From 17c64e2e6a4e1b4b55d2a7f70b48ddf1350daa55 Mon Sep 17 00:00:00 2001
From: brianjlowe <brianjlowe@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Mon, 9 Jul 2012 20:21:44 +0000
Subject: [PATCH] merge r.9955 from maint-rel-1.5 : NIHVIVO-3892 using
 RDFServiceModel to enable deleting an ontology without leaving cruft in the
 in-memory cache

---
 .../controller/jena/RDFUploadController.java     | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/RDFUploadController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/RDFUploadController.java
index 42aa63583..878feaf0c 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/RDFUploadController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/RDFUploadController.java
@@ -2,6 +2,8 @@
 
 package edu.cornell.mannlib.vitro.webapp.controller.jena;
 
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -43,6 +45,7 @@ import edu.cornell.mannlib.vitro.webapp.rdfservice.ChangeSet;
 import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
 import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceException;
 import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.RDFServiceUtils;
+import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.jena.model.RDFServiceModel;
 import edu.cornell.mannlib.vitro.webapp.servlet.setup.JenaDataSourceSetupBase;
 
 public class RDFUploadController extends JenaIngestController {
@@ -307,7 +310,18 @@ public class RDFUploadController extends JenaIngestController {
             mainModel.getBaseModel().notifyEvent(startEvent);
             try {                                                 
                 if (remove) {
-                    mainModel.remove(changesModel);
+                    RDFService rdfService = new RDFServiceModel(mainModel);
+                    ByteArrayOutputStream out = new ByteArrayOutputStream();
+                    changesModel.write(out, "N-TRIPLE");
+                    ChangeSet cs = rdfService.manufactureChangeSet();
+                    ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
+                    cs.addRemoval(in, RDFService.ModelSerializationFormat.NTRIPLE, null);
+                    try {
+                        rdfService.changeSetUpdate(cs);
+                    } catch (RDFServiceException e) {
+                        throw new RuntimeException(e);
+                    }
+                    //mainModel.remove(changesModel);
                 } else {
                     mainModel.add(changesModel);
                     if (classgroupModel != null) {