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

Additional debugging lines in SparqlEvaluateVTwo

Browse source
This commit is contained in:
hjkhjk54 2011-11-18 21:38:26 +00:00
parent 5b83be11e7
commit 02598d2707
1 changed files with 19 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

23
webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/SparqlEvaluateVTwo.java
View file

@ -27,21 +27,25 @@ public class SparqlEvaluateVTwo {
} }
public void evaluateForAdditionalUris( EditConfigurationVTwo editConfig ){ public void evaluateForAdditionalUris( EditConfigurationVTwo editConfig ){
log.debug("Evaluating for Additional URIS");
Map<String,List<String>> varsToUris = sparqlEvaluateForUris(editConfig, editConfig.getSparqlForAdditionalUrisInScope()); Map<String,List<String>> varsToUris = sparqlEvaluateForUris(editConfig, editConfig.getSparqlForAdditionalUrisInScope());
editConfig.getUrisInScope().putAll(varsToUris); editConfig.getUrisInScope().putAll(varsToUris);
} }
public void evalulateForAdditionalLiterals( EditConfigurationVTwo editConfig ){ public void evalulateForAdditionalLiterals( EditConfigurationVTwo editConfig ){
log.debug("Evaluating for Additional Literals");
Map<String,List<Literal>> varsToLiterals = sparqlEvaluateForLiterals(editConfig, editConfig.getSparqlForAdditionalLiteralsInScope()); Map<String,List<Literal>> varsToLiterals = sparqlEvaluateForLiterals(editConfig, editConfig.getSparqlForAdditionalLiteralsInScope());
editConfig.getLiteralsInScope().putAll(varsToLiterals); editConfig.getLiteralsInScope().putAll(varsToLiterals);
} }
public void evaluateForExistingUris( EditConfigurationVTwo editConfig){ public void evaluateForExistingUris( EditConfigurationVTwo editConfig){
log.debug("Evaluating for existing URIS");
Map<String,List<String>> varsToUris = sparqlEvaluateForUris(editConfig, editConfig.getSparqlForExistingUris()); Map<String,List<String>> varsToUris = sparqlEvaluateForUris(editConfig, editConfig.getSparqlForExistingUris());
editConfig.getUrisInScope().putAll(varsToUris); editConfig.getUrisInScope().putAll(varsToUris);
} }
public void evaluateForExistingLiterals( EditConfigurationVTwo editConfig){ public void evaluateForExistingLiterals( EditConfigurationVTwo editConfig){
log.debug("Evaluating for existing literals");
Map<String,List<Literal>> varsToLiterals = sparqlEvaluateForLiterals(editConfig, editConfig.getSparqlForExistingLiterals()); Map<String,List<Literal>> varsToLiterals = sparqlEvaluateForLiterals(editConfig, editConfig.getSparqlForExistingLiterals());
editConfig.getLiteralsInScope().putAll(varsToLiterals); editConfig.getLiteralsInScope().putAll(varsToLiterals);
} }
@ -88,15 +92,18 @@ public class SparqlEvaluateVTwo {
Map<String,List<Literal>> varToLiterals = new HashMap<String,List<Literal>>(); Map<String,List<Literal>> varToLiterals = new HashMap<String,List<Literal>>();
for(String var : varToSparql.keySet()){ for(String var : varToSparql.keySet()){
String query = varToSparql.get(var); String query = varToSparql.get(var);
log.debug("Var name " + var + " and query = " + query);
/* skip if var set to use a system generated value */ /* skip if var set to use a system generated value */
if( query == null || EditConfigurationVTwo.USE_SYSTEM_VALUE.equals( query )) if( query == null || EditConfigurationVTwo.USE_SYSTEM_VALUE.equals( query )) {
log.debug("Query is null or using system value so will not continue with rest of method");
continue; continue;
}
List<String> queryStrings = new ArrayList <String>(); List<String> queryStrings = new ArrayList <String>();
queryStrings.add( query ); queryStrings.add( query );
editConfig.getN3Generator().subInMultiUris(uriScope, queryStrings); editConfig.getN3Generator().subInMultiUris(uriScope, queryStrings);
log.debug("Query after substituting uris in scope: " + queryStrings.toString());
editConfig.getN3Generator().subInMultiLiterals(literalScope,queryStrings); editConfig.getN3Generator().subInMultiLiterals(literalScope,queryStrings);
log.debug("Query after substituting literals in scope: " + queryStrings.toString());
varToLiterals.put(var, queryToLiteral( queryStrings.get(0) )); //might result in (key -> null) varToLiterals.put(var, queryToLiteral( queryStrings.get(0) )); //might result in (key -> null)
} }
@ -111,13 +118,18 @@ public class SparqlEvaluateVTwo {
for(String var : varToSparql.keySet()){ for(String var : varToSparql.keySet()){
String query = varToSparql.get(var); String query = varToSparql.get(var);
log.debug("Var name " + var + " and query = " + query);
/* skip if var set to use a system generated value */ /* skip if var set to use a system generated value */
if( query == null || EditConfigurationVTwo.USE_SYSTEM_VALUE.equals( query )) if( query == null || EditConfigurationVTwo.USE_SYSTEM_VALUE.equals( query )) {
log.debug("Query is null or using system value so will not continue with rest of method");
continue; continue;
}
List<String> queryStrings = new ArrayList <String>(); List<String> queryStrings = new ArrayList <String>();
queryStrings.add(query); queryStrings.add(query);
editConfig.getN3Generator().subInMultiUris(uriScope, queryStrings); editConfig.getN3Generator().subInMultiUris(uriScope, queryStrings);
log.debug("Query after substituting uris in scope: " + queryStrings.toString());
editConfig.getN3Generator().subInMultiLiterals(literalScope,queryStrings); editConfig.getN3Generator().subInMultiLiterals(literalScope,queryStrings);
log.debug("Query after substituting literals in scope: " + queryStrings.toString());
List<String> uriFromQuery = queryToUri( queryStrings.get(0) ); List<String> uriFromQuery = queryToUri( queryStrings.get(0) );
if( uriFromQuery != null ) if( uriFromQuery != null )
{ {
@ -181,6 +193,7 @@ public class SparqlEvaluateVTwo {
}else{ }else{
log.debug("Query had no results");
return null; return null;
} }
} else { } else {
@ -198,6 +211,7 @@ public class SparqlEvaluateVTwo {
public List<Literal> queryToLiteral(String querystr){ public List<Literal> queryToLiteral(String querystr){
log.debug("Executing query " + querystr);
Literal value = null; Literal value = null;
List<Literal> values = new ArrayList<Literal>(); List<Literal> values = new ArrayList<Literal>();
QueryExecution qe = null; QueryExecution qe = null;
@ -217,6 +231,7 @@ public class SparqlEvaluateVTwo {
values.add(value); values.add(value);
} }
}else{ }else{
log.debug("Query had no results");
return null; return null;
} }
} else { } else {