change many function.

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

diff --git a/rec10/trunk/src/dbMySQL.py b/rec10/trunk/src/dbMySQL.py
index 783824d..cf8d00a 100644 (file)
--- a/rec10/trunk/src/dbMySQL.py
+++ b/rec10/trunk/src/dbMySQL.py
@@ -27,7 +27,7 @@ class DB_MySQL:
         db = self.connect_db()
         try:
             db[1].execute('\
-            CREATE TABLE main_timetable \
+            CREATE TABLE timeline \
             (\
             id INT UNSIGNED AUTO_INCREMENT NOT NULL PRIMARY KEY,\
             type VARCHAR(20),\
@@ -299,32 +299,32 @@ class DB_MySQL:
         except:
             ""
         self.close_db(db)
-    def add_main_timetable(self, type="", chtxt="", title="", btime="", etime="", deltatime="", deltaday="", opt=""):
+    def add_timeline(self, type="", chtxt="", title="", btime="", etime="", deltatime="", deltaday="", opt=""):
         db = self.connect_db()
         db[1].execute('\
-        INSERT IGNORE into main_timetable \
+        INSERT IGNORE into timeline \
         (type,chtxt,title,btime,etime,deltatime,deltaday,opt) \
         values (%s,%s,%s,%s,%s,%s,%s,%s)', \
                       (type, chtxt, title, btime, etime, deltatime, deltaday, opt))
         ##db.commit()
         self.close_db(db)
-    def del_main_timetable(self, type="", title="", chtxt="", btime=""):
+    def del_timeline(self, type="", title="", chtxt="", btime=""):
         """
 
         """
         db = self.connect_db()
         db[1].execute("\
-        DELETE FROM main_timetable \
+        DELETE FROM timeline \
         WHERE type = %s AND title = %s AND chtxt = %s AND btime = %s", \
                       (type, title, chtxt, btime))
         #db.commit()
         self.close_db(db)
-    def select_all_main_timetable(self):
+    def select_all_timeline(self):
         db = self.connect_db()
         recdata = []
         dbr = db[1].execute("\
         SELECT type, chtxt, title, btime, etime, deltatime ,deltaday ,opt \
-        FROM main_timetable")
+        FROM timeline")
         dbl = db[1].fetchall()
         self.close_db(db)
         if dbr > 0:
@@ -352,13 +352,13 @@ class DB_MySQL:
                 recdata.append(ret)
         self.close_db(db)
         return recdata
-    def select_bytime_main_timetable(self, dminutes):
+    def select_bytime_timeline(self, dminutes):
         db = self.connect_db()
         recdatum = []
         #dbr=db[1].execute("SELECT type, chtxt, title, btime, etime, deltatime ,deltaday ,opt FROM rectime WHERE btime < DATE_SUB(now(),INTERVAL "+dminutes+" MINUTE ) AND btime > DATE_ADD(now(),INTERVAL "+dminutes+" MINUTE )")
         dbr = db[1].execute("SELECT \
         type, chtxt, title, btime, etime, deltatime ,deltaday ,opt \
-        FROM main_timetable \
+        FROM timeline \
         WHERE btime BETWEEN DATE_SUB(now(),INTERVAL " + dminutes + " MINUTE ) AND \
         DATE_ADD(now(),INTERVAL " + dminutes + " MINUTE )")
         dbl = db[1].fetchall()
@@ -386,10 +386,10 @@ class DB_MySQL:
                     ret['deltaday'] = deltaday
                 recdatum.append(ret)
         return recdatum
-    def delete_old_main_timetable(self, dhour):
+    def delete_old_timeline(self, dhour):
         db = self.connect_db()
         db[1].execute("\
-        DELETE FROM main_timetable \
+        DELETE FROM timeline \
         WHERE \
         btime < DATE_SUB(now(),INTERVAL " + dhour + " HOUR )")
         #db.commit()
@@ -543,7 +543,6 @@ class DB_MySQL:
         (bctype,channel,start,stop,title,exp,longexp,category) \
         values(%s,%s,%s,%s,%s,%s,%s,%s)', \
                           tvlists)
-        #db.commit()
         self.close_db(db)
     def select_by_time_ngram_epg_timeline(self, btime, etime, chtxt):
         db = self.connect_db()
@@ -737,4 +736,66 @@ class DB_MySQL:
         if len(dls)>0:
             return dls[0]
         else:
-            return dls
\ No newline at end of file
+            return dls
+
+    def new_auto_timeline_keyword(self):
+        db = self.connect_db()
+        try:
+            db[1].execute('\
+            CREATE TABLE auto_timeline_keyword \
+            (\
+            id INT UNSIGNED AUTO_INCREMENT NOT NULL PRIMARY KEY,\
+            chtxt VARCHAR(20),\
+            title VARCHAR(100),\
+            btime DATETIME,\
+            etime DATETIME,\
+            UNIQUE uni (chtxt,title,btime,etime)\
+            )')
+        except:
+            ""
+    def add_auto_timeline_keyword(self,chtxt="", title="", btime="", etime=""):
+        db = self.connect_db()
+        db[1].execute('\
+        INSERT IGNORE into auto_timeline_keyword \
+        (chtxt,title,btime,etime) \
+        values (%s,%s,%s,%s)', \
+                       (chtxt, title, btime, etime))
+        ##db.commit()
+        self.close_db(db)
+    def delete_old_auto_timeline_keyword(self, dhour):
+        db = self.connect_db()
+        db[1].execute("\
+        DELETE FROM auto_timeline_keyword \
+        WHERE \
+        btime < DATE_SUB(now(),INTERVAL " + dhour + " HOUR )")
+        self.close_db(db)
+    def new_auto_timeline_bayes(self):
+        db = self.connect_db()
+        try:
+            db[1].execute('\
+            CREATE TABLE auto_timeline_bayes \
+            (\
+            id INT UNSIGNED AUTO_INCREMENT NOT NULL PRIMARY KEY,\
+            chtxt VARCHAR(20),\
+            title VARCHAR(100),\
+            btime DATETIME,\
+            etime DATETIME,\
+            UNIQUE uni (chtxt,title,btime,etime)\
+            )')
+        except:
+            ""
+    def add_auto_timeline_bayes(self,chtxt="", title="", btime="", etime=""):
+        db = self.connect_db()
+        db[1].execute('\
+        INSERT IGNORE into auto_timeline_bayes \
+        (chtxt,title,btime,etime) \
+        values (%s,%s,%s,%s)', \
+                      (chtxt, title, btime, etime))
+        self.close_db(db)
+    def delete_old_auto_timeline_keyword(self, dhour):
+        db = self.connect_db()
+        db[1].execute("\
+        DELETE FROM auto_timeline_keyword \
+        WHERE \
+        btime < DATE_SUB(now(),INTERVAL " + dhour + " HOUR )")
+        self.close_db(db)

diff --git a/rec10/trunk/src/recdb.py b/rec10/trunk/src/recdb.py
index 3c00e3d..def1950 100644 (file)
--- a/rec10/trunk/src/recdb.py
+++ b/rec10/trunk/src/recdb.py
@@ -98,22 +98,22 @@ REC_BAYES_SUGGEST ="bayes_suggest"
 def recreserv(title, chtxt, btime, etime, opt):#optにはa(アニメ)d(副音声)v(xvid)
     rec_reckey("res", title, chtxt, btime, etime, opt)
 def auto_keyreserv(keyword, chtxt, btime, etime, deltatime, opt):
-    rec10d.rec10db.add_main_timetable(type=recdb.REC_AUTO_KEYWORD, chtxt=chtxt, title=keyword, btime=btime, etime=etime, deltatime=deltatime, opt=opt)
+    rec10d.rec10db.add_timeline(type=recdb.REC_AUTO_KEYWORD, chtxt=chtxt, title=keyword, btime=btime, etime=etime, deltatime=deltatime, opt=opt)
 def keyreserv(keyword, chtxt, btime, etime, deltatime, opt):
-    rec10d.rec10db.add_main_timetable(type=recdb.REC_KEYWORD, chtxt=chtxt, title=keyword, btime=btime, etime=etime, deltatime=deltatime, opt=opt)
+    rec10d.rec10db.add_timeline(type=recdb.REC_KEYWORD, chtxt=chtxt, title=keyword, btime=btime, etime=etime, deltatime=deltatime, opt=opt)
 def everyreserv(keyword, chtxt, btime, etime, deltatime, opt, deltaday):
-    rec10d.rec10db.add_main_timetable(type=recdb.REC_KEYWORD_EVERY_SOME_DAYS, chtxt=chtxt, title=keyword, btime=btime, etime=etime, deltatime=deltatime, opt=opt, deltaday=deltaday)
+    rec10d.rec10db.add_timeline(type=recdb.REC_KEYWORD_EVERY_SOME_DAYS, chtxt=chtxt, title=keyword, btime=btime, etime=etime, deltatime=deltatime, opt=opt, deltaday=deltaday)
 def rec_reckey(type, title, chtxt, btime, etime, opt):
-    rec10d.rec10db.add_main_timetable(type=type, chtxt=chtxt, title=title, btime=btime, etime=etime, opt=opt)
+    rec10d.rec10db.add_timeline(type=type, chtxt=chtxt, title=title, btime=btime, etime=etime, opt=opt)
 def del_reckey(type, title, chtxt, btime):
-    rec10d.rec10db.del_main_timetable(type=type, title=title, chtxt=chtxt, btime=btime)
+    rec10d.rec10db.del_timeline(type=type, title=title, chtxt=chtxt, btime=btime)
 def getnow(dhour):
     dhour = int(dhour)
     dminutes = 60 * dhour
     dminutes = str(dminutes)
-    return rec10d.rec10db.select_bytime_main_timetable(dminutes)
+    return rec10d.rec10db.select_bytime_timeline(dminutes)
 def getnow_minutes(dminutes):
-    return rec10d.rec10db.select_bytime_main_timetable(dminutes)
+    return rec10d.rec10db.select_bytime_timeline(dminutes)
 def countRecNow(dhour):
     d = getnow(dhour)
     ret = 0
@@ -152,9 +152,9 @@ def delete_old(dhour):
     """
     delete keys except recdb.REC_MISS_ENCODE and recdb.REC_KEYWORD_EVERY_SOME_DAYS before dhour hours from now.
     """
-    rec10d.rec10db.delete_old_main_timetable(dhour)
+    rec10d.rec10db.delete_old_timeline(dhour)
 def getall():
-    return rec10d.rec10db.select_all_main_timetable()
+    return rec10d.rec10db.select_all_timeline()
 def rec_reclog(title,chtxt,btime,etime,opt,exp,longexp,category):
     rec10d.rec10db.add_in_timeline_log(chtxt,title,btime,etime,opt,exp,longexp,category)
 def get_key():