From ed71f74e105a7c73010bdeeb5fc6d372e4dda7ca Mon Sep 17 00:00:00 2001
From: brianjlowe <bjl23@cornell.edu>
Date: Fri, 9 Aug 2013 16:24:08 -0400
Subject: [PATCH] continued work on ISF conversion and data migration

---
 .../filegraph/tbox/appControls-temp.n3        | 54 +++++++++++++++++++
 .../update/oldAnnotations/placeholder.n3      |  0
 .../PersonHasPositionHistoryGenerator.java    |  1 +
 3 files changed, 55 insertions(+)
 create mode 100644 productMods/WEB-INF/filegraph/tbox/appControls-temp.n3
 create mode 100644 productMods/WEB-INF/ontologies/update/oldAnnotations/placeholder.n3

diff --git a/productMods/WEB-INF/filegraph/tbox/appControls-temp.n3 b/productMods/WEB-INF/filegraph/tbox/appControls-temp.n3
new file mode 100644
index 00000000..fcea92db
--- /dev/null
+++ b/productMods/WEB-INF/filegraph/tbox/appControls-temp.n3
@@ -0,0 +1,54 @@
+@prefix hr:      <http://vivo.cornell.edu/ns/hr/0.9/hr.owl#> .
+@prefix afn:     <http://jena.hpl.hp.com/ARQ/function#> .
+@prefix :        <http://vivoweb.org/ontology/activity-insight#> .
+@prefix scires:  <http://vivoweb.org/ontology/scientific-research#> .
+@prefix aka:     <http://vivoweb.org/ontology/aka#> .
+@prefix pubmed:  <http://vitro.mannlib.cornell.edu/ns/pubmed#> .
+@prefix vann:    <http://purl.org/vocab/vann/> .
+@prefix owl2:    <http://www.w3.org/2006/12/owl2-xml#> .
+@prefix wcmc:    <http://weill.cornell.edu/vivo/ontology/wcmc#> .
+@prefix dcterms:  <http://purl.org/dc/terms/> .
+@prefix rdfs:    <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix swrl:    <http://www.w3.org/2003/11/swrl#> .
+@prefix vitro:   <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> .
+@prefix event:   <http://purl.org/NET/c4dm/event.owl#> .
+@prefix wos:     <http://vivo.mannlib.cornell.edu/ns/ThomsonWOS/0.1#> .
+@prefix vivoc:   <http://vivo.library.cornell.edu/ns/0.1#> .
+@prefix swvs:    <http://www.w3.org/2003/06/sw-vocab-status/ns#> .
+@prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix c4o:     <http://purl.org/spar/c4o/> .
+@prefix cce:     <http://vivoweb.org/ontology/cornell-cooperative-extension#> .
+@prefix dcelem:  <http://purl.org/dc/elements/1.1/> .
+@prefix vivo:    <http://vivoweb.org/ontology/core#> .
+@prefix dc:      <http://purl.org/dc/elements/1.1/> .
+@prefix geo:     <http://aims.fao.org/aos/geopolitical.owl#> .
+@prefix pvs:     <http://vivoweb.org/ontology/provenance-support#> .
+@prefix foaf:    <http://xmlns.com/foaf/0.1/> .
+@prefix aktp:    <http://www.aktors.org/ontology/portal#> .
+@prefix far:     <http://vitro.mannlib.cornell.edu/ns/reporting#> .
+@prefix fabio:   <http://purl.org/spar/fabio/> .
+@prefix skco:    <http://www.w3.org/2004/02/skos/core#> .
+@prefix ospcu:   <http://vivoweb.org/ontology/cu-vivo-osp#> .
+@prefix acti:    <http://vivoweb.org/ontology/activity-insight#> .
+@prefix ai:      <http://vivoweb.org/ontology/activity-insight#> .
+@prefix sce:     <http://vivoweb.org/ontology/SchoolOfContinuingEducation#> .
+@prefix stars:   <http://vitro.mannlib.cornell.edu/ns/cornell/stars/classes#> .
+@prefix bibo:    <http://purl.org/ontology/bibo/> .
+@prefix xsd:     <http://www.w3.org/2001/XMLSchema#> .
+@prefix swrlb:   <http://www.w3.org/2003/11/swrlb#> .
+@prefix owl:     <http://www.w3.org/2002/07/owl#> .
+@prefix core:    <http://vivoweb.org/ontology/core#> .
+@prefix socsci:  <http://vivo.library.cornell.edu/ns/vivo/socsci/0.1#> .
+@prefix rdfsyn:  <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix local:   <http://vivo.cornell.edu/ontology/local#> .
+@prefix vitro-public:  <http://vitro.mannlib.cornell.edu/ns/vitro/public#> .
+@prefix mann:    <http://vivo.cornell.edu/ns/mannadditions/0.1#> .
+@prefix skos:    <http://www.w3.org/2004/02/skos/core#> .
+@prefix ero:     <http://purl.obolibrary.org/obo/> .
+
+foaf:Agent
+      rdfs:subClassOf
+              [ a       owl:Restriction ;
+                owl:allValuesFrom core:Relationship ;
+                owl:onProperty core:relatedBy
+              ] .
diff --git a/productMods/WEB-INF/ontologies/update/oldAnnotations/placeholder.n3 b/productMods/WEB-INF/ontologies/update/oldAnnotations/placeholder.n3
new file mode 100644
index 00000000..e69de29b
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasPositionHistoryGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasPositionHistoryGenerator.java
index be571723..9053c48e 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasPositionHistoryGenerator.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasPositionHistoryGenerator.java
@@ -206,6 +206,7 @@ public class PersonHasPositionHistoryGenerator extends VivoBaseGenerator impleme
     final static String orgLabelQuery =
         "SELECT ?existingOrgLabel WHERE { \n" +
         "  ?position <" + positionInOrgPred + "> ?existingOrg . \n" +
+        "  ?existingOrg a <" + orgClass + "> . \n" +
         "  ?existingOrg <" + label + "> ?existingOrgLabel . \n" +
         "}";