litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Committing the following changes

Browse source 
1) Reverting to the original configuration containing 5 queries and firing them against Dataset object.
2) setting for moderate solr logging onto the console.
This commit is contained in:
deepakkoni 2011-06-16 12:05:53 +00:00
parent 686521490d
commit 637f98661e
3 changed files with 38 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
webapp/config/default.log4j.properties
View file

@ -36,6 +36,9 @@ log4j.rootLogger=INFO, AllAppender
log4j.logger.edu.cornell.mannlib.vitro.webapp.controller.freemarker.BrowseController=WARN log4j.logger.edu.cornell.mannlib.vitro.webapp.controller.freemarker.BrowseController=WARN
log4j.logger.edu.cornell.mannlib.vitro.webapp.dao.jena.pellet.PelletListener=WARN log4j.logger.edu.cornell.mannlib.vitro.webapp.dao.jena.pellet.PelletListener=WARN
log4j.logger.edu.cornell.mannlib.vitro.webapp.dao.jena.RDBGraphGenerator=WARN log4j.logger.edu.cornell.mannlib.vitro.webapp.dao.jena.RDBGraphGenerator=WARN
#log4j.logger.edu.cornell.mannlib.vitro.webapp.search.solr.IndividualToSolrDocument=DEBUG
#log4j.logger.edu.cornell.mannlib.vitro.webapp.search.solr.CalculateParameters=DEBUG
#log4j.logger.edu.cornell.mannlib.vitro.webapp.search.solr.ContextNodeFields=DEBUG
# suppress odd warnings from libraries # suppress odd warnings from libraries
log4j.logger.org.openjena.riot=FATAL log4j.logger.org.openjena.riot=FATAL

70
webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/ContextNodeFields.java
View file

