fixing scaling images -> nullpointer, patch by yossarian

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

diff --git a/source/mircoders/search/UnIndexedSearchTerm.java b/source/mircoders/search/UnIndexedSearchTerm.java
index bcc2a14..4e48a4b 100755 (executable)
--- a/source/mircoders/search/UnIndexedSearchTerm.java
+++ b/source/mircoders/search/UnIndexedSearchTerm.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,41 +18,32 @@
  * 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.*;
+import java.util.Map;
 
-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.*;
-
 
+/**
+ * Stores some metatdata for retrieval with a 
+ * hit (for example a URL)  
+ */
 public class UnIndexedSearchTerm extends SearchTerm{
-  
-  public String templateVariable;
-  public String dataField;
-  public String matchField;
-  public String paramName;
-  public String partOfEntity;
-
   public UnIndexedSearchTerm(String anEntityPart,String aParamName,String aMatchField,String aDataField, String aTemplateVariable){
     partOfEntity = anEntityPart;
     paramName = aParamName;
@@ -60,24 +51,22 @@ public class UnIndexedSearchTerm extends SearchTerm{
     dataField =  aDataField;
     templateVariable = aTemplateVariable;
   }
-  
 
   public void index(Document doc, Entity entity){
-    doc.add(Field.Text(dataField,entity.getValue(partOfEntity)));
+    doc.add(Field.Text(dataField,entity.getFieldValue(partOfEntity)));
   }
 
   public void indexValue(Document doc, String value){
     doc.add(Field.Text(dataField, value));
   }
 
-
   public String makeTerm(HttpServletRequest req){
-    // it isn't indexed!       
+    // it isn't indexed!
     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));
   }
 }