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

Allow StopIteration in queryAsync() to cancel query

Browse Source 
And catch other errors and throw StopIteration so that they stop the
search. (Non-StopIteration errors in onRow don't stop Sqlite.jsm
queries. We were logging them but then re-throwing them, which didn't do
anything.)
This commit is contained in:
Dan Stillman 2014-08-10 14:15:46 -04:00
parent 31502de08f
commit 9441627e74
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
chrome/content/zotero/xpcom/db.js
View File

@ -656,15 +656,19 @@ Zotero.DBConnection.prototype.queryAsync = function (sql, params, options) {
} }
} }
if (options && options.onRow) { if (options && options.onRow) {
// Errors in onRow aren't shown by default, so we wrap them in a try/catch // Errors in onRow don't stop the query unless StopIteration is thrown
onRow = function (row) { onRow = function (row) {
try { try {
options.onRow(row); options.onRow(row);
} }
catch (e) { catch (e) {
if (e instanceof StopIteration) {
Zotero.debug("Query cancelled");
throw e;
}
Zotero.debug(e, 1); Zotero.debug(e, 1);
Components.utils.reportError(e); Components.utils.reportError(e);
throw e; throw StopIteration;
} }
} }
} }