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

NIHVIVO-2997 Merged r3354 from maint-rel-1.3 branch.

Browse source
This commit is contained in:
cappadona 2011-07-21 12:49:15 +00:00
parent 5485ff82b7
commit 73e299ec79
4 changed files with 252 additions and 238 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -423,7 +423,7 @@ class CsvFileHarvestJob implements FileHarvestJob {
public String getTemplateFillInHelp() {
String newline = "\n";
String help = "";
help += "<p>A CSV, or <b>C</b>omma-<b>S</b>eparated <b>V</b>alues file, is a method of storing tabular data in plain text. The first line of a CSV file contains header information, while each subsequent line contains a data record.</p>" + newline;
help += "<p>A CSV, or <strong>C</strong>omma-<strong>S</strong>eparated </strong>V</strong>alues file, is a method of storing tabular data in plain text. The first line of a CSV file contains header information, while each subsequent line contains a data record.</p>" + newline;
help += "<p>The template we provide contains only the header, which you will then fill in accordingly. For example, if the template contains the text \"firstName,lastName\", then you might add two more lines, \"John,Doe\" and \"Jane,Public\".</p>" + newline;
return help;
}

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

@ -57,7 +57,7 @@ public class FileHarvestController extends FreemarkerHttpServlet {
private static final String PARAMETER_MODE = "mode";
private static final String PARAMETER_JOB = "job";
private static final String POST_TO = "/vivo/harvester/harvest";
private static final String POST_TO = UrlBuilder.getUrl("/harvester/harvest");
private static final String MODE_HARVEST = "harvest";
private static final String MODE_CHECK_STATUS = "checkStatus";