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

VIVO-773 Remove "connectDB" function of advanced data tools.

Browse source 
It was tied up with RDB. It could have been converted, but there was little interest.
This commit is contained in:
Jim Blake 2014-06-02 17:57:06 -04:00
parent 3a2930cdc6
commit 0cd42e211e
3 changed files with 0 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -94,7 +94,6 @@ public class JenaIngestController extends BaseEditController {
private static final String RENAME_BNODES_JSP = "/jenaIngest/renameBNodes.jsp";
private static final String RENAME_BNODES_URI_SELECT_JSP = "/jenaIngest/renameBNodesURISelect.jsp";
private static final String SMUSH_JSP = "/jenaIngest/smushSingleModel.jsp";
private static final String CONNECT_DB_JSP = "/jenaIngest/connectDB.jsp";
private static final String CSV2RDF_JSP = "/jenaIngest/csv2rdf.jsp";
private static final String PROCESS_STRINGS_JSP = "/jenaIngest/processStrings.jsp";
private static final String SUBTRACT_MODELS_JSP = "/jenaIngest/subtractModels.jsp";
@ -158,8 +157,6 @@ public class JenaIngestController extends BaseEditController {
processRenameBNodesURISelectRequest(vreq, maker);
} else if("smushSingleModel".equals(actionStr)) {
processSmushSingleModelRequest(vreq);
} else if("connectDB".equals(actionStr)) {
processConnectDBRequest(vreq);
} else if("csv2rdf".equals(actionStr)) {
processCsv2rdfRequest(vreq);
} else if("processStrings".equals(actionStr)) {
@ -401,29 +398,6 @@ public class JenaIngestController extends BaseEditController {
}
}
private void processConnectDBRequest(VitroRequest vreq) {
String jdbcUrl = vreq.getParameter("jdbcUrl");
String tripleStore = vreq.getParameter("tripleStore");
if (jdbcUrl != null) {
doConnectDB(vreq);
if ("SDB".equals(tripleStore)) {
vreq.setAttribute("modelType", "sdb");
vreq.setAttribute("infoLine", "SDB models");
} else {
vreq.setAttribute("modelType", "rdb");
vreq.setAttribute("infoLine", "RDB models");
}
vreq.setAttribute("title","Ingest Menu");
vreq.setAttribute("bodyJsp",INGEST_MENU_JSP);
} else {
List<String> dbTypes = DatabaseType.allNames();
Collections.sort(dbTypes, new CollationSort(vreq));
vreq.setAttribute("dbTypes", dbTypes);
vreq.setAttribute("title", "Connect Jena Database");
vreq.setAttribute("bodyJsp",CONNECT_DB_JSP);
}
}
private void processCsv2rdfRequest(VitroRequest vreq) {
String csvUrl = vreq.getParameter("csvUrl");
if (csvUrl != null) {
@ -916,15 +890,6 @@ public class JenaIngestController extends BaseEditController {
return tempModel.size();
}
public void doConnectDB(VitroRequest vreq) {
String tripleStore = vreq.getParameter("tripleStore");
if("SDB".equals(tripleStore)) {
vreq.getSession().setAttribute(WHICH_MODEL_MAKER,CONTENT);
} else {
vreq.getSession().setAttribute(WHICH_MODEL_MAKER,CONFIGURATION);
}
}
public void doSubtractModels(VitroRequest vreq) {
String modela = vreq.getParameter("modela");
String modelb = vreq.getParameter("modelb");

45
webapp/web/jenaIngest/connectDB.jsp
View file

@ -1,45 +0,0 @@
<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
<%@ 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.permissions.SimplePermission" %>
<% request.setAttribute("requestedActions", SimplePermission.USE_ADVANCED_DATA_TOOLS_PAGES.ACTION); %>
<vitro:confirmAuthorization />
<%@page import="java.util.List"%><h2><a class="ingestMenu" href="ingest">Ingest Menu</a> > Connect to Jena Database</h2>
<form action="ingest" method="post">
<input type="hidden" name="action" value="connectDB"/>
<label for="JDBC URL">JDBC URL</label>
<input type="text" style="width:80%;" name="jdbcUrl" value="jdbc:mysql://localhost/"/>
<label for="username">Username</label>
<input type="text" name="username"/>
<label for="password">Password</label>
<input type="password" name="password" class="block"/>
<input id="tripleStoreRDB" name="tripleStore" type="radio" checked="checked" value="RDB"/>
<label for="tripleStoreRDB" class="inline">Jena RDB</label>
<input id="tripleStoreSDB" name="tripleStore" type="radio" value="SDB"/>
<label for="tripleStoreRDB" class="inline">Jena SDB (hash layout)</label>
<label for="database type">Database type</label>
<select name="dbType">
<c:forEach items="${requestScope.dbTypes}" var="typeName">
<c:choose>
<c:when test="${typeName eq 'MySQL'}">
<option value="${typeName}" selected="selected">${typeName}</option>
</c:when>
<c:otherwise>
<option value="${typeName}">${typeName}</option>
</c:otherwise>
</c:choose>
</c:forEach>
</select>
<input class="submit" type="submit" value="Connect Database" />

1
webapp/web/jenaIngest/ingestMenu.jsp
View file

@ -8,7 +8,6 @@
<h2>Ingest Menu</h2>
<ul class="ingestMenu">
<li><a href="ingest?action=connectDB" title="Connect to a Jena database">Connect DB</a></li>
<li><a href="ingest?action=listModels"title="Manage all available Jena models">Manage Jena Models</a></li>
<li><a href="ingest?action=subtractModels" title="Subtract one model from another and save difference to new model">Subtract One Model from Another</a></li>
</ul>