[Mapbender-commits] r1655 - trunk/mapbender/http/php

[svn_mapbender at osgeo.org]

Author: christoph
Date: 2007-08-10 05:11:24 -0400 (Fri, 10 Aug 2007)
New Revision: 1655

Modified:
   trunk/mapbender/http/php/mod_changeEPSG.php
   trunk/mapbender/http/php/mod_changeEPSG_dynamic.php
Log:
fixed faulty preg_replace call

Modified: trunk/mapbender/http/php/mod_changeEPSG.php
===================================================================
--- trunk/mapbender/http/php/mod_changeEPSG.php	2007-08-10 09:10:50 UTC (rev 1654)
+++ trunk/mapbender/http/php/mod_changeEPSG.php	2007-08-10 09:11:24 UTC (rev 1655)
@@ -61,19 +61,19 @@
 		$temp = mb_split(",",$arraymapObj[$i]);
 		if(SYS_DBTYPE=='pgsql'){
 			$con = db_connect($DBSERVER,$OWNER,$PW);
-			$sqlMinx = "SELECT X(transform(GeometryFromText('POINT(".$temp[2]." ".$temp[3].")',".preg_replace("EPSG:","",$temp[1])."),".preg_replace("EPSG:","",$_REQUEST["newSRS"]).")) as minx";
+			$sqlMinx = "SELECT X(transform(GeometryFromText('POINT(".$temp[2]." ".$temp[3].")',".preg_replace("/EPSG:/","",$temp[1])."),".preg_replace("/EPSG:/","",$_REQUEST["newSRS"]).")) as minx";
 			$resMinx = db_query($sqlMinx);
 			$minx = db_result($resMinx,0,"minx");
 			
-			$sqlMiny = "SELECT Y(transform(GeometryFromText('POINT(".$temp[2]." ".$temp[3].")',".preg_replace("EPSG:","",$temp[1])."),".preg_replace("EPSG:","",$_REQUEST["newSRS"]).")) as miny";
+			$sqlMiny = "SELECT Y(transform(GeometryFromText('POINT(".$temp[2]." ".$temp[3].")',".preg_replace("/EPSG:/","",$temp[1])."),".preg_replace("/EPSG:/","",$_REQUEST["newSRS"]).")) as miny";
 			$resMiny = db_query($sqlMiny);
 			$miny = db_result($resMiny,0,"miny");
 			
-			$sqlMaxx = "SELECT X(transform(GeometryFromText('POINT(".$temp[4]." ".$temp[5].")',".preg_replace("EPSG:","",$temp[1])."),".preg_replace("EPSG:","",$_REQUEST["newSRS"]).")) as maxx";
+			$sqlMaxx = "SELECT X(transform(GeometryFromText('POINT(".$temp[4]." ".$temp[5].")',".preg_replace("/EPSG:/","",$temp[1])."),".preg_replace("/EPSG:/","",$_REQUEST["newSRS"]).")) as maxx";
 			$resMaxx =db_query($sqlMaxx);
 			$maxx = db_result($resMaxx,0,"maxx");
 			
-			$sqlMaxy = "SELECT Y(transform(GeometryFromText('POINT(".$temp[4]." ".$temp[5].")',".preg_replace("EPSG:","",$temp[1])."),".preg_replace("EPSG:","",$_REQUEST["newSRS"]).")) as maxy";
+			$sqlMaxy = "SELECT Y(transform(GeometryFromText('POINT(".$temp[4]." ".$temp[5].")',".preg_replace("/EPSG:/","",$temp[1])."),".preg_replace("/EPSG:/","",$_REQUEST["newSRS"]).")) as maxy";
 			$resMaxy = db_query($sqlMaxy);
 			$maxy = db_result($resMaxy,0,"maxy");
 		}else{

Modified: trunk/mapbender/http/php/mod_changeEPSG_dynamic.php
===================================================================
--- trunk/mapbender/http/php/mod_changeEPSG_dynamic.php	2007-08-10 09:10:50 UTC (rev 1654)
+++ trunk/mapbender/http/php/mod_changeEPSG_dynamic.php	2007-08-10 09:11:24 UTC (rev 1655)
@@ -121,19 +121,19 @@
 	for($i=0; $i < count($arraymapObj); $i++){
 		$temp = mb_split(",",$arraymapObj[$i]);
 		
-		$sqlMinx = "SELECT X(transform(GeometryFromText('POINT(".$temp[2]." ".$temp[3].")',".preg_replace("EPSG:","",$temp[1])."),".preg_replace("EPSG:","",$_REQUEST["newSRS"]).")) as minx";
+		$sqlMinx = "SELECT X(transform(GeometryFromText('POINT(".$temp[2]." ".$temp[3].")',".preg_replace("/EPSG:/","",$temp[1])."),".preg_replace("/EPSG:/","",$_REQUEST["newSRS"]).")) as minx";
 		$resMinx = @pg_query($con,$sqlMinx);
 		$minx = pg_result($resMinx,0,"minx");
 		
-		$sqlMiny = "SELECT Y(transform(GeometryFromText('POINT(".$temp[2]." ".$temp[3].")',".preg_replace("EPSG:","",$temp[1])."),".preg_replace("EPSG:","",$_REQUEST["newSRS"]).")) as miny";
+		$sqlMiny = "SELECT Y(transform(GeometryFromText('POINT(".$temp[2]." ".$temp[3].")',".preg_replace("/EPSG:/","",$temp[1])."),".preg_replace("/EPSG:/","",$_REQUEST["newSRS"]).")) as miny";
 		$resMiny = @pg_query($con,$sqlMiny);
 		$miny = pg_result($resMiny,0,"miny");
 		
-		$sqlMaxx = "SELECT X(transform(GeometryFromText('POINT(".$temp[4]." ".$temp[5].")',".preg_replace("EPSG:","",$temp[1])."),".preg_replace("EPSG:","",$_REQUEST["newSRS"]).")) as maxx";
+		$sqlMaxx = "SELECT X(transform(GeometryFromText('POINT(".$temp[4]." ".$temp[5].")',".preg_replace("/EPSG:/","",$temp[1])."),".preg_replace("/EPSG:/","",$_REQUEST["newSRS"]).")) as maxx";
 		$resMaxx = @pg_query($con,$sqlMaxx);
 		$maxx = pg_result($resMaxx,0,"maxx");
 		
-		$sqlMaxy = "SELECT Y(transform(GeometryFromText('POINT(".$temp[4]." ".$temp[5].")',".preg_replace("EPSG:","",$temp[1])."),".preg_replace("EPSG:","",$_REQUEST["newSRS"]).")) as maxy";
+		$sqlMaxy = "SELECT Y(transform(GeometryFromText('POINT(".$temp[4]." ".$temp[5].")',".preg_replace("/EPSG:/","",$temp[1])."),".preg_replace("/EPSG:/","",$_REQUEST["newSRS"]).")) as maxy";
 		$resMaxy = @pg_query($con,$sqlMaxy);		 
 		$maxy = pg_result($resMaxy,0,"maxy");