From 76d8c63254685a43f6adbe2b7c30470708cea27d Mon Sep 17 00:00:00 2001 From: Andrew Ruthven Date: Tue, 11 Mar 2008 14:19:07 +1300 Subject: [PATCH] Be less paranoid about the XML protocol. Cut release 0.7.3. --- ChangeLog | 5 +++++ bin/mythtv-status | 10 ++++------ .../multiple-storage-groups.pucks-patches.one-warn.xml | 2 +- testing/xml/multiple-storage-groups.pucks-patches.xml | 2 +- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index d4d1866..aa40f47 100644 --- 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 17a37c7..89dbfb3 100755 --- 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 e3f8a8d..af34b99 100644 --- 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 @@ - + diff --git a/testing/xml/multiple-storage-groups.pucks-patches.xml b/testing/xml/multiple-storage-groups.pucks-patches.xml index 198e40f..e51bfa6 100644 --- a/testing/xml/multiple-storage-groups.pucks-patches.xml +++ b/testing/xml/multiple-storage-groups.pucks-patches.xml @@ -1,5 +1,5 @@ - + -- 2.30.2