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

Remove obsolete nsIJSON uses

Browse Source
This commit is contained in:
Simon Kornblith 2011-10-04 03:14:08 +00:00
parent 0741bb396f
commit 62180e0cd2
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
chrome/content/zotero/xpcom/schema.js
View File

@ -628,10 +628,8 @@ Zotero.Schema = new function(){
var dbCache = Zotero.DB.columnQuery(sql); var dbCache = Zotero.DB.columnQuery(sql);
// If there's anything in the cache, see what we actually need to extract // If there's anything in the cache, see what we actually need to extract
if (dbCache) { if (dbCache) {
var nsIJSON = Components.classes["@mozilla.org/dom/json;1"]
.createInstance(Components.interfaces.nsIJSON);
for each(var json in dbCache) { for each(var json in dbCache) {
var metadata = nsIJSON.decode(json); var metadata = JSON.parse(json);
var id = metadata.translatorID; var id = metadata.translatorID;
if (index[id] && index[id].lastUpdated == metadata.lastUpdated) { if (index[id] && index[id].lastUpdated == metadata.lastUpdated) {
index[id].extract = false; index[id].extract = false;
@ -2546,8 +2544,7 @@ Zotero.Schema = new function(){
var fileName = Zotero.Translators.getFileNameFromLabel(row.label); var fileName = Zotero.Translators.getFileNameFromLabel(row.label);
file.append(fileName); file.append(fileName);
var metadata = { translatorID: row.translatorID, translatorType: parseInt(row.translatorType), label: row.label, creator: row.creator, target: row.target ? row.target : null, minVersion: row.minVersion, maxVersion: row.maxVersion, priority: parseInt(row.priority), inRepository: row.inRepository == 1 ? true : false, lastUpdated: row.lastUpdated }; var metadata = { translatorID: row.translatorID, translatorType: parseInt(row.translatorType), label: row.label, creator: row.creator, target: row.target ? row.target : null, minVersion: row.minVersion, maxVersion: row.maxVersion, priority: parseInt(row.priority), inRepository: row.inRepository == 1 ? true : false, lastUpdated: row.lastUpdated };
var nsIJSON = Cc["@mozilla.org/dom/json;1"].createInstance(Ci.nsIJSON); var metadataJSON = JSON.stringify(metadata, null, "\t");
var metadataJSON = nsIJSON.encode(metadata);
var str = metadataJSON + "\n\n" + (row.detectCode ? row.detectCode + "\n\n" : "") + row.code; var str = metadataJSON + "\n\n" + (row.detectCode ? row.detectCode + "\n\n" : "") + row.code;
Zotero.debug("Extracting translator '" + row.label + "' from database"); Zotero.debug("Extracting translator '" + row.label + "' from database");
Zotero.File.putContents(file, str); Zotero.File.putContents(file, str);