OSDN Git Service

(root) / rec10 / rec10-git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9101332)
enable to show schedule is busy
authorgn64_jp <gn64_jp@4e526526-5e11-4fc0-8910-f8fd03428081>
Wed, 27 May 2009 12:42:35 +0000 (12:42 +0000)
committergn64_jp <gn64_jp@4e526526-5e11-4fc0-8910-f8fd03428081>
Wed, 27 May 2009 12:42:35 +0000 (12:42 +0000)
git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/rec10@21 4e526526-5e11-4fc0-8910-f8fd03428081

Rec10WEB/trunk/src/fin.htm patch | blob | history
Rec10WEB/trunk/src/finover.htm [new file with mode: 0644] patch | blob
Rec10WEB/trunk/src/rec10web.py patch | blob | history

diff --git a/Rec10WEB/trunk/src/fin.htm b/Rec10WEB/trunk/src/fin.htm
index 8516975..1d64b13 100644 (file)
--- a/Rec10WEB/trunk/src/fin.htm
+++ b/Rec10WEB/trunk/src/fin.htm
@@ -5,9 +5,9 @@
       <head>
       <meta http-equive="Content-Type" content="text/html;charset=UTF-8"/>
        <meta http-equiv="refresh" content="3; url=rec10web.py">
-　　　<title>Rec10 Simple Web Interface ver.0.1.2</title>         
+　　　<title>Rec10 Simple Web Interface ver.0.3.2</title>
        </head>
-       <h1>Rec10 Simple Web Interface ver.0.1.2</h1><br><br>
+       <h1>Rec10 Simple Web Interface ver.0.3.2</h1><br><br>
        予約が終了しました。移動します。
       </body>
 </html>
diff --git a/Rec10WEB/trunk/src/finover.htm b/Rec10WEB/trunk/src/finover.htm
new file mode 100644 (file)
index 0000000..e170908
--- /dev/null
+++ b/Rec10WEB/trunk/src/finover.htm
@@ -0,0 +1,13 @@
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+      <head>
+      <meta http-equive="Content-Type" content="text/html;charset=UTF-8"/>
+       <meta http-equiv="refresh" content="3; url=rec10web.py">
+　　　<title>Rec10 Simple Web Interface ver.0.3.2</title>
+       </head>
+       <h1>Rec10 Simple Web Interface ver.0.3.2</h1><br><br>
+       最大録画可能数を越えています。
+      </body>
+</html>
diff --git a/Rec10WEB/trunk/src/rec10web.py b/Rec10WEB/trunk/src/rec10web.py
index a758781..bcfd0fe 100644 (file)
--- a/Rec10WEB/trunk/src/rec10web.py
+++ b/Rec10WEB/trunk/src/rec10web.py
@@ -11,7 +11,6 @@ cgitb.enable()
 path=str(os.path.dirname(os.path.abspath(__file__)))+"/"
 dbpath=path+"ch.db"
 
-
 def getchtxt():
     db=sqlite3.connect(dbpath)
     chopt=""
@@ -23,12 +22,41 @@ def getchtxt():
     db.close()
     return chopt
 def reserv(type,keyword,chtxt,btime,etime,deltatime,opt,deltaday):
+    MaxT=2
+    MaxS=2
     db=sqlite3.connect(dbpath)
-    recline="\""+type+"\",\""+chtxt+"\",\""+keyword+"\",datetime(\""+btime+"\"),datetime(\""+etime+"\"),\""+deltatime+"\",\""+opt+"\",\""+deltaday+"\""
-    #print recline
-    db.execute('insert into rectime ("type","chtxt","title","btime","etime","deltatime","opt","deltaday") values ('+recline+')')
-    db.commit()
+    bt="\'"+btime+"\'"
+    et="\'"+etime+"\'"
+    dbexe="SELECT chdata.bctype,rectime.chtxt,rectime.title FROM rectime INNER JOIN chdata ON rectime.chtxt=chdata.chtxt"
+    #dbexe="SELECT bctype,chtxt,title FROM rectime INNER JOIN chdata ON rectime.chtxt=chdata.chtxt"
+
+    dbexe=dbexe+" WHERE NOT( ( rectime.etime <= "+bt+" ) OR ( rectime.btime >= "+et+" ) )"
+    for bctypet, chtxtt, titlet in db.execute(dbexe):
+        if bctypet.find("cs")>-1:
+            MaxS=MaxS-1
+        elif bctypet.find("bs")>-1:
+            MaxS=MaxS-1
+        elif bctypet.find("te")>-1:
+            MaxT=MaxT-1
+    bctype=""
+    rett=""
+    for bctypet, chtxtt in db.execute("SELECT bctype,chtxt FROM chdata WHERE chtxt=\'"+chtxt+"\'"):
+        bctype=bctypet
+    if bctype.find("cs")>-1:
+        MaxS=MaxS-1
+    elif bctype.find("bs")>-1:
+        MaxS=MaxS-1
+    elif bctype.find("te")>-1:
+        MaxT=MaxT-1
+    if MaxS>-1 and MaxT>-1:
+        recline="\""+type+"\",\""+chtxt+"\",\""+keyword+"\",datetime(\""+btime+"\"),datetime(\""+etime+"\"),\""+deltatime+"\",\""+opt+"\",\""+deltaday+"\""
+        #print recline
+        db.execute('insert into rectime ("type","chtxt","title","btime","etime","deltatime","opt","deltaday") values ('+recline+')')
+        db.commit()
+    else:
+        rett="over"
     db.close()
+    return rett
 def station2chtxt(station):
     db=sqlite3.connect(dbpath)
     ret=""
@@ -41,11 +69,17 @@ def readHtmlSrcSimple():
     ret=f.read()
     f.close()
     return ret
+
 def readRecFinisSimple():
     f = open(path+'fin.htm')
     ret=f.read()
     f.close()
     return ret
+def readRecFinisOver():
+    f = open(path+'finover.htm')
+    ret=f.read()
+    f.close()
+    return ret
 f=cgi.FieldStorage()
 
 btime=""
@@ -113,10 +147,12 @@ htmdate=htmdate.replace("<!--size-value//-->",size)
 htmdate=htmdate.replace("<!--opts-value//-->",opts)
 
 if (chtxt != "")and(title != "")and(btime!="")and(etime!="")and(opts!="")and(exect=="yes"):
-    reserv(type, title, chtxt, btime, etime, deltahour, opts, deltaday)
-    htmdate=readRecFinisSimple()
+    restxt=reserv(type, title, chtxt, btime, etime, deltahour, opts, deltaday)
+    if restxt=="":
+        htmdate=readRecFinisSimple()
+    elif restxt=="over":
+        htmdate=readRecFinisOver()
     exect=""
 #
 print htmdate
 
-
rec10 git
About OSDN
Find Software
Develop Software
Help