suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Restore support for modified pdfinfo 3.02

Browse Source
This commit is contained in:
Dan Stillman 2015-04-01 13:20:34 -04:00
parent a9ca6e0857
commit 1a47d79716
1 changed files with 42 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
chrome/content/zotero/xpcom/fulltext.js
View File

@ -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);