From df8305f0ccac914280252c7b4b5513c8d5f6eb5d Mon Sep 17 00:00:00 2001
From: gn64_jp <gn64_jp@4e526526-5e11-4fc0-8910-f8fd03428081>
Date: Thu, 2 Dec 2010 06:47:02 +0000
Subject: [PATCH] implement update(to 0.9.10)

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/rec10@763 4e526526-5e11-4fc0-8910-f8fd03428081
---
 rec10/trunk/src/dbMySQL.py   | 7 +++++--
 rec10/trunk/src/install.py   | 2 ++
 rec10/trunk/src/recdblist.py | 4 ++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/rec10/trunk/src/dbMySQL.py b/rec10/trunk/src/dbMySQL.py
index b89ee6f..beb5d1f 100644
--- a/rec10/trunk/src/dbMySQL.py
+++ b/rec10/trunk/src/dbMySQL.py
@@ -1182,11 +1182,14 @@ class DB_MySQL:
         self.new_in_settings()
         self.close_db(db)
         self.change_version_in_status("98")
-    def update_db_98to99(self):
+    def update_db_98to100(self):
+        ###ここで前のepg_chをバックアップしてchtxtの変換をする必要がある。
         db = self.connect_db()
         self.drop_in_settings()
         self.new_in_settings()
         db[1].execute("\
+        UPDATE timeline INNER JOIN epg_ch ON timeline.chtxt=epg_ch.chtxt SET chtxt=CONCAT(CONCAT(epg_ch.ch,'_'),epg_ch.csch)")
+        db[1].execute("\
         ALTER TABLE epg_ch DEL ontv")
         db[1].execute("\
         ALTER TABLE in_auto_jbk_key ADD auto TINYINT DEFAULT 0")
@@ -1194,4 +1197,4 @@ class DB_MySQL:
         ALTER TABLE in_auto_jbk_key ADD opt VARCHAR(20)")
         self.close_db(db)
         self.change_installed_in_status()#チャンネルスキャンをさせる
-        self.change_version_in_status("99")
\ No newline at end of file
+        self.change_version_in_status("100")
\ No newline at end of file
diff --git a/rec10/trunk/src/install.py b/rec10/trunk/src/install.py
index 90ef9ce..d6430ea 100644
--- a/rec10/trunk/src/install.py
+++ b/rec10/trunk/src/install.py
@@ -304,5 +304,7 @@ def update_db(version):
         rec10d.rec10db.update_db_95to96()
     elif version==96:
         rec10d.rec10db.update_db_96to98()
+    elif version==98:
+        rec10d.rec10db.update_db_98to100()
 if __name__ == "__main__":
     move()
diff --git a/rec10/trunk/src/recdblist.py b/rec10/trunk/src/recdblist.py
index 6d0341f..b0c8d7a 100644
--- a/rec10/trunk/src/recdblist.py
+++ b/rec10/trunk/src/recdblist.py
@@ -76,8 +76,8 @@ REC_BAYES_SUGGEST ="bayes_suggest"
 global BONTSDEMUX_DELAY
 BONTSDEMUX_DELAY="0"
 
-version = 98
-version_str="0.9.8"
+version = 100
+version_str="0.9.10"
 
 global verbose_level_now
 global log_level_now
-- 
2.11.0