* EPG/TIMERS/RECORDS : SQL-Query improve

6 files changed, 49 insertions, 34 deletions

diff --git a/skins/deltab/display.tmpl b/skins/deltab/display.tmpl
index de3addb..954769e 100644
--- a/skins/deltab/display.tmpl
+++ b/skins/deltab/display.tmpl
@@ -12,12 +12,15 @@
   stopp = data.last.4;
   channel = data.last.5;
   description = data.last.6;
-  bild = data.last.7;
-  d = data.last.8;
-  video = data.last.9;
-  audio = data.last.10;
-  pdc = data.last.11;
-  channelid = data.last.12;
+  video = data.last.7;
+  audio = data.last.8;
+  d = data.last.9;
+  timerid=data.last.10;
+  recording=data.last.11;
+  running=data.last.12;
+  bild = data.last.13;
+  pdc = data.last.14;
+  channelid = data.last.15;
 %?>
 <?% ######################################################################## %?>
 <div id="body">
@@ -96,12 +99,12 @@ END %?>
 
       <br />
 
-    <?% IF param.timers.${id} && allow('tedit') %?>
-    <a href="?cmd=tedit&amp;data=<?% param.timers.${id}.id %?>">
+    <?% IF timerid && allow('tedit') %?>
+    <a href="?cmd=tedit&amp;data=<?% timerid %?>">
         <img src="images/onoff.<?% global.imagetyp %?>" alt="" title="<?% gettext("Edit this timer") %?>" />
     </a>
     &nbsp;
-    <a href="?cmd=tedit&amp;data=<?% param.timers.${id}.id %?>">
+    <a href="?cmd=tedit&amp;data=<?% timerid %?>">
         <?% gettext("Edit this timer",20) %?>
     </a>
     <br />
diff --git a/skins/deltab/now.tmpl b/skins/deltab/now.tmpl
index d67afc7..351679e 100644
--- a/skins/deltab/now.tmpl
+++ b/skins/deltab/now.tmpl
@@ -15,10 +15,10 @@
 <?% ######################################################################## %?>
 <?% BLOCK SetState %?>
     <?% state = '' %?>
-    <?% IF param.runningTimer.exists(id) %?>
+    <?% IF running %?>
         <?% state = "running" %?>
-    <?% ELSIF param.timers.exists(id) %?>
-      <?% UNLESS param.timers.${id}.activ %?>
+    <?% ELSIF timerid %?>
+      <?% UNLESS recording %?>
         <?% state = "deactive" %?>
       <?% ELSE %?>
         <?% state = "active" %?>
@@ -62,8 +62,8 @@
         <a href="?cmd=search&amp;data=<?% url( title ) %?>">
             <img src="images/find.<?% global.imagetyp %?>" alt="" title="<?% gettext("Search for repeats") %?>" />
         </a>
-        <?% IF param.timers.${id} && allow('tedit') %?>
-        <a href="?cmd=tedit&amp;data=<?% param.timers.${id}.id %?>">
+        <?% IF timerid && allow('tedit') %?>
+        <a href="?cmd=tedit&amp;data=<?% timerid %?>">
             <img src="images/onoff.<?% global.imagetyp %?>" alt="" title="<?% gettext("Edit this timer") %?>" />
         </a>
         <?% ELSIF allow('tnew') %?>
@@ -107,7 +107,11 @@
 <?% FOREACH zeile = data %?>
     <?% IF debug;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
     <tr<?% " class='two'" IF loop.count mod 2 == 0 %?>>
-        <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;sender=zeile.3;channel=zeile.4;group=zeile.5;start=zeile.6;stop=zeile.7;description=zeile.8;duration=zeile.9;pdc=zeile.10 %?>
+        <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;sender=zeile.3;
+            channel=zeile.4;group=zeile.5;start=zeile.6;stop=zeile.7;
+            description=zeile.8;duration=zeile.9;
+            timerid=zeile.10;recording=zeile.11;running=zeile.12;
+            pdc=zeile.13; %?>
         <?% IF old.defined && group != old %?>
     </tr>
 </table>
diff --git a/skins/deltab/program.tmpl b/skins/deltab/program.tmpl
index 1978892..b5da892 100644
--- a/skins/deltab/program.tmpl
+++ b/skins/deltab/program.tmpl
@@ -14,10 +14,10 @@
 <?% ######################################################################## %?>
 <?% BLOCK SetState %?>
     <?% state = '' %?>
-    <?% IF param.runningTimer.exists(id) %?>
+    <?% IF running %?>
         <?% state = "running" %?>
-    <?% ELSIF param.timers.exists(id) %?>
-      <?% UNLESS param.timers.${id}.activ %?>
+    <?% ELSIF timerid %?>
+      <?% UNLESS recording %?>
         <?% state = "deactive" %?>
       <?% ELSE %?>
         <?% state = "active" %?>
@@ -45,8 +45,8 @@
         <a href="?cmd=search&amp;data=<?% url( title ) %?>">
             <img src="images/find.<?% global.imagetyp %?>" alt="" title="<?% gettext("Search for repeats") %?>" />
         </a>
-        <?% IF param.timers.${id} && allow('tedit') %?>
-        <a href="?cmd=tedit&amp;data=<?% param.timers.${id}.id %?>">
+        <?% IF timerid && allow('tedit') %?>
+        <a href="?cmd=tedit&amp;data=<?% timerid %?>">
             <img src="images/onoff.<?% global.imagetyp %?>" alt="" title="<?% gettext("Edit this timer") %?>" />
         </a>
         <?% ELSIF allow('tnew') %?>
@@ -78,8 +78,10 @@
 
 	<?% FOREACH zeile = data %?>
     <?% IF debug;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
