mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Closes #148, Optimize Zotero.Item.getSource()

Browse source
This commit is contained in:
Simon Kornblith 2012-07-22 20:13:40 -04:00
parent b1a51f900d
commit 30b3898235
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
chrome/content/zotero/xpcom/data/item.js
View file

@ -402,6 +402,9 @@ Zotero.Item.prototype.loadFromRow = function(row, reload) {
this['_' + col] = row[col] ? parseInt(row[col]) : 0; this['_' + col] = row[col] ? parseInt(row[col]) : 0;
break; break;
case 'sourceItemID':
this['_sourceItem'] = row[col] || false;
default: default:
this['_' + col] = row[col] ? row[col] : ''; this['_' + col] = row[col] ? row[col] : '';
} }

6
chrome/content/zotero/xpcom/data/items.js
View file

@ -46,7 +46,7 @@ Zotero.Items = new function() {
_primaryFields = Zotero.DB.getColumns('items'); _primaryFields = Zotero.DB.getColumns('items');
_primaryFields.splice(_primaryFields.indexOf('clientDateModified'), 1); _primaryFields.splice(_primaryFields.indexOf('clientDateModified'), 1);
_primaryFields = _primaryFields.concat( _primaryFields = _primaryFields.concat(
['firstCreator', 'numNotes', 'numAttachments'] ['firstCreator', 'numNotes', 'numAttachments', 'sourceItemID']
); );
} }
@ -749,7 +749,9 @@ Zotero.Items = new function() {
+ "(SELECT COUNT(*) FROM itemNotes INo WHERE sourceItemID=I.itemID AND " + "(SELECT COUNT(*) FROM itemNotes INo WHERE sourceItemID=I.itemID AND "
+ "INo.itemID NOT IN (SELECT itemID FROM deletedItems)) AS numNotes, " + "INo.itemID NOT IN (SELECT itemID FROM deletedItems)) AS numNotes, "
+ "(SELECT COUNT(*) FROM itemAttachments IA WHERE sourceItemID=I.itemID AND " + "(SELECT COUNT(*) FROM itemAttachments IA WHERE sourceItemID=I.itemID AND "
+ "IA.itemID NOT IN (SELECT itemID FROM deletedItems)) AS numAttachments " + "IA.itemID NOT IN (SELECT itemID FROM deletedItems)) AS numAttachments, "
+ "(CASE I.itemTypeID WHEN 14 THEN (SELECT sourceItemID FROM itemAttachments IA WHERE IA.itemID=I.itemID) "
+ "WHEN 1 THEN (SELECT sourceItemID FROM itemNotes INo WHERE INo.itemID=I.itemID) END) AS sourceItemID "
+ 'FROM items I WHERE 1'; + 'FROM items I WHERE 1';
if (arguments[0]) { if (arguments[0]) {
sql += ' AND I.itemID IN (' + Zotero.join(arguments[0], ',') + ')'; sql += ' AND I.itemID IN (' + Zotero.join(arguments[0], ',') + ')';