Changeset 25027 for branches/pap/ippScripts/scripts/dist_make_fileset.pl

Timestamp:

Aug 7, 2009, 4:08:25 PM (17 years ago)

Author:

Paul Price

Message:

Merging trunk (r25026) to get up-to-date on old branch.

Location:

branches/pap

Files:

• . (modified) (1 prop)
• ippScripts/scripts/dist_make_fileset.pl (modified) (5 diffs)

branches/pap/ippScripts/scripts/dist_make_fileset.pl

@@ -91 +91 @@
     &my_die("dbinfo file for dist run $dbinfo_file not found", $dist_id, $prod_id, $PS_EXIT_UNKNOWN_ERROR);
 }
-print "dbinfo file $dbinfo_file exists\n";
+print "dbinfo file $dbinfo_file exists\n" if $verbose;
+
+# make sure that the dirinfo file for this run exists
+my $dirinfo_file = "dirinfo.$stage.$stage_id.mdc";
+if (! -e "$dist_dir/$dirinfo_file" ) {
+    &my_die("dirinfo file for dist run $dirinfo_file not found", $dist_id, $prod_id, $PS_EXIT_UNKNOWN_ERROR);
+}
+print "dirinfo file $dirinfo_file exists\n" if $verbose;
 
 # open the dsreg file list
@@ -97 +104 @@
 
 # add the dbinfo file to the list
-print $listFile "$dbinfo_file|||text|\n";
+# XXX: change type from text to dbinfo and dirinfo once we define the types
+print $listFile "$dbinfo_file|||text|dbinfo|\n";
+print $listFile "$dirinfo_file|||text|dirinfo|\n";
 
 my $components;
@@ -125 +134 @@
     next if $size == 0;
     my $md5sum = $component->{md5sum};
+    # name of the file
     my $name = $component->{name};
+    # component id (class_is or skycell_id)
+    my $comp_name = $component->{component};
 
     # XXX: if tarfile is not always the right type we need to add a type to distComponent
-    print $listFile "$name|$size|$md5sum|tgz|\n";
+    print $listFile "$name|$size|$md5sum|tgz|$comp_name|\n";
 }
 
@@ -201 +213 @@
     if ($stage eq 'stack') {
         return "stack.$stage_id";
+    } elsif ($stage eq 'diff') {
+        return "diff.$stage_id";
     }
 
     #
-    # we are a long ways away from the rawExp in the pipline. Rather than do some exotic
-    # queries in the disttool, we look up the exp_name in the database using DBI
+    # we are a long ways away from the rawExp in the pipeline. Rather than do some 
+    # very long joins in disttool, we look up the exp_name in the database using DBI
     #
     my $dbh = getDBHandle($ipprc, $dbname);
@@ -224 +238 @@
         $query = "SELECT exp_name FROM warpRun JOIN fakeRun USING(fake_id) JOIN camRun USING(cam_id)"
                     . " JOIN chipRun USING(chip_id) JOIN rawExp USING(exp_id) WHERE warp_id = $stage_id";
-    } elsif ($stage eq 'diff') {
-        $query = "SELECT exp_name FROM diffRun JOIN rawExp USING(exp_id) WHERE diff_id = $stage_id";
     } else {
         &my_die("$stage is invalid value for stage\n");