Pass full filename to readXmlFileWithBody

1 files changed, 13 insertions, 7 deletions

diff --git a/lib/docx/docx-reader.js b/lib/docx/docx-reader.js
index 5aa95ca..db15b95 100644
--- a/lib/docx/docx-reader.js
+++ b/lib/docx/docx-reader.js
@@ -28,21 +28,21 @@ function read(docxFile, input) {
         files: new Files(input.path ? path.dirname(input.path) : null)
     }).also(function(result) {
         return {
-            footnotes: readXmlFileWithBody("footnotes", result, function(bodyReader, xml) {
+            footnotes: readXmlFileWithBody("word/footnotes.xml", result, function(bodyReader, xml) {
                 if (xml) {
                     return notesReader.createFootnotesReader(bodyReader)(xml);
                 } else {
                     return new Result([]);
                 }
             }),
-            endnotes: readXmlFileWithBody("endnotes", result, function(bodyReader, xml) {
+            endnotes: readXmlFileWithBody("word/endnotes.xml", result, function(bodyReader, xml) {
                 if (xml) {
                     return notesReader.createEndnotesReader(bodyReader)(xml);
                 } else {
                     return new Result([]);
                 }
             }),
-            comments: readXmlFileWithBody("comments", result, function(bodyReader, xml) {
+            comments: readXmlFileWithBody("word/comments.xml", result, function(bodyReader, xml) {
                 if (xml) {
                     return commentsReader.createCommentsReader(bodyReader)(xml);
                 } else {
@@ -59,7 +59,7 @@ function read(docxFile, input) {
             })
         };
     }).then(function(result) {
-        return readXmlFileWithBody("document", result, function(bodyReader, xml) {
+        return readXmlFileWithBody("word/document.xml", result, function(bodyReader, xml) {
             if (xml) {
                 return result.notes.flatMap(function(notes) {
                     return result.comments.flatMap(function(comments) {
@@ -87,9 +87,9 @@ function xmlFileReader(options) {
     };
 }
 
-function readXmlFileWithBody(name, options, func) {
+function readXmlFileWithBody(filename, options, func) {
     var readRelationshipsFromZipFile = xmlFileReader({
-        filename: "word/_rels/" + name + ".xml.rels",
+        filename: relationshipsFilename(filename),
         readElement: relationshipsReader.readRelationships,
         defaultValue: {}
     });
@@ -103,13 +103,19 @@ function readXmlFileWithBody(name, options, func) {
             styles: options.styles,
             files: options.files
         });
-        return readXmlFromZipFile(options.docxFile, "word/" + name + ".xml")
+        return readXmlFromZipFile(options.docxFile, filename)
             .then(function(xml) {
                 return func(bodyReader, xml);
             });
     });
 }
 
+function relationshipsFilename(filename) {
+    var parts = filename.split("/");
+    return parts.slice(0, parts.length - 1).join("/") +
+        "/_rels/" + parts[parts.length - 1] + ".rels";
+}
+
 var readContentTypesFromZipFile = xmlFileReader({
     filename: "[Content_Types].xml",
     readElement: contentTypesReader.readContentTypesFromXml,