From c486ec80030632118265b7a4b70ab87fa04d12e2 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Thu, 21 Nov 2019 04:35:31 +0000 Subject: [PATCH] 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. - Legacy-Id: 17075 --- ietf/submit/forms.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ietf/submit/forms.py b/ietf/submit/forms.py index 44e4664fb..9c97ed411 100644 --- a/ietf/submit/forms.py +++ b/ietf/submit/forms.py @@ -182,7 +182,7 @@ class SubmissionBaseUploadForm(forms.Form): # --- 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 @@ class SubmissionBaseUploadForm(forms.Form): 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 @@ class SubmissionBaseUploadForm(forms.Form): 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 @@ class SubmissionBaseUploadForm(forms.Form): [ 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)