Changeset 28794 for branches/eam_branches/ipp-20100621/ippScripts/scripts/publish_file.pl

Timestamp:

Jul 30, 2010, 9:31:50 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

File:

• branches/eam_branches/ipp-20100621/ippScripts/scripts/publish_file.pl (modified) (5 diffs)

branches/eam_branches/ipp-20100621/ippScripts/scripts/publish_file.pl

@@ -82 +82 @@
 my $mdcParser = PS::IPP::Metadata::Config->new;
 
+my $mops = ($product =~ /^IPP-MOPS/ ? 1 : 0); # Format for MOPS?
 my ($dsFile, $dsFileName) = tempfile("/tmp/publish.$pub_id.ds.XXXX", UNLINK => !$save_temps );
+my $dsType = $mops ? "IPP-MOPS" : $product; # Type for DataStore
 
 my $comment;                    # Comment for exposure
@@ -155 +157 @@
         &my_die("Unable to parse metadata config", $pub_id, $PS_EXIT_PROG_ERROR);
 
-    my $mops = ($product =~ /^IPP-MOPS/ ? 1 : 0); # Format for MOPS?
     my ($mopsPositiveFile, $mopsPositiveFileName) = tempfile("/tmp/publish.$pub_id.mops.pos.XXXX", UNLINK => !$save_temps ) if $mops;
     my ($mopsNegativeFile, $mopsNegativeFileName) = tempfile("/tmp/publish.$pub_id.mops.neg.XXXX", UNLINK => !$save_temps ) if $mops;
@@ -230 +231 @@
                 print $mopsNegativeFile "$filename\n";
             } else {
-                print $dsFile "$filename|||$product|${skycell_id}.neg|\n";
+                print $dsFile "$filename|||$dsType|${skycell_id}.neg|\n";
             }
         }
@@ -241 +242 @@
         if (scalar keys %positive > 0) {
             my $output = mops_combine(\%positive, "$outroot.pos.mops", $mopsPositiveFileName);
-            print $dsFile "$output|||$product|positive|\n";
+            print $dsFile "$output|||$dsType|positive|\n";
         }
         if (scalar keys %negative > 0) {
             my $output = mops_combine(\%negative, "$outroot.neg.mops", $mopsNegativeFileName);
-            print $dsFile "$output|||$product|negative|\n";
+            print $dsFile "$output|||$dsType|negative|\n";
         }
     }
@@ -253 +254 @@
 
 unless ($no_update) {
-    my $command = "$dsreg --add pub.$pub_id.$stage.$stage_id --copy --abspath --product $product --type $product --list $dsFileName";
+    my $command = "$dsreg --add pub.$pub_id.$stage.$stage_id --copy --abspath --product $product --type $dsType --list $dsFileName";
     $command .= " --ps0 \"$comment\"" if defined $comment;