Ticket #339: pleiades-notsure.patch

geo.py

@@ -34 +34 @@
-
-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')
+
+
-class GeoreferencedEvent(object):
-    """Event to notify that object has been georeferenced.
-    """
@@ -157 +162 @@
-    def geoItems(self):
-        if IATTopic.providedBy(self.context):
-            for ob in self.context.queryCatalog():
-
-
-
-
+
+
-                    continue
-
-
+
+
+
+
-            for ob in self.context.listFolderContents():
-
-
-
-
+
+
-                    continue
+                else:
+                    yield item
+        else:
+            item = self._adapt(self.context)
+            if item is None:
+                return
+            else:
-                yield item
-        else:
-            try:
-                item = IGeoItemSimple(self.context)
-                assert(item.isGeoreferenced())
-            except:
-                pass
-            yield item
-
+    def _adapt(self, ob):
+        try:
+            item = IGeoItemSimple(ob)
+            if item.isGeoreferenced():
+                return item
+            else:
+                logger.debug("%s is not georeferenced" % item)
+        except TypeError:
+            logger.debug("Could not adapt %s to IGeoItemSimple" % self.context)
+        return None
-
+