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

VIVO-669: remove ARQ functions substring and now

Browse source 
Still need to find replacement for localname and namespace
This commit is contained in:
Patrick McElwee 2015-06-25 14:41:36 -04:00
parent 46695e9ba2
commit 517d97ba91
28 changed files with 18 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
productMods/config/listViewConfig-authorInAuthorship.xml
View file

@ -7,7 +7,6 @@
<query-select>
PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
PREFIX afn: &lt;http://jena.hpl.hp.com/ARQ/function#&gt;
PREFIX bibo: &lt;http://purl.org/ontology/bibo/&gt;
PREFIX vitro: &lt;http://vitro.mannlib.cornell.edu/ns/vitro/0.7#&gt;
PREFIX foaf: &lt;http://xmlns.com/foaf/0.1/&gt;

1
productMods/config/listViewConfig-awardOrHonor.xml
View file

@ -6,7 +6,6 @@
<list-view-config>
<query-select>
PREFIX foaf: &lt;http://xmlns.com/foaf/0.1/&gt;
PREFIX afn: &lt;http://jena.hpl.hp.com/ARQ/function#&gt;
PREFIX bibo: &lt;http://purl.org/ontology/bibo/&gt;
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
PREFIX owl: &lt;http://www.w3.org/2002/07/owl#&gt;

1
productMods/config/listViewConfig-awardOrHonorGiven.xml
View file

@ -6,7 +6,6 @@
<list-view-config>
<query-select>
PREFIX foaf: &lt;http://xmlns.com/foaf/0.1/&gt;
PREFIX afn: &lt;http://jena.hpl.hp.com/ARQ/function#&gt;
PREFIX bibo: &lt;http://purl.org/ontology/bibo/&gt;
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
PREFIX owl: &lt;http://www.w3.org/2002/07/owl#&gt;

1
productMods/config/listViewConfig-degreeEarned.xml
View file

@ -7,7 +7,6 @@
<query-select>
PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
PREFIX afn: &lt;http://jena.hpl.hp.com/ARQ/function#&gt;
PREFIX vitro: &lt;http://vitro.mannlib.cornell.edu/ns/vitro/0.7#&gt;
SELECT DISTINCT ?awardedDegree

1
productMods/config/listViewConfig-editorship.xml
View file

@ -7,7 +7,6 @@
<query-select>
PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
PREFIX afn: &lt;http://jena.hpl.hp.com/ARQ/function#&gt;
PREFIX bibo: &lt;http://purl.org/ontology/bibo/&gt;
PREFIX vitro: &lt;http://vitro.mannlib.cornell.edu/ns/vitro/0.7#&gt;
PREFIX foaf: &lt;http://xmlns.com/foaf/0.1/&gt;

1
productMods/config/listViewConfig-educationalTraining.xml
View file

@ -7,7 +7,6 @@
<query-select>
PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
PREFIX afn: &lt;http://jena.hpl.hp.com/ARQ/function#&gt;
PREFIX foaf: &lt;http://xmlns.com/foaf/0.1/&gt;
PREFIX vitro: &lt;http://vitro.mannlib.cornell.edu/ns/vitro/0.7#&gt;

1
productMods/config/listViewConfig-hasClinicalActivity.xml
View file

@ -5,7 +5,6 @@
<list-view-config>
<query-select>
PREFIX afn: &lt;http://jena.hpl.hp.com/ARQ/function#&gt;
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;

1
productMods/config/listViewConfig-hasRole.xml
View file

@ -5,7 +5,6 @@
<list-view-config>
<query-select>
PREFIX afn: &lt;http://jena.hpl.hp.com/ARQ/function#&gt;
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;

1
productMods/config/listViewConfig-informationResourceInAuthorship.xml
View file

@ -7,7 +7,6 @@
<query-select>
PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
PREFIX afn: &lt;http://jena.hpl.hp.com/ARQ/function#&gt;
PREFIX foaf: &lt;http://xmlns.com/foaf/0.1/&gt;
PREFIX vitro: &lt;http://vitro.mannlib.cornell.edu/ns/vitro/0.7#&gt;
PREFIX vcard: &lt;http://www.w3.org/2006/vcard/ns#&gt;

1
productMods/config/listViewConfig-informationResourceInEditorship.xml
View file

