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

testfile.ftl: cleanup

Browse source 
TestFileController.java: cleanup
This commit is contained in:
mbarbier 2011-04-22 20:18:23 +00:00
parent 26f1c62249
commit 0930811696
2 changed files with 2 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
productMods/templates/freemarker/body/harvester/testfile.ftl
View file

@ -102,11 +102,6 @@
</style> </style>
<div id="responseArea">
<ul id="fileListing">
</ul>
</div>
<div id="step1" class="testfile-step"> <div id="step1" class="testfile-step">
<h3 class="testfile-step-header">Step 1</h3> <h3 class="testfile-step-header">Step 1</h3>
<div id="step1-inner" class="testfile-step-body"> <div id="step1-inner" class="testfile-step-body">
@ -142,10 +137,7 @@
<iframe id="uploadTarget" name="uploadTarget" src="" style="width:0;height:0;border:0px solid #fff;">${testvalue!}</iframe> <iframe id="uploadTarget" name="uploadTarget" src="" style="width:0;height:0;border:0px solid #fff;">${testvalue!}</iframe>
</form> </form>
<h5>Uploaded files</h5> <h5>Uploaded files</h5>
<ul> <ul id="fileListing">
<li>file1.csv <span style="color:green">success</span></li>
<li>file2.csv <span style="color:green">success</span></li>
<li>file3.csv <span style="color:red">upload failed: error parsing CSV file</span></li>
</ul> </ul>
</div> </div>
<div class="clearBothDiv" /> <div class="clearBothDiv" />

2
src/edu/cornell/mannlib/vitro/webapp/controller/harvester/TestFileController.java
View file

@ -64,7 +64,7 @@ public class TestFileController extends FreemarkerHttpServlet {
JSONObject json = new JSONObject(); JSONObject json = new JSONObject();
String path = "/home/mbarbieri/tempfileupload/"; //todo: complete String path = ""; //todo: complete
if(fileStreams.get("csvFile") != null && fileStreams.get("csvFile").size() > 0) { if(fileStreams.get("csvFile") != null && fileStreams.get("csvFile").size() > 0) {
FileItem csvStream = fileStreams.get("csvFile").get(0); FileItem csvStream = fileStreams.get("csvFile").get(0);
String name = csvStream.getName(); String name = csvStream.getName();