From 3e23a63be1f38538cb9151cce065d4978c2f2db7 Mon Sep 17 00:00:00 2001
From: bjl23 <bjl23@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Mon, 5 Apr 2010 17:01:03 +0000
Subject: [PATCH] work on NIHVIVO-23 vitro internal Jena models

---
 webapp/web/jenaIngest/csv2rdf.jsp        | 4 ++++
 webapp/web/jenaIngest/renameBNodes.jsp   | 5 ++++-
 webapp/web/jenaIngest/subtractModels.jsp | 8 +++++++-
 webapp/web/jenaIngest/xmlFileUpload.jsp  | 7 ++++++-
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/webapp/web/jenaIngest/csv2rdf.jsp b/webapp/web/jenaIngest/csv2rdf.jsp
index 7a32dfbd9..80d025f45 100644
--- a/webapp/web/jenaIngest/csv2rdf.jsp
+++ b/webapp/web/jenaIngest/csv2rdf.jsp
@@ -17,6 +17,8 @@
 
 %>
 
+    <p><a href="ingest">Ingest Home</a></p>
+
     <h2>Convert CSV to RDF</h2>
 
     <form action="ingest" method="get"i>
@@ -42,6 +44,7 @@
     <p>Class Name for Resources</p>
 
     <select name="destinationModelName">
+        <option value="vitro:baseOntModel">webapp assertions</option>
 <%
     for (Iterator it = maker.listModels(); it.hasNext(); ) {
 	String modelName = (String) it.next();
@@ -53,6 +56,7 @@
     <p>Destination Model</p>
 
    <select name="tboxDestinationModelName">
+        <option value="vitro:baseOntModel">webapp assertions</option>
 <%
     for (Iterator it = maker.listModels(); it.hasNext(); ) {
 	String modelName = (String) it.next();
diff --git a/webapp/web/jenaIngest/renameBNodes.jsp b/webapp/web/jenaIngest/renameBNodes.jsp
index 6ec9b2c50..6623c6b19 100644
--- a/webapp/web/jenaIngest/renameBNodes.jsp
+++ b/webapp/web/jenaIngest/renameBNodes.jsp
@@ -17,6 +17,8 @@
 
 %>
 
+    <p><a href="ingest">Ingest Home</a></p>
+
     <h2>Convert Blank Nodes to Named Resources</h2>
 
     <form action="ingest" method="get"i>
@@ -25,7 +27,7 @@
     <h3>Select URI prefix</h3>
    
 	<p>URIs will be constructed from the following string concatenated with a random integer:</p>
-	<input type="text" name="namespaceEtcStr"/> 
+	<input type="text" style="width:65%;" name="namespaceEtcStr"/> 
 
     <p/>
 
@@ -45,6 +47,7 @@
     <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();
diff --git a/webapp/web/jenaIngest/subtractModels.jsp b/webapp/web/jenaIngest/subtractModels.jsp
index 508f5fa39..48817887f 100644
--- a/webapp/web/jenaIngest/subtractModels.jsp
+++ b/webapp/web/jenaIngest/subtractModels.jsp
@@ -17,16 +17,19 @@
 
 %>
 
+    <p><a href="ingest">Ingest Home</a></p>
+
     <h2>Subtract One Model from Another</h2>
 
     <form action="ingest" method="get"i>
         <input type="hidden" name="action" value="subtractModels"/>
 
     <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>
+        %> <option value="<%=modelName%>"><%=modelName%></option>
         <%    
     }
 %>   
@@ -34,6 +37,7 @@
     <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();
@@ -45,6 +49,8 @@
     <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();
diff --git a/webapp/web/jenaIngest/xmlFileUpload.jsp b/webapp/web/jenaIngest/xmlFileUpload.jsp
index 00507cb98..1d99efb1d 100644
--- a/webapp/web/jenaIngest/xmlFileUpload.jsp
+++ b/webapp/web/jenaIngest/xmlFileUpload.jsp
@@ -20,14 +20,19 @@
     <form action="jenaXmlFileUpload" method="post" enctype="multipart/form-data">
     
     <input type="file" name="xmlfile"/>
+
+    <p>XML file</p>
     
 	<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>                
 <% } %>
         </select>
+
+        <p>Destination model</p>
+
         <input type="submit" name="submit" value="upload XML and convert to RDF"/>
     </form>