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

Adjust identifier registration on object save

Browse Source 
Previously, object identifiers were registered in a commit callback, but that
meant that they wouldn't be available to getLibraryAndKeyFromID/
getIDFromLibraryAndKey within a transaction. Instead, register them before
saving and clear them in a tranasction rollback if necessary.

This changes Zotero.DataObject to call its own _finalizeSave() in addition to a
descendent one.
This commit is contained in:
Dan Stillman 2015-04-25 02:57:57 -04:00
parent f8ac21d891
commit 2f556d0da1
1 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
chrome/content/zotero/xpcom/data/dataObject.js
View File

@ -520,8 +520,8 @@ Zotero.DataObject.prototype.editCheck = function () {
*/ */
Zotero.DataObject.prototype.save = Zotero.Promise.coroutine(function* (options) { Zotero.DataObject.prototype.save = Zotero.Promise.coroutine(function* (options) {
var env = { var env = {
transactionOptions: null, options: options || {},
options: options || {} transactionOptions: {}
}; };
var proceed = yield this._initSave(env); var proceed = yield this._initSave(env);
@ -535,8 +535,13 @@ Zotero.DataObject.prototype.save = Zotero.Promise.coroutine(function* (options)
} }
return Zotero.DB.executeTransaction(function* () { return Zotero.DB.executeTransaction(function* () {
if (Zotero.DataObject.prototype._finalizeSave == this._finalizeSave) {
throw new Error("_finalizeSave not implement for Zotero." + this._ObjectType);
}
yield this._saveData(env); yield this._saveData(env);
return yield this._finalizeSave(env); yield Zotero.DataObject.prototype._finalizeSave.call(this, env);
return this._finalizeSave(env);
}.bind(this), env.transactionOptions) }.bind(this), env.transactionOptions)
.catch(e => { .catch(e => {
return this._recoverFromSaveError(env, e) return this._recoverFromSaveError(env, e)
@ -555,19 +560,6 @@ Zotero.DataObject.prototype.hasChanged = function() {
return !!Object.keys(this._changed).filter(dataType => this._changed[dataType]).length return !!Object.keys(this._changed).filter(dataType => this._changed[dataType]).length
} }
Zotero.DataObject.prototype._saveData = function() {
throw new Error("Zotero.DataObject.prototype._saveData is an abstract method");
}
Zotero.DataObject.prototype._finalizeSave = function() {
throw new Error("Zotero.DataObject.prototype._finalizeSave is an abstract method");
}
Zotero.DataObject.prototype._recoverFromSaveError = Zotero.Promise.coroutine(function* () {
yield this.reload(null, true);
this._clearChanged();
});
Zotero.DataObject.prototype._initSave = Zotero.Promise.coroutine(function* (env) { Zotero.DataObject.prototype._initSave = Zotero.Promise.coroutine(function* (env) {
if (!this.libraryID) { if (!this.libraryID) {
throw new Error("libraryID must be set before saving " + this._objectType); throw new Error("libraryID must be set before saving " + this._objectType);
@ -584,19 +576,31 @@ Zotero.DataObject.prototype._initSave = Zotero.Promise.coroutine(function* (env)
return false; return false;
} }
// Register this object's identifiers in Zotero.DataObjects on transaction commit, // Undo registerIdentifiers() on failure
// before other callbacks run env.transactionOptions.onRollback = function () {
if (env.isNew) { this.ObjectsClass.unload(env.id);
env.transactionOptions = { }.bind(this);
onCommit: () => {
this.ObjectsClass.registerIdentifiers(env.id, env.libraryID, env.key);
}
};
}
return true; return true;
}); });
Zotero.DataObject.prototype._saveData = function () {
throw new Error("_saveData is an abstract method");
};
Zotero.DataObject.prototype._finalizeSave = Zotero.Promise.coroutine(function* (env) {
// Register this object's identifiers in Zotero.DataObjects
if (env.isNew) {
this.ObjectsClass.registerIdentifiers(env.id, env.libraryID, env.key);
}
});
Zotero.DataObject.prototype._recoverFromSaveError = Zotero.Promise.coroutine(function* (env) {
yield this.reload(null, true);
this._clearChanged();
});
/** /**
* Delete object from database * Delete object from database
*/ */