From 697ec1c58b77190fb6d373d5aee9f5812e0a6f75 Mon Sep 17 00:00:00 2001
From: Edmar Moretti <edmar.moretti@gmail.com>
Date: Thu, 15 Jan 2015 22:04:05 +0000
Subject: [PATCH] Correçãona aplicação de parametros no plugin de sql parametrizado

---
 admin/php/editormapfile.php        |  2 ++
 ferramentas/parametrossql/exec.php |  5 +++--
 ms_configura.php                   |  3 ++-
 temas/teste.map                    | 86 +++++++++++++++++++++++++++++++++++++++++---------------------------------------------
 4 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/admin/php/editormapfile.php b/admin/php/editormapfile.php
index d56c7c8..152734a 100644
--- a/admin/php/editormapfile.php
+++ b/admin/php/editormapfile.php
@@ -1151,6 +1151,8 @@ function refazerLayer()
 		$nl->setmetadata("olstatus","");
 		$nl->setmetadata("gmopacity","");
 		$nl->setmetadata("gmstatus","");
+		$nl->setmetadata("FILTROORIGINAL","");
+		$nl->setmetadata("DATAORIGINAL","");
 		$nl->setmetadata("cache",$cache);
 		$numclasses = $nl->numclasses;
 		if ($numclasses > 0)
diff --git a/ferramentas/parametrossql/exec.php b/ferramentas/parametrossql/exec.php
index 385b7eb..cc1f74b 100755
--- a/ferramentas/parametrossql/exec.php
+++ b/ferramentas/parametrossql/exec.php
@@ -40,9 +40,10 @@ Aplica a substituicao de chaves pelos valores enviados
 			}
 		}
 		if($filtro != ""){
-			$layer->setfilter(strip_tags(trim($filtro)));
+			$layer->setfilter($filtro);
 		}
-		$layer->set("data",strip_tags(trim($data)));
+		$data = str_replace("--","",$data);
+		$layer->set("data",$data);
 		$layer->set("status",MS_DEFAULT);
 		$layer->setmetadata("PLUGINI3GEO","");
 		$layer->setmetadata("TEMA",$layer->getmetadata("TEMA")." - ".implode(",",$valores));
diff --git a/ms_configura.php b/ms_configura.php
index b664dbf..2ce6cdb 100644
--- a/ms_configura.php
+++ b/ms_configura.php
@@ -415,8 +415,9 @@ $postgis_mapa = ""
 Tipo:
 {array ou  string}
 */
+//TODO verificar ao fechar versao
 $postgis_mapa = array(
-		"teste"=>"user=postgres password=postgres dbname=sissgeo host=localhost port=5432 options='-c client_encoding=LATIN1'",
+		"teste"=>"user=postgres password=postgres dbname=sigeo host=localhost port=5432",
 		"postgres"=>"user=postgres password=postgres dbname=postgres host=localhost port=5432",
 		"i3geosaude"=>"user=postgres password=postgres dbname=i3geosaude host=localhost port=5432 options='-c client_encoding=LATIN1'"
 );
diff --git a/temas/teste.map b/temas/teste.map
index 68d3dc0..fe1afd2 100644
--- a/temas/teste.map
+++ b/temas/teste.map
@@ -1,70 +1,66 @@
-<<<<<<< .mine
-MAP
-  FONTSET "../symbols/fontes.txt"
-  SYMBOLSET "../symbols/simbolosv6.sym"
-  LAYER
-    CONNECTION "i3geosaude"
-    CONNECTIONTYPE POSTGIS
-    DATA "geom from (select * from fisico.elem_fisiog_natural) as foo using unique gid using srid=4326"
-    METADATA
-      "METAESTAT_ID_MEDIDA_VARIAVEL"	""
-      "cache"	""
-      "CLASSE"	"SIM"
-      "METAESTAT_CODIGO_TIPO_REGIAO"	""
-      "metaestat"	""
-      "TEMA"	"Teste de localidades"
-      "convcaracter"	""
-      "cortepixels"	"0"
-    END # METADATA
-    NAME "teste"
-    STATUS OFF
-    TEMPLATE "none.htm"
-    TYPE LINE
-    UNITS METERS
-    CLASS
-      NAME ""
-      STYLE
-        COLOR 0 0 0
-        SIZE 12
-        SYMBOL "linha"
-      END # STYLE
-    END # CLASS
-  END # LAYER
-
-END # MAP
-
-=======
 MAP
   FONTSET "../symbols/fontes.txt"
   SYMBOLSET "../symbols/simbolosv6.sym"
   LAYER
