auto suggest keyword implemented.

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

diff --git a/rec10/trunk/src/dbMySQL.py b/rec10/trunk/src/dbMySQL.py
index 3e3277b..6d024c5 100644 (file)
--- a/rec10/trunk/src/dbMySQL.py
+++ b/rec10/trunk/src/dbMySQL.py
@@ -506,16 +506,14 @@ class DB_MySQL:
         AND \
         start <= %s \
         AND \
-        chdata.chtxt=%s \
-        AND \
-        (\
-        title LIKE \%%s\% \
+        ( \
+        ( title LIKE \'%%"+keyword+"%%\' ) \
         OR \
-        exp LIKE \%%s\% \
+        ( exp LIKE \'%%"+keyword+"%%\' ) \
         OR \
-        longexp LIKE \%%s\% \
+        ( longexp LIKE \'%%"+keyword+"%%\' ) \
         )"
-        dbcmd = db[1].execute(dbexe, (btime, etime, chtxt,keyword,keyword,keyword))
+        dbcmd = db[1].execute(dbexe,(btime, etime))
         retall = []
         if dbcmd > 0:
             retall = db[1].fetchall()

diff --git a/rec10/trunk/src/timerec.py b/rec10/trunk/src/timerec.py
index 62d6519..a9efc7e 100644 (file)
--- a/rec10/trunk/src/timerec.py
+++ b/rec10/trunk/src/timerec.py
@@ -309,7 +309,7 @@ def task():
                     recdb.del_reckey(recdb.REC_CHANGING_CANTAINER, title, chtxt, btime)
                     sys.exit()
         elif task["type"] == recdb.REC_AUTO_KEYWORD:#"key,"+chtxt+","+keyword+","+btime+","+deltatime+","+opt
-            deltatime = task['deltatime']
+            deltatime = "24"
             if dt < 90 * 60:
                 recdatum = epgdb.searchtime_auto(title.decode('utf-8'), btime, deltatime, chtxt)
                 for recdata in recdatum:
@@ -321,10 +321,10 @@ def task():
                         exp = recdata[4]
                         longexp = recdata[5]
                         category=recdata[6]
-                        bt = datetime.datetime.strptime(btimet, "%Y-%m-%d %H:%M:%S")
-                        et = datetime.datetime.strptime(etimet, "%Y-%m-%d %H:%M:%S")
-                        btimet = bt.strftime("%Y-%m-%d %H:%M:%S")
-                        etimet = et.strftime("%Y-%m-%d %H:%M:%S")
+                        btt = datetime.datetime.strptime(btimet, "%Y-%m-%d %H:%M:%S")
+                        ett = datetime.datetime.strptime(etimet, "%Y-%m-%d %H:%M:%S")
+                        btimet = btt.strftime("%Y-%m-%d %H:%M:%S")
+                        etimet = ett.strftime("%Y-%m-%d %H:%M:%S")
                         try:
                             recdb.rec_reckey(recdb.REC_AUTO_SUGGEST, titlet, chtxtt, btimet, etimet, opt)
                         except Exception, inst:
@@ -335,12 +335,10 @@ def task():
                 et = et + dd
                 btxt = bt.strftime("%Y-%m-%d %H:%M:%S")
                 etxt = et.strftime("%Y-%m-%d %H:%M:%S")
-                recdb.everyreserv(title, chtxt, btxt, etxt, deltatime, opt, deltaday)
                 try:
                     recdb.del_reckey(recdb.REC_AUTO_KEYWORD, title, chtxt, btime)
                     recdb.auto_keyreserv(title, chtxt, btxt, etxt, "24", opt)
                 except Exception, inst:
                     print type(inst)
                     print inst
-                
     sys.exit()
\ No newline at end of file