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

Updates to include correct new position for added element NIHVIVO-3061

Browse source
This commit is contained in:
hjkhjk54 2011-07-26 20:42:34 +00:00
parent 28864168b9
commit fc029333b9
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/MenuManagementEdit.java
View file

@ -29,6 +29,7 @@ import com.hp.hpl.jena.ontology.OntModel;
import com.hp.hpl.jena.ontology.OntModelSpec; import com.hp.hpl.jena.ontology.OntModelSpec;
import com.hp.hpl.jena.rdf.model.Literal; import com.hp.hpl.jena.rdf.model.Literal;
import com.hp.hpl.jena.rdf.model.Model; import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.Statement;
import com.hp.hpl.jena.rdf.model.ModelFactory; import com.hp.hpl.jena.rdf.model.ModelFactory;
import com.hp.hpl.jena.rdf.model.Resource; import com.hp.hpl.jena.rdf.model.Resource;
import com.hp.hpl.jena.rdf.model.ResourceFactory; import com.hp.hpl.jena.rdf.model.ResourceFactory;
@ -293,11 +294,15 @@ public class MenuManagementEdit extends VitroHttpServlet {
StmtIterator positions = displayModel.listStatements(null, DisplayVocabulary.MENU_POSITION, (RDFNode) null); StmtIterator positions = displayModel.listStatements(null, DisplayVocabulary.MENU_POSITION, (RDFNode) null);
int maxPosition = 1; int maxPosition = 1;
while(positions.hasNext()) { while(positions.hasNext()) {
int pos = positions.nextStatement().getInt(); Statement s = positions.nextStatement();
log.debug("Position statement is " + s);
int pos = s.getInt();
log.debug("position is " + pos);
if(pos > maxPosition) { if(pos > maxPosition) {
maxPosition = pos; maxPosition = pos;
} }
} }
log.debug("Maximum menu item position is " + maxPosition);
return maxPosition; return maxPosition;
} }
@ -495,9 +500,11 @@ public class MenuManagementEdit extends VitroHttpServlet {
,ResourceFactory.createProperty(DisplayVocabulary.HAS_ELEMENT), ,ResourceFactory.createProperty(DisplayVocabulary.HAS_ELEMENT),
menuItemResource)); menuItemResource));
addModel.add(addModel.createStatement(menuItemResource, RDF.type, DisplayVocabulary.NAVIGATION_ELEMENT)); addModel.add(addModel.createStatement(menuItemResource, RDF.type, DisplayVocabulary.NAVIGATION_ELEMENT));
int newMenuPosition = getLastPosition(displayModel) + 1;
log.debug("new menu position is " + newMenuPosition);
addModel.add(addModel.createStatement(menuItemResource, addModel.add(addModel.createStatement(menuItemResource,
DisplayVocabulary.MENU_POSITION, DisplayVocabulary.MENU_POSITION,
addModel.createTypedLiteral(getLastPosition(displayModel)))); addModel.createTypedLiteral(newMenuPosition)));
//page resource, type, title and url mapping, and what data getter associated //page resource, type, title and url mapping, and what data getter associated
addModel.add(addModel.createStatement(pageResource, addModel.add(addModel.createStatement(pageResource,
RDF.type, RDF.type,