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

VIVO-773 clean up some of the queries used in building the search index

Browse source 
The new JENA libraries won't allow a clause of the form (str(?result) as ?result), since the variable "result" is already bound.
This commit is contained in:
j2blake 2014-05-22 13:08:04 -04:00
parent eb802e2c6a
commit 3dba210af2
5 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFAdvisingFields.java
View file

@ -42,12 +42,12 @@ public class VivoISFAdvisingFields extends ContextNodeFields {
private static String makeQueryForPeople(){ private static String makeQueryForPeople(){
return prefix + return prefix +
"SELECT \n" + "SELECT \n" +
"(str(?result) as ?result) WHERE \n" + "(str(?rawresult) as ?result) WHERE \n" +
"{\n" + "{\n" +
" ?uri core:relatedBy ?rel . \n" + " ?uri core:relatedBy ?rel . \n" +
" ?rel rdf:type core:AdvisingRelationship . \n" + " ?rel rdf:type core:AdvisingRelationship . \n" +
" ?rel core:relates ?other . \n" + " ?rel core:relates ?other . \n" +
" ?other rdfs:label ?result . \n" + " ?other rdfs:label ?rawresult . \n" +
" FILTER( ?other != ?uri ) \n" + " FILTER( ?other != ?uri ) \n" +
"}"; "}";
} }

4
src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFBasicFields.java
View file

@ -60,12 +60,12 @@ public class VivoISFBasicFields extends ContextNodeFields {
queries.add( queries.add(
prefix + prefix +
"SELECT \n" + "SELECT \n" +
"(str(?result) as ?result) WHERE \n" + "(str(?rawresult) as ?result) WHERE \n" +
"{\n" + "{\n" +
" ?uri core:relatedBy ?rel . \n" + " ?uri core:relatedBy ?rel . \n" +
" ?rel rdf:type ?type . \n" + " ?rel rdf:type ?type . \n" +
" ?rel core:relates ?other . \n" + " ?rel core:relates ?other . \n" +
" ?other rdfs:label ?result . \n" + " ?other rdfs:label ?rawresult . \n" +
" FILTER ( ?type IN ( " + types + " ) )\n" + " FILTER ( ?type IN ( " + types + " ) )\n" +
"}" ); "}" );
} }

8
src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFEducationFields.java
View file

