From c09ce5b76d5052c600d030604f1cf8d3e4d9bd1e Mon Sep 17 00:00:00 2001 From: Edmar Moretti Date: Mon, 23 Mar 2015 05:01:11 +0000 Subject: [PATCH] Correção na ferramenta de busca na INDE --- classesjs/classe_editorgm.js | 4 ++++ classesjs/classe_editorol.js | 5 +++++ css/geral.css | 8 ++++++++ pacotes/cswclient/csw-proxy.php | 11 ++++++++++- pacotes/cswclient/lib/scripts/cswclient.js | 10 +++++++--- pacotes/cswclient/lib/xml/csw-hosts.xml | 6 ------ pacotes/cswclient/lib/xsl/csw-metadata.xsl | 30 ++++++++++++++++++++++++++++++ pacotes/cswclient/lib/xsl/csw-results.xsl | 284 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- 8 files changed, 122 insertions(+), 236 deletions(-) diff --git a/classesjs/classe_editorgm.js b/classesjs/classe_editorgm.js index 658515a..a4a9be3 100644 --- a/classesjs/classe_editorgm.js +++ b/classesjs/classe_editorgm.js @@ -1,5 +1,9 @@ //TODO documentar //TODO traduzir +//TODO incluir opcao para selecionar todas as figuras +//TODO incluir balao de informacoes como um elemento grafico de desenho +//TODO uncluir caixas de texto + /* Editor vetorial de limites para a interface google maps diff --git a/classesjs/classe_editorol.js b/classesjs/classe_editorol.js index ff5da63..20584d1 100644 --- a/classesjs/classe_editorol.js +++ b/classesjs/classe_editorol.js @@ -1,5 +1,9 @@ //TODO documentar //TODO traduzir +//TODO incluir opcao para selecionar todas as figuras +//TODO incluir balao de informacoes como um elemento grafico de desenho +//TODO uncluir caixas de texto + /* Title: Editor vetorial para OpenLayers @@ -33,6 +37,7 @@ Free Software Foundation, Inc., no endereço 59 Temple Street, Suite 330, Boston, MA 02111-1307 USA. */ + if(!i3GEO || typeof(i3GEO) === 'undefined'){ var i3GEO = { }; diff --git a/css/geral.css b/css/geral.css index 6584f06..8366000 100644 --- a/css/geral.css +++ b/css/geral.css @@ -8,6 +8,14 @@ margin-top: -5px; } */ +/* +Utilizado na janela do buscador INDE +*/ +.meta-param, .meta-value{ + text-align: left; + font-size: 12px; + padding: 5px; +} .botoesLegendaFlutuante { font-size: 10px; } diff --git a/pacotes/cswclient/csw-proxy.php b/pacotes/cswclient/csw-proxy.php index d5063fc..98cc0fe 100644 --- a/pacotes/cswclient/csw-proxy.php +++ b/pacotes/cswclient/csw-proxy.php @@ -5,7 +5,7 @@ // Author: Rob van Swol, NLR // October 15th, 2008 // - +include(dirname(__FILE__)."/../../ms_configura.php"); $logging = false; /* Optionally write all requests in a log file */ if ($logging) { @@ -62,6 +62,9 @@ if ($_POST['csw_request']) { curl_setopt ($session, CURLOPT_POST, true); curl_setopt ($session, CURLOPT_POSTFIELDS, $xmlpost); + if(isset($i3geo_proxy_server) && $i3geo_proxy_server != ""){ + curl_setopt($session, CURLOPT_PROXY, $i3geo_proxy_server); + } curl_setopt ($session, CURLOPT_HTTPHEADER, Array("Content-Type: application/xml")); //curl_setopt ($session, CURLOPT_SSL_VERIFYPEER, 0); if ($logging) @@ -78,6 +81,9 @@ if ($_POST['csw_request']) { } curl_setopt ($session, CURLOPT_POST, true); curl_setopt ($session, CURLOPT_POSTFIELDS, $_POST['csw_request']); + if(isset($i3geo_proxy_server) && $i3geo_proxy_server != ""){ + curl_setopt($session, CURLOPT_PROXY, $i3geo_proxy_server); + } curl_setopt ($session, CURLOPT_HTTPHEADER, Array("Content-Type: application/x-www-form-urlencoded")); if ($logging) fwrite($fh, $timestamp.": POST> ".$_POST['csw_request']."\n"); @@ -86,6 +92,9 @@ if ($_POST['csw_request']) { } else if ($_GET['csw_request']) { curl_setopt ($session, CURLOPT_POST, true); curl_setopt ($session, CURLOPT_POSTFIELDS, $_GET['csw_request']); + if(isset($i3geo_proxy_server) && $i3geo_proxy_server != ""){ + curl_setopt($session, CURLOPT_PROXY, $i3geo_proxy_server); + } curl_setopt ($session, CURLOPT_HTTPHEADER, Array("Content-Type: application/x-www-form-urlencoded")); if ($logging) fwrite($fh, $timestamp.": GET> ".$_GET['csw_request']."\n"); diff --git a/pacotes/cswclient/lib/scripts/cswclient.js b/pacotes/cswclient/lib/scripts/cswclient.js index fb19d1d..4fa8463 100644 --- a/pacotes/cswclient/lib/scripts/cswclient.js +++ b/pacotes/cswclient/lib/scripts/cswclient.js @@ -10,6 +10,8 @@ * Last Change : 2008-10-22 */ +i3GEO = window.parent.i3GEO; + CSWClient = function(cswhost, host){ this.cswhost = null; this.use_proxy = true; @@ -27,7 +29,7 @@ CSWClient = function(cswhost, host){ } CSWClient.prototype.abreINDE = function(id) { - window.open("http://www.metadados.inde.gov.br/geonetwork/srv/br/main.home?uuid="+id,"new"); + window.open("http://metadados.inde.gov.br/geonetwork/srv/por/main.home?uuid="+id,"new"); } CSWClient.prototype.setCSWHost = function(host) { @@ -82,12 +84,14 @@ CSWClient.prototype.handleCSWResponse = function(request, xml) if (request == "getrecordbyid"){ //outputDiv = window.open().document.body;//document.getElementById("metadata"); - //output = '' + output; + //output = '' + output; //this.positionDiv(document.getElementById('popup'), document.getElementById('results')) //this.positionPopUp(document.getElementById('popup'), document.getElementById('results')) //this.positionPopUp(document.getElementById('popup'), document.getElementById('cswclient')) //this.showDiv(document.getElementById('popup')); - } + i3GEO.janela.mensagemSimples("
"+output+"
","",450); + return; +} outputDiv.innerHTML = output; } diff --git a/pacotes/cswclient/lib/xml/csw-hosts.xml b/pacotes/cswclient/lib/xml/csw-hosts.xml index d443d4d..4057766 100644 --- a/pacotes/cswclient/lib/xml/csw-hosts.xml +++ b/pacotes/cswclient/lib/xml/csw-hosts.xml @@ -1,9 +1,3 @@ diff --git a/pacotes/cswclient/lib/xsl/csw-metadata.xsl b/pacotes/cswclient/lib/xsl/csw-metadata.xsl index 4b7ac99..ad28143 100644 --- a/pacotes/cswclient/lib/xsl/csw-metadata.xsl +++ b/pacotes/cswclient/lib/xsl/csw-metadata.xsl @@ -262,6 +262,7 @@

