aboutsummaryrefslogtreecommitdiff
path: root/lib/web.js
diff options
context:
space:
mode:
authorMichael Williamson <mike@zwobble.org>2013-03-30 22:01:09 +0000
committerMichael Williamson <mike@zwobble.org>2013-03-30 22:01:09 +0000
commit26f7cefe6379e9b76f5bb1963433a6832a55caa6 (patch)
tree684d647f040ab05fcae66d9c9ebb68ce13b552c4 /lib/web.js
parent49e22a72504df97195d82d4349f7e0f0fb0c8bb3 (diff)
Allow path to be passed into convertToHtml
Diffstat (limited to 'lib/web.js')
-rw-r--r--lib/web.js13
1 files changed, 1 insertions, 12 deletions
diff --git a/lib/web.js b/lib/web.js
index 73e501d..1d10693 100644
--- a/lib/web.js
+++ b/lib/web.js
@@ -4,7 +4,6 @@ var url = require("url");
var fs = require("fs");
var q = require("q");
var mammoth = require("./");
-var ZipFile = require("zipfile").ZipFile;
function startServer(options) {
var app = connect()
@@ -49,18 +48,8 @@ function handleConvert(request, response, next) {
var converter = new mammoth.Converter(mammoth.standardOptions);
var uploadedDocument = request.files.document;
var documentPath = uploadedDocument.path
- // TODO: remove duplication from index.js
- var zipFile = new ZipFile(documentPath);
- var docxFile = {
- read: function(path) {
- return q.ninvoke(zipFile, "readFile", path, "utf-8")
- .then(function(value) {
- return value.toString();
- });
- }
- };
- converter.convertToHtml(docxFile)
+ converter.convertToHtml(documentPath)
.then(function(result) {
request.template = {
name: "convert.html",