implement longexp.

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

diff --git a/rec10/trunk/src/dbMySQL.py b/rec10/trunk/src/dbMySQL.py
index 8856302..248d58a 100644 (file)
--- a/rec10/trunk/src/dbMySQL.py
+++ b/rec10/trunk/src/dbMySQL.py
@@ -218,13 +218,13 @@ class DB_MySQL:
                       (status, bctype)\
                       )
         self.close_db(db)
-    def add_reclog(self , chtxt="", title="", btime="", etime="", opt="",category=""):
+    def add_reclog(self , chtxt="", title="", btime="", etime="", opt="", exp="", longexp="", category=""):
         db = self.connect_db()
         db[1].execute('\
         INSERT IGNORE into reclog \
-        (chtxt,title,btime,etime,opt,category) \
-        values (%s,%s,%s,%s,%s,%s)', \
-                      ( chtxt, title, btime, etime, opt,category))
+        (chtxt,title,btime,etime,opt,exp,longexp,category) \
+        values (%s,%s,%s,%s,%s,%s,%s,%s)', \
+                      ( chtxt, title, btime, etime, opt,exp,longexp,category))
         ##db.commit()
         self.close_db(db)
     def del_reclog(self, title="", chtxt="", btime=""):
@@ -250,6 +250,8 @@ class DB_MySQL:
             btime DATETIME,\
             etime DATETIME,\
             opt VARCHAR(20),\
+            exp VARCHAR(200),\
+            longexp TEXT,\
             category VARCHAR(100),\
             UNIQUE uni (chtxt,title,btime,category)\
             )')
@@ -442,6 +444,7 @@ class DB_MySQL:
             stop  VARCHAR(30),\
             title VARCHAR(100),\
             exp VARCHAR(200),\
+            longexp TEXT,\
             category VARCHAR(100),\
             UNIQUE unitv(bctype,channel,start,stop,title)\
             )")
@@ -449,23 +452,23 @@ class DB_MySQL:
             ""
         #db.commit()
         self.close_db(db)
