Merge branch 'statisticssweden:master' into master

.github/workflows/deploy_to_azure.yml

@@ -57,7 +57,7 @@ jobs:
 
       - name: Deploy to Azure Web App
         id: deploy-to-webapp
-        uses: azure/webapps-deploy@v2
+        uses: azure/webapps-deploy@v3
         with:
           app-name: 'PxWebMaster'
           slot-name: 'Production'

.github/workflows/master_px-web_org.yaml

@@ -49,7 +49,7 @@ jobs:
 
       - name: Deploy to Azure Web App
         id: deploy-to-webapp
-        uses: azure/webapps-deploy@v2
+        uses: azure/webapps-deploy@v3
         with:
           app-name: 'master-pxweb'
           slot-name: 'production'

CHANGES.txt

@@ -1,4 +1,7 @@
 === Release of PxWeb 2023 v1 ===
+- New version of PcAxis.Query.1.0.8 #367
+- Added filetype csv2 and csv3 #367
+- Fix for issue #344 (Classification does not get back to zero - ValuesetMustBeSelectedFirst)
 - Dcat file uses the organizations.json file to map between organization names and existing organization uris
 - Dcat admin tool and api-endpoint is now updated to allow for catalog titles and descriptions in multiple languages
 - Dcat admin tool settings are now saved separately for each database, in the corresponding database.config file
@@ -66,5 +69,4 @@
 - On presentaionpage, keep focus on operationbutton and maintain status on menu (open/closed)
 - Better text for screenreader on buttons on selectionpage.
 - Added aria-live on selection page describing selection status and validation errors.
-- Moved checkbox for search in front of search-field. Better to read (screenreader) checkbox text before searchfield connected to checkbox.
-
+- Moved checkbox for search in front of search-field. Better to read (screenreader) checkbox text before searchfield connected to checkbox.

PCAxis.Api/PCAxis.Api.csproj

@@ -57,8 +57,8 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Azure.Core, Version=1.25.0.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
-      <HintPath>..\packages\Azure.Core.1.25.0\lib\net461\Azure.Core.dll</HintPath>
+    <Reference Include="Azure.Core, Version=1.35.0.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
+      <HintPath>..\packages\Azure.Core.1.35.0\lib\net472\Azure.Core.dll</HintPath>
     </Reference>
     <Reference Include="Azure.Identity, Version=1.7.0.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
       <HintPath>..\packages\Azure.Identity.1.7.0\lib\netstandard2.0\Azure.Identity.dll</HintPath>
@@ -157,8 +157,8 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Data.OracleClient" />
-    <Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Diagnostics.DiagnosticSource.4.6.0\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
+    <Reference Include="System.Diagnostics.DiagnosticSource, Version=6.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Diagnostics.DiagnosticSource.6.0.1\lib\net461\System.Diagnostics.DiagnosticSource.dll</HintPath>
     </Reference>
     <Reference Include="System.Diagnostics.PerformanceCounter, Version=6.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Diagnostics.PerformanceCounter.6.0.1\lib\net461\System.Diagnostics.PerformanceCounter.dll</HintPath>

PCAxis.Api/app.config

@@ -94,6 +94,10 @@
         <assemblyIdentity name="Microsoft.Identity.Client.Extensions.Msal" publicKeyToken="0a613f4dd989e8ae" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-2.31.0.0" newVersion="2.31.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Azure.Core" publicKeyToken="92742159e12e44c8" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.35.0.0" newVersion="1.35.0.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" /></startup></configuration>

PCAxis.Api/packages.config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Azure.Core" version="1.25.0" targetFramework="net48" />
-  <package id="Azure.Identity" version="1.7.0" targetFramework="net48" />
+  <package id="Azure.Core" version="1.35.0" targetFramework="net48" />
+  <package id="Azure.Identity" version="1.10.2" targetFramework="net48" />
   <package id="ClosedXML" version="0.95.4" targetFramework="net48" />
   <package id="DocumentFormat.OpenXml" version="2.12.2" targetFramework="net48" />
   <package id="ExcelNumberFormat" version="1.1.0" targetFramework="net48" />
@@ -32,7 +32,7 @@
   <package id="System.Buffers" version="4.5.1" targetFramework="net48" />
   <package id="System.Configuration.ConfigurationManager" version="7.0.0" targetFramework="net48" />
   <package id="System.Data.Common" version="4.3.0" targetFramework="net48" />
