X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=source%2Fmircoders%2Fsearch%2FKeywordSearchTerm.java;h=dfee6884ca33a56962abb927dc795060bc02149f;hb=6874c3a58e85fdb9ebf216d4c09eb466bda6f4f7;hp=de8e12b0db6185874dcf802005326548f58192fa;hpb=d90c1bbdd5e1823253436f24dce80de4f0abbfcb;p=mir.git

diff --git a/source/mircoders/search/KeywordSearchTerm.java b/source/mircoders/search/KeywordSearchTerm.java
index de8e12b0..dfee6884 100755
--- a/source/mircoders/search/KeywordSearchTerm.java
+++ b/source/mircoders/search/KeywordSearchTerm.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,19 +18,20 @@
  * 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 java.util.Map;
+
 import javax.servlet.http.HttpServletRequest;
 
 import mir.entity.Entity;
@@ -38,20 +39,11 @@ import mir.entity.Entity;
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.Field;
 
-import freemarker.template.SimpleHash;
-import freemarker.template.SimpleScalar;
 
 
 public class KeywordSearchTerm extends SearchTerm{
-  
-  public String templateVariable;
-  public String dataField;
-  public String matchField;
-  public String paramName;
-  public String partOfEntity;
- 
-
-  
+
+
   public KeywordSearchTerm(String anEntityPart,String aParamName,String aMatchField,String aDataField, String aTemplateVariable){
     partOfEntity = anEntityPart;
     paramName = aParamName;
@@ -59,10 +51,10 @@ public class KeywordSearchTerm extends SearchTerm{
     dataField = aDataField;
     templateVariable = aTemplateVariable;
   }
-  
+
 
   public void index(Document doc, Entity entity){
-    doc.add(Field.Keyword(matchField,entity.getValue(partOfEntity)));
+    doc.add(Field.Keyword(matchField,entity.getFieldValue(partOfEntity)));
   }
 
   public void indexValue(Document doc, String value){
@@ -73,16 +65,16 @@ public class KeywordSearchTerm extends SearchTerm{
   public String makeTerm(HttpServletRequest req){
       String wanted = req.getParameter(paramName);
       if (wanted != null && !(wanted.equals(""))){
-	return matchField + ":" + "\"" + wanted + "\"";
+        return matchField + ":" + "\"" + wanted + "\"";
       }
       else {
-	return null;
+        return null;
       }
   }
-  public void returnMeta(SimpleHash result,Document doc){
-    result.put(templateVariable,new SimpleScalar(doc.get(dataField))); 
+  public void returnMeta(Map result,Document doc){
+    result.put(templateVariable,doc.get(dataField));
   }
-  
+
 
 }