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

No Jira issue. Fixed an issue caused by webpages having multiple labels.

Browse source
This commit is contained in:
Tim Worrall 2015-06-17 15:26:50 -04:00
parent 65284687c3
commit 2eb332c74c
2 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
productMods/config/listViewConfig-webpage.xml
View file

@ -14,18 +14,19 @@
SELECT ?vcard ?link SELECT ?vcard ?link
(afn:localname(?link) AS ?linkName) (afn:localname(?link) AS ?linkName)
?label (group_concat(distinct ?linkLabel;separator="/") as ?label)
?url ?url
?rank WHERE { ?rank WHERE {
?subject ?property ?vcard . ?subject ?property ?vcard .
?vcard vcard:hasURL ?link ?vcard vcard:hasURL ?link
OPTIONAL { ?link rdfs:label ?label } OPTIONAL { ?link rdfs:label ?linkLabel }
OPTIONAL { ?link vcard:url ?url } OPTIONAL { ?link vcard:url ?url }
OPTIONAL { ?link core:rank ?rank } OPTIONAL { ?link core:rank ?rank }
<critical-data-required> <critical-data-required>
FILTER ( bound(?link) ) FILTER ( bound(?link) )
</critical-data-required> </critical-data-required>
} ORDER BY ?rank ?label } GROUP BY ?vcard ?link ?url ?rank
ORDER BY ?rank ?linkLabel
</query-select> </query-select>
<query-construct> <query-construct>
@ -37,7 +38,7 @@
?vcard vcard:hasURL ?link . ?vcard vcard:hasURL ?link .
?link vcard:url ?url . ?link vcard:url ?url .
?link core:rank ?rank . ?link core:rank ?rank .
?link rdfs:label ?label ?link rdfs:label ?linkLabel
} WHERE { } WHERE {
{ {
?subject ?property ?vcard . ?subject ?property ?vcard .
@ -53,7 +54,7 @@
} UNION { } UNION {
?subject ?property ?vcard . ?subject ?property ?vcard .
?vcard vcard:hasURL ?link . ?vcard vcard:hasURL ?link .
?link rdfs:label ?label ?link rdfs:label ?linkLabel
} }
} }
</query-construct> </query-construct>

7
src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageWebpagesForIndividualGenerator.java
View file

@ -95,16 +95,17 @@ public class ManageWebpagesForIndividualGenerator extends BaseEditConfigurationG
+ "PREFIX vcard: <http://www.w3.org/2006/vcard/ns#> \n" + "PREFIX vcard: <http://www.w3.org/2006/vcard/ns#> \n"
+ "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> \n" + "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> \n"
+ "PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> \n" + "PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> \n"
+ "SELECT DISTINCT ?vcard ?link ?url ?label ?rank ?typeLabel WHERE { \n" + "SELECT DISTINCT ?vcard ?link ?url ?rank ?typeLabel (group_concat(distinct ?linkLabel;separator=\"/\") as ?label) WHERE { \n"
+ " ?subject <http://purl.obolibrary.org/obo/ARG_2000028> ?vcard . \n" + " ?subject <http://purl.obolibrary.org/obo/ARG_2000028> ?vcard . \n"
+ " ?vcard vcard:hasURL ?link . \n" + " ?vcard vcard:hasURL ?link . \n"
+ " ?link a vcard:URL \n" + " ?link a vcard:URL \n"
+ " OPTIONAL { ?link vcard:url ?url } \n" + " OPTIONAL { ?link vcard:url ?url } \n"
+ " OPTIONAL { ?link rdfs:label ?label } \n" + " OPTIONAL { ?link rdfs:label ?linkLabel } \n"
+ " OPTIONAL { ?link core:rank ?rank } \n" + " OPTIONAL { ?link core:rank ?rank } \n"
+ " OPTIONAL { ?link vitro:mostSpecificType ?type } \n" + " OPTIONAL { ?link vitro:mostSpecificType ?type } \n"
+ " OPTIONAL { ?type rdfs:label ?typeLabel } \n" + " OPTIONAL { ?type rdfs:label ?typeLabel } \n"
+ "} ORDER BY ?rank"; + "} GROUP BY ?rank ?vcard ?link ?url ?typeLabel \n"
+ " ORDER BY ?rank";
private List<Map<String, String>> getWebpages(String subjectUri, VitroRequest vreq) { private List<Map<String, String>> getWebpages(String subjectUri, VitroRequest vreq) {