Changeset 12 for trunk/pbs_drmaa/submit.c

Timestamp:

04/20/11 17:20:29 (13 years ago)

Author:

mmamonski

Message:

version 1.0.7 release candidate

File:

• trunk/pbs_drmaa/submit.c (modified) (8 diffs, 1 prop)

trunk/pbs_drmaa/submit.c

@@ -1 @@
-/* $Id: submit.c 386 2011-01-06 18:13:33Z mamonski $ */
+/* $Id$ */
 /*
  *  FedStage DRMAA for PBS Pro
@@ -46 +46 @@
                 __attribute__ ((unused))
 #       endif
-        = "$Id: submit.c 386 2011-01-06 18:13:33Z mamonski $";
+        = "$Id$";
 #endif
 
@@ -546 +546 @@
                         else
                         {
-                                fsd_exc_raise_fmt(FSD_DRMAA_ERRNO_INVALID_ATTRIBUTE_VALUE, "Invalid native specification: %s (Invalid resource specification: %s)", resources, arg);
-
+                                fsd_exc_raise_fmt(FSD_DRMAA_ERRNO_INVALID_ATTRIBUTE_VALUE, "Invalid native specification: %s (Invalid resource specification: %s)", resources, arg);
                         }
                 }
@@ -569 +568 @@
         TRY
           {
-                for (arg = strtok_r(add_attr_copy, ",", &ctxt); arg; arg = strtok_r(NULL, ":",&ctxt) )
+                for (arg = strtok_r(add_attr_copy, ";", &ctxt); arg; arg = strtok_r(NULL, ";",&ctxt) )
                 {
                         name = fsd_strdup(strtok_r(arg, "=", &ctxt2));
@@ -606 +605 @@
 
                 TRY
-                 {
+                  {
                         for (arg = strtok_r(native_spec_copy, " \t", &ctxt); arg; arg = strtok_r(NULL, " \t",&ctxt) ) {
-                                if (!opt) {
-                                        if ( (arg[0] != '-') || ((strlen(arg) != 2) &&  arg[2] != ' ' && arg[1] !='-' ) )
+                                if (!opt)
+                                  {
+                                        if ( (arg[0] != '-') || (strlen(arg) != 2) )
                                                 fsd_exc_raise_fmt(FSD_DRMAA_ERRNO_INVALID_ATTRIBUTE_VALUE,
-                                                                "Invalid native specification: %s",
-                                                                native_specification);
-                                        if(arg[1] == '-') {
-                                                parse_additional_attr(pbs_attr, arg+2);
+                                                        "Invalid native specification: -o(ption) expected (arg=%s native=%s).",
+                                                        arg, native_specification);
+
+                                                case 'h' :
+                                                        pbs_attr->set_attr( pbs_attr, "Hold_Types" , arg );
+                                                        break;
+
+                                        opt = arg[1];
+
+                                        /* handle NO-arg options */
+
+                                        switch (opt) {
+                                                case 'h' :
+                                                        pbs_attr->set_attr( pbs_attr, "Hold_Types" , "u" );
+                                                        break;
+                                                default :
+                                                        continue; /*no NO-ARG option */
                                         }
-                                        else {
-                                                opt = arg[1];
-                                        }
-                                        
-                                } else {
+
+                                        opt = 0;
+                                  }
+                                else
+                                  {
                                         switch (opt) {
                                                 
@@ -644 +657 @@
                                                         pbs_attr->set_attr( pbs_attr, "Execution_Time" , arg );
                                                         break;
-                                                case 'h' :
-                                                        pbs_attr->set_attr( pbs_attr, "Hold_Types" , arg );
-                                                        break;
                                                 case 'A' :
                                                         pbs_attr->set_attr( pbs_attr, "Account_Name" , arg );
@@ -672 +682 @@
                                                         break;
                                                 case 'v' :
-                                                case 'V' :
                                                         pbs_attr->set_attr( pbs_attr, "Variable_List" , arg );
                                                         break;
@@ -687 +696 @@
                                                                         native_specification, opt);
                                         }
-
                                         opt = 0;
                                 }