history-ch title modify.

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

diff --git a/rec10/trunk/src/xml2db_dom.py b/rec10/trunk/src/xml2db_dom.py
index 1bb2737..15dba01 100644 (file)
--- a/rec10/trunk/src/xml2db_dom.py
+++ b/rec10/trunk/src/xml2db_dom.py
@@ -43,6 +43,7 @@ def xml2db_dom(xmlpath, bctype):#bctypeは放送種別で'TE'(地デジ)BS,CSが
     chlist=[]
     tvlist=[]
     bayes={}
+    rHisch=re.compile(u"『(.+)』(.+)\Z")##History CHのタイトル#01  exp:「#01説明」をタイトルに含める
     for ch in dom.getElementsByTagName('channel'):
         ontv=ch.getAttribute("id")
         chname=ch.getElementsByTagName("display-name").item(0).childNodes[0].data
@@ -55,7 +56,7 @@ def xml2db_dom(xmlpath, bctype):#bctypeは放送種別で'TE'(地デジ)BS,CSが
         desc=zenhan.toHankaku_ABC123(getText_item(tv.getElementsByTagName("desc")))
         longdesc=zenhan.toHankaku_ABC123(getText_item(tv.getElementsByTagName("longdesc")))
         category=zenhan.toHankaku_ABC123(getText_item(tv.getElementsByTagName("category")))
-        title=addTitle_Subtitle(title,desc)
+        title=addTitle_Subtitle(rHisch,1,title,desc)
         tch=chdb.ontvsearch(channel)
         if tch!=None:
             if tch.get('bctype',"")==bctype:
@@ -119,13 +120,12 @@ def getChdata(xmlpath):
         return chlist[0]
     else:
         return ["",""]
-def addTitle_Subtitle(title,exp):
+def addTitle_Subtitle(recompiled,num,title,exp):
     try:
-        rST=re.compile(u"『(.+)』(.+)\Z")##History CHのタイトル#01  exp:「#01説明」をタイトルに含める
-        tST=rST.match(exp)
+        tST=recompiled.match(exp)
         newtitle=u""
         if tST:
-            newtitle=title+u"『"+tST.group(0)+u"』"
+            newtitle=title+u"『"+tST.group(num)+u"』"
         else:
             newtitle=title
     except Exception, inst: