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

NIHVIVO-238 - Updating custom reports and site configuration sections of vitro site admin to remove datastar-specific changes. Preventing past expected publication date (datastar-215), Autopopulating dataset originator with person info (datastar-304), Updates to Model preprocess related to dataset-304

Browse source
This commit is contained in:
hjk54 2010-03-26 19:00:48 +00:00
parent 5b6ee59e77
commit 61a64faf40
12 changed files with 116 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

1
webapp/web/edit/editRequestDispatch.jsp
View file

@ -233,6 +233,7 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
}
request.setAttribute("form", form);
System.out.println("EditRequestDispatch - Forwarding TO: " + form);
%>
<jsp:forward page="/edit/forms/${form}" />

2
webapp/web/edit/forms/defaultDatapropForm.jsp
View file

@ -21,7 +21,7 @@
org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger("edu.cornell.mannlib.vitro.jsp.edit.forms.defaultDatapropForm.jsp");
log.debug("Starting defaultDatapropForm.jsp");
VitroRequest vreq = new VitroRequest(request);
System.out.println("Default data prop form is being called");
String subjectUri = vreq.getParameter("subjectUri");
String predicateUri = vreq.getParameter("predicateUri");

23
webapp/web/edit/processRdfForm2.jsp
View file

@ -16,6 +16,8 @@
<%@ page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.Field" %>
<%@ page import="java.io.StringReader" %>
<%@ page import="java.util.*" %>
<%@ page import="java.util.Map" %>
<%@ page import="java.util.Iterator" %>
<%@page import="org.apache.commons.logging.LogFactory"%>
<%@page import="org.apache.commons.logging.Log"%>
<%@page import="org.apache.commons.fileupload.servlet.ServletFileUpload"%>
@ -66,14 +68,25 @@ are well formed.
* we have to make a copy. */
Map <String,String[]> queryParameters = null;
queryParameters = vreq.getParameterMap();
Iterator it = queryParameters.entrySet().iterator();
while (it.hasNext()) {
Map.Entry pairs = (Map.Entry)it.next();
String[] value= (String[]) pairs.getValue();
System.out.println(pairs.getKey() + " = ");
if(value != null && value.length > 0 ) {
int i;
for(i = 0; i < value.length; i++) {
System.out.println(" " + value[i]);
}
}
}
List<String> errorMessages = new ArrayList<String>();
EditConfiguration editConfig = EditConfiguration.getConfigFromSession(session,vreq,queryParameters);
if( editConfig == null ){
%><jsp:forward page="/edit/messages/noEditConfigFound.jsp"/><%
}
EditN3Generator n3Subber = editConfig.getN3Generator();
EditN3Generator n3Subber = editConfig.getN3Generator();
EditSubmission submission = new EditSubmission(queryParameters,editConfig);
/* entity to return to may be a variable */
@ -85,7 +98,7 @@ are well formed.
Map<String,String> errors = submission.getValidationErrors();
EditSubmission.putEditSubmissionInSession(session,submission);
if( errors != null && ! errors.isEmpty() ){
if( errors != null && ! errors.isEmpty() ){
String form = editConfig.getFormUrl();
vreq.setAttribute("formUrl", form);
%><jsp:forward page="${formUrl}"/><%
@ -296,14 +309,14 @@ are well formed.
List<ModelChangePreprocessor> modelChangePreprocessors = editConfig.getModelChangePreprocessors();
if ( modelChangePreprocessors != null ) {
for ( ModelChangePreprocessor pp : modelChangePreprocessors ) {
pp.preprocess( actualRetractions, actualAssertions );
pp.preprocess( actualRetractions, actualAssertions, request );
}
}
// get the model to write to here in case a preprocessor has switched the write layer
OntModel writeModel = editConfig.getWriteModelSelector().getModel(request,application);
String editorUri = EditN3Utils.getEditorUri(vreq,session,application);
String editorUri = EditN3Utils.getEditorUri(vreq,session,application);
Lock lock = null;
try{
lock = writeModel.getLock();