Merge branch 'statisticssweden:master' into master

runejo · Jan 23, 2023 · 90f4b56 · 90f4b56
2 parents 80e144f + 88c941c
commit 90f4b56
Show file tree

Hide file tree

Showing 25 changed files with 62 additions and 55 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,3 +1,6 @@
+=== Release of PxWeb 2023 v1 ===
+- Updated template web.config with new assembly reference and new version number
+- JSON format, added text for the variable values
 === Release of PxWeb 2022 v1 ===
 - Changed Referrer-Policy to same-origin
 - Added security header for Strict Transport and change value on header referrer-policy

diff --git a/PCAxis.Api/PCAxis.Api.csproj b/PCAxis.Api/PCAxis.Api.csproj
@@ -122,13 +122,13 @@
       <HintPath>..\packages\PCAxis.Metadata.1.0.1\lib\netstandard2.0\PCAxis.Metadata.dll</HintPath>
     </Reference>
     <Reference Include="PCAxis.Query, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\PcAxis.Query.1.0.4\lib\netstandard2.0\PCAxis.Query.dll</HintPath>
+      <HintPath>..\packages\PcAxis.Query.1.0.5\lib\netstandard2.0\PCAxis.Query.dll</HintPath>
     </Reference>
     <Reference Include="PCAxis.Sql, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\PcAxis.Sql.1.1.4\lib\netstandard2.0\PCAxis.Sql.dll</HintPath>
     </Reference>
     <Reference Include="Serializers, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\PCAxis.Serializers.1.0.4\lib\netstandard2.0\Serializers.dll</HintPath>
+      <HintPath>..\packages\PCAxis.Serializers.1.1.0\lib\netstandard2.0\Serializers.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.configuration" />

diff --git a/PCAxis.Api/packages.config b/PCAxis.Api/packages.config
@@ -5,7 +5,7 @@
   <package id="ExcelNumberFormat" version="1.1.0" targetFramework="net48" />
   <package id="log4net" version="2.0.12" targetFramework="net48" />
   <package id="Microsoft.CSharp" version="4.7.0" targetFramework="net48" />
-  <package id="Microsoft.Data.SqlClient" version="1.1.3" targetFramework="net48" />
+  <package id="Microsoft.Data.SqlClient" version="1.1.4" targetFramework="net48" />
   <package id="Microsoft.Data.SqlClient.SNI" version="1.1.0" targetFramework="net48" />
   <package id="Microsoft.Identity.Client" version="3.0.8" targetFramework="net48" />
   <package id="Microsoft.IdentityModel.JsonWebTokens" version="5.5.0" targetFramework="net48" />
@@ -22,8 +22,8 @@
   <package id="PCAxis.Menu.MsSqlDatamodelMenu" version="1.0.1" targetFramework="net48" />
   <package id="PCAxis.Menu.OracleDatamodelMenu" version="1.0.1" targetFramework="net48" />
   <package id="PCAxis.Metadata" version="1.0.1" targetFramework="net48" />
-  <package id="PcAxis.Query" version="1.0.4" targetFramework="net48" />
-  <package id="PCAxis.Serializers" version="1.0.4" targetFramework="net48" />
+  <package id="PcAxis.Query" version="1.0.5" targetFramework="net48" />
+  <package id="PCAxis.Serializers" version="1.1.0" targetFramework="net48" />
   <package id="PcAxis.Sql" version="1.1.4" targetFramework="net48" />
   <package id="System.Configuration.ConfigurationManager" version="5.0.0" targetFramework="net48" />
   <package id="System.Data.Common" version="4.3.0" targetFramework="net48" />

diff --git a/PCAxis.Excel.Web.Controls/PCAxis.Excel.Web.Controls.csproj b/PCAxis.Excel.Web.Controls/PCAxis.Excel.Web.Controls.csproj
@@ -81,10 +81,10 @@
       <HintPath>..\packages\PCAxis.Metadata.1.0.1\lib\netstandard2.0\PCAxis.Metadata.dll</HintPath>
     </Reference>
     <Reference Include="PCAxis.Query, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\PcAxis.Query.1.0.4\lib\netstandard2.0\PCAxis.Query.dll</HintPath>
