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

Merging revision 474 from rel-1.0-maint.

Browse source
This commit is contained in:
rjy7 2010-04-13 23:24:35 +00:00
parent 83d1b564ef
commit 010a143880
2 changed files with 13 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
productMods/edit/forms/personHasEducationalBackground.jsp
View file

@ -147,9 +147,6 @@ core:organizationGrantingDegree (EducationalBackground : Organization) - no inve
<%-- Break up the new org type and subclass assertions, so that if there is no subclass,
the org type still gets asserted. --%>
<v:jsonset var="newOrgTypeAssertion">
?newOrg a <${orgClass}> .
</v:jsonset>
<v:jsonset var="newOrgSubClassAssertion">
?newOrg a ?newOrgType .
</v:jsonset>
@ -159,22 +156,17 @@ the org type still gets asserted. --%>
?person core:educationalBackground ?edBackgroundUri .
?edBackgroundUri core:educationalBackgroundOf ?person ;
a core:EducationalBackground ;
a <${flagURI}> .
a core:EducationalBackground ,
<${flagURI}> .
</v:jsonset>
<v:jsonset var="n3ForNewOrg">
?newOrg <${label}> ?newOrgName ;
a <${orgClass}> ,
a ?newOrgType ,
<${flagURI}> .
?edBackgroundUri <${orgGrantingDegree}> ?newOrg .
</v:jsonset>
<%-- Break up the new org type and subclass assertions, so that if there is no subclass,
the type still gets asserted. --%>
<v:jsonset var="n3ForNewOrgSubClass">
?newOrg a ?newOrgType .
</v:jsonset>
<v:jsonset var="edBackgroundClassUriJson">${edBackgroundClass}</v:jsonset>
<v:jsonset var="orgClassUriJson">${orgClass}</v:jsonset>
@ -193,8 +185,8 @@ the type still gets asserted. --%>
"n3required" : [ "${n3ForStmtToPerson}", "${degreeAssertion}", "${majorFieldAssertion}", "${yearAssertion}" ],
"n3optional" : [ "${organizationUriAssertion}",
"${n3ForNewOrg}", "${n3ForNewOrgSubClass}", "${newOrgNameAssertion}", "${newOrgTypeAssertion}",
"${newOrgSubClassAssertion}", "${deptAssertion}", "${infoAssertion}" ],
"${n3ForNewOrg}", "${newOrgNameAssertion}", "${newOrgTypeAssertion}",
"${deptAssertion}", "${infoAssertion}" ],
"newResources" : { "edBackgroundUri" : "${defaultNamespace}",
"newOrg" : "${defaultNamespace}" },
@ -270,7 +262,7 @@ the type still gets asserted. --%>
"objectClassUri" : "",
"rangeDatatypeUri" : "${stringDatatypeUriJson}",
"rangeLang" : "",
"assertions" : [ "${n3ForNewOrg}", "${n3ForNewOrgSubClass}" ]
"assertions" : [ "${n3ForNewOrg}" ]
},
"newOrgType" : {
"newResource" : "false",
@ -281,7 +273,7 @@ the type still gets asserted. --%>
"objectClassUri" : "${orgClassUriJson}",
"rangeDatatypeUri" : "",
"rangeLang" : "",
"assertions" : [ "${newOrgTypeAssertion}", "${newOrgSubClassAssertion}" ]
"assertions" : [ "${newOrgTypeAssertion}" ]
},
"dept" : {
"newResource" : "false",

23
productMods/edit/forms/personHasPositionHistory.jsp
View file

@ -108,12 +108,7 @@
<v:jsonset var="newOrgNameAssertion">
?newOrg <${label}> ?newOrgName .
</v:jsonset>
<%-- Break up the new org type and subclass assertions, so that if there is no subclass,
the type still gets asserted. --%>
<v:jsonset var="newOrgTypeAssertion">
?newOrg a <${orgClass}> .
</v:jsonset>
<v:jsonset var="newOrgSubClassAssertion">
?newOrg a ?newOrgType .
</v:jsonset>
@ -130,18 +125,12 @@ the type still gets asserted. --%>
<v:jsonset var="n3ForNewOrg">
?positionUri <${positionInOrgPred}> ?newOrg .
?newOrg <${label}> ?newOrgName .
?newOrg a <${orgClass}> ,
?newOrg <${label}> ?newOrgName ;
a ?newOrgType ,
<${flagURI}> ;
<${orgForPositionPred}> ?positionUri .
</v:jsonset>
<%-- Break up the new org type and subclass assertions, so that if there is no subclass,
the type still gets asserted. --%>
<v:jsonset var="n3ForNewOrgSubClass">
?newOrg a ?newOrgType .
</v:jsonset>
<v:jsonset var="positionClassUriJson">${positionClass}</v:jsonset>
<v:jsonset var="orgClassUriJson">${orgClass}</v:jsonset>
@ -159,8 +148,8 @@ the type still gets asserted. --%>
"n3required" : [ "${n3ForStmtToPerson}", "${titleAssertion}", "${startYearAssertion}" ],
"n3optional" : [ "${organizationUriAssertion}",
"${n3ForNewOrg}", "${n3ForNewOrgSubClass}", "${newOrgNameAssertion}", "${newOrgTypeAssertion}",
"${newOrgSubClassAssertion}", "${endYearAssertion}"],
"${n3ForNewOrg}", "${newOrgNameAssertion}", "${newOrgTypeAssertion}",
"${endYearAssertion}"],
"newResources" : { "positionUri" : "${defaultNamespace}",
"newOrg" : "${defaultNamespace}" },
@ -224,7 +213,7 @@ the type still gets asserted. --%>
"objectClassUri" : "",
"rangeDatatypeUri" : "${stringDatatypeUriJson}",
"rangeLang" : "",
"assertions" : [ "${n3ForNewOrg}", "${n3ForNewOrgSubClass}" ]
"assertions" : [ "${n3ForNewOrg}" ]
},
"newOrgType" : {
"newResource" : "false",
@ -235,7 +224,7 @@ the type still gets asserted. --%>
"objectClassUri" : "${orgClassUriJson}",
"rangeDatatypeUri" : "",
"rangeLang" : "",
"assertions" : [ "${newOrgTypeAssertion}", "${newOrgSubClassAssertion}" ]
"assertions" : [ "${newOrgTypeAssertion}" ]
},
"startYear" : {
"newResource" : "false",