From c63ce0d73eb1c14e004a3b1701148d8b17c23479 Mon Sep 17 00:00:00 2001
From: Edmar Moretti <edmar.moretti@gmail.com>
Date: Fri, 18 Nov 2011 02:00:03 +0000
Subject: [PATCH] 

---
 admin/admin.db                                 | Bin 75776 -> 0 bytes
 admin/html/ogcws.html                          |  2 ++
 admin/index.html                               |  2 +-
 admin/js/ogcws.js                              |  1 +
 admin/php/incluiMAP.php                        | 22 +++++++++++++++-------
 admin/php/ogcws.php                            |  1 +
 ferramentas/planosmanejoflorestal/pesquisa.htm |  4 ++--
 7 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/admin/admin.db b/admin/admin.db
index 2c62c1b..bd90b87 100644
Binary files a/admin/admin.db and b/admin/admin.db differ
diff --git a/admin/html/ogcws.html b/admin/html/ogcws.html
index f93a73f..6d982f2 100644
--- a/admin/html/ogcws.html
+++ b/admin/html/ogcws.html
@@ -29,6 +29,8 @@
 	<div class="ft"></div>
 </div>
 </div>
+<p>Parâmetros obtidos do mapfile:</p>
+<b><div id=mapfile style=color:navy ></div></b><br>
 <br>
 <div id="tabela" style="left:-5px;"></div>
 <script>
diff --git a/admin/index.html b/admin/index.html
index e0bd169..52ad489 100644
--- a/admin/index.html
+++ b/admin/index.html
@@ -202,7 +202,7 @@ essa cria&ccedil;&atilde;o podem ser obtidos no item "Outras op&ccedil;ões".</p>
 <table class=lista1 >
 <tr onclick="abre('html/incluimap.html')"><td><div class=aplicar ></div></td><td>Ajusta mapfiles</td></tr>
 <tr onclick="abre('php/estatisticas.php')"><td><div class=aplicar ></div></td><td>Estat&iacute;sticas</td></tr>
-<tr onclick="abre('php/upgradebanco44_45.php')"><td><div class=aplicar ></div></td><td>Adiciona as tabelas necessárias à versão 4.5 do i3Geo e que não existiam nas vesões anteriores</td></tr>
+<tr onclick="abre('php/upgradebanco44_45.php')"><td><div class=aplicar ></div></td><td>Adiciona as tabelas e colunas necessárias à versão atual do i3Geo e que não existiam nas versões anteriores</td></tr>
 
 <tr onclick="abre('php/sqlite.php')"><td><div class=aplicar ></div></td><td>Descri&ccedil;&atilde;o do banco padr&atilde;o (SQLITE)</td></tr>
 <tr onclick="abre('php/criabanco.php')"><td><div class=aplicar ></div></td><td>Criar banco de dados</td></tr>
diff --git a/admin/js/ogcws.js b/admin/js/ogcws.js
index 6b99a14..bc0ae2d 100644
--- a/admin/js/ogcws.js
+++ b/admin/js/ogcws.js
@@ -124,6 +124,7 @@ function initMenu()
 }
 function pegaParametros(retorno)
 {
+	$i("mapfile").innerHTML = retorno.mapfile;
 	var ins = ""
 	for (i=0;i<$parametros.simples.length;i++)
 	{
diff --git a/admin/php/incluiMAP.php b/admin/php/incluiMAP.php
index 115b765..1eed763 100644
--- a/admin/php/incluiMAP.php
+++ b/admin/php/incluiMAP.php
@@ -56,6 +56,7 @@ if (is_dir($locaplic."/temas"))
 echo "Arquivos convertidos: <br>";
 foreach($arquivos as $arquivo)
 {
+	$mapExiste = false;
 	$arq = $locaplic."/temas/".$arquivo;
 	$abre = fopen($arq, "r");
 	$maparray = array();
@@ -69,19 +70,26 @@ foreach($arquivos as $arquivo)
 		{
 			$maparray[] = $buffer;
 		}
+		else
+		{$mapExiste = true;}
 	}
 	fclose($abre);
 	//echo "<pre>";
 	//var_dump($maparray);
 	//exit;
-	$abre = fopen($arq, "wt");
-	foreach($maparray as $linha)
-	{
-		fwrite ($abre,$linha);
-		fwrite ($abre,"\n");
+	if($mapExiste == true){
+		echo "MAP já existe em ".$arquivo."<br>";
+	}
+	else{
+		$abre = fopen($arq, "wt");
+		foreach($maparray as $linha)
+		{
+			fwrite ($abre,$linha);
+			fwrite ($abre,"\n");
+		}
+		$fecha = fclose ($abre);
+		echo $arquivo."<br>";
 	}
-	$fecha = fclose ($abre);
-	echo $arquivo."<br>";
 }
 
 ?>
\ No newline at end of file
diff --git a/admin/php/ogcws.php b/admin/php/ogcws.php
index 7130979..a9c3e1b 100644
--- a/admin/php/ogcws.php
+++ b/admin/php/ogcws.php
@@ -86,6 +86,7 @@ switch (strtoupper($funcao))
 		{
 			$par[$v] = utf8_encode($web->metadata->get($v));
 		}
+		$par["mapfile"] = $map_file;
 		retornaJSON($par);
 		exit;
 	break;
diff --git a/ferramentas/planosmanejoflorestal/pesquisa.htm b/ferramentas/planosmanejoflorestal/pesquisa.htm
index d11c62b..0a41ae3 100644
--- a/ferramentas/planosmanejoflorestal/pesquisa.htm
+++ b/ferramentas/planosmanejoflorestal/pesquisa.htm
@@ -95,7 +95,7 @@ Planos de manejo florestal cadastrados no IBAMA. <a href="http://www.mma.gov.br/
 </form>
 <DIV id=ResultadoPesquisa></DIV>
 <script type="text/javascript" >
-g_sid = window.parent.g_sid
+g_sid = window.parent.i3GEO.configura.sid
 function executa()
 {
 	parametros = "&uf="+document.frmPlanoDeManejo.cboEstado[document.frmPlanoDeManejo.cboEstado.selectedIndex].value; 
@@ -117,7 +117,7 @@ function listaretornof(retorno)
 	if (retorno.data != "erro")
 	{
 		document.getElementById("ResultadoPesquisa").innerHTML = "<b>Mapa criado!"
-		window.parent.remapaf()
+		window.parent.i3GEO.atualiza();
 	}
 	else
 	{document.getElementById("ResultadoPesquisa").innerHTML = "<b>Erro. O mapa não pode ser criado!"}
--
libgit2 0.21.2