Skip to content

Commit

Permalink
openssl
Browse files Browse the repository at this point in the history
  • Loading branch information
alexandra iancu committed Sep 5, 2014
1 parent d37e8aa commit d8ab22f
Show file tree
Hide file tree
Showing 26 changed files with 973 additions and 138 deletions.
18 changes: 18 additions & 0 deletions DiscoverResponse.gsoap
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,24 @@ public:
xsd__string ProviderName;
xsd__string ProviderType;
xsd__string AuthenticationMode;
xsd__string FUNCTION_USCORENAME;
xsd__string PARAMETER_USCORELIST;
xsd__string RETURN_USCORETYPE;
xsd__string ORIGIN;
xsd__string INTERFACE_USCORENAME;
xsd__string Keyword;
xsd__string LiteralName;
xsd__string LiteralValue;
xsd__string LiteralInvalidChars;
xsd__string LiteralInvalidStartingChars;
int LiteralMaxLength;
int LiteralNameEnumValue;
xsd__string SET_USCORENAME;
xsd__string SCOPE;
xsd__string EXPRESSION;
xsd__string SET_USCORECAPTION;
xsd__string SET_USCOREDISPLAY_USCOREFOLDER;
xsd__string DIMENSIONS;
}* row;
};

Expand Down
31 changes: 25 additions & 6 deletions ExecuteResponse.gsoap
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,25 @@ extern typedef struct UserPropStruct {
const char* value;
} UserDataProp;

class arrayUserProp {
extern typedef struct arrayUserPropStruct {
public:
int __size;
UserDataProp* __array;
};
} arrayUserProp;

extern typedef struct CellPropStruct {

const char* elementName;
const char* name;
const char* value;
} CellDataProp;


extern typedef struct arrayCellPropStruct {
public:
int __size;
CellDataProp* __array;
}arrayCellProp;

class xmlns__Cube {
public:
Expand Down Expand Up @@ -102,11 +116,15 @@ public:
xmlns__AxisInfo* AxisInfo;
};

class xmlns__Value{
public:
xsd__string @name;
};

class xmlns__CellInfo {
public:
struct xmlns__ValueCellInfo {
xsd__string @name;
} Value;
xmlns__Value* Value;
arrayCellProp __cellProps;
};


Expand Down Expand Up @@ -157,13 +175,14 @@ public:
xsd__string @xsi__type;
xsd__string __v;
} Value;
arrayCellProp __cellProps;

};

class xmlns__CellData {
public:
int __size;
xmlns__Cell* Cell;
xmlns__Cell* Cell;
};


Expand Down
22 changes: 22 additions & 0 deletions README
Original file line number Diff line number Diff line change
@@ -1,3 +1,25 @@
Changes 5-September-2014

1. openssl added

It expects openssl to be a folder on the same level with the provider as shown below:

\
|
----XMLA Code
|
----openssl
--lib
--i386
--static
--x86_64
--static

2. Support for custom properties in dimension and cell properties

3. IDBInfo support


Changes 15-Apr-2014

The Visual Studio 2010 solution has been cleaned-up with respect to gSOAP files. It now expects gsoap to be on a folder on the same level with the provider as shown below:
Expand Down
2 changes: 2 additions & 0 deletions Restrictions.gsoap
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ public:
char* MEMBER_USCOREUNIQUE_USCORENAME;
char* LEVEL_USCOREUNIQUE_USCORENAME;
char* TREE_USCOREOP;
char* PROPERTY_USCORETYPE;
char* SET_USCORENAME;
};

