Changeset 2399 in products

Timestamp:

May 27, 2010 4:28:10 PM (14 years ago)

Author:

mylan

Message:

#131: code cleanup

Location:

quintagroup.plonegooglesitemaps/trunk/quintagroup/plonegooglesitemaps

Files:

• browser/newssitemapview.py (modified) (1 diff)
• browser/templates/newssitemapview.pt (modified) (1 diff)
• tests/testNewsSitemaps.py (modified) (2 diffs)

quintagroup.plonegooglesitemaps/trunk/quintagroup/plonegooglesitemaps/browser/newssitemapview.py

@@ -15 +15 @@
         ('publication_date', lambda x:DateTime(x.EffectiveDate).strftime("%Y-%m-%d")),
         ('keywords', lambda x:', '.join(x.Subject)),
+        ('title', lambda x:x.Title),
         ('name', lambda x:reTrailingParenthtical.sub("",x.Title)),
-        ('title', lambda x:x.Title),
         ('language', lambda x:x.Language),
         ('access', lambda x:x.gsm_access),

quintagroup.plonegooglesitemaps/trunk/quintagroup/plonegooglesitemaps/browser/templates/newssitemapview.pt

@@ -13 +13 @@
             <n:language tal:content="result/language">news language</n:language>
         </n:publication>
-        <n:title tal:content="result/title">Full title of the news item</n:title>
-        <n:publication_date tal:content="result/publication_date">2006-08-14</n:publication_date>
-        <n:keywords tal:content="result/keywords">Business, Mergers, Acquisitions</n:keywords>
         <n:access tal:condition="result/access" tal:content="result/access">
           Whether an article is available to all readers</n:access>
         <n:genres tal:condition="result/genres" tal:content="result/genres">
           Specifies one or more properties for an article</n:genres>
+        <n:publication_date tal:content="result/publication_date">2006-08-14</n:publication_date>
+        <n:title tal:content="result/title">Full title of the news item</n:title>
+        <n:keywords tal:content="result/keywords">Business, Mergers, Acquisitions</n:keywords>
     </n:news>
   </url>

quintagroup.plonegooglesitemaps/trunk/quintagroup/plonegooglesitemaps/tests/testNewsSitemaps.py

@@ -60 +60 @@
 
     def test_no_naccess(self):
-        open("/tmp/news.sm.1.xml","w").write(self.sitemap)
         self.assert_("n:access" not in self.start.keys())
 
@@ -71 +70 @@
         self.my_news.reindexObject()
         self.reParse()
-        open("/tmp/news.sm.2.xml","w").write(self.sitemap)
         self.assert_("n:access" in self.start.keys())
         self.assert_("Registration" in self.data, "No 'Registration' in data")
 
     def test_ngenres(self):
-        # Test when access present
+        # Test when genres present
         self.my_news._setProperty("gsm_genres", "PressRelease")
         self.my_news.reindexObject()
         self.reParse()
-        open("/tmp/news.sm.3.xml","w").write(self.sitemap)
         self.assert_("n:genres" in self.start.keys())
         self.assert_("PressRelease" in self.data, "No 'PressRelease' in data")