OSDN Git Service

make it to 0.8.0
authorgn64_jp <gn64_jp@4e526526-5e11-4fc0-8910-f8fd03428081>
Sun, 1 Nov 2009 01:38:45 +0000 (01:38 +0000)
committergn64_jp <gn64_jp@4e526526-5e11-4fc0-8910-f8fd03428081>
Sun, 1 Nov 2009 01:38:45 +0000 (01:38 +0000)
git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/rec10@207 4e526526-5e11-4fc0-8910-f8fd03428081

Rec10WEB/trunk/src/fin.htm
Rec10WEB/trunk/src/iepg_add.htm
Rec10WEB/trunk/src/iepg_show.htm
Rec10WEB/trunk/src/readme.txt
Rec10WEB/trunk/src/rec10web.py
Rec10WEB/trunk/src/rec10web_dbSQLite.py [deleted file]
Rec10WEB/trunk/src/rswi.htm

index 5d9219d..5fcdb1f 100644 (file)
@@ -4,10 +4,10 @@
     <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <meta http-equiv="refresh" content="10; url=<!--url_for_replace_fin//-->">
-        <title>Rec10 Simple Web Interface ver.0.7.0</title>
+        <title>Rec10 Simple Web Interface ver.0.8.0</title>
     </head>
     <body>
-        <h1>Rec10 Simple Web Interface ver.0.7.0</h1><br>
+        <h1>Rec10 Simple Web Interface ver.0.8.0</h1><br>
         <br>
         <!--text_for_replace_fin//-->
         予約が終了しました。移動します。
index 60b5193..da4cc32 100644 (file)
@@ -3,7 +3,7 @@
 <html>
     <head>
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-        <title>Rec10 Simple Web Interface ver.0.7.0 iEPGデータ追加</title>
+        <title>Rec10 Simple Web Interface ver.0.8.0 iEPGデータ追加</title>
         <script src="./dojo/dojo/dojo.js" djConfig="parseOnLoad:true">
         </script>
         <!-- テーマの読み込み -->
@@ -23,7 +23,7 @@
     </head>
     <body class="tundra">
         <div dojoType="dijit.form.Form" action="rec10web.py" onExecute="this.submit()">
-            <h1>Rec10 Simple Web Interface ver.0.7.0 iEPGデータ追加</h1><br>
+            <h1>Rec10 Simple Web Interface ver.0.8.0 iEPGデータ追加</h1><br>
             <input type="text"
                    length="40"
                    dojoType="dijit.form.TextBox"
index e2366fa..b1154fb 100644 (file)
@@ -5,7 +5,7 @@
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
         <meta http-equiv="Content-Style-Type" content="text/css">
         <meta http-equiv="Content-Script-Type" content="text/javascript">
-        <title>Rec10 Simple Web Interface ver.0.7.0 iEPGデータ表示</title>
+        <title>Rec10 Simple Web Interface ver.0.8.0 iEPGデータ表示</title>
         <script src="./dojo/dojo/dojo.js" djConfig="parseOnLoad:true">
         </script>
         <!-- テーマの読み込み -->
@@ -40,7 +40,7 @@
     </head>
     <body class="tundra">
         <div dojoType="dijit.form.Form" action="rec10web.py" onExecute="this.submit()">
-            <h1>Rec10 Simple Web Interface ver.0.7.0 iEPGデータ表示</h1><br>
+            <h1>Rec10 Simple Web Interface ver.0.8.0 iEPGデータ表示</h1><br>
             <table dojoType="dojox.grid.DataGrid"
                    id="iepgGrid"
                    jsid="iepgGrid"
index 1b58f10..3fe80db 100644 (file)
@@ -15,7 +15,7 @@ dbMySQLパッケージおよびpython2.4以上が必要です。
 同梱のdojoToolkitはBSDライセンスであり、本文の最後に記載されたライセンスに従い再配布が可能です。
 
 history
-0.7.0
+0.8.0
 SQLiteのサポート終了。
 大幅な仕様変更
 
index 2407d6c..7a24eae 100644 (file)
@@ -9,7 +9,6 @@ import rec10web_dbSQLite
 import os
 import re
 import datetime
-import rec10web_dbSQLite
 import ConfigParser
 import time
 cgitb.enable()
