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

updates for adding concepts and removing redirectToPublication.jsp

Browse source
This commit is contained in:
hjkhjk54 2011-11-29 16:36:00 +00:00
parent 9c0ab640fa
commit b8c70867e0
5 changed files with 29 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddAssociatedConceptGenerator.java
View file

@ -161,7 +161,8 @@ public class AddAssociatedConceptGenerator extends VivoBaseGenerator implements
private List<String> generateN3Required(VitroRequest vreq) {
return list(
getPrefixesString() + "\n" +
"?subject ?predicate ?conceptNode .\n"
"?subject ?predicate ?conceptNode .\n" +
"?conceptNode <" + RDF.type.getURI() + "> <http://www.w3.org/2002/07/owl#Thing> ."
);
}

3
src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/VivoBaseGenerator.java
View file

@ -39,7 +39,4 @@ public abstract class VivoBaseGenerator extends BaseEditConfigurationGenerator i
final static String orgClass ="http://xmlns.com/foaf/0.1/Organization" ;
final static String personClass = foaf + "Person";
//TODO: Define these elsewhere
final static String UMLSClass = vivoCore + "UMLS";
final static String AgrovocClass = vivoCore + "Agrovoc";
}

38
src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/AddAssociatedConceptsPreprocessor.java
View file

@ -30,7 +30,10 @@ public class AddAssociatedConceptsPreprocessor extends
private static String conceptNodeBase = "conceptNode";
private static String sourceBase = "conceptSource";
private static String labelBase = "conceptLabel";
//Also storing submission
//Also storing submission values
private static String conceptNodeValues = null;
private static String conceptLabelValues = null;
private static String conceptSourceValues = null;
private static MultiValueEditSubmission submission = null;
// String datatype
@ -46,7 +49,7 @@ public class AddAssociatedConceptsPreprocessor extends
// Get the input elements for concept node and concept label as well
// as vocab uri (which is based on thge
// For query parameters, check whether CUI
String conceptNodeValues = getConceptNodeValues();
copySubmissionValues();
if (conceptNodeValues != null) {
String[] conceptNodes = convertDelimitedStringToArray(conceptNodeValues);
@ -60,11 +63,22 @@ public class AddAssociatedConceptsPreprocessor extends
}
}
//Since we will change the uris and literals from form, we should make copies
//of the original values and store them, this will also make iterations
//and updates to the submission independent from accessing the values
private void copySubmissionValues() {
conceptLabelValues = getConceptLabelValues();
conceptNodeValues = getConceptNodeValues();
conceptSourceValues = getConceptSourceValues();
}
private void processConceptNodes(int numberConcepts) {
//There are no "new" resources b/c the concept nodes are URIs from external vocabularies
// Add N3Required
addN3Required(numberConcepts);
//Add N3 Optional as well
addN3Optional(numberConcepts);
// Add URIs on Form and Add Literals On Form
addLiteralsAndUrisOnForm(numberConcepts);
// Add fields
@ -88,13 +102,13 @@ public class AddAssociatedConceptsPreprocessor extends
}
private void addConceptNodeInputs(int numberConcepts) {
//Get the current value
String conceptNodeValues = getConceptNodeValues();
String[] conceptNodes = convertDelimitedStringToArray(conceptNodeValues);
if(conceptNodes != null && conceptNodes.length == numberConcepts) {
int i;
for(i = 1; i <= numberConcepts; i++) {
int suffix = i;
//iterate through the concept nodes converted string array
for(i = 0; i < numberConcepts; i++) {
int suffix = i + 1;
String conceptInputName = conceptNodeBase + suffix;
String[] nodeValues = new String[1];
nodeValues[0] = conceptNodes[i];
@ -110,12 +124,11 @@ public class AddAssociatedConceptsPreprocessor extends
}
private void addConceptSourceInputs(int numberConcepts) {
String conceptSourceValues = getConceptSourceValues();
String[] conceptSources = convertDelimitedStringToArray(conceptSourceValues);
if(conceptSources != null && conceptSources.length == numberConcepts) {
int i;
for(i = 1; i <= numberConcepts; i++) {
int suffix = i;
for(i = 0; i < numberConcepts; i++) {
int suffix = i + 1;
String conceptInputName = sourceBase + suffix;
String[] sourceValues = new String[1];
sourceValues[0] = conceptSources[i];
@ -130,12 +143,11 @@ public class AddAssociatedConceptsPreprocessor extends
}
private void addConceptLabelInputs(int numberConcepts) {
String conceptLabelValues = getConceptLabelValues();
String[] labels = convertDelimitedStringToArray(conceptLabelValues);
if(labels != null && labels.length == numberConcepts) {
int i;
for(i = 1; i <= numberConcepts; i++) {
int suffix = i;
for(i = 0; i < numberConcepts; i++) {
int suffix = i + 1;
String labelInputName = labelBase + suffix;
String[] labelValues = new String[1];
labelValues[0] = labels[i];
@ -301,5 +313,7 @@ public class AddAssociatedConceptsPreprocessor extends
return null;
return inputList.get(0);
}
}