-
+
diff --git a/productMods/edit/forms/personHasPositionHistory.old.jsp b/productMods/edit/forms/personHasPositionHistory.old.jsp
deleted file mode 100644
index b700e4fb..00000000
--- a/productMods/edit/forms/personHasPositionHistory.old.jsp
+++ /dev/null
@@ -1,276 +0,0 @@
-<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
-
-<%@ page import="java.util.List" %>
-<%@ page import="java.util.ArrayList" %>
-<%@ page import="java.util.Arrays" %>
-
-<%@ page import="com.hp.hpl.jena.rdf.model.Literal"%>
-<%@ page import="com.hp.hpl.jena.rdf.model.Model"%>
-<%@ page import="com.hp.hpl.jena.vocabulary.XSD" %>
-
-<%@ page import="edu.cornell.mannlib.vitro.webapp.beans.Individual"%>
-<%@ page import="edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary"%>
-<%@ page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.EditConfiguration"%>
-<%@ page import="edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory"%>
-<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.VitroRequest"%>
-<%@ page import="edu.cornell.mannlib.vitro.webapp.web.MiscWebUtils"%>
-
-<%@ page import="org.apache.commons.logging.Log" %>
-<%@ page import="org.apache.commons.logging.LogFactory" %>
-
-<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core"%>
-<%@ taglib prefix="v" uri="http://vitro.mannlib.cornell.edu/vitro/tags" %>
-
-<%!
- public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.edit.forms.personHasPositionHistory.jsp");
-%>
-<%
- VitroRequest vreq = new VitroRequest(request);
- WebappDaoFactory wdf = vreq.getWebappDaoFactory();
- vreq.setAttribute("defaultNamespace", wdf.getDefaultNamespace());
-
- String flagURI = null;
- if (vreq.getAppBean().isFlag1Active()) {
- flagURI = VitroVocabulary.vitroURI+"Flag1Value"+vreq.getPortal().getPortalId()+"Thing";
- } else {
- flagURI = wdf.getVClassDao().getTopConcept().getURI(); // fall back to owl:Thing if not portal filtering
- }
- vreq.setAttribute("flagURI",flagURI);
-
- request.setAttribute("stringDatatypeUriJson", MiscWebUtils.escape(XSD.xstring.toString()));
- request.setAttribute("gYearDatatypeUriJson", MiscWebUtils.escape(XSD.gYear.toString()));
-%>
-
-
-
-
-
-<%-- Then 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 --%>
-
-
- SELECT ?titleExisting WHERE {
- ?positionUri <${titlePred}> ?titleExisting }
-
-
-<%-- 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) --%>
-
- ?positionUri <${titlePred}> ?title .
- ?positionUri <${rdf}label> ?title.
-
-
-
-
- SELECT ?existingOrgName WHERE {
- ?positionUri <${involvedOrgNamePred}> ?existingOrgName }
-
-
- ?positionUri <${involvedOrgNamePred}> ?organizationName .
-
-
-
-
- SELECT ?startYearExisting WHERE {
- ?positionUri <${startYearPred}> ?startYearExisting }
-
-
- ?positionUri <${startYearPred}> ?startYear .
-
-
-
-
- SELECT ?endYearExisting WHERE {
- ?positionUri <${endYearPred}> ?endYearExisting }
-
-
- ?positionUri <${endYearPred}> ?endYear .
-
-
-<%-- Note there is really no difference in how things are set up for an object property except
- below in the n3ForEdit section, in whether the ..Existing variable goes in SparqlForExistingLiterals
- or in the SparqlForExistingUris, as well as perhaps in how the options are prepared --%>
-
-
- SELECT ?existingOrgUri WHERE {
- ?positionUri <${positionInOrgPred}> ?existingOrgUri }
-
-
- ?positionUri <${positionInOrgPred}> ?organizationUri .
- ?organizationUri <${vivo}organizationForPosition> ?positionUri .
-
-
-
- @prefix rdf: <${rdf}>.
- @prefix core: <${vivo}>.
-
- ?person core:personInPosition ?positionUri .
- ?positionUri core:positionForPerson ?person .
- ?positionUri rdf:type core:Position .
- ?positionUri rdf:type <${flagURI}> .
-
-
-
http://vivoweb.org/ontology/core#Position
-
http://xmlns.com/foaf/0.1/Organization
-
-
-
- {
- "formUrl" : "${formUrl}",
- "editKey" : "${editKey}",
- "urlPatternToReturnTo" : "/entity",
-
- "subject" : ["person", "${subjectUriJson}" ],
- "predicate" : ["predicate", "${predicateUriJson}" ],
- "object" : ["positionUri", "${objectUriJson}", "URI" ],
-
- "n3required" : [ "${n3ForStmtToPerson}", "${titleAssertion}", "${startYearAssertion}" ],
- "n3optional" : [ "${organizationNameAssertion}","${organizationUriAssertion}",
- "${endYearAssertion}"],
- "newResources" : { "positionUri" : "${defaultNamespace}" },
- "urisInScope" : { },
- "literalsInScope": { },
- "urisOnForm" : [ "organizationUri" ],
- "literalsOnForm" : [ "title", "organizationName",
- "startYear", "endYear" ],
- "filesOnForm" : [ ],
- "sparqlForLiterals" : { },
- "sparqlForUris" : { },
- "sparqlForExistingLiterals" : {
- "title" : "${titleExisting}",
- "organizationName" : "${organizationNameExisting}",
- "startYear" : "${startYearExisting}",
- "endYear" : "${endYearExisting}"
- },
- "sparqlForExistingUris" : {
- "organizationUri" : "${organizationUriExisting}"
- },
- "fields" : {
- "title" : {
- "newResource" : "false",
- "validators" : [ "nonempty" ],
- "optionsType" : "UNDEFINED",
- "literalOptions" : [ ],
- "predicateUri" : "",
- "objectClassUri" : "",
- "rangeDatatypeUri" : "",
- "rangeLang" : "",
- "assertions" : [ "${titleAssertion}" ]
- },
- "organizationUri" : {
- "newResource" : "false",
- "validators" : [ ],
- "optionsType" : "INDIVIDUALS_VIA_VCLASS",
- "literalOptions" : [ "Select one" ],
- "predicateUri" : "",
- "objectClassUri" : "${organizationClass}",
- "rangeDatatypeUri" : "",
- "rangeLang" : "",
- "assertions" : [ "${organizationUriAssertion}" ]
- },
- "organizationName" : {
- "newResource" : "false",
- "validators" : [ ],
- "optionsType" : "UNDEFINED",
- "literalOptions" : [ ],
- "predicateUri" : "",
- "objectClassUri" : "",
- "rangeDatatypeUri" : "${stringDatatypeUriJson}",
- "rangeLang" : "",
- "assertions" : [ "${organizationNameAssertion}" ]
- },
- "startYear" : {
- "newResource" : "false",
- "validators" : [ "nonempty", "datatype:${gYearDatatypeUriJson}" ],
- "optionsType" : "UNDEFINED",
- "literalOptions" : [ ],
- "predicateUri" : "",
- "objectClassUri" : "",
- "rangeDatatypeUri" : "${gYearDatatypeUriJson}",
- "rangeLang" : "",
- "assertions" : ["${startYearAssertion}"]
- },
- "endYear" : {
- "newResource" : "false",
- "validators" : [ "datatype:${gYearDatatypeUriJson}" ],
- "optionsType" : "UNDEFINED",
- "literalOptions" : [ ],
- "predicateUri" : "",
- "objectClassUri" : "",
- "rangeDatatypeUri" : "${gYearDatatypeUriJson}",
- "rangeLang" : "",
- "assertions" : ["${endYearAssertion}"]
- }
- }
-}
-
-<%
- 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);
- }
-
- Model model = (Model) application.getAttribute("jenaOntModel");
- String objectUri = (String) request.getAttribute("objectUri");
- if (objectUri != null) {
- editConfig.prepareForObjPropUpdate(model);
- } else {
- editConfig.prepareForNonUpdate(model);
- }
-
- /* prepare the page title and text for the submit button */
- String subjectName = ((Individual) request.getAttribute("subject")).getName();
- String submitLabel = "";
- if (objectUri != null) {
- request.setAttribute("title","Edit position entry for "+ subjectName);
- submitLabel = "Save changes";
- } else {
- request.setAttribute("title","Create a new position entry for " + subjectName);
- submitLabel = "Create new position history entry";
- }
-
- List
customJs = new ArrayList(Arrays.asList("forms/js/personHasPositionHistory.js"));
- request.setAttribute("customJs", customJs);
-
- List customCss = new ArrayList(Arrays.asList("forms/css/personHasPositionHistory.css"));
- request.setAttribute("customCss", customCss);
-%>
-
-
-
-${title}
-
-" >
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-