support saving XML to XPath instead of XML root

christso · Jul 10, 2016 · adde6bb · adde6bb
1 parent 17fa8f7
commit adde6bb
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 7 deletions.
diff --git a/DaxDrill/AddIn.cs b/DaxDrill/AddIn.cs
@@ -16,6 +16,8 @@
 using DG2NTT.DaxDrill.Logic;
 using DG2NTT.DaxDrill.DaxHelpers;
 using DG2NTT.DaxDrill.Helpers;
+using System.Collections;
+using Office = Microsoft.Office.Core;
 
 namespace DG2NTT.DaxDrill
 {
@@ -161,7 +163,6 @@ public static void About()
         {
             try
             {
-
                 AboutBox.ShowForm();
             }
             catch (Exception ex)

diff --git a/DaxDrill/ExcelHelpers/ExcelHelper.cs b/DaxDrill/ExcelHelpers/ExcelHelper.cs
@@ -82,7 +82,7 @@ public static List<string> ReadCustomXmlParts(Excel.Workbook workbook)
             return result;
         }
 
-        public static string ReadCustomXmlPart(Excel.Workbook workbook, string xNameSpace,
+        public static string ReadCustomXmlNode(Excel.Workbook workbook, string xNameSpace,
             string xPath)
         {
             Office.CustomXMLNode node = GetCustomXmlNode(workbook, xNameSpace, xPath);
@@ -97,11 +97,13 @@ public static Office.CustomXMLNode GetCustomXmlNode(Excel.Workbook workbook, str
             Office.CustomXMLParts ps = workbook.CustomXMLParts;
             ps = ps.SelectByNamespace(xNameSpace);
 
+
             for (int i = 1; i <= ps.Count; i++)
             {
                 Office.CustomXMLPart p = ps[i];
                 var nsmgr = p.NamespaceManager;
                 nsmgr.AddNamespace("x", xNameSpace);
+
                 Office.CustomXMLNode node = p.SelectSingleNode(xPath);
                 if (node != null)
                     return node;
@@ -125,6 +127,20 @@ public static void UpdateCustomXmlPart(Excel.Workbook workbook, string namespace
             AddCustomXmlPart(workbook, namespaceName, xmlString);
         }
 
+        public static void UpdateCustomXmlNode(Excel.Workbook workbook, string namespaceName, string xmlString, string xPath)
+        {
+            Office.CustomXMLParts ps = workbook.CustomXMLParts.SelectByNamespace(namespaceName);
+
+            foreach (Office.CustomXMLPart p in ps)
+            {
+                var nsmgr = p.NamespaceManager;
+                nsmgr.AddNamespace("x", namespaceName);
+
+                Office.CustomXMLNode oldNode = p.SelectSingleNode(xPath);
+                oldNode.ParentNode.ReplaceChildSubtree(xmlString, oldNode);
+            }
+        }
+
         public static void DeleteCustomXmlPart(Excel.Workbook workbook, string namespaceName)
         {
             IEnumerator e = workbook.CustomXMLParts.GetEnumerator();

diff --git a/DaxDrill/Logic/QueryClient.cs b/DaxDrill/Logic/QueryClient.cs
@@ -98,7 +98,7 @@ public static IEnumerable<DetailColumn> GetCustomDetailColumns(Excel.Range rngCe
 
             Measure measure = QueryClient.GetMeasure(rngCell);
 
-            string xmlString = ExcelHelper.ReadCustomXmlPart(
+            string xmlString = ExcelHelper.ReadCustomXmlNode(
                 workbook, Constants.DaxDrillXmlSchemaSpace,
                 Constants.TableXpath);
             List<DetailColumn> columns = DaxDrillConfig.GetColumnsFromTableXml(Constants.DaxDrillXmlSchemaSpace, xmlString, wbcnn.Name, measure.Table.Name);

diff --git a/DaxDrill/Logic/XmlEditController.cs b/DaxDrill/Logic/XmlEditController.cs
@@ -24,14 +24,17 @@ public void LoadXmlFromWorkbook()
         {
             Excel.Workbook workbook = null;
             workbook = ExcelHelper.FindWorkbook(xmlEditForm.WorkbookText);
-            string xmlString = ExcelHelper.ReadCustomXmlPart(workbook, xmlEditForm.NamespaceText, xmlEditForm.XpathText);
+            string xmlString = ExcelHelper.ReadCustomXmlNode(workbook, xmlEditForm.NamespaceText, xmlEditForm.XpathText);
             xmlEditForm.XmlText = xmlString;
         }
 
         public void SaveXmlToWorkbook()
         {
             Excel.Workbook workbook = ExcelHelper.FindWorkbook(xmlEditForm.WorkbookText);
-            ExcelHelper.UpdateCustomXmlPart(workbook, xmlEditForm.NamespaceText, xmlEditForm.XmlText);
+            if (xmlEditForm.XpathText == ".." || string.IsNullOrWhiteSpace(xmlEditForm.XpathText))
+                ExcelHelper.UpdateCustomXmlPart(workbook, xmlEditForm.NamespaceText, xmlEditForm.XmlText);
+            else
+                ExcelHelper.UpdateCustomXmlNode(workbook, xmlEditForm.NamespaceText, xmlEditForm.XmlText, xmlEditForm.XpathText);
         }
     }
 }
diff --git a/DaxDrill/UI/XmlEditForm.cs b/DaxDrill/UI/XmlEditForm.cs
@@ -126,13 +126,11 @@ public void RefreshWorkbooksControl()
         {
             Excel.Application excelApp = (Excel.Application)ExcelDnaUtil.Application;
 
-            Excel.Workbook workbook = excelApp.ActiveWorkbook;
             var wbList = ExcelHelper.ListWorkbooks(excelApp);
             cbWorkbooks.Items.Clear();
             cbWorkbooks.Items.AddRange(wbList.ToArray());
         }
 
-
         #endregion
 
         #region Form Events