From 5302a320960a1e7f8d2fb52ac14671c82d01c073 Mon Sep 17 00:00:00 2001
From: bdc34 <bdc34@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Thu, 3 Feb 2011 20:29:52 +0000
Subject: [PATCH] Getting ride of vitro:keyword in lucene index, adding class
 names to lucene index.

---
 .../search/lucene/Entity2LuceneDoc.java       | 25 ++++++++-----------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/lucene/Entity2LuceneDoc.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/lucene/Entity2LuceneDoc.java
index 277612196..a9d2d6a46 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/lucene/Entity2LuceneDoc.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/lucene/Entity2LuceneDoc.java
@@ -96,7 +96,8 @@ public class Entity2LuceneDoc  implements Obj2DocIface{
         Individual ent = (Individual)obj;
         String value;
         Document doc = new Document();
-
+        String classPublicNames = "";
+        
         //DocId
         String id = ent.getURI();
         if( id == null ){
@@ -145,14 +146,16 @@ public class Entity2LuceneDoc  implements Obj2DocIface{
 
         //rdf:type and ClassGroup
         List<VClass> vclasses = ent.getVClasses(false);
-        for( VClass clz : vclasses){
-        	log.debug( id + " as type " + clz.getURI() );
-        	
+        for( VClass clz : vclasses){        	
             //document boost for given classes
             if( clz.getSearchBoost() != null )
                 doc.setBoost( doc.getBoost() + clz.getSearchBoost() );            
             doc.add( new Field(term.RDFTYPE, clz.getURI(), 
-                                Field.Store.YES, Field.Index.NOT_ANALYZED));                                               
+                                Field.Store.YES, Field.Index.NOT_ANALYZED));
+            
+            if( clz.getName() != null )
+                classPublicNames = classPublicNames + " " + clz.getName();
+            
             //Classgroup URI
             if( clz.getGroupURI() != null )
                 doc.add( new Field(term.CLASSGROUP_URI, clz.getGroupURI(), 
@@ -244,6 +247,7 @@ public class Entity2LuceneDoc  implements Obj2DocIface{
         value+= " "+ ( ((t=ent.getBlurb()) == null)?"":t );
         value+= " "+ getKeyterms(ent);
 
+        value+= " " + classPublicNames;
 
         List<DataPropertyStatement> dataPropertyStatements = ent.getDataPropertyStatements();
         if (dataPropertyStatements != null) {
@@ -370,15 +374,8 @@ public class Entity2LuceneDoc  implements Obj2DocIface{
     }
 
     private String getKeyterms(Individual ent){
-        //List<String> terms = entityWADao.getKeywords(ent.getId());
-        List<String> terms = ent.getKeywords();
-        String rv = "";
-        if( terms != null ){
-            for( String term : terms){
-                rv += term + " ";
-            }
-        }
-        return rv;
+        /* bdc34: vitro:keywords are no longer being indexed */
+        return "";
     }
 
     public static float NAME_BOOST = 10;