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 a0b48278f..1228ba45f 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 @@ -27,7 +27,6 @@ import edu.cornell.mannlib.vitro.webapp.search.beans.ContextNodesInclusionFactor import edu.cornell.mannlib.vitro.webapp.search.beans.IndividualProhibitedFromSearch; import edu.cornell.mannlib.vitro.webapp.search.beans.ProhibitedFromSearch; import edu.cornell.mannlib.vitro.webapp.search.docbuilder.Obj2DocIface; -import edu.cornell.mannlib.vitro.webapp.search.lucene.test.LuceneDocument; /** * This class expect that Entities passed to it will have @@ -137,7 +136,6 @@ public class Entity2LuceneDoc implements Obj2DocIface{ String value; Document doc = new Document(); String classPublicNames = ""; - LuceneDocument document = new LuceneDocument(); //DocId String id = ent.getURI(); @@ -180,14 +178,12 @@ public class Entity2LuceneDoc implements Obj2DocIface{ Field typeField = new Field (term.RDFTYPE, clz.getURI(), Field.Store.YES, Field.Index.NOT_ANALYZED_NO_NORMS); doc.add( typeField); - document.setRDFTYPE(clz.getURI()); if(clz.getLocalName() != null){ Field classLocalName = new Field(term.CLASSLOCALNAME, clz.getLocalName(), Field.Store.YES, Field.Index.ANALYZED); Field classLocalNameLowerCase = new Field(term.CLASSLOCALNAMELOWERCASE, clz.getLocalName().toLowerCase(), Field.Store.YES, Field.Index.ANALYZED); doc.add(classLocalName); doc.add(classLocalNameLowerCase); - document.setCLASSLOCALNAME(clz.getLocalName()); } if( clz.getName() != null ) @@ -199,28 +195,23 @@ public class Entity2LuceneDoc implements Obj2DocIface{ Field.Store.YES, Field.Index.NOT_ANALYZED_NO_NORMS); // classGroupField.setBoost(FIELD_BOOST); doc.add(classGroupField); - document.setCLASSGROUP_URI(clz.getGroupURI()); } } } doc.add( new Field(term.PROHIBITED_FROM_TEXT_RESULTS, prohibited?"1":"0", Field.Store.NO,Field.Index.NOT_ANALYZED_NO_NORMS) ); - document.setPROHIBITED_FROM_TEXT_RESULTS(prohibited?"1":"0"); /* lucene DOCID */ doc.add( new Field(term.DOCID, entClassName + id, Field.Store.YES, Field.Index.NOT_ANALYZED_NO_NORMS)); - document.setDOCID(entClassName + id); //vitro Id doc.add( new Field(term.URI, id, Field.Store.YES, Field.Index.NOT_ANALYZED_NO_NORMS)); - document.setURI(id); //java class doc.add( new Field(term.JCLASS, entClassName, Field.Store.YES, Field.Index.NOT_ANALYZED_NO_NORMS)); - document.setJCLASS(entClassName); // Individual label if( ent.getRdfsLabel() != null ) @@ -234,7 +225,6 @@ public class Entity2LuceneDoc implements Obj2DocIface{ Field nameRaw = new Field(term.NAME_RAW, value, Field.Store.YES, Field.Index.NOT_ANALYZED); nameRaw.setBoost(NAME_BOOST); doc.add(nameRaw); - document.setNAME(value); // RY Not sure if we need to store this. For Solr, see schema.xml field definition. Field nameLowerCase = new Field(term.NAME_LOWERCASE, value.toLowerCase(), Field.Store.YES, Field.Index.NOT_ANALYZED); @@ -263,14 +253,12 @@ public class Entity2LuceneDoc implements Obj2DocIface{ Field contextNodeInformation = new Field(term.CONTEXTNODE, contextNodePropertyValues, Field.Store.YES, Field.Index.ANALYZED ); doc.add(contextNodeInformation); - document.setCONTEXTNODE(contextNodePropertyValues); //Moniker if(ent.getMoniker() != null){ Field moniker = new Field(term.MONIKER, ent.getMoniker(), Field.Store.YES, Field.Index.NOT_ANALYZED_NO_NORMS); doc.add(moniker); - document.setMONIKER(ent.getMoniker()); } //boost for entity @@ -313,45 +301,32 @@ public class Entity2LuceneDoc implements Obj2DocIface{ Object anon[] = { new Long((new DateTime() ).getMillis()) }; doc.add( new Field(term.INDEXEDTIME, String.format( "%019d", anon ), Field.Store.YES, Field.Index.NOT_ANALYZED_NO_NORMS)); - document.setINDEXEDTIME(String.format("%019d", anon)); if( ! prohibited ){ //ALLTEXT, all of the 'full text' - StringBuffer alltext = new StringBuffer(); - String t=null; value =""; value+= " "+( ((t=ent.getName()) == null)?"":t ); - alltext.append("\t NAME: " + ( ((t=ent.getName()) == null)?"":t )); value+= " "+( ((t=ent.getAnchor()) == null)?"":t); - alltext.append("\t ANCHOR: " + ( ((t=ent.getAnchor()) == null)?"":t)); value+= " "+ ( ((t=ent.getMoniker()) == null)?"":t ); - alltext.append("\t MONIKER: " + ( ((t=ent.getMoniker()) == null)?"":t )); value+= " "+ ( ((t=ent.getDescription()) == null)?"":t ); - alltext.append("\t DESCRIPTION: " + ( ((t=ent.getDescription()) == null)?"":t )); value+= " "+ ( ((t=ent.getBlurb()) == null)?"":t ); - alltext.append("\t BLURB: " + ( ((t=ent.getBlurb()) == null)?"":t )); value+= " "+ getKeyterms(ent); - alltext.append("\t KEYTERMS: " + getKeyterms(ent)); value+= " " + classPublicNames; - alltext.append(" CLASSPUBLICNAMES: " + classPublicNames); List dataPropertyStatements = ent.getDataPropertyStatements(); if (dataPropertyStatements != null) { - alltext.append("\n DATA_PROPERTY_STATEMENTS \n -------------------------------- \n"); Iterator dataPropertyStmtIter = dataPropertyStatements.iterator(); while (dataPropertyStmtIter.hasNext()) { DataPropertyStatement dataPropertyStmt = dataPropertyStmtIter.next(); value+= " "+ ( ((t=dataPropertyStmt.getData()) == null)?"":t ); - alltext.append("\n " + ( ((t=dataPropertyStmt.getData()) == null)?"":t )); } } List objectPropertyStatements = ent.getObjectPropertyStatements(); if (objectPropertyStatements != null) { - alltext.append("\n OBJECT_PROPERTY_STATEMENTS \n -------------------------------- \n"); Iterator objectPropertyStmtIter = objectPropertyStatements.iterator(); while (objectPropertyStmtIter.hasNext()) { ObjectPropertyStatement objectPropertyStmt = objectPropertyStmtIter.next(); @@ -359,8 +334,6 @@ public class Entity2LuceneDoc implements Obj2DocIface{ continue; try { value+= " "+ ( ((t=objectPropertyStmt.getObject().getName()) == null)?"":t ); - alltext.append("\n " +( ((t=objectPropertyStmt.getProperty().getURI()) == null)?"":t ) - + " : " + ( ((t=objectPropertyStmt.getObject().getName()) == null)?"":t )); if(ent.isVClass("http://xmlns.com/foaf/0.1/Person")){ //IndividualURIToObjectProperties.put(ent.getURI(), ( ((t=objectPropertyStmt.getProperty().getURI()) == null)?"":t ) ); @@ -376,10 +349,8 @@ public class Entity2LuceneDoc implements Obj2DocIface{ doc.add( new Field(term.ALLTEXT, value , Field.Store.NO, Field.Index.ANALYZED)); //unstemmed terms doc.add( new Field(term.ALLTEXTUNSTEMMED, value, Field.Store.NO, Field.Index.ANALYZED)); - document.setALLTEXT(alltext.toString()); } - document.writeToLog(); // log.info("\n IndividualURItoObjectProperties " + IndividualURIToObjectProperties.toString() + " \n\n"); log.info(" \n Object Properties " + objectProperties.toString() + "\n\n"); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/lucene/test/LuceneDocument.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/lucene/test/LuceneDocument.java deleted file mode 100644 index ad2ec0114..000000000 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/lucene/test/LuceneDocument.java +++ /dev/null @@ -1,209 +0,0 @@ -package edu.cornell.mannlib.vitro.webapp.search.lucene.test; - -import java.io.BufferedWriter; -import java.io.FileWriter; -import java.io.IOException; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -public class LuceneDocument { - - private static final Log log = LogFactory.getLog(LuceneDocument.class.getName()); - - String URI; - String DOCID; - String JCLASS; - String RDFTYPE; - String CLASSGROUP_URI; - String MODTIME; - String NAME; - String PORTAL; - String INDEXEDTIME; - String TIMEKEY; - String SUNSET; - String MONIKER; - String ALLTEXT; - String KEYWORDS; - String THUMBNAIL; - String PROHIBITED_FROM_TEXT_RESULTS; - String CLASSLOCALNAME; - String CONTEXTNODE; - - static final String FILE = "~/Desktop/LuceneIndividuals.txt"; - - - public String getURI() { - return URI; - } - - public void setURI(String uRI) { - URI = uRI; - } - - public String getDOCID() { - return DOCID; - } - - public void setDOCID(String dOCID) { - DOCID = dOCID; - } - - public String getJCLASS() { - return JCLASS; - } - - public void setJCLASS(String jCLASS) { - JCLASS = jCLASS; - } - - public String getRDFTYPE() { - return RDFTYPE; - } - - public void setRDFTYPE(String rDFTYPE) { - RDFTYPE = rDFTYPE; - } - - public String getCLASSGROUP_URI() { - return CLASSGROUP_URI; - } - - public void setCLASSGROUP_URI(String cLASSGROUP_URI) { - CLASSGROUP_URI = cLASSGROUP_URI; - } - - public String getMODTIME() { - return MODTIME; - } - - public void setMODTIME(String mODTIME) { - MODTIME = mODTIME; - } - - public String getNAME() { - return NAME; - } - - public void setNAME(String nAME) { - NAME = nAME; - } - - public String getPORTAL() { - return PORTAL; - } - - public void setPORTAL(String pORTAL) { - PORTAL = pORTAL; - } - - public String getINDEXEDTIME() { - return INDEXEDTIME; - } - - public void setINDEXEDTIME(String iNDEXEDTIME) { - INDEXEDTIME = iNDEXEDTIME; - } - - public String getTIMEKEY() { - return TIMEKEY; - } - - public void setTIMEKEY(String tIMEKEY) { - TIMEKEY = tIMEKEY; - } - - public String getSUNSET() { - return SUNSET; - } - - public void setSUNSET(String sUNSET) { - SUNSET = sUNSET; - } - - public String getMONIKER() { - return MONIKER; - } - - public void setMONIKER(String mONIKER) { - MONIKER = mONIKER; - } - - public String getALLTEXT() { - return ALLTEXT; - } - - public void setALLTEXT(String aLLTEXT) { - ALLTEXT = aLLTEXT; - } - - public String getKEYWORDS() { - return KEYWORDS; - } - - public void setKEYWORDS(String kEYWORDS) { - KEYWORDS = kEYWORDS; - } - - public String getTHUMBNAIL() { - return THUMBNAIL; - } - - public void setTHUMBNAIL(String tHUMBNAIL) { - THUMBNAIL = tHUMBNAIL; - } - - public String getPROHIBITED_FROM_TEXT_RESULTS() { - return PROHIBITED_FROM_TEXT_RESULTS; - } - - public void setPROHIBITED_FROM_TEXT_RESULTS(String pROHIBITED_FROM_TEXT_RESULTS) { - PROHIBITED_FROM_TEXT_RESULTS = pROHIBITED_FROM_TEXT_RESULTS; - } - - public String getCLASSLOCALNAME() { - return CLASSLOCALNAME; - } - - public void setCLASSLOCALNAME(String cLASSLOCALNAME) { - CLASSLOCALNAME = cLASSLOCALNAME; - } - - @Override - public String toString(){ - - StringBuffer result = new StringBuffer(); - - result.append("\n==================================\n"); - - result.append("URI : " + URI); - result.append("\nDOCID : " + DOCID); - result.append("\nJCLASS : " + JCLASS); - result.append("\nRDFTYPE : " + RDFTYPE); - result.append("\nCLASSGROUP_URI : " + CLASSGROUP_URI); - result.append("\nMODTIME : " + MODTIME); - result.append("\nNAME : " + NAME); - result.append("\nPORTAL : " + PORTAL); - result.append("\nINDEXEDTIME : " + INDEXEDTIME); - result.append("\nCONTEXTNODE : " + CONTEXTNODE); - result.append("\nTIMEKEY : " + TIMEKEY); - result.append("\nSUNSET : " + SUNSET); - result.append("\nMONIKER : " + MONIKER); - result.append("\nALLTEXT : " + ALLTEXT); - result.append("\nKEYWORDS : " + KEYWORDS); - result.append("\nTHUMBNAIL : " + THUMBNAIL); - result.append("\nPROHIBITED_FROM_TEXT_RESULTS : " + PROHIBITED_FROM_TEXT_RESULTS); - result.append("\nCLASSLOCALNAME : " + CLASSLOCALNAME); - - return result.toString(); - - } - - public void writeToLog(){ - log.info(this.toString()); - } - - public void setCONTEXTNODE(String contextNodePropertyValues) { - this.CONTEXTNODE = contextNodePropertyValues; - } -}