XML output modified to enable proper validation

XML document header modified so that it can be validated against the XSD
document.
Also always use cpu-load header for CPU activity (cpu-load-all has been
removed).

Signed-off-by: Sebastien GODARD <[email protected]>

Author: sysstat

sadf.h

@@ -9,7 +9,7 @@
 #include "sa.h"
 
 /* DTD version for XML output */
-#define XML_DTD_VERSION	"2.19"
+#define XML_DTD_VERSION	"3.0"
 
 /* Possible actions for functions used to display reports */
 #define F_BEGIN	0x01

sadf_misc.c

@@ -500,7 +500,10 @@ __printf_funct_t print_xml_header(int *tab, int action, char *dfile,
 		printf("\"http://pagesperso-orange.fr/sebastien.godard/sysstat-%s.dtd\">\n",
 		       XML_DTD_VERSION);
 
-		xprintf(*tab, "<sysstat>");
+		xprintf(*tab, "<sysstat\n"
+			      "xmlns=\"http://pagesperso-orange.fr/sebastien.godard/sysstat\"\n"
+			      "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
+			      "xsi:schemaLocation=\"http://pagesperso-orange.fr/sebastien.godard sysstat.xsd\">");
 
 		xprintf(++(*tab), "<sysdata-version>%s</sysdata-version>",
 			XML_DTD_VERSION);

xml_stats.c

@@ -112,12 +112,7 @@ __print_funct_t xml_print_cpu_stats(struct activity *a, int curr, int tab,
 	struct stats_cpu *scc, *scp;
 	char cpuno[8];
 
-	if (DISPLAY_CPU_DEF(a->opt_flags)) {
-		xprintf(tab++, "<cpu-load>");
-	}
-	else if (DISPLAY_CPU_ALL(a->opt_flags)) {
-		xprintf(tab++, "<cpu-load-all>");
-	}
+	xprintf(tab++, "<cpu-load>");
 
 	for (i = 0; (i < a->nr) && (i < a->bitmap->b_size + 1); i++) {
 
@@ -251,12 +246,7 @@ __print_funct_t xml_print_cpu_stats(struct activity *a, int curr, int tab,
 		}
 	}
 
-	if (DISPLAY_CPU_DEF(a->opt_flags)) {
-		xprintf(--tab, "</cpu-load>");
-	}
-	else if (DISPLAY_CPU_ALL(a->opt_flags)) {
-		xprintf(--tab, "</cpu-load-all>");
-	}
+	xprintf(--tab, "</cpu-load>");
 }
 
 /*