From a1dcf5ffcf4e17905999232be29d0c6349d65689 Mon Sep 17 00:00:00 2001 From: bdc34 Date: Fri, 5 Feb 2010 20:02:47 +0000 Subject: [PATCH] Fixing NIHVIVO-57 for personHasPositinHistory custom form --- .../edit/forms/personHasPositionHistory.jsp | 108 ++---------------- 1 file changed, 7 insertions(+), 101 deletions(-) diff --git a/modifications/edit/forms/personHasPositionHistory.jsp b/modifications/edit/forms/personHasPositionHistory.jsp index 85562a48..7726b778 100644 --- a/modifications/edit/forms/personHasPositionHistory.jsp +++ b/modifications/edit/forms/personHasPositionHistory.jsp @@ -61,22 +61,6 @@ ?positionUri ?startYear . - - SELECT ?startYearMonthExisting WHERE { - ?positionUri ?startYearMonthExisting } - - - ?positionUri ?startYearMonth . - - - - SELECT ?startDateExisting WHERE { - ?positionUri ?startDateExisting } - - - ?positionUri ?startDate . - - SELECT ?endYearExisting WHERE { ?positionUri ?endYearExisting } @@ -85,22 +69,6 @@ ?positionUri ?endYear . - - SELECT ?endYearMonthExisting WHERE { - ?positionUri ?endYearMonthExisting } - - - ?positionUri ?endYearMonth . - - - - SELECT ?endDateExisting WHERE { - ?positionUri ?endDateExisting } - - - ?positionUri ?endDate . - - <%-- 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 --%> @@ -139,15 +107,13 @@ "n3required" : [ "${n3ForStmtToPerson}", "${titleAssertion}" ], "n3optional" : [ "${organizationNameAssertion}","${organizationUriAssertion}", - "${startYearAssertion}","${startYearMonthAssertion}","${startDateAssertion}", - "${endYearAssertion}","${endYearMonthAssertion}","${endDateAssertion}"], + "${startYearAssertion}","${endYearAssertion}"], "newResources" : { "positionUri" : "${defaultNamespace}/position" }, "urisInScope" : { }, "literalsInScope": { }, "urisOnForm" : [ "organizationUri" ], "literalsOnForm" : [ "title", "organizationName", - "startYear", "startYearMonth", "startDate", - "endYear", "endYearMonth", "endDate" ], + "startYear", "endYear" ], "filesOnForm" : [ ], "sparqlForLiterals" : { }, "sparqlForUris" : { }, @@ -155,11 +121,7 @@ "title" : "${titleExisting}", "organizationName" : "${organizationNameExisting}", "startYear" : "${startYearExisting}", - "startYearMonth" : "${startYearMonthExisting}", - "startDate" : "${startDateExisting}", - "endYear" : "${endYearExisting}", - "endYearMonth" : "${endYearMonthExisting}", - "endDate" : "${endDateExisting}" + "endYear" : "${endYearExisting}" }, "sparqlForExistingUris" : { "organizationUri" : "${organizationUriExisting}" @@ -200,7 +162,7 @@ }, "startYear" : { "newResource" : "false", - "validators" : [ ], + "validators" : [ "datatype:http://www.w3.org/2001/XMLSchema#gYear" ], "optionsType" : "UNDEFINED", "literalOptions" : [ ], "predicateUri" : "", @@ -209,31 +171,9 @@ "rangeLang" : "", "assertions" : ["${startYearAssertion}"] }, - "startYearMonth" : { - "newResource" : "false", - "validators" : [], - "optionsType" : "UNDEFINED", - "literalOptions" : [ ], - "predicateUri" : "", - "objectClassUri" : "", - "rangeDatatypeUri" : "http://www.w3.org/2001/XMLSchema#gYearMonth"; - "rangeLang" : "", - "assertions" : [ "${startYearMonthAssertion}" ] - }, - "startDate" : { - "newResource" : "false", - "validators" : [], - "optionsType" : "UNDEFINED", - "literalOptions" : [], - "predicateUri" : "", - "objectClassUri" : "", - "rangeDatatypeUri" : "http://www.w3.org/2001/XMLSchema#Date", - "rangeLang" : "", - "assertions" : [ "${startDateAssertion}" ] - }, "endYear" : { "newResource" : "false", - "validators" : [ ], + "validators" : [ "datatype:http://www.w3.org/2001/XMLSchema#gYear" ], "optionsType" : "UNDEFINED", "literalOptions" : [ ], "predicateUri" : "", @@ -241,29 +181,7 @@ "rangeDatatypeUri" : "http://www.w3.org/2001/XMLSchema#gYear", "rangeLang" : "", "assertions" : ["${endYearAssertion}"] - }, - "endYearMonth" : { - "newResource" : "false", - "validators" : [], - "optionsType" : "UNDEFINED", - "literalOptions" : [ ], - "predicateUri" : "", - "objectClassUri" : "", - "rangeDatatypeUri" : "http://www.w3.org/2001/XMLSchema#gYearMonth"; - "rangeLang" : "", - "assertions" : [ "${endYearMonthAssertion}" ] - }, - "endDate" : { - "newResource" : "false", - "validators" : [], - "optionsType" : "UNDEFINED", - "literalOptions" : [], - "predicateUri" : "", - "objectClassUri" : "", - "rangeDatatypeUri" : "http://www.w3.org/2001/XMLSchema#Date", - "rangeLang" : "", - "assertions" : [ "${endDateAssertion}" ] - } + } } } @@ -304,20 +222,8 @@ - - - - <%-- - - - --%> - + - - <%-- - - - --%>