fixing scaling images -> nullpointer, patch by yossarian

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

diff --git a/source/mircoders/search/AudioSearchTerm.java b/source/mircoders/search/AudioSearchTerm.java
index 95d83d3..b68ee0b 100755 (executable)
--- a/source/mircoders/search/AudioSearchTerm.java
+++ b/source/mircoders/search/AudioSearchTerm.java
@@ -30,27 +30,40 @@
 
 package mircoders.search;
 
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 
 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.storage.DatabaseAudio;
 
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.Field;
 
+/**
+ * indexes whether an Enity has audio 
+ */
 public class AudioSearchTerm extends SearchTerm{
   public AudioSearchTerm() {
     super(null, "search_hasAudio", "hasAudio", null, "hasAudio");
   }
 
-  public void index(Document doc, Entity entity) throws StorageObjectFailure{
-    EntityList audio = DatabaseContentToMedia.getInstance().getAudio((EntityContent) entity);
-    if (audio != null && audio.size()>0){
+  public void index(Document doc, Entity entity) throws DatabaseFailure{
+      //    EntityList audio = DatabaseContentToMedia.getInstance().getAudio((EntityContent) entity);
+    List extraTables = new ArrayList();
+    extraTables.add("content_x_media cxm");
+    Iterator audios = new EntityBrowser(
+                                       DatabaseAudio.getInstance(), "i", extraTables,
+                                       "cxm.content_id="+entity.getId()+"and cxm.media_id=i.id",
+                                       "i.id desc", 30, -1, 0);
+
+
+    if (audios != null && audios.hasNext()){
       doc.add(Field.Keyword(matchField,"y"));
     }
   }
@@ -60,16 +73,12 @@ public class AudioSearchTerm extends SearchTerm{
     if (wanted != null && wanted.equals("y")){
       return matchField + ":" + "\"" + wanted + "\"";
     }
-    else {
-      return null;
-    }
+               return null;
   }
 
   public void returnMeta(Map result,Document doc){
     result.put(templateVariable,doc.get(matchField));
   }
-
-
 }