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

6
webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoSDB.java
View file

@ -438,13 +438,17 @@ public class IndividualDaoSDB extends IndividualDaoJena {
final List<String> list = final List<String> list =
new LinkedList<String>(); new LinkedList<String>();
// get all labeled resources from any non-tbox and non-metadata graphs. // get all labeled resources from any non-tbox and non-metadata graphs,
// as well as the unnamed graph (first pattern below)
String query = "SELECT DISTINCT ?ind WHERE { \n" + String query = "SELECT DISTINCT ?ind WHERE { \n" +
" { ?ind <" + RDFS.label.getURI() + "> ?label } " +
" UNION { " +
" GRAPH ?g { ?ind <" + RDFS.label.getURI() + " GRAPH ?g { ?ind <" + RDFS.label.getURI() +
"> ?label } \n" + "> ?label } \n" +
" FILTER (?g != <" + JenaDataSourceSetupBase " FILTER (?g != <" + JenaDataSourceSetupBase
.JENA_APPLICATION_METADATA_MODEL + "> " + .JENA_APPLICATION_METADATA_MODEL + "> " +
" && !regex(str(?g),\"tbox\")) \n " + " && !regex(str(?g),\"tbox\")) \n " +
" } " +
"}"; "}";
Query q = QueryFactory.create(query); Query q = QueryFactory.create(query);

2
webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassDaoSDB.java
View file

@ -139,10 +139,8 @@ public class VClassDaoSDB extends VClassDaoJena {
try { try {
String queryText = String queryText =
"SELECT COUNT( DISTINCT ?instance ) WHERE { \n" + "SELECT COUNT( DISTINCT ?instance ) WHERE { \n" +
" GRAPH <urn:x-arq:UnionGraph> { \n" +
" ?class <"+VitroVocabulary.IN_CLASSGROUP+"> <"+vcg.getURI() +"> .\n" + " ?class <"+VitroVocabulary.IN_CLASSGROUP+"> <"+vcg.getURI() +"> .\n" +
" ?instance a ?class . \n" + " ?instance a ?class . \n" +
" } \n" +
"} \n" ; "} \n" ;
Query countQuery = QueryFactory.create(queryText, Syntax.syntaxARQ); Query countQuery = QueryFactory.create(queryText, Syntax.syntaxARQ);

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

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