these actually work now

[mir.git] / source / mircoders / search / TextSearchTerm.java

diff --git a/source/mircoders/search/TextSearchTerm.java b/source/mircoders/search/TextSearchTerm.java
index 275d4e8..b461a19 100755 (executable)
--- a/source/mircoders/search/TextSearchTerm.java
+++ b/source/mircoders/search/TextSearchTerm.java
@@ -31,6 +31,8 @@
 
 package mircoders.search;
 
+import java.util.*;
+
 import javax.servlet.*;
 import javax.servlet.http.*;
 
@@ -44,9 +46,20 @@ import freemarker.template.*;
 
 
 public class TextSearchTerm extends SearchTerm{
-  
+
+  public String templateVariable;
+  public String dataField;
+  public String matchField;
+  public String paramName;
+  public String partOfEntity;
+
   public TextSearchTerm(String anEntityPart,String aParamName,String aMatchField,String aDataField, String aTemplateVariable){
-    super(anEntityPart,aParamName,aMatchField,aDataField,aTemplateVariable);
+    partOfEntity = anEntityPart;
+    paramName = aParamName;
+    matchField = aMatchField;
+    dataField = aDataField;
+    templateVariable = aTemplateVariable;
+    
   }
   
   public void index(Document doc, Entity entity){
@@ -60,7 +73,7 @@ public class TextSearchTerm extends SearchTerm{
 
   public String makeTerm(HttpServletRequest req){
       String wanted = req.getParameter(paramName);
-      if (wanted != null && wanted != ""){
+      if (wanted != null && !(wanted.equals(""))){
        return matchField + ":" + "\"" + wanted + "\"";
       }
       else {
@@ -68,7 +81,7 @@ public class TextSearchTerm extends SearchTerm{
       }
   }
   public void returnMeta(SimpleHash result,Document doc){
-    result.put(templateVariable,doc.get(dataField)); 
+    result.put(templateVariable,new SimpleScalar(doc.get(dataField))); 
   }