scriptoriumadmin/zotero
1
0
Fork 0
mirror of https://github.com/zotero/zotero.git synced 2026-10-05 02:43:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Remove unnecessary lastUpdated optimization in translator regexp, allowing lastUpdated to be anywhere in the JSON in connector too

Browse source
This commit is contained in:
Simon Kornblith 2011-07-21 19:29:32 +00:00
parent 7b469e3d6f
commit 63db2a4aaa
1 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
chrome/content/zotero/xpcom/connector/repo.js
View file

@ -86,25 +86,21 @@ Zotero.Repo = new function() {
if(!Zotero.isFx) {
code = Zotero.Translators.preprocessCode(code);
// make sure the version of the translator we retrieved actually matches what's in the
// repo. if not (because it's from a different source), we won't save it.
var lastUpdatedIndex = code.indexOf('"lastUpdated"');
if (lastUpdatedIndex == -1) {
Zotero.logError(new Error("Invalid or missing translator metadata JSON object for " + translatorID));
callback(false);
return;
}
// Add 50 characters to clear lastUpdated timestamp and final "}"
var header = code.substr(0, lastUpdatedIndex + 50);
var m = infoRe.exec(header);
var m = infoRe.exec(code);
if (!m) {
Zotero.logError(new Error("Invalid or missing translator metadata JSON object for " + translatorID));
callback(false);
return;
}
var metadata = JSON.parse(m[0]);
try {
var metadata = JSON.parse(m[0]);
} catch(e) {
Zotero.logError(new Error("Invalid or missing translator metadata JSON object for " + translatorID));
callback(false);
return;
}
var translator = Zotero.Translators.getWithoutCode(translatorID);
if(metadata.lastUpdated !== translator.lastUpdated) {