From 4a197f20d241036c98b8e4a55e223b283d0925fb Mon Sep 17 00:00:00 2001
From: Edmar Moretti <edmar.moretti@gmail.com>
Date: Fri, 28 Aug 2009 01:24:49 +0000
Subject: [PATCH] 

---
 aplicmap/geral.htm            | 18 +++++++++++++-----
 classesphp/funcoes_gerais.php |  8 ++++++++
 classesphp/mapa_controle.php  |  1 +
 menutemas/admin.db            | Bin 53248 -> 0 bytes
 ms_configura.php              | 14 ++++++++++++--
 temas/testesubsstring.map     | 30 ++++++++++++++++++++++++++++++
 6 files changed, 64 insertions(+), 7 deletions(-)
 create mode 100644 temas/testesubsstring.map

diff --git a/aplicmap/geral.htm b/aplicmap/geral.htm
index f023854..37332fb 100644
--- a/aplicmap/geral.htm
+++ b/aplicmap/geral.htm
@@ -163,12 +163,20 @@ vc pode optar por colocar mensagens de ajuda em algum lugar
 
 <center>
 <br><br>
-<table><tr>
-<td colspan=3 ><center><img src='../imagens/i3geo1.jpg'></td></tr>
+<table>
+<tr>
+	<td colspan=3 ><center><img src='../imagens/i3geo1.jpg'></td>
+</tr>
 <tr><td style="padding:10px;"><center><img src='../imagens/pspb.png'></td>
-<td style="padding:10px;"><center><img src='../imagens/mapserv.png'></td>
-<td style="padding:10px;"><center><a href='http://mapas.mma.gov.br/download' target=blank ><img src='../imagens/somerights20_pt.gif' ></a></td>
-</tr></table>
+	<td style="padding:10px;"><center><img src='../imagens/mapserv.png'></td>
+	<td style="padding:10px;"><center><a href='http://mapas.mma.gov.br/download' target=blank ><img src='../imagens/somerights20_pt.gif' ></a></td>
+</tr>
+<tr>
+	<td colspan=3 ><center>
+		<script type="text/javascript" src="http://www.ohloh.net/p/150688/widgets/project_users.js?style=red"></script>
+	</td>
+</tr>
+</table>
 
 
 <!--
diff --git a/classesphp/funcoes_gerais.php b/classesphp/funcoes_gerais.php
index aed7753..ededa22 100644
--- a/classesphp/funcoes_gerais.php
+++ b/classesphp/funcoes_gerais.php
@@ -861,8 +861,16 @@ postgis_mapa - string de conexão com o banco de dados definida em ms_configura.p
 */
 function testaMapa($map_file,$postgis_mapa)
 {
+	//var_dump($postgis_mapa);
+	//error_reporting(E_ALL);
 	substituiCon($map_file,$postgis_mapa);
 	$objMapa = ms_newMapObj($map_file);
+	
+	//$l = $objMapa->getlayerbyname("testesubsstring");
+	//echo $l->connection;
+	
+	
+	
 	ms_ResetErrorList();
 	$img = $objMapa->draw();
 	$erros = "";
diff --git a/classesphp/mapa_controle.php b/classesphp/mapa_controle.php
index bfbaa19..94ae846 100644
--- a/classesphp/mapa_controle.php
+++ b/classesphp/mapa_controle.php
@@ -721,6 +721,7 @@ Include:
 		$salvar = $m->adicionaTema($temas,$locaplic);
 		if($salvar)
 		$m->salva();
+		$cp->set_data("ok");
 		$teste = testaMapa($map_file,$postgis_mapa);
 		if ($teste == "ok")
 		{$cp->set_data("ok");}
diff --git a/menutemas/admin.db b/menutemas/admin.db
index 5076fe5..6d90188 100644
Binary files a/menutemas/admin.db and b/menutemas/admin.db differ
diff --git a/ms_configura.php b/ms_configura.php
index 26a7f3b..a67e792 100644
--- a/ms_configura.php
+++ b/ms_configura.php
@@ -253,10 +253,20 @@ if (strtoupper(substr(PHP_OS, 0, 3) == 'WIN'))
 	
 	Para mais detalhes veja a função substituiCon em classesphp/funcoes_gerais.php
 	
+	Importante - se vc usar o modo de substituição de strings, as interfaces que dependem do modo CGI
+	para funcionarem, não serão capazes de acessar os dados. Isso afeta por exemplo, a interface Google Maps e Openlayers.
+	
+	exemplo - 
+	
+	$postgis_mapa = array(
+		"conexao1"=>"user=geodados password=geodados dbname=geodados host=10.1.1.36 port=5432",
+		"conexao2"=>"user=geodados password=geodados dbname=geodadosteste host=10.1.1.36 port=5432"
+	)
+	
 	Tipo:
-	{array}
+	{array ou  string}
 	*/
-	$postgis_mapa = ""; //"user=geodados password=geodados dbname=geodados host=10.1.1.36 port=5432";
+	$postgis_mapa = array("teste"=>"user=postgres password=postgres dbname=pgutf8 host=localhost port=5432 options='-c client_encoding=LATIN1'"); //"user=geodados password=geodados dbname=geodados host=10.1.1.36 port=5432";
 	/*
 	Variable: menutemas
 	
diff --git a/temas/testesubsstring.map b/temas/testesubsstring.map
new file mode 100644
index 0000000..2b9047f
--- /dev/null
+++ b/temas/testesubsstring.map
@@ -0,0 +1,30 @@
+MAP
+SYMBOLSET ../symbols/simbolos.sym
+FONTSET   "../symbols/fontes.txt"
+  LAYER
+    CONNECTION "teste"
+    CONNECTIONTYPE POSTGIS
+    DATA "the_geom FROM (select * FROM biomas) as foo USING UNIQUE gid USING SRID=4291"
+    METADATA
+      "CLASSE"	"SIM"
+      "download"	"SIM"
+      "TEMA"	"Teste de substituição de string"
+    END
+    NAME "testesubsstring"
+    STATUS OFF
+    TEMPLATE "none.htm"
+    TYPE POLYGON
+    UNITS METERS
+    CLASS
+      NAME "Teste"
+      STYLE
+        ANGLE 360
+        COLOR 196 185 103
+        OPACITY 100
+        SYMBOL 0
+      END
+    END
+   END
+
+END
+
--
libgit2 0.21.2