diff -r fd2ba38ce4ad -r 594f79a5706b src/p4l/settings.py --- a/src/p4l/settings.py Mon Sep 16 18:00:04 2013 +0200 +++ b/src/p4l/settings.py Tue Sep 17 16:11:13 2013 +0200 @@ -408,12 +408,13 @@ PREFIX rdf: PREFIX owl: PREFIX rdfs: -SELECT DISTINCT ?uri ?label +SELECT DISTINCT ?uri ?label ?acro WHERE { ?uri a skos:Concept. ?uri skos:inScheme . ?uri skos:prefLabel ?label. ?uri skos:prefLabel ?lab. + OPTIONAL { ?uri skos:altLabel ?acro }. FILTER regex (str(?lab), ?reg, 'i'). BIND (STRLEN(STRBEFORE (str(?lab), ?reg)) AS ?place). BIND (STRLEN(STR(?lab)) AS ?len) @@ -425,11 +426,12 @@ PREFIX rdf: PREFIX owl: PREFIX rdfs: -SELECT DISTINCT ?uri ?label +SELECT DISTINCT ?uri ?label ?acro WHERE { ?uri a skos:Concept ; skos:inScheme ; skos:prefLabel ?label . + OPTIONAL { ?uri skos:altLabel ?acro } } ORDER BY ?label """ @@ -440,12 +442,13 @@ PREFIX rdf: PREFIX owl: PREFIX rdfs: -SELECT DISTINCT ?uri ?label +SELECT DISTINCT ?uri ?label ?acro WHERE { ?uri a skos:Concept. ?uri skos:inScheme . ?uri skos:prefLabel ?label. ?uri skos:prefLabel ?lab. + OPTIONAL { ?uri skos:altLabel ?acro }. FILTER regex (str(?lab), ?reg, 'i'). BIND (STRLEN(STRBEFORE (str(?lab), ?reg)) AS ?place). BIND (STRLEN(STR(?lab)) AS ?len) @@ -457,11 +460,12 @@ PREFIX rdf: PREFIX owl: PREFIX rdfs: -SELECT DISTINCT ?uri ?label +SELECT DISTINCT ?uri ?label ?acro WHERE { ?uri a skos:Concept ; skos:inScheme ; skos:prefLabel ?label . + OPTIONAL { ?uri skos:altLabel ?acro } } ORDER BY ?label """