www

commit 31941c079871af1eeae717105e9da343c8af70d8
parent 796a1a2898d52617b3841468fd63934b31078663
Author: Dan Stillman <dstillman@zotero.org>
Date:   Tue,  7 Apr 2015 01:14:18 -0400

Fix flashing console window for Retrieve Metadata on Windows

Diffstat:
M
chrome/content/zotero/recognizePDF.js
 | 
9
+++------
M
chrome/content/zotero/xpcom/fulltext.js
 | 
48
++++++++++++++++++++++++++++++------------------

2 files changed, 33 insertions(+), 24 deletions(-)
diff --git a/chrome/content/zotero/recognizePDF.js b/chrome/content/zotero/recognizePDF.js
@@ -139,13 +139,10 @@ var Zotero_RecognizePDF = new function() {
 			cacheFile.remove(false);
 		}
 		
-		var exec = Zotero.getZoteroDirectory();
-		exec.append(Zotero.Fulltext.pdfConverterFileName);
+		var {exec, args} = Zotero.Fulltext.getPDFConverterExecAndArgs();
+		args.push('-enc', 'UTF-8', '-nopgbrk', '-layout', '-l', pages, file.path, cacheFile.path);
 		
-		var args = ['-enc', 'UTF-8', '-nopgbrk', '-layout', '-l', pages];
-		args.push(file.path, cacheFile.path);
-		
-		Zotero.debug('RecognizePDF: Running pdftotext '+args.join(" "));
+		Zotero.debug("RecognizePDF: Running " + exec + " " + args.map(arg => "'" + arg + "'").join(" "));
 		
 		return Zotero.Utilities.Internal.exec(exec, args).then(function() {
 			if(!cacheFile.exists()) {
diff --git a/chrome/content/zotero/xpcom/fulltext.js b/chrome/content/zotero/xpcom/fulltext.js
@@ -381,6 +381,25 @@ Zotero.Fulltext = new function(){
 	}
 	
 	
+	this.getPDFConverterExecAndArgs = function () {
+		if (!this.pdfConverterIsRegistered()) {
+			throw new Error("PDF converter is not registered");
+		}
+		
+		if (_pdfConverterScript) {
+			return {
+				exec: _pdfConverterScript,
+				args: [_pdfConverter.path]
+			}
+		}
+		
+		return {
+			exec: _pdfConverter,
+			args: []
+		}
+	}
+	
+	
 	/*
 	 * Returns true if MIME type is converted to text and cached before indexing
 	 *   (e.g. application/pdf is run through pdftotext)
@@ -640,17 +659,18 @@ Zotero.Fulltext = new function(){
 				var totalPages = this.getTotalPagesFromFile(itemID);
 			}
 			catch (e) {
-				Zotero.debug("Error running pdfinfo");
+				Components.utils.reportError(e);
+				Zotero.debug("Error running pdfinfo", 1);
+				Zotero.debug(e, 1);
 			}
 		}
 		else {
 			Zotero.debug(this.pdfInfoName + " is not available");
 		}
 		
-		var args = []
-		if (_pdfConverterScript) {
-			args.push(_pdfConverter.path);
-		}
+		var proc = Components.classes["@mozilla.org/process/util;1"]
+			.createInstance(Components.interfaces.nsIProcess);
+		var {exec, args} = this.getPDFConverterExecAndArgs();
 		args.push('-enc', 'UTF-8', '-nopgbrk');
 		
 		if (allPages) {
@@ -664,24 +684,16 @@ Zotero.Fulltext = new function(){
 		}
 		args.push(file.path, cacheFile.path);
 		
-		var proc = Components.classes["@mozilla.org/process/util;1"]
-			.createInstance(Components.interfaces.nsIProcess);
-		if (_pdfConverterScript) {
-			Zotero.debug("Running " + _pdfConverterScript.path + ' '
-				+ args.map(arg => "'" + arg + "'").join(' '));
-			proc.init(_pdfConverterScript);
-		}
-		else {
-			Zotero.debug("Running " + _pdfConverter.path + ' '
-				+ args.map(arg => "'" + arg + "'").join(' '));
-			proc.init(_pdfConverter);
-		}
+		Zotero.debug("Running " + exec.path + " " + args.map(arg => "'" + arg + "'").join(" "));
 		
 		try {
+			proc.init(exec);
 			proc.runw(true, args, args.length);
 		}
 		catch (e) {
-			Zotero.debug("Error running pdftotext");
+			Components.utils.reportError(e);
+			Zotero.debug("Error running pdftotext", 1);
+			Zotero.debug(e, 1);
 			return false;
 		}