r26080 - in /branches/frame_order_cleanup: ./ data_store/exp_info.py -- September 26, 2014 - 19:29

Author: bugman
Date: Fri Sep 26 19:29:56 2014
New Revision: 26080

URL: http://svn.gna.org/viewcvs/relax?rev=26080&view=rev
Log:
Merged revisions 26067-26068 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r26067 | bugman | 2014-09-26 17:34:15 +0200 (Fri, 26 Sep 2014) | 11 lines
  
  Fix for the experimental information data pipe object when converting to 
XML state and results files.
  
  This is a partial fix for bug #22704 (https://gna.org/bugs/?22704), the 
corrupted relax state files
  after setting the relax references via the bmrb.software, bmrb.display, or 
bmrb.write user
  functions.
  
  The names and descriptions for the software, citation and script list 
objects were incorrectly set.
  These have been fixed so that the name of the data structure and the real 
description is present in
  the XML state or results file instead of <relax_list desc='relax list 
container'>.
........
  r26068 | bugman | 2014-09-26 17:44:48 +0200 (Fri, 26 Sep 2014) | 11 lines
  
  Fix for the experimental information data pipe object when converting to 
XML state and results files.
  
  This is a partial fix for bug #22704 (https://gna.org/bugs/?22704), the 
corrupted relax state files
  after setting the relax references via the bmrb.software, bmrb.display, or 
bmrb.write user
  functions.
  
  The names and descriptions for the software, citation and script list 
objects were incorrectly set.
  These have been fixed so that the name of the data structure and the real 
description is present in
  the XML state or results file instead of <relax_list desc='relax list 
container'>.
........

Modified:
    branches/frame_order_cleanup/   (props changed)
    branches/frame_order_cleanup/data_store/exp_info.py

Propchange: branches/frame_order_cleanup/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Sep 26 19:29:56 2014
@@ -1 +1 @@
-/trunk:1-26017,26043-26066
+/trunk:1-26017,26043-26068

Modified: branches/frame_order_cleanup/data_store/exp_info.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/data_store/exp_info.py?rev=26080&r1=26079&r2=26080&view=diff
==============================================================================
--- branches/frame_order_cleanup/data_store/exp_info.py (original)
+++ branches/frame_order_cleanup/data_store/exp_info.py Fri Sep 26 19:29:56 
2014
@@ -83,10 +83,10 @@
             self.citations = RelaxListType()
 
             # The name of the container.
-            self.citations.container_name = "citation_list"
+            self.citations.list_name = "citation_list"
 
             # The description of the container.
-            self.citations.container_desc = "List of citations"
+            self.citations.list_desc = "List of citations"
 
         # Init the container.
         cite = Element()
@@ -191,10 +191,10 @@
             self.scripts = RelaxListType()
 
             # The name of the container.
-            self.scripts.container_name = "script_list"
+            self.scripts.list_name = "script_list"
 
             # The description of the container.
-            self.scripts.container_desc = "List of scripts used for the 
analysis"
+            self.scripts.list_desc = "List of scripts used for the analysis"
 
         # Init the container.
         script = Element()
@@ -243,10 +243,10 @@
             self.software = RelaxListType()
 
             # The name of the container.
-            self.software.container_name = "software_list"
+            self.software.list_name = "software_list"
 
             # The description of the container.
-            self.software.container_desc = "List of software programs used 
in the analysis"
+            self.software.list_desc = "List of software programs used in the 
analysis"
 
         # Init the container.
         software = Element()