[Mapbender-commits] r3669 - in trunk/mapbender/http: classes
javascripts php
svn_mapbender at osgeo.org
svn_mapbender at osgeo.org
Wed Mar 11 10:46:08 EDT 2009
Author: christoph
Date: 2009-03-11 10:46:07 -0400 (Wed, 11 Mar 2009)
New Revision: 3669
Modified:
trunk/mapbender/http/classes/class_administration.php
trunk/mapbender/http/classes/class_wmc.php
trunk/mapbender/http/classes/class_wmcToXml.php
trunk/mapbender/http/classes/class_wms.php
trunk/mapbender/http/javascripts/initWms.php
trunk/mapbender/http/javascripts/map.php
trunk/mapbender/http/javascripts/mod_loadwmc.php
trunk/mapbender/http/php/mod_createJSObjFromDBByWMS.php
trunk/mapbender/http/php/mod_createJSObjFromXML.php
Log:
encoding issues
Modified: trunk/mapbender/http/classes/class_administration.php
===================================================================
--- trunk/mapbender/http/classes/class_administration.php 2009-03-11 14:13:08 UTC (rev 3668)
+++ trunk/mapbender/http/classes/class_administration.php 2009-03-11 14:46:07 UTC (rev 3669)
@@ -1142,6 +1142,22 @@
return ($this->is_utf8_xml($data) || $this->is_utf8_string($data));
}
+ public static function convertIncomingString ($str) {
+ if (CHARSET == "ISO-8859-1") {
+ $e = new mb_notice("Conversion to UTF-8: " . $str . " to " . utf8_encode($str));
+ return utf8_encode($str);
+ }
+ return $str;
+ }
+
+ public static function convertOutgoingString ($str) {
+ if (CHARSET == "ISO-8859-1") {
+ $e = new mb_notice("Conversion to ISO-8859-1: " . $str . " to " . utf8_decode($str));
+ return utf8_decode($str);
+ }
+ return $str;
+ }
+
function char_encode($data) {
if (CHARSET == "UTF-8") {
if (!$this->is_utf8($data)) {
Modified: trunk/mapbender/http/classes/class_wmc.php
===================================================================
--- trunk/mapbender/http/classes/class_wmc.php 2009-03-11 14:13:08 UTC (rev 3668)
+++ trunk/mapbender/http/classes/class_wmc.php 2009-03-11 14:46:07 UTC (rev 3669)
@@ -982,7 +982,7 @@
$wms->gui_wms_featureinfoformat = "text/html"; // TODO : Add correct data
$wms->gui_wms_exceptionformat = "application/vnd.ogc.se_xml"; // TODO : Add correct data
$wms->gui_wms_epsg = $this->mainMap->getEpsg();
- $wms->gui_wms_visible = 1; // TODO : Add correct data
+ $wms->gui_wms_visible = $currentLayer["extension"]["WMS_VISIBLE"];
$wms->gui_wms_opacity = 100; // TODO : Add correct data
$wms->gui_wms_sldurl = $currentLayer["style"][$styleIndex]["sld_url"];
Modified: trunk/mapbender/http/classes/class_wmcToXml.php
===================================================================
--- trunk/mapbender/http/classes/class_wmcToXml.php 2009-03-11 14:13:08 UTC (rev 3668)
+++ trunk/mapbender/http/classes/class_wmcToXml.php 2009-03-11 14:46:07 UTC (rev 3669)
@@ -47,6 +47,12 @@
// ---------------------------------------------------------------------
public function getXml () {
+ if (is_null($this->wmc)) {
+ return null;
+ }
+ if ($this->xml == "") {
+ $this->toXml();
+ }
return $this->xml;
}
@@ -95,7 +101,6 @@
$currentMap = $this->wmc->mainMap;
for ($i = 0; $i < count($currentWmsArray); $i++) {
$currentWms = $currentWmsArray[$i];
-
for ($j = 0; $j < count($currentWms->objLayer); $j++) {
$currentLayer = $currentWms->objLayer[$j];
@@ -121,7 +126,10 @@
$e_view_context->appendChild($e_layer_list);
$this->doc->appendChild($e_view_context);
+// $this->xml = $this->doc->saveXML($this->doc->documentElement);
$this->xml = $this->doc->saveXML();
+
+// $e = new mb_notice($this->xml);
}
private function createGeneralNode () {
@@ -280,11 +288,13 @@
$e_layer->appendChild($e_service);
// Name
- $e_layer_name = $this->doc->createElement("Name", $currentLayer->layer_name);
+ $currentLayerName = $currentLayer->layer_name;
+ $e_layer_name = $this->doc->createElement("Name", $currentLayerName);
$e_layer->appendChild($e_layer_name);
// Title
- $e_layer_title = $this->doc->createElement("Title", $currentLayer->layer_title);
+ $currentLayerTitle = $currentLayer->layer_title;
+ $e_layer_title = $this->doc->createElement("Title", $currentLayerTitle);
$e_layer->appendChild($e_layer_title);
// Abstract
@@ -401,6 +411,7 @@
$layerExtensionData["layer_id"] = $currentLayer->layer_uid;
$layerExtensionData["wms_layer_id"] = $currentWms->objLayer[0]->layer_uid;
$layerExtensionData["wms_selectable"] = $currentWms->objLayer[0]->gui_layer_selectable;
+ $layerExtensionData["wms_visible"] = $currentWms->gui_wms_visible;
$layerExtensionData["layer_pos"] = $currentLayer->layer_pos;
$layerExtensionData["layer_parent"] = $currentLayer->layer_parent;
$layerExtensionData["wms_id"] = $currentLayer->gui_layer_wms_id;
Modified: trunk/mapbender/http/classes/class_wms.php
===================================================================
--- trunk/mapbender/http/classes/class_wms.php 2009-03-11 14:13:08 UTC (rev 3668)
+++ trunk/mapbender/http/classes/class_wms.php 2009-03-11 14:46:07 UTC (rev 3669)
@@ -1812,8 +1812,8 @@
while($row2 = db_fetch_array($res_wms)){
$this->wms_id = $row2["wms_id"];
$this->wms_version = $row2["wms_version"];
- $this->wms_title = $this->stripEndlineAndCarriageReturn($row2["wms_title"]);
- $this->wms_abstract = $this->stripEndlineAndCarriageReturn($row2["wms_abstract"]);
+ $this->wms_title = administration::convertIncomingString($this->stripEndlineAndCarriageReturn($row2["wms_title"]));
+ $this->wms_abstract = administration::convertIncomingString($this->stripEndlineAndCarriageReturn($row2["wms_abstract"]));
$wmsowsproxy = $row2["wms_owsproxy"];
#$wmsowsproxy = "test";
if($wmsowsproxy != ""){
@@ -1875,8 +1875,8 @@
$this->addLayer($row2["layer_pos"],$row2["layer_parent"]);
$layer_cnt=count($this->objLayer)-1;
$this->objLayer[$layer_cnt]->layer_uid = $layer_id;
- $this->objLayer[$layer_cnt]->layer_name =$row2["layer_name"];
- $this->objLayer[$layer_cnt]->layer_title =$row2["layer_title"];
+ $this->objLayer[$layer_cnt]->layer_name = administration::convertIncomingString($row2["layer_name"]);
+ $this->objLayer[$layer_cnt]->layer_title = administration::convertIncomingString($row2["layer_title"]);
$this->objLayer[$layer_cnt]->layer_dataurl_href =$row2["layer_dataurl"];
$this->objLayer[$layer_cnt]->layer_metadataurl =$row2["layer_metadataurl"];
$this->objLayer[$layer_cnt]->layer_pos =$row2["layer_pos"];
Modified: trunk/mapbender/http/javascripts/initWms.php
===================================================================
--- trunk/mapbender/http/javascripts/initWms.php 2009-03-11 14:13:08 UTC (rev 3668)
+++ trunk/mapbender/http/javascripts/initWms.php 2009-03-11 14:46:07 UTC (rev 3669)
@@ -4,11 +4,15 @@
//
require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
require_once(dirname(__FILE__)."/../classes/class_wms.php");
+require_once(dirname(__FILE__)."/../classes/class_administration.php");
$wmsArray = wms::selectMyWmsByApplication($gui_id);
for ($i = 0; $i < count($wmsArray); $i++) {
$currentWms = $wmsArray[$i];
- $currentWms->createJsObjFromWMS();
+
+ $output = $currentWms->createJsObjFromWMS_();
+ echo administration::convertOutgoingString($output);
+ unset($output);
}
-?>
\ No newline at end of file
+?>
Modified: trunk/mapbender/http/javascripts/map.php
===================================================================
--- trunk/mapbender/http/javascripts/map.php 2009-03-11 14:13:08 UTC (rev 3668)
+++ trunk/mapbender/http/javascripts/map.php 2009-03-11 14:46:07 UTC (rev 3669)
@@ -131,13 +131,13 @@
for ($i = 0; $i < count($moduleArray); $i++) {
$currentFile = dirname(__FILE__) . "/../javascripts/" . trim($moduleArray[$i]);
if (file_exists($currentFile)) {
+ $e = new mb_notice("LOADING module : " . $currentFile);
require_once($currentFile);
echo "\n";
}
else {
$e = new mb_exception("Javascript module not found: " . $currentFile);
echo "var e = new Mb_exception('Javascript module not found: " . $currentFile . "');";
- die;
}
}
}
Modified: trunk/mapbender/http/javascripts/mod_loadwmc.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_loadwmc.php 2009-03-11 14:13:08 UTC (rev 3668)
+++ trunk/mapbender/http/javascripts/mod_loadwmc.php 2009-03-11 14:46:07 UTC (rev 3669)
@@ -29,15 +29,15 @@
$e = new mb_notice("wmc not set, generating from app: " . $_SESSION["mb_user_gui"]);
$wmc->createFromApplication($_SESSION["mb_user_gui"]);
$_SESSION["mb_wmc"] = $wmc->toXml();
-// $e = new mb_exception("initial WMC: " . $_SESSION["mb_wmc"]);
+ $e = new mb_notice("creating initial WMC.");
}
if (isset($_SESSION['mb_wmc'])) {
- $e = new mb_notice("merging with WMC.");
if ($wmc->createFromXml($_SESSION['mb_wmc'])) {
if ($mergeWms) {
+ $e = new mb_notice("merging with WMS.");
$wmsArray = array();
for ($i = 0; $i < count($_SESSION["wms"]); $i++) {
$currentWms = new wms();
@@ -59,7 +59,6 @@
}
}
else {
- $e = new mb_notice("not merging WMC");
$jsString .= "var e = new Mb_warning('mod_loadwmc: load_wmc_session: no wmc set!');";
}
return $jsString;
@@ -81,10 +80,10 @@
$e = new mb_notice("NOT merging with WMS in Session...");
$output = createJs(false);
}
-if (CHARSET == "ISO-8859-1") {
- $output = utf8_decode($output);
-}
+
+$output = administration::convertOutgoingString($output);
echo $output;
+
?>
}
Modified: trunk/mapbender/http/php/mod_createJSObjFromDBByWMS.php
===================================================================
--- trunk/mapbender/http/php/mod_createJSObjFromDBByWMS.php 2009-03-11 14:13:08 UTC (rev 3668)
+++ trunk/mapbender/http/php/mod_createJSObjFromDBByWMS.php 2009-03-11 14:46:07 UTC (rev 3669)
@@ -45,7 +45,9 @@
else{
$mywms->createObjFromDBNoGui($wms_id);
}
- $mywms->createJsObjFromWMS(true);
+ $output = $mywms->createJsObjFromWMS_(true);
+ echo administration::convertOutgoingString($output);
+ unset($output);
echo "parent.mod_addWMS_refresh();";
}
else {
@@ -53,12 +55,7 @@
}
?>
</script>
-<!--
-<script language="JavaScript" type="text/javascript">
-alert("3/3 mod_createJSObjFromDBByWMS: WMS ID = <?php echo $wms_id;?>, GUI ID = <?php echo $gui_id;?>");
-</script>
--->
</head>
<body bgcolor='#ffffff'>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: trunk/mapbender/http/php/mod_createJSObjFromXML.php
===================================================================
--- trunk/mapbender/http/php/mod_createJSObjFromXML.php 2009-03-11 14:13:08 UTC (rev 3668)
+++ trunk/mapbender/http/php/mod_createJSObjFromXML.php 2009-03-11 14:46:07 UTC (rev 3669)
@@ -19,6 +19,7 @@
require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
require_once(dirname(__FILE__)."/../classes/class_wms.php");
+require_once(dirname(__FILE__)."/../classes/class_administration.php");
$capabilitiesURL = html_entity_decode($_REQUEST['caps']);
?>
@@ -41,7 +42,9 @@
echo "prompt('" . $errorMessage . "', '" . $capabilitiesURL . "');";
die;
}
-$mywms->createJsObjFromWMS(true);
+$output = $mywms->createJsObjFromWMS_(true);
+echo administration::convertOutgoingString($output);
+unset($output);
?>
parent.mod_addWMS_refresh();
@@ -49,4 +52,4 @@
</head>
<body bgcolor='#ffffff'>
</body>
-</html>
\ No newline at end of file
+</html>
More information about the Mapbender_commits
mailing list