From 6cb418e30ea96b441f4e3cc0e813abea5c60d301 Mon Sep 17 00:00:00 2001 From: Edmar Moretti Date: Thu, 19 Jun 2008 14:04:56 +0000 Subject: [PATCH] --- admin/php/atlas.php | 17 +++++++++++++---- admin/php/conexaomma.php | 3 ++- admin/php/menutemas.php | 13 ++++++++++--- admin/php/sistemas.php | 4 +++- admin/php/sqlite.php | 2 ++ admin/php/xml.php | 6 +++--- admin/xmlsistemas.php | 25 +++++++++++++++++++++++++ 7 files changed, 58 insertions(+), 12 deletions(-) create mode 100644 admin/xmlsistemas.php diff --git a/admin/php/atlas.php b/admin/php/atlas.php index 21aaa49..27ca034 100644 --- a/admin/php/atlas.php +++ b/admin/php/atlas.php @@ -262,7 +262,11 @@ function importarXmlAtlas() if(!isset($atlasExistentes[$titulo])) $dbhw->query("INSERT INTO i3geoadmin_atlas (desc_atlas,h_atlas,w_atlas,icone_atlas,link_atlas,pranchadefault_atlas,template_atlas,tipoguias_atlas,titulo_atlas) VALUES ('$desc','$h','$w','$icone','$link','$pranchadefault','$template','$tipoguias','$titulo')"); $atlasExistentes[$titulo] = 0; - $id_atlas = $dbh->lastInsertId("id_atlas"); + + $id_atlas = $dbhw->query("SELECT id_atlas FROM i3geoadmin_atlas"); + $id_atlas = $id_atlas->fetchAll(); + $id_atlas = intval($id_atlas[count($id_atlas)-1]['id_atlas']); + foreach ($atlas->PRANCHAS->PRANCHA as $prancha) { $titulo = ixml($prancha,"TITULO"); @@ -271,16 +275,21 @@ function importarXmlAtlas() $link = ixml($prancha,"LINKMAISINFO"); $w = ixml($prancha,"WABERUTRA"); $h = ixml($prancha,"HABERTURA"); + if($w == ""){$w = 'null';} + if($h == ""){$h = 'null';} $mapext = ixml($prancha,"MAPEXT"); - $dbhw->query("INSERT INTO i3geoadmin_atlasp (id_atlas,desc_prancha,h_prancha,w_prancha,icone_prancha,link_prancha,titulo_prancha,mapext_prancha) VALUES ('$id_atlas','$desc','$h','$w','$icone','$link','$titulo','$mapext')"); - $id_prancha = $dbh->lastInsertId("id_prancha"); + $dbhw->query("INSERT INTO i3geoadmin_atlasp (id_atlas,desc_prancha,h_prancha,w_prancha,icone_prancha,link_prancha,titulo_prancha,mapext_prancha) VALUES ('$id_atlas','$desc',$h,$w,'$icone','$link','$titulo','$mapext')"); + + $id_prancha = $dbhw->query("SELECT id_prancha FROM i3geoadmin_atlasp"); + $id_prancha = $id_prancha->fetchAll(); + $id_prancha = intval($id_prancha[count($id_prancha)-1]['id_prancha']); + foreach ($prancha->TEMAS->TEMA as $tema) { $codigo = ixml($tema,"CODIGO"); $ligado = ixml($tema,"LIGADO"); $dbhw->query("INSERT INTO i3geoadmin_atlast (id_prancha,codigo_tema,ligado_tema) VALUES ('$id_prancha','$codigo','$ligado')"); } - } } $dbhw = null; diff --git a/admin/php/conexaomma.php b/admin/php/conexaomma.php index b37fa7a..aeb3e29 100644 --- a/admin/php/conexaomma.php +++ b/admin/php/conexaomma.php @@ -1,3 +1,4 @@ \ No newline at end of file diff --git a/admin/php/menutemas.php b/admin/php/menutemas.php index 432f8ed..929d861 100644 --- a/admin/php/menutemas.php +++ b/admin/php/menutemas.php @@ -413,7 +413,9 @@ function importarXmlMenu() include_once("../../classesphp/funcoes_gerais.php"); include("conexao.php"); $dbhw->query("INSERT INTO i3geoadmin_menus (desc_menu,nome_menu) VALUES ('','$nomemenu')"); - $id_menu = $dbhw->lastInsertId("id_menu"); + $id_menu = $dbhw->query("SELECT id_menu FROM i3geoadmin_menus"); + $id_menu = $id_menu->fetchAll(); + $id_menu = intval($id_menu[count($id_menu)-1]['id_menu']); $xml = simplexml_load_file($xml); // @@ -537,7 +539,10 @@ function importarXmlMenu() $r = $dbhw->query("select id_grupo from i3geoadmin_grupos where nome_grupo = '$gtipo'"); $id_grupo = $r->fetchColumn(); $dbhw->query("INSERT INTO i3geoadmin_n1 (id_menu,id_grupo,n1_perfil) VALUES ('$id_menu','$id_grupo','$n1_perfil')"); - $id_n1 = $dbhw->lastInsertId("id_n1"); + $id_n1 = $dbhw->query("SELECT id_menu FROM i3geoadmin_n1"); + $id_n1 = $id_n1->fetchAll(); + $id_n1 = intval($id_n1[count($id_n1)-1]['id_n1']); + foreach($grupo->TEMA as $tema) { $codigo = ixml($tema,"TID"); @@ -554,7 +559,9 @@ function importarXmlMenu() $id_subgrupo = $r->fetchColumn(); $dbhw->query("INSERT INTO i3geoadmin_n2 (id_n1,id_subgrupo,n2_perfil) VALUES ('$id_n1','$id_subgrupo','$n2_perfil')"); - $id_n2 = $dbhw->lastInsertId("id_n2"); + $id_n2 = $dbhw->query("SELECT id_n2 FROM i3geoadmin_n2"); + $id_n2 = $id_n2->fetchAll(); + $id_n2 = intval($id_n2[count($id_n2)-1]['id_n2']); foreach($subgrupo->TEMA as $tema) { $codigo = ixml($tema,"TID"); diff --git a/admin/php/sistemas.php b/admin/php/sistemas.php index e3de739..26d019c 100644 --- a/admin/php/sistemas.php +++ b/admin/php/sistemas.php @@ -199,7 +199,9 @@ function importarXmlSistemas() if(!isset($sistemasExistentes[$nome])) $dbhw->query("INSERT INTO i3geoadmin_sistemas (nome_sistema,perfil_sistema) VALUES ('$nome','$perfil')"); $sistemasExistentes[$nome] = 0; - $id_sistema = $dbh->lastInsertId("id_sistema"); + $id_sistema = $dbhw->query("SELECT id_sistema FROM i3geoadmin_sistemas"); + $id_sistema = $id_sistema->fetchAll(); + $id_sistema = intval($id_sistema[count($id_sistema)-1]['id_sistema']); foreach ($item->FUNCAO as $funcao) { $abrir_funcao = ixml($funcao,"ABRIR"); diff --git a/admin/php/sqlite.php b/admin/php/sqlite.php index 74afefd..13d789b 100644 --- a/admin/php/sqlite.php +++ b/admin/php/sqlite.php @@ -16,6 +16,8 @@ foreach($resultado as $r) echo $r["sql"]."
"; } echo "

