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

vivo 638 fixing query for existing interval value to utilize variable for object so editing works correctly

Browse source
This commit is contained in:
hudajkhan 2013-12-10 15:41:45 -05:00
parent 46b9340655
commit 8a490c6125
3 changed files with 58 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

16
webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/DateTimeWithPrecisionVTwo.java
View file

@ -167,9 +167,18 @@ public class DateTimeWithPrecisionVTwo extends BaseEditElementVTwo {
DateTime value = getTimeValue(editConfig,editSub); DateTime value = getTimeValue(editConfig,editSub);
/* This is the case where there is a precision so there should be a datetime */ /* This is the case where there is a precision so there should be a datetime */
if( value == null ) if( value == null ) {
log.debug("Field " + getFieldName() + " has precision " + precisionUri //If there is no value, then this is an error condition
+ " but the date time is " + value); log.error("Field " + getFieldName() + " has precision " + precisionUri
+ " but the date time value is null ");
map.put("year", "");
map.put("month", "");
map.put("day", "");
map.put("hour", "");
map.put("minute", "");
map.put("second", "") ;
} else {
/* only put the values in the map for ones which are significant based on the precision */ /* only put the values in the map for ones which are significant based on the precision */
if( existingPrec.ordinal() >= VitroVocabulary.Precision.SECOND.ordinal() ) if( existingPrec.ordinal() >= VitroVocabulary.Precision.SECOND.ordinal() )
@ -202,6 +211,7 @@ public class DateTimeWithPrecisionVTwo extends BaseEditElementVTwo {
else else
map.put("year", ""); map.put("year", "");
} }
}
return map; return map;
} }

19
webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DateTimeIntervalFormGenerator.java
View file