-  <package id="System.Diagnostics.DiagnosticSource" version="4.6.0" targetFramework="net48" />
+  <package id="System.Diagnostics.DiagnosticSource" version="6.0.1" targetFramework="net48" />
   <package id="System.Diagnostics.PerformanceCounter" version="6.0.1" targetFramework="net48" />
   <package id="System.DirectoryServices" version="6.0.1" targetFramework="net48" />
   <package id="System.DirectoryServices.Protocols" version="6.0.1" targetFramework="net48" />

PCAxis.Search/PCAxis.Search.csproj

@@ -35,8 +35,8 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Azure.Core, Version=1.25.0.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
-      <HintPath>..\packages\Azure.Core.1.25.0\lib\net461\Azure.Core.dll</HintPath>
+    <Reference Include="Azure.Core, Version=1.35.0.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
+      <HintPath>..\packages\Azure.Core.1.35.0\lib\net472\Azure.Core.dll</HintPath>
     </Reference>
     <Reference Include="Azure.Identity, Version=1.7.0.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
       <HintPath>..\packages\Azure.Identity.1.7.0\lib\netstandard2.0\Azure.Identity.dll</HintPath>
@@ -108,8 +108,8 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Data.OracleClient" />
-    <Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Diagnostics.DiagnosticSource.4.6.0\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
+    <Reference Include="System.Diagnostics.DiagnosticSource, Version=6.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Diagnostics.DiagnosticSource.6.0.1\lib\net461\System.Diagnostics.DiagnosticSource.dll</HintPath>
     </Reference>
     <Reference Include="System.Diagnostics.PerformanceCounter, Version=6.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Diagnostics.PerformanceCounter.6.0.1\lib\net461\System.Diagnostics.PerformanceCounter.dll</HintPath>

PCAxis.Search/app.config

@@ -82,6 +82,10 @@
         <assemblyIdentity name="Microsoft.Identity.Client.Extensions.Msal" publicKeyToken="0a613f4dd989e8ae" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-2.31.0.0" newVersion="2.31.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Azure.Core" publicKeyToken="92742159e12e44c8" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.35.0.0" newVersion="1.35.0.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" /></startup></configuration>

PCAxis.Search/packages.config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Azure.Core" version="1.25.0" targetFramework="net48" />
-  <package id="Azure.Identity" version="1.7.0" targetFramework="net48" />
+  <package id="Azure.Core" version="1.35.0" targetFramework="net48" />
+  <package id="Azure.Identity" version="1.10.2" targetFramework="net48" />
   <package id="log4net" version="2.0.15" targetFramework="net48" />
   <package id="Lucene.Net" version="3.0.3" targetFramework="net48" />
   <package id="Microsoft.Bcl.AsyncInterfaces" version="6.0.0" targetFramework="net48" />
@@ -24,7 +24,7 @@
   <package id="System.Buffers" version="4.5.1" targetFramework="net48" />
   <package id="System.Configuration.ConfigurationManager" version="7.0.0" targetFramework="net48" />
   <package id="System.Data.Common" version="4.3.0" targetFramework="net48" />
-  <package id="System.Diagnostics.DiagnosticSource" version="4.6.0" targetFramework="net48" />
+  <package id="System.Diagnostics.DiagnosticSource" version="6.0.1" targetFramework="net48" />
   <package id="System.Diagnostics.PerformanceCounter" version="6.0.1" targetFramework="net48" />
   <package id="System.DirectoryServices" version="6.0.1" targetFramework="net48" />
   <package id="System.DirectoryServices.Protocols" version="6.0.1" targetFramework="net48" />

PCAxis.Web.Controls/CommandBar/Plugin/Plugins.vb

@@ -54,6 +54,8 @@
         Public Const XLS_EXCEL As String = "FileTypeExcel"
         Public Const XLS_DOUBLE_COLUMN As String = "FileTypeExcelDoubleColumn"
         Public Const CSV As String = "csv"
