More logfile decoration in the CGI.

1 files changed, 7 insertions, 4 deletions

diff --git a/www/gps_report.cgi.in b/www/gps_report.cgi.in
index 4b5f5275..93c1fc36 100644
--- a/www/gps_report.cgi.in
+++ b/www/gps_report.cgi.in
@@ -80,12 +80,15 @@ if hasRequiredElements(form) and form.getvalue("action") == "Send Report":
     report.attach(MIMEText(msg))
 
     # Decorate the log data with some canned headers
-    # Omitted: nmea, notes, sample_notes, submitter, techdoc, tested, usbchip
+    # Omitted: nmea, notes, techdoc, tested, usbchip
     header = ''
-    header += "# Name: %s %s\n" % (form.getvalue('vendor'), form.getvalue('model'))
-    for fld in ("chipset", "firmware", 'date', 'location'):
-        if form.has_key(fld) and form.getvalue(fld):
+    header += "# Name: %s %s\n" \
+              % (form.getvalue('vendor'), form.getvalue('model'))
+    for fld in ("chipset", "firmware", 'date', 'submitter', 'location'):
+        if form.has_key(fld):
             header += "# %s: %s\n" % (fld.capitalize(), form.getvalue(fld))
+    if form.has_key('sample_notes') and form.getvalue('sample_notes'):
+        header += "# Notes: %s\n" % form.getvalue('sample_notes')
     content = MIMEText(header + output_sample_content)
     encode_base64(content)
     report.attach(content)