From 98b76de6f0e6e61155df36e953cb9285a39f9d98 Mon Sep 17 00:00:00 2001
From: gn64_jp <gn64_jp@4e526526-5e11-4fc0-8910-f8fd03428081>
Date: Sat, 28 Nov 2009 07:17:15 +0000
Subject: [PATCH] implemetn rec10 0.9.0 function.

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/rec10@281 4e526526-5e11-4fc0-8910-f8fd03428081
---
 Rec10WEB/trunk/src/rec10web.py         | 22 +++++++++++-----------
 Rec10WEB/trunk/src/rec10web_dbMySQL.py |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Rec10WEB/trunk/src/rec10web.py b/Rec10WEB/trunk/src/rec10web.py
index 6bba1f7..2d71b24 100644
--- a/Rec10WEB/trunk/src/rec10web.py
+++ b/Rec10WEB/trunk/src/rec10web.py
@@ -53,20 +53,20 @@ def getRecDate():
             deltaday = "なし"
         if opt == None:
             opt = "なし"
-        if typet == "res":
-            typet = "一回予約"
-        elif typet == "key":
-            typet = "検索予約"
-        elif typet == "keyevery":
-            typet = "隔週予約"
-        elif typet == "res":
-            typet = "録画最終"
+        if typet == "reserve_flexible":
+            typet = "浮動予約"
+        elif typet == "search_today":
+            typet = "当日予約"
+        elif typet == "search_everyday":
+            typet = "隔日予約"
+        elif typet == "reserve_fixed":
+            typet = "確定予約"
         elif typet == "grid":
             typet = "外部委託"
-        elif typet == "ts2avi":
+        elif typet == "convert_ts_mp4":
             typet = "縁故予約"
-        elif typet == "b252ts":
-            typet = "復号予約"
+        elif typet == "convert_b25_ts":
+            typet = "解読予約"
         #print btime
         btime = btime[5:16]
         etime = etime[5:16]
diff --git a/Rec10WEB/trunk/src/rec10web_dbMySQL.py b/Rec10WEB/trunk/src/rec10web_dbMySQL.py
index 3ff27d2..a59fed9 100644
--- a/Rec10WEB/trunk/src/rec10web_dbMySQL.py
+++ b/Rec10WEB/trunk/src/rec10web_dbMySQL.py
@@ -147,7 +147,7 @@ class DB_MySQL:
         return [te num,bs/cs num]
         """
         db = self.connect_db()
-        dbexe = "SELECT type,epg_ch.bctype,chtxt,title FROM timeline INNER JOIN epg_ch ON timeline.chtxt=epg_ch.chtxt"
+        dbexe = "SELECT type,epg_ch.bctype,timeline.chtxt,title FROM timeline INNER JOIN epg_ch ON timeline.chtxt=epg_ch.chtxt"
         dbexe = dbexe + " WHERE NOT( ( timeline.etime <= %s ) OR ( timeline.btime >= %s ) )"
         Srec = 0
         Trec = 0
-- 
2.11.0