bugfix for search

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

diff --git a/source/mircoders/search/ContentSearchTerm.java b/source/mircoders/search/ContentSearchTerm.java
index 0bbc630..636d1ec 100755 (executable)
--- a/source/mircoders/search/ContentSearchTerm.java
+++ b/source/mircoders/search/ContentSearchTerm.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,40 +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 java.util.StringTokenizer;
 
-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.*;
-
 
 public class ContentSearchTerm extends SearchTerm{
-
-  public String templateVariable;
-  public String dataField;
-  public String matchField;
-  public String paramName;
-  public String partOfEntity;
+  protected ContentSearchTerm() {
+  }
 
   public ContentSearchTerm(String anEntityPart,String aParamName,String aMatchField,String aDataField, String aTemplateVariable){
     partOfEntity = anEntityPart;
@@ -59,9 +51,8 @@ public class ContentSearchTerm extends SearchTerm{
     matchField = aMatchField;
     dataField = aDataField;
     templateVariable = aTemplateVariable;
-    
   }
-  
+
   public void index(Document doc, Entity entity){
     doc.add(Field.UnStored(matchField,entity.getValue(partOfEntity)));
   }
@@ -74,41 +65,41 @@ public class ContentSearchTerm extends SearchTerm{
   public String makeTerm(HttpServletRequest req){
       String wanted = req.getParameter(paramName);
       if (wanted != null && !(wanted.equals(""))){
-       String searchBoolean = req.getParameter("search_boolean");
-       if (searchBoolean != null && searchBoolean.equals("phrase")){
-         return matchField + ":" + "\"" + wanted + "\"";
-       }
-       else {
-         if (searchBoolean != null && searchBoolean.equals("and")){
-           StringTokenizer st = new StringTokenizer(wanted); 
-           String composite = "(";
-           while (st.hasMoreTokens()) { 
-             composite = composite + " +" + st.nextToken(); 
-           }
-           composite = composite + ")";
-           return composite;
-         }
-         else {
-           //default to or
-           StringTokenizer st = new StringTokenizer(wanted); 
-           String composite = "(";
-           while (st.hasMoreTokens()) { 
-             composite = composite + " " + st.nextToken(); 
-           }
-           composite = composite + ")";
-           return composite;
-         }
-       }
+        String searchBoolean = req.getParameter("search_boolean");
+        if (searchBoolean != null && searchBoolean.equals("phrase")){
+          return matchField + ":" + "\"" + wanted + "\"";
+        }
+        else {
+          if (searchBoolean != null && searchBoolean.equals("and")){
+            StringTokenizer st = new StringTokenizer(wanted);
+            String composite = "(";
+            while (st.hasMoreTokens()) {
+              composite = composite + " +" + matchField + ":" + st.nextToken();
+            }
+            composite = composite + ")";
+            return composite;
+          }
+          else {
+            //default to or
+            StringTokenizer st = new StringTokenizer(wanted);
+            String composite = "(";
+            while (st.hasMoreTokens()) {
+              composite = composite + " " + matchField + ":" + st.nextToken();
+            }
+            composite = composite + ")";
+            return composite;
+          }
+        }
       }
       else {
-       return null;
+        return null;
       }
   }
 
-  public void returnMeta(SimpleHash result,Document doc){
+  public void returnMeta(Map result,Document doc){
     return;
   }
-  
+
 
 }