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

NIHVIVO-2235 (include "context nodes" in response to linked data request) and NIHVIVO-2651 (include rdfs:label of related individuals in response to linked data request)

Browse source
This commit is contained in:
stellamit 2011-05-18 21:40:56 +00:00
parent a86480e6b7
commit 9b41389bd7
1 changed files with 49 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/IndividualController.java
View file

@ -18,6 +18,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import com.hp.hpl.jena.datatypes.TypeMapper; import com.hp.hpl.jena.datatypes.TypeMapper;
import com.hp.hpl.jena.datatypes.xsd.XSDDatatype;
import com.hp.hpl.jena.ontology.OntModel; import com.hp.hpl.jena.ontology.OntModel;
import com.hp.hpl.jena.rdf.model.Literal; import com.hp.hpl.jena.rdf.model.Literal;
import com.hp.hpl.jena.rdf.model.Model; import com.hp.hpl.jena.rdf.model.Model;
@ -25,6 +26,9 @@ import com.hp.hpl.jena.rdf.model.ModelFactory;
import com.hp.hpl.jena.rdf.model.Property; import com.hp.hpl.jena.rdf.model.Property;
import com.hp.hpl.jena.rdf.model.RDFNode; import com.hp.hpl.jena.rdf.model.RDFNode;
import com.hp.hpl.jena.rdf.model.Resource; import com.hp.hpl.jena.rdf.model.Resource;
import com.hp.hpl.jena.rdf.model.ResourceFactory;
import com.hp.hpl.jena.rdf.model.Statement;
import com.hp.hpl.jena.rdf.model.StmtIterator;
import com.hp.hpl.jena.shared.Lock; import com.hp.hpl.jena.shared.Lock;
import com.hp.hpl.jena.vocabulary.RDF; import com.hp.hpl.jena.vocabulary.RDF;
import com.hp.hpl.jena.vocabulary.RDFS; import com.hp.hpl.jena.vocabulary.RDFS;
@ -73,7 +77,10 @@ public class IndividualController extends FreemarkerHttpServlet {
put("vitro", VitroVocabulary.vitroURI); put("vitro", VitroVocabulary.vitroURI);
put("vitroPublic", VitroVocabulary.VITRO_PUBLIC); put("vitroPublic", VitroVocabulary.VITRO_PUBLIC);
}}; }};
private static final Property extendedLinkedDataProperty = ResourceFactory.createProperty(namespaces.get("vitro") + "extendedLinkedData");
private static final Literal xsdTrue = ResourceFactory.createTypedLiteral("true", XSDDatatype.XSDboolean);
private static final String TEMPLATE_INDIVIDUAL_DEFAULT = "individual.ftl"; private static final String TEMPLATE_INDIVIDUAL_DEFAULT = "individual.ftl";
private static final String TEMPLATE_HELP = "individual-help.ftl"; private static final String TEMPLATE_HELP = "individual-help.ftl";
private static Map<String,Float>qsMap; private static Map<String,Float>qsMap;
@ -329,8 +336,8 @@ public class IndividualController extends FreemarkerHttpServlet {
ontModel = (OntModel)session.getAttribute("jenaOntModel"); ontModel = (OntModel)session.getAttribute("jenaOntModel");
if( ontModel == null) if( ontModel == null)
ontModel = (OntModel)getServletContext().getAttribute("jenaOntModel"); ontModel = (OntModel)getServletContext().getAttribute("jenaOntModel");
Model newModel = getRDF(individual, ontModel, ModelFactory.createDefaultModel(), 0); Model newModel = getRDF(individual, ontModel, ModelFactory.createDefaultModel(),0);
return new RdfResponseValues(rdfFormat, newModel); return new RdfResponseValues(rdfFormat, newModel);
} }
@ -548,7 +555,6 @@ public class IndividualController extends FreemarkerHttpServlet {
return null; return null;
} }
@SuppressWarnings("unused") @SuppressWarnings("unused")
private boolean checkForSunset(VitroRequest vreq, Individual entity) { private boolean checkForSunset(VitroRequest vreq, Individual entity) {
// TODO Auto-generated method stub // TODO Auto-generated method stub
@ -591,11 +597,11 @@ public class IndividualController extends FreemarkerHttpServlet {
return "enabled".equals(property); return "enabled".equals(property);
} }
private Model getRDF(Individual entity, OntModel contextModel, Model newModel, int recurseDepth ) { private Model getRDF(Individual entity, OntModel contextModel, Model newModel, int recurseDepth) {
Resource subj = newModel.getResource(entity.getURI()); Resource subj = newModel.getResource(entity.getURI());
List<DataPropertyStatement> dstates = entity.getDataPropertyStatements(); List<DataPropertyStatement> dstates = entity.getDataPropertyStatements();
//System.out.println("data: "+dstates.size());
TypeMapper typeMapper = TypeMapper.getInstance(); TypeMapper typeMapper = TypeMapper.getInstance();
for (DataPropertyStatement ds: dstates) { for (DataPropertyStatement ds: dstates) {
Property dp = newModel.getProperty(ds.getDatapropURI()); Property dp = newModel.getProperty(ds.getDatapropURI());
@ -610,22 +616,31 @@ public class IndividualController extends FreemarkerHttpServlet {
newModel.add(newModel.createStatement(subj, dp, lit)); newModel.add(newModel.createStatement(subj, dp, lit));
} }
if( recurseDepth < 5 ){ if (recurseDepth < 5) {
List<ObjectPropertyStatement> ostates = entity.getObjectPropertyStatements(); List<ObjectPropertyStatement> ostates = entity.getObjectPropertyStatements();
for (ObjectPropertyStatement os: ostates) { for (ObjectPropertyStatement os: ostates) {
ObjectProperty objProp = os.getProperty(); ObjectProperty objProp = os.getProperty();
Property op = newModel.getProperty(os.getPropertyURI()); Property prop = newModel.getProperty(os.getPropertyURI());
Resource obj = newModel.getResource(os.getObjectURI()); Resource obj = newModel.getResource(os.getObjectURI());
newModel.add(newModel.createStatement(subj, op, obj)); newModel.add(newModel.createStatement(subj, prop, obj));
if( objProp.getStubObjectRelation() ) if ( includeInLinkedData(obj, contextModel)) {
newModel.add(getRDF(os.getObject(), contextModel, newModel, recurseDepth + 1)); newModel.add(getRDF(os.getObject(), contextModel, newModel, recurseDepth + 1));
} else {
contextModel.enterCriticalSection(Lock.READ);
try {
newModel.add(contextModel.listStatements(obj, RDFS.label, (RDFNode)null));
} finally {
contextModel.leaveCriticalSection();
}
}
} }
} }
newModel = getLabelAndTypes(entity, contextModel, newModel ); newModel = getLabelAndTypes(entity, contextModel, newModel );
return newModel; return newModel;
} }
/* Get the properties that are difficult to get via a filtered WebappDaoFactory. */ /* Get the properties that are difficult to get via a filtered WebappDaoFactory. */
private Model getLabelAndTypes(Individual entity, Model ontModel, Model newModel){ private Model getLabelAndTypes(Individual entity, Model ontModel, Model newModel){
for( VClass vclass : entity.getVClasses()){ for( VClass vclass : entity.getVClasses()){
@ -692,7 +707,27 @@ public class IndividualController extends FreemarkerHttpServlet {
return qsMap; return qsMap;
} }
// static String getAcceptedContentType(String acceptHeader,Map<String,Float>qs){ public static boolean includeInLinkedData(Resource object, Model contextModel) {
//
// } boolean retval = false;
contextModel.enterCriticalSection(Lock.READ);
try {
StmtIterator iter = contextModel.listStatements(object, RDF.type, (RDFNode)null);
while (iter.hasNext()) {
Statement stmt = iter.next();
if (stmt.getObject().isResource() && contextModel.contains(stmt.getObject().asResource(), extendedLinkedDataProperty, xsdTrue)) {
retval = true;
break;
}
}
} finally {
contextModel.leaveCriticalSection();
}
return retval;
}
} }