Changeset 9548 for trunk


Ignore:
Timestamp:
02/22/10 13:55:28 (15 years ago)
Author:
Daniela Dorner
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
17 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r9543 r9548  
    1818
    1919                                                 -*-*- END OF LINE -*-*-
     20
     21 2010/02/22 Daniela Dorner
     22
     23   * datacenter/db/menu.php:
     24     - added ObsLevel and download link column for cta pages
     25
     26   * datacenter/db/ctadefs.php:
     27     - added observation level
     28
     29   * datacenter/db/ctamcinfo.php:
     30     - added column with download link for the files
     31
     32   * datacenter/db/builddatasets.php, datacenter/db/ctamcinfo.php,
     33     datacenter/db/culminating.php, datacenter/db/datacheck.php,
     34     datacenter/db/datasetinfo-aio.php, datacenter/db/ganymed.php,
     35     datacenter/db/include.php, datacenter/db/mcinfo.php,
     36     datacenter/db/opticaldata.php, datacenter/db/printtable.php,
     37     datacenter/db/queryrbk.php, datacenter/db/runinfo-aio.php,
     38     datacenter/db/sequence.php, datacenter/db/sequinfo-aio.php,
     39     datacenter/db/sources.php, datacenter/db/statussbs.php:
     40     - bugfix for get.txt
     41
     42
    2043
    2144 2010/02/01 Daniela Dorner
    … …  
    551574     - added usage of $timelimits array in function StatusQuery(), i.e.
    552575       provides possibility to set different values for time after
    553        which job is marked as 'crashef' for diffent steps
     576       which job is marked as 'crashed' for diffent steps
    554577
    555578   * datacenter/db/builddatasets.php, datacenter/db/datacheck.php,

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

    r9510 r9548  
    848848        mysql_close($db_id);
    849849
    850         PrintSubmittedQuery($query0, $html, $db, "");
     850        if ($html=="1")
     851            PrintSubmittedQuery($query0, $db, "");
    851852    }
    852853

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

    r9547 r9548  
    299299
    300300        if ($html=="1")
    301             PrintSubmittedQuery($query0, $html, $db, "");
     301            PrintSubmittedQuery($query0, $db, "");
    302302    }
    303303

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

    r9498 r9548  
    237237        mysql_close($db_id);
    238238
    239         PrintSubmittedQuery($query0, $html, $db, "old");
     239        if ($html=="1")
     240            PrintSubmittedQuery($query0, $db, "old");
    240241    }
    241242    include ("include.php");

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

    r9498 r9548  
    430430        mysql_close($db_id);
    431431
    432         PrintSubmittedQuery($query0, $html, $db, "old");
     432        if ($html=="1")
     433            PrintSubmittedQuery($query0, $db, "old");
    433434    }
    434435

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

    r9498 r9548  
    246246        mysql_close($db_id);
    247247
    248         PrintSubmittedQuery($query0, $html, $db, "");
     248        if ($html=="1")
     249            PrintSubmittedQuery($query0, $db, "");
    249250    }
    250251

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

    r9106 r9548  
    307307        mysql_close($db_id);
    308308
    309         PrintSubmittedQuery($query0, $html, $db, "old");
     309        if ($html=="1")
     310            PrintSubmittedQuery($query0, $db, "old");
    310311    }
    311312

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

    r9509 r9548  
    266266}
    267267
    268 function PrintSubmittedQuery($query0, $html, $db, $old)
     268function PrintSubmittedQuery($query0, $db, $old)
    269269{
    270270    //diplay query on old websites
    271271    if (empty($old))
    272         printf("<tr class='Block' id='showquery' style='display:none'><td>");
    273     else
    274         printf("<tr class='Block' id='showquery' style='display:block'><td>");
    275     if ($html=="1")
    276     {
    277         printf("<b>DB:</b> %s <br>", $db);
    278         printf("<U><B>submitted query:</B></U><BR>%s<BR>", htmlspecialchars($query0));
    279     }
    280     printf("</td></tr>");
     272        printf("<tr class='Block' id='showquery' style='display:none'><td>\n");
     273    else
     274        printf("<tr class='Block' id='showquery' style='display:block'><td>\n");
     275    printf("<b>DB:</b> %s <br>\n", $db);
     276    printf("<U><B>submitted query:</B></U><BR>%s<BR>\n", htmlspecialchars($query0));
     277    printf("</td></tr>\n");
    281278}
    282279

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

    r9498 r9548  
    293293        mysql_close($db_id);
    294294
    295         PrintSubmittedQuery($query0, $html, $db, "");
     295        if ($html=="1")
     296            PrintSubmittedQuery($query0, $db, "");
    296297    }
    297298

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

    r9498 r9548  
    261261        mysql_close($db_id);
    262262
    263         PrintSubmittedQuery($query0, $html, $db, "old");
     263        if ($html=="1")
     264            PrintSubmittedQuery($query0, $db, "old");
    264265    }
    265266

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

    r9498 r9548  
    6161        mysql_close($db_id);
    6262
    63         PrintSubmittedQuery($query0, $html, $db, "old");
     63        if ($html=="1")
     64            PrintSubmittedQuery($query0, $db, "old");
    6465    }
    6566

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

    r9498 r9548  
    8787        mysql_close($db_id);
    8888
    89         PrintSubmittedQuery($query0, $html, $db, "old");
     89        if ($html=="1")
     90            PrintSubmittedQuery($query0, $db, "old");
    9091    }
    9192

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

    r9498 r9548  
    338338        mysql_close($db_id);
    339339
    340         PrintSubmittedQuery($query0, $html, $db, "");
     340        if ($html=="1")
     341            PrintSubmittedQuery($query0, $db, "");
    341342    }
    342343

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

    r9105 r9548  
    580580        mysql_close($db_id);
    581581
    582         PrintSubmittedQuery($query0, $html, $db, "old");
     582        if ($html=="1")
     583            PrintSubmittedQuery($query0, $db, "old");
    583584    }
    584585

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

    r9500 r9548  
    411411        mysql_close($db_id);
    412412
    413         PrintSubmittedQuery($query0, $html, $db, "");
     413        if ($html=="1")
     414            PrintSubmittedQuery($query0, $db, "");
    414415    }
    415416

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

    r9498 r9548  
    126126        mysql_close($db_id);
    127127
    128         PrintSubmittedQuery($query0, $html, $db, "old");
     128        if ($html=="1")
     129            PrintSubmittedQuery($query0, $db, "old");
    129130    }
    130131

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

    r9498 r9548  
    193193        mysql_close($db_id);
    194194
    195         PrintSubmittedQuery($query0, $html, $db, "old");
     195        if ($html=="1")
     196            PrintSubmittedQuery($query0, $db, "old");
    196197    }
    197198
Note: See TracChangeset for help on using the changeset viewer.