X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=source%2Fmircoders%2Fsearch%2FAudioSearchTerm.java;h=346841968f5ea607d7475a75636d55df79b74c94;hb=63e0ee1fb8038eb6d8f0190cf38c3b3ab2727216;hp=f43e12a4487cb716ac503c3bd12d154cb908a11c;hpb=f686dd55489e6241bff68b4169058cf6e498ec2c;p=mir.git

diff --git a/source/mircoders/search/AudioSearchTerm.java b/source/mircoders/search/AudioSearchTerm.java
index f43e12a4..34684196 100755
--- a/source/mircoders/search/AudioSearchTerm.java
+++ b/source/mircoders/search/AudioSearchTerm.java
@@ -18,42 +18,50 @@
  * 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  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.  
+ * 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.Map;
+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.DatabaseAudio;
 
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.Field;
 
 public class AudioSearchTerm extends SearchTerm{
-
-  static {
-    matchField       = "hasAudio";
-    paramName        = "search_hasAudio";
-    templateVariable = "hasAudio";    
+  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){
+      //    EntityList audio = DatabaseContentToMedia.getInstance().getAudio((EntityContent) entity);
+    Vector extraTables = new Vector();
+    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"));
     }
   }
@@ -71,8 +79,6 @@ public class AudioSearchTerm extends SearchTerm{
   public void returnMeta(Map result,Document doc){
     result.put(templateVariable,doc.get(matchField));
   }
-
-
 }