[Mapbender-commits] r1325 - trunk/mapbender/http/print

[svn_mapbender at osgeo.org]

Author: uli
Date: 2007-05-16 17:24:50 -0400 (Wed, 16 May 2007)
New Revision: 1325

Modified:
   trunk/mapbender/http/print/mod_printPDF_pdf.php
Log:
session closed before instantiating class weldMaps2Png because owsproxy was waiting for session-access

Modified: trunk/mapbender/http/print/mod_printPDF_pdf.php
===================================================================
--- trunk/mapbender/http/print/mod_printPDF_pdf.php	2007-05-16 21:22:52 UTC (rev 1324)
+++ trunk/mapbender/http/print/mod_printPDF_pdf.php	2007-05-16 21:24:50 UTC (rev 1325)
@@ -278,7 +278,7 @@
 	$header_height = $a4l_header_height;
 	$header_width = $a4l_header_width;
 }
-
+session_write_close();
 $i = new weldMaps2PNG(implode("___",$array_urls),$filename);
 
 $pdf->addPngFromFile($filename, $mapOffset_left, $mapOffset_bottom, $map_width, $map_height);
@@ -622,7 +622,7 @@
 	$pdf->ezText("<b><u>".$legendText."</u></b>", 13);
 
 	
-	//Seitenränder (top, bottom, left, right)
+	//Seitenr�nder (top, bottom, left, right)
 	if($size == "A4" && $format == "portrait"){
 	  $pdf->ezSetMargins(70,35,80,30);
 	} else {
@@ -631,7 +631,7 @@
 	
 	//generate the legend---------------------------------------------
 	
-	// gesamthöhe Legende / height of the legend
+	// gesamth�he Legende / height of the legend
 	$sum_legend_height = 0;
 
 
@@ -643,11 +643,11 @@
 			$wms_y_position = $pdf->ezText("<b>".$my_wms_title[$i]."</b>", 12, array('spacing'=>1.2));
 			$wms_zeilenhoehe   =  $pdf->getFontHeight(12);
 				 
-			// add this to the height of the legend /addiere dies zur Gesamthöhe Legende
+			// add this to the height of the legend /addiere dies zur Gesamth�he Legende
 			$sum_legend_height += $wms_zeilenhoehe;
 			
 			//Layer
-			$l = 0;		#l temporary parameter to count the layer /Hilfvariable zum durchzählen der angezeigten Layer
+			$l = 0;		#l temporary parameter to count the layer /Hilfvariable zum durchz�hlen der angezeigten Layer
 			for($j=0; $j<count($my_legendurls); $j++){
 				// url with grouped layers------------------
 				$temp_url = explode('*',$my_legendurls[$j]);
@@ -655,7 +655,7 @@
 	
 				for ($q=0; $q <count($temp_url);$q++){  
 					if($temp_url[$q] == '1' ){			// Layertitle for the parent of grouped layers	 
-						// add this to the height of the legend /addiere dies zur Gesamthöhe Legende		
+						// add this to the height of the legend /addiere dies zur Gesamth�he Legende		
 						$layer_y_position = $pdf->ezText($temp_layers[$q], 11, array('spacing'=>1.2));
 						$layer_zeilenhoehe   =  $pdf->getFontHeight(12);
 						$sum_legend_height += $layer_zeilenhoehe;
@@ -663,10 +663,10 @@
 					}elseif($temp_url[$q] != '0' ){
 						$funktionsaufruf = new SaveLegend($temp_url[$q],$legendFilename);
 						$imgsize = getimagesize($legendFilename);
-						// add this to the height of the legend /addiere dies zur Gesamthöhe der Legende
+						// add this to the height of the legend /addiere dies zur Gesamth�he der Legende
 						$sum_legend_height += $imgsize[1];
 	
-						//calculate text + picture / Berechnung Größe Schrift + Bild
+						//calculate text + picture / Berechnung Gr��e Schrift + Bild
 						if($l == 0){
 						       $y_position = $wms_y_position;
 						       $wms_y_position = '';
@@ -676,13 +676,13 @@
 						$layer_zeilenhoehe = $pdf->getFontHeight(11);
 						$next_position = $y_position - $layer_zeilenhoehe - $imgsize[1];
 						
-						// add this to the height of the legend / addiere dies zur Gesamthöhe Legende
+						// add this to the height of the legend / addiere dies zur Gesamth�he Legende
 						$sum_legend_height += $layer_zeilenhoehe;
 							
 						$l = $l+1;
 		
 		     			// if text + picture are smaler then the lower margin + textsize, then set a space
-						//wenn Schrift + Bild kleiner der unteren Margin + Zeilenhöhe, dann Abstand setzen
+						//wenn Schrift + Bild kleiner der unteren Margin + Zeilenh�he, dann Abstand setzen
 						 if($size == "A4" && $format == "portrait" && $next_position <= 35 +$layer_zeilenhoehe){ //90 $layer_zeilenhoehe
 							$space = $layer_zeilenhoehe + $imgsize[1];
 						  $pdf->ezSetDy(-$space);
@@ -692,7 +692,7 @@
 						  $pdf->ezSetDy(-$space);
 						}
 				
-						//write the header layername / Überschrift schreiben
+						//write the header layername / �berschrift schreiben
 						$legend = $temp_layers[$q]."\n";  //$layer[$j]."\n"; 
 						$pdf->ezText($legend, 11, array('spacing'=>1.2));