From 6f5ae2edcd8277ff41573c1ee4d2694c3a93874b Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz <henrik@levkowetz.com>
Date: Sat, 15 Dec 2012 22:43:10 +0000
Subject: [PATCH] Added a new field, #16: draft AD (name and email) to
 all_id2.txt  - Legacy-Id: 5128

---
 ietf/idindex/views.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/ietf/idindex/views.py b/ietf/idindex/views.py
index ad0f32bd5..584693733 100644
--- a/ietf/idindex/views.py
+++ b/ietf/idindex/views.py
@@ -102,7 +102,7 @@ def all_id2_entry(id):
     elif id.group.type_id == "wg" and id.group.parent:
         area = id.group.parent.acronym
     fields.append(area)
-    # 9
+    # 9 responsible AD name
     fields.append(id.idinternal.job_owner if id.idinternal else "")
     # 10
     s = id.intended_status
@@ -139,6 +139,15 @@ def all_id2_entry(id):
     else:
         name = u""
     fields.append(name)
+    # 16 Responsible AD name and email
+    if id.ad:
+        ad = id.ad
+        realname = unicode(ad)
+        email = ad.email_address()
+        name = re.sub(u"[<>@,]", u"", realname) + u" <"+re.sub(u"[<>,]", u"", email).strip()+u">"
+    else:
+        name = u""
+    fields.append(name)
     #
     return "\t".join([unicode(x) for x in fields])