[Mapbender-commits] r2382 - in branches/darndt_dev/http: classes
javascripts php
svn_mapbender at osgeo.org
svn_mapbender at osgeo.org
Fri Apr 11 05:48:14 EDT 2008
Author: darndt
Date: 2008-04-11 05:48:13 -0400 (Fri, 11 Apr 2008)
New Revision: 2382
Modified:
branches/darndt_dev/http/classes/class_wms.php
branches/darndt_dev/http/javascripts/mod_addWMSgeneralFunctions.js
branches/darndt_dev/http/php/mod_createJSObjFromXML.php
Log:
Modified: branches/darndt_dev/http/classes/class_wms.php
===================================================================
--- branches/darndt_dev/http/classes/class_wms.php 2008-04-11 08:46:51 UTC (rev 2381)
+++ branches/darndt_dev/http/classes/class_wms.php 2008-04-11 09:48:13 UTC (rev 2382)
@@ -76,7 +76,7 @@
function wms() {
}
- function createObjFromXML($url){
+ function createObjFromXML($url,$gn_uuid){
$x = new connector($url);
$data = $x->file;
@@ -95,7 +95,11 @@
$this->wms_getcapabilities_doc = $admin->char_encode($data);
$this->wms_upload_url = $url;
- $this->wms_id = "";
+ if(!$gn_uuid){
+ $this->wms_id = "";
+ }else{
+ $this->wms_id = $gn_uuid;
+ }
$parser = xml_parser_create("");
xml_parser_set_option($parser,XML_OPTION_CASE_FOLDING,0);
xml_parser_set_option($parser,XML_OPTION_SKIP_WHITE,1);
Modified: branches/darndt_dev/http/javascripts/mod_addWMSgeneralFunctions.js
===================================================================
--- branches/darndt_dev/http/javascripts/mod_addWMSgeneralFunctions.js 2008-04-11 08:46:51 UTC (rev 2381)
+++ branches/darndt_dev/http/javascripts/mod_addWMSgeneralFunctions.js 2008-04-11 09:48:13 UTC (rev 2382)
@@ -1,9 +1,17 @@
-function mod_addWMS_load(caps){
- window.frames['loadData'].document.location.href = "../php/mod_createJSObjFromXML.php?caps=" + encodeURIComponent(caps);
+//uuid für GeoNetowork Kompatibilität
+function mod_addWMS_load(caps,uuid){
+ if(!uuid) {
+ window.frames['loadData'].document.location.href = "../php/mod_createJSObjFromXML.php?caps=" + encodeURIComponent(caps);
+ }else{
+ window.frames['loadData'].document.location.href = "../php/mod_createJSObjFromXML.php?caps=" + encodeURIComponent(caps) + "&uuid=" + uuid;
+ }
}
-
-function mod_addLayer_load(caps,layer_name){
- var url = "../php/mod_createJSLayerObjFromXML.php?caps=" + encodeURIComponent(caps) + "&layer_name=" + encodeURIComponent(layer_name);
+function mod_addLayer_load(caps,layer_name,uuid){
+ if(!uuid) {
+ var url = "../php/mod_createJSLayerObjFromXML.php?caps=" + encodeURIComponent(caps) + "&layer_name=" + encodeURIComponent(layer_name);
+ }else{
+ var url = "../php/mod_createJSLayerObjFromXML.php?caps=" + encodeURIComponent(caps) + "&layer_name=" + encodeURIComponent(layer_name) + "&uuid=" + uuid;
+ }
window.frames['loadData'].document.location.href = url;
}
Modified: branches/darndt_dev/http/php/mod_createJSObjFromXML.php
===================================================================
--- branches/darndt_dev/http/php/mod_createJSObjFromXML.php 2008-04-11 08:46:51 UTC (rev 2381)
+++ branches/darndt_dev/http/php/mod_createJSObjFromXML.php 2008-04-11 09:48:13 UTC (rev 2382)
@@ -20,7 +20,10 @@
require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
require_once(dirname(__FILE__)."/../classes/class_wms.php");
-$capabilitiesURL = html_entity_decode($_REQUEST['caps']);
+$capabilitiesURL = html_entity_decode($_REQUEST['caps']);
+//Einfügung GeoNetwork
+$gn_uuid = $_REQUEST['uuid'];
+//Ende Einfügung GeoNetwork
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
More information about the Mapbender_commits
mailing list