op25
/
op25
4
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

oplog bug fixes thx as always Billb

This commit is contained in:
Max 2024-01-19 15:27:30 -05:00
parent 1d56794504
commit 6f1b25d2d1
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
op25/gr-op25_repeater/apps/install-sql.sh
View File

@ -5,7 +5,8 @@ USERDIR=~/.local/bin
sudo apt-get install python3-pip 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 # # # # # # # # # # # # un-comment the following two lines for ubuntu 16.04 # # # # # #
#pip3 install --user pip==10.0.1 #pip3 install --user pip==10.0.1
@ -14,10 +15,10 @@ PIP3=`which pip3`
echo PIP3 now set to $PIP3 echo PIP3 now set to $PIP3
# # # $PIP3 --version # # # generates errors -- (?) # # # $PIP3 --version # # # generates errors -- (?)
$PIP3 install --user sqlalchemy==1.4.48 $PIP3 install --user sqlalchemy
$PIP3 install --user flask==2.0.3 $PIP3 install --user flask
$PIP3 install --user datatables==0.4.9 $PIP3 install --user datatables
$PIP3 install --user flask-sqlalchemy==2.5.1 $PIP3 install --user flask-sqlalchemy
cd cd
git clone https://github.com/Pegase745/sqlalchemy-datatables.git git clone https://github.com/Pegase745/sqlalchemy-datatables.git

6
op25/gr-op25_repeater/apps/oplog/op25/__init__.py
View File

@ -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 app.secret_key = b'kH8HT0ucrh' # random bytes - this key not used anywhere else
db = SQLAlchemy(app) db = SQLAlchemy(app)
db.init_app(app) # db.init_app(app)
with app.app_context(): with app.app_context():
try: try:
@ -225,7 +225,7 @@ def import_tsv(argv):
@app.route("/") @app.route("/")
def home(): def home():
ds = dbstate() ds = dbstate()
if ds is not 0: if ds != 0:
return redirect('error?code=%s' % ds) return redirect('error?code=%s' % ds)
params = request.args.to_dict() params = request.args.to_dict()
params['ekeys'] = sorted(oplog_map.keys()) params['ekeys'] = sorted(oplog_map.keys())
@ -235,7 +235,7 @@ def home():
@app.route("/about") @app.route("/about")
def about(): def about():
ds = dbstate() ds = dbstate()
if ds is not 0: if ds != 0:
return redirect('error?code=%s' % ds) return redirect('error?code=%s' % ds)
params = request.args.to_dict() params = request.args.to_dict()
params['ekeys'] = sorted(oplog_map.keys()) params['ekeys'] = sorted(oplog_map.keys())