[fusion-commits] r3028 - trunk/widgets/Search

[svn_fusion at osgeo.org]

Author: jng
Date: 2018-03-08 06:29:30 -0800 (Thu, 08 Mar 2018)
New Revision: 3028

Modified:
   trunk/widgets/Search/Search.php
Log:
Speculative fix for: https://trac.osgeo.org/mapguide/ticket/2770

Just because we set $bHasPoint = true, don't blindly assume that the geometry we read out is also going to be a point. Render out the default non-point result row if the geometry is not a point.

Modified: trunk/widgets/Search/Search.php
===================================================================
--- trunk/widgets/Search/Search.php	2018-03-08 13:36:17 UTC (rev 3027)
+++ trunk/widgets/Search/Search.php	2018-03-08 14:29:30 UTC (rev 3028)
@@ -278,8 +278,10 @@
                                 $coord = $geom->GetCoordinate();
                                 $x = $coord->GetX();
                                 $y = $coord->GetY();
+                                echo sprintf("<td class=\"%s\" id=\"%d:%d\" onmousemove=\"SelectRow(%d)\" onclick=\"PointCellClicked('%s', %g, %g, %g)\"> %s</td>\n", !($row%2)? "Search" : "Search2", $row, $i, $row, $selText, $x, $y, $pointZoom, $val);
+                            } else {
+                                echo sprintf("<td class=\"%s\" id=\"%d:%d\" onmousemove=\"SelectRow(%d)\" onclick=\"CellClicked('%s')\"> %s</td>\n", !($row%2)? "Search" : "Search2", $row, $i, $row, $selText, $val);
                             }
-                            echo sprintf("<td class=\"%s\" id=\"%d:%d\" onmousemove=\"SelectRow(%d)\" onclick=\"PointCellClicked('%s', %g, %g, %g)\"> %s</td>\n", !($row%2)? "Search" : "Search2", $row, $i, $row, $selText, $x, $y, $pointZoom, $val);
                         } catch (MgException $ex) {
                             echo sprintf("<td class=\"%s\" id=\"%d:%d\" onmousemove=\"SelectRow(%d)\" onclick=\"CellClicked('%s')\"> %s</td>\n", !($row%2)? "Search" : "Search2", $row, $i, $row, $selText, $val);
                         }