r27384 - /trunk/data_store/seq_align.py -- January 30, 2015 - 11:35

Author: bugman
Date: Fri Jan 30 11:35:11 2015
New Revision: 27384

URL: http://svn.gna.org/viewcvs/relax?rev=27384&view=rev
Log:
Fixes for the data_store.seq_align.Alignment.generate_id() method.

These problems were identified by the _data_store.test_seq_align module
Test_seq_align.test_alignment_addition unit test.


Modified:
    trunk/data_store/seq_align.py

Modified: trunk/data_store/seq_align.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/data_store/seq_align.py?rev=27384&r1=27383&r2=27384&view=diff
==============================================================================
--- trunk/data_store/seq_align.py       (original)
+++ trunk/data_store/seq_align.py       Fri Jan 30 11:35:11 2015
@@ -129,7 +129,7 @@
                     raise RelaxError("The molecule ID '%s' is not unique." % 
self.ids[i])
 
 
-    def generate_id(object_id=None, model=None, molecule=None):
+    def generate_id(self, object_id=None, model=None, molecule=None):
         """Generate a unique ID.
 
         @keyword object_id: The structural object ID.
@@ -150,9 +150,9 @@
             id += "Object '%s'" % object_id
 
         # The model number.
-        if len(id):
-            id += '; '
         if model != None:
+            if len(id):
+                id += '; '
             id += "Model %i" % model
 
         # The molecule name.