| $tmp[0] | null | null | $tmp[3]";
+ list($expType, $downloadState, $rawState, $count, $summit_exp, $pz_exp, $raw_exp) = $tmp;
+ if ($downloadState == NULL) {
+ echo "| $expType ($summit_exp) | loading imfiles | null | $count";
} else {
- if ($tmp[1] == 'run') {
- echo "| $tmp[0] | loading | null | $tmp[3]";
+ if ($downloadState == 'run') {
+ echo "| $expType ($summit_exp) | summit_copy ($pz_exp) | saving ($pz_exp) | $count";
} else {
- if ($tmp[2] == NULL) {
- echo "| $tmp[0] | $tmp[1] | loading | $tmp[3]";
+ if ($rawState == NULL) {
+ echo "| $expType ($summit_exp) | $downloadState ($pz_exp) | registering ($pz_exp) | $count";
} else {
- echo "| $tmp[0] | $tmp[1] | downloaded | $tmp[3]";
+ echo " | | $expType ($summit_exp) | $downloadState ($pz_exp) | $rawState ($raw_exp) | $count";
}
}
@@ -1561,35 +1548,85 @@
}
- echo " | | Last night $datem1 (UTC)";
- $sql = "SELECT summitExp.exp_type,pzDownloadExp.state,rawExp.state,COUNT(*) FROM summitExp
- LEFT JOIN pzDownloadExp USING (summit_id) LEFT JOIN rawExp on summitExp.exp_name = rawExp.exp_name
- WHERE summitExp.dateobs like '$datem1%' group by summitExp.exp_type,pzDownloadExp.state,rawExp.state";
+ echo " |
|---|
Last night $previousDate (UTC), $mjdDaym1 (MJD)";
+ $sql = "
+ SELECT sum_type, pzstate, rawstate, count(*), sum_exp, pz_exp, raw_exp
+ FROM
+ (SELECT summitExp.exp_type as sum_type, pzDownloadExp.state as pzstate, rawExp.state as rawstate, summitExp.exp_name as sum_exp, pzDownloadExp.exp_name as pz_exp, rawExp.exp_name as raw_exp
+ FROM summitExp
+ LEFT JOIN pzDownloadExp USING (summit_id)
+ LEFT JOIN rawExp ON summitExp.exp_name = rawExp.exp_name
+ WHERE summitExp.summit_id >= (
+ SELECT COALESCE(MIN(summit_id), 0)
+ FROM summitExp
+ WHERE exp_name LIKE '$expnamem5'
+ )
+ AND summitExp.exp_name LIKE '$expnamem1' ORDER BY summitExp.dateobs desc) as sub
+ GROUP BY sum_type, pzstate, rawstate";
+ // $sql = "
+ // SELECT summitExp.exp_type, pzDownloadExp.state, rawExp.state, COUNT(*)
+ // FROM summitExp
+ // LEFT JOIN pzDownloadExp USING (summit_id)
+ // LEFT JOIN rawExp ON summitExp.exp_name = rawExp.exp_name
+ // WHERE summitExp.summit_id >= (
+ // SELECT COALESCE(MIN(summit_id), 0)
+ // FROM summitExp
+ // WHERE exp_name LIKE '$expnamem5'
+ // )
+ // AND summitExp.exp_name LIKE '$expnamem1'
+ // GROUP BY summitExp.exp_type, pzDownloadExp.state, rawExp.state";
+ if ($debug) {echo "$sql
";}
+
$qry = $projectdb->query($sql);
while ($qry->fetchInto($tmp)) {
- if ($tmp[1] == NULL) {
- echo " |
|---|
| $tmp[0] | null | null | $tmp[3]";
+ list($expType, $downloadState, $rawState, $count, $summit_exp, $pz_exp, $raw_exp) = $tmp;
+ if ($downloadState == NULL) {
+ echo "| $expType ($summit_exp) | loading imfiles | null | $count";
} else {
- if ($tmp[1] == 'run') {
- echo "| $tmp[0] | loading | null | $tmp[3]";
+ if ($downloadState == 'run') {
+ echo "| $expType ($summit_exp) | summit_copy ($pz_exp) | saving ($pz_exp) | $count";
} else {
- if ($tmp[2] == NULL) {
- echo "| $tmp[0] | $tmp[1] | loading | $tmp[3]";
+ if ($rawState == NULL) {
+ echo "| $expType ($summit_exp) | $downloadState ($pz_exp) | registering | $count";
} else {
- echo "| $tmp[0] | $tmp[1] | downloaded | $tmp[3]";
+ echo " | | $expType ($summit_exp) | $downloadState ($pz_exp) | $rawState ($raw_exp) | $count";
}
}
}
}
- // timer finished
+ //while ($qry->fetchInto($tmp)) {
+ // list($expType, $downloadState, $rawState, $count) = $tmp;
+ // if ($downloadState == NULL) {
+ // echo " | | $expType | null | null | $count";
+ // } else {
+ // if ($downloadState == 'run') {
+ // echo "| $expType | loading | null | $count";
+ // } else {
+ // if ($rawState == NULL) {
+ // echo "| $expType | $downloadState | loading | $count";
+ // } else {
+ // echo "| $expType | $downloadState | download ($rawState) | $count";
+ // }
+ // }
+ // }
+ //}
+
echo " | ";
- $time = microtime();
- $time = explode(' ', $time);
- $time = $time[1] + $time[0];
- $finish = $time;
- $total_time = round(($finish - $start), 3);
- echo "loading in $total_time seconds.";
- $start= $finish;
+ // End timer
+ $total_time = round(microtime(true) - $start, 3);
+ echo "loading in $total_time seconds
";
+
echo " |
|---|
";
echo "
";
+}
+
+function formatState($state) {
+ // Formats display of the state for better readability
+ if (is_null($state)) {
+ return "null";
+ } elseif ($state == 'run') {
+ return "loading";
+ } else {
+ return $state;
+ }
}
###########################################################################
@@ -1608,5 +1645,5 @@
echo "";
echo "
";
- echo " ";
+ echo " ";
echo " ";
echo " Free";
@@ -1686,7 +1723,8 @@
echo " },";
echo " bar: { groupWidth: '95%' },";
- echo " chartArea: {left:70, top:30, right:20, bottom:40},";
- echo " fontSize: 12,";
- echo " isStacked: true";
+ echo " chartArea: {left:100, top:30, right:20, bottom:40},";
+ echo " fontSize: 15,";
+ echo " isStacked: true,";
+ echo " colors: ['#76A7FA', '#FF5733', '#C70039', '#900C3F', '#581845']";
echo " };";
echo " var chart = new google.visualization.BarChart(document.getElementById('disk_div'));";
@@ -1821,14 +1859,18 @@
$date = gmdate("Y-m-d");
- $sql = "SELECT MAX(exp_id) FROM rawExp WHERE dateobs >= date_sub('$date', interval 20 day) AND dateobs <= date_sub('$date', interval 10 day)";
+ $sql = "SELECT MAX(exp_id) FROM rawExp WHERE dateobs BETWEEN DATE_SUB('$date', INTERVAL 20 DAY) AND DATE_SUB('$date', INTERVAL 10 DAY)";
+ if ($debug) {echo "$sql ";}
$qry = $db->query($sql);
+
if (dberror($qry)) {
- print "*** WARNING: no data in period 10-20 days before requested date (query will be slower) **\n";
+ echo "*** WARNING: No data in the period 10-20 days before requested date (query will be slower) **\n";
$refExpID = 0;
- }
- $qry->fetchInto($refExpID);
- if ($refExpID[0] = 'NULL') {
- $refExpID[0] = 0;
- }
+ } else {
+ $qry->fetchInto($refExpID);
+ $refExpID = isset($refExpID[0]) ? $refExpID[0] : 0;
+ }
+ // Print the result of the query
+ if ($debug) {echo "The result of MAX(exp_id) is: $refExpID ";}
+ {echo "The result of MAX(exp_id) is: $refExpID ";}
#Query for the needed data
@@ -1838,4 +1880,6 @@
# $sql.= " WHERE (rawExp.dateobs > utc_date() - INTERVAL 14 hour) and (rawExp.dateobs < utc_date() + INTERVAL 10 hour)";
$sql.= " WHERE (rawExp.dateobs > utc_date())";
+# $sql.= " WHERE (rawExp.dateobs > '2024-10-24')";
+# $sql.= " AND (rawExp.dateobs < '2024-10-25')";
$sql.= " AND exp_id > $refExpID[0]";
$sql.= " AND exp_type = 'OBJECT' AND camRun.state like 'full' ORDER BY dateobs asc;";
@@ -1843,4 +1887,5 @@
$qry = $db->query($sql);
if (dberror($qry)) {echo " error with $sql \n";}
+# echo " error with $sql \n";
while ($qry->fetchInto($row)) {
$DQarray[] = $row;
@@ -2044,10 +2089,10 @@
#define new zeropoints
- if(substr($row[5],0,1) == 'g') {$col_string = 'blue'; $zpt_off = $zp - 25.013;}
- if(substr($row[5],0,1) == 'r') {$col_string = 'red'; $zpt_off = $zp - 24.840;}
- if(substr($row[5],0,1) == 'i') {$col_string = '#6a3d9a'; $zpt_off = $zp - 24.711;}
- if(substr($row[5],0,1) == 'z') {$col_string = 'green'; $zpt_off = $zp - 24.30;}
- if(substr($row[5],0,1) == 'y') {$col_string = 'cyan'; $zpt_off = $zp - 23.57;}
- if(substr($row[5],0,1) == 'w') {$col_string = 'grey'; $zpt_off = $zp - 26.000;}
+ if(substr($row[5],0,1) == 'g') {$col_string = '#00f000'; $zpt_off = $zp - 25.013;}
+ if(substr($row[5],0,1) == 'r') {$col_string = '#f00000'; $zpt_off = $zp - 24.840;}
+ if(substr($row[5],0,1) == 'i') {$col_string = '#f05000'; $zpt_off = $zp - 24.711;}
+ if(substr($row[5],0,1) == 'z') {$col_string = '#0050a0'; $zpt_off = $zp - 24.300;}
+ if(substr($row[5],0,1) == 'y') {$col_string = '#ffe000'; $zpt_off = $zp - 23.570;}
+ if(substr($row[5],0,1) == 'w') {$col_string = '#808080'; $zpt_off = $zp - 26.060;}
$tt_string1 = sprintf('time: %s\n zeropoint: %s\n filter: %s\n exp_time: %s\n comment: %s', $timestamp, $zp,$row[5],$row[6],$row[7]);
@@ -2101,4 +2146,7 @@
}
+
+
+
###########################################################################
#
@@ -2108,8 +2156,5 @@
function Gettimeseries($db, $selectedMode, $selectedLabel, $proj, $selectedStage) {
// timer start
- $time = microtime();
- $time = explode(' ', $time);
- $time = $time[1] + $time[0];
- $start = $time;
+ $start = microtime(true);
// google chart javascript source code
@@ -2512,11 +2557,5 @@
// timer end
- $time = microtime();
- $time = explode(' ', $time);
- $time = $time[1] + $time[0];
- $finish = $time;
- $total_time = round(($finish - $start), 3);
- $start= $finish;
- echo " loading in $total_time seconds";
+ echo " loading in " . round((microtime(true) - $start), 3) . " seconds. ";
}
@@ -2994,4 +3033,370 @@
}
+
+###########################################################################
+#
+# Get data quality
+#
+###########################################################################
+function getDataQuality2($db) {
+ // Start timer
+ $start = microtime(true);
+
+ $mjdDay = getMJD();
+ $expname = "o".$mjdDay."%";
+
+ $sql = "SELECT SUBTIME(dateobs, '10:00:00') AS time,
+ round(( 367*YEAR(dateobs)- FLOOR((7 * (YEAR(dateobs) + FLOOR((MONTH(dateobs) + 9) / 12))) / 4) + FLOOR(275 * MONTH(dateobs) / 9)
+ + DAY(dateobs) + 1721013.5 + (HOUR(dateobs) / 24.0) + (MINUTE(dateobs) / 1440.0) + (SECOND(dateobs) / 86400.0) - 2400000.5), 5) AS MJD,
+ filter, comment, ra*180/pi() as RA, decl*180/pi() as DECL, exp_name, alt, az, fwhm_major, fwhm_minor, zpt_obs, zpt_stdev, rawExp.exp_id
+ FROM rawExp JOIN chipRun using (exp_id) JOIN camRun using (chip_id) JOIN camProcessedExp using (cam_id)
+ WHERE rawExp.exp_name like '$expname'
+ AND exp_type = 'OBJECT'
+ AND camRun.state like 'full'
+ AND camProcessedExp.fault = 0
+ AND camProcessedExp.zpt_obs != 0; ";
+
+ $DQarray = array();
+ $qry = $db->query($sql);
+ if (dberror($qry)) {
+ echo " Error with $sql\n";
+ return;
+ }
+
+ while ($qry->fetchInto($row)) {
+ $DQarray[] = $row;
+ }
+
+ // Ensure $DQarray is not empty
+ if (empty($DQarray)) {
+ echo " No data for MJD: $mjdDay ";
+ return; // Stop execution if no data to encode
+ }
+
+ // Convert data array to JSON for easier handling in JavaScript
+ $dataJson = json_encode($DQarray);
+
+ if ($dataJson === false) {
+ echo " Error encoding JSON: " . json_last_error_msg(); // Display any JSON encoding errors
+ return; // Stop execution if JSON encoding fails
+ }
+
+ echo ""; // Log JSON output to console for debugging
+
+echo <<
+
+
+
+
+
+
+
+
+
+HTML;
+ // End timer
+ $total_time = round(microtime(true) - $start, 3);
+ echo " loading plot in $total_time seconds
";
+
+}
+
+
+
function getprocrate ($proc1, $proc0, $trange) {
if($proc1 > $proc0) {
Index: /branches/eam_branches/ipp-20230313/ippMonitor/raw/ipp.php
===================================================================
--- /branches/eam_branches/ipp-20230313/ippMonitor/raw/ipp.php (revision 42750)
+++ /branches/eam_branches/ipp-20230313/ippMonitor/raw/ipp.php (revision 42751)
@@ -958,3 +958,29 @@
}
+function getMJD() {
+ // Get the current date and time in UTC as a Unix timestamp
+ $currentTimestamp = time();
+
+ // Convert the Unix timestamp to Julian Date (JD)
+ $jd = 2440587.5 + ($currentTimestamp / 86400);
+
+ // Calculate the Modified Julian Date (MJD)
+ $mjd = $jd - 2400000.5;
+ $mjdDay = floor($mjd); // Get only the day part of MJD
+
+ // Concatenate the desired string for expname
+ //$expname = "o" . $mjdDay . "%";
+
+ // Format the current date in 'YYYY-MM-DD-HH:mm:ss' for display
+ //$currentUTC = gmdate('Y-m-d-H:i:s', $currentTimestamp);
+
+ // Display the result
+ //echo "Current UTC: $currentUTC, MJD: $mjdDay, expname: $expname ";
+
+ // Return MJD day as an integer
+ return $mjdDay;
+}
+
+
+
?>
Index: /branches/eam_branches/ipp-20230313/ippMonitor/raw/ipp.plots.dat
===================================================================
--- /branches/eam_branches/ipp-20230313/ippMonitor/raw/ipp.plots.dat (revision 42750)
+++ /branches/eam_branches/ipp-20230313/ippMonitor/raw/ipp.plots.dat (revision 42751)
@@ -22,2 +22,7 @@
menulink | menuselect | link | Plot Background (chipProcessedImfile) vs Moon Phase (rawExp) | scatterCpiBgReMpImage.php
menulink | menuselect | link | Plot Background (chipProcessedImfile) vs Sun Angle (rawExp) | scatterCpiBgReSaImage.php
+
+menutop | menutop | plain | |
+menulink | menuselect | link | pointing status | scatterPlotPointing.php
+menulink | menuselect | link | data quality status | scatterPlotDataQuality.php
+menulink | menuselect | link | airmass status | scatterPlotAirmassMcal.php
Index: /branches/eam_branches/ipp-20230313/ippMonitor/raw/scatterPlotAirmassMcal.php
===================================================================
--- /branches/eam_branches/ipp-20230313/ippMonitor/raw/scatterPlotAirmassMcal.php (revision 42751)
+++ /branches/eam_branches/ipp-20230313/ippMonitor/raw/scatterPlotAirmassMcal.php (revision 42751)
@@ -0,0 +1,633 @@
+ Data Quality ";
+
+// set up the form
+echo " \n";
+
+if ($row[0] == 0) {
+ menu_end();
+}
+
+//$datFilename = tempnam("/tmp", "dvodat.");
+//$pngFilename = $datFilename.".png";
+//
+//$datfile = fopen($datFilename, "w");
+//chmod($datFilename, 0777);
+//
+//// output the results to tmpfile
+//while (dbFetchInto($qry, $row)) {
+// $line = "";
+// foreach ($row as $i => $value) {
+// switch ($value) {
+// case 'g.00002':
+// $filter = 1;
+// break;
+// case 'r.00002':
+// $filter = 2;
+// break;
+// case 'i.00002':
+// $filter = 3;
+// break;
+// case 'z.00002':
+// $filter = 4;
+// break;
+// case 'y.00002':
+// $filter = 5;
+// break;
+// case 'w.00002':
+// $filter = 6;
+// break;
+// case 'g.00000':
+// $filter = 1;
+// break;
+// case 'r.00000':
+// $filter = 2;
+// break;
+// case 'i.00000':
+// $filter = 3;
+// break;
+// case 'z.00000':
+// $filter = 4;
+// break;
+// case 'y.00000':
+// $filter = 5;
+// break;
+// case 'w.00000':
+// $filter = 6;
+// break;
+// case 'OPEN':
+// $filter = 0;
+// break;
+// case 'g':
+// $filter = 1;
+// break;
+// case 'r':
+// $filter = 2;
+// break;
+// case 'i':
+// $filter = 3;
+// break;
+// case 'z':
+// $filter = 4;
+// break;
+// case 'y':
+// $filter = 5;
+// break;
+// case 'w':
+// $filter = 6;
+// break;
+// default:
+// $filter = $value;
+// break;
+// }
+// $line .= "$filter ";
+// }
+// if (preg_match('/^[ \t]*$/', $line) == 0) {//Don't write empty lines
+// $line = preg_replace('/[ \t]*$/', '', $line);
+// fwrite ($datfile, $line."\n");
+// }
+//}
+//fclose($datfile);
+//
+//echo " ![](\"skyplot.php?input=$datFilename&output=$pngFilename&title='Sky_Plot_Raw'\") \n";
+//
+// ** TAIL CODE **
+
+echo " WHERE: $WHERE
\n";
+echo " SQL: $sql
\n";
+
+//echo "Temporary files are [$datFilename] and [$pngFilename]\n";
+
+echo " IPP-2244";
+
+// Start timer
+$start = microtime(true);
+
+$DQarray = array();
+$qry = $db->query($sql);
+if (dberror($qry)) {
+ echo " Error with $sql\n";
+ return;
+}
+
+while ($qry->fetchInto($row)) {
+ $DQarray[] = $row;
+}
+
+// Ensure $DQarray is not empty
+if (empty($DQarray)) {
+ echo " Error: Data array is empty.";
+ return; // Stop execution if no data to encode
+}
+
+// Convert data array to JSON for easier handling in JavaScript
+$dataJson = json_encode($DQarray);
+
+if ($dataJson === false) {
+ echo " Error encoding JSON: " . json_last_error_msg(); // Display any JSON encoding errors
+ return; // Stop execution if JSON encoding fails
+}
+
+echo ""; // Log JSON output to console for debugging
+
+echo <<
+
+
+
+
+
+
+
+
+
+
+HTML;
+
+// End timer
+$total_time = round(microtime(true) - $start, 3);
+echo " Loading plot in $total_time seconds
";
+
+menu_end();
+
+?>
Index: /branches/eam_branches/ipp-20230313/ippMonitor/raw/scatterPlotDataQuality.php
===================================================================
--- /branches/eam_branches/ipp-20230313/ippMonitor/raw/scatterPlotDataQuality.php (revision 42751)
+++ /branches/eam_branches/ipp-20230313/ippMonitor/raw/scatterPlotDataQuality.php (revision 42751)
@@ -0,0 +1,720 @@
+ Data Quality ";
+
+// set up the form
+echo " \n";
+
+if ($row[0] == 0) {
+ menu_end();
+}
+
+//$datFilename = tempnam("/tmp", "dvodat.");
+//$pngFilename = $datFilename.".png";
+//
+//$datfile = fopen($datFilename, "w");
+//chmod($datFilename, 0777);
+//
+//// output the results to tmpfile
+//while (dbFetchInto($qry, $row)) {
+// $line = "";
+// foreach ($row as $i => $value) {
+// switch ($value) {
+// case 'g.00002':
+// $filter = 1;
+// break;
+// case 'r.00002':
+// $filter = 2;
+// break;
+// case 'i.00002':
+// $filter = 3;
+// break;
+// case 'z.00002':
+// $filter = 4;
+// break;
+// case 'y.00002':
+// $filter = 5;
+// break;
+// case 'w.00002':
+// $filter = 6;
+// break;
+// case 'g.00000':
+// $filter = 1;
+// break;
+// case 'r.00000':
+// $filter = 2;
+// break;
+// case 'i.00000':
+// $filter = 3;
+// break;
+// case 'z.00000':
+// $filter = 4;
+// break;
+// case 'y.00000':
+// $filter = 5;
+// break;
+// case 'w.00000':
+// $filter = 6;
+// break;
+// case 'OPEN':
+// $filter = 0;
+// break;
+// case 'g':
+// $filter = 1;
+// break;
+// case 'r':
+// $filter = 2;
+// break;
+// case 'i':
+// $filter = 3;
+// break;
+// case 'z':
+// $filter = 4;
+// break;
+// case 'y':
+// $filter = 5;
+// break;
+// case 'w':
+// $filter = 6;
+// break;
+// default:
+// $filter = $value;
+// break;
+// }
+// $line .= "$filter ";
+// }
+// if (preg_match('/^[ \t]*$/', $line) == 0) {//Don't write empty lines
+// $line = preg_replace('/[ \t]*$/', '', $line);
+// fwrite ($datfile, $line."\n");
+// }
+//}
+//fclose($datfile);
+//
+//echo " \n";
+//
+// ** TAIL CODE **
+
+echo " WHERE: $WHERE
\n";
+echo " SQL: $sql
\n";
+
+//echo "Temporary files are [$datFilename] and [$pngFilename]\n";
+
+echo " IPP-2244";
+
+// Start timer
+$start = microtime(true);
+
+$DQarray = array();
+$qry = $db->query($sql);
+if (dberror($qry)) {
+ echo " Error with $sql\n";
+ return;
+}
+
+while ($qry->fetchInto($row)) {
+ $DQarray[] = $row;
+}
+
+// Ensure $DQarray is not empty
+if (empty($DQarray)) {
+ echo " Error: Data array is empty.";
+ return; // Stop execution if no data to encode
+}
+
+// Convert data array to JSON for easier handling in JavaScript
+$dataJson = json_encode($DQarray);
+
+if ($dataJson === false) {
+ echo " Error encoding JSON: " . json_last_error_msg(); // Display any JSON encoding errors
+ return; // Stop execution if JSON encoding fails
+}
+
+echo ""; // Log JSON output to console for debugging
+
+echo <<
+
+
+
+
+
+
+
+
+
+
+
+
+HTML;
+
+// End timer
+$total_time = round(microtime(true) - $start, 3);
+echo " Loading plot in $total_time seconds
";
+
+menu_end();
+
+?>
Index: /branches/eam_branches/ipp-20230313/ippMonitor/raw/scatterPlotPointing.php
===================================================================
--- /branches/eam_branches/ipp-20230313/ippMonitor/raw/scatterPlotPointing.php (revision 42751)
+++ /branches/eam_branches/ipp-20230313/ippMonitor/raw/scatterPlotPointing.php (revision 42751)
@@ -0,0 +1,715 @@
+ Pointing status ";
+
+// set up the form
+echo " \n";
+
+if ($row[0] == 0) {
+ menu_end();
+}
+
+//$datFilename = tempnam("/tmp", "dvodat.");
+//$pngFilename = $datFilename.".png";
+//
+//$datfile = fopen($datFilename, "w");
+//chmod($datFilename, 0777);
+//
+//// output the results to tmpfile
+//while (dbFetchInto($qry, $row)) {
+// $line = "";
+// foreach ($row as $i => $value) {
+// switch ($value) {
+// case 'g.00002':
+// $filter = 1;
+// break;
+// case 'r.00002':
+// $filter = 2;
+// break;
+// case 'i.00002':
+// $filter = 3;
+// break;
+// case 'z.00002':
+// $filter = 4;
+// break;
+// case 'y.00002':
+// $filter = 5;
+// break;
+// case 'w.00002':
+// $filter = 6;
+// break;
+// case 'g.00000':
+// $filter = 1;
+// break;
+// case 'r.00000':
+// $filter = 2;
+// break;
+// case 'i.00000':
+// $filter = 3;
+// break;
+// case 'z.00000':
+// $filter = 4;
+// break;
+// case 'y.00000':
+// $filter = 5;
+// break;
+// case 'w.00000':
+// $filter = 6;
+// break;
+// case 'OPEN':
+// $filter = 0;
+// break;
+// case 'g':
+// $filter = 1;
+// break;
+// case 'r':
+// $filter = 2;
+// break;
+// case 'i':
+// $filter = 3;
+// break;
+// case 'z':
+// $filter = 4;
+// break;
+// case 'y':
+// $filter = 5;
+// break;
+// case 'w':
+// $filter = 6;
+// break;
+// default:
+// $filter = $value;
+// break;
+// }
+// $line .= "$filter ";
+// }
+// if (preg_match('/^[ \t]*$/', $line) == 0) {//Don't write empty lines
+// $line = preg_replace('/[ \t]*$/', '', $line);
+// fwrite ($datfile, $line."\n");
+// }
+//}
+//fclose($datfile);
+//
+//echo " \n";
+//
+// ** TAIL CODE **
+
+echo " WHERE: $WHERE
\n";
+echo " SQL: $sql
\n";
+
+//echo "Temporary files are [$datFilename] and [$pngFilename]\n";
+
+echo " IPP-2244";
+
+// Start timer
+$start = microtime(true);
+
+$DQarray = array();
+$qry = $db->query($sql);
+if (dberror($qry)) {
+ echo " Error with $sql\n";
+ return;
+}
+
+while ($qry->fetchInto($row)) {
+ $DQarray[] = $row;
+}
+
+// Ensure $DQarray is not empty
+if (empty($DQarray)) {
+ echo " Error: Data array is empty.";
+ return; // Stop execution if no data to encode
+}
+
+// Convert data array to JSON for easier handling in JavaScript
+$dataJson = json_encode($DQarray);
+
+if ($dataJson === false) {
+ echo " Error encoding JSON: " . json_last_error_msg(); // Display any JSON encoding errors
+ return; // Stop execution if JSON encoding fails
+}
+
+echo ""; // Log JSON output to console for debugging
+
+echo <<
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+HTML;
+
+// End timer
+$total_time = round(microtime(true) - $start, 3);
+echo " Loading plot in $total_time seconds
";
+
+menu_end();
+
+?>
+
+
+
Index: /branches/eam_branches/ipp-20230313/ippMonitor/raw/storage.php
===================================================================
--- /branches/eam_branches/ipp-20230313/ippMonitor/raw/storage.php (revision 42750)
+++ /branches/eam_branches/ipp-20230313/ippMonitor/raw/storage.php (revision 42751)
@@ -23,5 +23,5 @@
echo " ";
echo "";
-echo " | ";
+echo " | ";
echo " Storage status";
# storage timeseries
@@ -42,5 +42,4 @@
/////////////////////////////////////////////////////////////////////////////
-
###########################################################################
#
@@ -49,14 +48,9 @@
###########################################################################
function getHosts($db) {
- // timer start
- $time = microtime();
- $time = explode(' ', $time);
- $time = $time[1] + $time[0];
- $start = $time;
-
- #echo "";
+ $start = microtime(true);
+
echo "";
- echo "
";
- echo " ";
+ echo " ";
+ echo " ";
echo " ";
echo " Free";
@@ -68,88 +62,84 @@
echo " ";
- echo "";
- $time = microtime();
- $time = explode(' ', $time);
- $time = $time[1] + $time[0];
- $finish = $time;
- $total_time = round(($finish - $start), 3);
- $start= $finish;
+
+ echo "";
+
+ $total_time = round(microtime(true) - $start, 3);
echo " loading in $total_time seconds
";
}
+
###########################################################################
@@ -186,6 +176,6 @@
#echo "";
echo "";
- echo " ";
- echo " ";
+ echo " ";
+ echo " ";
echo " ";
echo " ipp + ippb nodes: $ippusable + $ippbusable TB (latest usable) ";
| | | | | | | | | | | | | | | |