Fixed naming of staged xml draft submission files and tweaked the arguments for the xml2rfc parser invocation for xml draft submissions. Added some more logging.

levkowetz · levkowetz · commit c486ec800306 · 2019-11-21T04:35:31.000Z
- Legacy-Id: 17075
diff --git a/ietf/submit/forms.py b/ietf/submit/forms.py
@@ -182,7 +182,7 @@ def format_messages(where, e, log):
                 # --- Parse the xml ---
                 try:
                     parser = xml2rfc.XmlRfcParser(str(tfn), quiet=True)
-                    self.xmltree = parser.parse(remove_comments=False, quiet=True, add_xmlns=True)
+                    self.xmltree = parser.parse(remove_comments=False, quiet=True)
                     self.xmlroot = self.xmltree.getroot()
                     xml_version = self.xmlroot.get('version', '2')
                 except Exception as e:
@@ -221,7 +221,7 @@ def format_messages(where, e, log):
                     self.authors.append(info)
 
                 # --- Prep the xml ---
-                file_name['xml'] = os.path.join(settings.IDSUBMIT_STAGING_PATH, '%s-%s.%s' % (self.filename, self.revision, ext))
+                file_name['xml'] = os.path.join(settings.IDSUBMIT_STAGING_PATH, '%s-%s%s' % (self.filename, self.revision, ext))
                 try:
                     if xml_version == '3':
                         prep = xml2rfc.PrepToolWriter(self.xmltree, quiet=True, liberal=True, keep_pis=[xml2rfc.V3_PI_TARGET])
@@ -252,6 +252,7 @@ def format_messages(where, e, log):
                                     xml_version))
                     except Exception as e:
                         msgs = format_messages('txt', e, xml2rfc.log)
+                        log.log('\n'.join(msgs))
                         raise forms.ValidationError(msgs)
 
                 # --- Convert to xml ---
@@ -290,7 +291,6 @@ def format_messages(where, e, log):
                             [ forms.ValidationError("One or more XML validation errors occurred when processing the XML file:") ] +
                             [ forms.ValidationError("%s: Line %s: %s" % (xml_file.name, r.line, r.message), code="%s"%r.type) for r in errors ] 
                         )
-
             finally:
                 os.close(tfh)
                 os.unlink(tfn)
