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

merge r.3356 from the rel 1.3 maintenance branch.

Browse source
This commit is contained in:
j2blake 2011-07-21 14:25:04 +00:00
parent 73e299ec79
commit 77f721b463
2 changed files with 23 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -173,7 +173,7 @@ class CsvFileHarvestJob implements FileHarvestJob {
* @return the path to the directory containing the template files * @return the path to the directory containing the template files
*/ */
private String getTemplateFileDirectory() { private String getTemplateFileDirectory() {
String harvesterPath = FileHarvestController.getHarvesterPath(); String harvesterPath = FileHarvestController.getHarvesterPath(vreq);
String pathToTemplateFiles = harvesterPath + FileHarvestController.PATH_TO_TEMPLATE_FILES; String pathToTemplateFiles = harvesterPath + FileHarvestController.PATH_TO_TEMPLATE_FILES;
return pathToTemplateFiles; return pathToTemplateFiles;
} }
@ -183,7 +183,7 @@ class CsvFileHarvestJob implements FileHarvestJob {
* @return the path to the directory containing the script files * @return the path to the directory containing the script files
*/ */
private String getScriptFileDirectory() { private String getScriptFileDirectory() {
String harvesterPath = FileHarvestController.getHarvesterPath(); String harvesterPath = FileHarvestController.getHarvesterPath(vreq);
String pathToScriptFiles = harvesterPath + FileHarvestController.PATH_TO_HARVESTER_SCRIPTS; String pathToScriptFiles = harvesterPath + FileHarvestController.PATH_TO_HARVESTER_SCRIPTS;
return pathToScriptFiles; return pathToScriptFiles;
} }
@ -322,7 +322,7 @@ class CsvFileHarvestJob implements FileHarvestJob {
private String performScriptTemplateReplacements(String scriptTemplateContents) { private String performScriptTemplateReplacements(String scriptTemplateContents) {
String replacements = scriptTemplateContents; String replacements = scriptTemplateContents;
String workingDirectory = FileHarvestController.getHarvesterPath(); String workingDirectory = FileHarvestController.getHarvesterPath(vreq);
String fileDirectory = FileHarvestController.getUploadPath(vreq); String fileDirectory = FileHarvestController.getUploadPath(vreq);
String harvestedDataPath = getHarvestedDataPath(); String harvestedDataPath = getHarvestedDataPath();
String globalHarvestedDataRelativePath = FileHarvestController.PATH_TO_HARVESTED_DATA; String globalHarvestedDataRelativePath = FileHarvestController.PATH_TO_HARVESTED_DATA;
@ -386,7 +386,7 @@ class CsvFileHarvestJob implements FileHarvestJob {
} }
private String getHarvestedDataPath() { private String getHarvestedDataPath() {
return FileHarvestController.getHarvesterPath() + FileHarvestController.PATH_TO_HARVESTED_DATA + "csv/" + this.sessionId + "/"; return FileHarvestController.getHarvesterPath(vreq) + FileHarvestController.PATH_TO_HARVESTED_DATA + "csv/" + this.sessionId + "/";
} }
@Override @Override

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

@ -126,23 +126,8 @@ public class FileHarvestController extends FreemarkerHttpServlet {
} }
} }
/**
* This is the absolute path on the server of the Harvester root directory, including the final slash.
* Unfortunately, this value is not known at the time the servlet is loaded, so we need to initialize
* this in the init() method. I hope nobody calls for this before the servlet is initialized.
*/
private static volatile String pathToHarvester;
@Override @Override
public void init() throws ServletException {
super.init();
pathToHarvester = ConfigurationProperties.getBean(getServletContext()).getProperty("harvester.location");
if (pathToHarvester == null) {
throw new UnavailableException("The deploy.properties file does not contain a value for 'harvester.location'");
}
}
@Override
protected ResponseValues processRequest(VitroRequest vreq) { protected ResponseValues processRequest(VitroRequest vreq) {
try { try {
cleanUpOldSessions(); cleanUpOldSessions();
@ -187,10 +172,12 @@ public class FileHarvestController extends FreemarkerHttpServlet {
* Returns the root location of the VIVO Harvester on this machine. * Returns the root location of the VIVO Harvester on this machine.
* @return the root location of the VIVO Harvester on this machine * @return the root location of the VIVO Harvester on this machine
*/ */
public static String getHarvesterPath() public static String getHarvesterPath(HttpServletRequest req)
{ {
String pathToHarvester = ConfigurationProperties.getBean(req).getProperty("harvester.location");
if (pathToHarvester == null) { if (pathToHarvester == null) {
throw new IllegalStateException("FileHarvestController has not been initialized yet."); log.error("The deploy.properties file does not contain a value for 'harvester.location'");
return "";
} }
return pathToHarvester; return pathToHarvester;
} }
@ -199,9 +186,9 @@ public class FileHarvestController extends FreemarkerHttpServlet {
* Returns the path on this machine of the area within Harvester reserved for File Harvest. * Returns the path on this machine of the area within Harvester reserved for File Harvest.
* @return the path on this machine of the area within Harvester reserved for File Harvest * @return the path on this machine of the area within Harvester reserved for File Harvest
*/ */
public static String getFileHarvestRootPath() public static String getFileHarvestRootPath(HttpServletRequest req)
{ {
String fileHarvestRootPath = getHarvesterPath() + PATH_TO_FILE_HARVEST_ROOT; String fileHarvestRootPath = getHarvesterPath(req) + PATH_TO_FILE_HARVEST_ROOT;
return fileHarvestRootPath; return fileHarvestRootPath;
} }
@ -428,7 +415,8 @@ public class FileHarvestController extends FreemarkerHttpServlet {
String script = job.getScript(); String script = job.getScript();
String additionsFilePath = job.getAdditionsFilePath(); String additionsFilePath = job.getAdditionsFilePath();
runScript(getSessionId(request), script, additionsFilePath); String scriptFileLocation = getScriptFileLocation(vreq);
runScript(getSessionId(request), script, additionsFilePath, scriptFileLocation);
JSONObject json = new JSONObject(); JSONObject json = new JSONObject();
json.put("progressSinceLastCheck", ""); json.put("progressSinceLastCheck", "");
@ -539,14 +527,14 @@ public class FileHarvestController extends FreemarkerHttpServlet {
* placed. Final slash included. * placed. Final slash included.
* @return the location in which the ready-to-run scripts will be placed * @return the location in which the ready-to-run scripts will be placed
*/ */
private static String getScriptFileLocation() { private static String getScriptFileLocation(HttpServletRequest req) {
return getHarvesterPath() + PATH_TO_HARVESTER_SCRIPTS + "temp/"; return getHarvesterPath(req) + PATH_TO_HARVESTER_SCRIPTS + "temp/";
} }
private File createScriptFile(String script) throws IOException { private File createScriptFile(String scriptFileLocation, String script) throws IOException {
File scriptDirectory = new File(getScriptFileLocation()); File scriptDirectory = new File(scriptFileLocation);
if(!scriptDirectory.exists()) { if(!scriptDirectory.exists()) {
scriptDirectory.mkdirs(); scriptDirectory.mkdirs();
} }
@ -561,10 +549,10 @@ public class FileHarvestController extends FreemarkerHttpServlet {
} }
private void runScript(String sessionId, String script, String additionsFilePath) { private void runScript(String sessionId, String script, String additionsFilePath, String scriptFileLocation) {
clearSessionInfo(sessionId); clearSessionInfo(sessionId);
ScriptRunner runner = new ScriptRunner(sessionId, script, additionsFilePath); ScriptRunner runner = new ScriptRunner(sessionId, script, additionsFilePath, scriptFileLocation);
SessionInfo info = new SessionInfo(sessionId, runner); SessionInfo info = new SessionInfo(sessionId, runner);
sessionIdToSessionInfo.put(sessionId, info); sessionIdToSessionInfo.put(sessionId, info);
runner.start(); runner.start();
@ -797,13 +785,15 @@ public class FileHarvestController extends FreemarkerHttpServlet {
private final String sessionId; private final String sessionId;
private final String script; private final String script;
private final String additionsFilePath; private final String additionsFilePath;
private final String scriptFileLocation;
private volatile boolean abort = false; private volatile boolean abort = false;
public ScriptRunner(String sessionId, String script, String additionsFilePath) { public ScriptRunner(String sessionId, String script, String additionsFilePath, String scriptFileLocation) {
this.sessionId = sessionId; this.sessionId = sessionId;
this.script = script; this.script = script;
this.additionsFilePath = additionsFilePath; this.additionsFilePath = additionsFilePath;
this.scriptFileLocation = scriptFileLocation;
} }
public void abortRun() { public void abortRun() {
@ -818,9 +808,9 @@ public class FileHarvestController extends FreemarkerHttpServlet {
try { try {
ArrayList<String> unsentLogLines = sessionInfo.unsentLogLines; ArrayList<String> unsentLogLines = sessionInfo.unsentLogLines;
File scriptFile = createScriptFile(this.script); File scriptFile = createScriptFile(this.scriptFileLocation, this.script);
String command = "/bin/bash " + getScriptFileLocation() + scriptFile.getName(); String command = "/bin/bash " + this.scriptFileLocation + scriptFile.getName();
log.info("Running command: " + command); log.info("Running command: " + command);
Process pr = Runtime.getRuntime().exec(command); Process pr = Runtime.getRuntime().exec(command);