From 620592c942ee5d8f72460a677c22d9ddb13d6fe6 Mon Sep 17 00:00:00 2001
From: edmarmoretti <edmar.moretti@gmail.com>
Date: Thu, 15 Dec 2016 00:32:47 -0200
Subject: [PATCH] Inclusão da opção de teste da tabela de atributos no editor de mapfiles

---
 admin/admin.db                           | Bin 340992 -> 0 bytes
 admin/php/admin.php                      |   4 ++++
 admin/php/login.php                      |   1 +
 admin1/catalogo/mapfile/editor/index.js  |   4 ++++
 admin1/catalogo/mapfile/editor/index.php |   3 +--
 admin1/catalogo/mapfile/teste/exec.php   | 118 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------
 admin1/catalogo/mapfile/teste/index.js   |  25 +++++++++++++++++++++++++
 classesphp/classe_atributos.php          |  19 ++++++++++++++-----
 testamapfile.php                         |   1 +
 9 files changed, 153 insertions(+), 22 deletions(-)

diff --git a/admin/admin.db b/admin/admin.db
index 6efc0c0..0b3c62e 100755
Binary files a/admin/admin.db and b/admin/admin.db differ
diff --git a/admin/php/admin.php b/admin/php/admin.php
index a44c4b3..4a6cc81 100755
--- a/admin/php/admin.php
+++ b/admin/php/admin.php
@@ -47,7 +47,11 @@ error_reporting(0);
 //carrega o phpmapscript
 //
 include_once ($locaplic."/classesphp/carrega_ext.php");
+
 include_once ($locaplic."/classesphp/funcoes_gerais.php");
+
+//TODO sera que isso e necessario?
+
 $mapfile = mapfilebase($base,$locaplic);
 
 //
diff --git a/admin/php/login.php b/admin/php/login.php
index a53bbc1..0bbfd4d 100755
--- a/admin/php/login.php
+++ b/admin/php/login.php
@@ -63,6 +63,7 @@ error_reporting(0);
 //pega as variaveis passadas com get ou post
 //
 include_once(dirname(__FILE__)."/../safe.php");
+
 include_once(dirname(__FILE__)."/admin.php");
 
 //verifica se o login pode ser realizado
diff --git a/admin1/catalogo/mapfile/editor/index.js b/admin1/catalogo/mapfile/editor/index.js
index 0c58ee1..4054521 100755
--- a/admin1/catalogo/mapfile/editor/index.js
+++ b/admin1/catalogo/mapfile/editor/index.js
@@ -35,6 +35,10 @@ i3GEOadmin.editor = {
 		testa: function(codigo){
 			i3GEOadmin.core.modalAguarde(true);
 			i3GEOadmin.teste.testaImg("../../../..",codigo,"","",$("#modalGeral .modal-body"))
+		},
+		testaTabela: function(codigo){
+			i3GEOadmin.core.modalAguarde(true);
+			i3GEOadmin.teste.testaTabela("../../../..",codigo,$("#modalGeral .modal-body"))
 		}
 
 };
\ No newline at end of file
diff --git a/admin1/catalogo/mapfile/editor/index.php b/admin1/catalogo/mapfile/editor/index.php
index af4a380..79bb957 100755
--- a/admin1/catalogo/mapfile/editor/index.php
+++ b/admin1/catalogo/mapfile/editor/index.php
@@ -1,6 +1,5 @@
 <?php
 //TODO botoes de copiar, colar, limpar
-//TODO testa tabela do mapfile em um modal
 //TODO preview com openlayers
 //TODO editor de cores
 //
@@ -53,7 +52,7 @@ $textoMapfile = textoMapfile ( $codigo );
 				<a onclick="i3GEOadmin.editor.preview()" class="btn btn-primary" style="color: #008579;" href="#" role="button"> Preview </a>
 				<a onclick="i3GEOadmin.editor.testa('<?php echo $codigo;?>')" href="javascript:void(0)" class="btn btn-primary" style="color: #008579;" role="button"> {{{testaLayer}}} </a>
 				<a onclick="window.open('../../../../ms_criamapa.php?temasa=<?php echo $codigo;?>&layers=<?php echo $codigo;?>')" class="btn btn-primary" style="color: #008579;" href="javascript:void(0)" role="button"> {{{testarI3geo}}} </a>
-				<a onclick="window.open('../../../../ferramentas/recline/default.php?tema=<?php echo $codigo;?>')" class="btn btn-primary" style="color: #008579;" href="javascript:void(0)" role="button"> {{{tabela}}} </a>
+				<a onclick="i3GEOadmin.editor.testaTabela('<?php echo $codigo;?>')" class="btn btn-primary" style="color: #008579;" href="javascript:void(0)" role="button"> {{{tabela}}} </a>
 			</div>
 			<form action="index.php?codigo=<?php echo $codigo;?>&id_tema=<?php echo $id_tema;?>" method="post">
 				<TEXTAREA id=editor name=texto class="well form-control" style='font-size: 16px; width: 100%; float: left; border: 2px dotted lightgray;'>
