aboutsummaryrefslogtreecommitdiff
path: root/lib/docx/docx-reader.js
diff options
context:
space:
mode:
authorMichael Williamson <mike@zwobble.org>2018-01-26 23:21:49 +0000
committerMichael Williamson <mike@zwobble.org>2018-01-26 23:21:49 +0000
commit9196e8bc6f2ff2c59a9b4fde4813e7bc26b8c23d (patch)
treec42bfa3fb88f2348018c63f7dc1a64299a666355 /lib/docx/docx-reader.js
parentf5fbc6e4aface5c6c9537b38d1650b0d37e3cbc1 (diff)
Extract joinPath and splitPath for zip files
Diffstat (limited to 'lib/docx/docx-reader.js')
-rw-r--r--lib/docx/docx-reader.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/docx/docx-reader.js b/lib/docx/docx-reader.js
index beade38..cbeaccd 100644
--- a/lib/docx/docx-reader.js
+++ b/lib/docx/docx-reader.js
@@ -6,6 +6,7 @@ var path = require("path");
var promises = require("../promises");
var documents = require("../documents");
var Result = require("../results").Result;
+var zipfile = require("../zipfile");
var readXmlFromZipFile = require("./office-xml-reader").readXmlFromZipFile;
var createBodyReader = require("./body-reader").createBodyReader;
@@ -151,9 +152,8 @@ function readXmlFileWithBody(filename, options, func) {
}
function relationshipsFilename(filename) {
- var parts = filename.split("/");
- return parts.slice(0, parts.length - 1).join("/") +
- "/_rels/" + parts[parts.length - 1] + ".rels";
+ var split = zipfile.splitPath(filename);
+ return zipfile.joinPath(split.dirname, "_rels", split.basename + ".rels");
}
var readContentTypesFromZipFile = xmlFileReader({