diff options
Diffstat (limited to 'op25/gr-op25_repeater')
| -rwxr-xr-x | op25/gr-op25_repeater/apps/install-sql.sh | 11 | ||||
| -rw-r--r-- | op25/gr-op25_repeater/apps/oplog/op25/__init__.py | 6 |
2 files changed, 9 insertions, 8 deletions
diff --git a/op25/gr-op25_repeater/apps/install-sql.sh b/op25/gr-op25_repeater/apps/install-sql.sh index 5dd39f1..aa5c94d 100755 --- a/op25/gr-op25_repeater/apps/install-sql.sh +++ b/op25/gr-op25_repeater/apps/install-sql.sh @@ -5,7 +5,8 @@ USERDIR=~/.local/bin sudo apt-get install python3-pip -PIP3=`which pip3` +# PIP3=`which pip3` +PIP3=/usr/bin/pip3 # # # # # # un-comment the following two lines for ubuntu 16.04 # # # # # # #pip3 install --user pip==10.0.1 @@ -14,10 +15,10 @@ PIP3=`which pip3` echo PIP3 now set to $PIP3 # # # $PIP3 --version # # # generates errors -- (?) -$PIP3 install --user sqlalchemy==1.4.48 -$PIP3 install --user flask==2.0.3 -$PIP3 install --user datatables==0.4.9 -$PIP3 install --user flask-sqlalchemy==2.5.1 +$PIP3 install --user sqlalchemy +$PIP3 install --user flask +$PIP3 install --user datatables +$PIP3 install --user flask-sqlalchemy cd git clone https://github.com/Pegase745/sqlalchemy-datatables.git diff --git a/op25/gr-op25_repeater/apps/oplog/op25/__init__.py b/op25/gr-op25_repeater/apps/oplog/op25/__init__.py index 9e34798..a0ddf99 100644 --- a/op25/gr-op25_repeater/apps/oplog/op25/__init__.py +++ b/op25/gr-op25_repeater/apps/oplog/op25/__init__.py @@ -51,7 +51,7 @@ app.config['SQLALCHEMY_ECHO'] = False # set to True to send sql statements to t app.secret_key = b'kH8HT0ucrh' # random bytes - this key not used anywhere else db = SQLAlchemy(app) -db.init_app(app) +# db.init_app(app) with app.app_context(): try: @@ -225,7 +225,7 @@ def import_tsv(argv): @app.route("/") def home(): ds = dbstate() - if ds is not 0: + if ds != 0: return redirect('error?code=%s' % ds) params = request.args.to_dict() params['ekeys'] = sorted(oplog_map.keys()) @@ -235,7 +235,7 @@ def home(): @app.route("/about") def about(): ds = dbstate() - if ds is not 0: + if ds != 0: return redirect('error?code=%s' % ds) params = request.args.to_dict() params['ekeys'] = sorted(oplog_map.keys()) |