Commit 0cbd78207d58226e62ae615aab1c0b4a176ca500
1 parent
081c279d
Exists in
master
and in
7 other branches
--no commit message
Showing
4 changed files
with
698 additions
and
646 deletions
Show diff stats
admin/php/parsemapfile.php
@@ -33,6 +33,10 @@ Arquivo: | @@ -33,6 +33,10 @@ Arquivo: | ||
33 | 33 | ||
34 | i3geo/admin/php/parsemapfile.php | 34 | i3geo/admin/php/parsemapfile.php |
35 | */ | 35 | */ |
36 | +//TODO permitir acesso apenas com login e senha | ||
37 | +//TODO verificar restricao de acesso ao tema | ||
38 | + | ||
39 | +return; | ||
36 | include("../../ms_configura.php"); | 40 | include("../../ms_configura.php"); |
37 | include_once("../../classesphp/funcoes_gerais.php"); | 41 | include_once("../../classesphp/funcoes_gerais.php"); |
38 | include_once("../../classesphp/carrega_ext.php"); | 42 | include_once("../../classesphp/carrega_ext.php"); |
@@ -152,7 +156,7 @@ function legendaValorUnico($layername) | @@ -152,7 +156,7 @@ function legendaValorUnico($layername) | ||
152 | $expressao = str_replace("'eq","=",$expressao); | 156 | $expressao = str_replace("'eq","=",$expressao); |
153 | $expressao = str_replace("'eq ","=",$expressao); | 157 | $expressao = str_replace("'eq ","=",$expressao); |
154 | $expressao = str_replace("' eq","=",$expressao); | 158 | $expressao = str_replace("' eq","=",$expressao); |
155 | - $expressao = str_replace("' eq ","=",$expressao); | 159 | + $expressao = str_replace("' eq ","=",$expressao); |
156 | $temp = explode("=",$expressao); | 160 | $temp = explode("=",$expressao); |
157 | $temp = trim($temp[1]); | 161 | $temp = trim($temp[1]); |
158 | $temp = trim(str_replace("'","",$temp)); | 162 | $temp = trim(str_replace("'","",$temp)); |
@@ -212,7 +216,7 @@ function legendaValorUnico($layername) | @@ -212,7 +216,7 @@ function legendaValorUnico($layername) | ||
212 | $xml .= "</xml-tag>\n"; | 216 | $xml .= "</xml-tag>\n"; |
213 | echo header("Content-type: application/xml"); | 217 | echo header("Content-type: application/xml"); |
214 | echo $xml; | 218 | echo $xml; |
215 | - exit; | 219 | + exit; |
216 | } | 220 | } |
217 | function legendaSimples($layername) | 221 | function legendaSimples($layername) |
218 | { | 222 | { |
@@ -256,7 +260,7 @@ function legendaSimples($layername) | @@ -256,7 +260,7 @@ function legendaSimples($layername) | ||
256 | $xml .= "</xml-tag>\n"; | 260 | $xml .= "</xml-tag>\n"; |
257 | echo header("Content-type: application/xml"); | 261 | echo header("Content-type: application/xml"); |
258 | echo $xml; | 262 | echo $xml; |
259 | - exit; | 263 | + exit; |
260 | } | 264 | } |
261 | // | 265 | // |
262 | //gera xml com parâmetros do mapfile | 266 | //gera xml com parâmetros do mapfile |
@@ -265,7 +269,7 @@ function mapfile() | @@ -265,7 +269,7 @@ function mapfile() | ||
265 | { | 269 | { |
266 | global $codigoLayer,$mapfile,$mapa,$objcontype,$objlayertypes,$forcawms,$postgis_mapa; | 270 | global $codigoLayer,$mapfile,$mapa,$objcontype,$objlayertypes,$forcawms,$postgis_mapa; |
267 | $layers = $mapa->getalllayernames(); | 271 | $layers = $mapa->getalllayernames(); |
268 | - $dados = array(); | 272 | + $dados = array(); |
269 | $xml = "<"."\x3F"."xml version='1.0' encoding='ISO-8859-1' "."\x3F".">"; | 273 | $xml = "<"."\x3F"."xml version='1.0' encoding='ISO-8859-1' "."\x3F".">"; |
270 | $xml .= "\n<parsemapfile>\n"; | 274 | $xml .= "\n<parsemapfile>\n"; |
271 | $xml .= "<tiposconexao>".implode(",",$objcontype)."</tiposconexao>\n"; | 275 | $xml .= "<tiposconexao>".implode(",",$objcontype)."</tiposconexao>\n"; |
@@ -282,7 +286,7 @@ function mapfile() | @@ -282,7 +286,7 @@ function mapfile() | ||
282 | else | 286 | else |
283 | { | 287 | { |
284 | if($layer->group == $layer->name) | 288 | if($layer->group == $layer->name) |
285 | - {$nlayers[] = $layer->name;} | 289 | + {$nlayers[] = $layer->name;} |
286 | } | 290 | } |
287 | $layers = $nlayers; | 291 | $layers = $nlayers; |
288 | } | 292 | } |
@@ -296,7 +300,7 @@ function mapfile() | @@ -296,7 +300,7 @@ function mapfile() | ||
296 | if (@$layer->open() == MS_SUCCESS) | 300 | if (@$layer->open() == MS_SUCCESS) |
297 | {$colunas = implode(",",$layer->getItems());} | 301 | {$colunas = implode(",",$layer->getItems());} |
298 | else | 302 | else |
299 | - {$colunas = "*";} | 303 | + {$colunas = "*";} |
300 | $ct = $objcontype[$layer->connectiontype]; | 304 | $ct = $objcontype[$layer->connectiontype]; |
301 | $tagLegenda = "parsemapfile.php?id=".$codigoLayer."&layername=".$layer->name."&tipoparse=legenda"; | 305 | $tagLegenda = "parsemapfile.php?id=".$codigoLayer."&layername=".$layer->name."&tipoparse=legenda"; |
302 | $nomeLayer = $layer->name; | 306 | $nomeLayer = $layer->name; |
@@ -335,7 +339,7 @@ function mapfile() | @@ -335,7 +339,7 @@ function mapfile() | ||
335 | $xml .= "<format>image/png</format>"; | 339 | $xml .= "<format>image/png</format>"; |
336 | $xml .= "<style>$s</style>"; | 340 | $xml .= "<style>$s</style>"; |
337 | $tagLegenda = ""; | 341 | $tagLegenda = ""; |
338 | - } | 342 | + } |
339 | $xml .= "<geraxmllegenda>$tagLegenda</geraxmllegenda>"; | 343 | $xml .= "<geraxmllegenda>$tagLegenda</geraxmllegenda>"; |
340 | $xml .= "<connectiontype>".$ct."</connectiontype>\n"; | 344 | $xml .= "<connectiontype>".$ct."</connectiontype>\n"; |
341 | $xml .= "<data>$d</data>\n"; | 345 | $xml .= "<data>$d</data>\n"; |
@@ -349,7 +353,7 @@ function mapfile() | @@ -349,7 +353,7 @@ function mapfile() | ||
349 | if(($con == " ") || ($con == "")) | 353 | if(($con == " ") || ($con == "")) |
350 | {$con = $postgis_mapa;} | 354 | {$con = $postgis_mapa;} |
351 | else | 355 | else |
352 | - {$con = $postgis_mapa[$con];} | 356 | + {$con = $postgis_mapa[$con];} |
353 | } | 357 | } |
354 | $xml .= "<user>".preg_replace('/.*user\s*=\s*([a-zA-Z0-9_.]+).*/i', '\1', $con)."</user>\n"; | 358 | $xml .= "<user>".preg_replace('/.*user\s*=\s*([a-zA-Z0-9_.]+).*/i', '\1', $con)."</user>\n"; |
355 | $xml .= "<password>".preg_replace('/.*password\s*=\s*([a-zA-Z0-9_.]+).*/i', '\1', $con)."</password>\n"; | 359 | $xml .= "<password>".preg_replace('/.*password\s*=\s*([a-zA-Z0-9_.]+).*/i', '\1', $con)."</password>\n"; |
@@ -375,7 +379,7 @@ function mapfile() | @@ -375,7 +379,7 @@ function mapfile() | ||
375 | $xml .= "<type>".$objlayertypes[$layer->type]."</type>\n"; | 379 | $xml .= "<type>".$objlayertypes[$layer->type]."</type>\n"; |
376 | $xml .= "<filter>".$layer->getfilterstring()."</filter>\n"; | 380 | $xml .= "<filter>".$layer->getfilterstring()."</filter>\n"; |
377 | $xml .= "<filteritem>$layer->filteritem</filteritem>\n"; | 381 | $xml .= "<filteritem>$layer->filteritem</filteritem>\n"; |
378 | - $xml .= "<labelangleitem>$layer->labelangleitem</labelangleitem>\n"; | 382 | + //$xml .= "<labelangleitem>".$layer->labelangleitem."</labelangleitem>\n"; |
379 | $xml .= "<labelitem>$layer->labelitem</labelitem>\n"; | 383 | $xml .= "<labelitem>$layer->labelitem</labelitem>\n"; |
380 | $xml .= "<labelmaxscale>$layer->labelmaxscaledenom</labelmaxscale>\n"; | 384 | $xml .= "<labelmaxscale>$layer->labelmaxscaledenom</labelmaxscale>\n"; |
381 | $xml .= "<labelminscale>$layer->labelminscaledenom</labelminscale>\n"; | 385 | $xml .= "<labelminscale>$layer->labelminscaledenom</labelminscale>\n"; |
@@ -394,7 +398,7 @@ function mapfile() | @@ -394,7 +398,7 @@ function mapfile() | ||
394 | $xml .= "<tolerance>$layer->tolerance</tolerance>\n"; | 398 | $xml .= "<tolerance>$layer->tolerance</tolerance>\n"; |
395 | $xml .= "<toleranceunits>$layer->toleranceunits</toleranceunits>\n"; | 399 | $xml .= "<toleranceunits>$layer->toleranceunits</toleranceunits>\n"; |
396 | $xml .= "<sizeunits>$layer->sizeunits</sizeunits>\n"; | 400 | $xml .= "<sizeunits>$layer->sizeunits</sizeunits>\n"; |
397 | - $xml .= "<projection>$layer->getProjection</projection>\n"; | 401 | + $xml .= "<projection>".$layer->getProjection()."</projection>\n"; |
398 | $xml .= "<classes>\n"; | 402 | $xml .= "<classes>\n"; |
399 | $xml = pegaClasses($xml); | 403 | $xml = pegaClasses($xml); |
400 | $xml .= "</classes>\n"; | 404 | $xml .= "</classes>\n"; |
documentacao/diagramas/metaestat.erm
@@ -11,8 +11,8 @@ | @@ -11,8 +11,8 @@ | ||
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>-372</x> | ||
15 | - <y>188</y> | 14 | + <x>-362</x> |
15 | + <y>87</y> | ||
16 | <default_color> | 16 | <default_color> |
17 | <r>255</r> | 17 | <r>255</r> |
18 | <g>128</g> | 18 | <g>128</g> |
@@ -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-11-07 10:30:24</updated_date> | 113 | + <updated_date>2012-11-19 10:39:32</updated_date> |
114 | <model_property> | 114 | <model_property> |
115 | <name>Project Name</name> | 115 | <name>Project Name</name> |
116 | <value></value> | 116 | <value></value> |
@@ -1120,7 +1120,7 @@ | @@ -1120,7 +1120,7 @@ | ||
1120 | </sequence> | 1120 | </sequence> |
1121 | </normal_column> | 1121 | </normal_column> |
1122 | <normal_column> | 1122 | <normal_column> |
1123 | - <word_id>40</word_id> | 1123 | + <word_id>43</word_id> |
1124 | <id>1</id> | 1124 | <id>1</id> |
1125 | <description></description> | 1125 | <description></description> |
1126 | <unique_key_name></unique_key_name> | 1126 | <unique_key_name></unique_key_name> |
@@ -1311,7 +1311,7 @@ | @@ -1311,7 +1311,7 @@ | ||
1311 | </sequence> | 1311 | </sequence> |
1312 | </normal_column> | 1312 | </normal_column> |
1313 | <normal_column> | 1313 | <normal_column> |
1314 | - <word_id>42</word_id> | 1314 | + <word_id>39</word_id> |
1315 | <id>6</id> | 1315 | <id>6</id> |
1316 | <description></description> | 1316 | <description></description> |
1317 | <unique_key_name></unique_key_name> | 1317 | <unique_key_name></unique_key_name> |
@@ -1343,7 +1343,7 @@ | @@ -1343,7 +1343,7 @@ | ||
1343 | </sequence> | 1343 | </sequence> |
1344 | </normal_column> | 1344 | </normal_column> |
1345 | <normal_column> | 1345 | <normal_column> |
1346 | - <word_id>21</word_id> | 1346 | + <word_id>19</word_id> |
1347 | <id>7</id> | 1347 | <id>7</id> |
1348 | <description></description> | 1348 | <description></description> |
1349 | <unique_key_name></unique_key_name> | 1349 | <unique_key_name></unique_key_name> |
@@ -1438,7 +1438,7 @@ | @@ -1438,7 +1438,7 @@ | ||
1438 | </sequence> | 1438 | </sequence> |
1439 | </normal_column> | 1439 | </normal_column> |
1440 | <normal_column> | 1440 | <normal_column> |
1441 | - <word_id>43</word_id> | 1441 | + <word_id>42</word_id> |
1442 | <id>9</id> | 1442 | <id>9</id> |
1443 | <description></description> | 1443 | <description></description> |
1444 | <unique_key_name></unique_key_name> | 1444 | <unique_key_name></unique_key_name> |
@@ -1470,7 +1470,7 @@ | @@ -1470,7 +1470,7 @@ | ||
1470 | </sequence> | 1470 | </sequence> |
1471 | </normal_column> | 1471 | </normal_column> |
1472 | <normal_column> | 1472 | <normal_column> |
1473 | - <word_id>19</word_id> | 1473 | + <word_id>21</word_id> |
1474 | <id>10</id> | 1474 | <id>10</id> |
1475 | <description></description> | 1475 | <description></description> |
1476 | <unique_key_name></unique_key_name> | 1476 | <unique_key_name></unique_key_name> |
@@ -1526,7 +1526,7 @@ | @@ -1526,7 +1526,7 @@ | ||
1526 | <connections> | 1526 | <connections> |
1527 | <relation> | 1527 | <relation> |
1528 | <id>0</id> | 1528 | <id>0</id> |
1529 | - <source>10</source> | 1529 | + <source>9</source> |
1530 | <target>5</target> | 1530 | <target>5</target> |
1531 | <child_cardinality>1..n</child_cardinality> | 1531 | <child_cardinality>1..n</child_cardinality> |
1532 | <parent_cardinality>1</parent_cardinality> | 1532 | <parent_cardinality>1</parent_cardinality> |
@@ -1582,7 +1582,7 @@ | @@ -1582,7 +1582,7 @@ | ||
1582 | </sequence> | 1582 | </sequence> |
1583 | </normal_column> | 1583 | </normal_column> |
1584 | <normal_column> | 1584 | <normal_column> |
1585 | - <word_id>44</word_id> | 1585 | + <word_id>40</word_id> |
1586 | <id>12</id> | 1586 | <id>12</id> |
1587 | <description></description> | 1587 | <description></description> |
1588 | <unique_key_name></unique_key_name> | 1588 | <unique_key_name></unique_key_name> |
@@ -1615,7 +1615,7 @@ | @@ -1615,7 +1615,7 @@ | ||
1615 | </normal_column> | 1615 | </normal_column> |
1616 | <normal_column> | 1616 | <normal_column> |
1617 | <id>13</id> | 1617 | <id>13</id> |
1618 | - <referenced_column>39</referenced_column> | 1618 | + <referenced_column>33</referenced_column> |
1619 | <relation>0</relation> | 1619 | <relation>0</relation> |
1620 | <description></description> | 1620 | <description></description> |
1621 | <unique_key_name></unique_key_name> | 1621 | <unique_key_name></unique_key_name> |
@@ -2295,7 +2295,7 @@ | @@ -2295,7 +2295,7 @@ | ||
2295 | <connections> | 2295 | <connections> |
2296 | <relation> | 2296 | <relation> |
2297 | <id>2</id> | 2297 | <id>2</id> |
2298 | - <source>10</source> | 2298 | + <source>9</source> |
2299 | <target>8</target> | 2299 | <target>8</target> |
2300 | <child_cardinality>1..n</child_cardinality> | 2300 | <child_cardinality>1..n</child_cardinality> |
2301 | <parent_cardinality>1</parent_cardinality> | 2301 | <parent_cardinality>1</parent_cardinality> |
@@ -2337,7 +2337,7 @@ | @@ -2337,7 +2337,7 @@ | ||
2337 | <columns> | 2337 | <columns> |
2338 | <normal_column> | 2338 | <normal_column> |
2339 | <id>31</id> | 2339 | <id>31</id> |
2340 | - <referenced_column>39</referenced_column> | 2340 | + <referenced_column>33</referenced_column> |
2341 | <relation>2</relation> | 2341 | <relation>2</relation> |
2342 | <description></description> | 2342 | <description></description> |
2343 | <unique_key_name></unique_key_name> | 2343 | <unique_key_name></unique_key_name> |
@@ -2412,229 +2412,6 @@ | @@ -2412,229 +2412,6 @@ | ||
2412 | </table> | 2412 | </table> |
2413 | <table> | 2413 | <table> |
2414 | <id>9</id> | 2414 | <id>9</id> |
2415 | - <height>170</height> | ||
2416 | - <width>292</width> | ||
2417 | - <font_name>Ubuntu</font_name> | ||
2418 | - <font_size>9</font_size> | ||
2419 | - <x>8</x> | ||
2420 | - <y>499</y> | ||
2421 | - <color> | ||
2422 | - <r>255</r> | ||
2423 | - <g>165</g> | ||
2424 | - <b>0</b> | ||
2425 | - </color> | ||
2426 | - <connections> | ||
2427 | - </connections> | ||
2428 | - <physical_name>i3geoestat_conexao</physical_name> | ||
2429 | - <logical_name>i3geoestat_conexao</logical_name> | ||
2430 | - <description>Lista controlada dos parâmetros de conexão com o banco de dados onde residem dados
Código 0 indica que será utilizada a conexão padrão</description> | ||
2431 | - <constraint></constraint> | ||
2432 | - <primary_key_name></primary_key_name> | ||
2433 | - <option></option> | ||
2434 | - <columns> | ||
2435 | - <normal_column> | ||
2436 | - <word_id>3</word_id> | ||
2437 | - <id>33</id> | ||
2438 | - <description></description> | ||
2439 | - <unique_key_name></unique_key_name> | ||
2440 | - <logical_name></logical_name> | ||
2441 | - <physical_name></physical_name> | ||
2442 | - <type>integer</type> | ||
2443 | - <constraint></constraint> | ||
2444 | - <default_value></default_value> | ||
2445 | - <auto_increment>true</auto_increment> | ||
2446 | - <foreign_key>false</foreign_key> | ||
2447 | - <not_null>true</not_null> | ||
2448 | - <primary_key>true</primary_key> | ||
2449 | - <unique_key>true</unique_key> | ||
2450 | - <character_set></character_set> | ||
2451 | - <collation></collation> | ||
2452 | - <sequence> | ||
2453 | - <name></name> | ||
2454 | - <schema></schema> | ||
2455 | - <increment></increment> | ||
2456 | - <min_value></min_value> | ||
2457 | - <max_value></max_value> | ||
2458 | - <start></start> | ||
2459 | - <cache></cache> | ||
2460 | - <cycle>false</cycle> | ||
2461 | - <order>false</order> | ||
2462 | - <description></description> | ||
2463 | - <data_type></data_type> | ||
2464 | - <decimal_size>0</decimal_size> | ||
2465 | - </sequence> | ||
2466 | - </normal_column> | ||
2467 | - <normal_column> | ||
2468 | - <word_id>2</word_id> | ||
2469 | - <id>34</id> | ||
2470 | - <description></description> | ||
2471 | - <unique_key_name></unique_key_name> | ||
2472 | - <logical_name></logical_name> | ||
2473 | - <physical_name></physical_name> | ||
2474 | - <type>text</type> | ||
2475 | - <constraint></constraint> | ||
2476 | - <default_value></default_value> | ||
2477 | - <auto_increment>false</auto_increment> | ||
2478 | - <foreign_key>false</foreign_key> | ||
2479 | - <not_null>false</not_null> | ||
2480 | - <primary_key>false</primary_key> | ||
2481 | - <unique_key>false</unique_key> | ||
2482 | - <character_set></character_set> | ||
2483 | - <collation></collation> | ||
2484 | - <sequence> | ||
2485 | - <name></name> | ||
2486 | - <schema></schema> | ||
2487 | - <increment></increment> | ||
2488 | - <min_value></min_value> | ||
2489 | - <max_value></max_value> | ||
2490 | - <start></start> | ||
2491 | - <cache></cache> | ||
2492 | - <cycle>false</cycle> | ||
2493 | - <order>false</order> | ||
2494 | - <description></description> | ||
2495 | - <data_type></data_type> | ||
2496 | - <decimal_size>0</decimal_size> | ||
2497 | - </sequence> | ||
2498 | - </normal_column> | ||
2499 | - <normal_column> | ||
2500 | - <word_id>27</word_id> | ||
2501 | - <id>35</id> | ||
2502 | - <description></description> | ||
2503 | - <unique_key_name></unique_key_name> | ||
2504 | - <logical_name></logical_name> | ||
2505 | - <physical_name></physical_name> | ||
2506 | - <type>text</type> | ||
2507 | - <constraint></constraint> | ||
2508 | - <default_value></default_value> | ||
2509 | - <auto_increment>false</auto_increment> | ||
2510 | - <foreign_key>false</foreign_key> | ||
2511 | - <not_null>false</not_null> | ||
2512 | - <primary_key>false</primary_key> | ||
2513 | - <unique_key>false</unique_key> | ||
2514 | - <character_set></character_set> | ||
2515 | - <collation></collation> | ||
2516 | - <sequence> | ||
2517 | - <name></name> | ||
2518 | - <schema></schema> | ||
2519 | - <increment></increment> | ||
2520 | - <min_value></min_value> | ||
2521 | - <max_value></max_value> | ||
2522 | - <start></start> | ||
2523 | - <cache></cache> | ||
2524 | - <cycle>false</cycle> | ||
2525 | - <order>false</order> | ||
2526 | - <description></description> | ||
2527 | - <data_type></data_type> | ||
2528 | - <decimal_size>0</decimal_size> | ||
2529 | - </sequence> | ||
2530 | - </normal_column> | ||
2531 | - <normal_column> | ||
2532 | - <word_id>54</word_id> | ||
2533 | - <id>36</id> | ||
2534 | - <description></description> | ||
2535 | - <unique_key_name></unique_key_name> | ||
2536 | - <logical_name></logical_name> | ||
2537 | - <physical_name></physical_name> | ||
2538 | - <type>text</type> | ||
2539 | - <constraint></constraint> | ||
2540 | - <default_value></default_value> | ||
2541 | - <auto_increment>false</auto_increment> | ||
2542 | - <foreign_key>false</foreign_key> | ||
2543 | - <not_null>false</not_null> | ||
2544 | - <primary_key>false</primary_key> | ||
2545 | - <unique_key>false</unique_key> | ||
2546 | - <character_set></character_set> | ||
2547 | - <collation></collation> | ||
2548 | - <sequence> | ||
2549 | - <name></name> | ||
2550 | - <schema></schema> | ||
2551 | - <increment></increment> | ||
2552 | - <min_value></min_value> | ||
2553 | - <max_value></max_value> | ||
2554 | - <start></start> | ||
2555 | - <cache></cache> | ||
2556 | - <cycle>false</cycle> | ||
2557 | - <order>false</order> | ||
2558 | - <description></description> | ||
2559 | - <data_type></data_type> | ||
2560 | - <decimal_size>0</decimal_size> | ||
2561 | - </sequence> | ||
2562 | - </normal_column> | ||
2563 | - <normal_column> | ||
2564 | - <word_id>65</word_id> | ||
2565 | - <id>37</id> | ||
2566 | - <description></description> | ||
2567 | - <unique_key_name></unique_key_name> | ||
2568 | - <logical_name></logical_name> | ||
2569 | - <physical_name></physical_name> | ||
2570 | - <type>text</type> | ||
2571 | - <constraint></constraint> | ||
2572 | - <default_value></default_value> | ||
2573 | - <auto_increment>false</auto_increment> | ||
2574 | - <foreign_key>false</foreign_key> | ||
2575 | - <not_null>false</not_null> | ||
2576 | - <primary_key>false</primary_key> | ||
2577 | - <unique_key>false</unique_key> | ||
2578 | - <character_set></character_set> | ||
2579 | - <collation></collation> | ||
2580 | - <sequence> | ||
2581 | - <name></name> | ||
2582 | - <schema></schema> | ||
2583 | - <increment></increment> | ||
2584 | - <min_value></min_value> | ||
2585 | - <max_value></max_value> | ||
2586 | - <start></start> | ||
2587 | - <cache></cache> | ||
2588 | - <cycle>false</cycle> | ||
2589 | - <order>false</order> | ||
2590 | - <description></description> | ||
2591 | - <data_type></data_type> | ||
2592 | - <decimal_size>0</decimal_size> | ||
2593 | - </sequence> | ||
2594 | - </normal_column> | ||
2595 | - <normal_column> | ||
2596 | - <word_id>55</word_id> | ||
2597 | - <id>38</id> | ||
2598 | - <description></description> | ||
2599 | - <unique_key_name></unique_key_name> | ||
2600 | - <logical_name></logical_name> | ||
2601 | - <physical_name></physical_name> | ||
2602 | - <type>text</type> | ||
2603 | - <constraint></constraint> | ||
2604 | - <default_value></default_value> | ||
2605 | - <auto_increment>false</auto_increment> | ||
2606 | - <foreign_key>false</foreign_key> | ||
2607 | - <not_null>false</not_null> | ||
2608 | - <primary_key>false</primary_key> | ||
2609 | - <unique_key>false</unique_key> | ||
2610 | - <character_set></character_set> | ||
2611 | - <collation></collation> | ||
2612 | - <sequence> | ||
2613 | - <name></name> | ||
2614 | - <schema></schema> | ||
2615 | - <increment></increment> | ||
2616 | - <min_value></min_value> | ||
2617 | - <max_value></max_value> | ||
2618 | - <start></start> | ||
2619 | - <cache></cache> | ||
2620 | - <cycle>false</cycle> | ||
2621 | - <order>false</order> | ||
2622 | - <description></description> | ||
2623 | - <data_type></data_type> | ||
2624 | - <decimal_size>0</decimal_size> | ||
2625 | - </sequence> | ||
2626 | - </normal_column> | ||
2627 | - </columns> | ||
2628 | - <indexes> | ||
2629 | - </indexes> | ||
2630 | - <complex_unique_key_list> | ||
2631 | - </complex_unique_key_list> | ||
2632 | - <table_properties> | ||
2633 | - <schema></schema> | ||
2634 | - </table_properties> | ||
2635 | - </table> | ||
2636 | - <table> | ||
2637 | - <id>10</id> | ||
2638 | <height>339</height> | 2415 | <height>339</height> |
2639 | <width>292</width> | 2416 | <width>292</width> |
2640 | <font_name>Ubuntu</font_name> | 2417 | <font_name>Ubuntu</font_name> |
@@ -2650,7 +2427,7 @@ | @@ -2650,7 +2427,7 @@ | ||
2650 | <relation> | 2427 | <relation> |
2651 | <id>4</id> | 2428 | <id>4</id> |
2652 | <source>4</source> | 2429 | <source>4</source> |
2653 | - <target>10</target> | 2430 | + <target>9</target> |
2654 | <child_cardinality>1..n</child_cardinality> | 2431 | <child_cardinality>1..n</child_cardinality> |
2655 | <parent_cardinality>1</parent_cardinality> | 2432 | <parent_cardinality>1</parent_cardinality> |
2656 | <reference_for_pk>true</reference_for_pk> | 2433 | <reference_for_pk>true</reference_for_pk> |
@@ -2666,8 +2443,8 @@ | @@ -2666,8 +2443,8 @@ | ||
2666 | </relation> | 2443 | </relation> |
2667 | <relation> | 2444 | <relation> |
2668 | <id>5</id> | 2445 | <id>5</id> |
2669 | - <source>14</source> | ||
2670 | - <target>10</target> | 2446 | + <source>2</source> |
2447 | + <target>9</target> | ||
2671 | <child_cardinality>1..n</child_cardinality> | 2448 | <child_cardinality>1..n</child_cardinality> |
2672 | <parent_cardinality>1</parent_cardinality> | 2449 | <parent_cardinality>1</parent_cardinality> |
2673 | <reference_for_pk>true</reference_for_pk> | 2450 | <reference_for_pk>true</reference_for_pk> |
@@ -2683,8 +2460,8 @@ | @@ -2683,8 +2460,8 @@ | ||
2683 | </relation> | 2460 | </relation> |
2684 | <relation> | 2461 | <relation> |
2685 | <id>6</id> | 2462 | <id>6</id> |
2686 | - <source>2</source> | ||
2687 | - <target>10</target> | 2463 | + <source>13</source> |
2464 | + <target>9</target> | ||
2688 | <child_cardinality>1..n</child_cardinality> | 2465 | <child_cardinality>1..n</child_cardinality> |
2689 | <parent_cardinality>1</parent_cardinality> | 2466 | <parent_cardinality>1</parent_cardinality> |
2690 | <reference_for_pk>true</reference_for_pk> | 2467 | <reference_for_pk>true</reference_for_pk> |
@@ -2701,7 +2478,7 @@ | @@ -2701,7 +2478,7 @@ | ||
2701 | <relation> | 2478 | <relation> |
2702 | <id>7</id> | 2479 | <id>7</id> |
2703 | <source>3</source> | 2480 | <source>3</source> |
2704 | - <target>10</target> | 2481 | + <target>9</target> |
2705 | <child_cardinality>1..n</child_cardinality> | 2482 | <child_cardinality>1..n</child_cardinality> |
2706 | <parent_cardinality>1</parent_cardinality> | 2483 | <parent_cardinality>1</parent_cardinality> |
2707 | <reference_for_pk>true</reference_for_pk> | 2484 | <reference_for_pk>true</reference_for_pk> |
@@ -2717,8 +2494,8 @@ | @@ -2717,8 +2494,8 @@ | ||
2717 | </relation> | 2494 | </relation> |
2718 | <relation> | 2495 | <relation> |
2719 | <id>8</id> | 2496 | <id>8</id> |
2720 | - <source>9</source> | ||
2721 | - <target>10</target> | 2497 | + <source>12</source> |
2498 | + <target>9</target> | ||
2722 | <child_cardinality>1..n</child_cardinality> | 2499 | <child_cardinality>1..n</child_cardinality> |
2723 | <parent_cardinality>1</parent_cardinality> | 2500 | <parent_cardinality>1</parent_cardinality> |
2724 | <reference_for_pk>true</reference_for_pk> | 2501 | <reference_for_pk>true</reference_for_pk> |
@@ -2742,7 +2519,7 @@ | @@ -2742,7 +2519,7 @@ | ||
2742 | <columns> | 2519 | <columns> |
2743 | <normal_column> | 2520 | <normal_column> |
2744 | <word_id>34</word_id> | 2521 | <word_id>34</word_id> |
2745 | - <id>39</id> | 2522 | + <id>33</id> |
2746 | <description></description> | 2523 | <description></description> |
2747 | <unique_key_name></unique_key_name> | 2524 | <unique_key_name></unique_key_name> |
2748 | <logical_name></logical_name> | 2525 | <logical_name></logical_name> |
@@ -2773,9 +2550,9 @@ | @@ -2773,9 +2550,9 @@ | ||
2773 | </sequence> | 2550 | </sequence> |
2774 | </normal_column> | 2551 | </normal_column> |
2775 | <normal_column> | 2552 | <normal_column> |
2776 | - <id>40</id> | 2553 | + <id>34</id> |
2777 | <referenced_column>0</referenced_column> | 2554 | <referenced_column>0</referenced_column> |
2778 | - <relation>6</relation> | 2555 | + <relation>5</relation> |
2779 | <description></description> | 2556 | <description></description> |
2780 | <unique_key_name></unique_key_name> | 2557 | <unique_key_name></unique_key_name> |
2781 | <logical_name></logical_name> | 2558 | <logical_name></logical_name> |
@@ -2806,7 +2583,7 @@ | @@ -2806,7 +2583,7 @@ | ||
2806 | </sequence> | 2583 | </sequence> |
2807 | </normal_column> | 2584 | </normal_column> |
2808 | <normal_column> | 2585 | <normal_column> |
2809 | - <id>41</id> | 2586 | + <id>35</id> |
2810 | <referenced_column>5</referenced_column> | 2587 | <referenced_column>5</referenced_column> |
2811 | <relation>7</relation> | 2588 | <relation>7</relation> |
2812 | <description></description> | 2589 | <description></description> |
@@ -2839,7 +2616,7 @@ | @@ -2839,7 +2616,7 @@ | ||
2839 | </sequence> | 2616 | </sequence> |
2840 | </normal_column> | 2617 | </normal_column> |
2841 | <normal_column> | 2618 | <normal_column> |
2842 | - <id>42</id> | 2619 | + <id>36</id> |
2843 | <referenced_column>8</referenced_column> | 2620 | <referenced_column>8</referenced_column> |
2844 | <relation>4</relation> | 2621 | <relation>4</relation> |
2845 | <description></description> | 2622 | <description></description> |
@@ -2872,9 +2649,9 @@ | @@ -2872,9 +2649,9 @@ | ||
2872 | </sequence> | 2649 | </sequence> |
2873 | </normal_column> | 2650 | </normal_column> |
2874 | <normal_column> | 2651 | <normal_column> |
2875 | - <id>43</id> | ||
2876 | - <referenced_column>67</referenced_column> | ||
2877 | - <relation>5</relation> | 2652 | + <id>37</id> |
2653 | + <referenced_column>63</referenced_column> | ||
2654 | + <relation>6</relation> | ||
2878 | <description></description> | 2655 | <description></description> |
2879 | <unique_key_name></unique_key_name> | 2656 | <unique_key_name></unique_key_name> |
2880 | <logical_name></logical_name> | 2657 | <logical_name></logical_name> |
@@ -2905,8 +2682,8 @@ | @@ -2905,8 +2682,8 @@ | ||
2905 | </sequence> | 2682 | </sequence> |
2906 | </normal_column> | 2683 | </normal_column> |
2907 | <normal_column> | 2684 | <normal_column> |
2908 | - <id>44</id> | ||
2909 | - <referenced_column>33</referenced_column> | 2685 | + <id>38</id> |
2686 | + <referenced_column>57</referenced_column> | ||
2910 | <relation>8</relation> | 2687 | <relation>8</relation> |
2911 | <description></description> | 2688 | <description></description> |
2912 | <unique_key_name></unique_key_name> | 2689 | <unique_key_name></unique_key_name> |
@@ -2939,7 +2716,7 @@ | @@ -2939,7 +2716,7 @@ | ||
2939 | </normal_column> | 2716 | </normal_column> |
2940 | <normal_column> | 2717 | <normal_column> |
2941 | <word_id>23</word_id> | 2718 | <word_id>23</word_id> |
2942 | - <id>45</id> | 2719 | + <id>39</id> |
2943 | <description></description> | 2720 | <description></description> |
2944 | <unique_key_name></unique_key_name> | 2721 | <unique_key_name></unique_key_name> |
2945 | <logical_name></logical_name> | 2722 | <logical_name></logical_name> |
@@ -2971,7 +2748,7 @@ | @@ -2971,7 +2748,7 @@ | ||
2971 | </normal_column> | 2748 | </normal_column> |
2972 | <normal_column> | 2749 | <normal_column> |
2973 | <word_id>59</word_id> | 2750 | <word_id>59</word_id> |
2974 | - <id>46</id> | 2751 | + <id>40</id> |
2975 | <description></description> | 2752 | <description></description> |
2976 | <unique_key_name></unique_key_name> | 2753 | <unique_key_name></unique_key_name> |
2977 | <logical_name></logical_name> | 2754 | <logical_name></logical_name> |
@@ -3003,7 +2780,7 @@ | @@ -3003,7 +2780,7 @@ | ||
3003 | </normal_column> | 2780 | </normal_column> |
3004 | <normal_column> | 2781 | <normal_column> |
3005 | <word_id>17</word_id> | 2782 | <word_id>17</word_id> |
3006 | - <id>47</id> | 2783 | + <id>41</id> |
3007 | <description></description> | 2784 | <description></description> |
3008 | <unique_key_name></unique_key_name> | 2785 | <unique_key_name></unique_key_name> |
3009 | <logical_name></logical_name> | 2786 | <logical_name></logical_name> |
@@ -3035,7 +2812,7 @@ | @@ -3035,7 +2812,7 @@ | ||
3035 | </normal_column> | 2812 | </normal_column> |
3036 | <normal_column> | 2813 | <normal_column> |
3037 | <word_id>12</word_id> | 2814 | <word_id>12</word_id> |
3038 | - <id>48</id> | 2815 | + <id>42</id> |
3039 | <description></description> | 2816 | <description></description> |
3040 | <unique_key_name></unique_key_name> | 2817 | <unique_key_name></unique_key_name> |
3041 | <logical_name></logical_name> | 2818 | <logical_name></logical_name> |
@@ -3067,7 +2844,7 @@ | @@ -3067,7 +2844,7 @@ | ||
3067 | </normal_column> | 2844 | </normal_column> |
3068 | <normal_column> | 2845 | <normal_column> |
3069 | <word_id>26</word_id> | 2846 | <word_id>26</word_id> |
3070 | - <id>49</id> | 2847 | + <id>43</id> |
3071 | <description></description> | 2848 | <description></description> |
3072 | <unique_key_name></unique_key_name> | 2849 | <unique_key_name></unique_key_name> |
3073 | <logical_name></logical_name> | 2850 | <logical_name></logical_name> |
@@ -3099,7 +2876,7 @@ | @@ -3099,7 +2876,7 @@ | ||
3099 | </normal_column> | 2876 | </normal_column> |
3100 | <normal_column> | 2877 | <normal_column> |
3101 | <word_id>45</word_id> | 2878 | <word_id>45</word_id> |
3102 | - <id>50</id> | 2879 | + <id>44</id> |
3103 | <description></description> | 2880 | <description></description> |
3104 | <unique_key_name></unique_key_name> | 2881 | <unique_key_name></unique_key_name> |
3105 | <logical_name></logical_name> | 2882 | <logical_name></logical_name> |
@@ -3131,184 +2908,7 @@ | @@ -3131,184 +2908,7 @@ | ||
3131 | </normal_column> | 2908 | </normal_column> |
3132 | <normal_column> | 2909 | <normal_column> |
3133 | <word_id>13</word_id> | 2910 | <word_id>13</word_id> |
3134 | - <id>51</id> | ||
3135 | - <description></description> | ||
3136 | - <unique_key_name></unique_key_name> | ||
3137 | - <logical_name></logical_name> | ||
3138 | - <physical_name></physical_name> | ||
3139 | - <type>text</type> | ||
3140 | - <constraint></constraint> | ||
3141 | - <default_value></default_value> | ||
3142 | - <auto_increment>false</auto_increment> | ||
3143 | - <foreign_key>false</foreign_key> | ||
3144 | - <not_null>false</not_null> | ||
3145 | - <primary_key>false</primary_key> | ||
3146 | - <unique_key>false</unique_key> | ||
3147 | - <character_set></character_set> | ||
3148 | - <collation></collation> | ||
3149 | - <sequence> | ||
3150 | - <name></name> | ||
3151 | - <schema></schema> | ||
3152 | - <increment></increment> | ||
3153 | - <min_value></min_value> | ||
3154 | - <max_value></max_value> | ||
3155 | - <start></start> | ||
3156 | - <cache></cache> | ||
3157 | - <cycle>false</cycle> | ||
3158 | - <order>false</order> | ||
3159 | - <description></description> | ||
3160 | - <data_type></data_type> | ||
3161 | - <decimal_size>0</decimal_size> | ||
3162 | - </sequence> | ||
3163 | - </normal_column> | ||
3164 | - </columns> | ||
3165 | - <indexes> | ||
3166 | - </indexes> | ||
3167 | - <complex_unique_key_list> | ||
3168 | - </complex_unique_key_list> | ||
3169 | - <table_properties> | ||
3170 | - <schema></schema> | ||
3171 | - </table_properties> | ||
3172 | - </table> | ||
3173 | - <table> | ||
3174 | - <id>11</id> | ||
3175 | - <height>128</height> | ||
3176 | - <width>270</width> | ||
3177 | - <font_name>Ubuntu</font_name> | ||
3178 | - <font_size>9</font_size> | ||
3179 | - <x>-372</x> | ||
3180 | - <y>596</y> | ||
3181 | - <color> | ||
3182 | - <r>255</r> | ||
3183 | - <g>128</g> | ||
3184 | - <b>255</b> | ||
3185 | - </color> | ||
3186 | - <connections> | ||
3187 | - <relation> | ||
3188 | - <id>9</id> | ||
3189 | - <source>14</source> | ||
3190 | - <target>11</target> | ||
3191 | - <child_cardinality>1..n</child_cardinality> | ||
3192 | - <parent_cardinality>1</parent_cardinality> | ||
3193 | - <reference_for_pk>true</reference_for_pk> | ||
3194 | - <name></name> | ||
3195 | - <on_delete_action>RESTRICT</on_delete_action> | ||
3196 | - <on_update_action>RESTRICT</on_update_action> | ||
3197 | - <source_xp>-1</source_xp> | ||
3198 | - <source_yp>-1</source_yp> | ||
3199 | - <target_xp>-1</target_xp> | ||
3200 | - <target_yp>-1</target_yp> | ||
3201 | - <referenced_column>null</referenced_column> | ||
3202 | - <referenced_complex_unique_key>null</referenced_complex_unique_key> | ||
3203 | - </relation> | ||
3204 | - </connections> | ||
3205 | - <physical_name>i3geoestat_agregaregiao</physical_name> | ||
3206 | - <logical_name>i3geoestat_agregaregiao</logical_name> | ||
3207 | - <description></description> | ||
3208 | - <constraint></constraint> | ||
3209 | - <primary_key_name></primary_key_name> | ||
3210 | - <option></option> | ||
3211 | - <columns> | ||
3212 | - <normal_column> | ||
3213 | - <word_id>29</word_id> | ||
3214 | - <id>52</id> | ||
3215 | - <description></description> | ||
3216 | - <unique_key_name></unique_key_name> | ||
3217 | - <logical_name></logical_name> | ||
3218 | - <physical_name></physical_name> | ||
3219 | - <type>integer</type> | ||
3220 | - <constraint></constraint> | ||
3221 | - <default_value></default_value> | ||
3222 | - <auto_increment>true</auto_increment> | ||
3223 | - <foreign_key>false</foreign_key> | ||
3224 | - <not_null>true</not_null> | ||
3225 | - <primary_key>true</primary_key> | ||
3226 | - <unique_key>true</unique_key> | ||
3227 | - <character_set></character_set> | ||
3228 | - <collation></collation> | ||
3229 | - <sequence> | ||
3230 | - <name></name> | ||
3231 | - <schema></schema> | ||
3232 | - <increment></increment> | ||
3233 | - <min_value></min_value> | ||
3234 | - <max_value></max_value> | ||
3235 | - <start></start> | ||
3236 | - <cache></cache> | ||
3237 | - <cycle>false</cycle> | ||
3238 | - <order>false</order> | ||
3239 | - <description></description> | ||
3240 | - <data_type></data_type> | ||
3241 | - <decimal_size>0</decimal_size> | ||
3242 | - </sequence> | ||
3243 | - </normal_column> | ||
3244 | - <normal_column> | ||
3245 | - <id>53</id> | ||
3246 | - <referenced_column>67</referenced_column> | ||
3247 | - <relation>9</relation> | ||
3248 | - <description></description> | ||
3249 | - <unique_key_name></unique_key_name> | ||
3250 | - <logical_name></logical_name> | ||
3251 | - <physical_name></physical_name> | ||
3252 | - <type>integer</type> | ||
3253 | - <constraint></constraint> | ||
3254 | - <default_value></default_value> | ||
3255 | - <auto_increment>false</auto_increment> | ||
3256 | - <foreign_key>true</foreign_key> | ||
3257 | - <not_null>false</not_null> | ||
3258 | - <primary_key>false</primary_key> | ||
3259 | - <unique_key>false</unique_key> | ||
3260 | - <character_set></character_set> | ||
3261 | - <collation></collation> | ||
3262 | - <sequence> | ||
3263 | - <name></name> | ||
3264 | - <schema></schema> | ||
3265 | - <increment></increment> | ||
3266 | - <min_value></min_value> | ||
3267 | - <max_value></max_value> | ||
3268 | - <start></start> | ||
3269 | - <cache></cache> | ||
3270 | - <cycle>false</cycle> | ||
3271 | - <order>false</order> | ||
3272 | - <description></description> | ||
3273 | - <data_type></data_type> | ||
3274 | - <decimal_size>0</decimal_size> | ||
3275 | - </sequence> | ||
3276 | - </normal_column> | ||
3277 | - <normal_column> | ||
3278 | - <word_id>6</word_id> | ||
3279 | - <id>54</id> | ||
3280 | - <description></description> | ||
3281 | - <unique_key_name></unique_key_name> | ||
3282 | - <logical_name></logical_name> | ||
3283 | - <physical_name></physical_name> | ||
3284 | - <type>integer</type> | ||
3285 | - <constraint></constraint> | ||
3286 | - <default_value></default_value> | ||
3287 | - <auto_increment>false</auto_increment> | ||
3288 | - <foreign_key>false</foreign_key> | ||
3289 | - <not_null>false</not_null> | ||
3290 | - <primary_key>false</primary_key> | ||
3291 | - <unique_key>false</unique_key> | ||
3292 | - <character_set></character_set> | ||
3293 | - <collation></collation> | ||
3294 | - <sequence> | ||
3295 | - <name></name> | ||
3296 | - <schema></schema> | ||
3297 | - <increment></increment> | ||
3298 | - <min_value></min_value> | ||
3299 | - <max_value></max_value> | ||
3300 | - <start></start> | ||
3301 | - <cache></cache> | ||
3302 | - <cycle>false</cycle> | ||
3303 | - <order>false</order> | ||
3304 | - <description></description> | ||
3305 | - <data_type></data_type> | ||
3306 | - <decimal_size>0</decimal_size> | ||
3307 | - </sequence> | ||
3308 | - </normal_column> | ||
3309 | - <normal_column> | ||
3310 | - <word_id>14</word_id> | ||
3311 | - <id>55</id> | 2911 | + <id>45</id> |
3312 | <description></description> | 2912 | <description></description> |
3313 | <unique_key_name></unique_key_name> | 2913 | <unique_key_name></unique_key_name> |
3314 | <logical_name></logical_name> | 2914 | <logical_name></logical_name> |
@@ -3348,7 +2948,7 @@ | @@ -3348,7 +2948,7 @@ | ||
3348 | </table_properties> | 2948 | </table_properties> |
3349 | </table> | 2949 | </table> |
3350 | <table> | 2950 | <table> |
3351 | - <id>12</id> | 2951 | + <id>10</id> |
3352 | <height>128</height> | 2952 | <height>128</height> |
3353 | <width>269</width> | 2953 | <width>269</width> |
3354 | <font_name>Ubuntu</font_name> | 2954 | <font_name>Ubuntu</font_name> |
@@ -3362,9 +2962,9 @@ | @@ -3362,9 +2962,9 @@ | ||
3362 | </color> | 2962 | </color> |
3363 | <connections> | 2963 | <connections> |
3364 | <relation> | 2964 | <relation> |
3365 | - <id>10</id> | ||
3366 | - <source>10</source> | ||
3367 | - <target>12</target> | 2965 | + <id>9</id> |
2966 | + <source>9</source> | ||
2967 | + <target>10</target> | ||
3368 | <child_cardinality>1..n</child_cardinality> | 2968 | <child_cardinality>1..n</child_cardinality> |
3369 | <parent_cardinality>1</parent_cardinality> | 2969 | <parent_cardinality>1</parent_cardinality> |
3370 | <reference_for_pk>true</reference_for_pk> | 2970 | <reference_for_pk>true</reference_for_pk> |
@@ -3388,7 +2988,7 @@ | @@ -3388,7 +2988,7 @@ | ||
3388 | <columns> | 2988 | <columns> |
3389 | <normal_column> | 2989 | <normal_column> |
3390 | <word_id>38</word_id> | 2990 | <word_id>38</word_id> |
3391 | - <id>56</id> | 2991 | + <id>46</id> |
3392 | <description></description> | 2992 | <description></description> |
3393 | <unique_key_name></unique_key_name> | 2993 | <unique_key_name></unique_key_name> |
3394 | <logical_name></logical_name> | 2994 | <logical_name></logical_name> |
@@ -3419,9 +3019,9 @@ | @@ -3419,9 +3019,9 @@ | ||
3419 | </sequence> | 3019 | </sequence> |
3420 | </normal_column> | 3020 | </normal_column> |
3421 | <normal_column> | 3021 | <normal_column> |
3422 | - <id>57</id> | ||
3423 | - <referenced_column>39</referenced_column> | ||
3424 | - <relation>10</relation> | 3022 | + <id>47</id> |
3023 | + <referenced_column>33</referenced_column> | ||
3024 | + <relation>9</relation> | ||
3425 | <description></description> | 3025 | <description></description> |
3426 | <unique_key_name></unique_key_name> | 3026 | <unique_key_name></unique_key_name> |
3427 | <logical_name></logical_name> | 3027 | <logical_name></logical_name> |
@@ -3452,8 +3052,8 @@ | @@ -3452,8 +3052,8 @@ | ||
3452 | </sequence> | 3052 | </sequence> |
3453 | </normal_column> | 3053 | </normal_column> |
3454 | <normal_column> | 3054 | <normal_column> |
3455 | - <word_id>39</word_id> | ||
3456 | - <id>58</id> | 3055 | + <word_id>41</word_id> |
3056 | + <id>48</id> | ||
3457 | <description></description> | 3057 | <description></description> |
3458 | <unique_key_name></unique_key_name> | 3058 | <unique_key_name></unique_key_name> |
3459 | <logical_name></logical_name> | 3059 | <logical_name></logical_name> |
@@ -3485,7 +3085,7 @@ | @@ -3485,7 +3085,7 @@ | ||
3485 | </normal_column> | 3085 | </normal_column> |
3486 | <normal_column> | 3086 | <normal_column> |
3487 | <word_id>33</word_id> | 3087 | <word_id>33</word_id> |
3488 | - <id>59</id> | 3088 | + <id>49</id> |
3489 | <description></description> | 3089 | <description></description> |
3490 | <unique_key_name></unique_key_name> | 3090 | <unique_key_name></unique_key_name> |
3491 | <logical_name></logical_name> | 3091 | <logical_name></logical_name> |
@@ -3525,7 +3125,7 @@ | @@ -3525,7 +3125,7 @@ | ||
3525 | </table_properties> | 3125 | </table_properties> |
3526 | </table> | 3126 | </table> |
3527 | <table> | 3127 | <table> |
3528 | - <id>13</id> | 3128 | + <id>11</id> |
3529 | <height>170</height> | 3129 | <height>170</height> |
3530 | <width>292</width> | 3130 | <width>292</width> |
3531 | <font_name>Ubuntu</font_name> | 3131 | <font_name>Ubuntu</font_name> |
@@ -3539,9 +3139,9 @@ | @@ -3539,9 +3139,9 @@ | ||
3539 | </color> | 3139 | </color> |
3540 | <connections> | 3140 | <connections> |
3541 | <relation> | 3141 | <relation> |
3542 | - <id>11</id> | ||
3543 | - <source>10</source> | ||
3544 | - <target>13</target> | 3142 | + <id>10</id> |
3143 | + <source>9</source> | ||
3144 | + <target>11</target> | ||
3545 | <child_cardinality>1..n</child_cardinality> | 3145 | <child_cardinality>1..n</child_cardinality> |
3546 | <parent_cardinality>1</parent_cardinality> | 3146 | <parent_cardinality>1</parent_cardinality> |
3547 | <reference_for_pk>true</reference_for_pk> | 3147 | <reference_for_pk>true</reference_for_pk> |
@@ -3565,7 +3165,7 @@ | @@ -3565,7 +3165,7 @@ | ||
3565 | <columns> | 3165 | <columns> |
3566 | <normal_column> | 3166 | <normal_column> |
3567 | <word_id>36</word_id> | 3167 | <word_id>36</word_id> |
3568 | - <id>60</id> | 3168 | + <id>50</id> |
3569 | <description></description> | 3169 | <description></description> |
3570 | <unique_key_name></unique_key_name> | 3170 | <unique_key_name></unique_key_name> |
3571 | <logical_name></logical_name> | 3171 | <logical_name></logical_name> |
@@ -3597,7 +3197,7 @@ | @@ -3597,7 +3197,7 @@ | ||
3597 | </normal_column> | 3197 | </normal_column> |
3598 | <normal_column> | 3198 | <normal_column> |
3599 | <word_id>9</word_id> | 3199 | <word_id>9</word_id> |
3600 | - <id>61</id> | 3200 | + <id>51</id> |
3601 | <description></description> | 3201 | <description></description> |
3602 | <unique_key_name></unique_key_name> | 3202 | <unique_key_name></unique_key_name> |
3603 | <logical_name></logical_name> | 3203 | <logical_name></logical_name> |
@@ -3628,8 +3228,8 @@ | @@ -3628,8 +3228,8 @@ | ||
3628 | </sequence> | 3228 | </sequence> |
3629 | </normal_column> | 3229 | </normal_column> |
3630 | <normal_column> | 3230 | <normal_column> |
3631 | - <word_id>41</word_id> | ||
3632 | - <id>62</id> | 3231 | + <word_id>44</word_id> |
3232 | + <id>52</id> | ||
3633 | <description></description> | 3233 | <description></description> |
3634 | <unique_key_name></unique_key_name> | 3234 | <unique_key_name></unique_key_name> |
3635 | <logical_name></logical_name> | 3235 | <logical_name></logical_name> |
@@ -3661,7 +3261,7 @@ | @@ -3661,7 +3261,7 @@ | ||
3661 | </normal_column> | 3261 | </normal_column> |
3662 | <normal_column> | 3262 | <normal_column> |
3663 | <word_id>20</word_id> | 3263 | <word_id>20</word_id> |
3664 | - <id>63</id> | 3264 | + <id>53</id> |
3665 | <description></description> | 3265 | <description></description> |
3666 | <unique_key_name></unique_key_name> | 3266 | <unique_key_name></unique_key_name> |
3667 | <logical_name></logical_name> | 3267 | <logical_name></logical_name> |
@@ -3693,7 +3293,7 @@ | @@ -3693,7 +3293,7 @@ | ||
3693 | </normal_column> | 3293 | </normal_column> |
3694 | <normal_column> | 3294 | <normal_column> |
3695 | <word_id>35</word_id> | 3295 | <word_id>35</word_id> |
3696 | - <id>64</id> | 3296 | + <id>54</id> |
3697 | <description></description> | 3297 | <description></description> |
3698 | <unique_key_name></unique_key_name> | 3298 | <unique_key_name></unique_key_name> |
3699 | <logical_name></logical_name> | 3299 | <logical_name></logical_name> |
@@ -3724,9 +3324,9 @@ | @@ -3724,9 +3324,9 @@ | ||
3724 | </sequence> | 3324 | </sequence> |
3725 | </normal_column> | 3325 | </normal_column> |
3726 | <normal_column> | 3326 | <normal_column> |
3727 | - <id>65</id> | ||
3728 | - <referenced_column>39</referenced_column> | ||
3729 | - <relation>11</relation> | 3327 | + <id>55</id> |
3328 | + <referenced_column>33</referenced_column> | ||
3329 | + <relation>10</relation> | ||
3730 | <description></description> | 3330 | <description></description> |
3731 | <unique_key_name></unique_key_name> | 3331 | <unique_key_name></unique_key_name> |
3732 | <logical_name></logical_name> | 3332 | <logical_name></logical_name> |
@@ -3758,7 +3358,7 @@ | @@ -3758,7 +3358,7 @@ | ||
3758 | </normal_column> | 3358 | </normal_column> |
3759 | <normal_column> | 3359 | <normal_column> |
3760 | <word_id>62</word_id> | 3360 | <word_id>62</word_id> |
3761 | - <id>66</id> | 3361 | + <id>56</id> |
3762 | <description></description> | 3362 | <description></description> |
3763 | <unique_key_name></unique_key_name> | 3363 | <unique_key_name></unique_key_name> |
3764 | <logical_name></logical_name> | 3364 | <logical_name></logical_name> |
@@ -3798,30 +3398,253 @@ | @@ -3798,30 +3398,253 @@ | ||
3798 | </table_properties> | 3398 | </table_properties> |
3799 | </table> | 3399 | </table> |
3800 | <table> | 3400 | <table> |
3801 | - <id>14</id> | ||
3802 | - <height>275</height> | 3401 | + <id>12</id> |
3402 | + <height>170</height> | ||
3803 | <width>292</width> | 3403 | <width>292</width> |
3804 | <font_name>Ubuntu</font_name> | 3404 | <font_name>Ubuntu</font_name> |
3805 | <font_size>9</font_size> | 3405 | <font_size>9</font_size> |
3806 | - <x>-336</x> | ||
3807 | - <y>236</y> | 3406 | + <x>12</x> |
3407 | + <y>474</y> | ||
3808 | <color> | 3408 | <color> |
3809 | <r>255</r> | 3409 | <r>255</r> |
3810 | - <g>128</g> | ||
3811 | - <b>255</b> | 3410 | + <g>165</g> |
3411 | + <b>0</b> | ||
3812 | </color> | 3412 | </color> |
3813 | <connections> | 3413 | <connections> |
3814 | - <relation> | ||
3815 | - <id>12</id> | ||
3816 | - <source>9</source> | ||
3817 | - <target>14</target> | ||
3818 | - <child_cardinality>1..n</child_cardinality> | ||
3819 | - <parent_cardinality>1</parent_cardinality> | ||
3820 | - <reference_for_pk>true</reference_for_pk> | ||
3821 | - <name></name> | ||
3822 | - <on_delete_action>RESTRICT</on_delete_action> | ||
3823 | - <on_update_action>RESTRICT</on_update_action> | ||
3824 | - <source_xp>-1</source_xp> | 3414 | + </connections> |
3415 | + <physical_name>i3geoestat_conexao</physical_name> | ||
3416 | + <logical_name>i3geoestat_conexao</logical_name> | ||
3417 | + <description>Lista controlada dos parâmetros de conexão com o banco de dados onde residem dados
Código 0 indica que será utilizada a conexão padrão</description> | ||
3418 | + <constraint></constraint> | ||
3419 | + <primary_key_name></primary_key_name> | ||
3420 | + <option></option> | ||
3421 | + <columns> | ||
3422 | + <normal_column> | ||
3423 | + <word_id>3</word_id> | ||
3424 | + <id>57</id> | ||
3425 | + <description></description> | ||
3426 | + <unique_key_name></unique_key_name> | ||
3427 | + <logical_name></logical_name> | ||
3428 | + <physical_name></physical_name> | ||
3429 | + <type>integer</type> | ||
3430 | + <constraint></constraint> | ||
3431 | + <default_value></default_value> | ||
3432 | + <auto_increment>true</auto_increment> | ||
3433 | + <foreign_key>false</foreign_key> | ||
3434 | + <not_null>true</not_null> | ||
3435 | + <primary_key>true</primary_key> | ||
3436 | + <unique_key>true</unique_key> | ||
3437 | + <character_set></character_set> | ||
3438 | + <collation></collation> | ||
3439 | + <sequence> | ||
3440 | + <name></name> | ||
3441 | + <schema></schema> | ||
3442 | + <increment></increment> | ||
3443 | + <min_value></min_value> | ||
3444 | + <max_value></max_value> | ||
3445 | + <start></start> | ||
3446 | + <cache></cache> | ||
3447 | + <cycle>false</cycle> | ||
3448 | + <order>false</order> | ||
3449 | + <description></description> | ||
3450 | + <data_type></data_type> | ||
3451 | + <decimal_size>0</decimal_size> | ||
3452 | + </sequence> | ||
3453 | + </normal_column> | ||
3454 | + <normal_column> | ||
3455 | + <word_id>2</word_id> | ||
3456 | + <id>58</id> | ||
3457 | + <description></description> | ||
3458 | + <unique_key_name></unique_key_name> | ||
3459 | + <logical_name></logical_name> | ||
3460 | + <physical_name></physical_name> | ||
3461 | + <type>text</type> | ||
3462 | + <constraint></constraint> | ||
3463 | + <default_value></default_value> | ||
3464 | + <auto_increment>false</auto_increment> | ||
3465 | + <foreign_key>false</foreign_key> | ||
3466 | + <not_null>false</not_null> | ||
3467 | + <primary_key>false</primary_key> | ||
3468 | + <unique_key>false</unique_key> | ||
3469 | + <character_set></character_set> | ||
3470 | + <collation></collation> | ||
3471 | + <sequence> | ||
3472 | + <name></name> | ||
3473 | + <schema></schema> | ||
3474 | + <increment></increment> | ||
3475 | + <min_value></min_value> | ||
3476 | + <max_value></max_value> | ||
3477 | + <start></start> | ||
3478 | + <cache></cache> | ||
3479 | + <cycle>false</cycle> | ||
3480 | + <order>false</order> | ||
3481 | + <description></description> | ||
3482 | + <data_type></data_type> | ||
3483 | + <decimal_size>0</decimal_size> | ||
3484 | + </sequence> | ||
3485 | + </normal_column> | ||
3486 | + <normal_column> | ||
3487 | + <word_id>27</word_id> | ||
3488 | + <id>59</id> | ||
3489 | + <description></description> | ||
3490 | + <unique_key_name></unique_key_name> | ||
3491 | + <logical_name></logical_name> | ||
3492 | + <physical_name></physical_name> | ||
3493 | + <type>text</type> | ||
3494 | + <constraint></constraint> | ||
3495 | + <default_value></default_value> | ||
3496 | + <auto_increment>false</auto_increment> | ||
3497 | + <foreign_key>false</foreign_key> | ||
3498 | + <not_null>false</not_null> | ||
3499 | + <primary_key>false</primary_key> | ||
3500 | + <unique_key>false</unique_key> | ||
3501 | + <character_set></character_set> | ||
3502 | + <collation></collation> | ||
3503 | + <sequence> | ||
3504 | + <name></name> | ||
3505 | + <schema></schema> | ||
3506 | + <increment></increment> | ||
3507 | + <min_value></min_value> | ||
3508 | + <max_value></max_value> | ||
3509 | + <start></start> | ||
3510 | + <cache></cache> | ||
3511 | + <cycle>false</cycle> | ||
3512 | + <order>false</order> | ||
3513 | + <description></description> | ||
3514 | + <data_type></data_type> | ||
3515 | + <decimal_size>0</decimal_size> | ||
3516 | + </sequence> | ||
3517 | + </normal_column> | ||
3518 | + <normal_column> | ||
3519 | + <word_id>54</word_id> | ||
3520 | + <id>60</id> | ||
3521 | + <description></description> | ||
3522 | + <unique_key_name></unique_key_name> | ||
3523 | + <logical_name></logical_name> | ||
3524 | + <physical_name></physical_name> | ||
3525 | + <type>text</type> | ||
3526 | + <constraint></constraint> | ||
3527 | + <default_value></default_value> | ||
3528 | + <auto_increment>false</auto_increment> | ||
3529 | + <foreign_key>false</foreign_key> | ||
3530 | + <not_null>false</not_null> | ||
3531 | + <primary_key>false</primary_key> | ||
3532 | + <unique_key>false</unique_key> | ||
3533 | + <character_set></character_set> | ||
3534 | + <collation></collation> | ||
3535 | + <sequence> | ||
3536 | + <name></name> | ||
3537 | + <schema></schema> | ||
3538 | + <increment></increment> | ||
3539 | + <min_value></min_value> | ||
3540 | + <max_value></max_value> | ||
3541 | + <start></start> | ||
3542 | + <cache></cache> | ||
3543 | + <cycle>false</cycle> | ||
3544 | + <order>false</order> | ||
3545 | + <description></description> | ||
3546 | + <data_type></data_type> | ||
3547 | + <decimal_size>0</decimal_size> | ||
3548 | + </sequence> | ||
3549 | + </normal_column> | ||
3550 | + <normal_column> | ||
3551 | + <word_id>65</word_id> | ||
3552 | + <id>61</id> | ||
3553 | + <description></description> | ||
3554 | + <unique_key_name></unique_key_name> | ||
3555 | + <logical_name></logical_name> | ||
3556 | + <physical_name></physical_name> | ||
3557 | + <type>text</type> | ||
3558 | + <constraint></constraint> | ||
3559 | + <default_value></default_value> | ||
3560 | + <auto_increment>false</auto_increment> | ||
3561 | + <foreign_key>false</foreign_key> | ||
3562 | + <not_null>false</not_null> | ||
3563 | + <primary_key>false</primary_key> | ||
3564 | + <unique_key>false</unique_key> | ||
3565 | + <character_set></character_set> | ||
3566 | + <collation></collation> | ||
3567 | + <sequence> | ||
3568 | + <name></name> | ||
3569 | + <schema></schema> | ||
3570 | + <increment></increment> | ||
3571 | + <min_value></min_value> | ||
3572 | + <max_value></max_value> | ||
3573 | + <start></start> | ||
3574 | + <cache></cache> | ||
3575 | + <cycle>false</cycle> | ||
3576 | + <order>false</order> | ||
3577 | + <description></description> | ||
3578 | + <data_type></data_type> | ||
3579 | + <decimal_size>0</decimal_size> | ||
3580 | + </sequence> | ||
3581 | + </normal_column> | ||
3582 | + <normal_column> | ||
3583 | + <word_id>55</word_id> | ||
3584 | + <id>62</id> | ||
3585 | + <description></description> | ||
3586 | + <unique_key_name></unique_key_name> | ||
3587 | + <logical_name></logical_name> | ||
3588 | + <physical_name></physical_name> | ||
3589 | + <type>text</type> | ||
3590 | + <constraint></constraint> | ||
3591 | + <default_value></default_value> | ||
3592 | + <auto_increment>false</auto_increment> | ||
3593 | + <foreign_key>false</foreign_key> | ||
3594 | + <not_null>false</not_null> | ||
3595 | + <primary_key>false</primary_key> | ||
3596 | + <unique_key>false</unique_key> | ||
3597 | + <character_set></character_set> | ||
3598 | + <collation></collation> | ||
3599 | + <sequence> | ||
3600 | + <name></name> | ||
3601 | + <schema></schema> | ||
3602 | + <increment></increment> | ||
3603 | + <min_value></min_value> | ||
3604 | + <max_value></max_value> | ||
3605 | + <start></start> | ||
3606 | + <cache></cache> | ||
3607 | + <cycle>false</cycle> | ||
3608 | + <order>false</order> | ||
3609 | + <description></description> | ||
3610 | + <data_type></data_type> | ||
3611 | + <decimal_size>0</decimal_size> | ||
3612 | + </sequence> | ||
3613 | + </normal_column> | ||
3614 | + </columns> | ||
3615 | + <indexes> | ||
3616 | + </indexes> | ||
3617 | + <complex_unique_key_list> | ||
3618 | + </complex_unique_key_list> | ||
3619 | + <table_properties> | ||
3620 | + <schema></schema> | ||
3621 | + </table_properties> | ||
3622 | + </table> | ||
3623 | + <table> | ||
3624 | + <id>13</id> | ||
3625 | + <height>338</height> | ||
3626 | + <width>292</width> | ||
3627 | + <font_name>Ubuntu</font_name> | ||
3628 | + <font_size>9</font_size> | ||
3629 | + <x>-341</x> | ||
3630 | + <y>222</y> | ||
3631 | + <color> | ||
3632 | + <r>255</r> | ||
3633 | + <g>128</g> | ||
3634 | + <b>255</b> | ||
3635 | + </color> | ||
3636 | + <connections> | ||
3637 | + <relation> | ||
3638 | + <id>11</id> | ||
3639 | + <source>12</source> | ||
3640 | + <target>13</target> | ||
3641 | + <child_cardinality>1..n</child_cardinality> | ||
3642 | + <parent_cardinality>1</parent_cardinality> | ||
3643 | + <reference_for_pk>true</reference_for_pk> | ||
3644 | + <name></name> | ||
3645 | + <on_delete_action>RESTRICT</on_delete_action> | ||
3646 | + <on_update_action>RESTRICT</on_update_action> | ||
3647 | + <source_xp>-1</source_xp> | ||
3825 | <source_yp>-1</source_yp> | 3648 | <source_yp>-1</source_yp> |
3826 | <target_xp>-1</target_xp> | 3649 | <target_xp>-1</target_xp> |
3827 | <target_yp>-1</target_yp> | 3650 | <target_yp>-1</target_yp> |
@@ -3838,7 +3661,7 @@ | @@ -3838,7 +3661,7 @@ | ||
3838 | <columns> | 3661 | <columns> |
3839 | <normal_column> | 3662 | <normal_column> |
3840 | <word_id>5</word_id> | 3663 | <word_id>5</word_id> |
3841 | - <id>67</id> | 3664 | + <id>63</id> |
3842 | <description></description> | 3665 | <description></description> |
3843 | <unique_key_name></unique_key_name> | 3666 | <unique_key_name></unique_key_name> |
3844 | <logical_name></logical_name> | 3667 | <logical_name></logical_name> |
@@ -3870,7 +3693,7 @@ | @@ -3870,7 +3693,7 @@ | ||
3870 | </normal_column> | 3693 | </normal_column> |
3871 | <normal_column> | 3694 | <normal_column> |
3872 | <word_id>46</word_id> | 3695 | <word_id>46</word_id> |
3873 | - <id>68</id> | 3696 | + <id>64</id> |
3874 | <description></description> | 3697 | <description></description> |
3875 | <unique_key_name></unique_key_name> | 3698 | <unique_key_name></unique_key_name> |
3876 | <logical_name></logical_name> | 3699 | <logical_name></logical_name> |
@@ -3902,7 +3725,7 @@ | @@ -3902,7 +3725,7 @@ | ||
3902 | </normal_column> | 3725 | </normal_column> |
3903 | <normal_column> | 3726 | <normal_column> |
3904 | <word_id>22</word_id> | 3727 | <word_id>22</word_id> |
3905 | - <id>69</id> | 3728 | + <id>65</id> |
3906 | <description></description> | 3729 | <description></description> |
3907 | <unique_key_name></unique_key_name> | 3730 | <unique_key_name></unique_key_name> |
3908 | <logical_name></logical_name> | 3731 | <logical_name></logical_name> |
@@ -3933,9 +3756,9 @@ | @@ -3933,9 +3756,9 @@ | ||
3933 | </sequence> | 3756 | </sequence> |
3934 | </normal_column> | 3757 | </normal_column> |
3935 | <normal_column> | 3758 | <normal_column> |
3936 | - <id>70</id> | ||
3937 | - <referenced_column>33</referenced_column> | ||
3938 | - <relation>12</relation> | 3759 | + <id>66</id> |
3760 | + <referenced_column>57</referenced_column> | ||
3761 | + <relation>11</relation> | ||
3939 | <description></description> | 3762 | <description></description> |
3940 | <unique_key_name></unique_key_name> | 3763 | <unique_key_name></unique_key_name> |
3941 | <logical_name></logical_name> | 3764 | <logical_name></logical_name> |
@@ -3967,7 +3790,7 @@ | @@ -3967,7 +3790,7 @@ | ||
3967 | </normal_column> | 3790 | </normal_column> |
3968 | <normal_column> | 3791 | <normal_column> |
3969 | <word_id>24</word_id> | 3792 | <word_id>24</word_id> |
3970 | - <id>71</id> | 3793 | + <id>67</id> |
3971 | <description></description> | 3794 | <description></description> |
3972 | <unique_key_name></unique_key_name> | 3795 | <unique_key_name></unique_key_name> |
3973 | <logical_name></logical_name> | 3796 | <logical_name></logical_name> |
@@ -3999,7 +3822,7 @@ | @@ -3999,7 +3822,7 @@ | ||
3999 | </normal_column> | 3822 | </normal_column> |
4000 | <normal_column> | 3823 | <normal_column> |
4001 | <word_id>60</word_id> | 3824 | <word_id>60</word_id> |
4002 | - <id>72</id> | 3825 | + <id>68</id> |
4003 | <description></description> | 3826 | <description></description> |
4004 | <unique_key_name></unique_key_name> | 3827 | <unique_key_name></unique_key_name> |
4005 | <logical_name></logical_name> | 3828 | <logical_name></logical_name> |
@@ -4031,7 +3854,7 @@ | @@ -4031,7 +3854,7 @@ | ||
4031 | </normal_column> | 3854 | </normal_column> |
4032 | <normal_column> | 3855 | <normal_column> |
4033 | <word_id>11</word_id> | 3856 | <word_id>11</word_id> |
4034 | - <id>73</id> | 3857 | + <id>69</id> |
4035 | <description></description> | 3858 | <description></description> |
4036 | <unique_key_name></unique_key_name> | 3859 | <unique_key_name></unique_key_name> |
4037 | <logical_name></logical_name> | 3860 | <logical_name></logical_name> |
@@ -4063,7 +3886,7 @@ | @@ -4063,7 +3886,7 @@ | ||
4063 | </normal_column> | 3886 | </normal_column> |
4064 | <normal_column> | 3887 | <normal_column> |
4065 | <word_id>18</word_id> | 3888 | <word_id>18</word_id> |
4066 | - <id>74</id> | 3889 | + <id>70</id> |
4067 | <description></description> | 3890 | <description></description> |
4068 | <unique_key_name></unique_key_name> | 3891 | <unique_key_name></unique_key_name> |
4069 | <logical_name></logical_name> | 3892 | <logical_name></logical_name> |
@@ -4095,7 +3918,7 @@ | @@ -4095,7 +3918,7 @@ | ||
4095 | </normal_column> | 3918 | </normal_column> |
4096 | <normal_column> | 3919 | <normal_column> |
4097 | <word_id>28</word_id> | 3920 | <word_id>28</word_id> |
4098 | - <id>75</id> | 3921 | + <id>71</id> |
4099 | <description></description> | 3922 | <description></description> |
4100 | <unique_key_name></unique_key_name> | 3923 | <unique_key_name></unique_key_name> |
4101 | <logical_name></logical_name> | 3924 | <logical_name></logical_name> |
@@ -4127,7 +3950,7 @@ | @@ -4127,7 +3950,7 @@ | ||
4127 | </normal_column> | 3950 | </normal_column> |
4128 | <normal_column> | 3951 | <normal_column> |
4129 | <word_id>15</word_id> | 3952 | <word_id>15</word_id> |
4130 | - <id>76</id> | 3953 | + <id>72</id> |
4131 | <description></description> | 3954 | <description></description> |
4132 | <unique_key_name></unique_key_name> | 3955 | <unique_key_name></unique_key_name> |
4133 | <logical_name></logical_name> | 3956 | <logical_name></logical_name> |
@@ -4159,7 +3982,7 @@ | @@ -4159,7 +3982,7 @@ | ||
4159 | </normal_column> | 3982 | </normal_column> |
4160 | <normal_column> | 3983 | <normal_column> |
4161 | <word_id>58</word_id> | 3984 | <word_id>58</word_id> |
4162 | - <id>77</id> | 3985 | + <id>73</id> |
4163 | <description></description> | 3986 | <description></description> |
4164 | <unique_key_name></unique_key_name> | 3987 | <unique_key_name></unique_key_name> |
4165 | <logical_name></logical_name> | 3988 | <logical_name></logical_name> |
@@ -4191,7 +4014,7 @@ | @@ -4191,7 +4014,7 @@ | ||
4191 | </normal_column> | 4014 | </normal_column> |
4192 | <normal_column> | 4015 | <normal_column> |
4193 | <word_id>10</word_id> | 4016 | <word_id>10</word_id> |
4194 | - <id>78</id> | 4017 | + <id>74</id> |
4195 | <description></description> | 4018 | <description></description> |
4196 | <unique_key_name></unique_key_name> | 4019 | <unique_key_name></unique_key_name> |
4197 | <logical_name></logical_name> | 4020 | <logical_name></logical_name> |
@@ -4223,7 +4046,7 @@ | @@ -4223,7 +4046,7 @@ | ||
4223 | </normal_column> | 4046 | </normal_column> |
4224 | <normal_column> | 4047 | <normal_column> |
4225 | <word_id>16</word_id> | 4048 | <word_id>16</word_id> |
4226 | - <id>79</id> | 4049 | + <id>75</id> |
4227 | <description></description> | 4050 | <description></description> |
4228 | <unique_key_name></unique_key_name> | 4051 | <unique_key_name></unique_key_name> |
4229 | <logical_name></logical_name> | 4052 | <logical_name></logical_name> |
@@ -4255,6 +4078,183 @@ | @@ -4255,6 +4078,183 @@ | ||
4255 | </normal_column> | 4078 | </normal_column> |
4256 | <normal_column> | 4079 | <normal_column> |
4257 | <word_id>0</word_id> | 4080 | <word_id>0</word_id> |
4081 | + <id>76</id> | ||
4082 | + <description></description> | ||
4083 | + <unique_key_name></unique_key_name> | ||
4084 | + <logical_name></logical_name> | ||
4085 | + <physical_name></physical_name> | ||
4086 | + <type>text</type> | ||
4087 | + <constraint></constraint> | ||
4088 | + <default_value></default_value> | ||
4089 | + <auto_increment>false</auto_increment> | ||
4090 | + <foreign_key>false</foreign_key> | ||
4091 | + <not_null>false</not_null> | ||
4092 | + <primary_key>false</primary_key> | ||
4093 | + <unique_key>false</unique_key> | ||
4094 | + <character_set></character_set> | ||
4095 | + <collation></collation> | ||
4096 | + <sequence> | ||
4097 | + <name></name> | ||
4098 | + <schema></schema> | ||
4099 | + <increment></increment> | ||
4100 | + <min_value></min_value> | ||
4101 | + <max_value></max_value> | ||
4102 | + <start></start> | ||
4103 | + <cache></cache> | ||
4104 | + <cycle>false</cycle> | ||
4105 | + <order>false</order> | ||
4106 | + <description></description> | ||
4107 | + <data_type></data_type> | ||
4108 | + <decimal_size>0</decimal_size> | ||
4109 | + </sequence> | ||
4110 | + </normal_column> | ||
4111 | + </columns> | ||
4112 | + <indexes> | ||
4113 | + </indexes> | ||
4114 | + <complex_unique_key_list> | ||
4115 | + </complex_unique_key_list> | ||
4116 | + <table_properties> | ||
4117 | + <schema></schema> | ||
4118 | + </table_properties> | ||
4119 | + </table> | ||
4120 | + <table> | ||
4121 | + <id>14</id> | ||
4122 | + <height>128</height> | ||
4123 | + <width>270</width> | ||
4124 | + <font_name>Ubuntu</font_name> | ||
4125 | + <font_size>9</font_size> | ||
4126 | + <x>-328</x> | ||
4127 | + <y>603</y> | ||
4128 | + <color> | ||
4129 | + <r>255</r> | ||
4130 | + <g>128</g> | ||
4131 | + <b>255</b> | ||
4132 | + </color> | ||
4133 | + <connections> | ||
4134 | + <relation> | ||
4135 | + <id>12</id> | ||
4136 | + <source>13</source> | ||
4137 | + <target>14</target> | ||
4138 | + <child_cardinality>1..n</child_cardinality> | ||
4139 | + <parent_cardinality>1</parent_cardinality> | ||
4140 | + <reference_for_pk>true</reference_for_pk> | ||
4141 | + <name></name> | ||
4142 | + <on_delete_action>RESTRICT</on_delete_action> | ||
4143 | + <on_update_action>RESTRICT</on_update_action> | ||
4144 | + <source_xp>-1</source_xp> | ||
4145 | + <source_yp>-1</source_yp> | ||
4146 | + <target_xp>-1</target_xp> | ||
4147 | + <target_yp>-1</target_yp> | ||
4148 | + <referenced_column>null</referenced_column> | ||
4149 | + <referenced_complex_unique_key>null</referenced_complex_unique_key> | ||
4150 | + </relation> | ||
4151 | + </connections> | ||
4152 | + <physical_name>i3geoestat_agregaregiao</physical_name> | ||
4153 | + <logical_name>i3geoestat_agregaregiao</logical_name> | ||
4154 | + <description></description> | ||
4155 | + <constraint></constraint> | ||
4156 | + <primary_key_name></primary_key_name> | ||
4157 | + <option></option> | ||
4158 | + <columns> | ||
4159 | + <normal_column> | ||
4160 | + <word_id>29</word_id> | ||
4161 | + <id>77</id> | ||
4162 | + <description></description> | ||
4163 | + <unique_key_name></unique_key_name> | ||
4164 | + <logical_name></logical_name> | ||
4165 | + <physical_name></physical_name> | ||
4166 | + <type>integer</type> | ||
4167 | + <constraint></constraint> | ||
4168 | + <default_value></default_value> | ||
4169 | + <auto_increment>true</auto_increment> | ||
4170 | + <foreign_key>false</foreign_key> | ||
4171 | + <not_null>true</not_null> | ||
4172 | + <primary_key>true</primary_key> | ||
4173 | + <unique_key>true</unique_key> | ||
4174 | + <character_set></character_set> | ||
4175 | + <collation></collation> | ||
4176 | + <sequence> | ||
4177 | + <name></name> | ||
4178 | + <schema></schema> | ||
4179 | + <increment></increment> | ||
4180 | + <min_value></min_value> | ||
4181 | + <max_value></max_value> | ||
4182 | + <start></start> | ||
4183 | + <cache></cache> | ||
4184 | + <cycle>false</cycle> | ||
4185 | + <order>false</order> | ||
4186 | + <description></description> | ||
4187 | + <data_type></data_type> | ||
4188 | + <decimal_size>0</decimal_size> | ||
4189 | + </sequence> | ||
4190 | + </normal_column> | ||
4191 | + <normal_column> | ||
4192 | + <id>78</id> | ||
4193 | + <referenced_column>63</referenced_column> | ||
4194 | + <relation>12</relation> | ||
4195 | + <description></description> | ||
4196 | + <unique_key_name></unique_key_name> | ||
4197 | + <logical_name></logical_name> | ||
4198 | + <physical_name></physical_name> | ||
4199 | + <type>integer</type> | ||
4200 | + <constraint></constraint> | ||
4201 | + <default_value></default_value> | ||
4202 | + <auto_increment>false</auto_increment> | ||
4203 | + <foreign_key>true</foreign_key> | ||
4204 | + <not_null>false</not_null> | ||
4205 | + <primary_key>false</primary_key> | ||
4206 | + <unique_key>false</unique_key> | ||
4207 | + <character_set></character_set> | ||
4208 | + <collation></collation> | ||
4209 | + <sequence> | ||
4210 | + <name></name> | ||
4211 | + <schema></schema> | ||
4212 | + <increment></increment> | ||
4213 | + <min_value></min_value> | ||
4214 | + <max_value></max_value> | ||
4215 | + <start></start> | ||
4216 | + <cache></cache> | ||
4217 | + <cycle>false</cycle> | ||
4218 | + <order>false</order> | ||
4219 | + <description></description> | ||
4220 | + <data_type></data_type> | ||
4221 | + <decimal_size>0</decimal_size> | ||
4222 | + </sequence> | ||
4223 | + </normal_column> | ||
4224 | + <normal_column> | ||
4225 | + <word_id>6</word_id> | ||
4226 | + <id>79</id> | ||
4227 | + <description></description> | ||
4228 | + <unique_key_name></unique_key_name> | ||
4229 | + <logical_name></logical_name> | ||
4230 | + <physical_name></physical_name> | ||
4231 | + <type>integer</type> | ||
4232 | + <constraint></constraint> | ||
4233 | + <default_value></default_value> | ||
4234 | + <auto_increment>false</auto_increment> | ||
4235 | + <foreign_key>false</foreign_key> | ||
4236 | + <not_null>false</not_null> | ||
4237 | + <primary_key>false</primary_key> | ||
4238 | + <unique_key>false</unique_key> | ||
4239 | + <character_set></character_set> | ||
4240 | + <collation></collation> | ||
4241 | + <sequence> | ||
4242 | + <name></name> | ||
4243 | + <schema></schema> | ||
4244 | + <increment></increment> | ||
4245 | + <min_value></min_value> | ||
4246 | + <max_value></max_value> | ||
4247 | + <start></start> | ||
4248 | + <cache></cache> | ||
4249 | + <cycle>false</cycle> | ||
4250 | + <order>false</order> | ||
4251 | + <description></description> | ||
4252 | + <data_type></data_type> | ||
4253 | + <decimal_size>0</decimal_size> | ||
4254 | + </sequence> | ||
4255 | + </normal_column> | ||
4256 | + <normal_column> | ||
4257 | + <word_id>14</word_id> | ||
4258 | <id>80</id> | 4258 | <id>80</id> |
4259 | <description></description> | 4259 | <description></description> |
4260 | <unique_key_name></unique_key_name> | 4260 | <unique_key_name></unique_key_name> |
@@ -4302,57 +4302,57 @@ | @@ -4302,57 +4302,57 @@ | ||
4302 | <name>metaestat_basededados</name> | 4302 | <name>metaestat_basededados</name> |
4303 | <export_order>0</export_order> | 4303 | <export_order>0</export_order> |
4304 | <table_test_data> | 4304 | <table_test_data> |
4305 | - <table_id>9</table_id> | 4305 | + <table_id>12</table_id> |
4306 | <direct_test_data> | 4306 | <direct_test_data> |
4307 | <data> | 4307 | <data> |
4308 | <column_data> | 4308 | <column_data> |
4309 | - <column_id>33</column_id> | 4309 | + <column_id>57</column_id> |
4310 | <value>1</value> | 4310 | <value>1</value> |
4311 | </column_data> | 4311 | </column_data> |
4312 | <column_data> | 4312 | <column_data> |
4313 | - <column_id>34</column_id> | 4313 | + <column_id>58</column_id> |
4314 | <value>geosaude</value> | 4314 | <value>geosaude</value> |
4315 | </column_data> | 4315 | </column_data> |
4316 | <column_data> | 4316 | <column_data> |
4317 | - <column_id>35</column_id> | 4317 | + <column_id>59</column_id> |
4318 | <value>localhost</value> | 4318 | <value>localhost</value> |
4319 | </column_data> | 4319 | </column_data> |
4320 | <column_data> | 4320 | <column_data> |
4321 | - <column_id>36</column_id> | 4321 | + <column_id>60</column_id> |
4322 | <value>5432</value> | 4322 | <value>5432</value> |
4323 | </column_data> | 4323 | </column_data> |
4324 | <column_data> | 4324 | <column_data> |
4325 | - <column_id>37</column_id> | 4325 | + <column_id>61</column_id> |
4326 | <value>postgres</value> | 4326 | <value>postgres</value> |
4327 | </column_data> | 4327 | </column_data> |
4328 | <column_data> | 4328 | <column_data> |
4329 | - <column_id>38</column_id> | 4329 | + <column_id>62</column_id> |
4330 | <value>postgres</value> | 4330 | <value>postgres</value> |
4331 | </column_data> | 4331 | </column_data> |
4332 | </data> | 4332 | </data> |
4333 | <data> | 4333 | <data> |
4334 | <column_data> | 4334 | <column_data> |
4335 | - <column_id>33</column_id> | 4335 | + <column_id>57</column_id> |
4336 | <value>0</value> | 4336 | <value>0</value> |
4337 | </column_data> | 4337 | </column_data> |
4338 | <column_data> | 4338 | <column_data> |
4339 | - <column_id>34</column_id> | 4339 | + <column_id>58</column_id> |
4340 | <value>i3geo_metaestat</value> | 4340 | <value>i3geo_metaestat</value> |
4341 | </column_data> | 4341 | </column_data> |
4342 | <column_data> | 4342 | <column_data> |
4343 | - <column_id>35</column_id> | 4343 | + <column_id>59</column_id> |
4344 | <value>localhost</value> | 4344 | <value>localhost</value> |
4345 | </column_data> | 4345 | </column_data> |
4346 | <column_data> | 4346 | <column_data> |
4347 | - <column_id>36</column_id> | 4347 | + <column_id>60</column_id> |
4348 | <value>5432</value> | 4348 | <value>5432</value> |
4349 | </column_data> | 4349 | </column_data> |
4350 | <column_data> | 4350 | <column_data> |
4351 | - <column_id>37</column_id> | 4351 | + <column_id>61</column_id> |
4352 | <value>postgres</value> | 4352 | <value>postgres</value> |
4353 | </column_data> | 4353 | </column_data> |
4354 | <column_data> | 4354 | <column_data> |
4355 | - <column_id>38</column_id> | 4355 | + <column_id>62</column_id> |
4356 | <value>postgres</value> | 4356 | <value>postgres</value> |
4357 | </column_data> | 4357 | </column_data> |
4358 | </data> | 4358 | </data> |
@@ -4361,7 +4361,7 @@ | @@ -4361,7 +4361,7 @@ | ||
4361 | <test_data_num>0</test_data_num> | 4361 | <test_data_num>0</test_data_num> |
4362 | <data_def_list> | 4362 | <data_def_list> |
4363 | <data_def> | 4363 | <data_def> |
4364 | - <column_id>33</column_id> | 4364 | + <column_id>57</column_id> |
4365 | <type>Format</type> | 4365 | <type>Format</type> |
4366 | <repeat_num>1</repeat_num> | 4366 | <repeat_num>1</repeat_num> |
4367 | <template>%</template> | 4367 | <template>%</template> |
@@ -4376,7 +4376,7 @@ | @@ -4376,7 +4376,7 @@ | ||
4376 | </modified_values> | 4376 | </modified_values> |
4377 | </data_def> | 4377 | </data_def> |
4378 | <data_def> | 4378 | <data_def> |
4379 | - <column_id>34</column_id> | 4379 | + <column_id>58</column_id> |
4380 | <type>Format</type> | 4380 | <type>Format</type> |
4381 | <repeat_num>1</repeat_num> | 4381 | <repeat_num>1</repeat_num> |
4382 | <template>database%</template> | 4382 | <template>database%</template> |
@@ -4391,7 +4391,7 @@ | @@ -4391,7 +4391,7 @@ | ||
4391 | </modified_values> | 4391 | </modified_values> |
4392 | </data_def> | 4392 | </data_def> |
4393 | <data_def> | 4393 | <data_def> |
4394 | - <column_id>35</column_id> | 4394 | + <column_id>59</column_id> |
4395 | <type>Format</type> | 4395 | <type>Format</type> |
4396 | <repeat_num>1</repeat_num> | 4396 | <repeat_num>1</repeat_num> |
4397 | <template>host%</template> | 4397 | <template>host%</template> |
@@ -4406,7 +4406,7 @@ | @@ -4406,7 +4406,7 @@ | ||
4406 | </modified_values> | 4406 | </modified_values> |
4407 | </data_def> | 4407 | </data_def> |
4408 | <data_def> | 4408 | <data_def> |
4409 | - <column_id>36</column_id> | 4409 | + <column_id>60</column_id> |
4410 | <type>Format</type> | 4410 | <type>Format</type> |
4411 | <repeat_num>1</repeat_num> | 4411 | <repeat_num>1</repeat_num> |
4412 | <template>porta%</template> | 4412 | <template>porta%</template> |
@@ -4421,7 +4421,7 @@ | @@ -4421,7 +4421,7 @@ | ||
4421 | </modified_values> | 4421 | </modified_values> |
4422 | </data_def> | 4422 | </data_def> |
4423 | <data_def> | 4423 | <data_def> |
4424 | - <column_id>37</column_id> | 4424 | + <column_id>61</column_id> |
4425 | <type>Format</type> | 4425 | <type>Format</type> |
4426 | <repeat_num>1</repeat_num> | 4426 | <repeat_num>1</repeat_num> |
4427 | <template>usuario%</template> | 4427 | <template>usuario%</template> |
@@ -4436,7 +4436,7 @@ | @@ -4436,7 +4436,7 @@ | ||
4436 | </modified_values> | 4436 | </modified_values> |
4437 | </data_def> | 4437 | </data_def> |
4438 | <data_def> | 4438 | <data_def> |
4439 | - <column_id>38</column_id> | 4439 | + <column_id>62</column_id> |
4440 | <type>Format</type> | 4440 | <type>Format</type> |
4441 | <repeat_num>1</repeat_num> | 4441 | <repeat_num>1</repeat_num> |
4442 | <template>senha%</template> | 4442 | <template>senha%</template> |
@@ -4565,179 +4565,179 @@ | @@ -4565,179 +4565,179 @@ | ||
4565 | </repeat_test_data> | 4565 | </repeat_test_data> |
4566 | </table_test_data> | 4566 | </table_test_data> |
4567 | <table_test_data> | 4567 | <table_test_data> |
4568 | - <table_id>14</table_id> | 4568 | + <table_id>13</table_id> |
4569 | <direct_test_data> | 4569 | <direct_test_data> |
4570 | <data> | 4570 | <data> |
4571 | <column_data> | 4571 | <column_data> |
4572 | - <column_id>67</column_id> | 4572 | + <column_id>63</column_id> |
4573 | <value>2</value> | 4573 | <value>2</value> |
4574 | </column_data> | 4574 | </column_data> |
4575 | <column_data> | 4575 | <column_data> |
4576 | - <column_id>68</column_id> | 4576 | + <column_id>64</column_id> |
4577 | <value>Município</value> | 4577 | <value>Município</value> |
4578 | </column_data> | 4578 | </column_data> |
4579 | <column_data> | 4579 | <column_data> |
4580 | - <column_id>69</column_id> | 4580 | + <column_id>65</column_id> |
4581 | <value>Limites municipais</value> | 4581 | <value>Limites municipais</value> |
4582 | </column_data> | 4582 | </column_data> |
4583 | <column_data> | 4583 | <column_data> |
4584 | - <column_id>70</column_id> | 4584 | + <column_id>66</column_id> |
4585 | <value>1</value> | 4585 | <value>1</value> |
4586 | </column_data> | 4586 | </column_data> |
4587 | <column_data> | 4587 | <column_data> |
4588 | - <column_id>71</column_id> | 4588 | + <column_id>67</column_id> |
4589 | <value>i3geo_metaestat</value> | 4589 | <value>i3geo_metaestat</value> |
4590 | </column_data> | 4590 | </column_data> |
4591 | <column_data> | 4591 | <column_data> |
4592 | - <column_id>72</column_id> | 4592 | + <column_id>68</column_id> |
4593 | <value>municipios</value> | 4593 | <value>municipios</value> |
4594 | </column_data> | 4594 | </column_data> |
4595 | <column_data> | 4595 | <column_data> |
4596 | - <column_id>73</column_id> | 4596 | + <column_id>69</column_id> |
4597 | <value>the_geom</value> | 4597 | <value>the_geom</value> |
4598 | </column_data> | 4598 | </column_data> |
4599 | <column_data> | 4599 | <column_data> |
4600 | - <column_id>74</column_id> | 4600 | + <column_id>70</column_id> |
4601 | <value>2010</value> | 4601 | <value>2010</value> |
4602 | </column_data> | 4602 | </column_data> |
4603 | <column_data> | 4603 | <column_data> |
4604 | - <column_id>75</column_id> | 4604 | + <column_id>71</column_id> |
4605 | <value>co_municipio</value> | 4605 | <value>co_municipio</value> |
4606 | </column_data> | 4606 | </column_data> |
4607 | <column_data> | 4607 | <column_data> |
4608 | - <column_id>76</column_id> | 4608 | + <column_id>72</column_id> |
4609 | <value>no_cidade</value> | 4609 | <value>no_cidade</value> |
4610 | </column_data> | 4610 | </column_data> |
4611 | <column_data> | 4611 | <column_data> |
4612 | - <column_id>77</column_id> | 4612 | + <column_id>73</column_id> |
4613 | <value>4326</value> | 4613 | <value>4326</value> |
4614 | </column_data> | 4614 | </column_data> |
4615 | <column_data> | 4615 | <column_data> |
4616 | - <column_id>78</column_id> | 4616 | + <column_id>74</column_id> |
4617 | <value>the_geom2</value> | 4617 | <value>the_geom2</value> |
4618 | </column_data> | 4618 | </column_data> |
4619 | <column_data> | 4619 | <column_data> |
4620 | - <column_id>79</column_id> | 4620 | + <column_id>75</column_id> |
4621 | <value>co_municipio,no_cidade,co_uf,sg_uf,area_territorial,nu_ano_instalacao</value> | 4621 | <value>co_municipio,no_cidade,co_uf,sg_uf,area_territorial,nu_ano_instalacao</value> |
4622 | </column_data> | 4622 | </column_data> |
4623 | <column_data> | 4623 | <column_data> |
4624 | - <column_id>80</column_id> | 4624 | + <column_id>76</column_id> |
4625 | <value>Código ibge,Nome,Código UF,UF,Área,Ano de criação</value> | 4625 | <value>Código ibge,Nome,Código UF,UF,Área,Ano de criação</value> |
4626 | </column_data> | 4626 | </column_data> |
4627 | </data> | 4627 | </data> |
4628 | <data> | 4628 | <data> |
4629 | <column_data> | 4629 | <column_data> |
4630 | - <column_id>67</column_id> | 4630 | + <column_id>63</column_id> |
4631 | <value>3</value> | 4631 | <value>3</value> |
4632 | </column_data> | 4632 | </column_data> |
4633 | <column_data> | 4633 | <column_data> |
4634 | - <column_id>68</column_id> | 4634 | + <column_id>64</column_id> |
4635 | <value>Estado</value> | 4635 | <value>Estado</value> |
4636 | </column_data> | 4636 | </column_data> |
4637 | <column_data> | 4637 | <column_data> |
4638 | - <column_id>69</column_id> | 4638 | + <column_id>65</column_id> |
4639 | <value>Limites estaduais</value> | 4639 | <value>Limites estaduais</value> |
4640 | </column_data> | 4640 | </column_data> |
4641 | <column_data> | 4641 | <column_data> |
4642 | - <column_id>70</column_id> | 4642 | + <column_id>66</column_id> |
4643 | <value>1</value> | 4643 | <value>1</value> |
4644 | </column_data> | 4644 | </column_data> |
4645 | <column_data> | 4645 | <column_data> |
4646 | - <column_id>71</column_id> | 4646 | + <column_id>67</column_id> |
4647 | <value>i3geo_metaestat</value> | 4647 | <value>i3geo_metaestat</value> |
4648 | </column_data> | 4648 | </column_data> |
4649 | <column_data> | 4649 | <column_data> |
4650 | - <column_id>72</column_id> | 4650 | + <column_id>68</column_id> |
4651 | <value>uf</value> | 4651 | <value>uf</value> |
4652 | </column_data> | 4652 | </column_data> |
4653 | <column_data> | 4653 | <column_data> |
4654 | - <column_id>73</column_id> | 4654 | + <column_id>69</column_id> |
4655 | <value>the_geom</value> | 4655 | <value>the_geom</value> |
4656 | </column_data> | 4656 | </column_data> |
4657 | <column_data> | 4657 | <column_data> |
4658 | - <column_id>74</column_id> | 4658 | + <column_id>70</column_id> |
4659 | <value>2010</value> | 4659 | <value>2010</value> |
4660 | </column_data> | 4660 | </column_data> |
4661 | <column_data> | 4661 | <column_data> |
4662 | - <column_id>75</column_id> | 4662 | + <column_id>71</column_id> |
4663 | <value>co_uf</value> | 4663 | <value>co_uf</value> |
4664 | </column_data> | 4664 | </column_data> |
4665 | <column_data> | 4665 | <column_data> |
4666 | - <column_id>76</column_id> | 4666 | + <column_id>72</column_id> |
4667 | <value>no_uf</value> | 4667 | <value>no_uf</value> |
4668 | </column_data> | 4668 | </column_data> |
4669 | <column_data> | 4669 | <column_data> |
4670 | - <column_id>77</column_id> | 4670 | + <column_id>73</column_id> |
4671 | <value>4326</value> | 4671 | <value>4326</value> |
4672 | </column_data> | 4672 | </column_data> |
4673 | <column_data> | 4673 | <column_data> |
4674 | - <column_id>78</column_id> | 4674 | + <column_id>74</column_id> |
4675 | <value>the_geom</value> | 4675 | <value>the_geom</value> |
4676 | </column_data> | 4676 | </column_data> |
4677 | <column_data> | 4677 | <column_data> |
4678 | - <column_id>79</column_id> | 4678 | + <column_id>75</column_id> |
4679 | <value>co_uf,sg_uf,no_uf,no_regiao</value> | 4679 | <value>co_uf,sg_uf,no_uf,no_regiao</value> |
4680 | </column_data> | 4680 | </column_data> |
4681 | <column_data> | 4681 | <column_data> |
4682 | - <column_id>80</column_id> | 4682 | + <column_id>76</column_id> |
4683 | <value>Código UF,Sigla,Nome</value> | 4683 | <value>Código UF,Sigla,Nome</value> |
4684 | </column_data> | 4684 | </column_data> |
4685 | </data> | 4685 | </data> |
4686 | <data> | 4686 | <data> |
4687 | <column_data> | 4687 | <column_data> |
4688 | - <column_id>67</column_id> | 4688 | + <column_id>63</column_id> |
4689 | <value>1</value> | 4689 | <value>1</value> |
4690 | </column_data> | 4690 | </column_data> |
4691 | <column_data> | 4691 | <column_data> |
4692 | - <column_id>68</column_id> | 4692 | + <column_id>64</column_id> |
4693 | <value>Bairro</value> | 4693 | <value>Bairro</value> |
4694 | </column_data> | 4694 | </column_data> |
4695 | <column_data> | 4695 | <column_data> |
4696 | - <column_id>69</column_id> | 4696 | + <column_id>65</column_id> |
4697 | <value>Limites de bairros</value> | 4697 | <value>Limites de bairros</value> |
4698 | </column_data> | 4698 | </column_data> |
4699 | <column_data> | 4699 | <column_data> |
4700 | - <column_id>70</column_id> | 4700 | + <column_id>66</column_id> |
4701 | <value>1</value> | 4701 | <value>1</value> |
4702 | </column_data> | 4702 | </column_data> |
4703 | <column_data> | 4703 | <column_data> |
4704 | - <column_id>71</column_id> | 4704 | + <column_id>67</column_id> |
4705 | <value>i3geo_metaestat</value> | 4705 | <value>i3geo_metaestat</value> |
4706 | </column_data> | 4706 | </column_data> |
4707 | <column_data> | 4707 | <column_data> |
4708 | - <column_id>72</column_id> | 4708 | + <column_id>68</column_id> |
4709 | <value>bairros</value> | 4709 | <value>bairros</value> |
4710 | </column_data> | 4710 | </column_data> |
4711 | <column_data> | 4711 | <column_data> |
4712 | - <column_id>73</column_id> | 4712 | + <column_id>69</column_id> |
4713 | <value>the_geom</value> | 4713 | <value>the_geom</value> |
4714 | </column_data> | 4714 | </column_data> |
4715 | <column_data> | 4715 | <column_data> |
4716 | - <column_id>74</column_id> | 4716 | + <column_id>70</column_id> |
4717 | <value>2010</value> | 4717 | <value>2010</value> |
4718 | </column_data> | 4718 | </column_data> |
4719 | <column_data> | 4719 | <column_data> |
4720 | - <column_id>75</column_id> | 4720 | + <column_id>71</column_id> |
4721 | <value>co_bairro</value> | 4721 | <value>co_bairro</value> |
4722 | </column_data> | 4722 | </column_data> |
4723 | <column_data> | 4723 | <column_data> |
4724 | - <column_id>76</column_id> | 4724 | + <column_id>72</column_id> |
4725 | <value>no_bairro</value> | 4725 | <value>no_bairro</value> |
4726 | </column_data> | 4726 | </column_data> |
4727 | <column_data> | 4727 | <column_data> |
4728 | - <column_id>77</column_id> | 4728 | + <column_id>73</column_id> |
4729 | <value>4326</value> | 4729 | <value>4326</value> |
4730 | </column_data> | 4730 | </column_data> |
4731 | <column_data> | 4731 | <column_data> |
4732 | - <column_id>78</column_id> | 4732 | + <column_id>74</column_id> |
4733 | <value>the_geom</value> | 4733 | <value>the_geom</value> |
4734 | </column_data> | 4734 | </column_data> |
4735 | <column_data> | 4735 | <column_data> |
4736 | - <column_id>79</column_id> | 4736 | + <column_id>75</column_id> |
4737 | <value>co_bairro,no_bairro,no_distr,no_municip</value> | 4737 | <value>co_bairro,no_bairro,no_distr,no_municip</value> |
4738 | </column_data> | 4738 | </column_data> |
4739 | <column_data> | 4739 | <column_data> |
4740 | - <column_id>80</column_id> | 4740 | + <column_id>76</column_id> |
4741 | <value>Código bairro,Nome,Distrito,Município</value> | 4741 | <value>Código bairro,Nome,Distrito,Município</value> |
4742 | </column_data> | 4742 | </column_data> |
4743 | </data> | 4743 | </data> |
@@ -4746,7 +4746,7 @@ | @@ -4746,7 +4746,7 @@ | ||
4746 | <test_data_num>0</test_data_num> | 4746 | <test_data_num>0</test_data_num> |
4747 | <data_def_list> | 4747 | <data_def_list> |
4748 | <data_def> | 4748 | <data_def> |
4749 | - <column_id>67</column_id> | 4749 | + <column_id>63</column_id> |
4750 | <type>Format</type> | 4750 | <type>Format</type> |
4751 | <repeat_num>1</repeat_num> | 4751 | <repeat_num>1</repeat_num> |
4752 | <template>%</template> | 4752 | <template>%</template> |
@@ -4761,7 +4761,7 @@ | @@ -4761,7 +4761,7 @@ | ||
4761 | </modified_values> | 4761 | </modified_values> |
4762 | </data_def> | 4762 | </data_def> |
4763 | <data_def> | 4763 | <data_def> |
4764 | - <column_id>68</column_id> | 4764 | + <column_id>64</column_id> |
4765 | <type>Format</type> | 4765 | <type>Format</type> |
4766 | <repeat_num>1</repeat_num> | 4766 | <repeat_num>1</repeat_num> |
4767 | <template>nome_tipo_regiao%</template> | 4767 | <template>nome_tipo_regiao%</template> |
@@ -4776,7 +4776,7 @@ | @@ -4776,7 +4776,7 @@ | ||
4776 | </modified_values> | 4776 | </modified_values> |
4777 | </data_def> | 4777 | </data_def> |
4778 | <data_def> | 4778 | <data_def> |
4779 | - <column_id>69</column_id> | 4779 | + <column_id>65</column_id> |
4780 | <type>Format</type> | 4780 | <type>Format</type> |
4781 | <repeat_num>1</repeat_num> | 4781 | <repeat_num>1</repeat_num> |
4782 | <template>descricao_tipo_regiao%</template> | 4782 | <template>descricao_tipo_regiao%</template> |
@@ -4791,7 +4791,7 @@ | @@ -4791,7 +4791,7 @@ | ||
4791 | </modified_values> | 4791 | </modified_values> |
4792 | </data_def> | 4792 | </data_def> |
4793 | <data_def> | 4793 | <data_def> |
4794 | - <column_id>70</column_id> | 4794 | + <column_id>66</column_id> |
4795 | <type>Foreign Key</type> | 4795 | <type>Foreign Key</type> |
4796 | <repeat_num>1</repeat_num> | 4796 | <repeat_num>1</repeat_num> |
4797 | <template>%</template> | 4797 | <template>%</template> |
@@ -4806,7 +4806,7 @@ | @@ -4806,7 +4806,7 @@ | ||
4806 | </modified_values> | 4806 | </modified_values> |
4807 | </data_def> | 4807 | </data_def> |
4808 | <data_def> | 4808 | <data_def> |
4809 | - <column_id>71</column_id> | 4809 | + <column_id>67</column_id> |
4810 | <type>Format</type> | 4810 | <type>Format</type> |
4811 | <repeat_num>1</repeat_num> | 4811 | <repeat_num>1</repeat_num> |
4812 | <template>esquemadb%</template> | 4812 | <template>esquemadb%</template> |
@@ -4821,7 +4821,7 @@ | @@ -4821,7 +4821,7 @@ | ||
4821 | </modified_values> | 4821 | </modified_values> |
4822 | </data_def> | 4822 | </data_def> |
4823 | <data_def> | 4823 | <data_def> |
4824 | - <column_id>72</column_id> | 4824 | + <column_id>68</column_id> |
4825 | <type>Format</type> | 4825 | <type>Format</type> |
4826 | <repeat_num>1</repeat_num> | 4826 | <repeat_num>1</repeat_num> |
4827 | <template>tabela%</template> | 4827 | <template>tabela%</template> |
@@ -4836,7 +4836,7 @@ | @@ -4836,7 +4836,7 @@ | ||
4836 | </modified_values> | 4836 | </modified_values> |
4837 | </data_def> | 4837 | </data_def> |
4838 | <data_def> | 4838 | <data_def> |
4839 | - <column_id>73</column_id> | 4839 | + <column_id>69</column_id> |
4840 | <type>Format</type> | 4840 | <type>Format</type> |
4841 | <repeat_num>1</repeat_num> | 4841 | <repeat_num>1</repeat_num> |
4842 | <template>colunageo%</template> | 4842 | <template>colunageo%</template> |
@@ -4851,7 +4851,7 @@ | @@ -4851,7 +4851,7 @@ | ||
4851 | </modified_values> | 4851 | </modified_values> |
4852 | </data_def> | 4852 | </data_def> |
4853 | <data_def> | 4853 | <data_def> |
4854 | - <column_id>74</column_id> | 4854 | + <column_id>70</column_id> |
4855 | <type>Format</type> | 4855 | <type>Format</type> |
4856 | <repeat_num>1</repeat_num> | 4856 | <repeat_num>1</repeat_num> |
4857 | <template>data%</template> | 4857 | <template>data%</template> |
@@ -4866,7 +4866,7 @@ | @@ -4866,7 +4866,7 @@ | ||
4866 | </modified_values> | 4866 | </modified_values> |
4867 | </data_def> | 4867 | </data_def> |
4868 | <data_def> | 4868 | <data_def> |
4869 | - <column_id>75</column_id> | 4869 | + <column_id>71</column_id> |
4870 | <type>Format</type> | 4870 | <type>Format</type> |
4871 | <repeat_num>1</repeat_num> | 4871 | <repeat_num>1</repeat_num> |
4872 | <template>%</template> | 4872 | <template>%</template> |
@@ -4881,7 +4881,7 @@ | @@ -4881,7 +4881,7 @@ | ||
4881 | </modified_values> | 4881 | </modified_values> |
4882 | </data_def> | 4882 | </data_def> |
4883 | <data_def> | 4883 | <data_def> |
4884 | - <column_id>76</column_id> | 4884 | + <column_id>72</column_id> |
4885 | <type>Format</type> | 4885 | <type>Format</type> |
4886 | <repeat_num>1</repeat_num> | 4886 | <repeat_num>1</repeat_num> |
4887 | <template>colunanomeregiao%</template> | 4887 | <template>colunanomeregiao%</template> |
@@ -4896,7 +4896,7 @@ | @@ -4896,7 +4896,7 @@ | ||
4896 | </modified_values> | 4896 | </modified_values> |
4897 | </data_def> | 4897 | </data_def> |
4898 | <data_def> | 4898 | <data_def> |
4899 | - <column_id>77</column_id> | 4899 | + <column_id>73</column_id> |
4900 | <type>Format</type> | 4900 | <type>Format</type> |
4901 | <repeat_num>1</repeat_num> | 4901 | <repeat_num>1</repeat_num> |
4902 | <template>srid%</template> | 4902 | <template>srid%</template> |
@@ -4911,7 +4911,7 @@ | @@ -4911,7 +4911,7 @@ | ||
4911 | </modified_values> | 4911 | </modified_values> |
4912 | </data_def> | 4912 | </data_def> |
4913 | <data_def> | 4913 | <data_def> |
4914 | - <column_id>78</column_id> | 4914 | + <column_id>74</column_id> |
4915 | <type>Format</type> | 4915 | <type>Format</type> |
4916 | <repeat_num>1</repeat_num> | 4916 | <repeat_num>1</repeat_num> |
4917 | <template>colunacentroide%</template> | 4917 | <template>colunacentroide%</template> |
@@ -4926,7 +4926,7 @@ | @@ -4926,7 +4926,7 @@ | ||
4926 | </modified_values> | 4926 | </modified_values> |
4927 | </data_def> | 4927 | </data_def> |
4928 | <data_def> | 4928 | <data_def> |
4929 | - <column_id>79</column_id> | 4929 | + <column_id>75</column_id> |
4930 | <type>Format</type> | 4930 | <type>Format</type> |
4931 | <repeat_num>1</repeat_num> | 4931 | <repeat_num>1</repeat_num> |
4932 | <template>colunasvisiveis%</template> | 4932 | <template>colunasvisiveis%</template> |
@@ -4941,7 +4941,7 @@ | @@ -4941,7 +4941,7 @@ | ||
4941 | </modified_values> | 4941 | </modified_values> |
4942 | </data_def> | 4942 | </data_def> |
4943 | <data_def> | 4943 | <data_def> |
4944 | - <column_id>80</column_id> | 4944 | + <column_id>76</column_id> |
4945 | <type>Format</type> | 4945 | <type>Format</type> |
4946 | <repeat_num>1</repeat_num> | 4946 | <repeat_num>1</repeat_num> |
4947 | <template>alias%</template> | 4947 | <template>alias%</template> |
@@ -5066,59 +5066,59 @@ | @@ -5066,59 +5066,59 @@ | ||
5066 | </repeat_test_data> | 5066 | </repeat_test_data> |
5067 | </table_test_data> | 5067 | </table_test_data> |
5068 | <table_test_data> | 5068 | <table_test_data> |
5069 | - <table_id>10</table_id> | 5069 | + <table_id>9</table_id> |
5070 | <direct_test_data> | 5070 | <direct_test_data> |
5071 | <data> | 5071 | <data> |
5072 | <column_data> | 5072 | <column_data> |
5073 | - <column_id>39</column_id> | 5073 | + <column_id>33</column_id> |
5074 | <value>1</value> | 5074 | <value>1</value> |
5075 | </column_data> | 5075 | </column_data> |
5076 | <column_data> | 5076 | <column_data> |
5077 | - <column_id>40</column_id> | 5077 | + <column_id>34</column_id> |
5078 | <value>1</value> | 5078 | <value>1</value> |
5079 | </column_data> | 5079 | </column_data> |
5080 | <column_data> | 5080 | <column_data> |
5081 | - <column_id>41</column_id> | 5081 | + <column_id>35</column_id> |
5082 | <value>2</value> | 5082 | <value>2</value> |
5083 | </column_data> | 5083 | </column_data> |
5084 | <column_data> | 5084 | <column_data> |
5085 | - <column_id>42</column_id> | 5085 | + <column_id>36</column_id> |
5086 | <value>1</value> | 5086 | <value>1</value> |
5087 | </column_data> | 5087 | </column_data> |
5088 | <column_data> | 5088 | <column_data> |
5089 | - <column_id>43</column_id> | 5089 | + <column_id>37</column_id> |
5090 | <value>2</value> | 5090 | <value>2</value> |
5091 | </column_data> | 5091 | </column_data> |
5092 | <column_data> | 5092 | <column_data> |
5093 | - <column_id>44</column_id> | 5093 | + <column_id>38</column_id> |
5094 | <value>1</value> | 5094 | <value>1</value> |
5095 | </column_data> | 5095 | </column_data> |
5096 | <column_data> | 5096 | <column_data> |
5097 | - <column_id>45</column_id> | 5097 | + <column_id>39</column_id> |
5098 | <value>dbdemografia</value> | 5098 | <value>dbdemografia</value> |
5099 | </column_data> | 5099 | </column_data> |
5100 | <column_data> | 5100 | <column_data> |
5101 | - <column_id>46</column_id> | 5101 | + <column_id>40</column_id> |
5102 | <value>tb_demografia</value> | 5102 | <value>tb_demografia</value> |
5103 | </column_data> | 5103 | </column_data> |
5104 | <column_data> | 5104 | <column_data> |
5105 | - <column_id>47</column_id> | 5105 | + <column_id>41</column_id> |
5106 | <value>nu_populacao</value> | 5106 | <value>nu_populacao</value> |
5107 | </column_data> | 5107 | </column_data> |
5108 | <column_data> | 5108 | <column_data> |
5109 | - <column_id>48</column_id> | 5109 | + <column_id>42</column_id> |
5110 | <value>co_ibge</value> | 5110 | <value>co_ibge</value> |
5111 | </column_data> | 5111 | </column_data> |
5112 | <column_data> | 5112 | <column_data> |
5113 | - <column_id>49</column_id> | 5113 | + <column_id>43</column_id> |
5114 | <value></value> | 5114 | <value></value> |
5115 | </column_data> | 5115 | </column_data> |
5116 | <column_data> | 5116 | <column_data> |
5117 | - <column_id>50</column_id> | 5117 | + <column_id>44</column_id> |
5118 | <value>População residente</value> | 5118 | <value>População residente</value> |
5119 | </column_data> | 5119 | </column_data> |
5120 | <column_data> | 5120 | <column_data> |
5121 | - <column_id>51</column_id> | 5121 | + <column_id>45</column_id> |
5122 | <value></value> | 5122 | <value></value> |
5123 | </column_data> | 5123 | </column_data> |
5124 | </data> | 5124 | </data> |
@@ -5127,7 +5127,7 @@ | @@ -5127,7 +5127,7 @@ | ||
5127 | <test_data_num>0</test_data_num> | 5127 | <test_data_num>0</test_data_num> |
5128 | <data_def_list> | 5128 | <data_def_list> |
5129 | <data_def> | 5129 | <data_def> |
5130 | - <column_id>39</column_id> | 5130 | + <column_id>33</column_id> |
5131 | <type>Format</type> | 5131 | <type>Format</type> |
5132 | <repeat_num>1</repeat_num> | 5132 | <repeat_num>1</repeat_num> |
5133 | <template>%</template> | 5133 | <template>%</template> |
@@ -5142,7 +5142,7 @@ | @@ -5142,7 +5142,7 @@ | ||
5142 | </modified_values> | 5142 | </modified_values> |
5143 | </data_def> | 5143 | </data_def> |
5144 | <data_def> | 5144 | <data_def> |
5145 | - <column_id>40</column_id> | 5145 | + <column_id>34</column_id> |
5146 | <type>Foreign Key</type> | 5146 | <type>Foreign Key</type> |
5147 | <repeat_num>1</repeat_num> | 5147 | <repeat_num>1</repeat_num> |
5148 | <template>%</template> | 5148 | <template>%</template> |
@@ -5157,7 +5157,7 @@ | @@ -5157,7 +5157,7 @@ | ||
5157 | </modified_values> | 5157 | </modified_values> |
5158 | </data_def> | 5158 | </data_def> |
5159 | <data_def> | 5159 | <data_def> |
5160 | - <column_id>41</column_id> | 5160 | + <column_id>35</column_id> |
5161 | <type>Foreign Key</type> | 5161 | <type>Foreign Key</type> |
5162 | <repeat_num>1</repeat_num> | 5162 | <repeat_num>1</repeat_num> |
5163 | <template>%</template> | 5163 | <template>%</template> |
@@ -5172,7 +5172,7 @@ | @@ -5172,7 +5172,7 @@ | ||
5172 | </modified_values> | 5172 | </modified_values> |
5173 | </data_def> | 5173 | </data_def> |
5174 | <data_def> | 5174 | <data_def> |
5175 | - <column_id>42</column_id> | 5175 | + <column_id>36</column_id> |
5176 | <type>Foreign Key</type> | 5176 | <type>Foreign Key</type> |
5177 | <repeat_num>1</repeat_num> | 5177 | <repeat_num>1</repeat_num> |
5178 | <template>%</template> | 5178 | <template>%</template> |
@@ -5187,7 +5187,7 @@ | @@ -5187,7 +5187,7 @@ | ||
5187 | </modified_values> | 5187 | </modified_values> |
5188 | </data_def> | 5188 | </data_def> |
5189 | <data_def> | 5189 | <data_def> |
5190 | - <column_id>43</column_id> | 5190 | + <column_id>37</column_id> |
5191 | <type>Foreign Key</type> | 5191 | <type>Foreign Key</type> |
5192 | <repeat_num>1</repeat_num> | 5192 | <repeat_num>1</repeat_num> |
5193 | <template>%</template> | 5193 | <template>%</template> |
@@ -5202,7 +5202,7 @@ | @@ -5202,7 +5202,7 @@ | ||
5202 | </modified_values> | 5202 | </modified_values> |
5203 | </data_def> | 5203 | </data_def> |
5204 | <data_def> | 5204 | <data_def> |
5205 | - <column_id>44</column_id> | 5205 | + <column_id>38</column_id> |
5206 | <type>Foreign Key</type> | 5206 | <type>Foreign Key</type> |
5207 | <repeat_num>1</repeat_num> | 5207 | <repeat_num>1</repeat_num> |
5208 | <template>%</template> | 5208 | <template>%</template> |
@@ -5217,7 +5217,7 @@ | @@ -5217,7 +5217,7 @@ | ||
5217 | </modified_values> | 5217 | </modified_values> |
5218 | </data_def> | 5218 | </data_def> |
5219 | <data_def> | 5219 | <data_def> |
5220 | - <column_id>45</column_id> | 5220 | + <column_id>39</column_id> |
5221 | <type>Format</type> | 5221 | <type>Format</type> |
5222 | <repeat_num>1</repeat_num> | 5222 | <repeat_num>1</repeat_num> |
5223 | <template>esquemadb%</template> | 5223 | <template>esquemadb%</template> |
@@ -5232,7 +5232,7 @@ | @@ -5232,7 +5232,7 @@ | ||
5232 | </modified_values> | 5232 | </modified_values> |
5233 | </data_def> | 5233 | </data_def> |
5234 | <data_def> | 5234 | <data_def> |
5235 | - <column_id>46</column_id> | 5235 | + <column_id>40</column_id> |
5236 | <type>Format</type> | 5236 | <type>Format</type> |
5237 | <repeat_num>1</repeat_num> | 5237 | <repeat_num>1</repeat_num> |
5238 | <template>tabela%</template> | 5238 | <template>tabela%</template> |
@@ -5247,7 +5247,7 @@ | @@ -5247,7 +5247,7 @@ | ||
5247 | </modified_values> | 5247 | </modified_values> |
5248 | </data_def> | 5248 | </data_def> |
5249 | <data_def> | 5249 | <data_def> |
5250 | - <column_id>47</column_id> | 5250 | + <column_id>41</column_id> |
5251 | <type>Format</type> | 5251 | <type>Format</type> |
5252 | <repeat_num>1</repeat_num> | 5252 | <repeat_num>1</repeat_num> |
5253 | <template>colunavalor%</template> | 5253 | <template>colunavalor%</template> |
@@ -5262,7 +5262,7 @@ | @@ -5262,7 +5262,7 @@ | ||
5262 | </modified_values> | 5262 | </modified_values> |
5263 | </data_def> | 5263 | </data_def> |
5264 | <data_def> | 5264 | <data_def> |
5265 | - <column_id>48</column_id> | 5265 | + <column_id>42</column_id> |
5266 | <type>Format</type> | 5266 | <type>Format</type> |
5267 | <repeat_num>1</repeat_num> | 5267 | <repeat_num>1</repeat_num> |
5268 | <template>colunaidgeo_%</template> | 5268 | <template>colunaidgeo_%</template> |
@@ -5277,7 +5277,7 @@ | @@ -5277,7 +5277,7 @@ | ||
5277 | </modified_values> | 5277 | </modified_values> |
5278 | </data_def> | 5278 | </data_def> |
5279 | <data_def> | 5279 | <data_def> |
5280 | - <column_id>49</column_id> | 5280 | + <column_id>43</column_id> |
5281 | <type>Format</type> | 5281 | <type>Format</type> |
5282 | <repeat_num>1</repeat_num> | 5282 | <repeat_num>1</repeat_num> |
5283 | <template>filtro%</template> | 5283 | <template>filtro%</template> |
@@ -5292,7 +5292,7 @@ | @@ -5292,7 +5292,7 @@ | ||
5292 | </modified_values> | 5292 | </modified_values> |
5293 | </data_def> | 5293 | </data_def> |
5294 | <data_def> | 5294 | <data_def> |
5295 | - <column_id>50</column_id> | 5295 | + <column_id>44</column_id> |
5296 | <type>Format</type> | 5296 | <type>Format</type> |
5297 | <repeat_num>1</repeat_num> | 5297 | <repeat_num>1</repeat_num> |
5298 | <template>nomemedida_%</template> | 5298 | <template>nomemedida_%</template> |
@@ -5307,7 +5307,7 @@ | @@ -5307,7 +5307,7 @@ | ||
5307 | </modified_values> | 5307 | </modified_values> |
5308 | </data_def> | 5308 | </data_def> |
5309 | <data_def> | 5309 | <data_def> |
5310 | - <column_id>51</column_id> | 5310 | + <column_id>45</column_id> |
5311 | <type>Format</type> | 5311 | <type>Format</type> |
5312 | <repeat_num>1</repeat_num> | 5312 | <repeat_num>1</repeat_num> |
5313 | <template>colunaidunico%</template> | 5313 | <template>colunaidunico%</template> |
@@ -5325,35 +5325,35 @@ | @@ -5325,35 +5325,35 @@ | ||
5325 | </repeat_test_data> | 5325 | </repeat_test_data> |
5326 | </table_test_data> | 5326 | </table_test_data> |
5327 | <table_test_data> | 5327 | <table_test_data> |
5328 | - <table_id>13</table_id> | 5328 | + <table_id>11</table_id> |
5329 | <direct_test_data> | 5329 | <direct_test_data> |
5330 | <data> | 5330 | <data> |
5331 | <column_data> | 5331 | <column_data> |
5332 | - <column_id>60</column_id> | 5332 | + <column_id>50</column_id> |
5333 | <value>1</value> | 5333 | <value>1</value> |
5334 | </column_data> | 5334 | </column_data> |
5335 | <column_data> | 5335 | <column_data> |
5336 | - <column_id>61</column_id> | 5336 | + <column_id>51</column_id> |
5337 | <value>nu_ano</value> | 5337 | <value>nu_ano</value> |
5338 | </column_data> | 5338 | </column_data> |
5339 | <column_data> | 5339 | <column_data> |
5340 | - <column_id>62</column_id> | 5340 | + <column_id>52</column_id> |
5341 | <value>ano</value> | 5341 | <value>ano</value> |
5342 | </column_data> | 5342 | </column_data> |
5343 | <column_data> | 5343 | <column_data> |
5344 | - <column_id>63</column_id> | 5344 | + <column_id>53</column_id> |
5345 | <value></value> | 5345 | <value></value> |
5346 | </column_data> | 5346 | </column_data> |
5347 | <column_data> | 5347 | <column_data> |
5348 | - <column_id>64</column_id> | 5348 | + <column_id>54</column_id> |
5349 | <value>0</value> | 5349 | <value>0</value> |
5350 | </column_data> | 5350 | </column_data> |
5351 | <column_data> | 5351 | <column_data> |
5352 | - <column_id>65</column_id> | 5352 | + <column_id>55</column_id> |
5353 | <value>1</value> | 5353 | <value>1</value> |
5354 | </column_data> | 5354 | </column_data> |
5355 | <column_data> | 5355 | <column_data> |
5356 | - <column_id>66</column_id> | 5356 | + <column_id>56</column_id> |
5357 | <value>1</value> | 5357 | <value>1</value> |
5358 | </column_data> | 5358 | </column_data> |
5359 | </data> | 5359 | </data> |
@@ -5362,7 +5362,7 @@ | @@ -5362,7 +5362,7 @@ | ||
5362 | <test_data_num>0</test_data_num> | 5362 | <test_data_num>0</test_data_num> |
5363 | <data_def_list> | 5363 | <data_def_list> |
5364 | <data_def> | 5364 | <data_def> |
5365 | - <column_id>60</column_id> | 5365 | + <column_id>50</column_id> |
5366 | <type>Format</type> | 5366 | <type>Format</type> |
5367 | <repeat_num>1</repeat_num> | 5367 | <repeat_num>1</repeat_num> |
5368 | <template>%</template> | 5368 | <template>%</template> |
@@ -5377,7 +5377,7 @@ | @@ -5377,7 +5377,7 @@ | ||
5377 | </modified_values> | 5377 | </modified_values> |
5378 | </data_def> | 5378 | </data_def> |
5379 | <data_def> | 5379 | <data_def> |
5380 | - <column_id>61</column_id> | 5380 | + <column_id>51</column_id> |
5381 | <type>Format</type> | 5381 | <type>Format</type> |
5382 | <repeat_num>1</repeat_num> | 5382 | <repeat_num>1</repeat_num> |
5383 | <template>coluna%</template> | 5383 | <template>coluna%</template> |
@@ -5392,7 +5392,7 @@ | @@ -5392,7 +5392,7 @@ | ||
5392 | </modified_values> | 5392 | </modified_values> |
5393 | </data_def> | 5393 | </data_def> |
5394 | <data_def> | 5394 | <data_def> |
5395 | - <column_id>62</column_id> | 5395 | + <column_id>52</column_id> |
5396 | <type>Format</type> | 5396 | <type>Format</type> |
5397 | <repeat_num>1</repeat_num> | 5397 | <repeat_num>1</repeat_num> |
5398 | <template>nomedimensao%</template> | 5398 | <template>nomedimensao%</template> |
@@ -5407,7 +5407,7 @@ | @@ -5407,7 +5407,7 @@ | ||
5407 | </modified_values> | 5407 | </modified_values> |
5408 | </data_def> | 5408 | </data_def> |
5409 | <data_def> | 5409 | <data_def> |
5410 | - <column_id>63</column_id> | 5410 | + <column_id>53</column_id> |
5411 | <type>Format</type> | 5411 | <type>Format</type> |
5412 | <repeat_num>1</repeat_num> | 5412 | <repeat_num>1</repeat_num> |
5413 | <template>descricao%</template> | 5413 | <template>descricao%</template> |
@@ -5422,7 +5422,7 @@ | @@ -5422,7 +5422,7 @@ | ||
5422 | </modified_values> | 5422 | </modified_values> |
5423 | </data_def> | 5423 | </data_def> |
5424 | <data_def> | 5424 | <data_def> |
5425 | - <column_id>64</column_id> | 5425 | + <column_id>54</column_id> |
5426 | <type>Format</type> | 5426 | <type>Format</type> |
5427 | <repeat_num>1</repeat_num> | 5427 | <repeat_num>1</repeat_num> |
5428 | <template>%</template> | 5428 | <template>%</template> |
@@ -5437,7 +5437,7 @@ | @@ -5437,7 +5437,7 @@ | ||
5437 | </modified_values> | 5437 | </modified_values> |
5438 | </data_def> | 5438 | </data_def> |
5439 | <data_def> | 5439 | <data_def> |
5440 | - <column_id>65</column_id> | 5440 | + <column_id>55</column_id> |
5441 | <type>Foreign Key</type> | 5441 | <type>Foreign Key</type> |
5442 | <repeat_num>1</repeat_num> | 5442 | <repeat_num>1</repeat_num> |
5443 | <template>%</template> | 5443 | <template>%</template> |
@@ -5452,7 +5452,7 @@ | @@ -5452,7 +5452,7 @@ | ||
5452 | </modified_values> | 5452 | </modified_values> |
5453 | </data_def> | 5453 | </data_def> |
5454 | <data_def> | 5454 | <data_def> |
5455 | - <column_id>66</column_id> | 5455 | + <column_id>56</column_id> |
5456 | <type>Format</type> | 5456 | <type>Format</type> |
5457 | <repeat_num>1</repeat_num> | 5457 | <repeat_num>1</repeat_num> |
5458 | <template>%</template> | 5458 | <template>%</template> |
@@ -6048,23 +6048,23 @@ | @@ -6048,23 +6048,23 @@ | ||
6048 | </repeat_test_data> | 6048 | </repeat_test_data> |
6049 | </table_test_data> | 6049 | </table_test_data> |
6050 | <table_test_data> | 6050 | <table_test_data> |
6051 | - <table_id>12</table_id> | 6051 | + <table_id>10</table_id> |
6052 | <direct_test_data> | 6052 | <direct_test_data> |
6053 | <data> | 6053 | <data> |
6054 | <column_data> | 6054 | <column_data> |
6055 | - <column_id>56</column_id> | 6055 | + <column_id>46</column_id> |
6056 | <value>http://portal.saude.gov.br/portal/saude/area.cfm?id_area=1095</value> | 6056 | <value>http://portal.saude.gov.br/portal/saude/area.cfm?id_area=1095</value> |
6057 | </column_data> | 6057 | </column_data> |
6058 | <column_data> | 6058 | <column_data> |
6059 | - <column_id>57</column_id> | 6059 | + <column_id>47</column_id> |
6060 | <value>1</value> | 6060 | <value>1</value> |
6061 | </column_data> | 6061 | </column_data> |
6062 | <column_data> | 6062 | <column_data> |
6063 | - <column_id>58</column_id> | 6063 | + <column_id>48</column_id> |
6064 | <value>Site das Fármacias Populares</value> | 6064 | <value>Site das Fármacias Populares</value> |
6065 | </column_data> | 6065 | </column_data> |
6066 | <column_data> | 6066 | <column_data> |
6067 | - <column_id>59</column_id> | 6067 | + <column_id>49</column_id> |
6068 | <value>1</value> | 6068 | <value>1</value> |
6069 | </column_data> | 6069 | </column_data> |
6070 | </data> | 6070 | </data> |
@@ -6073,7 +6073,7 @@ | @@ -6073,7 +6073,7 @@ | ||
6073 | <test_data_num>0</test_data_num> | 6073 | <test_data_num>0</test_data_num> |
6074 | <data_def_list> | 6074 | <data_def_list> |
6075 | <data_def> | 6075 | <data_def> |
6076 | - <column_id>56</column_id> | 6076 | + <column_id>46</column_id> |
6077 | <type>Format</type> | 6077 | <type>Format</type> |
6078 | <repeat_num>1</repeat_num> | 6078 | <repeat_num>1</repeat_num> |
6079 | <template>link%</template> | 6079 | <template>link%</template> |
@@ -6088,7 +6088,7 @@ | @@ -6088,7 +6088,7 @@ | ||
6088 | </modified_values> | 6088 | </modified_values> |
6089 | </data_def> | 6089 | </data_def> |
6090 | <data_def> | 6090 | <data_def> |
6091 | - <column_id>57</column_id> | 6091 | + <column_id>47</column_id> |
6092 | <type>Foreign Key</type> | 6092 | <type>Foreign Key</type> |
6093 | <repeat_num>1</repeat_num> | 6093 | <repeat_num>1</repeat_num> |
6094 | <template>%</template> | 6094 | <template>%</template> |
@@ -6103,7 +6103,7 @@ | @@ -6103,7 +6103,7 @@ | ||
6103 | </modified_values> | 6103 | </modified_values> |
6104 | </data_def> | 6104 | </data_def> |
6105 | <data_def> | 6105 | <data_def> |
6106 | - <column_id>58</column_id> | 6106 | + <column_id>48</column_id> |
6107 | <type>Format</type> | 6107 | <type>Format</type> |
6108 | <repeat_num>1</repeat_num> | 6108 | <repeat_num>1</repeat_num> |
6109 | <template>nome%</template> | 6109 | <template>nome%</template> |
@@ -6118,7 +6118,7 @@ | @@ -6118,7 +6118,7 @@ | ||
6118 | </modified_values> | 6118 | </modified_values> |
6119 | </data_def> | 6119 | </data_def> |
6120 | <data_def> | 6120 | <data_def> |
6121 | - <column_id>59</column_id> | 6121 | + <column_id>49</column_id> |
6122 | <type>Format</type> | 6122 | <type>Format</type> |
6123 | <repeat_num>1</repeat_num> | 6123 | <repeat_num>1</repeat_num> |
6124 | <template>%</template> | 6124 | <template>%</template> |
@@ -6255,41 +6255,41 @@ | @@ -6255,41 +6255,41 @@ | ||
6255 | </repeat_test_data> | 6255 | </repeat_test_data> |
6256 | </table_test_data> | 6256 | </table_test_data> |
6257 | <table_test_data> | 6257 | <table_test_data> |
6258 | - <table_id>11</table_id> | 6258 | + <table_id>14</table_id> |
6259 | <direct_test_data> | 6259 | <direct_test_data> |
6260 | <data> | 6260 | <data> |
6261 | <column_data> | 6261 | <column_data> |
6262 | - <column_id>52</column_id> | 6262 | + <column_id>77</column_id> |
6263 | <value>1</value> | 6263 | <value>1</value> |
6264 | </column_data> | 6264 | </column_data> |
6265 | <column_data> | 6265 | <column_data> |
6266 | - <column_id>53</column_id> | 6266 | + <column_id>78</column_id> |
6267 | <value>1</value> | 6267 | <value>1</value> |
6268 | </column_data> | 6268 | </column_data> |
6269 | <column_data> | 6269 | <column_data> |
6270 | - <column_id>54</column_id> | 6270 | + <column_id>79</column_id> |
6271 | <value>2</value> | 6271 | <value>2</value> |
6272 | </column_data> | 6272 | </column_data> |
6273 | <column_data> | 6273 | <column_data> |
6274 | - <column_id>55</column_id> | 6274 | + <column_id>80</column_id> |
6275 | <value>co_municipio</value> | 6275 | <value>co_municipio</value> |
6276 | </column_data> | 6276 | </column_data> |
6277 | </data> | 6277 | </data> |
6278 | <data> | 6278 | <data> |
6279 | <column_data> | 6279 | <column_data> |
6280 | - <column_id>52</column_id> | 6280 | + <column_id>77</column_id> |
6281 | <value>2</value> | 6281 | <value>2</value> |
6282 | </column_data> | 6282 | </column_data> |
6283 | <column_data> | 6283 | <column_data> |
6284 | - <column_id>53</column_id> | 6284 | + <column_id>78</column_id> |
6285 | <value>2</value> | 6285 | <value>2</value> |
6286 | </column_data> | 6286 | </column_data> |
6287 | <column_data> | 6287 | <column_data> |
6288 | - <column_id>54</column_id> | 6288 | + <column_id>79</column_id> |
6289 | <value>3</value> | 6289 | <value>3</value> |
6290 | </column_data> | 6290 | </column_data> |
6291 | <column_data> | 6291 | <column_data> |
6292 | - <column_id>55</column_id> | 6292 | + <column_id>80</column_id> |
6293 | <value>co_uf</value> | 6293 | <value>co_uf</value> |
6294 | </column_data> | 6294 | </column_data> |
6295 | </data> | 6295 | </data> |
@@ -6298,7 +6298,7 @@ | @@ -6298,7 +6298,7 @@ | ||
6298 | <test_data_num>0</test_data_num> | 6298 | <test_data_num>0</test_data_num> |
6299 | <data_def_list> | 6299 | <data_def_list> |
6300 | <data_def> | 6300 | <data_def> |
6301 | - <column_id>52</column_id> | 6301 | + <column_id>77</column_id> |
6302 | <type>Format</type> | 6302 | <type>Format</type> |
6303 | <repeat_num>1</repeat_num> | 6303 | <repeat_num>1</repeat_num> |
6304 | <template>%</template> | 6304 | <template>%</template> |
@@ -6313,7 +6313,7 @@ | @@ -6313,7 +6313,7 @@ | ||
6313 | </modified_values> | 6313 | </modified_values> |
6314 | </data_def> | 6314 | </data_def> |
6315 | <data_def> | 6315 | <data_def> |
6316 | - <column_id>53</column_id> | 6316 | + <column_id>78</column_id> |
6317 | <type>Foreign Key</type> | 6317 | <type>Foreign Key</type> |
6318 | <repeat_num>1</repeat_num> | 6318 | <repeat_num>1</repeat_num> |
6319 | <template>%</template> | 6319 | <template>%</template> |
@@ -6328,7 +6328,7 @@ | @@ -6328,7 +6328,7 @@ | ||
6328 | </modified_values> | 6328 | </modified_values> |
6329 | </data_def> | 6329 | </data_def> |
6330 | <data_def> | 6330 | <data_def> |
6331 | - <column_id>54</column_id> | 6331 | + <column_id>79</column_id> |
6332 | <type>Format</type> | 6332 | <type>Format</type> |
6333 | <repeat_num>1</repeat_num> | 6333 | <repeat_num>1</repeat_num> |
6334 | <template>%</template> | 6334 | <template>%</template> |
@@ -6343,7 +6343,7 @@ | @@ -6343,7 +6343,7 @@ | ||
6343 | </modified_values> | 6343 | </modified_values> |
6344 | </data_def> | 6344 | </data_def> |
6345 | <data_def> | 6345 | <data_def> |
6346 | - <column_id>55</column_id> | 6346 | + <column_id>80</column_id> |
6347 | <type>Format</type> | 6347 | <type>Format</type> |
6348 | <repeat_num>1</repeat_num> | 6348 | <repeat_num>1</repeat_num> |
6349 | <template>colunaligacao_regiaopai%</template> | 6349 | <template>colunaligacao_regiaopai%</template> |
ms_configura.php
@@ -480,7 +480,10 @@ else //se for linux | @@ -480,7 +480,10 @@ else //se for linux | ||
480 | * TODO verificar qual o endereco padrao no Ubuntu | 480 | * TODO verificar qual o endereco padrao no Ubuntu |
481 | */ | 481 | */ |
482 | $R_libpath = ""; | 482 | $R_libpath = ""; |
483 | - $postgis_mapa = ""; | 483 | + $postgis_mapa = array( |
484 | + "teste"=>"user=postgres password=postgres dbname=postgis host=localhost port=5432 options='-c client_encoding=LATIN1'", | ||
485 | + "postgres"=>"user=postgres password=postgres dbname=postgis host=localhost port=5432", | ||
486 | + ); | ||
484 | $utilizacgi = "nao"; | 487 | $utilizacgi = "nao"; |
485 | $expoeMapfile = "sim"; | 488 | $expoeMapfile = "sim"; |
486 | $conexaoadmin = "";//$locaplic."/admin/php/conexaopostgresql.php"; | 489 | $conexaoadmin = "";//$locaplic."/admin/php/conexaopostgresql.php"; |
@@ -0,0 +1,45 @@ | @@ -0,0 +1,45 @@ | ||
1 | +MAP | ||
2 | + FONTSET "../symbols/fontes.txt" | ||
3 | + SYMBOLSET "../symbols/simbolos.sym" | ||
4 | + LAYER | ||
5 | + CONNECTION "http://www.geoservicos.inde.gov.br/geoserver/wms?" | ||
6 | + CONNECTIONTYPE WMS | ||
7 | + #DATA "ibgetransporterodoviarioacesso" | ||
8 | + METADATA | ||
9 | + "CLASSE" "SIM" | ||
10 | + "palletestep" "" | ||
11 | + "permitekmz" "sim" | ||
12 | + "description_template" "" | ||
13 | + "palletefile" "" | ||
14 | + "permitedownload" "nao" | ||
15 | + "download" "NAO" | ||
16 | + "arquivodownload" "" | ||
17 | + "permitekml" "sim" | ||
18 | + "permiteogc" "sim" | ||
19 | + "TEMA" "ibgetransporterodoviarioacesso" | ||
20 | + "editorsql" "NAO" | ||
21 | + "aplicaextensao" "NAO" | ||
22 | + "identifica" "SIM" | ||
23 | + "wms_force_separate_request" "1" | ||
24 | + "formatosinfo" "text/plain,text/html,application/vnd.ogc.gml" | ||
25 | + "wms_format" "image/png" | ||
26 | + "wms_connectiontimeout" "30" | ||
27 | + "wms_server_version" "1.1.1" | ||
28 | + "wms_name" "IBGE:Transporte_Rodoviario_Acesso" | ||
29 | + "wms_srs" "EPSG:4326" | ||
30 | + END | ||
31 | + NAME "testeibge" | ||
32 | + STATUS OFF | ||
33 | + TYPE RASTER | ||
34 | + UNITS METERS | ||
35 | + CLASS | ||
36 | + NAME "" | ||
37 | + STYLE | ||
38 | + ANGLE 360 | ||
39 | + COLOR 0 0 0 | ||
40 | + OPACITY 100 | ||
41 | + SYMBOL 0 | ||
42 | + END | ||
43 | + END | ||
44 | + END | ||
45 | +END |