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

code modification for permanent uri tool.

Browse source
This commit is contained in:
ass92 2010-07-14 12:55:00 +00:00
parent bc50c8ea4c
commit 8a299c67a0
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaIngestController.java
View file

@ -446,7 +446,7 @@ public class JenaIngestController extends BaseEditController {
String uri1 = vreq.getParameter("uri1"); String uri1 = vreq.getParameter("uri1");
String uri2 = vreq.getParameter("uri2"); String uri2 = vreq.getParameter("uri2");
if(uri1!=null){ if(uri1!=null){
String result = doMerge(uri1,uri2,response); String result = doMerge(uri1,uri2,response,request);
request.setAttribute("result",result); request.setAttribute("result",result);
request.setAttribute("title","Merge Individuals"); request.setAttribute("title","Merge Individuals");
request.setAttribute("bodyJsp",MERGE_RESULT); request.setAttribute("bodyJsp",MERGE_RESULT);
@ -988,7 +988,7 @@ public class JenaIngestController extends BaseEditController {
vitroJenaModel.leaveCriticalSection(); vitroJenaModel.leaveCriticalSection();
return uri; 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"); OntModel vitroJenaModel = (OntModel) getServletContext().getAttribute("baseOntModel");
Resource res1 = vitroJenaModel.getResource(uri1); Resource res1 = vitroJenaModel.getResource(uri1);
Resource res2 = vitroJenaModel.getResource(uri2); Resource res2 = vitroJenaModel.getResource(uri2);
@ -1031,6 +1031,7 @@ public class JenaIngestController extends BaseEditController {
OutputStream outStream = response.getOutputStream(); OutputStream outStream = response.getOutputStream();
outStream.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>".getBytes()); outStream.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>".getBytes());
leftoverModel.write( outStream,"RDF/XML-ABBREV"); leftoverModel.write( outStream,"RDF/XML-ABBREV");
request.getSession().setAttribute("leftoverModel", leftoverModel);
outStream.flush(); outStream.flush();
outStream.close(); outStream.close();
} }