From f0a3c4662b0f233e607134bd0657ba2fe34d7411 Mon Sep 17 00:00:00 2001 From: DaTekShaman Date: Fri, 24 Oct 2025 16:14:14 +0300 Subject: [PATCH] Updates to power-query/fGetSheet.m and power-query/fReplaceFunction.m --- power-query/fP.m | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/power-query/fP.m b/power-query/fP.m index 3718780..590e76e 100644 --- a/power-query/fP.m +++ b/power-query/fP.m @@ -107,27 +107,29 @@ let // CSV-ФАЙЛ В СТАНДАРТНОЙ ПАПКЕ F_LocalCSV = (Input as any) => let - Result = Csv.Document(File.Contents("\\msk.mts.ru\msk\WORKDATA\OPSIMPAO-ANALYTICS\Aggregated CSV\" & Input & ".csv"), [Delimiter=",", Encoding=1251, QuoteStyle=QuoteStyle.None]) + GetDoc = Csv.Document(File.Contents("A:\Aggregated CSV\" & Input & ".csv"), [Delimiter="#(tab)", Encoding=1251, QuoteStyle=QuoteStyle.None]), + Result = Table.PromoteHeaders(GetDoc, [PromoteAllScalars=true]) in Result, CaseValues = { { List.Contains({"BOOL" , "LOGICAL" }, P_TYPE), try F_Boolean (P_VALUE) otherwise null}, - { List.Contains({"INT" , "INT64" }, P_TYPE), try F_Integer (P_VALUE) otherwise null}, + { List.Contains({"INT" , "NUMBER" }, P_TYPE), try F_Integer (P_VALUE) otherwise null}, { List.Contains({"FLOAT" , "DOUBLE" }, P_TYPE), try F_Float (P_VALUE) otherwise null}, { List.Contains({"TEXT" , "STRING" }, P_TYPE), try F_Text (P_VALUE) otherwise null}, { List.Contains({"DATE" }, P_TYPE), try F_Date (P_VALUE) otherwise null}, { List.Contains({"DATETIME", "DTTM" }, P_TYPE), try F_DateTime (P_VALUE) otherwise null}, - { List.Contains({"LIST" }, P_TYPE), try F_List (P_VALUE) otherwise null}, - { List.Contains({"RCRDSET", "PQTABLE" }, P_TYPE), try F_RcrdSet (P_VALUE) otherwise null}, - { List.Contains({"SYMLNK" , "SYMLINK" }, P_TYPE), try F_Symlink (P_VALUE) otherwise null}, + { List.Contains({"LIST" , "PQLIST" }, P_TYPE), try F_List (P_VALUE) otherwise null}, + { List.Contains({"RCRDSET" , "PQTABLE" }, P_TYPE), try F_RcrdSet (P_VALUE) otherwise null}, + { List.Contains({"SYMLNK" , "SYMLINK" }, P_TYPE), try F_Symlink (P_VALUE) otherwise null}, { List.Contains({"TABLE" }, P_TYPE), try F_LocalTable (P_VALUE) otherwise null}, { List.Contains({"FILE" , "EXCEL" }, P_TYPE), try F_ExcelFile (P_VALUE) otherwise null}, { List.Contains({"DIR" , "PATH" }, P_TYPE), try F_DirContent (P_VALUE) otherwise null}, { List.Contains({"CSVL" }, P_TYPE), try F_LocalCSV (P_VALUE) otherwise null}, + { List.Contains({"CSVD" }, P_TYPE), try F_LocalCSV (P_VALUE) otherwise null}, // Сделать обработки папки с CSV { true , P_VALUE } },