fixing scaling images -> nullpointer, patch by yossarian

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

diff --git a/source/mircoders/search/ContentSearchTerm.java b/source/mircoders/search/ContentSearchTerm.java
index 20aadbb..2e52ebd 100755 (executable)
--- a/source/mircoders/search/ContentSearchTerm.java
+++ b/source/mircoders/search/ContentSearchTerm.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.
  */
 
@@ -40,14 +40,13 @@ import mir.entity.Entity;
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.Field;
 
-
+/**
+ * Tokenizes a string field in an Entity and indexes
+ * it, but does not store it for retrieval (used for content_data) 
+ */
 public class ContentSearchTerm extends SearchTerm{
-
-  public String templateVariable;
-  public String dataField;
-  public String matchField;
-  public String paramName;
-  public String partOfEntity;
+  protected ContentSearchTerm() {
+  }
 
   public ContentSearchTerm(String anEntityPart,String aParamName,String aMatchField,String aDataField, String aTemplateVariable){
     partOfEntity = anEntityPart;
@@ -55,11 +54,10 @@ public class ContentSearchTerm extends SearchTerm{
     matchField = aMatchField;
     dataField = aDataField;
     templateVariable = aTemplateVariable;
-
   }
 
   public void index(Document doc, Entity entity){
-    doc.add(Field.UnStored(matchField,entity.getValue(partOfEntity)));
+    doc.add(Field.UnStored(matchField,entity.getFieldValue(partOfEntity)));
   }
 
   public void indexValue(Document doc, String value){
@@ -96,9 +94,7 @@ public class ContentSearchTerm extends SearchTerm{
           }
         }
       }
-      else {
-        return null;
-      }
+                       return null;
   }
 
   public void returnMeta(Map result,Document doc){