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

[svn_mapbender at osgeo.org]

Author: christoph
Date: 2010-08-06 11:11:24 +0000 (Fri, 06 Aug 2010)
New Revision: 6709

Modified:
   trunk/mapbender/http/classes/class_wmc.php
Log:
always increment load count when loading a wmc

Modified: trunk/mapbender/http/classes/class_wmc.php
===================================================================
--- trunk/mapbender/http/classes/class_wmc.php	2010-08-06 09:33:07 UTC (rev 6708)
+++ trunk/mapbender/http/classes/class_wmc.php	2010-08-06 11:11:24 UTC (rev 6709)
@@ -84,7 +84,6 @@
 	var $xml;
 	
 	// constants
-	var $monitoringIsOn = false;
 	var $saveWmcAsFile = false;
 	var $extensionNamespace = "mapbender";
 	var $extensionNamespaceUrl = "http://www.mapbender.org/context";
@@ -151,8 +150,6 @@
 	 * @param integer $wmc_id the ID of the WMC document in the database table "mb_user_wmc"
 	 */
 	function createFromDb($wmcId){
-		$this->monitoringIsOn = true;
-		
 		$doc = wmc::getDocument($wmcId);
 		if ($doc === false) {
 			return false;
@@ -880,6 +877,14 @@
 		return $this->xml;
 	}
 
+	private function incrementLoadCount ($wms) {
+		// counts how often a layer has been loaded
+		$monitor = new Layer_load_count();
+		foreach ($wms->objLayer as $l) {
+			$monitor->increment($l->layer_uid);
+		}
+	}
+
 	public function wmsToJavaScript() {
 		$wmsArray = $this->mainMap->getWmsArray();
 
@@ -888,6 +893,7 @@
 			$currentWms = $wmsArray[$i];
 	
 			$wmcJsArray[] = $currentWms->createJsObjFromWMS_();
+			$this->incrementLoadCount($currentWms);
 		}
 		return $wmcJsArray;
 	}
@@ -898,15 +904,6 @@
 	 * @return String[]
 	 */
 	public function toJavaScript () {
-/*
-		// counts how often a layer has been loaded
-		if ($this->monitoringIsOn) {
-			$monitor = new Layer_load_count();
-			for ($i = 0; $i < count($this->wmc_layer_id); $i++) {
-				$monitor->increment($this->wmc_layer_id[$i]);
-			}
-		}
-*/		
 		$skipWmsArray = array();
 		if (func_num_args() === 1) {
 			$skipWmsArray = func_get_arg(0);
@@ -953,6 +950,7 @@
 				continue;
 			}
 			array_push($wmcJsArray, $wmsArray[$i]->createJsObjFromWMS_());
+			$this->incrementLoadCount($wmsArray[$i]);
 		}
 		
 		// delete existing map objects...