X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=source%2Fmircoders%2Fsearch%2FUnStoredSearchTerm.java;h=9c5fd7315632b057f536592507aafa6f8a523bd2;hb=f686dd55489e6241bff68b4169058cf6e498ec2c;hp=6cfcc5fb203f4b1fdbdeecd5bbcb8af20e85e474;hpb=548c41a40db8016a51f4b31b4fc275404a07cd44;p=mir.git

diff --git a/source/mircoders/search/UnStoredSearchTerm.java b/source/mircoders/search/UnStoredSearchTerm.java
index 6cfcc5fb..9c5fd731 100755
--- a/source/mircoders/search/UnStoredSearchTerm.java
+++ b/source/mircoders/search/UnStoredSearchTerm.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001, 2002  The Mir-coders group
+ * Copyright (C) 2001, 2002 The Mir-coders group
  *
  * This file is part of Mir.
  *
@@ -18,38 +18,39 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with the com.oreilly.servlet library, any library
- * licensed under the Apache Software License, The Sun (tm) Java Advanced
- * Imaging library (JAI), The Sun JIMI library (or with modified versions of
- * the above that use the same license as the above), and distribute linked
- * combinations including the two.  You must obey the GNU General Public
- * License in all respects for all of the code used other than the above
- * mentioned libraries.  If you modify this file, you may extend this exception
- * to your version of the file, but you are not obligated to do so.  If you do
- * not wish to do so, delete this exception statement from your version.
+ * the code of this program with  any library licensed under the Apache Software License, 
+ * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library 
+ * (or with modified versions of the above that use the same license as the above), 
+ * and distribute linked combinations including the two.  You must obey the 
+ * GNU General Public License in all respects for all of the code used other than 
+ * the above mentioned libraries.  If you modify this file, you may extend this 
+ * exception to your version of the file, but you are not obligated to do so.  
+ * If you do not wish to do so, delete this exception statement from your version.
  */
-
 package mircoders.search;
 
-import javax.servlet.*;
-import javax.servlet.http.*;
+import java.util.Map;
+
+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.*;
-
 
 public class UnStoredSearchTerm extends SearchTerm{
-  
+
+
   public UnStoredSearchTerm(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){
     doc.add(Field.UnStored(matchField,entity.getValue(partOfEntity)));
   }
@@ -57,20 +58,20 @@ public class UnStoredSearchTerm extends SearchTerm{
   public void indexValue(Document doc, String value){
     doc.add(Field.UnStored(matchField, value));
   }
-    
+
   public String makeTerm(HttpServletRequest req){
       String wanted = req.getParameter(paramName);
-      if (wanted != null && wanted != ""){
-	return matchField + ":" + "\"" + wanted + "\"";
+      if (wanted != null && !(wanted.equals(""))){
+        return matchField + ":" + "\"" + wanted + "\"";
       }
       else {
-	return null;
+        return null;
       }
   }
-  public void returnMeta(SimpleHash result,Document doc){
-      //do nothing...we don't have the data stored!
+  public void returnMeta(Map result,Document doc){
+    return;
   }
-  
+
 
 }