Download as
Browse Code »

Commit 610bee1cc42d113f1cbbff44d06c5c879a843774

Authored by Edmar Moretti
1 parent 5d8b2f91
Exists in master and in 7 other branches composer, doc-root, docker, guia, licenca, readme, unmaintened

corrige o upload de csv no sistema de metadados estatisticos

Showing 5 changed files with 20 additions and 8 deletions   Show diff stats
admin/admin.db
View file @610bee1
No preview for this file type
admin/html/estat_uploaddados.html
  Diff comments   View file @610bee1
@@ -61,7 +61,7 @@ body { @@ -61,7 +61,7 @@ body {
61 </form> 61 </form>
62 <br> 62 <br>
63 <div id="i3GEOadminEditorColunas" style="left: -5px;"></div> 63 <div id="i3GEOadminEditorColunas" style="left: -5px;"></div>
64 - <iframe id="i3GEOuploadiframe" name="i3GEOuploadiframe" src="#" style="width:0;height:0;border:0px solid #fff;"></iframe> 64 + <iframe id="i3GEOuploadiframe" name="i3GEOuploadiframe" src="#" style="width:300;height:400;border:0px solid #fff;"></iframe>
65 </fieldset> 65 </fieldset>
66 </div> 66 </div>
67 </div> 67 </div>
admin/js/editormapfile.js
  Diff comments   View file @610bee1
@@ -673,6 +673,7 @@ function adicionaNovoMapfile() @@ -673,6 +673,7 @@ function adicionaNovoMapfile()
673 metaestat = $i("Emetaestat").value; 673 metaestat = $i("Emetaestat").value;
674 if(codigo === "") 674 if(codigo === "")
675 {alert("Digite o nome do arquivo");return;} 675 {alert("Digite o nome do arquivo");return;}
  676 + codigo = codigo.toLowerCase();
676 sUrl = "../php/editormapfile.php?funcao=criarNovoMap&nome="+nome+"&codigo="+codigo+"&it="+it+"&en="+en+"&es="+es+"&metaestat="+metaestat; 677 sUrl = "../php/editormapfile.php?funcao=criarNovoMap&nome="+nome+"&codigo="+codigo+"&it="+it+"&en="+en+"&es="+es+"&metaestat="+metaestat;
677 core_carregando("ativa"); 678 core_carregando("ativa");
678 core_carregando(" adicionando um novo mapfile"); 679 core_carregando(" adicionando um novo mapfile");
admin/js/estat_uploaddados.js
  Diff comments   View file @610bee1
@@ -22,7 +22,7 @@ i3GEOadmin.uploaddados = { @@ -22,7 +22,7 @@ i3GEOadmin.uploaddados = {
22 }, 22 },
23 comboColunas: function(id){ 23 comboColunas: function(id){
24 var i=0, 24 var i=0,
25 - c = i3GEOadmin.uploaddados.COLUNASARQUIVO.split(";"), 25 + c = i3GEOadmin.uploaddados.COLUNASARQUIVO.split(","),
26 n = c.length, 26 n = c.length,
27 ins = "<select id='"+id+"'><option value='' >---</option>"; 27 ins = "<select id='"+id+"'><option value='' >---</option>";
28 for(i=0;i<n;i++){ 28 for(i=0;i<n;i++){
admin/php/metaestat_uploaddados_submit.php
  Diff comments   View file @610bee1
1 <?php 1 <?php
2 $colunasarquivo = ""; 2 $colunasarquivo = "";
3 $nomearquivoserv = ""; 3 $nomearquivoserv = "";
4 -//var_dump($_FILES); 4 +error_reporting(E_ALL);
5 if (isset($_FILES['i3GEOuploadArquivo']['name'])) 5 if (isset($_FILES['i3GEOuploadArquivo']['name']))
6 { 6 {
7 require_once (__DIR__."/../../ms_configura.php"); 7 require_once (__DIR__."/../../ms_configura.php");
8 $Arquivoup = $_FILES['i3GEOuploadArquivo']['tmp_name']; 8 $Arquivoup = $_FILES['i3GEOuploadArquivo']['tmp_name'];
9 - $nomearquivoserv = $dir_tmp."/upload".basename($Arquivoup); 9 + $nomearquivoserv = $dir_tmp."/upload".basename($Arquivoup);
  10 + //echo $nomearquivoserv;
10 if(file_exists($nomearquivoserv)){ 11 if(file_exists($nomearquivoserv)){
11 unlink($nomearquivoserv); 12 unlink($nomearquivoserv);
12 } 13 }
@@ -17,16 +18,26 @@ if (isset($_FILES[&#39;i3GEOuploadArquivo&#39;][&#39;name&#39;])) @@ -17,16 +18,26 @@ if (isset($_FILES[&#39;i3GEOuploadArquivo&#39;][&#39;name&#39;]))
17 $buffer = str_replace('"','',$buffer); 18 $buffer = str_replace('"','',$buffer);
18 $buffer = str_replace("'",'',$buffer); 19 $buffer = str_replace("'",'',$buffer);
19 $buffer = str_replace("\n",'',$buffer); 20 $buffer = str_replace("\n",'',$buffer);
  21 + $buffer = str_replace("\r",'',$buffer);
20 $colunas = explode(";",$buffer); 22 $colunas = explode(";",$buffer);
21 if(count($colunas) == 1){ 23 if(count($colunas) == 1){
22 $colunas = explode(",",$buffer); 24 $colunas = explode(",",$buffer);
23 } 25 }
24 - $colunasarquivo = implode(";",$colunas); 26 + //var_dump($colunas);
  27 + $colunasarquivo = implode(",",$colunas);
25 } 28 }
26 } 29 }
  30 +//echo $colunasarquivo;
  31 +//$colunasarquivo = "ano,codigoregiao,dia,gid,hora,id_medida_variavel,mes,valor_int,valor_num,valor_txt ";
27 ?> 32 ?>
  33 +<html>
28 <script> 34 <script>
29 -window.parent.i3GEOadmin.uploaddados.COLUNASARQUIVO = "<?php echo $colunasarquivo;?>";  
30 -window.parent.i3GEOadmin.uploaddados.NOMEARQUIVOSERV = "<?php echo $nomearquivoserv;?>"; 35 +
  36 +<?php echo "c = '$colunasarquivo';";?>
  37 +<?php echo "d = '$nomearquivoserv';";?>
  38 +window.parent.i3GEOadmin.uploaddados.COLUNASARQUIVO = c;
  39 +window.parent.i3GEOadmin.uploaddados.NOMEARQUIVOSERV = d;
31 window.parent.i3GEOadmin.uploaddados.upload.fimsubmit(); 40 window.parent.i3GEOadmin.uploaddados.upload.fimsubmit();
32 -</script>  
33 \ No newline at end of file 41 \ No newline at end of file
  42 +
  43 +</script>
  44 +</html>
34 \ No newline at end of file 45 \ No newline at end of file