@@ -286,16 +286,17 @@ EOcontent

             done

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

-        let line++

-

-        if test $((($scrutin*100)/$last)) -ne $progress; then

-            progress=$((($scrutin*100)/$last))

-            if test $(($progress % ${generation_progress:-5})) -eq 0; then

+        if test $(( ($line * 100) / ${qty:-$last} )) -ne $progress; then

+            progress=$(( ($line * 100) / ${qty:-$last} ))

+            if test $(( $progress % ${generation_progress:-5} )) -eq 0; then

                 now=$(date +%s)

                 delta=$(( $now - $begin ))

-                echo $progress%, ETA: $(date +%H:%M:%S -d "$(($delta * ($last - $scrutin) / $scrutin)) seconds")

+                echo $progress%, ETA: $(date +%H:%M:%S -d "$(( $delta * (${qty:-$last} - $line) / $line )) seconds")

             fi

         fi

+

+        let line++

+

     done

     echo

@@ -510,12 +511,14 @@ if test "$dossier" = $true_flag; then

         select dossier in $(sqlite3 "$in_ram_database" <<< "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")

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

     fi

 fi