diff --git a/searchPages/find/searchAll.component.ts b/searchPages/find/searchAll.component.ts index 990d5de7..edd54bb9 100644 --- a/searchPages/find/searchAll.component.ts +++ b/searchPages/find/searchAll.component.ts @@ -93,7 +93,8 @@ export class SearchAllComponent { // @Input() formPlaceholderText = "Search for "+OpenaireEntities.RESULTS+", "+OpenaireEntities.PROJECTS+", "+OpenaireEntities.DATASOURCES+" & "+OpenaireEntities.ORGANIZATIONS+" in OpenAIRE"; @Input() searchForm: SearchForm = {class: 'search-form', dark: true} @Input() breadcrumbs: Breadcrumb[] = []; - + @Input() openAccess: boolean = true; + subs: Subscription[] = []; quickFilter: { filter: Filter, selected: boolean, filterId: string, value: string } = { @@ -421,7 +422,7 @@ export class SearchAllComponent { this.reload["result"] = false; this.fetchPublications.results = []; //Add Open Access Filter - this.subs.push(this.numOfSearchResults(this.fetchPublications, (refineParams ? (refineParams + '&') : '') + "&fq=resultbestaccessright%20exact%20%22Open%20Access%22")); + this.subs.push(this.numOfSearchResults(this.fetchPublications, (refineParams ? (refineParams + '&') : '') + (this.openAccess ? "&fq=resultbestaccessright%20exact%20%22Open%20Access%22" : ""))); } if (this.activeEntity != "projects" && this.reload["projects"] && this.showProjects) { @@ -607,7 +608,9 @@ export class SearchAllComponent { } if (entity == "result") { entity = "research-outcomes"; - this.parameters["resultbestaccessright"] = '"' + encodeURIComponent("Open Access") + '"'; + if(!!this.openAccess) { + this.parameters["resultbestaccessright"] = '"' + encodeURIComponent("Open Access") + '"'; + } } this.router.navigate(["/search/find", entity], {queryParams: this.parameters}); }