--no commit message

Edmar Moretti
1 parent 82af21ac
Showing 2 changed files with 15 additions and 4 deletions Show diff stats
ferramentas/saiku/esquemaxml.php
ferramentas/saiku/saiku-server/tomcat/webapps/ROOT/js/saiku/plugins/CCC_Chart/plugin.js
@@ -121,6 +121,7 @@ $regiao = &quot;&quot;;
 $item = "";
 $registros = "";
 //echo "<pre>";var_dump($regioes);exit;
+
 $xml = "<Schema name='i3Geo Metaestat'>";
 //cria as dimensoes de tipo temporal
 if(empty($saikuConfigDataSource['tabelaDimensaoTempo'])){
@@ -410,8 +411,9 @@ header(&quot;Location:&quot;.$saikuUrl.&quot;/?nomeConexao=&quot;.$nomeConexao.&quot;&amp;locaplic=&quot;.$_GET[&quot;l
 function converte($texto){
 	$texto = str_replace("&","&amp;",htmlentities($texto));
 	//$texto = htmlentities($texto);
-	//$texto = mb_convert_encoding($texto, 'UTF-8', mb_detect_encoding($texto));
+	//$texto = mb_convert_encoding($texto, 'ISO-8859-1', "auto");
 	//$texto = utf8_encode($texto);
+	//$textox = mb_convert_encoding($texto, "UTF-8", mb_detect_encoding($texto, "UTF-8, ISO-8859-1, ISO-8859-15", true));
 	return $texto;
 }
 ?>
@@ -626,7 +626,7 @@ $(this.el).prepend(&quot; | chart process&quot;);
 														this.data.metadata.push({
 																colIndex: 0,
 																colType: "String",
-																colName: firstHeader.join('/')
+																colName: converteHtmlEntities(firstHeader.join('/'))
 														});
 														lowest_level = field - 1;
 												}
@@ -640,7 +640,7 @@ $(this.el).prepend(&quot; | chart process&quot;);
 														this.data.metadata.push({
 																colIndex: field - lowest_level + 1,
 																colType: "Numeric",
-																colName: colheader.join('/')
+																colName: converteHtmlEntities(colheader.join('/'))
 														});
 														data_start = row+1;
@@ -702,4 +702,13 @@ $(this.el).prepend(&quot; | chart process&quot;);
 		}
 });
-
+function converteHtmlEntities(texto){
+	var s = ["á","ã","à","é","í","ó","õ","ú","ç","Á","Ã","À","É","Í","Ó","Õ","Ú","Ç"],
+		e = ["&aacute;","&atilde;","&agrave;","&eacute;","&iacute;","&oacute;","&otilde;","&uacute;","&ccedil;","&Aacute;","&Atilde;","&Agrave;","&Eacute;","&Iacute;","&Oacute;","&Otilde;","&Uacute;","&Ccedil;"],
+		n = e.length,
+		i;
+	for(i=0;i<n;i++){
+		texto = texto.replace(e[i],s[i]);
+	}
+	return texto;
+}