[mythtv-commits] Re: Ticket #937: [PATCH]: mythfilldatabase --file tweaks

[MythTV]

#937: [PATCH]: mythfilldatabase --file tweaks
--------------------------------+-------------------------------------------
 Reporter:  mcdmx at users.sf.net  |        Owner:  ijr 
     Type:  patch               |       Status:  new 
 Priority:  minor               |    Milestone:      
Component:  mythtv              |      Version:  head
 Severity:  medium              |   Resolution:      
--------------------------------+-------------------------------------------
Comment (by mcdmx at users.sf.net):

 Thanks for the review and corrections. Here's a revised version of the
 patch:

 {{{
 Index: filldata.cpp
 ===================================================================
 --- filldata.cpp        (revision 8506)
 +++ filldata.cpp        (working copy)
 @@ -2200,18 +2200,37 @@
                  if ((mplexid > 0) || (minor == 0))
                      chanid = ChannelUtil::CreateChanID(id, (*i).chanstr);

 -                if ((*i).callsign == "")
 -                    (*i).callsign = QString::number(chanid);
 +                if ((*i).callsign.isEmpty())
 +                {
 +                    QStringList words = QStringList::split(" ",
 (*i).name.simplifyWhiteSpace().upper());
 +                    QString callsign = "";
 +                    if (words[1].isEmpty())
 +                    {
 +                        callsign = words[0].left(5);
 +                    }
 +                    else
 +                    {
 +                        callsign =
 words[0].left(words[1].length()==1?4:3);
 +                        callsign += words[1].left(5-callsign.length());
 +                    }
 +                    (*i).callsign = callsign;
 +                }

                  if (chanid > 0)
                  {
 +                    QString cstr = QString((*i).chanstr);
 +                    if( channel_preset && cstr.isEmpty() )
 +                    {
 +                        cstr = QString::number(chanid%1000);
 +                    }
                      ChannelUtil::CreateChannel(
                          mplexid,          id,        chanid,
 -                        (*i).callsign,    (*i).name, (*i).chanstr,
 +                        (*i).callsign,    (*i).name, cstr,
                          0 /*service id*/, major,     minor,
                          false /*use on air guide*/,  false /*hidden*/,
                          false /*hidden in guide*/,
 -                        freqid,      localfile, (*i).tvformat);
 +                        freqid,      localfile, (*i).tvformat,
 +                        (*i).xmltvid);
                  }
              }
          }

 }}}

-- 
Ticket URL: <http://cvs.mythtv.org/trac/ticket/937>
MythTV <http://www.mythtv.org/>
MythTV