From 4bd72a7da2b4b5ad2db799546291d7fffc640418 Mon Sep 17 00:00:00 2001
From: Edmar Moretti <edmar.moretti@gmail.com>
Date: Wed, 28 Sep 2011 14:54:48 +0000
Subject: [PATCH] 

---
 pacotes/cswclient/csw.html                 |  4 +++-
 pacotes/cswclient/lib/scripts/cswclient.js | 24 +++++++++++++++++++++---
 pacotes/cswclient/lib/xml/defaults.xml     |  3 ++-
 pacotes/cswclient/lib/xsl/getrecords.xsl   | 17 ++++++++++++++++-
 4 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/pacotes/cswclient/csw.html b/pacotes/cswclient/csw.html
index 84ca83f..bc24432 100644
--- a/pacotes/cswclient/csw.html
+++ b/pacotes/cswclient/csw.html
@@ -28,6 +28,8 @@
                </select>
                <input type="text" name="query" value="" size="24"/>
                <p/>
+			   Região (xmin ymin xmax ymax): <input type="text" name="bbox" value="-180 -90 180 90" size="24"/>
+			   <p/>
                <span id="csw-hosts"></span>
 		<select id="schema" name="schema">
 				 <option value="http://www.opengis.net/cat/csw/2.0.2">csw:Record</option>
@@ -46,7 +48,7 @@
                <!--input type="hidden" name="schema" value="http://www.isotc211.org/2005/gmd"/-->
                <!--input type="hidden" name="displaymode" value="html"/-->
                <input type="button" value="limpar" onClick="javascript:void(csw_client.clearPage())"/>
-               <input type="button" value="pesquisar" onClick="javascript:void(csw_client.getRecords())"/>
+               <input type="button" value="pesquisar" onClick="javascript:void(csw_client.clearResposta());void(csw_client.getRecords())"/>
 			 </form>
 	       </div>
 		   
diff --git a/pacotes/cswclient/lib/scripts/cswclient.js b/pacotes/cswclient/lib/scripts/cswclient.js
index 07b6ce0..3851635 100644
--- a/pacotes/cswclient/lib/scripts/cswclient.js
+++ b/pacotes/cswclient/lib/scripts/cswclient.js
@@ -109,6 +109,16 @@ CSWClient.prototype.getRecords = function(start)
  
  var operator = document.theForm.operator.value;
  var query = trim(document.theForm.query.value);
+ var bbox = document.theForm.bbox.value;
+ if (bbox == ""){
+	var lowerCorner = "";
+	var upperCorner = ""
+ }
+ else{
+	bbox = bbox.split(" ");
+	var lowerCorner = bbox[1]+" "+bbox[0];
+	var upperCorner = bbox[3]+" "+bbox[2];	
+ }
  if (operator == "contains" & query != "") {query = "%" + query + "%";}
  
  var schema = "http://www.opengis.net/cat/csw/2.0.2"; // force outputSchema  always  to csw:Record for GetRecords requests
@@ -119,13 +129,16 @@ CSWClient.prototype.getRecords = function(start)
  this.setXpathValue(this.defaults_xml, "/defaults/startposition", start + '');
  var sortby = document.theForm.sortby.value;
  this.setXpathValue(this.defaults_xml, "/defaults/sortby", sortby + '');
-
+ if (bbox != ""){
+	this.setXpathValue(this.defaults_xml, "/defaults/lowerCorner", lowerCorner + '');
+	this.setXpathValue(this.defaults_xml, "/defaults/upperCorner", upperCorner + '');
+}
  var processor = new XSLTProcessor();
  processor.importStylesheet(this.getrecords_xsl);
 
  var request_xml = processor.transformToDocument(this.defaults_xml);
  var request = new XMLSerializer().serializeToString(request_xml);
-
+ //alert(request);return;
  csw_response = this.sendCSWRequest(request);
  var results = "<results><request start=\"" + start + "\"";
  results += " maxrecords=\"";
@@ -227,7 +240,12 @@ CSWClient.prototype.setXpathValue = function(_a,_b,_c)
  return false;
  }
 };
-
+CSWClient.prototype.clearResposta = function()
+{
+  var outputDiv = document.getElementById("csw-output");
+  outputDiv.innerHTML = "Aguarde...";
+  this.hideDiv(document.getElementById('popup'))
+}
 
 CSWClient.prototype.clearPage = function()
 {
diff --git a/pacotes/cswclient/lib/xml/defaults.xml b/pacotes/cswclient/lib/xml/defaults.xml
index c54ddbe..bbcff6d 100644
--- a/pacotes/cswclient/lib/xml/defaults.xml
+++ b/pacotes/cswclient/lib/xml/defaults.xml
@@ -4,11 +4,12 @@
 <startposition>1</startposition>
 <outputformat>application/xml</outputformat>
 <outputschema>http://www.opengis.net/cat/csw/2.0.2</outputschema>
-<!--outputschema>http://www.isotc211.org/2005/gmd</outputschema-->
 <resulttype>results</resulttype>
 <propertyname>AnyText</propertyname>
 <literal></literal>
 <sortby></sortby>
 <sortorder>ASC</sortorder>
 <id></id>
+<lowerCorner></lowerCorner>
+<upperCorner></upperCorner>
 </defaults>
diff --git a/pacotes/cswclient/lib/xsl/getrecords.xsl b/pacotes/cswclient/lib/xsl/getrecords.xsl
index 87f472f..4af3555 100644
--- a/pacotes/cswclient/lib/xsl/getrecords.xsl
+++ b/pacotes/cswclient/lib/xsl/getrecords.xsl
@@ -41,7 +41,21 @@
 	  <xsl:if test="./literal !=''">
         <csw:Constraint version="1.1.0">
           <ogc:Filter xmlns:ogc="http://www.opengis.net/ogc" xmlns="http://www.opengis.net/ogc" xmlns:gml="http://www.opengis.net/gml">
-            <ogc:PropertyIsLike escape="\" singleChar="_" wildCard="%">
+            <ogc:And>
+			<xsl:if test="./lowerCorner !=''">
+			<ogc:Intersects>
+			<ogc:PropertyName>iso:BoundingBox</ogc:PropertyName>
+			<gml:Envelope xmlns:gml="http://www.opengis.net/gml">
+			<gml:lowerCorner>
+			<xsl:value-of select="./lowerCorner"/>
+			</gml:lowerCorner>
+			<gml:upperCorner>
+			<xsl:value-of select="./upperCorner"/>
+			</gml:upperCorner>
+			</gml:Envelope>
+			</ogc:Intersects>		
+			</xsl:if>
+			<ogc:PropertyIsLike escape="\" singleChar="_" wildCard="%">
               <ogc:PropertyName>
 			  <xsl:value-of select="./propertyname"/>
 			  </ogc:PropertyName>
@@ -49,6 +63,7 @@
               <xsl:value-of select="./literal"/>
               </ogc:Literal>
             </ogc:PropertyIsLike>
+			</ogc:And>
           </ogc:Filter>
         </csw:Constraint>
 	  </xsl:if>
--
libgit2 0.21.2