From 7dc214a59eb44f7baa1c22a48a827f14c181fa96 Mon Sep 17 00:00:00 2001 From: vados-dev <192440777+vados-dev@users.noreply.github.com> Date: Mon, 4 May 2026 19:50:03 +0300 Subject: [PATCH] Autocommit in repo: ros.vados.ru, generated by owner: root, in 19:50:03 04.05.2026. --- html/AM-GlobalFunc.rsc | 43 +++++------------------------------------- 1 file changed, 5 insertions(+), 38 deletions(-) diff --git a/html/AM-GlobalFunc.rsc b/html/AM-GlobalFunc.rsc index ebfdedd84..6190df3df 100644 --- a/html/AM-GlobalFunc.rsc +++ b/html/AM-GlobalFunc.rsc @@ -17,9 +17,9 @@ :global GlobalFuncReady false; # Git commit id & info, expected configuration version -:global CommitId "main/589/c05c3863"; +:global CommitId "main/590/de49a53c"; :global CommitTAG "unknown"; -:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 19:45:02 04.05.2026."; +:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 19:50:03 04.05.2026."; # The variables are received right here. :global GlobalConfVersion 140; @@ -710,15 +710,9 @@ :set CleanFilePath do={ :local Path [ :tostr $1 ]; :global CharacterReplace; - :while ($Path ~ "//") do={ - :set $Path [ $CharacterReplace $Path "//" "/" ]; - } - :if ([ :pick $Path 0 ] = "/") do={ - :set Path [ :pick $Path 1 [ :len $Path ] ]; - } - :if ([ :pick $Path ([ :len $Path ] - 1) ] = "/") do={ - :set Path [ :pick $Path 0 ([ :len $Path ] - 1) ]; - } + :while ($Path ~ "//") do={ :set $Path [ $CharacterReplace $Path "//" "/" ]; } + :if ([ :pick $Path 0 ] = "/") do={ :set Path [ :pick $Path 1 [ :len $Path ] ]; } + :if ([ :pick $Path ([ :len $Path ] - 1) ] = "/") do={ :set Path [ :pick $Path 0 ([ :len $Path ] - 1) ]; } :return $Path; } @@ -964,33 +958,6 @@ :return ($Return . $String); } -:set CleanFilePath do={ - :local Path [ :tostr $1 ]; - :global CharacterReplace; - :while ($Path ~ "//") do={ :set $Path [ $CharacterReplace $Path "//" "/" ]; } - :if ([ :pick $Path 0 ] = "/") do={ :set Path [ :pick $Path 1 [ :len $Path ] ]; } - :if ([ :pick $Path ([ :len $Path ] - 1) ] = "/") do={ :set Path [ :pick $Path 0 ([ :len $Path ] - 1) ]; } - :return $Path; -} - -:set CleanName do={ - :local Input [ :tostr $1 ]; - :local Return ""; - :for I from=0 to=([ :len $Input ] - 1) do={ - :local Char [ :pick $Input $I ]; - :if ([ :typeof [ find "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789" $Char ] ] = "nil") do={ - :do { :if ([ :len $Return ] = 0) do={ :error true; } } - :if ([ :pick $Return ([ :len $Return ] - 1) ] = "-") do={ :error true; } - :set Char "-"; - } on-error={ - :set Char ""; - } - } - :set Return ($Return . $Char); - } - :return $Return; -} - :set IfThenElse do={ :if ([ :tostr $1 ] = "true" || [ :tobool $1 ] = true) do={:return $2}; :return $3; -- 2.52.0