Changeset 3419

Timestamp:

14/02/08 14:09:52 (11 years ago)

Author:

cbyrom

Message:

Add new field to DIF object representing the KML URL when this is available.

File:

• TI05-delivery/ows_framework/trunk/ows_server/ows_server/models/DIF.py (modified) (2 diffs)

TI05-delivery/ows_framework/trunk/ows_server/ows_server/models/DIF.py

@@ -10 +10 @@
 from ndgObject import ndgObject
 from stubB import collapse2
+import urllib
+
 try: #python 2.5
     from xml.etree import ElementTree as ET
@@ -169 +171 @@
         #services
         self.services=[]
-
+        
+        # not all DIFs have KML resource available - set default value
+        # to the entryID for checking later on
+        self.kmlURL = self.entryID
         for item in helper.findall(self.tree,'Related_URL'):
+            contentType=helper.getText(item,'URL_Content_Type')
+            serviceURL=helper.cleanup.undo(helper.getText(item,'URL'))
             self.services.append(
                 DIFService(
-                 helper.getText(item,'URL_Content_Type'),
-                 helper.cleanup.undo(helper.getText(item,'URL')),
+                 contentType,
+                 serviceURL,
                  helper.getText(item,'Description') ))
+            # if there is a KML URL, encode it and add it as a field for
+            # easy access to store in session data for selectedItems
+            # NB, it needs to be encoded to avoid problems whilst sending
+            # via AJAX 
+            if contentType.find('KML') > 0:
+                # NB, adding the '' to quote forces forward slashes to be replaced
+                self.kmlURL = urllib.quote(serviceURL,'')
         
         if self.ndgObject is None: