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

NIHVIVO-1879 Combine collated and uncollated list view queries into a single query, with preprocessing to get the right version.

Browse source
This commit is contained in:
rjy7 2011-03-02 22:32:57 +00:00
parent 1ac5eb13c8
commit 896c6f157c
3 changed files with 47 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel.java
View file

@ -22,12 +22,12 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestActionConstants;
import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAction;
import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.AddObjectPropStmt;
import edu.cornell.mannlib.vitro.webapp.beans.DataProperty;
import edu.cornell.mannlib.vitro.webapp.beans.Individual;
import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
import edu.cornell.mannlib.vitro.webapp.beans.Property;
@ -321,10 +321,10 @@ public abstract class ObjectPropertyTemplateModel extends PropertyTemplateModel
private static final String DEFAULT_CONFIG_FILE_NAME = "listViewConfig-default.xml";
private static final String NODE_NAME_QUERY_CONSTRUCT = "query-construct";
private static final String NODE_NAME_QUERY_BASE = "query-base";
private static final String NODE_NAME_QUERY_COLLATED = "query-collated";
private static final String NODE_NAME_QUERY_SELECT = "query-select";
private static final String NODE_NAME_TEMPLATE = "template";
private static final String NODE_NAME_POSTPROCESSOR = "postprocessor";
private static final String NODE_NAME_COLLATION_FRAGMENT = "collation-fragment";
/* NB The default post-processor is not the same as the post-processor for the default view. The latter
* actually defines its own post-processor, whereas the default post-processor is used for custom views
@ -427,17 +427,13 @@ public abstract class ObjectPropertyTemplateModel extends PropertyTemplateModel
db = dbf.newDocumentBuilder();
Document doc = db.parse(configFilePath);
String propertyUri = op.getURI();
// Required values
String queryNodeName =
// Don't test op.getCollateBySubclass(), since if creating a CollatedObjectPropertyTemplateModel failed,
// we now want to create an UncollatedObjectPropertyTemplateModel
(ObjectPropertyTemplateModel.this instanceof CollatedObjectPropertyTemplateModel) ?
NODE_NAME_QUERY_COLLATED : NODE_NAME_QUERY_BASE;
log.debug("Using query element " + queryNodeName + " for object property " + propertyUri);
selectQuery = getConfigValue(doc, queryNodeName, propertyUri);
selectQuery = getSelectQuery(doc, propertyUri);
templateName = getConfigValue(doc, NODE_NAME_TEMPLATE, propertyUri);
// Optional values
constructQueries = getConfigValues(doc, NODE_NAME_QUERY_CONSTRUCT, propertyUri);
String postprocessorName = getConfigValue(doc, NODE_NAME_POSTPROCESSOR, propertyUri);
@ -458,10 +454,35 @@ public abstract class ObjectPropertyTemplateModel extends PropertyTemplateModel
} catch (Exception e) {
log.error("Error processing config file " + configFilePath, e);
// What should we do here?
}
}
private String getSelectQuery(Document doc, String propertyUri) {
Node selectQueryNode = doc.getElementsByTagName(NODE_NAME_QUERY_SELECT).item(0);
String value = null;
if (selectQueryNode != null) {
boolean removeCollationFragments = ObjectPropertyTemplateModel.this instanceof UncollatedObjectPropertyTemplateModel;
NodeList children = selectQueryNode.getChildNodes();
int childCount = children.getLength();
value = "";
for (int i = 0; i < childCount; i++) {
Node node = children.item(i);
if (node.getNodeName().equals(NODE_NAME_COLLATION_FRAGMENT)) {
if (removeCollationFragments) {
continue;
}
value += node.getChildNodes().item(0).getNodeValue();
} else {
value += node.getNodeValue();
}
}
log.debug("Found config parameter " + NODE_NAME_QUERY_SELECT + " for object property " + propertyUri + " with value " + value);
} else {
log.error("No value found for config parameter " + NODE_NAME_QUERY_SELECT + " for object property " + propertyUri);
}
return value;
}
private void getPostProcessor(String name, WebappDaoFactory wdf) throws Exception {
Class<?> postprocessorClass = Class.forName(name);
Constructor<?> constructor = postprocessorClass.getConstructor(ObjectPropertyTemplateModel.class, WebappDaoFactory.class);
@ -469,11 +490,10 @@ public abstract class ObjectPropertyTemplateModel extends PropertyTemplateModel
}
private String getConfigValue(Document doc, String nodeName, String propertyUri) {
NodeList nodes = doc.getElementsByTagName(nodeName);
Element element = (Element) nodes.item(0);
Node node = doc.getElementsByTagName(nodeName).item(0);
String value = null;
if (element != null) {
value = element.getChildNodes().item(0).getNodeValue();
if (node != null) {
value = node.getChildNodes().item(0).getNodeValue();
log.debug("Found config parameter " + nodeName + " for object property " + propertyUri + " with value " + value);
} else {
log.debug("No value found for config parameter " + nodeName + " for object property " + propertyUri);
@ -488,8 +508,8 @@ public abstract class ObjectPropertyTemplateModel extends PropertyTemplateModel
if (nodeCount > 0) {
values = new HashSet<String>(nodeCount);
for (int i = 0; i < nodeCount; i++) {
Element element = (Element) nodes.item(i);
String value = element.getChildNodes().item(0).getNodeValue();
Node node = nodes.item(i);
String value = node.getChildNodes().item(0).getNodeValue();
values.add(value);
log.debug("Found config parameter " + nodeName + " for object property " + propertyUri + " with value " + value);
}
@ -518,7 +538,7 @@ public abstract class ObjectPropertyTemplateModel extends PropertyTemplateModel
public String getType() {
return TYPE;
}
public String getTemplate() {
return config.templateName;
}

22
webapp/web/config/listViewConfig-default.xml
View file

@ -6,30 +6,20 @@
See guidelines in vitro/doc/list_view_configuration_guidelines.txt -->
<list-view-config>
<query-base>
PREFIX vitro: &lt;http://vitro.mannlib.cornell.edu/ns/vitro/0.7#&gt;
PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
SELECT ?object ?name ?moniker WHERE {
?subject ?property ?object
OPTIONAL { ?object rdfs:label ?name }
OPTIONAL { ?object vitro:moniker ?moniker }
} ORDER BY ?name ?object
</query-base>
<query-collated>
<query-select>
PREFIX vitro: &lt;http://vitro.mannlib.cornell.edu/ns/vitro/0.7#&gt;
PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
PREFIX afn: &lt;http://jena.hpl.hp.com/ARQ/function#&gt;
SELECT ?subclass ?object ?name ?moniker {
SELECT <collation-fragment> ?subclass </collation-fragment>
?object ?name ?moniker {
?subject ?property ?object
OPTIONAL { ?object a ?subclass }
<collation-fragment> OPTIONAL { ?object a ?subclass } </collation-fragment>
OPTIONAL { ?object rdfs:label ?name }
OPTIONAL { ?object vitro:moniker ?moniker }
FILTER ( afn:namespace(?subclass) != "http://vitro.mannlib.cornell.edu/ns/vitro/0.7#" )
} ORDER BY ?subclass ?name ?object
</query-collated>
} ORDER BY <collation-fragment> ?subclass </collation-fragment> ?name ?object
</query-select>
<query-construct>
PREFIX vitro: &lt;http://vitro.mannlib.cornell.edu/ns/vitro/0.7#&gt;

4
webapp/web/config/listViewConfig-vitroLink.xml
View file

@ -6,7 +6,7 @@
See guidelines in vitro/doc/list_view_configuration_guidelines.txt -->
<list-view-config>
<query-base>
<query-select>
PREFIX vitro: &lt;http://vitro.mannlib.cornell.edu/ns/vitro/0.7#&gt;
PREFIX afn: &lt;http://jena.hpl.hp.com/ARQ/function#&gt;
@ -19,7 +19,7 @@
OPTIONAL { ?link vitro:linkURL ?url }
OPTIONAL { ?link vitro:linkDisplayRank ?rank }
} ORDER BY ?rank
</query-base>
</query-select>
<query-construct>
CONSTRUCT {