From f0e99644a7a7a00d4b6514a2fa6405425b4b9f7d Mon Sep 17 00:00:00 2001
From: fyodor <fyodor@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Sat, 11 Aug 2007 05:11:08 +0000
Subject: [PATCH] merge soc07 r5077:5080 - Adding 'extrainfo' in the
 taskbegin/taskend XML elements for the SPM additional info

---
 docs/nmap.dtd | 2 ++
 timing.cc     | 8 ++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/docs/nmap.dtd b/docs/nmap.dtd
index 0865d411b..4fadba112 100644
--- a/docs/nmap.dtd
+++ b/docs/nmap.dtd
@@ -105,6 +105,7 @@
 <!ATTLIST taskbegin
 			task		CDATA		#REQUIRED
 			time		%attr_numeric;	#REQUIRED
+			extrainfo	CDATA		#IMPLIED
 >
 
 <!-- this element is written in timing.c:printStats() -->
@@ -122,6 +123,7 @@
 <!ATTLIST taskend
 			task		CDATA		#REQUIRED
 			time		%attr_numeric;	#REQUIRED
+			extrainfo	CDATA		#IMPLIED
 >
 
 <!-- 
diff --git a/timing.cc b/timing.cc
index df3b1134a..df299d957 100644
--- a/timing.cc
+++ b/timing.cc
@@ -422,18 +422,22 @@ bool ScanProgressMeter::beginOrEndTask(const struct timeval *now, const char *ad
   tm = localtime(&tv_sec);
   if (beginning) {
     log_write(LOG_STDOUT, "Initiating %s at %02d:%02d", scantypestr, tm->tm_hour, tm->tm_min);
+    log_write(LOG_XML, "<taskbegin task=\"%s\" time=\"%lu\"", scantypestr, (unsigned long) now->tv_sec);
     if (additional_info) {
       log_write(LOG_STDOUT, " (%s)", additional_info);
+      log_write(LOG_XML, " extrainfo=\"%s\"", additional_info);
     }
     log_write(LOG_STDOUT, "\n");
-    log_write(LOG_XML, "<taskbegin task=\"%s\" time=\"%lu\" />\n", scantypestr, (unsigned long) now->tv_sec);
+    log_write(LOG_XML, " />\n");
   } else {
     log_write(LOG_STDOUT, "Completed %s at %02d:%02d, %.2fs elapsed", scantypestr, tm->tm_hour, tm->tm_min, TIMEVAL_MSEC_SUBTRACT(*now, begin) / 1000.0);
+    log_write(LOG_XML, "<taskend task=\"%s\" time=\"%lu\"", scantypestr, (unsigned long) now->tv_sec);
     if (additional_info) {
       log_write(LOG_STDOUT, " (%s)", additional_info);
+      log_write(LOG_XML, " extrainfo=\"%s\"", additional_info);
     }
     log_write(LOG_STDOUT, "\n");
-    log_write(LOG_XML, "<taskend task=\"%s\" time=\"%lu\" />\n", scantypestr, (unsigned long) now->tv_sec);
+    log_write(LOG_XML, " />\n");
   }
   log_flush(LOG_STDOUT|LOG_XML);
   return true;