[Mapbender-commits] r8210 - in trunk/mapbender/http: classes php

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2011-11-21 03:22:31 -0800 (Mon, 21 Nov 2011)
New Revision: 8210

Modified:
   trunk/mapbender/http/classes/class_wms.php
   trunk/mapbender/http/php/wms.php
Log:
Extent twitter tweet with uuid to have no duplicates, which will be thrown away by twitter ;-) .

Modified: trunk/mapbender/http/classes/class_wms.php
===================================================================
--- trunk/mapbender/http/classes/class_wms.php	2011-11-17 15:45:25 UTC (rev 8209)
+++ trunk/mapbender/http/classes/class_wms.php	2011-11-21 11:22:31 UTC (rev 8210)
@@ -109,7 +109,7 @@
 		#	"$1php/mod_layerMetadata.php?id=", 
 		#	LOGIN
 		#) . $wmsId;
-		return LOGIN."/../../php/mod_showMetadata.php?resource=wms&id=".$wmsId;
+		return str_replace("portal/anmelden.html","",LOGIN)."wms/".$wmsId;
 		//the following may be activated if the metadata for the resources can be accessed over restful urls - maybe with help of apaches mod_rewrite
 		#return "http://www.geoportal.rlp.de/wms/".$wmsId;
 	}
@@ -119,7 +119,7 @@
 		#	"$1php/mod_layerMetadata.php?id=", 
 		#	LOGIN
 		#) . $wmsId;
-		return LOGIN."/../../php/mod_showMetadata.php?resource=layer&id=".$layerId;
+		return str_replace("portal/anmelden.html","",LOGIN)."layer/".$layerId;
 		//the following may be activated if the metadata for the resources can be accessed over restful urls - maybe with help of apaches mod_rewrite
 		#return "http://www.geoportal.rlp.de/layer/".$layerId;
 	}
@@ -1680,8 +1680,9 @@
 		if (TWITTER_NEWS == true) {
 			//new WMS
 			$twitter_wms = new twitter();
+			$twUuid = new Uuid();
 			//combine text for tweet
-			$tweetText = "NEW WMS: " . $this->wms_title." (".$myWMS.") ".self::getWmsMetadataUrl($myWMS);
+			$tweetText = "NEW WMS: " . $this->wms_title." (".$myWMS.") ".self::getWmsMetadataUrl($myWMS)." ".$twUuid;
 			//reduce to 140 chars
 			$tweetText = substr($tweetText, 0, 136);
 			//push to twitter
@@ -1768,7 +1769,8 @@
 				//new LAYER
 				$twitter_layer = new twitter();
 				//combine text for tweet
-				$tweetText = "NEW LAYER: " . $currentLayer->layer_title." (".$currentLayer->db_id.") ".self::getLayerMetadataUrl($currentLayer->db_id);
+				$twUuid = new Uuid();
+				$tweetText = "NEW LAYER: " . $currentLayer->layer_title." (".$currentLayer->db_id.") ".self::getLayerMetadataUrl($currentLayer->db_id)." ".$twUuid;
 				//reduce to 140 chars
 				$tweetText = substr($tweetText, 0, 136);
 				//push to twitter
@@ -2717,8 +2719,9 @@
 		if (TWITTER_NEWS == true) {
 			//updated WMS
 			$twitter_wms = new twitter();
+			$twUuid = new Uuid();
 			//combine text for tweet
-			$tweetText = "UPDATED WMS: " . $this->wms_title." (".$myWMS.") ".self::getWmsMetadataUrl($myWMS);
+			$tweetText = "UPDATED WMS: " . $this->wms_title." (".$myWMS.") ".self::getWmsMetadataUrl($myWMS)." ".$twUuid;
 			//reduce to 140 chars
 			$tweetText = substr($tweetText, 0, 136);
 			//push to twitter
@@ -2727,7 +2730,8 @@
 			
 			foreach ($oldLayerNameArray as $oldLayer) {
 				$twitter_layer = new twitter();
-				$tweetText = "DELETED LAYER: " . $oldLayer['title']." (".$oldLayer['id'].") ".self::getLayerMetadataUrl($currentLayer->layer_id);
+				$twUuid = new Uuid();
+				$tweetText = "DELETED LAYER: " . $oldLayer['title']." (".$oldLayer['id'].") ".self::getLayerMetadataUrl($currentLayer->layer_id)." ".$twUuid;
 				//reduce to 140 chars
 				$tweetText = substr($tweetText, 0, 136);
 				$result = $twitter_layer->postTweet($tweetText);

Modified: trunk/mapbender/http/php/wms.php
===================================================================
--- trunk/mapbender/http/php/wms.php	2011-11-17 15:45:25 UTC (rev 8209)
+++ trunk/mapbender/http/php/wms.php	2011-11-21 11:22:31 UTC (rev 8210)
@@ -941,14 +941,14 @@
 #</armin>
 
 
+$e = new mb_exception("wms.php: read sublayer:");
 
-
 while ($sub_layer_row = db_fetch_array($res_sub_layer_sql)) {
 	
 	#Creating layer node
 
 	$sub_layer = $doc->createElement("Layer");
-	$e = new mb_exception("wms.php: layer_parent:".$sub_layer_row['layer_parent']);
+	//$e = new mb_exception("wms.php: layer_parent:".$sub_layer_row['layer_parent']);
 	$parent = $parentLayerArray[$sub_layer_row['layer_parent']];
 	
 	$sub_layer = $parent->appendChild($sub_layer);
@@ -1102,7 +1102,7 @@
 mb_metadata.metadata_id = relation.fkey_metadata_id WHERE mb_metadata.origin IN ('capabilities','external','metador','upload')
 
 SQL;
-	$e = new mb_notice("layerid: ".$sub_layer_row['layer_id']);
+	//$e = new mb_exception("wms.php: layerid: ".$sub_layer_row['layer_id']);
 	$i = 0;
 	$res_metadata = db_query($sql);
 
@@ -1129,7 +1129,7 @@
 		$IdentifierText = $doc->createTextNode($datasetId);
     		$IdentifierText = $Identifier->appendChild($IdentifierText);
 	
-		$e = new mb_exception("i: ".$i);
+		//$e = new mb_exception("i: ".$i);
 		//push entries into xml structure	
 		//check for kind of link - push the right one into the link field	
 		switch ($row_metadata['origin']) {
@@ -1207,7 +1207,7 @@
 		$onlineResource->setAttribute("xlink:type", "simple");
 		//Add linkage to Capabilities
 		$i++;
-		$e = new mb_exception("i: ".$i);
+		//$e = new mb_exception("i: ".$i);
 	}