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

Fix report generation after 4e1937680f

Browse Source
This commit is contained in:
Dan Stillman 2017-06-04 21:33:14 -04:00
parent 47f7f3a93f
commit 653f041140
1 changed files with 15 additions and 15 deletions

30
components/zotero-protocol-handler.js
View File

@ -192,9 +192,9 @@ function ZoteroProtocolHandler() {
var mimeType, content = ''; var mimeType, content = '';
var items = []; var items = [];
var itemsHash = {}; // key = itemID, val = position in |items| var itemsHash = {}; // key = itemID, val = position in |items|
var searchItemIDs = {}; // hash of all selected items var searchItemIDs = new Set(); // All selected items
var searchParentIDs = {}; // hash of parents of selected child items var searchParentIDs = new Set(); // Parents of selected child items
var searchChildIDs = {}; // hash of selected chlid items var searchChildIDs = new Set() // Selected chlid items
var includeAllChildItems = Zotero.Prefs.get('report.includeAllChildItems'); var includeAllChildItems = Zotero.Prefs.get('report.includeAllChildItems');
var combineChildItems = Zotero.Prefs.get('report.combineChildItems'); var combineChildItems = Zotero.Prefs.get('report.combineChildItems');
@ -205,8 +205,8 @@ function ZoteroProtocolHandler() {
// (instead mark their parents for inclusion below) // (instead mark their parents for inclusion below)
var parentItemID = results[i].parentItemID; var parentItemID = results[i].parentItemID;
if (parentItemID) { if (parentItemID) {
searchParentIDs[parentItemID] = true; searchParentIDs.add(parentItemID);
searchChildIDs[results[i].id] = true; searchChildIDs.add(results[i].id);
// Don't include all child items if any child // Don't include all child items if any child
// items were selected // items were selected
@ -223,14 +223,14 @@ function ZoteroProtocolHandler() {
else { else {
unhandledParents[i] = true; unhandledParents[i] = true;
} }
searchItemIDs[results[i].id] = true; searchItemIDs.add(results[i].id);
} }
// If including all child items, add children of all matched // If including all child items, add children of all matched
// parents to the child array // parents to the child array
if (includeAllChildItems) { if (includeAllChildItems) {
for (var id in searchItemIDs) { for (let id of searchItemIDs) {
if (!searchChildIDs[id]) { if (!searchChildIDs.has(id)) {
var children = []; var children = [];
var item = yield Zotero.Items.getAsync(id); var item = yield Zotero.Items.getAsync(id);
if (!item.isRegularItem()) { if (!item.isRegularItem()) {
@ -239,7 +239,7 @@ function ZoteroProtocolHandler() {
var func = function (ids) { var func = function (ids) {
if (ids) { if (ids) {
for (var i=0; i<ids.length; i++) { for (var i=0; i<ids.length; i++) {
searchChildIDs[ids[i]] = true; searchChildIDs.add(ids[i]);
} }
} }
}; };
@ -261,8 +261,8 @@ function ZoteroProtocolHandler() {
if (combineChildItems) { if (combineChildItems) {
// Add parents of matches if parents aren't matches themselves // Add parents of matches if parents aren't matches themselves
for (var id in searchParentIDs) { for (let id of searchParentIDs) {
if (!searchItemIDs[id] && !itemsHash[id]) { if (!searchItemIDs.has(id) && !itemsHash[id]) {
var item = yield Zotero.Items.getAsync(id); var item = yield Zotero.Items.getAsync(id);
itemsHash[id] = items.length; itemsHash[id] = items.length;
items.push(item.toJSON({ mode: 'full' })); items.push(item.toJSON({ mode: 'full' }));
@ -270,8 +270,8 @@ function ZoteroProtocolHandler() {
} }
// Add children to reportChildren property of parents // Add children to reportChildren property of parents
for (var id in searchChildIDs) { for (let id of searchChildIDs) {
var item = yield Zotero.Items.getAsync(id); let item = yield Zotero.Items.getAsync(id);
var parentID = item.parentID; var parentID = item.parentID;
if (!items[itemsHash[parentID]].reportChildren) { if (!items[itemsHash[parentID]].reportChildren) {
items[itemsHash[parentID]].reportChildren = { items[itemsHash[parentID]].reportChildren = {
@ -290,7 +290,7 @@ function ZoteroProtocolHandler() {
// If not combining children, add a parent/child pair // If not combining children, add a parent/child pair
// for each matching child // for each matching child
else { else {
for (var id in searchChildIDs) { for (let id of searchChildIDs) {
var item = yield Zotero.Items.getAsync(id); var item = yield Zotero.Items.getAsync(id);
var parentID = item.parentID; var parentID = item.parentID;
var parentItem = Zotero.Items.get(parentID); var parentItem = Zotero.Items.get(parentID);
@ -298,7 +298,7 @@ function ZoteroProtocolHandler() {
if (!itemsHash[parentID]) { if (!itemsHash[parentID]) {
// If parent is a search match and not yet added, // If parent is a search match and not yet added,
// add on its own // add on its own
if (searchItemIDs[parentID]) { if (searchItemIDs.has(parentID)) {
itemsHash[parentID] = [items.length]; itemsHash[parentID] = [items.length];
items.push(parentItem.toJSON({ mode: 'full' })); items.push(parentItem.toJSON({ mode: 'full' }));
items[items.length - 1].reportSearchMatch = true; items[items.length - 1].reportSearchMatch = true;