From df8df2729cd6f12559d144a1bf46a33c2b5ae57e Mon Sep 17 00:00:00 2001 From: Priec Date: Wed, 2 Sep 2026 23:27:31 +0200 Subject: [PATCH] fixing import issues --- client | 2 +- client-gui2 | 2 +- common/src/proto/descriptor.bin | Bin 240329 -> 239828 bytes prod_data_parse_scripts/parse_uc_osnova.sh | 104 +++++++++++++++++++++ server | 2 +- 5 files changed, 107 insertions(+), 3 deletions(-) create mode 100644 prod_data_parse_scripts/parse_uc_osnova.sh diff --git a/client b/client index 70241e22..4df0322e 160000 --- a/client +++ b/client @@ -1 +1 @@ -Subproject commit 70241e22c4064bcbc43cd27aa6d54dbf4e226b68 +Subproject commit 4df0322e126d7deecaffd07c2ffe3a837c880cfa diff --git a/client-gui2 b/client-gui2 index 449c5099..a9f6c4ab 160000 --- a/client-gui2 +++ b/client-gui2 @@ -1 +1 @@ -Subproject commit 449c50994b5e75f6039e5dd7cdfb95342f830686 +Subproject commit a9f6c4ab355d02a97564cb66c8de7e214caa74dc diff --git a/common/src/proto/descriptor.bin b/common/src/proto/descriptor.bin index 52d2dbb89ab13ccc63262ccf762ea42080975d43..95136937575e7fbb17b4ff57111b586ddf01f1c1 100644 GIT binary patch delta 1590 zcmai!!EYNy6vlUEXCr5tns!T@vT@o`E(j<=s=}d#s)`~LxhbuLn_eon9@`Up%X)XU zJDbuAMqD@`^=cvRh+`#?a^l8?BN9C!{s#U7#5c3?It~INZR@P) z>#oRDnyFmHIu}yp_Oi&-Kn$do;!s9~x+eNboQJs%}eu}pd_v#e|52asuQp=saNyveyubEkd( z-f6Z8u3jEWZOpMYjz5<<#CNaP>ih<0%%P6&ZcRVGNIrOPi@wfRxM%JVv2}56c5-pL za+Uu~(O=@TTh7NMIHFVc68TfcgRn2PGEX2>mL=K$YI|rJ-ZhVCrP==DBcqHU@2%Qd zz5!*V1}ojBcc)iZ$;RY%ZH2#SZjIh;wjKoHlasEBizq6s1e7TPflDUx?Cb>ecK!0~ zgp#(`8vHGb#7{e{5i}N&gQVz1s)SA|D)CJ4EQb-ib7u9JNF9$SvqC$&j#zcAX+)BPh6LAiAX+s^|3p z-m9AC0la6LHnJV{K;A>wz9*b|a7WvDNP=&P=-xy3OOUY@b_||4QaXVp<6^9`a_TTq z)h4p@G&jv`#Q5~5fUMp(BmA$kwV2F?bq%Ron%FbL)As5-;LNk*wLkr1jWj0vbj7^A zxq~(KUpvRYL>-L!?2+@B1c#z~7Yp!Y8P77ArYgg_NQxMH#>g+9&F)9DT@KAK<;eWs z`vBz46KE@1W|@3mYG%fAk80=nO}K%Y5$jA_4f5eT9a=gacW6xK%sJ~GoDknRU-}*= T^riFF%Lc(eJ$l)2-+1vin#P3; delta 2123 zcmZ`)&u`pB7+wF^D48aqUD~8^(()0BQq)bT5Kt0vpru4gl_n@{P~d_myR#b;duBDZ zsg{em^?=k9(%#??;EI$(g*YQ|L4yB*3vfWcRrZ${=UXWe+15zQ!(TG;LbdGnN79)s||U2W7hd|s`%MwuHR_+w;G#H@S{)r zVxUDTWR?=Adk^+@NgaJAI@vm7bX!s`mF@~Hx^yCjYoGHt7nJZpnTj-vOWA!Md{jK-uoj2avpne{8 zMG;35^|04=pcSYa3bxiJNtIzW1bvXph67aUaEYg+E1f9jx-V#3W^cbqRuJ^3Dct3| z;p^eH>_sxlh9Sv3ITAW;GeT#bQjvQP3J6>hrM{4;9iv)Tfs!eb=7WLK8Op0vRN!bb z!s(QF%(60vv)!Yi%JHrJvOErZ7LZarFCtzmvt1XJgl(wV$y&Nnar)q3nHp#n1ZQcs^%nVJiCR|*5QzT~ao_VseWGRx< zG_6;XnFH84w>TEbfk->SGK4RT@@~u9gGiHtj`0NtxWU4ZTZ^u84y zi+%rc@ZJR7kCci9jB-89bdihDj%^Q0;cpyeW*ALlMu^wy${s53`_tnFJXGGFd9hlV zVhf97ANeis;D5TQBej&spK2A@TWJKRdk1wpK0pu9&a1W^R6m3{g9+_$t@*I#*@QO_ zYi~9Id02b13CKfu^J|Z}O$>o(9G^JBV{Zaz?RXdx-v7u1en<#IjyOk{OA)un5db9x ztW1xh?3k29jwv|~Et5laV6xHNlCxM)I0iGZihCte66ERjILeU?_Qlz<7TH`0cG^kd zQqjmp6b^4%QXM5zggO$6RpXDTQkbe|*Fq|Egj^`TKp2B-9Fs_*4E&2 + exit 2 +fi + +input=$1 +output=${2:--} + +process_csv() { + awk -F ',' ' + function clean_account(value, quoted) { + quoted = substr(value, 1, 1) == "\"" && + substr(value, length(value), 1) == "\"" + + if (quoted) { + value = substr(value, 2, length(value) - 2) + } + + # Remove trailing non-numeric characters. + # Internal hyphens are preserved. + while (length(value) > 0 && + substr(value, length(value), 1) !~ /[0-9]/) { + value = substr(value, 1, length(value) - 1) + } + + if (quoted) { + return "\"" value "\"" + } + + return value + } + + function key_value(value) { + if (substr(value, 1, 1) == "\"" && + substr(value, length(value), 1) == "\"") { + return substr(value, 2, length(value) - 2) + } + + return value + } + + BEGIN { + OFS = "," + } + + { + sub(/\r$/, "", $0) + } + + NR == 1 { + printf "%s,\"deleted\"\n", $0 + next + } + + { + cleaned = clean_account($5) + key = key_value(cleaned) + + $5 = cleaned + + # Deleted: + # "000" -> true + # "000/" -> cleaned to "000" -> true + # "" -> true + # + # Everything else -> false + if (key == "000" || key == "") { + deleted = "\"true\"" + } else { + deleted = "\"false\"" + } + + # Check duplicates only for non-deleted accounts + if (key != "000" && key != "") { + key_count[key]++ + + if (!(key in key_order)) { + key_order[key] = ++key_total + } + } + + printf "%s,%s\n", $0, deleted + } + + END { + for (key in key_order) { + if (key_count[key] > 1) { + printf "Non-unique column 5 key: %s (%d rows)\n", + key, key_count[key] > "/dev/stderr" + } + } + } +' "$input" +} + +if [ "$output" = "-" ]; then + process_csv +else + process_csv > "$output" +fi diff --git a/server b/server index 79fec029..d6f9f92f 160000 --- a/server +++ b/server @@ -1 +1 @@ -Subproject commit 79fec0298ffb68527e46363c88a2db017f3d4ea6 +Subproject commit d6f9f92fda812de2e12504e97dc35e03134f4dd8