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

Some minor file harvest changes

Browse source
This commit is contained in:
mbarbier 2011-07-05 20:49:23 +00:00
parent ff3ff4c90b
commit 977d859cd6
2 changed files with 13 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -28,6 +28,11 @@
request.onreadystatechange=function() { request.onreadystatechange=function() {
if(request.readyState == 4 && request.status == 200) { if(request.readyState == 4 && request.status == 200) {
harvestProgressResponse = request.responseText; harvestProgressResponse = request.responseText;
var json = eval("(" + harvestProgressResponse + ")");
var scriptTextArea = document.getElementById("scriptTextArea");
scriptTextArea.innerHTML = json.scriptText;
window.setTimeout(continueHarvest, 1000); window.setTimeout(continueHarvest, 1000);
} }
} }
@ -251,7 +256,12 @@
<h3 class="testfile-step-header">Step 5</h3> <h3 class="testfile-step-header">Step 5</h3>
<div id="step5-inner" class="testfile-step-body"> <div id="step5-inner" class="testfile-step-body">
<h4 class="testfile-step-subheader">View results</h4> <h4 class="testfile-step-subheader">View results</h4>
<div id="script">
<h5>Script being executed</h5>
<textarea cols="100" rows="20" readonly="readonly" id="scriptTextArea"></textarea>
</div>
<div id="progress"> <div id="progress">
<h5>Progress</h5>
<textarea cols="100" rows="20" readonly="readonly" id="progressTextArea"></textarea> <textarea cols="100" rows="20" readonly="readonly" id="progressTextArea"></textarea>
</div> </div>
<div id="summary"> <div id="summary">

3
src/edu/cornell/mannlib/vitro/webapp/controller/harvester/CsvFileHarvestJob.java
View file

@ -291,6 +291,9 @@ class CsvFileHarvestJob implements FileHarvestJob {
String harvestedDataPath = getHarvestedDataPath(); String harvestedDataPath = getHarvestedDataPath();
String globalHarvestedDataRelativePath = FileHarvestController.PATH_TO_HARVESTED_DATA; 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("${WORKING_DIRECTORY}", workingDirectory);
replacements = replacements.replace("${UPLOADS_FOLDER}", fileDirectory); replacements = replacements.replace("${UPLOADS_FOLDER}", fileDirectory);
replacements = replacements.replace("${HARVESTED_DATA_PATH}", harvestedDataPath); replacements = replacements.replace("${HARVESTED_DATA_PATH}", harvestedDataPath);