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

Fix "Untitled" collection naming after "Untitled 10"

Browse Source 
Fixes #16
This commit is contained in:
Dan Stillman 2011-11-17 14:16:25 -05:00
parent 81b6974053
commit 75baa706cd
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -699,26 +699,34 @@ Zotero.DBConnection.prototype.getNextID = function (table, column) {
**/ **/
Zotero.DBConnection.prototype.getNextName = function (table, field, name) Zotero.DBConnection.prototype.getNextName = function (table, field, name)
{ {
var sql = "SELECT " + field + " FROM " + table + " WHERE " + field var sql = "SELECT TRIM(SUBSTR(" + field + ", " + (name.length + 1) + ")) "
+ " LIKE ? ORDER BY " + field + " COLLATE NOCASE"; + "FROM " + table + " "
var untitleds = this.columnQuery(sql, name + '%'); + "WHERE " + field + " REGEXP '^" + name + "( [0-9]+)?$' "
+ "ORDER BY " + field;
if (!untitleds || untitleds[0]!=name) { var suffixes = this.columnQuery(sql);
// If none found or first one has a suffix, use default name
if (!suffixes || suffixes[0]) {
return name; return name;
} }
suffixes.sort(function (a, b) {
return parseInt(a) - parseInt(b);
});
Zotero.debug(suffixes);
var i = 1; var i = 1;
while (suffixes[i] === "") {
i++;
}
var num = 2; var num = 2;
while (untitleds[i] && untitleds[i]==(name + ' ' + num)) { while (suffixes[i] == num) {
while (untitleds[i+1] && untitleds[i]==untitleds[i+1]) { while (suffixes[i+1] && suffixes[i] == suffixes[i+1]) {
this._debug('Next ' + i + ' is ' + untitleds[i]);
i++; i++;
} }
i++; i++;
num++; num++;
} }
return name + ' ' + num; return name + ' ' + num;
} }