@@ -9,6 +9,10 @@ done

 IFS_=$IFS

+function sqlite_request () {

+    sqlite3 "$in_ram_database" <<< "$1"

+}

+

 function create_database () {

     declare -A groupes

     if test -z "${groupes[@]}"; then

@@ -16,33 +20,33 @@ function create_database () {

         exit 1

     fi

-    sqlite3 "$in_ram_database" <<< "create table if not exists votes (id integer primary key, nom text)"

-    sqlite3 "$in_ram_database" <<< "create table if not exists url (id integer primary key autoincrement, url text)"

-    sqlite3 "$in_ram_database" <<< "create table if not exists députés (id integer primary key autoincrement, nom text, groupe integer)"

-    sqlite3 "$in_ram_database" <<< "create table if not exists groupes (id integer primary key autoincrement, nom text, nom_court text)"

-    sqlite3 "$in_ram_database" <<< "create table if not exists scrutins (num integer primary key, date text not null, intitulé text non null, adoption boolean, url integer)"

-    sqlite3 "$in_ram_database" <<< "create table if not exists dépouillement (député integer not null, scrutin integer not null, groupe integer not null, vote integer not null)"

+    sqlite_request "create table if not exists votes (id integer primary key, nom text)"

+    sqlite_request "create table if not exists url (id integer primary key autoincrement, url text)"

+    sqlite_request "create table if not exists députés (id integer primary key autoincrement, nom text, groupe integer)"

+    sqlite_request "create table if not exists groupes (id integer primary key autoincrement, nom text, nom_court text)"

+    sqlite_request "create table if not exists scrutins (num integer primary key, date text not null, intitulé text non null, adoption boolean, url integer)"

+    sqlite_request "create table if not exists dépouillement (député integer not null, scrutin integer not null, groupe integer not null, vote integer not null)"

     v_id=0

     for v in Pour Contre Abstention Non-votant; do

-        if test -z $(sqlite3 "$in_ram_database" <<< "select nom from votes where id is $v_id"); then

-            sqlite3 "$in_ram_database" <<< "insert into votes values ($v_id, '$v')"

+        if test -z $(sqlite_request "select nom from votes where id is $v_id"); then

+            sqlite_request "insert into votes values ($v_id, '$v')"

         else

-            test -z $(sqlite3 "$in_ram_database" <<< "select nom from votes where id is $v_id and nom is '$v'") \

-                && sqlite3 "$in_ram_database" <<< "update votes set nom = '$v' where id is $v_id)"

+            test -z $(sqlite_request "select nom from votes where id is $v_id and nom is '$v'") \

+                && sqlite_request "update votes set nom = '$v' where id is $v_id)"

         fi

         let v_id++

     done

     unset v_id v

     for g in ${!groupes[@]}; do

-        test -z $(sqlite3 "$in_ram_database" <<< "select id from groupes where nom is '${groupes[$g]}' and nom_court is '$g'") \

-            && sqlite3 "$in_ram_database" <<< "insert into groupes (nom, nom_court) values ('${groupes[$g]}', '$g')"

+        test -z $(sqlite_request "select id from groupes where nom is '${groupes[$g]}' and nom_court is '$g'") \

+            && sqlite_request "insert into groupes (nom, nom_court) values ('${groupes[$g]}', '$g')"

     done

     unset g groupes

-    test -z $(sqlite3 "$in_ram_database" <<< "select id from url where id = 0") \

-        && sqlite3 "$in_ram_database" <<< "insert into url values (0, '')"

+    test -z $(sqlite_request "select id from url where id = 0") \

+        && sqlite_request "insert into url values (0, '')"

 }

 function update_database () {

@@ -50,7 +54,7 @@ function update_database () {

     tempfile="/dev/shm/scrutin.$$"

     progress=0

     first_=$first

-    first=$(sqlite3 "$in_ram_database" <<< "select count(num) from scrutins")

+    first=$(sqlite_request "select count(num) from scrutins")

     if test ${first:-0} -lt $last; then

         echo "récupération des scrutins n°$((${first:-0}+1)) à n°$last dans "$database" (à conserver autant que possible)" >&2

@@ -93,26 +97,26 @@ function update_database () {

             grep -q 'e a a' <<< "$adoption" && adoption=1 || adoption=0

             url=$(awk -F'|' "/^$scrutin\|/{print \$2}" "$url_database")

-            id_url=$(sqlite3 "$in_ram_database" <<< "select id from url where url is '$url'")

+            id_url=$(sqlite_request "select id from url where url is '$url'")

             if test -z "$id_url"; then

-                sqlite3 "$in_ram_database" <<< "insert into url (url) values ('$url')"

-                id_url=$(sqlite3 "$in_ram_database" <<< "select id from url where url is '$url'")

+                sqlite_request "insert into url (url) values ('$url')"

+                id_url=$(sqlite_request "select id from url where url is '$url'")

             fi

-            sqlite3 "$in_ram_database" <<< "insert into scrutins values ($scrutin, '$date', \"${title//\"}\", $adoption, ${id_url:-0})"

+            sqlite_request "insert into scrutins values ($scrutin, '$date', \"${title//\"}\", $adoption, ${id_url:-0})"

-            for v in $(sqlite3 "$in_ram_database" <<< "select * from votes"); do

-                for g in $(sqlite3 "$in_ram_database" <<< "select id,nom from groupes"); do

+            for v in $(sqlite_request "select * from votes"); do

+                for g in $(sqlite_request "select id,nom from groupes"); do

                     for d in $(sed -rn '/<p class="nomgroupe">'${g#*|}' <span class="block topmargin">/,/<div class="TTgroupe topmargin-lg">/p' $tempfile \

                         | sed -rn '/<p class="typevote">'${v#*|}':/,/<.div>/p' \

                         | sed 's,</li>,\n,g' \

                         | sed -rn '/<p class="typevote">/d; s,^\s*<li>\s*,,; s,&nbsp;, ,g; s/^\s*//; s/M(me|\.) //; s/ \(.*$//; s,<b>,,; s,</b>,,p'); do

-                        d_id=$(sqlite3 "$in_ram_database" <<< "select id from députés where nom is \"$d\" and groupe is ${g%|*}")

+                        d_id=$(sqlite_request "select id from députés where nom is \"$d\" and groupe is ${g%|*}")

                         if test -z "$d_id"; then

-                            sqlite3 "$in_ram_database" <<< "insert into députés (nom, groupe) values (\"$d\", ${g%|*})"

-                            d_id=$(sqlite3 "$in_ram_database" <<< "select id from députés where nom is \"$d\" and groupe is ${g%|*}")

+                            sqlite_request "insert into députés (nom, groupe) values (\"$d\", ${g%|*})"

+                            d_id=$(sqlite_request "select id from députés where nom is \"$d\" and groupe is ${g%|*}")

                         fi

-                        sqlite3 "$in_ram_database" <<< "insert into dépouillement values ($d_id, $scrutin, ${g%|*}, ${v%|*})"

+                        sqlite_request "insert into dépouillement values ($d_id, $scrutin, ${g%|*}, ${v%|*})"

                     done

                 done

             done

@@ -135,7 +139,7 @@ function write_comparaison () {

     result="comparaisons ${groupe[0]} avec ${groupe_ref:-GDR}${dossier:+ - ${dossier}}"

     content="/dev/shm/$result/content.xml"

     id_cols="Scrutin Date Titre Adoption"

-    typevotes=$(sqlite3 "$in_ram_database" <<< "select nom from votes")

+    typevotes=$(sqlite_request "select nom from votes")

     nb_cols=$(( $(wc -w <<< $id_cols) + $(wc -w <<< $typevotes) * ${#groupe[@]} ))

     last_col=$(awk -v n=$nb_cols 'BEGIN{printf("%c%c", n < 27 ? "" : int(n/26) + 64, (n % 26) + (n % 26 == 0 ? 26 : 0) + 64)}' | tr -d '\0')

@@ -234,7 +238,7 @@ EOcontent

     IFS=$'\n'

     for scrutin in $(eval ${seq:-seq $first $last}); do

-        data=$(sqlite3 "$in_ram_database" <<< "select date,intitulé,adoption,url.url from scrutins inner join url on scrutins.url = url.id where num is $scrutin")

+        data=$(sqlite_request "select date,intitulé,adoption,url.url from scrutins inner join url on scrutins.url = url.id where num is $scrutin")

         date=$(cut -d'|' -sf 1 <<< $data)

         title=$(cut -d'|' -sf 2 <<< $data)

         adoption=$(cut -d'|' -sf 3 <<< $data)

@@ -269,7 +273,7 @@ EOcontent

             </table:table-cell>

 EOcontent

         for typevote in 0 1 2 3; do

-            votes=$(sqlite3 "$in_ram_database" <<< "select

+            votes=$(sqlite_request "select

                                         count(député)

                                      from

                                         dépouillement

@@ -285,7 +289,7 @@ EOcontent

                 </table:table-cell>

 EOcontent

             for (( g = 1; g < ${#groupe_id[@]}; g++ )); do

-                votes=$(sqlite3 "$in_ram_database" <<< "select

+                votes=$(sqlite_request "select

                                             count(député)

                                          from

                                             dépouillement

@@ -491,7 +495,7 @@ else

 fi

 for (( g = 0; g < ${#groupe[@]}; g++ )); do

-    groupe_id[$g]=$(sqlite3 "$in_ram_database" <<< "select id from groupes where nom_court is '${groupe[$g]}'")

+    groupe_id[$g]=$(sqlite_request "select id from groupes where nom_court is '${groupe[$g]}'")

     if test -z "${groupe_id[$g]}"; then

         echo "groupe ${groupe[$g]} inconnu" >&2

         exit 1

@@ -499,8 +503,8 @@ for (( g = 0; g < ${#groupe[@]}; g++ )); do

 done

 if test "$periode" = $true_flag; then

-    first=$(sqlite3 "$in_ram_database" <<< "select num from scrutins where date like '% du ${periode_value%:*}' order by num asc" | head -1)

-    last=$(sqlite3 "$in_ram_database" <<< "select num from scrutins where date like '% du ${periode_value#*:}' order by num asc" | tail -1)

+    first=$(sqlite_request "select num from scrutins where date like '% du ${periode_value%:*}' order by num asc" | head -1)

+    last=$(sqlite_request "select num from scrutins where date like '% du ${periode_value#*:}' order by num asc" | tail -1)

     test -z "$first" && echo "date de début inconnue: ${periode_value#*:}" >&2 && rm -f $in_ram_database && exit 1

     test -z "$last" && echo "date de fin inconnue: ${periode_value%:*}" >&2 && rm -f $in_ram_database && exit 1

 elif test "$dossier" != $true_flag; then

@@ -512,7 +516,7 @@ elif test "$dossier" != $true_flag; then

 fi

 if test "$liste_dossiers" = $true_flag; then

-    sqlite3 "$in_ram_database" <<< "select printf('%s - %s', id, url) from url" | sed 's,https*://.*/dossiers/,,; s/_/ /g; s/.asp$//'

+    sqlite_request "select printf('%s - %s', id, url) from url" | sed 's,https*://.*/dossiers/,,; s/_/ /g; s/.asp$//'

     exit

 fi

@@ -527,26 +531,26 @@ fi

 if test "$liste_deputes" = $true_flag; then

     if test -n "$liste_deputes_value"; then

-        sqlite3 "$in_ram_database" <<< "select printf('%s - %s', députés.nom, groupes.nom_court) from députés inner join groupes on groupes.id = députés.groupe where groupes.nom_court is '$liste_deputes_value'"

+        sqlite_request "select printf('%s - %s', députés.nom, groupes.nom_court) from députés inner join groupes on groupes.id = députés.groupe where groupes.nom_court is '$liste_deputes_value'"

     else

-        sqlite3 "$in_ram_database" <<< "select printf('%s - %s', députés.nom, groupes.nom_court) from députés inner join groupes on groupes.id = députés.groupe order by groupes.nom_court asc"

+        sqlite_request "select printf('%s - %s', députés.nom, groupes.nom_court) from députés inner join groupes on groupes.id = députés.groupe order by groupes.nom_court asc"

     fi

     exit

 fi

 if test "$depute" = $true_flag; then

     if test -n "$nom"; then

-        match=$(sqlite3 "$in_ram_database" <<< "select count(députés.id) from députés inner join groupes on groupes.id = députés.groupe where députés.nom like '%$nom%' and groupes.nom_court is '$groupe' collate nocase")

+        match=$(sqlite_request "select count(députés.id) from députés inner join groupes on groupes.id = députés.groupe where députés.nom like '%$nom%' and groupes.nom_court is '$groupe' collate nocase")

         if test $match -ne 1; then

             if test $match -eq 0; then

                 echo "pas de député correspondant dans le groupe $groupe"

             else 

                 echo "plusieurs députés correspondent:"

-                sqlite3 "$in_ram_database" <<< "select députés.nom from députés inner join groupes on groupes.id = députés.groupe where députés.nom like '%$nom%' and groupes.nom_court is '$groupe' collate nocase"

+                sqlite_request "select députés.nom from députés inner join groupes on groupes.id = députés.groupe where députés.nom like '%$nom%' and groupes.nom_court is '$groupe' collate nocase"

             fi

             exit 1

         else

-            nom=$(sqlite3 "$in_ram_database" <<< "select députés.id,députés.nom from députés inner join groupes on groupes.id = députés.groupe where députés.nom like '%$nom%' and groupes.nom_court is '$groupe' collate nocase")

+            nom=$(sqlite_request "select députés.id,députés.nom from députés inner join groupes on groupes.id = députés.groupe where députés.nom like '%$nom%' and groupes.nom_court is '$groupe' collate nocase")

             groupe[0]="${nom#*|} (${groupe[0]})"

         fi

     fi

@@ -555,18 +559,18 @@ fi

 if test "$dossier" = $true_flag; then

     if test -z "$dossier_value"; then

         IFS=$'\n'

-        select dossier in $(sqlite3 "$in_ram_database" <<< "select url from url" | sed 's,^.*/dossiers/,,; s/_/ /g; s/.asp$//'); do

+        select dossier in $(sqlite_request "select url from url" | sed 's,^.*/dossiers/,,; s/_/ /g; s/.asp$//'); do

             if test -n "$dossier"; then

-                seq="sqlite3 \"$in_ram_database\" <<< \"select num from scrutins inner join url on url.id = scrutins.url where url.url like '%/dossiers/${dossier// /_}%' order by num asc\""

-                qty=$(sqlite3 "$in_ram_database" <<< "select count(num) from scrutins inner join url on url.id = scrutins.url where url.url like '%/dossiers/${dossier// /_}%' order by num asc")

+                seq="sqlite_request \"select num from scrutins inner join url on url.id = scrutins.url where url.url like '%/dossiers/${dossier// /_}%' order by num asc\""

+                qty=$(sqlite_request "select count(num) from scrutins inner join url on url.id = scrutins.url where url.url like '%/dossiers/${dossier// /_}%' order by num asc")

                 break

             fi

         done

         IFS=$IFS_

     else

-        seq="sqlite3 \"$in_ram_database\" <<< \"select num from scrutins inner join url on url.id = scrutins.url where url.id is $dossier_value order by num asc\""

-        qty=$(sqlite3 "$in_ram_database" <<< "select count(num) from scrutins inner join url on url.id = scrutins.url where url.id is $dossier_value order by num asc")

-        dossier=$(sqlite3 "$in_ram_database" <<< "select url from url where id is $dossier_value" | sed 's,^.*/dossiers/,,; s/_/ /g; s/.asp$//')

+        seq="sqlite_request \"select num from scrutins inner join url on url.id = scrutins.url where url.id is $dossier_value order by num asc\""

+        qty=$(sqlite_request "select count(num) from scrutins inner join url on url.id = scrutins.url where url.id is $dossier_value order by num asc")

+        dossier=$(sqlite_request "select url from url where id is $dossier_value" | sed 's,^.*/dossiers/,,; s/_/ /g; s/.asp$//')

     fi

 fi