From 4d4ed2df31641a6b22af3a88fbf83cf77899e758 Mon Sep 17 00:00:00 2001
From: Edmar Moretti <edmar.moretti@gmail.com>
Date: Fri, 1 Mar 2013 03:07:44 +0000
Subject: [PATCH] 

---
 admin/admin.db                           | Bin 197632 -> 0 bytes
 admin/js/estat_editor.js                 |  5 +++--
 admin/php/metaestat_uploadshp_submit.php | 17 ++++++++++-------
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/admin/admin.db b/admin/admin.db
index f26a8d7..972c6d7 100644
Binary files a/admin/admin.db and b/admin/admin.db differ
diff --git a/admin/js/estat_editor.js b/admin/js/estat_editor.js
index 6d0e900..37d2688 100644
--- a/admin/js/estat_editor.js
+++ b/admin/js/estat_editor.js
@@ -423,11 +423,12 @@ i3GEOadmin.editor = {
 		},
 		formulario: function(){
 			var ins = '<fieldset><form id=i3GEOuploadf target="i3GEOuploadiframe" action="../php/metaestat_uploadshp_submit.php" method="post" ENCTYPE="multipart/form-data">' +
+			'<p class="paragrafo" >Ap&oacute;s terminar o processo, atualize essa p&aacute;gina</p>' +
 			'<p class="paragrafo" >shp: <br><input class=digitar type="file" size=22 name="i3GEOuploadshp" style="top:0px;left:0px;cursor:pointer;"></p>' +
 			'<p class="paragrafo" >shx: <br><input class=digitar type="file" size=22 name="i3GEOuploadshx" style="top:0px;left:0px;cursor:pointer;"></p>' +
 			'<p class="paragrafo" >dbf: <br><input class=digitar type="file" size=22 name="i3GEOuploaddbf" style="top:0px;left:0px;cursor:pointer;"></p>' +
 			'<p class="paragrafo" >Nome da nova tabela:<br><input class=digitar type="text" size=20 id="tabelaDestino" name="tabelaDestino" style="top:0px;left:0px;cursor:pointer;"></p>' +
-			'<p class="paragrafo" >C&oacute;digo da proje&ccedil;&atilde;o (SRID):<br><input class=digitar type="text" value="4326" size=20 id="srid" name="srid" style="top:0px;left:0px;cursor:pointer;"></p>' +
+			'<p class="paragrafo" >C&oacute;digo da proje&ccedil;&atilde;o (SRID) Assegure-se que o shapefile esteja na proje&ccedil;&atilde;o geogr&aacute;fica se voc&ecirc; for usar com o sistema de metadados estat&iacute;sticos :<br><input class=digitar type="text" value="4326" size=20 id="srid" name="srid" style="top:0px;left:0px;cursor:pointer;"></p>' +
 
 			'<p class="paragrafo" ><input id=i3GEOuploadsubmit type="button" value="Enviar" size=12 />' +
 			'<input type="hidden" name="MAX_FILE_SIZE" value="1000000">' +
@@ -435,7 +436,7 @@ i3GEOadmin.editor = {
 			'<input type="hidden" id="i3GEOuploadesquema" name="i3GEOuploadesquema" value="">' +
 			'</form>' +
 			"<p class='paragrafo' style=color:red >N&atilde;o utilize '_' no nome do arquivo. Apenas letras e n&uacute;meros s&atilde;o aceitos!!!</p>" +
-			'<iframe name=i3GEOuploadiframe style="text-align:left;border:1px solid gray;" width="98%" height="60px"></iframe></fieldset>';
+			'<iframe name=i3GEOuploadiframe style="text-align:left;border:1px solid gray;" width="98%" height="400px"></iframe></fieldset>';
 			return ins;
 		},
 		submit: function(){
diff --git a/admin/php/metaestat_uploadshp_submit.php b/admin/php/metaestat_uploadshp_submit.php
index 1c08424..65cae7d 100755
--- a/admin/php/metaestat_uploadshp_submit.php
+++ b/admin/php/metaestat_uploadshp_submit.php
@@ -69,18 +69,20 @@ if (isset($_FILES['i3GEOuploadshp']['name'])){
 	$layer = ms_newLayerObj($mapObj);
 	$layer->set("data",$arqshp);
 	$layer->open();
-	$colunas = $layer->getItems();
-
+	$colunasTemp = $layer->getItems();
+	$colunas = array();
+	foreach($colunasTemp as $c){
+		if(!is_numeric($c)){
+			$colunas[] = $c;
+		}
+	}
+	
 	echo "<br>Numshapes: ". $numshapes;
 	$tipo = $shapefileObj->type;
 	echo "<br>Tipo: ". $tipo;
 	echo "<br>Colunas: ";
 	var_dump($colunas);
-
 	$sqinsert = array();
-
-
-
 	//verifica o tipo de coluna
 	$tipoColuna = array();
 	if($numshapes < 10){
@@ -140,6 +142,7 @@ if (isset($_FILES['i3GEOuploadshp']['name'])){
 	} catch (PDOException $e) {
 		echo 'Connection failed: ' . $e->getMessage();
 	}
+	
 	foreach($sqltabela as $linha){
 		try {
 			$dbh->query($linha);
@@ -154,7 +157,7 @@ if (isset($_FILES['i3GEOuploadshp']['name'])){
 			echo 'Erro: ' . $e->getMessage();
 		}
 	}
-	echo "<br>Feito!!!";
+	echo "<br>Feito!!!<br>Fa&ccedil;a o reload da p&aacute;gina";
 }
 else{
 	echo "<p class='paragrafo' >Erro ao enviar o arquivo. Talvez o tamanho do arquivo seja maior do que o permitido.</p>";
--
libgit2 0.21.2