Changeset 29186

Timestamp:

Sep 21, 2010, 4:38:03 PM (16 years ago)

Author:

rhenders

Message:

Changed update functions for clarity

File:

• trunk/ippToPsps/perl/ippToPsps/IppToPspsDb.pm (modified) (10 diffs)

trunk/ippToPsps/perl/ippToPsps/IppToPspsDb.pm

@@ -9 +9 @@
 our @ISA = qw(ippToPsps::MySQLDb);    # inherits from MySQLDb
 
-
 ###########################################################################
 #
@@ -19 +18 @@
 
     my $query = $self->{_db}->prepare(<<SQL);
-    SELECT created, exp_id, batch_id, survey_id, deleted, dvo_db, processed, on_datastore, loaded_to_ODM, merge_worthy, merged 
+    SELECT created, batch_type, exp_id, batch_id, survey_id, deleted, dvo_db, processed, on_datastore, loaded_to_ODM, merge_worthy, merged 
         FROM batches 
         WHERE created >= '$fromTime'
-        AND created <= '$toTime';
+        AND created <= '$toTime'
 SQL
 
@@ -30 +29 @@
     my $count = scalar @{${$batches}};
 
-   printf( "* Found %d batch%s\n", $count, ($count==1) ? "" : "es");
    return $count;
 }
@@ -43 +41 @@
 
     my $query = $self->{_db}->prepare(<<SQL);
-    SELECT created, exp_id, batch_id, survey_id, deleted, dvo_db, processed, on_datastore, loaded_to_ODM, merge_worthy, merged
+    SELECT created, batch_type, exp_id, batch_id, survey_id, deleted, dvo_db, processed, on_datastore, loaded_to_ODM, merge_worthy, merged
         FROM batches 
         WHERE batch_id = $batch_id 
@@ -52 +50 @@
     my $count = scalar @{${$batches}};
 
-   printf( "* Found %d batch%s\n", $count, ($count==1) ? "" : "es");
    return $count;
 }
@@ -103 +100 @@
 #
 ########################################################################################
-sub updateBatch {
-    my ($self, $batchId, $expId, $processed, $published, $totalDetections, $minObjId, $maxObjId) = @_;
+sub setAsProcessed {
+    my ($self, $batchId, $expId, $totalDetections, $minObjId, $maxObjId) = @_;
 
     if (!$minObjId) {$minObjId = -1;}
@@ -114 +111 @@
     UPDATE batches 
         SET 
-          processed = $processed, 
-          on_datastore = $published, 
+          processed = 1, 
           total_detections = $totalDetections,
           min_obj_id = $minObjId,
@@ -128 +124 @@
 #######################################################################################
 #
+# Sets published state of a batch 
+#
+########################################################################################
+sub setPublished {
+    my ($self, $batchId, $expId, $published) = @_;
+
+    my $query = $self->{_db}->prepare(<<SQL);
+    UPDATE batches 
+        SET on_datastore = $published 
+        WHERE batch_id = $batchId 
+        AND exp_id = $expId;
+SQL
+
+    $query->execute; # TODO check response of this
+}
+
+#######################################################################################
+#
 # Checks whether we have successfully processed this exposure 
 #
@@ -138 +152 @@
         FROM batches 
         WHERE exp_id = $expId
-        AND created > '2010-08-12'
         AND processed = 1;
 SQL
@@ -179 +192 @@
     $query->execute;
 
-    print "* New batch '$batchId' for exposure ID = $expId and survey = '$surveyType'\n";
+    print "* New batch '$batchId' for exposure ID = '$expId' and survey = '$surveyType'\n";
 
     return $batchId;