From fd945e97ad2e572f1223c46252af46d733105480 Mon Sep 17 00:00:00 2001 From: cappadona Date: Thu, 21 Jul 2011 12:33:41 +0000 Subject: [PATCH] NIHVIVO-1481 Merged r8774 from maint-rel-vivo-1.3 branch. --- .../controller/jena/JenaIngestController.java | 14 ++++---- webapp/web/jenaIngest/ingestMenu.jsp | 28 ++++++++-------- ...ergeIndividuals.jsp => mergeResources.jsp} | 33 +++++++++---------- 3 files changed, 37 insertions(+), 38 deletions(-) rename webapp/web/jenaIngest/{mergeIndividuals.jsp => mergeResources.jsp} (63%) 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 bd883abe8..5c1f8642f 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 @@ -101,7 +101,7 @@ public class JenaIngestController extends BaseEditController { private static final String WORKFLOW_STEP_JSP = "/jenaIngest/workflowStep.jsp"; private static final String GENERATE_TBOX_JSP = "/jenaIngest/generateTBox.jsp"; private static final String PERMANENT_URI = "/jenaIngest/permanentURI.jsp"; - private static final String MERGE_INDIVIDUALS = "/jenaIngest/mergeIndividuals.jsp"; + private static final String MERGE_RESOURCES = "/jenaIngest/mergeResources.jsp"; private static final String MERGE_RESULT = "/jenaIngest/merge_result.jsp"; private static final String SPARQL_CONSTRUCT_CLASS = "http://vitro.mannlib.cornell.edu/ns/vitro/0.7/sparql#SPARQLCONSTRUCTQuery"; private static final String SPARQL_QUERYSTR_PROP = "http://vitro.mannlib.cornell.edu/ns/vitro/0.7/sparql#queryStr"; @@ -174,8 +174,8 @@ public class JenaIngestController extends BaseEditController { processGenerateTBoxRequest(vreq, maker, modelType); } else if("permanentURI".equals(actionStr)){ processPermanentURIRequest(vreq, maker, modelType); - } else if("mergeIndividuals".equals(actionStr)){ - processMergeIndividualRequest(vreq, maker, modelType); + } else if("mergeResources".equals(actionStr)){ + processMergeResourceRequest(vreq, maker, modelType); } else if("renameResource".equals(actionStr)){ processRenameResourceRequest(vreq, response, maker, modelType); } else if("mergeResult".equals(actionStr)){ @@ -674,7 +674,7 @@ public class JenaIngestController extends BaseEditController { } } - private void processMergeIndividualRequest(VitroRequest vreq, ModelMaker maker, String modelType) { + private void processMergeResourceRequest(VitroRequest vreq, ModelMaker maker, String modelType) { String uri1 = vreq.getParameter("uri1"); // get primary uri String uri2 = vreq.getParameter("uri2"); // get secondary uri String usePrimaryLabelOnly = vreq.getParameter("usePrimaryLabelOnly"); @@ -695,12 +695,12 @@ public class JenaIngestController extends BaseEditController { String result = utils.doMerge(uri1,uri2,baseOntModel,ontModel,infOntModel,usePrimaryLabelOnly); getServletContext().setAttribute("leftoverModel", utils.getLeftOverModel()); vreq.setAttribute("result",result); - vreq.setAttribute("title","Merge Individuals"); + vreq.setAttribute("title","Merge Resources"); vreq.setAttribute("bodyJsp",MERGE_RESULT); } else{ - vreq.setAttribute("title","Merge Individuals"); - vreq.setAttribute("bodyJsp",MERGE_INDIVIDUALS); + vreq.setAttribute("title","Merge Resources"); + vreq.setAttribute("bodyJsp",MERGE_RESOURCES); } } diff --git a/webapp/web/jenaIngest/ingestMenu.jsp b/webapp/web/jenaIngest/ingestMenu.jsp index 42f034bdb..40541f742 100644 --- a/webapp/web/jenaIngest/ingestMenu.jsp +++ b/webapp/web/jenaIngest/ingestMenu.jsp @@ -8,27 +8,27 @@

Ingest Menu

\ No newline at end of file diff --git a/webapp/web/jenaIngest/mergeIndividuals.jsp b/webapp/web/jenaIngest/mergeResources.jsp similarity index 63% rename from webapp/web/jenaIngest/mergeIndividuals.jsp rename to webapp/web/jenaIngest/mergeResources.jsp index 9d9d07a3d..966c2100e 100644 --- a/webapp/web/jenaIngest/mergeIndividuals.jsp +++ b/webapp/web/jenaIngest/mergeResources.jsp @@ -23,28 +23,27 @@ -

Ingest Menu > Merge Individuals

+

Ingest Menu > Merge Resources

-

This tool allows two individuals with different URIs to be collapsed into a - single URI. Any statements using the "duplicate individual URI" will be - rewritten using the "primary individual URI." If there are multiple +

This tool allows two resources with different URIs to be collapsed into a + single URI. Any statements using the "duplicate resource URI" will be + rewritten using the "primary resource URI." If there are multiple statements for a property that can have only a single value, the extra statements will be retracted from the model and offered for download.

This tool operates on the main web application model only, not on any of the additional Jena models.

- - - - - - - - -
Primary individual URI
Duplicate individual URI
-Retain rdfs:labels only from Primary Individual -

-

-
+ + + + + + + + +
Primary resource URI
Duplicate resource URI
+ Retain rdfs:labels only from Primary Resource +

+ \ No newline at end of file