+        Public Const CSV2 As String = "FileTypeCsv2"
+        Public Const CSV3 As String = "FileTypeCsv3"
         Public Const CSV_TABULATOR_WITH_HEADING As String = "FileTypeCsvWithHeadingAndTabulator"
         Public Const CSV_TABULATOR_WITHOUT_HEADING As String = "FileTypeCsvWithoutHeadingAndTabulator"
         Public Const CSV_COMMA_WITH_HEADING As String = "FileTypeCsvWithHeadingAndComma"

PCAxis.Web.Controls/EmbeddedResources/Config/FileConfig.xml

@@ -52,7 +52,35 @@ xsi:schemaLocation="http://www.scb.se ../XSDSchemas/FileSchema.xsd">
 		  <Image>button_save_as_csv.png</Image>
 		  <ShortcutImage>small_button_csv.png</ShortcutImage>
 	 </FileType>
-	 <FileType Active="true">
+	<FileType Active="true">
+		<Type>csv2</Type>
+		<AssemblyQualifiedName>PCAxis.Paxiom.Csv2FileSerializer, PCAxis.Core, Version=1.1.0.0</AssemblyQualifiedName>
+		<Creator>PCAxis.Web.Controls.Csv2FileSerializerCreator, PCAxis.Web.Controls</Creator>
+		<FileInfos>
+			<FileInfo>FileTypeCsv2</FileInfo>
+		</FileInfos>
+		<WebControl>PCAxis.Web.Controls.Csv2FileType, PCAxis.Web.Controls, Version=1.1.0.0</WebControl>
+		<MimeType>application/octet-stream</MimeType>
+		<FileExtension>csv</FileExtension>
+		<CssClass>?</CssClass>
+		<Image>button_save_as_csv.png</Image>
+		<ShortcutImage>small_button_csv.png</ShortcutImage>
+	</FileType>
+	<FileType Active="true">
+		<Type>csv3</Type>
+		<AssemblyQualifiedName>PCAxis.Paxiom.Csv3FileSerializer, PCAxis.Core, Version=1.1.0.0</AssemblyQualifiedName>
+		<Creator>PCAxis.Web.Controls.Csv3FileSerializerCreator, PCAxis.Web.Controls</Creator>
+		<FileInfos>
+			<FileInfo>FileTypeCsv3</FileInfo>
+		</FileInfos>
+		<WebControl>PCAxis.Web.Controls.Csv3FileType, PCAxis.Web.Controls, Version=1.1.0.0</WebControl>
+		<MimeType>application/octet-stream</MimeType>
+		<FileExtension>csv</FileExtension>
+		<CssClass>?</CssClass>
+		<Image>button_save_as_csv.png</Image>
+		<ShortcutImage>small_button_csv.png</ShortcutImage>
+	</FileType>	
+	<FileType Active="true">
 		  <Type>html</Type>
 		  <AssemblyQualifiedName>PCAxis.Paxiom.HtmlFileSerializer, PCAxis.Core, Version=1.1.0.0</AssemblyQualifiedName>
       <Creator>PCAxis.Web.Controls.HtmlSerializerCreator, PCAxis.Web.Controls</Creator>

PCAxis.Web.Controls/FileTypes/Csv/Csv2FileSerializerCreator.vb

@@ -0,0 +1,11 @@
+Imports PCAxis.Paxiom
+Imports PCAxis.Web.Core
+
+Public Class Csv2FileSerializerCreator
+
+    Implements PCAxis.Web.Core.ISerializerCreator
+
+    Public Function Create(fileInfo As String) As IPXModelStreamSerializer Implements ISerializerCreator.Create
+        Return New PCAxis.Paxiom.Csv2FileSerializer()
+    End Function
+End Class

PCAxis.Web.Controls/FileTypes/Csv/Csv2FileType.ascx

@@ -0,0 +1 @@
+<%@ control  inherits="PCAxis.Web.Controls.Csv2FileTypeCodebehind" %>

PCAxis.Web.Controls/FileTypes/Csv/Csv2FileType.vb

