Autocommit in repo: ros.vados.ru, generated by owner: root, in 16:45:02 04.05.2026.

diff --git a/html/AM-FwAddrLists.rsc b/html/AM-FwAddrLists.rsc
index 902a1ae23f7519218dcd389021a77bdd5b9d4692..74f02bb8532d0c8abb1f585fd328153b19d4695f 100644 (file)
--- a/html/AM-FwAddrLists.rsc
+++ b/html/AM-FwAddrLists.rsc
@@ -67,23 +67,18 @@
     :set tmpIndex "";
   }
 
-  :foreach FwListName in=[ :deserialize $tmpIndex delimiter="\n" from=dsv options=dsv.plain ] do={
-    :set FwListName [ :tostr ($FwListName->0) ];
-#    :local FwListName;
-#    :local FwListName ($FwListFile->0);
-#    :set FwListName [ $Grep $FwListName "[^0-9a-zA-Z\\./:-]" ];
-#    :set FwListName ([ :pick $FwList 0 [ $FindDelim $FwList ] ]);
-#    :set FwListName [ $Grep $FwListName "[^0-9a-zA-Z\\./:-]" ];
-    :log warning ($ScriptName . " Parsing address-list index entry: " . $FwListName);
-
-#    :local Delim [ $FindDelim $FwListName ];
-#    :if ($Delim = 0) do={ :set FwListName ""; };
-    :if ([ :len $FwListName ] = 0) do={
-      :log error ($ScriptName . " Failed parsing address-list index entry: " . $FwListName);
+  :foreach FwList in=[ :deserialize $tmpIndex delimiter="\n" from=dsv options=dsv.plain ] do={
+    :set FwList ($FwList->0);
+    :local FwListName;
+    :local Delim [ $FindDelim $FwList ];
+    :if ($Delim = 0) do={ :set FwList ""; };
+    :log warning ($ScriptName . " Parsing address-list index entry: " . $FwList);
+    :if ([ :len $FwList ] = 0) do={
+      :log error ($ScriptName . " Failed parsing address-list index entry: " . $FwList);
+      } else={
+        :set FwListName [ :pick $FwList 0 $Delim ];
       }
-#    :set FwListName [ :pick $FwListName 0 $Delim ];
-
-    :local FwListUrl ($FwAddrListsUrl . $FwListName);
+    :log warning ($ScriptName . " Parsing address-list index entry: " . $FwListName . " - Ok.");
     :local CntAdd 0;
     :local CntRenew 0;
     :local CntRemove 0;
@@ -95,7 +90,6 @@
 
     :for I from=1 to=5 do={
       :if ($Data = false) do={
-        :set tmpIndex [ :tolf [ $FetchLargeFiles $ScriptName $FwAddrListsUrl $Index $CheckCerts ] ];
         :set Data [ :tolf [ $FetchLargeFiles $ScriptName $FwAddrListsUrl $FwListName $CheckCerts ] ];
         :if ($Data = false && $I < 5) do={
           :log warning ($ScriptName . " Failed downloading for list '" . $FwListName . "', " . $I . ". try from: " . $FwAddrListsUrl . $FwListName);
@@ -114,9 +108,9 @@
 
     :foreach Line in=[ :deserialize $Data delimiter="\n" from=dsv options=dsv.plain ] do={
       :set Line ($Line->0);
-#      :local Delim [ $FindDelim $Line ];
-#      :if ($Delim = 0) do={ :set Line ""; };
-#      :if ([ :len $Line ] = 0) do={ :error true; }
+      :local Delim [ $FindDelim $Line ];
+      :if ($Delim = 0) do={ :set Line ""; };
+      :if ([ :len $Line ] = 0) do={ :error true; }
       :local Address;
       :if ([ :pick $Line 0 1 ] = "{" && [ :pick $Line ([ :len $Line ] - 1) ] = "}") do={
         :do {

diff --git a/html/AM-GlobalFunc.rsc b/html/AM-GlobalFunc.rsc
index 761563157e9e0f389602ac4e8ea317dd4833c037..64cb7f131929bb7a94e76fde3d472c3d5590f02c 100644 (file)
--- 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/575/2bd7941e";
+:global CommitId "main/576/0cc4cd57";
 :global CommitTAG "unknown";
-:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 16:30:03 04.05.2026.";
+:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 16:45:02 04.05.2026.";
 
 # The variables are received right here.
 :global GlobalConfVersion 140;