some fix

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

diff --git a/Rec10WEB/trunk/src/rec10web.py b/Rec10WEB/trunk/src/rec10web.py
index c15b0b3..fb210a5 100644 (file)
--- a/Rec10WEB/trunk/src/rec10web.py
+++ b/Rec10WEB/trunk/src/rec10web.py
@@ -6,6 +6,7 @@ import cgi
 import cgitb
 import sqlite3
 import os
+import datetime
 cgitb.enable()
 path=str(os.path.dirname(os.path.abspath(__file__)))+"/"
 dbpath=path+"ch.db"
@@ -24,7 +25,7 @@ def getchtxt():
 def reserv(type,keyword,chtxt,btime,etime,deltatime,opt,deltaday):
     db=sqlite3.connect(dbpath)
     recline="\""+type+"\",\""+chtxt+"\",\""+keyword+"\",datetime(\""+btime+"\"),datetime(\""+etime+"\"),\""+deltatime+"\",\""+opt+"\",\""+deltaday+"\""
-    print recline
+    #print recline
     db.execute('insert into rectime ("type","chtxt","title","btime","etime","deltatime","opt","deltaday") values ('+recline+')')
     db.commit()
     db.close()
@@ -52,6 +53,7 @@ etime=""
 title=""
 chtxt=""
 type="res"
+bt=""
 ###ここからiEPG用の読み出し
 if f.getfirst('station'):
     station=f.getfirst('station')
@@ -65,8 +67,24 @@ if f.getfirst('chtxt'):
     chtxt=f.getfirst('chtxt')
 if f.getfirst('btime'):
     btime=f.getfirst('btime')
+    bt=datetime.datetime.strptime(btime,"%Y-%m-%d %H:%M:%S")
 if f.getfirst('etime'):
     etime=f.getfirst('etime')
+    et=datetime.datetime.strptime(etime,"%Y-%m-%d %H:%M:%S")
+    if bt !="":
+        delt=et-bt
+        dt=delt.days*24*60+delt.seconds
+        if dt<0:
+            dd=datetime.timedelta(days=1)
+            et=et+dd
+            etime=et.strftime("%Y-%m-%d %H:%M:%S")
+        if dt<-1*24*60+1:
+            d1=datetime.datetime(bt.year,0,0)
+            d2=datetime.datetime(bt.year+1,0,0)
+            dd=d2-d1
+            et=et+dd
+            etime=et.strftime("%Y-%m-%d %H:%M:%S")
+        
 size=""
 if f.getfirst('size'):
     size=f.getfirst('size')