remove error log.

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

diff --git a/rec10/trunk/src/timerec.py b/rec10/trunk/src/timerec.py
index 4eca5fe..da606d4 100644 (file)
--- a/rec10/trunk/src/timerec.py
+++ b/rec10/trunk/src/timerec.py
@@ -301,7 +301,7 @@ def type_reserve(typetxt,chtxt,title,bt,et,opt):
     if (dt < 58 * 60 and dt > 30 * 60):\r
         bctypet = chdb.searchCHFromChtxt(chtxt)['bctype']\r
         chdatat = rec10d.rec10db.select_by_bctype_epg_ch(bctypet)\r
-        dt1 = datetime.datetime.strptime(chdatat[0][4], "%Y-%m-%d %H:%M:%S")-datetime.datetime.now()\r
+        dt1=bt-datetime.datetime.strptime(chdatat[0][4], "%Y-%m-%d %H:%M:%S")\r
         dt1 = dt1.days * 24 * 60 * 60 + dt1.seconds\r
         if dt1 < 60 * 60:\r
             recdata = epgdb.searchTime(title, btime, "5", chtxt)\r

diff --git a/rec10/trunk/src/tv2mp4.py b/rec10/trunk/src/tv2mp4.py
index 3585202..10bf2a4 100644 (file)
--- a/rec10/trunk/src/tv2mp4.py
+++ b/rec10/trunk/src/tv2mp4.py
@@ -59,8 +59,6 @@ def raw2mp4(pin,pout,opt):
     execmp4box(pin, pout, e1)\r
     addAudio(pints, pout, opt)\r
     addCaption(pints, pout)\r
-    #recdblist.addLog(pout, txt, "mp4boxログ-コマンド")\r
-    #recdblist.addLog(pout, txt, "mp4boxログ-詳細")\r
     if status.getSettings_auto_del_tmp()==1:\r
         if os.path.exists(pout):\r
             if re.search(opt,"1") or re.search(opt,"2"):\r

diff --git a/rec10/trunk/src/tv2ts.py b/rec10/trunk/src/tv2ts.py
index dc0fac0..1c02c55 100644 (file)
--- a/rec10/trunk/src/tv2ts.py
+++ b/rec10/trunk/src/tv2ts.py
@@ -21,9 +21,6 @@ def tv2tsmix(pout, ch, time,getlog=0):
     #    except:
     #        ""
 def tv2ts(pout, ch, csch, time):
-    ext = os.path.splitext(pout)[1]#ext=".なんたら"
-    tempt = os.path.split(pout)
-    path = tempt[0]
     if len(ch) > 2:#BS/CSは100とかCS??とかなので3文字以上
         status.changeBSCSRecording(1)
     else:
@@ -54,9 +51,6 @@ def tv2ts(pout, ch, csch, time):
         except:
             ""
 def b252ts(pout, ch, csch):
-    ext = os.path.splitext(pout)[1]#ext=".なんたら"
-    tempt = os.path.split(pout)
-    path = tempt[0]
     b252tsmix(pout + ".b25", pout + ".tsmix")
     tch=u"0"
     if csch!=u"0":
@@ -65,15 +59,7 @@ def b252ts(pout, ch, csch):
         tch=u"101"
     elif ch==u"102":
         tch=u"102"
-    #else:
-    #    tch=ch
     tsmix2ts(pout + ".tsmix", pout, tch)
-    if os.access(pout, os.F_OK):
-        try:
-            #os.remove(path + "/" + t + ext)
-            ""
-        except:
-            ""
 def tv2b25ts(pout, ch, time):
     exe = configreader.getConfPath('recpt1')
     if len(ch) > 2:#BS/CSは100とかCS??とかなので3文字以上

diff --git a/rec10/trunk/src/zenhan.py b/rec10/trunk/src/zenhan.py
index d2787d4..4d28519 100644 (file)
--- a/rec10/trunk/src/zenhan.py
+++ b/rec10/trunk/src/zenhan.py
@@ -10,8 +10,6 @@ global z_number
 global h_number
 z_ascii = u"ＡＢＣＤＥＦＧＨＩＪＫＬＭＮＯＰＱＲＳＴＵＶＷＸＹＺａｂｃｄｅｆｇｈｉｊｋｌｍｎｏｐｑｒｓｔｕｖｗｘｙｚ　！”＃＄％＆’（）＊＋，−．／：；＜＝＞？＠［￥］＾＿‘｛｜｝〜　〜"
 h_ascii = u"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz !\"#$%&'()*+,-./:;<=>?@[\]^_`{|}~ -"
-#z_ascii = z_ascii+Ur"\Ue28892\Uefbc8e"
-#h_ascii = h_ascii+Ur"\Uefbc8d."
 z_ascii_sp = unichr(0x2212)+unichr(0xff0e)
 h_ascii_sp = unichr(0x002d)+unichr(0x002e)
 z_number = u"０１２３４５６７８９"
@@ -50,13 +48,7 @@ def checkCharacterType(character):
     """
     return code is 1:Alphabet 2:Hiragana 3:Katakana 4:Kanji
     """
-    #recdblist.printutf8(character)
-    #recdblist.printutf8(type(character))
-    #character=character.encode('UTF-8')
-    #recdblist.printutf8(character)
-    #recdblist.printutf8(type(character))
     chcode=ord(character)
-    #recdblist.printutf8(ord(chcode))
     if chcode>=0x0000 and chcode<=0x007F:
         return 1
     elif chcode>=0x3040 and chcode<=0x309F: