diff options
Diffstat (limited to 'lib/docx-reader.js')
| -rw-r--r-- | lib/docx-reader.js | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/lib/docx-reader.js b/lib/docx-reader.js index 179bd08..c96245a 100644 --- a/lib/docx-reader.js +++ b/lib/docx-reader.js @@ -8,6 +8,7 @@ var fs = require("fs"); var readXmlFromZipFile = require("./office-xml-reader").readXmlFromZipFile; var documents = require("./documents"); var DocumentXmlReader = require("./document-xml-reader").DocumentXmlReader; +var readRelationshipsFromZipFile = require("./relationships-reader").readRelationshipsFromZipFile; var Result = require("./results").Result; @@ -23,12 +24,10 @@ function read(options) { return q.reject(new Error("Could not find file in options")); } return q.when(docxFile, function(docxFile) { - return q.all([ - readXmlFromZipFile(docxFile, "word/_rels/document.xml.rels"), + readRelationshipsFromZipFile(docxFile), readXmlFromZipFile(docxFile, "word/document.xml") - ]).spread(function(relationshipsXml, documentXml) { - var relationships = relationshipsXml ? readRelationships(relationshipsXml) : {}; + ]).spread(function(relationships, documentXml) { var contentTypes = { findContentType: function(path) { return "image/png"; @@ -39,15 +38,3 @@ function read(options) { }); }); } - -function readRelationships(relationshipsXml) { - var relationships = {}; - relationshipsXml.root.children.forEach(function(child) { - if (child.name === "{http://schemas.openxmlformats.org/package/2006/relationships}:Relationship") { - relationships[child.attributes.Id] = { - target: child.attributes.Target - }; - } - }); - return relationships; -} |
