[mapguide-commits] r8296 - in trunk/MgDev: . Web/src/mapviewerjava Web/src/mapviewernet Web/src/mapviewerphp Web/src/viewerfiles
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Wed Jul 9 05:51:43 PDT 2014
Author: jng
Date: 2014-07-09 05:51:43 -0700 (Wed, 09 Jul 2014)
New Revision: 8296
Removed:
trunk/MgDev/Web/src/mapviewerjava/setselection.jsp
trunk/MgDev/Web/src/mapviewernet/setselection.aspx
trunk/MgDev/Web/src/mapviewerphp/setselection.php
Modified:
trunk/MgDev/
trunk/MgDev/Web/src/mapviewerjava/mapframe.jsp
trunk/MgDev/Web/src/mapviewernet/mapframe.aspx
trunk/MgDev/Web/src/mapviewerphp/mapframe.php
trunk/MgDev/Web/src/viewerfiles/
trunk/MgDev/Web/src/viewerfiles/ajaxmappane.templ
Log:
Merged revision(s) 8289-8292 from branches/2.6/MgDev:
#2465: Remove setselection script reference. This will momentarily break mapframe.[php/jsp/aspx] until we update these files to not plug this script reference in.
........
#2465: Remove setselection.aspx and don't plug in this script reference in mapframe.aspx
........
#2465: Remove setselection.php and don't plug in this script reference in mapframe.php
........
#2465: Remove setselection.jsp and don't plug in this script reference in mapframe.jsp
........
Property changes on: trunk/MgDev
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/2.4/MgDev:6749-6756,6777-6783,6785-6787,6789,6791-6794,6796-6801,6954-6962,6986-7006
/branches/2.6/MgDev:8276-8286,8288
/sandbox/jng/convenience_apis:8263
/sandbox/jng/createruntimemap:7486-7555
/sandbox/jng/v30:8212,8214,8217,8220-8221,8223-8225
/sandbox/rfc94:5099-5163
+ /branches/2.4/MgDev:6749-6756,6777-6783,6785-6787,6789,6791-6794,6796-6801,6954-6962,6986-7006
/branches/2.6/MgDev:8276-8286,8288-8292
/sandbox/jng/convenience_apis:8263
/sandbox/jng/createruntimemap:7486-7555
/sandbox/jng/v30:8212,8214,8217,8220-8221,8223-8225
/sandbox/rfc94:5099-5163
Modified: trunk/MgDev/Web/src/mapviewerjava/mapframe.jsp
===================================================================
--- trunk/MgDev/Web/src/mapviewerjava/mapframe.jsp 2014-07-09 12:48:46 UTC (rev 8295)
+++ trunk/MgDev/Web/src/mapviewerjava/mapframe.jsp 2014-07-09 12:51:43 UTC (rev 8296)
@@ -177,7 +177,6 @@
bgColor,
hlTgt,
hlTgtName,
- vpath + "setselection.jsp",
showSlider != 0? "true": "false",
locale,
scaleCreationCode,
Deleted: trunk/MgDev/Web/src/mapviewerjava/setselection.jsp
===================================================================
--- trunk/MgDev/Web/src/mapviewerjava/setselection.jsp 2014-07-09 12:48:46 UTC (rev 8295)
+++ trunk/MgDev/Web/src/mapviewerjava/setselection.jsp 2014-07-09 12:51:43 UTC (rev 8296)
@@ -1,122 +0,0 @@
-<%--
- -Copyright (C) 2004-2011 by Autodesk, Inc.
- -This library is free software; you can redistribute it and/or
- -modify it under the terms of version 2.1 of the GNU Lesser
- -General Public License as published by the Free Software Foundation.
-
- -This library 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
- -Lesser General Public License for more details.
-
- -You should have received a copy of the GNU Lesser General Public
- -License along with this library; if not, write to the Free Software
- -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
---%>
-
-<%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
-<%@ page import="org.osgeo.mapguide.*" %>
-<%@ page import="java.util.*" %>
-<%@ page import="java.io.*" %>
-<%@ page import="java.text.*" %>
-<%@ page import="javax.servlet.jsp.*" %>
-<%@ page import="javax.servlet.http.*" %>
-<%@ include file="common.jsp" %>
-<%@ page isThreadSafe="false" %>
-
-<%!
-String mapName = "";
-String sessionId = "";
-String selText = "";
-boolean queryInfo;
-%>
-
-<%
-
-response.setContentType("text/xml; charset=UTF-8");
-
-request.setCharacterEncoding("UTF-8");
-mapName = sessionId = selText = "";
-queryInfo = false;
-
-//fetch the parameters for this request
-//
-GetRequestParameters(request);
-
-try
-{
- InitializeWebTier();
-
- MgUserInformation cred = new MgUserInformation(sessionId);
- cred.SetClientIp(GetClientIp(request));
- cred.SetClientAgent(GetClientAgent());
-
- //connect to the site and get an instance of the resource service
- //
- MgSiteConnection site = new MgSiteConnection();
- site.Open(cred);
- MgResourceService resourceSrvc = (MgResourceService)site.CreateService(MgServiceType.ResourceService);
-
- //load the map runtime state
- //
- MgMap map = new MgMap(site);
- map.Open(mapName);
-
- // Create the selection set and save it
- MgSelection sel = new MgSelection(map);
- if(selText != null && selText.length() > 0)
- sel.FromXml(selText);
- sel.Save(resourceSrvc, mapName);
-
- if(queryInfo) {
- //Query feature info for the feature in the selection set. This will return the current set
- //along with property info
- //There must be only one feature in the feature set
- MgReadOnlyLayerCollection layers = sel.GetLayers();
- if(layers == null && layers.GetCount() != 1) {
- response.getWriter().write("Error: There must be exactly one feature in the set."); ///NOXLATE dbg report only
- return;
- }
- MgLayer layer = (MgLayer) layers.GetItem(0);
- String featureClassName = layer.GetFeatureClassName();
- String filter = sel.GenerateFilter(layer, featureClassName);
- MgFeatureService featureSrvc = (MgFeatureService)site.CreateService(MgServiceType.FeatureService);
- MgFeatureQueryOptions query = new MgFeatureQueryOptions();
- query.SetFilter(filter);
- MgResourceIdentifier featureSource = new MgResourceIdentifier(layer.GetFeatureSourceId());
- MgFeatureReader features = featureSrvc.SelectFeatures(featureSource, featureClassName, query);
- int featCount = 0;
- while(features.ReadNext()) {
- if(featCount++ == 1)
- break;
- }
- features.Close();
- if(featCount != 1) {
- response.getWriter().write("Error: There must be exactly one feature in the set."); ///NOXLATE dbg report only
- return;
- }
- MgRenderingService renderingSrvc = (MgRenderingService)site.CreateService(MgServiceType.RenderingService);
- MgStringCollection layerNames = new MgStringCollection();
- layerNames.Add(layer.GetName());
- MgFeatureInformation featInfo = renderingSrvc.QueryFeatures(map, layerNames, null, MgFeatureSpatialOperations.Intersects, selText, 1, 2);
- response.getWriter().write(featInfo.ToXml().ToString());
- }
-}
-catch(MgException e)
-{
- response.getWriter().write("\nClearSelection Exception: " + e.GetDetails());
-}
-catch(Exception e)
-{
-}
-%>
-
-<%!
-void GetRequestParameters(HttpServletRequest request)
-{
- sessionId = ValidateSessionId(GetParameter(request, "SESSION"));
- mapName = ValidateMapName(GetParameter(request, "MAPNAME"));
- queryInfo = (GetIntParameter(request, "QUERYINFO") == 1);
- selText = GetParameter(request, "SELECTION");
-}
-%>
Modified: trunk/MgDev/Web/src/mapviewernet/mapframe.aspx
===================================================================
--- trunk/MgDev/Web/src/mapviewernet/mapframe.aspx 2014-07-09 12:48:46 UTC (rev 8295)
+++ trunk/MgDev/Web/src/mapviewernet/mapframe.aspx 2014-07-09 12:51:43 UTC (rev 8296)
@@ -179,7 +179,6 @@
bgColor,
hlTgt,
hlTgtName,
- vpath + "setselection.aspx",
showSlider != 0? "true": "false",
locale,
scaleCreationCode,
Deleted: trunk/MgDev/Web/src/mapviewernet/setselection.aspx
===================================================================
--- trunk/MgDev/Web/src/mapviewernet/setselection.aspx 2014-07-09 12:48:46 UTC (rev 8295)
+++ trunk/MgDev/Web/src/mapviewernet/setselection.aspx 2014-07-09 12:51:43 UTC (rev 8296)
@@ -1,127 +0,0 @@
-<%--
-Copyright (C) 2004-2011 by Autodesk, Inc.
-This library is free software; you can redistribute it and/or
-modify it under the terms of version 2.1 of the GNU Lesser
-General Public License as published by the Free Software Foundation.
-
-This library 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
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
---%>
-
-<%@ Page language="c#" validateRequest="false" %>
-<%@ Import Namespace="System" %>
-<%@ Import Namespace="System.IO" %>
-<%@ Import Namespace="System.Collections.Specialized" %>
-<%@ Import Namespace="System.Text" %>
-<%@ Import Namespace="OSGeo.MapGuide" %>
-
-<!-- #Include File="common.aspx -->
-
-<script runat="server">
-String mapName = "";
-String sessionId = "";
-String selText = "";
-bool queryInfo = false;
-</script>
-
-<%
- Response.Charset = "utf-8";
- Response.ContentType = "text/xml";
-
- GetRequestParameters();
-
- try
- {
- InitializeWebTier();
-
- MgUserInformation cred = new MgUserInformation(sessionId);
- cred.SetClientIp(GetClientIp(Request));
- cred.SetClientAgent(GetClientAgent());
-
- //connect to the site and get an instance of the resoucre service
- //
- MgSiteConnection site = new MgSiteConnection();
- site.Open(cred);
- MgResourceService resourceSrvc = (MgResourceService)site.CreateService(MgServiceType.ResourceService);
-
- //load the map runtime state
- //
- MgMap map = new MgMap(site);
- map.Open(mapName);
-
- // Create the selection set and save it
- MgSelection sel = new MgSelection(map);
- if (selText != null && selText.Length > 0)
- sel.FromXml(selText);
- sel.Save(resourceSrvc, mapName);
-
- if (queryInfo)
- {
- //Query feature info for the feature in the selection set. This will return the current set
- //along with property info
- //There must be only one feature in the feature set
- MgReadOnlyLayerCollection layers = sel.GetLayers();
- if (layers == null || layers.GetCount() != 1)
- {
- Response.Write("Error: There must be exactly one feature in the set."); ///NOXLATE dbg report only
- return;
- }
- MgLayer layer = (MgLayer) layers.GetItem(0);
- String featureClassName = layer.GetFeatureClassName();
- String filter = sel.GenerateFilter(layer, featureClassName);
- MgFeatureService featureSrvc = (MgFeatureService)site.CreateService(MgServiceType.FeatureService);
- MgFeatureQueryOptions query = new MgFeatureQueryOptions();
- query.SetFilter(filter);
- MgResourceIdentifier featureSource = new MgResourceIdentifier(layer.GetFeatureSourceId());
- MgFeatureReader features = featureSrvc.SelectFeatures(featureSource, featureClassName, query);
- int featCount = 0;
- while (features.ReadNext())
- {
- if (featCount++ == 1)
- break;
- }
- features.Close();
- if (featCount != 1)
- {
- Response.Write("Error: There must be exactly one feature in the set."); ///NOXLATE dbg report only
- return;
- }
- MgRenderingService renderingSrvc = (MgRenderingService)site.CreateService(MgServiceType.RenderingService);
- MgStringCollection layerNames = new MgStringCollection();
- layerNames.Add(layer.GetName());
- MgFeatureInformation featInfo = renderingSrvc.QueryFeatures(map, layerNames, null, MgFeatureSpatialOperations.Intersects, selText, 1, 2);
- Response.Write(featInfo.ToXml().ToString());
- }
- }
- catch (MgException e)
- {
- Response.Write("\nSetSelection Exception: " + e.GetDetails());
- }
-%>
-
-<script runat="server">
-
-void GetRequestParameters()
-{
- if(Request.HttpMethod == "POST")
- GetParameters(Request.Form);
- else
- GetParameters(Request.QueryString);
-}
-
-void GetParameters(NameValueCollection parameters)
-{
- sessionId = ValidateSessionId(GetParameter(parameters, "SESSION"));
- mapName = ValidateMapName(GetParameter(parameters, "MAPNAME"));
- if(IsParameter(parameters, "QUERYINFO"))
- queryInfo = GetIntParameter(parameters, "QUERYINFO") == 1;
- selText = GetParameter(parameters, "SELECTION");
-}
-
-</script>
Modified: trunk/MgDev/Web/src/mapviewerphp/mapframe.php
===================================================================
--- trunk/MgDev/Web/src/mapviewerphp/mapframe.php 2014-07-09 12:48:46 UTC (rev 8295)
+++ trunk/MgDev/Web/src/mapviewerphp/mapframe.php 2014-07-09 12:51:43 UTC (rev 8296)
@@ -143,7 +143,6 @@
$unitsType,
$bgColor,
$hlTgt, $hlTgtName,
- $vpath . "setselection.php",
$showSlider? "true": "false",
$locale,
$scaleCreationCode,
Deleted: trunk/MgDev/Web/src/mapviewerphp/setselection.php
===================================================================
--- trunk/MgDev/Web/src/mapviewerphp/setselection.php 2014-07-09 12:48:46 UTC (rev 8295)
+++ trunk/MgDev/Web/src/mapviewerphp/setselection.php 2014-07-09 12:51:43 UTC (rev 8296)
@@ -1,130 +0,0 @@
-<?php
-
-//
-// Copyright (C) 2004-2011 by Autodesk, Inc.
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of version 2.1 of the GNU Lesser
-// General Public License as published by the Free Software Foundation.
-//
-// This library 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
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-//
-
- include 'common.php';
- include 'constants.php';
-
- $mapName = "";
- $sessionId = "";
- $selText = "";
- $queryInfo = false;
-
- GetRequestParameters();
-
- try
- {
- InitializeWebTier();
-
- $cred = new MgUserInformation($sessionId);
- $cred->SetClientIp(GetClientIp());
- $cred->SetClientAgent(GetClientAgent());
-
- //connect to the site and get an instance of the resoucre service
- //
- $site = new MgSiteConnection();
- $site->Open($cred);
- $resourceSrvc = $site->CreateService(MgServiceType::ResourceService);
-
- //load the map runtime state
- //
- $map = new MgMap($site);
- $map->Open($mapName);
-
- // Create the selection set and save it
- $sel = new MgSelection($map);
- if($selText != "")
- $sel->FromXml($selText);
- $sel->Save($resourceSrvc, $mapName);
-
- if($queryInfo) {
- //Query feature info for the feature in the selection set. This will return the current set
- //along with property info
- //There must be only one feature in the feature set
- $layers = $sel->GetLayers();
- if($layers == null || $layers->GetCount() != 1) {
- echo "Error: There must be exactly one feature in the set."; ///NOXLATE dbg report only
- return;
- }
- $layer = $layers->GetItem(0);
- $featureClassName = $layer->GetFeatureClassName();
- $filter = $sel->GenerateFilter($layer, $featureClassName);
- $featureSrvc = $site->CreateService(MgServiceType::FeatureService);
- $query = new MgFeatureQueryOptions();
- $query->SetFilter($filter);
- $featureSource = new MgResourceIdentifier($layer->GetFeatureSourceId());
- $features = $featureSrvc->SelectFeatures($featureSource, $featureClassName, $query);
- $featCount = 0;
- while($features->ReadNext())
- {
- if($featCount++ == 1)
- break;
- }
- $features->Close();
- if($featCount != 1) {
- echo "Error: There must be exactly one feature in the set."; ///NOXLATE dbg report only
- return;
- }
- $renderingSrvc = $site->CreateService(MgServiceType::RenderingService);
- $layerNames = new MgStringCollection();
- $layerNames->Add($layer->GetName());
- $featInfo = $renderingSrvc->QueryFeatures($map, $layerNames, NULL, MgFeatureSpatialOperations::Intersects, $selText, 1, 2);
- header('Content-Type: text/xml; charset: UTF-8');
- echo $featInfo->ToXml()->ToString();
- }
- }
- catch(MgException $e)
- {
- echo "ClearSelection Exception: " . $e->GetDetails();
- }
-
-function GetParameters($params)
-{
- global $mapName, $sessionId, $selText, $queryInfo;
-
- $sessionId = ValidateSessionId(GetParameter($params, 'SESSION'));
- $mapName = ValidateMapName(GetParameter($params, 'MAPNAME'));
- if(isset($params['QUERYINFO']))
- $queryInfo = (GetIntParameter($params, 'QUERYINFO') == 1);
-
- $selText = UnescapeMagicQuotes(GetParameter($params, 'SELECTION'));
-}
-
-function UnescapeMagicQuotes($str)
-{
- if(ini_get("magic_quotes_sybase") == "1")
- return str_replace("''", "'", $str);
- else if(get_magic_quotes_gpc() == "1")
- {
- //Unescape double quotes
- $str = str_replace('\\"', '"', $str);
-
- //remove additional backslash
- return str_replace("\\", "", $str);
- }
- return $str;
-}
-
-function GetRequestParameters()
-{
- if($_SERVER['REQUEST_METHOD'] == "POST")
- GetParameters($_POST);
- else
- GetParameters($_GET);
-}
-?>
Property changes on: trunk/MgDev/Web/src/viewerfiles
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/2.4/MgDev/Web/src/viewerfiles:6738-6741,6749-6756,6777-6783,6785-6787,6789,6791-6794,6796-6801,6954-6962,6986-7006
/branches/2.6/MgDev/Web/src/viewerfiles:8288
/sandbox/adsk/2.2gp/Web/src/viewerfiles:5392
/sandbox/jng/createruntimemap/Web/src/viewerfiles:7486-7555
+ /branches/2.4/MgDev/Web/src/viewerfiles:6738-6741,6749-6756,6777-6783,6785-6787,6789,6791-6794,6796-6801,6954-6962,6986-7006
/branches/2.6/MgDev/Web/src/viewerfiles:8288-8292
/sandbox/adsk/2.2gp/Web/src/viewerfiles:5392
/sandbox/jng/createruntimemap/Web/src/viewerfiles:7486-7555
Modified: trunk/MgDev/Web/src/viewerfiles/ajaxmappane.templ
===================================================================
--- trunk/MgDev/Web/src/viewerfiles/ajaxmappane.templ 2014-07-09 12:48:46 UTC (rev 8295)
+++ trunk/MgDev/Web/src/viewerfiles/ajaxmappane.templ 2014-07-09 12:51:43 UTC (rev 8296)
@@ -320,7 +320,6 @@
var imgId = 0, mapId = 0, selMapId = 0, lastMapRcv = 0;
var scales = new Array();
var requestTiles = false;
-var setSelScript = '%s';
var hlData;
var moveTimer = 0, mapInit = false;
var haveTooltip = false;
More information about the mapguide-commits
mailing list