Changeset 35976

Timestamp:

Aug 19, 2013, 2:30:26 PM (13 years ago)

Author:

bills

Message:

support for skycal stage in distribution client

Location:

trunk/ippScripts/scripts

Files:

• receive_advance.pl (modified) (3 diffs)
• receive_file.pl (modified) (2 diffs)

trunk/ippScripts/scripts/receive_advance.pl

@@ -65 +65 @@
     my ($stage) = $filename =~ m|^dbinfo\.(\S+)\.\d+\.mdc$|; # Stage of interest
     my $tool_name;
+    my $tool_mode = '-importrun';
     if ($stage eq "raw") {
         $tool_name = "regtool";
@@ -73 +74 @@
     } elsif ($stage eq "sky") {
         $tool_name = "staticskytool";
+    } elsif ($stage eq "skycal") {
+        $tool_name = "staticskytool";
+        $tool_mode = '-importskycal';
     } else {
         $tool_name = "${stage}tool";
@@ -81 +85 @@
     &my_die("Unable to resolve $dbinfo_uri\n", $PS_EXIT_UNKNOWN_ERROR) unless $file;
 
-    my $command = "$tool -importrun -infile $file"; # Command to execute
+    my $command = "$tool $tool_mode -infile $file"; # Command to execute
     $command .= " -dbname $dbname" if defined $dbname;
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =

trunk/ippScripts/scripts/receive_file.pl

@@ -223 +223 @@
     } elsif ($runType eq 'staticskyRun') {
         $stage = 'sky';
-        # XXX: This should be skycell, but the distribution code uses exposure
         $comp_name = 'skycell_id';
-#        $current_component = $comp_name;
+    } elsif ($runType eq 'skycalRun') {
+        $stage = 'skycal';
+        $comp_name = 'skycell_id';
     } else {
         &my_die( "unexpected run type line found in $filename: $runType\n", $file_id, $PS_EXIT_UNKNOWN_ERROR);
@@ -238 +239 @@
     }
 
-    if ($stage eq 'sky') {
-        # the dbinfo file for a skyRun only has one component and it doesn't contain
+    if ($stage eq 'sky' or $stage = 'skycal') {
+        # the dbinfo file for staticskyRun and skycalRun only have one component and they don't contain
         # skycell_id which is the way components are listed in the dirinfo file.
         my @ids = keys %$components;