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

NIHVIVO-3432 refactor access to model makers in ingest tools

Browse source
This commit is contained in:
brianjlowe 2011-12-05 20:13:37 +00:00
parent 820cf314b5
commit 672d9e6457
19 changed files with 1233 additions and 1458 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

File diff suppressed because it is too large Load diff

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

@ -41,7 +41,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.dao.jena.VitroJenaSpecialModelMaker;
import edu.cornell.mannlib.vitro.webapp.filestorage.uploadrequest.FileUploadServletRequest;
public class JenaXMLFileUpload extends BaseEditController {
public class JenaXMLFileUpload extends JenaIngestController {
Log log = LogFactory.getLog(JenaXMLFileUpload.class);
private String baseDirectoryForFiles;
private int maxFileSize = 1024 * 1024 * 500;
@ -88,6 +88,7 @@ public class JenaXMLFileUpload extends BaseEditController {
* defaultNamespace - namespace to use for elements in xml that lack a namespace
*
*/
@Override
public void doPost(HttpServletRequest rawRequest, HttpServletResponse resp)
throws ServletException, IOException {
FileUploadServletRequest request = FileUploadServletRequest.parseRequest(rawRequest, maxFileSize);
@ -151,8 +152,8 @@ public class JenaXMLFileUpload extends BaseEditController {
}
}
protected void doGet(HttpServletRequest request,
@Override
public void doGet(HttpServletRequest request,
HttpServletResponse response) throws ServletException, IOException {
if (!isAuthorizedToDisplayPage(request, response, new Actions(new UseAdvancedDataToolsPages()))) {
return;
@ -164,6 +165,7 @@ public class JenaXMLFileUpload extends BaseEditController {
request.setAttribute("title","Upload file and convert to RDF");
request.setAttribute("bodyJsp","/jenaIngest/xmlFileUpload.jsp");
request.setAttribute("modelNames", getVitroJenaModelMaker(vreq).listModels().toList());
request.setAttribute("models", null);
RequestDispatcher rd = request.getRequestDispatcher(Controllers.BASIC_JSP);
@ -267,13 +269,6 @@ public class JenaXMLFileUpload extends BaseEditController {
}
return filesToLoad;
}
private ModelMaker getVitroJenaModelMaker(HttpServletRequest request) {
ModelMaker myVjmm = (ModelMaker) request.getSession().getAttribute("vitroJenaModelMaker");
myVjmm = (myVjmm == null) ? (ModelMaker) getServletContext().getAttribute("vitroJenaModelMaker") : myVjmm;
return new VitroJenaSpecialModelMaker(myVjmm, request);
}
private long countOfStatements( List<Model> models){

4
webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VitroJenaSpecialModelMaker.java
View file

@ -35,6 +35,10 @@ public class VitroJenaSpecialModelMaker implements ModelMaker {
this.request = request;
}
public ModelMaker getInnerModelMaker() {
return this.innerModelMaker;
}
public void close() {
innerModelMaker.close();
}

35
webapp/web/jenaIngest/csv2rdf.jsp
View file

@ -9,19 +9,12 @@
<%@ page import="java.net.URLEncoder" %>
<%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %>
<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
<vitro:confirmAuthorization />
<%
ModelMaker maker = (ModelMaker) request.getSession().getAttribute("vitroJenaModelMaker");
if (maker == null) {
maker = (ModelMaker) getServletContext().getAttribute("vitroJenaSDBModelMaker");
}
%>
<h2><a class="ingestMenu" href="ingest">Ingest Menu</a> > Convert CSV to RDF</h2>
<form action="csv2rdf" method="post" enctype="multipart/form-data">
@ -49,7 +42,7 @@
-->
<p>
<p>Each row in the spreadsheet will produce an resource. Each of these
<p>Each row in the spreadsheet will produce a resource. Each of these
resources will be a member of a class in the namespace selected above.</p>
<p>What should the local name of this class be? This is normally a word or two
in "camel case" starting with an uppercase letter. (For example, if the
@ -60,25 +53,19 @@
<select name="destinationModelName">
<option value="vitro:baseOntModel">webapp assertions</option>
<%
for (Iterator it = maker.listModels(); it.hasNext(); ) {
String modelName = (String) it.next();
%> <option value="<%=modelName%>"><%=modelName%></option>
<%
}
%> <option value="">(none)</option>
<c:forEach var="modelName" items="${modelNames}">
<option value="${modelName}">${modelName}</option>
</c:forEach>
<option value="">(none)</option>
</select>
<p>Model in which to save the converted spreadsheet data</p>
<select name="tboxDestinationModelName">
<option value="vitro:baseOntModel">webapp assertions</option>
<%
for (Iterator it = maker.listModels(); it.hasNext(); ) {
String modelName = (String) it.next();
%> <option value="<%=modelName%>"><%=modelName%></option>
<%
}
%> <option value="">(none)</option>
<c:forEach var="modelName" items="${modelNames}">
<option value="${modelName}">${modelName}</option>
</c:forEach>
<option value="">(none)</option>
</select>
<p>Model in which to save the automatically-generated ontology</p>

10
webapp/web/jenaIngest/csv2rdfSelectUri.jsp
View file

@ -20,14 +20,6 @@
<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
<vitro:confirmAuthorization />
<%
ModelMaker maker = (ModelMaker) request.getSession().getAttribute("vitroJenaModelMaker");
if (maker == null) {
maker = (ModelMaker) getServletContext().getAttribute("vitroJenaSDBModelMaker");
}
%>
<script type="text/javascript" src="js/jquery.js"></script>
<script type="text/javascript" src="js/jenaIngest/renameNode.js"></script>
<script type="text/javascript">
@ -90,6 +82,8 @@ function disableProperties(){
<input type="hidden" name="sourceModelName" value="${sourceModelValue}"/>
</c:forEach>
<p/>
<input class="submit" type="submit" value="Convert CSV"/>
</form>

8
webapp/web/jenaIngest/executeWorkflow.jsp
View file

@ -13,14 +13,6 @@
<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
<vitro:confirmAuthorization />
<%
ModelMaker maker = (ModelMaker) request.getSession().getAttribute("vitroJenaModelMaker");
if (maker == null) {
maker = (ModelMaker) getServletContext().getAttribute("vitroJenaSDBModelMaker");
}
%>
<h2><a class="ingestMenu" href="ingest">Ingest Menu</a> > Execute RDF-Encoded Ingest Workflow</h2>
<form action="ingest" method="get"i>

39
webapp/web/jenaIngest/generateTBox.jsp
View file

@ -9,19 +9,11 @@
<%@ page import="java.net.URLEncoder" %>
<%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %>
<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
<vitro:confirmAuthorization />
<%
ModelMaker maker = (ModelMaker) request.getSession().getAttribute("vitroJenaModelMaker");
if (maker == null) {
maker = (ModelMaker) getServletContext().getAttribute("vitroJenaSDBModelMaker");
}
%>
<h2><a class="ingestMenu" href="ingest">Ingest Menu</a> > Generate TBox from Assertions Data</h2>
<form action="ingest" method="get">
@ -30,30 +22,21 @@
<h3>Select Source Models for Assertions Data</h3>
<ul>
<li><input type="checkbox" name="sourceModelName" value="vitro:jenaOntModel"/>webapp model</li>
<li><input type="checkbox" name="sourceModelName" value="vitro:baseOntModel"/>webapp assertions</li>
<%
for (Iterator it = maker.listModels(); it.hasNext(); ) {
String modelName = (String) it.next();
%> <li> <input type="checkbox" name="sourceModelName" value="<%=modelName%>"/><%=modelName%></li>
<%
}
%>
<li><input type="checkbox" name="sourceModelName" value="vitro:jenaOntModel"/>webapp model</li>
<li><input type="checkbox" name="sourceModelName" value="vitro:baseOntModel"/>webapp assertions</li>
<c:forEach var="modelName" items="${modelNames}">
<li><input type="checkbox" name="sourceModelName" value="${modelName}"/>${modelName}</li>
</c:forEach>
</ul>
<h3>Select Destination Model for Generated TBox</h3>
<select name="destinationModelName">
<option value="vitro:baseOntModel"/>webapp assertions</option>
<option value="vitro:jenaOntModel"/>webapp model</option>
<%
for (Iterator it = maker.listModels(); it.hasNext(); ) {
String modelName = (String) it.next();
%> <option value="<%=modelName%>"/><%=modelName%></option>
<%
}
%>
<option value="vitro:baseOntModel"/>webapp assertions</option>
<option value="vitro:jenaOntModel"/>webapp model</option>
<c:forEach var="modelName" items="${modelNames}">
<option value="${modelName}"/>${modelName}</option>
</c:forEach>
</select>
<input class="submit" type="submit" value="Generate TBox"/>

39
webapp/web/jenaIngest/listModels.jsp
View file

@ -3,7 +3,7 @@
<%@ page import="com.hp.hpl.jena.rdf.model.ModelMaker" %>
<%@ page import="java.util.Iterator" %>
<%@ page import="java.net.URLEncoder" %>
<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %>
@ -22,15 +22,6 @@ function init(){
}
</script>
<%
ModelMaker maker = (ModelMaker) request.getSession().getAttribute("vitroJenaModelMaker");
if (maker == null) {
maker = (ModelMaker) getServletContext().getAttribute("vitroJenaModelMaker");
getServletContext().setAttribute("vitroJenaModelMaker",maker);
}
%>
<h2><a class="ingestMenu" href="ingest">Ingest Menu</a> > Available Jena Models</h2>
<table>
@ -60,15 +51,13 @@ function init(){
Currently showing <font color="red">${infoLine}</font>
<ul>
<%
for (Iterator it = maker.listModels(); it.hasNext(); ) {
String modelName = (String) it.next();
%> <li style="padding-bottom:2em;padding-top:2em;"> <%=modelName%>
<c:forEach var="modelName" items="${modelNames}">
<li style="padding-bottom:2em;padding-top:2em;"> ${modelName}
<table style="margin-left:2em;"><tr>
<td>
<form action="ingest" method="get">
<input type="hidden" name="action" value="loadRDFData"/>
<input type="hidden" name="modelName" value="<%=modelName%>"/>
<input type="hidden" name="modelName" value="${modelName}"/>
<input type="hidden" name="modelType" value="${modelType}"/>
<input type="submit" name="submit" value="load RDF data"/>
</form>
@ -76,14 +65,14 @@ function init(){
<td>
<c:url var="outputModelURL" value="ingest">
<c:param name="action" value="outputModel"/>
<c:param name="modelName" value="<%=modelName%>"/>
<c:param name="modelName" value="${modelName}"/>
</c:url>
<a href="${outputModelURL}">output model</a>
</td>
<td>
<form action="ingest" method="post">
<input type="hidden" name="action" value="clearModel"/>
<input type="hidden" name="modelName" value="<%=modelName%>"/>
<input type="hidden" name="modelName" value="${modelName}"/>
<input type="hidden" name="modelType" value="${modelType}"/>
<input type="submit" name="submit" value="clear statements"/>
</form>
@ -91,7 +80,7 @@ function init(){
<td>
<form action="ingest" method="post">
<input type="hidden" name="action" value="removeModel"/>
<input type="hidden" name="modelName" value="<%=modelName%>"/>
<input type="hidden" name="modelName" value="${modelName}"/>
<input type="hidden" name="modelType" value="${modelType}"/>
<input type="submit" name="submit" value="remove"/>
</form>
@ -101,7 +90,7 @@ function init(){
<td>
<form action="ingest" method="post">
<input type="hidden" name="action" value="attachModel"/>
<input type="hidden" name="modelName" value="<%=modelName%>"/>
<input type="hidden" name="modelName" value="${modelName}"/>
<input type="hidden" name="modelType" value="${modelType}"/>
<input type="submit" name="submit" value="attach to TBox (ontology)"/>
</form>
@ -109,7 +98,7 @@ function init(){
<td>
<form action="ingest" method="post">
<input type="hidden" name="action" value="detachModel"/>
<input type="hidden" name="modelName" value="<%=modelName%>"/>
<input type="hidden" name="modelName" value="${modelName}"/>
<input type="hidden" name="modelType" value="${modelType}"/>
<input type="submit" name="submit" value="detach from TBox (ontology)"/>
</form>
@ -117,16 +106,14 @@ function init(){
<td>
<form action="ingest" method="get">
<input type="hidden" name="action" value="permanentURI" />
<input type="hidden" name="modelName" value="<%=modelName%>" />
<input type="hidden" name="modelName" value="${modelName}" />
<input type="hidden" name="modelType" value="${modelType}"/>
<input type="submit" name="submit" value="generate permanent URIs" /></form>
</td>
<td>&nbsp;</td>
</tr>
</table>
</li> <%
}
%>
</li>
</c:forEach>
</ul>
<BODY onLoad="init()"></BODY>

10
webapp/web/jenaIngest/mergeResources.jsp
View file

@ -5,21 +5,13 @@
<%@ page import="java.util.Iterator"%>
<%@ page import="java.net.URLEncoder"%>
<%@ page import="java.util.List"%>
<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
<%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %>
<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
<vitro:confirmAuthorization />
<%
ModelMaker maker = (ModelMaker) request.getSession().getAttribute("vitroJenaModelMaker");
if (maker == null) {
maker = (ModelMaker) getServletContext().getAttribute("vitroJenaSDBModelMaker");
}
%>
<script type="text/javascript" src="js/jquery.js"></script>
<script type="text/javascript" src="js/jenaIngest/ingestUtils.js"></script>

41
webapp/web/jenaIngest/permanentURI.jsp
View file

@ -5,22 +5,13 @@
<%@ page import="java.util.Iterator"%>
<%@ page import="java.net.URLEncoder"%>
<%@ page import="java.util.List"%>
<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
<%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %>
<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
<vitro:confirmAuthorization />
<%
ModelMaker maker = (ModelMaker) request.getSession().getAttribute("vitroJenaModelMaker");
if (maker == null) {
maker = (ModelMaker) getServletContext().getAttribute("vitroJenaSDBModelMaker");
}
%>
<h2><a class="ingestMenu" href="ingest">Ingest Menu</a> > Assign Permanent URIs To Resources</h2>
<p>This tool will rename the resources in the selected model to with new
@ -34,32 +25,30 @@ resources." Otherwise, the "use default namespace" option will generate
URIs exactly of the form created through the GUI interface.</p>
<form action="ingest" method="get" >
<%String modelName = (String)request.getAttribute("modelName"); %>
<input type="hidden" name="oldModel" value="<%=modelName%>"/>
<input type="hidden" name="oldModel" value="${modelName}"/>
<input type="hidden" name="action" value="permanentURI" />
<p>Current namespace of resources <select name=oldNamespace><%List namespaces = (List)request.getAttribute("namespaceList");
if(namespaces != null){
<p>Current namespace of resources
<select name=oldNamespace>
<%List namespaces = (List)request.getAttribute("namespaceList");
if(namespaces != null) {
Iterator namespaceItr = namespaces.iterator();
Integer count = 0;
while (namespaceItr.hasNext()){
String namespaceText = (String) namespaceItr.next();
%>
<option value="<%=namespaceText%>"><%=namespaceText%></option><%}}%>
<option value="<%=namespaceText%>"><%=namespaceText%></option>
<% }
}%>
</select></p>
<p>Model to save <select name=newModel>
<%
for (Iterator it = maker.listModels(); it.hasNext(); ) {
String modelNames = (String) it.next();
%>
<option value="<%=modelNames%>"><%=modelNames%></option>
<%
}
%>
<p>Model in which to save results <select name="newModel">
<c:forEach var="modelName" items="${modelNames}">
<option value="${modelName}">${modelName}</option>
</c:forEach>
</select></p>
<p>New namespace for resources <input type="text" name="newNamespace" /></p>
Or <%String defaultNamespace = (String)request.getAttribute("defaultNamespace");%>
<p>Use default namespace <%=defaultNamespace%> <input type="checkbox" name="defaultNamespace" value ="<%=defaultNamespace%>"/>
<p>Use default namespace ${defaultNamespace} <input type="checkbox" name="defaultNamespace" value ="${defaultNamespace}"/>
</p>
<p><input class="submit" type="submit" name="submit" value="Generate URIs" /></p>

39
webapp/web/jenaIngest/processStrings.jsp
View file

@ -9,18 +9,11 @@
<%@ page import="java.net.URLEncoder" %>
<%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %>
<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
<vitro:confirmAuthorization />
<%
ModelMaker maker = (ModelMaker) request.getSession().getAttribute("vitroJenaModelMaker");
if (maker == null) {
maker = (ModelMaker) getServletContext().getAttribute("vitroJenaSDBModelMaker");
}
%>
<h2><a class="ingestMenu" href="ingest">Ingest Menu</a> > Process Property Value Strings</h2>
<form action="ingest" method="get"i>
@ -39,38 +32,26 @@
<p>New Property URI</p>
<select name="destinationModelName">
<%
for (Iterator it = maker.listModels(); it.hasNext(); ) {
String modelName = (String) it.next();
%> <option value="<%=modelName%>"/><%=modelName%></option>
<%
}
%>
<c:forEach var="modelName" items="${modelName}">
<option value="${modelName}"/>${modelName}</option>
</c:forEach>
</select>
<input type="checkbox" name="processModel" value="TRUE"/> apply changes directly to this model
<p>model to use</p>
<select name="additionsModel">
<option value="">none</option>
<%
for (Iterator it = maker.listModels(); it.hasNext(); ) {
String modelName = (String) it.next();
%> <option value="<%=modelName%>"><%=modelName%></option>
<%
}
%>
<forEach var="modelName" items="${modelNames}">
<option value="${modelName}">${modelName}</option>
</forEach>
</select>
<p>model in which to save added statements</p>
<select name="retractionsModel">
<option value="">none</option>
<%
for (Iterator it = maker.listModels(); it.hasNext(); ) {
String modelName = (String) it.next();
%> <option value="<%=modelName%>"><%=modelName%></option>
<%
}
%>
<c:forEach var="modelName" items="${modelNames}">
<option value="${modelName}">${modelName}</option>
</c:forEach>
</select>
<p>model in which to save retracted statements</p>

21
webapp/web/jenaIngest/renameBNodes.jsp
View file

@ -9,19 +9,11 @@
<%@ page import="java.net.URLEncoder" %>
<%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %>
<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
<vitro:confirmAuthorization />
<%
ModelMaker maker = (ModelMaker) request.getSession().getAttribute("vitroJenaModelMaker");
if (maker == null) {
maker = (ModelMaker) getServletContext().getAttribute("vitroJenaSDBModelMaker");
}
%>
<h2><a class="ingestMenu" href="ingest">Ingest Menu</a> > Convert Blank Nodes to Named Resources</h2>
<form action="ingest" method="get">
@ -30,14 +22,9 @@
<h3>Select Source Models</h3>
<ul>
<%
for (Iterator it = maker.listModels(); it.hasNext(); ) {
String modelName = (String) it.next();
%> <li> <input type="checkbox" name="sourceModelName" value="<%=modelName%>"/><%=modelName%></li>
<%
}
%>
<c:forEach var="modelName" items="${modelNames}">
<li> <input type="checkbox" name="sourceModelName" value="${modelName}"/>${modelName}</li>
</c:forEach>
</ul>
<input class="submit" type="submit" value="Next Step"/>

20
webapp/web/jenaIngest/renameBNodesURISelect.jsp
View file

@ -12,21 +12,13 @@
<%@ page import="java.util.HashMap" %>
<%@ page import="java.util.Set" %>
<%@ page import="java.util.Map.Entry" %>
<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
<%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %>
<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
<vitro:confirmAuthorization />
<%
ModelMaker maker = (ModelMaker) request.getSession().getAttribute("vitroJenaModelMaker");
if (maker == null) {
maker = (ModelMaker) getServletContext().getAttribute("vitroJenaSDBModelMaker");
}
%>
<script type="text/javascript" src="js/jquery.js"></script>
<script type="text/javascript">
function selectProperties(){
@ -104,13 +96,9 @@ function disableProperties(){
<select name="destinationModelName">
<option value="vitro:baseOntModel">webapp assertions</option>
<%
for (Iterator it = maker.listModels(); it.hasNext(); ) {
String modelName = (String) it.next();
%> <option value="<%=modelName%>"/><%=modelName%></option>
<%
}
%>
<c:forEach var="modelName" items="${modelNames}">
<option value="${modelName}"/>${modelName}</option>
</c:forEach>
</select>
<input class="submit" type="submit" value="Rename Blank Nodes"/>

32
webapp/web/jenaIngest/smushSingleModel.jsp
View file

@ -9,18 +9,10 @@
<%@ page import="java.net.URLEncoder" %>
<%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %>
<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
<vitro:confirmAuthorization />
<%
ModelMaker maker = (ModelMaker) request.getSession().getAttribute("vitroJenaModelMaker");
if (maker == null) {
maker = (ModelMaker) getServletContext().getAttribute("vitroJenaSDBModelMaker");
}
%>
<h2><a class="ingestMenu" href="ingest">Ingest Menu</a> > Smush Resources</h2>
@ -33,27 +25,19 @@
<h3>Select Source Models</h3>
<ul>
<li> <input type="checkbox" name="sourceModelName" value="vitro:baseOntModel"/>webapp assertions</li>
<%
for (Iterator it = maker.listModels(); it.hasNext(); ) {
String modelName = (String) it.next();
%> <li> <input type="checkbox" name="sourceModelName" value="<%=modelName%>"/><%=modelName%></li>
<%
}
%>
<li> <input type="checkbox" name="sourceModelName" value="vitro:baseOntModel"/>webapp assertions</li>
<c:forEach var="modelName" items="${modelNames}">
<li> <input type="checkbox" name="sourceModelName" value="${modelName}"/>${modelName}</li>
</c:forEach>
</ul>
<h3>Select Destination Model</h3>
<select name="destinationModelName">
<option value="vitro:baseOntModel">webapp assertions</option>
<%
for (Iterator it = maker.listModels(); it.hasNext(); ) {
String modelName = (String) it.next();
%> <option value="<%=modelName%>"/><%=modelName%></option>
<%
}
%>
<c:forEach var="modelName" items="${modelNames}">
<option value="${modelName}"/>${modelName}</option>
</c:forEach>
</select>
<input id="submit" type="submit" value="Smush Resources"/>

7
webapp/web/jenaIngest/sparqlConstruct.jsp
View file

@ -16,12 +16,7 @@
<vitro:confirmAuthorization />
<%
ModelMaker maker = (ModelMaker) request.getSession().getAttribute("vitroJenaModelMaker");
if (maker == null) {
maker = (ModelMaker) getServletContext().getAttribute("vitroJenaSDBModelMaker");
}
ModelMaker maker = (ModelMaker) request.getAttribute("vitroJenaModelMaker");
%>

29
webapp/web/jenaIngest/splitPropertyValues.jsp
View file

@ -9,18 +9,11 @@
<%@ page import="java.net.URLEncoder" %>
<%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %>
<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
<vitro:confirmAuthorization />
<%
ModelMaker maker = (ModelMaker) request.getSession().getAttribute("vitroJenaModelMaker");
if (maker == null) {
maker = (ModelMaker) getServletContext().getAttribute("vitroJenaSDBModelMaker");
}
%>
<h2><a class="ingestMenu" href="ingest">Ingest Menu</a> > Split Property Value Strings into Multiple Property Values</h2>
<form action="ingest" method="get">
@ -29,13 +22,9 @@
<ul>
<li><input type="checkbox" name="sourceModelName" value="vitro:jenaOntModel"/>webapp model</li>
<li><input type="checkbox" name="sourceModelName" value="vitro:baseOntModel"/>webapp assertions</li>
<%
for (Iterator it = maker.listModels(); it.hasNext(); ) {
String modelName = (String) it.next();
%> <li> <input type="checkbox" name="sourceModelName" value="<%=modelName%>"/><%=modelName%></li>
<%
}
%>
<c:forEach var="modelName" items="${modelNames}">
<li> <input type="checkbox" name="sourceModelName" value="${modelName}"/>${modelName}</li>
</c:forEach>
</ul>
@ -57,13 +46,9 @@
<h3>Select Destination Model</h3>
<select name="destinationModelName">
<%
for (Iterator it = maker.listModels(); it.hasNext(); ) {
String modelName = (String) it.next();
%> <option value="<%=modelName%>"/><%=modelName%></option>
<%
}
%>
<c:forEach var="modelName" items="${modelNames}">
<option value="${modelName}"/>${modelName}</option>
</c:forEach>
</select>
<input id="submit" type="submit" value="Split Values"/>

41
webapp/web/jenaIngest/subtractModels.jsp
View file

@ -9,19 +9,11 @@
<%@ page import="java.net.URLEncoder" %>
<%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %>
<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
<vitro:confirmAuthorization />
<%
ModelMaker maker = (ModelMaker) request.getSession().getAttribute("vitroJenaModelMaker");
if (maker == null) {
maker = (ModelMaker) getServletContext().getAttribute("vitroJenaSDBModelMaker");
}
%>
<h2><a class="ingestMenu" href="ingest">Ingest Menu</a> > Subtract One Model from Another</h2>
<form action="ingest" method="get"i>
@ -29,38 +21,25 @@
<select name="modela">
<option value="vitro:baseOntModel">webapp assertions</option>
<%
for (Iterator it = maker.listModels(); it.hasNext(); ) {
String modelName = (String) it.next();
%> <option value="<%=modelName%>"><%=modelName%></option>
<%
}
%>
<c:forEach var="modelName" items="${modelNames}">
<option value="${modelName}">${modelName}</option>
</c:forEach>
</select>
<p>model to be subtracted from</p>
<select name="modelb">
<option value="vitro:baseOntModel">webapp assertions</option>
<%
for (Iterator it = maker.listModels(); it.hasNext(); ) {
String modelName = (String) it.next();
%> <option value="<%=modelName%>"><%=modelName%></option>
<%
}
%>
<c:forEach var="modelName" items="${modelNames}">
<option value="${modelName}">${modelName}</option>
</c:forEach>
</select>
<p>model to subtract</p>
<select name="destinationModelName">
<option value="vitro:baseOntModel">webapp assertions</option>
<%
for (Iterator it = maker.listModels(); it.hasNext(); ) {
String modelName = (String) it.next();
%> <option value="<%=modelName%>"><%=modelName%></option>
<%
}
%>
<c:forEach var="modelName" items="${modelNames}">
<option value="${modelName}">${modelName}</option>
</c:forEach>
</select>
<p>model in which difference should be saved</p>

8
webapp/web/jenaIngest/workflowStep.jsp
View file

@ -13,14 +13,6 @@
<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
<vitro:confirmAuthorization />
<%
ModelMaker maker = (ModelMaker) request.getSession().getAttribute("vitroJenaModelMaker");
if (maker == null) {
maker = (ModelMaker) getServletContext().getAttribute("vitroJenaModelMaker");
}
%>
<h2><a class="ingestMenu" href="ingest">Ingest Menu</a> > Execute RDF-Encoded Ingest Workflow</h2>
<form action="ingest" method="get"i>

18
webapp/web/jenaIngest/xmlFileUpload.jsp
View file

@ -3,22 +3,13 @@
<%@ page import="com.hp.hpl.jena.rdf.model.ModelMaker" %>
<%@ page import="java.util.Iterator" %>
<%@ page import="java.net.URLEncoder" %>
<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
<%@page import="edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.UseAdvancedDataToolsPages" %>
<% request.setAttribute("requestedActions", new UseAdvancedDataToolsPages()); %>
<vitro:confirmAuthorization />
<%
ModelMaker maker = (ModelMaker) request.getSession().getAttribute("vitroJenaModelMaker");
if (maker == null) {
maker = (ModelMaker) getServletContext().getAttribute("vitroJenaSDBModelMaker");
}
%>
<h2><a class="ingestMenu" href="ingest">Ingest Menu</a> > Load XML and convert to RDF</h2>
<form action="jenaXmlFileUpload" method="post" enctype="multipart/form-data">
@ -29,10 +20,9 @@
<select name="targetModel">
<option value="vitro:baseOntModel">webapp assertions</option>
<% for (Iterator it = maker.listModels(); it.hasNext(); ) {
String modelName = (String) it.next(); %>
<option value="<%=modelName%>"><%= modelName %></option>
<% } %>
<c:forEach var="modelName" items="${modelNames}">
<option value="${modelName}">${modelName}</option>
</c:forEach>
</select>
<p>Destination model</p>