Download as
Browse Code »

Commit 697ec1c58b77190fb6d373d5aee9f5812e0a6f75

Authored by Edmar Moretti
1 parent ce06c35d
Exists in master and in 7 other branches composer, doc-root, docker, guia, licenca, readme, unmaintened

Correçãona aplicação de parametros no plugin de sql parametrizado

Showing 4 changed files with 48 additions and 48 deletions   Show diff stats
admin/php/editormapfile.php
  Diff comments   View file @697ec1c
@@ -1151,6 +1151,8 @@ function refazerLayer() @@ -1151,6 +1151,8 @@ function refazerLayer()
1151 $nl->setmetadata("olstatus",""); 1151 $nl->setmetadata("olstatus","");
1152 $nl->setmetadata("gmopacity",""); 1152 $nl->setmetadata("gmopacity","");
1153 $nl->setmetadata("gmstatus",""); 1153 $nl->setmetadata("gmstatus","");
  1154 + $nl->setmetadata("FILTROORIGINAL","");
  1155 + $nl->setmetadata("DATAORIGINAL","");
1154 $nl->setmetadata("cache",$cache); 1156 $nl->setmetadata("cache",$cache);
1155 $numclasses = $nl->numclasses; 1157 $numclasses = $nl->numclasses;
1156 if ($numclasses > 0) 1158 if ($numclasses > 0)
ferramentas/parametrossql/exec.php
  Diff comments   View file @697ec1c
@@ -40,9 +40,10 @@ Aplica a substituicao de chaves pelos valores enviados @@ -40,9 +40,10 @@ Aplica a substituicao de chaves pelos valores enviados
40 } 40 }
41 } 41 }
42 if($filtro != ""){ 42 if($filtro != ""){
43 - $layer->setfilter(strip_tags(trim($filtro))); 43 + $layer->setfilter($filtro);
44 } 44 }
45 - $layer->set("data",strip_tags(trim($data))); 45 + $data = str_replace("--","",$data);
  46 + $layer->set("data",$data);
46 $layer->set("status",MS_DEFAULT); 47 $layer->set("status",MS_DEFAULT);
47 $layer->setmetadata("PLUGINI3GEO",""); 48 $layer->setmetadata("PLUGINI3GEO","");
48 $layer->setmetadata("TEMA",$layer->getmetadata("TEMA")." - ".implode(",",$valores)); 49 $layer->setmetadata("TEMA",$layer->getmetadata("TEMA")." - ".implode(",",$valores));
ms_configura.php
  Diff comments   View file @697ec1c
@@ -415,8 +415,9 @@ $postgis_mapa = "" @@ -415,8 +415,9 @@ $postgis_mapa = ""
415 Tipo: 415 Tipo:
416 {array ou string} 416 {array ou string}
417 */ 417 */
  418 +//TODO verificar ao fechar versao
418 $postgis_mapa = array( 419 $postgis_mapa = array(
419 - "teste"=>"user=postgres password=postgres dbname=sissgeo host=localhost port=5432 options='-c client_encoding=LATIN1'", 420 + "teste"=>"user=postgres password=postgres dbname=sigeo host=localhost port=5432",
420 "postgres"=>"user=postgres password=postgres dbname=postgres host=localhost port=5432", 421 "postgres"=>"user=postgres password=postgres dbname=postgres host=localhost port=5432",
421 "i3geosaude"=>"user=postgres password=postgres dbname=i3geosaude host=localhost port=5432 options='-c client_encoding=LATIN1'" 422 "i3geosaude"=>"user=postgres password=postgres dbname=i3geosaude host=localhost port=5432 options='-c client_encoding=LATIN1'"
422 ); 423 );
temas/teste.map
  Diff comments   View file @697ec1c
