Changeset 28529 for trunk/ippToPsps/scripts/ippToPsps_run.pl

Timestamp:

Jun 28, 2010, 4:26:47 PM (16 years ago)

Author:

rhenders

Message:

Now storing results in XML format

File:

• trunk/ippToPsps/scripts/ippToPsps_run.pl (modified) (6 diffs)

trunk/ippToPsps/scripts/ippToPsps_run.pl

@@ -10 +10 @@
 use constant DB_SOCKET => '/var/run/mysqld/mysqld.sock';
 use File::Temp qw(tempfile);
+use XML::LibXML;
 
 # globals
@@ -73 +74 @@
 
 # make a temporary file for saving results
-my ($resultsFile, $resultsFileName) = tempfile( "/tmp/ippToPsps_results.XXXX", UNLINK => !$save_temps);
+my ($resultsFile, $resultsFilePath) = tempfile( "/tmp/ippToPsps_results.XXXX", UNLINK => !$save_temps);
 
 process();
@@ -118 +119 @@
 }
 
-
 #######################################################################################
 # 
@@ -160 +160 @@
             AND chipRun.exp_id = rawExp.exp_id 
             AND camRun.dist_group = '$survey'   
+            AND rawExp.dateobs >= '2010-02-20'
             GROUP BY  rawExp.exp_id 
             ORDER BY rawExp.exp_id ASC;
@@ -457 +458 @@
 
     # read results
-    open (MYFILE, $resultsFileName);
-    my $i = 0;
-
-    # detection results
-    my $minObjId;
-    my $maxObjId;
-    my $filename;
-    if($batchType eq 'det') {
-
-        while (<MYFILE>) {
-            chomp;
-            if ($i == 0) { $filename = $_; }
-            if ($i == 1) { $minObjId = $_; }
-            if ($i == 2) { $maxObjId = $_; }
-            $i++;
-        }
-    }
-    close (MYFILE);
+    my $parser = XML::LibXML->new;
+    my $doc = $parser->parse_file($resultsFilePath);
+    my $filename = $doc->findvalue('//filename');
+    my $minObjId = $doc->findvalue('//minObjID');
+    my $maxObjId = $doc->findvalue('//maxObjID');
 
     # create XML file
@@ -794 +782 @@
     $command .= " -survey $surveyType";
     $command .= " -batch $batchType";
-    $command .= " -results $resultsFileName";
+    $command .= " -results $resultsFilePath";
 
     # run command