[Mapbender-commits] r4493 - in trunk/mapbender: resources/db/update
tools
svn_mapbender at osgeo.org
svn_mapbender at osgeo.org
Wed Aug 5 10:06:10 EDT 2009
Author: christoph
Date: 2009-08-05 10:06:10 -0400 (Wed, 05 Aug 2009)
New Revision: 4493
Removed:
trunk/mapbender/tools/mod_monitorCapabilities_read.php
trunk/mapbender/tools/mod_monitorCapabilities_read_single.php
trunk/mapbender/tools/mod_monitorCapabilities_read_single_diff.php
Modified:
trunk/mapbender/resources/db/update/update_2.7.sql
Log:
Modified: trunk/mapbender/resources/db/update/update_2.7.sql
===================================================================
--- trunk/mapbender/resources/db/update/update_2.7.sql 2009-08-05 13:56:26 UTC (rev 4492)
+++ trunk/mapbender/resources/db/update/update_2.7.sql 2009-08-05 14:06:10 UTC (rev 4493)
@@ -249,4 +249,11 @@
(wms_id);
+
+-- add monitor subscriber notification to admin1
+INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element, e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires, e_url) VALUES('admin1','monitor_abo_show',2,1,'monitoring','Show subscriptions','a','','href = "../php/mod_abo_show.php?sessionID" target = "AdminFrame" ',8,1080,190,20,10,'font-family: Arial, Helvetica, sans-serif; font-size : 12px; text-decoration : none; color: #808080;','Manage monitoring subscriptions','a','','','','AdminFrame','http://www.mapbender.org/');
+
+-- add monitor results to admin1
+INSERT INTO gui_element(fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element, e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires, e_url) VALUES('admin1','monitor_results',2,1,'monitoring results','Monitoring results','a','','href = "../php/mod_monitorCapabilities_read.php?sessionID" target = "AdminFrame" ',8,1110,190,20,10,'font-family: Arial, Helvetica, sans-serif; font-size : 12px; text-decoration : none; color: #808080;','View monitoring results','a','','','','AdminFrame','http://www.mapbender.org/');
+
---------------------------------------------MONITORING END
Deleted: trunk/mapbender/tools/mod_monitorCapabilities_read.php
===================================================================
--- trunk/mapbender/tools/mod_monitorCapabilities_read.php 2009-08-05 13:56:26 UTC (rev 4492)
+++ trunk/mapbender/tools/mod_monitorCapabilities_read.php 2009-08-05 14:06:10 UTC (rev 4493)
@@ -1,251 +0,0 @@
-<?php
-# $Id: mod_monitorCapabilities_read.php 3354 2008-12-17 10:31:57Z mschulz $
-# http://www.mapbender.org/index.php/Monitor_Capabilities
-# Copyright (C) 2002 CCGIS
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
-require_once(dirname(__FILE__)."/../classes/class_administration.php");
-session_start();
-import_request_variables("PG");
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
-?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-<head>
-<meta http-equiv="cache-control" content="no-cache">
-<meta http-equiv="pragma" content="no-cache">
-<meta http-equiv="expires" content="0">
-<?php
-echo '<meta http-equiv="Content-Type" content="text/html; charset='.CHARSET.'">';
-?>
-</head>
-<body>
-<?php
-$admin = new administration();
-
-// update selected wms
-for ($i=0; $i < $_POST['cbs']; $i++) {
- $upd_wmsid = intval($_POST['cb'.$i]);
- if ($upd_wmsid) {
-
- $now = time();
- $sql = "UPDATE mb_monitor SET status = '-2', status_comment = 'Monitoring is still in progress...', timestamp_begin = $1, timestamp_end = $2 WHERE upload_id = $3 AND fkey_wms_id = $4";
- $v = array($now, $now, $_POST['upl_id'.$i], $upd_wmsid);
- $t = array('s', 's', 's', 'i');
- $res = db_prep_query($sql,$v,$t);
-
- $exec = PHP_PATH . "php mod_monitorCapabilities_write.php ".$upd_wmsid." ".$_POST['upl_id'.$i]." 1 > output.txt &";
- exec($exec);
- }
-}
-
-$sql = "SELECT DISTINCT fkey_wms_id FROM mb_monitor";
-$res = db_prep_query($sql, array(), array());
-$cnt = 0;
-$wms = array();
-while(db_fetch_row($res)){
- $wms[$cnt] = db_result($res,$cnt,"fkey_wms_id");
- $cnt++;
-}
-
-$status = array();
-$upload_id = array();
-for ($i=0; $i<count($wms); $i++) {
- $wms_id[$wms[$i]] = $wms[$i];
- // get upload id
- $sql = "SELECT MAX(upload_id) FROM mb_monitor WHERE fkey_wms_id = $1";
- $v = array($wms[$i]);
- $t = array('i');
- $res = db_prep_query($sql,$v,$t);
- $upload_id[$wms[$i]] = db_result($res,0,0);
-
- $sql = "SELECT AVG(timestamp_begin), AVG(timestamp_end) FROM mb_monitor WHERE fkey_wms_id = $1 AND NOT status = '-1' AND NOT status = '-2'";
- $v = array($wms[$i]);
- $t = array('i');
- $res = db_prep_query($sql,$v,$t);
- if (db_result($res,0,1) == 0 && db_result($res,0,0) == 0) {
- $avg_response_time[$wms[$i]] = NULL;
- }
- else {
- $avg_response_time[$wms[$i]] = round(db_result($res,0,1)-db_result($res,0,0), 1);
- }
-
- $sql = "SELECT status, status_comment, timestamp_begin, timestamp_end, upload_url, updated, image, map_url, caps_diff FROM mb_monitor ";
- $sql .= "WHERE upload_id = $1 AND fkey_wms_id = $2 ORDER BY status, status_comment, timestamp_end, fkey_wms_id";
- $v = array($upload_id[$wms[$i]], $wms_id[$wms[$i]]);
- $t = array('s', 'i');
- $res = db_prep_query($sql,$v,$t);
-
- $status[$wms[$i]] = intval(db_result($res,0,"status"));
- $comment[$wms[$i]] = db_result($res,0,"status_comment");
- $timestamp_begin[$wms[$i]] = db_result($res,0,"timestamp_begin");
- $timestamp_end[$wms[$i]] = db_result($res,0,"timestamp_end");
- $upload_url[$wms[$i]] = db_result($res,0,"upload_url");
- $updated[$wms[$i]] = db_result($res,0,"updated");
- $mapurl[$wms[$i]] = db_result($res,0,"map_url");
- $image[$wms[$i]] = db_result($res,0,"image");
- $caps_diff[$wms[$i]] = db_result($res,0,"caps_diff");
-
- if ($status[$wms[$i]] == -2 && intval(time())-intval($timestamp_begin[$wms[$i]]) > intval(TIME_LIMIT)) {
- $comment[$wms[$i]] = "Monitoring process timed out.";
-
- $new_sql = "UPDATE mb_monitor SET status = '-1', status_comment = 'Monitoring process timed out.', timestamp_end = $1 WHERE fkey_wms_id = $2 AND upload_id = $3";
- $new_v = array((intval($upload_id[$wms[$i]])+intval(TIME_LIMIT)), $wms_id[$wms[$i]], $upload_id[$wms[$i]]);
- $new_t = array('s', 'i', 's');
- $new_res = db_prep_query($new_sql,$new_v,$new_t);
- }
-
- $sql = "SELECT COUNT(upload_id) FROM mb_monitor WHERE fkey_wms_id = $1 AND NOT status = '-2'";
- $v = array($wms[$i]);
- $t = array('i');
- $res = db_prep_query($sql, $v, $t);
- $total[$wms[$i]] = db_result($res, 0, 0);
-
- $sql = "SELECT COUNT(upload_id) FROM mb_monitor WHERE fkey_wms_id = $1 AND status = '-1'";
- $v = array($wms[$i]);
- $t = array('i');
- $res = db_prep_query($sql, $v, $t);
- $fail = db_result($res, 0, 0);
-
- $percentage[$wms[$i]] = 100 - round(100*floatval($fail)/floatval($total[$wms[$i]]), 1);
-}
-
-
-$newArray = $status;
-if ($_GET['sortby']) {
- if ($_GET['sortby'] == "wms") {
- $newArray = $wms_id;
- asort($newArray);
- }
- elseif ($_GET['sortby'] == "status") {
- $newArray = $status;
- asort($newArray);
- }
- elseif ($_GET['sortby'] == "avgresp") {
- $newArray = $avg_response_time;
- asort($newArray);
- }
- elseif ($_GET['sortby'] == "avail") {
- $newArray = $percentage;
- arsort($newArray);
- }
- elseif ($_GET['sortby'] == "last") {
- $newArray = $upload_id;
- arsort($newArray);
- }
- elseif ($_GET['image'] == "last") {
- $newArray = $image;
- arsort($newArray);
- }
-}
-
-
-
-$str = "<span style='font-size:30'>monitoring results</span><hr><br>\n";
-$str .= "<form name = 'form1' method='post' action='".$PHP_SELF."?sortby=".$_GET['sortby']."'>\n\t";
-$str .= "\n\t<input type=submit value='update selected WMS'>\n";
-$str .= "\n\t<input type=button onclick=\"self.location.href='".$PHP_SELF."?sortby=".$_GET['sortby']."'\" value='refresh'>\n<br/><br/>\n ";
-$str .= "<table cellpadding=10 cellspacing=0 border=0>";
-$str .= "<tr bgcolor='#dddddd'><th></th><th align='left'><a href='".$PHP_SELF."?sortby=wms'>wms</a></th>";
-$str .= "<th align='left' colspan = 2><a href='".$PHP_SELF."?sortby=status'>current status</a></th>";
-$str .= "<th align='left'><a href='".$PHP_SELF."?sortby=image'>image</a></th>";
-$str .= "<th align='left'><a href='".$PHP_SELF."?sortby=avgresp'>avg. response time</a></th>";
-$str .= "<th align='left'><a href='".$PHP_SELF."?sortby=avail'>overall availability</a></th><th></th><th>Diff</th></tr>";
-
-$cnt = 0;
-foreach ($newArray as $k => $value) {
- $img = "stop.bmp";
- if ($status[$k]==0) $img = "wait.bmp";
- elseif ($status[$k]==1) $img = "go.bmp";
-
- if ($updated[$k] == "0" && $status[$k] == 0) $fill = "checked"; else $fill = "disabled";
-
- if (fmod($cnt, 2) == 1) {
- $str .= "\n\t\t<tr bgcolor='#e6e6e6'>";
- }
- else {
- $str .= "\n\t\t<tr bgcolor='#f0f0f0'>";
- }
- $str .= "\n\t\t\t<td><input name='cb".$cnt."' value='" . $wms_id[$k] . "' type=checkbox ".$fill." /><input type=hidden name='upl_id".$cnt."' value='".$upload_id[$k]."'></td>";
- $str .= "\n\t\t\t<td valign='top'><b>" . $wms_id[$k] . "</b><br>" . $admin->getWmsTitleByWmsId($wms_id[$k]) . "</td>";
- $str .= "\n\t\t\t<td valign='top'><a href='".$upload_url[$k]."' target=_blank><img title='Connect to service' border=0 src = '../img/trafficlights/". $img. "'></a></td>";
- $str .= "\n\t\t\t<td valign='top'>" . $comment[$k] . "<br><div style='font-size:12'>".date("F j, Y, G:i:s", $upload_id[$k])."</div></td>";
- $str .= "\n\t\t\t<td valign='top'>";
-
- $str .= "<table bgcolor='black' border=1 cellspacing=1 cellpadding=0><tr><td height=20 width=20 align=center valign=middle bgcolor='";
-
- if ($image[$k] == -1) {
- $str .= "red";
- }
- elseif ($image[$k] == 0) {
- $str .= "yellow";
- }
- elseif ($image[$k] == 1) {
- $str .= "green";
- }
-
- if ($image[$k] != -1) {
- $str .= "'><a href='".$mapurl[$k]."'>o</a></td></tr></table></td>";
- }
- else {
- $str .= "'><a href='".$mapurl[$k]."'>x</a></td></tr></table></td>";
- }
-
- $str .= "\n\t\t\t<td valign='top' align = 'left'>";
- if ($avg_response_time[$k] == NULL) {
- $str .= "n/a";
- }
- else {
- $str .= $avg_response_time[$k] . " s";
- }
- $str .= "</td>";
- $str .= "\n\t\t\t<td valign='top'><b>" . $percentage[$k] . " %</b> <span style='font-size:12'>(" . $total[$k] . " cycles)</span><br>";
- $str .= "<table bgcolor='black' border=1 cellspacing=1 cellpadding=0><tr>";
- $val = $percentage[$k];
- for ($i=0; $i<10; $i++) {
- if ($val>=10) {
- $str .= "<td height=10 width='10' bgcolor='red'></td>";
- $val-=10;
- }
- elseif($val>0){
- $str .= "<td height=10 width='" . round($val) . "' bgcolor='red'></td>";
- if (round($val) < 10) {
- $str .= "<td height=10 width='" . (9-round($val)) . "' bgcolor='white'></td>";
- }
- $val=-1;
- }
- else {
- $str .= "<td height=10 width='10' bgcolor='white'></td>";
- }
- }
- $str .= "</tr></table></td>";
-
-# $str .= "\n\t\t\t<td><a href='output_".$wms_id[$k]."_".$max.".txt' target=_blank>log</a></td>";
- $str .= "\n\t\t<td><input type=button value='details' onclick=\"var newWindow = window.open('../tools/mod_monitorCapabilities_read_single.php?wmsid=".$wms_id[$k]."','wms','width=500,height=700,scrollbars');newWindow.href.location='test.php'\"></td>";
- $str .= "\n\t\t\t<td>";
- if ($caps_diff[$k] != "")
- $str .= "<a href='mod_monitorCapabilities_read_single_diff.php?wmsid=".$wms_id[$k]."&upload_id=".$upload_id[$k]."' target=_blank>view</a>";
- $str .= "</td></tr>";
- $cnt++;
-}
-$str .= "\n\t</table>\n\t<br/><input type=hidden name=cbs value='".$cnt."'>\n</form>";
-echo $str;
-
-?>
-</body></html>
Deleted: trunk/mapbender/tools/mod_monitorCapabilities_read_single.php
===================================================================
--- trunk/mapbender/tools/mod_monitorCapabilities_read_single.php 2009-08-05 13:56:26 UTC (rev 4492)
+++ trunk/mapbender/tools/mod_monitorCapabilities_read_single.php 2009-08-05 14:06:10 UTC (rev 4493)
@@ -1,105 +0,0 @@
-<?php
-# $Id: mod_monitorCapabilities_read_single.php 3354 2008-12-17 10:31:57Z mschulz $
-# http://www.mapbender.org/index.php/Monitor_Capabilities
-# Copyright (C) 2002 CCGIS
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
-require_once(dirname(__FILE__)."/../conf/mapbender.conf");
-require_once(dirname(__FILE__)."/../http/classes/class_administration.php");
-session_start();
-import_request_variables("PG");
-$con = db_connect($DBSERVER,$OWNER,$PW);
-db_select_db(DB,$con);
-?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-<head>
-<meta http-equiv="cache-control" content="no-cache">
-<meta http-equiv="pragma" content="no-cache">
-<meta http-equiv="expires" content="0">
-<?php
-echo '<meta http-equiv="Content-Type" content="text/html; charset='.CHARSET.'">';
-?>
-</head>
-<body>
-<?php
-$admin = new administration();
-
-if ($_GET['wmsid']) {
- $wms_id = intval($_GET['wmsid']);
-}
-else {
- echo "Invalid WMS ID.";
- die;
-}
-
-$sql = "SELECT upload_id, status, status_comment, timestamp_begin, timestamp_end, upload_url, updated, caps_diff FROM mb_monitor ";
-$sql .= "WHERE fkey_wms_id = $1 AND NOT status = '-2' ORDER BY upload_id DESC";
-$v = array($wms_id);
-$t = array('i');
-$res = db_prep_query($sql,$v,$t);
-
-$cnt=0;
-while ($row = db_fetch_array($res)) {
- $upload_id[$cnt] = db_result($res,$cnt,"upload_id");
- $status[$cnt] = intval(db_result($res,$cnt,"status"));
- $comment[$cnt] = db_result($res,$cnt,"status_comment");
- $timestamp_begin = db_result($res,$cnt,"timestamp_begin");
- $timestamp_end = db_result($res,$cnt,"timestamp_end");
- $upload_url[$cnt] = db_result($res,$cnt,"upload_url");
- $caps_diff[$cnt] = db_result($res,$cnt,"caps_diff");
- if ($status[$cnt] == '0' || $status[$cnt] == '1') {
- $response_time[$cnt] = strval($timestamp_end-$timestamp_begin) . " s";
- }
- else {
- $response_time[$cnt] = "n/a";
- }
- $cnt++;
-}
-
-
-$str = "<span style='font-size:30'>monitoring results</span><hr><br>\n";
-$str .= "<b>" . $wms_id . "</b><br>" . $admin->getWmsTitleByWmsId($wms_id) . "<br><br><br>\n";
-$str .= "<table cellpadding=10 cellspacing=0 border=0>";
-$str .= "<tr bgcolor='#dddddd'><th align='left'>date</th><th align='left' colspan = 2>status</th><th align='center'>response time</th><th align='center'>Diff</th></tr>";
-
-for ($k=0; $k<count($upload_id); $k++) {
- $img = "stop.bmp";
- if ($status[$k]==0) $img = "wait.bmp";
- elseif ($status[$k]==1) $img = "go.bmp";
-
- if (fmod($k, 2) == 1) {
- $str .= "\n\t\t<tr bgcolor='#e6e6e6'>";
- }
- else {
- $str .= "\n\t\t<tr bgcolor='#f0f0f0'>";
- }
- $str .= "\n\t\t\t<td>".date("F j, Y, G:i:s", $upload_id[$k])."</td>";
- $str .= "\n\t\t\t<td><a href='".$upload_url[$k]."' target=_blank><img title='Connect to service' border=0 src = '../img/trafficlights/". $img. "'></a></td>";
- $str .= "\n\t\t\t<td>" . $comment[$k] . "</td>";
- $str .= "\n\t\t\t<td align='center'>" . $response_time[$k] . "</td>";
- $str .= "\n\t\t\t<td>";
- if ($caps_diff[$k] != "")
- $str .= "<a href='mod_monitorCapabilities_read_single_diff.php?wmsid=".$wms_id."&upload_id=".$upload_id[$k]."' target=_blank>view</a>";
- $str .= "</td></tr>";
-# $str .= "\n\t\t\t<td><a href='output_".$wms_id[$k]."_".$max.".txt' target=_blank>log</a></td>";
-}
-$str .= "\n\t</table>\n\t";
-echo $str;
-
-?>
-</body></html>
\ No newline at end of file
Deleted: trunk/mapbender/tools/mod_monitorCapabilities_read_single_diff.php
===================================================================
--- trunk/mapbender/tools/mod_monitorCapabilities_read_single_diff.php 2009-08-05 13:56:26 UTC (rev 4492)
+++ trunk/mapbender/tools/mod_monitorCapabilities_read_single_diff.php 2009-08-05 14:06:10 UTC (rev 4493)
@@ -1,85 +0,0 @@
-<?php
-# $Id: mod_monitorCapabilities_read_single_diff.php 3342 2008-12-16 12:31:26Z mschulz $
-# http://www.mapbender.org/index.php/Monitor_Capabilities
-# Copyright (C) 2002 CCGIS
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
-require_once(dirname(__FILE__)."/../classes/class_administration.php");
-import_request_variables("PG");
-?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-<head>
-<title>Mapbender - monitor diff results</title>
-<meta http-equiv="cache-control" content="no-cache">
-<meta http-equiv="pragma" content="no-cache">
-<meta http-equiv="expires" content="0">
-<?php
-echo '<meta http-equiv="Content-Type" content="text/html; charset='.CHARSET.'">';
-?>
-<style type="text/css">
-* {font-family: Arial, "Courier New", monospace; font-size: small;}
-.diff-context {background: #eee;}
-.diff-deletedline {background: #eaa;}
-.diff-addedline {background: #aea;}
-.diff-blockheader {background: #ccc;}
-</style>
-</head>
-<body>
-<?php
-$admin = new administration();
-
-if ($_GET['wmsid']) {
- $wms_id = intval($_GET['wmsid']);
-}
-else {
- echo "Invalid WMS ID.";
- die;
-}
-
-if ($_GET['upload_id']) {
- $upload_id = intval($_GET['upload_id']);
-}
-else {
- echo "Invalid upload ID.";
- die;
-}
-
-$sql = "SELECT caps_diff FROM mb_monitor ";
-$sql .= "WHERE fkey_wms_id = $1 AND upload_id = $2";
-$v = array($wms_id,$upload_id);
-$t = array('i','i');
-$res = db_prep_query($sql,$v,$t);
-
-while ($row = db_fetch_array($res)) {
- $caps_diff = db_result($res,0,"caps_diff");
-}
-
-
-$str = "<span style='font-size:30'>monitoring results</span><hr><br>\n";
-$str .= "<b>" . $wms_id . "</b><br>" . $admin->getWmsTitleByWmsId($wms_id) . "<br><br><br>\n";
-$str .= "<table cellpadding=3 cellspacing=0 border=0>";
-$str .= "<tr><td align='center' colspan='2'>Local</td><td align='center' colspan='2'>Remote</td></tr>";
-
-$str .= $caps_diff;
-
-$str .= "\n\t</table>\n\t";
-echo $str;
-
-?>
-</body></html>
More information about the Mapbender_commits
mailing list