Fix issue #3985: add url encoding in "q" parameter

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@53593 d315682c-612b-4755-9ff5-7f18f6832af3

services/searchDataproviders.service.ts

@@ -423,7 +423,7 @@ export class SearchDataprovidersService {
     numOfSearchDataproviders(params: string, properties:EnvProperties):any {
         let url: string = properties.searchAPIURLLAst+"datasources/count?format=json";
         if(params != "") {
-          url += "&q=" + params;
+          url += "&q=" + StringUtils.URIEncode(params);
         }
 
         return this.numOfDataproviders(url, properties);

services/searchDatasets.service.ts

@@ -6,7 +6,7 @@ import {RefineResultsUtils} from './servicesUtils/refineResults.class';
 import 'rxjs/add/observable/of';
 import 'rxjs/add/operator/do';
 import 'rxjs/add/operator/share';
-
+import {StringUtils} from '../utils/string-utils.class';
 import { ParsingFunctions } from '../landingPages/landing-utils/parsingFunctions.class';
 import{EnvProperties} from '../utils/properties/env-properties';
 
@@ -354,7 +354,7 @@ export class SearchDatasetsService {
     numOfSearchDatasets(params: string, properties:EnvProperties):any {
         let url = properties.searchAPIURLLAst+"datasets/count?format=json";
         if(params != "") {
-          url += "&q=" + params;
+          url += "&q=" + StringUtils.URIEncode(params);
         }
         return this.numOfDatasets(url, properties);
     }

services/searchOrganizations.service.ts

@@ -7,6 +7,7 @@ import 'rxjs/add/operator/share';
 import {SearchResult}     from '../utils/entities/searchResult';
 import {RefineResultsUtils} from './servicesUtils/refineResults.class';
 import{EnvProperties} from '../utils/properties/env-properties';
+import {StringUtils} from '../utils/string-utils.class';
 
 @Injectable()
 export class SearchOrganizationsService {
@@ -183,7 +184,7 @@ export class SearchOrganizationsService {
     numOfSearchOrganizations(params: string, properties:EnvProperties ):any {
         let url = properties.searchAPIURLLAst+"organizations/count?format=json";
         if(params != "") {
-          url += "&q=" + params;
+          url += "&q=" + StringUtils.URIEncode(params);
         }
         return this.numOfOrganizations(url, properties);
     }

services/searchOrps.service.ts

@@ -6,7 +6,7 @@ import {RefineResultsUtils} from './servicesUtils/refineResults.class';
 import 'rxjs/add/observable/of';
 import 'rxjs/add/operator/do';
 import 'rxjs/add/operator/share';
-
+import {StringUtils} from '../utils/string-utils.class';
 import { ParsingFunctions } from '../landingPages/landing-utils/parsingFunctions.class';
 import{EnvProperties} from '../utils/properties/env-properties';
 
@@ -359,7 +359,7 @@ export class SearchOrpsService {
         let url = properties.searchAPIURLLAst+"other/count?format=json";
 
         if(params != "") {
-          url += "&q=" + params;
+          url += "&q=" + StringUtils.URIEncode(params);
         }
         return this.numOfOrps(url, properties);
     }

services/searchProjects.service.ts

@@ -7,7 +7,7 @@ import 'rxjs/add/operator/share';
 import {SearchResult}     from '../utils/entities/searchResult';
 import {RefineResultsUtils} from './servicesUtils/refineResults.class';
 import{EnvProperties} from '../utils/properties/env-properties';
-
+import {StringUtils} from '../utils/string-utils.class';
 @Injectable()
 export class SearchProjectsService {
     private sizeOfDescription: number = 270;
@@ -243,7 +243,7 @@ export class SearchProjectsService {
     numOfSearchProjects(params: string, properties:EnvProperties ):any {
         let url = properties.searchAPIURLLAst+"projects/count?format=json";
         if(params != "") {
-          url += "&q=" + params;
+          url += "&q=" + StringUtils.URIEncode(params);
         }
         return this.numOfProjects(url, properties);
     }

services/searchPublications.service.ts

@@ -7,7 +7,7 @@ import 'rxjs/add/operator/share';
 
 import {SearchResult}     from '../utils/entities/searchResult';
 import {RefineResultsUtils} from './servicesUtils/refineResults.class';
-
+import {StringUtils} from '../utils/string-utils.class';
 import { ParsingFunctions } from '../landingPages/landing-utils/parsingFunctions.class';
 import{EnvProperties} from '../utils/properties/env-properties';
 
@@ -468,7 +468,7 @@ export class SearchPublicationsService {
     numOfSearchPublications(params: string, properties:EnvProperties):any {
         let url = properties.searchAPIURLLAst+"publications/count?format=json";
         if(params != "") {
-          url += "&q=" + params;
+          url += "&q=" + StringUtils.URIEncode(params);
         }
         return this.numOfPublications(url, properties);
     }

services/searchSoftware.service.ts

@@ -8,7 +8,7 @@ import 'rxjs/add/operator/do';
 import 'rxjs/add/operator/share';
 import { ParsingFunctions } from '../landingPages/landing-utils/parsingFunctions.class';
 import{EnvProperties} from '../utils/properties/env-properties';
-
+import {StringUtils} from '../utils/string-utils.class';
 @Injectable()
 export class SearchSoftwareService {
     private sizeOfDescription: number = 270;
@@ -369,7 +369,7 @@ export class SearchSoftwareService {
     numOfSearchSoftware(params: string, properties:EnvProperties):any {
         let url = properties.searchAPIURLLAst+"software/count?format=json";
         if(params != "") {
-          url += "&q=" + params;
+          url += "&q=" + StringUtils.URIEncode(params);
         }
         return this.numOfSoftware(url, properties);
     }

utils/fetchEntitiesClasses/fetchDataproviders.class.ts

@@ -2,7 +2,7 @@ import {SearchDataprovidersService} from '../../services/searchDataproviders.ser
 import { ErrorCodes} from '../../utils/properties/errorCodes';
 import {SearchUtilsClass } from '../../searchPages/searchUtils/searchUtils.class';
 import{EnvProperties} from '../../utils/properties/env-properties';
-
+import {StringUtils} from '../../utils/string-utils.class';
 export class FetchDataproviders {
   private errorCodes: ErrorCodes;
 
@@ -34,7 +34,7 @@ export class FetchDataproviders {
   public getResultsByKeyword(keyword:string, page: number, size: number, properties:EnvProperties){
     var parameters = "";
     if(keyword.length > 0){
-      parameters = "q=" + keyword;
+      parameters = "q=" + StringUtils.URIEncode(keyword);
     }
 
     //var errorCodes:ErrorCodes = new ErrorCodes();

utils/fetchEntitiesClasses/fetchDatasets.class.ts

@@ -4,7 +4,7 @@ import {SearchUtilsClass } from '../../searchPages/searchUtils/searchUtils.class
 import {DOI} from '../../utils/string-utils.class';
 import {Subject} from 'rxjs/Subject';
 import{EnvProperties} from '../../utils/properties/env-properties';
-
+import {StringUtils} from '../../utils/string-utils.class';
 export class FetchDatasets{
   private errorCodes: ErrorCodes;
 
@@ -49,7 +49,7 @@ export class FetchDatasets{
       if(doisParams.length > 0){
         parameters += "&"+doisParams;
       }else{
-        parameters = "q=" + keyword;
+        parameters = "q=" + StringUtils.URIEncode(keyword);
       }
     }
 

utils/fetchEntitiesClasses/fetchOrganizations.class.ts

@@ -2,7 +2,7 @@
  import { ErrorCodes} from '../../utils/properties/errorCodes';
  import {SearchUtilsClass } from '../../searchPages/searchUtils/searchUtils.class';
  import{EnvProperties} from '../../utils/properties/env-properties';
-
+import {StringUtils} from '../../utils/string-utils.class';
 export class FetchOrganizations {
   private errorCodes: ErrorCodes;
 
@@ -35,7 +35,7 @@ export class FetchOrganizations {
     public getResultsByKeyword(keyword:string , page: number, size: number, properties:EnvProperties){
       var parameters = "";
       if(keyword.length > 0){
-        parameters = "q=" + keyword;
+        parameters = "q=" + StringUtils.URIEncode(keyword);
       }
 
       //var errorCodes:ErrorCodes = new ErrorCodes();

utils/fetchEntitiesClasses/fetchOrps.class.ts

@@ -4,6 +4,7 @@ import {SearchUtilsClass } from '../../searchPages/searchUtils/searchUtils.class
 import {DOI} from '../../utils/string-utils.class';
 import {Subject} from 'rxjs/Subject';
 import{EnvProperties} from '../../utils/properties/env-properties';
+import {StringUtils} from '../../utils/string-utils.class';
 
 export class FetchOrps{
   private errorCodes: ErrorCodes;
@@ -50,7 +51,7 @@ export class FetchOrps{
       if(doisParams.length > 0){
         parameters += "&"+doisParams;
       }else{
-        parameters = "q=" + keyword;
+        parameters = "q=" + StringUtils.URIEncode(keyword);
       }
     }
 

utils/fetchEntitiesClasses/fetchProjects.class.ts

@@ -2,7 +2,7 @@ import {SearchProjectsService} from '../../services/searchProjects.service';
 import {ErrorCodes} from '../../utils/properties/errorCodes';
 import {SearchUtilsClass } from '../../searchPages/searchUtils/searchUtils.class';
 import{EnvProperties} from '../../utils/properties/env-properties';
-
+import {StringUtils} from '../../utils/string-utils.class';
 export class FetchProjects{
   private errorCodes: ErrorCodes;
 
@@ -34,7 +34,7 @@ export class FetchProjects{
   public getResultsByKeyword(keyword:string,  page: number, size: number, properties:EnvProperties){
     var parameters = "";
     if(keyword.length > 0){
-      parameters = "q=" + keyword;
+      parameters = "q=" + StringUtils.URIEncode(keyword);
     }
 
     //var errorCodes:ErrorCodes = new ErrorCodes();

utils/fetchEntitiesClasses/fetchPublications.class.ts

@@ -6,7 +6,7 @@ import {SearchFields, FieldDetails} from '../../utils/properties/searchFields';
 import {DOI} from '../../utils/string-utils.class';
 import {Subject} from 'rxjs/Subject';
 import{EnvProperties} from '../../utils/properties/env-properties';
-
+import {StringUtils} from '../../utils/string-utils.class';
 export class FetchPublications {
   private errorCodes: ErrorCodes;
 
@@ -61,7 +61,7 @@ export class FetchPublications {
       if(doisParams.length > 0){
         parameters +=  "&"+doisParams;
       }else{
-        parameters = "q=" + keyword;
+        parameters = "q=" + StringUtils.URIEncode(keyword);
       }
     }
 

utils/fetchEntitiesClasses/fetchSoftware.class.ts

@@ -4,6 +4,7 @@ import {SearchUtilsClass } from '../../searchPages/searchUtils/searchUtils.class
 import {DOI} from '../../utils/string-utils.class';
 import {Subject} from 'rxjs/Subject';
 import{EnvProperties} from '../../utils/properties/env-properties';
+import {StringUtils} from '../../utils/string-utils.class';
 
 export class FetchSoftware{
   private errorCodes: ErrorCodes;
@@ -49,7 +50,7 @@ export class FetchSoftware{
       if(doisParams.length > 0){
         parameters += "&"+doisParams;
       }else{
-        parameters = "q=" + keyword;
+        parameters = "q=" + StringUtils.URIEncode(keyword);
       }
     }