merged 1.1 branch into head

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

diff --git a/source/mircoders/search/VideoSearchTerm.java b/source/mircoders/search/VideoSearchTerm.java
index 60137ce..2268854 100755 (executable)
--- a/source/mircoders/search/VideoSearchTerm.java
+++ b/source/mircoders/search/VideoSearchTerm.java
@@ -29,16 +29,16 @@
  */
 package mircoders.search;
 
+import java.util.ArrayList;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
-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.storage.DatabaseVideo;
 
 import org.apache.lucene.document.Document;
@@ -46,14 +46,16 @@ import org.apache.lucene.document.Field;
 
 
 
-
+/**
+ * indexes whether an Enity has video
+ */
 public class VideoSearchTerm extends SearchTerm {
   public VideoSearchTerm() {
     super(null, "search_hasVideo", "hasVideo", null, "hasVideo");
   }
 
-  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 videos = new EntityBrowser(
@@ -71,9 +73,8 @@ public class VideoSearchTerm extends SearchTerm {
 
     if ((wanted != null) && wanted.equals("y")) {
       return matchField + ":" + "\"" + wanted + "\"";
-    } else {
-      return null;
     }
+               return null;
   }
 
   public void returnMeta(Map result, Document doc) {