airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shame...@apache.org
Subject airavata git commit: Fixed gordon job verification issue.
Date Wed, 27 May 2015 18:25:43 GMT
Repository: airavata
Updated Branches:
  refs/heads/master a26c1e783 -> 4e9aa00a4


Fixed gordon job verification issue.


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/4e9aa00a
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/4e9aa00a
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/4e9aa00a

Branch: refs/heads/master
Commit: 4e9aa00a48801fe142a0588a69bf7118cca90dfa
Parents: a26c1e7
Author: Shameera Rathanyaka <shameerainfo@gmail.com>
Authored: Wed May 27 14:25:40 2015 -0400
Committer: Shameera Rathanyaka <shameerainfo@gmail.com>
Committed: Wed May 27 14:25:40 2015 -0400

----------------------------------------------------------------------
 .../java/org/apache/airavata/gsi/ssh/api/job/PBSOutputParser.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/4e9aa00a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/PBSOutputParser.java
----------------------------------------------------------------------
diff --git a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/PBSOutputParser.java
b/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/PBSOutputParser.java
index 3304465..321b67e 100644
--- a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/PBSOutputParser.java
+++ b/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/PBSOutputParser.java
@@ -195,7 +195,7 @@ public class PBSOutputParser implements OutputParser {
     @Override
     public String parseJobId(String jobName, String rawOutput) throws SSHApiException {
         String regJobId = "jobId";
-        Pattern pattern = Pattern.compile("(?=(?<" + regJobId + ">\\d+)\\s+\\w+\\s+"
+ jobName + ")"); // regex - look ahead and match
+        Pattern pattern = Pattern.compile("(?<" + regJobId + ">[^\\s]*).* " + jobName
+ " "); // regex , JOB_ID will come as first column 
         if (rawOutput != null) {
             Matcher matcher = pattern.matcher(rawOutput);
             if (matcher.find()) {


Mime
View raw message