Ticket #11954: recinput.mythweb.v0.28-pre-10-gbb41293.patch

File recinput.mythweb.v0.28-pre-10-gbb41293.patch, 4.2 KB (added by George Nassas <gnassas@…>, 7 years ago)
  • modules/tv/classes/Program.php

    From e48b6f9440174514ee3a366fe251cc87c56f35bd Mon Sep 17 00:00:00 2001
    From: George Nassas <gnassas@gmail.com>
    Date: Wed, 23 Oct 2013 22:17:56 -0400
    Subject: [PATCH 1/3] Switch inputname to come from the database rather than
     looking it up.
    
    ---
     modules/tv/classes/Program.php | 9 +++------
     1 file changed, 3 insertions(+), 6 deletions(-)
    
    diff --git a/modules/tv/classes/Program.php b/modules/tv/classes/Program.php
    index 097108e..c5740ce 100644
    a b class Program extends MythBase { 
    128128            $this->year            = $data[45];
    129129            $this->partnumber      = $data[46];
    130130            $this->parttotal       = $data[47];
     131            $this->inputname       = $data[48];
    131132        // Is this a previously-recorded program?
    132133            if (!empty($this->filename)) {
    133134                $this->url = video_url($this); // get download info
    class Program extends MythBase { 
    175176            $this->syndicatedepisodenumber  = $data['syndicatedepisodenumber'];
    176177            $this->title_pronounce          = $data['title_pronounce'];
    177178            $this->recstatus                = $data['recstatus'];
     179            $this->inputname                = $data['recinput'];
    178180
    179181        // These db fields should really get renamed...
    180182            $this->audioproperties          = $data['stereo'];
    class Program extends MythBase { 
    205207            $this->starstring .= '&frac12;';
    206208        elseif ($frac >= .25)
    207209            $this->starstring .= '&frac14;';
    208     // Get the name of the input
    209         if ($this->inputid) {
    210             $this->inputname = $db->query_col('SELECT displayname
    211                                                  FROM cardinput
    212                                                 WHERE cardinputid=?',
    213                                               $this->inputid);
    214210        }
    215211    // Turn recstatus into a word
    216212        if (isset($this->recstatus) && $GLOBALS['RecStatus_Types'][$this->recstatus]) {
    class Program extends MythBase { 
    390386                             $this->year           , // 44 year
    391387                             $this->partnumber     , // 45 partnumber
    392388                             $this->parttotal      , // 46 parttotal
     389                             $this->inputname      , // 47 recinput
    393390                            )
    394391                      );
    395392    }
  • modules/tv/classes/Program.php

    -- 
    1.7.12.4 (Apple Git-37)
    
    
    From bb41293e5c2cf83a2102b754618fba997347e211 Mon Sep 17 00:00:00 2001
    From: George Nassas <gnassas@gmail.com>
    Date: Tue, 29 Oct 2013 12:02:13 -0400
    Subject: [PATCH 2/3] fix a typo
    
    ---
     modules/tv/classes/Program.php | 2 +-
     1 file changed, 1 insertion(+), 1 deletion(-)
    
    diff --git a/modules/tv/classes/Program.php b/modules/tv/classes/Program.php
    index c5740ce..b147a67 100644
    a b class Program extends MythBase { 
    176176            $this->syndicatedepisodenumber  = $data['syndicatedepisodenumber'];
    177177            $this->title_pronounce          = $data['title_pronounce'];
    178178            $this->recstatus                = $data['recstatus'];
    179             $this->inputname                = $data['recinput'];
     179            $this->inputname                = $data['inputname'];
    180180
    181181        // These db fields should really get renamed...
    182182            $this->audioproperties          = $data['stereo'];
  • modules/tv/classes/Program.php

    -- 
    1.7.12.4 (Apple Git-37)
    
    
    From 8b164da5b24c05989b1fd6c1cedcecd67a684a5a Mon Sep 17 00:00:00 2001
    From: George Nassas <gnassas@gmail.com>
    Date: Tue, 29 Oct 2013 14:00:51 -0400
    Subject: [PATCH 3/3] Update
    
    ---
     modules/tv/classes/Program.php | 2 +-
     1 file changed, 1 insertion(+), 1 deletion(-)
    
    diff --git a/modules/tv/classes/Program.php b/modules/tv/classes/Program.php
    index b147a67..3e9be21 100644
    a b class Program extends MythBase { 
    207207            $this->starstring .= '&frac12;';
    208208        elseif ($frac >= .25)
    209209            $this->starstring .= '&frac14;';
    210         }
     210
    211211    // Turn recstatus into a word
    212212        if (isset($this->recstatus) && $GLOBALS['RecStatus_Types'][$this->recstatus]) {
    213213            $this->recstatus_orig   = $this->recstatus;