From 517d97ba911a59a42fde1a379526d6950dd921e9 Mon Sep 17 00:00:00 2001 From: Patrick McElwee Date: Thu, 25 Jun 2015 14:41:36 -0400 Subject: [PATCH] VIVO-669: remove ARQ functions substring and now Still need to find replacement for localname and namespace --- .../config/listViewConfig-authorInAuthorship.xml | 1 - productMods/config/listViewConfig-awardOrHonor.xml | 1 - .../config/listViewConfig-awardOrHonorGiven.xml | 1 - productMods/config/listViewConfig-degreeEarned.xml | 1 - productMods/config/listViewConfig-editorship.xml | 1 - .../config/listViewConfig-educationalTraining.xml | 1 - .../config/listViewConfig-hasClinicalActivity.xml | 1 - productMods/config/listViewConfig-hasRole.xml | 1 - .../listViewConfig-informationResourceInAuthorship.xml | 1 - .../listViewConfig-informationResourceInEditorship.xml | 1 - productMods/config/listViewConfig-orcidId.xml | 1 - .../config/listViewConfig-organizationForPosition.xml | 3 +-- .../config/listViewConfig-organizationForTraining.xml | 1 - productMods/config/listViewConfig-personInPosition.xml | 1 - .../config/listViewConfig-publicationVenueFor.xml | 1 - productMods/config/listViewConfig-publisherOf.xml | 1 - .../config/listViewConfig-researchActivities.xml | 1 - productMods/config/listViewConfig-researchAreaOf.xml | 3 +-- .../config/listViewConfig-roleContributesTo.xml | 1 - productMods/config/listViewConfig-roleRealizedIn.xml | 1 - rdf/display/everytime/vivoConceptDataGetters.n3 | 4 +--- rdf/display/everytime/vivoOrganizationDataGetters.n3 | 10 +++------- ...ionToGrantsForSubOrganizationsModelConstructor.java | 6 +++--- ...ublicationsForSubOrganizationsModelConstructor.java | 2 +- .../PeopleToGrantsModelConstructor.java | 6 +++--- .../PeopleToPublicationsModelConstructor.java | 2 +- .../PersonToGrantsModelConstructor.java | 6 +++--- .../PersonToPublicationsModelConstructor.java | 2 +- 28 files changed, 18 insertions(+), 44 deletions(-) diff --git a/productMods/config/listViewConfig-authorInAuthorship.xml b/productMods/config/listViewConfig-authorInAuthorship.xml index c15a65b2..15d4e0bb 100644 --- a/productMods/config/listViewConfig-authorInAuthorship.xml +++ b/productMods/config/listViewConfig-authorInAuthorship.xml @@ -7,7 +7,6 @@ PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> PREFIX core: <http://vivoweb.org/ontology/core#> - PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#> PREFIX bibo: <http://purl.org/ontology/bibo/> PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> PREFIX foaf: <http://xmlns.com/foaf/0.1/> diff --git a/productMods/config/listViewConfig-awardOrHonor.xml b/productMods/config/listViewConfig-awardOrHonor.xml index 4dbb907d..62749d67 100644 --- a/productMods/config/listViewConfig-awardOrHonor.xml +++ b/productMods/config/listViewConfig-awardOrHonor.xml @@ -6,7 +6,6 @@ PREFIX foaf: <http://xmlns.com/foaf/0.1/> - PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#> PREFIX bibo: <http://purl.org/ontology/bibo/> PREFIX core: <http://vivoweb.org/ontology/core#> PREFIX owl: <http://www.w3.org/2002/07/owl#> diff --git a/productMods/config/listViewConfig-awardOrHonorGiven.xml b/productMods/config/listViewConfig-awardOrHonorGiven.xml index 2cbc637c..08d0e83a 100644 --- a/productMods/config/listViewConfig-awardOrHonorGiven.xml +++ b/productMods/config/listViewConfig-awardOrHonorGiven.xml @@ -6,7 +6,6 @@ PREFIX foaf: <http://xmlns.com/foaf/0.1/> - PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#> PREFIX bibo: <http://purl.org/ontology/bibo/> PREFIX core: <http://vivoweb.org/ontology/core#> PREFIX owl: <http://www.w3.org/2002/07/owl#> diff --git a/productMods/config/listViewConfig-degreeEarned.xml b/productMods/config/listViewConfig-degreeEarned.xml index ad80eef3..bc8ebe15 100644 --- a/productMods/config/listViewConfig-degreeEarned.xml +++ b/productMods/config/listViewConfig-degreeEarned.xml @@ -7,7 +7,6 @@ PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> PREFIX core: <http://vivoweb.org/ontology/core#> - PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#> PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> SELECT DISTINCT ?awardedDegree diff --git a/productMods/config/listViewConfig-editorship.xml b/productMods/config/listViewConfig-editorship.xml index 44aeab26..c6392580 100644 --- a/productMods/config/listViewConfig-editorship.xml +++ b/productMods/config/listViewConfig-editorship.xml @@ -7,7 +7,6 @@ PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> PREFIX core: <http://vivoweb.org/ontology/core#> - PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#> PREFIX bibo: <http://purl.org/ontology/bibo/> PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> PREFIX foaf: <http://xmlns.com/foaf/0.1/> diff --git a/productMods/config/listViewConfig-educationalTraining.xml b/productMods/config/listViewConfig-educationalTraining.xml index 09f106ea..f3d1a41c 100644 --- a/productMods/config/listViewConfig-educationalTraining.xml +++ b/productMods/config/listViewConfig-educationalTraining.xml @@ -7,7 +7,6 @@ PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> PREFIX core: <http://vivoweb.org/ontology/core#> - PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#> PREFIX foaf: <http://xmlns.com/foaf/0.1/> PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> diff --git a/productMods/config/listViewConfig-hasClinicalActivity.xml b/productMods/config/listViewConfig-hasClinicalActivity.xml index 93047367..2d290eb0 100644 --- a/productMods/config/listViewConfig-hasClinicalActivity.xml +++ b/productMods/config/listViewConfig-hasClinicalActivity.xml @@ -5,7 +5,6 @@ - PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#> PREFIX core: <http://vivoweb.org/ontology/core#> PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> diff --git a/productMods/config/listViewConfig-hasRole.xml b/productMods/config/listViewConfig-hasRole.xml index 30de62b7..cd4102ba 100644 --- a/productMods/config/listViewConfig-hasRole.xml +++ b/productMods/config/listViewConfig-hasRole.xml @@ -5,7 +5,6 @@ - PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#> PREFIX core: <http://vivoweb.org/ontology/core#> PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> diff --git a/productMods/config/listViewConfig-informationResourceInAuthorship.xml b/productMods/config/listViewConfig-informationResourceInAuthorship.xml index 41326d41..4c5ec558 100644 --- a/productMods/config/listViewConfig-informationResourceInAuthorship.xml +++ b/productMods/config/listViewConfig-informationResourceInAuthorship.xml @@ -7,7 +7,6 @@ PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> PREFIX core: <http://vivoweb.org/ontology/core#> - PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#> PREFIX foaf: <http://xmlns.com/foaf/0.1/> PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> PREFIX vcard: <http://www.w3.org/2006/vcard/ns#> diff --git a/productMods/config/listViewConfig-informationResourceInEditorship.xml b/productMods/config/listViewConfig-informationResourceInEditorship.xml index a0b45ab8..29af027b 100644 --- a/productMods/config/listViewConfig-informationResourceInEditorship.xml +++ b/productMods/config/listViewConfig-informationResourceInEditorship.xml @@ -7,7 +7,6 @@ PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> PREFIX core: <http://vivoweb.org/ontology/core#> - PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#> PREFIX foaf: <http://xmlns.com/foaf/0.1/> PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> PREFIX fn: <http://www.w3.org/2005/xpath-functions#> diff --git a/productMods/config/listViewConfig-orcidId.xml b/productMods/config/listViewConfig-orcidId.xml index 6e25fc1b..9bff1e3b 100644 --- a/productMods/config/listViewConfig-orcidId.xml +++ b/productMods/config/listViewConfig-orcidId.xml @@ -7,7 +7,6 @@ - PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#> SELECT ?value WHERE { ?subject ?property ?value diff --git a/productMods/config/listViewConfig-organizationForPosition.xml b/productMods/config/listViewConfig-organizationForPosition.xml index 91919058..3747233b 100644 --- a/productMods/config/listViewConfig-organizationForPosition.xml +++ b/productMods/config/listViewConfig-organizationForPosition.xml @@ -7,7 +7,6 @@ PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> PREFIX core: <http://vivoweb.org/ontology/core#> - PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#> PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> PREFIX foaf: <http://xmlns.com/foaf/0.1/> PREFIX fn: <http://www.w3.org/2005/xpath-functions#> @@ -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) >= afn:substring(str(afn:now()), 0, 4) ) + substr(str(?dateTimeEnd), 1, 4) >= substr(str(now()), 1, 4) ) FILTER ( bound(?person) ) diff --git a/productMods/config/listViewConfig-organizationForTraining.xml b/productMods/config/listViewConfig-organizationForTraining.xml index a35410de..d4e1000f 100644 --- a/productMods/config/listViewConfig-organizationForTraining.xml +++ b/productMods/config/listViewConfig-organizationForTraining.xml @@ -7,7 +7,6 @@ PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> PREFIX core: <http://vivoweb.org/ontology/core#> - PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#> PREFIX foaf: <http://xmlns.com/foaf/0.1/> PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> diff --git a/productMods/config/listViewConfig-personInPosition.xml b/productMods/config/listViewConfig-personInPosition.xml index 0e27f3a6..07e47b05 100644 --- a/productMods/config/listViewConfig-personInPosition.xml +++ b/productMods/config/listViewConfig-personInPosition.xml @@ -7,7 +7,6 @@ PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> PREFIX core: <http://vivoweb.org/ontology/core#> - PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#> PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> PREFIX obo: <http://purl.obolibrary.org/obo/> diff --git a/productMods/config/listViewConfig-publicationVenueFor.xml b/productMods/config/listViewConfig-publicationVenueFor.xml index 0c89b134..79f4cad2 100644 --- a/productMods/config/listViewConfig-publicationVenueFor.xml +++ b/productMods/config/listViewConfig-publicationVenueFor.xml @@ -7,7 +7,6 @@ PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> PREFIX core: <http://vivoweb.org/ontology/core#> - PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#> PREFIX bibo: <http://purl.org/ontology/bibo/> PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> PREFIX foaf: <http://xmlns.com/foaf/0.1/> diff --git a/productMods/config/listViewConfig-publisherOf.xml b/productMods/config/listViewConfig-publisherOf.xml index ce07c4f4..9c36daa7 100644 --- a/productMods/config/listViewConfig-publisherOf.xml +++ b/productMods/config/listViewConfig-publisherOf.xml @@ -7,7 +7,6 @@ PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> PREFIX core: <http://vivoweb.org/ontology/core#> - PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#> PREFIX bibo: <http://purl.org/ontology/bibo/> PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> PREFIX foaf: <http://xmlns.com/foaf/0.1/> diff --git a/productMods/config/listViewConfig-researchActivities.xml b/productMods/config/listViewConfig-researchActivities.xml index e17ca083..7a11a703 100644 --- a/productMods/config/listViewConfig-researchActivities.xml +++ b/productMods/config/listViewConfig-researchActivities.xml @@ -5,7 +5,6 @@ - PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#> PREFIX core: <http://vivoweb.org/ontology/core#> PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> diff --git a/productMods/config/listViewConfig-researchAreaOf.xml b/productMods/config/listViewConfig-researchAreaOf.xml index 8875693d..65bba811 100644 --- a/productMods/config/listViewConfig-researchAreaOf.xml +++ b/productMods/config/listViewConfig-researchAreaOf.xml @@ -7,7 +7,6 @@ - PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#> PREFIX core: <http://vivoweb.org/ontology/core#> PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> @@ -119,4 +118,4 @@ - \ No newline at end of file + diff --git a/productMods/config/listViewConfig-roleContributesTo.xml b/productMods/config/listViewConfig-roleContributesTo.xml index 4ce2ecbf..eb31579b 100644 --- a/productMods/config/listViewConfig-roleContributesTo.xml +++ b/productMods/config/listViewConfig-roleContributesTo.xml @@ -8,7 +8,6 @@ - PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#> PREFIX core: <http://vivoweb.org/ontology/core#> PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> diff --git a/productMods/config/listViewConfig-roleRealizedIn.xml b/productMods/config/listViewConfig-roleRealizedIn.xml index a8064dc7..bba90f61 100644 --- a/productMods/config/listViewConfig-roleRealizedIn.xml +++ b/productMods/config/listViewConfig-roleRealizedIn.xml @@ -5,7 +5,6 @@ - PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#> PREFIX core: <http://vivoweb.org/ontology/core#> PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> diff --git a/rdf/display/everytime/vivoConceptDataGetters.n3 b/rdf/display/everytime/vivoConceptDataGetters.n3 index 41dbc7e7..3a0b2682 100644 --- a/rdf/display/everytime/vivoConceptDataGetters.n3 +++ b/rdf/display/everytime/vivoConceptDataGetters.n3 @@ -6,7 +6,6 @@ @prefix rdfs: . @prefix core: . @prefix vivoweb: . -@prefix afn: . #### n3 for research areas #### @@ -25,7 +24,6 @@ display:getDepartmentDataGetter """ PREFIX rdfs: PREFIX vivo: - PREFIX afn: PREFIX foaf: 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 """ . diff --git a/rdf/display/everytime/vivoOrganizationDataGetters.n3 b/rdf/display/everytime/vivoOrganizationDataGetters.n3 index 133b6545..d3ca3db2 100644 --- a/rdf/display/everytime/vivoOrganizationDataGetters.n3 +++ b/rdf/display/everytime/vivoOrganizationDataGetters.n3 @@ -6,7 +6,6 @@ @prefix rdfs: . @prefix core: . @prefix vivoweb: . -@prefix afn: . #### n3 for research areas #### @@ -31,7 +30,6 @@ display:getResearchAreaDataGetter """ PREFIX rdfs: PREFIX vivo: - PREFIX afn: PREFIX foaf: 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: PREFIX vivo: - PREFIX afn: PREFIX foaf: 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: PREFIX vivo: - PREFIX afn: PREFIX foaf: 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 """ ; diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/OrganizationToGrantsForSubOrganizationsModelConstructor.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/OrganizationToGrantsForSubOrganizationsModelConstructor.java index 75403b07..21e6c79f 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/OrganizationToGrantsForSubOrganizationsModelConstructor.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/OrganizationToGrantsForSubOrganizationsModelConstructor.java @@ -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); diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/OrganizationToPublicationsForSubOrganizationsModelConstructor.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/OrganizationToPublicationsForSubOrganizationsModelConstructor.java index 47a46649..f4c7ba4d 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/OrganizationToPublicationsForSubOrganizationsModelConstructor.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/OrganizationToPublicationsForSubOrganizationsModelConstructor.java @@ -75,7 +75,7 @@ public class OrganizationToPublicationsForSubOrganizationsModelConstructor imple + " ?journal rdfs:label ?journalLabel . " + " } " + " " - + " LET(?now := afn:now()) " + + " LET(?now := now()) " + " } "; } diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/PeopleToGrantsModelConstructor.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/PeopleToGrantsModelConstructor.java index e1bb07f4..a3b2bfd6 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/PeopleToGrantsModelConstructor.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/PeopleToGrantsModelConstructor.java @@ -57,7 +57,7 @@ private Set 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 constructPersonGrantsQueryTemplate(String constructProperty, // + " ?endDateForGrant core:dateTime ?endDateTimeValueForGrant " // + " } " + " " - + " LET(?now := afn:now()) " + + " LET(?now := now()) " + " } "; String justDateTimeOnRolesQuery = "" @@ -109,7 +109,7 @@ private Set constructPersonGrantsQueryTemplate(String constructProperty, // + " ?endDate core:dateTime ?endDateTimeValue . " // + " } " + " " - + " LET(?now := afn:now()) " + + " LET(?now := now()) " + " } "; differentPerspectiveQueries.add(justGrantsQuery); diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/PeopleToPublicationsModelConstructor.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/PeopleToPublicationsModelConstructor.java index bd572789..bf48cd8e 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/PeopleToPublicationsModelConstructor.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/PeopleToPublicationsModelConstructor.java @@ -65,7 +65,7 @@ public class PeopleToPublicationsModelConstructor implements ModelConstructor { + " ?journal rdfs:label ?journalLabel . " + " } " + " " - + " LET(?now := afn:now()) " + + " LET(?now := now()) " + " } "; } diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/PersonToGrantsModelConstructor.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/PersonToGrantsModelConstructor.java index 88a7b168..6e867ca3 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/PersonToGrantsModelConstructor.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/PersonToGrantsModelConstructor.java @@ -60,7 +60,7 @@ private Set 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 constructPersonGrantsQueryTemplate(String constructProperty, // + " ?endDateForGrant core:dateTime ?endDateTimeValueForGrant " // + " } " + " " - + " LET(?now := afn:now()) " + + " LET(?now := now()) " + " } "; String justDateTimeOnRolesQuery = "" @@ -112,7 +112,7 @@ private Set constructPersonGrantsQueryTemplate(String constructProperty, // + " ?endDate core:dateTime ?endDateTimeValue . " // + " } " + " " - + " LET(?now := afn:now()) " + + " LET(?now := now()) " + " } "; differentPerspectiveQueries.add(justGrantsQuery); diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/PersonToPublicationsModelConstructor.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/PersonToPublicationsModelConstructor.java index 37f11d35..cf8b575e 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/PersonToPublicationsModelConstructor.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/PersonToPublicationsModelConstructor.java @@ -67,7 +67,7 @@ public class PersonToPublicationsModelConstructor implements ModelConstructor { + " ?journal rdfs:label ?journalLabel . " + " } " + " " - + " LET(?now := afn:now()) " + + " LET(?now := now()) " + " } "; }