implement update(to 0.9.10)

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/rec10@764 4e526526-5e11-4fc0-8910-f8fd03428081

diff --git a/rec10/trunk/src/chdb.py b/rec10/trunk/src/chdb.py
index 4370151..adfc074 100644 (file)
--- a/rec10/trunk/src/chdb.py
+++ b/rec10/trunk/src/chdb.py
@@ -6,8 +6,9 @@
 import rec10d
 
 def chtxtsearch(chtxtin):
+    chtxtt=chtxtin.replace("_0","_%")
     ret = []
-    for datum in rec10d.rec10db.select_by_chtxt_epg_ch(chtxtin):
+    for datum in rec10d.rec10db.select_by_chtxt_epg_ch(chtxtt):
         rett = {'bctype':datum[0], 'chtxt':datum[1], 'ch':datum[2], 'csch':datum[3], 'update':datum[4]}
         ret.append(rett)
     if len(ret) == 0:

diff --git a/rec10/trunk/src/dbMySQL.py b/rec10/trunk/src/dbMySQL.py
index beb5d1f..3769427 100644 (file)
--- a/rec10/trunk/src/dbMySQL.py
+++ b/rec10/trunk/src/dbMySQL.py
@@ -114,7 +114,7 @@ class DB_MySQL:
         dbexe = db[1].execute("\
         SELECT bctype,chtxt,ch,csch,updatetime \
         FROM epg_ch \
-        WHERE chtxt = %s", \
+        WHERE chtxt LIKE %s", \
                               (chtxt,))
         ret = []
         dls = []
@@ -912,13 +912,13 @@ class DB_MySQL:
         epg_ch.chtxt,title,start,stop,exp,longexp,category \
         FROM epg_timeline \
         INNER JOIN epg_ch \
-        WHERE epg_ch.chtxt=epg_timeline.channel \
+        WHERE epg_ch.chtxt LIKE epg_timeline.channel \
         AND \
         start >= %s \
         AND \
         start <= %s \
         AND \
-        epg_ch.chtxt=%s"
+        epg_ch.chtxt LIKE %s"
         dbcmd = db[1].execute(dbexe, (btime, etime, chtxt))
         retall = []
         if dbcmd > 0:

diff --git a/rec10/trunk/src/epgdb.py b/rec10/trunk/src/epgdb.py
index bc5e3cb..dfb4180 100644 (file)
--- a/rec10/trunk/src/epgdb.py
+++ b/rec10/trunk/src/epgdb.py
@@ -61,6 +61,7 @@ def searchtime2(titletxt, timet, deltatime, chtxt):
     aftertime = aftertime.strftime("%Y%m%d%H%M%S")
     one = ["", "", "", "","","",""]
     tempt = 0
+    chtxtt=chtxt.replace("_0","_%")
     d = rec10d.rec10db.select_by_time_ngram_epg_timeline(beforetime, aftertime, chtxt)
     for chtxtt, title, start, stop ,exp,longexp,category in d:
         #recdblist.printutf8(chtxtt+":"+title+":"+start+":"+stop)