Changeset 946:b12a04d25c3d

Timestamp:

01/10/09 22:32:12 (3 years ago)

Author:

mitsuhiko

Branch:

default

Message:

improved importing of ZXA feeds (importers import the correct
syntax instead of HTML now). This fixes #137.

Files:

• CHANGES (modified) (1 diff)
• zine/importers/__init__.py (modified) (1 diff)
• zine/importers/feed.py (modified) (4 diffs)

CHANGES

@@ -25 +25 @@
   dropdown.
 - fixed importing of ZXA feeds with tags.
+- improved importing of ZXA feeds (importers import the correct
+  syntax instead of HTML now)
 - fixed wrong content type exporting in ZXA feeds.
 - fixed bug in tag-cloud query.  Too many items were counted for

zine/importers/__init__.py

@@ -170 +170 @@
                     uid=old_post.uid)
         if old_post.parser_data is not None:
-            post.parser_data = old_post.parser_data
+            post.parser_data.clear()
+            post.parser_data.update(old_post.parser_data)
         yield u'<li><strong>%s</strong>' % escape(post.title)
 

zine/importers/feed.py

@@ -31 +31 @@
 
 
-def _get_text_content(elements):
+def _get_text_content(elements, fallback=True):
     """Return the text content from the best element match."""
-    if not elements:
-        return u''
     for element in elements:
         if element.attrib.get('type') == 'text':
             return element.text or u''
-    for element in elements:
-        if element.attrib.get('type') == 'html':
-            return to_text(element)
-    return to_text(elements[0])
+    if fallback:
+        if not elements:
+            return u''
+        for element in elements:
+            if element.attrib.get('type') == 'html':
+                return to_text(element)
+        return to_text(elements[0])
 
 
@@ -394 +395 @@
         if author is None:
             element = self._lookup_user(self._dependencies,
-                                        id=dependency)[0]
+                                        id=str(dependency))[0]
             author = Author(
                 element.findtext(zine.username),
@@ -431 +432 @@
 
     def postprocess_post(self, post):
+        post.parser_data = _parser_data(post.element.findtext(zine.parser_data))
+        content = _get_text_content(post.element.findall(atom.content),
+                                    fallback=False)
+        if content is not None:
+            post.body = content
         content_type = post.element.findtext(zine.content_type)
         if content_type is not None:
@@ -455 +461 @@
             dependency = author.attrib.get('dependency')
             if dependency is not None:
-                author = self._get_author(author)
+                author = self._get_author(dependency)
                 email = www = None
             else: