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

Strip abstract field to save note space, set new itemData on export

Browse source
This commit is contained in:
Martynas Bagdonas 2021-03-25 12:58:30 +02:00
parent 3536a384a9
commit f6fa81fdac
2 changed files with 56 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
chrome/content/zotero/xpcom/data/notes.js
View file

@ -143,6 +143,25 @@ Zotero.Notes = new function() {
}
node.removeAttribute('data-attachment-key');
}
var nodes = doc.querySelectorAll('.citation[data-citation]');
for (var node of nodes) {
var citation = node.getAttribute('data-citation');
try {
citation = JSON.parse(decodeURIComponent(citation));
for (var citationItem of citation.citationItems) {
var item = await Zotero.EditorInstance.getItemFromURIs(citationItem.uris);
if (item) {
citationItem.itemData = Zotero.Cite.System.prototype.retrieveItem(item);
}
}
citation = encodeURIComponent(JSON.stringify(citation));
node.setAttribute('data-citation', citation);
}
catch (e) {
Zotero.logError(e);
}
}
return doc.body.innerHTML;
};

69
chrome/content/zotero/xpcom/editorInstance.js
View file

@ -223,10 +223,12 @@ class EditorInstance {
// Citation
let parentItem = attachmentItem.parentID && await Zotero.Items.getAsync(attachmentItem.parentID);
if (parentItem) {
// TODO: Find a more elegant way to call this
let itemData = Zotero.Cite.System.prototype.retrieveItem(parentItem);
delete itemData.abstract;
let citationItem = {
uris: [Zotero.URI.getItemURI(parentItem)],
// TODO: Find a more elegant way to call this method
itemData: Zotero.Cite.System.prototype.retrieveItem(parentItem),
itemData,
locator: annotation.pageLabel
};
annotation.citationItem = citationItem;
@ -283,10 +285,12 @@ class EditorInstance {
continue;
}
if (item.isRegularItem()) {
let itemData = Zotero.Cite.System.prototype.retrieveItem(item);
delete itemData.abstract;
let citation = {
citationItems: [{
uris: [Zotero.URI.getItemURI(item)],
itemData: Zotero.Cite.System.prototype.retrieveItem(item)
itemData
}],
properties: {}
};
@ -362,7 +366,7 @@ class EditorInstance {
return;
}
let citationItem = citation.citationItems[0];
let item = await this._getItemFromURIs(citationItem.uris);
let item = await Zotero.EditorInstance.getItemFromURIs(citationItem.uris);
if (!item) {
return;
}
@ -379,7 +383,7 @@ class EditorInstance {
let { citation } = message;
let items = [];
for (let citationItem of citation.citationItems) {
let item = await this._getItemFromURIs(citationItem.uris);
let item = await Zotero.EditorInstance.getItemFromURIs(citationItem.uris);
if (item) {
items.push(item);
}
@ -453,7 +457,7 @@ class EditorInstance {
citation = JSON.parse(JSON.stringify(citation));
let availableCitationItems = [];
for (let citationItem of citation.citationItems) {
let item = await this._getItemFromURIs(citationItem.uris);
let item = await Zotero.EditorInstance.getItemFromURIs(citationItem.uris);
if (item) {
availableCitationItems.push({ ...citationItem, id: item.id });
}
@ -691,31 +695,6 @@ class EditorInstance {
}
}
async _getItemFromURIs(uris) {
for (let uri of uris) {
// Try getting URI directly
try {
let item = await Zotero.URI.getURIItem(uri);
if (item) {
// Ignore items in the trash
if (!item.deleted) {
return item;
}
}
}
catch (e) {
}
// Try merged item mapping
var replacer = await Zotero.Relations.getByPredicateAndObject(
'item', Zotero.Relations.replacedItemPredicate, uri
);
if (replacer.length && !replacer[0].deleted) {
return replacer[0];
}
}
}
/**
* Builds the string to go inside a bubble
*/
@ -758,7 +737,7 @@ class EditorInstance {
if (!Array.isArray(citationItem.uris)) {
continue;
}
let item = await this._getItemFromURIs(citationItem.uris);
let item = await Zotero.EditorInstance.getItemFromURIs(citationItem.uris);
if (!item && citationItem.itemData) {
item = new Zotero.Item();
Zotero.Utilities.itemFromCSLJSON(item, citationItem.itemData);
@ -974,6 +953,32 @@ class EditorInstance {
});
}
// TODO: This should be moved to utilities
static async getItemFromURIs(uris) {
for (let uri of uris) {
// Try getting URI directly
try {
let item = await Zotero.URI.getURIItem(uri);
if (item) {
// Ignore items in the trash
if (!item.deleted) {
return item;
}
}
}
catch (e) {
}
// Try merged item mapping
var replacer = await Zotero.Relations.getByPredicateAndObject(
'item', Zotero.Relations.replacedItemPredicate, uri
);
if (replacer.length && !replacer[0].deleted) {
return replacer[0];
}
}
}
/**
* Create note from annotations
*