XML DTD document name is now tagged with a version number.

DTD document name now includes a version number.
XML output displayed by sadf -x points at the DTD document
which applies to this specific version.

Mail from Frank Ch Eigler (fche@redhat.com) 26/09/2012:

From some brief testing, it appears as though sadf's xml output format
has changed a few times over time, but the same xml dtd URL is being
emitted: http://pagesperso-orange.fr/sebastien.godard/sysstat.dtd If
indeed the dtd has changed over time, wouldn't it be wise to keep
newer versions tagged with a version number in the URLs, so that
URL-based xml validation would succeed well into the future?

diff --git a/CHANGES b/CHANGES
index f678f2313fa56fa69c235f85a7e8c4c8b54fda88..c7f9e5b7a782658ccfe1cd27c8778a58d12db1ac 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -8,6 +8,7 @@ xxxx/xx/xx: Version 10.1.2 - Sebastien Godard (sysstat <at> orange.fr)
        * [Peter Schiffer]: systemd support added.
        * [Peter Schiffer]: Sysstat init script updated to make it
          more conforming to LSB.
+       * XML DTD document name is now tagged with a version number.
        * sar, sadf and mpstat manual pages updated.
        * DTD and XSD documents updated.
        * Cosmetic change in sadf -H output.

diff --git a/sadf_misc.c b/sadf_misc.c
index 14d66f6fa1db40eeaec98b3019eb1b44444b4fb7..a2858aab6f23430814f8ff3e2b3cb5ac92e0341b 100644 (file)
--- a/sadf_misc.c
+++ b/sadf_misc.c
@@ -487,7 +487,8 @@ __printf_funct_t print_xml_header(int *tab, int action, char *dfile,
                printf("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
                printf("<!DOCTYPE sysstat PUBLIC \"DTD v%s sysstat //EN\"\n",
                       XML_DTD_VERSION);
-               printf("\"http://pagesperso-orange.fr/sebastien.godard/sysstat.dtd\">\n");
+               printf("\"http://pagesperso-orange.fr/sebastien.godard/sysstat-%s.dtd\">\n",
+                      XML_DTD_VERSION);
                
                xprintf(*tab, "<sysstat>");
 

diff --git a/xml/sysstat.dtd b/xml/sysstat-2.14.dtd
similarity index 100%
rename from xml/sysstat.dtd
rename to xml/sysstat-2.14.dtd