library-web r519 - in trunk: . src

[fpeters svn gnome org]

Author: fpeters
Date: Wed Oct 15 17:10:01 2008
New Revision: 519
URL: http://svn.gnome.org/viewvc/library-web?rev=519&view=rev

Log:
* src/lgo.py: don't update document title with nightly-generated
document title; done correctly this time.



Modified:
   trunk/ChangeLog
   trunk/src/lgo.py

Modified: trunk/src/lgo.py
==============================================================================
--- trunk/src/lgo.py	(original)
+++ trunk/src/lgo.py	Wed Oct 15 17:10:01 2008
@@ -1061,11 +1061,13 @@
 
         quirks = app.overlay.get_quirks(self)
 
-        if tree.find('title') is not None and tree.find('title').text:
-            doc.title[lang] = tree.find('title').text
-        elif tree.find('{http://www.w3.org/1999/xhtml}title') is not None and \
-                tree.find('{http://www.w3.org/1999/xhtml}title').text:
-            doc.title[lang] = tree.find('{http://www.w3.org/1999/xhtml}title').text
+        if not self.nightly or not doc.title.get(lang):
+            if tree.find('title') is not None and tree.find('title').text:
+                doc.title[lang] = tree.find('title').text
+            elif tree.find('{http://www.w3.org/1999/xhtml}title') is not None and \
+                    tree.find('{http://www.w3.org/1999/xhtml}title').text:
+                doc.title[lang] = tree.find('{http://www.w3.org/1999/xhtml}title').text
+
         if tree.find('abstract') is not None and tree.find('abstract').text:
             doc.abstract[lang] = tree.find('abstract').text
         elif tree.find('{http://www.w3.org/1999/xhtml}abstract') is not None and \