[Mapbender-commits] r3666 - in branches/2.5/http: classes
javascripts php
svn_mapbender at osgeo.org
svn_mapbender at osgeo.org
Wed Mar 11 09:40:12 EDT 2009
Author: christoph
Date: 2009-03-11 09:40:11 -0400 (Wed, 11 Mar 2009)
New Revision: 3666
Modified:
branches/2.5/http/classes/class_administration.php
branches/2.5/http/classes/class_wmcToXml.php
branches/2.5/http/classes/class_wms.php
branches/2.5/http/javascripts/map.php
branches/2.5/http/javascripts/mod_loadwmc.php
branches/2.5/http/php/mod_createJSObjFromDB.php
branches/2.5/http/php/mod_createJSObjFromDBByWMS.php
branches/2.5/http/php/mod_createJSObjFromXML.php
Log:
waking up from the encoding nightmare
Modified: branches/2.5/http/classes/class_administration.php
===================================================================
--- branches/2.5/http/classes/class_administration.php 2009-03-10 16:42:31 UTC (rev 3665)
+++ branches/2.5/http/classes/class_administration.php 2009-03-11 13:40:11 UTC (rev 3666)
@@ -1082,6 +1082,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: branches/2.5/http/classes/class_wmcToXml.php
===================================================================
--- branches/2.5/http/classes/class_wmcToXml.php 2009-03-10 16:42:31 UTC (rev 3665)
+++ branches/2.5/http/classes/class_wmcToXml.php 2009-03-11 13:40:11 UTC (rev 3666)
@@ -47,6 +47,12 @@
// ---------------------------------------------------------------------
public function getXml () {
+ if (is_null($this->wmc)) {
+ return null;
+ }
+ if ($this->xml == "") {
+ $this->toXml();
+ }
return $this->xml;
}
@@ -120,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 () {
@@ -279,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
Modified: branches/2.5/http/classes/class_wms.php
===================================================================
--- branches/2.5/http/classes/class_wms.php 2009-03-10 16:42:31 UTC (rev 3665)
+++ branches/2.5/http/classes/class_wms.php 2009-03-11 13:40:11 UTC (rev 3666)
@@ -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: branches/2.5/http/javascripts/map.php
===================================================================
--- branches/2.5/http/javascripts/map.php 2009-03-10 16:42:31 UTC (rev 3665)
+++ branches/2.5/http/javascripts/map.php 2009-03-11 13:40:11 UTC (rev 3666)
@@ -91,7 +91,10 @@
while($row = db_fetch_array($res)) {
$mywms = new wms();
$mywms->createObjFromDB($gui_id, $row["fkey_wms_id"]);
- $mywms->createJsObjFromWMS();
+ $output = $mywms->createJsObjFromWMS_();
+
+ echo administration::convertOutgoingString($output);
+ unset($output);
}
//
Modified: branches/2.5/http/javascripts/mod_loadwmc.php
===================================================================
--- branches/2.5/http/javascripts/mod_loadwmc.php 2009-03-10 16:42:31 UTC (rev 3665)
+++ branches/2.5/http/javascripts/mod_loadwmc.php 2009-03-11 13:40:11 UTC (rev 3666)
@@ -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: branches/2.5/http/php/mod_createJSObjFromDB.php
===================================================================
--- branches/2.5/http/php/mod_createJSObjFromDB.php 2009-03-10 16:42:31 UTC (rev 3665)
+++ branches/2.5/http/php/mod_createJSObjFromDB.php 2009-03-11 13:40:11 UTC (rev 3666)
@@ -18,6 +18,7 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
+require_once(dirname(__FILE__)."/../classes/class_administration.php");
require_once(dirname(__FILE__)."/../classes/class_wms.php");
$sql = "SELECT fkey_wms_id FROM gui_wms WHERE fkey_gui_id = $1 ORDER BY gui_wms_position";
@@ -28,6 +29,8 @@
while($row = db_fetch_array($res)){
$mywms = new wms();
$mywms->createObjFromDB($_SESSION["mb_user_gui"],$row["fkey_wms_id"]);
- $mywms->createJsObjFromWMS();
+ $output = $mywms->createJsObjFromWMS_();
+ echo administration::convertOutgoingString($output);
+ unset($output);
}
?>
\ No newline at end of file
Modified: branches/2.5/http/php/mod_createJSObjFromDBByWMS.php
===================================================================
--- branches/2.5/http/php/mod_createJSObjFromDBByWMS.php 2009-03-10 16:42:31 UTC (rev 3665)
+++ branches/2.5/http/php/mod_createJSObjFromDBByWMS.php 2009-03-11 13:40:11 UTC (rev 3666)
@@ -46,7 +46,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 {
Modified: branches/2.5/http/php/mod_createJSObjFromXML.php
===================================================================
--- branches/2.5/http/php/mod_createJSObjFromXML.php 2009-03-10 16:42:31 UTC (rev 3665)
+++ branches/2.5/http/php/mod_createJSObjFromXML.php 2009-03-11 13:40:11 UTC (rev 3666)
@@ -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();
More information about the Mapbender_commits
mailing list