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

NIHVIVO-2118 correction to remove garbage from display page of merge individuals

Browse source
This commit is contained in:
ass92 2011-02-11 16:29:22 +00:00
parent ff45e2e86e
commit 13f6b66f6f
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -577,7 +577,8 @@ public class JenaIngestController extends BaseEditController {
OntModel infOntModel = (OntModel) OntModel infOntModel = (OntModel)
getServletContext().getAttribute(JenaBaseDao.INFERENCE_ONT_MODEL_ATTRIBUTE_NAME); getServletContext().getAttribute(JenaBaseDao.INFERENCE_ONT_MODEL_ATTRIBUTE_NAME);
String result = utils.doMerge(uri1,uri2,baseOntModel,ontModel,infOntModel); String result = utils.doMerge(uri1,uri2,baseOntModel,ontModel,infOntModel);
request.getSession().setAttribute("leftoverModel", utils.getLeftOverModel()); // request.getSession().setAttribute("leftoverModel", utils.getLeftOverModel());
getServletContext().setAttribute("leftoverModel", utils.getLeftOverModel());
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);
@ -606,7 +607,8 @@ public class JenaIngestController extends BaseEditController {
} }
else if("mergeResult".equals(actionStr)){ else if("mergeResult".equals(actionStr)){
Model lmodel = (Model)request.getSession().getAttribute("leftoverModel"); //Model lmodel = (Model)request.getSession().getAttribute("leftoverModel");
Model lmodel = (Model)getServletContext().getAttribute("leftoverModel");
response.setContentType("RDF/XML-ABBREV"); response.setContentType("RDF/XML-ABBREV");
try{ try{
OutputStream outStream = response.getOutputStream(); OutputStream outStream = response.getOutputStream();