www

commit dcd7de03b09351f28502ba69c9c2fd58e36a0736
parent be4d56e43b683b2257af48a40a39b68c2fa6da93
Author: Dan Stillman <dstillman@zotero.org>
Date:   Thu, 18 Jun 2015 00:21:50 -0400

Match last name alone for two-field names in search autocomplete

https://forums.zotero.org/discussion/50073/

Diffstat:
M
components/zotero-autocomplete.js
 | 
10
+++++-----

1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/components/zotero-autocomplete.js b/components/zotero-autocomplete.js
@@ -96,11 +96,11 @@ ZoteroAutoComplete.prototype.startSearch = function(searchString, searchParams, 
 			if (searchParams.fieldMode == 2) {
 				var sql = "SELECT DISTINCT CASE fieldMode WHEN 1 THEN lastName "
 					+ "WHEN 0 THEN firstName || ' ' || lastName END AS val, NULL AS comment "
-					+ "FROM creators NATURAL JOIN creatorData WHERE CASE fieldMode "
-					+ "WHEN 1 THEN lastName "
-					+ "WHEN 0 THEN firstName || ' ' || lastName END "
-					+ "LIKE ? ";
-				var sqlParams = [searchString + '%'];
+					+ "FROM creators NATURAL JOIN creatorData "
+					+ "WHERE CASE fieldMode "
+					+ "WHEN 1 THEN lastName LIKE ? "
+					+ "WHEN 0 THEN (firstName || ' ' || lastName LIKE ?) OR (lastName LIKE ?) END "
+				var sqlParams = [searchString + '%', searchString + '%', searchString + '%'];
 				if (typeof searchParams.libraryID != 'undefined') {
 					sql += " AND libraryID=?";
 					sqlParams.push(searchParams.libraryID);