gauthiier/listservs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix small issues with archive refroctoring

Browse Source
This commit is contained in:
gauthiier 2019-08-24 14:21:26 +02:00
parent 849e57f450
commit 387c13be6d
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
archive/archive.py
View File

@ -88,15 +88,15 @@ class Archive:
data = None # "raw" json data data = None # "raw" json data
db_con = None db_con = None
def __init__(self, archive_name, archive_dir_or_db_config): def __init__(self, archive_name, config):
if isinstance(archive_dir_or_db_config, str): if isinstance(config, str):
# need a filename or a dir name.... # need a filename or a dir name....
print("reading archive " + archive_name, end='') print("reading archive " + archive_name, end='')
archive_dir = archive_dir_or_db_config archive_dir = config
(self.data, self.archive_name) = load_from_file(archive_name, archive_name, archive_dir) (self.data, self.archive_name) = load_from_file(archive_name, archive_name, archive_dir)
print(" - done.") print(" - done.")
elif isinstance(archive_dir_or_db_config, dict): elif isinstance(config, dict):
self.archive_name = archive_name self.archive_name = archive_name
self.db_con = connect_db(config['database'], config['host'], config['user'], config['password']) self.db_con = connect_db(config['database'], config['host'], config['user'], config['password'])

4
www/routes.py
View File

@ -1,4 +1,4 @@
from flask import render_template, request, jsonify from flask import render_template, request, jsonify, send_from_directory
from www import app from www import app
import archive.archive as archive import archive.archive as archive
import config import config
@ -21,7 +21,7 @@ def searh():
if len(request.args) < 1: if len(request.args) < 1:
# q: list all table or keep predefined wconfig.lists_to_serve? # q: list all table or keep predefined wconfig.lists_to_serve?
wconfig.lists_to_serve = archive.show_tables_db(config.db['database'], config.db['host'], config.db['user'], config.db['password']) wconfig.lists_to_serve = archive.list_tables_db(config.db['database'], config.db['host'], config.db['user'], config.db['password'])
return render_template("search.html", archives=wconfig.lists_to_serve, fields=['content', 'from']) return render_template("search.html", archives=wconfig.lists_to_serve, fields=['content', 'from'])
k_arg = request.args.get('keyword') k_arg = request.args.get('keyword')