Changeset 3833

Timestamp:

01/05/08 11:58:40 (12 years ago)

Author:

pjkersha

Message:

Fix calls to ndgRetrieve so that the discovery flag is set explicitly from the 'standalone' config option rather than defaulting to 1. Prior to this fix browse queries were breaking.

File:

• TI05-delivery/ows_framework/trunk/ows_server/ows_server/lib/ndgInterface.py (modified) (3 diffs)

TI05-delivery/ows_framework/trunk/ows_server/ows_server/lib/ndgInterface.py

@@ -108 +108 @@
         #unsecured discovery documents, these are called directly
         #in the retrieve controller!
+
+        # Fix call to ndgRetrieve so that it sets the discovery flag explicitly
+        # rather than defaulting to 1
+        # 
+        # PJK 01/05/2008
+        standaloneDiscovery = \
+                request.environ['ndgConfig'].config.getboolean('DISCOVERY',
+                                                               'standalone')
         
         try:
@@ -124 +132 @@
         if outputSchema:
             #bypass the cache ...
-            status,xmlh=ndgRetrieve(ndgO,request.environ['ndgConfig'],logger,outputSchema)
+            status,xmlh=ndgRetrieve(ndgO,
+                                    request.environ['ndgConfig'],
+                                    logger,
+                                    outputSchema,
+                                    discovery=standaloneDiscovery)
         else:
             try:
@@ -135 +147 @@
                     status,xmlH=self.__getLocal(uri)
                 else:    
-                    status,xmlh=ndgRetrieve(ndgO,request.environ['ndgConfig'],logger,outputSchema)
+                    status,xmlh=ndgRetrieve(ndgO,
+                                            request.environ['ndgConfig'],
+                                            logger,
+                                            outputSchema,
+                                            discovery=standaloneDiscovery)
                 if status: self.XMLHCache[uri]=xmlh