Changeset 27840 for branches/simtest_nebulous_branches/ippScripts/scripts/receive_file.pl

Timestamp:

May 3, 2010, 8:50:52 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/simtest_nebulous_branches

Files:

• . (modified) (1 prop)
• ippScripts/scripts/receive_file.pl (modified) (10 diffs)

branches/simtest_nebulous_branches/ippScripts/scripts/receive_file.pl

@@ -7 +7 @@
 use Sys::Hostname;
 my $host = hostname();
-print "Starting script $0 on $host\n\n";
+my $date = `date`;
+print "\n\n";
+print "Starting script $0 on $host at $date\n\n";
 
 use DateTime;
@@ -124 +126 @@
     print "dirinfo resolved is: $resolved\n" if $verbose;
 
-    open OUT, ">$resolved" 
+    open OUT, ">$resolved"
         or &my_die( "failed to open $resolved\n", $file_id, $PS_EXIT_UNKNOWN_ERROR);
     print OUT @$dirinfo_lines
@@ -130 +132 @@
     close OUT
         or &my_die( "failed to close $resolved\n", $file_id, $PS_EXIT_UNKNOWN_ERROR);
-    
+
     # update the fileset to allow processing of other files
     my $command = "$receivetool -updatefileset -fileset_id $fileset_id";
@@ -136 +138 @@
     $command .= " -dbname $dbname" if defined $dbname;
 
-    my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-        run(command => $command, verbose => $verbose);
-    &my_die( "Unable to update fileset $fileset_id to\n", $file_id, $PS_EXIT_UNKNOWN_ERROR) unless $success;
+    unless ($no_update) {
+        my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+            run(command => $command, verbose => $verbose);
+        &my_die( "Unable to update fileset $fileset_id to\n", $file_id, $PS_EXIT_UNKNOWN_ERROR) unless $success;
+    } else {
+        print STDERR "skipping $command\n";
+    }
 
 } elsif ($component eq "dbinfo") {
@@ -156 +162 @@
     &my_die( "failed to resolve $dbinfo_uri\n", $file_id, $PS_EXIT_UNKNOWN_ERROR) if !$resolved;
 
-    open OUT, ">$resolved" 
+    open OUT, ">$resolved"
         or &my_die( "failed to open $resolved\n", $file_id, $PS_EXIT_UNKNOWN_ERROR);
 
@@ -164 +170 @@
     # we are very strict about the format of the file
     #
-    # First comes the data for the Run
-    # Next is the data for each component
+    # First comes the dbversion metadata
+    # Next comes the data for the Run
+    # Next is the data for each component and other associated tables
     # The component_id (class_id, skycell_id) must come before any of the paths that we edit
 
-    # The first line tells us the run type. From this we get the stage
-    #
-    my $line = $lines[0];
-    my ($runType, $multi) = split " ", $line;
-    &my_die( "unexpected first line found in $filename: $line\n", $file_id, $PS_EXIT_UNKNOWN_ERROR)
-        if !$runType or ($multi ne 'MULTI');
+    my $runType = findRunType(\@lines);
 
     my $stage;
@@ -215 +217 @@
         $component_dir = $components->{$current_component};
     }
-    foreach $line (@lines) {
+    foreach my $line (@lines) {
         my $out_line = $line;
 
@@ -227 +229 @@
                 $current_component = $value;
                 $component_dir = $components->{$current_component};
-                &my_die( "$component_dir is null for $value in $filename: $runType\n", 
+                &my_die( "$component_dir is null for $value in $filename: $runType\n",
                         $file_id, $PS_EXIT_UNKNOWN_ERROR) if !$component_dir;
             } elsif ($name eq 'workdir') {
@@ -237 +239 @@
                 $new_value = basename($value);
             } elsif ((($name eq 'uri') or ($name eq 'path_base')) and ($value ne 'NULL')) {
-                &my_die( "$component_dir is null and we need it for $name", 
+                &my_die( "$component_dir is null and we need it for $name",
                         $file_id, $PS_EXIT_PROG_ERROR) if !$component_dir;
 
@@ -492 +494 @@
     return $new_path;
 }
+sub findRunType {
+    my $lines = shift;
+    my $runType;
+    my ($firstWord, $multi) = split " ", $lines->[0];
+    &my_die( "unexpected first line found in $filename: $lines->[0]\n",
+                $file_id, $PS_EXIT_UNKNOWN_ERROR) if ($firstWord ne 'dbversion') or ($multi ne 'MULTI');
+
+    my $dbversionDone = 0;
+    foreach my $line (@$lines) {
+        # skip blank lines
+        next if !$line or $line eq "\n";
+
+        ($firstWord, $multi) = split " ", $line;
+        if ($dbversionDone) {
+            # The first non blank line after the dbversion tells us the run type.
+            # From this we get the stage
+            &my_die( "unexpected line found in $filename: $line\n",
+                $file_id, $PS_EXIT_UNKNOWN_ERROR) if !$firstWord or !$multi or ($multi ne 'MULTI');
+
+            $runType = $firstWord;
+            last;
+        } else {
+            if ($firstWord and $firstWord eq 'END') {
+                # we're past the dbversion file now
+                $dbversionDone = 1;
+            }
+        }
+    }
+    &my_die( "failed to determine run type from $filename",
+                $file_id, $PS_EXIT_UNKNOWN_ERROR) if !$runType;
+
+    return $runType;
+}
 
 sub my_die