Changeset 29191

Timestamp:

Sep 22, 2010, 8:39:51 AM (16 years ago)

Author:

rhenders

Message:

Better handling of temporary input file

Location:

trunk/ippToPsps/perl/ippToPsps

Files:

• Batch.pm (modified) (2 diffs)
• DetectionBatch.pm (modified) (2 diffs)

trunk/ippToPsps/perl/ippToPsps/Batch.pm

@@ -455 +455 @@
     # create temporary input file for file list
     my ($resultsFile, $resultsFilePath) = tempfile( "/tmp/ippToPsps_results.XXXX", UNLINK => !$self->{_save_temps});
-# TODO create input file here
+
     # get list of input files
-    my $inputFile = $self->createInputFileList();
-
-    # run IppToPsps program TODO should not need
-    my $success = $self->runProgram($inputFile, $resultsFilePath);
-    if (!$self->{_save_temps}) {unlink $inputFile};
-
-    if ($success) {
-
-        # TODO type-specific processing
-        $self->parseResults($resultsFilePath);
-
-        # tar n' zip
-        if (!$self->{_dontTarball} && $self->createTarball()) {
-
-            # and publish
-            if (defined $self->{_datastore} &&
-                    $self->{_datastore}->register($self->{_name}, $self->{_subDir}, $self->{_filename}, "IPP_PSPS", "tgz")) {
-                $self->{_ippToPspsDb}->setPublished($self->{_batchId}, $self->{_expId}, 1);
+    my ($inputFile, $inputPath) = tempfile( "/tmp/ippToPsps_inputFileList.XXXX", UNLINK => !$self->{_save_temps});
+
+    my $success = 0;
+    if ($self->createInputFileList($inputFile)) {
+
+        # run IppToPsps program TODO should not need
+        $success = $self->runProgram($inputPath, $resultsFilePath);
+
+        if ($success) {
+
+            # TODO type-specific processing
+            $self->parseResults($resultsFilePath);
+
+            # tar n' zip
+            if (!$self->{_dontTarball} && $self->createTarball()) {
+
+                # and publish
+                if (defined $self->{_datastore} &&
+                        $self->{_datastore}->register($self->{_name}, $self->{_subDir}, $self->{_filename}, "IPP_PSPS", "tgz")) {
+                    $self->{_ippToPspsDb}->setPublished($self->{_batchId}, $self->{_expId}, 1);
+                }
             }
         }
@@ -480 +483 @@
 
     close $resultsFile;
+    close $inputFile;
+
     if (!$self->{_save_temps}) {unlink $resultsFile};
+    if (!$self->{_save_temps}) {unlink $inputFile};
 
     return $success;

trunk/ippToPsps/perl/ippToPsps/DetectionBatch.pm

@@ -48 +48 @@
 #######################################################################################
 sub createInputFileList {
-    my ($self) = @_;
+    my ($self, $inputFile) = @_;
 
     my $nebPath = $self->{_gpc1Db}->getCameraStageSmfForThisDvoDb($self->{_dvoDb}, $self->{_expId});
@@ -58 +58 @@
 
     # now write the path to this file out to temp file
-    my ($tempFile, $tempName) = tempfile( "/tmp/ippToPsps_inputFileList.XXXX", UNLINK => !$self->{_save_temps});
-    print $tempFile $realFile . "\n";
-    close $tempFile;
+    print $inputFile $realFile . "\n";
 
-    return $tempName;
+    return 1;
 }