change function name.

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

diff --git a/rec10/trunk/src/recdblist.py b/rec10/trunk/src/recdblist.py
index 782f0df..bcaa133 100644 (file)
--- a/rec10/trunk/src/recdblist.py
+++ b/rec10/trunk/src/recdblist.py
@@ -9,6 +9,9 @@ task names
 import datetime
 import os
 import os.path
+import traceback
+
+import configreader
 
 global REC_RESERVE
 global REC_FINAL_RESERVE
@@ -70,19 +73,28 @@ REC_AUTO_SUGGEST_AP2FP = "auto_suggest_ap2fp"
 REC_AUTO_KEYWORD = "auto_keyword"
 REC_BAYES_SUGGEST ="bayes_suggest"
 
-version = 98
-version_str="0.9.8"
+global BONTSDEMUX_DELAY
+BONTSDEMUX_DELAY="0"
+
+version = 100
+version_str="0.9.10"
 
-verbose_level_now = 400
-log_level_now = 400
+global verbose_level_now
+global log_level_now
+
+try:
+    log_level_now=int(configreader.getLogSetting("log_level"))
+    verbose_level_now=int(configreader.getLogSetting("verbose_level"))
+except:
+    log_level_now=900
+    verbose_level_now=400
 def printutf8(unicode,verbose_level=500):
-    print verbose_level_now
-    print verbose_level
     if verbose_level_now > verbose_level:
-        str=unicode.encode('utf-8')
-        print str
-    else :
-        print "test"
+        try:
+            str=unicode.encode('utf-8')
+            print str
+        except Exception, inst:
+            recdblist.addCommonlogEX("Error", "printutf8(recdblist.py)", str(type(inst)), str(inst)+traceback.format_exc(),log_level=200)
 def printuft8ex(unicode,verbose_level=500,log_level=500):
     str=unicode.encode('utf-8')
     if verbose_level_now > verbose_level:
@@ -94,7 +106,7 @@ def printuft8ex(unicode,verbose_level=500,log_level=500):
             f=open(logfname,mode)
             f.write(str+"\n")
             f.close()
-def Commonlogex(type,place,inst,txt,verbose_level=500,log_level=500):
+def addCommonlogEX(type,place,inst,txt,verbose_level=500,log_level=500):
     lt=datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")+u":"
     if txt=="":
         lt=lt+u"["+type+u"] "+place+u" "+inst
@@ -111,9 +123,9 @@ def Commonlogex(type,place,inst,txt,verbose_level=500,log_level=500):
             f.write(lt+"\n")
             f.close()
 def addCommandLog(tspath,log_title,cmd,cmd_log=""):
-    addlog(tspath,cmd,log_title+u"ログ-コマンド")
-    addlog(tspath,cmd_log,log_title+u"ログ-詳細")
-def addlog(tspath,txt,log_title):
+    addLog(tspath,cmd,log_title+u"ログ-コマンド")
+    addLog(tspath,cmd_log,log_title+u"ログ-詳細")
+def addLog(tspath,txt,log_title):
     logo=tspath
     logo=logo.replace("_1.wav",".ts")
     logo=logo.replace("_2.wav",".ts")
@@ -136,14 +148,14 @@ def addlog(tspath,txt,log_title):
     f=open(logo,'a')
     s=len(txt)
     stxt=""
-    if s>1600:
-        stxt=txt[0:800]+"\n\n(ry..)\n"
-        st=txt[s-800:].find("\n")
+    if s>3000:
+        stxt=txt[0:1500]+"\n\n(ry..)\n"
+        st=txt[s-1500:].find("\n")
         if st>0:
-            stxt=stxt+txt[s-800+st:]
+            stxt=stxt+txt[s-1500+st:]
     else:
         stxt=txt
     txtw= datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
     txtw=txtw+"\n####"+log_title+"####\n"+stxt
     f.write(txtw.encode('utf-8'))
-    f.close()
\ No newline at end of file
+    f.close()