r16804 - /branches/uf_redesign/generic_fns/bmrb.py -- June 10, 2012 - 12:51

Author: bugman
Date: Sun Jun 10 12:51:34 2012
New Revision: 16804

URL: http://svn.gna.org/viewcvs/relax?rev=16804&view=rev
Log:
Fixes for the bmrb.write backend - the generic_fns.exp_info module should be 
used rather than the cdp.

The abstraction via the generic_fns.exp_info module is needed to make sure 
all the relevant current
data pipe structures are set up.


Modified:
    branches/uf_redesign/generic_fns/bmrb.py

Modified: branches/uf_redesign/generic_fns/bmrb.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/generic_fns/bmrb.py?rev=16804&r1=16803&r2=16804&view=diff
==============================================================================
--- branches/uf_redesign/generic_fns/bmrb.py (original)
+++ branches/uf_redesign/generic_fns/bmrb.py Sun Jun 10 12:51:34 2012
@@ -283,10 +283,10 @@
         bib = info.bib[key]
 
         # Add.
-        cdp.exp_info.add_citation(cite_id=id, authors=bib.author2, 
doi=bib.doi, pubmed_id=bib.pubmed_id, full_citation=bib.cite_short(doi=False, 
url=False), title=bib.title, status=bib.status, type=bib.type, 
journal_abbrev=bib.journal, journal_full=bib.journal_full, volume=bib.volume, 
issue=bib.number, page_first=bib.page_first, page_last=bib.page_last, 
year=bib.year)
+        exp_info.citation(cite_id=id, authors=bib.author2, doi=bib.doi, 
pubmed_id=bib.pubmed_id, full_citation=bib.cite_short(doi=False, url=False), 
title=bib.title, status=bib.status, type=bib.type, 
journal_abbrev=bib.journal, journal_full=bib.journal_full, volume=bib.volume, 
issue=bib.number, page_first=bib.page_first, page_last=bib.page_last, 
year=bib.year)
 
     # Add the relax software package.
-    cdp.exp_info.software_setup(name=exp_info.SOFTWARE['relax'].name, 
version=version_full(), vendor_name=exp_info.SOFTWARE['relax'].authors, 
url=exp_info.SOFTWARE['relax'].url, cite_ids=['relax_ref1', 'relax_ref2'], 
tasks=exp_info.SOFTWARE['relax'].tasks)
+    exp_info.software(name=exp_info.SOFTWARE['relax'].name, 
version=version_full(), vendor_name=exp_info.SOFTWARE['relax'].authors, 
url=exp_info.SOFTWARE['relax'].url, cite_ids=['relax_ref1', 'relax_ref2'], 
tasks=exp_info.SOFTWARE['relax'].tasks)
 
     # Execute the specific BMRB writing code.
     write_function(file, version=version)