more property cleanup

2013-11-22 11:59:36 -05:00 · 2013-11-22 11:59:36 -05:00 · c66cdbf4aa
commit c66cdbf4aa
parent 5623eb82d4
6 changed files with 133 additions and 74 deletions
--- a/productMods/config/listViewConfig-relatedRole.xml
+++ b/productMods/config/listViewConfig-relatedRole.xml
@ -36,9 +36,9 @@
            OPTIONAL { ?role &lt;http://purl.obolibrary.org/obo/RO_0000052&gt; ?indivInRole .
                       ?indivInRole rdfs:label ?indivLabel 
            }
-            OPTIONAL { ?role &lt;http://purl.obolibrary.org/obo/BFO_0000055&gt; ?indivInRole .
+            OPTIONAL { ?role &lt;http://purl.obolibrary.org/obo/BFO_0000054&gt; ?indivInRole .
            }
-            OPTIONAL { ?role &lt;http://purl.obolibrary.org/obo/BFO_0000055&gt; ?indivInRole .
+            OPTIONAL { ?role &lt;http://purl.obolibrary.org/obo/BFO_0000054&gt; ?indivInRole .
                       ?indivInRole rdfs:label ?indivLabel 
            }

@ -92,7 +92,7 @@
            } UNION {
               ?subject ?property ?role .
               ?role a ?objectType .
-               ?role &lt;http://purl.obolibrary.org/obo/BFO_0000055&gt; ?indivInRole .
+               ?role &lt;http://purl.obolibrary.org/obo/BFO_0000054&gt; ?indivInRole .
               ?indivInRole rdfs:label ?indivLabel
            }
        } 
--- a/productMods/config/listViewConfig-roleContributesTo.xml
+++ b/productMods/config/listViewConfig-roleContributesTo.xml
@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!-- $This file is distributed under the terms of the license in /doc/license.txt$ -->

-<!-- See guidelines in vitro/doc/list_view_configuration_guidelines.txt -->
+<!-- See guidelines in vitro/doc/list_view_configuration_guidelines.txt 
+     This list view used for both roleContributesTo and BFO_0000054, which
+     is for events.
+-->

 <list-view-config>
    <query-select>    
@ -31,6 +34,13 @@
                        ?activity vitro:mostSpecificType ?subclass   
                        </collated>
            }           
+            OPTIONAL {  ?role &lt;http://purl.obolibrary.org/obo/BFO_0000054&gt; ?activity .
+                        ?activity rdfs:label ?activityLabel 
+                        
+                        <collated>
+                        ?activity vitro:mostSpecificType ?subclass   
+                        </collated>
+            }           
            OPTIONAL { ?role rdfs:label ?roleLabel }
            OPTIONAL { ?role core:dateTimeInterval ?dateTimeInterval .
                       ?dateTimeInterval core:start ?dateTimeStartValue .
@ -61,6 +71,24 @@
        }
    </query-construct>

+    <query-construct>
+        PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;  
+        PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;          
+        PREFIX vitro: &lt;http://vitro.mannlib.cornell.edu/ns/vitro/0.7#&gt;
+        
+        CONSTRUCT {
+            ?subject ?property ?role .
+            ?role a ?objectType .
+            ?role &lt;http://purl.obolibrary.org/obo/BFO_0000054&gt; ?activity .
+            ?activity vitro:mostSpecificType ?subclass .
+        } WHERE {
+            ?subject ?property ?role .
+            ?role a ?objectType .
+            ?role &lt;http://purl.obolibrary.org/obo/BFO_0000054&gt; ?activity .
+            ?activity vitro:mostSpecificType ?subclass
+        }
+    </query-construct>
+
    <query-construct>
        PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
        PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;    
--- a/rdf/tbox/filegraph/linkSuppression.n3
+++ b/rdf/tbox/filegraph/linkSuppression.n3
@ -10,3 +10,4 @@ core:hasResearchArea config:deleteLinkSuppressed "true"^^xsd:boolean .
 core:researchAreaOf config:deleteLinkSuppressed "true"^^xsd:boolean .
 core:hasSubjectArea config:deleteLinkSuppressed "true"^^xsd:boolean .
 core:subjectAreaFor config:deleteLinkSuppressed "true"^^xsd:boolean .
