Project

General

Profile

« Previous | Next » 

Revision 59124

Added by Konstantina Galouni almost 4 years ago

[Trunk | Library]:
1. parsingFunctions.class.ts: [ticket #3796] When hostedby name is "Unknown repository" or "other resources" show part or url as name.
2. organization.service.ts & searchOrganizations.service.ts: [ticket #5753] Compatibility limitation in landing page removed | Compatibility "openaire-cris_1.1" added in search organizations.

View differences:

organization.service.ts
17 17 
    organizationInfo: OrganizationInfo;
18 18 

  		




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


  		




  20
  
  
    
         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=openaire4.0 or reldatasourcecompatibilityid=openaire2.0_data or reldatasourcecompatibilityid=hostedBy or relprojectid=*  or reldatasourcecompatibilityid = native)) and ( objIdentifier ='+id+')';


  		




  
  20
  
    
         let url = properties.searchAPIURLLAst+'organizations/'+id+'?format=json';


  		




  
  21
  
    
           //'&query=( (oaftype exact organization) and (reldatasourcecompatibilityid=driver or reldatasourcecompatibilityid=driver-openaire2.0 or reldatasourcecompatibilityid=openaire2.0 or reldatasourcecompatibilityid=openaire3.0 or reldatasourcecompatibilityid=openaire4.0 or reldatasourcecompatibilityid=openaire2.0_data or reldatasourcecompatibilityid=hostedBy or relprojectid=*  or reldatasourcecompatibilityid = native)) and ( objIdentifier ='+id+')';


  		




  21
  22
  
    

  		




  22
  23
  
    
        return this.http.get((properties.useCache)? (properties.cacheUrl +encodeURIComponent(url)): url)


  		




  23
  24
  
    
                    //.map(res => <any> res.json())


  		




  24
  
  
    
                    .pipe(map(res => res['results'][0]))


  		




  25
  
  
    
                    //.map(res => res[0]['result']['metadata']['oaf:entity']['oaf:organization'])


  		




  
  25
  
    
                    //.pipe(map(res => res['results']))


  		




  
  26
  
    
                    //.pipe(map(res => res['result']['metadata']['oaf:entity']['oaf:organization']))


  		




  26
  27
  
    
                    //.map(res => [res, res['rels']['rel']])


  		




  27
  28
  
    
                    .pipe(map(res => this.parseOrganizationInfo(res)));


  		




  28
  29
  
    

  		












Also available in:  Unified diff