r11566 - in /branches/bieri_gui: ./ graphics/ info.py -- September 15, 2010 - 19:38

Author: bugman
Date: Wed Sep 15 19:38:34 2010
New Revision: 11566

URL: http://svn.gna.org/viewcvs/relax?rev=11566&view=rev
Log:
Merged revisions 11552,11565 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3

........
  r11552 | bugman | 2010-09-14 16:34:11 +0200 (Tue, 14 Sep 2010) | 3 lines
  
  Created a directory for relax graphics.  The first files here are the relax 
logo and icons.
........
  r11565 | bugman | 2010-09-15 19:36:15 +0200 (Wed, 15 Sep 2010) | 3 lines
  
  The Ref.cite_html() method can now handle missing data.
........

Added:
    branches/bieri_gui/graphics/
      - copied from r11565, 1.3/graphics/
Modified:
    branches/bieri_gui/   (props changed)
    branches/bieri_gui/info.py

Propchange: branches/bieri_gui/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Sep 15 19:38:34 2010
@@ -1,1 +1,1 @@
-/1.3:1-11539
+/1.3:1-11565

Modified: branches/bieri_gui/info.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/info.py?rev=11566&r1=11565&r2=11566&view=diff
==============================================================================
--- branches/bieri_gui/info.py (original)
+++ branches/bieri_gui/info.py Wed Sep 15 19:38:34 2010
@@ -518,23 +518,23 @@
 
         # Build the citation.
         cite = ''
-        if author and hasattr(self, 'author'):
+        if author and hasattr(self, 'author') and self.author:
             cite = cite + self.author
-        if year and hasattr(self, 'year'):
+        if year and hasattr(self, 'year') and self.year:
             cite = cite + ' (' + repr(self.year) + ').'
-        if title and hasattr(self, 'title'):
+        if title and hasattr(self, 'title') and self.title:
             cite = cite + ' ' + self.title
-        if journal and hasattr(self, 'journal'):
+        if journal and hasattr(self, 'journal') and self.journal:
             cite = cite + ' <em>' + self.journal + '</em>,'
-        if volume and hasattr(self, 'volume'):
+        if volume and hasattr(self, 'volume') and self.volume:
             cite = cite + ' <strong>' + self.volume + '</strong>'
-        if number and hasattr(self, 'number'):
+        if number and hasattr(self, 'number') and self.number:
             cite = cite + '(' + self.number + '),'
-        if pages and hasattr(self, 'pages'):
+        if pages and hasattr(self, 'pages') and self.pages:
             cite = cite + ' ' + self.pages
-        if doi and hasattr(self, 'doi'):
+        if doi and hasattr(self, 'doi') and self.doi:
             cite = cite + ' (<a href="http://dx.doi.org/%s";>abstract</a>)' % 
self.doi
-        if url and hasattr(self, 'url'):
+        if url and hasattr(self, 'url') and self.url:
             cite = cite + ' (<a href="http://dx.doi.org/%s";>url</a>)' % 
self.url
 
         # End.