From 2e1d5ac4ff73ca1847bf7d1dcfa1044ea2f4a4a4 Mon Sep 17 00:00:00 2001
From: Andreas Brachold <vdr07@deltab.de>
Date: Thu, 31 Jan 2008 18:09:08 +0000
Subject: * Update CHANGELOG * Backport fixes to XXV-1.0.2 * Remove query of
 revision by svnversion (Use maximum of modul version) * TIMERS: Drop used
 function getEvents * CHANNELS: Don't redirect if deletion of channel failed *
 widget/list: avoid theoretical wrong item selection * popularity: change
 layout of database table for smaller memory using

---
 bin/xxvd | 32 +++++++++++++-------------------
 1 file changed, 13 insertions(+), 19 deletions(-)

(limited to 'bin')

diff --git a/bin/xxvd b/bin/xxvd
index df6536c..7ffe9c1 100755
--- a/bin/xxvd
+++ b/bin/xxvd
@@ -40,7 +40,7 @@ use Locale::gettext;
 
 $|++;
 
-my $REV = &getRev() || (split(/ /, '$Revision$'))[1];
+my $REV = (split(/ /, '$Revision$'))[1];
 my $MODULES;
 my $VERSION = '1.1';
 my $VDRVERSION = 0;
@@ -276,7 +276,7 @@ sub init {
         my $moduleName = 'XXV::MODULES::'.(split('\.',(split('/', $module))[-1]))[0];
 
         # make an object for the module
-	    eval "use $moduleName";
+	      eval "use $moduleName";
         error $@ if $@;
         my $modul = $moduleName->new(
             -config => $Config,
@@ -284,12 +284,18 @@ sub init {
             -paths  => $PATHS,
         );
 
-        $MODULES->{$moduleName} = $modul if(ref $modul);
-        debug sprintf("Load modul %s(%s)",
+        if(ref $modul) {
+          $MODULES->{$moduleName} = $modul;
+          my $modRev = $modul->{MOD}->{Version};
+          debug sprintf("Load modul %s(%s)",
             $moduleName,
-            (ref $MODULES->{$moduleName})
-                ? $MODULES->{$moduleName}->{MOD}->{Version}
-                : 'failed');
+            $modRev);
+          $REV = $modRev
+            if($modRev > $REV);
+
+        } else {
+          panic sprintf("Load modul %s failed!",$moduleName);
+        }
 
     }
     &after();
@@ -432,18 +438,6 @@ sub getModule {
     return $MODULES->{$modname};
 }
 
-# ------------------
-sub getRev {
-# ------------------
-    my $sourcedir = $PATHS->{HTMLDIR};
-    if(-d $sourcedir and -d $sourcedir.'/.svn' and `which svnversion` ne "") {
-        my $rev = `svnversion -n $sourcedir`;
-        return $rev;
-    } else {
-        return 0;
-    }
-}
-
 # ------------------
 sub getGeneralConfig {
 # ------------------
-- 
cgit v1.2.3