Download as
Browse Code »

Commit 4e090de9136dfbeaa9e78980d2b418b8393c285e

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

-

Showing 4 changed files with 16 additions and 4 deletions   Show diff stats
admin/js/editormapfile_metadados.js
  Diff comments   View file @4e090de
... ... @@ -7,7 +7,7 @@ Abre o editor de metadados
7 7 */
8 8 function editorMetadados(codigoMap,codigoLayer)
9 9 {
10   - core_montaEditor("","450px","500px","","Metadados");
  10 + core_montaEditor("","450px","500px","","Miscelânea");
11 11 var sUrl = "../php/editormapfile.php?funcao=pegaMetadados&codigoMap="+codigoMap+"&codigoLayer="+codigoLayer;
12 12 core_pegaDados("Obtendo dados...",sUrl,"montaEditorMetadados");
13 13 }
... ... @@ -129,7 +129,7 @@ function montaEditorMetadados(dados)
129 129 var ins = "<input type=button title='Salvar' value='Salvar' id=salvarEditor />";
130 130 if(dados.colunas != "")
131 131 {
132   - ins += "<p>O layer possu&iacute; as seguintes colunas na tabela de atributos: ";
  132 + ins += "<p>O layer possu&iacute; as seguintes colunas na tabela de atributos: <br>";
133 133 ins += dados.colunas+"</p>";
134 134 }
135 135 ins += core_geraLinhas(param);
... ...
admin/php/editormapfile.php
  Diff comments   View file @4e090de
... ... @@ -1739,6 +1739,7 @@ function pegaConexao()
1739 1739 $dados["metaestat_id_medida_variavel"] = $layer->getmetadata("metaestat_id_medida_variavel");
1740 1740  
1741 1741 $dados["colunas"] = implode(",",pegaItens($layer));
  1742 +
1742 1743 if($layer->connectiontype == 7 || $layer->connectiontype == 9){
1743 1744 $dados["tipooriginal"] = $layer->getmetadata("tipooriginal");
1744 1745 }
... ... @@ -1841,7 +1842,17 @@ function pegaMetadados()
1841 1842 $dados["editorsql"] = $layer->getmetadata("editorsql");
1842 1843 $dados["codigoMap"] = $codigoMap;
1843 1844 $dados["codigoLayer"] = $codigoLayer;
  1845 + $lcon = $layer->connection;
  1846 + if ($layer->connectiontype == MS_POSTGIS){
  1847 + if (in_array($lcon,array_keys($postgis_mapa)))
  1848 + {
  1849 + //echo $postgis_mapa[$lcon];exit;
  1850 + $layer->set("connection",$postgis_mapa[$lcon]);
  1851 + }
  1852 + }
1844 1853 $dados["colunas"] = implode(" ,",pegaItens($layer));
  1854 + $layer->set("connection",$lcon);
  1855 +
1845 1856 $dados["ltempoformatodata"] = $layer->getmetadata("ltempoformatodata");
1846 1857 $dados["ltempoiteminicio"] = $layer->getmetadata("ltempoiteminicio");
1847 1858 $dados["ltempoitemfim"] = $layer->getmetadata("ltempoitemfim");
... ...
ms_configura.php
  Diff comments   View file @4e090de
... ... @@ -417,7 +417,8 @@ Tipo:
417 417 */
418 418 $postgis_mapa = array(
419 419 "teste"=>"user=postgres password=postgres dbname=postgis host=localhost port=5432 options='-c client_encoding=LATIN1'",
420   - "postgres"=>"user=postgres password=postgres dbname=postgres host=localhost port=5432"
  420 + "postgres"=>"user=postgres password=postgres dbname=postgres host=localhost port=5432",
  421 + "i3geosaude"=>"user=postgres password=postgres dbname=i3geosaude host=localhost port=5432"
421 422 );
422 423 /*
423 424 Variable: utilizacgi
... ...
temas/_lbairros.map
  Diff comments   View file @4e090de
... ... @@ -2,7 +2,7 @@ MAP
2 2 FONTSET "../symbols/fontes.txt"
3 3 SYMBOLSET "../symbols/simbolos.sym"
4 4 LAYER
5   - CONNECTION "user=postgres password=postgres dbname=i3geosaude host=localhost port=5432"
  5 + CONNECTION "i3geosaude"
6 6 CONNECTIONTYPE POSTGIS
7 7 DATA "the_geom from (select * from i3geo_metaestat.bairros) as foo using unique gid using srid=4326"
8 8 METADATA
... ...