@ -7,7 +7,6 @@
<query-select>
PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
PREFIX afn: &lt;http://jena.hpl.hp.com/ARQ/function#&gt;
PREFIX foaf: &lt;http://xmlns.com/foaf/0.1/&gt;
PREFIX vitro: &lt;http://vitro.mannlib.cornell.edu/ns/vitro/0.7#&gt;
PREFIX fn: &lt;http://www.w3.org/2005/xpath-functions#&gt;

1
productMods/config/listViewConfig-orcidId.xml
View file

@ -7,7 +7,6 @@
<list-view-config>
<query-select>
PREFIX afn: &lt;http://jena.hpl.hp.com/ARQ/function#&gt;
SELECT ?value
WHERE {
?subject ?property ?value

3
productMods/config/listViewConfig-organizationForPosition.xml
View file

@ -7,7 +7,6 @@
<query-select>
PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
PREFIX afn: &lt;http://jena.hpl.hp.com/ARQ/function#&gt;
PREFIX vitro: &lt;http://vitro.mannlib.cornell.edu/ns/vitro/0.7#&gt;
PREFIX foaf: &lt;http://xmlns.com/foaf/0.1/&gt;
PREFIX fn: &lt;http://www.w3.org/2005/xpath-functions#&gt;
@ -41,7 +40,7 @@
}
# Get current positions only: end date is either null or not in the past
FILTER ( !bound(?dateTimeEnd) ||
afn:substring(str(?dateTimeEnd), 0, 4) &gt;= afn:substring(str(afn:now()), 0, 4) )
substr(str(?dateTimeEnd), 1, 4) &gt;= substr(str(now()), 1, 4) )
<critical-data-required>
FILTER ( bound(?person) )
</critical-data-required>

1
productMods/config/listViewConfig-organizationForTraining.xml
View file

@ -7,7 +7,6 @@
<query-select>
PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
PREFIX afn: &lt;http://jena.hpl.hp.com/ARQ/function#&gt;
PREFIX foaf: &lt;http://xmlns.com/foaf/0.1/&gt;
PREFIX vitro: &lt;http://vitro.mannlib.cornell.edu/ns/vitro/0.7#&gt;

1
productMods/config/listViewConfig-personInPosition.xml
View file

@ -7,7 +7,6 @@
<query-select>
PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
PREFIX afn: &lt;http://jena.hpl.hp.com/ARQ/function#&gt;
PREFIX vitro: &lt;http://vitro.mannlib.cornell.edu/ns/vitro/0.7#&gt;
PREFIX obo: &lt;http://purl.obolibrary.org/obo/&gt;

1
productMods/config/listViewConfig-publicationVenueFor.xml
View file

@ -7,7 +7,6 @@
<query-select>
PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
PREFIX afn: &lt;http://jena.hpl.hp.com/ARQ/function#&gt;
PREFIX bibo: &lt;http://purl.org/ontology/bibo/&gt;
PREFIX vitro: &lt;http://vitro.mannlib.cornell.edu/ns/vitro/0.7#&gt;
PREFIX foaf: &lt;http://xmlns.com/foaf/0.1/&gt;

1
productMods/config/listViewConfig-publisherOf.xml
View file

@ -7,7 +7,6 @@
<query-select>
PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
PREFIX afn: &lt;http://jena.hpl.hp.com/ARQ/function#&gt;
PREFIX bibo: &lt;http://purl.org/ontology/bibo/&gt;
PREFIX vitro: &lt;http://vitro.mannlib.cornell.edu/ns/vitro/0.7#&gt;
PREFIX foaf: &lt;http://xmlns.com/foaf/0.1/&gt;

1
productMods/config/listViewConfig-researchActivities.xml
View file

@ -5,7 +5,6 @@
<list-view-config>
<query-select>
PREFIX afn: &lt;http://jena.hpl.hp.com/ARQ/function#&gt;
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;

3
productMods/config/listViewConfig-researchAreaOf.xml
View file

@ -7,7 +7,6 @@
<list-view-config>
<query-select>
PREFIX afn: &lt;http://jena.hpl.hp.com/ARQ/function#&gt;
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;
@ -119,4 +118,4 @@
</query-construct>
<template>propStatement-researchAreaOf.ftl</template>
</list-view-config>
</list-view-config>

1
productMods/config/listViewConfig-roleContributesTo.xml
View file

