@@ -143,6 +143,25 @@ function write_comparaison () {

     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')

+    function write_cell () {

+        case $1 in

+            url)

+                cell='<table:table-cell office:value-type="string" calcext:value-type="string">'

+                cell+="<text:p><text:a xlink:href=\"$2\" xlink:type=\"simple\">$3</text:a></text:p>";;

+            texte)

+                cell='<table:table-cell office:value-type="string" calcext:value-type="string">'

+                cell+="<text:p>$2</text:p>"

+                ;;

+            nombre)

+                cell="<table:table-cell office:value-type=\"float\" office:value=\"$2\" calcext:value-type=\"float\">"

+                cell+="<text:p>$2</text:p>"

+                ;;

+            *)

+                return 1;;

+        esac

+        cell+='</table:table-cell>'

+        echo $cell >> "$content"

+    }

     echo "génération du fichier $result"

@@ -213,20 +232,12 @@ EOcontent

     IFS=$IFS_

     for colonne in $id_cols; do

-        cat >> "$content" << EOcontent

-            <table:table-cell office:value-type="string" calcext:value-type="string">

-            <text:p>$colonne</text:p>

-            </table:table-cell>

-EOcontent

+        write_cell texte $colonne

     done

     for typevote in $typevotes; do

         for g in "${groupe[@]}"; do

-            cat >> "$content" << EOcontent

-                <table:table-cell office:value-type="string" calcext:value-type="string">

-                <text:p>$typevote - $g</text:p>

-                </table:table-cell>

-EOcontent

+            write_cell texte "$typevote - $g"

         done

     done

@@ -246,33 +257,16 @@ EOcontent

         url=$(cut -d'|' -sf 4 <<< $data)

         test $adoption -eq 1 && adoption='oui' || adoption='non'

-        cat >> "$content" << EOcontent

-            <table:table-row table:style-name="ro1">

-EOcontent

+        echo '<table:table-row table:style-name="ro1">' >> "$content"

+

         if test -n "$url"; then

-            cat >> "$content" << EOcontent

-                <table:table-cell office:value-type="string" calcext:value-type="string">

-                <text:p><text:a xlink:href="$url" xlink:type="simple">$scrutin</text:a></text:p>

-                </table:table-cell>

-EOcontent

+            write_cell url "$url" $scrutin

         else

-            cat >> "$content" << EOcontent

-                <table:table-cell office:value-type="float" office:value="$scrutin" calcext:value-type="float">

-                <text:p>$scrutin</text:p>

-                </table:table-cell>

-EOcontent

+            write_cell nombre $scrutin

         fi

-        cat >> "$content" << EOcontent

-            <table:table-cell office:value-type="string" calcext:value-type="string">

-            <text:p>$date</text:p>

-            </table:table-cell>

-            <table:table-cell office:value-type="string" calcext:value-type="string">

-            <text:p>${title//\'/&apos;}</text:p>

-            </table:table-cell>

-            <table:table-cell office:value-type="string" calcext:value-type="string">

-            <text:p>${adoption}</text:p>

-            </table:table-cell>

-EOcontent

+        write_cell texte "$date"

+        write_cell texte "${title//\'/'}"

+        write_cell texte "$adoption"

         for typevote in 0 1 2 3; do

             vote_cible[$typevote]=$(sqlite_request "select

@@ -292,11 +286,7 @@ EOcontent

         else

             panurge=0

         fi

-        cat >> "$content" << EOcontent

-            <table:table-cell office:value-type="float" office:value="$panurge" calcext:value-type="float">

-            <text:p>$panurge</text:p>

-            </table:table-cell>

-EOcontent

+        write_cell nombre $panurge

         if test -n "$nom"; then

             for typevote in 0 1; do

@@ -317,22 +307,12 @@ EOcontent

             else

                 loyaute=0

             fi

-            cat >> "$content" << EOcontent

-                <table:table-cell office:value-type="float" office:value="$participation" calcext:value-type="float">

-                <text:p>$participation</text:p>

-                </table:table-cell>

-                <table:table-cell office:value-type="float" office:value="$loyaute" calcext:value-type="float">

-                <text:p>$loyaute</text:p>

-                </table:table-cell>

-EOcontent

+            write_cell nombre $participation

+            write_cell nombre $loyaute

         fi

         for typevote in 0 1 2 3; do

-            cat >> "$content" << EOcontent

-                <table:table-cell office:value-type="float" office:value="${vote_cible[$typevote]}" calcext:value-type="float">

-                <text:p>${vote_cible[$typevote]}</text:p>

-                </table:table-cell>

-EOcontent

+            write_cell nombre ${vote_cible[$typevote]}

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

                 votes=$(sqlite_request "select

                                             count(député)

@@ -344,11 +324,7 @@ EOcontent

                                             vote is $typevote

                                          and

                                             groupe is ${groupe_id[$g]}")

-                cat >> "$content" << EOcontent

-                    <table:table-cell office:value-type="float" office:value="$votes" calcext:value-type="float">

-                    <text:p>$votes</text:p>

-                    </table:table-cell>

-EOcontent

+                write_cell nombre $votes

             done

         done

         echo '</table:table-row>' >> "$content"