Author: bugman
Date: Fri Feb 1 11:55:37 2013
New Revision: 18340
URL: http://svn.gna.org/viewcvs/relax?rev=18340&view=rev
Log:
Merged revisions 18338-18339 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk
........
r18338 | bugman | 2013-02-01 11:48:46 +0100 (Fri, 01 Feb 2013) | 5 lines
Fix for the bug reported as the support request #2998
(https://gna.org/support/?2998).
CONECT records pointing to non-existent atoms can now be handled.
........
r18339 | bugman | 2013-02-01 11:49:53 +0100 (Fri, 01 Feb 2013) | 3 lines
Copyright update.
........
Modified:
branches/frame_order_testing/ (props changed)
branches/frame_order_testing/generic_fns/structure/internal.py
branches/frame_order_testing/test_suite/system_tests/structure.py
Propchange: branches/frame_order_testing/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Feb 1 11:55:37 2013
@@ -1,1 +1,1 @@
-/trunk:1-18336
+/trunk:1-18339
Modified: branches/frame_order_testing/generic_fns/structure/internal.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/generic_fns/structure/internal.py?rev=18340&r1=18339&r2=18340&view=diff
==============================================================================
--- branches/frame_order_testing/generic_fns/structure/internal.py (original)
+++ branches/frame_order_testing/generic_fns/structure/internal.py Fri Feb 1
11:55:37 2013
@@ -1,6 +1,6 @@
###############################################################################
#
#
-# Copyright (C) 2003-2012 Edward d'Auvergne
#
+# Copyright (C) 2003-2013 Edward d'Auvergne
#
#
#
# This file is part of the program relax (http://www.nmr-relax.com).
#
#
#
@@ -2156,6 +2156,10 @@
if record[i+2] == None:
continue
+ # Skip broken CONECT records (for when the record points
to a non-existent atom).
+ if self._atom_index(record[1]) == None or
self._atom_index(record[i+2]) == None:
+ continue
+
# Make the connection.
self.atom_connect(index1=self._atom_index(record[1]),
index2=self._atom_index(record[i+2]))
Modified: branches/frame_order_testing/test_suite/system_tests/structure.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/system_tests/structure.py?rev=18340&r1=18339&r2=18340&view=diff
==============================================================================
--- branches/frame_order_testing/test_suite/system_tests/structure.py
(original)
+++ branches/frame_order_testing/test_suite/system_tests/structure.py Fri Feb
1 11:55:37 2013
@@ -1,6 +1,6 @@
###############################################################################
#
#
-# Copyright (C) 2008-2012 Edward d'Auvergne
#
+# Copyright (C) 2008-2013 Edward d'Auvergne
#
#
#
# This file is part of the program relax (http://www.nmr-relax.com).
#
#
#
r18340 - in /branches/frame_order_testing: ./ generic_fns/structure/internal.py test_suite/system_tests/structure.py