[GeoNetwork-commit] SF.net SVN: geonetwork:[5287] sandbox/geocat.ch/trunk/src/org/fao/geonet/ kernel/search/LanguageSearcher.java

[<jes...@us...>]

Revision: 5287
          http://geonetwork.svn.sourceforge.net/geonetwork/?rev=5287&view=rev
Author:   jesseeichar
Date:     2009-10-01 08:59:49 +0000 (Thu, 01 Oct 2009)

Log Message:
-----------
fixed temporal search: 17204

Modified Paths:
--------------
    sandbox/geocat.ch/trunk/src/org/fao/geonet/kernel/search/LanguageSearcher.java

Modified: sandbox/geocat.ch/trunk/src/org/fao/geonet/kernel/search/LanguageSearcher.java
===================================================================
--- sandbox/geocat.ch/trunk/src/org/fao/geonet/kernel/search/LanguageSearcher.java	2009-10-01 08:58:08 UTC (rev 5286)
+++ sandbox/geocat.ch/trunk/src/org/fao/geonet/kernel/search/LanguageSearcher.java	2009-10-01 08:59:49 UTC (rev 5287)
@@ -213,8 +213,8 @@
 
                     }
                 }
-                
-                 weight = createWeight(weight.getQuery().combine((Query[]) allQueries.toArray(new Query[0])));
+
+                 weight = createWeight(weight.getQuery().combine(allQueries.toArray(new Query[0])));
             }
         }
 
@@ -267,14 +267,16 @@
         } else if (original instanceof RangeQuery) {
             RangeQuery query = (RangeQuery) original;
             Term lower;
-            if (updateTerm(original, query.getLowerTerm()) == null) {
+            Query updatedTerm = updateTerm(original, query.getLowerTerm());
+            if (updatedTerm == null || updatedTerm == original) {
                 lower = query.getLowerTerm();
             } else {
                 lower = null;
             }
 
             Term upper;
-            if (updateTerm(original, query.getUpperTerm()) == null) {
+            updatedTerm = updateTerm(original, query.getUpperTerm());
+            if (updatedTerm == null || updatedTerm == original) {
                 upper = query.getUpperTerm();
             } else {
                 upper = null;
@@ -322,7 +324,7 @@
             if (fld.equals("_isTemplate") || fld.startsWith("_op")
                     || fld.startsWith("_locale") || fld.startsWith("_valid")
                     || fld.startsWith("_visibleForOwnerOnly")) {
-            
+
                 updated = original;
             } else if ((_stopWords.contains(txt.toLowerCase().trim()) || _stopWords.contains(txt.toUpperCase()
                     .trim()))) {


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