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

Support target selector sessions for /connector/import

Browse Source
This commit is contained in:
Dan Stillman 2018-03-28 08:45:46 -04:00
parent bff7cee374
commit 38330e4c13
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
chrome/content/zotero/xpcom/server_connector.js
View File

@ -850,29 +850,41 @@ Zotero.Server.Connector.Import.prototype = {
supportedDataTypes: '*', supportedDataTypes: '*',
permitBookmarklet: false, permitBookmarklet: false,
init: Zotero.Promise.coroutine(function* (options) { init: async function (options) {
let translate = new Zotero.Translate.Import(); let translate = new Zotero.Translate.Import();
translate.setString(options.data); translate.setString(options.data);
let translators = yield translate.getTranslators(); let translators = await translate.getTranslators();
if (!translators || !translators.length) { if (!translators || !translators.length) {
return 400; return 400;
} }
translate.setTranslator(translators[0]); translate.setTranslator(translators[0]);
var { library, collection, editable } = Zotero.Server.Connector.getSaveTarget(); var { library, collection, editable } = Zotero.Server.Connector.getSaveTarget();
var libraryID = library.libraryID;
if (!library.editable) { if (!library.editable) {
Zotero.logError("Can't import into read-only library " + library.name); Zotero.logError("Can't import into read-only library " + library.name);
return [500, "application/json", JSON.stringify({ libraryEditable: false })]; return [500, "application/json", JSON.stringify({ libraryEditable: false })];
} }
let items = yield translate.translate({
libraryID: library.libraryID, try {
var session = Zotero.Server.Connector.SessionManager.create(options.query.session);
}
catch (e) {
return [409, "application/json", JSON.stringify({ error: "SESSION_EXISTS" })];
}
await session.update(libraryID, collection ? collection.id : false);
let items = await translate.translate({
libraryID,
collections: collection ? [collection.id] : null, collections: collection ? [collection.id] : null,
// Import translation skips selection by default, so force it to occur // Import translation skips selection by default, so force it to occur
saveOptions: { saveOptions: {
skipSelect: false skipSelect: false
} }
}); });
session.addItems(items);
return [201, "application/json", JSON.stringify(items)]; return [201, "application/json", JSON.stringify(items)];
}) }
} }
/** /**