From a7606b079a67799d2cb720cf7ef1c4ee5808e5fc Mon Sep 17 00:00:00 2001
From: ass92 <ass92@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Thu, 27 Jan 2011 21:15:38 +0000
Subject: [PATCH] NIHVIVO-1876 csv tool optimization.

---
 .../mannlib/vitro/webapp/utils/Csv2Rdf.java   | 32 +++++++++++--------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/Csv2Rdf.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/Csv2Rdf.java
index 6dda0ef8b..321e0d2c6 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/Csv2Rdf.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/Csv2Rdf.java
@@ -81,23 +81,29 @@ public class Csv2Rdf {
         for (int i=0; i<columnHeaders.length; i++) {
             dpArray[i] = tboxOntModel.createDatatypeProperty(tboxNamespace+propertyNameBase+columnHeaders[i].replaceAll("\\W",""));
         }
-
+        Individual ind = null;
         for (int row=1; row<fileRows.size(); row++) {
-        	while( uriIsGood == false && attempts < 30 ){	
-        		uri = namespace+individualNameBase+random.nextInt( Math.min(Integer.MAX_VALUE,(int)Math.pow(2,attempts + 13)) );
-	        errMsg = wdf.checkURI(uri);
-	        Resource res = ResourceFactory.createResource(uri);
-	        inDestination = destination.contains(res, null);
-			if(  errMsg != null && !inDestination)
-				uri = null;
-			else
-				uriIsGood = true;				
-			attempts++;
-		}
+        	if(namespace!=null && !namespace.isEmpty()){
+        		while( uriIsGood == false && attempts < 30 ){	
+        			uri = namespace+individualNameBase+random.nextInt( Math.min(Integer.MAX_VALUE,(int)Math.pow(2,attempts + 13)) );
+        			errMsg = wdf.checkURI(uri);
+        			Resource res = ResourceFactory.createResource(uri);
+        			inDestination = destination.contains(res, null);
+        			if(  errMsg != null && !inDestination)
+        				uri = null;
+        			else
+        				uriIsGood = true;				
+        			attempts++;
+        		}
+        	}
         	uriIsGood = false;
         	attempts =0;
         	inDestination = false;
-        	Individual ind = ontModel.createIndividual(uri,theClass);
+        	
+        	if(uri!=null)
+        		ind = ontModel.createIndividual(uri,theClass);
+        	else
+        		ind = ontModel.createIndividual(theClass);
 	        String[] cols = fileRows.get(row);
 	        for (int col=0; col<cols.length; col++) {
 				String value = cols[col].trim();