-    CONNECTION "user=postgres password=postgres dbname=sissgeo host=localhost port=5432 options='-c client_encoding=LATIN7'"
+    CONNECTION "teste"
     CONNECTIONTYPE POSTGIS
-    DATA "geom from (select geom,cod_bioma,ds_sintese,ds_bioma,nom_bioma,gid from fisico.biomas) as foo using unique gid using srid=4326"
+    DATA "geom from (select * from ambiente.queim2013 WHERE data >= 999 and data <= 20131231 ) as foo using unique gid using srid=4326"
     METADATA
       "METAESTAT_ID_MEDIDA_VARIAVEL"	""
-      "cache"	""
+      "cache"	"nao"
+      "tip"	"lat,lon,data,horagmt,satelite,municipio,uf,regiao,bioma"
+      "ltempoitemimagem"	""
       "CLASSE"	"SIM"
+      "olopacity"	""
+      "ltempoitemdescricao"	""
+      "palletestep"	""
+      "ltempoiteminicio"	""
+      "ltempoitemtip"	""
+      "gmopacity"	""
+      "gmstatus"	""
+      "itensdesc"	"Lat,Lon,Latgms,Longms,Data,Horagmt,Satelite,Municipio,UF,Regiao,Prec,Num dias sem chuva,Risco,Bioma"
+      "description_template"	""
+      "ltempoitemtitulo"	""
+      "ltempoitemlink"	""
       "METAESTAT_CODIGO_TIPO_REGIAO"	""
+      "arquivotemaoriginal"	""
+      "palletefile"	""
+      "nomeoriginal"	""
+      "olstatus"	""
+      "ltempoformatodata"	""
+      "ltempoitemicone"	""
+      "PLUGINI3GEO"	'{"plugin":"parametrossql","parametros":[{"titulo" : "Início (mês/dia)","chave" : "999","tipo" : "input","valores" : "0101","prog" : ""},{"titulo" : "Fim (mês/dia)","chave" : "1231","tipo" : "input","valores" : "1231","prog" : ""},{"titulo" : "","chave" : "","tipo" : "input","valores" : "","prog" : ""},{"titulo" : "","chave" : "","tipo" : "input","valores" : "","prog" : ""}]}'
       "metaestat"	""
-      "TEMA"	"Teste de localidades"
+      "itembuscarapida"	""
+      "CONEXAOORIGINAL"	"sigeo"
+      "itens"	"lat,lon,latgms,longms,data,horagmt,satelite,municipio,uf,regiao,pais,prec,ndiasschuv,risco,bioma,wrs_tm"
       "convcaracter"	""
+      "TEMA"	"Focos de queimada 2013"
       "cortepixels"	"0"
+      "editorsql"	""
+      "ltempoconvencode"	""
+      "ltempoitemfim"	""
     END # METADATA
     NAME "teste"
-    STATUS OFF
+    PROCESSING "LABEL_NO_CLIP=True"
+    PROCESSING "POLYLINE_NO_CLIP=True"
+    STATUS DEFAULT
     TEMPLATE "none.htm"
-    TYPE POLYGON
+    TILEITEM "location"
+    TYPE POINT
     UNITS METERS
     CLASS
       NAME ""
       STYLE
-        COLOR 0 0 0
-        SIZE 12
+        ANGLE 0
+        COLOR 239 12 12
+        OFFSET 0 0
+        SIZE 6
+        SYMBOL "ponto"
       END # STYLE
+      TITLE ""
     END # CLASS
   END # LAYER
 
 END # MAP
 
->>>>>>> .r5411
--
libgit2 0.21.2