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

NIHVIVO-1943 Minor refactoring (method and variable name changes)

Browse source
This commit is contained in:
rjy7 2011-01-28 15:57:08 +00:00
parent 231d9ed818
commit 922a83f512
3 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/CollatedObjectPropertyTemplateModel.java
View file

@ -56,7 +56,7 @@ public class CollatedObjectPropertyTemplateModel extends ObjectPropertyTemplateM
String subjectUri = subject.getURI(); String subjectUri = subject.getURI();
String propertyUri = op.getURI(); String propertyUri = op.getURI();
List<Map<String, String>> statementData = List<Map<String, String>> statementData =
opDao.getObjectPropertyStatementsForIndividualByProperty(subjectUri, propertyUri, getQueryString()); opDao.getObjectPropertyStatementsForIndividualByProperty(subjectUri, propertyUri, getSelectQuery());
/* Apply post-processing */ /* Apply post-processing */
postprocess(statementData, wdf); postprocess(statementData, wdf);

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

@ -69,7 +69,7 @@ public abstract class ObjectPropertyTemplateModel extends PropertyTemplateModel
Pattern.compile("\\?" + KEY_SUBJECT + "\\s+\\?" + KEY_PROPERTY + "\\s+\\?(\\w+)"); Pattern.compile("\\?" + KEY_SUBJECT + "\\s+\\?" + KEY_PROPERTY + "\\s+\\?(\\w+)");
protected static enum ConfigError { protected static enum ConfigError {
NO_QUERY("Missing query specification"), NO_SELECT_QUERY("Missing select query specification"),
NO_SUBCLASS_SELECT("Query does not select a subclass variable"), NO_SUBCLASS_SELECT("Query does not select a subclass variable"),
NO_SUBCLASS_ORDER_BY("Query does not sort first by subclass variable"), NO_SUBCLASS_ORDER_BY("Query does not sort first by subclass variable"),
NO_TEMPLATE("Missing template specification"), NO_TEMPLATE("Missing template specification"),
@ -127,17 +127,17 @@ public abstract class ObjectPropertyTemplateModel extends PropertyTemplateModel
protected ConfigError checkQuery(String queryString) { protected ConfigError checkQuery(String queryString) {
if (StringUtils.isBlank(queryString)) { if (StringUtils.isBlank(queryString)) {
return ConfigError.NO_QUERY; return ConfigError.NO_SELECT_QUERY;
} }
return null; return null;
} }
protected String getQueryString() { protected String getSelectQuery() {
return config.queryString; return config.selectQuery;
} }
protected Set<String> getConstructQueryStrings() { protected Set<String> getConstructQueries() {
return config.constructQueryStrings; return config.constructQueries;
} }
protected boolean hasDefaultListView() { protected boolean hasDefaultListView() {
@ -163,7 +163,7 @@ public abstract class ObjectPropertyTemplateModel extends PropertyTemplateModel
log.debug("Using default list view for property " + propertyUri + log.debug("Using default list view for property " + propertyUri +
", so query object = '" + object + "'"); ", so query object = '" + object + "'");
} else { } else {
String queryString = getQueryString(); String queryString = getSelectQuery();
Matcher m = SUBJECT_PROPERTY_OBJECT_PATTERN.matcher(queryString); Matcher m = SUBJECT_PROPERTY_OBJECT_PATTERN.matcher(queryString);
if (m.find()) { if (m.find()) {
object = m.group(1); object = m.group(1);
@ -340,7 +340,7 @@ public abstract class ObjectPropertyTemplateModel extends PropertyTemplateModel
* effectively turns off this post-processing.) * effectively turns off this post-processing.)
*/ */
protected void moveNullEndDateTimesToTop(List<ObjectPropertyStatementTemplateModel> statements) { protected void moveNullEndDateTimesToTop(List<ObjectPropertyStatementTemplateModel> statements) {
String queryString = getQueryString(); String queryString = getSelectQuery();
Matcher m = ORDER_BY_END_DATE_TIME_PATTERN.matcher(queryString); Matcher m = ORDER_BY_END_DATE_TIME_PATTERN.matcher(queryString);
if ( ! m.find() ) { if ( ! m.find() ) {
return; return;
@ -384,8 +384,8 @@ public abstract class ObjectPropertyTemplateModel extends PropertyTemplateModel
private static final String NODE_NAME_POSTPROCESSOR = "postprocessor"; private static final String NODE_NAME_POSTPROCESSOR = "postprocessor";
private boolean isDefaultConfig; private boolean isDefaultConfig;
private Set<String> constructQueryStrings; private Set<String> constructQueries;
private String queryString; private String selectQuery;
private String templateName; private String templateName;
private String postprocessor; private String postprocessor;
@ -442,13 +442,13 @@ public abstract class ObjectPropertyTemplateModel extends PropertyTemplateModel
private ConfigError checkConfiguration(VitroRequest vreq) { private ConfigError checkConfiguration(VitroRequest vreq) {
ConfigError error = ObjectPropertyTemplateModel.this.checkQuery(queryString); ConfigError error = ObjectPropertyTemplateModel.this.checkQuery(selectQuery);
if (error != null) { if (error != null) {
return error; return error;
} }
if (StringUtils.isBlank(queryString)) { if (StringUtils.isBlank(selectQuery)) {
return ConfigError.NO_QUERY; return ConfigError.NO_SELECT_QUERY;
} }
if ( StringUtils.isBlank(templateName)) { if ( StringUtils.isBlank(templateName)) {
@ -483,12 +483,12 @@ public abstract class ObjectPropertyTemplateModel extends PropertyTemplateModel
// we now want to create an UncollatedObjectPropertyTemplateModel // we now want to create an UncollatedObjectPropertyTemplateModel
(ObjectPropertyTemplateModel.this instanceof CollatedObjectPropertyTemplateModel) ? NODE_NAME_QUERY_COLLATED : NODE_NAME_QUERY_BASE; (ObjectPropertyTemplateModel.this instanceof CollatedObjectPropertyTemplateModel) ? NODE_NAME_QUERY_COLLATED : NODE_NAME_QUERY_BASE;
log.debug("Using query element " + queryNodeName + " for object property " + propertyUri); log.debug("Using query element " + queryNodeName + " for object property " + propertyUri);
queryString = getConfigValue(doc, queryNodeName, propertyUri); selectQuery = getConfigValue(doc, queryNodeName, propertyUri);
templateName = getConfigValue(doc, NODE_NAME_TEMPLATE, propertyUri); templateName = getConfigValue(doc, NODE_NAME_TEMPLATE, propertyUri);
// Optional values // Optional values
postprocessor = getConfigValue(doc, NODE_NAME_POSTPROCESSOR, propertyUri); postprocessor = getConfigValue(doc, NODE_NAME_POSTPROCESSOR, propertyUri);
constructQueryStrings = getConfigValues(doc, NODE_NAME_QUERY_CONSTRUCT, propertyUri); constructQueries = getConfigValues(doc, NODE_NAME_QUERY_CONSTRUCT, propertyUri);
} catch (Exception e) { } catch (Exception e) {
log.error("Error processing config file " + configFilePath, e); log.error("Error processing config file " + configFilePath, e);

2
webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/UncollatedObjectPropertyTemplateModel.java
View file

@ -32,7 +32,7 @@ public class UncollatedObjectPropertyTemplateModel extends ObjectPropertyTemplat
String subjectUri = subject.getURI(); String subjectUri = subject.getURI();
String propertyUri = op.getURI(); String propertyUri = op.getURI();
List<Map<String, String>> statementData = List<Map<String, String>> statementData =
opDao.getObjectPropertyStatementsForIndividualByProperty(subjectUri, propertyUri, getQueryString()); opDao.getObjectPropertyStatementsForIndividualByProperty(subjectUri, propertyUri, getSelectQuery());
/* Apply postprocessing */ /* Apply postprocessing */
postprocess(statementData, wdf); postprocess(statementData, wdf);