diff --git a/definitions.pyc b/definitions.pyc deleted file mode 100644 index 74084b1..0000000 Binary files a/definitions.pyc and /dev/null differ diff --git a/pages.py b/pages.py index 2e822dd..45de155 100644 --- a/pages.py +++ b/pages.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from flask import render_template import definitions as lib from difflib import SequenceMatcher @@ -85,7 +84,8 @@ def sauveteur(idsauveteur): def search(texte): sauveurs = lib.ex_sql(dbname,"SELECT * FROM sauveteur") bateaux = lib.ex_sql(dbname,"SELECT * FROM bateau") - totals = sauveurs+bateaux + expeditions = lib.ex_sql(dbname,"SELECT * FROM expedition") + totals = sauveurs+bateaux+expeditions for i in totals: i["score"] = 0 for key in i.keys(): @@ -103,9 +103,14 @@ def search(texte): r = {} if "ship_id" in i.keys(): r["lien"] = "/bateaux/"+str(i["ship_id"]) + n = "Bateau" elif "personal_id" in i.keys(): r["lien"] = "/sauveteurs/"+str(i["personal_id"]) - r["nom"] = i["nom"] + n = "Sauveteurs" + elif "expedition_id" in i.keys(): + r["lien"] = "/expeditions/"+str(i["expedition_id"]) + n = "Expeditions" + r["nom"] = i["nom"]+" - "+n results.append(r) return render_template("searchresults.html",liste=results) diff --git a/pages.pyc b/pages.pyc deleted file mode 100644 index 761cd57..0000000 Binary files a/pages.pyc and /dev/null differ