From 7f679af8740b7d7039510d5f31bf49fa2c408740 Mon Sep 17 00:00:00 2001 From: ryounes Date: Tue, 29 Mar 2011 14:20:54 +0000 Subject: [PATCH] Remove unneeded GRAPH variables from queries used to generate property list on individual profile page --- .../mannlib/vitro/webapp/dao/jena/DataPropertyDaoJena.java | 4 ++-- .../vitro/webapp/dao/jena/DataPropertyStatementDaoJena.java | 4 +--- .../mannlib/vitro/webapp/dao/jena/ObjectPropertyDaoJena.java | 4 ++-- 3 files changed, 5 insertions(+), 7 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 8c641c488..e9ecb77f8 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 @@ -86,8 +86,8 @@ public class DataPropertyDaoJena extends PropertyDaoJena implements protected static final String DATA_PROPERTY_QUERY_STRING = prefixes + "\n" + "SELECT DISTINCT ?property WHERE { \n" + - " GRAPH ?g1 { ?subject ?property ?object } \n" + - " GRAPH ?g2 { ?property rdf:type owl:DatatypeProperty } \n" + + " ?subject ?property ?object . \n" + + " ?property rdf:type owl:DatatypeProperty . \n" + propertyFilters + "}"; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyStatementDaoJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyStatementDaoJena.java index fa534998a..b71d9f21d 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyStatementDaoJena.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyStatementDaoJena.java @@ -44,9 +44,7 @@ public class DataPropertyStatementDaoJena extends JenaBaseDao implements DataPro protected static final String DATA_PROPERTY_VALUE_QUERY_STRING = "SELECT ?value WHERE { \n" + - " GRAPH ?g {\n" + - " ?subject ?property ?value . \n" + - " }\n" + + " ?subject ?property ?value . \n" + "}"; static protected Query dataPropertyValueQuery; 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 7e2a9240f..199bb7a21 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 @@ -80,8 +80,8 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp protected static final String OBJECT_PROPERTY_QUERY_STRING = prefixes + "\n" + "SELECT DISTINCT ?property WHERE { \n" + - " GRAPH ?g1 { ?subject ?property ?object } \n" + - " GRAPH ?g2 { ?property rdf:type owl:ObjectProperty } \n" + + " ?subject ?property ?object . \n" + + " ?property rdf:type owl:ObjectProperty . \n" + propertyFilters + "}";