Fixed an Atom strictness bug and added some query stuff for mapper

darregui · Oct 17, 2011 · 1ffac23 · 1ffac23
1 parent e6bab09
commit 1ffac23
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/persistence/mapper/src/main/scala/net/liftweb/mapper/MetaMapper.scala b/persistence/mapper/src/main/scala/net/liftweb/mapper/MetaMapper.scala
@@ -1686,6 +1686,30 @@ object By {
   }
 }
 
+object By_>= {
+
+  import OprEnum._
+
+  def apply[O <: Mapper[O], T, U <% T](field: MappedField[T, O],
+                                       value: U) = Cmp[O, T](field, >=, Full(value), Empty, Empty)
+
+  def apply[O <: Mapper[O], T](field: MappedField[T, O], otherField:
+  MappedField[T, O]) = Cmp[O, T](field, >=, Empty, Full(otherField),
+    Empty)
+}
+
+object By_<= {
+
+  import OprEnum._
+
+  def apply[O <: Mapper[O], T, U <% T](field: MappedField[T, O],
+                                       value: U) = Cmp[O, T](field, <=, Full(value), Empty, Empty)
+
+  def apply[O <: Mapper[O], T](field: MappedField[T, O], otherField:
+  MappedField[T, O]) = Cmp[O, T](field, <=, Empty, Full(otherField),
+    Empty)
+}
+
 object NotBy {
   import OprEnum._
 

diff --git a/web/webkit/src/main/scala/net/liftweb/http/LiftSession.scala b/web/webkit/src/main/scala/net/liftweb/http/LiftSession.scala
@@ -1883,7 +1883,7 @@ class LiftSession(private[http] val _contextPath: String, val uniqueId: String,
       case text: Text => text
       case unparsed: Unparsed => unparsed
 
-      case a: Atom[Any] if a.getClass() == "scala.xml.Atom" => new Text(a.data.toString)
+      case a: Atom[Any] if a.getClass().getName() == "scala.xml.Atom" => new Text(a.data.toString)
 
       case v => v
     }