[fusion-commits] r1841 - in trunk/widgets/Query: . classes
svn_fusion at osgeo.org
svn_fusion at osgeo.org
Wed Apr 29 14:26:31 EDT 2009
Author: pagameba
Date: 2009-04-29 14:26:31 -0400 (Wed, 29 Apr 2009)
New Revision: 1841
Modified:
trunk/widgets/Query/classes/feature.php
trunk/widgets/Query/classes/property.php
trunk/widgets/Query/classes/query.php
trunk/widgets/Query/querycontroller.php
trunk/widgets/Query/querymain.php
Log:
re #249, changes to make features selectable in the query results.
Modified: trunk/widgets/Query/classes/feature.php
===================================================================
--- trunk/widgets/Query/classes/feature.php 2009-04-29 18:05:43 UTC (rev 1840)
+++ trunk/widgets/Query/classes/feature.php 2009-04-29 18:26:31 UTC (rev 1841)
@@ -1,40 +1,36 @@
-<?php
-
-//
-// Copyright (C) 2004-2006 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
-//
-
-?>
-
-<?php
-
-class Feature
-{
- public $displayValue = '';
- public $centerX = '';
- public $centerY = '';
- public $idList = null;
-
- function __construct($displayValue, $centerPoint, $idList)
- {
- $this->displayValue = $displayValue;
- $this->centerX = $centerPoint->GetCoordinate()->GetX();
- $this->centerY = $centerPoint->GetCoordinate()->GetY();
- $this->idList = $idList;
- }
-}
-
+<?php
+
+//
+// Copyright (C) 2004-2006 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
+//
+
+class Feature
+{
+ public $displayValue = '';
+ public $centerX = '';
+ public $centerY = '';
+ public $idList = null;
+
+ function __construct($displayValue, $centerPoint, $idList)
+ {
+ $this->displayValue = $displayValue;
+ $this->centerX = $centerPoint->GetCoordinate()->GetX();
+ $this->centerY = $centerPoint->GetCoordinate()->GetY();
+ $this->idList = $idList;
+ }
+}
+
?>
\ No newline at end of file
Modified: trunk/widgets/Query/classes/property.php
===================================================================
--- trunk/widgets/Query/classes/property.php 2009-04-29 18:05:43 UTC (rev 1840)
+++ trunk/widgets/Query/classes/property.php 2009-04-29 18:26:31 UTC (rev 1841)
@@ -1,36 +1,32 @@
-<?php
-
-//
-// Copyright (C) 2004-2006 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
-//
-
-?>
-
-<?php
-
-class Property
-{
- public $name = '';
- public $isString = false;
-
- function __construct($name, $isString)
- {
- $this->name = $name;
- $this->isString = $isString;
- }
-}
-
+<?php
+
+//
+// Copyright (C) 2004-2006 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
+//
+
+class Property
+{
+ public $name = '';
+ public $isString = false;
+
+ function __construct($name, $isString)
+ {
+ $this->name = $name;
+ $this->isString = $isString;
+ }
+}
+
?>
\ No newline at end of file
Modified: trunk/widgets/Query/classes/query.php
===================================================================
--- trunk/widgets/Query/classes/query.php 2009-04-29 18:05:43 UTC (rev 1840)
+++ trunk/widgets/Query/classes/query.php 2009-04-29 18:26:31 UTC (rev 1841)
@@ -17,10 +17,6 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-?>
-
-<?php
-
require_once('property.php');
require_once('feature.php');
// require_once '../Common/JSON.php';
Modified: trunk/widgets/Query/querycontroller.php
===================================================================
--- trunk/widgets/Query/querycontroller.php 2009-04-29 18:05:43 UTC (rev 1840)
+++ trunk/widgets/Query/querycontroller.php 2009-04-29 18:26:31 UTC (rev 1841)
@@ -20,45 +20,63 @@
$fusionMGpath = '../../layers/MapGuide/php/';
require_once $fusionMGpath . 'Common.php';
require_once $fusionMGpath . 'Utilities.php';
- require_once $fusionMGpath . '/JSON.php';
+ require_once $fusionMGpath . 'JSON.php';
require_once 'classes/query.php';
$args = ($_SERVER['REQUEST_METHOD'] == "POST") ? $_POST : $_GET;
// MgInitializeWebTier($configFilePath);
+
+ try {
- $query = new Query($args);
- $json = new Services_JSON();
- $responseType = '';
- $response = '';
+ $query = new Query($args);
+ $json = new Services_JSON();
+ $responseType = '';
+ $response = '';
- if (array_key_exists('COMMAND', $args))
+ if (array_key_exists('COMMAND', $args))
+ {
+ $cmd = $args['COMMAND'];
+ switch ($cmd) {
+ case "GETLAYERPROPERTIES":
+ $reponseType = 'text/plain';
+ $response = $json->encode($query->GetLayerProperties());
+ break;
+ case "TOGGLESPATIALFILTER":
+ $reponseType = 'text/plain';
+ $response = $json->encode($query->ToggleSpatialFilter());
+ break;
+ case "SHOWSPATIALFILTER":
+ $reponseType = 'text/plain';
+ $response = $json->encode($query->ShowSpatialFilter());
+ break;
+ case "EXECUTEQUERY":
+ $reponseType = 'text/plain';
+ $response = $json->encode($query->Execute());
+ break;
+ case "GETSELECTIONXML":
+ $reponseType = 'text/xml';
+ $response = trim($query->GetSelectionXML());
+ break;
+ }
+ }
+
+ header('Content-Type: ' . $responseType);
+ echo trim($response);
+ exit;
+ }
+ catch (MgException $mge)
{
- $cmd = $args['COMMAND'];
- switch ($cmd) {
- case "GETLAYERPROPERTIES":
- $reponseType = 'text/plain';
- $response = $json->encode($query->GetLayerProperties());
- break;
- case "TOGGLESPATIALFILTER":
- $reponseType = 'text/plain';
- $response = $json->encode($query->ToggleSpatialFilter());
- break;
- case "SHOWSPATIALFILTER":
- $reponseType = 'text/plain';
- $response = $json->encode($query->ShowSpatialFilter());
- break;
- case "EXECUTEQUERY":
- $reponseType = 'text/plain';
- $response = $json->encode($query->Execute());
- break;
- case "GETSELECTIONXML":
- $reponseType = 'text/xml';
- $response = trim($query->GetSelectionXML());
- break;
- }
+ $errorMsg = $mge->GetMessage();
+ $errorDetail = $mge->GetDetails();
}
-
- header('Content-Type: ' . $responseType);
- echo trim($response);
-?>
\ No newline at end of file
+ catch (Exception $e)
+ {
+ $errorMsg = $e->GetMessage();
+ }
+?>
+<table class="RegText" border="0" cellspacing="0" width="100%%">
+ <tr><td class="Title">Error<hr></td></tr>
+ <tr><td><?= $errorMsg ?></td></tr>
+ <tr><td><?= $errorDetail ?></td></tr>
+</table>
\ No newline at end of file
Modified: trunk/widgets/Query/querymain.php
===================================================================
--- trunk/widgets/Query/querymain.php 2009-04-29 18:05:43 UTC (rev 1840)
+++ trunk/widgets/Query/querymain.php 2009-04-29 18:26:31 UTC (rev 1841)
@@ -17,10 +17,6 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-?>
-
-<?php
-
$fusionMGpath = '../../layers/MapGuide/php/';
require_once $fusionMGpath . 'Common.php';
require_once $fusionMGpath . 'Utilities.php';
More information about the fusion-commits
mailing list