bugfix for search

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

diff --git a/source/mircoders/search/ImagesSearchTerm.java b/source/mircoders/search/ImagesSearchTerm.java
index 0a411d7..4039373 100755 (executable)
--- a/source/mircoders/search/ImagesSearchTerm.java
+++ b/source/mircoders/search/ImagesSearchTerm.java
@@ -18,23 +18,22 @@
  * 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  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.  
+ * 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.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.StringTokenizer;
-import java.util.Vector;
-
 import javax.servlet.http.HttpServletRequest;
 
 import mir.entity.Entity;
@@ -42,20 +41,15 @@ import mir.entity.EntityList;
 import mir.storage.StorageObjectFailure;
 import mircoders.entity.EntityContent;
 import mircoders.storage.DatabaseContentToMedia;
-
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.Field;
 
 
 public class ImagesSearchTerm extends SearchTerm{
-
-  static {
-    matchField       = "hasImages";
-    paramName        = "search_hasImages";
-    dataField        = "images";
-    templateVariable = "images";
+  public ImagesSearchTerm() {
+    super (null, "search_hasImages", "hasImages", "images", "images");
   }
-  
+
   public void index(Document doc, Entity entity) throws StorageObjectFailure{
     EntityList images = DatabaseContentToMedia.getInstance().getImages((EntityContent) entity);
     if (images != null && images.size()>0){
@@ -69,8 +63,6 @@ public class ImagesSearchTerm extends SearchTerm{
       }
       doc.add(Field.UnIndexed("images",imageURLString));
     }
-
-
   }
 
   public String makeTerm(HttpServletRequest req){
@@ -85,15 +77,15 @@ public class ImagesSearchTerm extends SearchTerm{
 
   public void returnMeta(Map result,Document doc){
     String imageURLString=doc.get(dataField);
+    List theImages = new ArrayList();
     if (imageURLString != null){
-      List theImages = new Vector();
       StringTokenizer st = new StringTokenizer(imageURLString,":");
       while (st.hasMoreTokens()) {
         String imageURL=st.nextToken();
         theImages.add(imageURL);
       }
-      result.put(templateVariable,theImages);
     }
+    result.put(templateVariable,theImages);
   }