1 -<<<<<<< .mine  
2 -MAP  
3 - FONTSET "../symbols/fontes.txt"  
4 - SYMBOLSET "../symbols/simbolosv6.sym"  
5 - LAYER  
6 - CONNECTION "i3geosaude"  
7 - CONNECTIONTYPE POSTGIS  
8 - DATA "geom from (select * from fisico.elem_fisiog_natural) as foo using unique gid using srid=4326"  
9 - METADATA  
10 - "METAESTAT_ID_MEDIDA_VARIAVEL" ""  
11 - "cache" ""  
12 - "CLASSE" "SIM"  
13 - "METAESTAT_CODIGO_TIPO_REGIAO" ""  
14 - "metaestat" ""  
15 - "TEMA" "Teste de localidades"  
16 - "convcaracter" ""  
17 - "cortepixels" "0"  
18 - END # METADATA  
19 - NAME "teste"  
20 - STATUS OFF  
21 - TEMPLATE "none.htm"  
22 - TYPE LINE  
23 - UNITS METERS  
24 - CLASS  
25 - NAME ""  
26 - STYLE  
27 - COLOR 0 0 0  
28 - SIZE 12  
29 - SYMBOL "linha"  
30 - END # STYLE  
31 - END # CLASS  
32 - END # LAYER  
33 -  
34 -END # MAP  
35 -  
36 -=======  
37 MAP 1 MAP
38 FONTSET "../symbols/fontes.txt" 2 FONTSET "../symbols/fontes.txt"
39 SYMBOLSET "../symbols/simbolosv6.sym" 3 SYMBOLSET "../symbols/simbolosv6.sym"
40 LAYER 4 LAYER
41 - CONNECTION "user=postgres password=postgres dbname=sissgeo host=localhost port=5432 options='-c client_encoding=LATIN7'" 5 + CONNECTION "teste"
42 CONNECTIONTYPE POSTGIS 6 CONNECTIONTYPE POSTGIS
43 - 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" 7 + DATA "geom from (select * from ambiente.queim2013 WHERE data >= 999 and data <= 20131231 ) as foo using unique gid using srid=4326"
44 METADATA 8 METADATA
45 "METAESTAT_ID_MEDIDA_VARIAVEL" "" 9 "METAESTAT_ID_MEDIDA_VARIAVEL" ""
46 - "cache" "" 10 + "cache" "nao"
  11 + "tip" "lat,lon,data,horagmt,satelite,municipio,uf,regiao,bioma"
  12 + "ltempoitemimagem" ""
47 "CLASSE" "SIM" 13 "CLASSE" "SIM"
  14 + "olopacity" ""
  15 + "ltempoitemdescricao" ""
  16 + "palletestep" ""
  17 + "ltempoiteminicio" ""
  18 + "ltempoitemtip" ""
  19 + "gmopacity" ""
  20 + "gmstatus" ""
  21 + "itensdesc" "Lat,Lon,Latgms,Longms,Data,Horagmt,Satelite,Municipio,UF,Regiao,Prec,Num dias sem chuva,Risco,Bioma"
  22 + "description_template" ""
  23 + "ltempoitemtitulo" ""
  24 + "ltempoitemlink" ""
48 "METAESTAT_CODIGO_TIPO_REGIAO" "" 25 "METAESTAT_CODIGO_TIPO_REGIAO" ""
  26 + "arquivotemaoriginal" ""
  27 + "palletefile" ""
  28 + "nomeoriginal" ""
  29 + "olstatus" ""
  30 + "ltempoformatodata" ""
  31 + "ltempoitemicone" ""
  32 + "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" : ""}]}'
49 "metaestat" "" 33 "metaestat" ""
50 - "TEMA" "Teste de localidades" 34 + "itembuscarapida" ""
  35 + "CONEXAOORIGINAL" "sigeo"
  36 + "itens" "lat,lon,latgms,longms,data,horagmt,satelite,municipio,uf,regiao,pais,prec,ndiasschuv,risco,bioma,wrs_tm"
51 "convcaracter" "" 37 "convcaracter" ""
  38 + "TEMA" "Focos de queimada 2013"
52 "cortepixels" "0" 39 "cortepixels" "0"
  40 + "editorsql" ""
  41 + "ltempoconvencode" ""
  42 + "ltempoitemfim" ""
53 END # METADATA 43 END # METADATA
54 NAME "teste" 44 NAME "teste"
55 - STATUS OFF 45 + PROCESSING "LABEL_NO_CLIP=True"
  46 + PROCESSING "POLYLINE_NO_CLIP=True"
  47 + STATUS DEFAULT
56 TEMPLATE "none.htm" 48 TEMPLATE "none.htm"
57 - TYPE POLYGON 49 + TILEITEM "location"
  50 + TYPE POINT
58 UNITS METERS 51 UNITS METERS
59 CLASS 52 CLASS
60 NAME "" 53 NAME ""
61 STYLE 54 STYLE
62 - COLOR 0 0 0  
63 - SIZE 12 55 + ANGLE 0
  56 + COLOR 239 12 12
  57 + OFFSET 0 0
  58 + SIZE 6
  59 + SYMBOL "ponto"
64 END # STYLE 60 END # STYLE
  61 + TITLE ""
65 END # CLASS 62 END # CLASS
66 END # LAYER 63 END # LAYER
67 64
68 END # MAP 65 END # MAP
69 66
70 ->>>>>>> .r5411