SVDRP: independent hold of version for any VDR

2 files changed, 16 insertions, 13 deletions

diff --git a/bin/xxvd b/bin/xxvd
index 344bbc3..362d8c3 100755
--- a/bin/xxvd
+++ b/bin/xxvd
@@ -42,7 +42,7 @@ $|++;
 
 my $REV = (split(/ /, '$Revision$'))[1];
 my $MODULES;
-my $VERSION = '1.6.1';
+my $VERSION = '1.7.0';
 my $VDRVERSION = 0;
 my $DBVERSION = 0;
 my $CLEANUP;
@@ -353,17 +353,6 @@ sub getVersion {
 }
 
 # ------------------
-sub getVdrVersion {
-# ------------------
-    my $ver = shift  || return $VDRVERSION;
-
-    # Transform 1.2.6 => 10206, 1.3.32 => 10332
-    $VDRVERSION = int(sprintf("%02d%02d%02d",split(/\./,$ver)));
-
-    return $ver;
-}
-
-# ------------------
 sub getConfigFile {
 # ------------------
     if(defined $PATHS->{DEFINED_CFGFILE} and -r $PATHS->{DEFINED_CFGFILE}) { # user defined file via comandline
diff --git a/lib/XXV/MODULES/SVDRP.pm b/lib/XXV/MODULES/SVDRP.pm
index 8b20540..b1e0077 100644
--- a/lib/XXV/MODULES/SVDRP.pm
+++ b/lib/XXV/MODULES/SVDRP.pm
@@ -497,6 +497,18 @@ sub is_host_online {
   	return 'no';
 }
 
+sub vdr_version {
+    my $self = shift  || return error('No object defined!');
+    my $vdrid = shift;
+
+    if($self->{Cache} 
+			&& $self->{Cache}->{$vdrid}
+			&& $self->{Cache}->{$vdrid}->{version}) { 
+    	return $self->{Cache}->{$vdrid}->{version};
+		}
+  	return 'no';
+}
+
 sub enum_onlinehosts {
     my $self = shift  || return error('No object defined!');
   
@@ -698,7 +710,9 @@ sub command {
       
       # parse header like 220 video SVDRP VideoDiskRecorder 1.7.1; Fri May 2 16:17:10 2008; ISO-8859-1
       my @header = split (/\;/, $data->[0]);
-      main::getVdrVersion($1)
+
+      # Store version 1.2.6 => 10206, 1.3.32 => 10332
+      $self->{Cache}->{$vdrid}->{version} = int(sprintf("%02d%02d%02d",split(/\./,$1)))
         if($header[0] =~ /SVDRP\s+VideoDiskRecorder\s+(\d\.\d\.\d+)/);
 
       if(scalar @header > 2) {