Changeset 35545 for branches/eam_branches/ipp-20130419/pstamp/scripts

Timestamp:

May 9, 2013, 11:25:56 AM (13 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20130419/pstamp/scripts

Files:

• . (modified) (1 prop)
• psmkreq (modified) (1 diff)
• pstamp_checkdependent.pl (modified) (2 diffs)
• pstamp_insert_request.pl (modified) (1 diff)
• pstamp_job_run.pl (modified) (1 diff)
• pstamp_request_file (modified) (5 diffs)
• pstamp_server_status (modified) (3 diffs)
• pstamp_webrequest.pl (modified) (1 diff)
• pstampparse.pl (modified) (3 diffs)

branches/eam_branches/ipp-20130419/pstamp/scripts/psmkreq

@@ -1 +1 @@
 #!/bin/env perl
 ###
-### pstamprequest
+### psmkreq
 ###
-###     Program to make a postage stamp request table for a set of coordinates
+###     Program to make a postage stamp request table for a set of coordinates using supplied command
+###     line options and defaults
 ###
 

branches/eam_branches/ipp-20130419/pstamp/scripts/pstamp_checkdependent.pl

@@ -344 +344 @@
 }
 
+if (0) {
     my $tess_id = $metadata->{tess_id};
     if ($tess_id eq 'RINGS.V0') {
@@ -349 +350 @@
         return $PSTAMP_GONE
     }
+}
     if (($state =~ /error/) or ($state =~ /purged/) or ($state =~ /scrubbed/) or ($state eq 'drop') or
          ($data_state =~ /error/) or ($data_state =~ /purged/) or ($data_state =~ /scrubbed/) or ($data_state eq 'drop')) {

branches/eam_branches/ipp-20130419/pstamp/scripts/pstamp_insert_request.pl

@@ -128 +128 @@
         run(command => $command, verbose => $verbose);
     unless ($success) {
+        my $status = $error_code >> 8;
         print STDERR @$stderr_buf;
-        die("Unable to perform pstamptool -getwebrequestnum: $error_code");
+        die("Unable to perform $command: $error_code : $status");
     }
     my $webreq_num = ${$stdout_buf}[0];

branches/eam_branches/ipp-20130419/pstamp/scripts/pstamp_job_run.pl

@@ -151 +151 @@
         } elsif ($params->{cmf}) {
             $argString .= " -write_cmf";
+            $fileArgs  .= " -sources $params->{cmf}";
             push @file_list, $params->{cmf};
         } else {

branches/eam_branches/ipp-20130419/pstamp/scripts/pstamp_request_file

@@ -18 +18 @@
      $output,                   # Name of output table
      $req_name, 
+     $email, 
      $help
      );
@@ -25 +26 @@
            'output|o=s'   => \$output,
            'req_name|r=s' => \$req_name,
-           'help|h'         => \$help,
+           'email=s'      => \$email,
+           'help|h'       => \$help,
 ) or pod2usage( 2 );
 
@@ -66 +68 @@
 ];
 
+my $email_column_num = 3;
+
 # Specification of columns to write
 my $columns = [ 
@@ -165 +169 @@
     $req_name = $header->[0]->{value};
 }
+if ($email) {
+    $header->[$email_column_num]->{value} = $email;
+}
+
 
 die "no request name defined" unless defined $req_name;
@@ -302 +310 @@
 
             $$r_extver = $vals[1];
