MaDgIK
/
openaire-library
13
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Search all: Add margin bottom from tabs. Search: Fix queries for projects, etc with miss parenthesis and fix queries with not includes in all content while DOI is available).

This commit is contained in:
Konstantinos Triantafyllou 2022-08-31 12:27:20 +03:00
parent 29100c8d6f
commit d45c573a56
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
searchPages/find/searchAll.component.html
View File

@ -27,7 +27,7 @@
<schema2jsonld *ngIf="name && logoURL" [URL]="properties.domain+ properties.baseLink +'/search/find'" <schema2jsonld *ngIf="name && logoURL" [URL]="properties.domain+ properties.baseLink +'/search/find'"
[logoURL]="properties.domain + properties.baseLink+logoURL" type="search" [name]=name [logoURL]="properties.domain + properties.baseLink+logoURL" type="search" [name]=name
description="Search for {{openaireEntities.RESULTS}} ({{openaireEntities.PUBLICATIONS}}, {{openaireEntities.DATASETS}}, {{openaireEntities.SOFTWARE}}, {{openaireEntities.OTHER}}), {{openaireEntities.PROJECTS}}, {{openaireEntities.ORGANIZATIONS}}, {{openaireEntities.DATASOURCES}} in the OpenAIRE Research Graph. "></schema2jsonld> description="Search for {{openaireEntities.RESULTS}} ({{openaireEntities.PUBLICATIONS}}, {{openaireEntities.DATASETS}}, {{openaireEntities.SOFTWARE}}, {{openaireEntities.OTHER}}), {{openaireEntities.PROJECTS}}, {{openaireEntities.ORGANIZATIONS}}, {{openaireEntities.DATASOURCES}} in the OpenAIRE Research Graph. "></schema2jsonld>
<div class="uk-container-large uk-container uk-margin-large-top"> <div class="uk-container-large uk-container uk-margin-large-top uk-margin-medium-bottom">
<div class="uk-width-1-1" uk-slider="finite: true"> <div class="uk-width-1-1" uk-slider="finite: true">
<div class="uk-position-relative"> <div class="uk-position-relative">
<div class="uk-slider-container"> <div class="uk-slider-container">

6
searchPages/searchUtils/newSearchPage.component.ts
View File

@ -987,11 +987,11 @@ export class NewSearchPageComponent implements OnInit, OnDestroy, OnChanges {
} }
} }
if (doisParams.length > 0) { if (doisParams.length > 0) {
params += this.createQuotedKeywordQuery(value, id, operatorId, countParams, true, true, includes) + " or " + doisParams + ")"; params += this.createQuotedKeywordQuery(value, id, operatorId, countParams, true, true, includes) + (includes?(" or " + doisParams + ")"):")");
} else { } else {
//if it is PIDs but no doisquery produced, forced to use quotes as the query will fail due to special characters //if it is PIDs but no doisquery produced, forced to use quotes as the query will fail due to special characters
params += this.createQuotedKeywordQuery(value, id, operatorId, countParams, true, params += this.createQuotedKeywordQuery(value, id, operatorId, countParams, true,
(DOIs.length > 0 && doisParams.length == 0), includes); (DOIs.length > 0 && doisParams.length == 0), includes) + ")";
} }
return params; return params;
@ -1014,7 +1014,7 @@ export class NewSearchPageComponent implements OnInit, OnDestroy, OnChanges {
if (forceQuotted) { if (forceQuotted) {
/** Remove double quotes **/ /** Remove double quotes **/
fieldValue = fieldValue.replace(/["]+/g, ''); fieldValue = fieldValue.replace(/["]+/g, '');
return (countParams == 0 ? "(" : " " + fieldOperator + " (") + this.getQuotedQueryPart(fieldId, '"' + fieldValue + '"', isSearchAll); return params + this.getQuotedQueryPart(fieldId, '"' + fieldValue + '"', isSearchAll);
} }
if (quotedParts && quotedParts.length == 1 && quotedParts[0] == fieldValue) { if (quotedParts && quotedParts.length == 1 && quotedParts[0] == fieldValue) {
params += this.getQuotedQueryPart(fieldId, fieldValue, isSearchAll); params += this.getQuotedQueryPart(fieldId, fieldValue, isSearchAll);