IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 27054


Ignore:
Timestamp:
Feb 24, 2010, 1:33:57 PM (16 years ago)
Author:
eugene
Message:

various improvements

Location:
trunk/ippMonitor
Files:
2 added
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/ippMonitor/Makefile.in

    r26955 r27054  
    3737$(DESTWWW)/phptest.php \
    3838$(DESTWWW)/site.php \
     39$(DESTWWW)/showimage.php \
     40$(DESTWWW)/nightSummary.php \
    3941$(DESTWWW)/getimage.php
    4042

  • trunk/ippMonitor/configure.tcsh

    r24662 r27054  
    133133if ($#args != 1) goto usage
    134134
     135set hostname = `hostname -f`
     136
    135137echo
    136138echo "prefix: $prefix"
    … …  
    191193cat tmp.2           | sed "s|@PERLLIB@|$libdir|" > tmp.1
    192194cat tmp.1           | sed "s|@SITE@|$site|"      > tmp.2
    193 cat tmp.2           | sed "s|@DBI@|$DBI|"        > raw/site.php
     195cat tmp.2           | sed "s|@DBI@|$DBI|"        > tmp.1
     196cat tmp.1           | sed "s|@HOST@|$hostname|"  > raw/site.php
    194197rm -f tmp.1 tmp.2
    195198

  • trunk/ippMonitor/def/destreakRun.d

    r26994 r27054  
    1515FIELD magicDSRun.stage,        5, %s,     Stage
    1616FIELD magicDSRun.stage_id,     5, %d,     Stage ID
     17FIELD magicDSFile.component,   5, %s,     Component
     18FIELD magicDSFile.streak_frac, 5, %.3f,   Streak Frac
    1719FIELD magicDSRun.cam_id,       5, %d,     Camera ID
    1820FIELD magicDSRun.label,        10, %s,     Label

  • trunk/ippMonitor/raw/ipp.imfiles.dat

    r26947 r27054  
    1717menutop   | menutop      | plain   | External Links               | none           
    1818menutop   | menutop      | link    | test page                    | phptest.php     
     19menutop   | menutop      | link    | night summary                | nightSummary.php

  • trunk/ippMonitor/raw/ipp.php

    r26947 r27054  
    283283  if (! $project) { $project = "none"; }
    284284
    285   // hardwire this name based on the configuration (use ipp.php.in)
     285  // these are defined in site.php
    286286  global $DBHOST;
    287   $HOST = $_SERVER['SERVER_NAME'];
    288   echo "<p style=\"font-size:50%\">host: $HOST, db: $DBHOST</p>\n";
     287  global $WWWHOST;
     288
     289  echo "<p style=\"font-size:50%\">host: $WWWHOST, db: $DBHOST</p>\n";
    289290  echo "<table class=page cellspacing=10px><tr><td valign=top>\n";
    290291  echo "<table class=menu cellspacing=0px>\n";
    … …  
    448449  }
    449450  if ($value == "") { return $where; }
     451
     452  global $restricted;
     453  $restricted = 1;
     454
    450455  if ($where) {
    451456    $where = $where . " AND";
    … …  
    680685
    681686  if ($basename && $camera && $rule) {
     687    echo "<a href=\"showimage.php?name=$basename&rule=$rule&camera=$camera&class_id=$class_id\">\n";
    682688    echo "<img $size src=\"getimage.php?name=$basename&rule=$rule&camera=$camera&class_id=$class_id\">\n";
     689    echo "</a>\n";
    683690  }
    684691}

  • trunk/ippMonitor/raw/site.php.in

    r24662 r27054  
    11<?php
    22
    3 $DBHOST = "@DBHOST@";
    4 $DBUSER = "@DBUSER@";
    5 $DBPASS = "@DBPASS@";
     3$WWWHOST = "@HOST@";
     4$DBHOST  = "@DBHOST@";
     5$DBUSER  = "@DBUSER@";
     6$DBPASS  = "@DBPASS@";
    67
    78$PERLLIB = "@PERLLIB@";
Note: See TracChangeset for help on using the changeset viewer.