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

Remove (non-async-compatible) REGEXP UDF in Zotero.DB.getNextName()

Browse source 
And remove UDF setup code

Duplicates view also used REGEXP, so we'll need to figure out another approach
for the async rewrite of that (#519). There are no other current UDF consumers,
so this closes #528.
This commit is contained in:
Dan Stillman 2014-08-12 03:13:00 -04:00
parent 2856b71f0b
commit df67de125e
1 changed files with 6 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
chrome/content/zotero/xpcom/db.js
View file

@ -385,8 +385,6 @@ Zotero.DBConnection.prototype.getColumns = function (table) {
* For example, if "Untitled" and "Untitled 2" and "Untitled 4",
* returns "Untitled 3"
*
* DEBUG: doesn't work once there's an "Untitled 10"
*
* If _name_ alone is available, returns that
**/
Zotero.DBConnection.prototype.getNextName = Zotero.Promise.coroutine(function* (libraryID, table, field, name)
@ -396,15 +394,17 @@ Zotero.DBConnection.prototype.getNextName = Zotero.Promise.coroutine(function* (
[libraryID, table, field, name] = [null, libraryID, table, field];
}
var sql = "SELECT TRIM(SUBSTR(" + field + ", " + (name.length + 1) + ")) "
var sql = "SELECT SUBSTR(" + field + ", " + (name.length + 1) + ") "
+ "FROM " + table + " "
+ "WHERE " + field + " REGEXP '^" + name + "( [0-9]+)?$' "
+ "AND libraryID=?"
+ "WHERE libraryID=? AND "
+ field + " LIKE '" + name + "%' "
+ " ORDER BY " + field;
var params = [libraryID];
var suffixes = yield this.columnQueryAsync(sql, params);
suffixes.filter(function (x) x.match(/^( [0-9]+)?$/));
// If none found or first one has a suffix, use default name
if (!suffixes || suffixes[0]) {
if (!suffixes.length || suffixes[0]) {
return name;
}
@ -1297,38 +1297,6 @@ Zotero.DBConnection.prototype._getConnectionAsync = Zotero.Promise.coroutine(fun
idleService.addIdleObserver(this, 60);
idleService = null;
/*// User-defined functions
// TODO: move somewhere else?
// Levenshtein distance UDF
var lev = {
onFunctionCall: function (arg) {
var a = arg.getUTF8String(0);
var b = arg.getUTF8String(1);
return Zotero.Utilities.levenshtein(a, b);
}
};
this._connection.createFunction('levenshtein', 2, lev);
// Regexp UDF
var rx = {
onFunctionCall: function (arg) {
var re = new RegExp(arg.getUTF8String(0));
var str = arg.getUTF8String(1);
return re.test(str);
}
};
this._connection.createFunction('regexp', 2, rx);
// text2html UDF
var rx = {
onFunctionCall: function (arg) {
var str = arg.getUTF8String(0);
return Zotero.Utilities.text2html(str, true);
}
};
this._connection.createFunction('text2html', 1, rx);*/
return this._connectionAsync;
});