Changeset 28907

Timestamp:

Aug 12, 2010, 3:44:01 PM (16 years ago)

Author:

rhenders

Message:

Now creates a subdir for data with same name as DVO Db

File:

• trunk/ippToPsps/perl/ippToPsps_run.pl (modified) (2 diffs)

trunk/ippToPsps/perl/ippToPsps_run.pl

@@ -188 +188 @@
         # generate batch path from batch IDs
         my $batch = sprintf("B%08d", $batchId);
-        my $batchDir = sprintf("$output/$batch");
+        my $dvoDir = "$output/$dvoDb";
+        my $batchDir = "$dvoDir/$batch";
+
+        # make directories
+        unless(-d $dvoDir) {mkdir($dvoDir, 0777);}
         mkdir($batchDir, 0777);
+
         $published = 0;
 
@@ -203 +208 @@
             if (writeBatchManifest($batchDir, $batch, $batchType, $surveyType, $filename, $minObjId, $maxObjId)) {
 
+                # tar n' zip
                 if (!$dontTarNZip) {
-                    my $tarball = tarAndZipBatch($output, $batch);
+                    my $tarball = tarAndZipBatch($dvoDir, $batch);
+
+                    # and publish
                     if ($tarball && defined $datastore ) {
                         
-                        $published = $datastore->register($batch, $output, $tarball, "IPP_PSPS", "tgz");
+                        $published = $datastore->register($batch, $dvoDir, $tarball, "IPP_PSPS", "tgz");
                     }
                 }