From 8a299c67a0e1603dd9b15647bd4acc61ee93d61c Mon Sep 17 00:00:00 2001 From: ass92 Date: Wed, 14 Jul 2010 12:55:00 +0000 Subject: [PATCH] code modification for permanent uri tool. --- .../vitro/webapp/controller/jena/JenaIngestController.java | 5 +++-- 1 file changed, 3 insertions(+), 2 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 07aa1c399..234a4424f 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 @@ -446,7 +446,7 @@ public class JenaIngestController extends BaseEditController { String uri1 = vreq.getParameter("uri1"); String uri2 = vreq.getParameter("uri2"); if(uri1!=null){ - String result = doMerge(uri1,uri2,response); + String result = doMerge(uri1,uri2,response,request); request.setAttribute("result",result); request.setAttribute("title","Merge Individuals"); request.setAttribute("bodyJsp",MERGE_RESULT); @@ -988,7 +988,7 @@ public class JenaIngestController extends BaseEditController { vitroJenaModel.leaveCriticalSection(); return uri; } - private String doMerge(String uri1, String uri2,HttpServletResponse response){ + private String doMerge(String uri1, String uri2,HttpServletResponse response,HttpServletRequest request){ OntModel vitroJenaModel = (OntModel) getServletContext().getAttribute("baseOntModel"); Resource res1 = vitroJenaModel.getResource(uri1); Resource res2 = vitroJenaModel.getResource(uri2); @@ -1031,6 +1031,7 @@ public class JenaIngestController extends BaseEditController { OutputStream outStream = response.getOutputStream(); outStream.write("".getBytes()); leftoverModel.write( outStream,"RDF/XML-ABBREV"); + request.getSession().setAttribute("leftoverModel", leftoverModel); outStream.flush(); outStream.close(); }