Skip to content

O
olapy
Commit 1eea7384 authored by mouadh's avatar mouadh
Browse files
Options

format

parent 53bc29a8
Hide whitespace changes
Inline Side-by-side
Showing with 19 additions and 88 deletions
olapy/core/services/xmla.py
View file @ 1eea7384
...@@ -9,7 +9,6 @@ import os ...@@ -9,7 +9,6 @@ import os
from datetime import datetime from datetime import datetime
from os.path import expanduser from os.path import expanduser
from lxml import etree
from spyne import AnyXml, Application, ServiceBase, rpc, Fault from spyne import AnyXml, Application, ServiceBase, rpc, Fault
from spyne.const.http import HTTP_200 from spyne.const.http import HTTP_200
from spyne.error import InvalidCredentialsError from spyne.error import InvalidCredentialsError
...@@ -168,15 +167,6 @@ class XmlaProviderService(ServiceBase): ...@@ -168,15 +167,6 @@ class XmlaProviderService(ServiceBase):
return str(xml) return str(xml)
# xml = xmlwitch.Builder()
# # xml.return return reserved of course
# xml.root(xmlns="urn:schemas-microsoft-com:xml-analysis:empty")
#
# return """
# <return>
# {0}
# </return>
# """.format(str(xml))
else: else:
XmlaProviderService.discover_tools.change_catalogue( XmlaProviderService.discover_tools.change_catalogue(
request.Properties.PropertyList.Catalog) request.Properties.PropertyList.Catalog)
...@@ -185,24 +175,6 @@ class XmlaProviderService(ServiceBase): ...@@ -185,24 +175,6 @@ class XmlaProviderService(ServiceBase):
df = executer.execute_mdx() df = executer.execute_mdx()
xmla_tools = XmlaExecuteTools(executer) xmla_tools = XmlaExecuteTools(executer)
# xml = xmlwitch.Builder()
# with xml.OlapInfo(xmla_tools.generate_cell_info()):
# with xml.CubeInfo:
# with xml.Cube:
# xml.CubeName('Sales')
# xml.LastDataUpdate(datetime.now().strftime('%Y-%m-%dT%H:%M:%S'),
# xmlns="http://schemas.microsoft.com/analysisservices/2003/engine")
# xml.LastSchemaUpdate(datetime.now().strftime('%Y-%m-%dT%H:%M:%S'),
# xmlns="http://schemas.microsoft.com/analysisservices/2003/engine")
# xml.AxesInfo(xmla_tools.generate_axes_info(df),
# xmla_tools.generate_axes_info_slicer(df))
#
# xml.Axes(xmla_tools.generate_xs0(df),
# xmla_tools.generate_slicer_axis(df))
#
# xml.CellData(xmla_tools.generate_cell_data(df))
# todo to check
xml = xmlwitch.Builder() xml = xmlwitch.Builder()
with xml['return']: with xml['return']:
with xml.root( with xml.root(
...@@ -211,22 +183,30 @@ class XmlaProviderService(ServiceBase): ...@@ -211,22 +183,30 @@ class XmlaProviderService(ServiceBase):
**{ **{
'xmlns:xsd': 'http://www.w3.org/2001/XMLSchema', 'xmlns:xsd': 'http://www.w3.org/2001/XMLSchema',
'xmlns:xsi': 'xmlns:xsi':
'http://www.w3.org/2001/XMLSchema-instance' 'http://www.w3.org/2001/XMLSchema-instance'
}): }):
with xml.OlapInfo(xmla_tools.generate_cell_info()): with xml.OlapInfo(xmla_tools.generate_cell_info()):
with xml.CubeInfo: with xml.CubeInfo:
with xml.Cube: with xml.Cube:
xml.CubeName('Sales') xml.CubeName('Sales')
xml.LastDataUpdate(datetime.now().strftime('%Y-%m-%dT%H:%M:%S'), xml.LastDataUpdate(
xmlns="http://schemas.microsoft.com/analysisservices/2003/engine") datetime.now().strftime(
xml.LastSchemaUpdate(datetime.now().strftime('%Y-%m-%dT%H:%M:%S'), '%Y-%m-%dT%H:%M:%S'),
xmlns="http://schemas.microsoft.com/analysisservices/2003/engine") xmlns="http://schemas.microsoft.com/analysisservices/2003/engine"
)
xml.AxesInfo(xmla_tools.generate_axes_info(df), xml.LastSchemaUpdate(
xmla_tools.generate_axes_info_slicer(df)) datetime.now().strftime(
'%Y-%m-%dT%H:%M:%S'),
xml.Axes(xmla_tools.generate_xs0(df), xmlns="http://schemas.microsoft.com/analysisservices/2003/engine"
xmla_tools.generate_slicer_axis(df)) )
xml.AxesInfo(
xmla_tools.generate_axes_info(df),
xmla_tools.generate_axes_info_slicer(df))
xml.Axes(
xmla_tools.generate_xs0(df),
xmla_tools.generate_slicer_axis(df))
xml.CellData(xmla_tools.generate_cell_data(df)) xml.CellData(xmla_tools.generate_cell_data(df))
...@@ -235,55 +215,6 @@ class XmlaProviderService(ServiceBase): ...@@ -235,55 +215,6 @@ class XmlaProviderService(ServiceBase):
return xml return xml
# return etree.fromstring("""
# <return>
# <root xmlns="urn:schemas-microsoft-com:xml-analysis:mddataset"
# xmlns:xsd="http://www.w3.org/2001/XMLSchema"
# xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
# {0}
# <OlapInfo>
# <CubeInfo>
# <Cube>
# <CubeName>Sales</CubeName>
# <LastDataUpdate
# xmlns="http://schemas.microsoft.com/analysisservices/2003/engine">{7}</LastDataUpdate>
# <LastSchemaUpdate
# xmlns="http://schemas.microsoft.com/analysisservices/2003/engine">{7}</LastSchemaUpdate>
# </Cube>
# </CubeInfo>
# <AxesInfo>
# {1}
# {2}
# </AxesInfo>
# {3}
# </OlapInfo>
# <Axes>
# {4}
# {5}
# </Axes>
# <CellData>
# {6}
# </CellData>
# </root>
# </return>
# """.format(execute_xsd,
# xmla_tools.generate_axes_info(df),
# xmla_tools.generate_axes_info_slicer(df),
# xmla_tools.generate_cell_info(),
# xmla_tools.generate_xs0(df),
# xmla_tools.generate_slicer_axis(df),
# xmla_tools.generate_cell_data(df),
# datetime.now().strftime('%Y-%m-%dT%H:%M:%S')).replace(
# '&', '&amp;'))
# Problem:
# An XML parser returns the error “xmlParseEntityRef: noname”
#
# Cause:
# There is a stray ‘&’ (ampersand character) somewhere in the XML text eg. some text & some more text
# Solution
# .replace('&', '&amp;')
application = Application( application = Application(
[XmlaProviderService], [XmlaProviderService],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7