Changeset 29092

Timestamp:

Sep 1, 2010, 12:33:21 PM (16 years ago)

Author:

rhenders

Message:

Simplified batch getting methods

File:

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

trunk/ippToPsps/perl/ippToPsps/IppToPspsDb.pm

@@ -15 +15 @@
 #
 ###########################################################################
-sub getListOfBatchesOnDatastore {
+sub getBatches {
     my ($self, $batches, $fromTime, $toTime) = @_;
 
     my $query = $self->{_db}->prepare(<<SQL);
-    SELECT created, exp_id, batch_id, survey_id, deleted 
+    SELECT created, exp_id, batch_id, survey_id, deleted, dvo_db, processed, on_datastore, loaded_to_ODM, merge_worthy, merged 
         FROM batches 
-        WHERE processed = 1 
-        AND on_datastore = 1
-        AND created >= '$fromTime'
+        WHERE created >= '$fromTime'
         AND created <= '$toTime';
 SQL
@@ -41 +39 @@
 #
 ###########################################################################
-sub getSingleBatch{
+sub getBatch{
     my ($self, $batch_id, $batches) = @_;
 
     my $query = $self->{_db}->prepare(<<SQL);
-    SELECT created, exp_id, batch_id, survey_id, deleted, dvo_db
+    SELECT created, 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 
-SQL
-  
-    $query->execute;
-    ${$batches} = $query->fetchall_arrayref();
-    my $count = scalar @{${$batches}};
-
-   printf( "* Found %d batch%s\n", $count, ($count==1) ? "" : "es");
-   return $count;
-}
-
-###########################################################################
-#
-# Returns a info about one particular batch on the datastore
-#
-###########################################################################
-sub getSingleBatchOnDatastore{
-    my ($self, $batch_id, $batches) = @_;
-
-    my $query = $self->{_db}->prepare(<<SQL);
-    SELECT created, exp_id, batch_id, survey_id, deleted 
-        FROM batches 
-        WHERE batch_id = $batch_id 
-        AND processed = 1 
-        AND on_datastore = 1;
 SQL