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
Download patch file Download diff file Expand all files Collapse all files

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
""" ;