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

Fixing broken build.

Browse source
This commit is contained in:
bdc34 2011-01-19 20:33:19 +00:00
parent e4c873654c
commit 43167c6c5c
1 changed files with 24 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
webapp/src/edu/cornell/mannlib/vitro/webapp/edit/elements/DateTimeWithPrecision.java
View file

@ -127,7 +127,7 @@ public class DateTimeWithPrecision extends BaseEditElement {
map.put("minimumPrecision", minimumPrecision.uri()); map.put("minimumPrecision", minimumPrecision.uri());
map.put("requiredLevel", displayRequiredLevel.uri()); map.put("requiredLevel", displayRequiredLevel.uri());
String precisionUri = getExistingPrecision(editConfig,editSub); String precisionUri = getPrecision(editConfig,editSub);
VitroVocabulary.Precision existingPrec = toPrecision(precisionUri); VitroVocabulary.Precision existingPrec = toPrecision(precisionUri);
if( precisionUri != null && !"".equals(precisionUri) && existingPrec == null ){ if( precisionUri != null && !"".equals(precisionUri) && existingPrec == null ){
@ -216,22 +216,35 @@ public class DateTimeWithPrecision extends BaseEditElement {
/** /**
* Gets the currently set precision. May return null. * Gets the currently set precision. May return null.
*/ */
private String getExistingPrecision(EditConfiguration editConfig, EditSubmission editSub) { private String getPrecision(EditConfiguration editConfig, EditSubmission editSub) {
String precisionURI = editConfig.getUrisInScope().get( getPrecisionVariableName() ); if( editSub != null ){
if( precisionURI == null ){ String submittedPrecisionURI = editSub.getUrisFromForm().get( getPrecisionVariableName() );
return null; if( submittedPrecisionURI != null ){
return submittedPrecisionURI;
}
}
String existingPrecisionURI = editConfig.getUrisInScope().get( getPrecisionVariableName() );
if( existingPrecisionURI != null ){
return existingPrecisionURI;
}else{ }else{
return precisionURI; return null;
} }
} }
private DateTime getTimeValue(EditConfiguration editConfig, EditSubmission editSub) { private DateTime getTimeValue(EditConfiguration editConfig, EditSubmission editSub) {
if( editSub != null ){
Literal submittedValue = editSub.getLiteralsFromForm().get( getValueVariableName() );
if( submittedValue != null )
return new DateTime( submittedValue.getLexicalForm() );
}
Literal dtValue = editConfig.getLiteralsInScope().get( getValueVariableName() ); Literal dtValue = editConfig.getLiteralsInScope().get( getValueVariableName() );
if( dtValue == null ){ if( dtValue != null ){
return null;
}else{
return new DateTime( dtValue.getLexicalForm() ); return new DateTime( dtValue.getLexicalForm() );
} }else{
return null;
}
} }
/** /**