Revision 58504
Added by Argiro Kokogiannaki about 4 years ago
modules/uoa-services-library/trunk/ng-openaire-library/src/app/searchPages/searchUtils/newSearchPage.component.ts | ||
---|---|---|
680 | 680 |
} else { |
681 | 681 |
params += this.createQuotedKeywordQuery(this.selectedFields[i].value, this.selectedFields[i].id, this.selectedFields[i].operatorId,countParams,true); |
682 | 682 |
}*/ |
683 |
params += NewSearchPageComponent.createKeywordQuery(this.entityType,this.selectedFields[i].value, this.selectedFields[i].id, this.selectedFields[i].operatorId, countParams); |
|
683 |
params +=(countParams == 0 ? "" : " " + this.selectedFields[i].operatorId + " ") + NewSearchPageComponent.createKeywordQuery(this.entityType,this.selectedFields[i].value, this.selectedFields[i].id, this.selectedFields[i].operatorId, countParams);
|
|
684 | 684 |
//TODO deposit case |
685 | 685 |
// console.log(this.usedBy) |
686 | 686 |
// console.log(this.keywordFields) |
... | ... | |
709 | 709 |
} else if(this.fieldIdsMap[this.selectedFields[i].id].equalityOperator == "=") { |
710 | 710 |
params+=NewSearchPageComponent.createQuotedKeywordQuery(this.selectedFields[i].value, this.selectedFields[i].id, this.selectedFields[i].operatorId, countParams, false); |
711 | 711 |
}else{ |
712 |
params += (countParams == 0 ? "" : this.selectedFields[i].operatorId + " ") + this.selectedFields[i].id + this.fieldIdsMap[this.selectedFields[i].id].equalityOperator + '"' + encodeURIComponent(this.selectedFields[i].value) + '"' + " "; |
|
712 |
params += (countParams == 0 ? "" : " " + this.selectedFields[i].operatorId + " ") + this.selectedFields[i].id + this.fieldIdsMap[this.selectedFields[i].id].equalityOperator + '"' + encodeURIComponent(this.selectedFields[i].value) + '"' + " ";
|
|
713 | 713 |
|
714 | 714 |
} |
715 | 715 |
} |
... | ... | |
741 | 741 |
} |
742 | 742 |
} |
743 | 743 |
if (doisParams.length > 0) { |
744 |
params += this.createQuotedKeywordQuery(value, id, operatorId ,countParams,true, true) + " or " + doisParams;
|
|
744 |
params += "(" + this.createQuotedKeywordQuery(value, id, operatorId ,countParams,true, true) + " or " + doisParams+")";
|
|
745 | 745 |
} else { |
746 | 746 |
params += this.createQuotedKeywordQuery(value, id, operatorId,countParams,true); |
747 | 747 |
} |
... | ... | |
751 | 751 |
private static createQuotedKeywordQuery(fieldValue, fieldId, fieldOperator, countParams:number, isSearchAll:boolean, forceQuotted:boolean=false){ |
752 | 752 |
let params = ""; |
753 | 753 |
let quotedParts = (fieldValue)?fieldValue.match(/(["'])(.*?)*?\1/g):[]; |
754 |
params+= (countParams == 0 ? "" : fieldOperator) + " ("; |
|
754 |
// params+= (countParams == 0 ? "" : fieldOperator) + |
|
755 |
params+= " ("; |
|
755 | 756 |
if(forceQuotted){ |
756 | 757 |
return this.getQuotedQueryPart(fieldId, '"'+ fieldValue+'"',isSearchAll); |
757 | 758 |
} |
... | ... | |
788 | 789 |
}else{ |
789 | 790 |
params+=this.getNoQuotedQueryPart(fieldId, fieldValue,isSearchAll); |
790 | 791 |
} |
791 |
params += " )";
|
|
792 |
params += ")"; |
|
792 | 793 |
return params; |
793 | 794 |
} |
794 | 795 |
|
Also available in: Unified diff
[Library|Trunk]
New Search pages: apply fixes for advanced search query