+      <HintPath>..\packages\PcAxis.Query.1.0.5\lib\netstandard2.0\PCAxis.Query.dll</HintPath>
     </Reference>
     <Reference Include="Serializers, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\PCAxis.Serializers.1.0.4\lib\netstandard2.0\Serializers.dll</HintPath>
+      <HintPath>..\packages\PCAxis.Serializers.1.1.0\lib\netstandard2.0\Serializers.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />

diff --git a/PCAxis.Excel.Web.Controls/packages.config b/PCAxis.Excel.Web.Controls/packages.config
@@ -8,8 +8,8 @@
   <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net48" />
   <package id="PcAxis.Core" version="1.2.2" targetFramework="net48" />
   <package id="PCAxis.Metadata" version="1.0.1" targetFramework="net48" />
-  <package id="PcAxis.Query" version="1.0.4" targetFramework="net48" />
-  <package id="PCAxis.Serializers" version="1.0.4" targetFramework="net48" />
+  <package id="PcAxis.Query" version="1.0.5" targetFramework="net48" />
+  <package id="PCAxis.Serializers" version="1.1.0" targetFramework="net48" />
   <package id="System.Configuration.ConfigurationManager" version="5.0.0" targetFramework="net48" />
   <package id="System.IO.FileSystem.Primitives" version="4.0.1" targetFramework="net48" />
   <package id="System.IO.Packaging" version="4.0.0" targetFramework="net48" />

diff --git a/PCAxis.Html5Table.Web.Controls/PCAxis.Html5Table.Web.Controls.csproj b/PCAxis.Html5Table.Web.Controls/PCAxis.Html5Table.Web.Controls.csproj
@@ -55,10 +55,10 @@
       <HintPath>..\packages\PCAxis.Metadata.1.0.1\lib\netstandard2.0\PCAxis.Metadata.dll</HintPath>
     </Reference>
     <Reference Include="PCAxis.Query, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\PcAxis.Query.1.0.4\lib\netstandard2.0\PCAxis.Query.dll</HintPath>
+      <HintPath>..\packages\PcAxis.Query.1.0.5\lib\netstandard2.0\PCAxis.Query.dll</HintPath>
     </Reference>
     <Reference Include="Serializers, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\PCAxis.Serializers.1.0.4\lib\netstandard2.0\Serializers.dll</HintPath>
+      <HintPath>..\packages\PCAxis.Serializers.1.1.0\lib\netstandard2.0\Serializers.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />

diff --git a/PCAxis.Html5Table.Web.Controls/packages.config b/PCAxis.Html5Table.Web.Controls/packages.config
@@ -8,8 +8,8 @@
   <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net48" />
   <package id="PcAxis.Core" version="1.2.2" targetFramework="net48" />
   <package id="PCAxis.Metadata" version="1.0.1" targetFramework="net48" />
-  <package id="PcAxis.Query" version="1.0.4" targetFramework="net48" />
-  <package id="PCAxis.Serializers" version="1.0.4" targetFramework="net48" />
+  <package id="PcAxis.Query" version="1.0.5" targetFramework="net48" />
+  <package id="PCAxis.Serializers" version="1.1.0" targetFramework="net48" />
   <package id="System.Configuration.ConfigurationManager" version="5.0.0" targetFramework="net48" />
   <package id="System.IO.FileSystem.Primitives" version="4.0.1" targetFramework="net48" />
   <package id="System.IO.Packaging" version="4.0.0" targetFramework="net48" />

diff --git a/PCAxis.JsonStat.Web.Controls/PCAxis.JsonStat.Web.Controls.csproj b/PCAxis.JsonStat.Web.Controls/PCAxis.JsonStat.Web.Controls.csproj
@@ -55,10 +55,10 @@
       <HintPath>..\packages\PCAxis.Metadata.1.0.1\lib\netstandard2.0\PCAxis.Metadata.dll</HintPath>
     </Reference>
     <Reference Include="PCAxis.Query, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\PcAxis.Query.1.0.4\lib\netstandard2.0\PCAxis.Query.dll</HintPath>
+      <HintPath>..\packages\PcAxis.Query.1.0.5\lib\netstandard2.0\PCAxis.Query.dll</HintPath>
     </Reference>
     <Reference Include="Serializers, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\PCAxis.Serializers.1.0.4\lib\netstandard2.0\Serializers.dll</HintPath>
