diff --git a/.settings/.jsdtscope b/.settings/.jsdtscope
index 76c3079..b0601cd 100644
--- a/.settings/.jsdtscope
+++ b/.settings/.jsdtscope
@@ -1,12 +1,97 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
diff --git a/admin/admin.db b/admin/admin.db
index d0ed35e..3abe881 100644
Binary files a/admin/admin.db and b/admin/admin.db differ
diff --git a/admin/php/classe_metaestat.php b/admin/php/classe_metaestat.php
index 096071b..ff8aac1 100755
--- a/admin/php/classe_metaestat.php
+++ b/admin/php/classe_metaestat.php
@@ -285,7 +285,7 @@ class Metaestat{
$rand = $this->nomeRandomico();
$arq = $this->dir_tmp."/".$rand.".map";
$dados[] = "MAP";
- $dados[] = "SYMBOLSET ".$this->locaplic."/symbols/simbolosv6.sym";
+ $dados[] = 'SYMBOLSET "'.$this->locaplic.'/symbols/simbolosv6.sym"';
$dados[] = 'FONTSET "'.$this->locaplic.'/symbols/fontes.txt"';
$dados[] = "LAYER";
$dados[] = ' NAME "'.$rand.'"';
@@ -346,7 +346,7 @@ class Metaestat{
$versao = $versao["principal"];
$f = "";
if (strtoupper(substr(PHP_OS, 0, 3) == 'WIN')){
- $f = $locaplic."/aplicmap/geral1windowsv".$versao.".map";
+ $f = $this->locaplic."/aplicmap/geral1windowsv".$versao.".map";
}
else{
if($f == "" && file_exists('/var/www/i3geo/aplicmap/geral1debianv'.$versao.'.map')){
diff --git a/admin/php/metaestat.php b/admin/php/metaestat.php
index 60c6945..2470197 100644
--- a/admin/php/metaestat.php
+++ b/admin/php/metaestat.php
@@ -767,6 +767,7 @@ switch (strtoupper($funcao))
'dirtmp' => $dir_tmp,
'barSize'=> 5000
);
+
include (__DIR__."/../../pacotes/tme/TME_i3geo.php");
}
exit;
diff --git a/testamapfile.php b/testamapfile.php
index e3a7b73..1f7c273 100644
--- a/testamapfile.php
+++ b/testamapfile.php
@@ -190,6 +190,7 @@ function verifica($map,$solegenda)
}
//echo $base;exit;
$mapa = ms_newMapObj($base);
+
error_reporting(0);
$temasn = $mapa->getAllLayerNames();
foreach ($temasn as $teman)
@@ -210,6 +211,7 @@ function verifica($map,$solegenda)
}
}
}
+
if(!stristr($tema, '.php') === FALSE){
echo "
Arquivo $tema é um programa PHP. O teste pode não funcionar.
";
include_once($locaplic."/".$tema);
@@ -221,8 +223,20 @@ function verifica($map,$solegenda)
eval($pegarext."(\$mapa);");
}
else{
- if(file_exists($mapUrl))
- {$nmapa = ms_newMapObj($mapUrl);}
+ if(file_exists($mapUrl)){
+ if(@ms_newMapObj($mapUrl))
+ {$nmapa = ms_newMapObj($mapUrl);}
+ else{
+ echo "Erro no arquivo $mapUrl
";
+ $error = ms_GetErrorObj();
+ while($error && $error->code != MS_NOERR)
+ {
+ printf("
Error in %s: %s
\n", $error->routine, $error->message);
+ $error = $error->next();
+ }
+ return;
+ }
+ }
else{
if(@ms_newMapObj($locaplic."/".$tema))
{
--
libgit2 0.21.2