1.1 restoration

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

diff --git a/source/mircoders/search/AudioSearchTerm.java b/source/mircoders/search/AudioSearchTerm.java
index 5597c49..3468419 100755 (executable)
--- a/source/mircoders/search/AudioSearchTerm.java
+++ b/source/mircoders/search/AudioSearchTerm.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,63 +18,67 @@
  * 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 javax.servlet.*;
-import javax.servlet.http.*;
+import java.util.Iterator;
+import java.util.Map; 
+import java.util.Vector;
 
-import mir.entity.*;
-import mir.storage.*;
-import mircoders.entity.*;
-import mircoders.storage.*;
+import javax.servlet.http.HttpServletRequest;
+
+import mir.entity.Entity;
+import mir.entity.EntityBrowser;
+import mir.storage.StorageObjectFailure;
+import mircoders.entity.EntityContent;
+import mircoders.storage.DatabaseContentToMedia;
+import mircoders.storage.DatabaseAudio;
 
-import org.apache.lucene.index.*;
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.Field;
 
-import freemarker.template.*;
+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);
+    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);
 
-public class AudioSearchTerm extends SearchTerm{
-  
-  
-  public static String matchField       = "hasAudio"; 
-  public static String paramName        = "search_hasAudio"; 
-  public static String templateVariable = "hasAudio";
 
-  public void index(Document doc, Entity entity) throws StorageObjectException{
-    EntityList audio = DatabaseContentToMedia.getInstance().getAudio((EntityContent) entity);
-    if (audio != null && audio.size()>0){
+    if (audios != null && audios.hasNext()){
       doc.add(Field.Keyword(matchField,"y"));
     }
   }
 
   public String makeTerm(HttpServletRequest req){
     String wanted = req.getParameter(paramName);
-    if (wanted == "y"){
+    if (wanted != null && wanted.equals("y")){
       return matchField + ":" + "\"" + wanted + "\"";
     }
     else {
       return null;
     }
   }
- 
-  public void returnMeta(SimpleHash result,Document doc){
+
+  public void returnMeta(Map result,Document doc){
     result.put(templateVariable,doc.get(matchField));
   }
-  
-
 }