[Mapbender-commits] r8387 - in trunk/mapbender/http: classes php plugins
svn_mapbender at osgeo.org
svn_mapbender at osgeo.org
Wed Jun 20 07:18:07 PDT 2012
Author: armin11
Date: 2012-06-20 07:18:07 -0700 (Wed, 20 Jun 2012)
New Revision: 8387
Modified:
trunk/mapbender/http/classes/class_wms.php
trunk/mapbender/http/php/mod_inspireDownloadFeed.php
trunk/mapbender/http/php/mod_loadCapabilities.php
trunk/mapbender/http/php/mod_loadwms.php
trunk/mapbender/http/php/mod_updateWMS.php
trunk/mapbender/http/plugins/mb_metadata_server.php
Log:
Bugfixes and possibility to decide, if loading a wms will result in a twitter and/or rss entry.
Modified: trunk/mapbender/http/classes/class_wms.php
===================================================================
--- trunk/mapbender/http/classes/class_wms.php 2012-06-19 15:12:44 UTC (rev 8386)
+++ trunk/mapbender/http/classes/class_wms.php 2012-06-20 14:18:07 UTC (rev 8387)
@@ -79,16 +79,16 @@
// and new layers have been added?
const GEORSS_APPEND_ON_UPDATE_NEWLAYERS = true;
- function _construct() {
- if (TWITTER_NEWS) {
- $this->twitterNews = true;
- require_once dirname(__FILE__) . "/class_twitter.php";
- }
+ function __construct() {
+ if (TWITTER_NEWS) {
+ $this->twitterNews = true;
+ require_once dirname(__FILE__) . "/class_twitter.php";
+ }
- if(GEO_RSS_FILE && GEO_RSS_FILE != "") {
- //GeoRSS feed
- $this->setGeoRss = true;
- }
+ if(defined("GEO_RSS_FILE") && GEO_RSS_FILE != "") {
+ //GeoRSS feed
+ $this->setGeoRss = true;
+ }
}
/**
*
@@ -2396,7 +2396,7 @@
if (!isset($this->wms_network_access) || ($this->wms_network_access == '')) {
$this->wms_network_access = intval('0');
}
-
+
if ($this->setGeoRss == true) {
$this->geoRssFactory = new GeoRssFactory();
$this->geoRss = $this->geoRssFactory->loadOrCreate(GEO_RSS_FILE);
@@ -2531,11 +2531,15 @@
# delete all layer which are outdated
//first delete their metadataUrl entries*****
- $e = new mb_notice("class_wms.php: delete all metadataUrls");
+
+
+
+
+ $e = new mb_notice("class_wms.php: delete all metadataUrl relations of old layer");
$v = array($myWMS);
$t = array('i');
$c = 2;
- $sql = "DELETE FROM mb_metadata WHERE metadata_id IN (SELECT metadata_id FROM mb_metadata INNER JOIN (SELECT * from ows_relation_metadata WHERE fkey_layer_id IN " ;
+ $sql = "DELETE FROM ows_relation_metadata WHERE fkey_layer_id IN " ;
$sql .= "(SELECT layer_id FROM layer WHERE fkey_wms_id = $1 AND NOT layer_name IN (";
for($i=0; $i<count($this->objLayer); $i++){
if($i>0){$sql .= ',';}
@@ -2544,9 +2548,12 @@
array_push($t,'s');
$c++;
}
- $sql .= ") ) )";
- $sql .= " as relation ON mb_metadata.metadata_id = relation.fkey_metadata_id AND mb_metadata.origin = 'capabilities')";
- $res = db_prep_query($sql,$v,$t);
+ $sql .= ") )";
+ $sql .= " AND ows_relation_metadata.relation_type = 'capabilities'";
+ $res = db_prep_query($sql,$v,$t);
+
+
+
//*******************************************
//TODO: is this done for the keywords too? Maybe not, cause they are stored only once! Only the relations have to be deleted!
//and then the layer entries
@@ -2608,6 +2615,7 @@
}
}
db_commit();
+
//
// update GeoRSS feed
//
Modified: trunk/mapbender/http/php/mod_inspireDownloadFeed.php
===================================================================
--- trunk/mapbender/http/php/mod_inspireDownloadFeed.php 2012-06-19 15:12:44 UTC (rev 8386)
+++ trunk/mapbender/http/php/mod_inspireDownloadFeed.php 2012-06-20 14:18:07 UTC (rev 8387)
@@ -358,9 +358,9 @@
$feedTitle = $feedDoc->createElement("title");
//$feedTitle->setAttribute("xml:lang", "de");
if ($type == 'SERVICE') {
- $feedTitleText = $feedDoc->createTextNode("INSPIRE Download Service Feed fuer ".$ressourceTitle);
+ $feedTitleText = $feedDoc->createTextNode("INSPIRE Download Service Feed für ".$ressourceTitle);
} else { //DATASET
- $feedTitleText = $feedDoc->createTextNode("INSPIRE Datensatz Feed fuer ".$ressourceTitle);
+ $feedTitleText = $feedDoc->createTextNode("INSPIRE Datensatz Feed für ".$ressourceTitle);
}
$feedTitle->appendChild($feedTitleText);
$feed->appendChild($feedTitle);
@@ -436,7 +436,7 @@
$feedLink->setAttribute("rel", "describedby");
$feedLink->setAttribute("type", "text/html");
$feedLink->setAttribute("hreflang", "de");
- $feedLink->setAttribute("title", "Naehere Beschreibung des Datensatzes");
+ $feedLink->setAttribute("title", "Nähere Beschreibung des Datensatzes");
$feed->appendChild($feedLink);
}
//5.1.6 - 5.1.7
@@ -739,7 +739,7 @@
$ressourceServiceFeedEntryTitle = $ressourceTitle." - generiert aus WMS Capabilities dataURL Element";
break;
case "wfs":
- $ressourceServiceFeedEntryTitle = $ressourceTitle." - generiert ueber WFS GetFeature Aufrufe";
+ $ressourceServiceFeedEntryTitle = $ressourceTitle." - generiert über WFS GetFeature Aufrufe";
break;
}
$feedEntryTitle->appendChild($feedDoc->createTextNode("Feed Entry fuer: ".$ressourceServiceFeedEntryTitle)); //TODO: maybe add some category?
@@ -752,7 +752,7 @@
$ressourceDataFeedEntryTitle = $ressourceTitle." - generiert aus WMS Capabilities dataURL Element";
break;
case "wfs":
- $ressourceDataFeedEntryTitle = $ressourceTitle." - generiert ueber WFS GetFeature Aufrufe";
+ $ressourceDataFeedEntryTitle = $ressourceTitle." - generiert über WFS GetFeature Aufrufe";
break;
}
$feedEntryTitle->appendChild($feedDoc->createTextNode($ressourceDataFeedEntryTitle. " im CRS ".$mapbenderMetadata[$i]->metadata_ref_system." und Format ".$mapbenderMetadata[$i]->format)); //TODO: maybe add some category?
@@ -906,7 +906,7 @@
//<summary>This is the entry for water network ABC Dataset</summary>
if ($type == 'SERVICE') {
$feedEntrySummary = $feedDoc->createElement("summary");
- $feedEntrySummary->appendChild($feedDoc->createTextNode("Naehere Beschreibung des Feedinhaltes: ".$ressourceAbstract));
+ $feedEntrySummary->appendChild($feedDoc->createTextNode("Nähere Beschreibung des Feedinhaltes: ".$ressourceAbstract));
$feedEntry->appendChild($feedEntrySummary);
}
Modified: trunk/mapbender/http/php/mod_loadCapabilities.php
===================================================================
--- trunk/mapbender/http/php/mod_loadCapabilities.php 2012-06-19 15:12:44 UTC (rev 8386)
+++ trunk/mapbender/http/php/mod_loadCapabilities.php 2012-06-20 14:18:07 UTC (rev 8387)
@@ -177,6 +177,13 @@
echo"Password:<br>";
echo"<input type='text' name='password' size='50' value=''><br>";
}
+
+ if (!TWITTER_NEWS) {
+ echo"<input type='checkbox' name='twitter_news' checked='checked'>Publish via Twitter<br>";
+ }
+ if (defined("GEO_RSS_FILE") && GEO_RSS_FILE != "") {
+ echo"<input type='checkbox' name='rss_news' checked='checked'>Publish via RSS<br>";
+ }
echo"<input type='button' name='loadCap' value='Load' onClick='validate(\"guiList\")'>";
echo "</form>";
}
Modified: trunk/mapbender/http/php/mod_loadwms.php
===================================================================
--- trunk/mapbender/http/php/mod_loadwms.php 2012-06-19 15:12:44 UTC (rev 8386)
+++ trunk/mapbender/http/php/mod_loadwms.php 2012-06-20 14:18:07 UTC (rev 8387)
@@ -34,12 +34,18 @@
$auth['auth_type'] = $_REQUEST["auth_type"];
}
$mywms = new wms();
+ if(empty($_POST['twitter_news'])) {
+ $mywms->twitterNews = false;
+ }
+ if(empty($_POST['rss_news'])) {
+ $mywms->setGeoRss = false;
+ }
if (isset($auth)) {
- $mywms->createObjFromXML($xml, $auth);
- $mywms->writeObjInDB($gui_id, $auth);
+ $mywms->createObjFromXML($xml, $auth);
+ $mywms->writeObjInDB($gui_id, $auth);
}
else {
- $mywms->createObjFromXML($xml);
+ $mywms->createObjFromXML($xml);
$mywms->writeObjInDB($gui_id);
}
Modified: trunk/mapbender/http/php/mod_updateWMS.php
===================================================================
--- trunk/mapbender/http/php/mod_updateWMS.php 2012-06-19 15:12:44 UTC (rev 8386)
+++ trunk/mapbender/http/php/mod_updateWMS.php 2012-06-20 14:18:07 UTC (rev 8387)
@@ -132,6 +132,8 @@
if (!MD_OVERWRITE) {
$mywms->overwrite=false;
}
+ $mywms->twitterNews = true;
+ $mywms->setGeoRss = true;
$mywms->updateObjInDB($myWMS);
$mywms->displayWMS();
Modified: trunk/mapbender/http/plugins/mb_metadata_server.php
===================================================================
--- trunk/mapbender/http/plugins/mb_metadata_server.php 2012-06-19 15:12:44 UTC (rev 8386)
+++ trunk/mapbender/http/plugins/mb_metadata_server.php 2012-06-20 14:18:07 UTC (rev 8387)
@@ -425,9 +425,9 @@
}
getWms($wmsId);
- $wms = new wms();
+ $wms = new wms();
$wms->createObjFromDBNoGui($wmsId,false);//here the original urls will be used - cause the object will used to update the wms table
-
+
$columns = array(
"wms_abstract",
"wms_title",
@@ -547,7 +547,8 @@
} else {
$wms->wms_network_access = intval('0');
}
-
+ //$wms->twitterNews = false;
+ //$wms->setGeoRss = false;
//try {
$wms->updateObjInDB($wmsId,true);
//}
More information about the Mapbender_commits
mailing list