-            if ($extver > 1) {
+            if ($$r_extver > 1) {
                 die "number of header columns in input $nvals does not equal expected number of header words $nhead"
                     if (@vals != @$header);

branches/eam_branches/ipp-20130419/pstamp/scripts/pstamp_server_status

@@ -65 +65 @@
 
 
+    my $serverRunning = 0;
     my $command = "$pantasks_client < $pantasks_script";
     my  ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
         run(command => $command, verbose => $verbose);
-    unless ($success) {
+    if ($success) {
+        $serverRunning = 1;
+    } else {
         $error_code = (($error_code >> 8) or 1);
-        if ($error_code == 12) {
-            print "Postage Stamp Server is not running\n";
+        if ($error_code == 12 || $error_code == 13) {
+            print "Postage Stamp Server is not running\n<br>";
             #print "Postage Stamp Server will be down for maintenance it will back shortly.\n";
-            exit 0;
+#            exit 0;
         } else {
-            warn("$command failed. exit status: $error_code");
-            exit $error_code;
+            warn("\nError: $command failed. exit status: $error_code\n");
+#            exit $error_code;
         }
     }
@@ -119 +122 @@
         } else {
             print STDERR "Controller state not found";
-            exit 1;
+#            exit 1;
         }
         print "$br$br\n";
-    } else {
+    } elsif ($serverRunning) {
         print STDERR "Scheduler state not found";
-        exit 1;
+#        exit 1;
     }
 
@@ -148 +151 @@
             print "Task pstamp.job.run not found.<br />\n";
         }
-    } else {
-        print "Task pstamp.request.run not found.\n";
+    } elsif ($serverRunning) {
+        print "Task pstamp.request.run not found.<br >\n";
     }
 }

branches/eam_branches/ipp-20130419/pstamp/scripts/pstamp_webrequest.pl

@@ -71 +71 @@
 }
 
-# make a request file
+# make a request file in a sub directory of the current directory
 my $cur_dir = getcwd();
 
 #print STDERR "cur_dir is $cur_dir\n";
 
+# put file in directory for the current date
 my $datestr = strftime "%Y/%m/%d", gmtime;
 my $datedir = "$cur_dir/webreq/$datestr";

branches/eam_branches/ipp-20130419/pstamp/scripts/pstampparse.pl

@@ -360 +360 @@
 
     my $wholefile = 0;
-    if (!$skycenter && $row->{CENTER_X} == 0 && $row->{CENTER_Y} == 0) {
+    if (($row->{WIDTH} == 0 && $row->{HEIGHT} == 0) ||
+       (!$skycenter && $row->{CENTER_X} == 0 && $row->{CENTER_Y} == 0)) {
         # Secret code for returning the whole file
         $wholefile = 1;
@@ -628 +629 @@
     my $h = $row->{HEIGHT};
     my $coord_mask = $row->{COORD_MASK};
+
     my $wholeFile = 0; 
-    if ($coord_mask & $PSTAMP_CENTER_IN_PIXELS) {
-        # Center of 0, 0 in pixel coordinates is interpreted to mean
-        # return the entire file
-        if ($x == 0 && $y == 0) {
-            $roi_string = "-wholefile";
-            $wholeFile = 1;
+    # For historical reasons there are two ways to specify that the entire file be returned 
+    # rather than a postage stamp ...
+    if ($w == 0 and $h == 0) {
+        # ... The right way: width and height both zero ...
+        $wholeFile = 1;
+    } else {
+        if ($coord_mask & $PSTAMP_CENTER_IN_PIXELS) {
+            if ($x == 0 && $y == 0) {
+                # ... and pixel coordinate center of 0, 0
+                # I made this one up without thinking through the API clearly.
+                # allowing width and height to do it works much better
+                $wholeFile = 1;
+            } else {
+                $roi_string = "-pixcenter $x $y";
+            }
         } else {
-            $roi_string = "-pixcenter $x $y";
-        }
+            $roi_string = "-skycenter $x $y";
+        }
+    }
+
+    if ($wholeFile) {
+        $roi_string = "-wholefile";
+    } elsif ($coord_mask & $PSTAMP_RANGE_IN_PIXELS) {
+            $roi_string .= " -pixrange $w $h";
     } else {
-        $roi_string = "-skycenter $x $y";
-    }
-    if (!$wholeFile) {
-        if ($coord_mask & $PSTAMP_RANGE_IN_PIXELS) {
-            $roi_string .= " -pixrange $w $h";
-        } else {
             $roi_string .= " -arcrange $w $h";
-        }
     }
 
@@ -1005 +1015 @@
     my $command = "$pstamptool -getdependent -stage $stage -stage_id $stage_id -imagedb $imagedb -component $component -outdir $outdir";
     $command .= " -need_magic" if $need_magic;
-    $command .= ' -hold' if $action eq 'PREVIEW';
+#    $command .= ' -hold' if $action eq 'PREVIEW';
 
     if ($label) {