diff --git a/productMods/templates/freemarker/body/harvester/fileharvest.ftl b/productMods/templates/freemarker/body/harvester/fileharvest.ftl
index ca5dbe98..b7c67dfe 100644
--- a/productMods/templates/freemarker/body/harvester/fileharvest.ftl
+++ b/productMods/templates/freemarker/body/harvester/fileharvest.ftl
@@ -28,6 +28,11 @@
request.onreadystatechange=function() {
if(request.readyState == 4 && request.status == 200) {
harvestProgressResponse = request.responseText;
+
+ var json = eval("(" + harvestProgressResponse + ")");
+ var scriptTextArea = document.getElementById("scriptTextArea");
+ scriptTextArea.innerHTML = json.scriptText;
+
window.setTimeout(continueHarvest, 1000);
}
}
@@ -251,7 +256,12 @@
+
+
Script being executed
+
+
+
Progress
diff --git a/src/edu/cornell/mannlib/vitro/webapp/controller/harvester/CsvFileHarvestJob.java b/src/edu/cornell/mannlib/vitro/webapp/controller/harvester/CsvFileHarvestJob.java
index 3418f4d0..6579b0e5 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/controller/harvester/CsvFileHarvestJob.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/controller/harvester/CsvFileHarvestJob.java
@@ -291,6 +291,9 @@ class CsvFileHarvestJob implements FileHarvestJob {
String harvestedDataPath = getHarvestedDataPath();
String globalHarvestedDataRelativePath = FileHarvestController.PATH_TO_HARVESTED_DATA;
+ if(harvestedDataPath.endsWith("/"))
+ harvestedDataPath = harvestedDataPath.substring(0, harvestedDataPath.length() - 1);
+
replacements = replacements.replace("${WORKING_DIRECTORY}", workingDirectory);
replacements = replacements.replace("${UPLOADS_FOLDER}", fileDirectory);
replacements = replacements.replace("${HARVESTED_DATA_PATH}", harvestedDataPath);