change function name.

[rec10/rec10-git.git] / rec10 / trunk / src / chdb.py

diff --git a/rec10/trunk/src/chdb.py b/rec10/trunk/src/chdb.py
index adfc074..4a4852f 100644 (file)
--- a/rec10/trunk/src/chdb.py
+++ b/rec10/trunk/src/chdb.py
@@ -5,7 +5,7 @@
     # モジュール属性 argv を取得するため
 import rec10d
 
-def chtxtsearch(chtxtin):
+def searchFromCHtxt(chtxtin):
     chtxtt=chtxtin.replace("_0","_%")
     ret = []
     for datum in rec10d.rec10db.select_by_chtxt_epg_ch(chtxtt):
@@ -14,7 +14,10 @@ def chtxtsearch(chtxtin):
     if len(ret) == 0:
         ret.append(None)
     return ret[0]
-def bctypesearch(bctypein):
+def getChCSchFromCHtxt(chtxt):
+    ret = {'csch':chtxt.split("_")[1],'ch':chtxt.split("_")[0]}
+    return ret
+def searchFromBctype(bctypein):
     ret = []
     for datum in rec10d.rec10db.select_by_bctype_epg_ch(bctypein):
         rett = {'bctype':datum[0], 'chtxt':datum[1], 'ch':datum[2], 'csch':datum[3], 'update':datum[4]}
@@ -22,7 +25,7 @@ def bctypesearch(bctypein):
     if len(ret) == 0:
         ret.append(None)
     return ret[0]
-def chsearch(chin):
+def searchFromCH(chin):
     ret = []
     for datum in rec10d.rec10db.select_by_ch_epg_ch(chin):
         rett = {'bctype':datum[0], 'chtxt':datum[1], 'ch':datum[2], 'csch':datum[3], 'update':datum[4]}
@@ -30,7 +33,7 @@ def chsearch(chin):
     if len(ret) == 0:
         ret.append(None)
     return ret[0]
-def getall():
+def getAll():
     ret = []
     for datum in rec10d.rec10db.select_all_epg_ch():
         rett = {'bctype':datum[0], 'chtxt':datum[1], 'ch':datum[2], 'csch':datum[3], 'update':datum[4]}