SQL no padrão POSTGRES

"; +echo "

Após criar as tabelas no Postgres, vc deve definir as permissões para os usuários.

"; +echo "

Para usar outro banco de dados que não seja o default (SQLITE), você terá de alterar o programa i3geo/admin/php/conexao.php

"; foreach($resultado as $r) { echo str_ireplace("INTEGER PRIMARY KEY","SERIAL",$r["sql"])."
"; diff --git a/admin/php/xml.php b/admin/php/xml.php index de9c1d2..85c1a92 100644 --- a/admin/php/xml.php +++ b/admin/php/xml.php @@ -328,7 +328,8 @@ function geraXmlAtlas_pegapranchas($xml,$id_atlas,$dbh) } function geraXmlAtlas_pegatemas($xml,$id_prancha,$dbh) { - $q = "select tema.codigo_tema,t.ligado_tema from i3geoadmin_atlast as t,i3geoadmin_temas as tema where tema.id_tema = t.id_tema and t.id_prancha = $id_prancha "; + $q = "select t.codigo_tema,t.ligado_tema from i3geoadmin_atlast as t where t.id_prancha = $id_prancha"; + //echo $q; $qtemas = $dbh->query($q); foreach($qtemas as $row) { @@ -337,7 +338,6 @@ function geraXmlAtlas_pegatemas($xml,$id_prancha,$dbh) $xml .= "".$row["ligado_tema"]."\n"; $xml .= "\n"; } - } function geraXmlSistemas_pegafuncoes($perfil,&$xml,$id_sistema,$dbh) { @@ -356,7 +356,7 @@ function geraXmlSistemas_pegafuncoes($perfil,&$xml,$id_sistema,$dbh) { $xml .= "\n"; $xml .= " ".xmlTexto_prepara($row["nome_funcao"])."\n"; - $xml .= " ".$row["abrir_funcao"]."\n"; + $xml .= " ".xmlTexto_prepara($row["abrir_funcao"])."\n"; $xml .= " ".$row["w_funcao"]."\n"; $xml .= " ".$row["h_funcao"]."\n"; $xml .= " ".$row["perfil_funcao"]."\n"; diff --git a/admin/xmlsistemas.php b/admin/xmlsistemas.php new file mode 100644 index 0000000..98dcbea --- /dev/null +++ b/admin/xmlsistemas.php @@ -0,0 +1,25 @@ + -- libgit2 0.21.2