From 3eb8b4124123fc7cc7fde700967ccf5feba3ca07 Mon Sep 17 00:00:00 2001
From: Luc Boudreau <lucboudreau@gmail.com>
Date: Fri, 7 Dec 2012 11:39:10 -0500
Subject: [PATCH] Small modification to the XMLA driver so that the format
 string of measures is available as a property.

---
 src/org/olap4j/driver/xmla/XmlaOlap4jConnection.java | 6 ++++--
 src/org/olap4j/driver/xmla/XmlaOlap4jMeasure.java    | 3 +++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/org/olap4j/driver/xmla/XmlaOlap4jConnection.java b/src/org/olap4j/driver/xmla/XmlaOlap4jConnection.java
index b496433..57a42d7 100644
--- a/src/org/olap4j/driver/xmla/XmlaOlap4jConnection.java
+++ b/src/org/olap4j/driver/xmla/XmlaOlap4jConnection.java
@@ -1533,6 +1533,8 @@ public void handle(
                 stringElement(row, "MEASURE_CAPTION");
             final String description =
                 stringElement(row, "DESCRIPTION");
+            final String formatString =
+                stringElement(row, "DEFAULT_FORMAT_STRING");
             final Measure.Aggregator measureAggregator =
                 Measure.Aggregator.getDictionary().forOrdinal(
                     integerElement(
@@ -1564,8 +1566,8 @@ public void handle(
             list.add(
                 new XmlaOlap4jMeasure(
                     (XmlaOlap4jLevel)member.getLevel(), measureUniqueName,
-                    measureName, measureCaption, description, null,
-                    measureAggregator, datatype, measureIsVisible,
+                    measureName, measureCaption, description, formatString,
+                    null, measureAggregator, datatype, measureIsVisible,
                     member.getOrdinal()));
         }
 
diff --git a/src/org/olap4j/driver/xmla/XmlaOlap4jMeasure.java b/src/org/olap4j/driver/xmla/XmlaOlap4jMeasure.java
index 5593636..315a021 100644
--- a/src/org/olap4j/driver/xmla/XmlaOlap4jMeasure.java
+++ b/src/org/olap4j/driver/xmla/XmlaOlap4jMeasure.java
@@ -57,6 +57,7 @@ class XmlaOlap4jMeasure
         String name,
         String caption,
         String description,
+        String formatString,
         String parentMemberUniqueName,
         Aggregator aggregator,
         Datatype datatype,
@@ -73,6 +74,8 @@ class XmlaOlap4jMeasure
         this.aggregator = aggregator;
         this.datatype = datatype;
         this.visible = visible;
+        setProperty(
+            Property.StandardCellProperty.FORMAT_STRING, formatString);
     }
 
     public Aggregator getAggregator() {