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

Addresses #171, Add more conditions to advanced search architecture

Browse source 
Added conditions 'tagID', 'tag' (text), 'creator' (concats first and last before comparing), and 'note'
This commit is contained in:
Dan Stillman 2006-08-08 23:08:52 +00:00
parent 6efd6d2cc4
commit 318cf3194f
1 changed files with 67 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
chrome/chromeFiles/content/scholar/xpcom/search.js
View file

@ -273,7 +273,9 @@ Scholar.Search.prototype._buildQuery = function(){
for (i in tables){
for (var j in tables[i]){
//
// Special table handling
//
switch (i){
case 'items':
break;
@ -282,10 +284,28 @@ Scholar.Search.prototype._buildQuery = function(){
var openParens = 2;
}
//
// Special field handling
//
// For itemData fields, include fieldID
if (tables[i][j]['name']=='field'){
switch (tables[i][j]['name']){
case 'field':
sql += 'fieldID=? AND ';
sqlParams.push(Scholar.ItemFields.getID(tables[i][j]['alias']));
sqlParams.push(
Scholar.ItemFields.getID(tables[i][j]['alias'])
);
break;
case 'tag':
sql += "tagID IN (SELECT tagID FROM tags WHERE ";
openParens++;
break;
case 'creator':
sql += "creatorID IN (SELECT creatorID FROM creators "
+ "WHERE ";
openParens++;
break;
}
sql += tables[i][j]['field'];
@ -486,6 +506,50 @@ Scholar.SearchConditions = new function(){
field: 'itemTypeID'
},
{
name: 'tagID',
operators: {
is: true,
isNot: true
},
table: 'itemTags',
field: 'tagID'
},
{
name: 'tag',
operators: {
is: true,
isNot: true,
contains: true,
doesNotContain: true
},
table: 'itemTags',
field: 'tag'
},
{
name: 'note',
operators: {
contains: true,
doesNotContain: true
},
table: 'itemNotes',
field: 'note'
},
{
name: 'creator',
operators: {
is: true,
isNot: true,
contains: true,
doesNotContain: true
},
table: 'itemCreators',
field: "firstName || ' ' || lastName"
},
{
name: 'field',
operators: {