[GeoNetwork-commit] SF.net SVN: geonetwork:[6107] sandbox/BlueNetMEST/web/geonetwork/xml

[<sp...@us...>]

Revision: 6107
          http://geonetwork.svn.sourceforge.net/geonetwork/?rev=6107&view=rev
Author:   sppigot
Date:     2010-05-31 07:52:25 +0000 (Mon, 31 May 2010)

Log Message:
-----------

- Do not apply spatial filter when the region is not specified
- Support GreaterThanEqualTo and LessThanEqualTo (as alternatives to
GreaterThanOrEqualTo and LessThanOrEqualTo) in OGC filters 
as these are specified in OGC CSW schemas

Thanks to Andrew Walsh at RANDOM for finding and reporting these bugs

Modified Paths:
--------------
    sandbox/BlueNetMEST/web/geonetwork/xml/csw/capabilities.xml
    sandbox/BlueNetMEST/web/geonetwork/xml/csw/filter-to-lucene.xsl
    sandbox/BlueNetMEST/web/geonetwork/xml/search/lucene.xsl

Modified: sandbox/BlueNetMEST/web/geonetwork/xml/csw/capabilities.xml
===================================================================
--- sandbox/BlueNetMEST/web/geonetwork/xml/csw/capabilities.xml	2010-05-28 12:41:36 UTC (rev 6106)
+++ sandbox/BlueNetMEST/web/geonetwork/xml/csw/capabilities.xml	2010-05-31 07:52:25 UTC (rev 6107)
@@ -227,8 +227,12 @@
                 <ogc:ComparisonOperator>Like</ogc:ComparisonOperator>
                 <ogc:ComparisonOperator>LessThan</ogc:ComparisonOperator>
                 <ogc:ComparisonOperator>GreaterThan</ogc:ComparisonOperator>
+								<!-- LessThanOrEqualTo is in OGC Filter Spec, LessThanEqualTo is in OGC CSW schema -->
                 <ogc:ComparisonOperator>LessThanEqualTo</ogc:ComparisonOperator>
+                <ogc:ComparisonOperator>LessThanOrEqualTo</ogc:ComparisonOperator>
+								<!-- GreaterThanOrEqualTo is in OGC Filter Spec, GreaterThanEqualTo is in OGC CSW schema -->
                 <ogc:ComparisonOperator>GreaterThanEqualTo</ogc:ComparisonOperator>
+                <ogc:ComparisonOperator>GreaterThanOrEqualTo</ogc:ComparisonOperator>
                 <ogc:ComparisonOperator>NotEqualTo</ogc:ComparisonOperator>
                 <ogc:ComparisonOperator>Between</ogc:ComparisonOperator>
                 <ogc:ComparisonOperator>NullCheck</ogc:ComparisonOperator>
@@ -240,4 +244,4 @@
             <ogc:FID/>
         </ogc:Id_Capabilities>
     </ogc:Filter_Capabilities>
-</csw:Capabilities>
\ No newline at end of file
+</csw:Capabilities>

Modified: sandbox/BlueNetMEST/web/geonetwork/xml/csw/filter-to-lucene.xsl
===================================================================
--- sandbox/BlueNetMEST/web/geonetwork/xml/csw/filter-to-lucene.xsl	2010-05-28 12:41:36 UTC (rev 6106)
+++ sandbox/BlueNetMEST/web/geonetwork/xml/csw/filter-to-lucene.xsl	2010-05-31 07:52:25 UTC (rev 6107)
@@ -80,7 +80,10 @@
 
 	<!-- ========================================================================== -->
 
-	<xsl:template match="ogc:PropertyIsLessThanOrEqualTo">
+	<!-- Filter spec says ogc:PropertyIsLessThanOrEqualTo, OGC CSW schema and 
+	     GetCapabilties says ogc:PropertyIsLessThanEqualTo so we'd better 
+			 support both -->
+	<xsl:template match="ogc:PropertyIsLessThanOrEqualTo|ogc:PropertyIsLessThanEqualTo">
 		<xsl:choose>
 			<xsl:when test="ogc:PropertyName and ogc:Literal">
 				<RangeQuery fld="{ogc:PropertyName}" upperTxt="{ogc:Literal}" inclusive="true"/>
@@ -110,7 +113,10 @@
 
 	<!-- ========================================================================== -->
 
-	<xsl:template match="ogc:PropertyIsGreaterThanOrEqualTo">
+	<!-- Filter spec says ogc:PropertyIsGreaterThanOrEqualTo, OGC CSW schema and 
+	     GetCapabilties says ogc:PropertyIsGreaterThanEqualTo so we'd better 
+			 support both -->
+	<xsl:template match="ogc:PropertyIsGreaterThanOrEqualTo|ogc:PropertyIsGreaterThanEqualTo">
 		<xsl:choose>
 			<xsl:when test="ogc:PropertyName and ogc:Literal">
 				<RangeQuery fld="{ogc:PropertyName}" lowerTxt="{ogc:Literal}" inclusive="true"/>
@@ -216,7 +222,6 @@
 	<!-- ========================================================================== -->
 
 	<xsl:template match="ogc:Not[not(ogc:Disjoint|ogc:Within|ogc:Equals|ogc:Touches|ogc:Overlaps|ogc:Crosses|ogc:Intersects|ogc:Contains|ogc:DWithin|ogc:Beyond|ogc:BBOX)]">
-		<xsl:message>Matched: ogc:Not</xsl:message>
 		<BooleanQuery>
 			<BooleanClause required="true" prohibited="false">
 				<!--WildcardQuery fld="any" txt="*"/-->

Modified: sandbox/BlueNetMEST/web/geonetwork/xml/search/lucene.xsl
===================================================================
--- sandbox/BlueNetMEST/web/geonetwork/xml/search/lucene.xsl	2010-05-28 12:41:36 UTC (rev 6106)
+++ sandbox/BlueNetMEST/web/geonetwork/xml/search/lucene.xsl	2010-05-31 07:52:25 UTC (rev 6107)
@@ -29,7 +29,7 @@
 
 	<query>
 
-	<xsl:if test="$northBL != 'NaN' and $southBL != 'NaN' and $eastBL != 'NaN' and $westBL != 'NaN'">
+	<xsl:if test="$northBL != 'NaN' and $southBL != 'NaN' and $eastBL != 'NaN' and $westBL != 'NaN' and normalize-space(/request/region)!=''">
 		<xsl:choose>
 				<!-- equal -->
 				<xsl:when test="string(/request/relation)='equal'">


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.