fixing scaling images -> nullpointer, patch by yossarian

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

diff --git a/source/mircoders/search/TopicMatrixSearchTerm.java b/source/mircoders/search/TopicMatrixSearchTerm.java
index e9fcf34..065b476 100755 (executable)
--- a/source/mircoders/search/TopicMatrixSearchTerm.java
+++ b/source/mircoders/search/TopicMatrixSearchTerm.java
@@ -18,13 +18,13 @@
  * 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;
@@ -35,7 +35,7 @@ import javax.servlet.http.HttpServletRequest;
 
 import mir.entity.Entity;
 import mir.entity.EntityList;
-import mir.storage.StorageObjectFailure;
+import mir.storage.DatabaseFailure;
 import mircoders.entity.EntityContent;
 import mircoders.storage.DatabaseContentToTopics;
 
@@ -44,16 +44,15 @@ import org.apache.lucene.document.Field;
 
 
 public class TopicMatrixSearchTerm extends SearchTerm{
+  public TopicMatrixSearchTerm() {
+    super(null, "search_topicmatrix", "topic", null, null);
+  }
 
-
-  public static String matchField       = "topic";
-  public static String paramName        = "search_topicmatrix"; 
-
-  public void index(Document doc, Entity entity) throws StorageObjectFailure{
+  public void index(Document doc, Entity entity) throws DatabaseFailure{
     EntityList topics = DatabaseContentToTopics.getInstance().getTopics((EntityContent) entity);
     if (topics != null && topics.size()>0){
       for(int k=0;k<topics.size();k++){
-        doc.add(Field.UnStored(matchField,(topics.elementAt(k)).getValue("title")));
+        doc.add(Field.UnStored(matchField,(topics.elementAt(k)).getFieldValue("title")));
       }
     }
   }
@@ -62,7 +61,7 @@ public class TopicMatrixSearchTerm extends SearchTerm{
     String queryTerm = "";
     for (int x=0;x<10;x++){
       String[] values = req.getParameterValues("search_topicmatrix_"+Integer.toString(x));
-      
+
       if (values != null && values.length > 0){
        String subqueryTerm = "(";
          for (int i=0;i<values.length;i++){
@@ -75,9 +74,7 @@ public class TopicMatrixSearchTerm extends SearchTerm{
     if (queryTerm.equals("")){
       return null;
     }
-    else {
-      return "( "+queryTerm+ " )";
-    }
+               return "( "+queryTerm+ " )";
 
   }