Merge remote-tracking branch 'origin/feature/8354_add_names_to_doi'

mantidproject · Feb 7, 2014 · d067788 · d067788
2 parents eed9b90 + db01998
commit d067788
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/Code/Tools/DOI/authors.py b/Code/Tools/DOI/authors.py
@@ -19,6 +19,7 @@
     'Arturs Bekasovs'         : 'Bekasovs, Arturs',
     'Jean Bilheux'            : 'Bilheux, Jean',
     'JeanBilheux'             : 'Bilheux, Jean',
+    'Bilheux'                 : 'Bilheux, Jean',
     'Jose Borreguero'         : 'Borreguero, Jose',
     'Keith Brown'             : 'Brown, Keith',
     'Alex Buts'               : 'Buts, Alex',
@@ -36,7 +37,9 @@
     'Martyn Gigg'             : 'Gigg, Martyn A.',
     'Samuel Jackson'          : 'Jackson, Samuel',
     'Dereck Kachere'          : 'Kachere, Dereck',
+    'Mark Koennecke'          : 'Koennecke, Mark',
     'Ricardo Leal'            : 'Leal, Ricardo',
+    'Christophe Le Bourlot'   : 'Le Bourlot, Christophe',
     'VickieLynch'             : 'Lynch, Vickie',
     'Vickie Lynch'            : 'Lynch, Vickie',
     'Pascal Manuel'           : 'Manuel, Pascal',
@@ -60,6 +63,7 @@
     'AndreiSavici'            : 'Savici, Andrei',
     'Andrei Savici'           : 'Savici, Andrei',
     'Russell Taylor'          : 'Taylor, Russell J.',
+    'Mike Thomas'             : 'Thomas, Mike',
     'Roman Tolchenov'         : 'Tolchenov, Roman',
     'Robert Whitley'          : 'Whitley, Robert',
     'Michael Whitty'          : 'Whitty, Michael',

diff --git a/Code/Tools/DOI/doi.py b/Code/Tools/DOI/doi.py
@@ -149,7 +149,8 @@ def build_xml_form(doi, relationships, creator_name_list, version_str):
     # "The version number of the resource." Suggested practice is to "register
     # a new identifier for a major version change."  We'll be ignoring this
     # as we're having a new DOI for every major/minor/patch release.
-    ET.SubElement(root, 'version').text = version_str
+    if version_str:
+        ET.SubElement(root, 'version').text = version_str
 
     # "Identifiers of related resources. These must be globally unique
     # identifiers."
@@ -383,7 +384,7 @@ def run(options):
         # In the case of the main DOI we need to add the whitelisted names too.
         creator_name_list = sorted(set(creator_name_list + authors.whitelist))
 
-        xml_form = build_xml_form(doi, {}, creator_name_list, version_str)
+        xml_form = build_xml_form(doi, {}, creator_name_list, None)
 
         create_or_update_metadata(xml_form, server_url_base, doi, options)
         create_or_update_doi(server_url_base, doi, destination, options)