Be less paranoid about the XML protocol.

Cut release 0.7.3.

diff --git a/ChangeLog b/ChangeLog
index d4d1866043cda7cfa611dbdf3353a3e305fda85a..aa40f47745ffdb4c33c4015cddbbce2ef172392d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-11     Andrew Ruthven
+       Be less stressed about the XML protocol, let XPath matching do
+       the validation for us.
+       Release version 0.7.3
+
 2008-03-07     Andrew Ruthven
        The MythTV protocol on release-0-21-fixes has been increased to 39.
        Release version 0.7.2

diff --git a/bin/mythtv-status b/bin/mythtv-status
index 17a37c7cd2e62b433c14cece1a3d2227c3a51756..89dbfb3fbe807ee8fb7ed7beb2a04d0fdcbdbff5 100755 (executable)
--- a/bin/mythtv-status
+++ b/bin/mythtv-status
@@ -34,7 +34,7 @@ my $disk_space_warn = 95;  # Percent to warn at.
 my $guide_days_warn = 2;   # How many days we require.
 my $auto_expire_count = 10; # How many auto expire shows to display.
 
-my $VERSION = '0.7.2';
+my $VERSION = '0.7.3';
 
 # Some display blocks are disabled by default:
 $display{'Shows due to Auto Expire'} = 0;
@@ -243,7 +243,7 @@ my @blocks = (
     'name' => 'Total Disk Space',
     'type' => 'xpath',
     'xpath' => '//Status/MachineInfo/Storage',
-    'protocol_version' => [ ">= 32", "<= 39" ],
+    'protocol_version' => [ ">= 32" ],
     'xml_version' => [ "== 0" ],
     'attrs' => [ qw/drive_total_total drive_total_used/ ],
     'commify' => [ qw/drive_total_total drive_total_used/ ],
@@ -261,8 +261,7 @@ my @blocks = (
     'name' => 'Total Disk Space',
     'type' => 'xpath',
     'xpath' => '//Status/MachineInfo/Storage/Group[@id="total"]',
-    'protocol_version' => [ ">= 40" ],
-    'xml_version' => [ "> 0" ],
+    'protocol_version' => [ ">= 39" ],
     'attrs' => [ qw/total used/ ],
     'commify' => [ qw/total used/ ],
     'template' => "Total space is __total__ MB, with __used__ MB used (__percent__)",
@@ -279,8 +278,7 @@ my @blocks = (
     'name' => 'Disk Space',
     'type' => 'xpath',
     'xpath' => '//Status/MachineInfo/Storage/Group',
-    'protocol_version' => [ ">= 38" ],
-    'xml_version' => [ "> 0" ],
+    'protocol_version' => [ ">= 39" ],
     'attrs' => [ qw/id total used/ ],
     'commify' => [ qw/total used/ ],
     'template' => "Total space for group __id__ is __total__ MB, with __used__ MB used (__percent__)",

diff --git a/testing/xml/multiple-storage-groups.pucks-patches.one-warn.xml b/testing/xml/multiple-storage-groups.pucks-patches.one-warn.xml
index e3f8a8db742d60a94f93a275007716a52e943ffb..af34b99de389485ef780ed61be3fcab010d25834 100644 (file)
--- a/testing/xml/multiple-storage-groups.pucks-patches.one-warn.xml
+++ b/testing/xml/multiple-storage-groups.pucks-patches.one-warn.xml
@@ -1,5 +1,5 @@
 <!DOCTYPE Status>
-<Status version="0.21.20071202-1" protoVer="36" xmlVer="1" ISODate="2007-12-07T16:26:55" time="4:26 PM" date="12/7/2007" >
+<Status version="0.21.20071202-1" protoVer="40" xmlVer="1" ISODate="2007-12-07T16:26:55" time="4:26 PM" date="12/7/2007" >
  <Encoders count="0" />
  <Scheduled count="0" />
  <JobQueue count="0" />

diff --git a/testing/xml/multiple-storage-groups.pucks-patches.xml b/testing/xml/multiple-storage-groups.pucks-patches.xml
index 198e40fa58dce4f7b733c9d147ce81fc8242ff0c..e51bfa6d52e21960a43bf92fd763b486d2016d83 100644 (file)
--- a/testing/xml/multiple-storage-groups.pucks-patches.xml
+++ b/testing/xml/multiple-storage-groups.pucks-patches.xml
@@ -1,5 +1,5 @@
 <!DOCTYPE Status>
-<Status version="0.21.20071202-1" protoVer="36" xmlVer="1" ISODate="2007-12-07T16:26:55" time="4:26 PM" date="12/7/2007" >
+<Status version="0.21.20071202-1" protoVer="40" xmlVer="1" ISODate="2007-12-07T16:26:55" time="4:26 PM" date="12/7/2007" >
  <Encoders count="0" />
  <Scheduled count="0" />
  <JobQueue count="0" />