From eee41c5eb6230af3ed60e7490aa8a74970a0788d Mon Sep 17 00:00:00 2001 From: bjl23 Date: Wed, 22 Dec 2010 20:23:58 +0000 Subject: [PATCH] NIHVIVO-1570 3 bugfixes and license text --- .../vitro/webapp/dao/jena/DataPropertyDaoJena.java | 1 - .../vitro/webapp/dao/jena/ObjectPropertyDaoJena.java | 1 - .../vitro/webapp/dao/jena/StaticDatasetFactory.java | 2 ++ .../vitro/webapp/dao/jena/WebappDaoFactoryJena.java | 10 +++++++--- .../webapp/servlet/setup/JenaDataSourceSetup.java | 2 +- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyDaoJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyDaoJena.java index 82f90146f..bd4900bcd 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyDaoJena.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyDaoJena.java @@ -67,7 +67,6 @@ public class DataPropertyDaoJena extends PropertyDaoJena implements " GRAPH ?g { ?subject ?property ?object } \n" + " GRAPH ?h { ?property rdf:type owl:DatatypeProperty } \n" + propertyFilters + - " }\n" + "}"; static protected Query dataPropertyQuery; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyDaoJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyDaoJena.java index cb2a55a32..5d5fe76b7 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyDaoJena.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyDaoJena.java @@ -58,7 +58,6 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp " GRAPH ?g { ?subject ?property ?object } \n" + " GRAPH ?h { ?property rdf:type owl:ObjectProperty } \n" + propertyFilters + - " }\n" + "}"; static protected Query objectPropertyQuery; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/StaticDatasetFactory.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/StaticDatasetFactory.java index 2fed71d7e..0ed683a2c 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/StaticDatasetFactory.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/StaticDatasetFactory.java @@ -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; import com.hp.hpl.jena.query.Dataset; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactoryJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactoryJena.java index dbd1a46fa..28b8ef186 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactoryJena.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactoryJena.java @@ -121,6 +121,7 @@ public class WebappDaoFactoryJena implements WebappDaoFactory { } public WebappDaoFactoryJena(OntModelSelector ontModelSelector, + OntModelSelector baseOntModelSelector, OntModelSelector inferenceOntModelSelector, String defaultNamespace, HashSet nonuserNamespaces, @@ -176,7 +177,9 @@ public class WebappDaoFactoryJena implements WebappDaoFactory { DataSource dataset = DatasetFactory.create(); dataset.addNamedModel(JenaDataSourceSetupBase.JENA_DB_MODEL, - ontModelSelector.getFullModel()); + (baseOntModelSelector != null) + ? baseOntModelSelector.getFullModel() + : ontModelSelector.getFullModel()); if (inferenceOntModelSelector != null) { dataset.addNamedModel(JenaDataSourceSetupBase.JENA_INF_MODEL, inferenceOntModelSelector.getFullModel()); @@ -194,6 +197,7 @@ public class WebappDaoFactoryJena implements WebappDaoFactory { String userURI){ this(ontModelSelector, null, + null, defaultNamespace, nonuserNamespaces, preferredLanguages, @@ -204,8 +208,8 @@ public class WebappDaoFactoryJena implements WebappDaoFactory { this(ontModelSelector, defaultNamespace, nonuserNamespaces, preferredLanguages, null); } - public WebappDaoFactoryJena(OntModelSelector ontModelSelector, OntModelSelector inferenceOntModelSelector, String defaultNamespace, HashSet nonuserNamespaces, String[] preferredLanguages){ - this(ontModelSelector, inferenceOntModelSelector, defaultNamespace, nonuserNamespaces, preferredLanguages, null); + public WebappDaoFactoryJena(OntModelSelector ontModelSelector, OntModelSelector baseOntModelSelector, OntModelSelector inferenceOntModelSelector, String defaultNamespace, HashSet nonuserNamespaces, String[] preferredLanguages){ + this(ontModelSelector, baseOntModelSelector, inferenceOntModelSelector, defaultNamespace, nonuserNamespaces, preferredLanguages, null); } public WebappDaoFactoryJena(OntModelSelector ontModelSelector) { diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/JenaDataSourceSetup.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/JenaDataSourceSetup.java index 15c4ec5e4..089b4f5c5 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/JenaDataSourceSetup.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/JenaDataSourceSetup.java @@ -100,7 +100,7 @@ public class JenaDataSourceSetup extends JenaDataSourceSetupBase implements java sce.getServletContext().setAttribute("jenaOntModel", unionModel); WebappDaoFactory wadf = new WebappDaoFactoryJena( - baseOms, inferenceOms, defaultNamespace, null, null); + unionOms, baseOms, inferenceOms, defaultNamespace, null, null); sce.getServletContext().setAttribute("webappDaoFactory",wadf); sce.getServletContext().setAttribute("unionOntModelSelector", unionOms);