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

NIHVIVO-2463 merge tool improvement for rdfs:labels

Browse source
This commit is contained in:
anupsawant 2011-07-11 17:52:38 +00:00
parent c185d816f9
commit 5c4de6d358
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -675,17 +675,24 @@ public class JenaIngestController extends BaseEditController {
} }
private void processMergeIndividualRequest(VitroRequest vreq, ModelMaker maker, String modelType) { private void processMergeIndividualRequest(VitroRequest vreq, ModelMaker maker, String modelType) {
String uri1 = vreq.getParameter("uri1"); String uri1 = vreq.getParameter("uri1"); // get primary uri
String uri2 = vreq.getParameter("uri2"); String uri2 = vreq.getParameter("uri2"); // get secondary uri
String usePrimaryLabelOnly = vreq.getParameter("usePrimaryLabelOnly");
if(uri1!=null){ if(uri1!=null){
JenaIngestUtils utils = new JenaIngestUtils(); JenaIngestUtils utils = new JenaIngestUtils();
/*
* get baseOnt, Ont and infOnt models
*/
OntModel baseOntModel = (OntModel) getServletContext().getAttribute("baseOntModel"); OntModel baseOntModel = (OntModel) getServletContext().getAttribute("baseOntModel");
OntModel ontModel = (OntModel) OntModel ontModel = (OntModel)
getServletContext().getAttribute("jenaOntModel"); getServletContext().getAttribute("jenaOntModel");
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); /*
// vreq.getSession().setAttribute("leftoverModel", utils.getLeftOverModel()); * calling method that does the merge operation.
*/
String result = utils.doMerge(uri1,uri2,baseOntModel,ontModel,infOntModel,usePrimaryLabelOnly);
getServletContext().setAttribute("leftoverModel", utils.getLeftOverModel()); getServletContext().setAttribute("leftoverModel", utils.getLeftOverModel());
vreq.setAttribute("result",result); vreq.setAttribute("result",result);
vreq.setAttribute("title","Merge Individuals"); vreq.setAttribute("title","Merge Individuals");