NIHVIVO-3516 fixed merge tool so it doesn't strand triples in a graph named with SDB's union URI
This commit is contained in:
parent
f3d6e33a01
commit
2bdb44685f
3 changed files with 814 additions and 791 deletions
|
@ -1,5 +1,6 @@
|
|||
<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
|
||||
|
||||
<%@page import="edu.cornell.mannlib.vitro.webapp.utils.jena.JenaIngestUtils.MergeResult"%>
|
||||
<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%>
|
||||
|
||||
<%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
|
||||
|
@ -11,8 +12,13 @@
|
|||
|
||||
<h2><a class="ingestMenu" href="ingest">Ingest Menu</a> > Merge Individuals</h2>
|
||||
|
||||
<%String result = (String) request.getAttribute("result");%>
|
||||
<%
|
||||
MergeResult resultObj = (MergeResult) request.getAttribute("result");
|
||||
String result = resultObj.getResultText();
|
||||
%>
|
||||
|
||||
<p><b><%=result%></b></p>
|
||||
|
||||
<%if(!result.equals("resource 1 not present") && !result.equals("resource 2 not present")){
|
||||
if(!result.equals("No statements merged") && !result.endsWith("statements.")){%>
|
||||
<p>Download non-mergeable statements.</p>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue