some db code rewriting

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

diff --git a/source/mircoders/search/ImagesSearchTerm.java b/source/mircoders/search/ImagesSearchTerm.java
index b1fa9ae..ee404ec 100755 (executable)
--- a/source/mircoders/search/ImagesSearchTerm.java
+++ b/source/mircoders/search/ImagesSearchTerm.java
@@ -31,16 +31,19 @@
 package mircoders.search;
 
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.StringTokenizer;
+
 import javax.servlet.http.HttpServletRequest;
 
 import mir.entity.Entity;
-import mir.entity.EntityList;
-import mir.storage.StorageObjectFailure;
-import mircoders.entity.EntityContent;
-import mircoders.storage.DatabaseContentToMedia;
+import mir.entity.EntityBrowser;
+import mir.storage.DatabaseFailure;
+import mircoders.entity.EntityImages;
+import mircoders.storage.DatabaseImages;
+
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.Field;
 
@@ -50,16 +53,26 @@ public class ImagesSearchTerm extends SearchTerm{
     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){
+  public void index(Document doc, Entity entity) throws DatabaseFailure{
+    List extraTables = new ArrayList();
+    extraTables.add("content_x_media cxm");
+
+    Iterator images = new EntityBrowser(
+                                       DatabaseImages.getInstance(), "i", extraTables,
+                                       "cxm.content_id="+entity.getId()+"and cxm.media_id=i.id",
+                                       "i.id desc", 30, -1, 0);
+
+
+    if (images != null && images.hasNext()){
       doc.add(Field.Keyword(matchField,"y"));
       String imageURLString = "";
-      for(int k=0;k<images.size();k++){
+      int k=0;
+      while(images.hasNext()){
         if (k != 0){
           imageURLString = imageURLString + ":";
         }
-        imageURLString = imageURLString + (images.elementAt(k)).getFieldValue("icon_path");
+             k++;
+        imageURLString = imageURLString + ((EntityImages) images.next()).getFieldValue("icon_path");
       }
       doc.add(Field.UnIndexed("images",imageURLString));
     }
@@ -70,9 +83,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){