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

Use the whole firstCreator string in sortCreatorAsString mode

Browse source 
And in the default mode, use the whole string up through 'and' or 'et al.'
before falling back to full creator sorting, which could speed things up
slightly.
This commit is contained in:
Dan Stillman 2014-11-26 20:09:58 -05:00
parent 09502d2005
commit 55068a0059
1 changed files with 31 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

37
chrome/content/zotero/xpcom/itemTreeView.js
View file

@ -1444,22 +1444,47 @@ Zotero.ItemTreeView.prototype.sort = function(itemID)
var firstCreatorSortCache = {}; var firstCreatorSortCache = {};
// Regexp to extract the whole string up to an optional "and" or "et al."
var andEtAlRegExp = new RegExp(
// Extract the beginning of the string in non-greedy mode
"^.+?"
// up to either the end of the string, "et al." at the end of string
+ "(?=(?: " + Zotero.getString('general.etAl').replace('.', '\.') + ")?$"
// or ' and '
+ "| " + Zotero.getString('general.and') + " "
+ ")"
);
function creatorSort(a, b) { function creatorSort(a, b) {
// //
// Try sorting by first word in firstCreator field, since we already have it // Try sorting by the first name in the firstCreator field, since we already have it
//
// For sortCreatorAsString mode, just use the whole string
// //
var aItemID = a.id, var aItemID = a.id,
bItemID = b.id, bItemID = b.id,
fieldA = firstCreatorSortCache[aItemID], fieldA = firstCreatorSortCache[aItemID],
fieldB = firstCreatorSortCache[bItemID]; fieldB = firstCreatorSortCache[bItemID];
if (fieldA === undefined) { if (fieldA === undefined) {
var matches = Zotero.Items.getSortTitle(a.getField('firstCreator')).match(/^[^\s]+/); let firstCreator = Zotero.Items.getSortTitle(a.getField('firstCreator'));
var fieldA = matches ? matches[0] : ''; if (sortCreatorAsString) {
var fieldA = firstCreator;
}
else {
var matches = andEtAlRegExp.exec(firstCreator);
var fieldA = matches ? matches[0] : '';
}
firstCreatorSortCache[aItemID] = fieldA; firstCreatorSortCache[aItemID] = fieldA;
} }
if (fieldB === undefined) { if (fieldB === undefined) {
var matches = Zotero.Items.getSortTitle(b.getField('firstCreator')).match(/^[^\s]+/); let firstCreator = Zotero.Items.getSortTitle(b.getField('firstCreator'));
var fieldB = matches ? matches[0] : ''; if (sortCreatorAsString) {
var fieldB = firstCreator;
}
else {
var matches = andEtAlRegExp.exec(firstCreator);
var fieldB = matches ? matches[0] : '';
}
firstCreatorSortCache[bItemID] = fieldB; firstCreatorSortCache[bItemID] = fieldB;
} }
@ -1473,7 +1498,7 @@ Zotero.ItemTreeView.prototype.sort = function(itemID)
} }
// //
// If first word is the same, compare actual creators // If first name is the same, compare actual creators
// //
var aRef = a.ref, var aRef = a.ref,
bRef = b.ref, bRef = b.ref,