@ -8,7 +8,6 @@
<list-view-config>
<query-select>
PREFIX afn: &lt;http://jena.hpl.hp.com/ARQ/function#&gt;
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;

1
productMods/config/listViewConfig-roleRealizedIn.xml
View file

@ -5,7 +5,6 @@
<list-view-config>
<query-select>
PREFIX afn: &lt;http://jena.hpl.hp.com/ARQ/function#&gt;
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;

4
rdf/display/everytime/vivoConceptDataGetters.n3
View file

@ -6,7 +6,6 @@
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
@prefix core: <http://vivoweb.org/ontology/core#> .
@prefix vivoweb: <http://vivoweb.org/ontology#> .
@prefix afn: <http://jena.hpl.hp.com/ARQ/function#> .
#### n3 for research areas ####
@ -25,7 +24,6 @@ display:getDepartmentDataGetter
"""
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
PREFIX vivo: <http://vivoweb.org/ontology/core#>
PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#>
PREFIX foaf: <http://xmlns.com/foaf/0.1/>
SELECT DISTINCT (str(?departmentLabel) AS ?deptLabel) ?dept
WHERE {
@ -41,7 +39,7 @@ display:getDepartmentDataGetter
}
}
FILTER ( !bound(?endDate) ||
afn:substring(str(?endDate), 0, 4) >= afn:substring(str(afn:now()), 0, 4) )
substr(str(?endDate), 1, 4) >= substr(str(now()), 1, 4) )
}
ORDER BY ?deptLabel
""" .

10
rdf/display/everytime/vivoOrganizationDataGetters.n3
View file

@ -6,7 +6,6 @@
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
@prefix core: <http://vivoweb.org/ontology/core#> .
@prefix vivoweb: <http://vivoweb.org/ontology#> .
@prefix afn: <http://jena.hpl.hp.com/ARQ/function#> .
#### n3 for research areas ####
@ -31,7 +30,6 @@ display:getResearchAreaDataGetter
"""
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
PREFIX vivo: <http://vivoweb.org/ontology/core#>
PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#>
PREFIX foaf: <http://xmlns.com/foaf/0.1/>
SELECT DISTINCT (str(?researchAreaLabel) AS ?raLabel) ?ra
WHERE {
@ -47,7 +45,7 @@ display:getResearchAreaDataGetter
}
}
FILTER ( !bound(?endDate) ||
afn:substring(str(?endDate), 0, 4) >= afn:substring(str(afn:now()), 0, 4) )
substr(str(?endDate), 1, 4) >= substr(str(now()), 1, 4) )
}
ORDER BY ?raLabel
""" .
@ -144,7 +142,6 @@ display:getGrantsDataGetter
"""
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
PREFIX vivo: <http://vivoweb.org/ontology/core#>
PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#>
PREFIX foaf: <http://xmlns.com/foaf/0.1/>
SELECT DISTINCT ?grant
WHERE {
@ -159,7 +156,7 @@ display:getGrantsDataGetter
?grant vivo:dateTimeInterval ?dti .
?dti vivo:end ?end.
?end vivo:dateTime ?dt
FILTER (?dt > afn:now())
FILTER (?dt > now())
}
LIMIT 1
""" .
@ -179,7 +176,6 @@ display:getGrantsDataGetter
"""
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
PREFIX vivo: <http://vivoweb.org/ontology/core#>
PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#>
PREFIX foaf: <http://xmlns.com/foaf/0.1/>
SELECT DISTINCT (str (?gLabel) AS ?grantLabel) ?dt (str(?departmentLabel) AS ?deptLabel) ?grant
WHERE {
@ -196,7 +192,7 @@ display:getGrantsDataGetter
?grant vivo:dateTimeInterval ?dti .
?dti vivo:end ?end.
?end vivo:dateTime ?dt
FILTER (?dt > afn:now())
FILTER (?dt > now())
}
ORDER BY ?gLabel
""" ;

6
src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/OrganizationToGrantsForSubOrganizationsModelConstructor.java
View file

