From a9eec83382339e2a5ae4c3e65da4410333316ec0 Mon Sep 17 00:00:00 2001 From: John Jenko Date: Thu, 25 Apr 2024 16:32:20 -0400 Subject: [PATCH 1/4] B2024-024 - Fixes issue when creating an Approved procedure import file (from Versions context menu) from a non-Parent/Child procedure set. --- PROMS/Volian.Controls.Library/vlnTreeView.cs | 30 ++++++++++++++++++-- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/PROMS/Volian.Controls.Library/vlnTreeView.cs b/PROMS/Volian.Controls.Library/vlnTreeView.cs index cddd4d47..28b2c6a6 100644 --- a/PROMS/Volian.Controls.Library/vlnTreeView.cs +++ b/PROMS/Volian.Controls.Library/vlnTreeView.cs @@ -1322,7 +1322,7 @@ namespace Volian.Controls.Library { MenuItem miri = mir.MenuItems.Add("Create Procedure to Import"); miri.Tag = ri.RevisionID; - miri.Click += new EventHandler(ImportProcedure_Click); + miri.Click += new EventHandler(MultiUnitImportProcedure_Click); //B2024-024 Parent Child Create Approved Import file } //end added jcb 20111031 @@ -1420,8 +1420,8 @@ namespace Volian.Controls.Library void ImportProcedure_Click(object sender, EventArgs e) { - //RevisionInfo ri = (sender as MenuItem).Tag as RevisionInfo; - RevisionInfo ri = RevisionInfo.Get(int.Parse((sender as MenuItem).Tag.ToString())); + //B2024-024 restored the line below from prior change - didn't work for non parent/childs sets - created a new click event method (below) for parent/child sets. + RevisionInfo ri = (sender as MenuItem).Tag as RevisionInfo; RevisionConfig rc = ri.MyConfig as RevisionConfig; // bug fix: B2016-183 - add the child's name (ex Unit 1) to the export file name for Parent/Child procedures. int applIdx = rc.Applicability_Index; @@ -1440,6 +1440,30 @@ namespace Volian.Controls.Library FlexibleMessageBox.Show("Approved procedure saved to import file " + fileName, "Creating Export of Approved Procedure", MessageBoxButtons.OK, MessageBoxIcon.Information); } + //B2024-024 create import file for parent/child procedure set + void MultiUnitImportProcedure_Click(object sender, EventArgs e) + { + //RevisionInfo ri = (sender as MenuItem).Tag as RevisionInfo; + RevisionInfo ri = RevisionInfo.Get(int.Parse((sender as MenuItem).Tag.ToString())); + RevisionConfig rc = ri.MyConfig as RevisionConfig; + // bug fix: B2016-183 - add the child's name (ex Unit 1) to the export file name for Parent/Child procedures. + int applIdx = rc.Applicability_Index; + string str = (applIdx > 0) ? _currentPri.MyDocVersion.UnitNames[applIdx - 1] + "_" : ""; // if parent/child get the defined child name to inlcude the export filename + System.Xml.XmlDocument xd = new System.Xml.XmlDocument(); + xd.LoadXml(ri.LatestVersion.ApprovedXML); + string PEIPath = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + @"\VEPROMS\PEI_" + Database.VEPROMS_SqlConnection.Database; + DirectoryInfo di = new DirectoryInfo(PEIPath); + if (!di.Exists) di.Create(); + // B2022-048: Crash when creating Procedure to Import from versions. Couldn't handle '/' in proc number. + string fNametmp = xd.SelectSingleNode("procedure/content/@number").InnerText.Replace(" ", "_").Replace(@"\u8209?", "-").Replace(@"\u9586?", "_").Replace("/", "-") + ".pxml"; + // B2022-112: If applicability, need to resolve the '<' and '>' characters. Just use the UnitNames, i.e. str, from above. + if (applIdx > 0) fNametmp = Regex.Replace(fNametmp, @"\", str, RegexOptions.IgnoreCase); + string fileName = PEIPath + "\\" + str + "Approved_Rev_" + ri.RevisionNumber.Replace(" ", "_").Replace("\\", "-").Replace("/", "-") + "_" + fNametmp; + xd.Save(fileName); + FlexibleMessageBox.Show("Approved procedure saved to import file " + fileName, "Creating Export of Approved Procedure", MessageBoxButtons.OK, MessageBoxIcon.Information); + } + + void ApprovedRevision_Click(object sender, EventArgs e) { bool superceded = false; -- 2.47.2 From de7e2d5f2a3772e8557809f681f6ece84728a56e Mon Sep 17 00:00:00 2001 From: John Jenko Date: Fri, 26 Apr 2024 16:18:51 -0400 Subject: [PATCH 2/4] F2024-057 F2024-058 bullet symbom in ERG note, Allow the insert of sub-steps in Notes and Cautions --- PROMS/Formats/fmtall/GENall.xml | Bin 42380 -> 43030 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/PROMS/Formats/fmtall/GENall.xml b/PROMS/Formats/fmtall/GENall.xml index 432f0ac33df49909be00c1ccb5ff90fba7121117..05f8bbaf7fe01da21ab4cdeb688edd76b255dd3d 100644 GIT binary patch delta 369 zcmeA<%{1)-(*_-$$qv~(lZ|+Ugew_x8IlKr<8=O89_O1(2f$#;p5|aa*%r Date: Mon, 6 May 2024 13:49:03 -0400 Subject: [PATCH 3/4] =?UTF-8?q?B2024-025=20Older=20Parent/Child=20procedur?= =?UTF-8?q?e=20sets=20use=20applicability=20tokens=20that=20do=20not=20inc?= =?UTF-8?q?lude=20the=20=E2=80=9CU-=E2=80=9C=20prefix.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Extension/DisplayText.cs | 2 + .../VEPROMS.CSLA.Library/Extension/ItemExt.cs | 27 +++++++----- .../Extension/TransitionExt.cs | 8 ++-- PROMS/Volian.Controls.Library/EditItem.cs | 38 +++++++++++----- .../Volian.Print.Library/VlnSvgPageHelper.cs | 44 +++++++++++++------ 5 files changed, 79 insertions(+), 40 deletions(-) diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs b/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs index 32b18364..e43bafcf 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs @@ -468,10 +468,12 @@ namespace VEPROMS.CSLA.Library return text; } // B2022-035: resolve unit specific designators - moved code to here so that other objects can use it + // B2024-025 added to the replace list public static string ResolveUnitSpecific(DocVersionInfo mydocversion, string text) { if (mydocversion == null) return text; text = Regex.Replace(text, @"\", mydocversion.DocVersionConfig.Unit_Number, RegexOptions.IgnoreCase); + text = Regex.Replace(text, @"\", mydocversion.DocVersionConfig.Unit_ID, RegexOptions.IgnoreCase); text = Regex.Replace(text, @"\<(U(-|\\u8209\?)ID)\>", mydocversion.DocVersionConfig.Unit_ID, RegexOptions.IgnoreCase); text = Regex.Replace(text, @"\<(U(-|\\u8209\?)NAME)\>", mydocversion.DocVersionConfig.Unit_Name, RegexOptions.IgnoreCase); text = Regex.Replace(text, @"\<(U(-|\\u8209\?)TEXT)\>", mydocversion.DocVersionConfig.Unit_Text, RegexOptions.IgnoreCase); diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs index e1634696..ca204abb 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs @@ -2934,7 +2934,8 @@ namespace VEPROMS.CSLA.Library { string str = MyContent.Text; // B2022-035: resolve unit specific designators - if (str.ToUpper().Contains(@", , ) + str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(this.MyDocVersion, str); return ConvertToDisplayText(str, false, " "); // B2024-013 added " " to replace hard returns with a space instead of semi-colon } } @@ -2946,7 +2947,8 @@ namespace VEPROMS.CSLA.Library { string str = MyContent.Text; // B2022-035: resolve unit specific designators - if (str.ToUpper().Contains(@", , ) + str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(this.MyDocVersion, str); return ConvertToDisplayText(str, false, ""); // pass in empty string for hard retun char will keep hard return } } @@ -2960,7 +2962,8 @@ namespace VEPROMS.CSLA.Library string str = MyContent.Text; if (MyDocVersion != null) { - str = Regex.Replace(str, @"\<[uU]\>", MyDocVersion.DocVersionConfig.Unit_Number); + // B2024-025 - process all of the applicability token (, , ) + str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(MyDocVersion, str); } else { @@ -2979,16 +2982,13 @@ namespace VEPROMS.CSLA.Library if (MyDocVersion != null) { // B2022-035: resolve unit specific designators - if (str.ToUpper().Contains(", , ) + str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(MyDocVersion, str); } else { _MyLog.WarnFormat("Disconnected Data - ItemID = {0}", ItemID); } - //if (str.Contains("")) - // str = str.Replace("", MyDocVersion.DocVersionConfig.Unit_Number); - //if (str.Contains("")) - // str = str.Replace("", MyDocVersion.DocVersionConfig.Unit_Number); return ConvertToDisplayText(str); } } @@ -3047,7 +3047,8 @@ namespace VEPROMS.CSLA.Library string str = MyContent.Text; if (MyDocVersion != null) { - str = Regex.Replace(str, @"\<[uU]\>", MyDocVersion.DocVersionConfig.Unit_Number); + // B2024-025 - process all of the applicability token (, , ) + str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(MyDocVersion, str); } else { @@ -3080,8 +3081,8 @@ namespace VEPROMS.CSLA.Library } else str = MyContent.Number; - str = Regex.Replace(str, @"\", MyDocVersion.DocVersionConfig.Unit_ID, RegexOptions.IgnoreCase); - str = Regex.Replace(str, @"\", MyDocVersion.DocVersionConfig.Unit_ID, RegexOptions.IgnoreCase); + // B2024-025 - process all of the applicability token (, , ) + str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(MyDocVersion, str); } else { @@ -3094,7 +3095,9 @@ namespace VEPROMS.CSLA.Library // str = str.Replace(@"", MyDocVersion.DocVersionConfig.Unit_ID); str = ConvertToDisplayText(str); if (MyDocVersion != null) // B2020-086 check for null doc version - happens if item we are trying to open is no longer there (disconnected) - str = Regex.Replace(str, @"\<[uU]\>", MyDocVersion.DocVersionConfig.Unit_Number); // B2017-019 - process "" in section number + // B2017-019 - process "" in section number + // B2024-025 - process all of the applicability token (, , ) + str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(MyDocVersion, str); return str; } //get { return ConvertToDisplayText(MyContent.Number); } diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs index 627f335b..f8f12d94 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs @@ -1540,8 +1540,8 @@ namespace VEPROMS.CSLA.Library ItemInfo tmpitm = TranGetSectionItem(itminfo); if (!tmpitm.IsSection) return ""; string str = tmpitm.MyContent.Number; - str = Regex.Replace(str, @"\", itminfo.MyDocVersion.DocVersionConfig.Unit_Number, RegexOptions.IgnoreCase ); - str = Regex.Replace(str, @"\", itminfo.MyDocVersion.DocVersionConfig.Unit_ID, RegexOptions.IgnoreCase); + // B2024-025 - process all of the applicability token (, , ) + str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(itminfo.MyDocVersion, str); return (str); } private static string TranGetSectionNumber(TransitionBuilder tb, bool allLevels) @@ -1566,8 +1566,8 @@ namespace VEPROMS.CSLA.Library } //string str = tmpitm.MyContent.Number; string str = BuildSectionPath(ToSections); - str = Regex.Replace(str, @"\", tb._ToItem.MyDocVersion.DocVersionConfig.Unit_Number, RegexOptions.IgnoreCase); - str = Regex.Replace(str, @"\", tb._ToItem.MyDocVersion.DocVersionConfig.Unit_ID, RegexOptions.IgnoreCase); + // B2024-025 - process all of the applicability token (, , ) + str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(tb._ToItem.MyDocVersion, str); //if (!str.EndsWith(".") && tb._ToItem.ItemID != tb._ToItem.ActiveSection.ItemID) tb.StepPrefix = "."; tb.SectionNumberLength = str.Length; diff --git a/PROMS/Volian.Controls.Library/EditItem.cs b/PROMS/Volian.Controls.Library/EditItem.cs index 2c4bab67..8bb85288 100644 --- a/PROMS/Volian.Controls.Library/EditItem.cs +++ b/PROMS/Volian.Controls.Library/EditItem.cs @@ -3583,6 +3583,9 @@ namespace Volian.Controls.Library private string ResolveUnitApp(DocVersionInfo dvi, string str) { if (dvi == null) return str; + // B2024-025 - process all of the applicability token (, , ) + str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(dvi, str); + // look for un-resolved tokens and replace less/greater than chars with "*?" and "?*" respectively string tmp = str.ToUpper(); int sindx = tmp.IndexOf("", sindx + 1); @@ -3591,21 +3594,34 @@ namespace Volian.Controls.Library { reptmp = str.Substring(sindx, eindx - sindx + 1); tmp = reptmp.ToUpper(); - if (tmp == "") str = str.Replace(reptmp, dvi.DocVersionConfig.Unit_Number); - else if (tmp == "") str = str.Replace(reptmp, dvi.DocVersionConfig.Unit_Text); - else if (tmp == "") str = str.Replace(reptmp, dvi.DocVersionConfig.Unit_Number); - else if (tmp == "") str = str.Replace(reptmp, dvi.DocVersionConfig.Unit_Name); - else if (tmp == "") str = str.Replace(reptmp, dvi.DocVersionConfig.Unit_ID); - // B2021-145: For applicability, the tree view & pdf file name are not getting resolved when using any of the ‘OTHER’ tokens - else if (tmp == "") str = str.Replace(reptmp, dvi.DocVersionConfig.Other_Unit_Text); - else if (tmp == "") str = str.Replace(reptmp, dvi.DocVersionConfig.Other_Unit_Number); - else if (tmp == "") str = str.Replace(reptmp, dvi.DocVersionConfig.Other_Unit_Name); - else if (tmp == "") str = str.Replace(reptmp, dvi.DocVersionConfig.Other_Unit_ID); - else str = str.Replace(reptmp, tmp.Replace("<", "*?").Replace(">", "?*")); + str = str.Replace(reptmp, tmp.Replace("<", "*?").Replace(">", "?*")); // unresolved token tmp = str.ToUpper(); sindx = tmp.IndexOf("", sindx + 1); } + //string tmp = str.ToUpper(); + //int sindx = tmp.IndexOf("", sindx + 1); + //string reptmp; + //while (sindx > -1 && eindx > -1) // B2022-007 added while loop to process more than one ") str = str.Replace(reptmp, dvi.DocVersionConfig.Unit_Number); + // else if (tmp == "") str = str.Replace(reptmp, dvi.DocVersionConfig.Unit_Text); + // else if (tmp == "") str = str.Replace(reptmp, dvi.DocVersionConfig.Unit_Number); + // else if (tmp == "") str = str.Replace(reptmp, dvi.DocVersionConfig.Unit_Name); + // else if (tmp == "") str = str.Replace(reptmp, dvi.DocVersionConfig.Unit_ID); + // // B2021-145: For applicability, the tree view & pdf file name are not getting resolved when using any of the ‘OTHER’ tokens + // else if (tmp == "") str = str.Replace(reptmp, dvi.DocVersionConfig.Other_Unit_Text); + // else if (tmp == "") str = str.Replace(reptmp, dvi.DocVersionConfig.Other_Unit_Number); + // else if (tmp == "") str = str.Replace(reptmp, dvi.DocVersionConfig.Other_Unit_Name); + // else if (tmp == "") str = str.Replace(reptmp, dvi.DocVersionConfig.Other_Unit_ID); + // else str = str.Replace(reptmp, tmp.Replace("<", "*?").Replace(">", "?*")); + // tmp = str.ToUpper(); + // sindx = tmp.IndexOf("", sindx + 1); + //} return str; } // C2021-018 used to display Alarm Point Table RO values in the editor diff --git a/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs b/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs index 32661ab0..f15899c6 100644 --- a/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs +++ b/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs @@ -1834,7 +1834,8 @@ i = 0; { if (section.ActiveFormat.PlantFormat.FormatData.ProcData.CapitalizeTitle) title = title.ToUpper(); // B2022-035: resolve unit specific designators - if (title.ToUpper().Contains(@", , ) + title = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(section.MyDocVersion, title); plstr = SplitTitle(svgGroup, pageItem, title, (int)linelen, token, plstr, null); //,rowAdj); } break; @@ -1847,7 +1848,8 @@ i = 0; string title1 = section.MyProcedure.MyContent.Text; if (section.ActiveFormat.PlantFormat.FormatData.ProcData.CapitalizeTitle) title1 = title1.ToUpper(); // F2024-012 copied this line from above (processing COVERPROCTITLE) to resolve unit designators in the procedure title - if (title1.ToUpper().Contains(@", , ) + title1 = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(section.MyDocVersion, title1); plstr = SplitCoverTitle(svgGroup, pageItem, title1, (int)coverlinelen, token, plstr);//, rowAdj); break; case "{TITLE&UNIT}": @@ -2471,6 +2473,9 @@ i = 0; private string ResolveUnitApp(DocVersionInfo dvi, string str) { if (dvi == null) return str; + // B2024-025 - process all of the applicability token (, , ) + str = VEPROMS.CSLA.Library.DisplayText.ResolveUnitSpecific(dvi, str); + // look for un-resolved tokens and replace less/greater than chars with "*?" and "?*" respectively string tmp = str.ToUpper(); int sindx = tmp.IndexOf("", sindx + 1); @@ -2479,21 +2484,34 @@ i = 0; { reptmp = str.Substring(sindx, eindx - sindx + 1); tmp = reptmp.ToUpper(); - if (tmp == "") str = str.Replace(reptmp, dvi.DocVersionConfig.Unit_Number); - else if (tmp == "") str = str.Replace(reptmp, dvi.DocVersionConfig.Unit_Text); - else if (tmp == "") str = str.Replace(reptmp, dvi.DocVersionConfig.Unit_Number); - else if (tmp == "") str = str.Replace(reptmp, dvi.DocVersionConfig.Unit_Name); - else if (tmp == "") str = str.Replace(reptmp, dvi.DocVersionConfig.Unit_ID); - // B2021-145: For applicability, the tree view & pdf file name are not getting resolved when using any of the ‘OTHER’ tokens - else if (tmp == "") str = str.Replace(reptmp, dvi.DocVersionConfig.Other_Unit_Text); - else if (tmp == "") str = str.Replace(reptmp, dvi.DocVersionConfig.Other_Unit_Number); - else if (tmp == "") str = str.Replace(reptmp, dvi.DocVersionConfig.Other_Unit_Name); - else if (tmp == "") str = str.Replace(reptmp, dvi.DocVersionConfig.Other_Unit_ID); - else str = str.Replace(reptmp, tmp.Replace("<", "*?").Replace(">", "?*")); + str = str.Replace(reptmp, tmp.Replace("<", "*?").Replace(">", "?*")); tmp = str.ToUpper(); sindx = tmp.IndexOf("", sindx + 1); } + //string tmp = str.ToUpper(); + //int sindx = tmp.IndexOf("", sindx + 1); + //string reptmp; + //while (sindx > -1 && eindx > -1) // B2022-007 added while loop to process more than one ") str = str.Replace(reptmp, dvi.DocVersionConfig.Unit_Number); + // else if (tmp == "") str = str.Replace(reptmp, dvi.DocVersionConfig.Unit_Text); + // else if (tmp == "") str = str.Replace(reptmp, dvi.DocVersionConfig.Unit_Number); + // else if (tmp == "") str = str.Replace(reptmp, dvi.DocVersionConfig.Unit_Name); + // else if (tmp == "") str = str.Replace(reptmp, dvi.DocVersionConfig.Unit_ID); + // // B2021-145: For applicability, the tree view & pdf file name are not getting resolved when using any of the ‘OTHER’ tokens + // else if (tmp == "") str = str.Replace(reptmp, dvi.DocVersionConfig.Other_Unit_Text); + // else if (tmp == "") str = str.Replace(reptmp, dvi.DocVersionConfig.Other_Unit_Number); + // else if (tmp == "") str = str.Replace(reptmp, dvi.DocVersionConfig.Other_Unit_Name); + // else if (tmp == "") str = str.Replace(reptmp, dvi.DocVersionConfig.Other_Unit_ID); + // else str = str.Replace(reptmp, tmp.Replace("<", "*?").Replace(">", "?*")); + // tmp = str.ToUpper(); + // sindx = tmp.IndexOf("", sindx + 1); + //} return str; } // B2019-076: moved the following to DocVersionExt.cs to make it available to transitionext.cs code. -- 2.47.2 From 6392ee3f0fe9c907b2286502873909110f586344 Mon Sep 17 00:00:00 2001 From: John Jenko Date: Tue, 7 May 2024 16:00:36 -0400 Subject: [PATCH 4/4] F2024-059 Customer requested an Asterisk Single Spaced List sub-step type. This was added to all Calaway formats --- PROMS/Formats/fmtall/CAL1all.xml | Bin 86400 -> 87016 bytes PROMS/Formats/fmtall/CAL2_00all.xml | Bin 58710 -> 59326 bytes PROMS/Formats/fmtall/CAL2all.xml | Bin 81980 -> 82602 bytes PROMS/Formats/fmtall/CALBCKall.xml | Bin 48166 -> 48782 bytes PROMS/Formats/fmtall/CALFSGBCKall.xml | Bin 47976 -> 48592 bytes PROMS/Formats/fmtall/CALOTOall.xml | Bin 77970 -> 78586 bytes PROMS/Formats/fmtall/CALSAMall.xml | Bin 82844 -> 83460 bytes 7 files changed, 0 insertions(+), 0 deletions(-) diff --git a/PROMS/Formats/fmtall/CAL1all.xml b/PROMS/Formats/fmtall/CAL1all.xml index a2b5b562b449080d236f654dbfce66a1ada67883..b584e1ab35847c288652a33c095e46830bf4c277 100644 GIT binary patch delta 262 zcmZoz%=%(E>jt52ZUqK7oP4oXcJicH5#CIOVulh1e})1eX*jttSa$M;LYc{jvc)Fr zwDNHWGL$mp17%VfQYHtoi1WksLrj{iSgRB247?0nKo$y|d@(^8!xamiH77rC SPeb*ei!eJ>=VsCF>|+2A@H7no delta 18 acmaE{oV8&w>jt6j$qhv;o9lYBjsXBr0SJKr diff --git a/PROMS/Formats/fmtall/CAL2_00all.xml b/PROMS/Formats/fmtall/CAL2_00all.xml index 34af6e72854fafa01706a25bcec2641de8fe30ed..2cceeba14b574d505a950e95eac52c57b4bd969c 100644 GIT binary patch delta 332 zcmcb1ih198<_%IV+zJeEIC-Isth@z-5>O`xC0qV8S;TLsSGKTH}Z?~!%cvgHF=?~3qzGL#3m|eGHOkJs3Hm^FDfVl$%E3;(po_C dlz>>D!H$8KfeXlj!^wv7!t7Aq=DjJI;Q)k;G(Z3V delta 26 icmeDC%e3qV(}rCslQ)R5FxxQbPv#bt-t3a@6%GKF-U*Zd diff --git a/PROMS/Formats/fmtall/CALFSGBCKall.xml b/PROMS/Formats/fmtall/CALFSGBCKall.xml index c01338b5474181f73e9e8ee48e0fbf7394a9db96..f8324ab1e77a04a14e732a230a8ef393d4afafb1 100644 GIT binary patch delta 288 zcmaFyjp@Q~rVW3RxfK}TaI#>uth@z-5>Oj*YC zm7xf1LpD%67|6>23`g(kSkzta-*~`JCwKie{yCx0O*i4;{X5v delta 18 acmccco9V?jrVW3RCm+ya*_@G<5e@)lb_sp} diff --git a/PROMS/Formats/fmtall/CALOTOall.xml b/PROMS/Formats/fmtall/CALOTOall.xml index 805628f06a9c8067fc8452d1b3dde996bca2480c..16b95356420c7a685233458f92cfd88bad90202b 100644 GIT binary patch delta 306 zcmbRAkmc7?mJMlH+zJeEI5|;6n$cu(ps6sw4?`wHF+&N1KSKeKG@SgSmE7cM zDI$_?42cXmK-p9VC7|9whEj%npqf;Ml*#oh;{0&aAm&a^RF|F{;LIkBCJvIFtZ1hh z=m@qam7xf1V>VDc7|6PSm#0d?XqX|kc8Fgw)T&6!!6#{eGBHmm>u delta 18 acmezMlx5OGmJMlHlNVUCY`&DEaSQ-k@(C;e diff --git a/PROMS/Formats/fmtall/CALSAMall.xml b/PROMS/Formats/fmtall/CALSAMall.xml index babc8e328cabcbcf6c6b7acc70e08c9e9e09edc1..443c285c54bb26e61aa9df0b0dc4e07c9942c37f 100644 GIT binary patch delta 328 zcmbQ!&f3z$x}hP5TY&)%Cl{v3PHyrM;`d?5WGH4RVen@t0Fs82FWOm8KIS7b`CC4p zVIV^(Lq1S6l_7<}mO+WZjUkaC2dFv~$hKqPW#B@X2VqT~=%OeLw*w(N`F^x!pd;9x zRE8q3joCoiU?3}xAsuLDDwtOQG(Q<^n*syOT}nV1eH^y^H&y0Gvu$#}zwG1$Jsw7_ z$rr;!nY9=cCMRYqf@woXNogP-=yt3oPIhz?hP&McXlF3k=LM4s^F=o=$@y^&04ZTT AIsgCw delta 18 ZcmZqaVV%>?x}hOwvV#rF<~Ml~*8xZz2k8I+ -- 2.47.2