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

Checking for nulls in EditN3GeneratorVTwo

Browse source
This commit is contained in:
briancaruso 2011-11-11 15:58:39 +00:00
parent 36253cd0f0
commit 7bfca34fe1
1 changed files with 16 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

46
webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditN3GeneratorVTwo.java
View file

@ -42,11 +42,14 @@ public class EditN3GeneratorVTwo {
*/ */
public void subInMultiUris(Map<String,List<String>> varsToVals, List<String> n3targets){ public void subInMultiUris(Map<String,List<String>> varsToVals, List<String> n3targets){
if( varsToVals == null || varsToVals.isEmpty() ) return; if( varsToVals == null || varsToVals.isEmpty() || n3targets == null)
return;
//for (String target : n3targets) { //for (String target : n3targets) {
for( int i = 0; i < n3targets.size() ; i++ ){ for( int i = 0; i < n3targets.size() ; i++ ){
String result = n3targets.get(i); String result = n3targets.get(i);
if( result == null )
continue;
Set<String> keySet = varsToVals.keySet(); Set<String> keySet = varsToVals.keySet();
for (String key : keySet) { for (String key : keySet) {
List<String> value = varsToVals.get(key); List<String> value = varsToVals.get(key);
@ -71,7 +74,9 @@ public class EditN3GeneratorVTwo {
return; return;
for( int i = 0; i < targets.size() ; i++ ){ for( int i = 0; i < targets.size() ; i++ ){
String result = targets.get(i); String result = targets.get(i);
if( result == null )
continue;
for( String key : varsToVals.keySet()) { for( String key : varsToVals.keySet()) {
result = subInUris( key, varsToVals.get(key), result); result = subInUris( key, varsToVals.get(key), result);
} }
@ -81,13 +86,15 @@ public class EditN3GeneratorVTwo {
public String subInUris(String var, String value, String target) { public String subInUris(String var, String value, String target) {
// empty URIs get skipped // empty URIs get skipped
if( var == null || var.isEmpty() || value == null ) if( var == null || var.isEmpty() || value == null || target == null)
return target; return target;
return subInNonBracketedURIS(var, "<" + value + ">", target); return subInNonBracketedURIS(var, "<" + value + ">", target);
} }
public void subInUris(String var, String value, List<String> targets){ public void subInUris(String var, String value, List<String> targets){
if( targets == null )
return;
for( String target : targets){ for( String target : targets){
subInUris( var, value, target); subInUris( var, value, target);
} }
@ -106,6 +113,8 @@ public class EditN3GeneratorVTwo {
for( int i=0; i< n3targets.size() ; i++ ){ for( int i=0; i< n3targets.size() ; i++ ){
String orginalN3 = n3targets.get(i); String orginalN3 = n3targets.get(i);
if( orginalN3 == null)
continue;
String newN3 = orginalN3; String newN3 = orginalN3;
for( String key : varsToVals.keySet() ){ for( String key : varsToVals.keySet() ){
newN3 = subInMultiLiterals( key, varsToVals.get(key), newN3 ); newN3 = subInMultiLiterals( key, varsToVals.get(key), newN3 );
@ -120,6 +129,8 @@ public class EditN3GeneratorVTwo {
for( int i=0; i< n3targets.size() ; i++ ){ for( int i=0; i< n3targets.size() ; i++ ){
String orginalN3 = n3targets.get(i); String orginalN3 = n3targets.get(i);
if( orginalN3 == null )
continue;
String newN3 = orginalN3; String newN3 = orginalN3;
for( String key : varsToVals.keySet() ){ for( String key : varsToVals.keySet() ){
newN3 = subInLiterals( key, varsToVals.get(key), newN3 ); newN3 = subInLiterals( key, varsToVals.get(key), newN3 );
@ -179,32 +190,7 @@ public class EditN3GeneratorVTwo {
} }
private Map<String,List<String>> substituteIntoValues protected String subInMultiLiterals(String var, List<Literal>values, String n3){
(Map<String,List<String>> varsToUris,
Map<String,List<Literal>> varsToLiterals,
Map<String,List<String>> namesToN3 )
{
Map<String,List<String>> outHash = new HashMap<String,List<String>>();
if (namesToN3==null) {
return outHash;
} else if (namesToN3.isEmpty()) {
return outHash;
} else {
for(String fieldName : namesToN3.keySet()){
List<String> n3strings = namesToN3.get(fieldName);
List<String> newList = new ArrayList<String>();
// if( varsToUris != null)
// newList = subInMultiUris(varsToUris, n3strings);
// if( varsToLiterals != null)
// newList = subInMultiLiterals(varsToLiterals, newList);
outHash.put(fieldName, newList);
}
}
return outHash;
}
protected String subInMultiLiterals(String var, List<Literal>values, String n3){
if (n3==null ) { if (n3==null ) {
log.error("subInMultiLiterals was passed a null n3 String"); log.error("subInMultiLiterals was passed a null n3 String");
return "blankBecauseTargetOrValueWasNull"; return "blankBecauseTargetOrValueWasNull";