Project

General

Profile

« Previous | Next » 

Revision 52016

Added by Argiro Kokogiannaki about 6 years ago

Change organization query for datasources with native compatibility #3577

View differences:

modules/uoa-services-library/trunk/ng-openaire-library/src/app/services/organization.service.ts
16 16 

  		




  17
  17
  
    
    getOrganizationInfo (id: string, properties:EnvProperties):any {


  		




  18
  18
  
    
        console.info("getOrganizationInfo in service");


  		




  19
  
  
    
         let url = properties.searchAPIURLLAst+'resources?format=json&query=( (oaftype exact organization) and (reldatasourcecompatibilityid=driver or reldatasourcecompatibilityid=driver-openaire2.0 or reldatasourcecompatibilityid=openaire2.0 or reldatasourcecompatibilityid=openaire3.0 or reldatasourcecompatibilityid=openaire2.0_data or reldatasourcecompatibilityid=hostedBy or relprojectid=*)) and ( objIdentifier ='+id+')';


  		




  
  19
  
    
         let url = properties.searchAPIURLLAst+'resources?format=json&query=( (oaftype exact organization) and (reldatasourcecompatibilityid=driver or reldatasourcecompatibilityid=driver-openaire2.0 or reldatasourcecompatibilityid=openaire2.0 or reldatasourcecompatibilityid=openaire3.0 or reldatasourcecompatibilityid=openaire2.0_data or reldatasourcecompatibilityid=hostedBy or relprojectid=*  or reldatasourcecompatibilityid = native)) and ( objIdentifier ='+id+')';


  		




  20
  20
  
    
        //let url = "http://beta.services.openaire.eu:8480/search/rest/v2/api/resources?format=json&query=(%20(oaftype%20exact%20organization)%20and%20(reldatasourcecompatibilityid=driver%20or%20reldatasourcecompatibilityid=driver-openaire2.0%20or%20reldatasourcecompatibilityid=openaire2.0%20or%20reldatasourcecompatibilityid=openaire3.0%20or%20reldatasourcecompatibilityid=openaire2.0_data%20or%20reldatasourcecompatibilityid=hostedBy%20or%20relprojectid=*))%20and%20(%20objIdentifier%20=dedup_wf_001%3A%3Af1e63493def7cedfa5b497cdbea26faa)";


  		




  21
  21
  
    

  		




  22
  22
  
    

  		












  

    
      modules/uoa-services-library/trunk/ng-openaire-library/src/app/utils/entitiesAutoComplete/entitySearch.service.ts
    
  





  47
  47
  
    
        let url = link+"?query=";


  		




  48
  48
  
    
        if(keyword!= null && keyword != ''  ) {


  		




  49
  49
  
    
          url += "((oaftype exact organization and deletedbyinference=false and "+


  		




  50
  
  
    
            "(reldatasourcecompatibilityid=driver or reldatasourcecompatibilityid=driver-openaire2.0 or reldatasourcecompatibilityid=openaire2.0 or reldatasourcecompatibilityid=openaire3.0 or reldatasourcecompatibilityid=openaire2.0_data or reldatasourcecompatibilityid=hostedBy or relprojectid=*))"+


  		




  
  50
  
    
            "(reldatasourcecompatibilityid=driver or reldatasourcecompatibilityid=driver-openaire2.0 or reldatasourcecompatibilityid=openaire2.0 or reldatasourcecompatibilityid=openaire3.0 or reldatasourcecompatibilityid=openaire2.0_data or reldatasourcecompatibilityid=hostedBy or relprojectid=* or reldatasourcecompatibilityid = native))"+


  		




  51
  51
  
    
            " and ((organizationlegalname all "+'"'+keyword+'"'+") or (organizationlegalshortname all "+'"'+keyword+'"'+")) " +


  		




  52
  52
  
    
            // "and " + this.quote(params) + " " +


  		




  53
  53
  
    
            "and (collectedfrom exact "+StringUtils.quote(StringUtils.URIEncode(DepositType))+")) "


  		












Also available in:  Unified diff