improve installer.

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

diff --git a/rec10/trunk/src/dbMySQL.py b/rec10/trunk/src/dbMySQL.py
index 057b6b8..a6d600d 100644 (file)
--- a/rec10/trunk/src/dbMySQL.py
+++ b/rec10/trunk/src/dbMySQL.py
@@ -522,10 +522,10 @@ class DB_MySQL:
         """
         db = self.connect_db()
         dbexe = "SELECT type,epg_ch.bctype,timeline.chtxt,title FROM timeline INNER JOIN epg_ch ON timeline.chtxt=epg_ch.chtxt"
-        dbexe = dbexe + " WHERE NOT( ( timeline.etime <= %s ) OR ( timeline.btime >= %s ) )"
+        dbexe = dbexe + " WHERE ((NOT(( timeline.etime <= %s )OR( timeline.btime >= %s ))) OR ((timeline.btime = %s) AND (timeline.etime = %s) ) )"
         Srec = 0
         Trec = 0
-        db[1].execute(dbexe, (btime, etime))
+        db[1].execute(dbexe, (btime, etime,btime,etime))
         for typet, bctypet, chtxtt, titlet in db[1].fetchall():
             if (typet == recdblist.REC_RESERVE) or (typet == recdblist.REC_FINAL_RESERVE) or (typet == recdblist.REC_KEYWORD) or (typet == recdblist.REC_KEYWORD_EVERY_SOME_DAYS):
                 if bctypet.find("cs") > -1:

diff --git a/rec10/trunk/src/install.sh b/rec10/trunk/src/install.sh
index 0151c36..7dca787 100644 (file)
--- a/rec10/trunk/src/install.sh
+++ b/rec10/trunk/src/install.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 SELF_DIR=`dirname $0`
 cd ${SELF_DIR}
-export LANG="ja_JP.UTF-8" && python2.6 ./install.py
\ No newline at end of file
+export LANG="ja_JP.UTF-8" && python2.6 ./install.py

diff --git a/rec10/trunk/src/tester.py b/rec10/trunk/src/tester.py
index 6c94f74..c2394dd 100644 (file)
--- a/rec10/trunk/src/tester.py
+++ b/rec10/trunk/src/tester.py
@@ -17,7 +17,7 @@ import os
 #import checker
 #import configreader
 #import classify
-#import epgdb
+import epgdb
 #import rec10d
 #import recdb
 #from ts2x264 import ts2x264
@@ -69,6 +69,6 @@ if __name__ == "__main__":
     #recdblist.printutf8(zenhan.check_Character_Type())
     #auto_process.Update_to_MP4("")
     #rec10d.rec10db.add_recjbk("畑健二郎")
-    xml2db_dom.xml2db_dom("C:\\Users\\yukikaze\\Desktop\\bsepgdata.xml","")
+    print epgdb.count_schedule("2009-12-25 17:00:00","2009-12-25 20:00:00")
     ""
     
\ No newline at end of file