From 3dba210af22e23ad948c37e22520591cc5f8b0c3 Mon Sep 17 00:00:00 2001 From: j2blake Date: Thu, 22 May 2014 13:08:04 -0400 Subject: [PATCH] VIVO-773 clean up some of the queries used in building the search index The new JENA libraries won't allow a clause of the form (str(?result) as ?result), since the variable "result" is already bound. --- .../VivoISFAdvisingFields.java | 4 +-- .../documentBuilding/VivoISFBasicFields.java | 4 +-- .../VivoISFEducationFields.java | 8 ++--- .../documentBuilding/VivoISFGrantFields.java | 32 +++++++++---------- .../documentBuilding/VivoISFMemberFields.java | 8 ++--- 5 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFAdvisingFields.java b/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFAdvisingFields.java index ac08fa1a..c2f26778 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFAdvisingFields.java +++ b/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFAdvisingFields.java @@ -42,12 +42,12 @@ public class VivoISFAdvisingFields extends ContextNodeFields { private static String makeQueryForPeople(){ return prefix + "SELECT \n" + - "(str(?result) as ?result) WHERE \n" + + "(str(?rawresult) as ?result) WHERE \n" + "{\n" + " ?uri core:relatedBy ?rel . \n" + " ?rel rdf:type core:AdvisingRelationship . \n" + " ?rel core:relates ?other . \n" + - " ?other rdfs:label ?result . \n" + + " ?other rdfs:label ?rawresult . \n" + " FILTER( ?other != ?uri ) \n" + "}"; } diff --git a/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFBasicFields.java b/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFBasicFields.java index 3675f67f..23856b5a 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFBasicFields.java +++ b/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFBasicFields.java @@ -60,12 +60,12 @@ public class VivoISFBasicFields extends ContextNodeFields { queries.add( prefix + "SELECT \n" + - "(str(?result) as ?result) WHERE \n" + + "(str(?rawresult) as ?result) WHERE \n" + "{\n" + " ?uri core:relatedBy ?rel . \n" + " ?rel rdf:type ?type . \n" + " ?rel core:relates ?other . \n" + - " ?other rdfs:label ?result . \n" + + " ?other rdfs:label ?rawresult . \n" + " FILTER ( ?type IN ( " + types + " ) )\n" + "}" ); } diff --git a/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFEducationFields.java b/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFEducationFields.java index 6a9aa443..8ba9cc3e 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFEducationFields.java +++ b/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFEducationFields.java @@ -28,11 +28,11 @@ public class VivoISFEducationFields extends ContextNodeFields { private static String queryForDegree = prefix + "SELECT \n" + - "(str(?result) as ?result) WHERE \n" + + "(str(?rawresult) as ?result) WHERE \n" + "{\n" + " ?uri core:relates ?deg . \n" + " ?deg rdf:type core:AwardedDegree . \n" + - " ?deg rdfs:label ?result . \n" + + " ?deg rdfs:label ?rawresult . \n" + "}"; /** @@ -41,12 +41,12 @@ public class VivoISFEducationFields extends ContextNodeFields { private static String queryForOrganization = prefix + "SELECT \n" + - "(str(?result) as ?result) WHERE \n" + + "(str(?rawresult) as ?result) WHERE \n" + "{\n" + " ?uri core:relates ?deg . \n" + " ?deg rdf:type core:AwardedDegree . \n" + " ?deg core:assignedBy ?org . \n" + - " ?org rdfs:label ?result . \n" + + " ?org rdfs:label ?rawresult . \n" + "}"; static List queries = new ArrayList(); diff --git a/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFGrantFields.java b/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFGrantFields.java index 1ffb164f..c36fde17 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFGrantFields.java +++ b/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFGrantFields.java @@ -40,11 +40,11 @@ public class VivoISFGrantFields extends ContextNodeFields { */ private static String peopleForGrant = prefix + - "SELECT (str(?result) as ?result) WHERE {\n" + + "SELECT (str(?rawresult) as ?result) WHERE {\n" + " ?uri rdf:type core:Grant . \n" + " ?uri core:relates ?person . \n" + " ?person rdf:type foaf:Person . \n" + - " ?person rdfs:label ?result . \n" + + " ?person rdfs:label ?rawresult . \n" + "}"; /** @@ -54,12 +54,12 @@ public class VivoISFGrantFields extends ContextNodeFields { private static String grantsForPerson = prefix + "SELECT \n" + - "(str(?result) as ?result) WHERE \n" + + "(str(?rawresult) as ?result) WHERE \n" + "{\n" + " ?uri rdf:type foaf:Person . \n" + " ?grant core:relates ?uri . \n" + " ?grant rdf:type core:Grant . \n" + - " ?grant rdfs:label ?result . \n" + + " ?grant rdfs:label ?rawresult . \n" + "}"; /** @@ -68,11 +68,11 @@ public class VivoISFGrantFields extends ContextNodeFields { */ private static String grantsForOrganization = prefix + - "SELECT (str(?result) as ?result) WHERE {\n" + + "SELECT (str(?rawresult) as ?result) WHERE {\n" + " ?uri rdf:type foaf:Organization . \n" + " ?grant core:relates ?uri . \n" + " ?grant rdf:type core:Grant . \n" + - " ?grant rdfs:label ?result . \n" + + " ?grant rdfs:label ?rawresult . \n" + "}"; /** @@ -81,11 +81,11 @@ public class VivoISFGrantFields extends ContextNodeFields { */ private static String organizationsForGrant = prefix + - "SELECT (str(?result) as ?result) WHERE {\n" + + "SELECT (str(?rawresult) as ?result) WHERE {\n" + " ?uri rdf:type core:Grant . \n" + " ?uri core:relates ?org . \n" + " ?org rdf:type foaf:Organization . \n" + - " ?org rdfs:label ?result . \n" + + " ?org rdfs:label ?rawresult . \n" + "}"; /** @@ -94,12 +94,12 @@ public class VivoISFGrantFields extends ContextNodeFields { */ private static String grantsForProject = prefix + - "SELECT (str(?result) as ?result) WHERE {\n" + + "SELECT (str(?rawresult) as ?result) WHERE {\n" + " ?uri rdf:type core:Project . \n" + " ?role obo:BFO_0000054 ?uri . \n" + " ?grant core:relates ?role . \n" + " ?grant rdf:type core:Grant . \n" + - " ?grant rdfs:label ?result . \n" + + " ?grant rdfs:label ?rawresult . \n" + "}"; /** @@ -108,12 +108,12 @@ public class VivoISFGrantFields extends ContextNodeFields { */ private static String peopleForProject = prefix + - "SELECT (str(?result) as ?result) WHERE {\n" + + "SELECT (str(?rawresult) as ?result) WHERE {\n" + " ?uri rdf:type core:Project . \n" + " ?role obo:BFO_0000054 ?uri . \n" + " ?role obo:RO_0000053 ?person . \n" + " ?person rdf:type foaf:Person . \n" + - " ?person rdfs:label ?result . \n" + + " ?person rdfs:label ?rawresult . \n" + "}"; /** @@ -123,13 +123,13 @@ public class VivoISFGrantFields extends ContextNodeFields { private static String projectsForGrant = prefix + "SELECT \n" + - "(str(?result) as ?result) WHERE \n" + + "(str(?rawresult) as ?result) WHERE \n" + "{\n" + " ?uri rdf:type core:Grant. \n" + " ?uri core:relates ?role . \n" + " ?role obo:BFO_0000054 ?project . \n" + " ?project rdf:type core:Project . \n" + - " ?project rdfs:label ?result . \n" + + " ?project rdfs:label ?rawresult . \n" + "}"; /** @@ -138,12 +138,12 @@ public class VivoISFGrantFields extends ContextNodeFields { */ private static String projectsForPerson = prefix + - "SELECT (str(?result) as ?result) WHERE {\n" + + "SELECT (str(?rawresult) as ?result) WHERE {\n" + " ?uri rdf:type foaf:Person . \n" + " ?uri obo:RO_0000053 ?role . \n" + " ?role obo:BFO_0000054 ?project . \n" + " ?project rdf:type core:Project . \n" + - " ?project rdfs:label ?result . \n" + + " ?project rdfs:label ?rawresult . \n" + "}"; static List queries = new ArrayList(); diff --git a/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFMemberFields.java b/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFMemberFields.java index 6ea535d1..9ae1c566 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFMemberFields.java +++ b/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFMemberFields.java @@ -35,11 +35,11 @@ public class VivoISFMemberFields extends ContextNodeFields { */ private static String peopleForOrganization = prefix + - "SELECT (str(?result) as ?result) WHERE {\n" + + "SELECT (str(?rawresult) as ?result) WHERE {\n" + " ?uri rdf:type foaf:Organization . \n" + " ?role core:roleContrigutesTo ?uri . \n" + " ?person obo:RO_0000053 ?role . \n" + - " ?person rdfs:label ?result .\n" + + " ?person rdfs:label ?rawresult .\n" + "}"; /** @@ -47,9 +47,9 @@ public class VivoISFMemberFields extends ContextNodeFields { */ private static String organizationForPeople = prefix + - "SELECT (str(?result) as ?result) WHERE {\n" + + "SELECT (str(?rawresult) as ?result) WHERE {\n" + " ?uri rdf:type foaf:Person . \n" + - " ?uri obo:RO_0000053 / core:roleContrigutesTo / rdfs:label ?result . \n" + + " ?uri obo:RO_0000053 / core:roleContrigutesTo / rdfs:label ?rawresult . \n" + "}";