+      <HintPath>..\packages\PCAxis.Serializers.1.1.0\lib\netstandard2.0\Serializers.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />

diff --git a/PCAxis.JsonStat.Web.Controls/packages.config b/PCAxis.JsonStat.Web.Controls/packages.config
@@ -8,8 +8,8 @@
   <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net48" />
   <package id="PcAxis.Core" version="1.2.2" targetFramework="net48" />
   <package id="PCAxis.Metadata" version="1.0.1" targetFramework="net48" />
-  <package id="PcAxis.Query" version="1.0.4" targetFramework="net48" />
-  <package id="PCAxis.Serializers" version="1.0.4" targetFramework="net48" />
+  <package id="PcAxis.Query" version="1.0.5" targetFramework="net48" />
+  <package id="PCAxis.Serializers" version="1.1.0" targetFramework="net48" />
   <package id="System.Configuration.ConfigurationManager" version="5.0.0" targetFramework="net48" />
   <package id="System.IO.FileSystem.Primitives" version="4.0.1" targetFramework="net48" />
   <package id="System.IO.Packaging" version="4.0.0" targetFramework="net48" />

diff --git a/PCAxis.JsonStat2.Web.Controls/PCAxis.JsonStat2.Web.Controls.csproj b/PCAxis.JsonStat2.Web.Controls/PCAxis.JsonStat2.Web.Controls.csproj
@@ -53,10 +53,10 @@
       <HintPath>..\packages\PCAxis.Metadata.1.0.1\lib\netstandard2.0\PCAxis.Metadata.dll</HintPath>
     </Reference>
     <Reference Include="PCAxis.Query, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\PcAxis.Query.1.0.4\lib\netstandard2.0\PCAxis.Query.dll</HintPath>
+      <HintPath>..\packages\PcAxis.Query.1.0.5\lib\netstandard2.0\PCAxis.Query.dll</HintPath>
     </Reference>
     <Reference Include="Serializers, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\PCAxis.Serializers.1.0.4\lib\netstandard2.0\Serializers.dll</HintPath>
+      <HintPath>..\packages\PCAxis.Serializers.1.1.0\lib\netstandard2.0\Serializers.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />

diff --git a/PCAxis.JsonStat2.Web.Controls/packages.config b/PCAxis.JsonStat2.Web.Controls/packages.config
@@ -8,8 +8,8 @@
   <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net48" />
   <package id="PcAxis.Core" version="1.2.2" targetFramework="net48" />
   <package id="PCAxis.Metadata" version="1.0.1" targetFramework="net48" />
-  <package id="PcAxis.Query" version="1.0.4" targetFramework="net48" />
-  <package id="PCAxis.Serializers" version="1.0.4" targetFramework="net48" />
+  <package id="PcAxis.Query" version="1.0.5" targetFramework="net48" />
+  <package id="PCAxis.Serializers" version="1.1.0" targetFramework="net48" />
   <package id="System.Configuration.ConfigurationManager" version="5.0.0" targetFramework="net48" />
   <package id="System.IO.FileSystem.Primitives" version="4.0.1" targetFramework="net48" />
   <package id="System.IO.Packaging" version="4.0.0" targetFramework="net48" />

diff --git a/PCAxis.PX-Web.sln b/PCAxis.PX-Web.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29709.97
+# Visual Studio Version 17
+VisualStudioVersion = 17.4.33205.214
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "PCAxis.Web.Core", "PCAxis.Web.Core\PCAxis.Web.Core.vbproj", "{BC004D40-DDC6-446E-A3DF-5D4BA0AE92B8}"
 EndProject

diff --git a/PCAxis.Search/packages.config b/PCAxis.Search/packages.config
@@ -2,7 +2,7 @@
 <packages>
   <package id="log4net" version="2.0.12" targetFramework="net48" />
   <package id="Lucene.Net" version="3.0.3" targetFramework="net48" />
-  <package id="Microsoft.Data.SqlClient" version="1.1.3" targetFramework="net48" />
+  <package id="Microsoft.Data.SqlClient" version="1.1.4" targetFramework="net48" />
   <package id="Microsoft.Data.SqlClient.SNI" version="1.1.0" targetFramework="net48" />
   <package id="Microsoft.Identity.Client" version="3.0.8" targetFramework="net48" />
   <package id="Microsoft.IdentityModel.JsonWebTokens" version="5.5.0" targetFramework="net48" />

