1. Support for Mondrian level properties. Caveat: will not work when …

…having two properties with the same name on the same hierarchy 2. Support for proxy bypass. 3. Preregisters well known CA root certificates. 4. Works with SharePoint 2013.
zhifac · Mar 9, 2015 · 93c676a · 93c676a
1 parent 007201c
commit 93c676a
Show file tree

Hide file tree

Showing 51 changed files with 2,026 additions and 445 deletions.
diff --git a/DiscoverResponse.gsoap b/DiscoverResponse.gsoap
@@ -53,6 +53,7 @@ public:
 	xsd__string		PropertyDescription;
 	xsd__string		PropertyType;
 	xsd__string		PropertyAccessType;
+	xsd__string		PROPERTY_USCOREATTRIBUTE_USCOREHIERARCHY_USCORENAME;
 	xsd__string		IsRequired;
 	xsd__string		Value;
 	xsd__string		DataSourceName;
@@ -78,6 +79,7 @@ public:
 	xsd__string		EXPRESSION;
 	xsd__string		SET_USCORECAPTION;
 	xsd__string		SET_USCOREDISPLAY_USCOREFOLDER;
+	xsd__string		STRUCTURE;
 	xsd__string		DIMENSIONS;
 	}*  row;	
 };

diff --git a/ExecuteResponse.gsoap b/ExecuteResponse.gsoap
@@ -1,5 +1,6 @@
 extern typedef struct UserPropStruct {
 	const char*		elementName;
+	const char*		name;
 	const char*		__xsi__type;
 	const char*		value;
 } UserDataProp; 

diff --git a/README b/README
@@ -1,3 +1,9 @@
+Changes 9-March-2015
+1. Support for Mondrian level properties. Caveat: will not work when having two propeties with the same name on the same hierarchy
+2. Support for proxy bypass.
+3. Preregisters well known CA root certificates.
+4. Works with SharePoint 2013.
+
 Changes 1-Jan-2015
 
 1. Proxy autoconfiguration script support. Implemented with ATLHTTP. You need to download it from here: http://atlserver.codeplex.com/ . The solution expects atlhttp to be on the same level with gsoap. The current build layout is shown belw:

