Changeset 37068 for branches/eam_branches/ipp-ops-20130712/ippMonitor

Timestamp:

Jul 17, 2014, 12:36:19 PM (12 years ago)

Author:

eugene

Message:

merge changes (from past YEAR) from trunk

Location:

branches/eam_branches/ipp-ops-20130712

Files:

• . (modified) (1 prop)
• ippMonitor (modified) (1 prop)
• ippMonitor/czartool/czartool/Gpc1Db.pm (modified) (6 diffs)
• ippMonitor/czartool/czartool/czarconfig.xml (modified) (2 diffs)
• ippMonitor/def/camIQstats.d (modified) (1 diff)
• ippMonitor/def/camProcessedExp.d (modified) (1 diff)
• ippMonitor/def/camProcessedExp_Images.d (modified) (2 diffs)
• ippMonitor/def/camProcessedExp_NoImages.d (modified) (1 diff)
• ippMonitor/def/camProcessedImfile.d (modified) (1 diff)
• ippMonitor/def/camStageExp.d (modified) (1 diff)
• ippMonitor/def/chipIQstats.d (modified) (1 diff)
• ippMonitor/def/chipProcessedExp.d (modified) (1 diff)
• ippMonitor/def/chipProcessedImfile.d (modified) (1 diff)
• ippMonitor/def/chipStageExp.d (modified) (1 diff)
• ippMonitor/def/diffInputSkyfile.d (modified) (1 diff)
• ippMonitor/def/diffProcessedSkyfile.d (modified) (1 diff)
• ippMonitor/def/diffProcessedSkyfile_Images.d (modified) (1 diff)
• ippMonitor/def/diffRun.d (modified) (1 diff)
• ippMonitor/def/rawBurntoolState.d (modified) (1 diff)
• ippMonitor/def/warpProcessedSkyfiles.d (modified) (1 diff)
• ippMonitor/def/warpProcessedSkyfiles_Images.d (modified) (1 diff)

branches/eam_branches/ipp-ops-20130712/ippMonitor/czartool/czartool/Gpc1Db.pm

@@ -139 +139 @@
     my $stateCol =  $table.".state";
 
+    my $extraState = "";
+    if ($state eq 'new') {
+        $extraState = " OR $stateCol = 'update' ";
+    }
+
     my $query =  $self->{_db}->prepare(<<SQL);
     SELECT COUNT(DISTINCT $id) 
@@ -144 +149 @@
         JOIN $joinTable USING ($id)
         WHERE label LIKE '$label'
-        AND (($faultCol != 0 AND $stateCol = '$state') OR $stateCol = 'failed_revert')
+        AND ($faultCol != 0 AND ($stateCol = '$state' $extraState))
 SQL
     $query->execute;
@@ -208 +213 @@
     my $query = undef;
 
