Changeset 3132 for TI01-discovery

Timestamp:

10/12/07 15:14:33 (12 years ago)

Author:

mpritcha

Message:

Fixed incorrect logic for ignoring spatial search if global extent requested.

File:

• TI01-discovery/trunk/ws-Discovery2/src/ndg/services/discovery/SearchAgent.java (modified) (3 diffs)

TI01-discovery/trunk/ws-Discovery2/src/ndg/services/discovery/SearchAgent.java

@@ -355 +355 @@
                         try
                         {
+                                SPATIO:
                                 if ( 
                                         doSpatio && 
@@ -363 +364 @@
                                 )
                                 {
+                                        if (    // Ignore spatial search if search area is global
+                                                limitWest.intValue() == -180 &&
+                                                limitEast.intValue() == 180 &&
+                                                limitNorth.intValue() == 90 &&
+                                                limitSouth.intValue() == -90
+                                        )
+                                        {
+                                                doSpatio = false;
+                                                System.out.println("Global extent selected : spatial search ignored");
+                                                break SPATIO;
+                                        }
+
                                         String latFormatPattern = "#0.00";
                                         String lonFormatPattern = "##0.00";
@@ -392 +405 @@
                                         spatialClause += ", coordinates ) ";
 
-                                }
-                                else if (       // Ignore spatial search if search area is global
-                                        doSpatio &&
-                                        limitWest.intValue() == -180 &&
-                                        limitEast.intValue() == 180 &&
-                                        limitNorth.intValue() == 90 &&
-                                        limitSouth.intValue() == -90
-                                )
-                                {
-                                        doSpatio = false;
                                 }
                                 else {