Changeset 28452

Timestamp:

Jun 24, 2010, 10:32:34 AM (16 years ago)

Author:

eugene

Message:

merging new features from trunk

Location:

tags/ipp-20100623/ippMonitor

Files:

• . (modified) (1 prop)
• Makefile.in (modified) (4 diffs)
• def/maskStats.d (copied) (copied from trunk/ippMonitor/def/maskStats.d )
• def/rawExp.d (modified) (1 diff)
• def/rawSummary.d (copied) (copied from trunk/ippMonitor/def/rawSummary.d )
• raw/czartool_labels.php (modified) (4 diffs)
• raw/histogram.php (copied) (copied from trunk/ippMonitor/raw/histogram.php )
• raw/ipp.imfiles.dat (modified) (1 diff)
• raw/ipp.load.dat (modified) (1 diff)
• raw/ipp.php (modified) (3 diffs)
• raw/show_and_delete_image.php (copied) (copied from trunk/ippMonitor/raw/show_and_delete_image.php )
• scripts/build_histogram.dvo (copied) (copied from trunk/ippMonitor/scripts/build_histogram.dvo )
• scripts/czartool_checkServer.pl (modified) (1 diff)

tags/ipp-20100623/ippMonitor/Makefile.in

@@ -16 +16 @@
 $(DESTBIN)/czartool_getLabels.pl \
 $(DESTBIN)/czartool_checkServer.pl \
-$(DESTBIN)/czartool_getServerStatus.pl
+$(DESTBIN)/czartool_getServerStatus.pl \
+$(DESTBIN)/build_histogram.dvo \
+
 
 RAWSRC = \
@@ -50 +52 @@
 $(DESTWWW)/czartool_labels.php \
 $(DESTWWW)/czartool_servers.php \
+$(DESTWWW)/histogram.php \
+$(DESTWWW)/show_and_delete_image.php \
 
 
@@ -121 +125 @@
 $(DESTWWW)/rawScienceExp.php \
 $(DESTWWW)/rawExp.php \
+$(DESTWWW)/rawSummary.php \
 $(DESTWWW)/rawExpStats.php \
 $(DESTWWW)/summitExp.php \
@@ -171 +176 @@
 $(DESTWWW)/flatcorrRun.php \
 $(DESTWWW)/flatcorrChip.php \
-$(DESTWWW)/flatcorrCamera.php
+$(DESTWWW)/flatcorrCamera.php \
+$(DESTWWW)/maskStats.php
 
 PICTURES = \

tags/ipp-20100623/ippMonitor/def/rawExp.d

@@ -15 +15 @@
 FIELD    camera,      10,  %s,     Camera
 FIELD    exp_type,     8,  %s,     Type    
+FIELD    obs_mode,     8,  %s,     obs mode
 FIELD    dateobs,     19,  %T,     Date/Time
 FIELD    ra,           8,  %C, RA,           op=OP1      

tags/ipp-20100623/ippMonitor/raw/czartool_labels.php

@@ -95 +95 @@
         $str = "";
         $anyFaults = false; 
-        $link = "chipProcessedImfile_failure.php?menu=ipp.science.dat&pass=" . $pass . "&proj=" . $proj . "&label=" . $stdsLabel;
+        $link = "chipProcessedImfile_failure.php?pass=" . $pass . "&proj=" . $proj . "&chipRun.label=" . $label . "&chipRun.state=new";
         getStateAndFaults($db, $label,"chipRun", $state, "chip", $str, $anyFaults);
         write_table_cell($class, '%s', $anyFaults ? $link : "", $str);
 
-        $link = "camProcessedExp_failure.php?pass=" . $pass . "&proj=" . $proj . "&label=" . $stdsLabel;
+        $link = "camProcessedExp_failure.php?pass=" . $pass . "&proj=" . $proj . "&camRun.label=" . $label . "&camRun.state=new";
         getStateAndFaults($db, $label,"camRun", $state, "cam", $str, $anyFaults);
         write_table_cell($class, '%s',  $anyFaults ? $link : "", $str);
@@ -107 +107 @@
         write_table_cell($class, '%s',  $anyFaults ? $link : "", $str);
 
-        $link = "warpFailedSkyfiles.php?pass=" . $pass . "&proj=" . $proj;
+        $link = "warpFailedSkyfiles.php?pass=" . $pass . "&proj=" . $proj . "&warpRun.label=" . $label . "&warpRun.state=new";
         getStateAndFaults($db, $label,"warpRun", $state, "warp", $str, $anyFaults);
         write_table_cell($class, '%s',  $anyFaults ? $link : "",  $str);
         
