Ticket #2461: filldatabase.patch

programs/mythfilldatabase/filldata.cpp

@@ -1808 +1808 @@
 
             if (!quiet)
             {
-                cerr << "removing conflicting program: "
-                     << (*todelete).channel << " "
-                     << (*todelete).title.local8Bit() << " "
-                     << (*todelete).startts << "-" << (*todelete).endts << endl;
+                cerr << "ignoring conflicting program: "
+                     << (*todelete).start.toString(Qt::ISODate) << "-"
+                     << (*todelete).end.toString(Qt::ISODate) << " "
+                     << (*todelete).channel.local8Bit() << " "
+                     << (*todelete).title.local8Bit() << endl;
+
                 cerr << "conflicted with             : "
-                     << (*tokeep).channel << " "
-                     << (*tokeep).title.local8Bit() << " "
-                     << (*tokeep).startts << "-" <<   (*tokeep).endts << endl;
-                cerr << endl;
+                     << (*tokeep).start.toString(Qt::ISODate) << "-"
+                     << (*tokeep).end.toString(Qt::ISODate) << " "
+                     << (*tokeep).channel.local8Bit() << " "
+                     << (*tokeep).title.local8Bit() << "\n" << endl;
             }
 
             if (todelete == i)
@@ -2259 +2261 @@
                               "subtitle=:SUBTITLE AND description=:DESC AND "
                               "category=:CATEGORY AND "
                               "category_type=:CATEGORY_TYPE AND "
-                              "airdate=:AIRDATE AND stars=:STARS AND "
+                              "airdate=:AIRDATE AND "
+                              "stars >= (:STARS - 0.001) AND stars <= (:STARS + 0.001) AND "
                               "previouslyshown=:PREVIOUSLYSHOWN AND "
                               "title_pronounce=:TITLE_PRONOUNCE AND "
                               "stereo=:STEREO AND subtitled=:SUBTITLED AND "
@@ -2268 +2271 @@
                               "partnumber=:PARTNUMBER AND "
                               "parttotal=:PARTTOTAL AND "
                               "seriesid=:SERIESID AND "
+                              "( (:ORIGINALAIRDATE is null AND originalairdate is null) OR "
+                              "originalairdate=:ORIGINALAIRDATE ) AND "
                               "showtype=:SHOWTYPE AND "
                               "colorcode=:COLORCODE AND "
                               "syndicatedepisodenumber=:SYNDICATEDEPISODENUMBER AND "
@@ -2290 +2295 @@
                 query.bindValue(":CLOSECAPTIONED", (*i).closecaptioned);
                 query.bindValue(":PARTNUMBER", (*i).partnumber);
                 query.bindValue(":PARTTOTAL", (*i).parttotal);
-                query.bindValue(":SERIESID", (*i).seriesid);
-                query.bindValue(":SHOWTYPE", (*i).showtype);
-                query.bindValue(":COLORCODE", (*i).colorcode);
-                query.bindValue(":SYNDICATEDEPISODENUMBER", (*i).syndicatedepisodenumber);
-                query.bindValue(":PROGRAMID", (*i).programid);
+                query.bindValue(":SERIESID", (*i).seriesid.utf8());
+                query.bindValue(":ORIGINALAIRDATE", (*i).originalairdate);
+                query.bindValue(":SHOWTYPE", (*i).showtype.utf8());
+                query.bindValue(":COLORCODE", (*i).colorcode.utf8());
+                query.bindValue(":SYNDICATEDEPISODENUMBER", (*i).syndicatedepisodenumber.utf8());
+                query.bindValue(":PROGRAMID", (*i).programid.utf8());
                 query.exec();
 
                 if (query.isActive() && query.size() > 0)
@@ -2318 +2324 @@
                         while (query.next())
                         {
                             cerr << "removing existing program: "
-                                 << (*i).channel.local8Bit() << " "
-                                 << QString::fromUtf8(query.value(0).toString()).local8Bit() << " "
                                  << query.value(1).toDateTime().toString(Qt::ISODate) << " - "
-                                 << query.value(2).toDateTime().toString(Qt::ISODate) << endl;
+                                 << query.value(2).toDateTime().toString(Qt::ISODate) << " "
+                                 << (*i).channel.local8Bit() << " "
+                                 << QString::fromUtf8(query.value(0).toString()).local8Bit() << endl;
                         }
 
                         cerr << "inserting new program    : "
+                             << (*i).start.toString(Qt::ISODate) << " - "
+                             << (*i).end.toString(Qt::ISODate) << " "
                              << (*i).channel.local8Bit() << " "
-                             << (*i).title.local8Bit() << " "
-                             << (*i).start.toString() << " - " 
-                             << (*i).end.toString() << endl << endl;
+                             << (*i).title.local8Bit() << "\n" << endl;
                     }
 
                     MSqlQuery subquery(MSqlQuery::InitCon());
@@ -2392 +2398 @@
                 query.bindValue(":CLOSECAPTIONED", (*i).closecaptioned);
                 query.bindValue(":PARTNUMBER", (*i).partnumber);
                 query.bindValue(":PARTTOTAL", (*i).parttotal);
-                query.bindValue(":SERIESID", (*i).seriesid);
+                query.bindValue(":SERIESID", (*i).seriesid.utf8());
                 query.bindValue(":ORIGINALAIRDATE", (*i).originalairdate);
-                query.bindValue(":SHOWTYPE", (*i).showtype);
-                query.bindValue(":COLORCODE", (*i).colorcode);
-                query.bindValue(":SYNDICATEDEPISODENUMBER", (*i).syndicatedepisodenumber);
-                query.bindValue(":PROGRAMID", (*i).programid);
+                query.bindValue(":SHOWTYPE", (*i).showtype.utf8());
+                query.bindValue(":COLORCODE", (*i).colorcode.utf8());
+                query.bindValue(":SYNDICATEDEPISODENUMBER", (*i).syndicatedepisodenumber.utf8());
+                query.bindValue(":PROGRAMID", (*i).programid.utf8());
                 if (!query.exec())
                     MythContext::DBError("program insert", query);