+
Advanced search
diff --git a/searchPages/searchUtils/advancedSearchForm.component.ts b/searchPages/searchUtils/advancedSearchForm.component.ts
index 1776a399..80954f7f 100644
--- a/searchPages/searchUtils/advancedSearchForm.component.ts
+++ b/searchPages/searchUtils/advancedSearchForm.component.ts
@@ -38,6 +38,8 @@ export class AdvancedSearchFormComponent {
selectedEntity;
selectedEntitySimpleUrl;
selectedEntityAdvancedUrl;
+ @Input() entitiesSelection:boolean;
+ @Input() showAdvancedSearchLink:boolean = true;
constructor (private route: ActivatedRoute, private router: Router) {
}
@@ -112,6 +114,10 @@ export class AdvancedSearchFormComponent {
}else{
this.selectedFields.splice(index, 1);
}
+ //if only one filter left, set the operator to and
+ if(this.selectedFields.length==1){
+ this.selectedFields[0].operatorId = "and";
+ }
}
fieldOperatorChanged(index: number, operatorId: string, operatorName: string) {
diff --git a/searchPages/searchUtils/datasourcesHelper.class.ts b/searchPages/searchUtils/datasourcesHelper.class.ts
new file mode 100644
index 00000000..1dbe0d40
--- /dev/null
+++ b/searchPages/searchUtils/datasourcesHelper.class.ts
@@ -0,0 +1,178 @@
+import {Filter, Value} from "./searchHelperClasses.class";
+import {SearchFields} from "../../utils/properties/searchFields";
+
+export class DatasourcesHelperClass {
+
+ public static getrefineFields(type: "all" | "registries" | "journals" | "compatible") {
+ let searchFields:SearchFields = new SearchFields();
+ if (type == "registries") {
+ return searchFields.ENTITY_REGISTRIES_FIELDS;
+ } else if (type == "journals") {
+ return searchFields.JOURNAL_FIELDS;
+
+ } else if (type == "compatible") {
+ return searchFields.COMPATIBLE_DATAPROVIDER_FIELDS;
+ } else {
+ return searchFields.DATASOURCE_REFINE_FIELDS;
+ }
+ }
+
+ public static getTitle(type: "all" | "registries" | "journals" | "compatible") {
+ if (type == "registries") {
+ return "Entity Registries"
+ } else if (type == "journals") {
+ return "Journals"
+
+ } else if (type == "compatible") {
+ return "Compatible Content Providers";
+ } else {
+ return "Content Providers"
+ }
+ }
+ public static getQueryPrefix(type: "all" | "registries" | "journals" | "compatible"): string {
+ if (type == "registries") {
+ return ' datasourcetypeuiid = other ';
+ } else if (type == "journals") {
+ // return ' not(datasourcecompatibilityid = UNKNOWN) not(datasourcecompatibilityid = notCompatible) and (datasourcetypeuiid exact "pubsrepository::journal" or datasourcetypeuiid exact "aggregator::pubsrepository::journals" ) ';
+ return 'oaftype exact datasource not datasourcecompatibilityid = notCompatible and (datasourcetypeuiid exact "pubsrepository::journal" or datasourcetypeuiid exact "aggregator::pubsrepository::journals" ) ';
+
+ } else if (type == "compatible") {
+ return ' oaftype exact datasource and datasourcecompatibilityid <> notCompatible and datasourcetypeuiid <> other and datasourcetypeuiid <> "pubsrepository::journal" and datasourcetypeuiid <> "aggregator::pubsrepository::journals" ';
+ } else {
+ return "";
+ }
+ }
+
+ public static createFilters(type: "all" | "registries" | "journals" | "compatible"): Filter[] {
+ if (type == "registries") {
+ return this.createRegistriesFilters();
+ } else if (type == "journals") {
+ return this.createJournalFilters();
+ } else if (type == "compatible") {
+ return this.createCompatibleFilters();
+ } else {
+ return [];
+ }
+ }
+
+ private static createCompatibleFilters(): Filter[] {
+ var filter_names = ["Type", "Compatibility Level"];
+ var filter_ids = ["datasourcetypeuiid", "datasourcecompatibilityname"];
+ var searchFields = new SearchFields();
+ var filter_original_ids = searchFields.COMPATIBLE_DATAPROVIDER_FIELDS;
+ var value_names = [
+
+ [
+ "Institutional Repository", "Thematic Repository", "Publication Repository",
+ "Institutional Repository Aggregator",
+ "Thematic Repository Aggregator", "Publication Repository Aggregator",
+ "Data Repository", "Data Repository Aggregator", "CRIS System", "Publication Catalogue",
+ "Software Repository", "Software Repository Aggregator"],
+ ["OpenAIRE Basic (DRIVER OA)", "OpenAIRE 2.0 (EC funding)", "OpenAIRE 2.0+ (DRIVER OA, EC funding)", "OpenAIRE 3.0 (OA, funding)", "OpenAIRE Data (funded, referenced datasets)", "OpenAIRE CRIS v1.1",
+ "collected from a compatible aggregator", "proprietary", "under validation"]];
+
+ var value_original_ids = [
+ ["pubsrepository::institutional", "pubsrepository::thematic", "pubsrepository::unknown", "aggregator::pubsrepository::institutional", "aggregator::pubsrepository::thematic", "aggregator::pubsrepository::unknown",
+ "datarepository::unknown", "aggregator::datarepository", "crissystem", "pubscatalogue::unknown", "softwarerepository", "aggregator::softwarerepository"],
+ //["driver","openaire2.0", "driver-openaire2.0", "openaire3.0","openaire2.0_data"]
+ ["OpenAIRE Basic (DRIVER OA)", "OpenAIRE 2.0 (EC funding)", "OpenAIRE 2.0+ (DRIVER OA, EC funding)", "OpenAIRE 3.0 (OA, funding)", "OpenAIRE Data (funded, referenced datasets)", "OpenAIRE CRIS v1.1",
+ "collected from a compatible aggregator", "proprietary", "under validation"]];
+ var filters: Filter[] = [];
+ for (var i = 0; i < filter_names.length; i++) {
+ var values: Value[] = [];
+ for (var j = 0; j < value_names[i].length; j++) {
+ var value: Value = {name: value_names[i][j], id: value_original_ids[i][j], number: 0, selected: false}
+ values.push(value);
+ }
+ var filter: Filter = {
+ title: filter_names[i],
+ filterId: filter_ids[i],
+ originalFilterId: filter_original_ids[i],
+ values: values,
+ countSelectedValues: 0,
+ "filterOperator": 'or',
+ valueIsExact: true,
+ filterType: "checkbox"
+ };
+ filters.push(filter);
+ }
+ return filters;
+ }
+
+ private static createRegistriesFilters(): Filter[] {
+ var filter_names = ["Type", "Compatibility Level"];
+ var filter_ids = ["datasourcetypename", "datasourcecompatibilityname"];
+ var searchFields = new SearchFields();
+ var filter_original_ids = searchFields.ENTITY_REGISTRIES_FIELDS;
+ var value_names = [
+ ["Funder", "Registry of repositories", "Scholarly Comm. Infrastructure", "Registry", "Information Space", "Web Source"],
+
+ ["OpenAIRE Basic (DRIVER OA)", "OpenAIRE 2.0 (EC funding)", "OpenAIRE 2.0+ (DRIVER OA, EC funding)", "OpenAIRE 3.0 (OA, funding)", "OpenAIRE Data (funded, referenced datasets)",
+ "collected from a compatible aggregator", "proprietary", "under validation"]];
+
+ var value_original_ids = [
+ ["Funder database", "Registry of repositories", "Scholarly Comm. Infrastructure", "Registry", "Information Space", "Web Source"],
+ //["entityregistry::projects","entityregistry::repositories","scholarcomminfra","entityregistry","infospace","websource"],
+ //["driver","openaire2.0", "driver-openaire2.0", "openaire3.0","openaire2.0_data"]
+ ["OpenAIRE Basic (DRIVER OA)", "OpenAIRE 2.0 (EC funding)", "OpenAIRE 2.0+ (DRIVER OA, EC funding)", "OpenAIRE 3.0 (OA, funding)", "OpenAIRE Data (funded, referenced datasets)",
+ "collected from a compatible aggregator", "proprietary", "under validation"]];
+
+ var filters: Filter[] = [];
+ for (var i = 0; i < filter_names.length; i++) {
+ var values: Value[] = [];
+ for (var j = 0; j < value_names[i].length; j++) {
+ var value: Value = {name: value_names[i][j], id: value_original_ids[i][j], number: 0, selected: false}
+ values.push(value);
+ }
+ var filter: Filter = {
+ title: filter_names[i],
+ filterId: filter_ids[i],
+ originalFilterId: filter_original_ids[i],
+ values: values,
+ countSelectedValues: 0,
+ "filterOperator": 'or',
+ valueIsExact: true,
+ filterType: "checkbox"
+ };
+ filters.push(filter);
+ }
+ return filters;
+ }
+
+
+ private static createJournalFilters():Filter[] {
+ var filter_names=["Type","Compatibility Level"];
+ var filter_ids=["datasourcetypeuiid","datasourcecompatibilityname"];
+ var searchFields = new SearchFields();
+ var filter_original_ids = searchFields.JOURNAL_FIELDS;
+ var value_names=[
+ /*[
+ "Institutional Publication Repository","Thematic Publication Repository", "Other Publication Repository",
+ "Institutional Repositories Aggregators",
+ "Thematic Repositories Aggregators", "Other Repositories Aggregators",
+ "Data Repositories", "Data Repositories Aggregators", "Journals", "Journals Aggregators", "CRIS Systems", "Publication Catalogues"],
+ */
+ ["Journal", "Journal Aggregator\/Publisher"],
+ ["OpenAIRE Basic (DRIVER OA)","OpenAIRE 2.0 (EC funding)", "OpenAIRE 2.0+ (DRIVER OA, EC funding)", "OpenAIRE 3.0 (OA, funding)","OpenAIRE Data (funded, referenced datasets)",
+ "collected from a compatible aggregator", "proprietary", "under validation"]];
+
+ var value_original_ids=[
+ ["pubsrepository::journal", "aggregator::pubsrepository::journals"],
+ //["driver","openaire2.0", "driver-openaire2.0", "openaire3.0","openaire2.0_data"]
+ ["OpenAIRE Basic (DRIVER OA)","OpenAIRE 2.0 (EC funding)", "OpenAIRE 2.0+ (DRIVER OA, EC funding)", "OpenAIRE 3.0 (OA, funding)","OpenAIRE Data (funded, referenced datasets)",
+ "collected from a compatible aggregator", "proprietary", "under validation"]];
+ var filters: Filter[] =[];
+ for(var i =0 ; i < filter_names.length;i++){
+ var values:Value[] = [];
+ for(var j =0 ; j < value_names[i].length;j++){
+ var value:Value = {name: value_names[i][j], id: value_original_ids[i][j], number:0, selected:false}
+ values.push(value);
+ }
+ var filter:Filter = {title: filter_names[i], filterId: filter_ids[i], originalFilterId: filter_original_ids[i], values : values, countSelectedValues:0, "filterOperator": 'or', valueIsExact: true, filterType: "checkbox" };
+ filters.push(filter);
+ }
+ return filters;
+ }
+
+
+}
diff --git a/searchPages/searchUtils/newSearchPage.component.html b/searchPages/searchUtils/newSearchPage.component.html
index 34519fc9..4760383e 100644
--- a/searchPages/searchUtils/newSearchPage.component.html
+++ b/searchPages/searchUtils/newSearchPage.component.html
@@ -18,7 +18,8 @@
[advancedSearchLinkParameters]
="this.routerHelper.createQueryParams(this.parameterNames, this.parameterValues)"
[pageTitle]=pageTitle [simpleView]="simpleView" [formPlaceholderText]="formPlaceholderText"
- [resultTypes]="resultTypes" [quickFilter]="quickFilter"
+ [resultTypes]="resultTypes" [quickFilter]="quickFilter" [entitiesSelection]="entitiesSelection"
+ [showAdvancedSearchLink]="showAdvancedSearchLink"
>
diff --git a/searchPages/searchUtils/newSearchPage.component.ts b/searchPages/searchUtils/newSearchPage.component.ts
index c1b85d02..7de228f8 100644
--- a/searchPages/searchUtils/newSearchPage.component.ts
+++ b/searchPages/searchUtils/newSearchPage.component.ts
@@ -86,6 +86,7 @@ export class NewSearchPageComponent {
url = null;
@Input() entitiesSelection:boolean = true;
+ @Input() showAdvancedSearchLink:boolean = true;
constructor(private route: ActivatedRoute,
private location: Location,
private _meta: Meta,
@@ -617,13 +618,16 @@ export class NewSearchPageComponent {
} else {
//Remove quotes from keyword search
// params += (countParams == 0 ? "" : this.selectedFields[i].operatorId) + " " + '"' + StringUtils.URIEncode(this.selectedFields[i].value) + '"' + " ";
- params += (countParams == 0 ? "" : this.selectedFields[i].operatorId) + " " + StringUtils.URIEncode(this.selectedFields[i].value) + " ";
+ // params += (countParams == 0 ? "" : this.selectedFields[i].operatorId) + " " + StringUtils.URIEncode(this.selectedFields[i].value) + " ";
+ params += this.createQuotedKeywordQuery(this.selectedFields[i],countParams,true);
}
// params += (countParams == 0 ? "" : this.selectedFields[i].operatorId) + " " + '"' + StringUtils.URIEncode(this.selectedFields[i].value) + '"' + " ";
- } else if (countParams == 0 && this.selectedFields[i].operatorId == "not") {
+ } else if (countParams == 0 && this.selectedFields[i].operatorId == "not" && this.fieldIdsMap[this.selectedFields[i].id].equalityOperator != "=") {
params += " " + this.selectedFields[i].id + " <> " + '"' + StringUtils.URIEncode(this.selectedFields[i].value) + '"' + " ";
- } else {
- params += (countParams == 0 ? "" : this.selectedFields[i].operatorId + " ") + this.selectedFields[i].id + this.fieldIdsMap[this.selectedFields[i].id].equalityOperator + '"' + encodeURIComponent(this.selectedFields[i].value) + '"' + " ";
+ } else if(this.fieldIdsMap[this.selectedFields[i].id].equalityOperator == "=") {
+ params+=this.createQuotedKeywordQuery(this.selectedFields[i], countParams, false);
+ }else{
+ params += (countParams == 0 ? "" : this.selectedFields[i].operatorId + " ") + this.selectedFields[i].id + this.fieldIdsMap[this.selectedFields[i].id].equalityOperator + '"' + encodeURIComponent(this.selectedFields[i].value) + '"' + " ";
}
}
@@ -634,9 +638,66 @@ export class NewSearchPageComponent {
if (this.customFilter) {
params += (countParams == 0 ? "" : " and ") + this.customFilter.queryFieldName + " exact " + StringUtils.quote((this.customFilter.valueId));
}
+ console.log("ParameterS:")
+ console.log(params)
return params;
}
+ createQuotedKeywordQuery(field:AdvancedField, countParams:number, isSearchAll:boolean){
+ console.log(field)
+ let params = "";
+ let quotedParts = (field.value)?field.value.match(/(["'])(.*?)*?\1/g):[];
+ console.log(quotedParts)
+ params+= (countParams == 0 ? "" : field.operatorId) + " (";
+ if(quotedParts && quotedParts.length == 1 && quotedParts[0] == field.value ){
+ params+=this.getQuotedQueryPart(field.id, field.value,isSearchAll);
+ }else if( quotedParts && quotedParts.length > 0){
+ for(let i=0; i< quotedParts.length; i++){
+ params+=(i>0)?" and ":"";
+ params+=this.getQuotedQueryPart(field.id, quotedParts[i],isSearchAll);
+ }
+ let startPoint = 0;
+ let endPoint = 0;
+ for(let i=0; i< quotedParts.length; i++){
+ let index = field.value.indexOf(quotedParts[i]);
+ endPoint = (i+1
0) {
+ params += " and " + this.getNoQuotedQueryPart(field.id, field.value.substring(startPoint, endPoint), isSearchAll);
+ }
+ // console.log("For "+i+" " +params+" SP "+ startPoint+" EP: "+endPoint);
+ // startPoint = (i+1 0){
+ params+=" and " + this.getNoQuotedQueryPart(field.id, field.value.substring(startPoint,field.value.length),isSearchAll);
+ }
+ }else{
+ params+=this.getNoQuotedQueryPart(field.id, field.value,isSearchAll);
+ }
+ params += " )";
+ return params;
+ }
+
+ private getQuotedQueryPart(fieldId:string, value:string, isSearchAll:boolean){
+ return " ("+(isSearchAll?"__all":fieldId)+" exact "+StringUtils.URIEncode(value)+")";
+ }
+ private getNoQuotedQueryPart(fieldId:string, value:string, isSearchAll:boolean){
+ if(isSearchAll){
+ return " (" + value + ")"
+ }else{
+ return " ("+fieldId+"="+ StringUtils.URIEncode(value)+")";
+ }
+ }
+
/**
* Create Search API query based on the filters of refine fields
* @param URLparams
@@ -848,14 +909,7 @@ export class NewSearchPageComponent {
* @param rangeFilters defined by the URL parameters
* @param includePage
*/
-//<<<<<<< .mine
buildPageURLParameters(filters:Filter[], rangeFilters: RangeFilter[], includePage: boolean) {
- //console.log("buildPageURLParameters");
-// ||||||| .r58066
-// buildPageURLParameters(filters:Filter[],includePage: boolean) {
-// =======
-// buildPageURLParameters(filters: Filter[], includePage: boolean) {
-// >>>>>>> .r58095
this.parameterNames.splice(0, this.parameterNames.length);
this.parameterValues.splice(0, this.parameterValues.length);
var fields: { [key: string]: { values: string[], operators: string[] } } = {};
@@ -1160,7 +1214,6 @@ export class NewSearchPageComponent {
* @param customFilter
* @param params
*/
-//<<<<<<< .mine
prepareSearchPage(fieldIds, selectedFields, refineFields, rangeFields, fieldIdsMap, customFilter, params, entityType, quickFilter=null){
//console.log("prepareSearchPage");
this.entityType = entityType;
@@ -1174,26 +1227,5 @@ export class NewSearchPageComponent {
this.getRangeFiltersFromURL(params);
this.getRefineFiltersFromURL(params);
this.createAdvancedSearchSelectedFiltersFromURLParameters(params);
-// ||||||| .r58066
-// prepareSearchPage(fieldIds, selectedFields, refineFields,fieldIdsMap, customFilter, params){
-// this.fieldIds = fieldIds;
-// this.selectedFields = selectedFields;
-// this.refineFields = refineFields;
-// this.fieldIdsMap = fieldIdsMap;
-// this.customFilter = customFilter;
-// this.getRefineFiltersFromURL(params);
-// this.createAdvancedSearchSelectedFiltersFromURLParameters(params);
-// =======
-// prepareSearchPage(fieldIds, selectedFields, refineFields, fieldIdsMap, customFilter, params, entityType, quickFilter=null) {
-// this.entityType = entityType;
-// this.fieldIds = fieldIds;
-// this.selectedFields = selectedFields;
-// this.refineFields = refineFields;
-// this.fieldIdsMap = fieldIdsMap;
-// this.customFilter = customFilter;
-// this.quickFilter = quickFilter;
-// this.getRefineFiltersFromURL(params);
-// this.createAdvancedSearchSelectedFiltersFromURLParameters(params);
}
-//>>>>>>> .r58095
}
diff --git a/sharedComponents/schema2jsonld/service/open-aire-jsonld-converter.service.ts b/sharedComponents/schema2jsonld/service/open-aire-jsonld-converter.service.ts
index a8c40c79..2870ff27 100644
--- a/sharedComponents/schema2jsonld/service/open-aire-jsonld-converter.service.ts
+++ b/sharedComponents/schema2jsonld/service/open-aire-jsonld-converter.service.ts
@@ -152,7 +152,8 @@ convertDatasource(datasource: any, URL, otherUrl): Organization {
private getDescription(result: any): String[] {
const item = _.get(result, "result.metadata.oaf:entity.oaf:result.description", null);
if (!item) return null;
- return [(item.substring(0,4997)+(item.substring(0,4997).length == 4997?'...':'')) as String];
+ let descr = Array.isArray(item) ? item[0]:item;
+ return [(descr.substring(0,4997)+(descr.substring(0,4997).length == 4997?'...':'')) as String];
}
private getDateCreated(result: any): String[] {
diff --git a/utils/entitiesAutoComplete/entitiesAutoComplete.component.ts b/utils/entitiesAutoComplete/entitiesAutoComplete.component.ts
index 1d3dc21b..a58e31c6 100644
--- a/utils/entitiesAutoComplete/entitiesAutoComplete.component.ts
+++ b/utils/entitiesAutoComplete/entitiesAutoComplete.component.ts
@@ -26,7 +26,7 @@ import{EnvProperties} from '../properties/env-properties';