fix a bug,

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

diff --git a/rec10/trunk/src/tester.py b/rec10/trunk/src/tester.py
index 7d11f8c..4437123 100644 (file)
--- a/rec10/trunk/src/tester.py
+++ b/rec10/trunk/src/tester.py
@@ -44,4 +44,5 @@ recpath = "/home/ftpusr/ftp-tmp/Recording/"
 ftpusr = "/home/ftpusr/ftp-tmp"
 recordedpath = u"/home/ftpusr/ftp-video"
 if __name__ == "__main__":
-    rec10d.rec10db.update_db_98to100()
\ No newline at end of file
+    #rec10d.rec10db.update_db_98to100()
+    recque.searchRecQue(recpath)
\ No newline at end of file

diff --git a/rec10/trunk/src/timerec.py b/rec10/trunk/src/timerec.py
index 6628427..987ebef 100644 (file)
--- a/rec10/trunk/src/timerec.py
+++ b/rec10/trunk/src/timerec.py
@@ -54,7 +54,7 @@ def task():
     encodenum=0
     b25num=0
     dnow=datetime.datetime.now()
-    if dnow.minute%10<5:
+    if dnow.minute % 10 < 5:
         pid = os.fork()
         if pid != 0:
             ""
@@ -483,7 +483,10 @@ def type_keyword_every_day(type,chtxt,title,bt,et,opt,deltatime,deltaday,counter
         et = et + dd
         btxt = bt.strftime("%Y-%m-%d %H:%M:%S")
         etxt = et.strftime("%Y-%m-%d %H:%M:%S")
-        recdb.reserveEverydayKeyword(title, chtxt, btxt, etxt, deltatime, opt, deltaday)
+        if counter>0:
+            recdb.reserveEverydayKeyword(title, chtxt, btxt, etxt, deltatime, opt, deltaday,counter-1)
+        elif counter==-1:
+            recdb.reserveEverydayKeyword(title, chtxt, btxt, etxt, deltatime, opt, deltaday,-1)
     elif dt < 120 * 60:
         recdb.deleteReckey(recdblist.REC_KEYWORD_EVERY_SOME_DAYS, title, chtxt, btime)
         bt = bt + dd