From d214d07a627df39a9ab47264fa4e58b87f9f3893 Mon Sep 17 00:00:00 2001
From: Andreas Brachold <vdr07@deltab.de>
Date: Sun, 21 Jun 2009 11:25:33 +0000
Subject: * HTTPD: Add widget for input time based values * RECORDS: redit
 remove useless edit of recording 'priority'

---
 lib/XXV/MODULES/AUTOTIMER.pm |  4 ++--
 lib/XXV/MODULES/RECORDS.pm   | 21 +--------------------
 lib/XXV/MODULES/TIMERS.pm    |  4 ++--
 3 files changed, 5 insertions(+), 24 deletions(-)

(limited to 'lib')

diff --git a/lib/XXV/MODULES/AUTOTIMER.pm b/lib/XXV/MODULES/AUTOTIMER.pm
index 8ad1dcc..6a8c006 100644
--- a/lib/XXV/MODULES/AUTOTIMER.pm
+++ b/lib/XXV/MODULES/AUTOTIMER.pm
@@ -759,7 +759,7 @@ You can also fine tune your search :
             },
         },
          'Start' => {
-             typ     => 'string',
+             typ     => 'time',
              def     => sub{
 		             my $value = $epg->{Start} || return "";
                      return fmttime($value);
@@ -782,7 +782,7 @@ You can also fine tune your search :
              },
          },
          'Stop' => {
-             typ     => 'string',
+             typ     => 'time',
              def     => sub{
     		         my $value = $epg->{Stop} || return "";
                      return fmttime($value);
diff --git a/lib/XXV/MODULES/RECORDS.pm b/lib/XXV/MODULES/RECORDS.pm
index 5c8397a..f3ba18d 100644
--- a/lib/XXV/MODULES/RECORDS.pm
+++ b/lib/XXV/MODULES/RECORDS.pm
@@ -2298,7 +2298,6 @@ SELECT SQL_CACHE
     CONCAT_WS('~',e.title,e.subtitle) as title,
     e.eventid as EventId,
     r.Path,
-    r.priority,
     r.lifetime
 FROM
     RECORDS as r,
@@ -2346,20 +2345,6 @@ WHERE
             },
             req     => gettext("This is required!"),
         },
-        'priority' => {
-            typ     => 'integer',
-            msg     => sprintf(gettext('Priority (%d ... %d)'),0,99),
-            def     => int($rec->{priority}),
-            check   => sub{
-                my $value = shift || 0;
-                if($value >= 0 and $value < 100) {
-                    return int($value);
-                } else {
-                    return undef, gettext('Value incorrect!');
-                }
-            },
-            req     => gettext("This is required!"),
-        },
         'channel' => {
             typ     => 'list',
             def     => $status->{channel},
@@ -2462,17 +2447,13 @@ WHERE
         }
 
 
-        if($data->{lifetime} ne $rec->{lifetime}
-            or $data->{priority} ne $rec->{priority}) {
+        if($data->{lifetime} ne $rec->{lifetime}) {
 
             my @options = split('\.', $rec->{Path});
 
             $options[-2] = sprintf("%02d",$data->{lifetime})
                 if($data->{lifetime} ne $rec->{lifetime});
 
-            $options[-3] = sprintf("%02d",$data->{priority})
-                if($data->{priority} ne $rec->{priority});
-
             my $newPath = join('.', @options);
 
             move($rec->{Path}, $newPath)
diff --git a/lib/XXV/MODULES/TIMERS.pm b/lib/XXV/MODULES/TIMERS.pm
index 561a025..64353f4 100644
--- a/lib/XXV/MODULES/TIMERS.pm
+++ b/lib/XXV/MODULES/TIMERS.pm
@@ -692,7 +692,7 @@ WHERE
             },
         },
         'start' => {
-            typ     => 'string',
+            typ     => $con ? 'string' : 'time',
             def     => sub{
                     return fmttime($default->{start});
                 },
@@ -711,7 +711,7 @@ WHERE
             },
         },
         'stop' => {
-            typ     => 'string',
+            typ     => $con ? 'string' : 'time',
             def     => sub{
                     return fmttime($default->{stop});
                 },
-- 
cgit v1.2.3