+    my $joinTable = undef;
+    my $id = undef;
+    if (!getJoinTableAndId($self, $stage, \$joinTable, \$id)) {return -1;}
+
+    # XXX: the "update" page is now obsolete. The standard processing page should now show
+    # counts in new and update state
     if ($state eq "update") {
-
         if ($stage eq "dist") {return 0;}
-        my $joinTable = undef;
-        my $id = undef;
-        if (!getJoinTableAndId($self, $stage, \$joinTable, \$id)) {return -1;}
 
         if ($stage eq "chip" || $stage eq "fake" || $stage eq "warp" || $stage eq "diff" || $stage eq "magicDS") {
@@ -226 +233 @@
         }
         else {
-        
             $query = $self->{_db}->prepare(<<SQL);
             SELECT COUNT(state)
-                FROM $table JOIN $joinTable 
-                USING($id) 
+                FROM $table
                 WHERE label LIKE '$label'
                 AND state = 'update'; 
 SQL
+        
         }
 
@@ -240 +246 @@
     elsif ($state eq "new") {
 
-        $query = $self->{_db}->prepare(<<SQL);
-        SELECT COUNT(state)  
-            FROM $table 
-            WHERE label LIKE '$label' 
-            AND (state = 'new' OR state = 'update')
-SQL
+        if ($stage eq "chip" || $stage eq "fake" || $stage eq "warp" || $stage eq "diff" || $stage eq "magicDS") {
+            # get count of runs in new state and update state that have components left to update
+            $query = $self->{_db}->prepare(<<SQL);
+            SELECT COUNT(DISTINCT $id)  
+                FROM $table LEFT JOIN $joinTable
+                USING($id)
+                WHERE label LIKE '$label' 
+                AND (state = 'new' OR (state = 'update' AND data_state = 'update'))
+SQL
+        } else {
+            $query = $self->{_db}->prepare(<<SQL);
+            SELECT COUNT(state)
+                FROM $table
+                WHERE label LIKE '$label'
+                AND (state = 'new' OR state = 'update'); 
+SQL
+        }
     }
     else {
@@ -256 +273 @@
 SQL
     }
+
+    # print $query->{Statement} . "\n";
 
     $query->execute;

branches/eam_branches/ipp-ops-20130712/ippMonitor/czartool/czartool/czarconfig.xml

@@ -27 +27 @@
   <gpc1database>
     <name>gpc1</name>
-    <host>scidbm</host>
+    <host>scidbs1</host>
     <user>ippuser</user>
     <password>ippuser</password>
@@ -47 +47 @@
     <serverinterval>20 MINUTE</serverinterval>
     <!-- whitespace-separated server list for servers we want roboczar to check --> 
-    <interestedservers>stdscience distribution summitcopy registration stack publishing pstamp </interestedservers>
+    <interestedservers>stdscience distribution summitcopy registration stack pstamp </interestedservers>
     <!-- <interestedservers>pstamp</interestedservers> -->
   </roboczar>

branches/eam_branches/ipp-ops-20130712/ippMonitor/def/camIQstats.d

@@ -10 +10 @@
 WHERE camProcessedExp.cam_id  = camRun.cam_id
 WHERE camProcessedExp.fault = 0
+
+RESTRICT_COUNT AND dateobs >= CURDATE()
+UNRESTRICTED AND dateobs >= CURDATE()
 
 ARGS  ARG1  rawImfile.exp_id=$rawExp.exp_id

branches/eam_branches/ipp-ops-20130712/ippMonitor/def/camProcessedExp.d

@@ -10 +10 @@
 WHERE camProcessedExp.cam_id  = camRun.cam_id
 WHERE camProcessedExp.fault = 0
+
+RESTRICT_COUNT AND dateobs >= CURDATE()
+UNRESTRICTED AND dateobs >= CURDATE()
 
 # define the arguments supplied to the links below (if any)

branches/eam_branches/ipp-ops-20130712/ippMonitor/def/camProcessedExp_Images.d

@@ -3 +3 @@
 FILE  camProcessedExp_Images.php
 MENU  ipp.science.dat
-
-UNRESTRICTED AND 0>1
 
 # the following WHERE clauses are added to all queries joined by AND
@@ -12 +10 @@
 WHERE camProcessedExp.cam_id  = camRun.cam_id
 WHERE camProcessedExp.fault = 0
+
+RESTRICT_COUNT AND dateobs >= CURDATE()
+UNRESTRICTED AND dateobs >= CURDATE()
+
 # define image names to be used below
 # IMAGE VAR basename filerule camera class_id

branches/eam_branches/ipp-ops-20130712/ippMonitor/def/camProcessedExp_NoImages.d

@@ -10 +10 @@
 WHERE camProcessedExp.cam_id  = camRun.cam_id
 WHERE camProcessedExp.fault = 0
+
+RESTRICT_COUNT AND dateobs >= CURDATE()
+UNRESTRICTED AND dateobs >= CURDATE()
 
 # define the arguments supplied to the links below (if any)

branches/eam_branches/ipp-ops-20130712/ippMonitor/def/camProcessedImfile.d

@@ -10 +10 @@
 WHERE camProcessedExp.cam_id = camRun.cam_id
 WHERE chipProcessedImfile.chip_id = camRun.chip_id
+
+RESTRICT_COUNT AND dateobs >= CURDATE()
+UNRESTRICTED AND dateobs >= CURDATE()
 
 ARGS  ARG1  rawImfile.exp_id=$rawExp.exp_id

branches/eam_branches/ipp-ops-20130712/ippMonitor/def/camStageExp.d

@@ -6 +6 @@
 WHERE camRun.chip_id = chipRun.chip_id
 WHERE chipRun.exp_id = rawExp.exp_id
+
+RESTRICT_COUNT AND dateobs >= CURDATE()
+UNRESTRICTED AND dateobs >= CURDATE()
 
 ARGS  ARG1  rawImfile.exp_id=$rawExp.exp_id

branches/eam_branches/ipp-ops-20130712/ippMonitor/def/chipIQstats.d

@@ -8 +8 @@
 WHERE chipRun.exp_id = rawExp.exp_id
 WHERE chipRun.chip_id = chipProcessedImfile.chip_id
+
+RESTRICT_COUNT AND dateobs >= CURDATE()
+UNRESTRICTED AND dateobs >= CURDATE()
 
 ARGS  ARG1  rawImfile.exp_id=$rawExp.exp_id

branches/eam_branches/ipp-ops-20130712/ippMonitor/def/chipProcessedExp.d

@@ -7 +7 @@
 WHERE chipRun.state != 'new'
 WHERE chipRun.exp_id = rawExp.exp_id
+
+RESTRICT_COUNT AND dateobs >= CURDATE()
+UNRESTRICTED AND dateobs >= CURDATE()
 
 ARGS  ARG1  rawImfile.exp_id=$rawExp.exp_id

branches/eam_branches/ipp-ops-20130712/ippMonitor/def/chipProcessedImfile.d

@@ -9 +9 @@
 WHERE chipProcessedImfile.chip_id = chipRun.chip_id
 WHERE chipProcessedImfile.fault = 0
+
+RESTRICT_COUNT AND dateobs >= CURDATE()
+UNRESTRICTED AND dateobs >= CURDATE()
 
 #UNRESTRICTED WHERE 0=1

branches/eam_branches/ipp-ops-20130712/ippMonitor/def/chipStageExp.d

@@ -5 +5 @@
 
 WHERE chipRun.exp_id = rawExp.exp_id
+
+RESTRICT_COUNT AND dateobs >= CURDATE()
+UNRESTRICTED AND dateobs >= CURDATE()
 
 ARGS  ARG1  rawImfile.exp_id=$rawExp.exp_id

branches/eam_branches/ipp-ops-20130712/ippMonitor/def/diffInputSkyfile.d

@@ -5 +5 @@
 
 WHERE diffInputSkyfile.diff_id = diffRun.diff_id
+
+RESTRICT_COUNT AND 0 = 1
+UNRESTRICTED AND 0 = 1
 
 #        field                            size format  name           show     link to         extras

branches/eam_branches/ipp-ops-20130712/ippMonitor/def/diffProcessedSkyfile.d

@@ -7 +7 @@
 # WHERE diffRun.state = 'full'
 # WHERE diffSkyfile.fault = 0
+
+RESTRICT_COUNT AND 0 = 1
+UNRESTRICTED AND 0 = 1
 
 ARGS  ARG7 diffSkyfile.diff_id=$diffSkyfile.diff_id

branches/eam_branches/ipp-ops-20130712/ippMonitor/def/diffProcessedSkyfile_Images.d

@@ -3 +3 @@
 FILE  diffProcessedSkyfile_Images.php
 MENU  ipp.stack.dat
+
+#RESTRICT_COUNT AND dateobs >= CURDATE()
+#UNRESTRICTED AND dateobs >= CURDATE()
 
 UNRESTRICTED AND 0>1

branches/eam_branches/ipp-ops-20130712/ippMonitor/def/diffRun.d

@@ -3 +3 @@
 FILE  diffRun.php
 MENU  ipp.stack.dat
+
+#RESTRICT_COUNT WHERE dateobs >= CURDATE()
+#UNRESTRICTED WHERE dateobs >= CURDATE()
 
 #        field        size  format  name           show     link to         extras

branches/eam_branches/ipp-ops-20130712/ippMonitor/def/rawBurntoolState.d

@@ -5 +5 @@
 
 # if no query restrictions are supplied, we want to limit the query or it is extremely long running:
-RESTRICT_COUNT WHERE 0>1
-UNRESTRICTED WHERE exp_id = 0
+RESTRICT_COUNT WHERE dateobs >= CURDATE()
+# UNRESTRICTED WHERE exp_id = 0
+UNRESTRICTED WHERE dateobs >= CURDATE()
 
 #        field        size format  name           show          link to   extras

branches/eam_branches/ipp-ops-20130712/ippMonitor/def/warpProcessedSkyfiles.d

@@ -4 +4 @@
 MENU  ipp.science.dat
 
-UNRESTRICTED WHERE 0=1
+RESTRICT_COUNT WHERE dateobs >= CURDATE()
+UNRESTRICTED WHERE dateobs >= CURDATE()
 
 ARGS  ARG1  rawImfile.exp_id=$rawExp.exp_id

branches/eam_branches/ipp-ops-20130712/ippMonitor/def/warpProcessedSkyfiles_Images.d

@@ -4 +4 @@
 MENU  ipp.science.dat
 
-UNRESTRICTED WHERE 0=1
+RESTRICT_COUNT WHERE dateobs >= CURDATE()
+UNRESTRICTED WHERE dateobs >= CURDATE()
+
+# UNRESTRICTED WHERE 0=1
 
 # WHERE warpSkyfile.warp_id = warpRun.warp_id