Ajout des expeditions

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)