Skip to content
Snippets Groups Projects
Commit a43956e1 authored by tjc's avatar tjc
Browse files

zip results up optionally

git-svn-id: svn+ssh://svn.internal.sanger.ac.uk/repos/svn/pathsoft/artemis/trunk@13757 ee4ac58c-ac51-4696-9907-e4b3aa274f04
parent a2eb5ed7
No related branches found
No related tags found
Loading
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
package uk.ac.sanger.artemis.j2ssh; package uk.ac.sanger.artemis.j2ssh;
import uk.ac.sanger.artemis.Options;
import uk.ac.sanger.artemis.components.MessageDialog; import uk.ac.sanger.artemis.components.MessageDialog;
import javax.swing.JFileChooser; import javax.swing.JFileChooser;
...@@ -68,6 +69,7 @@ public class SshPSUClient extends Thread ...@@ -68,6 +69,7 @@ public class SshPSUClient extends Thread
private SshClient ssh; private SshClient ssh;
private String user; private String user;
private boolean keep = false; private boolean keep = false;
private boolean zipResults = false;
// //
StdoutStdErrHandler stdouth; StdoutStdErrHandler stdouth;
...@@ -273,6 +275,14 @@ public class SshPSUClient extends Thread ...@@ -273,6 +275,14 @@ public class SshPSUClient extends Thread
db = "%uniprot"; db = "%uniprot";
} }
if(settings.getProperty("zip") != null)
{
String zipValue = settings.getProperty("zip");
zipResults = Boolean.parseBoolean(zipValue);
logger4j.debug("zip results :: "+zipResults);
}
if(wdir == null && settings.getProperty("wdir") != null) if(wdir == null && settings.getProperty("wdir") != null)
wdir = settings.getProperty("wdir"); wdir = settings.getProperty("wdir");
...@@ -494,11 +504,19 @@ public class SshPSUClient extends Thread ...@@ -494,11 +504,19 @@ public class SshPSUClient extends Thread
} }
logger4j.debug("GET SUCCESS "+filepath+".out"); logger4j.debug("GET SUCCESS "+filepath+".out");
sftp.rm(wdir+filename);
if(!keep) if(!keep)
{ {
sftp.rm(outputfile); sftp.rm(outputfile);
sftp.rm(wdir+filename); }
else if(zipResults)
{
cmd = "gzip "+outputfile+"; zip -j "+wdir+program+".zip "+
outputfile+".gz; rm -f "+outputfile+".gz";
logger4j.debug(cmd);
SshPSUClient sshClient = new SshPSUClient(cmd);
sshClient.start();
} }
sftp = getSftpClient(); sftp = getSftpClient();
sftp.rm(outputfile+".err"); sftp.rm(outputfile+".err");
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment