Default values for parameters

Author: Antoine Detante

modules/websql/app/models/DSL.scala

@@ -64,6 +64,8 @@ object DSL{
   def form(name:String) = PostParameter(name)
   def path(name:String) = PathParameter(name)
 
+  def url(name:String, defaultValue:String) = GetParameter(name,Some(defaultValue))
+
   private[DSL] class SimpleColumnLinkOp(val page:Page, val query:SimpleQuery, val column:Column, val link:Link){
     def as(pName:String) = new SimpleColumnLinkOp(page, query, column, link.copy(parameter = Some(GetParameter(pName))))
     def asPath = new SimpleColumnLinkOp(page, query, column, link.copy(parameter = Some(PathParameter("path"))))
@@ -81,5 +83,5 @@ object DSL{
     def withQuery(newQuery:NamedQuery) = new PageNamedQueryOp(page.copy(namedQueries = page.namedQueries :+ query.copy(columns=query.columns :+ column.copy(link=Some(link)))),newQuery)
     def withQuery(newQuery:SimpleQuery) = new PageSimpleQueryOp(page.copy(namedQueries = page.namedQueries :+ query.copy(columns=query.columns :+ column.copy(link=Some(link)))),newQuery)
   }
-  
+
 }

modules/websql/app/models/Pages.scala

@@ -23,11 +23,14 @@ case class SimpleQuery(queryString:String,columns:Seq[Column]) extends Query
 
 trait Parameter{
   def name:String
+  def defaultValue:Option[String]
 }
 
-case class PostParameter(name:String) extends Parameter
-case class GetParameter(name:String) extends Parameter
-case class PathParameter(name:String) extends Parameter
+case class PostParameter(name:String,defaultValue:Option[String]=None) extends Parameter
+case class GetParameter(name:String,defaultValue:Option[String]=None) extends Parameter {
+  def withDefaultValue(value:String) = this.copy(defaultValue=Some(value))
+}
+case class PathParameter(name:String,defaultValue:Option[String]=None) extends Parameter
 
 case class Page(
     id:String,

modules/websql/app/models/Request.scala

@@ -13,13 +13,23 @@ object ParameterValue{
     ParameterValue(
       parameter.name,
       parameter match {
-        case GetParameter(paramName) =>
-          for (values <- request.queryString.get(paramName)) yield values.head
-        case PostParameter(paramName) =>
+        case GetParameter(paramName,default) =>
+          request.queryString.get(paramName) match {
+            case None =>
+              default
+            case Some(list) if list.size == 0 =>
+              default
+            case Some(Seq("")) =>
+              default
+            case Some(list) =>
+              Some(list.head)
+          }
+
+        case PostParameter(paramName,_) =>
           request.body.asFormUrlEncoded.map{formData=>
               for (values <- formData.get(paramName)) yield values.head
             }.getOrElse(None)
-        case PathParameter(paramName) =>
+        case PathParameter(paramName,_) =>
           request.uri match {
             case PathParameterExtractor(value)  => Some(value)
             case _                              =>  None

modules/websql/app/views/helpers/Helpers.scala

@@ -9,8 +9,8 @@ object Helpers{
     Html("""<a href="%s%s">%s</a>""".format(
         link.toPage,
         link.parameter.collect{
-          case GetParameter(pName)  => "?" + pName + "=" + col._2
-          case PathParameter(_)     => "/" + col._2
+          case GetParameter(pName,_)  => "?" + pName + "=" + col._2
+          case PathParameter(_,_)     => "/" + col._2
         }.getOrElse("?" + col._1 + "=" + col._2),
         link.title.getOrElse(col._2)
       ))