MaDgIK
/
connect-admin
14
0
Fork 0
Code Issues Pull Requests Projects Releases 12 Wiki Activity

Merge remote-tracking branch 'origin/new-search' into new-search-extend-criteria

This commit is contained in:
Konstantinos Triantafyllou 2025-11-14 18:43:59 +02:00
parent 758673b54b 183942ccd0
commit 6224b23aed
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/pages/content-providers/add-content-providers.component.ts
View File

@ -164,7 +164,7 @@ export class AddContentProvidersComponent implements OnInit {
if (this.subResults) {
this.subResults.unsubscribe();
}
this.subResults = this.searchDataprovidersService.searchDataproviders(parameters, null, page, size, [], this.properties).subscribe(
this.subResults = this.searchDataprovidersService.advancedSearchDataproviders(parameters, page, size, this.properties, null, [], null, false, true).subscribe(
data => {
this.openaireSearchUtils.totalResults = data[0];
this.openaireContentProviders = data[1];

6
src/app/pages/projects/add-projects.component.ts
View File

@ -222,7 +222,7 @@ export class AddProjectsComponent implements OnInit {
if (this.subResults) {
this.subResults.unsubscribe();
}
this.subResults = this._searchProjectsService.searchProjects(parameters, null, page, size, [], this.properties).subscribe(
this.subResults = this._searchProjectsService.advancedSearchProjects(parameters, page, size, properties, null, [], null, true, false).subscribe(
data => {
this.openaireSearchUtils.totalResults = data[0];
this.openaireProjects = data[1];
@ -273,12 +273,12 @@ export class AddProjectsComponent implements OnInit {
this.queryParameters = "";
if (this.openaireSearchUtils.keyword) {
this.queryParameters = "q=" + StringUtils.URIEncode(this.openaireSearchUtils.keyword);
this.queryParameters = "search=" + StringUtils.URIEncode(this.openaireSearchUtils.keyword);
}
if (this.selectedFunderId) {
this.queryParameters += this.queryParameters ? "&" : "";
this.queryParameters += "fq=funder exact " + '"' + StringUtils.URIEncode(this.selectedFunderId) + '"';
this.queryParameters += "funder=" + StringUtils.quoteAndURIEncode(this.selectedFunderId);
}
}

2
src/app/pages/propagated-organizations/propagated-organizations.component.ts
View File

@ -86,7 +86,7 @@ export class PropagatedOrganizationsComponent extends BaseComponent {
getTagged(propagatedOrganizations: PropagatedOrganization[]) {
//from index
this.subscriptions.push(this.searchOrganizationsService.advancedSearchOrganizations("communityId=" + StringUtils.quoteAndURIEncode(this.community.communityId),
this.subscriptions.push(this.searchOrganizationsService.advancedSearchOrganizations("relCommunityId=" + StringUtils.quoteAndURIEncode(this.community.communityId),
1, propagatedOrganizations.length, properties, "", []).subscribe(res => {
// this.subscriptions.push(this.searchOrganizationsService.searchOrganizations("communityId=" + StringUtils.quoteAndURIEncode(this.community.communityId),