Changeset 30118 for branches/czw_branch/20101203/ippToPsps

Timestamp:

Dec 20, 2010, 2:30:45 PM (16 years ago)

Author:

watersc1

Message:

Attempting to bring branch in sync with trunk

Location:

branches/czw_branch/20101203

Files:

• . (modified) (1 prop)
• ippToPsps/docs (copied) (copied from trunk/ippToPsps/docs )
• ippToPsps/docs/loadingSummary.txt (copied) (copied from trunk/ippToPsps/docs/loadingSummary.txt )
• ippToPsps/perl/checkOdmStatus.pl (modified) (2 diffs)
• ippToPsps/perl/exposureSummary.pl (copied) (copied from trunk/ippToPsps/perl/exposureSummary.pl )
• ippToPsps/perl/ippToPsps/DetectionBatch.pm (modified) (1 diff)
• ippToPsps/perl/ippToPsps/IppToPspsDb.pm (modified) (5 diffs)
• ippToPsps/perl/ippToPsps_run.pl (modified) (2 diffs)

branches/czw_branch/20101203/ippToPsps/perl/checkOdmStatus.pl

@@ -39 +39 @@
         );
 
+if (@ARGV) {
+    print "* UNKNKOWN: option                          @ARGV\n";
+}
 if (!defined $product) {
     print "* OPTIONAL: a datastore product name            -p <name>\n";
@@ -159 +162 @@
         $numBatchesToCheck++;
 
-        # if not merged then update by polling ODM for status
+        # if not merged or failed load, then update by polling ODM for status
         if (!$merged && !$loadFailed) {
-
             if (checkODM($batch->getName(), \$loadedToOdm, \$loadFailed, \$mergeWorthy, \$merged)) {
                 

branches/czw_branch/20101203/ippToPsps/perl/ippToPsps/DetectionBatch.pm

@@ -78 +78 @@
     # get neb path of smf file
     my $nebPath = $self->{_gpc1Db}->getCameraStageSmfForThisDvoDb($self->{_dvoDb}, $self->{_expId});
-    if (!$nebPath) { return 0; }
+    if (!$nebPath) { return undef; }
 
     # get real filename from neb 'key'

branches/czw_branch/20101203/ippToPsps/perl/ippToPsps/IppToPspsDb.pm

@@ -11 +11 @@
 ###########################################################################
 #
-# Returns a list of batches that have been processed and loaded to datastore
+# Returns a list of batches created within the provided dates
 #
 ###########################################################################
@@ -39 +39 @@
     $query->execute;
     ${$batches} = $query->fetchall_arrayref();
-    my $count = scalar @{${$batches}};
-
-   return $count;
+    return scalar @{${$batches}};
 }
 
@@ -72 +70 @@
     $query->execute;
     ${$batches} = $query->fetchall_arrayref();
-    my $count = scalar @{${$batches}};
-
-   return $count;
+    return scalar @{${$batches}};
+}
+
+###########################################################################
+#
+# Returns a count of all distinct exposures between provided limits
+#
+###########################################################################
+sub countExposures {
+    my ($self, $fromExp, $toExp, $datastoreProduct, $batchType, $dvoDb) = @_;
+
+    my $query = $self->{_db}->prepare(<<SQL);
+    SELECT COUNT(distinct exp_id) 
+        FROM batches 
+        WHERE exp_id >= $fromExp
+        AND exp_id <= $toExp 
+        AND dvo_db = '$dvoDb' 
+        AND batch_type = '$batchType' 
+        AND datastore_product = '$datastoreProduct' 
+SQL
+
+    $query->execute;
+    return scalar $query->fetchrow_array();
+}
+
+###########################################################################
+#
+# Returns a count of exposures (between provided limits) that have been merged
+#
+###########################################################################
+sub countMergedExposures {
+    my ($self, $fromExp, $toExp, $datastoreProduct, $batchType, $dvoDb) = @_;
+
+    my $query = $self->{_db}->prepare(<<SQL);
+    SELECT COUNT(distinct exp_id) 
+        FROM batches 
+        WHERE exp_id >= $fromExp
+        AND exp_id <= $toExp 
+        AND dvo_db = '$dvoDb' 
+        AND batch_type = '$batchType' 
+        AND datastore_product = '$datastoreProduct' 
+        AND merged
+SQL
+
+    $query->execute;
+    return scalar $query->fetchrow_array();
+}
+
+###########################################################################
+#
+# Returns a list of exposures (between provided limits) that have not been merged
+#
+###########################################################################
+sub getUnmergedExposures {
+    my ($self, $exposures, $fromExp, $toExp, $datastoreProduct, $batchType, $dvoDb) = @_;
+
+    my $query = $self->{_db}->prepare(<<SQL);
+    SELECT batch_id, exp_id 
+        FROM batches 
+        WHERE exp_id >= $fromExp
+        AND exp_id <= $toExp 
+        AND dvo_db = '$dvoDb' 
+        AND batch_type = '$batchType' 
+        AND datastore_product = '$datastoreProduct' 
+        AND !merged
+        GROUP BY exp_id
+SQL
+
+    $query->execute;
+    ${$exposures} = $query->fetchall_arrayref();
+    return scalar @{${$exposures}};
 }
 
@@ -166 +232 @@
 #######################################################################################
 #
+# Checks whether this exposure failed to load to the ODM
+#
+########################################################################################
+sub didLoadFail {
+    my ($self, $expId) = @_;
+
+    my $query = $self->{_db}->prepare(<<SQL);
+    SELECT COUNT(*) 
+        FROM batches 
+        WHERE exp_id = $expId
+        AND load_failed
+SQL
+
+    $query->execute;
+
+    return scalar $query->fetchrow_array();
+}
+
+#######################################################################################
+#
+# Checks whether this exposure has a min object ID under old PSPS hard limit of 72010000000000001
+#
+########################################################################################
+sub isMinObjIdUnderLimit {
+    my ($self, $expId) = @_;
+
+    my $query = $self->{_db}->prepare(<<SQL);
+    SELECT COUNT(*) 
+        FROM batches 
+        WHERE exp_id = $expId
+        AND min_obj_id < 72010000000000001
+SQL
+
+    $query->execute;
+
+    return scalar $query->fetchrow_array();
+}
+#######################################################################################
+#
+# Checks whether this exposure has been processed
+#
+########################################################################################
+sub isExposureProcessed {
+    my ($self, $expId) = @_;
+
+    my $query = $self->{_db}->prepare(<<SQL);
+    SELECT COUNT(*) 
+        FROM batches 
+        WHERE exp_id = $expId
+        AND processed
+SQL
+
+    $query->execute;
+
+    return scalar $query->fetchrow_array();
+}
+
+#######################################################################################
+#
+# Checks whether this exposure has been merged 
+#
+########################################################################################
+sub isExposureMerged {
+    my ($self, $expId) = @_;
+
+    my $query = $self->{_db}->prepare(<<SQL);
+    SELECT COUNT(*) 
+        FROM batches 
+        WHERE exp_id = $expId
+        AND merged
+SQL
+
+    $query->execute;
+
+    return scalar $query->fetchrow_array();
+}
+
+#######################################################################################
+#
+# Checks whether this exposure has been loaded to ODM 
+#
+########################################################################################
+sub isExposureLoadedToOdm {
+    my ($self, $expId) = @_;
+
+    my $query = $self->{_db}->prepare(<<SQL);
+    SELECT COUNT(*) 
+        FROM batches 
+        WHERE exp_id = $expId
+        AND loaded_to_ODM
+SQL
+
+    $query->execute;
+
+    return scalar $query->fetchrow_array();
+}
+
+#######################################################################################
+#
 # Checks whether we have successfully processed this exposure and loaded it to the datastore 
 #
@@ -184 +349 @@
     my $processed = $query->fetchrow_array();
 
+    # TODO can use return scalar $query->fetchrow_array();
     return $processed;
 }

branches/czw_branch/20101203/ippToPsps/perl/ippToPsps_run.pl

@@ -15 +15 @@
 use ippToPsps::IppToPspsDb;
 use ippToPsps::Datastore;
+#use ippToPsps::BatchManager;
 
 # globals
@@ -112 +113 @@
 my $datastore = undef;
 if ($datastoreProduct) {$datastore = new ippToPsps::Datastore($datastoreProduct, $verbose, $save_temps);}
+#my $batchManager = new ippToPsps::BatchManager($ippToPspsDb, $output, $verbose, $save_temps);
 
 # check we can run programs and get camera config