@ -28,11 +28,11 @@ public class VivoISFEducationFields extends ContextNodeFields {
private static String queryForDegree = private static String queryForDegree =
prefix + prefix +
"SELECT \n" + "SELECT \n" +
"(str(?result) as ?result) WHERE \n" + "(str(?rawresult) as ?result) WHERE \n" +
"{\n" + "{\n" +
" ?uri core:relates ?deg . \n" + " ?uri core:relates ?deg . \n" +
" ?deg rdf:type core:AwardedDegree . \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 = private static String queryForOrganization =
prefix + prefix +
"SELECT \n" + "SELECT \n" +
"(str(?result) as ?result) WHERE \n" + "(str(?rawresult) as ?result) WHERE \n" +
"{\n" + "{\n" +
" ?uri core:relates ?deg . \n" + " ?uri core:relates ?deg . \n" +
" ?deg rdf:type core:AwardedDegree . \n" + " ?deg rdf:type core:AwardedDegree . \n" +
" ?deg core:assignedBy ?org . \n" + " ?deg core:assignedBy ?org . \n" +
" ?org rdfs:label ?result . \n" + " ?org rdfs:label ?rawresult . \n" +
"}"; "}";
static List<String> queries = new ArrayList<String>(); static List<String> queries = new ArrayList<String>();

32
src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFGrantFields.java
View file

@ -40,11 +40,11 @@ public class VivoISFGrantFields extends ContextNodeFields {
*/ */
private static String peopleForGrant = private static String peopleForGrant =
prefix + prefix +
"SELECT (str(?result) as ?result) WHERE {\n" + "SELECT (str(?rawresult) as ?result) WHERE {\n" +
" ?uri rdf:type core:Grant . \n" + " ?uri rdf:type core:Grant . \n" +
" ?uri core:relates ?person . \n" + " ?uri core:relates ?person . \n" +
" ?person rdf:type foaf: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 = private static String grantsForPerson =
prefix + prefix +
"SELECT \n" + "SELECT \n" +
"(str(?result) as ?result) WHERE \n" + "(str(?rawresult) as ?result) WHERE \n" +
"{\n" + "{\n" +
" ?uri rdf:type foaf:Person . \n" + " ?uri rdf:type foaf:Person . \n" +
" ?grant core:relates ?uri . \n" + " ?grant core:relates ?uri . \n" +
" ?grant rdf:type core:Grant . \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 = private static String grantsForOrganization =
prefix + prefix +
"SELECT (str(?result) as ?result) WHERE {\n" + "SELECT (str(?rawresult) as ?result) WHERE {\n" +
" ?uri rdf:type foaf:Organization . \n" + " ?uri rdf:type foaf:Organization . \n" +
" ?grant core:relates ?uri . \n" + " ?grant core:relates ?uri . \n" +
" ?grant rdf:type core:Grant . \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 = private static String organizationsForGrant =
prefix + prefix +
"SELECT (str(?result) as ?result) WHERE {\n" + "SELECT (str(?rawresult) as ?result) WHERE {\n" +
" ?uri rdf:type core:Grant . \n" + " ?uri rdf:type core:Grant . \n" +
" ?uri core:relates ?org . \n" + " ?uri core:relates ?org . \n" +
" ?org rdf:type foaf:Organization . \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 = private static String grantsForProject =
prefix + prefix +
"SELECT (str(?result) as ?result) WHERE {\n" + "SELECT (str(?rawresult) as ?result) WHERE {\n" +
" ?uri rdf:type core:Project . \n" + " ?uri rdf:type core:Project . \n" +
" ?role obo:BFO_0000054 ?uri . \n" + " ?role obo:BFO_0000054 ?uri . \n" +
" ?grant core:relates ?role . \n" + " ?grant core:relates ?role . \n" +
" ?grant rdf:type core:Grant . \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 = private static String peopleForProject =
prefix + prefix +
"SELECT (str(?result) as ?result) WHERE {\n" + "SELECT (str(?rawresult) as ?result) WHERE {\n" +
" ?uri rdf:type core:Project . \n" + " ?uri rdf:type core:Project . \n" +
" ?role obo:BFO_0000054 ?uri . \n" + " ?role obo:BFO_0000054 ?uri . \n" +
" ?role obo:RO_0000053 ?person . \n" + " ?role obo:RO_0000053 ?person . \n" +
" ?person rdf:type foaf: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 = private static String projectsForGrant =
prefix + prefix +
"SELECT \n" + "SELECT \n" +
"(str(?result) as ?result) WHERE \n" + "(str(?rawresult) as ?result) WHERE \n" +
"{\n" + "{\n" +
" ?uri rdf:type core:Grant. \n" + " ?uri rdf:type core:Grant. \n" +
" ?uri core:relates ?role . \n" + " ?uri core:relates ?role . \n" +
" ?role obo:BFO_0000054 ?project . \n" + " ?role obo:BFO_0000054 ?project . \n" +
" ?project rdf:type core: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 = private static String projectsForPerson =
prefix + prefix +
"SELECT (str(?result) as ?result) WHERE {\n" + "SELECT (str(?rawresult) as ?result) WHERE {\n" +
" ?uri rdf:type foaf:Person . \n" + " ?uri rdf:type foaf:Person . \n" +
" ?uri obo:RO_0000053 ?role . \n" + " ?uri obo:RO_0000053 ?role . \n" +
" ?role obo:BFO_0000054 ?project . \n" + " ?role obo:BFO_0000054 ?project . \n" +
" ?project rdf:type core:Project . \n" + " ?project rdf:type core:Project . \n" +
" ?project rdfs:label ?result . \n" + " ?project rdfs:label ?rawresult . \n" +
"}"; "}";
static List<String> queries = new ArrayList<String>(); static List<String> queries = new ArrayList<String>();

8
src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFMemberFields.java
View file

@ -35,11 +35,11 @@ public class VivoISFMemberFields extends ContextNodeFields {
*/ */
private static String peopleForOrganization = private static String peopleForOrganization =
prefix + prefix +
"SELECT (str(?result) as ?result) WHERE {\n" + "SELECT (str(?rawresult) as ?result) WHERE {\n" +
" ?uri rdf:type foaf:Organization . \n" + " ?uri rdf:type foaf:Organization . \n" +
" ?role core:roleContrigutesTo ?uri . \n" + " ?role core:roleContrigutesTo ?uri . \n" +
" ?person obo:RO_0000053 ?role . \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 = private static String organizationForPeople =
prefix + prefix +
"SELECT (str(?result) as ?result) WHERE {\n" + "SELECT (str(?rawresult) as ?result) WHERE {\n" +
" ?uri rdf:type foaf:Person . \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" +
"}"; "}";