[mapguide-commits] r6151 - in trunk/MgDev/Web/src/mapadmin: .
HelpDocs
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Tue Sep 27 06:24:45 EDT 2011
Author: liuar
Date: 2011-09-27 03:24:45 -0700 (Tue, 27 Sep 2011)
New Revision: 6151
Added:
trunk/MgDev/Web/src/mapadmin/HelpDocs/performance_report.htm
Modified:
trunk/MgDev/Web/src/mapadmin/performanceReport.php
trunk/MgDev/Web/src/mapadmin/performanceReport_Export.php
trunk/MgDev/Web/src/mapadmin/performanceReport_GetResult.php
trunk/MgDev/Web/src/mapadmin/performanceReport_MapViewer.php
trunk/MgDev/Web/src/mapadmin/serverdatafunctions.php
Log:
On behalf of Ted Yang.
fix the ticket 1768(part 4): http://trac.osgeo.org/mapguide/ticket/1768
This submission includes:
1. add exception handler for the "file not exist"
2. add one line for apache/java configuration cause the cross-domain problem
3. add exception handler for the "map not exist" when get profiling result from the server
4. refine the data extent format
5. add help file
6. fix one ie9 default which can't get attribute value by this way: object.attributes["name"]
7. add exception handler for the "map not exist" when click the recent setting
Added: trunk/MgDev/Web/src/mapadmin/HelpDocs/performance_report.htm
===================================================================
--- trunk/MgDev/Web/src/mapadmin/HelpDocs/performance_report.htm (rev 0)
+++ trunk/MgDev/Web/src/mapadmin/HelpDocs/performance_report.htm 2011-09-27 10:24:45 UTC (rev 6151)
@@ -0,0 +1,239 @@
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html><!-- #BeginTemplate "/Templates/ServerAdminHelp.dwt" -->
+<head>
+<title>Site Administrator Help</title>
+<meta content="text/html; charset=utf-8" http-equiv="Content-Type">
+<link rel="stylesheet" type="text/css" href="ad_mh.css">
+<meta name="keywords" content="">
+<meta name="description" content="">
+<meta name="siteid" content="123112">
+<meta name="author" content="Autodesk, Inc.">
+<link href="TableStyles.css" rel="stylesheet" type="text/css">
+<style type="text/css">
+<!--
+.style1 {color: #FF0000}
+.style3 {color: #FF00FF}
+-->
+</style>
+</head>
+<body vlink="#CCCCCC">
+<table border="0" cellspacing="5" cellpadding="5" name="Header">
+ <tr class="main">
+ <td class="sitename" colspan="2">
+ <table cellspacing="0" cellpadding="0" border="0" class="sitename" width="790">
+ <tr>
+ <td class="sitename" width="385"><a href="about_sites_and_servers.htm" class="sitename">Site
+ Administrator Help</a></td>
+ <td class="logo" width="367"> </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ <tr>
+ <td class="imgband" colspan="2" height="58">
+ <div align="left"><img src="Images/banner.jpg" width="852" height="80" alt=""></div>
+ </td>
+ </tr>
+ <!-- Main Content Area -->
+</table>
+<table border="0" cellpadding="0" cellspacing="0" name="Content">
+ <tr class="main">
+ <td class="lhsash" width="206" >
+ <table cellspacing="0" cellpadding="0" border="0" name="Sidebar menu">
+ <tr>
+ <td class="lhnav"><font size="2"><span class="chapnametoc"><a href="about_sites_and_servers.htm">About
+ Sites and Servers</a></span></font></td>
+ <tr>
+ <td class="lhnav"><font size="2"><span class="chapnametoc"><a href="managing_servers.htm">Managing
+ Servers</a></span></font></td>
+ </tr>
+ <tr>
+ <td class="lhnav"><font size="2"><span class="chapnametoc"><a href="adding_and_removing_servers.htm">Adding
+ and Removing Servers</a></span></font></td>
+ </tr>
+ <tr>
+ <td class="lhnav"><font size="2"><span class="chapnametoc"><a href="monitor_server_status.htm">Monitoring
+ the Status of a Server</a></span></font></td>
+ </tr>
+ <tr>
+ <td class="lhnav"><font size="2"><span class="chapnametoc"><a href="configuring_servers.htm">Configuring
+ Servers</a></span></font></td>
+ </tr>
+ <tr>
+ <td class="lhnav"><font size="2"><span class="chapnametoc"><a href="about_services.htm">About
+ Services</a></span></font></td>
+ </tr>
+ <tr>
+ <td class="lhnav"><font size="2"><span class="chapnametoc"><a href="enabling_and_disabling_services.htm">Enabling
+ and Disabling Services</a></span></font></td>
+ </tr>
+ <tr>
+ <td class="lhnav"><font size="2"><span class="chapnametoc"><a href="configuring_services.htm">Configuring
+ Services</a></span></font></td>
+ </tr>
+ <tr>
+ <td class="lhnav"><font size="2"><span class="chapnametoc"><a href="about_users_groups_and_roles.htm">About
+ Users, Groups, and Roles</a></span></font></td>
+ </tr>
+ <tr>
+ <td class="lhnav"><font size="2"><span class="chapnametoc"><a href="managing_users.htm">Managing
+ Users</a></span></font></td>
+ </tr>
+ <tr>
+ <td class="lhnav" ><font size="2"><span class="chapnametoc"><a href="adding_and_deleting_users.htm">Adding
+ and Deleting Users</a></span></font></td>
+ </tr>
+ <tr>
+ <td class="lhnav" ><font size="2"><span class="chapnametoc"><a href="managing_groups.htm">Managing
+ Groups</a></span></font></td>
+ </tr>
+ <tr> </tr>
+ <tr>
+ <td class="lhnav">
+ <p><font size="2"><span class="chapnametoc"><a href="adding_and_deleting_groups.htm">Adding
+ and Deleting Groups</a></span></font></p>
+ </td>
+ </tr>
+ <tr>
+ <td class="lhnav"><font size="2"><span class="chapnametoc"><a href="adding_users_to_groups.htm">Adding
+ Users to Groups</a></span></font></td>
+ </tr>
+ <tr>
+ <td class="lhnav"><font size="2"><span class="chapnametoc"><a href="managing_roles.htm">Managing
+ Roles</a></span></font></td>
+ </tr>
+ <tr>
+ <td class="lhnav"><font size="2"><span class="chapnametoc"><a href="assigning_roles.htm">Assigning
+ Roles</a></span></font></td>
+ </tr>
+ <tr>
+ <td class="lhnav"><font size="2"><span class="chapnametoc"><a href="about_log_files.htm">About
+ Log Files</a></span></font></td>
+ </tr>
+ <tr>
+ <td class="lhnav"><font size="2"><span class="chapnametoc"><a href="configuring_and_viewing_logs.htm">Configuring
+ and Viewing Log Files</a></span></font></td>
+ </tr>
+ <tr>
+ <td class="lhnav"><font size="2"><span class="chapnametoc"><a href="about_packages.htm">About
+ Packages </a></span></font></td>
+ </tr>
+ <tr>
+ <td class="lhnav"><font size="2"><span class="chapnametoc"><a href="managing_packages.htm">Managing
+ Packages </a></span></font></td>
+ </tr>
+ <tr>
+ <td class="lhnav"><font size="2"><span class="chapnametoc"><a href="performance_report.htm">Performance Report</a></span></font></td>
+ </tr>
+ <tr>
+ <td class="lhnav"><font size="2"><span class="chapnametoc"><a href="about_WFS_WMS.htm">About
+ WMS/WFS</a></span></font></td>
+ </tr>
+ <tr>
+ <td class="lhnav"><font size="2"><span class="chapnametoc"><a href="configuring_web_services.htm">Configuring
+ WMS/WFS</a></span></font></td>
+ </tr>
+ <tr>
+ <td class="lhnav"><font size="2"><span class="chapnametoc"><a href="about_external_files.htm">About
+ External Files</a></span></font></td>
+ </tr>
+ <tr>
+ <td class="lhnav"><font size="2"><span class="chapnametoc"><a href="configuring_external_files.htm">Configuring
+ External Files</a></span></font></td>
+ </tr>
+ </table>
+ </td>
+ <td class="content" width="678" >
+ <!-- Contents Area -->
+ <hr color="#464646" NOSHADE size="1" width="100%">
+ <!-- #BeginEditable "Body%20content" -->
+ <p class="head2"><font size="6">Performance Report</font></p>
+ <div class="rule">
+ <hr color="#464646" NOSHADE size="1" width="100%">
+ </div>
+ <table width="100%" border="0" cellspacing="5" cellpadding="5">
+ <tr>
+ <td width="49%"> </td>
+ <td class="paragraph" width="51%">
+ <hr>
+ <font size="2">This page allows you to enter server details and meta
+ data describing web services.</font>
+ <hr>
+ </td>
+ </tr>
+ <tr>
+ <td width="49%" valign="top">
+ <p><img src="Images/server_admin_web.png" width="436" height="265"></p>
+ <p class="caption">Specifying the server name</p>
+ </td>
+ <td width="51%">
+ <p class="headstep"><font size="2"><b>To configure WFS and WMS</b></font></p>
+ <p class="numberstep"><font size="2"><span class="bold">1 </span>
+ On the Configure WFS or Configure WMS page, enter a title for the
+ server that provides the web service.</font></p>
+ <p class="numberstep"><font size="2"><span class="bold">2</span> Optional:
+ Fill in the Abstract, Access Fees, and Access Constraints fields
+ as appropriate. </font></p>
+ <p class="numberstep"><font size="2"><span class="bold">3</span> For
+ Server Name, enter the name of the server that provides the web
+ service, for example CCS12352768.</font></p>
+ <p class="numberstep"><font size="2"><span class="bold">4</span> <span class="numberstep">Optional:
+ For Script Name, enter the path and name of a virtual directory
+ or alias, if you have configured your own. Otherwise, leave the
+ default path and name.</span></font></p>
+ <p class="numberstep"><font size="2"><span class="bold">5</span> <span class="numberstep">Optional:
+ Fill in the Contact Properties fields.</span></font></p>
+ <p class="numberstep"><font size="2"><span class="bold">6</span> <span class="numberstep">Click
+ Save.<br>
+ </span></font><font size="2"><br>
+ The information that you added will be available to requests made
+ to the web server.</font></p>
+ </td>
+ </tr>
+
+ <td class="content" width="678" >
+ <!-- Contents Area -->
+ <hr color="#464646" NOSHADE size="1" width="100%">
+ <!-- #BeginEditable "Body%20content" -->
+ <p class="headstep"><font size="2"><b>Advanced WMS Configuration</b></font></p>
+ <p>For advanced WMS configuration, you can also edit the OgcWmsService.config.awd file (located in MapGuide_server_installation_directory\Wms).</p>
+ <p class="numberstep"><font size="2"><span class="bold">1 </span>
+ You can delete the default reference system (supported by alllayers): </font></p>
+ <p><img src="Images/server_admin_web_advanced1.png" width="409" height="107"></p>
+ <p>This can be used to stop WMS from applying coordinate transformations to layers such as raster images that use a different coordinate system.</p>
+ <p class="numberstep"><font size="2"><span class="bold">2</span> You can add more mappings to the EPSG to WKT mapping section:
+</font></p>
+ <p><img src="Images/server_admin_web_advanced2.png" width="520" height="383"></p>
+ <div class="bullet">
+ <p></p>
+ <hr color="#464646" NOSHADE size="1" width="100%">
+ <br>
+ </div>
+ <!-- #EndEditable -->
+ <p class="bold">
+ </p>
+ <p>
+ </p>
+</td>
+
+
+ </table>
+ <div class="rule2">
+ <hr color="#464646" NOSHADE size="1" width="100%">
+ </div>
+ <br>
+ <!-- #EndEditable -->
+ <p class="bold">
+ </p>
+ <p>
+ </p>
+</td>
+ <tr class="main">
+ <td class="lhsash" width="206"> </td>
+ <td class="footer" width="678"> </td>
+ </tr>
+</table>
+<p> </p><p> </p>
+</body>
+<!-- #EndTemplate --></html>
Modified: trunk/MgDev/Web/src/mapadmin/performanceReport.php
===================================================================
--- trunk/MgDev/Web/src/mapadmin/performanceReport.php 2011-09-27 08:52:08 UTC (rev 6150)
+++ trunk/MgDev/Web/src/mapadmin/performanceReport.php 2011-09-27 10:24:45 UTC (rev 6151)
@@ -31,7 +31,7 @@
// Define Local values
$menuCategory = PERFORMANCE_REPORT_MENU_ITEM;
$pageTitle = PERFORMANCE_REPORT_MENU_ITEM;
- $helpPage = 'HelpDocs/performanceReport.htm';
+ $helpPage = 'HelpDocs/performance_report.htm';
$pageName = 'PerformanceReportPage';
$formName = 'PerformanceReportForm';
$homePage = NULL;
@@ -786,10 +786,6 @@
mapViewerDiv.style.display = "block";
SetMapViewerLoaction(mapViewerDiv);
- //make the textbox focused
- var autoFoucsTxt = document.getElementById("mapViewerAutoFocusTxt");
- autoFoucsTxt.focus();
-
checkMapFrameLoadedInterval = setInterval(CheckMapFrameLoaded, 100);
}
@@ -802,7 +798,7 @@
//we set the width and height as 0, and border as none,
//it works well in IE9 and firefox, but in chrome and safari,
//if the border set as none, this event will not be fired.
- //TODO:Multiple Browsers:Safari and Chrome not work
+ //TODO:Multiple Browsers:Safari and Chrome not work,So this event handler is not registered
function MapViewerKeyUp(event)
{
if(event.keyCode == 13)
@@ -868,7 +864,11 @@
return;
clearInterval(checkMapFrameLoadedInterval);
-
+
+ //make the textbox focused
+ var autoFoucsTxt = document.getElementById("mapViewerAutoFocusTxt");
+ autoFoucsTxt.focus();
+
CreateButtons();
}
@@ -932,7 +932,7 @@
var buttonPanelInnerHtml="<table>";
buttonPanelInnerHtml+="<tr>";
buttonPanelInnerHtml+="<td>";
- buttonPanelInnerHtml+='<button type="button" style="width: 57px; height: 22px; border-style:none;border: 1px solid #000000;" onclick="window.parent.parent.MapViewerBtnOKClicked()">OK</button>';
+ buttonPanelInnerHtml+='<button type="button" id="mapViewerAutoFocusBtn" style="width: 57px; height: 22px; border-style:none;border: 1px solid #000000;" onclick="window.parent.parent.MapViewerBtnOKClicked()">OK</button>';
buttonPanelInnerHtml+="</td>";
buttonPanelInnerHtml+="<td>";
buttonPanelInnerHtml+='<button type="button" style="width: 57px; height: 22px; border-style:none;border: 1px solid #000000;margin-left:10px;" onclick="window.parent.parent.MapViewerBtnCloseClicked()">Cancel</button>';
@@ -1330,12 +1330,22 @@
if ((4 == xmlHttp.readyState || "complete" == xmlHttp.readyState)&& 200 == xmlHttp.status)
{
var profileResult = document.getElementById("resultsTab");
+ var result = xmlHttp.responseText;
+ var btnClear = document.getElementById("btnClearSpan");
+ var loadingImg = document.getElementById("ajax_loading_img");
+
+ if(Trim(result) == "mapNotExist")
+ {
+ alert("The selected map resource is longer available. Select a different map resource to continue.");
+ btnClear.style.display = "inline";
+ loadingImg.style.display = "none";
+ SetRunButtonState(true);
+ return;
+ }
+
profileResult.innerHTML = xmlHttp.responseText;
-
- var btnClear = document.getElementById("btnClearSpan");
+
btnClear.style.display = "inline";
-
- var loadingImg = document.getElementById("ajax_loading_img");
loadingImg.style.display = "none";
CollapseSettingTab();
@@ -1647,8 +1657,8 @@
//get the content need to be sorted into a 2-D array
rowArray = [];
- //TODO:Multiple Browsers:It has problem under IE9 quirks mode, will fix it in part 3
- colIndex = headerColumn.attributes["columnindex"].value-1;
+
+ colIndex = parseInt(headerColumn.getAttribute("columnindex")) - 1;
rows = layersTBody.rows;
var j = 0;
for (; j < rows.length; j++)
@@ -1842,18 +1852,36 @@
}
}
- //TODO: Excepions: what if the map is removed
if(null != selectSetting)
{
+ var mapDefinitonSelector = document.getElementById("mapSelector_DO_NOT_PERSIST");
+ var i = 0;
+ var found = false;
+ for(;i < mapDefinitonSelector.options.length;i++)
+ {
+ var mapId = Trim(mapDefinitonSelector.options[i].value);
+ if(Trim(selectSetting[1]) == mapId)
+ {
+ found = true;
+ }
+ }
+
+ if(found)
+ {
+ mapDefinitonSelector.value = Trim(selectSetting[1]);
+ }
+ else
+ {
+ alert("The selected map resource is longer available. Select a different map resource to continue.");
+ return;
+ }
+
var centerPoint = document.getElementById("txtCenterPoint");
centerPoint.value = selectSetting[2];
var scaleInput = document.getElementById("txtScale");
scaleInput.value = FormatNumber(selectSetting[3],2);
- var mapDefinitonSelector = document.getElementById("mapSelector_DO_NOT_PERSIST");
- mapDefinitonSelector.value = Trim(selectSetting[1]);
-
var tipDiv = document.getElementById("mapResourceNameTip");
tipDiv.innerHTML = mapDefinitonSelector.value;
@@ -1968,7 +1996,7 @@
</td>
<td style=" text-align: right;border-bottom:1px solid #000000; cursor: default;">
<img alt="Close" src="images/close.png" onclick="CloseMapViewer();"/>
- <input type="text" id="mapViewerAutoFocusTxt" style="width:0px; height:0px; border: none; cursor:default;" onKeyUp="MapViewerKeyUp(event);"/>
+ <input type="text" id="mapViewerAutoFocusTxt" style="width: 0px; height:0px; border: none; cursor:default;"/>
</td>
</tr>
<tr>
Modified: trunk/MgDev/Web/src/mapadmin/performanceReport_Export.php
===================================================================
--- trunk/MgDev/Web/src/mapadmin/performanceReport_Export.php 2011-09-27 08:52:08 UTC (rev 6150)
+++ trunk/MgDev/Web/src/mapadmin/performanceReport_Export.php 2011-09-27 10:24:45 UTC (rev 6151)
@@ -10,7 +10,7 @@
CheckForCancel( 'performanceReport.php' );
// Define Local values
- $mapProfileResult=new MapProfileResult();
+ $mapProfileResult = new MapProfileResult();
function ReplaceCSVSpecialChar($value)
{
@@ -32,13 +32,20 @@
}
else
{
- //TODO: Excepions: more user friendly hint
- //should give some warning message about "No profiling result file found, please re-generate it!"
- throw $e;
+ throw new Exception("The temp result file may be deleted or corrupted, Please regenerate the performance report and try again!");
}
}
- GetProfilingResults();
+ try
+ {
+ GetProfilingResults();
+ }
+ catch (Exception $e)
+ {
+ echo $e->getMessage();
+ header("Content-type:text/plain");
+ exit(0);
+ }
//add one line gap
echo "\n";
Modified: trunk/MgDev/Web/src/mapadmin/performanceReport_GetResult.php
===================================================================
--- trunk/MgDev/Web/src/mapadmin/performanceReport_GetResult.php 2011-09-27 08:52:08 UTC (rev 6150)
+++ trunk/MgDev/Web/src/mapadmin/performanceReport_GetResult.php 2011-09-27 10:24:45 UTC (rev 6151)
@@ -23,6 +23,64 @@
$clientWidth = $_REQUEST["imageWidth"];
$clientHeigth = $_REQUEST["imageHeight"];
+ function CheckMapExist()
+ {
+ global $mapResourceId;
+ $mapNotExist = true;
+
+ if(isset($mapResourceId))
+ {
+ try
+ {
+ global $userInfo;
+ global $mapResources;
+ $mapResourcesXml = "";
+
+ // Enumerates all maps in the library
+ $resourceID = new MgResourceIdentifier("Library://");
+ //connect to the site and get a resource service instance
+ $siteConn = new MgSiteConnection();
+ $siteConn->Open($userInfo);
+ $resourceService = $siteConn->CreateService(MgServiceType::ResourceService);
+
+ $byteReader = $resourceService->EnumerateResources($resourceID, -1, "MapDefinition");
+
+ $chunk = "";
+ do
+ {
+ $chunkSize = $byteReader->Read($chunk, 4096);
+ $mapResourcesXml = $mapResourcesXml . $chunk;
+ } while ($chunkSize != 0);
+
+ $resourceList = new DOMDocument();
+ $resourceList->loadXML($mapResourcesXml);
+
+ $resourceIdNodeList = $resourceList->documentElement->getElementsByTagName("ResourceId");
+
+ for ($i = 0; $i < $resourceIdNodeList->length; $i++)
+ {
+ $mapResourceID = $resourceIdNodeList->item($i)->nodeValue;
+
+ if(trim($mapResourceId) == trim($mapResourceID))
+ {
+ $mapNotExist = false;
+ break;
+ }
+ }
+ }
+ catch (Exception $exc)
+ {
+ //true again
+ }
+ }
+
+ if($mapNotExist)
+ {
+ echo "mapNotExist";
+ exit(0);
+ }
+ }
+
//get the background color of the given map resource id
function GetBackGroundColor($resourceID)
{
@@ -106,7 +164,7 @@
//[imageFormat]
$imageFormat = "PNG";
-
+
//userInfo are saved in the session
global $userInfo;
@@ -155,6 +213,7 @@
$mapProfileResult->GetBaseLayerCount();
}
+ CheckMapExist();
GetProfilingResults();
$displayManager->mapProfileResult = $mapProfileResult;
@@ -219,20 +278,21 @@
{
if(strlen($value) > 10)
{
- //numfmt_create("en", NumberFormatter::SCIENTIFIC, "");
- //$fmt = new NumberFormatter("en", NumberFormatter::SCIENTIFIC, "");
- //$value = $fmt->format($value);
-
+ $value = sprintf("%+F",$value);
$pos = strpos($value, ".");
- if( ( strlen($value) - $pos ) > 7)
+ if ($pos >= 6 )
{
- $value = number_format($value,4);
+ $value = sprintf("%0.4E", $value);
}
+ else
+ {
+ $value = number_format($value, 4,'.',' ');
+ }
}
else
{
- $value = number_format($value,4);
+ $value = number_format($value, 4,'.',' ');
}
return $value;
Modified: trunk/MgDev/Web/src/mapadmin/performanceReport_MapViewer.php
===================================================================
--- trunk/MgDev/Web/src/mapadmin/performanceReport_MapViewer.php 2011-09-27 08:52:08 UTC (rev 6150)
+++ trunk/MgDev/Web/src/mapadmin/performanceReport_MapViewer.php 2011-09-27 10:24:45 UTC (rev 6151)
@@ -38,7 +38,12 @@
$resourceSrvc->SetResource($webLayOutId, $content_byteReader, null);
//pass the seesion ID with the url, so when the map viewer is opened, there is no need to re-enter the password
- $webLayoutUrl="../mapviewerajax/?WEBLAYOUT=".urlencode($webLayoutName)."&LOCALE=en&SESSION=".$site->GetCurrentSession();
+ $ajaxViewerFolder = "mapviewerajax/?";
+ //uncomment this line for Java API.
+ //$ajaxViewerFolder = "mapviewerjava/ajaxviewer.jsp?";
+
+ $webLayoutUrl="../".$ajaxViewerFolder."WEBLAYOUT=".urlencode($webLayoutName)."&LOCALE=en&SESSION=".$site->GetCurrentSession();
+
header('Location:'. $webLayoutUrl);
?>
Modified: trunk/MgDev/Web/src/mapadmin/serverdatafunctions.php
===================================================================
--- trunk/MgDev/Web/src/mapadmin/serverdatafunctions.php 2011-09-27 08:52:08 UTC (rev 6150)
+++ trunk/MgDev/Web/src/mapadmin/serverdatafunctions.php 2011-09-27 10:24:45 UTC (rev 6151)
@@ -2366,7 +2366,6 @@
$scale = trim($scale);
//required parameters are null or empty then ignore this setting
- //TODO: Excepions: we can ignore this setting, but we need to send signal not to update the original part
if( (!isset($mapResourceId,$centerPoint,$scale)) || ("" == trim($mapResourceId)) || ("" == trim($centerPoint)) || ("" == trim($scale)) )
{
return;
More information about the mapguide-commits
mailing list