IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Oct 27, 2019, 9:47:12 PM (7 years ago)
Author:
cclin33
Message:

sync from trunk with r40973

Location:
branches/ccl_branches/ipp-20190806/ippMonitor
Files:
116 edited

Legend:

Unmodified
Added
Removed

  • branches/ccl_branches/ipp-20190806/ippMonitor

  • branches/ccl_branches/ipp-20190806/ippMonitor/czartool/czarpoll.pl

    r40847 r40974  
    1212use POSIX qw/strftime/;
    1313use List::MoreUtils qw(uniq);
     14use DateTime;
    1415
    1516# local classes
    … …  
    127128###########################################################################
    128129sub updateLabels {
     130    my ($dbupdate) = @_;
    129131
    130132    # this used to have a concept of labels grouped by pantasks server, but we
    … …  
    199201
    200202    # store them all in stdscience:
    201     $server = "stdscience";
    202     if (@allLabels) {
    203         $czarDb->updateCurrentLabels($server, \@allLabels,'gpc1', \@priorities);
    204     } else {
    205         print "WARNING: No labels to update for gpc1 for '$server'\n";
    206     }
    207 
    208     if (@allLabels2) {
    209         $czarDb->updateCurrentLabels($server, \@allLabels2,'gpc2', \@priorities2);
    210     } else {
    211         print "WARNING: No labels to update for gpc2 for '$server'\n";
     203    if($dbupdate == 1) {
     204        $server = "stdscience";
     205        if (@allLabels) {
     206            $czarDb->updateCurrentLabels($server, \@allLabels,'gpc1', \@priorities);
     207        } else {
     208            print "WARNING: No labels to update for gpc1 for '$server'\n";
     209        }
     210
     211        if (@allLabels2) {
     212            $czarDb->updateCurrentLabels($server, \@allLabels2,'gpc2', \@priorities2);
     213        } else {
     214            print "WARNING: No labels to update for gpc2 for '$server'\n";
     215        }
    212216    }
    213217    return(\@allLabels,\@allLabels2);
    … …  
    243247    my ($period) = @_;
    244248
     249    my $dbupdate;
     250    my $polldate;
     251    my $datenow;
     252    my $timediff;
    245253    my $label;
    246254    my $new;
    … …  
    267275    # main polling loop
    268276    while (1) {
    269 
    270277        my $iterationStartTime = time();
     278
     279        #get the time of last czarpoll update
     280        $polldate = $czarDb->getPollDate();
     281        $polldate=~/^(\d{4})\-(\d{2})\-(\d{2}) (\d{2}):(\d{2}):(\d{2})$/;
     282        my $date=DateTime->new(year=>$1,month=>$2,day=>$3,hour=>$4,minute=>$5,second=>$6,time_zone=>"HST");
     283        $date->set_time_zone("UTC");
     284
     285        $datenow=DateTime->now;
     286        $timediff = ($datenow->epoch) - ($date->epoch);
     287        if($timediff > 120.) {
     288            print "There is no recent Czarpoll iteration\n";
     289            print "*Updating database entries*\n";
     290            $dbupdate = 1;
     291        } else {
     292            print "There is a recent Czarpoll iteration already made ($timediff sec ago)\n";
     293            print "*Skipping database queries and entries*\n";
     294            $dbupdate = 0;
     295        }
     296
    271297
    272298        # sort out times
    … …  
    298324
    299325                # now cleanup tables from yesterday and optimize
    300                 print "* Performing database cleanup\n";
    301                 $czarDb->cleanupDateRange($yesterday, $yesterday, $config->getCzarCleanupInterval());
    302                 print "* Optimizing the database\n";
    303                 $czarDb->optimize();
     326                #TdB20190703: The ipp113 and ipp117 instances of czarpoll use the same stage DBs in czarDB.
     327                #Therefore, it makes no sense to run the cleanup+optimising twice
     328                #print "* Performing database cleanup\n";
     329                #$czarDb->cleanupDateRange($yesterday, $yesterday, $config->getCzarCleanupInterval());
     330                #print "* Optimizing the database\n";
     331                #$czarDb->optimize();
    304332                $lastDayDailyTasks = $yesterday;
    305333            }
    … …  
    307335
    308336        # check nightly science status
    309         print "* Checking nightly science status\n";
    310         if (!$pantasks->getNightlyScienceStatus(\$nsStatus,'gpc1')) {$nsStatus = "Unknown";}
    311         $czarDb->updateNightlyScience($nsStatus,'gpc1');
    312         if (!$pantasks->getNightlyScienceStatus(\$nsStatus,'gpc2')) {$nsStatus = "Unknown";}
    313         $czarDb->updateNightlyScience($nsStatus,'gpc2');
     337        if($dbupdate == 1) {
     338            print "* Checking nightly science status\n";
     339            if (!$pantasks->getNightlyScienceStatus(\$nsStatus,'gpc1')) {$nsStatus = "Unknown";}
     340            $czarDb->updateNightlyScience($nsStatus,'gpc1');
     341            if (!$pantasks->getNightlyScienceStatus(\$nsStatus,'gpc2')) {$nsStatus = "Unknown";}
     342            $czarDb->updateNightlyScience($nsStatus,'gpc2');
     343        }
    314344
    315345        # check nebulous
    316346        print "* Checking Nebulous\n";
    317         $nebulous->updateClusterSpaceInfo();
     347        if($dbupdate == 1) {$nebulous->updateClusterSpaceInfo();}
    318348        $plotter0->plotStorageTimeSeries($czarDb->subtractInterval($begin, "1 WEEK") , $end);
    319349        $plotter0->plotDiskUsageHistogram();
    320350        $plotter0->plotDiskUsageHistogramLarge();
    321         updateServerStatus();
     351        if($dbupdate == 1) {updateServerStatus();}
    322352
    323353        # check pantasks dates
    324         updateDates();
     354        if($dbupdate == 1) {updateDates();}
    325355
    326356        # check labels
    327         my ($labels, $labels2) = updateLabels();
     357        my ($labels, $labels2) = updateLabels($dbupdate);
    328358        my @labels = @$labels;
    329359        my @labels2 = @$labels2;
    … …  
    342372            my $size = @{$labels};
    343373            if($size > 0) {
    344                 updateAllStages($thisServer, $newState, $labels,$labels2, $begin, $end);
     374                if($dbupdate == 1) {updateAllStages($thisServer, $newState, $labels,$labels2, $begin, $end);}
    345375                if ($thisServer eq "stdscience") {
    346376                    createPlots($thisServer, $plotter1, $labels, $begin, $end);

  • branches/ccl_branches/ipp-20190806/ippMonitor/czartool/czartool/CzarDb.pm

    r40854 r40974  
    4040use czartool::StageMetrics;
    4141
     42
    4243###########################################################################
    4344#
    … …  
    5455
    5556    return $self;
     57}
     58
     59###########################################################################
     60#
     61# Gets last czarpoll iteration time
     62#
     63###########################################################################
     64sub getPollDate {
     65    my ($self,$polldate) = @_;
     66
     67    my $query = $self->{_db}->prepare(<<SQL);
     68    SELECT timestamp FROM chip ORDER BY timestamp DESC LIMIT 1
     69SQL
     70
     71    $query->execute;
     72
     73    $polldate = $query->fetchrow_array();
     74
     75    return $polldate;
    5676}
    5777
    … …  
    281301SQL
    282302
    283        $query->execute;
     303        #execute the query, but check for deadlocks
     304        my $db_res=0;
     305        while($db_res==0)
     306        {
     307            $db_res=1;
     308            my $result = eval{$query->execute;};
     309            unless($result) {
     310                 if(/DBD::mysql::st execute failed: Deadlock found when trying to get lock; try restarting transaction/){
     311                     $db_res=0;
     312                     sleep 3;
     313                 }
     314            }
     315        }
     316       
    284317    }
    285318}

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/addRunProcessed.d

    r31320 r40974  
    1 TABLE addRun, addProcessedExp
     1TABLE addRun JOIN addProcessedExp USING (add_id)
    22TITLE Processed addRuns
    33FILE  addRunProcessed.php
    … …  
    55
    66# the following WHERE clauses are added to all queries joined by AND
    7 
    8 WHERE addRun.add_id = addProcessedExp.add_id
    97
    108#     field                   size  format  name         show    link to                  extras

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/camIQstats.d

    r36788 r40974  
    1 TABLE camRun, chipRun, rawExp, camProcessedExp
     1TABLE camRun JOIN camProcessedExp USING (cam_id) JOIN chipRun USING (chip_id) JOIN rawExp USING (exp_id)
    22TITLE Per-Exposure Image Quality Stats
    33FILE  camIQstats.php
    … …  
    66# limit this table to non-OBJECT types of images
    77WHERE camRun.state = 'full'
    8 WHERE camRun.chip_id = chipRun.chip_id
    9 WHERE chipRun.exp_id = rawExp.exp_id
    10 WHERE camProcessedExp.cam_id  = camRun.cam_id
    118WHERE camProcessedExp.fault = 0
    129
    13 RESTRICT_COUNT AND dateobs >= CURDATE()
    14 UNRESTRICTED AND dateobs >= CURDATE()
     10RESTRICT_COUNT AND rawExp.dateobs >= CURDATE()
     11UNRESTRICTED AND rawExp.dateobs >= CURDATE()
    1512
    1613ARGS  ARG1  rawImfile.exp_id=$rawExp.exp_id

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/camPendingExp.d

    r27892 r40974  
    1 TABLE camRun, chipRun, rawExp
     1TABLE camRun JOIN chipRun using (chip_id) JOIN rawExp using (exp_id)
    22TITLE Camera Pending
    33FILE  camPendingExp.php
    … …  
    55
    66WHERE camRun.state = 'new'
    7 WHERE camRun.chip_id = chipRun.chip_id
    8 WHERE chipRun.exp_id = rawExp.exp_id
     7
     8RESTRICT_COUNT AND rawExp.dateobs >= CURDATE()
     9UNRESTRICTED AND rawExp.dateobs >= CURDATE()
    910
    1011ARGS  ARG1  rawImfile.exp_id=$rawExp.exp_id

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/camProcessedExp.d

    r36788 r40974  
    1 TABLE camRun, camProcessedExp, chipRun, rawExp
     1TABLE camRun JOIN camProcessedExp using (cam_id) JOIN chipRun using (chip_id) JOIN rawExp using (exp_id)
    22TITLE Camera Processed
    33FILE  camProcessedExp.php
    … …  
    66# the following WHERE clauses are added to all queries joined by AND
    77WHERE camRun.state = 'full'
    8 WHERE camRun.chip_id = chipRun.chip_id
    9 WHERE chipRun.exp_id = rawExp.exp_id
    10 WHERE camProcessedExp.cam_id  = camRun.cam_id
    118WHERE camProcessedExp.fault = 0
    129
    13 RESTRICT_COUNT AND dateobs >= CURDATE()
    14 UNRESTRICTED AND dateobs >= CURDATE()
     10RESTRICT_COUNT AND rawExp.dateobs >= CURDATE()
     11UNRESTRICTED AND rawExp.dateobs >= CURDATE()
    1512
    1613# define the arguments supplied to the links below (if any)

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/camProcessedExp_Images.d

    r36788 r40974  
    1 TABLE camRun, camProcessedExp, chipRun, rawExp
     1TABLE camRun JOIN camProcessedExp using (cam_id) JOIN chipRun using (chip_id) JOIN rawExp using (exp_id)
    22TITLE Camera Processed
    33FILE  camProcessedExp_Images.php
    … …  
    66# the following WHERE clauses are added to all queries joined by AND
    77WHERE camRun.state = 'full'
    8 WHERE camRun.chip_id = chipRun.chip_id
    9 WHERE chipRun.exp_id = rawExp.exp_id
    10 WHERE camProcessedExp.cam_id  = camRun.cam_id
    118WHERE camProcessedExp.fault = 0
    129
    13 RESTRICT_COUNT AND dateobs >= CURDATE()
    14 UNRESTRICTED AND dateobs >= CURDATE()
     10RESTRICT_COUNT AND rawExp.dateobs >= CURDATE()
     11UNRESTRICTED AND rawExp.dateobs >= CURDATE()
    1512
    1613# define image names to be used below

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/camProcessedExp_NoImages.d

    r36788 r40974  
    1 TABLE camRun, camProcessedExp, chipRun, rawExp
     1TABLE camRun JOIN camProcessedExp using (cam_id) JOIN chipRun using (chip_id) JOIN rawExp using (exp_id)
    22TITLE Camera Processed (No Images)
    33FILE  camProcessedExp_NoImages.php
    … …  
    66# the following WHERE clauses are added to all queries joined by AND
    77WHERE camRun.state = 'full'
    8 WHERE camRun.chip_id = chipRun.chip_id
    9 WHERE chipRun.exp_id = rawExp.exp_id
    10 WHERE camProcessedExp.cam_id  = camRun.cam_id
    118WHERE camProcessedExp.fault = 0
    129
    13 RESTRICT_COUNT AND dateobs >= CURDATE()
    14 UNRESTRICTED AND dateobs >= CURDATE()
     10RESTRICT_COUNT AND rawExp.dateobs >= CURDATE()
     11UNRESTRICTED AND rawExp.dateobs >= CURDATE()
    1512
    1613# define the arguments supplied to the links below (if any)

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/camProcessedExp_failure.d

    r27892 r40974  
    1 TABLE camRun, camProcessedExp, chipRun, rawExp
     1TABLE camRun JOIN camProcessedExp using (cam_id) JOIN chipRun using (chip_id) JOIN rawExp using (exp_id)
    22TITLE Camera Failed Exposures
    33FILE  camProcessedExp_failure.php
    … …  
    55
    66# the following WHERE clauses are added to all queries joined by AND
    7 WHERE camRun.chip_id = chipRun.chip_id
    8 WHERE chipRun.exp_id = rawExp.exp_id
    9 WHERE camProcessedExp.cam_id  = camRun.cam_id
    107WHERE camProcessedExp.fault != 0
     8
     9RESTRICT_COUNT AND rawExp.dateobs >= CURDATE()
     10UNRESTRICTED AND rawExp.dateobs >= CURDATE()
    1111
    1212# define the arguments supplied to the links below (if any)

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/camProcessedImfile.d

    r36788 r40974  
    1 TABLE camRun, camProcessedExp, chipRun, rawExp, chipProcessedImfile
     1TABLE camRun JOIN camProcessedExp using (cam_id) JOIN chipRun using (chip_id) JOIN rawExp using (exp_id) JOIN chipProcessedImfile using (chip_id)
    22TITLE Camera Processed Imfiles
    33FILE  camProcessedImfile.php
    … …  
    66# the following WHERE clauses are added to all queries joined by AND
    77WHERE camRun.state = 'full'
    8 WHERE camRun.chip_id = chipRun.chip_id
    9 WHERE chipRun.exp_id = rawExp.exp_id
    10 WHERE camProcessedExp.cam_id = camRun.cam_id
    11 WHERE chipProcessedImfile.chip_id = camRun.chip_id
    128
    13 RESTRICT_COUNT AND dateobs >= CURDATE()
    14 UNRESTRICTED AND dateobs >= CURDATE()
     9RESTRICT_COUNT AND rawExp.dateobs >= CURDATE()
     10UNRESTRICTED AND rawExp.dateobs >= CURDATE()
    1511
    1612ARGS  ARG1  rawImfile.exp_id=$rawExp.exp_id

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/camStageExp.d

    r36788 r40974  
    1 TABLE camRun, chipRun, rawExp
     1TABLE camRun JOIN chipRun using (chip_id) JOIN rawExp using (exp_id)
    22TITLE Camera Stage Exposures
    33FILE  camStageExp.php
    44MENU  ipp.science.dat
    55
    6 WHERE camRun.chip_id = chipRun.chip_id
    7 WHERE chipRun.exp_id = rawExp.exp_id
    8 
    9 RESTRICT_COUNT AND dateobs >= CURDATE()
    10 UNRESTRICTED AND dateobs >= CURDATE()
     6RESTRICT_COUNT WHERE rawExp.dateobs >= CURDATE()
     7UNRESTRICTED WHERE rawExp.dateobs >= CURDATE()
    118
    129ARGS  ARG1  rawImfile.exp_id=$rawExp.exp_id

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/chipIQstats.d

    r36788 r40974  
    1 TABLE chipRun, rawExp, chipProcessedImfile
     1TABLE chipRun JOIN rawExp USING (exp_id) JOIN chipProcessedImfile using (chip_id)
    22TITLE Per-Chip Image Quality Stats
    33FILE  chipIQstats.php
    … …  
    66# limit this table to non-OBJECT types of images
    77WHERE chipRun.state = 'full'
    8 WHERE chipRun.exp_id = rawExp.exp_id
    9 WHERE chipRun.chip_id = chipProcessedImfile.chip_id
    108
    11 RESTRICT_COUNT AND dateobs >= CURDATE()
    12 UNRESTRICTED AND dateobs >= CURDATE()
     9RESTRICT_COUNT AND rawExp.dateobs >= CURDATE()
     10UNRESTRICTED AND rawExp.dateobs >= CURDATE()
    1311
    1412ARGS  ARG1  rawImfile.exp_id=$rawExp.exp_id

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/chipPendingExp.d

    r27892 r40974  
    1 TABLE chipRun, rawExp
     1TABLE chipRun JOIN rawExp using (exp_id)
    22TITLE chip Pending Exposures
    33FILE  chipPendingExp.php
    … …  
    66# limit this table to non-OBJECT types of images
    77WHERE chipRun.state = 'new'
    8 WHERE chipRun.exp_id = rawExp.exp_id
     8
     9RESTRICT_COUNT AND rawExp.dateobs >= CURDATE()
     10UNRESTRICTED AND rawExp.dateobs >= CURDATE()
    911
    1012ARGS  ARG1  rawImfile.exp_id=$rawExp.exp_id

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/chipPendingImfile.d

    r27892 r40974  
    1 TABLE chipRun, rawExp, rawImfile
     1TABLE chipRun JOIN rawExp using (exp_id) JOIN rawImfile using (exp_id)
    22TITLE Chip Pending Imfiles
    33FILE  chipPendingImfile.php
    … …  
    99# limit this table to OBJECT types of images
    1010WHERE chipRun.state = 'new'
    11 WHERE chipRun.exp_id = rawExp.exp_id
    12 WHERE rawImfile.exp_id = rawExp.exp_id
     11
     12RESTRICT_COUNT AND rawExp.dateobs >= CURDATE()
     13UNRESTRICTED AND rawExp.dateobs >= CURDATE()
    1314
    1415ARGS  ARG1 rawImfile.exp_id=$rawExp.exp_id

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/chipProcessedExp.d

    r36788 r40974  
    1 TABLE chipRun, rawExp
     1TABLE chipRun JOIN rawExp using (exp_id)
    22TITLE chip Processed Exposures
    33FILE  chipProcessedExp.php
    … …  
    66# limit this table to non-OBJECT types of images
    77WHERE chipRun.state != 'new'
    8 WHERE chipRun.exp_id = rawExp.exp_id
    98
    10 RESTRICT_COUNT AND dateobs >= CURDATE()
    11 UNRESTRICTED AND dateobs >= CURDATE()
     9RESTRICT_COUNT AND rawExp.dateobs >= CURDATE()
     10UNRESTRICTED AND rawExp.dateobs >= CURDATE()
    1211
    1312ARGS  ARG1  rawImfile.exp_id=$rawExp.exp_id

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/chipProcessedImfile.d

    r36788 r40974  
    1 TABLE chipRun, rawExp, chipProcessedImfile
     1TABLE chipRun JOIN rawExp using (exp_id) JOIN chipProcessedImfile using (chip_id)
    22TITLE chip Processed Imfile
    33FILE  chipProcessedImfile.php
    … …  
    55
    66# limit this table to non-OBJECT types of images
    7 WHERE chipRun.exp_id = rawExp.exp_id
    8 WHERE chipProcessedImfile.exp_id = chipRun.exp_id
    9 WHERE chipProcessedImfile.chip_id = chipRun.chip_id
    107WHERE chipProcessedImfile.fault = 0
    118
    12 RESTRICT_COUNT AND dateobs >= CURDATE()
    13 UNRESTRICTED AND dateobs >= CURDATE()
     9RESTRICT_COUNT AND rawExp.dateobs >= CURDATE()
     10UNRESTRICTED AND rawExp.dateobs >= CURDATE()
    1411
    1512#UNRESTRICTED WHERE 0=1

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/chipProcessedImfile_failure.d

    r37983 r40974  
    1 TABLE chipRun, rawExp, chipProcessedImfile
     1TABLE chipRun JOIN rawExp using (exp_id) JOIN chipProcessedImfile using (chip_id)
    22TITLE Chip Failed Imfiles
    33FILE  chipProcessedImfile_failure.php
    … …  
    55
    66# limit this table to non-OBJECT types of images
    7 WHERE chipRun.exp_id = rawExp.exp_id
    8 WHERE chipProcessedImfile.exp_id = chipRun.exp_id
    9 WHERE chipProcessedImfile.chip_id = chipRun.chip_id
    107WHERE chipProcessedImfile.fault != 0
     8
     9RESTRICT_COUNT AND rawExp.dateobs >= CURDATE()
     10UNRESTRICTED AND rawExp.dateobs >= CURDATE()
    1111
    1212ARGS  ARG1 rawImfile.exp_id=$rawExp.exp_id

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/chipStageExp.d

    r36788 r40974  
    1 TABLE chipRun, rawExp
     1TABLE chipRun JOIN rawExp using (exp_id)
    22TITLE Chip Stage Exposures
    33FILE  chipStageExp.php
    44MENU  ipp.science.dat
    55
    6 WHERE chipRun.exp_id = rawExp.exp_id
    7 
    8 RESTRICT_COUNT AND dateobs >= CURDATE()
    9 UNRESTRICTED AND dateobs >= CURDATE()
     6RESTRICT_COUNT WHERE rawExp.dateobs >= CURDATE()
     7UNRESTRICTED WHERE rawExp.dateobs >= CURDATE()
    108
    119ARGS  ARG1  rawImfile.exp_id=$rawExp.exp_id

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/detInputExp.d

    r39498 r40974  
    1 TABLE detInputExp, rawExp
     1TABLE detInputExp JOIN rawExp USING (exp_id)
    22TITLE detInputExp
    33FILE  detInputExp.php
    … …  
    55
    66# limit this table to non-OBJECT types of images
    7 WHERE detInputExp.exp_id = rawExp.exp_id
     7
     8RESTRICT_COUNT WHERE dateobs >= CURDATE()
     9UNRESTRICTED WHERE dateobs >= CURDATE()
    810
    911ARGS  ARG1  rawImfile.exp_id=$detInputExp.exp_id

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/detNormalizedExp.d

    r15954 r40974  
    1 TABLE detNormalizedExp, detRun
     1TABLE detNormalizedExp JOIN detRun USING (det_id)
    22TITLE detNormalizedExp
    33FILE  detNormalizedExp.php
    … …  
    55
    66# the following WHERE clauses are added to all queries joined by AND
    7 WHERE detNormalizedExp.det_id    = detRun.det_id
    87# WHERE detNormalizedExp.iteration = detRun.iteration
    98

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/detNormalizedExp_failure.d

    r19726 r40974  
    1 TABLE detNormalizedExp, detRun
     1TABLE detNormalizedExp JOIN detRun USING (det_id)
    22TITLE detNormalizedExp Failures
    33FILE  detNormalizedExp_failure.php
    … …  
    55
    66# the following WHERE clauses are added to all queries joined by AND
    7 WHERE detNormalizedExp.det_id = detRun.det_id
    87WHERE detNormalizedExp.fault  > 0
    98

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/detNormalizedImfile.d

    r24218 r40974  
    1 TABLE detNormalizedImfile, detRun
     1TABLE detNormalizedImfile JOIN detRun USING (det_id)
    22TITLE detNormalizedImfile
    33FILE  detNormalizedImfile.php
    44MENU  ipp.imfiles.dat
    5 
    6 WHERE detNormalizedImfile.det_id = detRun.det_id
    75
    86ARGS  ARG1 detNormalizedImfile.det_id=$detNormalizedImfile.det_id

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/detProcessedExp.d

    r19726 r40974  
    1 TABLE detProcessedExp, rawExp
     1TABLE detProcessedExp JOIN rawExp USING (exp_id)
    22TITLE detProcessedExp
    33FILE  detProcessedExp.php
    … …  
    55
    66# the following WHERE clauses are added to all queries joined by AND
    7 WHERE detProcessedExp.exp_id = rawExp.exp_id
     7
     8RESTRICT_COUNT WHERE rawExp.dateobs >= CURDATE()
     9UNRESTRICTED WHERE rawExp.dateobs >= CURDATE()
    810
    911# define image names to be used below

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/detProcessedExp_failure.d

    r28043 r40974  
    1 TABLE detProcessedExp, rawExp
     1TABLE detProcessedExp JOIN rawExp USING (exp_id)
    22TITLE detProcessedExp Failures
    33FILE  detProcessedExp_failure.php
    … …  
    55
    66# the following WHERE clauses are added to all queries joined by AND
    7 WHERE detProcessedExp.exp_id = rawExp.exp_id
    87WHERE detProcessedExp.fault > 0
     8
     9RESTRICT_COUNT AND rawExp.dateobs >= CURDATE()
     10UNRESTRICTED AND rawExp.dateobs >= CURDATE()
    911
    1012ARGS  ARG1 detProcessedImfile.det_id=$detProcessedExp.det_id

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/detProcessedExp_noimage.d

    r19726 r40974  
    1 TABLE detProcessedExp, rawExp
     1TABLE detProcessedExp JOIN rawExp USING (exp_id)
    22TITLE detProcessedExp
    33FILE  detProcessedExp_noimage.php
    … …  
    55
    66# the following WHERE clauses are added to all queries joined by AND
    7 WHERE detProcessedExp.exp_id = rawExp.exp_id
     7
     8RESTRICT_COUNT WHERE rawExp.dateobs >= CURDATE()
     9UNRESTRICTED WHERE rawExp.dateobs >= CURDATE()
    810
    911# define image names to be used below

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/detProcessedImfile.d

    r26888 r40974  
    1 TABLE detProcessedImfile, rawExp
     1TABLE detProcessedImfile JOIN rawExp USING (exp_id)
    22TITLE detProcessedImfile
    33FILE  detProcessedImfile.php
    … …  
    55
    66# the following WHERE clauses are added to all queries joined by AND
    7 WHERE detProcessedImfile.exp_id = rawExp.exp_id
     7
     8RESTRICT_COUNT WHERE rawExp.dateobs >= CURDATE()
     9UNRESTRICTED WHERE rawExp.dateobs >= CURDATE()
    810
    911#     field                          size  format  name      show   link to     extras

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/detProcessedImfile_failure.d

    r19726 r40974  
    1 TABLE detProcessedImfile, rawExp, rawImfile
     1TABLE detProcessedImfile JOIN rawExp USING (exp_id) JOIN rawImfile USING (exp_id)
    22TITLE detProcessedImfile Failures
    33FILE  detProcessedImfile_failure.php
    … …  
    55
    66# the following WHERE clauses are added to all queries joined by AND
    7 WHERE detProcessedImfile.exp_id = rawExp.exp_id
    8 WHERE detProcessedImfile.exp_id = rawImfile.exp_id
    97WHERE detProcessedImfile.class_id = rawImfile.class_id
    108WHERE detProcessedImfile.fault > 0
     9
     10RESTRICT_COUNT AND rawExp.dateobs >= CURDATE()
     11UNRESTRICTED AND rawExp.dateobs >= CURDATE()
    1112
    1213ARGS  ARG1 detProcessedImfile.det_id=$detProcessedImfile.det_id

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/detRegisteredImfile.d

    r24218 r40974  
    1 TABLE detRegisteredImfile, detRun
     1TABLE detRegisteredImfile JOIN detRun USING (det_id)
    22TITLE detRegisteredImfile
    33FILE  detRegisteredImfile.php
    44MENU  ipp.imfiles.dat
    5 
    6 WHERE detRegisteredImfile.det_id = detRun.det_id
    75
    86ARGS  ARG1 detRegisteredImfile.det_id=$detRegisteredImfile.det_id

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/detResidExp.d

    r24867 r40974  
    1 TABLE detResidExp, rawExp, detInputExp
     1TABLE detResidExp JOIN rawExp USING (exp_id) JOIN detInputExp USING (det_id)
    22TITLE detResidExp
    33FILE  detResidExp.php
    … …  
    55
    66# the following WHERE clauses are added to all queries joined by AND
    7 WHERE detResidExp.exp_id = rawExp.exp_id
    8 WHERE detResidExp.det_id = detInputExp.det_id
    97WHERE detResidExp.exp_id = detInputExp.exp_id
    108WHERE detResidExp.iteration = detInputExp.iteration
     9
     10RESTRICT_COUNT AND rawExp.dateobs >= CURDATE()
     11UNRESTRICTED AND rawExp.dateobs >= CURDATE()
    1112
    1213# define image names to be used below

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/detResidExp_failure.d

    r19726 r40974  
    1 TABLE detResidExp, rawExp, detInputExp
     1TABLE detResidExp JOIN rawExp USING (exp_id) JOIN detInputExp USING (exp_id)
    22TITLE detResidExp Failures
    33FILE  detResidExp_failure.php
    … …  
    55
    66# the following WHERE clauses are added to all queries joined by AND
    7 WHERE detResidExp.exp_id = rawExp.exp_id
    8 WHERE detResidExp.exp_id = detInputExp.exp_id
    97WHERE detResidExp.iteration = detInputExp.iteration
    108WHERE detResidExp.fault > 0
     9
     10RESTRICT_COUNT AND rawExp.dateobs >= CURDATE()
     11UNRESTRICTED AND rawExp.dateobs >= CURDATE()
    1112
    1213# define the arguments supplied to the links below (if any)

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/detResidExp_noimage.d

    r19811 r40974  
    1 TABLE detResidExp, rawExp, detInputExp
     1TABLE detResidExp JOIN rawExp USING (exp_id) JOIN detInputExp USING (exp_id)
    22TITLE detResidExp
    33FILE  detResidExp_noimage.php
    … …  
    55
    66# the following WHERE clauses are added to all queries joined by AND
    7 WHERE detResidExp.exp_id = rawExp.exp_id
    8 WHERE detResidExp.exp_id = detInputExp.exp_id
    97WHERE detResidExp.iteration = detInputExp.iteration
     8
     9RESTRICT_COUNT AND rawExp.dateobs >= CURDATE()
     10UNRESTRICTED AND rawExp.dateobs >= CURDATE()
    1011
    1112# define image names to be used below

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/detResidImfile.d

    r26888 r40974  
    1 TABLE detResidImfile, rawImfile
     1TABLE detResidImfile JOIN rawImfile USING (exp_id)
    22TITLE detResidImfile
    33FILE  detResidImfile.php
    … …  
    55
    66# the following WHERE clauses are added to all queries joined by AND
    7 WHERE detResidImfile.exp_id = rawImfile.exp_id
    87WHERE detResidImfile.class_id = rawImfile.class_id
    98

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/detResidImfile_failure.d

    r19726 r40974  
    1 TABLE detResidImfile, rawExp, rawImfile
     1TABLE detResidImfile JOIN rawExp USING (exp_id) JOIN rawImfile USING (exp_id)
    22TITLE detResidImfile Failures
    33FILE  detResidImfile_failure.php
    … …  
    55
    66# the following WHERE clauses are added to all queries joined by AND
    7 WHERE detResidImfile.exp_id = rawExp.exp_id
    8 WHERE detResidImfile.exp_id = rawImfile.exp_id
    97WHERE detResidImfile.class_id = rawImfile.class_id
    108WHERE detResidImfile.fault > 0
     9
     10RESTRICT_COUNT AND rawExp.dateobs >= CURDATE()
     11UNRESTRICTED AND rawExp.dateobs >= CURDATE()
    1112
    1213ARGS  ARG1 detResidImfile.det_id=$detResidImfile.det_id

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/detRunActive.d

    r40828 r40974  
    1 TABLE detRun LEFT JOIN detRunSummary using(det_id)
     1TABLE detRun LEFT JOIN detRunSummary using (det_id)
    22TITLE Active Detrend Runs
    33FILE  detRunActive.php

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/detRunSummary.d

    r39498 r40974  
    1 TABLE detRunSummary, detRun
     1TABLE detRunSummary JOIN detRun USING (det_id)
    22TITLE Detrend Run Iterations (does not list registered frames)
    33FILE  detRunSummary.php
    44MENU  ipp.detrend.dat
    5 
    6 WHERE detRunSummary.det_id = detRun.det_id
    75
    86ARGS  ARG1  detInputExp.det_id=$detRunSummary.det_id

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/detStackedImfile.d

    r24218 r40974  
    1 TABLE detStackedImfile, detRun
     1TABLE detStackedImfile JOIN detRun USING (det_id)
    22TITLE detStackedImfile
    33FILE  detStackedImfile.php
    44MENU  ipp.imfiles.dat
    5 
    6 WHERE detStackedImfile.det_id = detRun.det_id
    75
    86# XXX change uri to path_base in db

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/detStackedImfile_failure.d

    r24016 r40974  
    1 TABLE detStackedImfile, detRun
     1TABLE detStackedImfile JOIN detRun USING (det_id)
    22TITLE detStackedImfile Failures
    33FILE  detStackedImfile_failure.php
    … …  
    55
    66WHERE fault > 0
    7 WHERE detStackedImfile.det_id = detRun.det_id
    87
    98ARGS  ARG1 detStackedImfile.det_id    =$detStackedImfile.det_id

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/diffFailedSkyfile.d

    r27892 r40974  
    1 TABLE diffRun, diffSkyfile
     1TABLE diffRun JOIN diffSkyfile USING (diff_id)
    22TITLE Diff Failed Skyfiles
    33FILE  diffFailedSkyfile.php
    44MENU  ipp.stack.dat
    55
    6 WHERE diffRun.diff_id             = diffSkyfile.diff_id
    76WHERE diffSkyfile.fault != 0
    87

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/diffInputSkyfile.d

    r36788 r40974  
    1 TABLE diffInputSkyfile, diffRun
     1TABLE diffInputSkyfile JOIN diffRun USING (diff_id)
    22TITLE diffInputSkyfile
    33FILE  diffInputSkyfile.php
    44MENU  ipp.stack.dat
    5 
    6 WHERE diffInputSkyfile.diff_id = diffRun.diff_id
    7 
    8 RESTRICT_COUNT AND 0 = 1
    9 UNRESTRICTED AND 0 = 1
    105
    116#        field                            size format  name           show     link to         extras

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/diffProcessedSkyfile.d

    r36788 r40974  
    1 TABLE diffRun, diffSkyfile
     1TABLE diffRun JOIN diffSkyfile USING (diff_id)
    22TITLE Diff Processed Skyfiles
    33FILE  diffProcessedSkyfile.php
    44MENU  ipp.stack.dat
    55
    6 WHERE diffRun.diff_id             = diffSkyfile.diff_id
    76# WHERE diffRun.state = 'full'
    87# WHERE diffSkyfile.fault = 0
    9 
    10 RESTRICT_COUNT AND 0 = 1
    11 UNRESTRICTED AND 0 = 1
    128
    139ARGS  ARG7 diffSkyfile.diff_id=$diffSkyfile.diff_id

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/diffProcessedSkyfile_Images.d

    r36788 r40974  
    1 TABLE diffRun, diffSkyfile
     1TABLE diffRun JOIN diffSkyfile USING (diff_id)
    22TITLE Diff Processed Skyfiles
    33FILE  diffProcessedSkyfile_Images.php
    … …  
    77#UNRESTRICTED AND dateobs >= CURDATE()
    88
    9 UNRESTRICTED AND 0>1
    10 RESTRICT_COUNT AND 0>1
    11 
    12 WHERE diffRun.diff_id             = diffSkyfile.diff_id
    139# WHERE diffRun.state = 'full'
    1410# WHERE diffSkyfile.fault = 0

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/diffSummary_Images.d

    r34011 r40974  
    1 TABLE diffRun, diffSkyfile, diffSummary
     1TABLE diffRun JOIN diffSkyfile USING (diff_id) JOIN diffSummary USING (diff_id)
    22TITLE Diff Summary w/ Images
    33FILE  diffSummary_Images.php
    … …  
    66UNRESTRICTED AND 0>1
    77
    8 WHERE diffRun.diff_id             = diffSkyfile.diff_id
    9 WHERE diffSummary.diff_id = diffRun.diff_id
    108# WHERE diffRun.state = 'full'
    119# WHERE diffSkyfile.fault = 0

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/distRun.d

    r35299 r40974  
    1 TABLE distRun, distComponent
     1TABLE distRun JOIN distComponent USING (dist_id)
    22TITLE Distribution Runs
    33FILE  distRun.php
    … …  
    66# the following WHERE clauses are added to all queries joined by AND
    77
    8 WHERE distRun.dist_id = distComponent.dist_id
    9 UNRESTRICTED AND 0=1
    10 RESTRICT_COUNT AND 0>1
     8UNRESTRICTED WHERE distRun.time_stamp >= CURDATE()
     9RESTRICT_COUNT WHERE distRun.time_stamp >= CURDATE()
    1110
    1211#     field                   size  format  name         show    link to                  extras

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/failedCamProcessedExp.d

    r37983 r40974  
    1 TABLE camRun, camProcessedExp, chipRun, rawExp
     1TABLE camRun JOIN camProcessedExp USING (cam_id) JOIN chipRun USING (chip_id) JOIN rawExp USING (exp_id)
    22TITLE Camera Failed Exposures
    33FILE  failedCamProcessedExp.php
    … …  
    55
    66# the following WHERE clauses are added to all queries joined by AND
    7 WHERE camRun.chip_id = chipRun.chip_id
    8 WHERE chipRun.exp_id = rawExp.exp_id
    9 WHERE camProcessedExp.cam_id  = camRun.cam_id
    107WHERE camProcessedExp.fault != 0
     8
     9RESTRICT_COUNT AND rawExp.dateobs >= CURDATE()
     10UNRESTRICTED AND rawExp.dateobs >= CURDATE()
    1111
    1212# define the arguments supplied to the links below (if any)

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/failedChipProcessedImfile.d

    r37983 r40974  
    1 TABLE chipRun, rawExp, chipProcessedImfile
     1TABLE chipRun JOIN rawExp USING (exp_id) JOIN chipProcessedImfile USING (chip_id)
    22TITLE Chip Failed Imfiles
    33FILE  failedChipProcessedImfile.php
    … …  
    66# limit this table to non-OBJECT types of images
    77WHERE chipRun.exp_id = rawExp.exp_id
    8 WHERE chipProcessedImfile.exp_id = chipRun.exp_id
    9 WHERE chipProcessedImfile.chip_id = chipRun.chip_id
    108WHERE chipProcessedImfile.fault != 0
     9
     10RESTRICT_COUNT AND rawExp.dateobs >= CURDATE()
     11UNRESTRICTED AND rawExp.dateobs >= CURDATE()
    1112
    1213ARGS  ARG1 rawImfile.exp_id=$rawExp.exp_id

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/failedDiffSkyfile.d

    r32028 r40974  
    1 TABLE diffRun, diffSkyfile
     1TABLE diffRun JOIN diffSkyfile USING (diff_id)
    22TITLE Diff Failed Skyfiles
    33FILE  failedDiffSkyfile.php
    44MENU  ipp.stack.dat
    55
    6 WHERE diffRun.diff_id             = diffSkyfile.diff_id
    76WHERE diffSkyfile.fault != 0
    87

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/failedFakeProcessedImfile.d

    r32028 r40974  
    1 TABLE fakeRun, fakeProcessedImfile, camRun, chipRun, rawExp
     1TABLE fakeRun JOIN fakeProcessedImfile USING (fake_id) JOIN camRun USING (cam_id) JOIN chipRun USING (chip_id) JOIN rawExp USING (exp_id)
    22TITLE fake Processed Imfile
    33FILE  failedFakeProcessedImfile.php
    … …  
    55
    66# limit this table to non-OBJECT types of images
    7 WHERE fakeRun.cam_id = camRun.cam_id
    8 WHERE camRun.chip_id = chipRun.chip_id
    9 WHERE chipRun.exp_id = rawExp.exp_id
    10 WHERE fakeProcessedImfile.fake_id = fakeRun.fake_id
    117WHERE fakeProcessedImfile.fault != 0
     8
     9RESTRICT_COUNT AND rawExp.dateobs >= CURDATE()
     10UNRESTRICTED AND rawExp.dateobs >= CURDATE()
    1211
    1312ARGS  ARG1  rawImfile.exp_id=$rawExp.exp_id

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/failedFullForceSkyfiles.d

    r38216 r40974  
    1 TABLE fullForceResult, fullForceRun
     1TABLE fullForceResult JOIN fullForceRun USING (ff_id)
    22TITLE FullForce Failed Skyfiles
    33FILE  failedFullForceSkyfiles.php
    44MENU  ipp.science.dat
    55
    6 WHERE fullForceResult.ff_id = fullForceRun.ff_id
    76WHERE fullForceResult.fault != 0
    87

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/failedStackSkyfile.d

    r32028 r40974  
    1 TABLE stackRun, stackSumSkyfile
     1TABLE stackRun JOIN stackSumSkyfile USING (stack_id)
    22TITLE Stack Failed Skyfiles
    33FILE  failedStackSkyfile.php
    44MENU  ipp.stack.dat
    55
    6 WHERE stackRun.stack_id = stackSumSkyfile.stack_id
    76WHERE stackSumSkyfile.fault != 0
    87

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/failedStaticsky.d

    r40844 r40974  
    1 TABLE staticskyRun JOIN staticskyResult USING(sky_id) JOIN staticskyInput USING(sky_id) JOIN stackRun USING(stack_id)
     1TABLE staticskyRun JOIN staticskyResult USING (sky_id) JOIN staticskyInput USING (sky_id) JOIN stackRun USING (stack_id)
    22TITLE Static Sky Failed
    33FILE  failedStaticsky.php

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/failedWarpSkyfiles.d

    r37983 r40974  
    1 TABLE warpSkyfile, warpRun, fakeRun, camRun, chipRun, rawExp
     1TABLE warpSkyfile JOIN warpRun USING (warp_id) JOIN fakeRun USING (fake_id) JOIN camRun USING (cam_id) JOIN chipRun USING (chip_id) JOIN rawExp USING (exp_id)
    22TITLE Warp Failed Skyfiles
    33FILE  failedWarpSkyfiles.php
    44MENU  ipp.science.dat
    55
    6 WHERE warpSkyfile.warp_id = warpRun.warp_id
    7 WHERE warpRun.fake_id = fakeRun.fake_id
    8 WHERE fakeRun.cam_id = camRun.cam_id
    9 WHERE camRun.chip_id = chipRun.chip_id
    10 WHERE chipRun.exp_id = rawExp.exp_id
    116WHERE warpSkyfile.fault != 0
     7
     8RESTRICT_COUNT AND rawExp.dateobs >= CURDATE()
     9UNRESTRICTED AND rawExp.dateobs >= CURDATE()
    1210
    1311ARGS  ARG1  rawImfile.exp_id=$rawExp.exp_id

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/fakePendingExp.d

    r27892 r40974  
    1 TABLE fakeRun, camRun, chipRun, rawExp
     1TABLE fakeRun JOIN camRun USING (cam_id) JOIN chipRun USING (chip_id) JOIN rawExp USING (exp_id)
    22TITLE fake Pending Exposures
    33FILE  fakePendingExp.php
    … …  
    66# limit this table to non-OBJECT types of images
    77WHERE fakeRun.state = 'new'
    8 WHERE fakeRun.cam_id = camRun.cam_id
    9 WHERE camRun.chip_id = chipRun.chip_id
    10 WHERE chipRun.exp_id = rawExp.exp_id
     8
     9RESTRICT_COUNT AND rawExp.dateobs >= CURDATE()
     10UNRESTRICTED AND rawExp.dateobs >= CURDATE()
    1111
    1212ARGS  ARG1  rawImfile.exp_id=$rawExp.exp_id

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/fakePendingImfile.d

    r27892 r40974  
    1 TABLE fakeRun, camRun, chipRun, rawExp, rawImfile
     1TABLE fakeRun JOIN camRun USING (cam_id) JOIN chipRun USING (chip_id) JOIN rawExp USING (exp_id) JOIN rawImfile USING (exp_id)
    22TITLE Fake Pending Imfiles
    33FILE  fakePendingImfile.php
    … …  
    55
    66WHERE fakeRun.state = 'new'
    7 WHERE fakeRun.cam_id = camRun.cam_id
    8 WHERE camRun.chip_id = chipRun.chip_id
    9 WHERE chipRun.exp_id = rawExp.exp_id
    10 WHERE rawImfile.exp_id = rawExp.exp_id
     7
     8RESTRICT_COUNT AND rawExp.dateobs >= CURDATE()
     9UNRESTRICTED AND rawExp.dateobs >= CURDATE()
    1110
    1211ARGS  ARG1 rawImfile.exp_id=$rawExp.exp_id

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/fakeProcessedExp.d

    r27892 r40974  
    1 TABLE fakeRun, camRun, chipRun, rawExp
     1TABLE fakeRun JOIN camRun USING (cam_id) JOIN chipRun USING (chip_id) JOIN rawExp USING (exp_id)
    22TITLE fake Processed Exposures
    33FILE  fakeProcessedExp.php
    … …  
    66# limit this table to non-OBJECT types of images
    77WHERE fakeRun.state != 'new'
    8 WHERE fakeRun.cam_id = camRun.cam_id
    9 WHERE camRun.chip_id = chipRun.chip_id
    10 WHERE chipRun.exp_id = rawExp.exp_id
     8
     9RESTRICT_COUNT AND rawExp.dateobs >= CURDATE()
     10UNRESTRICTED AND rawExp.dateobs >= CURDATE()
    1111
    1212ARGS  ARG1  rawImfile.exp_id=$rawExp.exp_id

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/fakeProcessedImfile.d

    r27892 r40974  
    1 TABLE fakeRun, fakeProcessedImfile, camRun, chipRun, rawExp
     1TABLE fakeRun JOIN camRun USING (cam_id) JOIN chipRun USING (chip_id) JOIN rawExp USING (exp_id) JOIN fakeProcessedImfile USING (fake_id)
    22TITLE fake Processed Imfile
    33FILE  fakeProcessedImfile.php
    … …  
    55
    66# limit this table to non-OBJECT types of images
    7 WHERE fakeRun.cam_id = camRun.cam_id
    8 WHERE camRun.chip_id = chipRun.chip_id
    9 WHERE chipRun.exp_id = rawExp.exp_id
    10 WHERE fakeProcessedImfile.fake_id = fakeRun.fake_id
    117WHERE fakeProcessedImfile.fault = 0
     8
     9RESTRICT_COUNT AND rawExp.dateobs >= CURDATE()
     10UNRESTRICTED AND rawExp.dateobs >= CURDATE()
    1211
    1312ARGS  ARG1  rawImfile.exp_id=$rawExp.exp_id

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/fakeProcessedImfile_failure.d

    r27892 r40974  
    1 TABLE fakeRun, fakeProcessedImfile, camRun, chipRun, rawExp
     1TABLE fakeRun JOIN camRun USING (cam_id) JOIN chipRun USING (chip_id) JOIN rawExp USING (exp_id) JOIN fakeProcessedImfile USING (fake_id)
    22TITLE fake Processed Imfile
    33FILE  fakeProcessedImfile_failure.php
    … …  
    55
    66# limit this table to non-OBJECT types of images
    7 WHERE fakeRun.cam_id = camRun.cam_id
    8 WHERE camRun.chip_id = chipRun.chip_id
    9 WHERE chipRun.exp_id = rawExp.exp_id
    10 WHERE fakeProcessedImfile.fake_id = fakeRun.fake_id
    117WHERE fakeProcessedImfile.fault != 0
     8
     9RESTRICT_COUNT AND rawExp.dateobs >= CURDATE()
     10UNRESTRICTED AND rawExp.dateobs >= CURDATE()
    1211
    1312ARGS  ARG1  rawImfile.exp_id=$rawExp.exp_id

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/fakeStageExp.d

    r27892 r40974  
    1 TABLE fakeRun, camRun, chipRun, rawExp
     1TABLE fakeRun JOIN camRun USING (cam_id) JOIN chipRun USING (chip_id) JOIN rawExp USING (exp_id)
    22TITLE Fake Stage Exposures
    33FILE  fakeStageExp.php
    44MENU  ipp.science.dat
    55
    6 WHERE fakeRun.cam_id = camRun.cam_id
    7 WHERE camRun.chip_id = chipRun.chip_id
    8 WHERE chipRun.exp_id = rawExp.exp_id
     6RESTRICT_COUNT WHERE rawExp.dateobs >= CURDATE()
     7UNRESTRICTED WHERE rawExp.dateobs >= CURDATE()
    98
    109ARGS  ARG1  rawImfile.exp_id=$rawExp.exp_id

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/flatcorrCamera.d

    r27892 r40974  
    1 TABLE flatcorrCamLink, flatcorrRun, camRun, chipRun, rawExp
     1TABLE flatcorrCamLink JOIN flatcorrRun USING (corr_id) JOIN camRun USING (cam_id) JOIN chipRun USING (chip_id) JOIN rawExp USING (exp_id)
    22TITLE flatcorr Camera Runs
    33FILE  flatcorrCamera.php
    44MENU  ipp.detrend.dat
    55
    6 WHERE flatcorrRun.corr_id = flatcorrCamLink.corr_id
    7 WHERE flatcorrCamLink.cam_id = camRun.cam_id
    8 WHERE flatcorrCamLink.chip_id = chipRun.chip_id
    9 WHERE chipRun.exp_id = rawExp.exp_id
     6RESTRICT_COUNT WHERE rawExp.dateobs >= CURDATE()
     7UNRESTRICTED WHERE rawExp.dateobs >= CURDATE()
    108
    119OP   OP1  $rawExp.ra * 57.295783

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/flatcorrChip.d

    r27892 r40974  
    1 TABLE flatcorrChipLink, flatcorrRun, chipRun, rawExp
     1TABLE flatcorrChipLink JOIN flatcorrRun USING (corr_id) JOIN chipRun USING (chip_id) JOIN rawExp USING (exp_id)
    22TITLE flatcorr Chip Runs
    33FILE  flatcorrChip.php
    44MENU  ipp.detrend.dat
    55
    6 WHERE flatcorrRun.corr_id = flatcorrChipLink.corr_id
    7 WHERE flatcorrChipLink.chip_id = chipRun.chip_id
    8 WHERE chipRun.exp_id = rawExp.exp_id
     6RESTRICT_COUNT WHERE rawExp.dateobs >= CURDATE()
     7UNRESTRICTED WHERE rawExp.dateobs >= CURDATE()
    98
    109OP   OP1  $rawExp.ra * 57.295783

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/fullforceFailedSkyfile.d

    r40844 r40974  
    1 TABLE fullForceInput, fullForceRun, warpRun, fullForceResult
     1TABLE fullForceInput JOIN fullForceRun USING (ff_id) JOIN warpRun USING (warp_id) JOIN fullForceResult USING (ff_id)
    22TITLE Full Force Failed
    33FILE  fullforceFailedSkyfile.php
    44MENU  ipp.ffs.dat
    55
    6 WHERE fullForceRun.ff_id = fullForceInput.ff_id
    7 WHERE fullForceInput.warp_id = warpRun.warp_id
    8 WHERE fullForceInput.ff_id = fullForceResult.ff_id
    96WHERE fullForceResult.fault != 0
    107

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/fullforceProcessedSkyfile.d

    r40844 r40974  
    1 TABLE fullForceInput, fullForceRun, warpRun, fullForceResult
     1TABLE fullForceInput JOIN fullForceRun USING (ff_id) JOIN warpRun USING (warp_id) JOIN fullForceResult USING (ff_id)
    22TITLE Full Force Processed
    33FILE  fullforceProcessedSkyfile.php
    44MENU  ipp.ffs.dat
    5 
    6 WHERE fullForceRun.ff_id = fullForceInput.ff_id
    7 WHERE fullForceInput.warp_id = warpRun.warp_id
    8 WHERE fullForceInput.ff_id = fullForceResult.ff_id
    95
    106#        field                          size  format  name           show     link to         extras

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/fullforce_failure.d

    r38223 r40974  
    1 TABLE staticskyRun JOIN staticskyResult USING(sky_id) JOIN staticskyInput USING(sky_id) JOIN stackRun USING(stack_id)
     1TABLE staticskyRun JOIN staticskyResult USING (sky_id) JOIN staticskyInput USING (sky_id) JOIN stackRun USING (stack_id)
    22TITLE Static Sky Failed (Log)
    33FILE  failedStaticsky.php

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/histogramBackgroundImage.d

    r34196 r40974  
    1 TABLE camRun, chipRun, rawExp, camProcessedExp
     1TABLE camRun JOIN chipRun USING (chip_id) JOIN rawExp USING (exp_id) JOIN camProcessedExp USING (cam_id)
    22TITLE New histogram background
    33FILE  histogramBackgroundImage.php
    … …  
    55
    66WHERE camRun.state = 'full'
    7 WHERE camRun.chip_id = chipRun.chip_id
    8 WHERE chipRun.exp_id = rawExp.exp_id
    9 WHERE camProcessedExp.cam_id = camRun.cam_id
    107WHERE camProcessedExp.fault = 0
    118

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/histogramCamProcessedExpImage.d

    r34195 r40974  
    1 TABLE camRun, chipRun, rawExp, camProcessedExp
     1TABLE camRun JOIN chipRun USING (chip_id) JOIN rawExp USING (exp_id) JOIN camProcessedExp USING (cam_id)
    22TITLE Histogram fwhm major (camProcessedExp)
    33FILE  histogramCamProcessedExpImage.php
    … …  
    55
    66WHERE camRun.state = 'full'
    7 WHERE camRun.chip_id = chipRun.chip_id
    8 WHERE chipRun.exp_id = rawExp.exp_id
    9 WHERE camProcessedExp.cam_id = camRun.cam_id
    107WHERE camProcessedExp.fault = 0
    118

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/histogramChipProcessedImfileFwhmMajorImage.d

    r28601 r40974  
    1 TABLE camRun, chipRun, rawExp, camProcessedExp, chipProcessedImfile
     1TABLE camRun JOIN chipRun USING (chip_id) JOIN rawExp USING (exp_id) JOIN camProcessedExp USING (cam_id) JOIN chipProcessedImfile USING (chip_id)
    22TITLE Histogram fwhm major (chipProcessedImfile)
    33FILE  histogramChipProcessedImfileFwhmMajorImage.php
    … …  
    55
    66WHERE camRun.state = 'full'
    7 WHERE chipProcessedImfile.exp_id = rawExp.exp_id
    8 WHERE chipRun.exp_id = rawExp.exp_id
    9 WHERE camRun.chip_id = chipRun.chip_id
    10 WHERE camProcessedExp.cam_id = camRun.cam_id
    117WHERE camProcessedExp.fault = 0
    128

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/histogramChipRunFwhmMajorImage.d

    r28601 r40974  
    1 TABLE camRun, chipRun, rawExp, camProcessedExp
     1TABLE camRun JOIN chipRun USING (chip_id) JOIN rawExp USING (exp_id) JOIN camProcessedExp USING (cam_id)
    22TITLE Histogram fwhm major (camProcessedExp)
    33FILE  histogramCamProcessedExpImage.php
    … …  
    55
    66WHERE camRun.state = 'full'
    7 WHERE camRun.chip_id = chipRun.chip_id
    8 WHERE chipRun.exp_id = rawExp.exp_id
    9 WHERE camProcessedExp.cam_id = camRun.cam_id
    107WHERE camProcessedExp.fault = 0
    118

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/histogramFwhmMajorImage.d

    r28601 r40974  
    1 TABLE camRun, chipRun, rawExp, camProcessedExp
     1TABLE camRun JOIN chipRun USING (chip_id) JOIN rawExp USING (exp_id) JOIN camProcessedExp USING (cam_id)
    22TITLE New histogram fwhm major
    33FILE  histogramFwhmMajorImage.php
    … …  
    55
    66WHERE camRun.state = 'full'
    7 WHERE camRun.chip_id = chipRun.chip_id
    8 WHERE chipRun.exp_id = rawExp.exp_id
    9 WHERE camProcessedExp.cam_id = camRun.cam_id
    107WHERE camProcessedExp.fault = 0
    118

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/histogramFwhmMinorImage.d

    r28601 r40974  
    1 TABLE camRun, chipRun, rawExp, camProcessedExp
     1TABLE camRun JOIN chipRun USING (chip_id) JOIN rawExp USING (exp_id) JOIN camProcessedExp USING (cam_id)
    22TITLE New histogram fwhm minor
    33FILE  histogramFwhmMinorImage.php
    … …  
    55
    66WHERE camRun.state = 'full'
    7 WHERE camRun.chip_id = chipRun.chip_id
    8 WHERE chipRun.exp_id = rawExp.exp_id
    9 WHERE camProcessedExp.cam_id = camRun.cam_id
    107WHERE camProcessedExp.fault = 0
    118

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/histogramZptObsImage.d

    r34196 r40974  
    1 TABLE camRun, chipRun, rawExp, camProcessedExp
     1TABLE camRun JOIN chipRun USING (chip_id) JOIN rawExp USING (exp_id) JOIN camProcessedExp USING (cam_id)
    22TITLE Histogram of ZptObs
    33FILE  histogramZptObsImage.php
    … …  
    55
    66WHERE camRun.state = 'full'
    7 WHERE camRun.chip_id = chipRun.chip_id
    8 WHERE chipRun.exp_id = rawExp.exp_id
    9 WHERE camProcessedExp.cam_id = camRun.cam_id
    107WHERE camProcessedExp.fault = 0
    118

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/maskStats.d

    r33846 r40974  
    1 TABLE rawExp, chipRun, camRun, fakeRun, warpRun
     1TABLE rawExp JOIN chipRun USING (exp_id) JOIN camRun USING (chip_id) JOIN fakeRun USING (cam_id) JOIN warpRun USING (fake_id)
    22TITLE Mask Stats
    33FILE  maskStats.php
    44MENU  ipp.czar.dat
    55
    6 WHERE rawExp.exp_id = chipRun.exp_id
    7 WHERE chipRun.chip_id = camRun.chip_id
    8 WHERE camRun.cam_id = fakeRun.cam_id
    9 WHERE fakeRun.fake_id = warpRun.fake_id
     6RESTRICT_COUNT WHERE rawExp.dateobs >= CURDATE()
     7UNRESTRICTED WHERE rawExp.dateobs >= CURDATE()
    108
    119OP   OP1  $ra * 57.295783

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/newImfile.d

    r34013 r40974  
    44MENU  ipp.load.dat
    55
    6 UNRESTRICTED WHERE 0>1
    7 
    86#        field       size  format  name           show   link to         extras
    97FIELD    exp_id,        5, %d,     exposure ID

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/newsimplePlotStaticskyImage.d

    r35742 r40974  
    1 TABLE staticskyRun, staticskyInput, stackRun, skycell
     1TABLE staticskyRun JOIN staticskyInput USING (sky_id) JOIN stackRun USING (stack_id) JOIN skycell using (skycell_id)
    22TITLE New sky plot - staticsky
    33FILE  simplePlotStaticskyImage.php
    … …  
    55
    66WHERE staticskyRun.state != 'new'
    7 WHERE staticskyRun.sky_id = staticskyInput.sky_id
    8 WHERE staticskyInput.stack_id = stackRun.stack_id
    9 WHERE stackRun.skycell_id = skycell.skycell_id
    107WHERE stackRun.tess_id = skycell.tess_id
    118

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/publishDone.d

    r32025 r40974  
    1 TABLE publishRun, publishClient, publishDone
     1TABLE publishRun JOIN publishClient USING (client_id) JOIN publishDone USING (pub_id)
    22TITLE Publish Done
    33FILE  publishDone.php
    44MENU  ipp.dist.dat
    5 
    6 WHERE publishRun.client_id = publishClient.client_id
    7 WHERE publishRun.pub_id    = publishDone.pub_id
    85
    96ARGS ARG1 basename=$publishDone.path_base

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/publishRun.d

    r27197 r40974  
    1 TABLE publishRun, publishClient
     1TABLE publishRun JOIN publishClient USING (client_id)
    22TITLE Publish Runs
    33FILE  publishRun.php
    44MENU  ipp.dist.dat
    5 
    6 WHERE publishRun.client_id = publishClient.client_id
    75
    86#     field                   size  format  name         show    link to                  extras

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/publishSummary.d

    r26991 r40974  
    1 TABLE publishRun, publishClient
     1TABLE publishRun JOIN publishClient USING (client_id)
    22TITLE Publish Summary
    33FILE  publishSummary.php
    44MENU  ipp.dist.dat
    5 
    6 WHERE publishRun.client_id = publishClient.client_id
    75
    86#     field                   size  format  name         show    link to                  extras

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/pzDoneImfile.d

    r34013 r40974  
    44MENU  ipp.load.dat
    55
    6 UNRESTRICTED AND 0>1
    7 
    8 WHERE pzDownloadImfile.fault     = 0
     6#WHERE pzDownloadImfile.fault     = 0
    97
    108#        field                       size       format  name           show     link to         extras

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/pzPendingImfile.d

    r34013 r40974  
    33FILE  pzPendingImfile.php
    44MENU  ipp.load.dat
    5 
    6 UNRESTRICTED AND 0>1
    75
    86WHERE summitImfile.exp_name  = pzDownloadExp.exp_name

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/rawDetrendExp.d

    r19868 r40974  
    66# limit this table to non-OBJECT types of images
    77WHERE (rawExp.exp_type != 'OBJECT' and rawExp.exp_type != 'LIGHT')
     8
     9RESTRICT_COUNT AND dateobs >= CURDATE()
     10UNRESTRICTED AND dateobs >= CURDATE()
    811
    912ARGS ARG1 exp_id=$exp_id

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/rawDetrendExp_detrend.d

    r28597 r40974  
    66# limit this table to non-OBJECT types of images
    77WHERE rawExp.exp_type != 'OBJECT'
     8
     9RESTRICT_COUNT AND dateobs >= CURDATE()
     10UNRESTRICTED AND dateobs >= CURDATE()
    811
    912ARGS ARG1 rawImfile.exp_id=$exp_id

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/rawExp.d

    r28451 r40974  
    55
    66ARGS ARG1 rawImfile.exp_id=$exp_id
     7
     8RESTRICT_COUNT WHERE dateobs >= CURDATE()
     9UNRESTRICTED WHERE dateobs >= CURDATE()
    710
    811OP   OP1  $ra * 57.295783

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/rawExpStats.d

    r27674 r40974  
    55
    66ARGS ARG1 rawImfile.exp_id=$exp_id
     7
     8RESTRICT_COUNT WHERE dateobs >= CURDATE()
     9UNRESTRICTED WHERE dateobs >= CURDATE()
    710
    811OP   OP1  $ra * 57.295783

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/rawExp_failed.d

    r24867 r40974  
    77WHERE fault > 0
    88WHERE rawExp.exp_type = 'OBJECT'
     9
     10RESTRICT_COUNT AND dateobs >= CURDATE()
     11UNRESTRICTED AND dateobs >= CURDATE()
    912
    1013ARGS ARG1 exp_id=$exp_id

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/rawImfile.d

    r34013 r40974  
    22TITLE Raw Image File
    33FILE  rawImfile.php
    4 MENU  ipp.imfiles.dat
     4MENU  ipp.load.dat
    55
    66# HEAD PHP insert_backref ("rawExp.php", "exp_id", $ID['link']);
    77
    8 UNRESTRICTED WHERE 0>1
     8UNRESTRICTED WHERE dateobs >= CURDATE()
    99
    1010OP   OP1  $ra * 57.295783

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/rawScienceExp.d

    r24760 r40974  
    66# limit this table to OBJECT types of images
    77WHERE (rawExp.exp_type = 'OBJECT' or rawExp.exp_type = 'LIGHT')
     8
     9RESTRICT_COUNT AND dateobs >= CURDATE()
     10UNRESTRICTED AND dateobs >= CURDATE()
    811
    912ARGS ARG1 rawImfile.exp_id=$exp_id

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/simplePlotCamImage.d

    r34431 r40974  
    1 TABLE camProcessedExp, camRun, chipRun, rawExp
     1TABLE camProcessedExp JOIN camRun USING (cam_id) JOIN chipRun USING (chip_id) JOIN rawExp USING (exp_id)
    22TITLE New sky plot - cam
    33FILE  simplePlotCamImage.php
    … …  
    55
    66WHERE camRun.state != 'new'
    7 WHERE chipRun.exp_id = rawExp.exp_id
    8 WHERE camRun.chip_id = chipRun.chip_id
    9 WHERE camProcessedExp.cam_id = camRun.cam_id
    107
    118#    field                size  format  name           show     link to         extras

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/simplePlotChipImage.d

    r34189 r40974  
    1 TABLE chipRun, rawExp
     1TABLE chipRun JOIN rawExp USING (exp_id)
    22TITLE New sky plot - chip
    33FILE  simplePlotChipImage.php
    … …  
    55
    66WHERE chipRun.state != 'new'
    7 WHERE chipRun.exp_id = rawExp.exp_id
    87
    98#    field                size  format  name           show     link to         extras

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/simplePlotChipQueue.d

    r37983 r40974  
    1 TABLE chipRun, rawExp
     1TABLE chipRun JOIN rawExp USING (exp_id)
    22TITLE New sky plot - chip
    33FILE  simplePlotChipQueue.php
    44MENU  ipp.plots.dat
    5 
    6 WHERE chipRun.exp_id = rawExp.exp_id
    75
    86#    field                size  format  name           show     link to         extras

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/simplePlotDiffImage.d

    r37983 r40974  
    1 TABLE diffRun, diffSkyfile, skycell
     1TABLE diffRun JOIN diffSkyfile USING (diff_id) JOIN skycell USING (skycell_id)
    22TITLE New sky plot - diff
    33FILE  simplePlotDiffImage.php
    … …  
    55
    66WHERE diffRun.state != 'new'
    7 WHERE diffRun.diff_id = diffSkyfile.diff_id
    8 WHERE diffSkyfile.skycell_id = skycell.skycell_id
    97WHERE diffRun.tess_id = skycell.tess_id
    108

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/simplePlotFullForceImage.d

    r38220 r40974  
    11# TABLE fullForceRun, fullForceResult, skycalRun, stackRun, skycell
    2 TABLE fullForceRun, skycalRun, stackRun, skycell
     2TABLE fullForceRun JOIN skycalRun USING (skycal_id) JOIN stackRun USING (stack_id) JOIN skycell USING (skycell_id)
    33TITLE New sky plot - fullForce
    44FILE  simplePlotFullForceImage.php
    … …  
    66
    77# WHERE fullForceResult.ff_id  = fullForceRun.ff_id
    8 WHERE fullForceRun.skycal_id = skycalRun.skycal_id
    9 WHERE skycalRun.stack_id     = stackRun.stack_id
    108WHERE stackRun.tess_id       = skycell.tess_id
    11 WHERE stackRun.skycell_id    = skycell.skycell_id
    129WHERE fullForceRun.state != 'new'
    1310

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/simplePlotSkycalImage.d

    r39805 r40974  
    1 TABLE skycalRun, skycalResult, stackRun, skycell
     1TABLE skycalRun JOIN skycalResult USING (skycal_id) JOIN stackRun USING (stack_id) JOIN skycell USING (skycell_id)
    22TITLE New sky plot - skycal
    33FILE  simplePlotSkycalImage.php
    … …  
    55
    66WHERE skycalRun.state = 'full'
    7 WHERE skycalRun.skycal_id = skycalResult.skycal_id
    8 WHERE skycalRun.stack_id = stackRun.stack_id
    9 WHERE stackRun.skycell_id = skycell.skycell_id
    107WHERE stackRun.tess_id = skycell.tess_id
    118

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/simplePlotStackImage.d

    r34436 r40974  
    1 TABLE stackRun, stackSumSkyfile, skycell
     1TABLE stackRun JOIN stackSumSkyfile USING (stack_id) JOIN skycell USING (skycell_id)
    22TITLE New sky plot - stack
    33FILE  simplePlotStackImage.php
    … …  
    55
    66WHERE stackRun.state != 'new'
    7 WHERE stackRun.stack_id = stackSumSkyfile.stack_id
    8 WHERE stackRun.skycell_id = skycell.skycell_id
    97WHERE stackRun.tess_id = skycell.tess_id
    108

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/simplePlotStaticskyImage.d

    r39805 r40974  
    1 TABLE staticskyRun, staticskyResult, staticskyInput, stackRun, skycell
     1TABLE staticskyRun JOIN staticskyResult USING (sky_id) JOIN staticskyInput USING (sky_id) JOIN stackRun USING (stack_id) JOIN skycell USING (skycell_id)
    22TITLE New sky plot - staticsky
    33FILE  simplePlotStaticskyImage.php
    … …  
    55
    66WHERE staticskyRun.state = 'full'
    7 WHERE staticskyRun.sky_id = staticskyResult.sky_id
    8 WHERE staticskyRun.sky_id = staticskyInput.sky_id
    9 WHERE staticskyInput.stack_id = stackRun.stack_id
    10 WHERE stackRun.skycell_id = skycell.skycell_id
    117WHERE stackRun.tess_id = skycell.tess_id
    128

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/skycalFailedSkyfile.d

    r40844 r40974  
    1 TABLE skycalRun, skycalResult, stackRun
     1TABLE skycalRun JOIN skycalResult USING (skycal_id) JOIN stackRun USING (stack_id)
    22TITLE Skycal Failed Skyfiles
    33FILE  skycalfailedSkyfile.php
    44MENU  ipp.sky.dat
    55
    6 WHERE skycalRun.stack_id = stackRun.stack_id
    7 WHERE skycalRun.skycal_id = skycalResult.skycal_id
    86WHERE skycalResult.fault != 0
    97

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/skycalProcessedSkyfile.d

    r40844 r40974  
    1 TABLE skycalRun, skycalResult, stackRun
     1TABLE skycalRun JOIN skycalResult USING (skycal_id) JOIN stackRun USING (stack_id)
    22TITLE Skycal Processed Skyfiles
    33FILE  skycalProcessedSkyfile.php
    44MENU  ipp.sky.dat
    5 
    6 WHERE skycalRun.stack_id = stackRun.stack_id
    7 WHERE skycalRun.skycal_id = skycalResult.skycal_id
    85
    96#        field          size  format  name           show     link to         extras

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/skycalRun.d

    r40844 r40974  
    1 TABLE skycalRun, stackRun
     1TABLE skycalRun JOIN stackRun USING (stack_id)
    22TITLE skycalRun
    33FILE  skycalRun.php
    44MENU  ipp.sky.dat
    5 
    6 WHERE skycalRun.stack_id = stackRun.stack_id
    75
    86#        field          size  format  name           show     link to         extras

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/skycal_failure.d

    r40844 r40974  
    1 TABLE skycalRun, skycalResult, stackRun
     1TABLE skycalRun JOIN skycalResult USING (skycal_id) JOIN stackRun USING (stack_id)
    22TITLE skycal Failure
    33FILE  skycal_failure.php
    44MENU  ipp.sky.dat
    55
    6 WHERE skycalRun.stack_id = stackRun.stack_id
    7 WHERE skycalRun.skycal_id = skycalResult.skycal_id
    86WHERE skycalResult.fault != 0
    97

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/stackFailedSkyfile.d

    r27892 r40974  
    1 TABLE stackRun, stackSumSkyfile
     1TABLE stackRun JOIN stackSumSkyfile USING (stack_id)
    22TITLE Stack Failed Skyfiles
    33FILE  stackFailedSkyfile.php
    44MENU  ipp.stack.dat
    55
    6 WHERE stackRun.stack_id = stackSumSkyfile.stack_id
    76WHERE stackSumSkyfile.fault != 0
    87

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/stackInputSkyfile.d

    r30989 r40974  
    1 TABLE stackInputSkyfile, stackRun, warpRun, warpSkyfile, fakeRun, camRun, camProcessedExp, chipRun, rawExp
     1TABLE stackInputSkyfile JOIN stackRun USING (stack_id) JOIN warpRun USING (warp_id) JOIN warpSkyfile USING (warp_id) JOIN fakeRun USING (fake_id) JOIN camRun USING (cam_id) JOIN camProcessedExp USING (cam_id) JOIN chipRun USING (chip_id) JOIN rawExp USING (exp_id)
    22TITLE Stack Input Exposures
    33FILE  stackInputSkyfile.php
    44MENU  ipp.stack.dat
    55
    6 WHERE stackRun.stack_id = stackInputSkyfile.stack_id
    7 WHERE stackInputSkyfile.warp_id = warpRun.warp_id
    8 WHERE warpRun.fake_id = fakeRun.fake_id
    9 WHERE warpSkyfile.warp_id = warpRun.warp_id
    10 WHERE warpSkyfile.skycell_id = stackRun.skycell_id
    11 WHERE fakeRun.cam_id = camRun.cam_id
    12 WHERE camProcessedExp.cam_id = camRun.cam_id
    13 WHERE camRun.chip_id = chipRun.chip_id
    14 WHERE chipRun.exp_id = rawExp.exp_id
     6RESTRICT_COUNT WHERE rawExp.dateobs >= CURDATE()
     7UNRESTRICTED WHERE rawExp.dateobs >= CURDATE()
    158
    169# if no query restrictions are supplied, we want to limit the query or it is extremely long running:
    17 UNRESTRICTED AND stackRun.stack_id = 0
     10#UNRESTRICTED AND stackRun.stack_id = 0
    1811
    1912ARGS  ARG1  rawImfile.exp_id=$rawExp.exp_id

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/stackProcessedSkyfile.d

    r27892 r40974  
    1 TABLE stackRun, stackSumSkyfile
     1TABLE stackRun JOIN stackSumSkyfile USING (stack_id)
    22TITLE Stack Processed Skyfiles
    33FILE  stackProcessedSkyfile.php
    44MENU  ipp.stack.dat
    55
    6 WHERE stackRun.stack_id = stackSumSkyfile.stack_id
    76WHERE stackRun.state = 'full'
    87WHERE stackSumSkyfile.fault = 0

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/stackProcessedSkyfile_Images.d

    r32539 r40974  
    1 TABLE stackRun, stackSumSkyfile
     1TABLE stackRun JOIN stackSumSkyfile USING (stack_id)
    22TITLE Stack Processed Skyfiles
    33FILE  stackProcessedSkyfile_Images.php
    44MENU  ipp.stack.dat
    55
    6 WHERE stackRun.stack_id = stackSumSkyfile.stack_id
    76WHERE stackRun.state = 'full'
    87WHERE stackSumSkyfile.fault = 0

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/stackSummary_Images.d

    r37983 r40974  
    1 TABLE stackAssociation, stackSummary
     1TABLE stackAssociation JOIN stackSummary USING (sass_id)
    22TITLE Stack Summary w/ Images
    33FILE  stackSummary_Images.php
    44MENU  ipp.stack.dat
    5 
    6 # TODO
    7 WHERE stackSummary.sass_id = stackAssociation.sass_id
    85
    96# define image names to be used below

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/staticskyFailedSkyfile.d

    r40844 r40974  
    1 TABLE staticskyInput, staticskyRun, stackRun, staticskyResult
     1TABLE staticskyInput JOIN staticskyRun USING (sky_id) JOIN stackRun USING (stack_id) JOIN staticskyResult USING (sky_id)
    22TITLE Static Sky Failed
    33FILE  staticskyFailedSkyfile.php
    44MENU  ipp.sky.dat
    55
    6 WHERE staticskyRun.sky_id = staticskyInput.sky_id
    7 WHERE staticskyInput.stack_id = stackRun.stack_id
    8 WHERE staticskyInput.sky_id = staticskyResult.sky_id
    96WHERE staticskyResult.fault != 0
    107

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/staticskyInputSkyfile.d

    r38222 r40974  
    1 TABLE staticskyInput, staticskyRun, stackRun
     1TABLE staticskyInput JOIN staticskyRun USING (sky_id) JOIN stackRun USING (stack_id)
    22TITLE Static Sky Input Exposures
    33FILE  staticskyInputSkyfile.php
    44MENU  ipp.sky.dat
    5 
    6 WHERE staticskyRun.sky_id = staticskyInput.sky_id
    7 WHERE staticskyInput.stack_id = stackRun.stack_id
    85
    96#        field                          size  format  name           show     link to         extras

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/staticskyProcessedSkyfile.d

    r38222 r40974  
    1 TABLE staticskyInput, staticskyRun, stackRun, staticskyResult
     1TABLE staticskyInput JOIN staticskyRun USING (sky_id) JOIN stackRun USING (stack_id) JOIN staticskyResult USING (sky_id)
    22TITLE Static Sky Processed
    33FILE  staticskyProcessedSkyfile.php
    44MENU  ipp.sky.dat
    5 
    6 WHERE staticskyRun.sky_id = staticskyInput.sky_id
    7 WHERE staticskyInput.stack_id = stackRun.stack_id
    8 WHERE staticskyInput.sky_id = staticskyResult.sky_id
    95
    106#        field                          size  format  name           show     link to         extras

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/staticsky_failure.d

    r38222 r40974  
    1 TABLE staticskyRun JOIN staticskyResult USING(sky_id) JOIN staticskyInput USING(sky_id) JOIN stackRun USING(stack_id)
     1TABLE staticskyRun JOIN staticskyResult USING (sky_id) JOIN staticskyInput USING (sky_id) JOIN stackRun USING (stack_id)
    22TITLE Static Sky Failed (Log)
    33FILE  failedStaticsky.php

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/subsetPlotDiffImage.d

    r37984 r40974  
    1 TABLE diffRun, diffInputSkyfile, diffSkyfile, skycell
     1TABLE diffRun JOIN diffInputSkyfile USING (diff_id) JOIN diffSkyfile USING (skycell_id) JOIN skycell USING (skycell_id)
    22TITLE New sky plot - diff
    33FILE  subsetPlotDiffImage.php
    … …  
    55
    66WHERE diffRun.state != 'new'
    7 WHERE diffRun.diff_id             = diffInputSkyfile.diff_id
    8 WHERE diffInputSkyfile.diff_id    = diffSkyfile.diff_id
    9 WHERE diffInputSkyfile.skycell_id = diffSkyfile.skycell_id
    10 WHERE diffSkyfile.skycell_id      = skycell.skycell_id
    117WHERE diffRun.tess_id             = skycell.tess_id
    128WHERE MOD(diffInputSkyfile.diff_skyfile_id, 50)   = 0

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/summitImfile.d

    r34013 r40974  
    33FILE  summitImfile.php
    44MENU  ipp.load.dat
    5 
    6 UNRESTRICTED WHERE 0>1
    75
    86#        field     size  format  name             show   link to         extras

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/warpFailedSkyfiles.d

    r37983 r40974  
    1 TABLE warpSkyfile, warpRun, fakeRun, camRun, chipRun, rawExp
     1TABLE warpSkyfile JOIN warpRun USING (warp_id) JOIN fakeRun USING (fake_id) JOIN camRun USING (cam_id) JOIN chipRun USING (chip_id) JOIN rawExp USING (exp_id)
    22TITLE Warp Failed Skyfiles
    33FILE  warpFailedSkyfiles.php
    44MENU  ipp.science.dat
    55
    6 WHERE warpSkyfile.warp_id = warpRun.warp_id
    7 WHERE warpRun.fake_id = fakeRun.fake_id
    8 WHERE fakeRun.cam_id = camRun.cam_id
    9 WHERE camRun.chip_id = chipRun.chip_id
    10 WHERE chipRun.exp_id = rawExp.exp_id
    116WHERE warpSkyfile.fault != 0
     7
     8RESTRICT_COUNT AND rawExp.dateobs >= CURDATE()
     9UNRESTRICTED AND rawExp.dateobs >= CURDATE()
    1210
    1311ARGS  ARG1  rawImfile.exp_id=$rawExp.exp_id

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/warpProcessedSkyfiles.d

    r36788 r40974  
    1 TABLE rawExp JOIN chipRun USING(exp_id) JOIN camRun USING(chip_id) JOIN fakeRun USING(cam_id) JOIN warpRun USING(fake_id) JOIN warpSkyfile USING(warp_id)
     1TABLE rawExp JOIN chipRun USING (exp_id) JOIN camRun USING (chip_id) JOIN fakeRun USING (cam_id) JOIN warpRun USING (fake_id) JOIN warpSkyfile USING (warp_id)
    22TITLE Warp Processed Skyfiles
    33FILE  warpProcessedSkyfiles.php
    44MENU  ipp.science.dat
    55
    6 RESTRICT_COUNT WHERE dateobs >= CURDATE()
    7 UNRESTRICTED WHERE dateobs >= CURDATE()
     6RESTRICT_COUNT WHERE rawExp.dateobs >= CURDATE()
     7UNRESTRICTED WHERE rawExp.dateobs >= CURDATE()
    88
    99ARGS  ARG1  rawImfile.exp_id=$rawExp.exp_id

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/warpProcessedSkyfiles_Images.d

    r36788 r40974  
    1 TABLE  rawExp JOIN chipRun USING(exp_id) JOIN camRun USING(chip_id) JOIN fakeRun USING(cam_id) JOIN warpRun USING(fake_id) JOIN warpSkyfile USING(warp_id)
     1TABLE  rawExp JOIN chipRun USING (exp_id) JOIN camRun USING (chip_id) JOIN fakeRun USING (cam_id) JOIN warpRun USING (fake_id) JOIN warpSkyfile USING (warp_id)
    22TITLE Warp Processed Skyfiles
    33FILE  warpProcessedSkyfiles_Images.php
    44MENU  ipp.science.dat
    55
    6 RESTRICT_COUNT WHERE dateobs >= CURDATE()
    7 UNRESTRICTED WHERE dateobs >= CURDATE()
     6RESTRICT_COUNT AND rawExp.dateobs >= CURDATE()
     7UNRESTRICTED AND rawExp.dateobs >= CURDATE()
    88
    99# UNRESTRICTED WHERE 0=1

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/warpSkycellMap.d

    r27892 r40974  
    1 TABLE warpSkyCellMap, warpRun, camProcessedExp, chipRun, rawExp
     1TABLE warpSkyCellMap JOIN warpRun USING (warp_id) JOIN camProcessedExp USING (cam_id) JOIN chipRun USING (chip_id) JOIN rawExp USING (exp_id)
    22TITLE warpSkyCellMap
    33FILE  warpSkycellMap.php
    44MENU  ipp.science.dat
    55
    6 WHERE warpSkyCellMap.warp_id     = warpRun.warp_id
    7 WHERE warpSkyCellMap.cam_id      = camProcessedExp.cam_id
    8 WHERE camProcessedExp.chip_id    = chipRun.chip_id
    9 WHERE chipRun.exp_id = rawExp.exp_id
     6RESTRICT_COUNT AND rawExp.dateobs >= CURDATE()
     7UNRESTRICTED AND rawExp.dateobs >= CURDATE()
    108
    119OP   OP1  $rawExp.ra * 57.295783

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/warpStageExp.d

    r28684 r40974  
    1 TABLE warpRun, fakeRun, camRun, chipRun, rawExp
     1TABLE warpRun JOIN fakeRun USING (fake_id) JOIN camRun USING (cam_id) JOIN chipRun USING (chip_id) JOIN rawExp USING (exp_id)
    22TITLE Warp Stage Exposures
    33FILE  warpStageExp.php
    44MENU  ipp.science.dat
    55
    6 WHERE warpRun.fake_id = fakeRun.fake_id
    7 WHERE fakeRun.cam_id = camRun.cam_id
    8 WHERE camRun.chip_id = chipRun.chip_id
    9 WHERE chipRun.exp_id = rawExp.exp_id
     6RESTRICT_COUNT WHERE rawExp.dateobs >= CURDATE()
     7UNRESTRICTED WHERE rawExp.dateobs >= CURDATE()
    108
    119ARGS  ARG1  rawImfile.exp_id=$rawExp.exp_id

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/warpStageSkyfileInputs.d

    r27892 r40974  
    1 TABLE warpSkyCellMap, warpRun, fakeRun, camRun, chipRun, rawExp, chipProcessedImfile
     1TABLE warpSkyCellMap JOIN warpRun USING (warp_id) JOIN fakeRun USING (fake_id) JOIN camRun USING (cam_id) JOIN chipRun USING (chip_id) JOIN rawExp USING (exp_id) JOIN chipProcessedImfile USING (chip_id)
    22TITLE Warp Stage Skyfile Inputs
    33FILE  warpStageSkyfileInputs.php
    44MENU  ipp.science.dat
    55
    6 WHERE warpSkyCellMap.warp_id = warpRun.warp_id
    7 WHERE warpRun.fake_id = fakeRun.fake_id
    8 WHERE fakeRun.cam_id = camRun.cam_id
    9 WHERE camRun.chip_id = chipRun.chip_id
    10 WHERE chipRun.exp_id = rawExp.exp_id
    11 WHERE chipProcessedImfile.chip_id = chipRun.chip_id
    126WHERE chipProcessedImfile.class_id = warpSkyCellMap.class_id
    137
     8RESTRICT_COUNT AND rawExp.dateobs >= CURDATE()
     9UNRESTRICTED AND rawExp.dateobs >= CURDATE()
     10
    1411# if no query restrictions are supplied, we want to limit the query or it is extremely long running:
    15 UNRESTRICTED AND warpRun.warp_id = 0
     12#UNRESTRICTED AND warpRun.warp_id = 0
    1613
    1714ARGS  ARG1  rawImfile.exp_id=$rawExp.exp_id

  • branches/ccl_branches/ipp-20190806/ippMonitor/def/warpStageSkyfiles.d

    r27892 r40974  
    1 TABLE warpSkyCellMap, warpRun, fakeRun, camRun, chipRun, rawExp
     1TABLE warpSkyCellMap JOIN warpRun USING (warp_id) JOIN fakeRun USING (fake_id) JOIN camRun USING (cam_id) JOIN chipRun USING (chip_id) JOIN rawExp USING (exp_id)
    22TITLE Warp Stage Skyfiles
    33FILE  warpStageSkyfiles.php
    44MENU  ipp.science.dat
    55
    6 WHERE warpSkyCellMap.warp_id = warpRun.warp_id
    7 WHERE warpRun.fake_id = fakeRun.fake_id
    8 WHERE fakeRun.cam_id = camRun.cam_id
    9 WHERE camRun.chip_id = chipRun.chip_id
    10 WHERE chipRun.exp_id = rawExp.exp_id
     6RESTRICT_COUNT WHERE rawExp.dateobs >= CURDATE()
     7UNRESTRICTED WHERE rawExp.dateobs >= CURDATE()
    118
    129ARGS  ARG1  rawImfile.exp_id=$rawExp.exp_id

  • branches/ccl_branches/ipp-20190806/ippMonitor/raw/czartool_labels.php

    r40853 r40974  
    399399        $qry2->fetchInto($summit);
    400400
     401
    401402        $sql = "SELECT COUNT(*) FROM summitExp JOIN rawExp ON summitExp.exp_name = rawExp.exp_name WHERE summitExp.dateobs > '$date' AND rawExp.dateobs > '$date' AND summitExp.exp_type = '$expType[0]'";
    402403        $qry2 = $projectdb->query($sql);
    … …  
    407408        $qry2->fetchInto($dropped);
    408409
     410
     411        #Query with 30 minutes delay to check during the night if any exposures are missing.
     412        $datehour = gmdate("Y-m-d H:i:s");
     413        $sql = "SELECT COUNT(*) FROM summitExp left join pzDownloadExp using (summit_id) WHERE dateobs > '$date' AND dateobs <= date_sub('$datehour', interval 30 minute) AND exp_type = '$expType[0]' and (state != 'drop' or state is null) and fault != 1042";
     414        $qry2 = $projectdb->query($sql);
     415        $qry2->fetchInto($summitdelay);
     416
     417        $sql = "SELECT COUNT(*) FROM summitExp JOIN rawExp ON summitExp.exp_name = rawExp.exp_name WHERE summitExp.dateobs > '$date' AND summitExp.dateobs <= date_sub('$datehour', interval 30 minute) AND rawExp.dateobs > '$date' AND summitExp.exp_type = '$expType[0]'";
     418        $qry2 = $projectdb->query($sql);
     419        $qry2->fetchInto($mhpccdelay);
     420
    409421        echo "<tr>";
    410422
    411         if ($summit[0] == $mhpcc[0]) $error = 0;
     423        $DLdiff = $summit[0] - $mhpcc[0];
     424        if ($DLdiff == 0) $error = 0;
    412425        else $error = 1;
     426
     427        $delayDLdiff = $summitdelay[0] - $mhpccdelay[0];
     428        if ($delayDLdiff == 0) $errordelay = 0;
     429        else $errordelay = 1;
    413430
    414431        echo "<td>$expType[0]</td>";
    415432        echo "<td>$summit[0]</td>";
    416         createFormattedTableCell("", "", $mhpcc[0], $error, 0);
     433        #createFormattedTableCell("", "", $mhpcc[0], $error, 0);
     434        if ($delayDLdiff==0) {
     435           createFormattedTableCell("", "", $mhpcc[0], $error, 0);
     436        } else {
     437           $DLStatus = "<font style=\"BACKGROUND-COLOR: yellow\"  color=\"red\">$mhpcc[0] ($delayDLdiff)</font>";
     438           echo "<td>$DLStatus</td>";
     439        }
     440
    417441        echo "<td>$dropped[0]</td>";
    418442
    … …  
    440464    }
    441465    $qry->fetchInto($refExpID);
     466    if ($refExpID[0] = 'NULL') {
     467        $refExpID[0] = 0;
     468    }
    442469
    443470    #Find the number of chunks
    … …  
    482509    createTableColumnHeader("Chunk");
    483510    createTableColumnHeader("Nobs_1stvisit");
    484     createTableColumnHeader("Nobs_4visits");
     511    createTableColumnHeader("Nobs_4visits(bad cam)");
    485512    createTableColumnHeader("Ndiffs_published");
    486513    createTableColumnHeader("Completion");
    … …  
    492519        $Nfirstvisits = 0;
    493520        $Nfourvisits = 0;
     521        $badcam = 0;
    494522
    495523        $chunkname = $row[0];
    … …  
    533561        }
    534562
     563        #also query for bad quality camRun exposures
     564        $query4 = "SELECT count(*) ";
     565        $query4 .= " FROM rawExp";
     566        $query4 .= " JOIN chipRun USING (exp_id)";
     567        $query4 .= " JOIN camRun USING (chip_id)";
     568        $query4 .= " JOIN camProcessedExp USING (cam_id)";
     569        $query4 .= " WHERE dateobs LIKE '$date%'";
     570        $query4 .= " AND exp_id > $refExpID[0]";
     571        $query4 .= " AND exp_type = 'OBJECT'";
     572        $query4 .= " AND substr(comment, 1, position(' ' in comment)) LIKE '$chunkname%'";
     573        $query4 .= " AND (camProcessedExp.quality > 0)";
     574        $qry4 = $projectdb->query($query4);
     575        $qry4->fetchInto($badcam);
     576
     577
     578
    535579        echo "<tr>";
    536580
    537581        echo "<td>$chunkname</td>";
    538582        echo "<td>$Nfirstvisits</td>";
    539         echo "<td>$Nfourvisits</td>";
     583        if ($badcam[0]==0) {
     584           echo "<td>$Nfourvisits</td>";
     585        } else {
     586           $DLStatus = "<font style=\"BACKGROUND-COLOR: yellow\"  color=\"red\">$Nfourvisits ($badcam[0])</font>";
     587           echo "<td>$DLStatus</td>";
     588        }
    540589        echo "<td>$Ndiffs</td>";
    541590        echo "<td>$complete</td>";
    … …  
    944993    foreach ($servers as &$server) {
    945994
    946         getServerStatus($db, $server, $alive, $running);
     995        getServerStatus($db,$proj, $server, $alive, $running);
    947996
    948997        echo "<tr>\n";
    … …  
    10361085#
    10371086###########################################################################
    1038 function getServerStatus($db, $server, &$alive, &$running) {
    1039 
    1040     $sql = "SELECT alive, running FROM servers WHERE server LIKE '$server' ORDER BY timestamp DESC LIMIT 1";
     1087function getServerStatus($db,$proj, $server, &$alive, &$running) {
     1088
     1089    $sql = "SELECT alive, running FROM science_servers WHERE server LIKE '$server' AND telescope LIKE '$proj' ORDER BY timestamp DESC LIMIT 1";
    10411090    if($debug){echo "$sql<br>";}
    10421091
Note: See TracChangeset for help on using the changeset viewer.