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

Merge branch 'develop' of https://github.com/vivo-project/Vitro into develop

Browse source 
I have no idea what just happened.
was behind. doing this merge to correct that so I can push a change.
This commit is contained in:
tworrall 2013-02-19 12:22:43 -05:00
commit 7241929be0
3 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
webapp/web/templates/edit/specific/ents_edit.jsp
View file

@ -37,9 +37,12 @@
SELECT ?pred ?predLabel ?obj ?objLabel ?graph
WHERE
{
{ <${entity.URI}> ?pred ?obj
MINUS { GRAPH ?g { <${entity.URI}> ?pred ?obj } } }
UNION
{ GRAPH ?graph { <${entity.URI}> ?pred ?obj} }
OPTIONAL { GRAPH ?h { ?obj rdfs:label ?objLabel } }
OPTIONAL { GRAPH ?i { ?pred rdfs:label ?predLabel } }
OPTIONAL { ?obj rdfs:label ?objLabel }
OPTIONAL { ?pred rdfs:label ?predLabel }
} ORDER BY ?graph ?pred
limit 10000"/>
<form action="admin/sparqlquery" method="get">
@ -54,9 +57,12 @@
SELECT ?sub ?subL ?pred ?predLabel ?graph
WHERE
{
{ ?sub ?pred <${entity.URI}>
MINUS { GRAPH ?g { ?sub ?pred <${entity.URI}> } } }
UNION
{ GRAPH ?graph { ?sub ?pred <${entity.URI}> } }
OPTIONAL { GRAPH ?h { ?sub rdfs:label ?subL } }
OPTIONAL { GRAPH ?i { ?pred rdfs:label ?predLabel } }
OPTIONAL { ?sub rdfs:label ?subL }
OPTIONAL { ?pred rdfs:label ?predLabel }
} ORDER BY ?graph ?pred
limit 10000"/>
<form action="admin/sparqlquery" method="get">