diff --git a/gaboshlib/g_read_csv.sh b/gaboshlib/g_read_csv.sh index f17fc31..c7e1ff2 100644 --- a/gaboshlib/g_read_csv.sh +++ b/gaboshlib/g_read_csv.sh @@ -51,6 +51,7 @@ function g_read_csv { g_basename $g_csvfile local g_csvfile_base=${g_basename_result/\.history*.csv/} g_csvfile_base=${g_csvfile_base//[^a-zA-Z0-9_]/} + g_csvfile_base=${g_csvfile_base//ECONOMY*/} # read last lines if defined or complete csv file if [ -n "$g_last_lines" ] @@ -81,8 +82,14 @@ function g_read_csv { [ "$l" = 0 ] && declare -g v_${g_headline_item}="${g_csv_line_array[i]}" v_csv_array_associative[${g_headline_item}_${r}]="${g_csv_line_array[i]}" v_csv_array_associative_reverse[${g_headline_item}_${l}]="${g_csv_line_array[i]}" - v[${g_csvfile_base}_${g_headline_item}_${r}]=${g_csv_line_array[i]} - vr[${g_csvfile_base}_${g_headline_item}_${l}]=${g_csv_line_array[i]} + if [ -z "${g_csvfile_base}" ] + then + v[${g_headline_item}_${r}]=${g_csv_line_array[i]} + vr[${g_headline_item}_${l}]=${g_csv_line_array[i]} + else + v[${g_csvfile_base}_${g_headline_item}_${r}]=${g_csv_line_array[i]} + vr[${g_csvfile_base}_${g_headline_item}_${l}]=${g_csv_line_array[i]} + fi ((i++)) done ((l++))