From ddc5403ceba36359bf9ff230562ccf9069e69933 Mon Sep 17 00:00:00 2001
From: ass92 <ass92@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Mon, 10 Jan 2011 17:36:49 +0000
Subject: [PATCH] improvement on csv2rdf tool

---
 .../controller/jena/JenaIngestController.java | 37 +++++++++++++++++--
 1 file changed, 33 insertions(+), 4 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaIngestController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaIngestController.java
index 67552b896..cb003ae84 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaIngestController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaIngestController.java
@@ -722,12 +722,13 @@ public class JenaIngestController extends BaseEditController {
 	
 	private void doRenameBNodes(VitroRequest vreq, String namespaceEtc, boolean patternBoolean, String pattern, String[] sourceModel) {
 		OntModel source = ModelFactory.createOntologyModel(OntModelSpec.OWL_DL_MEM);
-		//String[] sourceModel = vreq.getParameterValues("sourceModelName");
-		
+		String property = vreq.getParameter("property");
+		Boolean csv2rdf = (Boolean)getServletContext().getAttribute("csv2rdf");
 		for (int i=0; i<sourceModel.length; i++) {
 			Model m = getModel(sourceModel[i],vreq);
 			source.addSubModel(m);
 		}
+		System.out.println(vreq.getParameter("destinationModelName"));
 		Model destination = getModel(vreq.getParameter("destinationModelName"),vreq);
 		JenaIngestUtils utils = new JenaIngestUtils();
 		destination.enterCriticalSection(Lock.WRITE);
@@ -736,10 +737,38 @@ public class JenaIngestController extends BaseEditController {
 				destination.add(utils.renameBNodes(source, namespaceEtc, vreq.getJenaOntModel()));
 			}
 			else{
-				String property = vreq.getParameter("property");
 				destination.add(utils.renameBNodesByPattern(source, namespaceEtc, vreq.getJenaOntModel(), pattern, property));
 			}
-				
+			if(csv2rdf){
+				ClosableIterator closeIt = destination.listSubjects();
+				Property prop = ResourceFactory.createProperty(property);
+				try {
+					for (Iterator it = closeIt; it.hasNext();) {
+						Resource res = (Resource) it.next();
+						if (res.isAnon()) {
+							// now we do something hacky to get the same resource in the outModel, since there's no getResourceById();
+							ClosableIterator closfIt = destination.listStatements(res,prop,(RDFNode)null);
+							Statement stmt = null;
+							try {
+								if (closfIt.hasNext()) {
+									stmt = (Statement) closfIt.next();
+								}
+							} finally {
+								closfIt.close();
+							}
+							if (stmt != null) {
+								Resource outRes = stmt.getSubject();
+								destination.removeAll(outRes,(Property)null,(RDFNode)null);
+							}
+						}
+					}
+				} finally {
+					closeIt.close();
+				}
+				csv2rdf = false;
+				getServletContext().setAttribute("csv2rdf", csv2rdf);
+			}
+			
 		} finally {
 			destination.leaveCriticalSection();
 		}