@ -177,10 +177,10 @@ public class ContextNodeFields implements DocumentModifier{
objectProperties.append(" "); objectProperties.append(" ");
objectProperties.append(getPropertiesAssociatedWithContextNodes(individual.getURI())); // objectProperties.append(getPropertiesAssociatedWithContextNodes(individual.getURI()));
// objectProperties.append(getPropertiesAssociatedWithEducationalTraining(individual.getURI())); objectProperties.append(getPropertiesAssociatedWithEducationalTraining(individual.getURI()));
// objectProperties.append(" "); objectProperties.append(" ");
// properties related to core:EducationalTraining // properties related to core:EducationalTraining
@ -197,11 +197,11 @@ public class ContextNodeFields implements DocumentModifier{
// objectProperties.append(" "); // objectProperties.append(" ");
// //
// //
// objectProperties.append(getPropertiesAssociatedWithRole(individual.getURI())); objectProperties.append(getPropertiesAssociatedWithRole(individual.getURI()));
// objectProperties.append(" "); objectProperties.append(" ");
// objectProperties.append(getPropertiesAssociatedWithPosition(individual.getURI())); objectProperties.append(getPropertiesAssociatedWithPosition(individual.getURI()));
// objectProperties.append(" "); objectProperties.append(" ");
//properties related to core:Position //properties related to core:Position
// objectProperties.append(getHRJobTitle(individual.getURI())); // objectProperties.append(getHRJobTitle(individual.getURI()));
@ -219,8 +219,8 @@ public class ContextNodeFields implements DocumentModifier{
// objectProperties.append(getInvolvedOrganizationName(individual.getURI())); // objectProperties.append(getInvolvedOrganizationName(individual.getURI()));
// objectProperties.append(" "); // objectProperties.append(" ");
// objectProperties.append(getPropertiesAssociatedWithRelationship(individual.getURI())); objectProperties.append(getPropertiesAssociatedWithRelationship(individual.getURI()));
// objectProperties.append(" "); objectProperties.append(" ");
//properties related to core:Relationship //properties related to core:Relationship
// objectProperties.append(getLinkedAuthor(individual.getURI())); // objectProperties.append(getLinkedAuthor(individual.getURI()));
@ -235,8 +235,8 @@ public class ContextNodeFields implements DocumentModifier{
// objectProperties.append(getDegreeCandidacy(individual.getURI())); // objectProperties.append(getDegreeCandidacy(individual.getURI()));
// objectProperties.append(" "); // objectProperties.append(" ");
// objectProperties.append(getPropertiesAssociatedWithAwardReceipt(individual.getURI())); objectProperties.append(getPropertiesAssociatedWithAwardReceipt(individual.getURI()));
// objectProperties.append(" "); objectProperties.append(" ");
//properties related to core:AwardReceipt //properties related to core:AwardReceipt
// objectProperties.append(getAwardConferredBy(individual.getURI())); // objectProperties.append(getAwardConferredBy(individual.getURI()));
@ -251,12 +251,12 @@ public class ContextNodeFields implements DocumentModifier{
} }
if(IndividualToSolrDocument.superClassNames.contains("InformationResource")){ if(IndividualToSolrDocument.superClassNames.contains("InformationResource")){
//targetField.addValue(" " + getPropertiesAssociatedWithInformationResource(individual.getURI()), targetField.getBoost()); targetField.addValue(" " + getPropertiesAssociatedWithInformationResource(individual.getURI()), targetField.getBoost());
//properties related to core:InformationResource //properties related to core:InformationResource
targetField.addValue(" " + getLinkedAuthorandLinkedInformationResource(individual.getURI()), targetField.getBoost()); // targetField.addValue(" " + getLinkedAuthorandLinkedInformationResource(individual.getURI()), targetField.getBoost());
targetField.addValue(" " + getFeatures(individual.getURI()), targetField.getBoost()); // targetField.addValue(" " + getFeatures(individual.getURI()), targetField.getBoost());
targetField.addValue(" " + getEditor(individual.getURI()), targetField.getBoost()); // targetField.addValue(" " + getEditor(individual.getURI()), targetField.getBoost());
targetField.addValue(" " + getSubjectAreaAndResearchAreaOf(individual.getURI()), targetField.getBoost()); // targetField.addValue(" " + getSubjectAreaAndResearchAreaOf(individual.getURI()), targetField.getBoost());
} }
field.addValue(objectProperties, field.getBoost()); field.addValue(objectProperties, field.getBoost());
@ -571,10 +571,9 @@ public class ContextNodeFields implements DocumentModifier{
+ " } ORDER BY ?PositionLabel "; + " } ORDER BY ?PositionLabel ";
Query sparqlQuery = QueryFactory.create(thisQuery, Syntax.syntaxARQ); Query sparqlQuery = QueryFactory.create(thisQuery, Syntax.syntaxARQ);
fullModel.enterCriticalSection(Lock.READ); dataset.getLock().enterCriticalSection(Lock.READ);
try{ try{
QueryExecution qExec = QueryExecutionFactory.create(sparqlQuery, fullModel, initialBinding); QueryExecution qExec = QueryExecutionFactory.create(sparqlQuery, dataset, initialBinding);
try{ try{
ResultSet results = qExec.execSelect(); ResultSet results = qExec.execSelect();
@ -632,7 +631,7 @@ public class ContextNodeFields implements DocumentModifier{
qExec.close(); qExec.close();
} }
}finally{ }finally{
fullModel.leaveCriticalSection(); dataset.getLock().leaveCriticalSection();
} }
return propertyValues.toString(); return propertyValues.toString();
@ -851,10 +850,10 @@ public class ContextNodeFields implements DocumentModifier{
+ " } "; + " } ";
Query sparqlQuery = QueryFactory.create(thisQuery, Syntax.syntaxARQ); Query sparqlQuery = QueryFactory.create(thisQuery, Syntax.syntaxARQ);
fullModel.enterCriticalSection(Lock.READ); dataset.getLock().enterCriticalSection(Lock.READ);
try{ try{
QueryExecution qExec = QueryExecutionFactory.create(sparqlQuery, fullModel, initialBinding); QueryExecution qExec = QueryExecutionFactory.create(sparqlQuery, dataset, initialBinding);
try{ try{
ResultSet results = qExec.execSelect(); ResultSet results = qExec.execSelect();
@ -898,7 +897,7 @@ public class ContextNodeFields implements DocumentModifier{
qExec.close(); qExec.close();
} }
}finally{ }finally{
fullModel.leaveCriticalSection(); dataset.getLock().leaveCriticalSection();
} }
return propertyValues.toString(); return propertyValues.toString();
@ -1069,10 +1068,10 @@ public class ContextNodeFields implements DocumentModifier{
+ " } ORDER BY ?AwardReceiptLabel"; + " } ORDER BY ?AwardReceiptLabel";
Query sparqlQuery = QueryFactory.create(thisQuery, Syntax.syntaxARQ); Query sparqlQuery = QueryFactory.create(thisQuery, Syntax.syntaxARQ);
fullModel.enterCriticalSection(Lock.READ); dataset.getLock().enterCriticalSection(Lock.READ);
try{ try{
QueryExecution qExec = QueryExecutionFactory.create(sparqlQuery, fullModel, initialBinding); QueryExecution qExec = QueryExecutionFactory.create(sparqlQuery, dataset, initialBinding);
try{ try{
ResultSet results = qExec.execSelect(); ResultSet results = qExec.execSelect();
@ -1116,7 +1115,7 @@ public class ContextNodeFields implements DocumentModifier{
qExec.close(); qExec.close();
} }
}finally{ }finally{
fullModel.leaveCriticalSection(); dataset.getLock().leaveCriticalSection();
} }
return propertyValues.toString(); return propertyValues.toString();
@ -1140,10 +1139,10 @@ public class ContextNodeFields implements DocumentModifier{
+ " } ORDER BY ?OrganizationLabel "; + " } ORDER BY ?OrganizationLabel ";
Query sparqlQuery = QueryFactory.create(thisQuery, Syntax.syntaxARQ); Query sparqlQuery = QueryFactory.create(thisQuery, Syntax.syntaxARQ);
fullModel.enterCriticalSection(Lock.READ); dataset.getLock().enterCriticalSection(Lock.READ);
try{ try{
QueryExecution qExec = QueryExecutionFactory.create(sparqlQuery, fullModel, initialBinding); QueryExecution qExec = QueryExecutionFactory.create(sparqlQuery, dataset, initialBinding);
try{ try{
ResultSet results = qExec.execSelect(); ResultSet results = qExec.execSelect();
@ -1166,7 +1165,7 @@ public class ContextNodeFields implements DocumentModifier{
qExec.close(); qExec.close();
} }
}finally{ }finally{
fullModel.leaveCriticalSection(); dataset.getLock().leaveCriticalSection();
} }
return propertyValues.toString(); return propertyValues.toString();
@ -1404,10 +1403,10 @@ public class ContextNodeFields implements DocumentModifier{
+"}"; +"}";
Query sparqlQuery = QueryFactory.create(thisQuery, Syntax.syntaxARQ); Query sparqlQuery = QueryFactory.create(thisQuery, Syntax.syntaxARQ);
fullModel.enterCriticalSection(Lock.READ); dataset.getLock().enterCriticalSection(Lock.READ);
try{ try{
QueryExecution qExec = QueryExecutionFactory.create(sparqlQuery, fullModel, initialBinding); QueryExecution qExec = QueryExecutionFactory.create(sparqlQuery, dataset, initialBinding);
try{ try{
ResultSet results = qExec.execSelect(); ResultSet results = qExec.execSelect();
@ -1458,7 +1457,7 @@ public class ContextNodeFields implements DocumentModifier{
qExec.close(); qExec.close();
} }
}finally{ }finally{
fullModel.leaveCriticalSection(); dataset.getLock().leaveCriticalSection();
} }
return propertyValues.toString(); return propertyValues.toString();
@ -1708,10 +1707,9 @@ public class ContextNodeFields implements DocumentModifier{
+"}"; +"}";
Query sparqlQuery = QueryFactory.create(thisQuery, Syntax.syntaxARQ); Query sparqlQuery = QueryFactory.create(thisQuery, Syntax.syntaxARQ);
fullModel.enterCriticalSection(Lock.READ); dataset.getLock().enterCriticalSection(Lock.READ);
try{ try{
QueryExecution qExec = QueryExecutionFactory.create(sparqlQuery, fullModel, initialBinding); QueryExecution qExec = QueryExecutionFactory.create(sparqlQuery, dataset, initialBinding);
try{ try{
ResultSet results = qExec.execSelect(); ResultSet results = qExec.execSelect();
@ -1769,7 +1767,7 @@ public class ContextNodeFields implements DocumentModifier{
qExec.close(); qExec.close();
} }
}finally{ }finally{
fullModel.leaveCriticalSection(); dataset.getLock().leaveCriticalSection();
} }
return propertyValues.toString(); return propertyValues.toString();