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

updates for page management - page deletion as well as changing menu management to menu ordering

Browse source
This commit is contained in:
hjkhjk54 2012-06-25 00:19:33 +00:00
parent 54941a201b
commit e3f9caced1
11 changed files with 81 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

10
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DeletePageController.java
View file

@ -41,7 +41,7 @@ public class DeletePageController extends VitroHttpServlet {
removeStatements = ModelFactory.createDefaultModel();
VitroRequest vreq = new VitroRequest(rawRequest);
String pageUri = vreq.getParameter("pageURI");
if(pageUri != null) {
if(pageUri != null) {
doDeletePage(pageUri, vreq, resp);
}
resp.sendRedirect(rawRequest.getContextPath() + REDIRECT_URL);
@ -130,7 +130,7 @@ public class DeletePageController extends VitroHttpServlet {
(RDFNode) null);
while(dataGetterIt.hasNext()) {
Statement dataGetterStmt = dataGetterIt.nextStatement();
Resource dataGetterResource = dataGetterStmt.getSubject();
Resource dataGetterResource = dataGetterStmt.getResource();
dataGettersModel.add(displayModel.listStatements(dataGetterResource, null, (RDFNode) null));
}
return dataGettersModel;
@ -160,11 +160,7 @@ public class DeletePageController extends VitroHttpServlet {
//This should be in write mode
//TODO: find better way of doing this
private OntModel getDisplayModel(VitroRequest vreq) {
if(vreq.getAttribute(vreq.SPECIAL_WRITE_MODEL) != null) {
return vreq.getWriteModel();
} else {
return (OntModel) getServletContext().getAttribute("http://vitro.mannlib.cornell.edu/default/vitro-kb-displayMetadata");
}
return vreq.getDisplayModel();
}
Log log = LogFactory.getLog(MenuManagementEdit.class);

34
webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyStatementDaoJena.java
View file

@ -366,9 +366,43 @@ public class ObjectPropertyStatementDaoJena extends JenaBaseDao implements Objec
// }
try {
//If RDFService is null, will do what code used to do before, otherwise employ rdfservice
if(rdfService == null) {
log.debug("RDF Service null, Using CONSTRUCT query string for object property " +
propertyUri + ": " + queryString);
Query query = null;
try {
query = QueryFactory.create(queryString, Syntax.syntaxARQ);
} catch(Throwable th){
log.error("Could not create CONSTRUCT SPARQL query for query " +
"string. " + th.getMessage());
log.error(queryString);
return constructedModel;
}
DatasetWrapper w = dwf.getDatasetWrapper();
Dataset dataset = w.getDataset();
dataset.getLock().enterCriticalSection(Lock.READ);
QueryExecution qe = null;
try {
qe = QueryExecutionFactory.create(
query, dataset);
qe.execConstruct(constructedModel);
} catch (Exception e) {
log.error("Error getting constructed model for subject " + subjectUri + " and property " + propertyUri);
} finally {
if (qe != null) {
qe.close();
}
dataset.getLock().leaveCriticalSection();
w.close();
}
} else {
constructedModel.read(
rdfService.sparqlConstructQuery(
queryString, RDFService.ModelSerializationFormat.N3), null, "N3");
}
} catch (Exception e) {
log.error("Error getting constructed model for subject " + subjectUri + " and property " + propertyUri);
}

7
webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManagePageGenerator.java
View file

@ -508,7 +508,12 @@ private String getExistingCustomTemplateQuery() {
data.put("title", "Add Menu Item");
data.put("menuAction", "Add");
data.put("selectedTemplateType", "default");
//defaults to regular class group page
//Check for parameter specifying that this is a new menu page, in which case
//menu item should be selected
String menuItemParam = vreq.getParameter("addMenuItem");
if(menuItemParam != null) {
data.put("addMenuItem", menuItemParam);
}
}
//N3 strings