fix for sparql issues found during testing with Digital Vita team

productMods/WEB-INF/rich-export/advising/adviseesDegreeAlt.sparql

@@ -0,0 +1,11 @@
+PREFIX core: <http://vivoweb.org/ontology/core#>
+
+CONSTRUCT {
+     ?degree ?property ?object
+} WHERE {
+     PERSON_URI core:advisorIn ?advisingRelationship .
+     ?advisingRelationship core:advisee ?advisee .
+     ?advisee core:educationalTraining ?educationalTraining .
+     ?educationalTraining core:degreeEarned ?degree .
+     ?degree ?property ?object
+}

productMods/WEB-INF/rich-export/advising/adviseesEducationEndDate.sparql

@@ -0,0 +1,12 @@
+PREFIX core: <http://vivoweb.org/ontology/core#>
+
+CONSTRUCT {
+     ?dateTimeValue ?property ?object .
+} WHERE {
+     PERSON_URI core:advisorIn ?advisingRelationship .
+     ?advisingRelationship core:advisee ?advisee .
+     ?advisee core:educationalTraining ?educationalTraining .
+     ?educationalTraining core:dateTimeInterval ?dateTimeInterval .
+     ?dateTimeInterval core:end ?dateTimeValue .
+     ?dateTimeValue ?property ?object .
+}

productMods/WEB-INF/rich-export/advising/adviseesEducationalInsitituionAlt.sparql

@@ -0,0 +1,12 @@
+PREFIX core: <http://vivoweb.org/ontology/core#>
+PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+
+CONSTRUCT {
+     ?educationalInstitution rdfs:label ?label
+} WHERE {
+     PERSON_URI core:advisorIn ?advisingRelationship .
+     ?advisingRelationship core:advisee ?advisee .
+     ?advisee core:educationalTraining ?educationalTraining .
+     ?educationalTraining core:trainingAtOrganization ?educationalInstitution .
+     ?educationalInstitution rdfs:label ?label
+}

productMods/WEB-INF/rich-export/advising/associatedEducationalTrainingAlt.sparql

@@ -0,0 +1,10 @@
+PREFIX core: <http://vivoweb.org/ontology/core#>
+
+CONSTRUCT {
+     ?educationalTraining ?property ?object .
+} WHERE {
+     PERSON_URI core:advisorIn ?advisingRelationship .
+     ?advisingRelationship core:advisee ?advisee .
+     ?advisee core:educationalTraining ?educationalTraining .
+     ?educationalTraining ?property ?object .
+}

productMods/WEB-INF/rich-export/educationalTraining/educationalTrainingEndDate.sparql

@@ -1,6 +1,7 @@
 PREFIX core: <http://vivoweb.org/ontology/core#>
 
 CONSTRUCT {
+     ?dateTimeInterval core:end ?date .
      ?date ?property ?object .
 } WHERE {
      PERSON_URI core:educationalTraining ?educationalTraining . 

productMods/WEB-INF/rich-export/funding/grantAwardedBy.sparql

@@ -0,0 +1,17 @@
+PREFIX core: <http://vivoweb.org/ontology/core#>
+PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+
+CONSTRUCT {
+      ?awardingOrganization ?p ?o 
+} WHERE {
+    {
+      {PERSON_URI core:hasPrincipalInvestigatorRole ?investigatorRole }
+        union
+      {PERSON_URI core:hasCo-PrincipalInvestigatorRole ?investigatorRole }   
+     }
+     
+     ?investigatorRole core:roleIn ?grant .
+     ?grant a core:Grant .
+     ?grant core:grantAwardedBy ?awardingOrganization .
+     ?awardingOrganization ?p ?o 
+}

productMods/WEB-INF/rich-export/presentation/meetingLocation.sparql

@@ -0,0 +1,12 @@
+PREFIX core: <http://vivoweb.org/ontology/core#>
+PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+
+CONSTRUCT {
+     ?location rdfs:label ?locationName .
+} WHERE {
+     PERSON_URI core:hasPresenterRole ?presenterRole .
+     ?presenterRole core:roleIn ?presentation .
+     ?presentation core:eventWithin ?containingEvent .
+     ?containingEvent core:hasGeographicLocation ?location .
+     ?location rdfs:label ?locationName .
+}

productMods/WEB-INF/rich-export/presentation/meetingName.sparql

@@ -1,4 +1,5 @@
 PREFIX core: <http://vivoweb.org/ontology/core#>
+PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
 
 CONSTRUCT {
      ?containingEvent rdfs:label ?containingEventName

productMods/WEB-INF/rich-export/presentation/presentationLocation.sparql

@@ -1,10 +0,0 @@
-PREFIX core: <http://vivoweb.org/ontology/core#>
-
-CONSTRUCT {
-     ?location ?rdfs:label ?locationName .
-} WHERE {
-     PERSON_URI core:hasPresenterRole ?presenterRole .
-     ?presenterRole core:roleIn ?presentation .
-     ?presentation core:hasGeographicLocation ?location .
-     ?location ?rdfs:label ?locationName .
-}

productMods/WEB-INF/rich-export/publication/authors.sparql

@@ -1,9 +1,13 @@
 PREFIX core: <http://vivoweb.org/ontology/core#>
 
 CONSTRUCT {
-     ?person ?property ?object .   
+     ?coAuthorship ?property1 ?object1 .
+     ?person ?property2 ?object2 .   
 } WHERE {
      PERSON_URI core:authorInAuthorship ?authorship . 
-     ?authorship core:linkedAuthor ?person .
+     ?authorship core:linkedInformationResource ?publication .
-     ?person ?property ?object .   
+     ?publication core:informationResourceInAuthorship ?coAuthorship .
+     ?coAuthorship ?property1 ?object1 .
+     ?coAuthorship core:linkedAuthor ?person .
+     ?person ?property2 ?object2 .
 }

productMods/WEB-INF/rich-export/publication/presentedAtEventLocation.sparql

@@ -1,12 +1,13 @@
 PREFIX core: <http://vivoweb.org/ontology/core#>
 PREFIX bibo: <http://purl.org/ontology/bibo/>
+PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
 
 CONSTRUCT {
-     ?location ?property ?object .
+     ?location rdfs:label ?locationName .
 } WHERE {
      PERSON_URI core:authorInAuthorship ?authorship . 
      ?authorship core:linkedInformationResource ?publication .
      ?publication bibo:presentedAt ?event .
      ?event core:hasGeographicLocation ?location .
-     ?location ?property ?object .
+     ?location rdfs:label ?locationName .
 }