r8414 - /branches/multi_structure/generic_fns/structure/internal.py -- January 12, 2009 - 14:27

Author: bugman
Date: Mon Jan 12 14:27:07 2009
New Revision: 8414

URL: http://svn.gna.org/viewcvs/relax?rev=8414&view=rev
Log:
When no structure ID is given, the '.pdb' is now stripped from the file name 
before creating the ID.


Modified:
    branches/multi_structure/generic_fns/structure/internal.py

Modified: branches/multi_structure/generic_fns/structure/internal.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/multi_structure/generic_fns/structure/internal.py?rev=8414&r1=8413&r2=8414&view=diff
==============================================================================
--- branches/multi_structure/generic_fns/structure/internal.py (original)
+++ branches/multi_structure/generic_fns/structure/internal.py Mon Jan 12 
14:27:07 2009
@@ -36,7 +36,7 @@
 from generic_fns import pipes, relax_re
 from generic_fns.mol_res_spin import Selection
 from relax_errors import RelaxError, RelaxNoPdbError
-from relax_io import open_read_file
+from relax_io import file_root, open_read_file
 from relax_warnings import RelaxWarning
 
 
@@ -697,7 +697,7 @@
                     new_mol_name = set_mol_name[mol_index]
                 else:
                     # Set the name to the file name plus the structure 
number.
-                    new_mol_name = file + '_mol' + `mol_num`
+                    new_mol_name = file_root(file) + '_mol' + `mol_num`
 
                 # Print out.
                 print "%-25s %-10s" % ("Loading from molecule: ", `mol_num`)