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

Fix display of editors in Creator column in new databases

Browse source 
Regression in 5.0.78
This commit is contained in:
Dan Stillman 2019-12-21 05:08:32 -05:00
parent 85a3f03002
commit fda5df9a82
1 changed files with 21 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

31
chrome/content/zotero/xpcom/data/items.js
View file

@ -1243,6 +1243,9 @@ Zotero.Items = function() {
return _firstCreatorSQL; return _firstCreatorSQL;
} }
var editorCreatorTypeID = Zotero.CreatorTypes.getID('editor');
var contributorCreatorTypeID = Zotero.CreatorTypes.getID('contributor');
/* This whole block is to get the firstCreator */ /* This whole block is to get the firstCreator */
var localizedAnd = Zotero.getString('general.and'); var localizedAnd = Zotero.getString('general.and');
var localizedEtAl = Zotero.getString('general.etAl'); var localizedEtAl = Zotero.getString('general.etAl');
@ -1285,50 +1288,58 @@ Zotero.Items = function() {
// Then try editors // Then try editors
"CASE (" + "CASE (" +
"SELECT COUNT(*) FROM itemCreators WHERE itemID=O.itemID AND creatorTypeID IN (3)" + "SELECT COUNT(*) FROM itemCreators " +
`WHERE itemID=O.itemID AND creatorTypeID=${editorCreatorTypeID}` +
") " + ") " +
"WHEN 0 THEN NULL " + "WHEN 0 THEN NULL " +
"WHEN 1 THEN (" + "WHEN 1 THEN (" +
"SELECT lastName FROM itemCreators NATURAL JOIN creators " + "SELECT lastName FROM itemCreators NATURAL JOIN creators " +
"WHERE itemID=O.itemID AND creatorTypeID IN (3)" + `WHERE itemID=O.itemID AND creatorTypeID=${editorCreatorTypeID}` +
") " + ") " +
"WHEN 2 THEN (" + "WHEN 2 THEN (" +
"SELECT " + "SELECT " +
"(SELECT lastName FROM itemCreators NATURAL JOIN creators " + "(SELECT lastName FROM itemCreators NATURAL JOIN creators " +
"WHERE itemID=O.itemID AND creatorTypeID IN (3) ORDER BY orderIndex LIMIT 1)" + `WHERE itemID=O.itemID AND creatorTypeID=${editorCreatorTypeID} ` +
"ORDER BY orderIndex LIMIT 1)" +
" || ' " + localizedAnd + " ' || " + " || ' " + localizedAnd + " ' || " +
"(SELECT lastName FROM itemCreators NATURAL JOIN creators " + "(SELECT lastName FROM itemCreators NATURAL JOIN creators " +
"WHERE itemID=O.itemID AND creatorTypeID IN (3) ORDER BY orderIndex LIMIT 1,1) " + `WHERE itemID=O.itemID AND creatorTypeID=${editorCreatorTypeID} ` +
"ORDER BY orderIndex LIMIT 1,1) " +
") " + ") " +
"ELSE (" + "ELSE (" +
"SELECT " + "SELECT " +
"(SELECT lastName FROM itemCreators NATURAL JOIN creators " + "(SELECT lastName FROM itemCreators NATURAL JOIN creators " +
"WHERE itemID=O.itemID AND creatorTypeID IN (3) ORDER BY orderIndex LIMIT 1)" + `WHERE itemID=O.itemID AND creatorTypeID=${editorCreatorTypeID} ` +
"ORDER BY orderIndex LIMIT 1)" +
" || ' " + localizedEtAl + "' " + " || ' " + localizedEtAl + "' " +
") " + ") " +
"END, " + "END, " +
// Then try contributors // Then try contributors
"CASE (" + "CASE (" +
"SELECT COUNT(*) FROM itemCreators WHERE itemID=O.itemID AND creatorTypeID IN (2)" + "SELECT COUNT(*) FROM itemCreators " +
`WHERE itemID=O.itemID AND creatorTypeID=${contributorCreatorTypeID}` +
") " + ") " +
"WHEN 0 THEN NULL " + "WHEN 0 THEN NULL " +
"WHEN 1 THEN (" + "WHEN 1 THEN (" +
"SELECT lastName FROM itemCreators NATURAL JOIN creators " + "SELECT lastName FROM itemCreators NATURAL JOIN creators " +
"WHERE itemID=O.itemID AND creatorTypeID IN (2)" + `WHERE itemID=O.itemID AND creatorTypeID=${contributorCreatorTypeID}` +
") " + ") " +
"WHEN 2 THEN (" + "WHEN 2 THEN (" +
"SELECT " + "SELECT " +
"(SELECT lastName FROM itemCreators NATURAL JOIN creators " + "(SELECT lastName FROM itemCreators NATURAL JOIN creators " +
"WHERE itemID=O.itemID AND creatorTypeID IN (2) ORDER BY orderIndex LIMIT 1)" + `WHERE itemID=O.itemID AND creatorTypeID=${contributorCreatorTypeID} ` +
"ORDER BY orderIndex LIMIT 1)" +
" || ' " + localizedAnd + " ' || " + " || ' " + localizedAnd + " ' || " +
"(SELECT lastName FROM itemCreators NATURAL JOIN creators " + "(SELECT lastName FROM itemCreators NATURAL JOIN creators " +
"WHERE itemID=O.itemID AND creatorTypeID IN (2) ORDER BY orderIndex LIMIT 1,1) " + `WHERE itemID=O.itemID AND creatorTypeID=${contributorCreatorTypeID} ` +
"ORDER BY orderIndex LIMIT 1,1) " +
") " + ") " +
"ELSE (" + "ELSE (" +
"SELECT " + "SELECT " +
"(SELECT lastName FROM itemCreators NATURAL JOIN creators " + "(SELECT lastName FROM itemCreators NATURAL JOIN creators " +
"WHERE itemID=O.itemID AND creatorTypeID IN (2) ORDER BY orderIndex LIMIT 1)" + `WHERE itemID=O.itemID AND creatorTypeID=${contributorCreatorTypeID} ` +
"ORDER BY orderIndex LIMIT 1)" +
" || ' " + localizedEtAl + "' " + " || ' " + localizedEtAl + "' " +
") " + ") " +
"END" + "END" +