@@ -34,8 +33,6 @@ def getdb():
         dbpwd = getdbpath("mysql_passwd")
         dbport = int(getdbpath("mysql_port"))
         retdb = rec10web_dbMySQL.DB_MySQL(dbname=dbn, host=dbh, user=dbu, passwd=dbpwd, port=dbport)
-    else:
-        retdb = rec10web_dbSQLite.DB_SQLite(dbpath)
     return retdb
 def getRecDate():
     dl = database.select_all_rectime()
diff --git a/Rec10WEB/trunk/src/rec10web_dbSQLite.py b/Rec10WEB/trunk/src/rec10web_dbSQLite.py
deleted file mode 100644 (file)
index 9e06e8c..0000000
+++ /dev/null
@@ -1,163 +0,0 @@
-#!/usr/bin/python
-# coding: UTF-8
-# Rec10 TS Recording Tools
-# Copyright (C) 2009 Yukikaze
-import os
-import sqlite
-path = str(os.path.dirname(os.path.abspath(__file__))) + "/"
-dbpath = path + "ch.db"
-class DB_SQLite:
-    dbpath = ""
-    def __init__(self, dbpath):
-        self.dbpath = dbpath
-    def connect_db(self, tout=10):
-        global dbpath
-        """
-        dbへの接続(timeoutは秒)
-
-        """
-        tout = tout * 1000
-        return sqlite3.connect(self.dbpath, timeout=tout)
-    def close_db(self, db):
-        db.close()
-    def select_by_ontv_ch(self, ontv):
-        db = self.connect_db(120)
-        ret = db.execute("SELECT bctype,channel,display FROM ch WHERE channel= ? ", (ontv, ))
-        ret = ret.fetchall()
-        self.close_db(db)
-        return ret
-    def select_all_rectime(self):
-        db = self.connect_db(120)
-        recdata = []
-        for id, typet, chtxt, title, btime, etime, deltatime, deltaday, opt in db.execute("SELECT id,type,chtxt,title,btime,etime,deltatime,deltaday,opt FROM rectime"):
-            ret = {}
-            ret['id'] = id
-            ret['type'] = typet
-            ret['chtxt'] = chtxt
-            ret['title'] = title.encode('utf-8')
-            ret['btime'] = btime
-            ret['etime'] = etime
-            ret['opt'] = opt
-            ret['deltatime'] = ""
-            ret['deltaday'] = ""
-            if deltatime == None:
-                deltatime = "3"
-            if deltaday == None:
-                deltaday = "7"
-            if typet == 'key':
-                ret['deltatime'] = deltatime
-            elif typet == 'keyevery':
-                ret['deltatime'] = deltatime
-                ret['deltaday'] = deltaday
-            recdata.append(ret)
-        self.close_db(db)
-        return recdata
-    def select_by_chtxt_rectime(self, chtxt):
-        db = self.connect_db(120)
-        recdata = []
-        for typet, chtxt, title, btime, etime, deltatime, deltaday, opt in db.execute("SELECT type, chtxt, title, btime, etime, deltatime ,deltaday ,opt FROM rectime WHERE chtxt = ? ", (chtxt, )):
-            ret = {}
-            ret['type'] = typet
-            ret['chtxt'] = chtxt
-            ret['title'] = title.encode('utf-8')
-            ret['btime'] = btime
-            ret['etime'] = etime
-            ret['opt'] = opt
-            if deltatime == None:
-                deltatime = "3"
-            if deltaday == None:
-                deltaday = "7"
-            if typet == 'key':
-                ret['deltatime'] = deltatime
-            elif typet == 'keyevery':
-                ret['deltatime'] = deltatime
-                ret['deltaday'] = deltaday
-            recdata.append(ret)
-        self.close_db(db)
-        return recdata
-    def select_by_id_rectime(self, id):
-        db = self.connect_db(120)
-        recdata = []
-        for typet, chtxt, title, btime, etime, deltatime, deltaday, opt in db.execute("SELECT type, chtxt, title, btime, etime, deltatime ,deltaday ,opt FROM rectime WHERE id = ? ", (id, )):
-            ret = {}
-            ret['type'] = typet
-            ret['chtxt'] = chtxt
-            ret['title'] = title.encode('utf-8')
-            ret['btime'] = btime
-            ret['etime'] = etime
-            ret['opt'] = opt
-            if deltatime == None:
-                deltatime = "3"
-            if deltaday == None:
-                deltaday = "7"
-            if typet == 'key':
-                ret['deltatime'] = deltatime
-            elif typet == 'keyevery':
-                ret['deltatime'] = deltatime
-                ret['deltaday'] = deltaday
-            recdata.append(ret)
-        self.close_db(db)
-        return recdata
-    def select_all_chdata(self):
-        db = self.connect_db(120)
-        ret = db.execute("SELECT bctype,ontv,chtxt,ch,csch,updatetime FROM chdata")
-        ret = ret.fetchall()
-        self.close_db(db)
-        return ret
-    def select_by_chtxt_chdata(self, chtxt):
-        db = self.connect_db(120)
-        ret = db.execute("SELECT bctype,ontv,chtxt,ch,csch,updatetime FROM chdata WHERE chtxt=?", (chtxt, ))
-        ret = ret.fetchall()
-        self.close_db(db)
-        return ret
-    def select_by_station_chdata(self, station):
-        db = self.connect_db(120)
-        ret = db.execute("SELECT bctype,ontv,chtxt,ch,csch,updatetime FROM chdata WHERE station=?", (station, ))
-        ret = ret.fetchall()
-        self.close_db(db)
-        return ret
-    def select_by_station_name_chdata(self, station_name):
-        db = self.connect_db(120)
-        ret = db.execute("SELECT bctype,ontv,chtxt,ch,csch,updatetime FROM chdata WHERE station_name=?", (station_name, ))
-        ret = ret.fetchall()
-        self.close_db(db)
-        return ret
-    def add_rectime(self, type="", chtxt="", title="", btime="", etime="", deltatime="", deltaday="", opt=""):
-        db = self.connect_db(480)
-        db.execute('INSERT OR IGNORE INTO rectime (type,chtxt,title,btime,etime,deltatime,deltaday,opt) values (?,?,?,datetime(?),datetime(?),?,?,?)', (type, chtxt, title, btime, etime, deltatime, deltaday, opt))
-        db.commit()
-        self.close_db(db)
-    def schedule_rectime(self, btime, etime):
-        db = self.connect_db(120)
-        dbexe = "SELECT type,chdata.bctype,rectime.chtxt,rectime.title,rectime.btime,rectime.etime FROM rectime INNER JOIN chdata ON rectime.chtxt=chdata.chtxt"
-        dbexe = dbexe + " WHERE NOT( ( rectime.etime <= ? ) OR ( rectime.btime >= ? ) )"
-        rets = []
-        for typet, bctypet, chtxtt, titlet, btimet, etimet in db.execute(dbexe, (btime, etime)):
-            ret = [typet, bctypet, chtxtt, titlet, btimet, etimet]
-            rets.append(ret)
-        self.close_db(db)
-        return rets
-    def count_schedule_rectime(self, btime, etime):
-        """
-        count rectasknum
-        return [te num,bs/cs num]
-        """
-        db = self.connect_db(120)
-        dbexe = "SELECT type,chdata.bctype,rectime.chtxt,rectime.title FROM rectime INNER JOIN chdata ON rectime.chtxt=chdata.chtxt"
-        dbexe = dbexe + " WHERE NOT( ( rectime.etime <= ? ) OR ( rectime.btime >= ? ) )"
-        Srec = 0
-        Trec = 0
-        for typet, bctypet, chtxtt, titlet in db.execute(dbexe, (btime, etime)):
-            if (typet == "rec") or (typet == "res") or (typet == "key") or (typet == "keyevery"):
-                if bctypet.find("cs") > -1:
-                    Srec = Srec + 1
-                elif bctypet.find("bs") > -1:
-                    Srec = Srec + 1
-                elif bctypet.find("te") > -1:
-                    Trec = Trec + 1
-        self.close_db(db)
-        return [Trec, Srec]
-    def del_by_id_rectime(self, id):
-        db = self.connect_db(120)
-        db.execute('DELETE FROM rectime WHERE id=' + id)
-        self.close_db(db)
\ No newline at end of file
index 96b15ac..4b578b9 100644 (file)
@@ -3,7 +3,7 @@
 <html lang="ja">
     <head>
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-        <title>Rec10 Simple Web Interface ver.0.7.0</title>
+        <title>Rec10 Simple Web Interface ver.0.8.0</title>
         <!-- dojo.jsの読み込み -->
         <script src="./dojo/dojo/dojo.js" djConfig="parseOnLoad:true">
         </script>