Improve output: distinguish between failed assertions (failures) and unexpected exceptions (errors), and print a filtered stack trace for any exception.

webapp/web/jenaIngest/subtractModels.jsp

@@ -0,0 +1,58 @@
+<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
+
+<%@ page import="com.hp.hpl.jena.ontology.Individual" %>
+<%@ page import="com.hp.hpl.jena.ontology.OntModel" %>
+<%@ page import="com.hp.hpl.jena.rdf.model.ModelMaker" %>
+<%@ page import="com.hp.hpl.jena.shared.Lock" %>
+<%@ page import="java.util.Iterator" %>
+<%@ page import="java.util.List" %>
+<%@ page import="java.net.URLEncoder" %>
+
+<%
+
+    ModelMaker maker = (ModelMaker) request.getSession().getAttribute("vitroJenaModelMaker");
+    if (maker == null) {
+        maker = (ModelMaker) getServletContext().getAttribute("vitroJenaModelMaker");
+    }
+
+%>
+
+    <h2>Subtract One Model from Another</h2>
+
+    <form action="ingest" method="get"i>
+        <input type="hidden" name="action" value="subtractModels"/>
+
+    <select name="modela">
+<%
+    for (Iterator it = maker.listModels(); it.hasNext(); ) {
+	String modelName = (String) it.next();
+        %> <option value="<%=modelName%>"/><%=modelName%></option>
+        <%    
+    }
+%>   
+    </select>
+    <p>model to be subtracted from</p>
+
+    <select name="modelb">
+<%
+    for (Iterator it = maker.listModels(); it.hasNext(); ) {
+	String modelName = (String) it.next();
+        %> <option value="<%=modelName%>"><%=modelName%></option>
+        <%    
+    }
+%>   
+	</select>
+    <p>model to subtract</p>
+
+    <select name="destinationModelName">
+<%
+    for (Iterator it = maker.listModels(); it.hasNext(); ) {
+	String modelName = (String) it.next();
+        %> <option value="<%=modelName%>"><%=modelName%></option>
+        <%    
+    }
+%>   
+	</select>
+    <p>model in which difference should be saved</p>
+
+    <input type="submit" value="Subtract models"/>