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

Fix [Attachment Content] [does not contain] searches in "all" mode

Browse Source
This commit is contained in:
Dan Stillman 2014-02-19 00:52:27 -05:00
parent 62bc5830eb
commit 1d4a6b0848
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
chrome/content/zotero/xpcom/search.js
View File

@ -716,7 +716,8 @@ Zotero.Search.prototype.search = function(asTempTable){
// (a separate fulltext word search filtered by fulltext content) // (a separate fulltext word search filtered by fulltext content)
for each(var condition in this._conditions){ for each(var condition in this._conditions){
if (condition['condition']=='fulltextContent'){ if (condition['condition']=='fulltextContent'){
var filter = function(val, index, array) { var fulltextWordIntersectionFilter = function (val, index, array) !!hash[val]
var fulltextWordIntersectionConditionFilter = function(val, index, array) {
return hash[val] ? return hash[val] ?
(condition.operator == 'contains') : (condition.operator == 'contains') :
(condition.operator == 'doesNotContain'); (condition.operator == 'doesNotContain');
@ -789,7 +790,7 @@ Zotero.Search.prototype.search = function(asTempTable){
} }
if (ids) { if (ids) {
var scopeIDs = ids.filter(filter); var scopeIDs = ids.filter(fulltextWordIntersectionFilter);
} }
else { else {
var scopeIDs = []; var scopeIDs = [];
@ -811,7 +812,7 @@ Zotero.Search.prototype.search = function(asTempTable){
hash[val.id] = true; hash[val.id] = true;
} }
filteredIDs = scopeIDs.filter(filter); filteredIDs = scopeIDs.filter(fulltextWordIntersectionConditionFilter);
} }
else { else {
var filteredIDs = []; var filteredIDs = [];