support for native LB-JP attributes

diff --git a/org.glite.lb/project/MultiStruct.pm b/org.glite.lb/project/MultiStruct.pm
index 9cd847c..0f1a7e9 100644 (file)
--- a/org.glite.lb/project/MultiStruct.pm
+++ b/org.glite.lb/project/MultiStruct.pm
@@ -80,7 +80,7 @@ sub load {
                }
                elsif ($ftype eq '_special_') {
                        my $f = $self->getField();
-                       addSpecial $f $fname;
+                       addSpecial $f $fname,$comment;
                }
                elsif ($ftype eq '_null_') {
                        my $f = $self->getField();

diff --git a/org.glite.lb/project/StructField.pm b/org.glite.lb/project/StructField.pm
index 95d33b8..418decc 100644 (file)
--- a/org.glite.lb/project/StructField.pm
+++ b/org.glite.lb/project/StructField.pm
@@ -25,7 +25,9 @@ sub addCode {
 sub addSpecial {
        my $self = shift;
        my $special = shift;
-       $self->{special} = $special;
+       my $val = shift;
+       $val = 1 unless $val;
+       $self->{special}->{$special} = $val;
        1;
 }
 

diff --git a/org.glite.lb/project/status.T b/org.glite.lb/project/status.T
index b5fbeed..8abb1c9 100644 (file)
--- a/org.glite.lb/project/status.T
+++ b/org.glite.lb/project/status.T
@@ -2,15 +2,20 @@
 jobid  jobId           Id of the job
 string owner           Job owner
 _index_
+       _special_       JP
 
 int    jobtype         Type of job
        _null_  -1
        _code_ SIMPLE   simple job
        _code_ DAG      composite job
+       _special_       JP
 jobid  parent_job      parent job of subjob
+       _special_       JP
 
 string seed            string used for generation of subjob IDs
+       _special_       JP
 int    children_num    number of subjobs
+       _special_       JP
 strlist        children        list of subjob IDs
        _special_       XMLstructured
 intlist        children_hist   summary (histogram) of children job states
@@ -19,22 +24,33 @@ stslist children_states full status information of the children
        _special_       XMLstructured
 
 string         condorId        Id within Condor-G
+       _special_       JP
 string globusId        Globus allocated Id
+       _special_       JP
 string localId         Id within LRMS
+       _special_       JP
 
 string jdl             User submitted job description
+       _special_       JP
 string matched_jdl     Full job description after matchmaking
+       _special_       JP
 string destination     ID of CE where the job is being sent
+       _special_       JP
 _index_
 string condor_jdl      ClassAd passed to Condor-G for last job execution
+       _special_       JP
 string rsl             Job RSL sent to Globus
 
 string reason          Reason of being in this status, if any
+       _special_       JP
 
 string location        Where the job is being processed
+       _special_       JP
 _index_
 string ce_node         Worker node where the job is executed
+       _special_       JP
 string network_server  Network server handling the job
+       _special_       JP
 
 bool   subjob_failed   Subjob failed (the parent job will fail too)
 int    done_code               Return code
@@ -42,14 +58,19 @@ int done_code               Return code
        _code_  OK              Finished correctly
        _code_  FAILED          Execution failed
        _code_  CANCELLED       Cancelled by user
+       _special_       JP
 int    exit_code               Unix exit code
-bool   resubmitted     The job was resubmitted
+       _special_       JP
+bool   resubmitted     Resubmit count (the job was resubmitted if non-zero)
+       _special_       JP
 
 bool   cancelling      Cancellation request in progress
 string cancelReason    Reason of cancel
+       _special_       JP
 
 int    cpuTime         Consumed CPU time
        _null_  -1
+       _special_       JP
 
 taglist        user_tags       List of pairs (user_tag, user_value)
        _special_       XMLstructured
@@ -63,6 +84,7 @@ intlist       stateEnterTimes When all previous states were entered
 bool   expectUpdate    Some logged information has not arrived yet
 string expectFrom      Sources of the missing information
 string acl             ACL of the job
+       _special_       JP
 
 bool   payload_running User payload started
 strlist        possible_destinations   Possible job destinations