image bugfixx - mir now depends on jai imagio

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

diff --git a/source/mircoders/search/UnStoredSearchTerm.java b/source/mircoders/search/UnStoredSearchTerm.java
index 4e8b9cd..8ed8c10 100755 (executable)
--- 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,19 +18,19 @@
  * 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,8 +38,6 @@ import mir.entity.Entity;
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.Field;
 
-import freemarker.template.SimpleHash;
-
 
 public class UnStoredSearchTerm extends SearchTerm{
 
@@ -49,7 +47,7 @@ public class UnStoredSearchTerm extends SearchTerm{
   public String paramName;
   public String partOfEntity;
 
-  
+
   public UnStoredSearchTerm(String anEntityPart,String aParamName,String aMatchField,String aDataField, String aTemplateVariable){
       partOfEntity = anEntityPart;
       paramName = aParamName;
@@ -57,8 +55,8 @@ public class UnStoredSearchTerm extends SearchTerm{
       dataField = aDataField;
       templateVariable = aTemplateVariable;
   }
-  
-  
+
+
   public void index(Document doc, Entity entity){
     doc.add(Field.UnStored(matchField,entity.getValue(partOfEntity)));
   }
@@ -66,20 +64,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.equals(""))){
-       return matchField + ":" + "\"" + wanted + "\"";
+        return matchField + ":" + "\"" + wanted + "\"";
       }
       else {
-       return null;
+        return null;
       }
   }
-  public void returnMeta(SimpleHash result,Document doc){
+  public void returnMeta(Map result,Document doc){
     return;
   }
-  
+
 
 }