diff --git a/Rowset.h b/Rowset.h
@@ -1,6 +1,6 @@
 /*
 	ODBO provider for XMLA data stores
-    Copyright (C) 2014  Yalos Software Labs
+    Copyright (C) 2014-2015  ARquery LTD
 	http://www.arquery.com
 
     This program is free software: you can redistribute it and/or modify

diff --git a/Session.h b/Session.h
@@ -1,6 +1,6 @@
 /*
 	ODBO provider for XMLA data stores
-    Copyright (C) 2014  Yalos Software Labs
+    Copyright (C) 2014-2015  ARquery LTD
 	http://www.arquery.com
 
     This program is free software: you can redistribute it and/or modify
@@ -24,6 +24,7 @@
 
 #include <strsafe.h>
 
+
 class catalog_rowset;
 class cube_rowset;
 class dimension_rowset;
@@ -35,6 +36,8 @@ class measure_rowset;
 class property_rowset;
 class set_rowset;
 
+
+
 using namespace ATL;
 
 class ATL_NO_VTABLE session : 
@@ -99,7 +102,7 @@ class ATL_NO_VTABLE session :
 		return FInit();
 	}
 
-	void FinalRelease() 
+	void FinalRelease() 	
 	{
 		session_table().erase( session_table().find( this ) );
 	}

diff --git a/XMLAAdvancedDlg.rgs b/XMLAAdvancedDlg.rgs
@@ -16,7 +16,7 @@ HKCR
 			VersionIndependentProgID = s 'XMLAProviderLib.XMLAAdvancedDlg'
 			InprocServer32 = s '%MODULE%'
 			{
-				val ThreadingModel = s 'Apartment'
+				val ThreadingModel = s 'Both'
 			}
 			TypeLib = s '{27958A5E-8C87-4CFA-B293-7940DE842E24}'
 			Version = s '1.0'

diff --git a/XMLAConnectionDlg.rgs b/XMLAConnectionDlg.rgs
@@ -16,7 +16,7 @@ HKCR
 			VersionIndependentProgID = s 'XMLAProviderLib.XMLAConnectionDlg'
 			InprocServer32 = s '%MODULE%'
 			{
-				val ThreadingModel = s 'Apartment'
+				val ThreadingModel = s 'Both'
 			}
 			TypeLib = s '{27958A5E-8C87-4CFA-B293-7940DE842E24}'
 			Version = s '1.0'

diff --git a/XMLAData.rgs b/XMLAData.rgs
@@ -16,7 +16,7 @@ HKCR
 			VersionIndependentProgID = s 'XMLAProvider.data_source'
 			InprocServer32 = s '%MODULE%'
 			{
-				val ThreadingModel = s 'Apartment'
+				val ThreadingModel = s 'Both'
 			}
 			'OLE DB MD Provider' = s 'XMLA Data Source'
 			val OLEDB_SERVICES = d '4294967295'

diff --git a/XMLAMethods.h b/XMLAMethods.h
@@ -31,7 +31,12 @@ struct SOAP_ENV__Header {
 	} *EndSession;
 };
 
-
+struct SOAP_ENV__Detail {
+ struct erType {
+  xsd__string code;
+  xsd__string desc;
+ } error;
+};
 
 //gsoap xmlns service name: XMLAConnection //gsoap xmlns service type: XMLAConnectionPortType 
 //gsoap xmlns service namespace: urn:schemas-microsoft-com:xml-analysis

diff --git a/XMLAProvider.aps b/XMLAProvider.aps
diff --git a/XMLAProvider.idl b/XMLAProvider.idl
@@ -1,6 +1,6 @@
 /*
 	ODBO provider for XMLA data stores
-    Copyright (C) 2014  Yalos Software Labs
+    Copyright (C) 2014-2015  ARquery LTD
 	http://www.arquery.com
 
     This program is free software: you can redistribute it and/or modify

diff --git a/XMLAProvider.rc b/XMLAProvider.rc
diff --git a/XMLAProvider.vcxproj b/XMLAProvider.vcxproj
@@ -84,7 +84,7 @@
       <PrecompiledHeader>Use</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>ALLOW_TRANSLATIONS;WITH_OPENSSL;WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WITH_OPENSSL;WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\gsoap\gsoap\;..\openssl\include\;..\atl_server\include\</AdditionalIncludeDirectories>
     </ClCompile>
     <Midl>
@@ -110,7 +110,7 @@
       <ModuleDefinitionFile>.\XMLAProvider.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <RegisterOutput>true</RegisterOutput>
-      <AdditionalDependencies>Ws2_32.lib;Dnsapi.lib;Crypt32.lib;Wininet.lib;libeay32d.lib;ssleay32d.lib;Version.lib;comsuppwd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>Iphlpapi.lib;Ws2_32.lib;Dnsapi.lib;Crypt32.lib;Wininet.lib;libeay32d.lib;ssleay32d.lib;Version.lib;comsuppwd.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\openssl\lib\Windows\i386\static\</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
@@ -119,7 +119,7 @@
       <PrecompiledHeader>Use</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WITH_OPENSSL;WIN32;_WINDOWS;_DEBUG;_USRDLL;ALLOW_TRANSLATIONS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WITH_NOIDREF;WITH_OPENSSL;WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\gsoap\gsoap\;..\openssl\include\;..\atl_server\include\</AdditionalIncludeDirectories>
     </ClCompile>
     <Midl>
@@ -143,7 +143,7 @@
       <ModuleDefinitionFile>.\XMLAProvider.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <RegisterOutput>true</RegisterOutput>
-      <AdditionalDependencies>Ws2_32.lib;Dnsapi.lib;Crypt32.lib;Wininet.lib;libeay32d.lib;ssleay32d.lib;Version.lib;comsuppwd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>Iphlpapi.lib;Ws2_32.lib;Dnsapi.lib;Crypt32.lib;Wininet.lib;libeay32d.lib;ssleay32d.lib;Version.lib;comsuppwd.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\openssl\lib\Windows\x86_64\static\</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
@@ -152,7 +152,7 @@
       <PrecompiledHeader>Use</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>MaxSpeed</Optimization>
-      <PreprocessorDefinitions>ALLOW_TRANSLATIONS;WITH_OPENSSL;WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WITH_OPENSSL;WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\gsoap\gsoap\;..\openssl\include\;..\atl_server\include\</AdditionalIncludeDirectories>
     </ClCompile>
     <Midl>
@@ -180,7 +180,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <RegisterOutput>true</RegisterOutput>
-      <AdditionalDependencies>Ws2_32.lib;Dnsapi.lib;Crypt32.lib;Wininet.lib;libeay32.lib;ssleay32.lib;Version.lib;comsuppw.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>Iphlpapi.lib;Ws2_32.lib;Dnsapi.lib;Crypt32.lib;Wininet.lib;libeay32.lib;ssleay32.lib;Version.lib;comsuppw.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\openssl\lib\Windows\i386\static\</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
@@ -189,7 +189,7 @@
       <PrecompiledHeader>Use</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>MaxSpeed</Optimization>
-      <PreprocessorDefinitions>ALLOW_TRANSLATIONS;WITH_OPENSSL;WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WITH_OPENSSL;WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\gsoap\gsoap\;..\openssl\include\;..\atl_server\include\</AdditionalIncludeDirectories>
     </ClCompile>
     <Midl>
@@ -215,7 +215,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <RegisterOutput>true</RegisterOutput>
-      <AdditionalDependencies>Ws2_32.lib;Dnsapi.lib;Crypt32.lib;Wininet.lib;libeay32.lib;ssleay32.lib;Version.lib;comsuppw.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>Iphlpapi.lib;Ws2_32.lib;Dnsapi.lib;Crypt32.lib;Wininet.lib;libeay32.lib;ssleay32.lib;Version.lib;comsuppw.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\openssl\lib\Windows\x86_64\static\</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
@@ -289,6 +289,7 @@
     <ClInclude Include="config_data.h" />
     <ClInclude Include="cube_row.h" />
     <ClInclude Include="axis_row.h" />
+    <ClInclude Include="dimension_properties.h" />
     <ClInclude Include="dimension_row.h" />
     <ClInclude Include="dllmain.h" />
     <ClInclude Include="function_row.h" />
@@ -320,7 +321,7 @@
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\gsoap\gsoap\bin\win32\soapcpp2.exe -i XMLAMethods.h</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">soapXMLAConnectionProxy.h soapXMLAConnectionProxy.cpp</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">soapXMLAConnectionProxy.h soapXMLAConnectionProxy.cpp</Outputs>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
     </CustomBuild>
     <ClInclude Include="version_info.h" />
     <ClInclude Include="XMLAProvider_i.h" />

diff --git a/XMLAProvider.vcxproj.filters b/XMLAProvider.vcxproj.filters
@@ -198,6 +198,9 @@
     <ClInclude Include="pac_interpreter.h">
       <Filter>Header Files\config</Filter>
     </ClInclude>
+    <ClInclude Include="dimension_properties.h">
+      <Filter>Header Files\compatibility</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="XMLAProvider.rc">

diff --git a/axis_row.h b/axis_row.h
@@ -1,6 +1,6 @@
 /*
 	ODBO provider for XMLA m_data_exchange stores
-    Copyright (C) 2014  Yalos Software Labs
+    Copyright (C) 2014-2015  ARquery LTD
 	http://www.arquery.com
 
     This program is free software: you can redistribute it and/or modify
@@ -24,6 +24,8 @@
 
 class axis_row
 {
+private:
+	static const size_t MAX_BUF_SIZE = 10 * 1024 * sizeof( wchar_t );
 private:
 	char*					m_data_exchange;
 	xmlns__Axis*			m_axis;
@@ -33,6 +35,7 @@ class axis_row
 	DBLENGTH				m_buf_size;
 	typedef 				std::map<unsigned short, unsigned short> m_indirection_type;
 	m_indirection_type		m_indirection;
+	std::vector<size_t>		m_boundaries;
 public:
 	axis_row()
 	{
@@ -87,12 +90,12 @@ class axis_row
 
 		for ( unsigned int i = 0, e = m_axis_info->__size; i < e; ++i ) {
 			xmlns__HierarchyInfo hInfo = m_axis_info->HierarchyInfo[i];
-
+			m_boundaries.push_back(crtColInfo);
 			m_col_info[crtColInfo].pwszName = _wcsdup( CA2W( hInfo.UName.name, CP_UTF8 ) );
 			m_col_info[crtColInfo].pTypeInfo = (ITypeInfo*)nullptr;
 			m_col_info[crtColInfo].iOrdinal = crtColInfo+1;
 			m_col_info[crtColInfo].dwFlags = DBCOLUMNFLAGS_ISFIXEDLENGTH;
-			m_col_info[crtColInfo].ulColumnSize = 1024;
+			m_col_info[crtColInfo].ulColumnSize = MAX_BUF_SIZE;
 			m_col_info[crtColInfo].wType = DBTYPE_WSTR;
 			m_col_info[crtColInfo].bPrecision = 0xFF;
 			m_col_info[crtColInfo].bScale = 0xFF;
@@ -105,7 +108,7 @@ class axis_row
 			m_col_info[crtColInfo].pTypeInfo = (ITypeInfo*)nullptr;
 			m_col_info[crtColInfo].iOrdinal = crtColInfo+1;
 			m_col_info[crtColInfo].dwFlags = DBCOLUMNFLAGS_ISFIXEDLENGTH;
-			m_col_info[crtColInfo].ulColumnSize = 1024;
+			m_col_info[crtColInfo].ulColumnSize = MAX_BUF_SIZE;
 			m_col_info[crtColInfo].wType = DBTYPE_WSTR;
 			m_col_info[crtColInfo].bPrecision = 0xFF;
 			m_col_info[crtColInfo].bScale = 0xFF;
@@ -118,7 +121,7 @@ class axis_row
 			m_col_info[crtColInfo].pTypeInfo = (ITypeInfo*)nullptr;
 			m_col_info[crtColInfo].iOrdinal = crtColInfo+1;
 			m_col_info[crtColInfo].dwFlags = DBCOLUMNFLAGS_ISFIXEDLENGTH;
-			m_col_info[crtColInfo].ulColumnSize = 1024;
+			m_col_info[crtColInfo].ulColumnSize = MAX_BUF_SIZE;
 			m_col_info[crtColInfo].wType = DBTYPE_WSTR;
 			m_col_info[crtColInfo].bPrecision = 0xFF;
 			m_col_info[crtColInfo].bScale = 0xFF;
@@ -158,7 +161,7 @@ class axis_row
 				m_col_info[crtColInfo].pTypeInfo = (ITypeInfo*)nullptr;
 				m_col_info[crtColInfo].iOrdinal = crtColInfo+1;
 				m_col_info[crtColInfo].dwFlags = DBCOLUMNFLAGS_ISFIXEDLENGTH;
-				m_col_info[crtColInfo].ulColumnSize = 1024;
+				m_col_info[crtColInfo].ulColumnSize = MAX_BUF_SIZE;
 				m_col_info[crtColInfo].wType = DBTYPE_WSTR;
 				m_col_info[crtColInfo].bPrecision = 0xFF;
 				m_col_info[crtColInfo].bScale = 0xFF;
@@ -173,7 +176,7 @@ class axis_row
 				m_col_info[crtColInfo].pTypeInfo = (ITypeInfo*)nullptr;
 				m_col_info[crtColInfo].iOrdinal = crtColInfo+1;
 				m_col_info[crtColInfo].dwFlags = DBCOLUMNFLAGS_ISFIXEDLENGTH;
-				m_col_info[crtColInfo].ulColumnSize = 1024;
+				m_col_info[crtColInfo].ulColumnSize = MAX_BUF_SIZE;
 				m_col_info[crtColInfo].wType = DBTYPE_WSTR;
 				m_col_info[crtColInfo].bPrecision = 0xFF;
 				m_col_info[crtColInfo].bScale = 0xFF;
@@ -204,7 +207,7 @@ class axis_row
 				m_col_info[crtColInfo].pTypeInfo = (ITypeInfo*)nullptr;
 				m_col_info[crtColInfo].iOrdinal = crtColInfo+1;
 				m_col_info[crtColInfo].dwFlags = DBCOLUMNFLAGS_ISFIXEDLENGTH;
-				m_col_info[crtColInfo].ulColumnSize = 1024;
+				m_col_info[crtColInfo].ulColumnSize = MAX_BUF_SIZE;
 				m_col_info[crtColInfo].wType = DBTYPE_WSTR;
 				m_col_info[crtColInfo].bPrecision = 0xFF;
 				m_col_info[crtColInfo].bScale = 0xFF;
@@ -232,9 +235,14 @@ class axis_row
 		*( ( DBLENGTH *) m_data_exchange ) = idx;
 		offset += m_col_info[0].ulColumnSize;
 
+		size_t pos = 0;
+		size_t length = m_boundaries.size() - 1;
 		for ( unsigned short i = 1; i < m_col_info_cnt; ++i ) {
-			unsigned short idx = ( i-1 ) % member_size;
-			unsigned short memberIdx = (i - 1 ) / member_size;
+			if ( (pos < length) && (i == m_boundaries[pos+1] ) ) {
+				++pos;
+			}
+			unsigned short idx = i- m_boundaries[pos];//( i-1 ) % member_size;
+			unsigned short memberIdx = pos;//(i - 1 ) / member_size;
 			switch ( idx ) {
 			case 0://UName
 				wcscpy_s(  ( wchar_t* )( m_data_exchange + offset ), m_col_info[i].ulColumnSize / 2, CA2W( crtTuple.Member[ memberIdx ].UName, CP_UTF8 ) );
@@ -258,8 +266,8 @@ class axis_row
 				break;
 			default://optional
 				{
-					unsigned short customIdx = m_indirection.at(idx);
-					switch ( m_indirection.at( idx ) ) {
+					//unsigned short customIdx = m_indirection.at(idx);
+					switch ( m_indirection.at( i - 1 ) ) {
 					case 0://ParentUniqueName
 						if ( nullptr != crtTuple.Member[ memberIdx ].PARENT_USCOREUNIQUE_USCORENAME ) {
 							wcscpy_s(  ( wchar_t* )( m_data_exchange + offset ), m_col_info[i].ulColumnSize / 2, CA2W( crtTuple.Member[ memberIdx ].PARENT_USCOREUNIQUE_USCORENAME, CP_UTF8 ) );
@@ -299,7 +307,7 @@ class axis_row
 						break;
 					default://custom props
 						{
-							size_t crt_idx = m_indirection.at( idx ) - 3;
+							size_t crt_idx = m_indirection.at( i - 1 ) - 3;
 							if ( crtTuple.Member[ memberIdx ].__userProp.__size <= crt_idx )
 							{
 								*( ( wchar_t* )( m_data_exchange + offset ) ) = 0;
@@ -353,6 +361,7 @@ class axis_row
 		m_col_info = nullptr;
 		m_data_exchange = nullptr;
 		m_axis = nullptr;
+		m_boundaries.clear();
 	}
 };
 

diff --git a/axis_rowset.h b/axis_rowset.h
@@ -1,6 +1,6 @@
 /*
 	ODBO provider for XMLA data stores
-    Copyright (C) 2014  Yalos Software Labs
+    Copyright (C) 2014-2015  ARquery LTD
 	http://www.arquery.com
 
     This program is free software: you can redistribute it and/or modify