From cf28d5cdc5e67665d5c0e2fbf62a62556ed7096a Mon Sep 17 00:00:00 2001 From: gwen Date: Thu, 14 Sep 2023 21:23:39 +0200 Subject: [PATCH] configuration in params --- app/config.py | 1 + app/routes.py | 12 +++++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/app/config.py b/app/config.py index 5775352..b661201 100644 --- a/app/config.py +++ b/app/config.py @@ -17,3 +17,4 @@ with open(local_params_file, 'r') as file_handle: params_content = safe_load(file_handle) dbadmin = params_content['dbadmin'] dbpassword = params_content['dbpassword'] + server_ip = params_content['server_ip'] diff --git a/app/routes.py b/app/routes.py index 7eaa67c..8a8fb51 100644 --- a/app/routes.py +++ b/app/routes.py @@ -4,15 +4,17 @@ import urllib.parse from flask import Blueprint, abort, render_template, request, send_from_directory from pymongo import MongoClient -from .config import dbadmin, dbpassword +from .config import dbadmin, dbpassword, server_ip + main = Blueprint("main", __name__, url_prefix="/") +# database connexion username = urllib.parse.quote_plus(dbadmin) password = urllib.parse.quote_plus(dbpassword) -myclient = MongoClient('mongodb://%s:%s@149.202.41.75:27017' % (username, password)) -mydb = myclient["actesdb"] -dbhouse = mydb["house"] +dbclient = MongoClient(f'mongodb://{username}:{password}@{server_ip}:27017') +actesdb = dbclient["actesdb"] +housecol = actesdb["house"] # (unproudly borrowed from the flask-pymongo's helpers :) @@ -58,7 +60,7 @@ def corpora_all(): lists houses sample_house_names = ["Bourbon", "Berry", "Anjou", ...] """ - houses = list(dbhouse.find()) + houses = list(housecol.find()) return render_template("corpora_all.html", houses=houses)