code cleaning, new config

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

diff --git a/source/mircoders/search/UnStoredSearchTerm.java b/source/mircoders/search/UnStoredSearchTerm.java
index 9978432..4e8b9cd 100755 (executable)
--- a/source/mircoders/search/UnStoredSearchTerm.java
+++ b/source/mircoders/search/UnStoredSearchTerm.java
@@ -31,19 +31,33 @@
 
 package mircoders.search;
 
-import javax.servlet.*;
-import javax.servlet.http.*;
+import javax.servlet.http.HttpServletRequest;
 
-import mir.entity.*;
+import mir.entity.Entity;
 
-import org.apache.lucene.index.*;
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.Field;
 
-import freemarker.template.*;
+import freemarker.template.SimpleHash;
 
 
 public class UnStoredSearchTerm extends SearchTerm{
+
+  public String templateVariable;
+  public String dataField;
+  public String matchField;
+  public String paramName;
+  public String partOfEntity;
+
+  
+  public UnStoredSearchTerm(String anEntityPart,String aParamName,String aMatchField,String aDataField, String aTemplateVariable){
+      partOfEntity = anEntityPart;
+      paramName = aParamName;
+      matchField = aMatchField;
+      dataField = aDataField;
+      templateVariable = aTemplateVariable;
+  }
+  
   
   public void index(Document doc, Entity entity){
     doc.add(Field.UnStored(matchField,entity.getValue(partOfEntity)));
@@ -55,7 +69,7 @@ public class UnStoredSearchTerm 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 {
@@ -63,7 +77,7 @@ public class UnStoredSearchTerm extends SearchTerm{
       }
   }
   public void returnMeta(SimpleHash result,Document doc){
-      //do nothing...we don't have the data stored!
+    return;
   }