From 43c47d0a558092ee28f15c544cd64a8d82c82d50 Mon Sep 17 00:00:00 2001 From: brianjlowe Date: Tue, 27 Aug 2013 15:46:15 -0400 Subject: [PATCH] fixes bug in list view support for domain-side qualification --- .../mannlib/vitro/webapp/dao/jena/ObjectPropertyDaoJena.java | 2 +- .../vitro/webapp/dao/jena/ObjectPropertyStatementDaoJena.java | 4 ++++ .../web/templatemodels/individual/GroupedPropertyList.java | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) 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 ba0766626..8c4dc5b25 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 @@ -902,7 +902,7 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp protected static final String LIST_VIEW_CONFIG_FILE_QUERY_STRING = "PREFIX display: \n" + "PREFIX config: \n" + - "SELECT ?property ?range ?filename WHERE { \n" + + "SELECT ?property ?range ?domain ?filename WHERE { \n" + " { ?property display:listViewConfigFile ?filename \n" + " } UNION { \n" + " ?configuration config:listViewConfigFile ?filename . \n " + diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyStatementDaoJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyStatementDaoJena.java index 289e10822..7b754f465 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyStatementDaoJena.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyStatementDaoJena.java @@ -279,6 +279,10 @@ public class ObjectPropertyStatementDaoJena extends JenaBaseDao implements Objec Model constructedModel = constructModelForSelectQueries( subjectUri, propertyUri, constructQueryStrings); + if(log.isDebugEnabled()) { + log.debug("Constructed model has " + constructedModel.size() + " statements."); + } + if("desc".equalsIgnoreCase( sortDirection ) ){ queryString = queryString.replaceAll(" ASC\\(", " DESC("); } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/GroupedPropertyList.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/GroupedPropertyList.java index 39ec73225..a2af46880 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/GroupedPropertyList.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/GroupedPropertyList.java @@ -80,7 +80,7 @@ public class GroupedPropertyList extends BaseTemplateModel { populatedObjectPropertyList, subject, vreq); if (log.isDebugEnabled()) { for (ObjectProperty t : additions) { - log.debug(t.getDomainPublic() + " " + t.getGroupURI()); + log.debug(t.getDomainPublic() + " " + t.getGroupURI() + " domain " + t.getDomainVClassURI()); } log.debug("Added " + additions.size() + " properties due to application configuration ontology");