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

[svn_mapbender at osgeo.org]

Author: christoph
Date: 2007-03-02 13:03:55 -0500 (Fri, 02 Mar 2007)
New Revision: 1174

Modified:
   trunk/mapbender/http/classes/class_wms.php
Log:
debugged createJSLayerObj

Modified: trunk/mapbender/http/classes/class_wms.php
===================================================================
--- trunk/mapbender/http/classes/class_wms.php	2007-03-02 16:19:30 UTC (rev 1173)
+++ trunk/mapbender/http/classes/class_wms.php	2007-03-02 18:03:55 UTC (rev 1174)
@@ -110,7 +110,7 @@
 			$this->wms_version = $element[attributes][version];
 		}
 		if(strtoupper($element[tag]) == "TITLE" && $element[level] == '3'){
-			$this->wms_title = $element[value];
+			$this->wms_title = $this->stripEndlineAndCarriageReturn($element[value]);
 		}
 		if(strtoupper($element[tag]) == "ABSTRACT" && $element[level] == '3'){
 			$this->wms_abstract = $this->stripEndlineAndCarriageReturn($element[value]);
@@ -387,7 +387,7 @@
 				$this->objLayer[$cnt_layer]->layer_name = $element[value];
 			}
 			if(strtoupper($element[tag]) == "TITLE"){
-				$this->objLayer[$cnt_layer]->layer_title = $element[value];
+				$this->objLayer[$cnt_layer]->layer_title = $this->stripEndlineAndCarriageReturn($element[value]);
 			}
 			if(strtoupper($element[tag]) == "ABSTRACT"){
 				$this->objLayer[$cnt_layer]->layer_abstract = $this->stripEndlineAndCarriageReturn($element[value]);
@@ -739,11 +739,11 @@
 		echo "wms_add_data_type_format('". $this->data_type[$i] ."','". $this->data_format[$i] ."');\n";		
 	}
 	for($i=0; $i<count($this->objLayer); $i++){
-		if($parent){
-			echo "parent.";
-		}
-	if($this->objLayer[$i]->layer_name == $layer_name|| $this->objLayer[$i]->layer_pos == 0){
+		if($this->objLayer[$i]->layer_name == $layer_name|| $this->objLayer[$i]->layer_pos == 0){
 		
+			if($parent){
+				echo "parent.";
+			}
 		 print ("wms_add_layer('". 
 			$this->objLayer[$i]->layer_parent ."','". 
 			$this->objLayer[$i]->layer_uid ."','". 
@@ -1401,7 +1401,7 @@
 		while($row2 = db_fetch_array($res_wms)){
 			$this->wms_id = $row2["wms_id"];
 			$this->wms_version = $row2["wms_version"];
-			$this->wms_title =  $row2["wms_title"];
+			$this->wms_title = $this->stripEndlineAndCarriageReturn($row2["wms_title"]);
 			$this->wms_abstract = $this->stripEndlineAndCarriageReturn($row2["wms_abstract"]);
 			if($row2["wms_owsproxy"] != ""){
 				$t = OWSPROXY."/".session_id()."/".$row2["wms_owsproxy"]."?";