Add configurable PX parser and centralize content variable logic

Refactored PxFileBuilder2 to delegate contents variable creation to ContentsUtil.AssertContentsVariableExists, reducing code duplication. Introduced UsePxUtilsParser option in PxFileConfigurationOptions to allow runtime selection between PxBuilder and PxFileBuilder2 in PxFileDataSource. Updated class inheritance and namespaces to align with new structure.

Author: likp

PxWeb/Code/Api2/DataSource/PxFile/PxFileBuilder2.cs

@@ -1,67 +1,18 @@
-using System.Globalization;
+using PCAxis.Paxiom;
 
-using PCAxis.Paxiom;
-
-using PxWeb.PxFile;
+using PxWeb.Code.PxFile;
 
 namespace PxWeb.Code.Api2.DataSource.PxFile
 {
-    internal class PxFileBuilder2 : PxBuilder
+
+
+    internal class PxFileBuilder2 : PXFileBuilder
     {
         public override bool BuildForSelection()
         {
             var meta = base.Model.Meta;
             var result = base.BuildForSelection();
-            if (meta.ContentVariable is null)
-            {
-                // If there is no content variable, we create one.
-
-                try
-                {
-                    // The name of the content variable is localized based on the language of the metadata.
-                    var name = PCAxis.Paxiom.Localization.PxResourceManager.GetResourceManager()
-                        .GetString("ApiContentsVariableName", new CultureInfo(meta.Language));
-
-                    // Create the content variable
-                    var contentVariable = new Variable(name, "CONTENTS", PlacementType.Stub, meta.NumberOfLanguages);
-                    contentVariable.IsContentVariable = true;
-
-                    // Create the value for the content variable from the meta contents
-                    var value = new Value(meta.Contents, meta.NumberOfLanguages);
-                    PaxiomUtil.SetCode(value, "content");
-                    // Move the contentInfo from tablelevel to the content value
-                    value.ContentInfo = meta.ContentInfo;
-                    meta.ContentInfo = null;
-                    contentVariable.Values.Add(value);
-
-                    // Insert the content variable as the first variable in the stub
-                    meta.Stub.Insert(0, contentVariable);
-                    meta.Variables.Insert(0, contentVariable);
-                    meta.ContentVariable = contentVariable;
-
-                    // Add text and ContentInfo for all languages
-                    var languages = meta.GetAllLanguages();
-                    var currentLanguage = meta.CurrentLanguage;
-                    for (int i = 0; i < languages.Length; i++)
-                    {
-                        var lang = languages[i];
-
-                        meta.SetLanguage(i);
-
-                        // Add the label for each language
-                        contentVariable.Name = PCAxis.Paxiom.Localization.PxResourceManager.GetResourceManager()
-                            .GetString("ApiContentsVariableName", new CultureInfo(lang));
-
-                        // Set the value text in diffrent languages
-                        value.Value = meta.Contents;
-                    }
-                    meta.SetLanguage(currentLanguage);
-                }
-                catch (Exception)
-                {
-                    result = false;
-                }
-            }
+            ContentsUtil.AssertContentsVariableExists(meta);
 
             return result;
 

PxWeb/Code/Api2/DataSource/PxFile/PxFileDataSource.cs

@@ -10,6 +10,7 @@
 using Px.Abstractions.Interfaces;
 
 using PxWeb.Mappers;
+using PxWeb.PxFile;
 
 namespace PxWeb.Code.Api2.DataSource.PxFile
 {
@@ -19,13 +20,15 @@ public class PxFileDataSource : IDataSource
         private readonly ITablePathResolver _tablePathResolver;
         private readonly IPxHost _hostingEnvironment;
         private readonly ICodelistMapper _codelistMapper;
+        private readonly bool _usePxUtilsParser;
 
         public PxFileDataSource(IPxFileConfigurationService pxFileConfigurationService, IItemSelectionResolver itemSelectionResolver, ITablePathResolver tablePathResolver, IPxHost hostingEnvironment, ICodelistMapper codelistMapper)
         {
             _itemSelectionResolver = itemSelectionResolver;
             _tablePathResolver = tablePathResolver;
             _hostingEnvironment = hostingEnvironment;
             _codelistMapper = codelistMapper;
+            _usePxUtilsParser = pxFileConfigurationService.GetConfiguration().UsePxUtilsParser;
         }
 
         /// <summary>
@@ -36,7 +39,7 @@ public PxFileDataSource(IPxFileConfigurationService pxFileConfigurationService,
         /// <returns>Builder object, null if builder could not be created</returns>
         public IPXModelBuilder? CreateBuilder(string id, string language)
         {
-            var builder = new PxFileBuilder2();
+            IPXModelBuilder builder = _usePxUtilsParser ? new PxBuilder() : new PxFileBuilder2();
 
             var path = _tablePathResolver.Resolve(language, id, out bool selectionExists);
 

PxWeb/Config/Api2/PxFileConfigurationOptions.cs

@@ -3,5 +3,7 @@
     public class PxFileConfigurationOptions
     {
         public bool StrictAggregations { get; set; }
+
+        public bool UsePxUtilsParser { get; set; } = false;
     }
 }