@@ -0,0 +1,28 @@
+Imports System.Web.UI
+Imports System.Web.UI.WebControls
+Imports System.ComponentModel
+Imports PCAxis.Web.Core
+Imports PCAxis.Web.Core.Attributes
+Imports PCAxis.Paxiom
+Imports PCAxis.Web.Core.Management
+
+
+''' <summary>
+''' </summary>
+''' <remarks></remarks>
+Partial Public Class Csv2FileType
+    Inherits FileTypeMarkerControlBase(Of Csv2FileTypeCodebehind, Csv2FileType)
+
+    ''' <summary>
+    ''' Creates a csv2 file and sends it to the user
+    ''' </summary>
+    ''' <remarks></remarks>
+    Public Overrides Sub SerializeAndStream()
+        Using stream As IO.MemoryStream = New IO.MemoryStream()
+            Dim csv2FileSerializer As New Csv2FileSerializer
+            csv2FileSerializer.Serialize(PaxiomManager.PaxiomModel, stream)
+            StreamFile(stream, Me.SelectedFileType.MimeType, Me.SelectedFileType.FileExtension)
+        End Using
+    End Sub
+
+End Class

PCAxis.Web.Controls/FileTypes/Csv/Csv2FileTypeCodebehind.vb

@@ -0,0 +1,12 @@
+Imports PCAxis.Web.Core
+
+
+Public Class Csv2FileTypeCodebehind
+    Inherits FileTypeControlBase(Of Csv2FileTypeCodebehind, Csv2FileType)
+
+    Private Sub Csv2FileType_Load(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Load
+        OnFinished()
+        Marker.SerializeAndStream()
+    End Sub
+
+End Class

PCAxis.Web.Controls/FileTypes/Csv/Csv3FileSerializerCreator.vb

@@ -0,0 +1,11 @@
+Imports PCAxis.Paxiom
+Imports PCAxis.Web.Core
+
+Public Class Csv3FileSerializerCreator
+
+    Implements PCAxis.Web.Core.ISerializerCreator
+
+    Public Function Create(fileInfo As String) As IPXModelStreamSerializer Implements ISerializerCreator.Create
+        Return New PCAxis.Paxiom.Csv3FileSerializer()
+    End Function
+End Class

PCAxis.Web.Controls/FileTypes/Csv/Csv3FileType.ascx

@@ -0,0 +1 @@
+<%@ control  inherits="PCAxis.Web.Controls.Csv3FileTypeCodebehind" %>

PCAxis.Web.Controls/FileTypes/Csv/Csv3FileType.vb

@@ -0,0 +1,28 @@
+Imports System.Web.UI
+Imports System.Web.UI.WebControls
+Imports System.ComponentModel
+Imports PCAxis.Web.Core
+Imports PCAxis.Web.Core.Attributes
+Imports PCAxis.Paxiom
+Imports PCAxis.Web.Core.Management
+
+
+''' <summary>
+''' </summary>
+''' <remarks></remarks>
+Partial Public Class Csv3FileType
+    Inherits FileTypeMarkerControlBase(Of Csv3FileTypeCodebehind, Csv3FileType)
+
+    ''' <summary>
+    ''' Creates a csv3 file and sends it to the user
+    ''' </summary>
+    ''' <remarks></remarks>
+    Public Overrides Sub SerializeAndStream()
+        Using stream As IO.MemoryStream = New IO.MemoryStream()
+            Dim csv3FileSerializer As New Csv3FileSerializer
+            csv3FileSerializer.Serialize(PaxiomManager.PaxiomModel, stream)
+            StreamFile(stream, Me.SelectedFileType.MimeType, Me.SelectedFileType.FileExtension)
+        End Using
+    End Sub
+
+End Class

PCAxis.Web.Controls/FileTypes/Csv/Csv3FileTypeCodebehind.vb

