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

rewritten list view queries with UNIONs plus various and sundry other bugfixes and improvements; also probably new bugs

Browse source
This commit is contained in:
bjl23 2011-01-27 20:56:44 +00:00
parent 881c3ca4fa
commit b5777a60ad
14 changed files with 238 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

43
webapp/web/config/listViewConfig-default.xml
View file

@ -11,9 +11,21 @@
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
SELECT ?object ?name ?moniker {
GRAPH ?g1 { ?subject ?property ?object }
OPTIONAL { GRAPH ?g2 { ?object rdfs:label ?name } }
OPTIONAL { GRAPH ?g3 { ?object vitro:moniker ?moniker } }
{
?subject ?property ?object .
}
UNION {
?subject ?property ?object .
?object rdfs:label ?name
}
UNION {
?subject ?property ?object .
?object vitro:moniker ?moniker
} UNION {
?subject ?property ?object .
?object rdfs:label ?name .
?object vitro:moniker ?moniker .
}
}
</query-base>
@ -22,11 +34,28 @@
PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
SELECT ?subclass ?object ?name ?moniker {
GRAPH ?g1 { ?subject ?property ?object
OPTIONAL { ?object a ?subclass }
{
?subject ?property ?object .
?object a ?subclass .
}
OPTIONAL { GRAPH ?g2 { ?object rdfs:label ?name } }
OPTIONAL { GRAPH ?g3 { ?object vitro:moniker ?moniker } }
UNION {
?subject ?property ?object .
?object a ?subclass .
?object rdfs:label ?name
}
UNION {
?subject ?property ?object .
?object a ?subclass .
?object vitro:moniker ?moniker
} UNION {
?subject ?property ?object .
?object a ?subclass .
?object rdfs:label ?name .
?object vitro:moniker ?moniker .
}
} ORDER BY ?subclass
</query-collated>

8
webapp/web/config/listViewConfig-vitroLink.xml
View file

@ -14,10 +14,10 @@
(afn:localname(?link) AS ?linkName)
?anchor
?url WHERE {
GRAPH ?g1 { ?subject ?property ?link }
OPTIONAL { GRAPH ?g2 { ?link vitro:linkAnchor ?anchor } }
OPTIONAL { GRAPH ?g3 { ?link vitro:linkURL ?url } }
OPTIONAL { GRAPH ?g4 { ?link vitro:linkDisplayRank ?rank } }
?subject ?property ?link
OPTIONAL { ?link vitro:linkAnchor ?anchor }
OPTIONAL { ?link vitro:linkURL ?url }
OPTIONAL { ?link vitro:linkDisplayRank ?rank }
} ORDER BY ?rank
</query-base>