diff --git a/webapp/web/edit/forms/autoCompleteDatapropForm.jsp b/webapp/web/edit/forms/autoCompleteDatapropForm.jsp
deleted file mode 100644
index 5c88164fd..000000000
--- a/webapp/web/edit/forms/autoCompleteDatapropForm.jsp
+++ /dev/null
@@ -1,181 +0,0 @@
-<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
-
-<%@ page import="com.hp.hpl.jena.rdf.model.Model" %>
-<%@ page import="edu.cornell.mannlib.vitro.webapp.beans.Individual" %>
-<%@ page import="edu.cornell.mannlib.vitro.webapp.beans.DataProperty" %>
-<%@ page import="edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement" %>
-<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
-<%@ page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.EditConfiguration" %>
-<%@ taglib prefix="v" uri="http://vitro.mannlib.cornell.edu/vitro/tags" %>
-<%@page import="edu.cornell.mannlib.vitro.webapp.web.MiscWebUtils"%>
-
-<%
- org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger("edu.cornell.mannlib.vitro.jsp.edit.forms.autoCompleteDatapropForm.jsp");
- log.debug("Starting autoCompleteDatapropForm.jsp");
-
- String subjectUri = request.getParameter("subjectUri");
- String predicateUri = request.getParameter("predicateUri");
-
- DataPropertyStatement dps = (DataPropertyStatement)request.getAttribute("dataprop");
-
- String datapropKeyStr = request.getParameter("datapropKey");
- int dataHash=0;
-
- DataProperty prop = (DataProperty)request.getAttribute("predicate");
- if( prop == null ) throw new Error("In autoCompleteDatapropForm.jsp, could not find predicate " + predicateUri);
- request.setAttribute("propertyName",prop.getPublicName());
-
- Individual subject = (Individual)request.getAttribute("subject");
- if( subject == null ) throw new Error("In autoCompleteDatapropForm.jsp, could not find subject " + subjectUri);
- request.setAttribute("subjectName",subject.getName());
-
- String rangeDatatypeUri = prop.getRangeDatatypeURI();
- request.setAttribute("rangeDatatypeUriJson", MiscWebUtils.escape(rangeDatatypeUri));
-
- if( dps != null ){
- try {
- dataHash = Integer.parseInt(datapropKeyStr);
- log.debug("dataHash is " + dataHash);
- } catch (NumberFormatException ex) {
- log.debug("could not parse dataprop hash "+
- "but there was a dataproperty; hash: '"+datapropKeyStr+"'");
- }
-
- String rangeDatatype = dps.getDatatypeURI();
- if( rangeDatatype == null ){
- log.debug("no range datatype uri set on data property statement when property's range datatype is "+prop.getRangeDatatypeURI()+" in autoCompleteDatapropForm.jsp");
- request.setAttribute("rangeDatatypeUriJson","");
- }else{
- log.debug("range datatype uri of ["+rangeDatatype+"] on data property statement in autoCompleteDatapropForm.jsp");
- request.setAttribute("rangeDatatypeUriJson",rangeDatatype);
- }
- String rangeLang = dps.getLanguage();
- if( rangeLang == null ) {
- log.debug("no language attribute on data property statement in autoCompleteDatapropForm.jsp");
- request.setAttribute("rangeLangJson","");
- }else{
- log.debug("language attribute of ["+rangeLang+"] on data property statement in autoCompleteDatapropForm.jsp");
- request.setAttribute("rangeLangJson", rangeLang);
- }
- } else {
- log.error("No incoming dataproperty statement attribute in autoCompleteDatapropForm.jsp");
- }
-%>
-
- ?subject ?predicate ?${dataLiteral}.
-
-
-
- {
- "formUrl" : "${formUrl}",
- "editKey" : "${editKey}",
- "datapropKey" : "<%=datapropKeyStr==null?"":datapropKeyStr%>",
- "urlPatternToReturnTo" : "/entity",
-
- "subject" : ["subject", "${subjectUriJson}" ],
- "predicate" : ["predicate", "${predicateUriJson}"],
- "object" : ["${dataLiteral}","","DATAPROPHASH"],
-
- "n3required" : ["${n3ForEdit}"],
- "n3optional" : [ ],
- "newResources" : { },
- "urisInScope" : { },
- "literalsInScope" : { },
- "urisOnForm" : [ ],
- "literalsOnForm" : ["${dataLiteral}"],
- "filesOnForm" : [ ],
- "sparqlForLiterals" : { },
- "sparqlForUris" : { },
- "sparqlForExistingLiterals" : { },
- "sparqlForExistingUris" : { },
- "optionsForFields" : { },
- "fields" : { "${dataLiteral}" : {
- "newResource" : "false",
- "validators" : ["nonempty"],
- "optionsType" : "STRINGS_VIA_DATATYPE_PROPERTY",
- "literalOptions" : [],
- "predicateUri" : "${predicateUriJson}",
- "objectClassUri" : "",
- "rangeDatatypeUri" : "${rangeDatatypeUriJson}" ,
- "rangeLang" : "${rangeLangJson}",
- "assertions" : ["${n3ForEdit}"]
- }
- }
- }
-
-
-<%
- if( log.isDebugEnabled()) log.debug(request.getAttribute("editjson"));
-
- EditConfiguration editConfig = new EditConfiguration((String)request.getAttribute("editjson"));
- EditConfiguration.putConfigInSession(editConfig, session);
-
- String formTitle =""; // dont add local page variables to the request
- String submitLabel ="";
-
- if( datapropKeyStr != null && datapropKeyStr.trim().length() > 0 ) {
- Model model = (Model)application.getAttribute("jenaOntModel");
- editConfig.prepareForDataPropUpdate(model,dps);
- formTitle = "Change text for: "+prop.getPublicName()+" ";
- submitLabel = "Save change";
- } else {
- formTitle = "Add new entry for: "+prop.getPublicName()+" ";
- submitLabel = "Save entry";
- }
-%>
-
-
-
-
-JSP form, must be removed for the 1.4!
-
-
-
-<%=formTitle%>
-" >
-
- ${predicate.publicDescription}
-
-
- PREFIX owl:
- SELECT ?inverse_property
- WHERE {
- ?inverse_property owl:inverseOf ?predicate
- }
-
-
-
- ?subject ?predicate ?${objectVar}.
-
-
-
- ?${objectVar} ?inverseProp ?subject.
-
-
-
- {
- "formUrl" : "${formUrl}",
- "editKey" : "${editKey}",
- "urlPatternToReturnTo" : "/entity",
-
- "subject" : [ "subject", "${subjectUriJson}" ] ,
- "predicate" : [ "predicate", "${predicateUriJson}" ],
- "object" : [ "${objectVar}" , "${objectUriJson}" , "URI"],
-
- "n3required" : [ "${n3ForEdit}" ],
- "n3optional" : [ "${n3Inverse}" ],
- "newResources" : { },
-
- "urisInScope" : { },
- "literalsInScope" : { },
-
- "urisOnForm" : ["${objectVar}"],
- "literalsOnForm" : [ ],
- "filesOnForm" : [ ],
-
- "sparqlForLiterals" : { },
- "sparqlForUris" : {"inverseProp" : "${queryForInverse}" },
-
- "sparqlForExistingLiterals" : { },
- "sparqlForExistingUris" : { },
- "fields" : { "${objectVar}" : {
- "newResource" : "false",
- "queryForExisting" : { },
- "validators" : [ ],
- "optionsType" : "INDIVIDUALS_VIA_OBJECT_PROPERTY",
- "subjectUri" : "${subjectUriJson}",
- "subjectClassUri" : "",
- "predicateUri" : "${predicateUriJson}",
- "objectClassUri" : "",
- "rangeDatatypeUri" : "",
- "rangeLang" : "",
- "literalOptions" : [ ] ,
- "assertions" : ["${n3ForEdit}"]
- }
- }
- }
-
-
-<% /* now put edit configuration Json object into session */
- EditConfiguration editConfig = new EditConfiguration((String)request.getAttribute("editjson"));
- EditConfiguration.putConfigInSession(editConfig, session);
- String formTitle ="";
- String submitLabel ="";
- Model model = (Model)application.getAttribute("jenaOntModel");
- if( request.getAttribute("object") != null ){//this block is for an edit of an existing object property statement
- editConfig.prepareForObjPropUpdate( model );
- formTitle = "Change entry for: "+prop.getDomainPublic()+" ";
- submitLabel = "save change";
- } else {
- editConfig.prepareForNonUpdate( model );
- if ( prop.getOfferCreateNewOption() ) {
- log.debug("property set to offer \"create new\" option; custom form: ["+prop.getCustomEntryForm()+"]");
- formTitle = "Select an existing "+rangeClass.getName()+" for "+subject.getName();
- submitLabel = "Select existing";
- } else {
- formTitle = "Add an entry to: "+prop.getDomainPublic()+" ";
- submitLabel = "Save entry";
- }
- }
-%>
-
-
-JSP form, must be removed for the 1.4!
-
-
-
-<%=formTitle%>
-" >
-
-
-
-
-
- ${predicate.publicDescription}
-
-
- If you don't find the appropriate entry on the selection list,
- Add a new item to this list
-
-
-
-
-
-
-
-
-
-
- JSP form, must be removed for the 1.4!
-
-
-
- ?subject <${toDateTimeInterval}> ?intervalNode .
- ?intervalNode <${type}> <${intervalType}> .
- ?intervalNode <${intervalToStart}> ?startNode .
- ?startNode <${type}> <${dateTimeValueType}> .
- ?startNode <${dateTimeValue}> ?startField-value .
- ?startNode <${dateTimePrecision}> ?startField-precision .
-
-
-
- ?subject <${toDateTimeInterval}> ?intervalNode .
- ?intervalNode <${type}> <${intervalType}> .
- ?intervalNode <${intervalToEnd}> ?endNode .
- ?endNode <${type}> <${dateTimeValueType}> .
- ?endNode <${dateTimeValue}> ?endField-value .
- ?endNode <${dateTimePrecision}> ?endField-precision .
-
-
-<%-- Queries for editing an existing role --%>
-
-
- SELECT ?existingIntervalNode WHERE {
- ?subject <${toDateTimeInterval}> ?existingIntervalNode .
- ?existingIntervalNode <${type}> <${intervalType}> . }
-
-
-
- SELECT ?existingStartNode WHERE {
- ?subject <${toDateTimeInterval}> ?existingIntervalNode .
- ?intervalNode <${type}> <${intervalType}> .
- ?intervalNode <${intervalToStart}> ?existingStartNode .
- ?existingStartNode <${type}> <${dateTimeValueType}> .}
-
-
-
- SELECT ?existingDateStart WHERE {
- ?subject <${toDateTimeInterval}> ?existingIntervalNode .
- ?intervalNode <${type}> <${intervalType}> .
- ?intervalNode <${intervalToStart}> ?startNode .
- ?startNode <${type}> <${dateTimeValueType}> .
- ?startNode <${dateTimeValue}> ?existingDateStart . }
-
-
-
- SELECT ?existingStartPrecision WHERE {
- ?subject <${toDateTimeInterval}> ?existingIntervalNode .
- ?intervalNode <${type}> <${intervalType}> .
- ?intervalNode <${intervalToStart}> ?startNode .
- ?startNode <${type}> <${dateTimeValueType}> .
- ?startNode <${dateTimePrecision}> ?existingStartPrecision . }
-
-
-
-
- SELECT ?existingEndNode WHERE {
- ?subject <${toDateTimeInterval}> ?existingIntervalNode .
- ?intervalNode <${type}> <${intervalType}> .
- ?intervalNode <${intervalToEnd}> ?existingEndNode .
- ?existingEndNode <${type}> <${dateTimeValueType}> .}
-
-
-
- SELECT ?existingEndDate WHERE {
- ?subject <${toDateTimeInterval}> ?existingIntervalNode .
- ?intervalNode <${type}> <${intervalType}> .
- ?intervalNode <${intervalToEnd}> ?endNode .
- ?endNode <${type}> <${dateTimeValueType}> .
- ?endNode <${dateTimeValue}> ?existingEndDate . }
-
-
-
- SELECT ?existingEndPrecision WHERE {
- ?subject <${toDateTimeInterval}> ?existingIntervalNode .
- ?intervalNode <${type}> <${intervalType}> .
- ?intervalNode <${intervalToEnd}> ?endNode .
- ?endNode <${type}> <${dateTimeValueType}> .
- ?endNode <${dateTimePrecision}> ?existingEndPrecision . }
-
-
-<%-- Configure add vs. edit --%>
-<%
-
- String objectUri = (String) request.getAttribute("objectUri");
- if (objectUri != null) { // editing existing entry
-%>
-
- {
- "formUrl" : "${formUrl}",
- "editKey" : "${editKey}",
- "urlPatternToReturnTo" : "/entity",
-
- "subject" : ["subject", "${subjectUriJson}" ],
- "predicate" : ["toDateTimeInterval", "${predicateUriJson}" ],
- "object" : ["intervalNode", "${objectUriJson}", "URI" ],
-
- "n3required" : [ ],
-
- "n3optional" : [ "${n3ForStart}", "${n3ForEnd}" ],
-
- "newResources" : { "intervalNode" : "${defaultNamespace}",
- "startNode" : "${defaultNamespace}",
- "endNode" : "${defaultNamespace}" },
-
- "urisInScope" : { },
- "literalsInScope": { },
- "urisOnForm" : [ ],
- "literalsOnForm" : [ ],
- "filesOnForm" : [ ],
- "sparqlForLiterals" : { },
- "sparqlForUris" : { },
- "sparqlForExistingLiterals" : {
- "startField-value" : "${existingStartDateQuery}",
- "endField-value" : "${existingEndDateQuery}"
- },
- "sparqlForExistingUris" : {
- "intervalNode" : "${existingIntervalNodeQuery}",
- "startNode" : "${existingStartNodeQuery}",
- "endNode" : "${existingEndNodeQuery}",
- "startField-precision": "${existingStartPrecisionQuery}",
- "endField-precision" : "${existingEndPrecisionQuery}"
- },
- "fields" : {
- "startField" : {
- "newResource" : "false",
- "validators" : [ ],
- "optionsType" : "UNDEFINED",
- "literalOptions" : [ ],
- "predicateUri" : "",
- "objectClassUri" : "",
- "rangeDatatypeUri" : "",
- "rangeLang" : "",
- "assertions" : ["${n3ForStart}"]
- },
- "endField" : {
- "newResource" : "false",
- "validators" : [ ],
- "optionsType" : "UNDEFINED",
- "literalOptions" : [ ],
- "predicateUri" : "",
- "objectClassUri" : "",
- "rangeDatatypeUri" : "",
- "rangeLang" : "",
- "assertions" : ["${n3ForEnd}"]
- }
- }
-}
-
-
-<%
- log.debug(request.getAttribute("editjson"));
-
- EditConfiguration editConfig = EditConfiguration.getConfigFromSession(session,request);
- if (editConfig == null) {
- editConfig = new EditConfiguration((String) request.getAttribute("editjson"));
- EditConfiguration.putConfigInSession(editConfig,session);
-
- //setup date time edit elements
- Field startField = editConfig.getField("startField");
- // arguments for DateTimeWithPrecision are (fieldName, minimumPrecision, [requiredLevel])
- startField.setEditElement(new DateTimeWithPrecision(startField, VitroVocabulary.Precision.SECOND.uri(), VitroVocabulary.Precision.NONE.uri()));
- Field endField = editConfig.getField("endField");
- endField.setEditElement(new DateTimeWithPrecision(endField, VitroVocabulary.Precision.SECOND.uri(), VitroVocabulary.Precision.NONE.uri()));
- }
-
- editConfig.addValidator(new DateTimeIntervalValidation("startField","endField") );
-
- Model model = (Model) application.getAttribute("jenaOntModel");
-
- if (objectUri != null) { // editing existing
- editConfig.prepareForObjPropUpdate(model);
- } else { // adding new
- editConfig.prepareForNonUpdate(model);
- }
-
- List customJs = new ArrayList(Arrays.asList(JavaScript.JQUERY_UI.path(),
- JavaScript.CUSTOM_FORM_UTILS.path()
- ));
- request.setAttribute("customJs", customJs);
-
- List customCss = new ArrayList(Arrays.asList(Css.JQUERY_UI.path(),
- Css.CUSTOM_FORM.path()
- ));
- request.setAttribute("customCss", customCss);
-
- String subjectName = ((Individual) request.getAttribute("subject")).getName();
-%>
-
-JSP form, must be removed for the 1.4!
-${titleVerb} date time interval for <%= subjectName %>
-
-" >
-
-
-
-
-
- ?subject <${toDateTimeValue}> ?valueNode .
- ?valueNode <${type}> <${valueType}> .
- ?valueNode <${dateTimeValue}> ?dateTimeField-value .
- ?valueNode <${dateTimePrecision}> ?dateTimeField-precision .
-
-
-<%-- Queries for editing an existing role --%>
-
- SELECT ?existingNode WHERE {
- ?subject <${toDateTimeValue}> ?existingNode .
- ?existingNode <${type}> <${valueType}> . }
-
-
-
- SELECT ?existingDateTimeValue WHERE {
- ?subject <${toDateTimeValue}> ?existingValueNode .
- ?existingValueNode <${type}> <${valueType}> .
- ?existingValueNode <${dateTimeValue}> ?existingDateTimeValue . }
-
-
-
- SELECT ?existingPrecision WHERE {
- ?subject <${toDateTimeValue}> ?existingValueNode .
- ?existingValueNode <${type}> <${valueType}> .
- ?existingValueNode <${dateTimePrecision}> ?existingPrecision . }
-
-
-
-<%-- Configure add vs. edit --%>
-<%
-
- String objectUri = (String) request.getAttribute("objectUri");
- if (objectUri != null) { // editing existing entry
-%>
-
- {
- "formUrl" : "${formUrl}",
- "editKey" : "${editKey}",
- "urlPatternToReturnTo" : "/individual",
-
- "subject" : ["subject", "${subjectUriJson}" ],
- "predicate" : ["toDateTimeValue", "${predicateUriJson}" ],
- "object" : ["valueNode", "${objectUriJson}", "URI" ],
-
- "n3required" : [ ],
-
- "n3optional" : [ "${n3ForValue}" ],
-
- "newResources" : { "valueNode" : "${defaultNamespace}" },
-
- "urisInScope" : { },
- "literalsInScope": { },
- "urisOnForm" : [ ],
- "literalsOnForm" : [ ],
- "filesOnForm" : [ ],
- "sparqlForLiterals" : { },
- "sparqlForUris" : { },
- "sparqlForExistingLiterals" : {
- "dateTimeField-value" : "${existingDateTimeValueQuery}",
- },
- "sparqlForExistingUris" : {
- "valueNode" : "${existingNodeQuery}",
- "dateTimeField-precision": "${existingPrecisionQuery}"
- },
- "fields" : {
- "dateTimeField" : {
- "newResource" : "false",
- "validators" : [ ],
- "optionsType" : "UNDEFINED",
- "literalOptions" : [ ],
- "predicateUri" : "",
- "objectClassUri" : "",
- "rangeDatatypeUri" : "",
- "rangeLang" : "",
- "assertions" : ["${n3ForValue}"]
- }
- }
-}
-
-
-<%
- log.debug(request.getAttribute("editjson"));
-
- EditConfiguration editConfig = EditConfiguration.getConfigFromSession(session,request);
- if (editConfig == null) {
- editConfig = new EditConfiguration((String) request.getAttribute("editjson"));
- EditConfiguration.putConfigInSession(editConfig,session);
-
- //setup date time edit elements
- Field dateTimeField = editConfig.getField("dateTimeField");
- // arguments for DateTimeWithPrecision are (fieldName, minimumPrecision, [requiredLevel])
- dateTimeField.setEditElement(new DateTimeWithPrecision(dateTimeField, VitroVocabulary.Precision.SECOND.uri(), VitroVocabulary.Precision.NONE.uri()));
- }
-
- Model model = (Model) application.getAttribute("jenaOntModel");
-
- if (objectUri != null) { // editing existing
- editConfig.prepareForObjPropUpdate(model);
- } else { // adding new
- editConfig.prepareForNonUpdate(model);
- }
-
- List customJs = new ArrayList(Arrays.asList(JavaScript.JQUERY_UI.path(),
- JavaScript.CUSTOM_FORM_UTILS.path()
- ));
- request.setAttribute("customJs", customJs);
-
- List customCss = new ArrayList(Arrays.asList(Css.JQUERY_UI.path(),
- Css.CUSTOM_FORM.path()
- ));
- request.setAttribute("customCss", customCss);
-
- String subjectName = ((Individual) request.getAttribute("subject")).getName();
-%>
-
-${titleVerb} date time value for <%= subjectName %>
-JSP form, must be removed for the 1.4!
-" >
-
-
-
-
-
- PREFIX owl:
- SELECT ?inverse_property
- WHERE {
- ?inverse_property owl:inverseOf ?predicate
- }
-
-
-<%-- Enter a SPARQL query for each field, by convention concatenating the field id with "Existing"
- to convey that the expression is used to retrieve any existing value for the field in an existing individual.
- Each of these must then be referenced in the sparqlForExistingLiterals section of the JSON block below
- and in the literalsOnForm --%>
-
- PREFIX rdfs:
- SELECT ?existingName
- WHERE { ?newIndividual rdfs:label ?existingName }
-
-
-<%-- Pair the "existing" query with the skeleton of what will be asserted for a new statement involving this field.
- the actual assertion inserted in the model will be created via string substitution into the ? variables.
- NOTE the pattern of punctuation (a period after the prefix URI and after the ?field) --%>
-
- @prefix rdfs: .
- ?newIndividual rdfs:label ?name .
-
-
-
- ?subject ?predicate ?newIndividual .
-
-
-
- @prefix rdf: .
- ?newIndividual rdf:type <${rangeClassUri}> .
-
-
-
- @prefix rdf: .
- ?newIndividual rdf:type <${flagURI}> .
-
-
-<%-- using v:jsonset here so everything goes through the same JSON escaping --%>
-
- @prefix rdf: .
- ${n3AssertedTypesUnescaped}
-
-
-
- ?newIndividual ?inverseProp ?subject .
-
-
-<%-- note that it's safer to have multiple distinct optional blocks so that a failure in one
- will not prevent correct sections from being inserted --%>
-
-
- {
- "formUrl" : "${formUrl}",
- "editKey" : "${editKey}",
- "urlPatternToReturnTo" : "/entity",
-
- "subject" : [ "subject", "${subjectUriJson}" ],
- "predicate" : [ "predicate", "${predicateUriJson}" ],
- "object" : [ "newIndividual", "${objectUriJson}", "URI" ],
-
- "n3required" : [ "${n3ForName}" , "${n3ForRelation}", "${n3ForType}"],
- "n3optional" : [ "${n3Inverse}", "${n3AssertedTypes}", "${n3ForFlag}" ],
- "newResources" : {
- "newIndividual" : "${defaultNamespace}individual"
- },
- "urisInScope" : { },
- "literalsInScope" : { },
- "urisOnForm" : [ ],
- "literalsOnForm" : [ "name" ],
- "filesOnForm" : [ ],
- "sparqlForLiterals" : { },
- "sparqlForUris" : { "inverseProp" : "${queryForInverse}" },
- "sparqlForExistingLiterals" : {
- "name" : "${nameExisting}"
- },
- "sparqlForExistingUris" : { },
- "fields" : {
- "name" : {
- "newResource" : "false",
- "validators" : ["nonempty"],
- "optionsType" : "UNDEFINED",
- "literalOptions" : [ ],
- "predicateUri" : "",
- "objectClassUri" : "",
- "rangeDatatypeUri" : "",
- "rangeLang" : "",
- "assertions" : [ "${n3ForName}" ]
- }
- }
- }
-
-<%
- EditConfiguration editConfig = null;
- if( ! isForwardToCreateNew )
- editConfig = EditConfiguration.getConfigFromSession(session,request);
- //else
- // don't want to get the editConfig because it was for the defaultObjPropForm
-
- if( editConfig == null ){
- editConfig = new EditConfiguration((String)request.getAttribute("editjson"));
- EditConfiguration.putConfigInSession(editConfig, session);
- }
-
- Model model = (Model)application.getAttribute("jenaOntModel");
-
- if( isReplaceWithNew){
- // this is very specialized for the defaultAddMissingIndividual.jsp
- // to support objPropStmt edits where the user wants to
- // create a new Individual. Here we trick the processRdfForm2 into
- // creating a new Individual and use the preprocessor to do the
- // removal of the old objPropStmt
- editConfig.addModelChangePreprocessor(
- new DefaultAddMissingIndividualFormModelPreprocessor(
- subject.getURI(),predicateUri ,objectUri ) );
- editConfig.setObject(null);
- editConfig.prepareForNonUpdate(model);
- }else if ( isForwardToCreateButEdit) {
- editConfig.prepareForObjPropUpdate(model);
- }else if(request.getAttribute("object") != null ){
- editConfig.prepareForObjPropUpdate(model);
- } else{
- editConfig.prepareForNonUpdate(model);
- }
-
- String submitButtonLabel="";
- /* title is used by pre and post form fragments */
- //set title to Edit to maintain functionality from 1.1.1 and avoid updates to Selenium tests
- request.setAttribute("title", "Edit");
- if (objectUri != null) {
- request.setAttribute("formTitle", "Edit \""+propDomainPublic+"\" entry for " + subject.getName());
- submitButtonLabel = "Save changes";
- } else {
- request.setAttribute("formTitle","Create \""+propDomainPublic+"\" entry for " + subject.getName());
- submitButtonLabel = "Create \""+propDomainPublic+"\" entry";
- }
-
-%>
-
-
-
-
-${formTitle}
-JSP form, must be removed for the 1.4!
-" > defaultsForXSDtypes ;
- static {
- defaultsForXSDtypes = new HashMap();
- //defaultsForXSDtypes.put("http://www.w3.org/2001/XMLSchema#dateTime","2001-01-01T12:00:00");
- defaultsForXSDtypes.put("http://www.w3.org/2001/XMLSchema#dateTime","#Unparseable datetime defaults to now");
- }
-%>
-<%
- 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);
- String subjectUri = vreq.getParameter("subjectUri");
- String predicateUri = vreq.getParameter("predicateUri");
-
- DataPropertyStatement dps = (DataPropertyStatement)vreq.getAttribute("dataprop");
-
- String datapropKeyStr = vreq.getParameter("datapropKey");
- int dataHash=0;
-
- DataProperty prop = (DataProperty)vreq.getAttribute("predicate");
- if( prop == null ) throw new Error("In defaultDatapropForm.jsp, could not find predicate " + predicateUri);
- vreq.setAttribute("propertyName",prop.getPublicName());
-
- Individual subject = (Individual)vreq.getAttribute("subject");
- if( subject == null ) throw new Error("In defaultDatapropForm.jsp, could not find subject " + subjectUri);
- vreq.setAttribute("subjectName",subject.getName());
-
- String rangeDatatypeUri = vreq.getWebappDaoFactory().getDataPropertyDao().getRequiredDatatypeURI(subject, prop);
- //String rangeDatatypeUri = prop.getRangeDatatypeURI();
- vreq.setAttribute("rangeDatatypeUriJson", MiscWebUtils.escape(rangeDatatypeUri));
-
- if( dps != null ){
- try {
- dataHash = Integer.parseInt(datapropKeyStr);
- log.debug("dataHash is " + dataHash);
- } catch (NumberFormatException ex) {
- log.debug("could not parse dataprop hash "+
- "but there was a dataproperty; hash: '"+datapropKeyStr+"'");
- }
-
- String rangeDatatype = dps.getDatatypeURI();
- if( rangeDatatype == null ){
- log.debug("no range datatype uri set on data property statement when property's range datatype is "+prop.getRangeDatatypeURI()+" in defaultDatapropForm.jsp");
- vreq.setAttribute("rangeDatatypeUriJson","");
- } else {
- log.debug("range datatype uri of ["+rangeDatatype+"] on data property statement in defaultDatapropForm.jsp");
- vreq.setAttribute("rangeDatatypeUriJson",rangeDatatype);
- }
- String rangeLang = dps.getLanguage();
- if( rangeLang == null ) {
- log.debug("no language attribute on data property statement in defaultDatapropForm.jsp");
- vreq.setAttribute("rangeLangJson","");
- }else{
- log.debug("language attribute of ["+rangeLang+"] on data property statement in defaultDatapropForm.jsp");
- vreq.setAttribute("rangeLangJson", rangeLang);
- }
- } else {
- log.debug("No incoming dataproperty statement attribute for property "+prop.getPublicName()+"; adding a new statement");
- if(rangeDatatypeUri != null && rangeDatatypeUri.length() > 0) {
- String defaultVal = defaultsForXSDtypes.get(rangeDatatypeUri);
- if( defaultVal == null )
- vreq.setAttribute("rangeDefaultJson", "");
- else
- vreq.setAttribute("rangeDefaultJson", '"' + MiscWebUtils.escape(defaultVal) + '"' );
- }
- }
-
-%>
-
- ?subject ?predicate ?${dataLiteral}.
-
-
-
- {
- "formUrl" : "${formUrl}",
- "editKey" : "${editKey}",
- "datapropKey" : "<%=datapropKeyStr==null?"":datapropKeyStr%>",
- "urlPatternToReturnTo" : "/entity",
-
- "subject" : ["subject", "${subjectUriJson}" ],
- "predicate" : ["predicate", "${predicateUriJson}"],
- "object" : ["${dataLiteral}","","DATAPROPHASH"],
-
- "n3required" : ["${n3ForEdit}"],
- "n3optional" : [ ],
- "newResources" : { },
- "urisInScope" : { },
- "literalsInScope" : { },
- "urisOnForm" : [ ],
- "literalsOnForm" : ["${dataLiteral}"],
- "filesOnForm" : [ ],
- "sparqlForLiterals" : { },
- "sparqlForUris" : { },
- "sparqlForExistingLiterals" : { },
- "sparqlForExistingUris" : { },
- "optionsForFields" : { },
- "fields" : { "${dataLiteral}" : {
- "newResource" : "false",
- "validators" : ["datatype:${rangeDatatypeUriJson}"],
- "optionsType" : "LITERALS",
- "literalOptions" : [ ${rangeDefaultJson} ],
- "predicateUri" : "",
- "objectClassUri" : "",
- "rangeDatatypeUri" : "${rangeDatatypeUriJson}",
- "rangeLang" : "${rangeLangJson}",
- "assertions" : ["${n3ForEdit}"]
- }
- }
- }
-
-
-<%
- if( log.isDebugEnabled()) log.debug(request.getAttribute("editjson"));
-
- EditConfiguration editConfig = new EditConfiguration((String)vreq.getAttribute("editjson"));
- EditConfiguration.putConfigInSession(editConfig, session);
-
- String formTitle =""; // don't add local page variables to the request
- String submitLabel ="";
-
- if( datapropKeyStr != null && datapropKeyStr.trim().length() > 0 ) {
- Model model = (Model)application.getAttribute("jenaOntModel");
- editConfig.prepareForDataPropUpdate(model,dps);
- formTitle = "Change text for: "+prop.getPublicName()+" ";
- submitLabel = "Save change";
- } else {
- formTitle ="Add new entry for: "+prop.getPublicName()+" ";
- submitLabel ="Save entry";
- }
-%>
-
-<%--the following parameters configure the tinymce textarea --%>
-
-
-
-JSP form, must be removed for the 1.4!
-
-<%=formTitle%>
-" method="post" > <%-- see VITRO-435 Jira issue: need POST, not GET --%>
-
- ${predicate.publicDescription}
-
-
-
-
- PREFIX owl:
- SELECT ?inverse_property
- WHERE {
- ?inverse_property owl:inverseOf ?predicate
- }
-
-
-
- ?subject ?predicate ?objectVar.
-
-
-
- ?objectVar ?inverseProp ?subject.
-
-
-
- {
- "formUrl" : "${formUrl}",
- "editKey" : "${editKey}",
- "urlPatternToReturnTo" : "/entity",
-
- "subject" : [ "subject", "${subjectUriJson}" ] ,
- "predicate" : [ "predicate", "${predicateUriJson}" ],
- "object" : [ "objectVar" , "${objectUriJson}" , "URI"],
-
- "n3required" : [ "${n3ForEdit}" ],
- "n3optional" : [ "${n3Inverse}" ],
- "newResources" : { },
-
- "urisInScope" : { },
- "literalsInScope" : { },
-
- "urisOnForm" : ["objectVar"],
- "literalsOnForm" : [ ],
- "filesOnForm" : [ ],
-
- "sparqlForLiterals" : { },
- "sparqlForUris" : {"inverseProp" : "${queryForInverse}" },
-
- "sparqlForExistingLiterals" : { },
- "sparqlForExistingUris" : { },
- "fields" : { "objectVar" : {
- "newResource" : "false",
- "queryForExisting" : { },
- "validators" : [ "nonempty" ],
- "optionsType" : "INDIVIDUALS_VIA_OBJECT_PROPERTY",
- "subjectUri" : "${subjectUriJson}",
- "subjectClassUri" : "",
- "predicateUri" : "${predicateUriJson}",
- "objectClassUri" : "",
- "rangeDatatypeUri" : "",
- "rangeLang" : "",
- "literalOptions" : [ ] ,
- "assertions" : ["${n3ForEdit}", "${n3Inverse}"]
- }
- }
- }
-
-
-<%
- log.debug(request.getAttribute("editjson"));
-
- /* now put edit configuration Json object into session */
- EditConfiguration editConfig = new EditConfiguration((String)request.getAttribute("editjson"));
- EditConfiguration.putConfigInSession(editConfig, session);
- String formTitle ="";
- String submitLabel ="";
- Model model = (Model)application.getAttribute("jenaOntModel");
- if( request.getAttribute("object") != null ){//this block is for an edit of an existing object property statement
- editConfig.prepareForObjPropUpdate( model );
- formTitle = "Change entry for: "+prop.getDomainPublic()+" ";
- submitLabel = "save change";
- } else {
- editConfig.prepareForNonUpdate( model );
- if ( prop.getOfferCreateNewOption() ) {
- //Try to get the name of the class to select from
- VClass classOfObjectFillers = null;
-
- if( prop.getRangeVClassURI() == null ) {
- // If property has no explicit range, try to get classes
- List classes = wdf.getVClassDao().getVClassesForProperty(subject.getVClassURI(), prop.getURI());
- if( classes == null || classes.size() == 0 || classes.get(0) == null ){
- // If property has no explicit range, we will use e.g. owl:Thing.
- // Typically an allValuesFrom restriction will come into play later.
- classOfObjectFillers = wdf.getVClassDao().getTopConcept();
- } else {
- if( classes.size() > 1 )
- log.debug("Found multiple classes when attempting to get range vclass.");
- classOfObjectFillers = classes.get(0);
- }
- }else{
- classOfObjectFillers = wdf.getVClassDao().getVClassByURI(prop.getRangeVClassURI());
- if( classOfObjectFillers == null )
- classOfObjectFillers = wdf.getVClassDao().getTopConcept();
- }
-
- log.debug("property set to offer \"create new\" option; custom form: ["+prop.getCustomEntryForm()+"]");
- formTitle = "Select an existing "+classOfObjectFillers.getName()+" for "+subject.getName();
- submitLabel = "Select existing";
- } else {
- formTitle = "Add an entry to: "+prop.getDomainPublic()+" ";
- submitLabel = "Save entry";
- }
- }
-
- if( prop.getSelectFromExisting() ){
- // set ProhibitedFromSearch object so picklist doesn't show
- // individuals from classes that should be hidden from list views
- OntModel displayOntModel =
- (OntModel) pageContext.getServletContext()
- .getAttribute("displayOntModel");
- if (displayOntModel != null) {
- ProhibitedFromSearch pfs = new ProhibitedFromSearch(
- DisplayVocabulary.SEARCH_INDEX_URI, displayOntModel);
- if( editConfig != null )
- editConfig.setProhibitedFromSearch(pfs);
- }
- Map rangeOptions = SelectListGenerator.getOptions(editConfig, "objectVar" , wdf);
- if( rangeOptions != null && rangeOptions.size() > 0 ) {
- request.setAttribute("rangeOptionsExist", true);
- request.setAttribute("rangeOptions.objectVar", rangeOptions);
- } else {
- request.setAttribute("rangeOptionsExist",false);
- }
- }
-%>
-JSP form, must be removed for the 1.4!
-<%=formTitle%>
-
-
-
- " >
-
- ${predicate.publicDescription}
-
-
-
-
-
-
- There are no entries in the system to select from.
-
-
-
-
-
- If you don't find the appropriate entry on the selection list above:
-
-
- Please create a new entry.
-
-
-
-
-
-
-
- This property is currently configured to prohibit editing.
-
-
-
-
-
-
- customCss = new ArrayList(Arrays.asList("/edit/forms/css/customForm.css"
- ));
- request.setAttribute("customCss", customCss);
-%>
-
-<%= type.getName() %>
-
-
- @prefix rdf: <${rdf}> .
- ?newInd rdf:type <${param.typeOfNew}> .
-
-
-
- @prefix rdfs: <${rdfs}> .
- ?newInd rdfs:label ?label .
-
-
-
- {
- "formUrl" : "${formUrl}",
- "editKey" : "${editKey}",
- "urlPatternToReturnTo" : "/individual",
-
- "subject" : ["subjectNotUsed", "" ],
- "predicate" : ["predicateNotUsed", "" ],
- "object" : ["objectNotUsed", "", "URI" ],
-
- "n3required" : [ "${n3ForType}" ],
-
- "n3optional" : [ "${n3ForRdfsLabel}" ],
-
- "newResources" : { "newInd" : "${defaultNamespace}" },
-
- "urisInScope" : { },
- "literalsInScope": { },
- "urisOnForm" : [ ],
- "literalsOnForm" : [ "label", "firstName", "lastName" ],
- "filesOnForm" : [ ],
- "sparqlForLiterals" : { },
- "sparqlForUris" : { },
- "sparqlForExistingLiterals" : { },
- "sparqlForExistingUris" : { },
- "fields" : {
- "label" : {
- "newResource" : "false",
- "validators" : [ "nonempty" ],
- "optionsType" : "UNDEFINED",
- "literalOptions" : [ ],
- "predicateUri" : "",
- "objectClassUri" : "",
- "rangeDatatypeUri" : "${stringDatatypeUriJson}",
- "rangeLang" : "",
- "assertions" : [ ]
- }
- }
-}
-
-<%
- EditConfiguration editConfig = EditConfiguration.getConfigFromSession(session,request);
- if (editConfig == null) {
- editConfig = new EditConfiguration((String) request.getAttribute("editjson"));
- EditConfiguration.putConfigInSession(editConfig,session);
- }
- editConfig.setEntityToReturnTo("?newInd");
-
- //this form always is always doing a non-update:
- Model model = (Model) application.getAttribute("jenaOntModel");
- editConfig.prepareForNonUpdate(model);
-%>
-
-JSP form, must be removed for the 1.4!
-Create a new ${typeName}
-
-" >
-
- * required fields
-
-
-
-
-
-<%
- String subjectUri = request.getParameter("subjectUri");
- String predicateUri = request.getParameter("predicateUri");
- String objectUri = request.getParameter("objectUri");
-
- VitroRequest vreq = new VitroRequest(request);
- WebappDaoFactory wdf = vreq.getWebappDaoFactory();
- if( wdf == null ) {
- throw new Error("could not get a WebappDaoFactory");
- }
- ObjectProperty prop = wdf.getObjectPropertyDao().getObjectPropertyByURI(predicateUri);
- if( prop == null ) {
- throw new Error("In propDelete.jsp, could not find property " + predicateUri);
- }
- request.setAttribute("propertyName",prop.getDomainPublic().toLowerCase());
-
- //do the delete
- if( request.getParameter("y") != null ) {
-
- String editorUri = EditN3Utils.getEditorUri(request);
- wdf = wdf.getUserAwareDaoFactory(editorUri);
-
- if (prop.getStubObjectRelation()) {
- Individual object = (Individual)request.getAttribute("object");
- if (object==null) {
- object = getUnfilteredDaoFactory().getIndividualDao().getIndividualByURI(objectUri);
- }
- if( object != null ) {
- log.warn("Deleting individual "+object.getName()+" since property has been set to force range object deletion");
- wdf.getIndividualDao().deleteIndividual(object);
- } else {
- throw new Error("Could not find object as request attribute or in model: '" + objectUri + "'");
- }
- }
- wdf.getPropertyInstanceDao().deleteObjectPropertyStatement(subjectUri,predicateUri,objectUri); %>
- statement = new HashMap();
- for (Object key : params.keySet()) {
- String keyString = (String) key; //key.toString()
- if (keyString.startsWith("statement_")) {
- keyString = keyString.replaceFirst("statement_", "");
- String value = ( (String[]) params.get(key))[0];
- statement.put(keyString, value);
- }
- }
-
- // Process the statement data through the template to create the display string
- String statementDisplay = null;
- if (! statement.isEmpty()) {
- Map map = new HashMap();
- map.put("statement", statement);
-
- /* Some propStatements (propStatement-educationalTraining.ftl) make reference to the individual,
- * but instead of adding it to the data model we'll test in the template for non-existence. If
- * this becomes more common, add it here instead. We don't want to generate the property
- * list for the individual, though, so should modify IndividualTemplateModel to make that
- * conditional, or perhaps use a different template model that contains only the limited
- * information needed in the propStatement templates.
- */
- //map.put("individual", new IndividualTemplateModel(subject, vreq));
-
- //map.putAll(FreemarkerHttpServlet.getDirectives());
- //map.putAll(FreemarkerHttpServlet.getMethods());
- ServletContext context = getServletContext();
- FreemarkerConfiguration fmConfig = FreemarkerConfigurationLoader.getConfig(vreq, context);
- fmConfig.resetRequestSpecificSharedVariables();
- TemplateProcessingHelper helper = new TemplateProcessingHelper(fmConfig, vreq, context);
- statementDisplay = helper.processTemplateToString(templateName, map);
- }
- request.setAttribute("statementDisplay", statementDisplay);
-%>
-
-JSP form, must be removed for the 1.4!
-
-
-
- validatorList = new ArrayList();
- if (predicateUri.equals(VitroVocabulary.LABEL) || predicateUri.equals(VitroVocabulary.RDF_TYPE)) {
- validatorList.add("\"nonempty\"");
- }
- if (!StringUtils.isEmpty(rangeDatatypeUriJson)) {
- validatorList.add("\"datatype:" + rangeDatatypeUriJson + "\"");
- }
- vreq.setAttribute("validators", StringUtils.join(validatorList, ","));
-
-%>
-
-
- ?subject <${predicate}> ?label .
-
-
-
- {
- "formUrl" : "${formUrl}",
- "editKey" : "${editKey}",
- "datapropKey" : "<%= datapropKeyStr == null ? "" : datapropKeyStr %>",
- "urlPatternToReturnTo" : "/entity",
-
- "subject" : ["subject", "${subjectUriJson}" ],
- "predicate" : ["predicate", "${predicateUriJson}" ],
- "object" : ["label", "", "DATAPROPHASH" ],
-
- "n3required" : [ "${dataAssertion}" ],
- "n3optional" : [ ],
- "newResources" : { },
- "urisInScope" : { },
- "literalsInScope": { },
- "urisOnForm" : [ ],
- "literalsOnForm" : [ "label" ],
- "filesOnForm" : [ ],
- "sparqlForLiterals" : { },
- "sparqlForUris" : { },
- "sparqlForExistingLiterals" : { },
- "sparqlForExistingUris" : { },
- "fields" : {
- "label" : {
- "newResource" : "false",
- "validators" : [ ${validators} ],
- "optionsType" : "UNDEFINED",
- "literalOptions" : [ ],
- "predicateUri" : "",
- "objectClassUri" : "",
- "rangeDatatypeUri" : "${rangeDatatypeUriJson}",
- "rangeLang" : "${rangeLangJson}",
- "assertions" : [ "${dataAssertion}" ]
- }
- }
-}
-
-
-<%
- if( log.isDebugEnabled()) log.debug(request.getAttribute("editjson"));
-
- EditConfiguration editConfig = EditConfiguration.getConfigFromSession(session,request);
- if (editConfig == null) {
- log.debug("No editConfig in session. Making new editConfig.");
- log.debug(vreq.getAttribute("editjson"));
- editConfig = new EditConfiguration((String)vreq.getAttribute("editjson"));
- EditConfiguration.putConfigInSession(editConfig, session);
-
- }
-
- if ( datapropKeyStr != null && datapropKeyStr.trim().length() > 0 ) {
- editConfig.prepareForDataPropUpdate(model,dps);
- }
-
- // Configure form
- String actionText = dps == null ? "Add new " : "Edit ";
- String submitLabel = actionText + "label";
- String title = actionText + "label for " + subject.getName();
-
-%>
-
-
-
-
-JSP form, must be removed for the 1.4!
-
-<%= title %>
-" >
-
-
-
-
-
-
-
-