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

updates to submission including addition of uris/literals to form to support dynamic field addition such as in add associated concept

Browse source
This commit is contained in:
hjkhjk54 2011-11-23 22:07:25 +00:00
parent 6aec52dc1d
commit 69e9c7f261
2 changed files with 43 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/BaseEditSubmissionPreprocessorVTwo.java
View file

@ -2,9 +2,6 @@
package edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo; package edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo;
import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.EditConfiguration;
public abstract class BaseEditSubmissionPreprocessorVTwo implements public abstract class BaseEditSubmissionPreprocessorVTwo implements
EditSubmissionVTwoPreprocessor { EditSubmissionVTwoPreprocessor {

74
webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/MultiValueEditSubmission.java
View file

@ -73,19 +73,7 @@ public class MultiValueEditSubmission {
for( String var: editConfig.getUrisOnform() ){ for( String var: editConfig.getUrisOnform() ){
String[] valuesArray = queryParameters.get( var ); String[] valuesArray = queryParameters.get( var );
//String uri = null; //String uri = null;
List<String> values = (valuesArray != null) ? Arrays.asList(valuesArray) : null; addUriToForm(editConfig, var, valuesArray);
if( values != null && values.size() > 0){
//Iterate through the values and check to see if they should be added or removed from form
urisFromForm.put(var, values);
for(String uri : values) {
if( uri != null && uri.length() == 0 && editConfig.getNewResources().containsKey(var) ){
log.debug("A new resource URI will be made for var " + var + " since it was blank on the form.");
urisFromForm.remove(var);
}
}
} else {
log.debug("No value found for query parameter " + var);
}
} }
this.literalsFromForm =new HashMap<String,List<Literal>>(); this.literalsFromForm =new HashMap<String,List<Literal>>();
@ -98,25 +86,7 @@ public class MultiValueEditSubmission {
log.debug("skipping field with edit element, it should not be in literals on form list"); log.debug("skipping field with edit element, it should not be in literals on form list");
}else{ }else{
String[] valuesArray = queryParameters.get(var); String[] valuesArray = queryParameters.get(var);
List<String> valueList = (valuesArray != null) ? Arrays.asList(valuesArray) : null; addLiteralToForm(editConfig, field, var, valuesArray);
if( valueList != null && valueList.size() > 0 ) {
List<Literal> literalsArray = new ArrayList<Literal>();
//now support multiple values
for(String value:valueList) {
value = EditN3Utils.stripInvalidXMLChars(value);
//Add to array of literals corresponding to this variable
if (!StringUtils.isEmpty(value)) {
literalsArray.add(createLiteral(
value,
field.getRangeDatatypeUri(),
field.getRangeLang()));
}
}
literalsFromForm.put(var, literalsArray);
}else{
log.debug("could not find value for parameter " + var );
}
} }
} }
@ -294,4 +264,44 @@ public class MultiValueEditSubmission {
public void setEntityToReturnTo(String string) { public void setEntityToReturnTo(String string) {
entityToReturnTo = string; entityToReturnTo = string;
} }
//Added specifically to help with "dynamic" forms such as addition of concept
public void addLiteralToForm(EditConfigurationVTwo editConfig, FieldVTwo field, String var, String[] valuesArray) {
List<String> valueList = (valuesArray != null) ? Arrays.asList(valuesArray) : null;
if( valueList != null && valueList.size() > 0 ) {
List<Literal> literalsArray = new ArrayList<Literal>();
//now support multiple values
for(String value:valueList) {
value = EditN3Utils.stripInvalidXMLChars(value);
//Add to array of literals corresponding to this variable
if (!StringUtils.isEmpty(value)) {
literalsArray.add(createLiteral(
value,
field.getRangeDatatypeUri(),
field.getRangeLang()));
}
}
literalsFromForm.put(var, literalsArray);
}else{
log.debug("could not find value for parameter " + var );
}
}
//Add literal to form
//Add uri to form
public void addUriToForm(EditConfigurationVTwo editConfig, String var, String[] valuesArray) {
List<String> values = (valuesArray != null) ? Arrays.asList(valuesArray) : null;
if( values != null && values.size() > 0){
//Iterate through the values and check to see if they should be added or removed from form
urisFromForm.put(var, values);
for(String uri : values) {
if( uri != null && uri.length() == 0 && editConfig.getNewResources().containsKey(var) ){
log.debug("A new resource URI will be made for var " + var + " since it was blank on the form.");
urisFromForm.remove(var);
}
}
} else {
log.debug("No value found for query parameter " + var);
}
}
} }