-    def add_tv(self, bctype, channel, start, stop, title, desc, category):
+    def add_tv(self, bctype, channel, start, stop, title, desc,longdesc, category):
         db = self.connect_db()
         db[1].execute('\
         INSERT IGNORE INTO tv \
-        VALUES (%s,%s,%s,%s,%s,%s,%s)', \
-                      (bctype, channel, start, stop, title, desc, category))
+        VALUES (%s,%s,%s,%s,%s,%s,%s,%s)', \
+                      (bctype, channel, start, stop, title, desc,longdesc,category))
         #db.commit()
         self.close_db(db)
     def add_multi_tv(self, tvlists):
         """
-        tvlists is (bctype,channel,start,stop,title,desc,category) lists.
+        tvlists is (bctype,channel,start,stop,title,desc,longdesc,category) lists.
         """
         db = self.connect_db()
         db[1].executemany('\
         INSERT IGNORE INTO tv \
-        (bctype,channel,start,stop,title,exp,category) \
-        values(%s,%s,%s,%s,%s,%s,%s)', \
+        (bctype,channel,start,stop,title,exp,longexp,category) \
+        values(%s,%s,%s,%s,%s,%s,%s,%s)', \
                           tvlists)
         #db.commit()
         self.close_db(db)
@@ -475,7 +478,7 @@ class DB_MySQL:
         db = self.connect_db()
         dbexe = "\
         SELECT \
-        chdata.chtxt,title,start,stop,category \
+        chdata.chtxt,title,start,stop,exp,longexp,category \
         FROM tv \
         INNER JOIN chdata \
         WHERE chdata.ontv=tv.channel \

diff --git a/rec10/trunk/src/epgdb.py b/rec10/trunk/src/epgdb.py
index 4ecb80b..941cb88 100644 (file)
--- a/rec10/trunk/src/epgdb.py
+++ b/rec10/trunk/src/epgdb.py
@@ -75,7 +75,7 @@ def searchtime2(titletxt, timet, deltatime, chtxt):
     one = ["", "", "", ""]
     tempt = 0
     d = rec10d.rec10db.select_by_time_ngram_tv(beforetime, aftertime, chtxt)
-    for chtxtt, title, start, stop ,category in d:
+    for chtxtt, title, start, stop ,exp,longexp,category in d:
         #print chtxtt+":"+title+":"+start+":"+stop
         p = n_gram.bigram(titletxt, title)
         btime = start
@@ -91,7 +91,7 @@ def searchtime2(titletxt, timet, deltatime, chtxt):
             p = p + dt
             print dt
         if p > tempt:
-            one = [chtxtt, title.encode('utf-8'), btime, etime,category.encode('UTF-8')]
+            one = [chtxtt, title.encode('utf-8'), btime, etime,exp.encode('UTF-8'),longexp.encode('UTF-8'),category.encode('UTF-8')]
             tempt = p
         if p > 0:
             print title + ":" + str(p) + "点"

diff --git a/rec10/trunk/src/rec10d.py b/rec10/trunk/src/rec10d.py
index b3be636..995eef6 100644 (file)
--- a/rec10/trunk/src/rec10d.py
+++ b/rec10/trunk/src/rec10d.py
@@ -6,7 +6,6 @@ import os
 
 import configreader
 import dbMySQL
-import dbSQLite
 import timerec
 path = str(os.path.dirname(os.path.abspath(__file__))) + "/"
 global rec10db

diff --git a/rec10/trunk/src/recdb.py b/rec10/trunk/src/recdb.py
index 055fb92..5225a6e 100644 (file)
--- a/rec10/trunk/src/recdb.py
+++ b/rec10/trunk/src/recdb.py
@@ -103,6 +103,5 @@ def delete_old(dhour):
     rec10d.rec10db.delete_old_rectime(dhour)
 def getall():
     return rec10d.rec10db.select_all_rectime()
-def rec_reclog(title,chtxt,btime,etime,opt,category):
-    rec10d.rec10db.add_reclog(chtxt,title,btime,etime,opt,category)
-    
+def rec_reclog(title,chtxt,btime,etime,opt,exp,longexp,category):
+    rec10d.rec10db.add_reclog(chtxt,title,btime,etime,opt,exp,longexp,category)
\ No newline at end of file

diff --git a/rec10/trunk/src/timerec.py b/rec10/trunk/src/timerec.py
index b1ff83c..f1a2f46 100644 (file)
--- a/rec10/trunk/src/timerec.py
+++ b/rec10/trunk/src/timerec.py
@@ -110,7 +110,9 @@ def task():
                         titlen = recdata[1]
                         btimen = recdata[2]
                         etimen = recdata[3]
-                        category=recdata[4]
+                        exp = recdata[4]
+                        longexp = recdata[5]
+                        category=recdata[6]
                         bt = datetime.datetime.strptime(btimen, "%Y-%m-%d %H:%M:%S")
                         et = datetime.datetime.strptime(etimen, "%Y-%m-%d %H:%M:%S")
                         btimen = bt.strftime("%Y-%m-%d %H:%M:%S")
@@ -119,7 +121,7 @@ def task():
                             try:
                                 recdb.del_reckey(recdb.REC_RESERVE, title, chtxt, btime)
                                 recdb.rec_reckey(recdb.REC_FINAL_RESERVE, titlen, chtxtn, btimen, etimen, opt)
-                                recdb.rec_reclog(titlen, chtxtn, btimen, etimen, opt, category)
+                                recdb.rec_reclog(titlen, chtxtn, btimen, etimen, opt, exp, longexp, category)
                                 print "Oikake "+title+" : "+titlen+" "+btimen+" "+etimen
                             except Exception, inst:
                                 print type(inst)
@@ -147,7 +149,9 @@ def task():
                     titlet = recdata[1]
                     btimet = recdata[2]
                     etimet = recdata[3]
-                    category = recdata[4]
+                    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")
@@ -155,11 +159,12 @@ def task():
                     try:
                         recdb.del_reckey(recdb.REC_KEYWORD, title, chtxt, btime)
                         recdb.rec_reckey(recdb.REC_RESERVE, titlet, chtxtt, btimet, etimet, opt)
-                        recdb.rec_reclog(titlet, chtxtt, btimet, etimet, opt, category)
+                        
                         print "key "+title+" : "+titlet+" "+btimet+" "+etimet
                     except Exception, inst:
                         print type(inst)
                         print inst
+                    recdb.rec_reclog(titlet, chtxtt, btimet, etimet, opt, exp,longexp,category)
                 else:
                     print "nothing match"
         elif task["type"] == recdb.REC_KEYWORD_EVERY_SOME_DAYS:#"keyevery,"+chtxt+","+keyword+","+btime+","+deltatime+","+opt+","+deltaday

diff --git a/rec10/trunk/src/xml2db.py b/rec10/trunk/src/xml2db.py
index a3d1c26..0fa6514 100644 (file)
--- a/rec10/trunk/src/xml2db.py
+++ b/rec10/trunk/src/xml2db.py
@@ -87,14 +87,16 @@ def end_element(name):
             ustop = unicode(xmldate['programme:stop'].replace(" +0900", ""))
             utitle = unicode(xmldate['title'].replace(",", "-"))
             udesc = unicode(xmldate['desc'])
+            ulongdesc = unicode(xmldate['longdesc'])
             ucategory = unicode(xmldate['category'])
             #print ucategory+"//"
-            tvlists.append([ubctype, uch, ustart, ustop, utitle, udesc,ucategory])
+            tvlists.append([ubctype, uch, ustart, ustop, utitle, udesc,ulongdesc,ucategory])
             #writetvDB(ubctype,uch,ustart,ustop,utitle,udesc)
             #print xmld
             #print xmldate
             xmldate['title'] = ""
             xmldate['desc'] = ""
+            xmldate['longdesc'] = ""
             xmldate['category'] =""
             #xmldate[]
         if name == "tv":