-        $link = "stackFailedSkyfile.php?pass=" . $pass . "&proj=" . $proj;
+        $link = "stackFailedSkyfile.php?pass=" . $pass . "&proj=" . $proj . "&stackRun.label=" . $label . "&stackRun.state=new";
         getStateAndFaults($db, $label,"stackRun", $state, "stack", $str, $anyFaults);
         write_table_cell($class, '%s',  $anyFaults ? $link : "", $str);
 
-        $link = "diffFailedSkyfile.php?pass=" . $pass . "&proj=" . $proj;
+        $link = "diffFailedSkyfile.php?pass=" . $pass . "&proj=" . $proj . "&diffRun.label=" . $label . "&diffRun.state=new";
         getStateAndFaults($db, $label,"diffRun", $state, "diff", $str, $anyFaults);
         write_table_cell($class, '%s',  $anyFaults ? $link : "",  $str);
@@ -189 +189 @@
         $anyFaults = false; 
 
-        $link = "chipProcessedImfile_failure.php?menu=ipp.science.dat&pass=" . $pass . "&proj=" . $proj . "&label=" . $stdsLabel;
+        $link = "chipProcessedImfile_failure.php?pass=" . $pass . "&proj=" . $proj . "&chipRun.label=" . $stdsLabel . "&chipRun.state=new";
         getStateAndFaults($db, $stdsLabel,"chipRun", $selectedState, "chip", $str, $anyFaults);
         write_table_cell($class, '%s', $anyFaults ? $link : "", $str);
 
-        $link = "camProcessedExp_failure.php?pass=" . $pass . "&proj=" . $proj . "&label=" . $stdsLabel;
+        $link = "camProcessedExp_failure.php?pass=" . $pass . "&proj=" . $proj . "&camRun.label=" . $stdsLabel . "&camRun.state=new";
         getStateAndFaults($db, $stdsLabel,"camRun", $selectedState, "cam", $str, $anyFaults);
         write_table_cell($class, '%s',  $anyFaults ? $link : "", $str);
@@ -201 +201 @@
         write_table_cell($class, '%s',  $anyFaults ? $link : "", $str);
 
-        $link = "warpFailedSkyfiles.php?pass=" . $pass . "&proj=" . $proj;
+        $link = "warpFailedSkyfiles.php?pass=" . $pass . "&proj=" . $proj . "&warpRun.label=" . $stdsLabel . "&warpRun.state=new";
         getStateAndFaults($db, $stdsLabel,"warpRun", $selectedState, "warp", $str, $anyFaults);
         write_table_cell($class, '%s',  $anyFaults ? $link : "",  $str);
         
-        $link = "stackFailedSkyfile.php?pass=" . $pass . "&proj=" . $proj;
+        $link = "stackFailedSkyfile.php?pass=" . $pass . "&proj=" . $proj . "&stackRun.label=" . $stdsLabel . "&stackRun.state=new";
         getStateAndFaults($db, $stdsLabel,"stackRun", $selectedState, "stack", $str, $anyFaults);
         write_table_cell($class, '%s',  $anyFaults ? $link : "", $str);
 
-        $link = "diffFailedSkyfile.php?pass=" . $pass . "&proj=" . $proj;
+        $link = "diffFailedSkyfile.php?pass=" . $pass . "&proj=" . $proj . "&diffRun.label=" . $stdsLabel . "&diffRun.state=new";
         getStateAndFaults($db, $stdsLabel,"diffRun", $selectedState, "diff", $str, $anyFaults);
         write_table_cell($class, '%s',  $anyFaults ? $link : "",  $str);

tags/ipp-20100623/ippMonitor/raw/ipp.imfiles.dat

@@ -22 +22 @@
 menutop   | menutop      | link    | simple plot - cam            | simplePlotcam.php
 menutop   | menutop      | link    | czartool                     | czartool_labels.php
-
+menutop   | menutop      | link    | mask stats                   | maskStats.php
+menutop   | menutop      | link    | histogram                    | histogram.php

tags/ipp-20100623/ippMonitor/raw/ipp.load.dat

@@ -2 +2 @@
 
 menutop   | menutop      | plain   |                         | 
