diff --git a/chrome/content/scripts/jasminum.js b/chrome/content/scripts/jasminum.js index 9a4cbf6..6ede5ee 100644 --- a/chrome/content/scripts/jasminum.js +++ b/chrome/content/scripts/jasminum.js @@ -190,14 +190,18 @@ Zotero.Jasminum = { var patentSepRegArr = patentSepArr.map(x => x.replace(/([\[\\\^\$\.\|\?\*\+\(\)])/g, '\\$&')); var patentMainArr = patent.match(/{%[^}]+}/g); //文件名中的作者姓名字段里不能包含下划线,请使用“&,,”等字符分隔多个作者,或仅使用第一个作者名(加不加“等”都行)。 - var patentMainRegArr = patentMainArr.map(x => x.replace(/.+/, /{%y}/.test(x) ? '(\\d+)' : (/{%a}/.test(x) ? '([^_]+)' : '(.+)'))); + var patentMainRegArr = patentMainArr.map(x => x.replace(/.+/, /{%y}/.test(x) ? '(\\d+)' : (/{%g}/.test(x) ? '([^_]+)' : '(.+)'))); var regStrInterArr = patentSepRegArr.map((_, i) => [patentSepRegArr[i], patentMainRegArr[i]]); var patentReg = new RegExp([].concat.apply([], regStrInterArr).filter(Boolean).join(''), 'g'); var prefix = filename.substr(0, filename.length - 4); var prefix = prefix.replace(/\.ashx$/g, ""); // 删除末尾.ashx字符 var prefixMainArr = patentReg.exec(prefix); + // 文件名识别结果为空,跳出警告弹窗 + if (prefixMainArr === null) { + alert("文件名识别出错,请检查文件名识别模板与实际抓取文件名") + } var titleIdx = patentMainArr.indexOf('{%t}'); - var authorIdx = patentMainArr.indexOf('{%a}'); + var authorIdx = patentMainArr.indexOf('{%g}'); var titleRaw = (titleIdx != -1) ? prefixMainArr[titleIdx + 1] : ''; var authors = (authorIdx != -1) ? prefixMainArr[authorIdx + 1] : ''; var authorArr = authors.split(/[,,&]/); diff --git a/chrome/locale/en-US/overlay.dtd b/chrome/locale/en-US/overlay.dtd index b391e76..0bb254c 100644 --- a/chrome/locale/en-US/overlay.dtd +++ b/chrome/locale/en-US/overlay.dtd @@ -15,7 +15,7 @@ - + diff --git a/chrome/locale/zh-CN/overlay.dtd b/chrome/locale/zh-CN/overlay.dtd index 1dead8e..9de86fb 100644 --- a/chrome/locale/zh-CN/overlay.dtd +++ b/chrome/locale/zh-CN/overlay.dtd @@ -15,7 +15,7 @@ - + diff --git a/install.rdf b/install.rdf index c64bd40..8c585f5 100644 --- a/install.rdf +++ b/install.rdf @@ -5,7 +5,7 @@ jasminum@linxzh.com Jasminum - 0.1.0 + 0.1.1 2 chrome://jasminum/skin/icon.png true diff --git a/update.rdf b/update.rdf index 0c1d005..d8721b0 100644 --- a/update.rdf +++ b/update.rdf @@ -6,13 +6,13 @@ - 0.1.0 + 0.1.1 zotero@chnm.gmu.edu 5.0.0 5.* - https://github.com/l0o0/jasminum/releases/download/v0.1.0/jasminum-v0.1.0.xpi + https://github.com/l0o0/jasminum/releases/download/v0.1.1/jasminum-v0.1.1.xpi @@ -21,7 +21,7 @@ juris-m@juris-m.github.io 5.0 5.0.* - https://github.com/l0o0/jasminum/releases/download/v0.1.0/jasminum-v0.1.0.xpi + https://github.com/l0o0/jasminum/releases/download/v0.1.1/jasminum-v0.1.1.xpi