From 41f9f5fd90abe1e67630dd22f0ed74df4940ea30 Mon Sep 17 00:00:00 2001 From: Vitaly the Alpaca Date: Sat, 1 Jun 2024 16:43:20 +0000 Subject: [PATCH 1/2] =?UTF-8?q?=D0=9F=D1=80=D0=B5=D0=BE=D0=B1=D1=80=D0=B0?= =?UTF-8?q?=D0=B7=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20OPI=20->=20OInt=20?= =?UTF-8?q?(workflow)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/en/OInt/core/Modules/OPI_Dropbox.os | 4 +- .../OInt/tests/Modules/internal/OPI_Tests.os | 6 +- .../tools/Modules/OPI_TestDataRetrieval.os | 10 +-- .../OInt/tools/Modules/OPI_TypeConversion.os | 4 +- .../Modules/internal/Modules/OPI_Tools.os | 80 +++++++++---------- .../src/CommonModules/OPI_Dropbox/Module.bsl | 4 +- .../OPI_TestDataRetrieval/Module.bsl | 10 +-- .../src/CommonModules/OPI_Tests/Module.bsl | 6 +- .../src/CommonModules/OPI_Tools/Module.bsl | 80 +++++++++---------- .../OPI_TypeConversion/Module.bsl | 4 +- 10 files changed, 104 insertions(+), 104 deletions(-) diff --git a/src/en/OInt/core/Modules/OPI_Dropbox.os b/src/en/OInt/core/Modules/OPI_Dropbox.os index 419dba0da4..996f94c569 100644 --- a/src/en/OInt/core/Modules/OPI_Dropbox.os +++ b/src/en/OInt/core/Modules/OPI_Dropbox.os @@ -820,8 +820,8 @@ Function GetRequestHeaders(Val Token, Val Parameters = "") If ValueIsFilled(Parameters) Then - JSON = OPI_Tools.JSONString(Parameters, "No"); - JSON = StrReplace(JSON, Chars.VK + Chars.PS, ""); + JSON = OPI_Tools.JSONString(Parameters, "None"); + JSON = StrReplace(JSON, Chars.CR + Chars.PS, ""); Headers.Insert("Dropbox-API-Arg", JSON); diff --git a/src/en/OInt/tests/Modules/internal/OPI_Tests.os b/src/en/OInt/tests/Modules/internal/OPI_Tests.os index 77d7168fa3..26c3d202d1 100644 --- a/src/en/OInt/tests/Modules/internal/OPI_Tests.os +++ b/src/en/OInt/tests/Modules/internal/OPI_Tests.os @@ -48,7 +48,7 @@ // For YAxUnit -Procedure ExecutableScripts() Export +Procedure AndwithполняеымыеСцеtoрии() Export OPI_TestDataRetrieval.FormYAXTests(); @@ -490,7 +490,7 @@ Procedure VKAPI_GetPostStatistics() Export OPI_TestDataRetrieval.WriteLog(Result, "GetPostStatistics"); - OPI_TestDataRetrieval.ExpectsThat(Result).HasType("Array").HasLength(2); + OPI_TestDataRetrieval.ExpectsThat(Result).HasType("Array").AndмеетДлину(2); OPI_Tools.Pause(5); @@ -826,7 +826,7 @@ Procedure VKAPI_CreateProductWithProperties() Export OPI_Tools.Pause(5); OPI_TestDataRetrieval.ExpectsThat(Result).HasType(TypeMatch); - OPI_TestDataRetrieval.ExpectsThat(Result[Response]["items"]).HasType("Array").HasLength(2); + OPI_TestDataRetrieval.ExpectsThat(Result[Response]["items"]).HasType("Array").AndмеетДлину(2); Result = OPI_VK.GroupProducts(ProductsArray, , Parameters); diff --git a/src/en/OInt/tools/Modules/OPI_TestDataRetrieval.os b/src/en/OInt/tools/Modules/OPI_TestDataRetrieval.os index cac65f3007..d6ac5876db 100644 --- a/src/en/OInt/tools/Modules/OPI_TestDataRetrieval.os +++ b/src/en/OInt/tools/Modules/OPI_TestDataRetrieval.os @@ -226,7 +226,7 @@ Function ExpectsThat(Value) Export Try - Module = GetCommonModule("UTest"); + Module = GetCommonModule("ЮTest"); Awaiting = TypeOf(Module) = Type("CommonModule"); Return Module.ExpectsThat(Value); @@ -238,7 +238,7 @@ EndFunction Function FormYAXTests() Export - Module = GetCommonModule("UTTests"); + Module = GetCommonModule("ЮТTests"); Sections = GetTestingSectionMapping(); TestTable = GetTestTable(); @@ -246,12 +246,12 @@ Function FormYAXTests() Export CurrentSection = Section.Key; Filter = New Structure("Section", CurrentSection); - SectionTests = TestTable.FindLines(Filter); + SectionTests = TestTable.FindRows(Filter); - Set = Module.AddTestSet(CurrentSection); + Set = Module.AddTestоinыйSet(CurrentSection); For Each Test In SectionTests Do - Set.AddServerTest(Test.Method, Test.Synonym); + Set.AddServerныйTest(Test.Method, Test.Synonym); EndDo; EndDo; diff --git a/src/en/OInt/tools/Modules/OPI_TypeConversion.os b/src/en/OInt/tools/Modules/OPI_TypeConversion.os index 63cf8328cd..674c7aa0c5 100644 --- a/src/en/OInt/tools/Modules/OPI_TypeConversion.os +++ b/src/en/OInt/tools/Modules/OPI_TypeConversion.os @@ -290,7 +290,7 @@ Procedure GetDate(Value) Export Except OOD = New TypeDescription(Date); - Value = OOD.ConvertValue(Value); + Value = OOD.AdjustValue(Value); EndTry; EndProcedure @@ -298,7 +298,7 @@ EndProcedure Procedure GetNumber(Value) Export TypeDescription = New TypeDescription("Number"); - Value = TypeDescription.ConvertValue(Value); + Value = TypeDescription.AdjustValue(Value); EndProcedure diff --git a/src/en/OInt/tools/Modules/internal/Modules/OPI_Tools.os b/src/en/OInt/tools/Modules/internal/Modules/OPI_Tools.os index 4aa606ae90..c973616dca 100644 --- a/src/en/OInt/tools/Modules/internal/Modules/OPI_Tools.os +++ b/src/en/OInt/tools/Modules/internal/Modules/OPI_Tools.os @@ -293,7 +293,7 @@ Function JsonToStructure(Val Text) Export EndFunction -Function JSONString(Val Data, Val Escaping = "No") Export +Function JSONString(Val Data, Val Escaping = "None") Export JSONParameters = New JSONWriterSettings(JSONLineBreak.Windows , " " @@ -319,7 +319,7 @@ Function JSONString(Val Data, Val Escaping = "No") Export EndFunction Function NumberToString(Val Number) Export - Return StrReplace(String(Number), Chars.NPP, ""); + Return StrReplace(String(Number), Chars.NBSp, ""); EndFunction Function ReadJSONFile(Val Path) Export @@ -361,7 +361,7 @@ EndFunction Function UNIXTime(Val Date) Export OTD = New TypeDescription("Date"); - Date = OTD.ConvertValue(Date); + Date = OTD.AdjustValue(Date); UNIX = Format(Date - Date(1970, 1, 1, 1, 0, 0), "HC=10; HDC=0; HG=0"); UNIX = StrReplace(UNIX, ",", ""); @@ -666,7 +666,7 @@ Function ExecuteMultipartRequest(Val URL Redirection = 300; Error = 400; Boundary = StrReplace(String(New UUID), "-", ""); - LineSeparator = Chars.VK + Chars.PS; + LineSeparator = Chars.CR + Chars.PS; DataType = "multipart/form-data; boundary=" + Boundary; URLStructure = SplitURL(URL); Server = URLStructure["Server"]; @@ -687,7 +687,7 @@ Function ExecuteMultipartRequest(Val URL WriteMultipartParameters(TextRecord, Boundary, Parameters); WriteMultipartFiles(TextRecord, Boundary, ContentType, Files); - TextRecord.WriteString("--" + boundary + "--" + LineSeparator); + TextRecord.WriteLine("--" + boundary + "--" + LineSeparator); TextRecord.Close(); Request.SetBodyFileName(RequestBody); @@ -730,7 +730,7 @@ Function ExecuteMultipartRelatedRequest(Val URL Redirection = 300; Error = 400; Boundary = StrReplace(String(New UUID), "-", ""); - LineSeparator = Chars.VK + Chars.PS; + LineSeparator = Chars.CR + Chars.PS; DataType = "multipart/related; boundary=" + Boundary; URLStructure = SplitURL(URL); Server = URLStructure["Server"]; @@ -751,7 +751,7 @@ Function ExecuteMultipartRelatedRequest(Val URL WriteJSONMultipart(TextRecord, Boundary, JSON); WriteRelatedFiles(TextRecord, Boundary, Files); - TextRecord.WriteString("--" + boundary + "--" + LineSeparator); + TextRecord.WriteLine("--" + boundary + "--" + LineSeparator); TextRecord.Close(); AddContentLength(Request); @@ -839,7 +839,7 @@ EndProcedure Procedure WriteMultipartParameters(TextRecord, Val Boundary, Val Parameters) - LineSeparator = Chars.VK + Chars.PS; + LineSeparator = Chars.CR + Chars.PS; For Each Parameter In Parameters Do @@ -848,20 +848,20 @@ Procedure WriteMultipartParameters(TextRecord, Val Boundary, Val Parameters) Continue; EndIf; - TextRecord.WriteString("--" + boundary + LineSeparator); - TextRecord.WriteString("Content-Disposition: form-data; name=""" + Parameter.Key + """"); - TextRecord.WriteString(LineSeparator); - TextRecord.WriteString(LineSeparator); + TextRecord.WriteLine("--" + boundary + LineSeparator); + TextRecord.WriteLine("Content-Disposition: form-data; name=""" + Parameter.Key + """"); + TextRecord.WriteLine(LineSeparator); + TextRecord.WriteLine(LineSeparator); If TypeOf(Parameter.Value) = Type("String") Or TypeOf(Parameter.Value) = Type("Number") Then ValueAsString = NumberToString(Parameter.Value); - TextRecord.WriteString(ValueAsString); + TextRecord.WriteLine(ValueAsString); ElsIf TypeOf(Parameter.Value) = Type("Boolean") Then - TextRecord.WriteString(?(Parameter.Value, "true", "false")); + TextRecord.WriteLine(?(Parameter.Value, "true", "false")); Else @@ -869,7 +869,7 @@ Procedure WriteMultipartParameters(TextRecord, Val Boundary, Val Parameters) EndIf; - TextRecord.WriteString(LineSeparator); + TextRecord.WriteLine(LineSeparator); EndDo; @@ -878,7 +878,7 @@ EndProcedure Procedure WriteMultipartFiles(TextRecord, Val Boundary, Val ContentType, Val Files) ContentType = TrimAll(ContentType); - LineSeparator = Chars.VK + Chars.PS; + LineSeparator = Chars.CR + Chars.PS; DotReplacement = "___"; For Each File In Files Do @@ -894,22 +894,22 @@ Procedure WriteMultipartFiles(TextRecord, Val Boundary, Val ContentType, Val Fil DotReplacement, ".")); EndIf; - TextRecord.WriteString("--" + boundary + LineSeparator); - TextRecord.WriteString("Content-Disposition: form-data; name=""" + TextRecord.WriteLine("--" + boundary + LineSeparator); + TextRecord.WriteLine("Content-Disposition: form-data; name=""" + SendingFileName + """; filename=""" + FilePath + """"); - TextRecord.WriteString(LineSeparator); + TextRecord.WriteLine(LineSeparator); If ValueIsFilled(ContentType) Then - TextRecord.WriteString("Content-Type: " + ContentType); + TextRecord.WriteLine("Content-Type: " + ContentType); EndIf; - TextRecord.WriteString(LineSeparator); - TextRecord.WriteString(LineSeparator); + TextRecord.WriteLine(LineSeparator); + TextRecord.WriteLine(LineSeparator); WriteBinaryData(TextRecord, File.Value); - TextRecord.WriteString(LineSeparator); + TextRecord.WriteLine(LineSeparator); EndDo; @@ -921,18 +921,18 @@ Procedure WriteRelatedFiles(TextRecord, Val Boundary, Val Files) Return; EndIf; - LineSeparator = Chars.VK + Chars.PS; + LineSeparator = Chars.CR + Chars.PS; If TypeOf(Files) = Type("Map") Then For Each File In Files Do - TextRecord.WriteString("--" + boundary + LineSeparator); - TextRecord.WriteString("Content-Type: " + File.Value); - TextRecord.WriteString(LineSeparator); - TextRecord.WriteString(LineSeparator); + TextRecord.WriteLine("--" + boundary + LineSeparator); + TextRecord.WriteLine("Content-Type: " + File.Value); + TextRecord.WriteLine(LineSeparator); + TextRecord.WriteLine(LineSeparator); WriteBinaryData(TextRecord, File.Key); - TextRecord.WriteString(LineSeparator); - TextRecord.WriteString(LineSeparator); + TextRecord.WriteLine(LineSeparator); + TextRecord.WriteLine(LineSeparator); EndDo; @@ -976,15 +976,15 @@ Procedure WriteJSONMultipart(TextRecord, Val Boundary, Val JSON) Return; EndIf; - LineSeparator = Chars.VK + Chars.PS; + LineSeparator = Chars.CR + Chars.PS; - TextRecord.WriteString("--" + boundary + LineSeparator); - TextRecord.WriteString("Content-Type: application/json; charset=UTF-8"); - TextRecord.WriteString(LineSeparator); - TextRecord.WriteString(LineSeparator); - TextRecord.WriteString(JSON); - TextRecord.WriteString(LineSeparator); - TextRecord.WriteString(LineSeparator); + TextRecord.WriteLine("--" + boundary + LineSeparator); + TextRecord.WriteLine("Content-Type: application/json; charset=UTF-8"); + TextRecord.WriteLine(LineSeparator); + TextRecord.WriteLine(LineSeparator); + TextRecord.WriteLine(JSON); + TextRecord.WriteLine(LineSeparator); + TextRecord.WriteLine(LineSeparator); EndProcedure @@ -1107,9 +1107,9 @@ Function ReadZip(CompressedData, ErrorText = Undefined) Directory = GetTempFileName(); ReadingZip = New ZipFileReader(CompressedData); - FileName = ReadingZip.Elements[0].Name; + FileName = ReadingZip.Items[0].Name; Try - ReadingZip.Extract(ReadingZip.Elements[0], Directory, ZIPRestoreFilePathsMode.DontRestore); + ReadingZip.Extract(ReadingZip.Items[0], Directory, ZIPRestoreFilePathsMode.DontRestore); Except // Ignore archive integrity check, just read the result ErrorText = DetailErrorDescription(ErrorInfo()); diff --git a/src/en/OPI/src/CommonModules/OPI_Dropbox/Module.bsl b/src/en/OPI/src/CommonModules/OPI_Dropbox/Module.bsl index 1f4e9af7b0..93bac7043e 100644 --- a/src/en/OPI/src/CommonModules/OPI_Dropbox/Module.bsl +++ b/src/en/OPI/src/CommonModules/OPI_Dropbox/Module.bsl @@ -820,8 +820,8 @@ Function GetRequestHeaders(Val Token, Val Parameters = "") If ValueIsFilled(Parameters) Then - JSON = OPI_Tools.JSONString(Parameters, "No"); - JSON = StrReplace(JSON, Chars.VK + Chars.PS, ""); + JSON = OPI_Tools.JSONString(Parameters, "None"); + JSON = StrReplace(JSON, Chars.CR + Chars.PS, ""); Headers.Insert("Dropbox-API-Arg", JSON); diff --git a/src/en/OPI/src/CommonModules/OPI_TestDataRetrieval/Module.bsl b/src/en/OPI/src/CommonModules/OPI_TestDataRetrieval/Module.bsl index 7db635b446..363f3b8af1 100644 --- a/src/en/OPI/src/CommonModules/OPI_TestDataRetrieval/Module.bsl +++ b/src/en/OPI/src/CommonModules/OPI_TestDataRetrieval/Module.bsl @@ -226,7 +226,7 @@ Function ExpectsThat(Value) Export Try - Module = GetCommonModule("UTest"); + Module = GetCommonModule("ЮTest"); Awaiting = TypeOf(Module) = Type("CommonModule"); Return Module.ExpectsThat(Value); @@ -238,7 +238,7 @@ EndFunction Function FormYAXTests() Export - Module = GetCommonModule("UTTests"); + Module = GetCommonModule("ЮТTests"); Sections = GetTestingSectionMapping(); TestTable = GetTestTable(); @@ -246,12 +246,12 @@ Function FormYAXTests() Export CurrentSection = Section.Key; Filter = New Structure("Section", CurrentSection); - SectionTests = TestTable.FindLines(Filter); + SectionTests = TestTable.FindRows(Filter); - Set = Module.AddTestSet(CurrentSection); + Set = Module.AddTestоinыйSet(CurrentSection); For Each Test In SectionTests Do - Set.AddServerTest(Test.Method, Test.Synonym); + Set.AddServerныйTest(Test.Method, Test.Synonym); EndDo; EndDo; diff --git a/src/en/OPI/src/CommonModules/OPI_Tests/Module.bsl b/src/en/OPI/src/CommonModules/OPI_Tests/Module.bsl index 260f539f5a..8d5bce9e8d 100644 --- a/src/en/OPI/src/CommonModules/OPI_Tests/Module.bsl +++ b/src/en/OPI/src/CommonModules/OPI_Tests/Module.bsl @@ -48,7 +48,7 @@ // For YAxUnit -Procedure ExecutableScripts() Export +Procedure AndwithполняеымыеСцеtoрии() Export OPI_TestDataRetrieval.FormYAXTests(); @@ -490,7 +490,7 @@ Procedure VKAPI_GetPostStatistics() Export // !OInt OPI_TestDataRetrieval.WriteLog(Result, "GetPostStatistics"); - OPI_TestDataRetrieval.ExpectsThat(Result).HasType("Array").HasLength(2); + OPI_TestDataRetrieval.ExpectsThat(Result).HasType("Array").AndмеетДлину(2); OPI_Tools.Pause(5); @@ -826,7 +826,7 @@ Procedure VKAPI_CreateProductWithProperties() Export OPI_Tools.Pause(5); OPI_TestDataRetrieval.ExpectsThat(Result).HasType(TypeMatch); - OPI_TestDataRetrieval.ExpectsThat(Result[Response]["items"]).HasType("Array").HasLength(2); + OPI_TestDataRetrieval.ExpectsThat(Result[Response]["items"]).HasType("Array").AndмеетДлину(2); Result = OPI_VK.GroupProducts(ProductsArray, , Parameters); diff --git a/src/en/OPI/src/CommonModules/OPI_Tools/Module.bsl b/src/en/OPI/src/CommonModules/OPI_Tools/Module.bsl index 2609f06a51..ab65092f37 100644 --- a/src/en/OPI/src/CommonModules/OPI_Tools/Module.bsl +++ b/src/en/OPI/src/CommonModules/OPI_Tools/Module.bsl @@ -293,7 +293,7 @@ Function JsonToStructure(Val Text) Export EndFunction -Function JSONString(Val Data, Val Escaping = "No") Export +Function JSONString(Val Data, Val Escaping = "None") Export JSONParameters = New JSONWriterSettings(JSONLineBreak.Windows , " " @@ -319,7 +319,7 @@ Function JSONString(Val Data, Val Escaping = "No") Export EndFunction Function NumberToString(Val Number) Export - Return StrReplace(String(Number), Chars.NPP, ""); + Return StrReplace(String(Number), Chars.NBSp, ""); EndFunction Function ReadJSONFile(Val Path) Export @@ -361,7 +361,7 @@ EndFunction Function UNIXTime(Val Date) Export OTD = New TypeDescription("Date"); - Date = OTD.ConvertValue(Date); + Date = OTD.AdjustValue(Date); UNIX = Format(Date - Date(1970, 1, 1, 1, 0, 0), "HC=10; HDC=0; HG=0"); UNIX = StrReplace(UNIX, ",", ""); @@ -666,7 +666,7 @@ Function ExecuteMultipartRequest(Val URL Redirection = 300; Error = 400; Boundary = StrReplace(String(New UUID), "-", ""); - LineSeparator = Chars.VK + Chars.PS; + LineSeparator = Chars.CR + Chars.PS; DataType = "multipart/form-data; boundary=" + Boundary; URLStructure = SplitURL(URL); Server = URLStructure["Server"]; @@ -687,7 +687,7 @@ Function ExecuteMultipartRequest(Val URL WriteMultipartParameters(TextRecord, Boundary, Parameters); WriteMultipartFiles(TextRecord, Boundary, ContentType, Files); - TextRecord.WriteString("--" + boundary + "--" + LineSeparator); + TextRecord.WriteLine("--" + boundary + "--" + LineSeparator); TextRecord.Close(); Request.SetBodyFileName(RequestBody); @@ -730,7 +730,7 @@ Function ExecuteMultipartRelatedRequest(Val URL Redirection = 300; Error = 400; Boundary = StrReplace(String(New UUID), "-", ""); - LineSeparator = Chars.VK + Chars.PS; + LineSeparator = Chars.CR + Chars.PS; DataType = "multipart/related; boundary=" + Boundary; URLStructure = SplitURL(URL); Server = URLStructure["Server"]; @@ -751,7 +751,7 @@ Function ExecuteMultipartRelatedRequest(Val URL WriteJSONMultipart(TextRecord, Boundary, JSON); WriteRelatedFiles(TextRecord, Boundary, Files); - TextRecord.WriteString("--" + boundary + "--" + LineSeparator); + TextRecord.WriteLine("--" + boundary + "--" + LineSeparator); TextRecord.Close(); AddContentLength(Request); @@ -839,7 +839,7 @@ EndProcedure Procedure WriteMultipartParameters(TextRecord, Val Boundary, Val Parameters) - LineSeparator = Chars.VK + Chars.PS; + LineSeparator = Chars.CR + Chars.PS; For Each Parameter In Parameters Do @@ -848,20 +848,20 @@ Procedure WriteMultipartParameters(TextRecord, Val Boundary, Val Parameters) Continue; EndIf; - TextRecord.WriteString("--" + boundary + LineSeparator); - TextRecord.WriteString("Content-Disposition: form-data; name=""" + Parameter.Key + """"); - TextRecord.WriteString(LineSeparator); - TextRecord.WriteString(LineSeparator); + TextRecord.WriteLine("--" + boundary + LineSeparator); + TextRecord.WriteLine("Content-Disposition: form-data; name=""" + Parameter.Key + """"); + TextRecord.WriteLine(LineSeparator); + TextRecord.WriteLine(LineSeparator); If TypeOf(Parameter.Value) = Type("String") Or TypeOf(Parameter.Value) = Type("Number") Then ValueAsString = NumberToString(Parameter.Value); - TextRecord.WriteString(ValueAsString); + TextRecord.WriteLine(ValueAsString); ElsIf TypeOf(Parameter.Value) = Type("Boolean") Then - TextRecord.WriteString(?(Parameter.Value, "true", "false")); + TextRecord.WriteLine(?(Parameter.Value, "true", "false")); Else @@ -869,7 +869,7 @@ Procedure WriteMultipartParameters(TextRecord, Val Boundary, Val Parameters) EndIf; - TextRecord.WriteString(LineSeparator); + TextRecord.WriteLine(LineSeparator); EndDo; @@ -878,7 +878,7 @@ EndProcedure Procedure WriteMultipartFiles(TextRecord, Val Boundary, Val ContentType, Val Files) ContentType = TrimAll(ContentType); - LineSeparator = Chars.VK + Chars.PS; + LineSeparator = Chars.CR + Chars.PS; DotReplacement = "___"; For Each File In Files Do @@ -894,22 +894,22 @@ Procedure WriteMultipartFiles(TextRecord, Val Boundary, Val ContentType, Val Fil DotReplacement, ".")); EndIf; - TextRecord.WriteString("--" + boundary + LineSeparator); - TextRecord.WriteString("Content-Disposition: form-data; name=""" + TextRecord.WriteLine("--" + boundary + LineSeparator); + TextRecord.WriteLine("Content-Disposition: form-data; name=""" + SendingFileName + """; filename=""" + FilePath + """"); - TextRecord.WriteString(LineSeparator); + TextRecord.WriteLine(LineSeparator); If ValueIsFilled(ContentType) Then - TextRecord.WriteString("Content-Type: " + ContentType); + TextRecord.WriteLine("Content-Type: " + ContentType); EndIf; - TextRecord.WriteString(LineSeparator); - TextRecord.WriteString(LineSeparator); + TextRecord.WriteLine(LineSeparator); + TextRecord.WriteLine(LineSeparator); WriteBinaryData(TextRecord, File.Value); - TextRecord.WriteString(LineSeparator); + TextRecord.WriteLine(LineSeparator); EndDo; @@ -921,18 +921,18 @@ Procedure WriteRelatedFiles(TextRecord, Val Boundary, Val Files) Return; EndIf; - LineSeparator = Chars.VK + Chars.PS; + LineSeparator = Chars.CR + Chars.PS; If TypeOf(Files) = Type("Map") Then For Each File In Files Do - TextRecord.WriteString("--" + boundary + LineSeparator); - TextRecord.WriteString("Content-Type: " + File.Value); - TextRecord.WriteString(LineSeparator); - TextRecord.WriteString(LineSeparator); + TextRecord.WriteLine("--" + boundary + LineSeparator); + TextRecord.WriteLine("Content-Type: " + File.Value); + TextRecord.WriteLine(LineSeparator); + TextRecord.WriteLine(LineSeparator); WriteBinaryData(TextRecord, File.Key); - TextRecord.WriteString(LineSeparator); - TextRecord.WriteString(LineSeparator); + TextRecord.WriteLine(LineSeparator); + TextRecord.WriteLine(LineSeparator); EndDo; @@ -976,15 +976,15 @@ Procedure WriteJSONMultipart(TextRecord, Val Boundary, Val JSON) Return; EndIf; - LineSeparator = Chars.VK + Chars.PS; + LineSeparator = Chars.CR + Chars.PS; - TextRecord.WriteString("--" + boundary + LineSeparator); - TextRecord.WriteString("Content-Type: application/json; charset=UTF-8"); - TextRecord.WriteString(LineSeparator); - TextRecord.WriteString(LineSeparator); - TextRecord.WriteString(JSON); - TextRecord.WriteString(LineSeparator); - TextRecord.WriteString(LineSeparator); + TextRecord.WriteLine("--" + boundary + LineSeparator); + TextRecord.WriteLine("Content-Type: application/json; charset=UTF-8"); + TextRecord.WriteLine(LineSeparator); + TextRecord.WriteLine(LineSeparator); + TextRecord.WriteLine(JSON); + TextRecord.WriteLine(LineSeparator); + TextRecord.WriteLine(LineSeparator); EndProcedure @@ -1107,9 +1107,9 @@ Function ReadZip(CompressedData, ErrorText = Undefined) Directory = GetTempFileName(); ReadingZip = New ZipFileReader(CompressedData); - FileName = ReadingZip.Elements[0].Name; + FileName = ReadingZip.Items[0].Name; Try - ReadingZip.Extract(ReadingZip.Elements[0], Directory, ZIPRestoreFilePathsMode.DontRestore); + ReadingZip.Extract(ReadingZip.Items[0], Directory, ZIPRestoreFilePathsMode.DontRestore); Except // Ignore archive integrity check, just read the result ErrorText = DetailErrorDescription(ErrorInfo()); diff --git a/src/en/OPI/src/CommonModules/OPI_TypeConversion/Module.bsl b/src/en/OPI/src/CommonModules/OPI_TypeConversion/Module.bsl index 5f69a7f4f3..681e74e577 100644 --- a/src/en/OPI/src/CommonModules/OPI_TypeConversion/Module.bsl +++ b/src/en/OPI/src/CommonModules/OPI_TypeConversion/Module.bsl @@ -290,7 +290,7 @@ Procedure GetDate(Value) Export Except OOD = New TypeDescription(Date); - Value = OOD.ConvertValue(Value); + Value = OOD.AdjustValue(Value); EndTry; EndProcedure @@ -298,7 +298,7 @@ EndProcedure Procedure GetNumber(Value) Export TypeDescription = New TypeDescription("Number"); - Value = TypeDescription.ConvertValue(Value); + Value = TypeDescription.AdjustValue(Value); EndProcedure From d58377e4c422c03c1db3a676a2f86bf94df52098 Mon Sep 17 00:00:00 2001 From: Vitaly the Alpaca Date: Sat, 1 Jun 2024 16:46:27 +0000 Subject: [PATCH 2/2] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=B7=D0=B0=D1=88=D0=B8=D1=84=D1=80=D0=BE?= =?UTF-8?q?=D0=B2=D0=B0=D0=BD=D0=BD=D1=8B=D1=85=20=D0=B4=D0=B0=D0=BD=D0=BD?= =?UTF-8?q?=D1=8B=D1=85=20=D0=BF=D0=BE=20=D1=80=D0=B5=D0=B7=D1=83=D0=BB?= =?UTF-8?q?=D1=8C=D1=82=D0=B0=D1=82=D0=B0=D0=BC=20=D1=82=D0=B5=D1=81=D1=82?= =?UTF-8?q?=D0=BE=D0=B2=20(workflow)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data.json.gpg | Bin 3383 -> 3380 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/data.json.gpg b/data.json.gpg index db822c92e997e9d3942ee2dde8dc35a82ea08695..c2abec8a775bb80c0d48efe8e5a5c64cb58a0c40 100644 GIT binary patch literal 3380 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