@ -70,8 +70,7 @@ public class DateTimeIntervalFormGenerator extends
"startField-value", existingStartDateQuery); "startField-value", existingStartDateQuery);
conf.addSparqlForExistingLiteral( conf.addSparqlForExistingLiteral(
"endField-value", existingEndDateQuery); "endField-value", existingEndDateQuery);
conf.addSparqlForExistingUris(
getNodeVar(), existingIntervalNodeQuery);
conf.addSparqlForExistingUris("startNode", existingStartNodeQuery); conf.addSparqlForExistingUris("startNode", existingStartNodeQuery);
conf.addSparqlForExistingUris("endNode", existingEndNodeQuery); conf.addSparqlForExistingUris("endNode", existingEndNodeQuery);
conf.addSparqlForExistingUris( conf.addSparqlForExistingUris(
@ -115,7 +114,7 @@ public class DateTimeIntervalFormGenerator extends
final String existingStartDateQuery = final String existingStartDateQuery =
"SELECT ?existingDateStart WHERE { \n" + "SELECT ?existingDateStart WHERE { \n" +
"?subject <" + getToDateTimeIntervalPredicate() + "> ?existingIntervalNode . \n" + "?subject <" + getToDateTimeIntervalPredicate() + "> " + getNodeN3Var() + " . \n" +
getNodeN3Var() + " a <" + intervalType + "> . \n" + getNodeN3Var() + " a <" + intervalType + "> . \n" +
getNodeN3Var() + " <" + intervalToStart + "> ?startNode . \n" + getNodeN3Var() + " <" + intervalToStart + "> ?startNode . \n" +
"?startNode a <" + dateTimeValueType + "> . \n" + "?startNode a <" + dateTimeValueType + "> . \n" +
@ -123,34 +122,30 @@ public class DateTimeIntervalFormGenerator extends
final String existingEndDateQuery = final String existingEndDateQuery =
"SELECT ?existingEndDate WHERE { \n" + "SELECT ?existingEndDate WHERE { \n" +
"?subject <" + getToDateTimeIntervalPredicate() + "> ?existingIntervalNode . \n" + "?subject <" + getToDateTimeIntervalPredicate() + "> " + getNodeN3Var() + " . \n" +
getNodeN3Var() + " a <" + intervalType + "> . \n" + getNodeN3Var() + " a <" + intervalType + "> . \n" +
getNodeN3Var() + " <" + intervalToEnd + "> ?endNode . \n" + getNodeN3Var() + " <" + intervalToEnd + "> ?endNode . \n" +
"?endNode a <" + dateTimeValueType + "> . \n " + "?endNode a <" + dateTimeValueType + "> . \n " +
"?endNode <" + dateTimeValue + "> ?existingEndDate . }"; "?endNode <" + dateTimeValue + "> ?existingEndDate . }";
final String existingIntervalNodeQuery =
"SELECT ?existingIntervalNode WHERE { \n" +
"?subject <" + getToDateTimeIntervalPredicate() + "> ?existingIntervalNode . \n" +
"?existingIntervalNode a <" + intervalType + "> . }";
final String existingStartNodeQuery = final String existingStartNodeQuery =
"SELECT ?existingStartNode WHERE { \n" + "SELECT ?existingStartNode WHERE { \n" +
"?subject <" + getToDateTimeIntervalPredicate() + "> ?existingIntervalNode . \n" + "?subject <" + getToDateTimeIntervalPredicate() + "> " + getNodeN3Var() + " . \n" +
getNodeN3Var() + " a <" + intervalType + "> . \n" + getNodeN3Var() + " a <" + intervalType + "> . \n" +
getNodeN3Var() + " <" + intervalToStart + "> ?existingStartNode . \n" + getNodeN3Var() + " <" + intervalToStart + "> ?existingStartNode . \n" +
"?existingStartNode a <" + dateTimeValueType + "> .} "; "?existingStartNode a <" + dateTimeValueType + "> .} ";
final String existingEndNodeQuery = final String existingEndNodeQuery =
"SELECT ?existingEndNode WHERE { \n" + "SELECT ?existingEndNode WHERE { \n" +
"?subject <" + getToDateTimeIntervalPredicate() + "> ?existingIntervalNode . \n" + "?subject <" + getToDateTimeIntervalPredicate() + "> " + getNodeN3Var() + " . \n" +
getNodeN3Var() + " a <" + intervalType + "> . \n" + getNodeN3Var() + " a <" + intervalType + "> . \n" +
getNodeN3Var() + " <" + intervalToEnd + "> ?existingEndNode . \n" + getNodeN3Var() + " <" + intervalToEnd + "> ?existingEndNode . \n" +
"?existingEndNode a <" + dateTimeValueType + "> .} "; "?existingEndNode a <" + dateTimeValueType + "> .} ";
final String existingStartPrecisionQuery = final String existingStartPrecisionQuery =
"SELECT ?existingStartPrecision WHERE { \n" + "SELECT ?existingStartPrecision WHERE { \n" +
"?subject <" + getToDateTimeIntervalPredicate() + "> ?existingIntervalNode . \n" + "?subject <" + getToDateTimeIntervalPredicate() + "> " + getNodeN3Var() + " . \n" +
getNodeN3Var() + " a <" + intervalType + "> . \n" + getNodeN3Var() + " a <" + intervalType + "> . \n" +
getNodeN3Var() + " <" + intervalToStart + "> ?startNode . \n" + getNodeN3Var() + " <" + intervalToStart + "> ?startNode . \n" +
"?startNode a <" + dateTimeValueType + "> . \n" + "?startNode a <" + dateTimeValueType + "> . \n" +
@ -158,7 +153,7 @@ public class DateTimeIntervalFormGenerator extends
final String existingEndPrecisionQuery = final String existingEndPrecisionQuery =
"SELECT ?existingEndPrecision WHERE { \n" + "SELECT ?existingEndPrecision WHERE { \n" +
"?subject <" + getToDateTimeIntervalPredicate() + "> ?existingIntervalNode . \n" + "?subject <" + getToDateTimeIntervalPredicate() + "> " + getNodeN3Var() + " . \n" +
getNodeN3Var() + " a <" + intervalType + "> . \n" + getNodeN3Var() + " a <" + intervalType + "> . \n" +
getNodeN3Var() + " <" + intervalToEnd + "> ?endNode . \n" + getNodeN3Var() + " <" + intervalToEnd + "> ?endNode . \n" +
"?endNode a <" + dateTimeValueType + "> . \n" + "?endNode a <" + dateTimeValueType + "> . \n" +

20
webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DateTimeValueFormGenerator.java
View file

@ -46,7 +46,7 @@ public class DateTimeValueFormGenerator extends BaseEditConfigurationGenerator
conf.setVarNameForSubject("subject"); conf.setVarNameForSubject("subject");
conf.setVarNameForPredicate("toDateTimeValue"); conf.setVarNameForPredicate("toDateTimeValue");
conf.setVarNameForObject("valueNode"); conf.setVarNameForObject("valueNode");
//Value node value will be in scope if we have an object uri that exists for editing
conf.setN3Optional(Arrays.asList(getN3ForValue())); conf.setN3Optional(Arrays.asList(getN3ForValue()));
conf.addNewResource("valueNode", DEFAULT_NS_FOR_NEW_RESOURCE); conf.addNewResource("valueNode", DEFAULT_NS_FOR_NEW_RESOURCE);
@ -55,7 +55,6 @@ public class DateTimeValueFormGenerator extends BaseEditConfigurationGenerator
"dateTimeField-value", getExistingDateTimeValueQuery()); "dateTimeField-value", getExistingDateTimeValueQuery());
conf.addSparqlForExistingUris( conf.addSparqlForExistingUris(
"dateTimeField-precision", getExistingPrecisionQuery()); "dateTimeField-precision", getExistingPrecisionQuery());
conf.addSparqlForExistingUris("valueNode", getExistingNodeQuery());
FieldVTwo dateTimeField = new FieldVTwo().setName(this.getDateTimeFieldName()); FieldVTwo dateTimeField = new FieldVTwo().setName(this.getDateTimeFieldName());
dateTimeField.setEditElement(new DateTimeWithPrecisionVTwo(dateTimeField, dateTimeField.setEditElement(new DateTimeWithPrecisionVTwo(dateTimeField,
@ -84,23 +83,18 @@ public class DateTimeValueFormGenerator extends BaseEditConfigurationGenerator
protected String getExistingDateTimeValueQuery () { protected String getExistingDateTimeValueQuery () {
return "SELECT ?existingDateTimeValue WHERE { \n" + return "SELECT ?existingDateTimeValue WHERE { \n" +
"?subject <" + this.getToDateTimeValuePredicate() + "> ?existingValueNode . \n" + "?subject <" + this.getToDateTimeValuePredicate() + "> ?valueNode . \n" +
"?existingValueNode a <" + valueType + "> . \n" + "?valueNode a <" + valueType + "> . \n" +
"?existingValueNode <" + dateTimeValue + "> ?existingDateTimeValue }"; "?valueNode <" + dateTimeValue + "> ?existingDateTimeValue }";
} }
protected String getExistingPrecisionQuery() { protected String getExistingPrecisionQuery() {
return "SELECT ?existingPrecision WHERE { \n" + return "SELECT ?existingPrecision WHERE { \n" +
"?subject <" + this.getToDateTimeValuePredicate() + "> ?existingValueNode . \n" + "?subject <" + this.getToDateTimeValuePredicate() + "> ?valueNode . \n" +
"?existingValueNode a <" + valueType + "> . \n" + "?valueNode a <" + valueType + "> . \n" +
"?existingValueNode <" + dateTimePrecision + "> ?existingPrecision }"; "?valueNode <" + dateTimePrecision + "> ?existingPrecision }";
} }
protected String getExistingNodeQuery() {
return "SELECT ?existingNode WHERE { \n" +
"?subject <" + this.getToDateTimeValuePredicate() + "> ?existingNode . \n" +
"?existingNode a <" + valueType + "> }";
}
public static String getNodeVar() { public static String getNodeVar() {
return "valueNode"; return "valueNode";
} }