Changeset 8122


Ignore:
Timestamp:
10/18/06 18:53:28 (18 years ago)
Author:
Daniela Dorner
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
16 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r8120 r8122  
    4545     - updated default values for jobmanager
    4646
    47    * datacenter/db/menu.php, datacenter/db/magicdef.php:
     47   * datacenter/db/menu.php, datacenter/db/magicdefs.php:
    4848     - implemented Observation Mode flag
    4949
    … …  
    5252     - removed ManuallyChanged from SequInfo2 (not needed anymore with
    5353       new sequence building algorithm
     54
     55   * datacenter/db/culminating.php, datacenter/db/datasetinfo-aio.php,
     56     datacenter/db/datasetinfo.php, datacenter/db/include.php,
     57     datacenter/db/index.php, datacenter/db/magicdefs.php,
     58     datacenter/db/querymc.php, datacenter/db/queryseq.php,
     59     datacenter/db/runinfo-aio.php, datacenter/db/runinfo.php,
     60     datacenter/db/sequinfo-aio.php, datacenter/db/sequinfo.php,
     61     datacenter/db/statusrps.php, datacenter/db/statussbs.php
     62     datacenter/db/statussps.php:
     63     - bugfix (order by was not working for runs/sequences/datasets
     64       when doing group by)
    5465
    5566

  • trunk/MagicSoft/Mars/datacenter/db/culminating.php

    r7974 r8122  
    2121            //--------------------------------------------------
    2222            $query0 .= " SUM(fNumEvents) as '" . $alias["SUM(fNumEvents)"] . "', ";
    23             $query0 .= " COUNT(*) as 'Sequ#' ";
     23            $query0 .= " COUNT(*) as '# Sequ' ";
    2424        }
    2525        else

  • trunk/MagicSoft/Mars/datacenter/db/datasetinfo-aio.php

    r7974 r8122  
    2222                if ($element==-1)
    2323                    $query0 .=  $key . " as '" . $alias[$key] . "' " . ", ";
    24             $query0 .= " COUNT(*) as 'Dataset#' ";
     24            $query0 .= " COUNT(*) as '# Datasets' ";
    2525        }
    2626        else
    … …  
    3333//                        $query0 .= " (if(IsNull(" . $key . "), 'not done' ,if(" . $key . "='1970-01-01 00:00:00','dont do','done'))) as '" . $alias[$key] . "', ";
    3434
    35                 $query0 .= " count(*) as 'DataSet#'";
     35                $query0 .= " COUNT(*) as '# Datasets'";
    3636
    3737            }

  • trunk/MagicSoft/Mars/datacenter/db/datasetinfo.php

    r7974 r8122  
    2222                if ($element==-1)
    2323                    $query0 .=  $key . " as '" . $alias[$key] . "' " . ", ";
    24             $query0 .= " COUNT(*) as 'Dataset#' ";
     24            $query0 .= " COUNT(*) as '# Datasets' ";
    2525        }
    2626        else
    … …  
    3333//                        $query0 .= " (if(IsNull(" . $key . "), 'not done' ,if(" . $key . "='1970-01-01 00:00:00','dont do','done'))) as '" . $alias[$key] . "', ";
    3434
    35                 $query0 .= " count(*) as 'DataSet#'";
     35                $query0 .= " COUNT(*) as '# Datasets'";
    3636
    3737            }

  • trunk/MagicSoft/Mars/datacenter/db/include.php

    r7974 r8122  
    388388            return $key;
    389389
     390    if ($search=="# Runs")
     391        return "NumRuns";
     392    if ($search=="# Sequ")
     393        return "NumSequ";
     394    if ($search=="# Datasets")
     395        return "NumDS";
     396    if ($search=="# days")
     397        return "NumDays";
    390398    return "";
    391399}

  • trunk/MagicSoft/Mars/datacenter/db/index.php

    r7974 r8122  
    2727            $query0 .= " Min(fZenithDistance) as '" . $alias["Min(fZenithDistance)"] . "', ";
    2828            $query0 .= " Max(fZenithDistance) as '" . $alias["Max(fZenithDistance)"] . "', ";
    29             $query0 .= " COUNT(*) as 'Runs#' ";
     29            $query0 .= " COUNT(*) as '# Runs' ";
    3030        }
    3131        else

  • trunk/MagicSoft/Mars/datacenter/db/magicdefs.php

    r8119 r8122  
    270270     "Min(fZenithDistance)"             => "ZdMin",
    271271     "Max(fZenithDistance)"             => "ZdMax",
    272      "COUNT(*)"                         => "Sequence",
    273272//     "fArrTimeLimit"                    => "ArrTRms",
    274273     "fArrTimeLimit"                    => "ArrTime",
    … …  
    300299     "fFailedCode"                      => "Err<br>Code",
    301300     "fFailedCodeAdd"                   => "Code<br>Add",
     301//     "COUNT(*)"                         => "# Runs",
     302//     "COUNT(*)"                         => "Sequence",
    302303    );
    303304
    … …  
    551552         "Min(fZenithDistance)"              => "'ZdMin'",
    552553         "Max(fZenithDistance)"              => "'ZdMax'",
    553          "COUNT(*)"                          => "'Sequence'",
     554//         "COUNT(*)"                          => "'Sequence'",
    554555         "fStartTime"                        => "fStartTime",
    555556         "fFailedTime"                       => "fFailedTime",
    … …  
    563564    if (!empty($tables[$val]))
    564565        $table=$tables[$val];
     566    if ($val=="NumRuns")
     567        $table="'# Runs'";
     568    if ($val=="NumSequ")
     569        $table="'# Sequ'";
     570    if ($val=="NumDS")
     571        $table="'# Datasets'";
     572    if ($val=="NumDays")
     573        $table="'# days'";
    565574    return $table;
    566575}

  • trunk/MagicSoft/Mars/datacenter/db/querymc.php

    r7974 r8122  
    2727//            $query0 .= " Min(fZenithDistance) as '" . $alias["Min(fZenithDistance)"] . "', ";
    2828//            $query0 .= " Max(fZenithDistance) as '" . $alias["Max(fZenithDistance)"] . "', ";
    29             $query0 .= " COUNT(*) as 'Runs#' ";
     29            $query0 .= " COUNT(*) as '# Runs' ";
    3030        }
    3131        else

  • trunk/MagicSoft/Mars/datacenter/db/queryseq.php

    r7974 r8122  
    2323            $query0 .= " Min(fZenithDistanceMin) as '" . $alias["Min(fZenithDistanceMin)"] . "', ";
    2424            $query0 .= " Max(fZenithDistanceMax) as '" . $alias["Max(fZenithDistanceMax)"] . "', ";
    25             $query0 .= " COUNT(*) as 'Sequence#' ";
     25            $query0 .= " COUNT(*) as '# Sequ' ";
    2626        }
    2727        else

  • trunk/MagicSoft/Mars/datacenter/db/runinfo-aio.php

    r8044 r8122  
    4343//                        $query0 .= " (if(IsNull(" . $key . "), 'not done' ,if(" . $key . "='1970-01-01 00:00:00','dont do','done'))) as '" . $alias[$key] . "', ";
    4444
    45                 $query0 .= " count(*) as '# Run'";
     45                $query0 .= " count(*) as '# Runs'";
    4646
    4747            }
    … …  
    173173        {
    174174            $val=substr($_GET["fSortBy"], 0, -1);
     175//            $query0 .= "---" . $val . "---";
    175176            $query0 .= " ORDER BY " . GetTable($fromtable, $val) . " ";
    176177            if (substr($_GET["fSortBy"], -1)=="-")

  • trunk/MagicSoft/Mars/datacenter/db/runinfo.php

    r8044 r8122  
    4343//                        $query0 .= " (if(IsNull(" . $key . "), 'not done' ,if(" . $key . "='1970-01-01 00:00:00','dont do','done'))) as '" . $alias[$key] . "', ";
    4444
    45                 $query0 .= " count(*) as '# Run'";
     45                $query0 .= " count(*) as '# Runs'";
    4646
    4747            }

  • trunk/MagicSoft/Mars/datacenter/db/sequinfo-aio.php

    r7962 r8122  
    2828            $query0 .= " Min(fZenithDistanceMin) as '" . $alias["Min(fZenithDistanceMin)"] . "', ";
    2929            $query0 .= " Max(fZenithDistanceMax) as '" . $alias["Max(fZenithDistanceMax)"] . "', ";
    30             $query0 .= " COUNT(*) as 'Sequence' ";
     30            $query0 .= " COUNT(*) as '# Sequ' ";
    3131        }
    3232        else
    … …  
    3939//                        $query0 .= " (if(IsNull(" . $key . "), 'not done' ,if(" . $key . "='1970-01-01 00:00:00','dont do','done'))) as '" . $alias[$key] . "', ";
    4040
    41                 $query0 .= " count(*) as 'Sequence'";
     41                $query0 .= " COUNT(*) as '# Sequ'";
    4242
    4343            }

  • trunk/MagicSoft/Mars/datacenter/db/sequinfo.php

    r7974 r8122  
    2828            $query0 .= " Min(fZenithDistanceMin) as '" . $alias["Min(fZenithDistanceMin)"] . "', ";
    2929            $query0 .= " Max(fZenithDistanceMax) as '" . $alias["Max(fZenithDistanceMax)"] . "', ";
    30             $query0 .= " COUNT(*) as 'Sequence' ";
     30            $query0 .= " COUNT(*) as '# Sequ' ";
    3131        }
    3232        else
    … …  
    3939//                        $query0 .= " (if(IsNull(" . $key . "), 'not done' ,if(" . $key . "='1970-01-01 00:00:00','dont do','done'))) as '" . $alias[$key] . "', ";
    4040
    41                 $query0 .= " count(*) as 'Sequence'";
     41                $query0 .= " COUNT(*) as '# Sequ'";
    4242
    4343            }

  • trunk/MagicSoft/Mars/datacenter/db/statusrps.php

    r7974 r8122  
    1717//                    $query0 .= " (if(IsNull(" . $key . "), 'not done' ,if(" . $key . "='1970-01-01 00:00:00','dont do','done'))) as '" . $key . "', ";
    1818
    19             $query0 .= " count(*) as 'Run#'";
    20 
    21         }
    22         else
    23         {
    24             $query0 .= "fRunNumber as 'Run#' ";
     19            $query0 .= " count(*) as '# Runs'";
     20
     21        }
     22        else
     23        {
     24            $query0 .= "fRunNumber as '# Runs' ";
    2525
    2626            foreach ($_GET as $key => $element)

  • trunk/MagicSoft/Mars/datacenter/db/statussbs.php

    r7974 r8122  
    1717//                    $query0 .= " (if(IsNull(" . $key . "), 'not done' ,if(" . $key . "='1970-01-01 00:00:00','dont do','done'))) as '" . $alias[$key] . "', ";
    1818
    19             $query0 .= " count(*) as '#days'";
     19            $query0 .= " count(*) as '# days'";
    2020
    2121        }

  • trunk/MagicSoft/Mars/datacenter/db/statussps.php

    r7974 r8122  
    1717//                    $query0 .= " (if(IsNull(" . $key . "), 'not done' ,if(" . $key . "='1970-01-01 00:00:00','dont do','done'))) as '" . $alias[$key] . "', ";
    1818
    19             $query0 .= " count(*) as 'Sequence#'";
     19            $query0 .= " count(*) as '# Sequ'";
    2020
    2121        }
Note: See TracChangeset for help on using the changeset viewer.