@@ -2,7 +2,7 @@

 set -e

-declare -A data=(

+declare -A datatypes=(

         [/sim/description]=text

         [/sim/long-description]=text

         [/sim/author]=text

@@ -109,7 +109,7 @@ function trap_exit () {

     fi

     for data_presence_check in ${missing_data_check[@]}; do

-        if [[ -v data[$data_presence_check] ]]; then

+        if [[ -v datatypes[$data_presence_check] ]]; then

             local missing_data=$(sqlite_request "select count(setxml.file)

                                                  from aircrafts inner join setxml

                                                  where aircrafts.id = setxml.variantof and setxml.\`$data_presence_check\` = ''")

@@ -161,9 +161,8 @@ function update_database () {

     echo $(sqlite_request "select printf('[ %i/%i ] $ac', count(sx), count(distinct ac)) from recover_setxml")

     for sx in $(sqlite_request "select distinct sx from recover_setxml where ac = '$ac'"); do

-        for col in ${!data[@]}; do

-            data[$col]=

-        done

+        unset data

+        declare -A data

         echo " -> $sx"

         getfromrepo ${ac}/$sx-set.xml > $setxml

@@ -224,7 +223,7 @@ function update_database () {

             fi

             # continue parsing (while loop) until everything's found

-            for col in ${!data[@]}; do

+            for col in ${!datatypes[@]}; do

                 test -z "${data[$col]}" && continue 2

             done

             break # everything's found

@@ -239,10 +238,11 @@ function update_database () {

             insert_col='file, variantof, '

             update_values=''

             for col in ${!data[@]}; do

+                test ${datatypes[$col]%% *} == 'text' && single_quote="'" || single_quote=""

                 insert_col+="\`$col\`, "

-                insert_values+="'${data[$col]//\'/\'\'}', "

+                insert_values+="$single_quote${data[$col]//\'/\'\'}$single_quote, "

                 if test -n "${data[$col]}"; then

-                    update_values+="\`$col\` = '${data[$col]//\'/\'\'}', "

+                    update_values+="\`$col\` = $single_quote${data[$col]//\'/\'\'}$single_quote, "

                 fi

             done

             sqlite_request "insert into setxml (${insert_col%,*}, installed) values (${insert_values%,*}, 0)

@@ -344,17 +344,17 @@ trap trap_exit EXIT

 stty -echoctl

 declare -A hangar

-data_pattern=$(printf "%s|" ${!data[@]})

+data_pattern=$(printf "%s|" ${!datatypes[@]})

 data_pattern=${data_pattern:0:-1}

-data_test_null=$(printf '${data[%s]}' ${!data[@]})

+data_test_null=$(printf '${data[%s]}' ${!datatypes[@]})

 if test -e $database; then

     cp $database $in_ram_database

     sql_cols=$(sqlite_request "pragma table_info(setxml)" | awk -F'|' '{printf("%s %s ", $2, $3)}')

     script_cols="file text variantof integer "

-    for col in ${!data[@]}; do

-        script_cols+="$col ${data["$col"]} "

+    for col in ${!datatypes[@]}; do

+        script_cols+="$col ${datatypes["$col"]%% *} "

     done

     script_cols+="installed integer " # last space is important

     if test "$sql_cols" != "$script_cols"; then

@@ -399,7 +399,7 @@ sqlite_request 'create unique index if not exists "index_aircrafts" on aircrafts

 sqlite_request "create table if not exists setxml (

                     file text,

                     variantof integer,

-                    $(for col in ${!data[@]}; do printf "'%s' %s, " $col ${data[$col]}; done)

+                    $(for col in ${!datatypes[@]}; do printf "'%s' %s, " $col "${datatypes[$col]}"; done)

                     installed integer)"

 sqlite_request 'create unique index if not exists "index_setxml" on setxml (file, variantof)'