X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=source%2Fmircoders%2Fsearch%2FImagesSearchTerm.java;h=ee404eca831332954b27b38e4985f689f7f81a93;hb=95c2e3a74f492f6f61d4dbe8bb47996f43af0627;hp=723eb7094a05ec734917e1e898c2a3dbf4a891f4;hpb=d90c1bbdd5e1823253436f24dce80de4f0abbfcb;p=mir.git

diff --git a/source/mircoders/search/ImagesSearchTerm.java b/source/mircoders/search/ImagesSearchTerm.java
index 723eb709..ee404eca 100755
--- a/source/mircoders/search/ImagesSearchTerm.java
+++ b/source/mircoders/search/ImagesSearchTerm.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001, 2002  The Mir-coders group
+ * Copyright (C) 2001, 2002 The Mir-coders group
  *
  * This file is part of Mir.
  *
@@ -18,60 +18,64 @@
  * 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 the com.oreilly.servlet library, 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.
+ * 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.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;
 
-import freemarker.template.SimpleHash;
-import freemarker.template.SimpleList;
-import freemarker.template.SimpleScalar;
-
 
 public class ImagesSearchTerm extends SearchTerm{
-  
-  
-  public static String matchField       = "hasImages"; 
-  public static String paramName        = "search_hasImages"; 
-  public static String dataField        = "images"; 
-  public static String templateVariable = "images";
-
-  public void index(Document doc, Entity entity) throws StorageObjectFailure{
-    EntityList images = DatabaseContentToMedia.getInstance().getImages((EntityContent) entity);
-    if (images != null && images.size()>0){
+  public ImagesSearchTerm() {
+    super (null, "search_hasImages", "hasImages", "images", "images");
+  }
+
+  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++){
-	if (k != 0){
-	  imageURLString = imageURLString + ":";
-	}
-	imageURLString = imageURLString + (images.elementAt(k)).getValue("icon_path");
+      int k=0;
+      while(images.hasNext()){
+        if (k != 0){
+          imageURLString = imageURLString + ":";
+        }
+	      k++;
+        imageURLString = imageURLString + ((EntityImages) images.next()).getFieldValue("icon_path");
       }
       doc.add(Field.UnIndexed("images",imageURLString));
     }
-
-
   }
 
   public String makeTerm(HttpServletRequest req){
@@ -79,24 +83,22 @@ public class ImagesSearchTerm extends SearchTerm{
     if (wanted != null && wanted.equals("y")){
       return matchField + ":y";
     }
-    else {
-      return null;
-    }
+		return null;
   }
- 
-  public void returnMeta(SimpleHash result,Document doc){
+
+  public void returnMeta(Map result,Document doc){
     String imageURLString=doc.get(dataField);
+    List theImages = new ArrayList();
     if (imageURLString != null){
-      SimpleList theImages = new SimpleList();
       StringTokenizer st = new StringTokenizer(imageURLString,":");
       while (st.hasMoreTokens()) {
-	String imageURL=st.nextToken();
-	theImages.add(new SimpleScalar(imageURL));
+        String imageURL=st.nextToken();
+        theImages.add(imageURL);
       }
-      result.put(templateVariable,theImages);
     }
+    result.put(templateVariable,theImages);
   }
-  
+
 
 }