Project

General

Profile

« Previous | Next » 

Revision 56059

[Library|Trunk]

Changes for Aggregator portal:
use a customFilter in search pages, and pass it through the components
for landing pages check if a route is available in order to add linking and deposit links

View differences:

fetchSoftware.class.ts
1 1
import {SearchSoftwareService} from '../../services/searchSoftware.service';
2 2
import { ErrorCodes} from '../../utils/properties/errorCodes';
3 3
import {ErrorMessagesComponent}    from '../../utils/errorMessages.component';
4
import {SearchUtilsClass } from '../../searchPages/searchUtils/searchUtils.class';
4
import {SearchCustomFilter, SearchUtilsClass} from '../../searchPages/searchUtils/searchUtils.class';
5 5
import {DOI} from '../../utils/string-utils.class';
6 6
import {Subject} from 'rxjs';
7 7
import{EnvProperties} from '../../utils/properties/env-properties';
......
41 41
  }
42 42

  
43 43

  
44
  public getResultsByKeyword(keyword:string,  page: number, size: number, properties:EnvProperties, connectCommunityId=null){
44
  public getResultsByKeyword(keyword:string,  page: number, size: number, properties:EnvProperties, connectCommunityId=null, customFilter:SearchCustomFilter=null){
45 45
    var parameters = "";
46 46
    if(keyword.length > 0){
47 47
      var DOIs:string[] = DOI.getDOIsFromString(keyword);
......
60 60
    //var errorCodes:ErrorCodes = new ErrorCodes();
61 61
    this.searchUtils.status = this.errorCodes.LOADING;
62 62
    var refineParams = (connectCommunityId)?("&fq="+StringUtils.URIEncode("communityId exact " + StringUtils.quote((connectCommunityId )))):null;
63

  
63
    if(customFilter){
64
      refineParams = (refineParams?(refineParams+'&'):'')+"&fq="+StringUtils.URIEncode(customFilter.queryFieldName + " exact " + StringUtils.quote((customFilter.valueId )));
65
    }
64 66
    this.subResults = this._searchSoftwareService.searchSoftware(parameters,refineParams, page, size, "", [], properties).subscribe(
65 67
        data => {
66 68
            this.searchUtils.totalResults = data[0];

Also available in: Unified diff