@@ -0,0 +1,11 @@
+Imports PCAxis.Web.Core
+
+Public Class Csv3FileTypeCodebehind
+    Inherits FileTypeControlBase(Of Csv3FileTypeCodebehind, Csv3FileType)
+
+    Private Sub Csv3FiltType_Load(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Load
+        OnFinished()
+        Marker.SerializeAndStream()
+    End Sub
+
+End Class

PCAxis.Web.Controls/PCAxis.Web.Controls.vbproj

@@ -115,6 +115,7 @@
     <Reference Include="System.ServiceProcess" />
     <Reference Include="System.Transactions" />
     <Reference Include="System.Web" />
+    <Reference Include="System.Web.Extensions" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
     <Reference Include="Ude.NetStandard, Version=1.0.2.0, Culture=neutral, PublicKeyToken=103cb45fc06c90e4, processorArchitecture=MSIL">
@@ -270,6 +271,24 @@
     <Compile Include="FileTypes\Chart\SaveAsChartCodebehind.vb">
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
+    <Compile Include="FileTypes\Csv\Csv2FileType.vb">
+      <DependentUpon>Csv2FileType.ascx</DependentUpon>
+    </Compile>
+    <Compile Include="FileTypes\Csv\Csv2FileTypeCodebehind.vb">
+      <DependentUpon>Csv2FileType.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="FileTypes\Csv\Csv2FileSerializerCreator.vb" /> 
+
+    <Compile Include="FileTypes\Csv\Csv3FileType.vb">
+      <DependentUpon>Csv3FileType.ascx</DependentUpon>
+    </Compile>
+    <Compile Include="FileTypes\Csv\Csv3FileTypeCodebehind.vb">
+      <DependentUpon>Csv3FileType.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="FileTypes\Csv\Csv3FileSerializerCreator.vb" /> 
+
     <Compile Include="FileTypes\Excel\Excel.vb">
       <DependentUpon>Excel.ascx</DependentUpon>
     </Compile>
@@ -741,6 +760,10 @@
     <Content Include="EmbeddedResources\Config\FileConfig.xml">
       <SubType>Designer</SubType>
     </Content>
+    <EmbeddedResource Include="FileTypes\Csv\Csv3FileType.ascx" />
+    <EmbeddedResource Include="FileTypes\Csv\Csv2FileType.ascx">
+      <SubType>ASPXCodeBehind</SubType>
+    </EmbeddedResource>
     <EmbeddedResource Include="SelectFromGroup\SelectFromGroup.ascx">
       <SubType>ASPXCodeBehind</SubType>
     </EmbeddedResource>
@@ -759,11 +782,11 @@
     <Folder Include="CommandBarFunctions\Sort\" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.VisualBasic.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
   -->
 </Project>

PCAxis.Web.Controls/VariableSelector/VariableSelectorValueSelectCodebehind.vb

@@ -1042,15 +1042,27 @@ Public Class VariableSelectorValueSelectCodebehind
     Friend Function ApplyGrouping(ByVal code As String, Optional ByVal clearSelection As Boolean = True, Optional ByVal include As Nullable(Of GroupingIncludesType) = Nothing) As Boolean
         Dim ok As Boolean = False
 
-        If (code.Equals("_RESTORE_") And Not (Marker.ValuesetMustBeSelectedFirst)) Then
+        If (code.Equals("_RESTORE_")) Then
             'Code "_RESTORE_" means that the option --Select classification-- has been selected in the dropdown.
             'This shall result in the values in the dropdown being restored to the initial ones.
-            'Restore of values is performed by applying the valueset _ALL_.
-            Dim vsInfo As New PCAxis.Paxiom.ValueSetInfo
-            vsInfo.ID = "_ALL_"
-            Core.Management.PaxiomManager.PaxiomModelBuilder.ApplyValueSet(Marker.Variable.Code, vsInfo)
-            Marker.SelectedGroupingPresentation = GroupingIncludesType.SingleValues
-            ok = True
+
+            If (Marker.ValuesetMustBeSelectedFirst AndAlso Marker.Variable.HasValuesets) Then
+                Marker.Variable.CurrentGrouping = Nothing
+                Marker.Variable.CurrentValueSet = Nothing
+                clearSelection = True
+            Else
+                'Fix for when only one valueset and _ALL_ does not exist
+                If Marker.Variable.ValueSets.Count = 1 Then
+                    Core.Management.PaxiomManager.PaxiomModelBuilder.ApplyValueSet(Marker.Variable.Code, Marker.Variable.ValueSets(0))
+                Else
+                    'Restore of values is performed by applying the valueset _ALL_.
+                    Dim vsInfo As New PCAxis.Paxiom.ValueSetInfo
+                    vsInfo.ID = "_ALL_"
+                    Core.Management.PaxiomManager.PaxiomModelBuilder.ApplyValueSet(Marker.Variable.Code, vsInfo)
+                End If
+                Marker.SelectedGroupingPresentation = GroupingIncludesType.SingleValues
+                ok = True
+            End If
         ElseIf code.StartsWith("gr__") Then
             'Apply grouping
             Dim grpInfo As PCAxis.Paxiom.GroupingInfo