@ -68,7 +68,7 @@ public class OrganizationToGrantsForSubOrganizationsModelConstructor implements
+ " ?Grant rdf:type core:Grant . "
+ " ?Grant rdfs:label ?grantLabel . "
+ " "
+ " LET(?now := afn:now()) "
+ " LET(?now := now()) "
+ " } ";
String justDateTimeOnGrantsQuery = ""
@ -103,7 +103,7 @@ public class OrganizationToGrantsForSubOrganizationsModelConstructor implements
// + " ?endDateForGrant core:dateTime ?endDateTimeValueForGrant "
// + " } "
+ " "
+ " LET(?now := afn:now()) "
+ " LET(?now := now()) "
+ " } ";
String justDateTimeOnRolesQuery = ""
@ -138,7 +138,7 @@ public class OrganizationToGrantsForSubOrganizationsModelConstructor implements
// + " ?endDate core:dateTime ?endDateTimeValue . "
// + " } "
+ " "
+ " LET(?now := afn:now()) "
+ " LET(?now := now()) "
+ " } ";
differentPerspectiveQueries.add(justGrantsQuery);

2
src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/OrganizationToPublicationsForSubOrganizationsModelConstructor.java
View file

@ -75,7 +75,7 @@ public class OrganizationToPublicationsForSubOrganizationsModelConstructor imple
+ " ?journal rdfs:label ?journalLabel . "
+ " } "
+ " "
+ " LET(?now := afn:now()) "
+ " LET(?now := now()) "
+ " } ";
}

6
src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/PeopleToGrantsModelConstructor.java
View file

@ -57,7 +57,7 @@ private Set<String> constructPersonGrantsQueryTemplate(String constructProperty,
+ " ?Grant rdf:type core:Grant . "
+ " ?Grant rdfs:label ?grantLabel . "
+ " "
+ " LET(?now := afn:now()) "
+ " LET(?now := now()) "
+ " } ";
String justDateTimeOnGrantsQuery = ""
@ -83,7 +83,7 @@ private Set<String> constructPersonGrantsQueryTemplate(String constructProperty,
// + " ?endDateForGrant core:dateTime ?endDateTimeValueForGrant "
// + " } "
+ " "
+ " LET(?now := afn:now()) "
+ " LET(?now := now()) "
+ " } ";
String justDateTimeOnRolesQuery = ""
@ -109,7 +109,7 @@ private Set<String> constructPersonGrantsQueryTemplate(String constructProperty,
// + " ?endDate core:dateTime ?endDateTimeValue . "
// + " } "
+ " "
+ " LET(?now := afn:now()) "
+ " LET(?now := now()) "
+ " } ";
differentPerspectiveQueries.add(justGrantsQuery);

2
src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/PeopleToPublicationsModelConstructor.java
View file

@ -65,7 +65,7 @@ public class PeopleToPublicationsModelConstructor implements ModelConstructor {
+ " ?journal rdfs:label ?journalLabel . "
+ " } "
+ " "
+ " LET(?now := afn:now()) "
+ " LET(?now := now()) "
+ " } ";
}

6
src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/PersonToGrantsModelConstructor.java
View file

@ -60,7 +60,7 @@ private Set<String> constructPersonGrantsQueryTemplate(String constructProperty,
+ " ?Grant rdf:type core:Grant . "
+ " ?Grant rdfs:label ?grantLabel . "
+ " "
+ " LET(?now := afn:now()) "
+ " LET(?now := now()) "
+ " } ";
String justDateTimeOnGrantsQuery = ""
@ -86,7 +86,7 @@ private Set<String> constructPersonGrantsQueryTemplate(String constructProperty,
// + " ?endDateForGrant core:dateTime ?endDateTimeValueForGrant "
// + " } "
+ " "
+ " LET(?now := afn:now()) "
+ " LET(?now := now()) "
+ " } ";
String justDateTimeOnRolesQuery = ""
@ -112,7 +112,7 @@ private Set<String> constructPersonGrantsQueryTemplate(String constructProperty,
// + " ?endDate core:dateTime ?endDateTimeValue . "
// + " } "
+ " "
+ " LET(?now := afn:now()) "
+ " LET(?now := now()) "
+ " } ";
differentPerspectiveQueries.add(justGrantsQuery);

2
src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/PersonToPublicationsModelConstructor.java
View file

@ -67,7 +67,7 @@ public class PersonToPublicationsModelConstructor implements ModelConstructor {
+ " ?journal rdfs:label ?journalLabel . "
+ " } "
+ " "
+ " LET(?now := afn:now()) "
+ " LET(?now := now()) "
+ " } ";
}