From da0826b8714dea65ec3a6198ec397ddfc8f76d26 Mon Sep 17 00:00:00 2001 From: john Date: Wed, 27 Nov 2002 15:26:52 +0000 Subject: [PATCH] these actually work now --- source/mircoders/search/AudioSearchTerm.java | 6 +- source/mircoders/search/ContentSearchTerm.java | 115 +++++++++++++++++++++++ source/mircoders/search/ImagesSearchTerm.java | 4 +- source/mircoders/search/KeywordSearchTerm.java | 20 +++- source/mircoders/search/SearchTerm.java | 2 + source/mircoders/search/TextSearchTerm.java | 21 ++++- source/mircoders/search/TopicSearchTerm.java | 2 +- source/mircoders/search/UnIndexedSearchTerm.java | 20 +++- source/mircoders/search/UnStoredSearchTerm.java | 19 +++- source/mircoders/search/VideoSearchTerm.java | 6 +- 10 files changed, 193 insertions(+), 22 deletions(-) create mode 100755 source/mircoders/search/ContentSearchTerm.java diff --git a/source/mircoders/search/AudioSearchTerm.java b/source/mircoders/search/AudioSearchTerm.java index 5597c496..3b245525 100755 --- a/source/mircoders/search/AudioSearchTerm.java +++ b/source/mircoders/search/AudioSearchTerm.java @@ -31,6 +31,8 @@ package mircoders.search; +import java.util.*; + import javax.servlet.*; import javax.servlet.http.*; @@ -62,7 +64,7 @@ public class AudioSearchTerm extends SearchTerm{ public String makeTerm(HttpServletRequest req){ String wanted = req.getParameter(paramName); - if (wanted == "y"){ + if (wanted != null && wanted.equals("y")){ return matchField + ":" + "\"" + wanted + "\""; } else { @@ -71,7 +73,7 @@ public class AudioSearchTerm extends SearchTerm{ } public void returnMeta(SimpleHash result,Document doc){ - result.put(templateVariable,doc.get(matchField)); + result.put(templateVariable,new SimpleScalar(doc.get(matchField))); } diff --git a/source/mircoders/search/ContentSearchTerm.java b/source/mircoders/search/ContentSearchTerm.java new file mode 100755 index 00000000..0bbc630f --- /dev/null +++ b/source/mircoders/search/ContentSearchTerm.java @@ -0,0 +1,115 @@ +/* + * Copyright (C) 2001, 2002 The Mir-coders group + * + * This file is part of Mir. + * + * Mir is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * Mir is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Mir; if not, write to the Free Software + * 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. + */ + +package mircoders.search; + +import java.util.*; + +import javax.servlet.*; +import javax.servlet.http.*; + +import mir.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; + + public ContentSearchTerm(String anEntityPart,String aParamName,String aMatchField,String aDataField, String 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))); + } + + 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(""))){ + 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; + } + } + } + else { + return null; + } + } + + public void returnMeta(SimpleHash result,Document doc){ + return; + } + + +} + + diff --git a/source/mircoders/search/ImagesSearchTerm.java b/source/mircoders/search/ImagesSearchTerm.java index 2f5b4c6e..0b2ca05e 100755 --- a/source/mircoders/search/ImagesSearchTerm.java +++ b/source/mircoders/search/ImagesSearchTerm.java @@ -75,8 +75,8 @@ public class ImagesSearchTerm extends SearchTerm{ public String makeTerm(HttpServletRequest req){ String wanted = req.getParameter(paramName); - if (wanted == "y"){ - return matchField + ":" + "\"" + wanted + "\""; + if (wanted != null && wanted.equals("y")){ + return matchField + ":y"; } else { return null; diff --git a/source/mircoders/search/KeywordSearchTerm.java b/source/mircoders/search/KeywordSearchTerm.java index 080c037b..384b3fa8 100755 --- a/source/mircoders/search/KeywordSearchTerm.java +++ b/source/mircoders/search/KeywordSearchTerm.java @@ -31,6 +31,8 @@ package mircoders.search; +import java.util.*; + import javax.servlet.*; import javax.servlet.http.*; @@ -45,8 +47,20 @@ import freemarker.template.*; 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){ - super(anEntityPart,aParamName,aMatchField,aDataField,aTemplateVariable); + partOfEntity = anEntityPart; + paramName = aParamName; + matchField = aMatchField; + dataField = aDataField; + templateVariable = aTemplateVariable; } @@ -61,7 +75,7 @@ public class KeywordSearchTerm extends SearchTerm{ public String makeTerm(HttpServletRequest req){ String wanted = req.getParameter(paramName); - if (wanted != null && wanted != ""){ + if (wanted != null && !(wanted.equals(""))){ return matchField + ":" + "\"" + wanted + "\""; } else { @@ -69,7 +83,7 @@ public class KeywordSearchTerm extends SearchTerm{ } } public void returnMeta(SimpleHash result,Document doc){ - result.put(templateVariable,doc.get(dataField)); + result.put(templateVariable,new SimpleScalar(doc.get(dataField))); } diff --git a/source/mircoders/search/SearchTerm.java b/source/mircoders/search/SearchTerm.java index ad43ee89..4f14f6c6 100755 --- a/source/mircoders/search/SearchTerm.java +++ b/source/mircoders/search/SearchTerm.java @@ -31,6 +31,8 @@ package mircoders.search; +import java.util.*; + import javax.servlet.*; import javax.servlet.http.*; diff --git a/source/mircoders/search/TextSearchTerm.java b/source/mircoders/search/TextSearchTerm.java index 275d4e8b..b461a19c 100755 --- a/source/mircoders/search/TextSearchTerm.java +++ b/source/mircoders/search/TextSearchTerm.java @@ -31,6 +31,8 @@ package mircoders.search; +import java.util.*; + import javax.servlet.*; import javax.servlet.http.*; @@ -44,9 +46,20 @@ import freemarker.template.*; public class TextSearchTerm extends SearchTerm{ - + + public String templateVariable; + public String dataField; + public String matchField; + public String paramName; + public String partOfEntity; + public TextSearchTerm(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){ @@ -60,7 +73,7 @@ public class TextSearchTerm extends SearchTerm{ public String makeTerm(HttpServletRequest req){ String wanted = req.getParameter(paramName); - if (wanted != null && wanted != ""){ + if (wanted != null && !(wanted.equals(""))){ return matchField + ":" + "\"" + wanted + "\""; } else { @@ -68,7 +81,7 @@ public class TextSearchTerm extends SearchTerm{ } } public void returnMeta(SimpleHash result,Document doc){ - result.put(templateVariable,doc.get(dataField)); + result.put(templateVariable,new SimpleScalar(doc.get(dataField))); } diff --git a/source/mircoders/search/TopicSearchTerm.java b/source/mircoders/search/TopicSearchTerm.java index 7f29d72b..e5e66e04 100755 --- a/source/mircoders/search/TopicSearchTerm.java +++ b/source/mircoders/search/TopicSearchTerm.java @@ -64,7 +64,7 @@ public class TopicSearchTerm extends SearchTerm{ } public String makeTerm(HttpServletRequest req){ String wanted = req.getParameter(paramName); - if (wanted != null && wanted != ""){ + if (wanted != null && !(wanted.equals(""))){ return matchField + ":" + "\"" + wanted + "\""; } else { diff --git a/source/mircoders/search/UnIndexedSearchTerm.java b/source/mircoders/search/UnIndexedSearchTerm.java index 07da68c1..bcc2a145 100755 --- a/source/mircoders/search/UnIndexedSearchTerm.java +++ b/source/mircoders/search/UnIndexedSearchTerm.java @@ -31,6 +31,8 @@ package mircoders.search; +import java.util.*; + import javax.servlet.*; import javax.servlet.http.*; @@ -44,9 +46,19 @@ import freemarker.template.*; 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){ - super(anEntityPart,aParamName,aMatchField,aDataField,aTemplateVariable); + partOfEntity = anEntityPart; + paramName = aParamName; + matchField = aMatchField; + dataField = aDataField; + templateVariable = aTemplateVariable; } @@ -63,12 +75,10 @@ public class UnIndexedSearchTerm extends SearchTerm{ // it isn't indexed! return null; } - + public void returnMeta(SimpleHash result,Document doc){ - result.put(templateVariable,doc.get(dataField)); + result.put(templateVariable,new SimpleScalar(doc.get(dataField))); } - - } diff --git a/source/mircoders/search/UnStoredSearchTerm.java b/source/mircoders/search/UnStoredSearchTerm.java index 6cfcc5fb..cafd3bba 100755 --- a/source/mircoders/search/UnStoredSearchTerm.java +++ b/source/mircoders/search/UnStoredSearchTerm.java @@ -31,6 +31,8 @@ package mircoders.search; +import java.util.*; + import javax.servlet.*; import javax.servlet.http.*; @@ -44,9 +46,20 @@ import freemarker.template.*; public class UnStoredSearchTerm extends SearchTerm{ + + public String templateVariable; + public String dataField; + public String matchField; + public String paramName; + public String partOfEntity; + 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; } @@ -60,7 +73,7 @@ public class UnStoredSearchTerm extends SearchTerm{ public String makeTerm(HttpServletRequest req){ String wanted = req.getParameter(paramName); - if (wanted != null && wanted != ""){ + if (wanted != null && !(wanted.equals(""))){ return matchField + ":" + "\"" + wanted + "\""; } else { @@ -68,7 +81,7 @@ public class UnStoredSearchTerm extends SearchTerm{ } } public void returnMeta(SimpleHash result,Document doc){ - //do nothing...we don't have the data stored! + return; } diff --git a/source/mircoders/search/VideoSearchTerm.java b/source/mircoders/search/VideoSearchTerm.java index 3b01ed13..21a0eada 100755 --- a/source/mircoders/search/VideoSearchTerm.java +++ b/source/mircoders/search/VideoSearchTerm.java @@ -31,6 +31,8 @@ package mircoders.search; +import java.util.*; + import javax.servlet.*; import javax.servlet.http.*; @@ -62,7 +64,7 @@ public class VideoSearchTerm extends SearchTerm{ public String makeTerm(HttpServletRequest req){ String wanted = req.getParameter(paramName); - if (wanted == "y"){ + if (wanted != null && wanted.equals("y")){ return matchField + ":" + "\"" + wanted + "\""; } else { @@ -71,7 +73,7 @@ public class VideoSearchTerm extends SearchTerm{ } public void returnMeta(SimpleHash result,Document doc){ - result.put(templateVariable,doc.get(matchField)); + result.put(templateVariable,new SimpleScalar(doc.get(matchField))); } -- 2.11.0