diff --git a/PCAxis.Web.Controls/PCAxis.Web.Controls.vbproj b/PCAxis.Web.Controls/PCAxis.Web.Controls.vbproj
@@ -87,7 +87,7 @@
       <HintPath>..\packages\PCAxis.Metadata.1.0.1\lib\netstandard2.0\PCAxis.Metadata.dll</HintPath>
     </Reference>
     <Reference Include="PCAxis.Query, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\PcAxis.Query.1.0.4\lib\netstandard2.0\PCAxis.Query.dll</HintPath>
+      <HintPath>..\packages\PcAxis.Query.1.0.5\lib\netstandard2.0\PCAxis.Query.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.configuration" />

diff --git a/PCAxis.Web.Controls/packages.config b/PCAxis.Web.Controls/packages.config
@@ -5,7 +5,7 @@
   <package id="PcAxis.Core" version="1.2.2" targetFramework="net48" />
   <package id="PCAxis.Menu" version="1.0.1" targetFramework="net48" />
   <package id="PCAxis.Metadata" version="1.0.1" targetFramework="net48" />
-  <package id="PcAxis.Query" version="1.0.4" targetFramework="net48" />
+  <package id="PcAxis.Query" version="1.0.5" targetFramework="net48" />
   <package id="System.Configuration.ConfigurationManager" version="5.0.0" targetFramework="net48" />
   <package id="System.Security.AccessControl" version="5.0.0" targetFramework="net48" />
   <package id="System.Security.Permissions" version="5.0.0" targetFramework="net48" />

diff --git a/PCAxis.Web.Core/PCAxis.Web.Core.vbproj b/PCAxis.Web.Core/PCAxis.Web.Core.vbproj
@@ -79,7 +79,7 @@
       <HintPath>..\packages\PcAxis.Core.1.2.2\lib\netstandard2.0\PCAxis.Core.dll</HintPath>
     </Reference>
     <Reference Include="PCAxis.Query, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\PcAxis.Query.1.0.4\lib\netstandard2.0\PCAxis.Query.dll</HintPath>
+      <HintPath>..\packages\PcAxis.Query.1.0.5\lib\netstandard2.0\PCAxis.Query.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.configuration" />

diff --git a/PCAxis.Web.Core/packages.config b/PCAxis.Web.Core/packages.config
@@ -3,7 +3,7 @@
   <package id="log4net" version="2.0.12" targetFramework="net48" />
   <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net48" />
   <package id="PcAxis.Core" version="1.2.2" targetFramework="net48" />
-  <package id="PcAxis.Query" version="1.0.4" targetFramework="net48" />
+  <package id="PcAxis.Query" version="1.0.5" targetFramework="net48" />
   <package id="System.Configuration.ConfigurationManager" version="5.0.0" targetFramework="net48" />
   <package id="System.Security.AccessControl" version="5.0.0" targetFramework="net48" />
   <package id="System.Security.Permissions" version="5.0.0" targetFramework="net48" />

diff --git a/PX.Json.Web.Controls/PX.Json.Web.Controls.csproj b/PX.Json.Web.Controls/PX.Json.Web.Controls.csproj
@@ -54,10 +54,10 @@
       <HintPath>..\packages\PCAxis.Metadata.1.0.1\lib\netstandard2.0\PCAxis.Metadata.dll</HintPath>
     </Reference>
     <Reference Include="PCAxis.Query, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\PcAxis.Query.1.0.4\lib\netstandard2.0\PCAxis.Query.dll</HintPath>
+      <HintPath>..\packages\PcAxis.Query.1.0.5\lib\netstandard2.0\PCAxis.Query.dll</HintPath>
     </Reference>
     <Reference Include="Serializers, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\PCAxis.Serializers.1.0.4\lib\netstandard2.0\Serializers.dll</HintPath>
+      <HintPath>..\packages\PCAxis.Serializers.1.1.0\lib\netstandard2.0\Serializers.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />

diff --git a/PX.Json.Web.Controls/packages.config b/PX.Json.Web.Controls/packages.config
@@ -8,8 +8,8 @@
   <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net48" />
   <package id="PcAxis.Core" version="1.2.2" targetFramework="net48" />
   <package id="PCAxis.Metadata" version="1.0.1" targetFramework="net48" />
