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

NIHVIVO-1570 3 bugfixes and license text

Browse source
This commit is contained in:
bjl23 2010-12-22 20:23:58 +00:00
parent 4848117fc9
commit eee41c5eb6
5 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyDaoJena.java
View file

@ -67,7 +67,6 @@ public class DataPropertyDaoJena extends PropertyDaoJena implements
" GRAPH ?g { ?subject ?property ?object } \n" + " GRAPH ?g { ?subject ?property ?object } \n" +
" GRAPH ?h { ?property rdf:type owl:DatatypeProperty } \n" + " GRAPH ?h { ?property rdf:type owl:DatatypeProperty } \n" +
propertyFilters + propertyFilters +
" }\n" +
"}"; "}";
static protected Query dataPropertyQuery; static protected Query dataPropertyQuery;

1
webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyDaoJena.java
View file

@ -58,7 +58,6 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
" GRAPH ?g { ?subject ?property ?object } \n" + " GRAPH ?g { ?subject ?property ?object } \n" +
" GRAPH ?h { ?property rdf:type owl:ObjectProperty } \n" + " GRAPH ?h { ?property rdf:type owl:ObjectProperty } \n" +
propertyFilters + propertyFilters +
" }\n" +
"}"; "}";
static protected Query objectPropertyQuery; static protected Query objectPropertyQuery;

2
webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/StaticDatasetFactory.java
View file

@ -1,3 +1,5 @@
/* $This file is distributed under the terms of the license in /doc/license.txt$ */
package edu.cornell.mannlib.vitro.webapp.dao.jena; package edu.cornell.mannlib.vitro.webapp.dao.jena;
import com.hp.hpl.jena.query.Dataset; import com.hp.hpl.jena.query.Dataset;

10
webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactoryJena.java
View file

@ -121,6 +121,7 @@ public class WebappDaoFactoryJena implements WebappDaoFactory {
} }
public WebappDaoFactoryJena(OntModelSelector ontModelSelector, public WebappDaoFactoryJena(OntModelSelector ontModelSelector,
OntModelSelector baseOntModelSelector,
OntModelSelector inferenceOntModelSelector, OntModelSelector inferenceOntModelSelector,
String defaultNamespace, String defaultNamespace,
HashSet<String> nonuserNamespaces, HashSet<String> nonuserNamespaces,
@ -176,7 +177,9 @@ public class WebappDaoFactoryJena implements WebappDaoFactory {
DataSource dataset = DatasetFactory.create(); DataSource dataset = DatasetFactory.create();
dataset.addNamedModel(JenaDataSourceSetupBase.JENA_DB_MODEL, dataset.addNamedModel(JenaDataSourceSetupBase.JENA_DB_MODEL,
ontModelSelector.getFullModel()); (baseOntModelSelector != null)
? baseOntModelSelector.getFullModel()
: ontModelSelector.getFullModel());
if (inferenceOntModelSelector != null) { if (inferenceOntModelSelector != null) {
dataset.addNamedModel(JenaDataSourceSetupBase.JENA_INF_MODEL, dataset.addNamedModel(JenaDataSourceSetupBase.JENA_INF_MODEL,
inferenceOntModelSelector.getFullModel()); inferenceOntModelSelector.getFullModel());
@ -194,6 +197,7 @@ public class WebappDaoFactoryJena implements WebappDaoFactory {
String userURI){ String userURI){
this(ontModelSelector, this(ontModelSelector,
null, null,
null,
defaultNamespace, defaultNamespace,
nonuserNamespaces, nonuserNamespaces,
preferredLanguages, preferredLanguages,
@ -204,8 +208,8 @@ public class WebappDaoFactoryJena implements WebappDaoFactory {
this(ontModelSelector, defaultNamespace, nonuserNamespaces, preferredLanguages, null); this(ontModelSelector, defaultNamespace, nonuserNamespaces, preferredLanguages, null);
} }
public WebappDaoFactoryJena(OntModelSelector ontModelSelector, OntModelSelector inferenceOntModelSelector, String defaultNamespace, HashSet<String> nonuserNamespaces, String[] preferredLanguages){ public WebappDaoFactoryJena(OntModelSelector ontModelSelector, OntModelSelector baseOntModelSelector, OntModelSelector inferenceOntModelSelector, String defaultNamespace, HashSet<String> nonuserNamespaces, String[] preferredLanguages){
this(ontModelSelector, inferenceOntModelSelector, defaultNamespace, nonuserNamespaces, preferredLanguages, null); this(ontModelSelector, baseOntModelSelector, inferenceOntModelSelector, defaultNamespace, nonuserNamespaces, preferredLanguages, null);
} }
public WebappDaoFactoryJena(OntModelSelector ontModelSelector) { public WebappDaoFactoryJena(OntModelSelector ontModelSelector) {

2
webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/JenaDataSourceSetup.java
View file

@ -100,7 +100,7 @@ public class JenaDataSourceSetup extends JenaDataSourceSetupBase implements java
sce.getServletContext().setAttribute("jenaOntModel", unionModel); sce.getServletContext().setAttribute("jenaOntModel", unionModel);
WebappDaoFactory wadf = new WebappDaoFactoryJena( WebappDaoFactory wadf = new WebappDaoFactoryJena(
baseOms, inferenceOms, defaultNamespace, null, null); unionOms, baseOms, inferenceOms, defaultNamespace, null, null);
sce.getServletContext().setAttribute("webappDaoFactory",wadf); sce.getServletContext().setAttribute("webappDaoFactory",wadf);
sce.getServletContext().setAttribute("unionOntModelSelector", unionOms); sce.getServletContext().setAttribute("unionOntModelSelector", unionOms);