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

Fix PDF recognition within collection (broken by f8b41c971c)

Browse Source
This commit is contained in:
Dan Stillman 2018-02-28 17:34:06 -05:00
parent f99038fd37
commit 3cc92fe1e9
2 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
chrome/content/zotero/xpcom/recognizePDF.js
View File

@ -256,8 +256,8 @@ Zotero.RecognizePDF = new function () {
let collections = attachment.getCollections(); let collections = attachment.getCollections();
await Zotero.DB.executeTransaction(async function () { await Zotero.DB.executeTransaction(async function () {
if (collections.length) { if (collections.length) {
for (let collection of collections) { for (let collectionID of collections) {
parentItem.addToCollection(collection.id); parentItem.addToCollection(collectionID);
} }
await parentItem.save(); await parentItem.save();
} }

29
test/tests/recognizePDFTest.js
View File

@ -60,4 +60,33 @@ describe("PDF Recognition", function() {
Zotero.Attachments.getFileBaseNameFromItem(item) + '.pdf' Zotero.Attachments.getFileBaseNameFromItem(item) + '.pdf'
); );
}); });
it("should put new item in same collection", async function () {
this.timeout(30000);
// Import the PDF
var testdir = getTestDataDirectory();
testdir.append("recognizePDF_test_GS.pdf");
var collection = await createDataObject('collection');
var attachment = await Zotero.Attachments.importFromFile({
file: testdir,
collections: [collection.id]
});
win.ZoteroPane.recognizeSelected();
var addedIDs = await waitForItemEvent("add");
var modifiedIDs = await waitForItemEvent("modify");
assert.lengthOf(addedIDs, 1);
var item = Zotero.Items.get(addedIDs[0]);
assert.lengthOf(modifiedIDs, 2);
// Wait for status to show as complete
var progressWindow = getWindows("chrome://zotero/content/recognizePDFDialog.xul")[0];
var completeStr = Zotero.getString("recognizePDF.complete.label");
while (progressWindow.document.getElementById("label").value != completeStr) {
await Zotero.Promise.delay(20);
}
assert.isTrue(collection.hasItem(item.id));
});
}); });