-        <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;start=zeile.3;stop=zeile.4;description=zeile.6;video=zeile.7;audio=zeile.8;pdc=zeile.9 %?>
-        <?% day = date.format(zeile.5, "%A, %x", locale) %?>
+        <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;start=zeile.3;stop=zeile.4;
+            description=zeile.6;video=zeile.7;audio=zeile.8;pdc=zeile.9;
+            timerid=zeile.10;recording=zeile.11;running=zeile.12;
+            day = date.format(zeile.5, "%A, %x", locale) %?>
 		<?% IF old.defined && day != old %?>
   		<tr>
             <td colspan="12" align="left">
diff --git a/skins/deltab/schema.tmpl b/skins/deltab/schema.tmpl
index 2d80abf..280a803 100644
--- a/skins/deltab/schema.tmpl
+++ b/skins/deltab/schema.tmpl
@@ -114,6 +114,9 @@
                                 video = event.11;

                                 audio = event.12;

                                 image = event.13;
+                                timerid     = event.14;
+                                recording   = event.15;
+                                running     = event.16;
                                 IF second_start > oldend;
                                     laenge = second_start - oldend;
                                     percent = (laenge / Duration) * width;
@@ -141,7 +144,7 @@
                             <img style="float:left" alt="" src="images/blank.gif" width="<?% percent div 1 %?>" height="1" align="left" />
                         <!-- </a> -->
                         <?% ELSE %?>
-                        <?% PROCESS SetState t=param.timers r=param.runningTimer %?>
+                        <?% PROCESS SetState %?>
                         <table summary="" class="schema" style="width:<?% percent div 1 %?>px">
                             <tr>
                                 <td>
@@ -163,10 +166,10 @@
 <?% ######################################################################## %?>
 <?% BLOCK SetState %?>
     <?% state = '' %?>
-    <?% IF param.runningTimer.exists(id) %?>
+    <?% IF running %?>
         <?% state = "running" %?>
-    <?% ELSIF param.timers.exists(id) %?>
-      <?% UNLESS param.timers.${id}.activ %?>
+    <?% ELSIF timerid %?>
+      <?% UNLESS recording %?>
         <?% state = "deactive" %?>
       <?% ELSE %?>
         <?% state = "active" %?>
diff --git a/skins/deltab/search.tmpl b/skins/deltab/search.tmpl
index 4ca1814..889fc09 100644
--- a/skins/deltab/search.tmpl
+++ b/skins/deltab/search.tmpl
@@ -14,10 +14,10 @@
 <?% ######################################################################## %?>
 <?% BLOCK SetState %?>
     <?% state = '' %?>
-    <?% IF param.runningTimer.exists(id) %?>
+    <?% IF running %?>
         <?% state = "running" %?>
-    <?% ELSIF param.timers.exists(id) %?>
-      <?% UNLESS param.timers.${id}.activ %?>
+    <?% ELSIF timerid %?>
+      <?% UNLESS recording %?>
         <?% state = "deactive" %?>
       <?% ELSE %?>
         <?% state = "active" %?>
@@ -50,8 +50,8 @@
         <a href="?cmd=search&amp;data=<?% url( title ) %?>">
             <img src="images/find.<?% global.imagetyp %?>" alt="" title="<?% gettext("Search for repeats") %?>" />
         </a>
-        <?% IF param.timers.${id} && allow('tedit') %?>
-        <a href="?cmd=tedit&amp;data=<?% param.timers.${id}.id %?>">
+        <?% IF timerid && allow('tedit') %?>
+        <a href="?cmd=tedit&amp;data=<?% timerid %?>">
             <img src="images/onoff.<?% global.imagetyp %?>" alt="" title="<?% gettext("Edit this timer") %?>" />
         </a>
         <?% ELSIF allow('tnew') %?>
@@ -76,8 +76,10 @@
     </tr>
 	<?% FOREACH zeile = data %?>
      <?% IF debug;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
-        <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;sender=zeile.3;channel=zeile.4;start=zeile.5;stop=zeile.6;description=zeile.8;pdc=zeile.9 %?>
-        <?% day = date.format(zeile.7, "%A, %x", locale) %?>
+        <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;sender=zeile.3;
+            channel=zeile.4;start=zeile.5;stop=zeile.6;description=zeile.8;
+            pdc=zeile.9;timerid=zeile.10;recording=zeile.11;running=zeile.12;
+            day = date.format(zeile.7, "%A, %x", locale) %?>
 		<?% IF old.defined && day != old %?>
    		  <tr>
             <td colspan="12" align="left">
diff --git a/skins/deltab/tlist.tmpl b/skins/deltab/tlist.tmpl
index 7f724f1..a2583b7 100644
--- a/skins/deltab/tlist.tmpl
+++ b/skins/deltab/tlist.tmpl
@@ -52,7 +52,7 @@
         <?% state = "deactive" %?>
     <?% ELSIF conflict %?>
         <?% state = "problem" %?>
-    <?% ELSIF param.runningTimer.exists(id) %?>
+    <?% ELSIF running %?>
         <?% state = "active" %?>
     <?% END %?>
 <?% END %?>
@@ -157,6 +157,7 @@
           autotimerid=zeile.12;
           duration=zeile.13;
           description=zeile.14;
+          running=zeile.15;
           t = zeile.7.split('&#x7e;');IF t.size > 1;subtitle = t.pop;ELSE;subtitle="";END;title=t.join('&#x7e;');
           pdc= ( zeile.1 ? zeile.1 mod 8 div 4 : 0 );
 	    	  day = date.format(zeile.9, "%A, %x", locale) %?>