diff --git a/admin1/catalogo/mapfile/teste/exec.php b/admin1/catalogo/mapfile/teste/exec.php
index 41583d5..d68de70 100755
--- a/admin1/catalogo/mapfile/teste/exec.php
+++ b/admin1/catalogo/mapfile/teste/exec.php
@@ -28,6 +28,7 @@ error_reporting ( 0 );
 //
 
 include_once (dirname ( __FILE__ ) . "/../../../../admin/php/login.php");
+
 if (verificaOperacaoSessao ( "admin/html/editormapfile" ) === false) {
 	header ( "HTTP/1.1 403 Vc nao pode realizar essa operacao" );
 	exit ();
@@ -45,22 +46,28 @@ if(!file_exists($tema)){
 	header ( "HTTP/1.1 500 erro mapfile nao encontrado" );
 	exit ();
 }
+
 $funcao = strtoupper ( $funcao );
 switch ($funcao) {
 	case "TESTAIMG" :
-		//include($locaplic . "/classesphp/funcoes_gerais.php");
 		$versao = versao();
 		$versao = $versao["principal"];
 		ms_ResetErrorList();
 		$tempo = microtime(true);
-		$retorno = verifica($tema);
+		$retorno = testaMapaImg($tema);
+		retornaJSON ( $retorno );
+		break;
+	case "TESTATABELA" :
+		$versao = versao();
+		$versao = $versao["principal"];
+		ms_ResetErrorList();
+		$tempo = microtime(true);
+		$retorno = testaTabela($tema);
 		retornaJSON ( $retorno );
 		break;
 }
-function verifica($tema){
-	global $locaplic,$postgis_mapa,$versao,$base,$dir_tmp,$tempo;
-
-	if($base == "" or !isset($base)){
+function mapaBase($locaplic,$versao,$base){
+	if($base == "" || !isset($base)){
 		$base = "";
 		if (strtoupper(substr(PHP_OS, 0, 3) == 'WIN')){
 			$base = $locaplic."/aplicmap/geral1windowsv".$versao.".map";
@@ -80,23 +87,104 @@ function verifica($tema){
 			}
 		}
 	}
-	else{
-		if(!file_exists($base)){
-			$base = $locaplic."/aplicmap/".$base;
+	return $base;
+}
+function testaTabela($tema){
+	global $locaplic,$postgis_mapa,$versao,$base,$dir_tmp,$tempo;
+
+	$base = mapaBase($locaplic,$versao,$base);
+
+	$mapa = ms_newMapObj($base);
+	$nmapa = ms_newMapObj($tema);
+	error_reporting(0);
+	ms_ResetErrorList();
+
+	$numlayers = $nmapa->numlayers;
+	$dados = "";
+	for ($i=0;$i < $numlayers;$i++){
+		$layern = $nmapa->getlayer($i);
+		$layern->set("status",MS_DEFAULT);
+		error_reporting(0);
+		if($layern->classitem != "" && $layern->connectiontype == 7 && $layern->numclasses > 0 && $layern->getmetadata("wms_sld_body") == ""){
+			$tipotemp = $layern->type;
+			$tiporep = $layern->getmetadata("tipooriginal");
+			$layern->set("type",MS_LAYER_POLYGON);
+			if ($tiporep == "linear"){
+				$layern->set("type",MS_LAYER_LINE);
+			}
+			if ($tiporep == "pontual"){
+				$layern->set("type",MS_LAYER_POINT);
+			}
+			$sld = $layern->generateSLD();
+			if($sld != ""){
+				$layern->setmetadata("wms_sld_body",str_replace('"',"'",$sld));
+			}
+			$layern->set("type",$tipotemp);
 		}
+		$layerAdicionado = ms_newLayerObj($mapa, $layern);
+		$pegarext = $layern->name;
 	}
-	//echo $base;exit;
+
+	zoomTema($pegarext,$mapa);
+	include_once($locaplic."/classesphp/classe_atributos.php");
+
+	$t = new Atributos($mapa,$layern->name);
+
+	$r = $t->itensTexto();
+	$colunas = explode(";",$r["itens"]);
+
+	$ncolunas = count($colunas);
+	$registros = $r["valores"];
+	$nregistros = count($registros);
+	$error = "";
+	$error = ms_GetErrorObj();
+	$tab = "";
+	while($error && $error->code != MS_NOERR){
+		$tab .= "<br>Error in %s: %s<br>";
+		$tab .= $error->routine;
+		$tab .= $error->message;
+		$error = $error->next();
+	}
+	$tab .= "Registros em ISO-8859-1 s&atilde;o convertidos para UTF8<br>";
+	$tab .= "Registros: ".$nregistros;"<br>";
+	$tab .= "<br><b>Tempo leitura (s): ";
+	$tab .= microtime(true) - $tempo;
+	$tab .= "</b>";
+	$tab .= "<table>";
+	$tab .= "<tr>";
+	foreach($colunas as $co){
+		$tab .= "<td><b>".$co."</b></td>";
+	}
+	$tab .= "</tr>";
+	foreach($registros as $reg){
+		$tab .= "<tr>";
+		$cc = explode(";",$reg);
+		foreach($cc as $c){
+			if (mb_detect_encoding ( $c, 'UTF-8, ISO-8859-1' ) == "ISO-8859-1") {
+				$c = utf8_encode ( $c );
+			}
+			$tab .= "<td>".$c."</td>";
+		}
+		$tab .= "</tr>";
+	}
+	$tab .= "</table>";
+	$tab .= "<br><b>Tempo total (montagem da tabela) (s): ";
+	$tab .= microtime(true) - $tempo;
+	$tab .= "</b>";
+	return $tab;
+}
+function testaMapaImg($tema){
+	global $locaplic,$postgis_mapa,$versao,$base,$dir_tmp,$tempo;
+
+	$base = mapaBase($locaplic,$versao,$base);
 	$mapa = ms_newMapObj($base);
 	error_reporting(0);
 	ms_ResetErrorList();
-
 	try {
 		ms_newMapObj ( $tema );
 	} catch ( Exception $e ) {
 		return array("imgMapa"=>"","imgLegenda"=>"","tempo"=> (microtime(true) - $tempo),"erro"=>"Objeto map nao pode ser criado. Erro fatal.");
 	}
-
-
 	if(@ms_newMapObj($tema)){
 		$nmapa = ms_newMapObj($tema);
 	}
@@ -111,8 +199,8 @@ function verifica($tema){
 		}
 		return array("imgMapa"=>"","imgLegenda"=>"","tempo"=> (microtime(true) - $tempo),"erro"=>$erro);
 	}
-	restauraConObj($mapa,$postgis_mapa);
-	restauraConObj($nmapa,$postgis_mapa);
+	substituiConObj($mapa,$postgis_mapa);
+	substituiConObj($nmapa,$postgis_mapa);
 
 	$numlayers = $nmapa->numlayers;
 	$dados = "";
diff --git a/admin1/catalogo/mapfile/teste/index.js b/admin1/catalogo/mapfile/teste/index.js
index 74df5b4..6adfc67 100755
--- a/admin1/catalogo/mapfile/teste/index.js
+++ b/admin1/catalogo/mapfile/teste/index.js
@@ -58,5 +58,30 @@ i3GEOadmin.teste = {
 			}
 			i3GEOadmin.core.mostraErro(data.status + " " +data.statusText);
 		});
+	},
+	testaTabela: function(locaplic,codigo,onde){
+		if(onde && onde != ""){
+			i3GEOadmin.core.iconeAguarde(onde);
+		}
+		$.post(
+				locaplic+"/admin1/catalogo/mapfile/teste/exec.php?funcao=testaTabela",
+				"codigo=" + codigo
+		)
+		.done(
+				function(data, status){
+					//objeto json com os dados vindos do banco
+					var json = jQuery.parseJSON(data);
+					if(onde && onde != ""){
+						onde.html(json);
+					}
+				}
+		)
+		.fail(function(data){
+			if(onde && onde != ""){
+				onde.html("");
+			}
+
+			i3GEOadmin.core.mostraErro(data.status + " " +data.statusText);
+		});
 	}
 };
\ No newline at end of file
diff --git a/classesphp/classe_atributos.php b/classesphp/classe_atributos.php
index 490b380..ef3fcd6 100755
--- a/classesphp/classe_atributos.php
+++ b/classesphp/classe_atributos.php
@@ -90,7 +90,7 @@ class Atributos
 
 	parameters:
 
-	$map_file - Endere&ccedil;o do mapfile no servidor.
+	$map_file - Endere&ccedil;o do mapfile no servidor ou objeto mapObj.
 
 	$tema - nome do tema
 
@@ -113,12 +113,19 @@ class Atributos
 		$this->v = versao();
 		$this->v = $this->v["principal"];
 		if($map_file != ""){
-			$this->qyfile = str_replace(".map",".qy",$map_file);
+
 			$this->locaplic = $locaplic;
-			$this->mapa = ms_newMapObj($map_file);
+			if(is_string($map_file)){
+				$this->mapa = ms_newMapObj($map_file);
+				$this->arquivo = str_replace(".map","",$map_file).".map";
+				$this->qyfile = str_replace(".map",".qy",$map_file);
+			}
+			else {
+				$this->mapa = $map_file;
+				$this->arquivo = "";
+			}
 			substituiConObj($this->mapa,$postgis_mapa);
 
-			$this->arquivo = str_replace(".map","",$map_file).".map";
 			if($tema != "" && @$this->mapa->getlayerbyname($tema))
 			{
 				$this->layer = $this->mapa->getlayerbyname($tema);
@@ -147,7 +154,9 @@ class Atributos
 			$this->mapa->setProjection($this->projO);
 		}
 		restauraConObj($this->mapa,$this->postgis_mapa);
-		$this->mapa->save($this->arquivo);
+		if($this->arquivo != ""){
+			$this->mapa->save($this->arquivo);
+		}
 	}
 
 	/*
diff --git a/testamapfile.php b/testamapfile.php
index cef4b3c..048ebcf 100755
--- a/testamapfile.php
+++ b/testamapfile.php
@@ -1,4 +1,5 @@
 <?php
+echo "Depreciado na versao 7";exit;
 /*
 Testa um mapfile
 
--
libgit2 0.21.2