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

vitro list views with CONSTRUCTs and improvement to null individual handling

Browse source
This commit is contained in:
bjl23 2011-01-31 21:53:24 +00:00
parent c9cf713fed
commit eb55aa694f
4 changed files with 83 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

31
webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualSDB.java
View file

@ -30,6 +30,7 @@ import com.hp.hpl.jena.query.QueryExecutionFactory;
import com.hp.hpl.jena.query.QueryFactory;
import com.hp.hpl.jena.query.QuerySolution;
import com.hp.hpl.jena.query.ResultSet;
import com.hp.hpl.jena.query.Syntax;
import com.hp.hpl.jena.rdf.model.Literal;
import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.ModelFactory;
@ -132,7 +133,6 @@ public class IndividualSDB extends IndividualImpl implements Individual {
Dataset dataset = w.getDataset();
try {
dataset.getLock().enterCriticalSection(Lock.READ);
String[] graphVars = {"?g", "?h", "?i"};
String getStatements =
"CONSTRUCT " +
"{ <"+individualURI+"> <" + RDFS.label.getURI() +
@ -140,18 +140,16 @@ public class IndividualSDB extends IndividualImpl implements Individual {
// "<"+individualURI+"> a ?type . \n" +
"<"+individualURI+"> <" + VitroVocabulary.MONIKER +
"> ?moniker \n" +
"} WHERE { GRAPH <urn:x-arq:UnionGraph> {" +
"{ \n" +
"} WHERE {" +
"{ <"+individualURI+"> <" + RDFS.label.getURI() +
"> ?ooo } \n" +
"UNION { <" +
individualURI+"> <" + VitroVocabulary.MONIKER +
"> ?moniker } \n" +
"> ?moniker \n" +
"} \n" +
// "UNION { <"
// + individualURI + "> a ?type } \n" +
// WebappDaoFactorySDB.getFilterBlock(graphVars, datasetMode) +
"} }";
"}";
model = QueryExecutionFactory.create(
QueryFactory.create(getStatements), dataset)
.execConstruct();
@ -163,7 +161,7 @@ public class IndividualSDB extends IndividualImpl implements Individual {
OntModel ontModel = ModelFactory.createOntologyModel(
OntModelSpec.OWL_MEM, model);
if (model.isEmpty()) {
if (model.isEmpty() && noTriplesFor(individualURI)) {
throw new IndividualNotFoundException();
}
@ -173,6 +171,25 @@ public class IndividualSDB extends IndividualImpl implements Individual {
this.webappDaoFactory = wadf;
}
private boolean noTriplesFor(String individualURI) {
String ask = "ASK { <" + individualURI + "> ?p ?o }";
DatasetWrapper w = getDatasetWrapper();
Dataset dataset = w.getDataset();
dataset.getLock().enterCriticalSection(Lock.READ);
try {
Query askQuery = QueryFactory.create(ask, Syntax.syntaxARQ);
QueryExecution qe = QueryExecutionFactory.create(askQuery, dataset);
try {
return !qe.execAsk();
} finally {
qe.close();
}
} finally {
dataset.getLock().leaveCriticalSection();
w.close();
}
}
private static final boolean SKIP_INITIALIZATION = true;
public IndividualSDB(String individualURI,

6
webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/BaseObjectPropertyDataPostProcessor.java
View file

@ -56,7 +56,11 @@ public abstract class BaseObjectPropertyDataPostProcessor implements
protected void addName(Map<String, String> map, String nameKey, String objectKey) {
String name = map.get(nameKey);
if (name == null) {
map.put(nameKey, getIndividual(map.get(objectKey)).getName());
// getIndividual() could return null
Individual ind = getIndividual(map.get(objectKey));
if (ind != null) {
map.put(nameKey, ind.getName());
}
}
}