class xmlns__Restrictions
Expand Down
2 changes: 2 additions & 0 deletions Rowset.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ class rowset:
public IErrorRecordsImpl< rowset>,
public IMDDataset
{
friend class row_data;
private:
connection_handler* mConnectionHandler;
public:
BEGIN_COM_MAP(rowset)
Expand Down
7 changes: 7 additions & 0 deletions Session.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
class catalog_rowset;
class cube_rowset;
class dimension_rowset;
class function_rowset;
class hierarchy_rowset;
class level_rowset;
class member_rowset;
Expand All @@ -44,6 +45,7 @@ class ATL_NO_VTABLE session :
public IObjectWithSiteSessionImpl<session>,
public IDBSchemaRowsetImpl<session>,
public IDBCreateCommandImpl<session, command>,
public IInternalConnectionImpl<session>,
public IGetSelf ,
public ISupportErrorInfo
{
Expand Down Expand Up @@ -150,6 +152,7 @@ BEGIN_COM_MAP(session)
COM_INTERFACE_ENTRY(IObjectWithSite)
COM_INTERFACE_ENTRY(IDBCreateCommand)
COM_INTERFACE_ENTRY(IDBSchemaRowset)
COM_INTERFACE_ENTRY(IInternalConnection)
COM_INTERFACE_ENTRY(ISupportErrorInfo)
COM_INTERFACE_ENTRY(IGetSelf)
END_COM_MAP()
Expand All @@ -158,6 +161,7 @@ BEGIN_SCHEMA_MAP(session)
SCHEMA_ENTRY( DBSCHEMA_CATALOGS , catalog_rowset )
SCHEMA_ENTRY( MDSCHEMA_CUBES , cube_rowset )
SCHEMA_ENTRY( MDSCHEMA_DIMENSIONS, dimension_rowset )
SCHEMA_ENTRY( MDSCHEMA_FUNCTIONS, function_rowset )
SCHEMA_ENTRY( MDSCHEMA_HIERARCHIES, hierarchy_rowset )
SCHEMA_ENTRY( MDSCHEMA_LEVELS, level_rowset )
SCHEMA_ENTRY( MDSCHEMA_MEMBERS, member_rowset )
Expand All @@ -172,16 +176,19 @@ END_SCHEMA_MAP()
#include "catalog_row.h"
#include "cube_row.h"
#include "dimension_row.h"
#include "function_row.h"
#include "hierarchy_row.h"
#include "level_row.h"
#include "measure_row.h"
#include "member_row.h"
#include "property_row.h"
#include "set_row.h"
#include "base_rowset.h"

class catalog_rowset : public base_rowset< catalog_rowset, catalog_row, session >{};
class cube_rowset : public base_rowset< cube_rowset, cube_row, session >{};
class dimension_rowset : public base_rowset< dimension_rowset, dimension_row, session >{};
class function_rowset : public base_rowset< function_rowset, function_row, session >{};
class hierarchy_rowset : public base_rowset< hierarchy_rowset, hierarchy_row, session >{};
class level_rowset : public base_rowset< level_rowset, level_row, session >{};
class member_rowset : public base_rowset< member_rowset, member_row, session >{};
Expand Down
Binary file modified XMLAProvider.aps
Binary file not shown.
Binary file modified XMLAProvider.rc
Binary file not shown.
16 changes: 10 additions & 6 deletions XMLAProvider.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\gsoap\gsoap\</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WITH_OPENSSL;WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\openssl\include\;..\gsoap\gsoap\</AdditionalIncludeDirectories>
</ClCompile>
<Midl>
<MkTypLibCompatible>false</MkTypLibCompatible>
Expand All @@ -110,16 +110,17 @@
<ModuleDefinitionFile>.\XMLAProvider.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<RegisterOutput>true</RegisterOutput>
<AdditionalDependencies>Version.lib;comsuppwd.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>libeay32d.lib;ssleay32d.lib;Version.lib;comsuppwd.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>C:\workspace\oracleinterpreter\openssl\lib\Windows\i386\static</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\gsoap\gsoap\</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WITH_OPENSSL;WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\gsoap\gsoap\;..\openssl\include\</AdditionalIncludeDirectories>
</ClCompile>
<Midl>
<MkTypLibCompatible>false</MkTypLibCompatible>
Expand All @@ -142,7 +143,8 @@
<ModuleDefinitionFile>.\XMLAProvider.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<RegisterOutput>true</RegisterOutput>
<AdditionalDependencies>Version.lib;comsuppwd.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>libeay32d.lib;ssleay32d.lib;Version.lib;comsuppwd.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>..\openssl\lib\Windows\x86_64\static\</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Expand Down Expand Up @@ -284,6 +286,7 @@
<ClInclude Include="axis_row.h" />
<ClInclude Include="dimension_row.h" />
<ClInclude Include="dllmain.h" />
<ClInclude Include="function_row.h" />
<ClInclude Include="hierarchy_row.h" />
<ClInclude Include="level_row.h" />
<ClInclude Include="measure_row.h" />
Expand Down Expand Up @@ -311,6 +314,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>
</CustomBuild>
<ClInclude Include="version_info.h" />
<ClInclude Include="XMLAProvider_i.h" />
Expand Down
3 changes: 3 additions & 0 deletions XMLAProvider.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,9 @@
<ClInclude Include="version_info.h">
<Filter>Resource Files</Filter>
</ClInclude>
<ClInclude Include="function_row.h">
<Filter>Header Files\schema</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="XMLAProvider.rc">
Expand Down
24 changes: 0 additions & 24 deletions base_rowset.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,30 +29,6 @@ class base_rowset :
public CSchemaRowsetImpl< T, Storage, CreatorClass>,
public IErrorRecordsImpl< base_rowset<T, Storage, CreatorClass>>
{
private:
void make_error( LPOLESTR a_description )
{
ICreateErrorInfo *cerr_info;
IErrorInfo *err_info;
HRESULT hr;

if FAILED( hr = CreateErrorInfo(&cerr_info) ) return;

hr = cerr_info->QueryInterface(IID_IErrorInfo, (LPVOID FAR*) &err_info);

if ( FAILED( hr ) )
{
cerr_info->Release();
return;
}

cerr_info->SetDescription( a_description );
cerr_info->SetGUID( __uuidof(IDBSchemaRowset) );
SetErrorInfo(0, err_info);

err_info->Release();
cerr_info->Release();
}
public:

//IDBSchemaRowset implementation
Expand Down
27 changes: 0 additions & 27 deletions command.h
Original file line number Diff line number Diff line change
Expand Up @@ -54,33 +54,6 @@ BEGIN_COM_MAP(command)
END_COM_MAP()
private:
std::unique_ptr< connection_handler > mConnectionHandler;
private:
void make_error( LPOLESTR aDescription )
{
ICreateErrorInfo *pcerrinfo;
IErrorInfo *perrinfo;
HRESULT hr;

hr = CreateErrorInfo(&pcerrinfo);

if ( FAILED( hr ) ) return;

hr = pcerrinfo->QueryInterface(IID_IErrorInfo, (LPVOID FAR*) &perrinfo);

if ( FAILED( hr ) )
{
pcerrinfo->Release();
return;
}

pcerrinfo->SetDescription( aDescription );
pcerrinfo->SetGUID( __uuidof(IDBSchemaRowset) );
SetErrorInfo(0, perrinfo);

perrinfo->Release();
pcerrinfo->Release();
}
// ICommand
public:
HRESULT FinalConstruct()
{
Expand Down
Loading

0 comments on commit d8ab22f

Please sign in to comment.