Download as
Browse Code »

Commit 1057f2b452b6d7b34f072d117c30a9477e1434ed

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

--no commit message

Showing 8 changed files with 1133 additions and 967 deletions   Show diff stats
admin/admin.db
View file @1057f2b
No preview for this file type
admin/js/estat_variavel.js
  Diff comments   View file @1057f2b
@@ -164,11 +164,11 @@ function adicionaNosMedidas(no,dados,redesenha) @@ -164,11 +164,11 @@ function adicionaNosMedidas(no,dados,redesenha)
164 {currentIconMode = newVal;} 164 {currentIconMode = newVal;}
165 } 165 }
166 function loadNodeData(node, fnLoadComplete){ 166 function loadNodeData(node, fnLoadComplete){
167 - var sUrl = "../php/metaestat.php?funcao=listaDimensao&id_medida_variavel="+node.data.no_dimensoes, 167 + var sUrl = "../php/metaestat.php?funcao=listaParametro&id_medida_variavel="+node.data.no_parametros,
168 callback = { 168 callback = {
169 success: function(oResponse){ 169 success: function(oResponse){
170 var dados = YAHOO.lang.JSON.parse(oResponse.responseText); 170 var dados = YAHOO.lang.JSON.parse(oResponse.responseText);
171 - adicionaNosDimensao(node,dados,false); 171 + adicionaNosParametro(node,dados,false);
172 oResponse.argument.fnLoadComplete(); 172 oResponse.argument.fnLoadComplete();
173 }, 173 },
174 failure: function(oResponse){ 174 failure: function(oResponse){
@@ -264,8 +264,8 @@ function adicionaNosMedidas(no,dados,redesenha) @@ -264,8 +264,8 @@ function adicionaNosMedidas(no,dados,redesenha)
264 tempNode1 = new YAHOO.widget.HTMLNode(d, no, false,true); 264 tempNode1 = new YAHOO.widget.HTMLNode(d, no, false,true);
265 tempNode1.isLeaf = false; 265 tempNode1.isLeaf = false;
266 //tempNode1.setDynamicLoad(temp, 1); 266 //tempNode1.setDynamicLoad(temp, 1);
267 - conteudo = " Dimensões";  
268 - d = {html:conteudo,no_dimensoes:dados[i].id_medida_variavel}; 267 + conteudo = " Parâmetros";
  268 + d = {html:conteudo,no_parametros:dados[i].id_medida_variavel};
269 tempNode2 = new YAHOO.widget.HTMLNode(d, tempNode1, false,true); 269 tempNode2 = new YAHOO.widget.HTMLNode(d, tempNode1, false,true);
270 tempNode2.isLeaf = false; 270 tempNode2.isLeaf = false;
271 tempNode2.setDynamicLoad(loadNodeData, 1); 271 tempNode2.setDynamicLoad(loadNodeData, 1);
@@ -289,11 +289,11 @@ function adicionaNosMedidas(no,dados,redesenha) @@ -289,11 +289,11 @@ function adicionaNosMedidas(no,dados,redesenha)
289 if(redesenha){tree.draw();} 289 if(redesenha){tree.draw();}
290 } 290 }
291 /* 291 /*
292 -Function: adicionaNosDimensao 292 +Function: adicionaNosParametro
293 293
294 -Mostra os nós de uma dimensao 294 +Mostra os nós de uma parametro
295 */ 295 */
296 -function adicionaNosDimensao(no,dados,redesenha){ 296 +function adicionaNosParametro(no,dados,redesenha){
297 var tempNode,i,j,conteudo,d; 297 var tempNode,i,j,conteudo,d;
298 function temaIconMode() { 298 function temaIconMode() {
299 var newVal = parseInt(this.value); 299 var newVal = parseInt(this.value);
@@ -303,7 +303,7 @@ function adicionaNosDimensao(no,dados,redesenha){ @@ -303,7 +303,7 @@ function adicionaNosDimensao(no,dados,redesenha){
303 if(!redesenha) { 303 if(!redesenha) {
304 tempNode = new YAHOO.widget.HTMLNode( 304 tempNode = new YAHOO.widget.HTMLNode(
305 { 305 {
306 - html:"<span style=\"cursor:pointer;\" onclick=\"adicionarDimensaoMedida('"+no.data.no_dimensoes+"')\" ><img style=\"position:relative;top:2px\" src=\"../imagens/05.png\" /><i>Adicionar nova dimens&atilde;o</i></span>" 306 + html:"<span style=\"cursor:pointer;\" onclick=\"adicionarParametroMedida('"+no.data.no_parametros+"')\" ><img style=\"position:relative;top:2px\" src=\"../imagens/05.png\" /><i>Adicionar novo par&acirc;metro</i></span>"
307 }, 307 },
308 no, 308 no,
309 false, 309 false,
@@ -312,13 +312,13 @@ function adicionaNosDimensao(no,dados,redesenha){ @@ -312,13 +312,13 @@ function adicionaNosDimensao(no,dados,redesenha){
312 tempNode.isLeaf = true; 312 tempNode.isLeaf = true;
313 } 313 }
314 for (i=0, j=dados.length; i<j; i++) { 314 for (i=0, j=dados.length; i<j; i++) {
315 - conteudo = "&nbsp;<img style=\"position:relative;cursor:pointer;top:0px\" onclick=\"excluir('dimensaoMedida','"+dados[i].id_dimensao_medida+"')\" title=excluir width='10px' heigth='10px' src=\"../imagens/01.png\" />";  
316 - conteudo += "&nbsp;<img style=\"position:relative;cursor:pointer;top:2px\" onclick=\"editar('dimensaoMedida','"+dados[i].id_dimensao_medida+"')\" title=editar src=\"../imagens/06.png\" /><b>";  
317 - if(dados[i].nomedimensao != "")  
318 - {conteudo += "&nbsp;<span><b>"+dados[i].nomedimensao+"</b><span style=color:gray > - "+dados[i].descricao+" id: "+dados[i].id_dimensao_medida+"</span></span>";} 315 + conteudo = "&nbsp;<img style=\"position:relative;cursor:pointer;top:0px\" onclick=\"excluir('parametroMedida','"+dados[i].id_parametro_medida+"')\" title=excluir width='10px' heigth='10px' src=\"../imagens/01.png\" />";
  316 + conteudo += "&nbsp;<img style=\"position:relative;cursor:pointer;top:2px\" onclick=\"editar('parametroMedida','"+dados[i].id_parametro_medida+"')\" title=editar src=\"../imagens/06.png\" /><b>";
  317 + if(dados[i].nome != "")
  318 + {conteudo += "&nbsp;<span><b>"+dados[i].nome+"</b><span style=color:gray > - "+dados[i].descricao+" id: "+dados[i].id_parametro_medida+"</span></span>";}
319 else 319 else
320 {conteudo += "&nbsp;<span style=color:red >Edite para definir a nova medida!!!</span>";} 320 {conteudo += "&nbsp;<span style=color:red >Edite para definir a nova medida!!!</span>";}
321 - d = {html:conteudo,id_dimensao_medida:dados[i].id_dimensao_medida,tipo:"dimensao"}; 321 + d = {html:conteudo,id_parametro_medida:dados[i].id_parametro_medida,tipo:"parametro"};
322 tempNode = new YAHOO.widget.HTMLNode(d, no, false,true); 322 tempNode = new YAHOO.widget.HTMLNode(d, no, false,true);
323 tempNode.isLeaf = true; 323 tempNode.isLeaf = true;
324 } 324 }
@@ -327,7 +327,7 @@ function adicionaNosDimensao(no,dados,redesenha){ @@ -327,7 +327,7 @@ function adicionaNosDimensao(no,dados,redesenha){
327 /* 327 /*
328 Function: adicionaNosClassificacao 328 Function: adicionaNosClassificacao
329 329
330 -Mostra os nós de uma dimensao 330 +Mostra os nós de um parametro
331 */ 331 */
332 function adicionaNosClassificacao(no,dados,redesenha){ 332 function adicionaNosClassificacao(no,dados,redesenha){
333 var tempNode,i,j,conteudo,d; 333 var tempNode,i,j,conteudo,d;
@@ -369,7 +369,7 @@ function adicionaNosClassificacao(no,dados,redesenha){ @@ -369,7 +369,7 @@ function adicionaNosClassificacao(no,dados,redesenha){
369 for (i=0, j=dados.length; i<j; i++) { 369 for (i=0, j=dados.length; i<j; i++) {
370 conteudo = "&nbsp;<img style=\"position:relative;cursor:pointer;top:0px\" onclick=\"excluir('classificacaoMedida','"+dados[i].id_classificacao+"')\" title=excluir width='10px' heigth='10px' src=\"../imagens/01.png\" />"; 370 conteudo = "&nbsp;<img style=\"position:relative;cursor:pointer;top:0px\" onclick=\"excluir('classificacaoMedida','"+dados[i].id_classificacao+"')\" title=excluir width='10px' heigth='10px' src=\"../imagens/01.png\" />";
371 conteudo += "&nbsp;<img style=\"position:relative;cursor:pointer;top:2px\" onclick=\"editar('classificacaoMedida','"+dados[i].id_classificacao+"')\" title=editar src=\"../imagens/06.png\" /><b>"; 371 conteudo += "&nbsp;<img style=\"position:relative;cursor:pointer;top:2px\" onclick=\"editar('classificacaoMedida','"+dados[i].id_classificacao+"')\" title=editar src=\"../imagens/06.png\" /><b>";
372 - if(dados[i].nomedimensao != "") 372 + if(dados[i].nome != "")
373 {conteudo += "&nbsp;<span><b>"+dados[i].nome+"</b><span style=color:gray > Obs.: "+dados[i].observacao+" id: "+dados[i].id_classificacao+"</span></span>";} 373 {conteudo += "&nbsp;<span><b>"+dados[i].nome+"</b><span style=color:gray > Obs.: "+dados[i].observacao+" id: "+dados[i].id_classificacao+"</span></span>";}
374 else 374 else
375 {conteudo += "&nbsp;<span style=color:red >Edite para definir a nova classifica&ccedil;&atilde;o!!!</span>";} 375 {conteudo += "&nbsp;<span style=color:red >Edite para definir a nova classifica&ccedil;&atilde;o!!!</span>";}
@@ -406,7 +406,7 @@ function adicionaNosClasses(no,dados,redesenha){ @@ -406,7 +406,7 @@ function adicionaNosClasses(no,dados,redesenha){
406 for (i=0, j=dados.length; i<j; i++) { 406 for (i=0, j=dados.length; i<j; i++) {
407 conteudo = "&nbsp;<img style=\"position:relative;cursor:pointer;top:0px\" onclick=\"excluir('classeClassificacao','"+dados[i].id_classe+"')\" title=excluir width='10px' heigth='10px' src=\"../imagens/01.png\" />"; 407 conteudo = "&nbsp;<img style=\"position:relative;cursor:pointer;top:0px\" onclick=\"excluir('classeClassificacao','"+dados[i].id_classe+"')\" title=excluir width='10px' heigth='10px' src=\"../imagens/01.png\" />";
408 conteudo += "&nbsp;<img style=\"position:relative;cursor:pointer;top:2px\" onclick=\"editar('classeClassificacao','"+dados[i].id_classe+"')\" title=editar src=\"../imagens/06.png\" /><b>"; 408 conteudo += "&nbsp;<img style=\"position:relative;cursor:pointer;top:2px\" onclick=\"editar('classeClassificacao','"+dados[i].id_classe+"')\" title=editar src=\"../imagens/06.png\" /><b>";
409 - if(dados[i].nomedimensao != "") 409 + if(dados[i].nome != "")
410 {conteudo += "&nbsp;<span><b>"+dados[i].titulo+"</b><span style=color:gray > id: "+dados[i].id_classe+"</span></span>";} 410 {conteudo += "&nbsp;<span><b>"+dados[i].titulo+"</b><span style=color:gray > id: "+dados[i].id_classe+"</span></span>";}
411 else 411 else
412 {conteudo += "&nbsp;<span style=color:red >Edite para definir a nova classe!!!</span>";} 412 {conteudo += "&nbsp;<span style=color:red >Edite para definir a nova classe!!!</span>";}
@@ -558,25 +558,19 @@ function montaDivMedidaVariavel(i){ @@ -558,25 +558,19 @@ function montaDivMedidaVariavel(i){
558 $i("Ccodigo_estat_conexao").innerHTML = temp; 558 $i("Ccodigo_estat_conexao").innerHTML = temp;
559 } 559 }
560 } 560 }
561 -function montaDivDimensaoMedida(i){ 561 +function montaDivParametroMedida(i){
562 var temp,ins = "", 562 var temp,ins = "",
563 param = { 563 param = {
564 "linhas":[ 564 "linhas":[
565 - {titulo:"Nome:",id:"Enomedimensao",size:"50",value:i.nomedimensao,tipo:"text",div:""}, 565 + {titulo:"Nome:",id:"Enome",size:"50",value:i.nome,tipo:"text",div:""},
566 {titulo:"Descri&ccedil;&atilde;o:",id:"Edescricao",size:"50",value:i.descricao,tipo:"text",div:""}, 566 {titulo:"Descri&ccedil;&atilde;o:",id:"Edescricao",size:"50",value:i.descricao,tipo:"text",div:""},
567 {titulo:"Coluna:",id:"Ecoluna",size:"50",value:i.coluna,tipo:"text",div:""}, 567 {titulo:"Coluna:",id:"Ecoluna",size:"50",value:i.coluna,tipo:"text",div:""},
568 - {titulo:"Agrega valores:",id:"",size:"50",value:i.agregavalores,tipo:"text",div:"<div id=Cagregavalores ></div>"} 568 + {titulo:"id_pai:",id:"Eid_pai",size:"50",value:i.id_pai,tipo:"text",div:""}
569 ] 569 ]
570 }; 570 };
571 ins += core_geraLinhas(param); 571 ins += core_geraLinhas(param);
572 ins += "<br><br><br>"; 572 ins += "<br><br><br>";
573 $i("editor_bd").innerHTML = ins; 573 $i("editor_bd").innerHTML = ins;
574 - if($i("Cagregavalores")){  
575 - temp = "<select id='Eagregavalores' >";  
576 - temp += core_comboObjeto([{"nome":"sim","valor":"1"},{"nome":"nao","valor":"0"}],"valor","nome",i.agregavalores);  
577 - temp += "</select>";  
578 - $i("Cagregavalores").innerHTML = temp;  
579 - }  
580 } 574 }
581 function montaDivClassificacaoMedida(i){ 575 function montaDivClassificacaoMedida(i){
582 var ins = "", 576 var ins = "",
@@ -653,20 +647,20 @@ function adicionarMedidaVariavel(codigo_variavel){ @@ -653,20 +647,20 @@ function adicionarMedidaVariavel(codigo_variavel){
653 core_makeRequest(sUrl,callback); 647 core_makeRequest(sUrl,callback);
654 } 648 }
655 /* 649 /*
656 -Function: adicionarDimensaoMedida 650 +Function: adicionarParametroMedida
657 651
658 -Adiciona uma nova dimensao a uma medida de variavel 652 +Adiciona uma nova parametro a uma medida de variavel
659 653
660 -<ADICIONARDIMENSAOMedida> 654 +<ADICIONARPARAMETROMedida>
661 */ 655 */
662 -function adicionarDimensaoMedida(id_medida_variavel){ 656 +function adicionarParametroMedida(id_medida_variavel){
663 var no = tree.getNodeByProperty("id_medida_variavel",id_medida_variavel), 657 var no = tree.getNodeByProperty("id_medida_variavel",id_medida_variavel),
664 - sUrl = "../php/metaestat.php?funcao=alteraDimensaoMedida&id_medida_variavel="+id_medida_variavel, 658 + sUrl = "../php/metaestat.php?funcao=alteraParametroMedida&id_medida_variavel="+id_medida_variavel,
665 callback = { 659 callback = {
666 success: function(oResponse){ 660 success: function(oResponse){
667 var dados = YAHOO.lang.JSON.parse(oResponse.responseText); 661 var dados = YAHOO.lang.JSON.parse(oResponse.responseText);
668 - adicionaNosDimensao(no,[dados],true);  
669 - editar('dimensaoMedida',dados.id_dimensao_medida); 662 + adicionaNosParametro(no,[dados],true);
  663 + editar('parametroMedida',dados.id_parametro_medida);
670 }, 664 },
671 failure:core_handleFailure, 665 failure:core_handleFailure,
672 argument: { foo:"foo", bar:"bar" } 666 argument: { foo:"foo", bar:"bar" }
@@ -762,10 +756,10 @@ function editar(tipo,id) { @@ -762,10 +756,10 @@ function editar(tipo,id) {
762 core_montaEditor("gravaDados('medidaVariavel','"+id+"')","450px","200px","","Editor de medidas"); 756 core_montaEditor("gravaDados('medidaVariavel','"+id+"')","450px","200px","","Editor de medidas");
763 montaDivMedidaVariavel(dados); 757 montaDivMedidaVariavel(dados);
764 } 758 }
765 - if(tipo == "dimensaoMedida"){ 759 + if(tipo == "parametroMedida"){
766 dados = YAHOO.lang.JSON.parse(o.responseText); 760 dados = YAHOO.lang.JSON.parse(o.responseText);
767 - core_montaEditor("gravaDados('dimensaoMedida','"+id+"')","450px","200px","","Editor de dimens&oatilde;es");  
768 - montaDivDimensaoMedida(dados); 761 + core_montaEditor("gravaDados('parametroMedida','"+id+"')","450px","200px","","Editor de par&acirc;metros");
  762 + montaDivParametroMedida(dados);
769 } 763 }
770 if(tipo == "classificacaoMedida"){ 764 if(tipo == "classificacaoMedida"){
771 dados = YAHOO.lang.JSON.parse(o.responseText); 765 dados = YAHOO.lang.JSON.parse(o.responseText);
@@ -795,8 +789,8 @@ function editar(tipo,id) { @@ -795,8 +789,8 @@ function editar(tipo,id) {
795 if(tipo == "medidaVariavel"){ 789 if(tipo == "medidaVariavel"){
796 sUrl = "../php/metaestat.php?funcao=listaMedidaVariavel&id_medida_variavel="+id; 790 sUrl = "../php/metaestat.php?funcao=listaMedidaVariavel&id_medida_variavel="+id;
797 } 791 }
798 - if(tipo == "dimensaoMedida"){  
799 - sUrl = "../php/metaestat.php?funcao=listaDimensao&id_dimensao_medida="+id; 792 + if(tipo == "parametroMedida"){
  793 + sUrl = "../php/metaestat.php?funcao=listaParametro&id_parametro_medida="+id;
800 } 794 }
801 if(tipo == "classificacaoMedida"){ 795 if(tipo == "classificacaoMedida"){
802 sUrl = "../php/metaestat.php?funcao=listaClassificacaoMedida&id_classificacao="+id; 796 sUrl = "../php/metaestat.php?funcao=listaClassificacaoMedida&id_classificacao="+id;
@@ -1008,7 +1002,7 @@ function sql(tipo,id) { @@ -1008,7 +1002,7 @@ function sql(tipo,id) {
1008 core_makeRequest(sUrl,callback); 1002 core_makeRequest(sUrl,callback);
1009 }; 1003 };
1010 } 1004 }
1011 - if(tipo == "dimensaoMedida"){ 1005 + if(tipo == "parametroMedida"){
1012 1006
1013 } 1007 }
1014 core_carregando("desativa"); 1008 core_carregando("desativa");
@@ -1021,8 +1015,8 @@ function sql(tipo,id) { @@ -1021,8 +1015,8 @@ function sql(tipo,id) {
1021 if(tipo == "medidaVariavel"){ 1015 if(tipo == "medidaVariavel"){
1022 sUrl = "../php/metaestat.php?funcao=sqlMedidaVariavel&id_medida_variavel="+id; 1016 sUrl = "../php/metaestat.php?funcao=sqlMedidaVariavel&id_medida_variavel="+id;
1023 } 1017 }
1024 - if(tipo == "dimensaoMedida"){  
1025 - sUrl = "../php/metaestat.php?funcao=listaDimensao&id_dimensao_medida="+id; 1018 + if(tipo == "parametroMedida"){
  1019 + sUrl = "../php/metaestat.php?funcao=listaParametro&id_parametro_medida="+id;
1026 } 1020 }
1027 if(sUrl){ 1021 if(sUrl){
1028 core_makeRequest(sUrl,callback); 1022 core_makeRequest(sUrl,callback);
@@ -1046,9 +1040,9 @@ function excluir(tipo,id){ @@ -1046,9 +1040,9 @@ function excluir(tipo,id){
1046 no = tree.getNodeByProperty("id_medida_variavel",id); 1040 no = tree.getNodeByProperty("id_medida_variavel",id);
1047 sUrl = "../php/metaestat.php?funcao=excluirMedidaVariavel&id_medida_variavel="+id; 1041 sUrl = "../php/metaestat.php?funcao=excluirMedidaVariavel&id_medida_variavel="+id;
1048 } 1042 }
1049 - if(tipo == "dimensaoMedida") {  
1050 - no = tree.getNodeByProperty("id_dimensao_medida",id);  
1051 - sUrl = "../php/metaestat.php?funcao=excluirDimensaoMedida&id_dimensao_medida="+id; 1043 + if(tipo == "parametroMedida") {
  1044 + no = tree.getNodeByProperty("id_parametro_medida",id);
  1045 + sUrl = "../php/metaestat.php?funcao=excluirParametroMedida&id_parametro_medida="+id;
1052 } 1046 }
1053 if(tipo == "classificacaoMedida") { 1047 if(tipo == "classificacaoMedida") {
1054 no = tree.getNodeByProperty("id_classificacao",id); 1048 no = tree.getNodeByProperty("id_classificacao",id);
@@ -1094,10 +1088,10 @@ function gravaDados(tipo,id){ @@ -1094,10 +1088,10 @@ function gravaDados(tipo,id){
1094 par = "&id_medida_variavel="+id; 1088 par = "&id_medida_variavel="+id;
1095 prog = "../php/metaestat.php?funcao=alteraMedidaVariavel"; 1089 prog = "../php/metaestat.php?funcao=alteraMedidaVariavel";
1096 } 1090 }
1097 - if(tipo == "dimensaoMedida"){  
1098 - campos = new Array("nomedimensao","descricao","coluna","agregavalores");  
1099 - par = "&id_dimensao_medida="+id;  
1100 - prog = "../php/metaestat.php?funcao=alteraDimensaoMedida"; 1091 + if(tipo == "parametroMedida"){
  1092 + campos = new Array("nome","descricao","coluna","id_pai");
  1093 + par = "&id_parametro_medida="+id;
  1094 + prog = "../php/metaestat.php?funcao=alteraParametroMedida";
1101 } 1095 }
1102 if(tipo == "classificacaoMedida"){ 1096 if(tipo == "classificacaoMedida"){
1103 campos = new Array("nome","observacao"); 1097 campos = new Array("nome","observacao");
@@ -1143,9 +1137,9 @@ function gravaDados(tipo,id){ @@ -1143,9 +1137,9 @@ function gravaDados(tipo,id){
1143 no.getContentEl().getElementsByTagName("span")[0].style.color = ""; 1137 no.getContentEl().getElementsByTagName("span")[0].style.color = "";
1144 no.html = no.getContentEl().innerHTML; 1138 no.html = no.getContentEl().innerHTML;
1145 } 1139 }
1146 - if(tipo == "dimensaoMedida"){  
1147 - no = tree.getNodeByProperty("id_dimensao_medida",id);  
1148 - no.getContentEl().getElementsByTagName("span")[0].innerHTML = "<b>"+document.getElementById("Enomedimensao").value+"</b><span style=color:gray > - "+document.getElementById("Edescricao").value+" id: "+id+"</span>"; 1140 + if(tipo == "parametroMedida"){
  1141 + no = tree.getNodeByProperty("id_parametro_medida",id);
  1142 + no.getContentEl().getElementsByTagName("span")[0].innerHTML = "<b>"+document.getElementById("Enome").value+"</b><span style=color:gray > - "+document.getElementById("Edescricao").value+" id: "+id+"</span>";
1149 no.getContentEl().getElementsByTagName("span")[0].style.color = ""; 1143 no.getContentEl().getElementsByTagName("span")[0].style.color = "";
1150 no.html = no.getContentEl().innerHTML; 1144 no.html = no.getContentEl().innerHTML;
1151 } 1145 }
admin/php/classe_metaestat.php
  Diff comments   View file @1057f2b
@@ -671,25 +671,25 @@ class Metaestat{ @@ -671,25 +671,25 @@ class Metaestat{
671 } 671 }
672 } 672 }
673 /* 673 /*
674 - Function: alteraDimensaoMedida 674 + Function: alteraParametroMedida
675 675
676 - Altera uma dimensao de uma medida ou cria uma nova 676 + Altera uma parametro de uma medida ou cria uma nova
677 */ 677 */
678 - function alteraDimensaoMedida($id_medida_variavel,$id_dimensao_medida="",$nomedimensao,$descricao,$coluna,$agregavalores){ 678 + function alteraParametroMedida($id_medida_variavel,$id_parametro_medida="",$nome,$descricao,$coluna,$id_pai){
679 try { 679 try {
680 - if($id_dimensao_medida != ""){ 680 + if($id_parametro_medida != ""){
681 if($this->convUTF){ 681 if($this->convUTF){
682 - $nomedimensao = utf8_encode($nomedimensao); 682 + $nomeparametro = utf8_encode($nomeparametro);
683 $descricao = utf8_encode($descricao); 683 $descricao = utf8_encode($descricao);
684 } 684 }
685 - //echo "UPDATE ".$this->esquemaadmin."i3geoestat_dimensao_medida SET nomedimensao = '$nomedimensao',descricao = '$descricao',coluna = '$coluna',agregavalores = '$agregavalores' WHERE id_dimensao_medida = $id_dimensao_medida";exit;  
686 - $this->dbhw->query("UPDATE ".$this->esquemaadmin."i3geoestat_dimensao_medida SET nomedimensao = '$nomedimensao',descricao = '$descricao',coluna = '$coluna',agregavalores = '$agregavalores' WHERE id_dimensao_medida = $id_dimensao_medida");  
687 - $retorna = $id_dimensao_medida; 685 + //echo "UPDATE ".$this->esquemaadmin."i3geoestat_parametro_medida SET nomeparametro = '$nomeparametro',descricao = '$descricao',coluna = '$coluna',agregavalores = '$agregavalores' WHERE id_parametro_medida = $id_parametro_medida";exit;
  686 + $this->dbhw->query("UPDATE ".$this->esquemaadmin."i3geoestat_parametro_medida SET nome = '$nome',descricao = '$descricao',coluna = '$coluna',id_pai = '$id_pai' WHERE id_parametro_medida = $id_parametro_medida");
  687 + $retorna = $id_parametro_medida;
688 } 688 }
689 else{ 689 else{
690 - $retorna = $this->insertId("i3geoestat_dimensao_medida","nomedimensao","id_dimensao_medida"); 690 + $retorna = $this->insertId("i3geoestat_parametro_medida","nome","id_parametro_medida");
691 if($retorna){ 691 if($retorna){
692 - $this->dbhw->query("UPDATE ".$this->esquemaadmin."i3geoestat_dimensao_medida SET id_medida_variavel = $id_medida_variavel WHERE id_dimensao_medida = $retorna"); 692 + $this->dbhw->query("UPDATE ".$this->esquemaadmin."i3geoestat_parametro_medida SET id_medida_variavel = $id_medida_variavel WHERE id_parametro_medida = $retorna");
693 } 693 }
694 } 694 }
695 return $retorna; 695 return $retorna;
@@ -699,9 +699,9 @@ class Metaestat{ @@ -699,9 +699,9 @@ class Metaestat{
699 } 699 }
700 } 700 }
701 /* 701 /*
702 - Function: alteraDimensaoMedida 702 + Function: alteraParametroMedida
703 703
704 - Altera uma dimensao de uma medida ou cria uma nova 704 + Altera uma parametro de uma medida ou cria uma nova
705 */ 705 */
706 function alteraClassificacaoMedida($id_medida_variavel,$id_classificacao="",$nome="",$observacao=""){ 706 function alteraClassificacaoMedida($id_medida_variavel,$id_classificacao="",$nome="",$observacao=""){
707 try { 707 try {
@@ -711,7 +711,7 @@ class Metaestat{ @@ -711,7 +711,7 @@ class Metaestat{
711 $observacao = utf8_encode($observacao); 711 $observacao = utf8_encode($observacao);
712 } 712 }
713 $this->dbhw->query("UPDATE ".$this->esquemaadmin."i3geoestat_classificacao SET observacao = '$observacao',nome = '$nome' WHERE id_classificacao = $id_classificacao"); 713 $this->dbhw->query("UPDATE ".$this->esquemaadmin."i3geoestat_classificacao SET observacao = '$observacao',nome = '$nome' WHERE id_classificacao = $id_classificacao");
714 - $retorna = $id_dimensao_medida; 714 + $retorna = $id_parametro_medida;
715 } 715 }
716 else{ 716 else{
717 $retorna = $this->insertId("i3geoestat_classificacao","nome","id_classificacao"); 717 $retorna = $this->insertId("i3geoestat_classificacao","nome","id_classificacao");
@@ -918,7 +918,7 @@ class Metaestat{ @@ -918,7 +918,7 @@ class Metaestat{
918 return $this->execSQL($sql,$codigo_estat_conexao); 918 return $this->execSQL($sql,$codigo_estat_conexao);
919 } 919 }
920 /* 920 /*
921 - Function: listaDimensao 921 + Function: listaParametro
922 922
923 Lista as variaveis cadastradas ou uma unica variavel 923 Lista as variaveis cadastradas ou uma unica variavel
924 924
@@ -926,24 +926,24 @@ class Metaestat{ @@ -926,24 +926,24 @@ class Metaestat{
926 926
927 $id_medida_variavel 927 $id_medida_variavel
928 928
929 - $id_dimensao_variavel - opcional 929 + $id_parametro_variavel - opcional
930 */ 930 */
931 - function listaDimensao($id_medida_variavel,$id_dimensao_medida=""){  
932 - $sql = "SELECT i3geoestat_dimensao_medida.* ";  
933 - $sql .= "FROM ".$this->esquemaadmin."i3geoestat_dimensao_medida "; 931 + function listaParametro($id_medida_variavel,$id_parametro_medida=""){
  932 + $sql = "SELECT i3geoestat_parametro_medida.* ";
  933 + $sql .= "FROM ".$this->esquemaadmin."i3geoestat_parametro_medida ";
934 $sql .= "INNER JOIN ".$this->esquemaadmin."i3geoestat_medida_variavel "; 934 $sql .= "INNER JOIN ".$this->esquemaadmin."i3geoestat_medida_variavel ";
935 - $sql .= "ON i3geoestat_dimensao_medida.id_medida_variavel = i3geoestat_medida_variavel.id_medida_variavel "; 935 + $sql .= "ON i3geoestat_parametro_medida.id_medida_variavel = i3geoestat_medida_variavel.id_medida_variavel ";
936 if($id_medida_variavel != ""){ 936 if($id_medida_variavel != ""){
937 - $sql .= "WHERE i3geoestat_dimensao_medida.id_medida_variavel = $id_medida_variavel ";  
938 - if($id_dimensao_medida != ""){  
939 - $sql .= "AND i3geoestat_dimensao_medida.id_dimensao_medida = $id_dimensao_medida "; 937 + $sql .= "WHERE i3geoestat_parametro_medida.id_medida_variavel = $id_medida_variavel ";
  938 + if($id_parametro_medida != ""){
  939 + $sql .= "AND i3geoestat_parametro_medida.id_parametro_medida = $id_parametro_medida ";
940 } 940 }
941 } 941 }
942 else{ 942 else{
943 - $sql .= "WHERE i3geoestat_dimensao_medida.id_dimensao_medida = $id_dimensao_medida "; 943 + $sql .= "WHERE i3geoestat_parametro_medida.id_parametro_medida = $id_parametro_medida ";
944 } 944 }
945 //echo $sql;exit; 945 //echo $sql;exit;
946 - return $this->execSQL($sql,$id_dimensao_medida); 946 + return $this->execSQL($sql,$id_parametro_medida);
947 } 947 }
948 948
949 /* 949 /*
admin/php/metaestat.php
  Diff comments   View file @1057f2b
@@ -138,17 +138,17 @@ switch (strtoupper($funcao)) @@ -138,17 +138,17 @@ switch (strtoupper($funcao))
138 exit; 138 exit;
139 break; 139 break;
140 /* 140 /*
141 - Valor: LISTADIMENSAO 141 + Valor: LISTAPARAMETRO
142 142
143 - Lista de dimensoes 143 + Lista de parametros
144 144
145 Retorno: 145 Retorno:
146 146
147 {JSON} 147 {JSON}
148 */ 148 */
149 - case "LISTADIMENSAO": 149 + case "LISTAPARAMETRO":
150 $m = new Metaestat(); 150 $m = new Metaestat();
151 - retornaJSON($m->listaDimensao($id_medida_variavel,$id_dimensao_medida)); 151 + retornaJSON($m->listaParametro($id_medida_variavel,$id_parametro_medida));
152 exit; 152 exit;
153 break; 153 break;
154 /* 154 /*
@@ -244,23 +244,23 @@ switch (strtoupper($funcao)) @@ -244,23 +244,23 @@ switch (strtoupper($funcao))
244 exit; 244 exit;
245 break; 245 break;
246 /* 246 /*
247 - Valor: ALTERADIMENSAOMEDIDA 247 + Valor: ALTERAPARAMETROMEDIDA
248 248
249 - Altera os dados de uma dimensao de uma medida 249 + Altera os dados de uma parametro de uma medida
250 250
251 Retorno: 251 Retorno:
252 252
253 {JSON} 253 {JSON}
254 */ 254 */
255 - case "ALTERADIMENSAOMEDIDA": 255 + case "ALTERAPARAMETROMEDIDA":
256 $m = new Metaestat(); 256 $m = new Metaestat();
257 - if(empty($id_dimensao_medida)){  
258 - $id_dimensao_medida = $m->alteraDimensaoMedida($id_medida_variavel); 257 + if(empty($id_parametro_medida)){
  258 + $id_parametro_medida = $m->alteraParametroMedida($id_medida_variavel);
259 } 259 }
260 else{ 260 else{
261 - $m->alteraDimensaoMedida("",$id_dimensao_medida,$nomedimensao,$descricao,$coluna,$agregavalores); 261 + $m->alteraParametroMedida("",$id_parametro_medida,$nome,$descricao,$coluna,$id_pai);
262 } 262 }
263 - retornaJSON($m->listaDimensao($id_medida_variavel,$id_dimensao_medida)); 263 + retornaJSON($m->listaParametro($id_medida_variavel,$id_parametro_medida));
264 exit; 264 exit;
265 break; 265 break;
266 /* 266 /*
@@ -570,21 +570,21 @@ switch (strtoupper($funcao)) @@ -570,21 +570,21 @@ switch (strtoupper($funcao))
570 exit; 570 exit;
571 break; 571 break;
572 /* 572 /*
573 - Valor: EXCLUIRDIMENSAOMEDIDA 573 + Valor: EXCLUIRPARAMETROMEDIDA
574 574
575 Exclui uma medida da variavel 575 Exclui uma medida da variavel
576 576
577 Parametros: 577 Parametros:
578 578
579 - id_dimensao_medida 579 + id_parametro_medida
580 580
581 Retorno: 581 Retorno:
582 582
583 {JSON} 583 {JSON}
584 */ 584 */
585 - case "EXCLUIRDIMENSAOMEDIDA": 585 + case "EXCLUIRPARAMETROMEDIDA":
586 $m = new Metaestat(); 586 $m = new Metaestat();
587 - retornaJSON($m->excluirRegistro("i3geoestat_dimensao_medida","id_dimensao_medida",$id_dimensao_medida)); 587 + retornaJSON($m->excluirRegistro("i3geoestat_parametro_medida","id_parametro_medida",$id_parametro_medida));
588 exit; 588 exit;
589 break; 589 break;
590 /* 590 /*
@@ -594,7 +594,7 @@ switch (strtoupper($funcao)) @@ -594,7 +594,7 @@ switch (strtoupper($funcao))
594 594
595 Parametros: 595 Parametros:
596 596
597 - id_dimensao_medida 597 + id_classificacao
598 598
599 Retorno: 599 Retorno:
600 600
@@ -767,7 +767,7 @@ switch (strtoupper($funcao)) @@ -767,7 +767,7 @@ switch (strtoupper($funcao))
767 'dirtmp' => $dir_tmp, 767 'dirtmp' => $dir_tmp,
768 'barSize'=> 5000 768 'barSize'=> 5000
769 ); 769 );
770 - 770 +
771 include (__DIR__."/../../pacotes/tme/TME_i3geo.php"); 771 include (__DIR__."/../../pacotes/tme/TME_i3geo.php");
772 } 772 }
773 exit; 773 exit;
admin/sql/metaestat.sql
  Diff comments   View file @1057f2b
@@ -3,9 +3,9 @@ @@ -3,9 +3,9 @@
3 3
4 drop table i3geoestat_classes; 4 drop table i3geoestat_classes;
5 drop table i3geoestat_classificacao; 5 drop table i3geoestat_classificacao;
6 -drop table i3geoestat_dimensao_medida;  
7 drop table i3geoestat_fonteinfo_medida; 6 drop table i3geoestat_fonteinfo_medida;
8 drop table i3geoestat_medida_variavel_link; 7 drop table i3geoestat_medida_variavel_link;
  8 +drop table i3geoestat_parametro_medida;
9 drop table i3geoestat_medida_variavel; 9 drop table i3geoestat_medida_variavel;
10 drop table i3geoestat_tipo_regiao; 10 drop table i3geoestat_tipo_regiao;
11 drop table i3geoestat_conexao; 11 drop table i3geoestat_conexao;
@@ -15,10 +15,22 @@ drop table i3geoestat_unidade_medida; @@ -15,10 +15,22 @@ drop table i3geoestat_unidade_medida;
15 drop table i3geoestat_variavel; 15 drop table i3geoestat_variavel;
16 16
17 17
18 - 18 +
19 19
20 /* create tables */ 20 /* create tables */
21 21
  22 +create table i3geoestat_unidade_medida
  23 +(
  24 + codigo_unidade_medida integer not null unique primary key autoincrement,
  25 + nome text,
  26 + sigla text,
  27 + -- o tipo de unidade permite que os valores sejam somados? (0 ou 1)
  28 + permitesoma integer default 0,
  29 + -- o tipo de unidade permite o cálculo de média aritmética? (0 ou 1)
  30 + permitemedia integer default 0
  31 +);
  32 +
  33 +
22 -- lista controlada dos parâmetros de conexão com o banco de dados onde residem dados 34 -- lista controlada dos parâmetros de conexão com o banco de dados onde residem dados
23 create table i3geoestat_conexao 35 create table i3geoestat_conexao
24 ( 36 (
@@ -64,15 +76,12 @@ create table i3geoestat_tipo_regiao @@ -64,15 +76,12 @@ create table i3geoestat_tipo_regiao
64 ); 76 );
65 77
66 78
67 -create table i3geoestat_unidade_medida 79 +-- lista controlada de tipos de período de tempo
  80 +create table i3geoestat_tipo_periodo
68 ( 81 (
69 - codigo_unidade_medida integer not null unique primary key autoincrement, 82 + codigo_tipo_periodo integer not null unique primary key autoincrement,
70 nome text, 83 nome text,
71 - sigla text,  
72 - -- o tipo de unidade permite que os valores sejam somados? (0 ou 1)  
73 - permitesoma integer default 0,  
74 - -- o tipo de unidade permite o cálculo de média aritmética? (0 ou 1)  
75 - permitemedia integer default 0 84 + descricao text
76 ); 85 );
77 86
78 87
@@ -85,15 +94,6 @@ create table i3geoestat_variavel @@ -85,15 +94,6 @@ create table i3geoestat_variavel
85 ); 94 );
86 95
87 96
88 --- lista controlada de tipos de período de tempo  
89 -create table i3geoestat_tipo_periodo  
90 -(  
91 - codigo_tipo_periodo integer not null unique primary key autoincrement,  
92 - nome text,  
93 - descricao text  
94 -);  
95 -  
96 -  
97 -- descreve as colunas que contém valores de algum tipo de medida, por exemplo população residente 97 -- descreve as colunas que contém valores de algum tipo de medida, por exemplo população residente
98 create table i3geoestat_medida_variavel 98 create table i3geoestat_medida_variavel
99 ( 99 (
@@ -115,16 +115,16 @@ create table i3geoestat_medida_variavel @@ -115,16 +115,16 @@ create table i3geoestat_medida_variavel
115 filtro text, 115 filtro text,
116 -- titulo da medida 116 -- titulo da medida
117 nomemedida text, 117 nomemedida text,
118 - foreign key (codigo_tipo_regiao)  
119 - references i3geoestat_tipo_regiao (codigo_tipo_regiao),  
120 foreign key (codigo_unidade_medida) 118 foreign key (codigo_unidade_medida)
121 references i3geoestat_unidade_medida (codigo_unidade_medida), 119 references i3geoestat_unidade_medida (codigo_unidade_medida),
122 - foreign key (codigo_variavel)  
123 - references i3geoestat_variavel (codigo_variavel), 120 + foreign key (codigo_tipo_regiao)
  121 + references i3geoestat_tipo_regiao (codigo_tipo_regiao),
  122 + foreign key (codigo_tipo_periodo)
  123 + references i3geoestat_tipo_periodo (codigo_tipo_periodo),
124 foreign key (codigo_estat_conexao) 124 foreign key (codigo_estat_conexao)
125 references i3geoestat_conexao (codigo_estat_conexao), 125 references i3geoestat_conexao (codigo_estat_conexao),
126 - foreign key (codigo_tipo_periodo)  
127 - references i3geoestat_tipo_periodo (codigo_tipo_periodo) 126 + foreign key (codigo_variavel)
  127 + references i3geoestat_variavel (codigo_variavel)
128 ); 128 );
129 129
130 130
@@ -173,20 +173,6 @@ create table i3geoestat_classes @@ -173,20 +173,6 @@ create table i3geoestat_classes
173 ); 173 );
174 174
175 175
176 -create table i3geoestat_dimensao_medida  
177 -(  
178 - id_dimensao_medida integer not null unique primary key autoincrement,  
179 - coluna text,  
180 - nomedimensao text,  
181 - descricao text,  
182 - -- (0 ou 1) indica se a coluna de valores da variável deve ser agregada ou não (soma dos valores ou média) conforme o tipo de unidade de medida  
183 - agregavalores integer default 0,  
184 - id_medida_variavel integer,  
185 - foreign key (id_medida_variavel)  
186 - references i3geoestat_medida_variavel (id_medida_variavel)  
187 -);  
188 -  
189 -  
190 create table i3geoestat_fonteinfo 176 create table i3geoestat_fonteinfo
191 ( 177 (
192 id_fonteinfo integer not null unique primary key autoincrement, 178 id_fonteinfo integer not null unique primary key autoincrement,
@@ -200,10 +186,10 @@ create table i3geoestat_fonteinfo_medida @@ -200,10 +186,10 @@ create table i3geoestat_fonteinfo_medida
200 ( 186 (
201 id_medida_variavel integer not null, 187 id_medida_variavel integer not null,
202 id_fonteinfo integer not null, 188 id_fonteinfo integer not null,
203 - foreign key (id_medida_variavel)  
204 - references i3geoestat_medida_variavel (id_medida_variavel),  
205 foreign key (id_fonteinfo) 189 foreign key (id_fonteinfo)
206 - references i3geoestat_fonteinfo (id_fonteinfo) 190 + references i3geoestat_fonteinfo (id_fonteinfo),
  191 + foreign key (id_medida_variavel)
  192 + references i3geoestat_medida_variavel (id_medida_variavel)
207 ); 193 );
208 194
209 195
@@ -218,4 +204,18 @@ create table i3geoestat_medida_variavel_link @@ -218,4 +204,18 @@ create table i3geoestat_medida_variavel_link
218 ); 204 );
219 205
220 206
221 - 207 +create table i3geoestat_parametro_medida
  208 +(
  209 + id_parametro_medida integer not null unique primary key autoincrement,
  210 + coluna text,
  211 + nome text,
  212 + descricao text,
  213 + -- (0 ou 1) indica se a coluna de valores da variável deve ser agregada ou não (soma dos valores ou média) conforme o tipo de unidade de medida
  214 + id_pai integer default 0,
  215 + id_medida_variavel integer,
  216 + foreign key (id_medida_variavel)
  217 + references i3geoestat_medida_variavel (id_medida_variavel)
  218 +);
  219 +
  220 +
  221 +
admin/sql/metaestat_basededados.sql
  Diff comments   View file @1057f2b
@@ -19,9 +19,9 @@ INSERT INTO i3geoestat_unidade_medida (codigo_unidade_medida, nome, sigla, permi @@ -19,9 +19,9 @@ INSERT INTO i3geoestat_unidade_medida (codigo_unidade_medida, nome, sigla, permi
19 INSERT INTO i3geoestat_medida_variavel (id_medida_variavel, codigo_unidade_medida, codigo_tipo_periodo, codigo_variavel, codigo_tipo_regiao, codigo_estat_conexao, esquemadb, tabela, colunavalor, colunaidgeo, filtro, nomemedida) VALUES ('1', '1', '2', '1', '1', '1', 'dbacoes_saude', 'tb_farmacia_pop', 'nu_farm_funcionando', 'co_ibge', '', 'Número de farmácias em funcionamento por mês e ano'); 19 INSERT INTO i3geoestat_medida_variavel (id_medida_variavel, codigo_unidade_medida, codigo_tipo_periodo, codigo_variavel, codigo_tipo_regiao, codigo_estat_conexao, esquemadb, tabela, colunavalor, colunaidgeo, filtro, nomemedida) VALUES ('1', '1', '2', '1', '1', '1', 'dbacoes_saude', 'tb_farmacia_pop', 'nu_farm_funcionando', 'co_ibge', '', 'Número de farmácias em funcionamento por mês e ano');
20 20
21 21
22 --- i3geoestat_dimensao_medida  
23 -INSERT INTO i3geoestat_dimensao_medida (id_dimensao_medida, coluna, nomedimensao, descricao, agregavalores, id_medida_variavel) VALUES ('1', "to_date(mes_farm_pop||' '||ano_farm,'MM YYYY') as mes", 'mês e ano', '', '0', '1');  
24 -INSERT INTO i3geoestat_dimensao_medida (id_dimensao_medida, coluna, nomedimensao, descricao, agregavalores, id_medida_variavel) VALUES ('2', 'ano_farm', 'ano', '', '1', '1'); 22 +-- i3geoestat_parametro_medida
  23 +INSERT INTO i3geoestat_parametro_medida (id_parametro_medida, coluna, nome, descricao, id_pai, id_medida_variavel) VALUES ('1', 'mes_farm_pop', 'mês', '', '2', '1');
  24 +INSERT INTO i3geoestat_parametro_medida (id_parametro_medida, coluna, nome, descricao, id_pai, id_medida_variavel) VALUES ('2', 'ano_farm', 'ano', '', '0', '1');
25 25
26 26
27 -- i3geoestat_variavel 27 -- i3geoestat_variavel
@@ -42,7 +42,7 @@ INSERT INTO i3geoestat_classes (id_classe, expressao, titulo, vermelho, verde, a @@ -42,7 +42,7 @@ INSERT INTO i3geoestat_classes (id_classe, expressao, titulo, vermelho, verde, a
42 INSERT INTO i3geoestat_medida_variavel_link (link, id_medida_variavel, nome, id_link) VALUES ('http://portal.saude.gov.br/portal/saude/area.cfm?id_area=1095', '1', 'Site das Fármacias Populares', '1'); 42 INSERT INTO i3geoestat_medida_variavel_link (link, id_medida_variavel, nome, id_link) VALUES ('http://portal.saude.gov.br/portal/saude/area.cfm?id_area=1095', '1', 'Site das Fármacias Populares', '1');
43 43
44 44
45 --- i3geoestat_fontinfo_medida 45 +-- i3geoestat_fonteinfo_medida
46 INSERT INTO i3geoestat_fonteinfo_medida (id_medida_variavel, id_fonteinfo) VALUES ('1', '1'); 46 INSERT INTO i3geoestat_fonteinfo_medida (id_medida_variavel, id_fonteinfo) VALUES ('1', '1');
47 47
48 48
documentacao/diagramas/metaestat.erm
  Diff comments   View file @1057f2b
@@ -11,12 +11,12 @@ @@ -11,12 +11,12 @@
11 </page_setting> 11 </page_setting>
12 <category_index>0</category_index> 12 <category_index>0</category_index>
13 <zoom>1.0</zoom> 13 <zoom>1.0</zoom>
14 - <x>193</x>  
15 - <y>17</y> 14 + <x>155</x>
  15 + <y>111</y>
16 <default_color> 16 <default_color>
17 - <r>144</r>  
18 - <g>238</g>  
19 - <b>144</b> 17 + <r>255</r>
  18 + <g>128</g>
  19 + <b>255</b>
20 </default_color> 20 </default_color>
21 <color> 21 <color>
22 <r>255</r> 22 <r>255</r>
@@ -41,7 +41,7 @@ @@ -41,7 +41,7 @@
41 <suspend_validator>false</suspend_validator> 41 <suspend_validator>false</suspend_validator>
42 <export_setting> 42 <export_setting>
43 <category_name_to_export>All</category_name_to_export> 43 <category_name_to_export>All</category_name_to_export>
44 - <ddl_output>/var/www/i3geo/admin/sql/metaestat.sql</ddl_output> 44 + <ddl_output>C:\ms4w\Apache\htdocs\i3geo\admin\sql\metaestat.sql</ddl_output>
45 <excel_output></excel_output> 45 <excel_output></excel_output>
46 <excel_template></excel_template> 46 <excel_template></excel_template>
47 <image_output></image_output> 47 <image_output></image_output>
@@ -78,7 +78,7 @@ @@ -78,7 +78,7 @@
78 </export_java_setting> 78 </export_java_setting>
79 <export_testdata_setting> 79 <export_testdata_setting>
80 <file_encoding>ISO-8859-1</file_encoding> 80 <file_encoding>ISO-8859-1</file_encoding>
81 - <file_path>/var/www/i3geo/admin/sql</file_path> 81 + <file_path>C:\ms4w\Apache\htdocs\i3geo\admin\sql</file_path>
82 <format>0</format> 82 <format>0</format>
83 </export_testdata_setting> 83 </export_testdata_setting>
84 </export_setting> 84 </export_setting>
@@ -97,7 +97,7 @@ @@ -97,7 +97,7 @@
97 <id></id> 97 <id></id>
98 <height>-1</height> 98 <height>-1</height>
99 <width>-1</width> 99 <width>-1</width>
100 - <font_name>Ubuntu</font_name> 100 + <font_name>Segoe UI</font_name>
101 <font_size>9</font_size> 101 <font_size>9</font_size>
102 <x>50</x> 102 <x>50</x>
103 <y>50</y> 103 <y>50</y>
@@ -110,7 +110,7 @@ @@ -110,7 +110,7 @@
110 </connections> 110 </connections>
111 <display>false</display> 111 <display>false</display>
112 <creation_date>2012-07-17 15:03:53</creation_date> 112 <creation_date>2012-07-17 15:03:53</creation_date>
113 - <updated_date>2012-08-15 01:02:44</updated_date> 113 + <updated_date>2012-08-16 11:27:59</updated_date>
114 <model_property> 114 <model_property>
115 <name>Project Name</name> 115 <name>Project Name</name>
116 <value></value> 116 <value></value>
@@ -151,26 +151,13 @@ @@ -151,26 +151,13 @@
151 <array_dimension>null</array_dimension> 151 <array_dimension>null</array_dimension>
152 <unsigned>false</unsigned> 152 <unsigned>false</unsigned>
153 <args></args> 153 <args></args>
154 - <description>(0 ou 1) indica se a coluna de valores da variável deve ser agregada ou não (soma dos valores ou média) conforme o tipo de unidade de medida</description>  
155 - <logical_name>agregavalores</logical_name>  
156 - <physical_name>agregavalores</physical_name>  
157 - <type>integer</type>  
158 - </word>  
159 - <word>  
160 - <id>1</id>  
161 - <length>null</length>  
162 - <decimal>null</decimal>  
163 - <array>false</array>  
164 - <array_dimension>null</array_dimension>  
165 - <unsigned>false</unsigned>  
166 - <args></args>  
167 <description>componente B da cor utilizada para representar a classe</description> 154 <description>componente B da cor utilizada para representar a classe</description>
168 <logical_name>azul</logical_name> 155 <logical_name>azul</logical_name>
169 <physical_name>azul</physical_name> 156 <physical_name>azul</physical_name>
170 <type>text</type> 157 <type>text</type>
171 </word> 158 </word>
172 <word> 159 <word>
173 - <id>2</id> 160 + <id>1</id>
174 <length>null</length> 161 <length>null</length>
175 <decimal>null</decimal> 162 <decimal>null</decimal>
176 <array>false</array> 163 <array>false</array>
@@ -183,7 +170,7 @@ @@ -183,7 +170,7 @@
183 <type>text</type> 170 <type>text</type>
184 </word> 171 </word>
185 <word> 172 <word>
186 - <id>3</id> 173 + <id>2</id>
187 <length>null</length> 174 <length>null</length>
188 <decimal>null</decimal> 175 <decimal>null</decimal>
189 <array>false</array> 176 <array>false</array>
@@ -196,7 +183,7 @@ @@ -196,7 +183,7 @@
196 <type>integer</type> 183 <type>integer</type>
197 </word> 184 </word>
198 <word> 185 <word>
199 - <id>4</id> 186 + <id>3</id>
200 <length>null</length> 187 <length>null</length>
201 <decimal>null</decimal> 188 <decimal>null</decimal>
202 <array>false</array> 189 <array>false</array>
@@ -209,7 +196,7 @@ @@ -209,7 +196,7 @@
209 <type>integer</type> 196 <type>integer</type>
210 </word> 197 </word>
211 <word> 198 <word>
212 - <id>5</id> 199 + <id>4</id>
213 <length>null</length> 200 <length>null</length>
214 <decimal>null</decimal> 201 <decimal>null</decimal>
215 <array>false</array> 202 <array>false</array>
@@ -222,6 +209,19 @@ @@ -222,6 +209,19 @@
222 <type>integer</type> 209 <type>integer</type>
223 </word> 210 </word>
224 <word> 211 <word>
  212 + <id>5</id>
  213 + <length>null</length>
  214 + <decimal>null</decimal>
  215 + <array>false</array>
  216 + <array_dimension>null</array_dimension>
  217 + <unsigned>false</unsigned>
  218 + <args></args>
  219 + <description></description>
  220 + <logical_name>codigo_tipo_regiao_pai</logical_name>
  221 + <physical_name>codigo_tipo_regiao_pai</physical_name>
  222 + <type>integer</type>
  223 + </word>
  224 + <word>
225 <id>6</id> 225 <id>6</id>
226 <length>null</length> 226 <length>null</length>
227 <decimal>null</decimal> 227 <decimal>null</decimal>
@@ -307,13 +307,26 @@ @@ -307,13 +307,26 @@
307 <array_dimension>null</array_dimension> 307 <array_dimension>null</array_dimension>
308 <unsigned>false</unsigned> 308 <unsigned>false</unsigned>
309 <args></args> 309 <args></args>
  310 + <description>Coluna na tabela filho que liga com a coluna de identificadores da coluna pai</description>
  311 + <logical_name>colunaligacao_regiaopai</logical_name>
  312 + <physical_name>colunaligacao_regiaopai</physical_name>
  313 + <type>text</type>
  314 + </word>
  315 + <word>
  316 + <id>13</id>
  317 + <length>null</length>
  318 + <decimal>null</decimal>
  319 + <array>false</array>
  320 + <array_dimension>null</array_dimension>
  321 + <unsigned>false</unsigned>
  322 + <args></args>
310 <description>Coluna que contém o nome de cada região ou local</description> 323 <description>Coluna que contém o nome de cada região ou local</description>
311 <logical_name>colunanomeregiao</logical_name> 324 <logical_name>colunanomeregiao</logical_name>
312 <physical_name>colunanomeregiao</physical_name> 325 <physical_name>colunanomeregiao</physical_name>
313 <type>text</type> 326 <type>text</type>
314 </word> 327 </word>
315 <word> 328 <word>
316 - <id>13</id> 329 + <id>14</id>
317 <length>null</length> 330 <length>null</length>
318 <decimal>null</decimal> 331 <decimal>null</decimal>
319 <array>false</array> 332 <array>false</array>
@@ -326,7 +339,7 @@ @@ -326,7 +339,7 @@
326 <type>text</type> 339 <type>text</type>
327 </word> 340 </word>
328 <word> 341 <word>
329 - <id>14</id> 342 + <id>15</id>
330 <length>null</length> 343 <length>null</length>
331 <decimal>null</decimal> 344 <decimal>null</decimal>
332 <array>false</array> 345 <array>false</array>
@@ -339,7 +352,7 @@ @@ -339,7 +352,7 @@
339 <type>text</type> 352 <type>text</type>
340 </word> 353 </word>
341 <word> 354 <word>
342 - <id>15</id> 355 + <id>16</id>
343 <length>null</length> 356 <length>null</length>
344 <decimal>null</decimal> 357 <decimal>null</decimal>
345 <array>false</array> 358 <array>false</array>
@@ -352,7 +365,7 @@ @@ -352,7 +365,7 @@
352 <type>text</type> 365 <type>text</type>
353 </word> 366 </word>
354 <word> 367 <word>
355 - <id>16</id> 368 + <id>17</id>
356 <length>null</length> 369 <length>null</length>
357 <decimal>null</decimal> 370 <decimal>null</decimal>
358 <array>false</array> 371 <array>false</array>
@@ -365,7 +378,7 @@ @@ -365,7 +378,7 @@
365 <type>text</type> 378 <type>text</type>
366 </word> 379 </word>
367 <word> 380 <word>
368 - <id>17</id> 381 + <id>18</id>
369 <length>null</length> 382 <length>null</length>
370 <decimal>null</decimal> 383 <decimal>null</decimal>
371 <array>false</array> 384 <array>false</array>
@@ -378,7 +391,7 @@ @@ -378,7 +391,7 @@
378 <type>text</type> 391 <type>text</type>
379 </word> 392 </word>
380 <word> 393 <word>
381 - <id>18</id> 394 + <id>19</id>
382 <length>null</length> 395 <length>null</length>
383 <decimal>null</decimal> 396 <decimal>null</decimal>
384 <array>false</array> 397 <array>false</array>
@@ -391,7 +404,7 @@ @@ -391,7 +404,7 @@
391 <type>text</type> 404 <type>text</type>
392 </word> 405 </word>
393 <word> 406 <word>
394 - <id>19</id> 407 + <id>20</id>
395 <length>null</length> 408 <length>null</length>
396 <decimal>null</decimal> 409 <decimal>null</decimal>
397 <array>false</array> 410 <array>false</array>
@@ -404,7 +417,7 @@ @@ -404,7 +417,7 @@
404 <type>text</type> 417 <type>text</type>
405 </word> 418 </word>
406 <word> 419 <word>
407 - <id>20</id> 420 + <id>21</id>
408 <length>null</length> 421 <length>null</length>
409 <decimal>null</decimal> 422 <decimal>null</decimal>
410 <array>false</array> 423 <array>false</array>
@@ -417,7 +430,7 @@ @@ -417,7 +430,7 @@
417 <type>text</type> 430 <type>text</type>
418 </word> 431 </word>
419 <word> 432 <word>
420 - <id>21</id> 433 + <id>22</id>
421 <length>null</length> 434 <length>null</length>
422 <decimal>null</decimal> 435 <decimal>null</decimal>
423 <array>false</array> 436 <array>false</array>
@@ -430,7 +443,7 @@ @@ -430,7 +443,7 @@
430 <type>text</type> 443 <type>text</type>
431 </word> 444 </word>
432 <word> 445 <word>
433 - <id>22</id> 446 + <id>23</id>
434 <length>null</length> 447 <length>null</length>
435 <decimal>null</decimal> 448 <decimal>null</decimal>
436 <array>false</array> 449 <array>false</array>
@@ -443,7 +456,7 @@ @@ -443,7 +456,7 @@
443 <type>text</type> 456 <type>text</type>
444 </word> 457 </word>
445 <word> 458 <word>
446 - <id>23</id> 459 + <id>24</id>
447 <length>null</length> 460 <length>null</length>
448 <decimal>null</decimal> 461 <decimal>null</decimal>
449 <array>false</array> 462 <array>false</array>
@@ -456,7 +469,7 @@ @@ -456,7 +469,7 @@
456 <type>text</type> 469 <type>text</type>
457 </word> 470 </word>
458 <word> 471 <word>
459 - <id>24</id> 472 + <id>25</id>
460 <length>null</length> 473 <length>null</length>
461 <decimal>null</decimal> 474 <decimal>null</decimal>
462 <array>false</array> 475 <array>false</array>
@@ -469,7 +482,7 @@ @@ -469,7 +482,7 @@
469 <type>integer</type> 482 <type>integer</type>
470 </word> 483 </word>
471 <word> 484 <word>
472 - <id>25</id> 485 + <id>26</id>
473 <length>null</length> 486 <length>null</length>
474 <decimal>null</decimal> 487 <decimal>null</decimal>
475 <array>false</array> 488 <array>false</array>
@@ -477,12 +490,12 @@ @@ -477,12 +490,12 @@
477 <unsigned>false</unsigned> 490 <unsigned>false</unsigned>
478 <args></args> 491 <args></args>
479 <description></description> 492 <description></description>
480 - <logical_name>id_classe</logical_name>  
481 - <physical_name>id_classe</physical_name> 493 + <logical_name>id_agregaregiao</logical_name>
  494 + <physical_name>id_agregaregiao</physical_name>
482 <type>integer</type> 495 <type>integer</type>
483 </word> 496 </word>
484 <word> 497 <word>
485 - <id>26</id> 498 + <id>27</id>
486 <length>null</length> 499 <length>null</length>
487 <decimal>null</decimal> 500 <decimal>null</decimal>
488 <array>false</array> 501 <array>false</array>
@@ -490,12 +503,12 @@ @@ -490,12 +503,12 @@
490 <unsigned>false</unsigned> 503 <unsigned>false</unsigned>
491 <args></args> 504 <args></args>
492 <description></description> 505 <description></description>
493 - <logical_name>id_classificacao</logical_name>  
494 - <physical_name>id_classificacao</physical_name> 506 + <logical_name>id_classe</logical_name>
  507 + <physical_name>id_classe</physical_name>
495 <type>integer</type> 508 <type>integer</type>
496 </word> 509 </word>
497 <word> 510 <word>
498 - <id>27</id> 511 + <id>28</id>
499 <length>null</length> 512 <length>null</length>
500 <decimal>null</decimal> 513 <decimal>null</decimal>
501 <array>false</array> 514 <array>false</array>
@@ -503,12 +516,12 @@ @@ -503,12 +516,12 @@
503 <unsigned>false</unsigned> 516 <unsigned>false</unsigned>
504 <args></args> 517 <args></args>
505 <description></description> 518 <description></description>
506 - <logical_name>id_dimensao_medida</logical_name>  
507 - <physical_name>id_dimensao_medida</physical_name> 519 + <logical_name>id_classificacao</logical_name>
  520 + <physical_name>id_classificacao</physical_name>
508 <type>integer</type> 521 <type>integer</type>
509 </word> 522 </word>
510 <word> 523 <word>
511 - <id>28</id> 524 + <id>29</id>
512 <length>null</length> 525 <length>null</length>
513 <decimal>null</decimal> 526 <decimal>null</decimal>
514 <array>false</array> 527 <array>false</array>
@@ -521,7 +534,7 @@ @@ -521,7 +534,7 @@
521 <type>integer</type> 534 <type>integer</type>
522 </word> 535 </word>
523 <word> 536 <word>
524 - <id>29</id> 537 + <id>30</id>
525 <length>null</length> 538 <length>null</length>
526 <decimal>null</decimal> 539 <decimal>null</decimal>
527 <array>false</array> 540 <array>false</array>
@@ -534,7 +547,7 @@ @@ -534,7 +547,7 @@
534 <type>integer</type> 547 <type>integer</type>
535 </word> 548 </word>
536 <word> 549 <word>
537 - <id>30</id> 550 + <id>31</id>
538 <length>null</length> 551 <length>null</length>
539 <decimal>null</decimal> 552 <decimal>null</decimal>
540 <array>false</array> 553 <array>false</array>
@@ -547,7 +560,33 @@ @@ -547,7 +560,33 @@
547 <type>integer</type> 560 <type>integer</type>
548 </word> 561 </word>
549 <word> 562 <word>
550 - <id>31</id> 563 + <id>32</id>
  564 + <length>null</length>
  565 + <decimal>null</decimal>
  566 + <array>false</array>
  567 + <array_dimension>null</array_dimension>
  568 + <unsigned>false</unsigned>
  569 + <args></args>
  570 + <description>(0 ou 1) indica se a coluna de valores da variável deve ser agregada ou não (soma dos valores ou média) conforme o tipo de unidade de medida</description>
  571 + <logical_name>id_pai</logical_name>
  572 + <physical_name>id_pai</physical_name>
  573 + <type>integer</type>
  574 + </word>
  575 + <word>
  576 + <id>33</id>
  577 + <length>null</length>
  578 + <decimal>null</decimal>
  579 + <array>false</array>
  580 + <array_dimension>null</array_dimension>
  581 + <unsigned>false</unsigned>
  582 + <args></args>
  583 + <description></description>
  584 + <logical_name>id_parametro_medida</logical_name>
  585 + <physical_name>id_parametro_medida</physical_name>
  586 + <type>integer</type>
  587 + </word>
  588 + <word>
  589 + <id>34</id>
551 <length>null</length> 590 <length>null</length>
552 <decimal>null</decimal> 591 <decimal>null</decimal>
553 <array>false</array> 592 <array>false</array>
@@ -560,7 +599,7 @@ @@ -560,7 +599,7 @@
560 <type>text</type> 599 <type>text</type>
561 </word> 600 </word>
562 <word> 601 <word>
563 - <id>32</id> 602 + <id>35</id>
564 <length>null</length> 603 <length>null</length>
565 <decimal>null</decimal> 604 <decimal>null</decimal>
566 <array>false</array> 605 <array>false</array>
@@ -573,7 +612,7 @@ @@ -573,7 +612,7 @@
573 <type>text</type> 612 <type>text</type>
574 </word> 613 </word>
575 <word> 614 <word>
576 - <id>33</id> 615 + <id>36</id>
577 <length>null</length> 616 <length>null</length>
578 <decimal>null</decimal> 617 <decimal>null</decimal>
579 <array>false</array> 618 <array>false</array>
@@ -586,7 +625,7 @@ @@ -586,7 +625,7 @@
586 <type>text</type> 625 <type>text</type>
587 </word> 626 </word>
588 <word> 627 <word>
589 - <id>34</id> 628 + <id>37</id>
590 <length>null</length> 629 <length>null</length>
591 <decimal>null</decimal> 630 <decimal>null</decimal>
592 <array>false</array> 631 <array>false</array>
@@ -599,7 +638,7 @@ @@ -599,7 +638,7 @@
599 <type>text</type> 638 <type>text</type>
600 </word> 639 </word>
601 <word> 640 <word>
602 - <id>35</id> 641 + <id>38</id>
603 <length>null</length> 642 <length>null</length>
604 <decimal>null</decimal> 643 <decimal>null</decimal>
605 <array>false</array> 644 <array>false</array>
@@ -612,7 +651,7 @@ @@ -612,7 +651,7 @@
612 <type>text</type> 651 <type>text</type>
613 </word> 652 </word>
614 <word> 653 <word>
615 - <id>36</id> 654 + <id>39</id>
616 <length>null</length> 655 <length>null</length>
617 <decimal>null</decimal> 656 <decimal>null</decimal>
618 <array>false</array> 657 <array>false</array>
@@ -625,7 +664,7 @@ @@ -625,7 +664,7 @@
625 <type>text</type> 664 <type>text</type>
626 </word> 665 </word>
627 <word> 666 <word>
628 - <id>37</id> 667 + <id>40</id>
629 <length>null</length> 668 <length>null</length>
630 <decimal>null</decimal> 669 <decimal>null</decimal>
631 <array>false</array> 670 <array>false</array>
@@ -638,7 +677,7 @@ @@ -638,7 +677,7 @@
638 <type>text</type> 677 <type>text</type>
639 </word> 678 </word>
640 <word> 679 <word>
641 - <id>38</id> 680 + <id>41</id>
642 <length>null</length> 681 <length>null</length>
643 <decimal>null</decimal> 682 <decimal>null</decimal>
644 <array>false</array> 683 <array>false</array>
@@ -646,12 +685,12 @@ @@ -646,12 +685,12 @@
646 <unsigned>false</unsigned> 685 <unsigned>false</unsigned>
647 <args></args> 686 <args></args>
648 <description></description> 687 <description></description>
649 - <logical_name>nomedimensao</logical_name>  
650 - <physical_name>nomedimensao</physical_name> 688 + <logical_name>nome</logical_name>
  689 + <physical_name>nome</physical_name>
651 <type>text</type> 690 <type>text</type>
652 </word> 691 </word>
653 <word> 692 <word>
654 - <id>39</id> 693 + <id>42</id>
655 <length>null</length> 694 <length>null</length>
656 <decimal>null</decimal> 695 <decimal>null</decimal>
657 <array>false</array> 696 <array>false</array>
@@ -664,7 +703,7 @@ @@ -664,7 +703,7 @@
664 <type>text</type> 703 <type>text</type>
665 </word> 704 </word>
666 <word> 705 <word>
667 - <id>40</id> 706 + <id>43</id>
668 <length>null</length> 707 <length>null</length>
669 <decimal>null</decimal> 708 <decimal>null</decimal>
670 <array>false</array> 709 <array>false</array>
@@ -677,7 +716,7 @@ @@ -677,7 +716,7 @@
677 <type>text</type> 716 <type>text</type>
678 </word> 717 </word>
679 <word> 718 <word>
680 - <id>41</id> 719 + <id>44</id>
681 <length>null</length> 720 <length>null</length>
682 <decimal>null</decimal> 721 <decimal>null</decimal>
683 <array>false</array> 722 <array>false</array>
@@ -690,7 +729,7 @@ @@ -690,7 +729,7 @@
690 <type>text</type> 729 <type>text</type>
691 </word> 730 </word>
692 <word> 731 <word>
693 - <id>42</id> 732 + <id>45</id>
694 <length>null</length> 733 <length>null</length>
695 <decimal>null</decimal> 734 <decimal>null</decimal>
696 <array>false</array> 735 <array>false</array>
@@ -703,7 +742,7 @@ @@ -703,7 +742,7 @@
703 <type>text</type> 742 <type>text</type>
704 </word> 743 </word>
705 <word> 744 <word>
706 - <id>43</id> 745 + <id>46</id>
707 <length>null</length> 746 <length>null</length>
708 <decimal>null</decimal> 747 <decimal>null</decimal>
709 <array>false</array> 748 <array>false</array>
@@ -716,7 +755,7 @@ @@ -716,7 +755,7 @@
716 <type>text</type> 755 <type>text</type>
717 </word> 756 </word>
718 <word> 757 <word>
719 - <id>44</id> 758 + <id>47</id>
720 <length>null</length> 759 <length>null</length>
721 <decimal>null</decimal> 760 <decimal>null</decimal>
722 <array>false</array> 761 <array>false</array>
@@ -729,7 +768,7 @@ @@ -729,7 +768,7 @@
729 <type>text</type> 768 <type>text</type>
730 </word> 769 </word>
731 <word> 770 <word>
732 - <id>45</id> 771 + <id>48</id>
733 <length>null</length> 772 <length>null</length>
734 <decimal>null</decimal> 773 <decimal>null</decimal>
735 <array>false</array> 774 <array>false</array>
@@ -742,7 +781,7 @@ @@ -742,7 +781,7 @@
742 <type>text</type> 781 <type>text</type>
743 </word> 782 </word>
744 <word> 783 <word>
745 - <id>46</id> 784 + <id>49</id>
746 <length>null</length> 785 <length>null</length>
747 <decimal>null</decimal> 786 <decimal>null</decimal>
748 <array>false</array> 787 <array>false</array>
@@ -755,7 +794,7 @@ @@ -755,7 +794,7 @@
755 <type>integer</type> 794 <type>integer</type>
756 </word> 795 </word>
757 <word> 796 <word>
758 - <id>47</id> 797 + <id>50</id>
759 <length>null</length> 798 <length>null</length>
760 <decimal>null</decimal> 799 <decimal>null</decimal>
761 <array>false</array> 800 <array>false</array>
@@ -768,7 +807,7 @@ @@ -768,7 +807,7 @@
768 <type>integer</type> 807 <type>integer</type>
769 </word> 808 </word>
770 <word> 809 <word>
771 - <id>48</id> 810 + <id>51</id>
772 <length>null</length> 811 <length>null</length>
773 <decimal>null</decimal> 812 <decimal>null</decimal>
774 <array>false</array> 813 <array>false</array>
@@ -781,7 +820,7 @@ @@ -781,7 +820,7 @@
781 <type>text</type> 820 <type>text</type>
782 </word> 821 </word>
783 <word> 822 <word>
784 - <id>49</id> 823 + <id>52</id>
785 <length>null</length> 824 <length>null</length>
786 <decimal>null</decimal> 825 <decimal>null</decimal>
787 <array>false</array> 826 <array>false</array>
@@ -794,7 +833,7 @@ @@ -794,7 +833,7 @@
794 <type>text</type> 833 <type>text</type>
795 </word> 834 </word>
796 <word> 835 <word>
797 - <id>50</id> 836 + <id>53</id>
798 <length>null</length> 837 <length>null</length>
799 <decimal>null</decimal> 838 <decimal>null</decimal>
800 <array>false</array> 839 <array>false</array>
@@ -807,7 +846,7 @@ @@ -807,7 +846,7 @@
807 <type>text</type> 846 <type>text</type>
808 </word> 847 </word>
809 <word> 848 <word>
810 - <id>51</id> 849 + <id>54</id>
811 <length>null</length> 850 <length>null</length>
812 <decimal>null</decimal> 851 <decimal>null</decimal>
813 <array>false</array> 852 <array>false</array>
@@ -820,7 +859,7 @@ @@ -820,7 +859,7 @@
820 <type>text</type> 859 <type>text</type>
821 </word> 860 </word>
822 <word> 861 <word>
823 - <id>52</id> 862 + <id>55</id>
824 <length>null</length> 863 <length>null</length>
825 <decimal>null</decimal> 864 <decimal>null</decimal>
826 <array>false</array> 865 <array>false</array>
@@ -833,7 +872,7 @@ @@ -833,7 +872,7 @@
833 <type>text</type> 872 <type>text</type>
834 </word> 873 </word>
835 <word> 874 <word>
836 - <id>53</id> 875 + <id>56</id>
837 <length>null</length> 876 <length>null</length>
838 <decimal>null</decimal> 877 <decimal>null</decimal>
839 <array>false</array> 878 <array>false</array>
@@ -846,7 +885,7 @@ @@ -846,7 +885,7 @@
846 <type>text</type> 885 <type>text</type>
847 </word> 886 </word>
848 <word> 887 <word>
849 - <id>54</id> 888 + <id>57</id>
850 <length>null</length> 889 <length>null</length>
851 <decimal>null</decimal> 890 <decimal>null</decimal>
852 <array>false</array> 891 <array>false</array>
@@ -859,7 +898,7 @@ @@ -859,7 +898,7 @@
859 <type>text</type> 898 <type>text</type>
860 </word> 899 </word>
861 <word> 900 <word>
862 - <id>55</id> 901 + <id>58</id>
863 <length>null</length> 902 <length>null</length>
864 <decimal>null</decimal> 903 <decimal>null</decimal>
865 <array>false</array> 904 <array>false</array>
@@ -872,33 +911,33 @@ @@ -872,33 +911,33 @@
872 <type>text</type> 911 <type>text</type>
873 </word> 912 </word>
874 <word> 913 <word>
875 - <id>56</id> 914 + <id>59</id>
876 <length>null</length> 915 <length>null</length>
877 <decimal>null</decimal> 916 <decimal>null</decimal>
878 <array>false</array> 917 <array>false</array>
879 <array_dimension>null</array_dimension> 918 <array_dimension>null</array_dimension>
880 <unsigned>false</unsigned> 919 <unsigned>false</unsigned>
881 <args></args> 920 <args></args>
882 - <description>Título da classe</description> 921 + <description>Título completo da fonte, devendo conter o ano quando for o caso</description>
883 <logical_name>titulo</logical_name> 922 <logical_name>titulo</logical_name>
884 <physical_name>titulo</physical_name> 923 <physical_name>titulo</physical_name>
885 <type>text</type> 924 <type>text</type>
886 </word> 925 </word>
887 <word> 926 <word>
888 - <id>57</id> 927 + <id>60</id>
889 <length>null</length> 928 <length>null</length>
890 <decimal>null</decimal> 929 <decimal>null</decimal>
891 <array>false</array> 930 <array>false</array>
892 <array_dimension>null</array_dimension> 931 <array_dimension>null</array_dimension>
893 <unsigned>false</unsigned> 932 <unsigned>false</unsigned>
894 <args></args> 933 <args></args>
895 - <description>Título completo da fonte, devendo conter o ano quando for o caso</description> 934 + <description>Título da classe</description>
896 <logical_name>titulo</logical_name> 935 <logical_name>titulo</logical_name>
897 <physical_name>titulo</physical_name> 936 <physical_name>titulo</physical_name>
898 <type>text</type> 937 <type>text</type>
899 </word> 938 </word>
900 <word> 939 <word>
901 - <id>58</id> 940 + <id>61</id>
902 <length>null</length> 941 <length>null</length>
903 <decimal>null</decimal> 942 <decimal>null</decimal>
904 <array>false</array> 943 <array>false</array>
@@ -911,7 +950,7 @@ @@ -911,7 +950,7 @@
911 <type>text</type> 950 <type>text</type>
912 </word> 951 </word>
913 <word> 952 <word>
914 - <id>59</id> 953 + <id>62</id>
915 <length>null</length> 954 <length>null</length>
916 <decimal>null</decimal> 955 <decimal>null</decimal>
917 <array>false</array> 956 <array>false</array>
@@ -924,7 +963,7 @@ @@ -924,7 +963,7 @@
924 <type>text</type> 963 <type>text</type>
925 </word> 964 </word>
926 <word> 965 <word>
927 - <id>60</id> 966 + <id>63</id>
928 <length>null</length> 967 <length>null</length>
929 <decimal>null</decimal> 968 <decimal>null</decimal>
930 <array>false</array> 969 <array>false</array>
@@ -942,23 +981,6 @@ @@ -942,23 +981,6 @@
942 <contents> 981 <contents>
943 <note> 982 <note>
944 <id>0</id> 983 <id>0</id>
945 - <height>135</height>  
946 - <width>120</width>  
947 - <font_name>Ubuntu</font_name>  
948 - <font_size>9</font_size>  
949 - <x>-328</x>  
950 - <y>584</y>  
951 - <color>  
952 - <r>255</r>  
953 - <g>255</g>  
954 - <b>255</b>  
955 - </color>  
956 - <connections>  
957 - </connections>  
958 - <text>Esta tabela deverá ser sempre juntada com a tabela medida_variavel por meio de JOIN</text>  
959 - </note>  
960 - <note>  
961 - <id>1</id>  
962 <height>75</height> 984 <height>75</height>
963 <width>365</width> 985 <width>365</width>
964 <font_name>Ubuntu</font_name> 986 <font_name>Ubuntu</font_name>
@@ -975,7 +997,7 @@ @@ -975,7 +997,7 @@
975 <text>Modelo de dados do sistema de metadados estatísticos do i3Geo</text> 997 <text>Modelo de dados do sistema de metadados estatísticos do i3Geo</text>
976 </note> 998 </note>
977 <note> 999 <note>
978 - <id>2</id> 1000 + <id>1</id>
979 <height>-1</height> 1001 <height>-1</height>
980 <width>-1</width> 1002 <width>-1</width>
981 <font_name>Ubuntu</font_name> 1003 <font_name>Ubuntu</font_name>
@@ -992,7 +1014,7 @@ @@ -992,7 +1014,7 @@
992 <text>Os nomes de colunas podem &#x0A;receber funções, por exemplo, &#x0A;pode-se agregar as geometrias de &#x0A;COLUNAGEO ou somar valores de&#x0A;COLUNAVALOR</text> 1014 <text>Os nomes de colunas podem &#x0A;receber funções, por exemplo, &#x0A;pode-se agregar as geometrias de &#x0A;COLUNAGEO ou somar valores de&#x0A;COLUNAVALOR</text>
993 </note> 1015 </note>
994 <table> 1016 <table>
995 - <id>3</id> 1017 + <id>2</id>
996 <height>107</height> 1018 <height>107</height>
997 <width>242</width> 1019 <width>242</width>
998 <font_name>Ubuntu</font_name> 1020 <font_name>Ubuntu</font_name>
@@ -1046,7 +1068,7 @@ @@ -1046,7 +1068,7 @@
1046 </sequence> 1068 </sequence>
1047 </normal_column> 1069 </normal_column>
1048 <normal_column> 1070 <normal_column>
1049 - <word_id>34</word_id> 1071 + <word_id>36</word_id>
1050 <id>1</id> 1072 <id>1</id>
1051 <description></description> 1073 <description></description>
1052 <unique_key_name></unique_key_name> 1074 <unique_key_name></unique_key_name>
@@ -1078,7 +1100,7 @@ @@ -1078,7 +1100,7 @@
1078 </sequence> 1100 </sequence>
1079 </normal_column> 1101 </normal_column>
1080 <normal_column> 1102 <normal_column>
1081 - <word_id>50</word_id> 1103 + <word_id>53</word_id>
1082 <id>2</id> 1104 <id>2</id>
1083 <description></description> 1105 <description></description>
1084 <unique_key_name></unique_key_name> 1106 <unique_key_name></unique_key_name>
@@ -1110,7 +1132,7 @@ @@ -1110,7 +1132,7 @@
1110 </sequence> 1132 </sequence>
1111 </normal_column> 1133 </normal_column>
1112 <normal_column> 1134 <normal_column>
1113 - <word_id>47</word_id> 1135 + <word_id>50</word_id>
1114 <id>3</id> 1136 <id>3</id>
1115 <description></description> 1137 <description></description>
1116 <unique_key_name></unique_key_name> 1138 <unique_key_name></unique_key_name>
@@ -1142,7 +1164,7 @@ @@ -1142,7 +1164,7 @@
1142 </sequence> 1164 </sequence>
1143 </normal_column> 1165 </normal_column>
1144 <normal_column> 1166 <normal_column>
1145 - <word_id>46</word_id> 1167 + <word_id>49</word_id>
1146 <id>4</id> 1168 <id>4</id>
1147 <description></description> 1169 <description></description>
1148 <unique_key_name></unique_key_name> 1170 <unique_key_name></unique_key_name>
@@ -1183,7 +1205,7 @@ @@ -1183,7 +1205,7 @@
1183 </table_properties> 1205 </table_properties>
1184 </table> 1206 </table>
1185 <table> 1207 <table>
1186 - <id>4</id> 1208 + <id>3</id>
1187 <height>107</height> 1209 <height>107</height>
1188 <width>280</width> 1210 <width>280</width>
1189 <font_name>Ubuntu</font_name> 1211 <font_name>Ubuntu</font_name>
@@ -1205,7 +1227,7 @@ @@ -1205,7 +1227,7 @@
1205 <option></option> 1227 <option></option>
1206 <columns> 1228 <columns>
1207 <normal_column> 1229 <normal_column>
1208 - <word_id>4</word_id> 1230 + <word_id>3</word_id>
1209 <id>5</id> 1231 <id>5</id>
1210 <description></description> 1232 <description></description>
1211 <unique_key_name></unique_key_name> 1233 <unique_key_name></unique_key_name>
@@ -1237,7 +1259,7 @@ @@ -1237,7 +1259,7 @@
1237 </sequence> 1259 </sequence>
1238 </normal_column> 1260 </normal_column>
1239 <normal_column> 1261 <normal_column>
1240 - <word_id>36</word_id> 1262 + <word_id>40</word_id>
1241 <id>6</id> 1263 <id>6</id>
1242 <description></description> 1264 <description></description>
1243 <unique_key_name></unique_key_name> 1265 <unique_key_name></unique_key_name>
@@ -1310,7 +1332,7 @@ @@ -1310,7 +1332,7 @@
1310 </table_properties> 1332 </table_properties>
1311 </table> 1333 </table>
1312 <table> 1334 <table>
1313 - <id>5</id> 1335 + <id>4</id>
1314 <height>107</height> 1336 <height>107</height>
1315 <width>250</width> 1337 <width>250</width>
1316 <font_name>Ubuntu</font_name> 1338 <font_name>Ubuntu</font_name>
@@ -1364,7 +1386,7 @@ @@ -1364,7 +1386,7 @@
1364 </sequence> 1386 </sequence>
1365 </normal_column> 1387 </normal_column>
1366 <normal_column> 1388 <normal_column>
1367 - <word_id>35</word_id> 1389 + <word_id>38</word_id>
1368 <id>9</id> 1390 <id>9</id>
1369 <description></description> 1391 <description></description>
1370 <unique_key_name></unique_key_name> 1392 <unique_key_name></unique_key_name>
@@ -1396,7 +1418,7 @@ @@ -1396,7 +1418,7 @@
1396 </sequence> 1418 </sequence>
1397 </normal_column> 1419 </normal_column>
1398 <normal_column> 1420 <normal_column>
1399 - <word_id>16</word_id> 1421 + <word_id>18</word_id>
1400 <id>10</id> 1422 <id>10</id>
1401 <description></description> 1423 <description></description>
1402 <unique_key_name></unique_key_name> 1424 <unique_key_name></unique_key_name>
@@ -1437,51 +1459,29 @@ @@ -1437,51 +1459,29 @@
1437 </table_properties> 1459 </table_properties>
1438 </table> 1460 </table>
1439 <table> 1461 <table>
1440 - <id>6</id> 1462 + <id>5</id>
1441 <height>170</height> 1463 <height>170</height>
1442 <width>292</width> 1464 <width>292</width>
1443 <font_name>Ubuntu</font_name> 1465 <font_name>Ubuntu</font_name>
1444 <font_size>9</font_size> 1466 <font_size>9</font_size>
1445 - <x>387</x>  
1446 - <y>533</y> 1467 + <x>8</x>
  1468 + <y>499</y>
1447 <color> 1469 <color>
1448 - <r>160</r>  
1449 - <g>32</g>  
1450 - <b>240</b> 1470 + <r>255</r>
  1471 + <g>165</g>
  1472 + <b>0</b>
1451 </color> 1473 </color>
1452 <connections> 1474 <connections>
1453 - <relation>  
1454 - <id>0</id>  
1455 - <source>13</source>  
1456 - <target>6</target>  
1457 - <child_cardinality>1..n</child_cardinality>  
1458 - <parent_cardinality>1</parent_cardinality>  
1459 - <reference_for_pk>true</reference_for_pk>  
1460 - <name></name>  
1461 - <on_delete_action>RESTRICT</on_delete_action>  
1462 - <on_update_action>RESTRICT</on_update_action>  
1463 - <source_xp>-1</source_xp>  
1464 - <source_yp>-1</source_yp>  
1465 - <target_xp>-1</target_xp>  
1466 - <target_yp>-1</target_yp>  
1467 - <referenced_column>null</referenced_column>  
1468 - <referenced_complex_unique_key>null</referenced_complex_unique_key>  
1469 - </relation>  
1470 - <comment_connection>  
1471 - <id>1</id>  
1472 - <source>7</source>  
1473 - <target>6</target>  
1474 - </comment_connection>  
1475 </connections> 1475 </connections>
1476 - <physical_name>i3geoestat_dimensao_medida</physical_name>  
1477 - <logical_name>i3geoestat_dimensao_medida</logical_name>  
1478 - <description></description> 1476 + <physical_name>i3geoestat_conexao</physical_name>
  1477 + <logical_name>i3geoestat_conexao</logical_name>
  1478 + <description>Lista controlada dos parâmetros de conexão com o banco de dados onde residem dados</description>
1479 <constraint></constraint> 1479 <constraint></constraint>
1480 <primary_key_name></primary_key_name> 1480 <primary_key_name></primary_key_name>
1481 <option></option> 1481 <option></option>
1482 <columns> 1482 <columns>
1483 <normal_column> 1483 <normal_column>
1484 - <word_id>27</word_id> 1484 + <word_id>2</word_id>
1485 <id>11</id> 1485 <id>11</id>
1486 <description></description> 1486 <description></description>
1487 <unique_key_name></unique_key_name> 1487 <unique_key_name></unique_key_name>
@@ -1513,7 +1513,7 @@ @@ -1513,7 +1513,7 @@
1513 </sequence> 1513 </sequence>
1514 </normal_column> 1514 </normal_column>
1515 <normal_column> 1515 <normal_column>
1516 - <word_id>8</word_id> 1516 + <word_id>1</word_id>
1517 <id>12</id> 1517 <id>12</id>
1518 <description></description> 1518 <description></description>
1519 <unique_key_name></unique_key_name> 1519 <unique_key_name></unique_key_name>
@@ -1545,7 +1545,7 @@ @@ -1545,7 +1545,7 @@
1545 </sequence> 1545 </sequence>
1546 </normal_column> 1546 </normal_column>
1547 <normal_column> 1547 <normal_column>
1548 - <word_id>38</word_id> 1548 + <word_id>24</word_id>
1549 <id>13</id> 1549 <id>13</id>
1550 <description></description> 1550 <description></description>
1551 <unique_key_name></unique_key_name> 1551 <unique_key_name></unique_key_name>
@@ -1577,7 +1577,7 @@ @@ -1577,7 +1577,7 @@
1577 </sequence> 1577 </sequence>
1578 </normal_column> 1578 </normal_column>
1579 <normal_column> 1579 <normal_column>
1580 - <word_id>15</word_id> 1580 + <word_id>51</word_id>
1581 <id>14</id> 1581 <id>14</id>
1582 <description></description> 1582 <description></description>
1583 <unique_key_name></unique_key_name> 1583 <unique_key_name></unique_key_name>
@@ -1609,15 +1609,15 @@ @@ -1609,15 +1609,15 @@
1609 </sequence> 1609 </sequence>
1610 </normal_column> 1610 </normal_column>
1611 <normal_column> 1611 <normal_column>
1612 - <word_id>0</word_id> 1612 + <word_id>61</word_id>
1613 <id>15</id> 1613 <id>15</id>
1614 <description></description> 1614 <description></description>
1615 <unique_key_name></unique_key_name> 1615 <unique_key_name></unique_key_name>
1616 <logical_name></logical_name> 1616 <logical_name></logical_name>
1617 <physical_name></physical_name> 1617 <physical_name></physical_name>
1618 - <type>integer</type> 1618 + <type>text</type>
1619 <constraint></constraint> 1619 <constraint></constraint>
1620 - <default_value>0</default_value> 1620 + <default_value></default_value>
1621 <auto_increment>false</auto_increment> 1621 <auto_increment>false</auto_increment>
1622 <foreign_key>false</foreign_key> 1622 <foreign_key>false</foreign_key>
1623 <not_null>false</not_null> 1623 <not_null>false</not_null>
@@ -1641,18 +1641,17 @@ @@ -1641,18 +1641,17 @@
1641 </sequence> 1641 </sequence>
1642 </normal_column> 1642 </normal_column>
1643 <normal_column> 1643 <normal_column>
  1644 + <word_id>52</word_id>
1644 <id>16</id> 1645 <id>16</id>
1645 - <referenced_column>55</referenced_column>  
1646 - <relation>0</relation>  
1647 <description></description> 1646 <description></description>
1648 <unique_key_name></unique_key_name> 1647 <unique_key_name></unique_key_name>
1649 <logical_name></logical_name> 1648 <logical_name></logical_name>
1650 <physical_name></physical_name> 1649 <physical_name></physical_name>
1651 - <type>integer</type> 1650 + <type>text</type>
1652 <constraint></constraint> 1651 <constraint></constraint>
1653 <default_value></default_value> 1652 <default_value></default_value>
1654 <auto_increment>false</auto_increment> 1653 <auto_increment>false</auto_increment>
1655 - <foreign_key>true</foreign_key> 1654 + <foreign_key>false</foreign_key>
1656 <not_null>false</not_null> 1655 <not_null>false</not_null>
1657 <primary_key>false</primary_key> 1656 <primary_key>false</primary_key>
1658 <unique_key>false</unique_key> 1657 <unique_key>false</unique_key>
@@ -1682,46 +1681,24 @@ @@ -1682,46 +1681,24 @@
1682 <schema></schema> 1681 <schema></schema>
1683 </table_properties> 1682 </table_properties>
1684 </table> 1683 </table>
1685 - <note>  
1686 - <id>7</id>  
1687 - <height>111</height>  
1688 - <width>188</width>  
1689 - <font_name>Ubuntu</font_name>  
1690 - <font_size>9</font_size>  
1691 - <x>748</x>  
1692 - <y>594</y>  
1693 - <color>  
1694 - <r>255</r>  
1695 - <g>255</g>  
1696 - <b>255</b>  
1697 - </color>  
1698 - <connections>  
1699 - </connections>  
1700 - <text>As colunas obtidas da junção de medida_variavel com tipo_regiao podem ser utilizadas para definir uma dimensão</text>  
1701 - </note>  
1702 <table> 1684 <table>
1703 - <id>8</id>  
1704 - <height>275</height>  
1705 - <width>292</width> 1685 + <id>6</id>
  1686 + <height>128</height>
  1687 + <width>247</width>
1706 <font_name>Ubuntu</font_name> 1688 <font_name>Ubuntu</font_name>
1707 <font_size>9</font_size> 1689 <font_size>9</font_size>
1708 - <x>-336</x>  
1709 - <y>236</y> 1690 + <x>673</x>
  1691 + <y>-89</y>
1710 <color> 1692 <color>
1711 - <r>255</r>  
1712 - <g>165</g>  
1713 - <b>0</b> 1693 + <r>230</r>
  1694 + <g>230</g>
  1695 + <b>250</b>
1714 </color> 1696 </color>
1715 <connections> 1697 <connections>
1716 - <comment_connection>  
1717 - <id>2</id>  
1718 - <source>0</source>  
1719 - <target>8</target>  
1720 - </comment_connection>  
1721 <relation> 1698 <relation>
1722 - <id>3</id> 1699 + <id>0</id>
1723 <source>9</source> 1700 <source>9</source>
1724 - <target>8</target> 1701 + <target>6</target>
1725 <child_cardinality>1..n</child_cardinality> 1702 <child_cardinality>1..n</child_cardinality>
1726 <parent_cardinality>1</parent_cardinality> 1703 <parent_cardinality>1</parent_cardinality>
1727 <reference_for_pk>true</reference_for_pk> 1704 <reference_for_pk>true</reference_for_pk>
@@ -1736,15 +1713,15 @@ @@ -1736,15 +1713,15 @@
1736 <referenced_complex_unique_key>null</referenced_complex_unique_key> 1713 <referenced_complex_unique_key>null</referenced_complex_unique_key>
1737 </relation> 1714 </relation>
1738 </connections> 1715 </connections>
1739 - <physical_name>i3geoestat_tipo_regiao</physical_name>  
1740 - <logical_name>i3geoestat_tipo_regiao</logical_name>  
1741 - <description>Identifica as tabelas que possuem colunas com geometrias de determinado local ou região</description> 1716 + <physical_name>i3geoestat_classificacao</physical_name>
  1717 + <logical_name>i3geoestat_classificacao</logical_name>
  1718 + <description>Lista de classificacoes de uma medida de variável</description>
1742 <constraint></constraint> 1719 <constraint></constraint>
1743 <primary_key_name></primary_key_name> 1720 <primary_key_name></primary_key_name>
1744 <option></option> 1721 <option></option>
1745 <columns> 1722 <columns>
1746 <normal_column> 1723 <normal_column>
1747 - <word_id>5</word_id> 1724 + <word_id>28</word_id>
1748 <id>17</id> 1725 <id>17</id>
1749 <description></description> 1726 <description></description>
1750 <unique_key_name></unique_key_name> 1727 <unique_key_name></unique_key_name>
@@ -1776,7 +1753,7 @@ @@ -1776,7 +1753,7 @@
1776 </sequence> 1753 </sequence>
1777 </normal_column> 1754 </normal_column>
1778 <normal_column> 1755 <normal_column>
1779 - <word_id>40</word_id> 1756 + <word_id>37</word_id>
1780 <id>18</id> 1757 <id>18</id>
1781 <description></description> 1758 <description></description>
1782 <unique_key_name></unique_key_name> 1759 <unique_key_name></unique_key_name>
@@ -1808,17 +1785,18 @@ @@ -1808,17 +1785,18 @@
1808 </sequence> 1785 </sequence>
1809 </normal_column> 1786 </normal_column>
1810 <normal_column> 1787 <normal_column>
1811 - <word_id>18</word_id>  
1812 <id>19</id> 1788 <id>19</id>
  1789 + <referenced_column>37</referenced_column>
  1790 + <relation>0</relation>
1813 <description></description> 1791 <description></description>
1814 <unique_key_name></unique_key_name> 1792 <unique_key_name></unique_key_name>
1815 <logical_name></logical_name> 1793 <logical_name></logical_name>
1816 <physical_name></physical_name> 1794 <physical_name></physical_name>
1817 - <type>text</type> 1795 + <type>integer</type>
1818 <constraint></constraint> 1796 <constraint></constraint>
1819 <default_value></default_value> 1797 <default_value></default_value>
1820 <auto_increment>false</auto_increment> 1798 <auto_increment>false</auto_increment>
1821 - <foreign_key>false</foreign_key> 1799 + <foreign_key>true</foreign_key>
1822 <not_null>false</not_null> 1800 <not_null>false</not_null>
1823 <primary_key>false</primary_key> 1801 <primary_key>false</primary_key>
1824 <unique_key>false</unique_key> 1802 <unique_key>false</unique_key>
@@ -1840,18 +1818,17 @@ @@ -1840,18 +1818,17 @@
1840 </sequence> 1818 </sequence>
1841 </normal_column> 1819 </normal_column>
1842 <normal_column> 1820 <normal_column>
  1821 + <word_id>45</word_id>
1843 <id>20</id> 1822 <id>20</id>
1844 - <referenced_column>29</referenced_column>  
1845 - <relation>3</relation>  
1846 <description></description> 1823 <description></description>
1847 <unique_key_name></unique_key_name> 1824 <unique_key_name></unique_key_name>
1848 <logical_name></logical_name> 1825 <logical_name></logical_name>
1849 <physical_name></physical_name> 1826 <physical_name></physical_name>
1850 - <type>integer</type> 1827 + <type>text</type>
1851 <constraint></constraint> 1828 <constraint></constraint>
1852 <default_value></default_value> 1829 <default_value></default_value>
1853 <auto_increment>false</auto_increment> 1830 <auto_increment>false</auto_increment>
1854 - <foreign_key>true</foreign_key> 1831 + <foreign_key>false</foreign_key>
1855 <not_null>false</not_null> 1832 <not_null>false</not_null>
1856 <primary_key>false</primary_key> 1833 <primary_key>false</primary_key>
1857 <unique_key>false</unique_key> 1834 <unique_key>false</unique_key>
@@ -1872,21 +1849,69 @@ @@ -1872,21 +1849,69 @@
1872 <decimal_size>0</decimal_size> 1849 <decimal_size>0</decimal_size>
1873 </sequence> 1850 </sequence>
1874 </normal_column> 1851 </normal_column>
  1852 + </columns>
  1853 + <indexes>
  1854 + </indexes>
  1855 + <complex_unique_key_list>
  1856 + </complex_unique_key_list>
  1857 + <table_properties>
  1858 + <schema></schema>
  1859 + </table_properties>
  1860 + </table>
  1861 + <table>
  1862 + <id>7</id>
  1863 + <height>317</height>
  1864 + <width>210</width>
  1865 + <font_name>Ubuntu</font_name>
  1866 + <font_size>9</font_size>
  1867 + <x>1018</x>
  1868 + <y>-24</y>
  1869 + <color>
  1870 + <r>230</r>
  1871 + <g>230</g>
  1872 + <b>250</b>
  1873 + </color>
  1874 + <connections>
  1875 + <relation>
  1876 + <id>1</id>
  1877 + <source>6</source>
  1878 + <target>7</target>
  1879 + <child_cardinality>1..n</child_cardinality>
  1880 + <parent_cardinality>1</parent_cardinality>
  1881 + <reference_for_pk>true</reference_for_pk>
  1882 + <name></name>
  1883 + <on_delete_action>RESTRICT</on_delete_action>
  1884 + <on_update_action>RESTRICT</on_update_action>
  1885 + <source_xp>-1</source_xp>
  1886 + <source_yp>-1</source_yp>
  1887 + <target_xp>-1</target_xp>
  1888 + <target_yp>-1</target_yp>
  1889 + <referenced_column>null</referenced_column>
  1890 + <referenced_complex_unique_key>null</referenced_complex_unique_key>
  1891 + </relation>
  1892 + </connections>
  1893 + <physical_name>i3geoestat_classes</physical_name>
  1894 + <logical_name>i3geoestat_classes</logical_name>
  1895 + <description>Classes pertencentes a uma classificação</description>
  1896 + <constraint></constraint>
  1897 + <primary_key_name></primary_key_name>
  1898 + <option></option>
  1899 + <columns>
1875 <normal_column> 1900 <normal_column>
1876 - <word_id>20</word_id> 1901 + <word_id>27</word_id>
1877 <id>21</id> 1902 <id>21</id>
1878 <description></description> 1903 <description></description>
1879 <unique_key_name></unique_key_name> 1904 <unique_key_name></unique_key_name>
1880 <logical_name></logical_name> 1905 <logical_name></logical_name>
1881 <physical_name></physical_name> 1906 <physical_name></physical_name>
1882 - <type>text</type> 1907 + <type>integer</type>
1883 <constraint></constraint> 1908 <constraint></constraint>
1884 <default_value></default_value> 1909 <default_value></default_value>
1885 - <auto_increment>false</auto_increment> 1910 + <auto_increment>true</auto_increment>
1886 <foreign_key>false</foreign_key> 1911 <foreign_key>false</foreign_key>
1887 - <not_null>false</not_null>  
1888 - <primary_key>false</primary_key>  
1889 - <unique_key>false</unique_key> 1912 + <not_null>true</not_null>
  1913 + <primary_key>true</primary_key>
  1914 + <unique_key>true</unique_key>
1890 <character_set></character_set> 1915 <character_set></character_set>
1891 <collation></collation> 1916 <collation></collation>
1892 <sequence> 1917 <sequence>
@@ -1905,7 +1930,7 @@ @@ -1905,7 +1930,7 @@
1905 </sequence> 1930 </sequence>
1906 </normal_column> 1931 </normal_column>
1907 <normal_column> 1932 <normal_column>
1908 - <word_id>54</word_id> 1933 + <word_id>22</word_id>
1909 <id>22</id> 1934 <id>22</id>
1910 <description></description> 1935 <description></description>
1911 <unique_key_name></unique_key_name> 1936 <unique_key_name></unique_key_name>
@@ -1937,7 +1962,7 @@ @@ -1937,7 +1962,7 @@
1937 </sequence> 1962 </sequence>
1938 </normal_column> 1963 </normal_column>
1939 <normal_column> 1964 <normal_column>
1940 - <word_id>10</word_id> 1965 + <word_id>60</word_id>
1941 <id>23</id> 1966 <id>23</id>
1942 <description></description> 1967 <description></description>
1943 <unique_key_name></unique_key_name> 1968 <unique_key_name></unique_key_name>
@@ -1969,7 +1994,7 @@ @@ -1969,7 +1994,7 @@
1969 </sequence> 1994 </sequence>
1970 </normal_column> 1995 </normal_column>
1971 <normal_column> 1996 <normal_column>
1972 - <word_id>14</word_id> 1997 + <word_id>63</word_id>
1973 <id>24</id> 1998 <id>24</id>
1974 <description></description> 1999 <description></description>
1975 <unique_key_name></unique_key_name> 2000 <unique_key_name></unique_key_name>
@@ -2001,13 +2026,13 @@ @@ -2001,13 +2026,13 @@
2001 </sequence> 2026 </sequence>
2002 </normal_column> 2027 </normal_column>
2003 <normal_column> 2028 <normal_column>
2004 - <word_id>24</word_id> 2029 + <word_id>62</word_id>
2005 <id>25</id> 2030 <id>25</id>
2006 <description></description> 2031 <description></description>
2007 <unique_key_name></unique_key_name> 2032 <unique_key_name></unique_key_name>
2008 <logical_name></logical_name> 2033 <logical_name></logical_name>
2009 <physical_name></physical_name> 2034 <physical_name></physical_name>
2010 - <type>integer</type> 2035 + <type>text</type>
2011 <constraint></constraint> 2036 <constraint></constraint>
2012 <default_value></default_value> 2037 <default_value></default_value>
2013 <auto_increment>false</auto_increment> 2038 <auto_increment>false</auto_increment>
@@ -2033,7 +2058,7 @@ @@ -2033,7 +2058,7 @@
2033 </sequence> 2058 </sequence>
2034 </normal_column> 2059 </normal_column>
2035 <normal_column> 2060 <normal_column>
2036 - <word_id>12</word_id> 2061 + <word_id>0</word_id>
2037 <id>26</id> 2062 <id>26</id>
2038 <description></description> 2063 <description></description>
2039 <unique_key_name></unique_key_name> 2064 <unique_key_name></unique_key_name>
@@ -2065,17 +2090,18 @@ @@ -2065,17 +2090,18 @@
2065 </sequence> 2090 </sequence>
2066 </normal_column> 2091 </normal_column>
2067 <normal_column> 2092 <normal_column>
2068 - <word_id>52</word_id>  
2069 <id>27</id> 2093 <id>27</id>
  2094 + <referenced_column>17</referenced_column>
  2095 + <relation>1</relation>
2070 <description></description> 2096 <description></description>
2071 <unique_key_name></unique_key_name> 2097 <unique_key_name></unique_key_name>
2072 <logical_name></logical_name> 2098 <logical_name></logical_name>
2073 <physical_name></physical_name> 2099 <physical_name></physical_name>
2074 - <type>text</type> 2100 + <type>integer</type>
2075 <constraint></constraint> 2101 <constraint></constraint>
2076 - <default_value>4326</default_value> 2102 + <default_value></default_value>
2077 <auto_increment>false</auto_increment> 2103 <auto_increment>false</auto_increment>
2078 - <foreign_key>false</foreign_key> 2104 + <foreign_key>true</foreign_key>
2079 <not_null>false</not_null> 2105 <not_null>false</not_null>
2080 <primary_key>false</primary_key> 2106 <primary_key>false</primary_key>
2081 <unique_key>false</unique_key> 2107 <unique_key>false</unique_key>
@@ -2097,7 +2123,7 @@ @@ -2097,7 +2123,7 @@
2097 </sequence> 2123 </sequence>
2098 </normal_column> 2124 </normal_column>
2099 <normal_column> 2125 <normal_column>
2100 - <word_id>9</word_id> 2126 + <word_id>58</word_id>
2101 <id>28</id> 2127 <id>28</id>
2102 <description></description> 2128 <description></description>
2103 <unique_key_name></unique_key_name> 2129 <unique_key_name></unique_key_name>
@@ -2128,52 +2154,21 @@ @@ -2128,52 +2154,21 @@
2128 <decimal_size>0</decimal_size> 2154 <decimal_size>0</decimal_size>
2129 </sequence> 2155 </sequence>
2130 </normal_column> 2156 </normal_column>
2131 - </columns>  
2132 - <indexes>  
2133 - </indexes>  
2134 - <complex_unique_key_list>  
2135 - </complex_unique_key_list>  
2136 - <table_properties>  
2137 - <schema></schema>  
2138 - </table_properties>  
2139 - </table>  
2140 - <table>  
2141 - <id>9</id>  
2142 - <height>170</height>  
2143 - <width>292</width>  
2144 - <font_name>Ubuntu</font_name>  
2145 - <font_size>9</font_size>  
2146 - <x>8</x>  
2147 - <y>499</y>  
2148 - <color>  
2149 - <r>255</r>  
2150 - <g>165</g>  
2151 - <b>0</b>  
2152 - </color>  
2153 - <connections>  
2154 - </connections>  
2155 - <physical_name>i3geoestat_conexao</physical_name>  
2156 - <logical_name>i3geoestat_conexao</logical_name>  
2157 - <description>Lista controlada dos parâmetros de conexão com o banco de dados onde residem dados</description>  
2158 - <constraint></constraint>  
2159 - <primary_key_name></primary_key_name>  
2160 - <option></option>  
2161 - <columns>  
2162 <normal_column> 2157 <normal_column>
2163 - <word_id>3</word_id> 2158 + <word_id>54</word_id>
2164 <id>29</id> 2159 <id>29</id>
2165 <description></description> 2160 <description></description>
2166 <unique_key_name></unique_key_name> 2161 <unique_key_name></unique_key_name>
2167 <logical_name></logical_name> 2162 <logical_name></logical_name>
2168 <physical_name></physical_name> 2163 <physical_name></physical_name>
2169 - <type>integer</type> 2164 + <type>text</type>
2170 <constraint></constraint> 2165 <constraint></constraint>
2171 <default_value></default_value> 2166 <default_value></default_value>
2172 - <auto_increment>true</auto_increment> 2167 + <auto_increment>false</auto_increment>
2173 <foreign_key>false</foreign_key> 2168 <foreign_key>false</foreign_key>
2174 - <not_null>true</not_null>  
2175 - <primary_key>true</primary_key>  
2176 - <unique_key>true</unique_key> 2169 + <not_null>false</not_null>
  2170 + <primary_key>false</primary_key>
  2171 + <unique_key>false</unique_key>
2177 <character_set></character_set> 2172 <character_set></character_set>
2178 <collation></collation> 2173 <collation></collation>
2179 <sequence> 2174 <sequence>
@@ -2192,7 +2187,7 @@ @@ -2192,7 +2187,7 @@
2192 </sequence> 2187 </sequence>
2193 </normal_column> 2188 </normal_column>
2194 <normal_column> 2189 <normal_column>
2195 - <word_id>2</word_id> 2190 + <word_id>48</word_id>
2196 <id>30</id> 2191 <id>30</id>
2197 <description></description> 2192 <description></description>
2198 <unique_key_name></unique_key_name> 2193 <unique_key_name></unique_key_name>
@@ -2224,7 +2219,7 @@ @@ -2224,7 +2219,7 @@
2224 </sequence> 2219 </sequence>
2225 </normal_column> 2220 </normal_column>
2226 <normal_column> 2221 <normal_column>
2227 - <word_id>23</word_id> 2222 + <word_id>47</word_id>
2228 <id>31</id> 2223 <id>31</id>
2229 <description></description> 2224 <description></description>
2230 <unique_key_name></unique_key_name> 2225 <unique_key_name></unique_key_name>
@@ -2256,7 +2251,7 @@ @@ -2256,7 +2251,7 @@
2256 </sequence> 2251 </sequence>
2257 </normal_column> 2252 </normal_column>
2258 <normal_column> 2253 <normal_column>
2259 - <word_id>48</word_id> 2254 + <word_id>44</word_id>
2260 <id>32</id> 2255 <id>32</id>
2261 <description></description> 2256 <description></description>
2262 <unique_key_name></unique_key_name> 2257 <unique_key_name></unique_key_name>
@@ -2288,7 +2283,7 @@ @@ -2288,7 +2283,7 @@
2288 </sequence> 2283 </sequence>
2289 </normal_column> 2284 </normal_column>
2290 <normal_column> 2285 <normal_column>
2291 - <word_id>58</word_id> 2286 + <word_id>46</word_id>
2292 <id>33</id> 2287 <id>33</id>
2293 <description></description> 2288 <description></description>
2294 <unique_key_name></unique_key_name> 2289 <unique_key_name></unique_key_name>
@@ -2319,13 +2314,76 @@ @@ -2319,13 +2314,76 @@
2319 <decimal_size>0</decimal_size> 2314 <decimal_size>0</decimal_size>
2320 </sequence> 2315 </sequence>
2321 </normal_column> 2316 </normal_column>
  2317 + </columns>
  2318 + <indexes>
  2319 + </indexes>
  2320 + <complex_unique_key_list>
  2321 + </complex_unique_key_list>
  2322 + <table_properties>
  2323 + <schema></schema>
  2324 + </table_properties>
  2325 + </table>
  2326 + <table>
  2327 + <id>8</id>
  2328 + <height>107</height>
  2329 + <width>228</width>
  2330 + <font_name>Ubuntu</font_name>
  2331 + <font_size>9</font_size>
  2332 + <x>937</x>
  2333 + <y>321</y>
  2334 + <color>
  2335 + <r>144</r>
  2336 + <g>238</g>
  2337 + <b>144</b>
  2338 + </color>
  2339 + <connections>
  2340 + </connections>
  2341 + <physical_name>i3geoestat_fonteinfo</physical_name>
  2342 + <logical_name>i3geoestat_fonteinfo</logical_name>
  2343 + <description></description>
  2344 + <constraint></constraint>
  2345 + <primary_key_name></primary_key_name>
  2346 + <option></option>
  2347 + <columns>
2322 <normal_column> 2348 <normal_column>
2323 - <word_id>49</word_id> 2349 + <word_id>29</word_id>
2324 <id>34</id> 2350 <id>34</id>
2325 <description></description> 2351 <description></description>
2326 <unique_key_name></unique_key_name> 2352 <unique_key_name></unique_key_name>
2327 <logical_name></logical_name> 2353 <logical_name></logical_name>
2328 <physical_name></physical_name> 2354 <physical_name></physical_name>
  2355 + <type>integer</type>
  2356 + <constraint></constraint>
  2357 + <default_value></default_value>
  2358 + <auto_increment>true</auto_increment>
  2359 + <foreign_key>false</foreign_key>
  2360 + <not_null>true</not_null>
  2361 + <primary_key>true</primary_key>
  2362 + <unique_key>true</unique_key>
  2363 + <character_set></character_set>
  2364 + <collation></collation>
  2365 + <sequence>
  2366 + <name></name>
  2367 + <schema></schema>
  2368 + <increment></increment>
  2369 + <min_value></min_value>
  2370 + <max_value></max_value>
  2371 + <start></start>
  2372 + <cache></cache>
  2373 + <cycle>false</cycle>
  2374 + <order>false</order>
  2375 + <description></description>
  2376 + <data_type></data_type>
  2377 + <decimal_size>0</decimal_size>
  2378 + </sequence>
  2379 + </normal_column>
  2380 + <normal_column>
  2381 + <word_id>59</word_id>
  2382 + <id>35</id>
  2383 + <description></description>
  2384 + <unique_key_name></unique_key_name>
  2385 + <logical_name></logical_name>
  2386 + <physical_name></physical_name>
2329 <type>text</type> 2387 <type>text</type>
2330 <constraint></constraint> 2388 <constraint></constraint>
2331 <default_value></default_value> 2389 <default_value></default_value>
@@ -2333,7 +2391,39 @@ @@ -2333,7 +2391,39 @@
2333 <foreign_key>false</foreign_key> 2391 <foreign_key>false</foreign_key>
2334 <not_null>false</not_null> 2392 <not_null>false</not_null>
2335 <primary_key>false</primary_key> 2393 <primary_key>false</primary_key>
2336 - <unique_key>false</unique_key> 2394 + <unique_key>true</unique_key>
  2395 + <character_set></character_set>
  2396 + <collation></collation>
  2397 + <sequence>
  2398 + <name></name>
  2399 + <schema></schema>
  2400 + <increment></increment>
  2401 + <min_value></min_value>
  2402 + <max_value></max_value>
  2403 + <start></start>
  2404 + <cache></cache>
  2405 + <cycle>false</cycle>
  2406 + <order>false</order>
  2407 + <description></description>
  2408 + <data_type></data_type>
  2409 + <decimal_size>0</decimal_size>
  2410 + </sequence>
  2411 + </normal_column>
  2412 + <normal_column>
  2413 + <word_id>34</word_id>
  2414 + <id>36</id>
  2415 + <description></description>
  2416 + <unique_key_name></unique_key_name>
  2417 + <logical_name></logical_name>
  2418 + <physical_name></physical_name>
  2419 + <type>text</type>
  2420 + <constraint></constraint>
  2421 + <default_value></default_value>
  2422 + <auto_increment>false</auto_increment>
  2423 + <foreign_key>false</foreign_key>
  2424 + <not_null>false</not_null>
  2425 + <primary_key>false</primary_key>
  2426 + <unique_key>false</unique_key>
2337 <character_set></character_set> 2427 <character_set></character_set>
2338 <collation></collation> 2428 <collation></collation>
2339 <sequence> 2429 <sequence>
@@ -2361,23 +2451,91 @@ @@ -2361,23 +2451,91 @@
2361 </table_properties> 2451 </table_properties>
2362 </table> 2452 </table>
2363 <table> 2453 <table>
2364 - <id>10</id>  
2365 - <height>128</height>  
2366 - <width>247</width> 2454 + <id>9</id>
  2455 + <height>339</height>
  2456 + <width>292</width>
2367 <font_name>Ubuntu</font_name> 2457 <font_name>Ubuntu</font_name>
2368 <font_size>9</font_size> 2458 <font_size>9</font_size>
2369 - <x>673</x>  
2370 - <y>-89</y> 2459 + <x>353</x>
  2460 + <y>155</y>
2371 <color> 2461 <color>
2372 - <r>230</r>  
2373 - <g>230</g>  
2374 - <b>250</b> 2462 + <r>160</r>
  2463 + <g>32</g>
  2464 + <b>240</b>
2375 </color> 2465 </color>
2376 <connections> 2466 <connections>
2377 <relation> 2467 <relation>
  2468 + <id>2</id>
  2469 + <source>2</source>
  2470 + <target>9</target>
  2471 + <child_cardinality>1..n</child_cardinality>
  2472 + <parent_cardinality>1</parent_cardinality>
  2473 + <reference_for_pk>true</reference_for_pk>
  2474 + <name></name>
  2475 + <on_delete_action>RESTRICT</on_delete_action>
  2476 + <on_update_action>RESTRICT</on_update_action>
  2477 + <source_xp>-1</source_xp>
  2478 + <source_yp>-1</source_yp>
  2479 + <target_xp>-1</target_xp>
  2480 + <target_yp>-1</target_yp>
  2481 + <referenced_column>null</referenced_column>
  2482 + <referenced_complex_unique_key>null</referenced_complex_unique_key>
  2483 + </relation>
  2484 + <relation>
  2485 + <id>3</id>
  2486 + <source>4</source>
  2487 + <target>9</target>
  2488 + <child_cardinality>1..n</child_cardinality>
  2489 + <parent_cardinality>1</parent_cardinality>
  2490 + <reference_for_pk>true</reference_for_pk>
  2491 + <name></name>
  2492 + <on_delete_action>RESTRICT</on_delete_action>
  2493 + <on_update_action>RESTRICT</on_update_action>
  2494 + <source_xp>-1</source_xp>
  2495 + <source_yp>-1</source_yp>
  2496 + <target_xp>-1</target_xp>
  2497 + <target_yp>-1</target_yp>
  2498 + <referenced_column>null</referenced_column>
  2499 + <referenced_complex_unique_key>null</referenced_complex_unique_key>
  2500 + </relation>
  2501 + <relation>
2378 <id>4</id> 2502 <id>4</id>
2379 <source>13</source> 2503 <source>13</source>
2380 - <target>10</target> 2504 + <target>9</target>
  2505 + <child_cardinality>1..n</child_cardinality>
  2506 + <parent_cardinality>1</parent_cardinality>
  2507 + <reference_for_pk>true</reference_for_pk>
  2508 + <name></name>
  2509 + <on_delete_action>RESTRICT</on_delete_action>
  2510 + <on_update_action>RESTRICT</on_update_action>
  2511 + <source_xp>-1</source_xp>
  2512 + <source_yp>-1</source_yp>
  2513 + <target_xp>-1</target_xp>
  2514 + <target_yp>-1</target_yp>
  2515 + <referenced_column>null</referenced_column>
  2516 + <referenced_complex_unique_key>null</referenced_complex_unique_key>
  2517 + </relation>
  2518 + <relation>
  2519 + <id>5</id>
  2520 + <source>5</source>
  2521 + <target>9</target>
  2522 + <child_cardinality>1..n</child_cardinality>
  2523 + <parent_cardinality>1</parent_cardinality>
  2524 + <reference_for_pk>true</reference_for_pk>
  2525 + <name></name>
  2526 + <on_delete_action>RESTRICT</on_delete_action>
  2527 + <on_update_action>RESTRICT</on_update_action>
  2528 + <source_xp>-1</source_xp>
  2529 + <source_yp>-1</source_yp>
  2530 + <target_xp>-1</target_xp>
  2531 + <target_yp>-1</target_yp>
  2532 + <referenced_column>null</referenced_column>
  2533 + <referenced_complex_unique_key>null</referenced_complex_unique_key>
  2534 + </relation>
  2535 + <relation>
  2536 + <id>6</id>
  2537 + <source>3</source>
  2538 + <target>9</target>
2381 <child_cardinality>1..n</child_cardinality> 2539 <child_cardinality>1..n</child_cardinality>
2382 <parent_cardinality>1</parent_cardinality> 2540 <parent_cardinality>1</parent_cardinality>
2383 <reference_for_pk>true</reference_for_pk> 2541 <reference_for_pk>true</reference_for_pk>
@@ -2392,16 +2550,16 @@ @@ -2392,16 +2550,16 @@
2392 <referenced_complex_unique_key>null</referenced_complex_unique_key> 2550 <referenced_complex_unique_key>null</referenced_complex_unique_key>
2393 </relation> 2551 </relation>
2394 </connections> 2552 </connections>
2395 - <physical_name>i3geoestat_classificacao</physical_name>  
2396 - <logical_name>i3geoestat_classificacao</logical_name>  
2397 - <description>Lista de classificacoes de uma medida de variável</description> 2553 + <physical_name>i3geoestat_medida_variavel</physical_name>
  2554 + <logical_name>i3geoestat_medida_variavel</logical_name>
  2555 + <description>Descreve as colunas que contém valores de algum tipo de medida, por exemplo população residente</description>
2398 <constraint></constraint> 2556 <constraint></constraint>
2399 <primary_key_name></primary_key_name> 2557 <primary_key_name></primary_key_name>
2400 <option></option> 2558 <option></option>
2401 <columns> 2559 <columns>
2402 <normal_column> 2560 <normal_column>
2403 - <word_id>26</word_id>  
2404 - <id>35</id> 2561 + <word_id>31</word_id>
  2562 + <id>37</id>
2405 <description></description> 2563 <description></description>
2406 <unique_key_name></unique_key_name> 2564 <unique_key_name></unique_key_name>
2407 <logical_name></logical_name> 2565 <logical_name></logical_name>
@@ -2432,17 +2590,18 @@ @@ -2432,17 +2590,18 @@
2432 </sequence> 2590 </sequence>
2433 </normal_column> 2591 </normal_column>
2434 <normal_column> 2592 <normal_column>
2435 - <word_id>33</word_id>  
2436 - <id>36</id> 2593 + <id>38</id>
  2594 + <referenced_column>0</referenced_column>
  2595 + <relation>2</relation>
2437 <description></description> 2596 <description></description>
2438 <unique_key_name></unique_key_name> 2597 <unique_key_name></unique_key_name>
2439 <logical_name></logical_name> 2598 <logical_name></logical_name>
2440 <physical_name></physical_name> 2599 <physical_name></physical_name>
2441 - <type>text</type> 2600 + <type>integer</type>
2442 <constraint></constraint> 2601 <constraint></constraint>
2443 <default_value></default_value> 2602 <default_value></default_value>
2444 <auto_increment>false</auto_increment> 2603 <auto_increment>false</auto_increment>
2445 - <foreign_key>false</foreign_key> 2604 + <foreign_key>true</foreign_key>
2446 <not_null>false</not_null> 2605 <not_null>false</not_null>
2447 <primary_key>false</primary_key> 2606 <primary_key>false</primary_key>
2448 <unique_key>false</unique_key> 2607 <unique_key>false</unique_key>
@@ -2464,9 +2623,9 @@ @@ -2464,9 +2623,9 @@
2464 </sequence> 2623 </sequence>
2465 </normal_column> 2624 </normal_column>
2466 <normal_column> 2625 <normal_column>
2467 - <id>37</id>  
2468 - <referenced_column>55</referenced_column>  
2469 - <relation>4</relation> 2626 + <id>39</id>
  2627 + <referenced_column>5</referenced_column>
  2628 + <relation>6</relation>
2470 <description></description> 2629 <description></description>
2471 <unique_key_name></unique_key_name> 2630 <unique_key_name></unique_key_name>
2472 <logical_name></logical_name> 2631 <logical_name></logical_name>
@@ -2497,17 +2656,18 @@ @@ -2497,17 +2656,18 @@
2497 </sequence> 2656 </sequence>
2498 </normal_column> 2657 </normal_column>
2499 <normal_column> 2658 <normal_column>
2500 - <word_id>42</word_id>  
2501 - <id>38</id> 2659 + <id>40</id>
  2660 + <referenced_column>8</referenced_column>
  2661 + <relation>3</relation>
2502 <description></description> 2662 <description></description>
2503 <unique_key_name></unique_key_name> 2663 <unique_key_name></unique_key_name>
2504 <logical_name></logical_name> 2664 <logical_name></logical_name>
2505 <physical_name></physical_name> 2665 <physical_name></physical_name>
2506 - <type>text</type> 2666 + <type>integer</type>
2507 <constraint></constraint> 2667 <constraint></constraint>
2508 <default_value></default_value> 2668 <default_value></default_value>
2509 <auto_increment>false</auto_increment> 2669 <auto_increment>false</auto_increment>
2510 - <foreign_key>false</foreign_key> 2670 + <foreign_key>true</foreign_key>
2511 <not_null>false</not_null> 2671 <not_null>false</not_null>
2512 <primary_key>false</primary_key> 2672 <primary_key>false</primary_key>
2513 <unique_key>false</unique_key> 2673 <unique_key>false</unique_key>
@@ -2528,57 +2688,10 @@ @@ -2528,57 +2688,10 @@
2528 <decimal_size>0</decimal_size> 2688 <decimal_size>0</decimal_size>
2529 </sequence> 2689 </sequence>
2530 </normal_column> 2690 </normal_column>
2531 - </columns>  
2532 - <indexes>  
2533 - </indexes>  
2534 - <complex_unique_key_list>  
2535 - </complex_unique_key_list>  
2536 - <table_properties>  
2537 - <schema></schema>  
2538 - </table_properties>  
2539 - </table>  
2540 - <table>  
2541 - <id>11</id>  
2542 - <height>317</height>  
2543 - <width>210</width>  
2544 - <font_name>Ubuntu</font_name>  
2545 - <font_size>9</font_size>  
2546 - <x>1018</x>  
2547 - <y>-24</y>  
2548 - <color>  
2549 - <r>230</r>  
2550 - <g>230</g>  
2551 - <b>250</b>  
2552 - </color>  
2553 - <connections>  
2554 - <relation>  
2555 - <id>5</id>  
2556 - <source>10</source>  
2557 - <target>11</target>  
2558 - <child_cardinality>1..n</child_cardinality>  
2559 - <parent_cardinality>1</parent_cardinality>  
2560 - <reference_for_pk>true</reference_for_pk>  
2561 - <name></name>  
2562 - <on_delete_action>RESTRICT</on_delete_action>  
2563 - <on_update_action>RESTRICT</on_update_action>  
2564 - <source_xp>-1</source_xp>  
2565 - <source_yp>-1</source_yp>  
2566 - <target_xp>-1</target_xp>  
2567 - <target_yp>-1</target_yp>  
2568 - <referenced_column>null</referenced_column>  
2569 - <referenced_complex_unique_key>null</referenced_complex_unique_key>  
2570 - </relation>  
2571 - </connections>  
2572 - <physical_name>i3geoestat_classes</physical_name>  
2573 - <logical_name>i3geoestat_classes</logical_name>  
2574 - <description>Classes pertencentes a uma classificação</description>  
2575 - <constraint></constraint>  
2576 - <primary_key_name></primary_key_name>  
2577 - <option></option>  
2578 - <columns>  
2579 <normal_column> 2691 <normal_column>
2580 - <word_id>25</word_id>  
2581 - <id>39</id> 2692 + <id>41</id>
  2693 + <referenced_column>61</referenced_column>
  2694 + <relation>4</relation>
2582 <description></description> 2695 <description></description>
2583 <unique_key_name></unique_key_name> 2696 <unique_key_name></unique_key_name>
2584 <logical_name></logical_name> 2697 <logical_name></logical_name>
@@ -2586,40 +2699,8 @@ @@ -2586,40 +2699,8 @@
2586 <type>integer</type> 2699 <type>integer</type>
2587 <constraint></constraint> 2700 <constraint></constraint>
2588 <default_value></default_value> 2701 <default_value></default_value>
2589 - <auto_increment>true</auto_increment>  
2590 - <foreign_key>false</foreign_key>  
2591 - <not_null>true</not_null>  
2592 - <primary_key>true</primary_key>  
2593 - <unique_key>true</unique_key>  
2594 - <character_set></character_set>  
2595 - <collation></collation>  
2596 - <sequence>  
2597 - <name></name>  
2598 - <schema></schema>  
2599 - <increment></increment>  
2600 - <min_value></min_value>  
2601 - <max_value></max_value>  
2602 - <start></start>  
2603 - <cache></cache>  
2604 - <cycle>false</cycle>  
2605 - <order>false</order>  
2606 - <description></description>  
2607 - <data_type></data_type>  
2608 - <decimal_size>0</decimal_size>  
2609 - </sequence>  
2610 - </normal_column>  
2611 - <normal_column>  
2612 - <word_id>21</word_id>  
2613 - <id>40</id>  
2614 - <description></description>  
2615 - <unique_key_name></unique_key_name>  
2616 - <logical_name></logical_name>  
2617 - <physical_name></physical_name>  
2618 - <type>text</type>  
2619 - <constraint></constraint>  
2620 - <default_value></default_value>  
2621 <auto_increment>false</auto_increment> 2702 <auto_increment>false</auto_increment>
2622 - <foreign_key>false</foreign_key> 2703 + <foreign_key>true</foreign_key>
2623 <not_null>false</not_null> 2704 <not_null>false</not_null>
2624 <primary_key>false</primary_key> 2705 <primary_key>false</primary_key>
2625 <unique_key>false</unique_key> 2706 <unique_key>false</unique_key>
@@ -2641,17 +2722,18 @@ @@ -2641,17 +2722,18 @@
2641 </sequence> 2722 </sequence>
2642 </normal_column> 2723 </normal_column>
2643 <normal_column> 2724 <normal_column>
2644 - <word_id>56</word_id>  
2645 - <id>41</id> 2725 + <id>42</id>
  2726 + <referenced_column>11</referenced_column>
  2727 + <relation>5</relation>
2646 <description></description> 2728 <description></description>
2647 <unique_key_name></unique_key_name> 2729 <unique_key_name></unique_key_name>
2648 <logical_name></logical_name> 2730 <logical_name></logical_name>
2649 <physical_name></physical_name> 2731 <physical_name></physical_name>
2650 - <type>text</type> 2732 + <type>integer</type>
2651 <constraint></constraint> 2733 <constraint></constraint>
2652 <default_value></default_value> 2734 <default_value></default_value>
2653 <auto_increment>false</auto_increment> 2735 <auto_increment>false</auto_increment>
2654 - <foreign_key>false</foreign_key> 2736 + <foreign_key>true</foreign_key>
2655 <not_null>false</not_null> 2737 <not_null>false</not_null>
2656 <primary_key>false</primary_key> 2738 <primary_key>false</primary_key>
2657 <unique_key>false</unique_key> 2739 <unique_key>false</unique_key>
@@ -2673,8 +2755,8 @@ @@ -2673,8 +2755,8 @@
2673 </sequence> 2755 </sequence>
2674 </normal_column> 2756 </normal_column>
2675 <normal_column> 2757 <normal_column>
2676 - <word_id>60</word_id>  
2677 - <id>42</id> 2758 + <word_id>20</word_id>
  2759 + <id>43</id>
2678 <description></description> 2760 <description></description>
2679 <unique_key_name></unique_key_name> 2761 <unique_key_name></unique_key_name>
2680 <logical_name></logical_name> 2762 <logical_name></logical_name>
@@ -2705,8 +2787,8 @@ @@ -2705,8 +2787,8 @@
2705 </sequence> 2787 </sequence>
2706 </normal_column> 2788 </normal_column>
2707 <normal_column> 2789 <normal_column>
2708 - <word_id>59</word_id>  
2709 - <id>43</id> 2790 + <word_id>56</word_id>
  2791 + <id>44</id>
2710 <description></description> 2792 <description></description>
2711 <unique_key_name></unique_key_name> 2793 <unique_key_name></unique_key_name>
2712 <logical_name></logical_name> 2794 <logical_name></logical_name>
@@ -2737,8 +2819,8 @@ @@ -2737,8 +2819,8 @@
2737 </sequence> 2819 </sequence>
2738 </normal_column> 2820 </normal_column>
2739 <normal_column> 2821 <normal_column>
2740 - <word_id>1</word_id>  
2741 - <id>44</id> 2822 + <word_id>14</word_id>
  2823 + <id>45</id>
2742 <description></description> 2824 <description></description>
2743 <unique_key_name></unique_key_name> 2825 <unique_key_name></unique_key_name>
2744 <logical_name></logical_name> 2826 <logical_name></logical_name>
@@ -2769,18 +2851,17 @@ @@ -2769,18 +2851,17 @@
2769 </sequence> 2851 </sequence>
2770 </normal_column> 2852 </normal_column>
2771 <normal_column> 2853 <normal_column>
2772 - <id>45</id>  
2773 - <referenced_column>35</referenced_column>  
2774 - <relation>5</relation> 2854 + <word_id>11</word_id>
  2855 + <id>46</id>
2775 <description></description> 2856 <description></description>
2776 <unique_key_name></unique_key_name> 2857 <unique_key_name></unique_key_name>
2777 <logical_name></logical_name> 2858 <logical_name></logical_name>
2778 <physical_name></physical_name> 2859 <physical_name></physical_name>
2779 - <type>integer</type> 2860 + <type>text</type>
2780 <constraint></constraint> 2861 <constraint></constraint>
2781 <default_value></default_value> 2862 <default_value></default_value>
2782 <auto_increment>false</auto_increment> 2863 <auto_increment>false</auto_increment>
2783 - <foreign_key>true</foreign_key> 2864 + <foreign_key>false</foreign_key>
2784 <not_null>false</not_null> 2865 <not_null>false</not_null>
2785 <primary_key>false</primary_key> 2866 <primary_key>false</primary_key>
2786 <unique_key>false</unique_key> 2867 <unique_key>false</unique_key>
@@ -2802,8 +2883,8 @@ @@ -2802,8 +2883,8 @@
2802 </sequence> 2883 </sequence>
2803 </normal_column> 2884 </normal_column>
2804 <normal_column> 2885 <normal_column>
2805 - <word_id>55</word_id>  
2806 - <id>46</id> 2886 + <word_id>23</word_id>
  2887 + <id>47</id>
2807 <description></description> 2888 <description></description>
2808 <unique_key_name></unique_key_name> 2889 <unique_key_name></unique_key_name>
2809 <logical_name></logical_name> 2890 <logical_name></logical_name>
@@ -2834,8 +2915,8 @@ @@ -2834,8 +2915,8 @@
2834 </sequence> 2915 </sequence>
2835 </normal_column> 2916 </normal_column>
2836 <normal_column> 2917 <normal_column>
2837 - <word_id>51</word_id>  
2838 - <id>47</id> 2918 + <word_id>42</word_id>
  2919 + <id>48</id>
2839 <description></description> 2920 <description></description>
2840 <unique_key_name></unique_key_name> 2921 <unique_key_name></unique_key_name>
2841 <logical_name></logical_name> 2922 <logical_name></logical_name>
@@ -2865,9 +2946,57 @@ @@ -2865,9 +2946,57 @@
2865 <decimal_size>0</decimal_size> 2946 <decimal_size>0</decimal_size>
2866 </sequence> 2947 </sequence>
2867 </normal_column> 2948 </normal_column>
  2949 + </columns>
  2950 + <indexes>
  2951 + </indexes>
  2952 + <complex_unique_key_list>
  2953 + </complex_unique_key_list>
  2954 + <table_properties>
  2955 + <schema></schema>
  2956 + </table_properties>
  2957 + </table>
  2958 + <table>
  2959 + <id>10</id>
  2960 + <height>128</height>
  2961 + <width>269</width>
  2962 + <font_name>Ubuntu</font_name>
  2963 + <font_size>9</font_size>
  2964 + <x>753</x>
  2965 + <y>442</y>
  2966 + <color>
  2967 + <r>230</r>
  2968 + <g>230</g>
  2969 + <b>250</b>
  2970 + </color>
  2971 + <connections>
  2972 + <relation>
  2973 + <id>7</id>
  2974 + <source>9</source>
  2975 + <target>10</target>
  2976 + <child_cardinality>1..n</child_cardinality>
  2977 + <parent_cardinality>1</parent_cardinality>
  2978 + <reference_for_pk>true</reference_for_pk>
  2979 + <name></name>
  2980 + <on_delete_action>RESTRICT</on_delete_action>
  2981 + <on_update_action>RESTRICT</on_update_action>
  2982 + <source_xp>-1</source_xp>
  2983 + <source_yp>-1</source_yp>
  2984 + <target_xp>-1</target_xp>
  2985 + <target_yp>-1</target_yp>
  2986 + <referenced_column>null</referenced_column>
  2987 + <referenced_complex_unique_key>null</referenced_complex_unique_key>
  2988 + </relation>
  2989 + </connections>
  2990 + <physical_name>i3geoestat_medida_variavel_link</physical_name>
  2991 + <logical_name>i3geoestat_medida_variavel_link</logical_name>
  2992 + <description></description>
  2993 + <constraint></constraint>
  2994 + <primary_key_name></primary_key_name>
  2995 + <option></option>
  2996 + <columns>
2868 <normal_column> 2997 <normal_column>
2869 - <word_id>45</word_id>  
2870 - <id>48</id> 2998 + <word_id>35</word_id>
  2999 + <id>49</id>
2871 <description></description> 3000 <description></description>
2872 <unique_key_name></unique_key_name> 3001 <unique_key_name></unique_key_name>
2873 <logical_name></logical_name> 3002 <logical_name></logical_name>
@@ -2898,17 +3027,18 @@ @@ -2898,17 +3027,18 @@
2898 </sequence> 3027 </sequence>
2899 </normal_column> 3028 </normal_column>
2900 <normal_column> 3029 <normal_column>
2901 - <word_id>44</word_id>  
2902 - <id>49</id> 3030 + <id>50</id>
  3031 + <referenced_column>37</referenced_column>
  3032 + <relation>7</relation>
2903 <description></description> 3033 <description></description>
2904 <unique_key_name></unique_key_name> 3034 <unique_key_name></unique_key_name>
2905 <logical_name></logical_name> 3035 <logical_name></logical_name>
2906 <physical_name></physical_name> 3036 <physical_name></physical_name>
2907 - <type>text</type> 3037 + <type>integer</type>
2908 <constraint></constraint> 3038 <constraint></constraint>
2909 <default_value></default_value> 3039 <default_value></default_value>
2910 <auto_increment>false</auto_increment> 3040 <auto_increment>false</auto_increment>
2911 - <foreign_key>false</foreign_key> 3041 + <foreign_key>true</foreign_key>
2912 <not_null>false</not_null> 3042 <not_null>false</not_null>
2913 <primary_key>false</primary_key> 3043 <primary_key>false</primary_key>
2914 <unique_key>false</unique_key> 3044 <unique_key>false</unique_key>
@@ -2931,7 +3061,7 @@ @@ -2931,7 +3061,7 @@
2931 </normal_column> 3061 </normal_column>
2932 <normal_column> 3062 <normal_column>
2933 <word_id>41</word_id> 3063 <word_id>41</word_id>
2934 - <id>50</id> 3064 + <id>51</id>
2935 <description></description> 3065 <description></description>
2936 <unique_key_name></unique_key_name> 3066 <unique_key_name></unique_key_name>
2937 <logical_name></logical_name> 3067 <logical_name></logical_name>
@@ -2962,20 +3092,20 @@ @@ -2962,20 +3092,20 @@
2962 </sequence> 3092 </sequence>
2963 </normal_column> 3093 </normal_column>
2964 <normal_column> 3094 <normal_column>
2965 - <word_id>43</word_id>  
2966 - <id>51</id> 3095 + <word_id>30</word_id>
  3096 + <id>52</id>
2967 <description></description> 3097 <description></description>
2968 <unique_key_name></unique_key_name> 3098 <unique_key_name></unique_key_name>
2969 <logical_name></logical_name> 3099 <logical_name></logical_name>
2970 <physical_name></physical_name> 3100 <physical_name></physical_name>
2971 - <type>text</type> 3101 + <type>integer</type>
2972 <constraint></constraint> 3102 <constraint></constraint>
2973 <default_value></default_value> 3103 <default_value></default_value>
2974 - <auto_increment>false</auto_increment> 3104 + <auto_increment>true</auto_increment>
2975 <foreign_key>false</foreign_key> 3105 <foreign_key>false</foreign_key>
2976 - <not_null>false</not_null>  
2977 - <primary_key>false</primary_key>  
2978 - <unique_key>false</unique_key> 3106 + <not_null>true</not_null>
  3107 + <primary_key>true</primary_key>
  3108 + <unique_key>true</unique_key>
2979 <character_set></character_set> 3109 <character_set></character_set>
2980 <collation></collation> 3110 <collation></collation>
2981 <sequence> 3111 <sequence>
@@ -3003,74 +3133,77 @@ @@ -3003,74 +3133,77 @@
3003 </table_properties> 3133 </table_properties>
3004 </table> 3134 </table>
3005 <table> 3135 <table>
3006 - <id>12</id>  
3007 - <height>107</height>  
3008 - <width>228</width> 3136 + <id>11</id>
  3137 + <height>86</height>
  3138 + <width>269</width>
3009 <font_name>Ubuntu</font_name> 3139 <font_name>Ubuntu</font_name>
3010 <font_size>9</font_size> 3140 <font_size>9</font_size>
3011 - <x>937</x>  
3012 - <y>321</y> 3141 + <x>705</x>
  3142 + <y>152</y>
3013 <color> 3143 <color>
3014 <r>144</r> 3144 <r>144</r>
3015 <g>238</g> 3145 <g>238</g>
3016 <b>144</b> 3146 <b>144</b>
3017 </color> 3147 </color>
3018 <connections> 3148 <connections>
  3149 + <relation>
  3150 + <id>8</id>
  3151 + <source>9</source>
  3152 + <target>11</target>
  3153 + <child_cardinality>1..n</child_cardinality>
  3154 + <parent_cardinality>1</parent_cardinality>
  3155 + <reference_for_pk>true</reference_for_pk>
  3156 + <name></name>
  3157 + <on_delete_action>RESTRICT</on_delete_action>
  3158 + <on_update_action>RESTRICT</on_update_action>
  3159 + <source_xp>-1</source_xp>
  3160 + <source_yp>-1</source_yp>
  3161 + <target_xp>-1</target_xp>
  3162 + <target_yp>-1</target_yp>
  3163 + <referenced_column>null</referenced_column>
  3164 + <referenced_complex_unique_key>null</referenced_complex_unique_key>
  3165 + </relation>
  3166 + <relation>
  3167 + <id>9</id>
  3168 + <source>8</source>
  3169 + <target>11</target>
  3170 + <child_cardinality>1..n</child_cardinality>
  3171 + <parent_cardinality>1</parent_cardinality>
  3172 + <reference_for_pk>true</reference_for_pk>
  3173 + <name></name>
  3174 + <on_delete_action>RESTRICT</on_delete_action>
  3175 + <on_update_action>RESTRICT</on_update_action>
  3176 + <source_xp>-1</source_xp>
  3177 + <source_yp>-1</source_yp>
  3178 + <target_xp>-1</target_xp>
  3179 + <target_yp>-1</target_yp>
  3180 + <referenced_column>null</referenced_column>
  3181 + <referenced_complex_unique_key>null</referenced_complex_unique_key>
  3182 + </relation>
3019 </connections> 3183 </connections>
3020 - <physical_name>i3geoestat_fonteinfo</physical_name>  
3021 - <logical_name>i3geoestat_fonteinfo</logical_name> 3184 + <physical_name>i3geoestat_fonteinfo_medida</physical_name>
  3185 + <logical_name>i3geoestat_fonteinfo_medida</logical_name>
3022 <description></description> 3186 <description></description>
3023 <constraint></constraint> 3187 <constraint></constraint>
3024 <primary_key_name></primary_key_name> 3188 <primary_key_name></primary_key_name>
3025 <option></option> 3189 <option></option>
3026 <columns> 3190 <columns>
3027 <normal_column> 3191 <normal_column>
3028 - <word_id>28</word_id>  
3029 - <id>52</id>  
3030 - <description></description>  
3031 - <unique_key_name></unique_key_name>  
3032 - <logical_name></logical_name>  
3033 - <physical_name></physical_name>  
3034 - <type>integer</type>  
3035 - <constraint></constraint>  
3036 - <default_value></default_value>  
3037 - <auto_increment>true</auto_increment>  
3038 - <foreign_key>false</foreign_key>  
3039 - <not_null>true</not_null>  
3040 - <primary_key>true</primary_key>  
3041 - <unique_key>true</unique_key>  
3042 - <character_set></character_set>  
3043 - <collation></collation>  
3044 - <sequence>  
3045 - <name></name>  
3046 - <schema></schema>  
3047 - <increment></increment>  
3048 - <min_value></min_value>  
3049 - <max_value></max_value>  
3050 - <start></start>  
3051 - <cache></cache>  
3052 - <cycle>false</cycle>  
3053 - <order>false</order>  
3054 - <description></description>  
3055 - <data_type></data_type>  
3056 - <decimal_size>0</decimal_size>  
3057 - </sequence>  
3058 - </normal_column>  
3059 - <normal_column>  
3060 - <word_id>57</word_id>  
3061 <id>53</id> 3192 <id>53</id>
  3193 + <referenced_column>37</referenced_column>
  3194 + <relation>8</relation>
3062 <description></description> 3195 <description></description>
3063 <unique_key_name></unique_key_name> 3196 <unique_key_name></unique_key_name>
3064 <logical_name></logical_name> 3197 <logical_name></logical_name>
3065 <physical_name></physical_name> 3198 <physical_name></physical_name>
3066 - <type>text</type> 3199 + <type>integer</type>
3067 <constraint></constraint> 3200 <constraint></constraint>
3068 <default_value></default_value> 3201 <default_value></default_value>
3069 <auto_increment>false</auto_increment> 3202 <auto_increment>false</auto_increment>
3070 - <foreign_key>false</foreign_key>  
3071 - <not_null>false</not_null> 3203 + <foreign_key>true</foreign_key>
  3204 + <not_null>true</not_null>
3072 <primary_key>false</primary_key> 3205 <primary_key>false</primary_key>
3073 - <unique_key>true</unique_key> 3206 + <unique_key>false</unique_key>
3074 <character_set></character_set> 3207 <character_set></character_set>
3075 <collation></collation> 3208 <collation></collation>
3076 <sequence> 3209 <sequence>
@@ -3089,18 +3222,19 @@ @@ -3089,18 +3222,19 @@
3089 </sequence> 3222 </sequence>
3090 </normal_column> 3223 </normal_column>
3091 <normal_column> 3224 <normal_column>
3092 - <word_id>32</word_id>  
3093 <id>54</id> 3225 <id>54</id>
  3226 + <referenced_column>34</referenced_column>
  3227 + <relation>9</relation>
3094 <description></description> 3228 <description></description>
3095 <unique_key_name></unique_key_name> 3229 <unique_key_name></unique_key_name>
3096 <logical_name></logical_name> 3230 <logical_name></logical_name>
3097 <physical_name></physical_name> 3231 <physical_name></physical_name>
3098 - <type>text</type> 3232 + <type>integer</type>
3099 <constraint></constraint> 3233 <constraint></constraint>
3100 <default_value></default_value> 3234 <default_value></default_value>
3101 - <auto_increment>false</auto_increment>  
3102 - <foreign_key>false</foreign_key>  
3103 - <not_null>false</not_null> 3235 + <auto_increment>false</auto_increment>
  3236 + <foreign_key>true</foreign_key>
  3237 + <not_null>true</not_null>
3104 <primary_key>false</primary_key> 3238 <primary_key>false</primary_key>
3105 <unique_key>false</unique_key> 3239 <unique_key>false</unique_key>
3106 <character_set></character_set> 3240 <character_set></character_set>
@@ -3130,13 +3264,13 @@ @@ -3130,13 +3264,13 @@
3130 </table_properties> 3264 </table_properties>
3131 </table> 3265 </table>
3132 <table> 3266 <table>
3133 - <id>13</id>  
3134 - <height>339</height> 3267 + <id>12</id>
  3268 + <height>170</height>
3135 <width>292</width> 3269 <width>292</width>
3136 <font_name>Ubuntu</font_name> 3270 <font_name>Ubuntu</font_name>
3137 <font_size>9</font_size> 3271 <font_size>9</font_size>
3138 - <x>353</x>  
3139 - <y>155</y> 3272 + <x>387</x>
  3273 + <y>533</y>
3140 <color> 3274 <color>
3141 <r>160</r> 3275 <r>160</r>
3142 <g>32</g> 3276 <g>32</g>
@@ -3144,77 +3278,9 @@ @@ -3144,77 +3278,9 @@
3144 </color> 3278 </color>
3145 <connections> 3279 <connections>
3146 <relation> 3280 <relation>
3147 - <id>6</id>  
3148 - <source>8</source>  
3149 - <target>13</target>  
3150 - <child_cardinality>1..n</child_cardinality>  
3151 - <parent_cardinality>1</parent_cardinality>  
3152 - <reference_for_pk>true</reference_for_pk>  
3153 - <name></name>  
3154 - <on_delete_action>RESTRICT</on_delete_action>  
3155 - <on_update_action>RESTRICT</on_update_action>  
3156 - <source_xp>-1</source_xp>  
3157 - <source_yp>-1</source_yp>  
3158 - <target_xp>-1</target_xp>  
3159 - <target_yp>-1</target_yp>  
3160 - <referenced_column>null</referenced_column>  
3161 - <referenced_complex_unique_key>null</referenced_complex_unique_key>  
3162 - </relation>  
3163 - <relation>  
3164 - <id>7</id>  
3165 - <source>3</source>  
3166 - <target>13</target>  
3167 - <child_cardinality>1..n</child_cardinality>  
3168 - <parent_cardinality>1</parent_cardinality>  
3169 - <reference_for_pk>true</reference_for_pk>  
3170 - <name></name>  
3171 - <on_delete_action>RESTRICT</on_delete_action>  
3172 - <on_update_action>RESTRICT</on_update_action>  
3173 - <source_xp>-1</source_xp>  
3174 - <source_yp>-1</source_yp>  
3175 - <target_xp>-1</target_xp>  
3176 - <target_yp>-1</target_yp>  
3177 - <referenced_column>null</referenced_column>  
3178 - <referenced_complex_unique_key>null</referenced_complex_unique_key>  
3179 - </relation>  
3180 - <relation>  
3181 - <id>8</id>  
3182 - <source>5</source>  
3183 - <target>13</target>  
3184 - <child_cardinality>1..n</child_cardinality>  
3185 - <parent_cardinality>1</parent_cardinality>  
3186 - <reference_for_pk>true</reference_for_pk>  
3187 - <name></name>  
3188 - <on_delete_action>RESTRICT</on_delete_action>  
3189 - <on_update_action>RESTRICT</on_update_action>  
3190 - <source_xp>-1</source_xp>  
3191 - <source_yp>-1</source_yp>  
3192 - <target_xp>-1</target_xp>  
3193 - <target_yp>-1</target_yp>  
3194 - <referenced_column>null</referenced_column>  
3195 - <referenced_complex_unique_key>null</referenced_complex_unique_key>  
3196 - </relation>  
3197 - <relation>  
3198 - <id>9</id>  
3199 - <source>9</source>  
3200 - <target>13</target>  
3201 - <child_cardinality>1..n</child_cardinality>  
3202 - <parent_cardinality>1</parent_cardinality>  
3203 - <reference_for_pk>true</reference_for_pk>  
3204 - <name></name>  
3205 - <on_delete_action>RESTRICT</on_delete_action>  
3206 - <on_update_action>RESTRICT</on_update_action>  
3207 - <source_xp>-1</source_xp>  
3208 - <source_yp>-1</source_yp>  
3209 - <target_xp>-1</target_xp>  
3210 - <target_yp>-1</target_yp>  
3211 - <referenced_column>null</referenced_column>  
3212 - <referenced_complex_unique_key>null</referenced_complex_unique_key>  
3213 - </relation>  
3214 - <relation>  
3215 <id>10</id> 3281 <id>10</id>
3216 - <source>4</source>  
3217 - <target>13</target> 3282 + <source>9</source>
  3283 + <target>12</target>
3218 <child_cardinality>1..n</child_cardinality> 3284 <child_cardinality>1..n</child_cardinality>
3219 <parent_cardinality>1</parent_cardinality> 3285 <parent_cardinality>1</parent_cardinality>
3220 <reference_for_pk>true</reference_for_pk> 3286 <reference_for_pk>true</reference_for_pk>
@@ -3229,15 +3295,15 @@ @@ -3229,15 +3295,15 @@
3229 <referenced_complex_unique_key>null</referenced_complex_unique_key> 3295 <referenced_complex_unique_key>null</referenced_complex_unique_key>
3230 </relation> 3296 </relation>
3231 </connections> 3297 </connections>
3232 - <physical_name>i3geoestat_medida_variavel</physical_name>  
3233 - <logical_name>i3geoestat_medida_variavel</logical_name>  
3234 - <description>Descreve as colunas que contém valores de algum tipo de medida, por exemplo população residente</description> 3298 + <physical_name>i3geoestat_parametro_medida</physical_name>
  3299 + <logical_name>i3geoestat_parametro_medida</logical_name>
  3300 + <description></description>
3235 <constraint></constraint> 3301 <constraint></constraint>
3236 <primary_key_name></primary_key_name> 3302 <primary_key_name></primary_key_name>
3237 <option></option> 3303 <option></option>
3238 <columns> 3304 <columns>
3239 <normal_column> 3305 <normal_column>
3240 - <word_id>30</word_id> 3306 + <word_id>33</word_id>
3241 <id>55</id> 3307 <id>55</id>
3242 <description></description> 3308 <description></description>
3243 <unique_key_name></unique_key_name> 3309 <unique_key_name></unique_key_name>
@@ -3269,18 +3335,17 @@ @@ -3269,18 +3335,17 @@
3269 </sequence> 3335 </sequence>
3270 </normal_column> 3336 </normal_column>
3271 <normal_column> 3337 <normal_column>
  3338 + <word_id>8</word_id>
3272 <id>56</id> 3339 <id>56</id>
3273 - <referenced_column>0</referenced_column>  
3274 - <relation>7</relation>  
3275 <description></description> 3340 <description></description>
3276 <unique_key_name></unique_key_name> 3341 <unique_key_name></unique_key_name>
3277 <logical_name></logical_name> 3342 <logical_name></logical_name>
3278 <physical_name></physical_name> 3343 <physical_name></physical_name>
3279 - <type>integer</type> 3344 + <type>text</type>
3280 <constraint></constraint> 3345 <constraint></constraint>
3281 <default_value></default_value> 3346 <default_value></default_value>
3282 <auto_increment>false</auto_increment> 3347 <auto_increment>false</auto_increment>
3283 - <foreign_key>true</foreign_key> 3348 + <foreign_key>false</foreign_key>
3284 <not_null>false</not_null> 3349 <not_null>false</not_null>
3285 <primary_key>false</primary_key> 3350 <primary_key>false</primary_key>
3286 <unique_key>false</unique_key> 3351 <unique_key>false</unique_key>
@@ -3302,18 +3367,17 @@ @@ -3302,18 +3367,17 @@
3302 </sequence> 3367 </sequence>
3303 </normal_column> 3368 </normal_column>
3304 <normal_column> 3369 <normal_column>
  3370 + <word_id>39</word_id>
3305 <id>57</id> 3371 <id>57</id>
3306 - <referenced_column>5</referenced_column>  
3307 - <relation>10</relation>  
3308 <description></description> 3372 <description></description>
3309 <unique_key_name></unique_key_name> 3373 <unique_key_name></unique_key_name>
3310 <logical_name></logical_name> 3374 <logical_name></logical_name>
3311 <physical_name></physical_name> 3375 <physical_name></physical_name>
3312 - <type>integer</type> 3376 + <type>text</type>
3313 <constraint></constraint> 3377 <constraint></constraint>
3314 <default_value></default_value> 3378 <default_value></default_value>
3315 <auto_increment>false</auto_increment> 3379 <auto_increment>false</auto_increment>
3316 - <foreign_key>true</foreign_key> 3380 + <foreign_key>false</foreign_key>
3317 <not_null>false</not_null> 3381 <not_null>false</not_null>
3318 <primary_key>false</primary_key> 3382 <primary_key>false</primary_key>
3319 <unique_key>false</unique_key> 3383 <unique_key>false</unique_key>
@@ -3335,18 +3399,17 @@ @@ -3335,18 +3399,17 @@
3335 </sequence> 3399 </sequence>
3336 </normal_column> 3400 </normal_column>
3337 <normal_column> 3401 <normal_column>
  3402 + <word_id>16</word_id>
3338 <id>58</id> 3403 <id>58</id>
3339 - <referenced_column>8</referenced_column>  
3340 - <relation>8</relation>  
3341 <description></description> 3404 <description></description>
3342 <unique_key_name></unique_key_name> 3405 <unique_key_name></unique_key_name>
3343 <logical_name></logical_name> 3406 <logical_name></logical_name>
3344 <physical_name></physical_name> 3407 <physical_name></physical_name>
3345 - <type>integer</type> 3408 + <type>text</type>
3346 <constraint></constraint> 3409 <constraint></constraint>
3347 <default_value></default_value> 3410 <default_value></default_value>
3348 <auto_increment>false</auto_increment> 3411 <auto_increment>false</auto_increment>
3349 - <foreign_key>true</foreign_key> 3412 + <foreign_key>false</foreign_key>
3350 <not_null>false</not_null> 3413 <not_null>false</not_null>
3351 <primary_key>false</primary_key> 3414 <primary_key>false</primary_key>
3352 <unique_key>false</unique_key> 3415 <unique_key>false</unique_key>
@@ -3368,18 +3431,17 @@ @@ -3368,18 +3431,17 @@
3368 </sequence> 3431 </sequence>
3369 </normal_column> 3432 </normal_column>
3370 <normal_column> 3433 <normal_column>
  3434 + <word_id>32</word_id>
3371 <id>59</id> 3435 <id>59</id>
3372 - <referenced_column>17</referenced_column>  
3373 - <relation>6</relation>  
3374 <description></description> 3436 <description></description>
3375 <unique_key_name></unique_key_name> 3437 <unique_key_name></unique_key_name>
3376 <logical_name></logical_name> 3438 <logical_name></logical_name>
3377 <physical_name></physical_name> 3439 <physical_name></physical_name>
3378 <type>integer</type> 3440 <type>integer</type>
3379 <constraint></constraint> 3441 <constraint></constraint>
3380 - <default_value></default_value> 3442 + <default_value>0</default_value>
3381 <auto_increment>false</auto_increment> 3443 <auto_increment>false</auto_increment>
3382 - <foreign_key>true</foreign_key> 3444 + <foreign_key>false</foreign_key>
3383 <not_null>false</not_null> 3445 <not_null>false</not_null>
3384 <primary_key>false</primary_key> 3446 <primary_key>false</primary_key>
3385 <unique_key>false</unique_key> 3447 <unique_key>false</unique_key>
@@ -3402,8 +3464,8 @@ @@ -3402,8 +3464,8 @@
3402 </normal_column> 3464 </normal_column>
3403 <normal_column> 3465 <normal_column>
3404 <id>60</id> 3466 <id>60</id>
3405 - <referenced_column>29</referenced_column>  
3406 - <relation>9</relation> 3467 + <referenced_column>37</referenced_column>
  3468 + <relation>10</relation>
3407 <description></description> 3469 <description></description>
3408 <unique_key_name></unique_key_name> 3470 <unique_key_name></unique_key_name>
3409 <logical_name></logical_name> 3471 <logical_name></logical_name>
@@ -3433,21 +3495,69 @@ @@ -3433,21 +3495,69 @@
3433 <decimal_size>0</decimal_size> 3495 <decimal_size>0</decimal_size>
3434 </sequence> 3496 </sequence>
3435 </normal_column> 3497 </normal_column>
  3498 + </columns>
  3499 + <indexes>
  3500 + </indexes>
  3501 + <complex_unique_key_list>
  3502 + </complex_unique_key_list>
  3503 + <table_properties>
  3504 + <schema></schema>
  3505 + </table_properties>
  3506 + </table>
  3507 + <table>
  3508 + <id>13</id>
  3509 + <height>275</height>
  3510 + <width>292</width>
  3511 + <font_name>Ubuntu</font_name>
  3512 + <font_size>9</font_size>
  3513 + <x>-336</x>
  3514 + <y>236</y>
  3515 + <color>
  3516 + <r>255</r>
  3517 + <g>128</g>
  3518 + <b>255</b>
  3519 + </color>
  3520 + <connections>
  3521 + <relation>
  3522 + <id>11</id>
  3523 + <source>5</source>
  3524 + <target>13</target>
  3525 + <child_cardinality>1..n</child_cardinality>
  3526 + <parent_cardinality>1</parent_cardinality>
  3527 + <reference_for_pk>true</reference_for_pk>
  3528 + <name></name>
  3529 + <on_delete_action>RESTRICT</on_delete_action>
  3530 + <on_update_action>RESTRICT</on_update_action>
  3531 + <source_xp>-1</source_xp>
  3532 + <source_yp>-1</source_yp>
  3533 + <target_xp>-1</target_xp>
  3534 + <target_yp>-1</target_yp>
  3535 + <referenced_column>null</referenced_column>
  3536 + <referenced_complex_unique_key>null</referenced_complex_unique_key>
  3537 + </relation>
  3538 + </connections>
  3539 + <physical_name>i3geoestat_tipo_regiao</physical_name>
  3540 + <logical_name>i3geoestat_tipo_regiao</logical_name>
  3541 + <description>Identifica as tabelas que possuem colunas com geometrias de determinado local ou região</description>
  3542 + <constraint></constraint>
  3543 + <primary_key_name></primary_key_name>
  3544 + <option></option>
  3545 + <columns>
3436 <normal_column> 3546 <normal_column>
3437 - <word_id>19</word_id> 3547 + <word_id>4</word_id>
3438 <id>61</id> 3548 <id>61</id>
3439 <description></description> 3549 <description></description>
3440 <unique_key_name></unique_key_name> 3550 <unique_key_name></unique_key_name>
3441 <logical_name></logical_name> 3551 <logical_name></logical_name>
3442 <physical_name></physical_name> 3552 <physical_name></physical_name>
3443 - <type>text</type> 3553 + <type>integer</type>
3444 <constraint></constraint> 3554 <constraint></constraint>
3445 <default_value></default_value> 3555 <default_value></default_value>
3446 - <auto_increment>false</auto_increment> 3556 + <auto_increment>true</auto_increment>
3447 <foreign_key>false</foreign_key> 3557 <foreign_key>false</foreign_key>
3448 - <not_null>false</not_null>  
3449 - <primary_key>false</primary_key>  
3450 - <unique_key>false</unique_key> 3558 + <not_null>true</not_null>
  3559 + <primary_key>true</primary_key>
  3560 + <unique_key>true</unique_key>
3451 <character_set></character_set> 3561 <character_set></character_set>
3452 <collation></collation> 3562 <collation></collation>
3453 <sequence> 3563 <sequence>
@@ -3466,7 +3576,7 @@ @@ -3466,7 +3576,7 @@
3466 </sequence> 3576 </sequence>
3467 </normal_column> 3577 </normal_column>
3468 <normal_column> 3578 <normal_column>
3469 - <word_id>53</word_id> 3579 + <word_id>43</word_id>
3470 <id>62</id> 3580 <id>62</id>
3471 <description></description> 3581 <description></description>
3472 <unique_key_name></unique_key_name> 3582 <unique_key_name></unique_key_name>
@@ -3498,7 +3608,7 @@ @@ -3498,7 +3608,7 @@
3498 </sequence> 3608 </sequence>
3499 </normal_column> 3609 </normal_column>
3500 <normal_column> 3610 <normal_column>
3501 - <word_id>13</word_id> 3611 + <word_id>19</word_id>
3502 <id>63</id> 3612 <id>63</id>
3503 <description></description> 3613 <description></description>
3504 <unique_key_name></unique_key_name> 3614 <unique_key_name></unique_key_name>
@@ -3530,17 +3640,18 @@ @@ -3530,17 +3640,18 @@
3530 </sequence> 3640 </sequence>
3531 </normal_column> 3641 </normal_column>
3532 <normal_column> 3642 <normal_column>
3533 - <word_id>11</word_id>  
3534 <id>64</id> 3643 <id>64</id>
  3644 + <referenced_column>11</referenced_column>
  3645 + <relation>11</relation>
3535 <description></description> 3646 <description></description>
3536 <unique_key_name></unique_key_name> 3647 <unique_key_name></unique_key_name>
3537 <logical_name></logical_name> 3648 <logical_name></logical_name>
3538 <physical_name></physical_name> 3649 <physical_name></physical_name>
3539 - <type>text</type> 3650 + <type>integer</type>
3540 <constraint></constraint> 3651 <constraint></constraint>
3541 <default_value></default_value> 3652 <default_value></default_value>
3542 <auto_increment>false</auto_increment> 3653 <auto_increment>false</auto_increment>
3543 - <foreign_key>false</foreign_key> 3654 + <foreign_key>true</foreign_key>
3544 <not_null>false</not_null> 3655 <not_null>false</not_null>
3545 <primary_key>false</primary_key> 3656 <primary_key>false</primary_key>
3546 <unique_key>false</unique_key> 3657 <unique_key>false</unique_key>
@@ -3562,7 +3673,7 @@ @@ -3562,7 +3673,7 @@
3562 </sequence> 3673 </sequence>
3563 </normal_column> 3674 </normal_column>
3564 <normal_column> 3675 <normal_column>
3565 - <word_id>22</word_id> 3676 + <word_id>21</word_id>
3566 <id>65</id> 3677 <id>65</id>
3567 <description></description> 3678 <description></description>
3568 <unique_key_name></unique_key_name> 3679 <unique_key_name></unique_key_name>
@@ -3594,7 +3705,7 @@ @@ -3594,7 +3705,7 @@
3594 </sequence> 3705 </sequence>
3595 </normal_column> 3706 </normal_column>
3596 <normal_column> 3707 <normal_column>
3597 - <word_id>39</word_id> 3708 + <word_id>57</word_id>
3598 <id>66</id> 3709 <id>66</id>
3599 <description></description> 3710 <description></description>
3600 <unique_key_name></unique_key_name> 3711 <unique_key_name></unique_key_name>
@@ -3625,57 +3736,41 @@ @@ -3625,57 +3736,41 @@
3625 <decimal_size>0</decimal_size> 3736 <decimal_size>0</decimal_size>
3626 </sequence> 3737 </sequence>
3627 </normal_column> 3738 </normal_column>
3628 - </columns>  
3629 - <indexes>  
3630 - </indexes>  
3631 - <complex_unique_key_list>  
3632 - </complex_unique_key_list>  
3633 - <table_properties>  
3634 - <schema></schema>  
3635 - </table_properties>  
3636 - </table>  
3637 - <table>  
3638 - <id>14</id>  
3639 - <height>128</height>  
3640 - <width>269</width>  
3641 - <font_name>Ubuntu</font_name>  
3642 - <font_size>9</font_size>  
3643 - <x>753</x>  
3644 - <y>442</y>  
3645 - <color>  
3646 - <r>230</r>  
3647 - <g>230</g>  
3648 - <b>250</b>  
3649 - </color>  
3650 - <connections>  
3651 - <relation>  
3652 - <id>11</id>  
3653 - <source>13</source>  
3654 - <target>14</target>  
3655 - <child_cardinality>1..n</child_cardinality>  
3656 - <parent_cardinality>1</parent_cardinality>  
3657 - <reference_for_pk>true</reference_for_pk>  
3658 - <name></name>  
3659 - <on_delete_action>RESTRICT</on_delete_action>  
3660 - <on_update_action>RESTRICT</on_update_action>  
3661 - <source_xp>-1</source_xp>  
3662 - <source_yp>-1</source_yp>  
3663 - <target_xp>-1</target_xp>  
3664 - <target_yp>-1</target_yp>  
3665 - <referenced_column>null</referenced_column>  
3666 - <referenced_complex_unique_key>null</referenced_complex_unique_key>  
3667 - </relation>  
3668 - </connections>  
3669 - <physical_name>i3geoestat_medida_variavel_link</physical_name>  
3670 - <logical_name>i3geoestat_medida_variavel_link</logical_name>  
3671 - <description></description>  
3672 - <constraint></constraint>  
3673 - <primary_key_name></primary_key_name>  
3674 - <option></option>  
3675 - <columns>  
3676 <normal_column> 3739 <normal_column>
3677 - <word_id>31</word_id>  
3678 - <id>67</id> 3740 + <word_id>10</word_id>
  3741 + <id>67</id>
  3742 + <description></description>
  3743 + <unique_key_name></unique_key_name>
  3744 + <logical_name></logical_name>
  3745 + <physical_name></physical_name>
  3746 + <type>text</type>
  3747 + <constraint></constraint>
  3748 + <default_value></default_value>
  3749 + <auto_increment>false</auto_increment>
  3750 + <foreign_key>false</foreign_key>
  3751 + <not_null>false</not_null>
  3752 + <primary_key>false</primary_key>
  3753 + <unique_key>false</unique_key>
  3754 + <character_set></character_set>
  3755 + <collation></collation>
  3756 + <sequence>
  3757 + <name></name>
  3758 + <schema></schema>
  3759 + <increment></increment>
  3760 + <min_value></min_value>
  3761 + <max_value></max_value>
  3762 + <start></start>
  3763 + <cache></cache>
  3764 + <cycle>false</cycle>
  3765 + <order>false</order>
  3766 + <description></description>
  3767 + <data_type></data_type>
  3768 + <decimal_size>0</decimal_size>
  3769 + </sequence>
  3770 + </normal_column>
  3771 + <normal_column>
  3772 + <word_id>15</word_id>
  3773 + <id>68</id>
3679 <description></description> 3774 <description></description>
3680 <unique_key_name></unique_key_name> 3775 <unique_key_name></unique_key_name>
3681 <logical_name></logical_name> 3776 <logical_name></logical_name>
@@ -3706,9 +3801,8 @@ @@ -3706,9 +3801,8 @@
3706 </sequence> 3801 </sequence>
3707 </normal_column> 3802 </normal_column>
3708 <normal_column> 3803 <normal_column>
3709 - <id>68</id>  
3710 - <referenced_column>55</referenced_column>  
3711 - <relation>11</relation> 3804 + <word_id>25</word_id>
  3805 + <id>69</id>
3712 <description></description> 3806 <description></description>
3713 <unique_key_name></unique_key_name> 3807 <unique_key_name></unique_key_name>
3714 <logical_name></logical_name> 3808 <logical_name></logical_name>
@@ -3717,7 +3811,7 @@ @@ -3717,7 +3811,7 @@
3717 <constraint></constraint> 3811 <constraint></constraint>
3718 <default_value></default_value> 3812 <default_value></default_value>
3719 <auto_increment>false</auto_increment> 3813 <auto_increment>false</auto_increment>
3720 - <foreign_key>true</foreign_key> 3814 + <foreign_key>false</foreign_key>
3721 <not_null>false</not_null> 3815 <not_null>false</not_null>
3722 <primary_key>false</primary_key> 3816 <primary_key>false</primary_key>
3723 <unique_key>false</unique_key> 3817 <unique_key>false</unique_key>
@@ -3739,8 +3833,8 @@ @@ -3739,8 +3833,8 @@
3739 </sequence> 3833 </sequence>
3740 </normal_column> 3834 </normal_column>
3741 <normal_column> 3835 <normal_column>
3742 - <word_id>37</word_id>  
3743 - <id>69</id> 3836 + <word_id>13</word_id>
  3837 + <id>70</id>
3744 <description></description> 3838 <description></description>
3745 <unique_key_name></unique_key_name> 3839 <unique_key_name></unique_key_name>
3746 <logical_name></logical_name> 3840 <logical_name></logical_name>
@@ -3771,20 +3865,52 @@ @@ -3771,20 +3865,52 @@
3771 </sequence> 3865 </sequence>
3772 </normal_column> 3866 </normal_column>
3773 <normal_column> 3867 <normal_column>
3774 - <word_id>29</word_id>  
3775 - <id>70</id> 3868 + <word_id>55</word_id>
  3869 + <id>71</id>
3776 <description></description> 3870 <description></description>
3777 <unique_key_name></unique_key_name> 3871 <unique_key_name></unique_key_name>
3778 <logical_name></logical_name> 3872 <logical_name></logical_name>
3779 <physical_name></physical_name> 3873 <physical_name></physical_name>
3780 - <type>integer</type> 3874 + <type>text</type>
  3875 + <constraint></constraint>
  3876 + <default_value>4326</default_value>
  3877 + <auto_increment>false</auto_increment>
  3878 + <foreign_key>false</foreign_key>
  3879 + <not_null>false</not_null>
  3880 + <primary_key>false</primary_key>
  3881 + <unique_key>false</unique_key>
  3882 + <character_set></character_set>
  3883 + <collation></collation>
  3884 + <sequence>
  3885 + <name></name>
  3886 + <schema></schema>
  3887 + <increment></increment>
  3888 + <min_value></min_value>
  3889 + <max_value></max_value>
  3890 + <start></start>
  3891 + <cache></cache>
  3892 + <cycle>false</cycle>
  3893 + <order>false</order>
  3894 + <description></description>
  3895 + <data_type></data_type>
  3896 + <decimal_size>0</decimal_size>
  3897 + </sequence>
  3898 + </normal_column>
  3899 + <normal_column>
  3900 + <word_id>9</word_id>
  3901 + <id>72</id>
  3902 + <description></description>
  3903 + <unique_key_name></unique_key_name>
  3904 + <logical_name></logical_name>
  3905 + <physical_name></physical_name>
  3906 + <type>text</type>
3781 <constraint></constraint> 3907 <constraint></constraint>
3782 <default_value></default_value> 3908 <default_value></default_value>
3783 - <auto_increment>true</auto_increment> 3909 + <auto_increment>false</auto_increment>
3784 <foreign_key>false</foreign_key> 3910 <foreign_key>false</foreign_key>
3785 - <not_null>true</not_null>  
3786 - <primary_key>true</primary_key>  
3787 - <unique_key>true</unique_key> 3911 + <not_null>false</not_null>
  3912 + <primary_key>false</primary_key>
  3913 + <unique_key>false</unique_key>
3788 <character_set></character_set> 3914 <character_set></character_set>
3789 <collation></collation> 3915 <collation></collation>
3790 <sequence> 3916 <sequence>
@@ -3812,40 +3938,23 @@ @@ -3812,40 +3938,23 @@
3812 </table_properties> 3938 </table_properties>
3813 </table> 3939 </table>
3814 <table> 3940 <table>
3815 - <id>15</id>  
3816 - <height>86</height>  
3817 - <width>269</width> 3941 + <id>14</id>
  3942 + <height>128</height>
  3943 + <width>270</width>
3818 <font_name>Ubuntu</font_name> 3944 <font_name>Ubuntu</font_name>
3819 <font_size>9</font_size> 3945 <font_size>9</font_size>
3820 - <x>705</x>  
3821 - <y>152</y> 3946 + <x>-372</x>
  3947 + <y>596</y>
3822 <color> 3948 <color>
3823 - <r>144</r>  
3824 - <g>238</g>  
3825 - <b>144</b> 3949 + <r>255</r>
  3950 + <g>128</g>
  3951 + <b>255</b>
3826 </color> 3952 </color>
3827 <connections> 3953 <connections>
3828 <relation> 3954 <relation>
3829 <id>12</id> 3955 <id>12</id>
3830 <source>13</source> 3956 <source>13</source>
3831 - <target>15</target>  
3832 - <child_cardinality>1..n</child_cardinality>  
3833 - <parent_cardinality>1</parent_cardinality>  
3834 - <reference_for_pk>true</reference_for_pk>  
3835 - <name></name>  
3836 - <on_delete_action>RESTRICT</on_delete_action>  
3837 - <on_update_action>RESTRICT</on_update_action>  
3838 - <source_xp>-1</source_xp>  
3839 - <source_yp>-1</source_yp>  
3840 - <target_xp>-1</target_xp>  
3841 - <target_yp>-1</target_yp>  
3842 - <referenced_column>null</referenced_column>  
3843 - <referenced_complex_unique_key>null</referenced_complex_unique_key>  
3844 - </relation>  
3845 - <relation>  
3846 - <id>13</id>  
3847 - <source>12</source>  
3848 - <target>15</target> 3957 + <target>14</target>
3849 <child_cardinality>1..n</child_cardinality> 3958 <child_cardinality>1..n</child_cardinality>
3850 <parent_cardinality>1</parent_cardinality> 3959 <parent_cardinality>1</parent_cardinality>
3851 <reference_for_pk>true</reference_for_pk> 3960 <reference_for_pk>true</reference_for_pk>
@@ -3860,16 +3969,48 @@ @@ -3860,16 +3969,48 @@
3860 <referenced_complex_unique_key>null</referenced_complex_unique_key> 3969 <referenced_complex_unique_key>null</referenced_complex_unique_key>
3861 </relation> 3970 </relation>
3862 </connections> 3971 </connections>
3863 - <physical_name>i3geoestat_fonteinfo_medida</physical_name>  
3864 - <logical_name>i3geoestat_fonteinfo_medida</logical_name> 3972 + <physical_name>i3geoestat_agregaregiao</physical_name>
  3973 + <logical_name>i3geoestat_agregaregiao</logical_name>
3865 <description></description> 3974 <description></description>
3866 <constraint></constraint> 3975 <constraint></constraint>
3867 <primary_key_name></primary_key_name> 3976 <primary_key_name></primary_key_name>
3868 <option></option> 3977 <option></option>
3869 <columns> 3978 <columns>
3870 <normal_column> 3979 <normal_column>
3871 - <id>71</id>  
3872 - <referenced_column>55</referenced_column> 3980 + <word_id>26</word_id>
  3981 + <id>73</id>
  3982 + <description></description>
  3983 + <unique_key_name></unique_key_name>
  3984 + <logical_name></logical_name>
  3985 + <physical_name></physical_name>
  3986 + <type>integer</type>
  3987 + <constraint></constraint>
  3988 + <default_value></default_value>
  3989 + <auto_increment>true</auto_increment>
  3990 + <foreign_key>false</foreign_key>
  3991 + <not_null>true</not_null>
  3992 + <primary_key>true</primary_key>
  3993 + <unique_key>true</unique_key>
  3994 + <character_set></character_set>
  3995 + <collation></collation>
  3996 + <sequence>
  3997 + <name></name>
  3998 + <schema></schema>
  3999 + <increment></increment>
  4000 + <min_value></min_value>
  4001 + <max_value></max_value>
  4002 + <start></start>
  4003 + <cache></cache>
  4004 + <cycle>false</cycle>
  4005 + <order>false</order>
  4006 + <description></description>
  4007 + <data_type></data_type>
  4008 + <decimal_size>0</decimal_size>
  4009 + </sequence>
  4010 + </normal_column>
  4011 + <normal_column>
  4012 + <id>74</id>
  4013 + <referenced_column>61</referenced_column>
3873 <relation>12</relation> 4014 <relation>12</relation>
3874 <description></description> 4015 <description></description>
3875 <unique_key_name></unique_key_name> 4016 <unique_key_name></unique_key_name>
@@ -3880,7 +4021,7 @@ @@ -3880,7 +4021,7 @@
3880 <default_value></default_value> 4021 <default_value></default_value>
3881 <auto_increment>false</auto_increment> 4022 <auto_increment>false</auto_increment>
3882 <foreign_key>true</foreign_key> 4023 <foreign_key>true</foreign_key>
3883 - <not_null>true</not_null> 4024 + <not_null>false</not_null>
3884 <primary_key>false</primary_key> 4025 <primary_key>false</primary_key>
3885 <unique_key>false</unique_key> 4026 <unique_key>false</unique_key>
3886 <character_set></character_set> 4027 <character_set></character_set>
@@ -3901,9 +4042,8 @@ @@ -3901,9 +4042,8 @@
3901 </sequence> 4042 </sequence>
3902 </normal_column> 4043 </normal_column>
3903 <normal_column> 4044 <normal_column>
3904 - <id>72</id>  
3905 - <referenced_column>52</referenced_column>  
3906 - <relation>13</relation> 4045 + <word_id>5</word_id>
  4046 + <id>75</id>
3907 <description></description> 4047 <description></description>
3908 <unique_key_name></unique_key_name> 4048 <unique_key_name></unique_key_name>
3909 <logical_name></logical_name> 4049 <logical_name></logical_name>
@@ -3912,8 +4052,40 @@ @@ -3912,8 +4052,40 @@
3912 <constraint></constraint> 4052 <constraint></constraint>
3913 <default_value></default_value> 4053 <default_value></default_value>
3914 <auto_increment>false</auto_increment> 4054 <auto_increment>false</auto_increment>
3915 - <foreign_key>true</foreign_key>  
3916 - <not_null>true</not_null> 4055 + <foreign_key>false</foreign_key>
  4056 + <not_null>false</not_null>
  4057 + <primary_key>false</primary_key>
  4058 + <unique_key>false</unique_key>
  4059 + <character_set></character_set>
  4060 + <collation></collation>
  4061 + <sequence>
  4062 + <name></name>
  4063 + <schema></schema>
  4064 + <increment></increment>
  4065 + <min_value></min_value>
  4066 + <max_value></max_value>
  4067 + <start></start>
  4068 + <cache></cache>
  4069 + <cycle>false</cycle>
  4070 + <order>false</order>
  4071 + <description></description>
  4072 + <data_type></data_type>
  4073 + <decimal_size>0</decimal_size>
  4074 + </sequence>
  4075 + </normal_column>
  4076 + <normal_column>
  4077 + <word_id>12</word_id>
  4078 + <id>76</id>
  4079 + <description></description>
  4080 + <unique_key_name></unique_key_name>
  4081 + <logical_name></logical_name>
  4082 + <physical_name></physical_name>
  4083 + <type>text</type>
  4084 + <constraint></constraint>
  4085 + <default_value></default_value>
  4086 + <auto_increment>false</auto_increment>
  4087 + <foreign_key>false</foreign_key>
  4088 + <not_null>false</not_null>
3917 <primary_key>false</primary_key> 4089 <primary_key>false</primary_key>
3918 <unique_key>false</unique_key> 4090 <unique_key>false</unique_key>
3919 <character_set></character_set> 4091 <character_set></character_set>
@@ -3950,31 +4122,31 @@ @@ -3950,31 +4122,31 @@
3950 <name>metaestat_basededados</name> 4122 <name>metaestat_basededados</name>
3951 <export_order>0</export_order> 4123 <export_order>0</export_order>
3952 <table_test_data> 4124 <table_test_data>
3953 - <table_id>9</table_id> 4125 + <table_id>5</table_id>
3954 <direct_test_data> 4126 <direct_test_data>
3955 <data> 4127 <data>
3956 <column_data> 4128 <column_data>
3957 - <column_id>29</column_id> 4129 + <column_id>11</column_id>
3958 <value>1</value> 4130 <value>1</value>
3959 </column_data> 4131 </column_data>
3960 <column_data> 4132 <column_data>
3961 - <column_id>30</column_id> 4133 + <column_id>12</column_id>
3962 <value>dbspo</value> 4134 <value>dbspo</value>
3963 </column_data> 4135 </column_data>
3964 <column_data> 4136 <column_data>
3965 - <column_id>31</column_id> 4137 + <column_id>13</column_id>
3966 <value>localhost</value> 4138 <value>localhost</value>
3967 </column_data> 4139 </column_data>
3968 <column_data> 4140 <column_data>
3969 - <column_id>32</column_id> 4141 + <column_id>14</column_id>
3970 <value>5432</value> 4142 <value>5432</value>
3971 </column_data> 4143 </column_data>
3972 <column_data> 4144 <column_data>
3973 - <column_id>33</column_id> 4145 + <column_id>15</column_id>
3974 <value>postgres</value> 4146 <value>postgres</value>
3975 </column_data> 4147 </column_data>
3976 <column_data> 4148 <column_data>
3977 - <column_id>34</column_id> 4149 + <column_id>16</column_id>
3978 <value>postgres</value> 4150 <value>postgres</value>
3979 </column_data> 4151 </column_data>
3980 </data> 4152 </data>
@@ -3983,7 +4155,7 @@ @@ -3983,7 +4155,7 @@
3983 <test_data_num>0</test_data_num> 4155 <test_data_num>0</test_data_num>
3984 <data_def_list> 4156 <data_def_list>
3985 <data_def> 4157 <data_def>
3986 - <column_id>29</column_id> 4158 + <column_id>11</column_id>
3987 <type>Format</type> 4159 <type>Format</type>
3988 <repeat_num>1</repeat_num> 4160 <repeat_num>1</repeat_num>
3989 <template>%</template> 4161 <template>%</template>
@@ -3998,7 +4170,7 @@ @@ -3998,7 +4170,7 @@
3998 </modified_values> 4170 </modified_values>
3999 </data_def> 4171 </data_def>
4000 <data_def> 4172 <data_def>
4001 - <column_id>30</column_id> 4173 + <column_id>12</column_id>
4002 <type>Format</type> 4174 <type>Format</type>
4003 <repeat_num>1</repeat_num> 4175 <repeat_num>1</repeat_num>
4004 <template>database%</template> 4176 <template>database%</template>
@@ -4013,7 +4185,7 @@ @@ -4013,7 +4185,7 @@
4013 </modified_values> 4185 </modified_values>
4014 </data_def> 4186 </data_def>
4015 <data_def> 4187 <data_def>
4016 - <column_id>31</column_id> 4188 + <column_id>13</column_id>
4017 <type>Format</type> 4189 <type>Format</type>
4018 <repeat_num>1</repeat_num> 4190 <repeat_num>1</repeat_num>
4019 <template>host%</template> 4191 <template>host%</template>
@@ -4028,7 +4200,7 @@ @@ -4028,7 +4200,7 @@
4028 </modified_values> 4200 </modified_values>
4029 </data_def> 4201 </data_def>
4030 <data_def> 4202 <data_def>
4031 - <column_id>32</column_id> 4203 + <column_id>14</column_id>
4032 <type>Format</type> 4204 <type>Format</type>
4033 <repeat_num>1</repeat_num> 4205 <repeat_num>1</repeat_num>
4034 <template>porta%</template> 4206 <template>porta%</template>
@@ -4043,7 +4215,7 @@ @@ -4043,7 +4215,7 @@
4043 </modified_values> 4215 </modified_values>
4044 </data_def> 4216 </data_def>
4045 <data_def> 4217 <data_def>
4046 - <column_id>33</column_id> 4218 + <column_id>15</column_id>
4047 <type>Format</type> 4219 <type>Format</type>
4048 <repeat_num>1</repeat_num> 4220 <repeat_num>1</repeat_num>
4049 <template>usuario%</template> 4221 <template>usuario%</template>
@@ -4058,7 +4230,7 @@ @@ -4058,7 +4230,7 @@
4058 </modified_values> 4230 </modified_values>
4059 </data_def> 4231 </data_def>
4060 <data_def> 4232 <data_def>
4061 - <column_id>34</column_id> 4233 + <column_id>16</column_id>
4062 <type>Format</type> 4234 <type>Format</type>
4063 <repeat_num>1</repeat_num> 4235 <repeat_num>1</repeat_num>
4064 <template>senha%</template> 4236 <template>senha%</template>
@@ -4076,7 +4248,7 @@ @@ -4076,7 +4248,7 @@
4076 </repeat_test_data> 4248 </repeat_test_data>
4077 </table_test_data> 4249 </table_test_data>
4078 <table_test_data> 4250 <table_test_data>
4079 - <table_id>4</table_id> 4251 + <table_id>3</table_id>
4080 <direct_test_data> 4252 <direct_test_data>
4081 <data> 4253 <data>
4082 <column_data> 4254 <column_data>
@@ -4159,55 +4331,55 @@ @@ -4159,55 +4331,55 @@
4159 </repeat_test_data> 4331 </repeat_test_data>
4160 </table_test_data> 4332 </table_test_data>
4161 <table_test_data> 4333 <table_test_data>
4162 - <table_id>8</table_id> 4334 + <table_id>13</table_id>
4163 <direct_test_data> 4335 <direct_test_data>
4164 <data> 4336 <data>
4165 <column_data> 4337 <column_data>
4166 - <column_id>17</column_id> 4338 + <column_id>61</column_id>
4167 <value>1</value> 4339 <value>1</value>
4168 </column_data> 4340 </column_data>
4169 <column_data> 4341 <column_data>
4170 - <column_id>18</column_id> 4342 + <column_id>62</column_id>
4171 <value>Município</value> 4343 <value>Município</value>
4172 </column_data> 4344 </column_data>
4173 <column_data> 4345 <column_data>
4174 - <column_id>19</column_id> 4346 + <column_id>63</column_id>
4175 <value>Limites municipais</value> 4347 <value>Limites municipais</value>
4176 </column_data> 4348 </column_data>
4177 <column_data> 4349 <column_data>
4178 - <column_id>20</column_id> 4350 + <column_id>64</column_id>
4179 <value>1</value> 4351 <value>1</value>
4180 </column_data> 4352 </column_data>
4181 <column_data> 4353 <column_data>
4182 - <column_id>21</column_id> 4354 + <column_id>65</column_id>
4183 <value>public</value> 4355 <value>public</value>
4184 </column_data> 4356 </column_data>
4185 <column_data> 4357 <column_data>
4186 - <column_id>22</column_id> 4358 + <column_id>66</column_id>
4187 <value>tb_ibge</value> 4359 <value>tb_ibge</value>
4188 </column_data> 4360 </column_data>
4189 <column_data> 4361 <column_data>
4190 - <column_id>23</column_id> 4362 + <column_id>67</column_id>
4191 <value>the_geom</value> 4363 <value>the_geom</value>
4192 </column_data> 4364 </column_data>
4193 <column_data> 4365 <column_data>
4194 - <column_id>24</column_id> 4366 + <column_id>68</column_id>
4195 <value></value> 4367 <value></value>
4196 </column_data> 4368 </column_data>
4197 <column_data> 4369 <column_data>
4198 - <column_id>25</column_id> 4370 + <column_id>69</column_id>
4199 <value>ibge</value> 4371 <value>ibge</value>
4200 </column_data> 4372 </column_data>
4201 <column_data> 4373 <column_data>
4202 - <column_id>26</column_id> 4374 + <column_id>70</column_id>
4203 <value>no_cidade</value> 4375 <value>no_cidade</value>
4204 </column_data> 4376 </column_data>
4205 <column_data> 4377 <column_data>
4206 - <column_id>27</column_id> 4378 + <column_id>71</column_id>
4207 <value>4326</value> 4379 <value>4326</value>
4208 </column_data> 4380 </column_data>
4209 <column_data> 4381 <column_data>
4210 - <column_id>28</column_id> 4382 + <column_id>72</column_id>
4211 <value>the_geom2</value> 4383 <value>the_geom2</value>
4212 </column_data> 4384 </column_data>
4213 </data> 4385 </data>
@@ -4216,7 +4388,7 @@ @@ -4216,7 +4388,7 @@
4216 <test_data_num>0</test_data_num> 4388 <test_data_num>0</test_data_num>
4217 <data_def_list> 4389 <data_def_list>
4218 <data_def> 4390 <data_def>
4219 - <column_id>17</column_id> 4391 + <column_id>61</column_id>
4220 <type>Format</type> 4392 <type>Format</type>
4221 <repeat_num>1</repeat_num> 4393 <repeat_num>1</repeat_num>
4222 <template>%</template> 4394 <template>%</template>
@@ -4231,7 +4403,7 @@ @@ -4231,7 +4403,7 @@
4231 </modified_values> 4403 </modified_values>
4232 </data_def> 4404 </data_def>
4233 <data_def> 4405 <data_def>
4234 - <column_id>18</column_id> 4406 + <column_id>62</column_id>
4235 <type>Format</type> 4407 <type>Format</type>
4236 <repeat_num>1</repeat_num> 4408 <repeat_num>1</repeat_num>
4237 <template>nome_tipo_regiao%</template> 4409 <template>nome_tipo_regiao%</template>
@@ -4246,7 +4418,7 @@ @@ -4246,7 +4418,7 @@
4246 </modified_values> 4418 </modified_values>
4247 </data_def> 4419 </data_def>
4248 <data_def> 4420 <data_def>
4249 - <column_id>19</column_id> 4421 + <column_id>63</column_id>
4250 <type>Format</type> 4422 <type>Format</type>
4251 <repeat_num>1</repeat_num> 4423 <repeat_num>1</repeat_num>
4252 <template>descricao_tipo_regiao%</template> 4424 <template>descricao_tipo_regiao%</template>
@@ -4261,7 +4433,7 @@ @@ -4261,7 +4433,7 @@
4261 </modified_values> 4433 </modified_values>
4262 </data_def> 4434 </data_def>
4263 <data_def> 4435 <data_def>
4264 - <column_id>20</column_id> 4436 + <column_id>64</column_id>
4265 <type>Foreign Key</type> 4437 <type>Foreign Key</type>
4266 <repeat_num>1</repeat_num> 4438 <repeat_num>1</repeat_num>
4267 <template>%</template> 4439 <template>%</template>
@@ -4276,7 +4448,7 @@ @@ -4276,7 +4448,7 @@
4276 </modified_values> 4448 </modified_values>
4277 </data_def> 4449 </data_def>
4278 <data_def> 4450 <data_def>
4279 - <column_id>21</column_id> 4451 + <column_id>65</column_id>
4280 <type>Format</type> 4452 <type>Format</type>
4281 <repeat_num>1</repeat_num> 4453 <repeat_num>1</repeat_num>
4282 <template>esquemadb%</template> 4454 <template>esquemadb%</template>
@@ -4291,7 +4463,7 @@ @@ -4291,7 +4463,7 @@
4291 </modified_values> 4463 </modified_values>
4292 </data_def> 4464 </data_def>
4293 <data_def> 4465 <data_def>
4294 - <column_id>22</column_id> 4466 + <column_id>66</column_id>
4295 <type>Format</type> 4467 <type>Format</type>
4296 <repeat_num>1</repeat_num> 4468 <repeat_num>1</repeat_num>
4297 <template>tabela%</template> 4469 <template>tabela%</template>
@@ -4306,7 +4478,7 @@ @@ -4306,7 +4478,7 @@
4306 </modified_values> 4478 </modified_values>
4307 </data_def> 4479 </data_def>
4308 <data_def> 4480 <data_def>
4309 - <column_id>23</column_id> 4481 + <column_id>67</column_id>
4310 <type>Format</type> 4482 <type>Format</type>
4311 <repeat_num>1</repeat_num> 4483 <repeat_num>1</repeat_num>
4312 <template>colunageo%</template> 4484 <template>colunageo%</template>
@@ -4321,7 +4493,7 @@ @@ -4321,7 +4493,7 @@
4321 </modified_values> 4493 </modified_values>
4322 </data_def> 4494 </data_def>
4323 <data_def> 4495 <data_def>
4324 - <column_id>24</column_id> 4496 + <column_id>68</column_id>
4325 <type>Format</type> 4497 <type>Format</type>
4326 <repeat_num>1</repeat_num> 4498 <repeat_num>1</repeat_num>
4327 <template>data%</template> 4499 <template>data%</template>
@@ -4336,7 +4508,7 @@ @@ -4336,7 +4508,7 @@
4336 </modified_values> 4508 </modified_values>
4337 </data_def> 4509 </data_def>
4338 <data_def> 4510 <data_def>
4339 - <column_id>25</column_id> 4511 + <column_id>69</column_id>
4340 <type>Format</type> 4512 <type>Format</type>
4341 <repeat_num>1</repeat_num> 4513 <repeat_num>1</repeat_num>
4342 <template>%</template> 4514 <template>%</template>
@@ -4351,7 +4523,7 @@ @@ -4351,7 +4523,7 @@
4351 </modified_values> 4523 </modified_values>
4352 </data_def> 4524 </data_def>
4353 <data_def> 4525 <data_def>
4354 - <column_id>26</column_id> 4526 + <column_id>70</column_id>
4355 <type>Format</type> 4527 <type>Format</type>
4356 <repeat_num>1</repeat_num> 4528 <repeat_num>1</repeat_num>
4357 <template>colunanomeregiao%</template> 4529 <template>colunanomeregiao%</template>
@@ -4366,7 +4538,7 @@ @@ -4366,7 +4538,7 @@
4366 </modified_values> 4538 </modified_values>
4367 </data_def> 4539 </data_def>
4368 <data_def> 4540 <data_def>
4369 - <column_id>27</column_id> 4541 + <column_id>71</column_id>
4370 <type>Format</type> 4542 <type>Format</type>
4371 <repeat_num>1</repeat_num> 4543 <repeat_num>1</repeat_num>
4372 <template>srid%</template> 4544 <template>srid%</template>
@@ -4381,7 +4553,7 @@ @@ -4381,7 +4553,7 @@
4381 </modified_values> 4553 </modified_values>
4382 </data_def> 4554 </data_def>
4383 <data_def> 4555 <data_def>
4384 - <column_id>28</column_id> 4556 + <column_id>72</column_id>
4385 <type>Format</type> 4557 <type>Format</type>
4386 <repeat_num>1</repeat_num> 4558 <repeat_num>1</repeat_num>
4387 <template>colunacentroide%</template> 4559 <template>colunacentroide%</template>
@@ -4399,7 +4571,7 @@ @@ -4399,7 +4571,7 @@
4399 </repeat_test_data> 4571 </repeat_test_data>
4400 </table_test_data> 4572 </table_test_data>
4401 <table_test_data> 4573 <table_test_data>
4402 - <table_id>3</table_id> 4574 + <table_id>2</table_id>
4403 <direct_test_data> 4575 <direct_test_data>
4404 <data> 4576 <data>
4405 <column_data> 4577 <column_data>
@@ -4506,55 +4678,55 @@ @@ -4506,55 +4678,55 @@
4506 </repeat_test_data> 4678 </repeat_test_data>
4507 </table_test_data> 4679 </table_test_data>
4508 <table_test_data> 4680 <table_test_data>
4509 - <table_id>13</table_id> 4681 + <table_id>9</table_id>
4510 <direct_test_data> 4682 <direct_test_data>
4511 <data> 4683 <data>
4512 <column_data> 4684 <column_data>
4513 - <column_id>55</column_id> 4685 + <column_id>37</column_id>
4514 <value>1</value> 4686 <value>1</value>
4515 </column_data> 4687 </column_data>
4516 <column_data> 4688 <column_data>
4517 - <column_id>56</column_id> 4689 + <column_id>38</column_id>
4518 <value>1</value> 4690 <value>1</value>
4519 </column_data> 4691 </column_data>
4520 <column_data> 4692 <column_data>
4521 - <column_id>57</column_id> 4693 + <column_id>39</column_id>
4522 <value>2</value> 4694 <value>2</value>
4523 </column_data> 4695 </column_data>
4524 <column_data> 4696 <column_data>
4525 - <column_id>58</column_id> 4697 + <column_id>40</column_id>
4526 <value>1</value> 4698 <value>1</value>
4527 </column_data> 4699 </column_data>
4528 <column_data> 4700 <column_data>
4529 - <column_id>59</column_id> 4701 + <column_id>41</column_id>
4530 <value>1</value> 4702 <value>1</value>
4531 </column_data> 4703 </column_data>
4532 <column_data> 4704 <column_data>
4533 - <column_id>60</column_id> 4705 + <column_id>42</column_id>
4534 <value>1</value> 4706 <value>1</value>
4535 </column_data> 4707 </column_data>
4536 <column_data> 4708 <column_data>
4537 - <column_id>61</column_id> 4709 + <column_id>43</column_id>
4538 <value>dbacoes_saude</value> 4710 <value>dbacoes_saude</value>
4539 </column_data> 4711 </column_data>
4540 <column_data> 4712 <column_data>
4541 - <column_id>62</column_id> 4713 + <column_id>44</column_id>
4542 <value>tb_farmacia_pop</value> 4714 <value>tb_farmacia_pop</value>
4543 </column_data> 4715 </column_data>
4544 <column_data> 4716 <column_data>
4545 - <column_id>63</column_id> 4717 + <column_id>45</column_id>
4546 <value>nu_farm_funcionando</value> 4718 <value>nu_farm_funcionando</value>
4547 </column_data> 4719 </column_data>
4548 <column_data> 4720 <column_data>
4549 - <column_id>64</column_id> 4721 + <column_id>46</column_id>
4550 <value>co_ibge</value> 4722 <value>co_ibge</value>
4551 </column_data> 4723 </column_data>
4552 <column_data> 4724 <column_data>
4553 - <column_id>65</column_id> 4725 + <column_id>47</column_id>
4554 <value></value> 4726 <value></value>
4555 </column_data> 4727 </column_data>
4556 <column_data> 4728 <column_data>
4557 - <column_id>66</column_id> 4729 + <column_id>48</column_id>
4558 <value>Número de farmácias em funcionamento por mês e ano</value> 4730 <value>Número de farmácias em funcionamento por mês e ano</value>
4559 </column_data> 4731 </column_data>
4560 </data> 4732 </data>
@@ -4563,7 +4735,7 @@ @@ -4563,7 +4735,7 @@
4563 <test_data_num>0</test_data_num> 4735 <test_data_num>0</test_data_num>
4564 <data_def_list> 4736 <data_def_list>
4565 <data_def> 4737 <data_def>
4566 - <column_id>55</column_id> 4738 + <column_id>37</column_id>
4567 <type>Format</type> 4739 <type>Format</type>
4568 <repeat_num>1</repeat_num> 4740 <repeat_num>1</repeat_num>
4569 <template>%</template> 4741 <template>%</template>
@@ -4578,7 +4750,7 @@ @@ -4578,7 +4750,7 @@
4578 </modified_values> 4750 </modified_values>
4579 </data_def> 4751 </data_def>
4580 <data_def> 4752 <data_def>
4581 - <column_id>56</column_id> 4753 + <column_id>38</column_id>
4582 <type>Foreign Key</type> 4754 <type>Foreign Key</type>
4583 <repeat_num>1</repeat_num> 4755 <repeat_num>1</repeat_num>
4584 <template>%</template> 4756 <template>%</template>
@@ -4593,7 +4765,7 @@ @@ -4593,7 +4765,7 @@
4593 </modified_values> 4765 </modified_values>
4594 </data_def> 4766 </data_def>
4595 <data_def> 4767 <data_def>
4596 - <column_id>57</column_id> 4768 + <column_id>39</column_id>
4597 <type>Foreign Key</type> 4769 <type>Foreign Key</type>
4598 <repeat_num>1</repeat_num> 4770 <repeat_num>1</repeat_num>
4599 <template>%</template> 4771 <template>%</template>
@@ -4608,7 +4780,7 @@ @@ -4608,7 +4780,7 @@
4608 </modified_values> 4780 </modified_values>
4609 </data_def> 4781 </data_def>
4610 <data_def> 4782 <data_def>
4611 - <column_id>58</column_id> 4783 + <column_id>40</column_id>
4612 <type>Foreign Key</type> 4784 <type>Foreign Key</type>
4613 <repeat_num>1</repeat_num> 4785 <repeat_num>1</repeat_num>
4614 <template>%</template> 4786 <template>%</template>
@@ -4623,7 +4795,7 @@ @@ -4623,7 +4795,7 @@
4623 </modified_values> 4795 </modified_values>
4624 </data_def> 4796 </data_def>
4625 <data_def> 4797 <data_def>
4626 - <column_id>59</column_id> 4798 + <column_id>41</column_id>
4627 <type>Foreign Key</type> 4799 <type>Foreign Key</type>
4628 <repeat_num>1</repeat_num> 4800 <repeat_num>1</repeat_num>
4629 <template>%</template> 4801 <template>%</template>
@@ -4638,7 +4810,7 @@ @@ -4638,7 +4810,7 @@
4638 </modified_values> 4810 </modified_values>
4639 </data_def> 4811 </data_def>
4640 <data_def> 4812 <data_def>
4641 - <column_id>60</column_id> 4813 + <column_id>42</column_id>
4642 <type>Foreign Key</type> 4814 <type>Foreign Key</type>
4643 <repeat_num>1</repeat_num> 4815 <repeat_num>1</repeat_num>
4644 <template>%</template> 4816 <template>%</template>
@@ -4653,7 +4825,7 @@ @@ -4653,7 +4825,7 @@
4653 </modified_values> 4825 </modified_values>
4654 </data_def> 4826 </data_def>
4655 <data_def> 4827 <data_def>
4656 - <column_id>61</column_id> 4828 + <column_id>43</column_id>
4657 <type>Format</type> 4829 <type>Format</type>
4658 <repeat_num>1</repeat_num> 4830 <repeat_num>1</repeat_num>
4659 <template>esquemadb%</template> 4831 <template>esquemadb%</template>
@@ -4668,7 +4840,7 @@ @@ -4668,7 +4840,7 @@
4668 </modified_values> 4840 </modified_values>
4669 </data_def> 4841 </data_def>
4670 <data_def> 4842 <data_def>
4671 - <column_id>62</column_id> 4843 + <column_id>44</column_id>
4672 <type>Format</type> 4844 <type>Format</type>
4673 <repeat_num>1</repeat_num> 4845 <repeat_num>1</repeat_num>
4674 <template>tabela%</template> 4846 <template>tabela%</template>
@@ -4683,7 +4855,7 @@ @@ -4683,7 +4855,7 @@
4683 </modified_values> 4855 </modified_values>
4684 </data_def> 4856 </data_def>
4685 <data_def> 4857 <data_def>
4686 - <column_id>63</column_id> 4858 + <column_id>45</column_id>
4687 <type>Format</type> 4859 <type>Format</type>
4688 <repeat_num>1</repeat_num> 4860 <repeat_num>1</repeat_num>
4689 <template>colunavalor%</template> 4861 <template>colunavalor%</template>
@@ -4698,7 +4870,7 @@ @@ -4698,7 +4870,7 @@
4698 </modified_values> 4870 </modified_values>
4699 </data_def> 4871 </data_def>
4700 <data_def> 4872 <data_def>
4701 - <column_id>64</column_id> 4873 + <column_id>46</column_id>
4702 <type>Format</type> 4874 <type>Format</type>
4703 <repeat_num>1</repeat_num> 4875 <repeat_num>1</repeat_num>
4704 <template>colunaidgeo_%</template> 4876 <template>colunaidgeo_%</template>
@@ -4713,7 +4885,7 @@ @@ -4713,7 +4885,7 @@
4713 </modified_values> 4885 </modified_values>
4714 </data_def> 4886 </data_def>
4715 <data_def> 4887 <data_def>
4716 - <column_id>65</column_id> 4888 + <column_id>47</column_id>
4717 <type>Format</type> 4889 <type>Format</type>
4718 <repeat_num>1</repeat_num> 4890 <repeat_num>1</repeat_num>
4719 <template>filtro%</template> 4891 <template>filtro%</template>
@@ -4728,7 +4900,7 @@ @@ -4728,7 +4900,7 @@
4728 </modified_values> 4900 </modified_values>
4729 </data_def> 4901 </data_def>
4730 <data_def> 4902 <data_def>
4731 - <column_id>66</column_id> 4903 + <column_id>48</column_id>
4732 <type>Format</type> 4904 <type>Format</type>
4733 <repeat_num>1</repeat_num> 4905 <repeat_num>1</repeat_num>
4734 <template>nomemedida_%</template> 4906 <template>nomemedida_%</template>
@@ -4746,57 +4918,57 @@ @@ -4746,57 +4918,57 @@
4746 </repeat_test_data> 4918 </repeat_test_data>
4747 </table_test_data> 4919 </table_test_data>
4748 <table_test_data> 4920 <table_test_data>
4749 - <table_id>6</table_id> 4921 + <table_id>12</table_id>
4750 <direct_test_data> 4922 <direct_test_data>
4751 <data> 4923 <data>
4752 <column_data> 4924 <column_data>
4753 - <column_id>11</column_id> 4925 + <column_id>55</column_id>
4754 <value>1</value> 4926 <value>1</value>
4755 </column_data> 4927 </column_data>
4756 <column_data> 4928 <column_data>
4757 - <column_id>12</column_id>  
4758 - <value>to_date(mes_farm_pop||&apos; &apos;||ano_farm,&apos;MM YYYY&apos;) as mes</value> 4929 + <column_id>56</column_id>
  4930 + <value>mes_farm_pop</value>
4759 </column_data> 4931 </column_data>
4760 <column_data> 4932 <column_data>
4761 - <column_id>13</column_id>  
4762 - <value>mês e ano</value> 4933 + <column_id>57</column_id>
  4934 + <value>mês</value>
4763 </column_data> 4935 </column_data>
4764 <column_data> 4936 <column_data>
4765 - <column_id>14</column_id> 4937 + <column_id>58</column_id>
4766 <value></value> 4938 <value></value>
4767 </column_data> 4939 </column_data>
4768 <column_data> 4940 <column_data>
4769 - <column_id>15</column_id>  
4770 - <value>0</value> 4941 + <column_id>59</column_id>
  4942 + <value>2</value>
4771 </column_data> 4943 </column_data>
4772 <column_data> 4944 <column_data>
4773 - <column_id>16</column_id> 4945 + <column_id>60</column_id>
4774 <value>1</value> 4946 <value>1</value>
4775 </column_data> 4947 </column_data>
4776 </data> 4948 </data>
4777 <data> 4949 <data>
4778 <column_data> 4950 <column_data>
4779 - <column_id>11</column_id> 4951 + <column_id>55</column_id>
4780 <value>2</value> 4952 <value>2</value>
4781 </column_data> 4953 </column_data>
4782 <column_data> 4954 <column_data>
4783 - <column_id>12</column_id> 4955 + <column_id>56</column_id>
4784 <value>ano_farm</value> 4956 <value>ano_farm</value>
4785 </column_data> 4957 </column_data>
4786 <column_data> 4958 <column_data>
4787 - <column_id>13</column_id> 4959 + <column_id>57</column_id>
4788 <value>ano</value> 4960 <value>ano</value>
4789 </column_data> 4961 </column_data>
4790 <column_data> 4962 <column_data>
4791 - <column_id>14</column_id> 4963 + <column_id>58</column_id>
4792 <value></value> 4964 <value></value>
4793 </column_data> 4965 </column_data>
4794 <column_data> 4966 <column_data>
4795 - <column_id>15</column_id>  
4796 - <value>1</value> 4967 + <column_id>59</column_id>
  4968 + <value>0</value>
4797 </column_data> 4969 </column_data>
4798 <column_data> 4970 <column_data>
4799 - <column_id>16</column_id> 4971 + <column_id>60</column_id>
4800 <value>1</value> 4972 <value>1</value>
4801 </column_data> 4973 </column_data>
4802 </data> 4974 </data>
@@ -4805,7 +4977,7 @@ @@ -4805,7 +4977,7 @@
4805 <test_data_num>0</test_data_num> 4977 <test_data_num>0</test_data_num>
4806 <data_def_list> 4978 <data_def_list>
4807 <data_def> 4979 <data_def>
4808 - <column_id>11</column_id> 4980 + <column_id>55</column_id>
4809 <type>Format</type> 4981 <type>Format</type>
4810 <repeat_num>1</repeat_num> 4982 <repeat_num>1</repeat_num>
4811 <template>%</template> 4983 <template>%</template>
@@ -4820,7 +4992,7 @@ @@ -4820,7 +4992,7 @@
4820 </modified_values> 4992 </modified_values>
4821 </data_def> 4993 </data_def>
4822 <data_def> 4994 <data_def>
4823 - <column_id>12</column_id> 4995 + <column_id>56</column_id>
4824 <type>Format</type> 4996 <type>Format</type>
4825 <repeat_num>1</repeat_num> 4997 <repeat_num>1</repeat_num>
4826 <template>coluna%</template> 4998 <template>coluna%</template>
@@ -4835,7 +5007,7 @@ @@ -4835,7 +5007,7 @@
4835 </modified_values> 5007 </modified_values>
4836 </data_def> 5008 </data_def>
4837 <data_def> 5009 <data_def>
4838 - <column_id>13</column_id> 5010 + <column_id>57</column_id>
4839 <type>Format</type> 5011 <type>Format</type>
4840 <repeat_num>1</repeat_num> 5012 <repeat_num>1</repeat_num>
4841 <template>nomedimensao%</template> 5013 <template>nomedimensao%</template>
@@ -4850,7 +5022,7 @@ @@ -4850,7 +5022,7 @@
4850 </modified_values> 5022 </modified_values>
4851 </data_def> 5023 </data_def>
4852 <data_def> 5024 <data_def>
4853 - <column_id>14</column_id> 5025 + <column_id>58</column_id>
4854 <type>Format</type> 5026 <type>Format</type>
4855 <repeat_num>1</repeat_num> 5027 <repeat_num>1</repeat_num>
4856 <template>descricao%</template> 5028 <template>descricao%</template>
@@ -4865,7 +5037,7 @@ @@ -4865,7 +5037,7 @@
4865 </modified_values> 5037 </modified_values>
4866 </data_def> 5038 </data_def>
4867 <data_def> 5039 <data_def>
4868 - <column_id>15</column_id> 5040 + <column_id>59</column_id>
4869 <type>Format</type> 5041 <type>Format</type>
4870 <repeat_num>1</repeat_num> 5042 <repeat_num>1</repeat_num>
4871 <template>%</template> 5043 <template>%</template>
@@ -4880,7 +5052,7 @@ @@ -4880,7 +5052,7 @@
4880 </modified_values> 5052 </modified_values>
4881 </data_def> 5053 </data_def>
4882 <data_def> 5054 <data_def>
4883 - <column_id>16</column_id> 5055 + <column_id>60</column_id>
4884 <type>Foreign Key</type> 5056 <type>Foreign Key</type>
4885 <repeat_num>1</repeat_num> 5057 <repeat_num>1</repeat_num>
4886 <template>%</template> 5058 <template>%</template>
@@ -4898,7 +5070,7 @@ @@ -4898,7 +5070,7 @@
4898 </repeat_test_data> 5070 </repeat_test_data>
4899 </table_test_data> 5071 </table_test_data>
4900 <table_test_data> 5072 <table_test_data>
4901 - <table_id>5</table_id> 5073 + <table_id>4</table_id>
4902 <direct_test_data> 5074 <direct_test_data>
4903 <data> 5075 <data>
4904 <column_data> 5076 <column_data>
@@ -4967,23 +5139,23 @@ @@ -4967,23 +5139,23 @@
4967 </repeat_test_data> 5139 </repeat_test_data>
4968 </table_test_data> 5140 </table_test_data>
4969 <table_test_data> 5141 <table_test_data>
4970 - <table_id>10</table_id> 5142 + <table_id>6</table_id>
4971 <direct_test_data> 5143 <direct_test_data>
4972 <data> 5144 <data>
4973 <column_data> 5145 <column_data>
4974 - <column_id>35</column_id> 5146 + <column_id>17</column_id>
4975 <value>1</value> 5147 <value>1</value>
4976 </column_data> 5148 </column_data>
4977 <column_data> 5149 <column_data>
4978 - <column_id>36</column_id> 5150 + <column_id>18</column_id>
4979 <value>Pela média</value> 5151 <value>Pela média</value>
4980 </column_data> 5152 </column_data>
4981 <column_data> 5153 <column_data>
4982 - <column_id>37</column_id> 5154 + <column_id>19</column_id>
4983 <value>1</value> 5155 <value>1</value>
4984 </column_data> 5156 </column_data>
4985 <column_data> 5157 <column_data>
4986 - <column_id>38</column_id> 5158 + <column_id>20</column_id>
4987 <value></value> 5159 <value></value>
4988 </column_data> 5160 </column_data>
4989 </data> 5161 </data>
@@ -4992,7 +5164,7 @@ @@ -4992,7 +5164,7 @@
4992 <test_data_num>0</test_data_num> 5164 <test_data_num>0</test_data_num>
4993 <data_def_list> 5165 <data_def_list>
4994 <data_def> 5166 <data_def>
4995 - <column_id>35</column_id> 5167 + <column_id>17</column_id>
4996 <type>Format</type> 5168 <type>Format</type>
4997 <repeat_num>1</repeat_num> 5169 <repeat_num>1</repeat_num>
4998 <template>%</template> 5170 <template>%</template>
@@ -5007,7 +5179,7 @@ @@ -5007,7 +5179,7 @@
5007 </modified_values> 5179 </modified_values>
5008 </data_def> 5180 </data_def>
5009 <data_def> 5181 <data_def>
5010 - <column_id>36</column_id> 5182 + <column_id>18</column_id>
5011 <type>Format</type> 5183 <type>Format</type>
5012 <repeat_num>1</repeat_num> 5184 <repeat_num>1</repeat_num>
5013 <template>nome%</template> 5185 <template>nome%</template>
@@ -5022,7 +5194,7 @@ @@ -5022,7 +5194,7 @@
5022 </modified_values> 5194 </modified_values>
5023 </data_def> 5195 </data_def>
5024 <data_def> 5196 <data_def>
5025 - <column_id>37</column_id> 5197 + <column_id>19</column_id>
5026 <type>Foreign Key</type> 5198 <type>Foreign Key</type>
5027 <repeat_num>1</repeat_num> 5199 <repeat_num>1</repeat_num>
5028 <template>%</template> 5200 <template>%</template>
@@ -5037,7 +5209,7 @@ @@ -5037,7 +5209,7 @@
5037 </modified_values> 5209 </modified_values>
5038 </data_def> 5210 </data_def>
5039 <data_def> 5211 <data_def>
5040 - <column_id>38</column_id> 5212 + <column_id>20</column_id>
5041 <type>Format</type> 5213 <type>Format</type>
5042 <repeat_num>1</repeat_num> 5214 <repeat_num>1</repeat_num>
5043 <template>observacao%</template> 5215 <template>observacao%</template>
@@ -5055,167 +5227,167 @@ @@ -5055,167 +5227,167 @@
5055 </repeat_test_data> 5227 </repeat_test_data>
5056 </table_test_data> 5228 </table_test_data>
5057 <table_test_data> 5229 <table_test_data>
5058 - <table_id>11</table_id> 5230 + <table_id>7</table_id>
5059 <direct_test_data> 5231 <direct_test_data>
5060 <data> 5232 <data>
5061 <column_data> 5233 <column_data>
5062 - <column_id>39</column_id> 5234 + <column_id>21</column_id>
5063 <value>1</value> 5235 <value>1</value>
5064 </column_data> 5236 </column_data>
5065 <column_data> 5237 <column_data>
5066 - <column_id>40</column_id> 5238 + <column_id>22</column_id>
5067 <value>([nu_farm_funcionando] &lt; 1)</value> 5239 <value>([nu_farm_funcionando] &lt; 1)</value>
5068 </column_data> 5240 </column_data>
5069 <column_data> 5241 <column_data>
5070 - <column_id>41</column_id> 5242 + <column_id>23</column_id>
5071 <value>Nenhuma</value> 5243 <value>Nenhuma</value>
5072 </column_data> 5244 </column_data>
5073 <column_data> 5245 <column_data>
5074 - <column_id>42</column_id> 5246 + <column_id>24</column_id>
5075 <value>255</value> 5247 <value>255</value>
5076 </column_data> 5248 </column_data>
5077 <column_data> 5249 <column_data>
5078 - <column_id>43</column_id> 5250 + <column_id>25</column_id>
5079 <value>0</value> 5251 <value>0</value>
5080 </column_data> 5252 </column_data>
5081 <column_data> 5253 <column_data>
5082 - <column_id>44</column_id> 5254 + <column_id>26</column_id>
5083 <value>0</value> 5255 <value>0</value>
5084 </column_data> 5256 </column_data>
5085 <column_data> 5257 <column_data>
5086 - <column_id>45</column_id> 5258 + <column_id>27</column_id>
5087 <value>1</value> 5259 <value>1</value>
5088 </column_data> 5260 </column_data>
5089 <column_data> 5261 <column_data>
5090 - <column_id>46</column_id> 5262 + <column_id>28</column_id>
5091 <value></value> 5263 <value></value>
5092 </column_data> 5264 </column_data>
5093 <column_data> 5265 <column_data>
5094 - <column_id>47</column_id> 5266 + <column_id>29</column_id>
5095 <value></value> 5267 <value></value>
5096 </column_data> 5268 </column_data>
5097 <column_data> 5269 <column_data>
5098 - <column_id>48</column_id> 5270 + <column_id>30</column_id>
5099 <value>0</value> 5271 <value>0</value>
5100 </column_data> 5272 </column_data>
5101 <column_data> 5273 <column_data>
5102 - <column_id>49</column_id> 5274 + <column_id>31</column_id>
5103 <value>0</value> 5275 <value>0</value>
5104 </column_data> 5276 </column_data>
5105 <column_data> 5277 <column_data>
5106 - <column_id>50</column_id> 5278 + <column_id>32</column_id>
5107 <value>0</value> 5279 <value>0</value>
5108 </column_data> 5280 </column_data>
5109 <column_data> 5281 <column_data>
5110 - <column_id>51</column_id> 5282 + <column_id>33</column_id>
5111 <value></value> 5283 <value></value>
5112 </column_data> 5284 </column_data>
5113 </data> 5285 </data>
5114 <data> 5286 <data>
5115 <column_data> 5287 <column_data>
5116 - <column_id>39</column_id> 5288 + <column_id>21</column_id>
5117 <value>2</value> 5289 <value>2</value>
5118 </column_data> 5290 </column_data>
5119 <column_data> 5291 <column_data>
5120 - <column_id>40</column_id> 5292 + <column_id>22</column_id>
5121 <value>([nu_farm_funcionando] = 1)</value> 5293 <value>([nu_farm_funcionando] = 1)</value>
5122 </column_data> 5294 </column_data>
5123 <column_data> 5295 <column_data>
5124 - <column_id>41</column_id> 5296 + <column_id>23</column_id>
5125 <value>Uma</value> 5297 <value>Uma</value>
5126 </column_data> 5298 </column_data>
5127 <column_data> 5299 <column_data>
5128 - <column_id>42</column_id> 5300 + <column_id>24</column_id>
5129 <value>0</value> 5301 <value>0</value>
5130 </column_data> 5302 </column_data>
5131 <column_data> 5303 <column_data>
5132 - <column_id>43</column_id> 5304 + <column_id>25</column_id>
5133 <value>255</value> 5305 <value>255</value>
5134 </column_data> 5306 </column_data>
5135 <column_data> 5307 <column_data>
5136 - <column_id>44</column_id> 5308 + <column_id>26</column_id>
5137 <value>0</value> 5309 <value>0</value>
5138 </column_data> 5310 </column_data>
5139 <column_data> 5311 <column_data>
5140 - <column_id>45</column_id> 5312 + <column_id>27</column_id>
5141 <value>1</value> 5313 <value>1</value>
5142 </column_data> 5314 </column_data>
5143 <column_data> 5315 <column_data>
5144 - <column_id>46</column_id> 5316 + <column_id>28</column_id>
5145 <value></value> 5317 <value></value>
5146 </column_data> 5318 </column_data>
5147 <column_data> 5319 <column_data>
5148 - <column_id>47</column_id> 5320 + <column_id>29</column_id>
5149 <value></value> 5321 <value></value>
5150 </column_data> 5322 </column_data>
5151 <column_data> 5323 <column_data>
5152 - <column_id>48</column_id> 5324 + <column_id>30</column_id>
5153 <value></value> 5325 <value></value>
5154 </column_data> 5326 </column_data>
5155 <column_data> 5327 <column_data>
5156 - <column_id>49</column_id> 5328 + <column_id>31</column_id>
5157 <value></value> 5329 <value></value>
5158 </column_data> 5330 </column_data>
5159 <column_data> 5331 <column_data>
5160 - <column_id>50</column_id> 5332 + <column_id>32</column_id>
5161 <value></value> 5333 <value></value>
5162 </column_data> 5334 </column_data>
5163 <column_data> 5335 <column_data>
5164 - <column_id>51</column_id> 5336 + <column_id>33</column_id>
5165 <value></value> 5337 <value></value>
5166 </column_data> 5338 </column_data>
5167 </data> 5339 </data>
5168 <data> 5340 <data>
5169 <column_data> 5341 <column_data>
5170 - <column_id>39</column_id> 5342 + <column_id>21</column_id>
5171 <value>3</value> 5343 <value>3</value>
5172 </column_data> 5344 </column_data>
5173 <column_data> 5345 <column_data>
5174 - <column_id>40</column_id> 5346 + <column_id>22</column_id>
5175 <value>([nu_farm_funcionando] &gt; 1)</value> 5347 <value>([nu_farm_funcionando] &gt; 1)</value>
5176 </column_data> 5348 </column_data>
5177 <column_data> 5349 <column_data>
5178 - <column_id>41</column_id> 5350 + <column_id>23</column_id>
5179 <value>Mais de uma</value> 5351 <value>Mais de uma</value>
5180 </column_data> 5352 </column_data>
5181 <column_data> 5353 <column_data>
5182 - <column_id>42</column_id> 5354 + <column_id>24</column_id>
5183 <value>0</value> 5355 <value>0</value>
5184 </column_data> 5356 </column_data>
5185 <column_data> 5357 <column_data>
5186 - <column_id>43</column_id> 5358 + <column_id>25</column_id>
5187 <value>0</value> 5359 <value>0</value>
5188 </column_data> 5360 </column_data>
5189 <column_data> 5361 <column_data>
5190 - <column_id>44</column_id> 5362 + <column_id>26</column_id>
5191 <value>255</value> 5363 <value>255</value>
5192 </column_data> 5364 </column_data>
5193 <column_data> 5365 <column_data>
5194 - <column_id>45</column_id> 5366 + <column_id>27</column_id>
5195 <value>1</value> 5367 <value>1</value>
5196 </column_data> 5368 </column_data>
5197 <column_data> 5369 <column_data>
5198 - <column_id>46</column_id> 5370 + <column_id>28</column_id>
5199 <value></value> 5371 <value></value>
5200 </column_data> 5372 </column_data>
5201 <column_data> 5373 <column_data>
5202 - <column_id>47</column_id> 5374 + <column_id>29</column_id>
5203 <value></value> 5375 <value></value>
5204 </column_data> 5376 </column_data>
5205 <column_data> 5377 <column_data>
5206 - <column_id>48</column_id> 5378 + <column_id>30</column_id>
5207 <value></value> 5379 <value></value>
5208 </column_data> 5380 </column_data>
5209 <column_data> 5381 <column_data>
5210 - <column_id>49</column_id> 5382 + <column_id>31</column_id>
5211 <value></value> 5383 <value></value>
5212 </column_data> 5384 </column_data>
5213 <column_data> 5385 <column_data>
5214 - <column_id>50</column_id> 5386 + <column_id>32</column_id>
5215 <value></value> 5387 <value></value>
5216 </column_data> 5388 </column_data>
5217 <column_data> 5389 <column_data>
5218 - <column_id>51</column_id> 5390 + <column_id>33</column_id>
5219 <value></value> 5391 <value></value>
5220 </column_data> 5392 </column_data>
5221 </data> 5393 </data>
@@ -5224,7 +5396,7 @@ @@ -5224,7 +5396,7 @@
5224 <test_data_num>0</test_data_num> 5396 <test_data_num>0</test_data_num>
5225 <data_def_list> 5397 <data_def_list>
5226 <data_def> 5398 <data_def>
5227 - <column_id>39</column_id> 5399 + <column_id>21</column_id>
5228 <type>Format</type> 5400 <type>Format</type>
5229 <repeat_num>1</repeat_num> 5401 <repeat_num>1</repeat_num>
5230 <template>%</template> 5402 <template>%</template>
@@ -5239,7 +5411,7 @@ @@ -5239,7 +5411,7 @@
5239 </modified_values> 5411 </modified_values>
5240 </data_def> 5412 </data_def>
5241 <data_def> 5413 <data_def>
5242 - <column_id>40</column_id> 5414 + <column_id>22</column_id>
5243 <type>Format</type> 5415 <type>Format</type>
5244 <repeat_num>1</repeat_num> 5416 <repeat_num>1</repeat_num>
5245 <template>expressao%</template> 5417 <template>expressao%</template>
@@ -5254,7 +5426,7 @@ @@ -5254,7 +5426,7 @@
5254 </modified_values> 5426 </modified_values>
5255 </data_def> 5427 </data_def>
5256 <data_def> 5428 <data_def>
5257 - <column_id>41</column_id> 5429 + <column_id>23</column_id>
5258 <type>Format</type> 5430 <type>Format</type>
5259 <repeat_num>1</repeat_num> 5431 <repeat_num>1</repeat_num>
5260 <template>titulo%</template> 5432 <template>titulo%</template>
@@ -5269,7 +5441,7 @@ @@ -5269,7 +5441,7 @@
5269 </modified_values> 5441 </modified_values>
5270 </data_def> 5442 </data_def>
5271 <data_def> 5443 <data_def>
5272 - <column_id>42</column_id> 5444 + <column_id>24</column_id>
5273 <type>Format</type> 5445 <type>Format</type>
5274 <repeat_num>1</repeat_num> 5446 <repeat_num>1</repeat_num>
5275 <template>vermelho%</template> 5447 <template>vermelho%</template>
@@ -5284,7 +5456,7 @@ @@ -5284,7 +5456,7 @@
5284 </modified_values> 5456 </modified_values>
5285 </data_def> 5457 </data_def>
5286 <data_def> 5458 <data_def>
5287 - <column_id>43</column_id> 5459 + <column_id>25</column_id>
5288 <type>Format</type> 5460 <type>Format</type>
5289 <repeat_num>1</repeat_num> 5461 <repeat_num>1</repeat_num>
5290 <template>verde%</template> 5462 <template>verde%</template>
@@ -5299,7 +5471,7 @@ @@ -5299,7 +5471,7 @@
5299 </modified_values> 5471 </modified_values>
5300 </data_def> 5472 </data_def>
5301 <data_def> 5473 <data_def>
5302 - <column_id>44</column_id> 5474 + <column_id>26</column_id>
5303 <type>Format</type> 5475 <type>Format</type>
5304 <repeat_num>1</repeat_num> 5476 <repeat_num>1</repeat_num>
5305 <template>azul%</template> 5477 <template>azul%</template>
@@ -5314,7 +5486,7 @@ @@ -5314,7 +5486,7 @@
5314 </modified_values> 5486 </modified_values>
5315 </data_def> 5487 </data_def>
5316 <data_def> 5488 <data_def>
5317 - <column_id>45</column_id> 5489 + <column_id>27</column_id>
5318 <type>Foreign Key</type> 5490 <type>Foreign Key</type>
5319 <repeat_num>1</repeat_num> 5491 <repeat_num>1</repeat_num>
5320 <template>%</template> 5492 <template>%</template>
@@ -5329,7 +5501,7 @@ @@ -5329,7 +5501,7 @@
5329 </modified_values> 5501 </modified_values>
5330 </data_def> 5502 </data_def>
5331 <data_def> 5503 <data_def>
5332 - <column_id>46</column_id> 5504 + <column_id>28</column_id>
5333 <type>Format</type> 5505 <type>Format</type>
5334 <repeat_num>1</repeat_num> 5506 <repeat_num>1</repeat_num>
5335 <template>tamanho%</template> 5507 <template>tamanho%</template>
@@ -5344,7 +5516,7 @@ @@ -5344,7 +5516,7 @@
5344 </modified_values> 5516 </modified_values>
5345 </data_def> 5517 </data_def>
5346 <data_def> 5518 <data_def>
5347 - <column_id>47</column_id> 5519 + <column_id>29</column_id>
5348 <type>Format</type> 5520 <type>Format</type>
5349 <repeat_num>1</repeat_num> 5521 <repeat_num>1</repeat_num>
5350 <template>simbolo%</template> 5522 <template>simbolo%</template>
@@ -5359,7 +5531,7 @@ @@ -5359,7 +5531,7 @@
5359 </modified_values> 5531 </modified_values>
5360 </data_def> 5532 </data_def>
5361 <data_def> 5533 <data_def>
5362 - <column_id>48</column_id> 5534 + <column_id>30</column_id>
5363 <type>Format</type> 5535 <type>Format</type>
5364 <repeat_num>1</repeat_num> 5536 <repeat_num>1</repeat_num>
5365 <template>overmelho%</template> 5537 <template>overmelho%</template>
@@ -5374,7 +5546,7 @@ @@ -5374,7 +5546,7 @@
5374 </modified_values> 5546 </modified_values>
5375 </data_def> 5547 </data_def>
5376 <data_def> 5548 <data_def>
5377 - <column_id>49</column_id> 5549 + <column_id>31</column_id>
5378 <type>Format</type> 5550 <type>Format</type>
5379 <repeat_num>1</repeat_num> 5551 <repeat_num>1</repeat_num>
5380 <template>overde%</template> 5552 <template>overde%</template>
@@ -5389,7 +5561,7 @@ @@ -5389,7 +5561,7 @@
5389 </modified_values> 5561 </modified_values>
5390 </data_def> 5562 </data_def>
5391 <data_def> 5563 <data_def>
5392 - <column_id>50</column_id> 5564 + <column_id>32</column_id>
5393 <type>Format</type> 5565 <type>Format</type>
5394 <repeat_num>1</repeat_num> 5566 <repeat_num>1</repeat_num>
5395 <template>oazul%</template> 5567 <template>oazul%</template>
@@ -5404,7 +5576,7 @@ @@ -5404,7 +5576,7 @@
5404 </modified_values> 5576 </modified_values>
5405 </data_def> 5577 </data_def>
5406 <data_def> 5578 <data_def>
5407 - <column_id>51</column_id> 5579 + <column_id>33</column_id>
5408 <type>Format</type> 5580 <type>Format</type>
5409 <repeat_num>1</repeat_num> 5581 <repeat_num>1</repeat_num>
5410 <template>otamanho%</template> 5582 <template>otamanho%</template>
@@ -5422,23 +5594,23 @@ @@ -5422,23 +5594,23 @@
5422 </repeat_test_data> 5594 </repeat_test_data>
5423 </table_test_data> 5595 </table_test_data>
5424 <table_test_data> 5596 <table_test_data>
5425 - <table_id>14</table_id> 5597 + <table_id>10</table_id>
5426 <direct_test_data> 5598 <direct_test_data>
5427 <data> 5599 <data>
5428 <column_data> 5600 <column_data>
5429 - <column_id>67</column_id> 5601 + <column_id>49</column_id>
5430 <value>http://portal.saude.gov.br/portal/saude/area.cfm?id_area=1095</value> 5602 <value>http://portal.saude.gov.br/portal/saude/area.cfm?id_area=1095</value>
5431 </column_data> 5603 </column_data>
5432 <column_data> 5604 <column_data>
5433 - <column_id>68</column_id> 5605 + <column_id>50</column_id>
5434 <value>1</value> 5606 <value>1</value>
5435 </column_data> 5607 </column_data>
5436 <column_data> 5608 <column_data>
5437 - <column_id>69</column_id> 5609 + <column_id>51</column_id>
5438 <value>Site das Fármacias Populares</value> 5610 <value>Site das Fármacias Populares</value>
5439 </column_data> 5611 </column_data>
5440 <column_data> 5612 <column_data>
5441 - <column_id>70</column_id> 5613 + <column_id>52</column_id>
5442 <value>1</value> 5614 <value>1</value>
5443 </column_data> 5615 </column_data>
5444 </data> 5616 </data>
@@ -5447,7 +5619,7 @@ @@ -5447,7 +5619,7 @@
5447 <test_data_num>0</test_data_num> 5619 <test_data_num>0</test_data_num>
5448 <data_def_list> 5620 <data_def_list>
5449 <data_def> 5621 <data_def>
5450 - <column_id>67</column_id> 5622 + <column_id>49</column_id>
5451 <type>Format</type> 5623 <type>Format</type>
5452 <repeat_num>1</repeat_num> 5624 <repeat_num>1</repeat_num>
5453 <template>link%</template> 5625 <template>link%</template>
@@ -5462,7 +5634,7 @@ @@ -5462,7 +5634,7 @@
5462 </modified_values> 5634 </modified_values>
5463 </data_def> 5635 </data_def>
5464 <data_def> 5636 <data_def>
5465 - <column_id>68</column_id> 5637 + <column_id>50</column_id>
5466 <type>Foreign Key</type> 5638 <type>Foreign Key</type>
5467 <repeat_num>1</repeat_num> 5639 <repeat_num>1</repeat_num>
5468 <template>%</template> 5640 <template>%</template>
@@ -5477,7 +5649,7 @@ @@ -5477,7 +5649,7 @@
5477 </modified_values> 5649 </modified_values>
5478 </data_def> 5650 </data_def>
5479 <data_def> 5651 <data_def>
5480 - <column_id>69</column_id> 5652 + <column_id>51</column_id>
5481 <type>Format</type> 5653 <type>Format</type>
5482 <repeat_num>1</repeat_num> 5654 <repeat_num>1</repeat_num>
5483 <template>nome%</template> 5655 <template>nome%</template>
@@ -5492,7 +5664,7 @@ @@ -5492,7 +5664,7 @@
5492 </modified_values> 5664 </modified_values>
5493 </data_def> 5665 </data_def>
5494 <data_def> 5666 <data_def>
5495 - <column_id>70</column_id> 5667 + <column_id>52</column_id>
5496 <type>Format</type> 5668 <type>Format</type>
5497 <repeat_num>1</repeat_num> 5669 <repeat_num>1</repeat_num>
5498 <template>%</template> 5670 <template>%</template>
@@ -5510,15 +5682,15 @@ @@ -5510,15 +5682,15 @@
5510 </repeat_test_data> 5682 </repeat_test_data>
5511 </table_test_data> 5683 </table_test_data>
5512 <table_test_data> 5684 <table_test_data>
5513 - <table_id>15</table_id> 5685 + <table_id>11</table_id>
5514 <direct_test_data> 5686 <direct_test_data>
5515 <data> 5687 <data>
5516 <column_data> 5688 <column_data>
5517 - <column_id>71</column_id> 5689 + <column_id>53</column_id>
5518 <value>1</value> 5690 <value>1</value>
5519 </column_data> 5691 </column_data>
5520 <column_data> 5692 <column_data>
5521 - <column_id>72</column_id> 5693 + <column_id>54</column_id>
5522 <value>1</value> 5694 <value>1</value>
5523 </column_data> 5695 </column_data>
5524 </data> 5696 </data>
@@ -5527,7 +5699,7 @@ @@ -5527,7 +5699,7 @@
5527 <test_data_num>0</test_data_num> 5699 <test_data_num>0</test_data_num>
5528 <data_def_list> 5700 <data_def_list>
5529 <data_def> 5701 <data_def>
5530 - <column_id>71</column_id> 5702 + <column_id>53</column_id>
5531 <type>Foreign Key</type> 5703 <type>Foreign Key</type>
5532 <repeat_num>1</repeat_num> 5704 <repeat_num>1</repeat_num>
5533 <template>%</template> 5705 <template>%</template>
@@ -5542,7 +5714,7 @@ @@ -5542,7 +5714,7 @@
5542 </modified_values> 5714 </modified_values>
5543 </data_def> 5715 </data_def>
5544 <data_def> 5716 <data_def>
5545 - <column_id>72</column_id> 5717 + <column_id>54</column_id>
5546 <type>Foreign Key</type> 5718 <type>Foreign Key</type>
5547 <repeat_num>1</repeat_num> 5719 <repeat_num>1</repeat_num>
5548 <template>%</template> 5720 <template>%</template>
@@ -5560,19 +5732,19 @@ @@ -5560,19 +5732,19 @@
5560 </repeat_test_data> 5732 </repeat_test_data>
5561 </table_test_data> 5733 </table_test_data>
5562 <table_test_data> 5734 <table_test_data>
5563 - <table_id>12</table_id> 5735 + <table_id>8</table_id>
5564 <direct_test_data> 5736 <direct_test_data>
5565 <data> 5737 <data>
5566 <column_data> 5738 <column_data>
5567 - <column_id>52</column_id> 5739 + <column_id>34</column_id>
5568 <value>1</value> 5740 <value>1</value>
5569 </column_data> 5741 </column_data>
5570 <column_data> 5742 <column_data>
5571 - <column_id>53</column_id> 5743 + <column_id>35</column_id>
5572 <value>Ministério da Saúde</value> 5744 <value>Ministério da Saúde</value>
5573 </column_data> 5745 </column_data>
5574 <column_data> 5746 <column_data>
5575 - <column_id>54</column_id> 5747 + <column_id>36</column_id>
5576 <value>http://saude.gov.br</value> 5748 <value>http://saude.gov.br</value>
5577 </column_data> 5749 </column_data>
5578 </data> 5750 </data>
@@ -5581,7 +5753,7 @@ @@ -5581,7 +5753,7 @@
5581 <test_data_num>0</test_data_num> 5753 <test_data_num>0</test_data_num>
5582 <data_def_list> 5754 <data_def_list>
5583 <data_def> 5755 <data_def>
5584 - <column_id>52</column_id> 5756 + <column_id>34</column_id>
5585 <type>Format</type> 5757 <type>Format</type>
5586 <repeat_num>1</repeat_num> 5758 <repeat_num>1</repeat_num>
5587 <template>%</template> 5759 <template>%</template>
@@ -5596,7 +5768,7 @@ @@ -5596,7 +5768,7 @@
5596 </modified_values> 5768 </modified_values>
5597 </data_def> 5769 </data_def>
5598 <data_def> 5770 <data_def>
5599 - <column_id>53</column_id> 5771 + <column_id>35</column_id>
5600 <type>Format</type> 5772 <type>Format</type>
5601 <repeat_num>1</repeat_num> 5773 <repeat_num>1</repeat_num>
5602 <template>titulo%</template> 5774 <template>titulo%</template>
@@ -5611,7 +5783,7 @@ @@ -5611,7 +5783,7 @@
5611 </modified_values> 5783 </modified_values>
5612 </data_def> 5784 </data_def>
5613 <data_def> 5785 <data_def>
5614 - <column_id>54</column_id> 5786 + <column_id>36</column_id>
5615 <type>Format</type> 5787 <type>Format</type>
5616 <repeat_num>1</repeat_num> 5788 <repeat_num>1</repeat_num>
5617 <template>link%</template> 5789 <template>link%</template>
pacotes/tme/TME_Engine.php
  Diff comments   View file @1057f2b
@@ -663,7 +663,7 @@ $z-&gt;close();age&#39;: @@ -663,7 +663,7 @@ $z-&gt;close();age&#39;:
663 $zip->output($file);//edmar 663 $zip->output($file);//edmar
664 if($download){ 664 if($download){
665 ob_end_clean(); 665 ob_end_clean();
666 - header('Content-Type: application/vnd.google-earth.kml+xml'); 666 + //header('Content-Type: application/vnd.google-earth.kml+xml');
667 header('Content-Disposition: attachment; filename='.basename($file)); 667 header('Content-Disposition: attachment; filename='.basename($file));
668 print $file; 668 print $file;
669 exit; 669 exit;