From b2b09eddc696b6706417e02401c92dad86a9022d Mon Sep 17 00:00:00 2001
From: edmarmoretti <edmar.moretti@gmail.com>
Date: Wed, 26 Jul 2017 11:52:09 -0300
Subject: [PATCH] Modificada a rotina de criação de um novo mapfile para indicar como default o valor SIM para o metadata convcaracter

---
 admin/admin.db                      | Bin 340992 -> 0 bytes
 admin1/catalogo/mapfile/funcoes.php | 1 +
 admin1/upload/arquivo/index.php     | 2 +-
 classesphp/classe_atributos.php     | 1 -
 classesphp/mapa_controle.php        | 2 +-
 ms_configura.php                    | 4 ++--
 6 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/admin/admin.db b/admin/admin.db
index e5c5310..476e89f 100755
Binary files a/admin/admin.db and b/admin/admin.db differ
diff --git a/admin1/catalogo/mapfile/funcoes.php b/admin1/catalogo/mapfile/funcoes.php
index e2ba858..32191ea 100755
--- a/admin1/catalogo/mapfile/funcoes.php
+++ b/admin1/catalogo/mapfile/funcoes.php
@@ -139,6 +139,7 @@ function adicionar($locaplic, $titulolegenda, $link_tema, $codigo, $acessopublic
 	$dados [] = '	STATUS DEFAULT';
 	$dados [] = '	METADATA';
 	$dados [] = '		TEMA "' . $titulolegenda . '"';
+	$dados [] = '		convcaracter "SIM"';
 	$dados [] = '		CLASSE "SIM"';
 	$tipoa_tema = "";
 	if (! empty ( $metaestat ) && $metaestat == "SIM") {
diff --git a/admin1/upload/arquivo/index.php b/admin1/upload/arquivo/index.php
index 989abff..0635639 100755
--- a/admin1/upload/arquivo/index.php
+++ b/admin1/upload/arquivo/index.php
@@ -144,7 +144,7 @@ $comboPastas .= "</select>";
 	</div>
 </div>
 <?php
-if (empty ( $_SESSION ["i3geoUploadDataWL"] )) {
+if (empty ( $_SESSION ["i3geoUploadDataWL"] ) || (is_array($_SESSION ["i3geoUploadDataWL"]) && count($_SESSION ["i3geoUploadDataWL"]) == 0)) {
 	echo "<script>iniciaMenuPrincipal();i3GEOadmin.core.mostraErro('Nenhuma pasta cadastrada para upload nas configura&ccedil;&otilde;es do i3Geo (ms_configura)');</script>";
 	exit ();
 }
diff --git a/classesphp/classe_atributos.php b/classesphp/classe_atributos.php
index 3e7118a..e5152eb 100755
--- a/classesphp/classe_atributos.php
+++ b/classesphp/classe_atributos.php
@@ -523,7 +523,6 @@ class Atributos
 						$indx  = $result->shapeindex;
 						$shape = $this->layer->getfeature($indx,-1);
 					}
-
 					foreach ($items as $item){
 						$valori = "";
 						if(@$shape->values[$item]){
diff --git a/classesphp/mapa_controle.php b/classesphp/mapa_controle.php
index c345b6b..e6e0c4f 100755
--- a/classesphp/mapa_controle.php
+++ b/classesphp/mapa_controle.php
@@ -2127,9 +2127,9 @@ switch (strtoupper($funcao))
 				}
 			}
 		}
-
 		$retorno = $m->listaRegistros($itemtema,$tipo,$unico,$inicio,$fim,$tipolista,$dadosDaClasse);
 		$retorno["legenda"] = $legenda;
+
 		break;
 		/*
 		 Valor: LISTAUNICA
diff --git a/ms_configura.php b/ms_configura.php
index f2ffb44..87f294b 100755
--- a/ms_configura.php
+++ b/ms_configura.php
@@ -132,7 +132,7 @@ $logTransacoes = false;
  Tipo:
  {array}
 */
-$i3geoEsquemasWL = array("public","i3geo_metaestat");
+$i3geoEsquemasWL = array();
 /*
  Variale: $i3geoUploadDataWL
 
@@ -160,7 +160,7 @@ $i3geoEsquemasWL = array("public","i3geo_metaestat");
  Tipo:
  {array}
  */
-$i3geoUploadDataWL = array("public","i3geo_metaestat");
+$i3geoUploadDataWL = array();
 
 //TODO documentar moodle
 /*
--
libgit2 0.21.2