Changeset 25739 for trunk/pstamp/scripts

Timestamp:

Oct 1, 2009, 4:18:16 PM (17 years ago)

Author:

bills

Message:

convert to new request format. Add label and comment, reorder columns in text description

Location:

trunk/pstamp/scripts

Files:

• pstamp_finish.pl (modified) (2 diffs)
• pstamp_results_file.pl (modified) (2 diffs)
• pstampparse.pl (modified) (1 diff)

trunk/pstamp/scripts/pstamp_finish.pl

@@ -297 +297 @@
 
     if ($rownum eq 0) {
-        my $dummy_rowinfo = "0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|";
+        my $dummy_rowinfo = "0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|";
         return (undef, $dummy_rowinfo, "none");
     }
@@ -308 +308 @@
     my $tess_id = $row->{TESS_ID};
     $tess_id = "null" if !$tess_id;
+    my $comment = $row->{COMMENT};
+    $comment = "null" if !$comment;
+    my $label = $row->{LABEL};
+    $label = "null" if !$label;
 
     # This is ugly, error prone and hard to change.
     # Create a results file module and provide a list of the names (we have the data in the columns)
     my $rowinfo = "$row->{PROJECT}|$row->{JOB_TYPE}|$row->{REQ_TYPE}|$row->{IMG_TYPE}|";
-    $rowinfo   .= "$row->{ID}|$tess_id|$component|$row->{OPTION_MASK}|$row->{MJD_MIN}|$row->{MJD_MAX}|";
+    $rowinfo   .= "$row->{ID}|$tess_id|$component|$label|$row->{OPTION_MASK}|$row->{MJD_MIN}|$row->{MJD_MAX}|";
     $rowinfo   .= "$row->{REQFILT}|$row->{COORD_MASK}|$row->{CENTER_X}|$row->{CENTER_Y}|";
-    $rowinfo   .= "$row->{WIDTH}|$row->{HEIGHT}";
+    $rowinfo   .= "$row->{WIDTH}|$row->{HEIGHT}|";
+    $rowinfo   .= $comment;
 
     return ($row, $rowinfo, $row->{PROJECT});

trunk/pstamp/scripts/pstamp_results_file.pl

@@ -90 +90 @@
         { name => 'TESS_ID',    type => '64A', writetype => TSTRING },    
         { name => 'COMPONENT',  type => '64A', writetype => TSTRING },    
+        { name => 'LABEL',      type => '64A', writetype => TSTRING },    
 
         # output parameters
@@ -104 +105 @@
         { name => 'WIDTH',      type => 'D', writetype => TDOUBLE },   
         { name => 'HEIGHT',     type => 'D', writetype => TDOUBLE },  
+        { name => 'COMMENT',    type => '64A', writetype => TSTRING },    
 ];
 

trunk/pstamp/scripts/pstampparse.pl

@@ -668 +668 @@
     return 0 if ($r1->{IMG_TYPE} ne $r2->{IMG_TYPE});
     return 0 if ($r1->{ID} ne $r2->{ID});
+    return 0 if ($r1->{TESS_ID} ne $r2->{TESS_ID});
+    return 0 if ($r1->{REQFILT} ne $r2->{REQFILT});
+    return 0 if ($r1->{LABEL} ne $r2->{LABEL});
+    return 0 if ($r1->{MJDMIN} ne $r2->{MJDMAX});
+    return 0 if ($r1->{MJDMAX} ne $r2->{MJDMAX});
     return 0 if ($r1->{inverse} ne $r2->{inverse});