OSDN Git Service
(root)
/
rec10
/
rec10-git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix LANG.
[rec10/rec10-git.git]
/
rec10
/
trunk
/
src
/
recdblist.py
diff --git
a/rec10/trunk/src/recdblist.py
b/rec10/trunk/src/recdblist.py
index
9686f82
..
00abe1f
100644
(file)
--- a/
rec10/trunk/src/recdblist.py
+++ b/
rec10/trunk/src/recdblist.py
@@
-76,7
+76,7
@@
REC_BAYES_SUGGEST ="bayes_suggest"
global BONTSDEMUX_DELAY
\r
BONTSDEMUX_DELAY="0"
\r
\r
global BONTSDEMUX_DELAY
\r
BONTSDEMUX_DELAY="0"
\r
\r
-version = 10
0
\r
+version = 10
1
\r
version_str="0.9.10"
\r
\r
global verbose_level_now
\r
version_str="0.9.10"
\r
\r
global verbose_level_now
\r
@@
-88,6
+88,13
@@
try:
except:
\r
log_level_now=900
\r
verbose_level_now=400
\r
except:
\r
log_level_now=900
\r
verbose_level_now=400
\r
+
\r
+os.environ['LANG'] = "ja_JP.UTF-8"
\r
+my_env = os.environ
\r
+my_env['LANG'] = "ja_JP.UTF-8"
\r
+
\r
+def getEnv():
\r
+ return my_env
\r
def printutf8(unicode,verbose_level=500):
\r
if verbose_level_now > verbose_level:
\r
try:
\r
def printutf8(unicode,verbose_level=500):
\r
if verbose_level_now > verbose_level:
\r
try:
\r
@@
-95,7
+102,7
@@
def printutf8(unicode,verbose_level=500):
print str
\r
except Exception, inst:
\r
recdblist.addCommonlogEX("Error", "printutf8(recdblist.py)", str(type(inst)), str(inst)+traceback.format_exc(),log_level=200)
\r
print str
\r
except Exception, inst:
\r
recdblist.addCommonlogEX("Error", "printutf8(recdblist.py)", str(type(inst)), str(inst)+traceback.format_exc(),log_level=200)
\r
-def printu
ft
8ex(unicode,verbose_level=500,log_level=500):
\r
+def printu
tf
8ex(unicode,verbose_level=500,log_level=500):
\r
str=unicode.encode('utf-8')
\r
if verbose_level_now > verbose_level:
\r
print str
\r
str=unicode.encode('utf-8')
\r
if verbose_level_now > verbose_level:
\r
print str
\r
@@
-106,12
+113,21
@@
def printuft8ex(unicode,verbose_level=500,log_level=500):
f=open(logfname,mode)
\r
f.write(str+"\n")
\r
f.close()
\r
f=open(logfname,mode)
\r
f.write(str+"\n")
\r
f.close()
\r
+def printutf8_Important(unicode):
\r
+ printutf8ex(unicode,100,100)
\r
+def printutf8_Normal(unicode):
\r
+ printutf8ex(unicode,300,300)
\r
+def printutf8_Detailed(unicode):
\r
+ printutf8ex(unicode,600,600)
\r
def addCommonlogEX(type,place,inst,txt,verbose_level=500,log_level=500):
\r
def addCommonlogEX(type,place,inst,txt,verbose_level=500,log_level=500):
\r
- lt=
datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S"
)+u":"
\r
+ lt=
unicode(datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
)+u":"
\r
if txt=="":
\r
lt=lt+u"["+type+u"] "+place+u" "+inst
\r
else:
\r
if txt=="":
\r
lt=lt+u"["+type+u"] "+place+u" "+inst
\r
else:
\r
- lt=lt+u"["+type+u"] "+place+u" "+inst+u"\n"+txt
\r
+ try:
\r
+ lt=lt+u"["+type+u"] "+place+u" "+inst+u"\n"+txt
\r
+ except:
\r
+ print [type,place,inst,txt]
\r
lt=lt.encode('utf-8')
\r
logfname="/var/log/rec10"
\r
mode="a"
\r
lt=lt.encode('utf-8')
\r
logfname="/var/log/rec10"
\r
mode="a"
\r
@@
-140,7
+156,10
@@
def addCommandSelfLog(tspath,command):
f=open(logpath,'a')
\r
else:
\r
f=open(logpath,'w')
\r
f=open(logpath,'a')
\r
else:
\r
f=open(logpath,'w')
\r
- f.write(command+"\n\n")
\r
+ tc=command+u"\n\n"
\r
+ tc=unicode(tc)
\r
+ f.write(tc.encode("utf-8"))
\r
+ #f.write(tc.encode('utf-8','ignore'))
\r
f.close()
\r
def getLogTitle(tspath):
\r
logo=tspath
\r
f.close()
\r
def getLogTitle(tspath):
\r
logo=tspath
\r
@@
-183,7
+202,6
@@
def addLog(tspath,txt,log_title,maxtextlength=1500):
def addLogAll(tspath,txt,log_title,logpath):
\r
logo=logpath
\r
f=open(logo,'a')
\r
def addLogAll(tspath,txt,log_title,logpath):
\r
logo=logpath
\r
f=open(logo,'a')
\r
- s=len(txt)
\r
stxt=txt
\r
txtw= datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
\r
txtw=txtw+"\n####"+log_title+"####\n"+stxt
\r
stxt=txt
\r
txtw= datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
\r
txtw=txtw+"\n####"+log_title+"####\n"+stxt
\r