+menulink  | menuselect   | link    | Raw Exp Summary              | rawSummary.php             
 menulink  | menuselect   | link    | Raw Exposures                | rawExp.php             
 menulink  | menuselect   | link    | Raw Detrend Exp              | rawDetrendExp.php             

tags/ipp-20100623/ippMonitor/raw/ipp.php

@@ -564 +564 @@
 }
 
+// 
+function button_restrict_checkbox ($key, $line) {
+  $htmlkey = preg_replace ('|\.|', '_', $key);
+  if ($_SERVER[REQUEST_METHOD] == 'GET') { 
+    $value = $_GET[$htmlkey]; 
+  } else {
+    $value = $_POST[$htmlkey];
+  }
+  if ($value != "") {
+    if ($line) {
+      $line = $line . "&$htmlkey=$value";
+    } else {
+      $line = "$htmlkey=$value";
+    }
+  }
+  return $line;
+}
+
+// 
+function button_restrict_radio ($key, $line) {
+  $htmlkey = preg_replace ('|\.|', '_', $key);
+  if ($_SERVER[REQUEST_METHOD] == 'GET') { 
+    $value = $_GET[$htmlkey]; 
+  } else {
+    $value = $_POST[$htmlkey];
+  }
+  if ($value != "") {
+    if ($line) {
+      $line = $line . "&$htmlkey=$value";
+    } else {
+      $line = "$htmlkey=$value";
+    }
+  }
+  return $line;
+}
+
 function write_header_cell ($class, $name) {
-
   echo "<th class=\"$class\">$name</th>\n";
 }
@@ -637 +672 @@
   if ($value != "") { 
     echo "value=\"$value\">";
-  } 
+  } else {
+    echo ">";
+  }
   echo "</td>\n";
+}
+
+// checkbox
+function write_query_checkbox ($key, $comment) {
+  $htmlkey = preg_replace ('|\.|', '_', $key);
+
+  if ($_SERVER[REQUEST_METHOD] == 'GET') { 
+    $value = $_GET[$htmlkey]; 
+  } else {
+    $value = $_POST[$htmlkey];
+  }
+  echo "<td> <input type=\"checkbox\" name=\"$htmlkey\"";
+  if ($value == "on") { 
+    echo " checked>";
+  } else {
+    echo ">";
+  }
+  echo "$comment ($htmlkey/$value)</td>\n";
+}
+
+// checkbox
+function write_query_radio ($value, $key) {
+  $htmlkey = preg_replace ('| |', '_', $key);
+  $htmlvalue = preg_replace ('|\.|', '_', $value);
+
+  if ($_SERVER[REQUEST_METHOD] == 'GET') { 
+    $value = $_GET[$htmlkey]; 
+  } else {
+    $value = $_POST[$htmlkey];
+  }
+  if ($htmlvalue == get_value_from_key($htmlkey, TRUE)) {
+    $checked = "checked";
+  } else {
+    $checked = "";
+  }
+  echo "<td> <input type=\"radio\" name=\"$htmlkey\" value=\"$htmlvalue\" $checked/>";
+  echo "$key ($htmlkey/$htmlvalue)</td>\n";
 }
 
@@ -778 +852 @@
 // $myPage = $_SERVER[SCRIPT_NAME] . "?pass=$pass";
 
+//////////////////////////////////////////////////////////////////////////
+// Return the value associated to the key (GET or POST method)
+// If convertKeyToHtmlkey is true, the key is converted to a 
+// so-called HTML, i.e. the key where '.' are replaced by '_'
+// (e.g. the conversion of 'f.o.o.b_a_r' is 'f_o_o_b_a_r'.
+//
+function get_value_from_key ($key, $convertKeyToHtmlkey) {
+  if ($convertKeyToHtmlkey) {
+    $htmlkey = preg_replace ('|\.|', '_', $key);
+  } else {
+    $htmlkey = $key;
+  }
+  if ($_SERVER[REQUEST_METHOD] == 'GET') { 
+    return $_GET[$htmlkey]; 
+  } else {
+    return $_POST[$htmlkey]; 
+  }
+}
+
 ?>

tags/ipp-20100623/ippMonitor/scripts/czartool_checkServer.pl

@@ -17 +17 @@
     if ($line =~ m/Scheduler is stopped/) {$isRunning = 0; $foundStatus=1;last;}
     if ($line =~ m/Scheduler is running/) {$isRunning = 1; $foundStatus=1;last;}
-    if ($line =~ m/Task Staus/) {last;}
+    if ($line =~ m/Task Status/) {last;}
 
 }