www

commit 1a47d79716db73f114fa844a9caaa14227d35a85
parent a9ca6e0857928d8d2fe9de451567e5ff3027f64d
Author: Dan Stillman <dstillman@zotero.org>
Date:   Wed,  1 Apr 2015 13:20:34 -0400

Restore support for modified pdfinfo 3.02

Diffstat:
M
chrome/content/zotero/xpcom/fulltext.js
 | 
58
++++++++++++++++++++++++++++++++++++++++++----------------

1 file changed, 42 insertions(+), 16 deletions(-)
diff --git a/chrome/content/zotero/xpcom/fulltext.js b/chrome/content/zotero/xpcom/fulltext.js
@@ -309,6 +309,21 @@ Zotero.Fulltext = new function(){
 			return false;
 		}
 		
+		var versionFile = exec.parent;
+		versionFile.append(fileName + '.version');
+		if (versionFile.exists()) {
+			try {
+				var version = Zotero.File.getSample(versionFile).split(/[\r\n\s]/)[0];
+			}
+			catch (e) {
+				Zotero.debug(e, 1);
+				Components.utils.reportError(e);
+			}
+		}
+		if (!version) {
+			var version = 'UNKNOWN';
+		}
+		
 		// If scripts exist, use those instead
 		switch (tool) {
 		case 'converter':
@@ -323,6 +338,9 @@ Zotero.Fulltext = new function(){
 			break;
 		
 		case 'info':
+			// Modified 3.02 version doesn't use redirection script
+			if (version == '3.02') break;
+			
 			var script = Zotero.getZoteroDirectory();
 			script.append('pdfinfo.' + _getScriptExtension())
 			// The redirection script is necessary to run pdfinfo
@@ -335,21 +353,6 @@ Zotero.Fulltext = new function(){
 			break;
 		}
 		
-		var versionFile = exec.parent;
-		versionFile.append(fileName + '.version');
-		if (versionFile.exists()) {
-			try {
-				var version = Zotero.File.getSample(versionFile).split(/[\r\n\s]/)[0];
-			}
-			catch (e) {
-				Zotero.debug(e, 1);
-				Components.utils.reportError(e);
-			}
-		}
-		if (!version) {
-			var version = 'UNKNOWN';
-		}
-		
 		switch (tool) {
 			case 'converter':
 				_pdfConverter = exec;
@@ -596,7 +599,30 @@ Zotero.Fulltext = new function(){
 		}
 		cacheFile.append(this.pdfConverterCacheFile);
 		
-		if (_pdfInfoScript) {
+		// Modified 3.02 version that can output a text file directly
+		if (_pdfInfo && _pdfInfoVersion == '3.02') {
+			var infoFile = cacheFile.parent;
+			infoFile.append(this.pdfInfoCacheFile);
+			
+			var args = [file.path, infoFile.path];
+			
+			Zotero.debug("Running " + _pdfInfo.path + ' '
+				+ args.map(arg => "'" + arg + "'").join(' '));
+			
+			var proc = Components.classes["@mozilla.org/process/util;1"]
+				.createInstance(Components.interfaces.nsIProcess);
+			proc.init(_pdfInfo);
+			
+			try {
+				proc.runw(true, args, args.length);
+				var totalPages = this.getTotalPagesFromFile(itemID);
+			}
+			catch (e) {
+				Zotero.debug("Error running pdfinfo");
+			}
+		}
+		// Use redirection script
+		else if (_pdfInfoScript) {
 			var infoFile = cacheFile.parent;
 			infoFile.append(this.pdfInfoCacheFile);