-  <package id="PcAxis.Query" version="1.0.4" targetFramework="net48" />
-  <package id="PCAxis.Serializers" version="1.0.4" targetFramework="net48" />
+  <package id="PcAxis.Query" version="1.0.5" targetFramework="net48" />
+  <package id="PCAxis.Serializers" version="1.1.0" targetFramework="net48" />
   <package id="System.Configuration.ConfigurationManager" version="5.0.0" targetFramework="net48" />
   <package id="System.IO.FileSystem.Primitives" version="4.0.1" targetFramework="net48" />
   <package id="System.IO.Packaging" version="4.0.0" targetFramework="net48" />

diff --git a/PXWeb/Admin/Tools-XMLGenerator.aspx.cs b/PXWeb/Admin/Tools-XMLGenerator.aspx.cs
@@ -170,11 +170,10 @@ protected void btnGenerateXML_Click(object sender, EventArgs e)
             }
             string themeMapping = HttpContext.Current.Server.MapPath("~/TMapping.json");
             string dbType = cboSelectDbType.SelectedItem.Value;
-            string dbid = "";
+            string dbid;
             IFetcher fetcher;
 
-            string currPath = HttpContext.Current.Server.MapPath("~");
-
+            string savePath = HttpContext.Current.Server.MapPath(PXWeb.Settings.Current.General.Paths.PxDatabasesPath + cboSelectDb.SelectedItem.Value + "/dcat-ap.xml");
             switch (dbType) {
                 case "PX":
                     dbid = HttpContext.Current.Server.MapPath("~/Resources/PX/Databases/") + cboSelectDb.SelectedItem.Value + "/Menu.xml";
@@ -212,7 +211,7 @@ protected void btnGenerateXML_Click(object sender, EventArgs e)
             };
             try
             {
-                XML.WriteToFile(HttpContext.Current.Server.MapPath("~/dcat-ap.xml"), settings);
+                XML.WriteToFile(savePath, settings);
             }
             catch(PCAxis.Menu.Exceptions.InvalidMenuFromXMLException)
             {

diff --git a/PXWeb/Code/API/Controllers/DcatController.cs b/PXWeb/Code/API/Controllers/DcatController.cs
@@ -37,17 +37,18 @@ public HttpResponseMessage buildXML(string databaseType, string database, string
                 }
                 else if(databaseTypeLower == "px")
                 {
-                    settings.DBid = HttpContext.Current.Server.MapPath("~/Resources/PX/Databases/") + database + "/Menu.xml";
+                    settings.DBid = HttpContext.Current.Server.MapPath(PXWeb.Settings.Current.General.Paths.PxDatabasesPath) + database + "/Menu.xml";
                     if (!File.Exists(settings.DBid)) return Request.CreateResponse(HttpStatusCode.BadRequest, $"Database does not exist: {database}");
-                    string localThemeMapping = HttpContext.Current.Server.MapPath("~/Resources/PX/Databases/") + database + "/TMapping.json";
+                    string localThemeMapping = HttpContext.Current.Server.MapPath(PXWeb.Settings.Current.General.Paths.PxDatabasesPath) + database + "/TMapping.json";
                     if (File.Exists(localThemeMapping)) settings.ThemeMapping = localThemeMapping;
-                    settings.Fetcher = new PXFetcher(HttpContext.Current.Server.MapPath("~/Resources/PX/Databases/"));
+                    settings.Fetcher = new PXFetcher(HttpContext.Current.Server.MapPath(PXWeb.Settings.Current.General.Paths.PxDatabasesPath));
                 }
                 else
                 {
                     return Request.CreateResponse(HttpStatusCode.BadRequest, $"Invalid database type");
                 }
-                XML.WriteToFile(HttpContext.Current.Server.MapPath("~/dcat-ap.xml"), settings);
+                string savePath = HttpContext.Current.Server.MapPath(PXWeb.Settings.Current.General.Paths.PxDatabasesPath + database + "/dcat-ap.xml");
+                XML.WriteToFile(savePath, settings);
                 return Request.CreateResponse(HttpStatusCode.OK, $"Xml file created successfully, {databaseType}");
             }
         }