+core:geographicFocusOf config:editLinkSuppressed "true"^^xsd:boolean .
--- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddOrganizerRoleToPersonGenerator.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddOrganizerRoleToPersonGenerator.java
@ -1,68 +1,68 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators;
-
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ConstantFieldOptions;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldOptions;
-
-public class AddOrganizerRoleToPersonGenerator extends AddRoleToPersonTwoStageGenerator {
-	
-	private static String template = "addOrganizerRoleToPerson.ftl";
-	
-    
-	@Override
-	String getTemplate() {
-		return template;
-	}
-
-	@Override
-	String getRoleType() {
-		return "http://vivoweb.org/ontology/core#OrganizerRole";
-	}
-	
-	//Organizer role involves hard-coded options for the "right side" of the role or activity
-    @Override
-    FieldOptions getRoleActivityFieldOptions(VitroRequest vreq) throws Exception {
-		return new ConstantFieldOptions(
-        "","Select type",
-        "http://purl.org/NET/c4dm/event.owl#Event", "Event",
-        "http://vivoweb.org/ontology/core#Competition", "Competition",
-        "http://purl.org/ontology/bibo/Conference", "Conference",
-        "http://vivoweb.org/ontology/core#Course", "Course",
-        "http://vivoweb.org/ontology/core#Exhibit", "Exhibit",
-        "http://purl.org/ontology/bibo/Hearing", "Hearing",
-        "http://purl.org/ontology/bibo/Interview", "Interview",
-        "http://vivoweb.org/ontology/core#Meeting", "Meeting",
-        "http://purl.org/ontology/bibo/Performance", "Performance",
-        "http://vivoweb.org/ontology/core#Presentation", "Presentation",
-        "http://vivoweb.org/ontology/core#InvitedTalk", "Invited Talk",
-        "http://purl.org/ontology/bibo/Workshop", "Workshop",
-        "http://vivoweb.org/ontology/core#EventSeries", "Event Series",
-        "http://vivoweb.org/ontology/core#ConferenceSeries", "Conference Series",
-        "http://vivoweb.org/ontology/core#SeminarSeries", "Seminar Series",
-        "http://vivoweb.org/ontology/core#WorkshopSeries", "Workshop Series");
-	}
-
-	@Override
-	boolean isShowRoleLabelField() {
-		return false;
-	}
-       /* 
-        * Use the methods below to change the date/time precision in the
-        * custom form associated with this generator. When not used, the
-        * precision will be YEAR. The other precisons are MONTH, DAY, HOUR,
-        * MINUTE, TIME and NONE.
-        */
-    /*
-        public String getStartDatePrecision() {
-            String precision = VitroVocabulary.Precision.MONTH.uri();
-    	    return precision;
-        }
-
-        public String getEndDatePrecision() {
-            String precision = VitroVocabulary.Precision.DAY.uri();
-    	    return precision;
-        }
-    */    
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators;
+
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ConstantFieldOptions;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldOptions;
+
+public class AddOrganizerRoleToPersonGenerator extends AddRoleToPersonTwoStageGenerator {
+	
+	private static String template = "addOrganizerRoleToPerson.ftl";
+	
+    
+	@Override
+	String getTemplate() {
+		return template;
+	}
+
+	@Override
+	String getRoleType() {
+		return "http://vivoweb.org/ontology/core#OrganizerRole";
+	}
+	
+	//Organizer role involves hard-coded options for the "right side" of the role or activity
+    @Override
+    FieldOptions getRoleActivityFieldOptions(VitroRequest vreq) throws Exception {
+		return new ConstantFieldOptions(
+        "","Select type",
+        "http://vivoweb.org/ontology/core#Competition", "Competition",
+        "http://purl.org/ontology/bibo/Conference", "Conference",
+        "http://vivoweb.org/ontology/core#Course", "Course",
+        "http://purl.org/NET/c4dm/event.owl#Event", "Event",
+        "http://vivoweb.org/ontology/core#Exhibit", "Exhibit",
+        "http://purl.org/ontology/bibo/Hearing", "Hearing",
+        "http://purl.org/ontology/bibo/Interview", "Interview",
+        "http://vivoweb.org/ontology/core#InvitedTalk", "Invited Talk",
+        "http://vivoweb.org/ontology/core#Meeting", "Meeting",
+        "http://purl.org/ontology/bibo/Performance", "Performance",
+        "http://vivoweb.org/ontology/core#Presentation", "Presentation",
+        "http://purl.org/ontology/bibo/Workshop", "Workshop",
+        "http://vivoweb.org/ontology/core#ConferenceSeries", "Conference Series",
+        "http://vivoweb.org/ontology/core#EventSeries", "Event Series",
+        "http://vivoweb.org/ontology/core#SeminarSeries", "Seminar Series",
+        "http://vivoweb.org/ontology/core#WorkshopSeries", "Workshop Series");
+	}
+
+	@Override
+	boolean isShowRoleLabelField() {
+		return false;
+	}
+       /* 
+        * Use the methods below to change the date/time precision in the
+        * custom form associated with this generator. When not used, the
+        * precision will be YEAR. The other precisons are MONTH, DAY, HOUR,
+        * MINUTE, TIME and NONE.
+        */
+    /*
+        public String getStartDatePrecision() {
+            String precision = VitroVocabulary.Precision.MONTH.uri();
+    	    return precision;
+        }
+
+        public String getEndDatePrecision() {
+            String precision = VitroVocabulary.Precision.DAY.uri();
+    	    return precision;
+        }
+    */    
+}
--- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddOutreachProviderRoleToPersonGenerator.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddOutreachProviderRoleToPersonGenerator.java
@ -33,33 +33,48 @@ public class AddOutreachProviderRoleToPersonGenerator extends AddRoleToPersonTwo
            "http://vivoweb.org/ontology/core#College","College",
            "http://vivoweb.org/ontology/core#Committee","Committee",
            "http://vivoweb.org/ontology/core#Company","Company",
+            "http://vivoweb.org/ontology/core#Competition", "Competition",
+            "http://purl.org/ontology/bibo/Conference", "Conference",
+            "http://vivoweb.org/ontology/core#ConferenceSeries", "Conference Series",
            "http://vivoweb.org/ontology/core#Consortium","Consortium",
            "http://vivoweb.org/ontology/core#CoreLaboratory","Core Laboratory",
+            "http://vivoweb.org/ontology/core#Course", "Course",
            "http://vivoweb.org/ontology/core#Department","Department",
            "http://vivoweb.org/ontology/core#Division","Division",
            "http://purl.org/NET/c4dm/event.owl#Event","Event",
+            "http://vivoweb.org/ontology/core#EventSeries", "Event Series",
+            "http://vivoweb.org/ontology/core#Exhibit", "Exhibit",
            "http://vivoweb.org/ontology/core#ExtensionUnit","Extension Unit",
            "http://vivoweb.org/ontology/core#Foundation","Foundation",
            "http://vivoweb.org/ontology/core#FundingOrganization","Funding Organization",
            "http://vivoweb.org/ontology/core#GovernmentAgency","Government Agency",
            "http://xmlns.com/foaf/0.1/Group","Group",
+            "http://purl.org/ontology/bibo/Hearing", "Hearing",
            "http://vivoweb.org/ontology/core#Hospital","Hospital",
            "http://vivoweb.org/ontology/core#Institute","Institute",
+            "http://purl.org/ontology/bibo/Interview", "Interview",
+            "http://vivoweb.org/ontology/core#InvitedTalk", "Invited Talk",
            "http://vivoweb.org/ontology/core#Laboratory","Laboratory",
            "http://vivoweb.org/ontology/core#Library","Library",
            "http://purl.obolibrary.org/obo/OBI_0000835","Manufacturer",
+            "http://vivoweb.org/ontology/core#Meeting", "Meeting",
            "http://vivoweb.org/ontology/core#Museum","Museum",
            "http://xmlns.com/foaf/0.1/Organization","Organization",
+            "http://purl.org/ontology/bibo/Performance", "Performance",
+            "http://vivoweb.org/ontology/core#Presentation", "Presentation",
            "http://vivoweb.org/ontology/core#PrivateCompany","Private Company",
            "http://vivoweb.org/ontology/core#Program","Program",
            "http://vivoweb.org/ontology/core#Publisher","Publisher",
            "http://vivoweb.org/ontology/core#ResearchOrganization","Research Organization",
            "http://vivoweb.org/ontology/core#School","School",
+            "http://vivoweb.org/ontology/core#SeminarSeries", "Seminar Series",
            "http://vivoweb.org/ontology/core#Team","Team",
            "http://vivoweb.org/ontology/core#ServiceProvidingLaboratory","Service Providing Lab",
            "http://vivoweb.org/ontology/core#StudentOrganization","Student Organization",
            "http://purl.obolibrary.org/obo/ERO_0000565","Technology Transfer Office",
-            "http://vivoweb.org/ontology/core#University","University");
+            "http://vivoweb.org/ontology/core#University","University",
+            "http://purl.org/ontology/bibo/Workshop", "Workshop",
+            "http://vivoweb.org/ontology/core#WorkshopSeries", "Workshop Series");
 	}

 	@Override
--- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddServiceProviderRoleToPersonGenerator.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddServiceProviderRoleToPersonGenerator.java
@ -31,33 +31,48 @@ FieldOptions getRoleActivityFieldOptions(VitroRequest vreq) throws Exception {
        "http://vivoweb.org/ontology/core#College","College",
        "http://vivoweb.org/ontology/core#Committee","Committee",
        "http://vivoweb.org/ontology/core#Company","Company",
+        "http://vivoweb.org/ontology/core#Competition", "Competition",
+        "http://purl.org/ontology/bibo/Conference", "Conference",
+        "http://vivoweb.org/ontology/core#ConferenceSeries", "Conference Series",
        "http://vivoweb.org/ontology/core#Consortium","Consortium",
        "http://vivoweb.org/ontology/core#CoreLaboratory","Core Laboratory",
+        "http://vivoweb.org/ontology/core#Course", "Course",
        "http://vivoweb.org/ontology/core#Department","Department",
        "http://vivoweb.org/ontology/core#Division","Division",
        "http://purl.org/NET/c4dm/event.owl#Event","Event",
+        "http://vivoweb.org/ontology/core#EventSeries", "Event Series",
+        "http://vivoweb.org/ontology/core#Exhibit", "Exhibit",
        "http://vivoweb.org/ontology/core#ExtensionUnit","Extension Unit",
        "http://vivoweb.org/ontology/core#Foundation","Foundation",
        "http://vivoweb.org/ontology/core#FundingOrganization","Funding Organization",
        "http://vivoweb.org/ontology/core#GovernmentAgency","Government Agency",
        "http://xmlns.com/foaf/0.1/Group","Group",
+        "http://purl.org/ontology/bibo/Hearing", "Hearing",
        "http://vivoweb.org/ontology/core#Hospital","Hospital",
        "http://vivoweb.org/ontology/core#Institute","Institute",
+        "http://purl.org/ontology/bibo/Interview", "Interview",
+        "http://vivoweb.org/ontology/core#InvitedTalk", "Invited Talk",
        "http://vivoweb.org/ontology/core#Laboratory","Laboratory",
        "http://vivoweb.org/ontology/core#Library","Library",
        "http://purl.obolibrary.org/obo/OBI_0000835","Manufacturer",
+        "http://vivoweb.org/ontology/core#Meeting", "Meeting",
        "http://vivoweb.org/ontology/core#Museum","Museum",
        "http://xmlns.com/foaf/0.1/Organization","Organization",
+        "http://purl.org/ontology/bibo/Performance", "Performance",
+        "http://vivoweb.org/ontology/core#Presentation", "Presentation",
        "http://vivoweb.org/ontology/core#PrivateCompany","Private Company",
        "http://vivoweb.org/ontology/core#Program","Program",
        "http://vivoweb.org/ontology/core#Publisher","Publisher",
        "http://vivoweb.org/ontology/core#ResearchOrganization","Research Organization",
        "http://vivoweb.org/ontology/core#School","School",
+        "http://vivoweb.org/ontology/core#SeminarSeries", "Seminar Series",
        "http://vivoweb.org/ontology/core#Team","Team",
        "http://vivoweb.org/ontology/core#ServiceProvidingLaboratory","Service Providing Lab",
        "http://vivoweb.org/ontology/core#StudentOrganization","Student Organization",
        "http://purl.obolibrary.org/obo/ERO_0000565","Technology Transfer Office",
-        "http://vivoweb.org/ontology/core#University","University");
+        "http://vivoweb.org/ontology/core#University","University",
+        "http://purl.org/ontology/bibo/Workshop", "Workshop",
+        "http://vivoweb.org/ontology/core#WorkshopSeries", "Workshop Series");
 }
 	
 	@Override