1.1 restoration

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

diff --git a/source/mircoders/search/VideoSearchTerm.java b/source/mircoders/search/VideoSearchTerm.java
index 3aff976..60137ce 100755 (executable)
--- a/source/mircoders/search/VideoSearchTerm.java
+++ b/source/mircoders/search/VideoSearchTerm.java
@@ -29,15 +29,22 @@
  */
 package mircoders.search;
 
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Vector;
+
+import javax.servlet.http.HttpServletRequest;
+
 import mir.entity.Entity;
-import mir.entity.EntityList;
+import mir.entity.EntityBrowser;
 import mir.storage.StorageObjectFailure;
 import mircoders.entity.EntityContent;
-import mircoders.storage.DatabaseContentToMedia;
+import mircoders.storage.DatabaseVideo;
+
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.Field;
-import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
+
+
 
 
 public class VideoSearchTerm extends SearchTerm {
@@ -46,9 +53,15 @@ public class VideoSearchTerm extends SearchTerm {
   }
 
   public void index(Document doc, Entity entity) throws StorageObjectFailure {
-    EntityList video = DatabaseContentToMedia.getInstance().getVideo((EntityContent) entity);
+    Vector extraTables = new Vector();
+    extraTables.add("content_x_media cxm");
+
+    Iterator videos = new EntityBrowser(
+                                       DatabaseVideo.getInstance(), "i", extraTables,
+                                       "cxm.content_id="+entity.getId()+"and cxm.media_id=i.id",
+                                       "i.id desc", 30, -1, 0);
 
-    if ((video != null) && (video.size() > 0)) {
+    if ((videos != null) && (videos.hasNext())) {
       doc.add(Field.Keyword(matchField, "y"));
     }
   }