From 67e6423cb426930d9642490ec491b6325abc7305 Mon Sep 17 00:00:00 2001 From: Ole Laursen Date: Wed, 2 Nov 2016 12:37:47 +0000 Subject: [PATCH] Modify importer to pick deadline from documents when there's an exact match, otherwise prefer what's stored with the review request (fixes a bunch of cases with multiple reviews of the same draft) - Legacy-Id: 12246 --- ietf/review/import_from_review_tool.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/ietf/review/import_from_review_tool.py b/ietf/review/import_from_review_tool.py index 2e5b7b75e..f4b85ba32 100755 --- a/ietf/review/import_from_review_tool.py +++ b/ietf/review/import_from_review_tool.py @@ -372,14 +372,17 @@ with db_con.cursor() as c: continue # ignore meta = doc_metadata.get((row.docname, row.version)) - if not meta: - meta = doc_metadata.get(row.docname) - deadline, telechat, lcend, status = meta or (None, None, None, None) - if not deadline: deadline = parse_timestamp(row.timeout) + if not meta: + meta = doc_metadata.get(row.docname) + telechat, lcend, status = (meta or (None, None, None, None))[1:] + + if not deadline and meta: + deadline = meta[1] + reviewed_rev = row.version if row.version and row.version != "99" else "" if row.summary == "noresponse": reviewed_rev = ""