Changeset 30586 for branches/czw_branch/20101203/ippToPsps/perl/exposureSummary.pl

Timestamp:

Feb 11, 2011, 4:29:48 PM (15 years ago)

Author:

watersc1

Message:

Trying to merge back into trunk.

Location:

branches/czw_branch/20101203

Files:

• . (modified) (1 prop)
• ippToPsps/perl/exposureSummary.pl (modified) (6 diffs)

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

@@ -86 +86 @@
 my $totalUnmerged = 0;
 my $totalMergeWorthy = 0;
+my $totalNotMergeWorthy = 0;
 my $totalProcessed = 0;
 my $totalOnDatastore = 0;
 my $totalLoadedToOdm = 0;
 my $totalLoadFailed = 0;
+my $totalMergeWorthy = 0;
 my $totalUnderObjIdLimit = 0;
 my $totalUnprocessed = 0;
 my $totalUnprocessedAvailableSmfs = 0;
-my $totalOdmFailures = 0;
+my $remainingOdmFailures = 0;
 my $totalUnprocessedMissingSmfs = 0;
+my $totalProcessedNotOnDatastore = 0;
 
 
 open (UNPRO, ">unprocessedExposures.txt") or print "* Problem opening data file for unprocessed exposures\n";
 open (ODMFAIL, ">odmFailures.txt") or print "* Problem opening data file for ODM failures\n";
+open (NOTONDATASTORE, ">notOnDatastore.txt") or print "* Problem opening data file for exposures not on datastore\n";
 
 if ($checkNeb) {
@@ -114 +118 @@
     if ($verbose) {print "$totalUnmerged | $expId \n"; }
 
+    # processed stuff
     if ($ippToPspsDb->isExposureProcessed($expId)) {
 
         $totalProcessed++;
 
-        if ($ippToPspsDb->isExposureAlreadyPublished($expId)) {
+        if (!$ippToPspsDb->isExposureAlreadyPublished($expId)) {
+
+            $totalProcessedNotOnDatastore++;
+            print NOTONDATASTORE "$expId\n";
+        }
+        else {
 
             $totalOnDatastore++;
@@ -126 +136 @@
                 $totalLoadedToOdm++;
 
-                if ($ippToPspsDb->didLoadFail($expId)) {
-
-                    $totalLoadFailed++;
+                if ($ippToPspsDb->isMergeWorthy($expId)) {
+
+                    $totalMergeWorthy++;
                 }
-                if ($ippToPspsDb->isMinObjIdUnderLimit($expId)) {
-
-                    $totalUnderObjIdLimit++;
-                }
+                # not mergeworthy
                 else {
 
-                    $totalOdmFailures++;
-                    print ODMFAIL "$expId\n";
+                    $totalNotMergeWorthy++;
+
+                    #if ($ippToPspsDb->didLoadFail($expId)) {
+
+                    #    $totalLoadFailed++;
+                    #}
+                    if ($ippToPspsDb->isMinObjIdUnderLimit($expId)) {
+
+                        $totalUnderObjIdLimit++;
+                    }
+                    else {
+
+                        $remainingOdmFailures++;
+                        print ODMFAIL "$expId\n";
+                    }
                 }
             }
         }
     }
+    # unprocessed stuff
     else {
 
@@ -181 +202 @@
 close(UNPRO);
 close(ODMFAIL);
+close(NOTONDATASTORE);
 if ($checkNeb) {
 
@@ -186 +208 @@
     close(NOTMISSSMF);
 }
-my $totalProcessedNotOnDatastore = $totalProcessed - $totalOnDatastore;
 my $totalOnDatastoreNotLoaded = $totalOnDatastore - $totalLoadedToOdm;
 print "***********************************************************\n";
@@ -193 +214 @@
 print "*    Exposures between $beginExp and $endExp\n";
 print "*\n";
-print "* total Exposures                            = $totalExposures\n";
-print "*   merged into PSPS                         = $totalMerged\n";
-print "*   un-merged                                = $totalUnmerged\n";
-print "*     unprocessed by ippToPsps               = $totalUnprocessed\n";
+print "* Total Exposures                            = $totalExposures\n";
+print "*   Merged into PSPS                         = $totalMerged\n";
+print "*   Un-merged                                = $totalUnmerged\n";
+print "*     Unprocessed by ippToPsps               = $totalUnprocessed\n";
 if ($checkNeb) {
-    print "*       missing SMF files                    = $totalUnprocessedMissingSmfs\n";
-    print "*       available SMF files                  = $totalUnprocessedAvailableSmfs\n";
-}
-print "*     processed by ippToPsps                 = $totalProcessed\n";
-print "*       not on datastore                     = $totalProcessedNotOnDatastore\n";
-print "*       on datastore                         = $totalOnDatastore\n";
-print "*         not loaded to ODM                  = $totalOnDatastoreNotLoaded\n";
-print "*         loaded to ODM but rejected         = $totalLoadedToOdm\n";
-print "*           under -30 dec limit              = $totalUnderObjIdLimit\n";
-print "*           remaining ODM failures           = $totalOdmFailures\n";
+    print "*       Missing SMF files                    = $totalUnprocessedMissingSmfs\n";
+    print "*       Available SMF files                  = $totalUnprocessedAvailableSmfs\n";
+}
+print "*     Processed by ippToPsps                 = $totalProcessed\n";
+print "*       Not on datastore                     = $totalProcessedNotOnDatastore\n";
+print "*       On datastore                         = $totalOnDatastore\n";
+print "*         Not loaded to ODM                  = $totalOnDatastoreNotLoaded\n";
+print "*         Loaded to ODM                      = $totalLoadedToOdm\n";
+print "*           MergeWorthy                      = $totalMergeWorthy\n";
+print "*           Not MergeWorthy                  = $totalNotMergeWorthy\n";
+print "*             Under -30 dec limit            = $totalUnderObjIdLimit\n";
+print "*             Remaining failures             = $remainingOdmFailures\n";
 print "*\n";
 print "***********************************************************\n";