trouver --all pour chercher aussi dans les alias et anciens pseudos

[scripts-20-100.git] / bde / trouver.sh

diff --git a/bde/trouver.sh b/bde/trouver.sh
index 47dca069ad6ca34a0f3e982b7c50053b17aa29db..8f5031200ea7e3568d428b62217bd2e30dc3b1ed 100755 (executable)
--- a/bde/trouver.sh
+++ b/bde/trouver.sh
@@ -6,22 +6,33 @@ for i in $@
 do
   if [ $i = "--no-mail" ]
     then nomail=1;
+    shift;
   fi;
-  if [ $i = "--numcbde" ]
-    then searchnumcbde=1;
+  if [ $i = "--idbde" ]
+    then searchidcbde=1;
+    shift;
+  fi
+  if [ $i = "--all" ] || [ $i = "-a" ]
+    then searchall=1;
+    shift;
   fi
 done
 
 # Si on n'a *pas* mis --no-mail (too many negations, I know)
 if [ -z "${nomail}" ]
 then
-  adding=" OR email ILIKE '%$1%'"
+  adding=" OR mail ILIKE '%$1%'"
 fi
-# Si on a mis --numcbde, il faut matcher numcbde de manière plus lâche
-if [ "${searchnumcbde}" = "1" ]
+# Si on a mis --idbde, il faut matcher l'idbde de manière plus lâche
+if [ "${searchidcbde}" = "1" ]
 then
   wild="%"
 fi
 
-psql bde -c "SELECT * FROM adherents WHERE pseudo ILIKE '%$1%' OR nom ILIKE '%$1%'
- OR prenom ILIKE '%$1%'${adding} OR CAST(numcbde AS varchar) LIKE '${wild}$1${wild}' ORDER BY nom;"
+    psql note -c "SELECT * FROM comptes WHERE pseudo ILIKE '%$1%' OR nom ILIKE '%$1%'
+     OR prenom ILIKE '%$1%'${adding} OR CAST(idbde AS varchar) LIKE '${wild}$1${wild}' ORDER BY nom;"
+if [ -n "${searchall}" ]
+then
+    psql note -c "SELECT a.*, c.* FROM aliases AS a, comptes AS c WHERE a.idbde = c.idbde AND a.alias ILIKE '%$1%' ORDER BY a.alias;"
+    psql note -c "SELECT h.*, c.* FROM historique AS h, comptes AS c WHERE h.idbde = c.idbde AND h.avant ILIKE '%$1%' ORDER BY h.avant;"
+fi