Changeset 1228

Timestamp:

11/14/07 14:53:30 (1 year ago)

Author:

sgillies

Message:

Improve clarity of geoItems method and add logging (#339)

Files:

• PleiadesGeocoder/trunk/geo.py (modified) (2 diffs)

PleiadesGeocoder/trunk/geo.py

@@ -35 +35 @@
-from Products.ATContentTypes.interface.topic import IATTopic
-from Products.ATContentTypes.interface.folder import IATFolder
+from Products.ATContentTypes.interface.folder import IATBTreeFolder
-
-from Products.PleiadesGeocoder.interfaces import IGeoItemSimple \
-    , IGeoCollectionSimple, IGeoreferencedEvent
+
+import logging
+
+logger = logging.getLogger('PleiadesGeocoder.geo')
-
-
@@ -158 +163 @@
-        if IATTopic.providedBy(self.context):
-            for ob in self.context.queryCatalog():
-try:
-    item = IGeoItemSimple(ob.getObject())
-assert(item.isGeoreferenced())
-xcept
+item = self._adapt(ob.getObject())
+if item is not None:
+yield item
+lse
-                    continue
+        elif (IATFolder.providedBy(self.context) or
+              IATBTreeFolder.providedBy(self.context)):
+            for ob in self.context.listFolderContents():
+                item = self._adapt(ob)
+                if item is not None:
+                    yield item
+                else:
+                    continue
+        # Last resort: single objects may yield geoItems
+        else:
+            item = self._adapt(self.context)
+            if item is not None:
-                yield item
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-