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

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2011-11-17 01:11:00 -0800 (Thu, 17 Nov 2011)
New Revision: 8205

Modified:
   trunk/mapbender/http/classes/class_wms.php
Log:
Bugfix

Modified: trunk/mapbender/http/classes/class_wms.php
===================================================================
--- trunk/mapbender/http/classes/class_wms.php	2011-11-17 08:55:35 UTC (rev 8204)
+++ trunk/mapbender/http/classes/class_wms.php	2011-11-17 09:11:00 UTC (rev 8205)
@@ -1732,9 +1732,7 @@
 			#$this->insertLayerDataUrls($i);TODO: in the spec 1.3.0 the schema defines a 1:n relation, but in the table there is only one link possible - maybe we need only this one link
 			# insert metadataurls
 			$this->insertLayerMetadataUrls($i);
-
-
-			//actualize georss and twitter
+			//update messages for twitter and georss
 			$currentLayer = $this->objLayer[$i];
 			$geoRssItemNewLayer = new GeoRssItem();
 			if (!is_null($geoRss)) {
@@ -1768,6 +1766,7 @@
 				//push to twitter
 				$result = $twitter_layer->postTweet($tweetText);
 			}
+		}
 	}
 	function updateLayer($i,$myWMS){
 		$sql = "SELECT layer_id FROM layer WHERE fkey_wms_id = $1 AND layer_name = $2";
@@ -2692,30 +2691,7 @@
 				}
 			}
 			$geoRss->appendTop($geoRssItem);
-//the following will be done by insert layer - cause we have no id till now!
-/*			foreach ($newLayerArray as $newLayer) {
-				$currentLayer = $this->objLayer[$newLayer];
-				$geoRssItemNewLayer = new GeoRssItem();
-				$geoRssItemNewLayer->setTitle("NEW LAYER: " . $currentLayer->layer_title." (".$currentLayer->layer_id.")");
-				$geoRssItemNewLayer->setDescription($currentLayer->layer_abstract);
-				$geoRssItemNewLayer->setUrl(self::getLayerMetadataUrl($currentLayer->layer_id));
-				$geoRssItemNewLayer->setPubDate(self::rssDate());
-				for ($j = 0; $j < count($currentLayer->layer_epsg); $j++) {
-					$currentEpsg = $currentLayer->layer_epsg[$j];
-					if ($currentEpsg["epsg"] === "EPSG:4326") {
-						$currentBbox = new Mapbender_bbox(
-							$currentEpsg["minx"],
-							$currentEpsg["miny"],
-							$currentEpsg["maxx"],
-							$currentEpsg["maxy"],
-							$currentEpsg["epsg"]
-						);
-						$geoRssItemNewLayer->setBbox($currentBbox);
-						break;
-					}
-				}
-				$geoRss->appendTop($geoRssItemNewLayer);
-			} */
+
 			foreach ($oldLayerNameArray as $oldLayer) {
 				$geoRssItemOldLayer = new GeoRssItem();
 				$geoRssItemOldLayer->setTitle("DELETED LAYER: " . $oldLayer['title']." (".$oldLayer['id'].")");
@@ -2737,14 +2713,8 @@
 			$tweetText = substr($tweetText, 0, 139);
 			//push to twitter
 			$result = $twitter_wms->postTweet($tweetText);
-			//for each layer
-			/*foreach ($newLayerArray as $newLayer) {
-				$twitter_layer = new twitter();
-				$tweetText = "NEW LAYER: " . $currentLayer->layer_title." (".$currentLayer->layer_id.") ".self::getLayerMetadataUrl($currentLayer->layer_id)." ".$currentLayer->layer_abstract;
-				//reduce to 140 chars
-				$tweetText = substr($tweetText, 0, 139);
-				$result = $twitter_layer->postTweet($tweetText);
-			}*/
+			//for each layer which was deleted
+			
 			foreach ($oldLayerNameArray as $oldLayer) {
 				$twitter_layer = new twitter();
 				$tweetText = "DELETED LAYER: " . $oldLayer['title']." (".$oldLayer['id'].") ".self::getLayerMetadataUrl($currentLayer->layer_id)." ".$currentLayer->layer_abstract;