Changeset 29257

Timestamp:

Sep 29, 2010, 10:57:05 AM (16 years ago)

Author:

rhenders

Message:

New version of Db: added a load_failed column, complete with changes to getters/setters

File:

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

trunk/ippToPsps/perl/ippToPsps/IppToPspsDb.pm

@@ -18 +18 @@
 
     my $query = $self->{_db}->prepare(<<SQL);
-    SELECT created, batch_type, 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, 
+           load_failed, 
+           merge_worthy, 
+           merged 
         FROM batches 
         WHERE created >= '$fromTime'
@@ -41 +53 @@
 
     my $query = $self->{_db}->prepare(<<SQL);
-    SELECT created, batch_type, 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, 
+           load_failed, 
+           merge_worthy, 
+           merged
         FROM batches 
         WHERE batch_id = $batch_id 
@@ -222 +246 @@
 #######################################################################################
 sub updateODMStatus {
-    my ($self,$batchId, $expId, $loadedToOdm, $mergeWorthy, $mergeCompleted) = @_;
+    my ($self,$batchId, $expId, $loadedToOdm, $loadFailed, $mergeWorthy, $mergeCompleted) = @_;
 
     my $query = $self->{_db}->prepare(<<SQL);
     UPDATE batches 
-        SET loaded_to_ODM = $loadedToOdm, merge_worthy = $mergeWorthy, merged = $mergeCompleted 
+        SET loaded_to_ODM = $loadedToOdm, 
+            load_failed = $loadFailed, 
+            merge_worthy = $mergeWorthy, 
+            merged = $mergeCompleted 
         WHERE batch_id = $batchId 
         AND exp_id = $expId;
@@ -245 +272 @@
 
     my $currentRevision = -1;
-    my $latestRevision = 6;
-
-    while ($currentRevision != $latestRevision) {
+
+    while (1) {
 
         $currentRevision = $self->getRevision();
@@ -258 +284 @@
         elsif ($currentRevision == 4) {$self->createRevision_5();}
         elsif ($currentRevision == 5) {$self->createRevision_6();}
+        elsif ($currentRevision == 6) {$self->createRevision_7();}
+        else {last;}
     }
 }
@@ -399 +427 @@
 #######################################################################################
 # 
+# Create revision 7 of the database 
+#
+#######################################################################################
+sub createRevision_7 {
+    my ($self) = @_;
+
+    print "* Creating revision 7 of '$self->{_dbName}'\n";
+
+    my $query = $self->{_db}->prepare(<<SQL);
+    ALTER TABLE batches 
+        ADD COLUMN load_failed TINYINT DEFAULT 0
+SQL
+        $query->execute;
+
+    $self->setRevision(7);
+}
+
+#######################################################################################
+# 
 # Sets current revision of ippToPsps database
 #