Distribution info

+ @@ -315,6 +316,7 @@ + @@ -372,6 +374,7 @@
+
@@ -397,6 +400,33 @@ + + +
+

+ + + + + + + + + + + + + + + + + + + + + +
+ diff --git a/pacotes/cswclient/lib/xsl/csw-results.xsl b/pacotes/cswclient/lib/xsl/csw-results.xsl index 48ebbff..370fce2 100644 --- a/pacotes/cswclient/lib/xsl/csw-results.xsl +++ b/pacotes/cswclient/lib/xsl/csw-results.xsl @@ -1,14 +1,8 @@ - - + - - - + xmlns:dct="http://purl.org/dc/terms/"> + @@ -83,232 +77,70 @@
+
    + + + + +
  1. + Title: + + + javascript:(csw_client.abreINDE + (' + + ')) + + + + + + + ... + + + +
    + +
    + Keywords: + + + , + + + +
    +
    2. +     +
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - -
Mais info: - - - javascript:csw_client.abreINDE - (' - - ') - - - (abre em nova janela) - -
- - - - -
- - - - - - - - - - - - -
Resumo: - -
-
- - - - - - Organização: - - - - - - e-mail: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Download: - - - - - -
Esri ArcIms: - - - - - -
OGC-WMS: - - javascript:void(window.open(' - - ')) - - - -
OGC-WMS Capabilities: - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

- - - - - - - - - - - - - - - + - - - : - - + + + ... - - - - - - - : - - - - - - + + Abstract: + + ... + + + javascript:(csw_client.getRecordById + (' + + ')) + + Mais info + - -- libgit2 0.21.2