[Mapbender-commits] r8557 - trunk/mapbender/http/classes

[svn_mapbender at osgeo.org]

Author: verenadiewald
Date: 2013-02-06 23:53:49 -0800 (Wed, 06 Feb 2013)
New Revision: 8557

Modified:
   trunk/mapbender/http/classes/class_wfs_1_0_factory.php
   trunk/mapbender/http/classes/class_wfs_1_1_factory.php
Log:
use function stripEndlineAndCarriageReturn for parsing of featuretype name, title and abstract

Modified: trunk/mapbender/http/classes/class_wfs_1_0_factory.php
===================================================================
--- trunk/mapbender/http/classes/class_wfs_1_0_factory.php	2013-02-06 13:51:40 UTC (rev 8556)
+++ trunk/mapbender/http/classes/class_wfs_1_0_factory.php	2013-02-07 07:53:49 UTC (rev 8557)
@@ -183,9 +183,9 @@
 				
 				foreach ($capFeatureTypes as $featureType) {
 
-					$featuretype_name = $featureType->Name[0];
-					$featuretype_title = $featureType->Title[0];
-					$featuretype_abstract = $featureType->Abstract[0];
+					$featuretype_name = $this->stripEndlineAndCarriageReturn($featureType->Name[0]);
+					$featuretype_title = $this->stripEndlineAndCarriageReturn($featureType->Title[0]);
+					$featuretype_abstract = $this->stripEndlineAndCarriageReturn($featureType->Abstract[0]);
 					$featuretype_srs = $featureType->SRS[0];
 					$LatLongBoundingBox = $featureType->LatLongBoundingBox[0];
 					//read bbox of featuretype

Modified: trunk/mapbender/http/classes/class_wfs_1_1_factory.php
===================================================================
--- trunk/mapbender/http/classes/class_wfs_1_1_factory.php	2013-02-06 13:51:40 UTC (rev 8556)
+++ trunk/mapbender/http/classes/class_wfs_1_1_factory.php	2013-02-07 07:53:49 UTC (rev 8557)
@@ -277,9 +277,9 @@
 				foreach ($capFeatureTypes as $featureType) {
 					//debug
 					$e = new mb_notice("ft: ".$featureType->asXML());
-					$featuretype_name = $featureType->Name[0];
-					$featuretype_title = $featureType->Title[0];
-					$featuretype_abstract = $featureType->Abstract[0];
+					$featuretype_name = $this->stripEndlineAndCarriageReturn($featureType->Name[0]);
+					$featuretype_title = $this->stripEndlineAndCarriageReturn($featureType->Title[0]);
+					$featuretype_abstract = $this->stripEndlineAndCarriageReturn($featureType->Abstract[0]);
 					//<DefaultSRS>urn:ogc:def:crs:EPSG::4326</DefaultSRS><OtherSRS>urn:ogc:def:crs:EPSG::4269</OtherSRS><OtherSRS>urn:ogc:def:crs:EPSG::3978</OtherSRS><OtherSRS>urn:ogc:def:crs:EPSG::3857</OtherSRS><OtherSRS>urn:ogc:def:crs:EPSG::31466</OtherSRS><OtherSRS>urn:ogc:def:crs:EPSG::25832</OtherSRS><OtherSRS>urn:ogc:def:crs:EPSG::4258</OtherSRS>
 					$featuretype_srs = $featureType->DefaultSRS[0];
 					$otherSRSArray = $featureType->OtherSRS;