Improve check for whether mythfilldatabase inserted data.

Only consider channels which have an xmltvid when checking whether mythfilldatabase inserted any data. This will better handle error reporting for users who have sources with different channels using XMLTV (or Schedules Direct) and EIT. Fixes #9990 Signed-off-by: Michael T. Dean <mdean@mythtv.org>
MythTV · Dec 6, 2011 · a98783e · a98783e
1 parent 474da62
commit a98783e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/mythtv/programs/mythfilldatabase/filldata.cpp b/mythtv/programs/mythfilldatabase/filldata.cpp
@@ -552,7 +552,7 @@ bool FillData::Run(SourceList &sourcelist)
 
         query.prepare("SELECT MAX(endtime) FROM program p LEFT JOIN channel c "
                       "ON p.chanid=c.chanid WHERE c.sourceid= :SRCID "
-                      "AND manualid = 0;");
+                      "AND manualid = 0 AND c.xmltvid != '';");
         query.bindValue(":SRCID", (*it).id);
 
         if (query.exec() && query.size() > 0)
@@ -962,7 +962,7 @@ bool FillData::Run(SourceList &sourcelist)
 
         query.prepare("SELECT MAX(endtime) FROM program p LEFT JOIN channel c "
                       "ON p.chanid=c.chanid WHERE c.sourceid= :SRCID "
-                      "AND manualid = 0;");
+                      "AND manualid = 0 AND c.xmltvid != '';");
         query.bindValue(":SRCID", (*it).id);
 
         if (query.exec() && query.size() > 0)

diff --git a/mythtv/programs/mythfilldatabase/main.cpp b/mythtv/programs/mythfilldatabase/main.cpp
@@ -376,7 +376,7 @@ int main(int argc, char *argv[])
 
         query.prepare("SELECT MAX(endtime) FROM program p LEFT JOIN channel c "
                       "ON p.chanid=c.chanid WHERE c.sourceid= :SRCID "
-                      "AND manualid = 0;");
+                      "AND manualid = 0 AND c.xmltvid != '';");
         query.bindValue(":SRCID", fromfile_id);
 
         if (query.exec() && query.next())
@@ -396,7 +396,7 @@ int main(int argc, char *argv[])
 
         query.prepare("SELECT MAX(endtime) FROM program p LEFT JOIN channel c "
                       "ON p.chanid=c.chanid WHERE c.sourceid= :SRCID "
-                      "AND manualid = 0;");
+                      "AND manualid = 0 AND c.xmltvid != '';");
         query.bindValue(":SRCID", fromfile_id);
 
         if (query.exec() && query.next())