merged 1.1 branch into head

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

diff --git a/source/mircoders/search/ImagesSearchTerm.java b/source/mircoders/search/ImagesSearchTerm.java
index 275cb44..55cde5c 100755 (executable)
--- a/source/mircoders/search/ImagesSearchTerm.java
+++ b/source/mircoders/search/ImagesSearchTerm.java
@@ -35,27 +35,30 @@ import java.util.Iterator;
 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;
 import mir.entity.EntityBrowser;
-import mir.storage.StorageObjectFailure;
-import mircoders.entity.EntityContent;
+import mir.storage.DatabaseFailure;
 import mircoders.entity.EntityImages;
 import mircoders.storage.DatabaseImages;
 
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.Field;
 
-
+/**
+ * Indexes whether or not an Entity has associated
+ * images, and also stores urls of those images for 
+ * retrieval in the search results
+ */
 public class ImagesSearchTerm extends SearchTerm{
   public ImagesSearchTerm() {
     super (null, "search_hasImages", "hasImages", "images", "images");
   }
 
-  public void index(Document doc, Entity entity) throws StorageObjectFailure{
-    Vector extraTables = new Vector();
+  public void index(Document doc, Entity entity) throws DatabaseFailure{
+    List extraTables = new ArrayList();
     extraTables.add("content_x_media cxm");
 
     Iterator images = new EntityBrowser(
@@ -84,9 +87,7 @@ public class ImagesSearchTerm extends SearchTerm{
     if (wanted != null && wanted.equals("y")){
       return matchField + ":y";
     }
-    else {
-      return null;
-    }
+               return null;
   }
 
   public void returnMeta(Map result,Document doc){