[Mapbender-commits] r7640 - in trunk/mapbender/http: classes
geoportal javascripts php
svn_mapbender at osgeo.org
svn_mapbender at osgeo.org
Wed Feb 23 14:54:40 EST 2011
Author: astrid_emde
Date: 2011-02-23 11:54:40 -0800 (Wed, 23 Feb 2011)
New Revision: 7640
Modified:
trunk/mapbender/http/classes/class_metadata_new.php
trunk/mapbender/http/geoportal/mod_revertGuiSessionSettings.php
trunk/mapbender/http/geoportal/mod_wfsConfSelect_client.php
trunk/mapbender/http/geoportal/updateUserDataIntoDb.php
trunk/mapbender/http/javascripts/mod_wfsGazetteerEditor_client.php
trunk/mapbender/http/php/mod_showMetadata.php
trunk/mapbender/http/php/mod_wfsMetadata.php
Log:
replaced x_geoportal and changed it to geoportal
Modified: trunk/mapbender/http/classes/class_metadata_new.php
===================================================================
--- trunk/mapbender/http/classes/class_metadata_new.php 2011-02-23 12:49:07 UTC (rev 7639)
+++ trunk/mapbender/http/classes/class_metadata_new.php 2011-02-23 19:54:40 UTC (rev 7640)
@@ -351,7 +351,7 @@
$this->wfsJSON->wfs->srv[$i-$j]->date = date("d.m.Y",$wfsMatrix[$i]['wfs_timestamp']);
$this->wfsJSON->wfs->srv[$i-$j]->respOrg = $wfsMatrix[$i]['mb_group_name'];
$this->wfsJSON->wfs->srv[$i-$j]->logoUrl = $wfsMatrix[$i]['mb_group_logo_path'];
- $this->wfsJSON->wfs->srv[$i-$j]->mdLink = "http://".$this->hostName."/mapbender/x_geoportal/showWFSMetadata.php?id=".$wfsMatrix[$i]['wfs_id'];
+ $this->wfsJSON->wfs->srv[$i-$j]->mdLink = "http://".$this->hostName."/mapbender/geoportal/showWFSMetadata.php?id=".$wfsMatrix[$i]['wfs_id'];
$spatialSource = "";
$stateOrProvince = $wfsMatrix[$i]['administrativearea'];
if ($stateOrProvince == "NULL" || $stateOrProvince == "") {
@@ -380,7 +380,7 @@
$this->wfsJSON->wfs->srv[$i-$j]->ftype[$l-$m]->id = (integer)$wfsMatrix[$i]['featuretype_id'];
$this->wfsJSON->wfs->srv[$i-$j]->ftype[$l-$m]->title = $wfsMatrix[$i]['featuretype_title'];
$this->wfsJSON->wfs->srv[$i-$j]->ftype[$l-$m]->abstract = $wfsMatrix[$i]['featuretype_abstract'];
- $this->wfsJSON->wfs->srv[$i-$j]->ftype[$l-$m]->mdLink = "http://".$this->hostName."/mapbender/x_geoportal/showWFeatureTypeMetadata.php?id=".$wfsMatrix[$i]['featuretype_id'];
+ $this->wfsJSON->wfs->srv[$i-$j]->ftype[$l-$m]->mdLink = "http://".$this->hostName."/mapbender/geoportal/showWFeatureTypeMetadata.php?id=".$wfsMatrix[$i]['featuretype_id'];
$this->wfsJSON->wfs->srv[$i-$j]->ftype[$l-$m]->geomtype = $wfsMatrix[$i]['element_type'];
$this->wfsJSON->wfs->srv[$i-$j]->ftype[$l-$m]->bbox = array(-180.0,-90.0,180.0,90.0);//TODO: $wfsMatrix[$i]['bbox'];
@@ -581,7 +581,7 @@
$this->wmsJSON->wms->srv[$j]->date = date("d.m.Y",$subLayers[$rootIndex]['wms_timestamp']);
#$this->wmsJSON->wms->srv[$j]->respOrg = "test";
$this->wmsJSON->wms->srv[$j]->loadCount = (integer)$subLayers[$rootIndex]['load_count'];
- #$this->wmsJSON->wms->srv[$j]->mdLink = "http://".$_SERVER['HTTP_HOST']."/mapbender/x_geoportal/mod_layerMetadata.php?id=".(integer)$subLayers[$rootIndex]['layer_id'];
+ #$this->wmsJSON->wms->srv[$j]->mdLink = "http://".$_SERVER['HTTP_HOST']."/mapbender/geoportal/mod_layerMetadata.php?id=".(integer)$subLayers[$rootIndex]['layer_id'];
$spatialSource = "";
$stateOrProvince = $subLayers[$rootIndex]['stateorprovince'];
#echo $stateOrProvince."<br>";
@@ -669,7 +669,7 @@
# $this->wmsJSON->wms->srv[$i-$j]->layer[0]->loadable = 1;
#}
$this->wmsJSON->wms->srv[$j]->layer[0]->loadCount = $subLayers[$rootIndex]['load_count'];
- #$servObject->layer[$countsublayer]->mdLink = $_SERVER['HOST']."/mapbender/x_geoportal/showWFeatureTypeMetadata.php?id=".$wfsMatrix[$i]['featuretype_id'];
+ #$servObject->layer[$countsublayer]->mdLink = $_SERVER['HOST']."/mapbender/geoportal/showWFeatureTypeMetadata.php?id=".$wfsMatrix[$i]['featuretype_id'];
#$servObject->layer[$countsublayer]->geomtype = $wfsMatrix[$i]['element_type'];
$this->wmsJSON->wms->srv[$j]->layer[0]->bbox = $subLayers[$rootIndex]['bbox'];
$this->wmsJSON->wms->srv[$j]->layer[0]->permission = $this->getPermissionValueForLayer($subLayers[$rootIndex]['layer_id'], $subLayers[$rootIndex]['wms_id']); //TODO: Make this much more faster
Modified: trunk/mapbender/http/geoportal/mod_revertGuiSessionSettings.php
===================================================================
--- trunk/mapbender/http/geoportal/mod_revertGuiSessionSettings.php 2011-02-23 12:49:07 UTC (rev 7639)
+++ trunk/mapbender/http/geoportal/mod_revertGuiSessionSettings.php 2011-02-23 19:54:40 UTC (rev 7640)
@@ -18,6 +18,6 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
?>
Mapbender.events.init.register(function () {
- $.post("../x_geoportal/mod_revertGuiSessionSettings_server.php", {}, function () {
+ $.post("../geoportal/mod_revertGuiSessionSettings_server.php", {}, function () {
});
});
Modified: trunk/mapbender/http/geoportal/mod_wfsConfSelect_client.php
===================================================================
--- trunk/mapbender/http/geoportal/mod_wfsConfSelect_client.php 2011-02-23 12:49:07 UTC (rev 7639)
+++ trunk/mapbender/http/geoportal/mod_wfsConfSelect_client.php 2011-02-23 19:54:40 UTC (rev 7640)
@@ -147,7 +147,7 @@
removeChildNodes(document.getElementById("wfs_conf_sel"));
removeChildNodes(document.getElementById("wfs_messages"));
- var url = "../x_geoportal/mod_wfsGazetteerEditor_server.php";
+ var url = "../geoportal/mod_wfsGazetteerEditor_server.php";
var properties = {command:"getWfsConf", wfsConfIdString:wfsConfIdString};
parent.mb_ajax_json(url , properties, function(json, status) {
@@ -210,10 +210,10 @@
removeChildNodes(bulbNode);
var imgNode = document.createElement("img");
imgNode.id = "wfsInfoImg";
- imgNode.src = "../x_geoportal/img/info.png";
+ imgNode.src = "../geoportal/img/info.png";
imgNode.border = 0;
bulbNode.appendChild(imgNode);
- bulbNode.href = "javascript:openwindow('../x_geoportal/mod_featuretypeMetadata.php?wfs_conf_id=" + global_selectedWfsConfId.toString() + "');";
+ bulbNode.href = "javascript:openwindow('../geoportal/mod_featuretypeMetadata.php?wfs_conf_id=" + global_selectedWfsConfId.toString() + "');";
bulbNode.style.display = "inline";
//
@@ -228,11 +228,11 @@
}
}
if (preConfigured) {
- wfsPreConfiguredOrEditor.src = "../x_geoportal/img/modul_suche.png";
+ wfsPreConfiguredOrEditor.src = "../geoportal/img/modul_suche.png";
wfsPreConfiguredOrEditor.title = "Modultyp: Suche";
}
else {
- wfsPreConfiguredOrEditor.src = "../x_geoportal/img/modul_download.png";
+ wfsPreConfiguredOrEditor.src = "../geoportal/img/modul_download.png";
wfsPreConfiguredOrEditor.title = "Modultyp: Download";
}
wfsPreConfiguredOrEditor.style.display = 'inline';
@@ -248,17 +248,17 @@
}
}
if (wfsGeomType.match(/Point/)) {
- wfsGeomTypeNode.src = "../x_geoportal/img/wfs_pkt.gif";
+ wfsGeomTypeNode.src = "../geoportal/img/wfs_pkt.gif";
wfsGeomTypeNode.style.display = 'inline';
wfsGeomTypeNode.title = 'Geometrietyp: Punkt';
}
else if (wfsGeomType.match(/Line/)) {
- wfsGeomTypeNode.src = "../x_geoportal/img/wfs_l.gif";
+ wfsGeomTypeNode.src = "../geoportal/img/wfs_l.gif";
wfsGeomTypeNode.style.display = 'inline';
wfsGeomTypeNode.title = 'Geometrietyp: Linie';
}
else if (wfsGeomType.match(/Polygon/)) {
- wfsGeomTypeNode.src = "../x_geoportal/img/wfs_p.gif";
+ wfsGeomTypeNode.src = "../geoportal/img/wfs_p.gif";
wfsGeomTypeNode.style.display = 'inline';
wfsGeomTypeNode.title = 'Geometrietyp: Fläche';
}
@@ -270,7 +270,7 @@
// set image: remove this WFS
//
var wfsRemoveNode = document.getElementById("wfsRemove");
- wfsRemoveNode.src = "../x_geoportal/img/modul_loeschen.png";
+ wfsRemoveNode.src = "../geoportal/img/modul_loeschen.png";
wfsRemoveNode.style.display = 'inline';
wfsRemoveNode.onclick = function () {
delete global_wfsConfObj[global_selectedWfsConfId];
@@ -321,16 +321,16 @@
function displayPopup(){
var e_id = "<?php echo $e_id_css; ?>";
- var url = "../x_geoportal/mod_wfsGazetteerEditor_client.php?" +
+ var url = "../geoportal/mod_wfsGazetteerEditor_client.php?" +
"e_target=<?php echo $e_target; ?>" +
"&e_id_css=" + e_id;
if (typeof(searchPopup) == "undefined") {
- searchPopup = new parent.mb_popup({title:global_wfsConfObj[global_selectedWfsConfId].g_label,
- url:url, width:430, height:400, top:50, left:50, frameName:e_id + "_",
- minTop:"document",minLeft:"document",maxRight:"document",maxBottom:"document",destroy:false});
- }
- else{
+ searchPopup = new parent.mb_popup({title:global_wfsConfObj[global_selectedWfsConfId].g_label,
+ url:url, width:430, height:400, top:50, left:50, frameName:e_id + "_",
+ minTop:"document",minLeft:"document",maxRight:"document",maxBottom:"document",destroy:false});
+ }
+ else{
searchPopup.setUrl(url);
searchPopup.setTitle(global_wfsConfObj[global_selectedWfsConfId].g_label);
}
Modified: trunk/mapbender/http/geoportal/updateUserDataIntoDb.php
===================================================================
--- trunk/mapbender/http/geoportal/updateUserDataIntoDb.php 2011-02-23 12:49:07 UTC (rev 7639)
+++ trunk/mapbender/http/geoportal/updateUserDataIntoDb.php 2011-02-23 19:54:40 UTC (rev 7640)
@@ -59,7 +59,7 @@
$fields[] = array('mb_user_organisation_name', $mb_user_organisation_name, 's');
$fields[] = array('mb_user_position_name', $mb_user_position_name, 's');
$fields[] = array('mb_user_city', $mb_user_city, 's');
- #$e = new mb_exception("x_geoportal/updateUserIntoDb.php: digest new: ".md5($mb_user_name.";".$mb_user_email.":".REALM.":".$mb_user_password));
+ #$e = new mb_exception("geoportal/updateUserIntoDb.php: digest new: ".md5($mb_user_name.";".$mb_user_email.":".REALM.":".$mb_user_password));
$fields[] = array('mb_user_digest', md5($mb_user_name.";".$mb_user_email.":".REALM.":".$mb_user_password), 's');
if(is_int($mb_user_postal_code) && $mb_user_postal_code >= 0){
$fields[] = array('mb_user_postal_code', $mb_user_postal_code, 'i'); //postal_code als integer?
Modified: trunk/mapbender/http/javascripts/mod_wfsGazetteerEditor_client.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_wfsGazetteerEditor_client.php 2011-02-23 12:49:07 UTC (rev 7639)
+++ trunk/mapbender/http/javascripts/mod_wfsGazetteerEditor_client.php 2011-02-23 19:54:40 UTC (rev 7640)
@@ -998,7 +998,7 @@
}
else {
if (jsCode) {
- var htmlCodeDownload = "<iframe style='visibility:visible' src='../x_geoportal/download.php?download=" + geoObj.filename + "'></iframe>";
+ var htmlCodeDownload = "<iframe style='visibility:visible' src='../geoportal/download.php?download=" + geoObj.filename + "'></iframe>";
var downloadPopup = new parent.mb_popup("Download", htmlCodeDownload, 1, 1, -10, 1);
downloadPopup.show();
//downloadPopup.hide();
Modified: trunk/mapbender/http/php/mod_showMetadata.php
===================================================================
--- trunk/mapbender/http/php/mod_showMetadata.php 2011-02-23 12:49:07 UTC (rev 7639)
+++ trunk/mapbender/http/php/mod_showMetadata.php 2011-02-23 19:54:40 UTC (rev 7640)
@@ -500,7 +500,7 @@
$resourceMetadata['legend'] .= "<img src = '../geoportal/mod_showPreview.php?resource=layerlegend&id=".$layerId."'>";
}
/* if ($rowP['layer_extent_preview_filename'] != "") {
- $resourceMetadata['extent'] .= "<img src = '../x_geoportal/layer_preview/".$rowP['layer_extent_preview_filename']."'>";
+ $resourceMetadata['extent'] .= "<img src = '../geoportal/layer_preview/".$rowP['layer_extent_preview_filename']."'>";
}*/
}
Modified: trunk/mapbender/http/php/mod_wfsMetadata.php
===================================================================
--- trunk/mapbender/http/php/mod_wfsMetadata.php 2011-02-23 12:49:07 UTC (rev 7639)
+++ trunk/mapbender/http/php/mod_wfsMetadata.php 2011-02-23 19:54:40 UTC (rev 7640)
@@ -80,8 +80,8 @@
//$featuretype['Koordinatensysteme'] = $row_wfs['featuretype_srs'];
//$featuretype['Geometrietyp'] = $geomType;
- $wfs['Capabilities-Dokument'] = "<a href = '../x_geoportal/getCapabilities_wfs.php?wfs_id=".$row_wfs['wfs_id']."' target=_blank>Capabilities-Dokument</a>";
- //$featuretype['DescribeFeature-Dokument'] = "<a href = '../x_geoportal/describeFeatureType_wfs.php?wfs_id=".$row['wfs_id']."&featureType_id=".$row['featuretype_id']."' target=_blank>DescribeFeature-Dokument</a>";
+ $wfs['Capabilities-Dokument'] = "<a href = '../geoportal/getCapabilities_wfs.php?wfs_id=".$row_wfs['wfs_id']."' target=_blank>Capabilities-Dokument</a>";
+ //$featuretype['DescribeFeature-Dokument'] = "<a href = '../geoportal/describeFeatureType_wfs.php?wfs_id=".$row['wfs_id']."&featureType_id=".$row['featuretype_id']."' target=_blank>DescribeFeature-Dokument</a>";
if ($row_wfs['wfs_timestamp']) {
$layer['Datum der Registrierung'] = date("d.m.Y",$row_wfs['wfs_timestamp']);
}
More information about the Mapbender_commits
mailing list