Project

General

Profile

« Previous | Next » 

Revision 61005

Added by Antonis Lempesis 5 months ago

adapted mooore queries

View differences:

data-handler.service.ts
771 771
    for (const series of rawData.datasets) {
772 772

  
773 773
      if ((series.series.query.name === 'oso.results.oa_percentage.country')
774
        && series.series.query.parameters && series.series.query.parameters[0] === 'publication'
774
        && series.series.query.parameters && series.series.query.parameters[1] === 'publication'
775 775
        && series.series.result && series.series.result.length > 0 && series.series.result[0].row) {
776 776

  
777 777
        countryPageOverviewData.name = series.series.result[0].row[3];
......
797 797
        countryPageOverviewData.publicationsDeposited = publicationsDepositedIndicator;
798 798

  
799 799
      } else if ((series.series.query.name === 'oso.results.oa_percentage.country')
800
        && series.series.query.parameters && series.series.query.parameters[0] === 'dataset'
800
        && series.series.query.parameters && series.series.query.parameters[1] === 'dataset'
801 801
        && series.series.result && series.series.result.length > 0 && series.series.result[0].row) {
802 802

  
803 803
        countryPageOverviewData.name = series.series.result[0].row[3];
......
886 886
    for (const series of rawData.datasets) {
887 887

  
888 888
      if ((series.series.query.name === 'oso.results.oa_percentage.country')
889
        && series.series.query.parameters && series.series.query.parameters[0] === 'publication'
889
        && series.series.query.parameters && series.series.query.parameters[1] === 'publication'
890 890
        && series.series.result && series.series.result.length > 0 && series.series.result[0].row) {
891 891

  
892 892
        countryPageOverviewData.name = series.series.result[0].row[3];
......
899 899
        countryPageOverviewData.publicationsAffiliated = publicationsAffiliatedIndicator;
900 900

  
901 901
      } else  if ((series.series.query.name === 'oso.results.oa_percentage.country')
902
        && series.series.query.parameters && series.series.query.parameters[0] === 'dataset'
902
        && series.series.query.parameters && series.series.query.parameters[1] === 'dataset'
903 903
        && series.series.result && series.series.result.length > 0 && series.series.result[0].row) {
904 904

  
905 905
        countryPageOverviewData.name = series.series.result[0].row[3];
......
912 912
        countryPageOverviewData.datasetsAffiliated = datasetsAffiliatedIndicator;
913 913

  
914 914
      } else if ((series.series.query.name === 'oso.results.oa_percentage.country')
915
        && series.series.query.parameters && series.series.query.parameters[0] === 'software'
915
        && series.series.query.parameters && series.series.query.parameters[1] === 'software'
916 916
        && series.series.result && series.series.result.length > 0 && series.series.result[0].row) {
917 917

  
918 918
        countryPageOverviewData.name = series.series.result[0].row[3];
......
925 925
        countryPageOverviewData.software = softwareIndicator;
926 926

  
927 927
      } else if ((series.series.query.name === 'oso.results.oa_percentage.country')
928
        && series.series.query.parameters && series.series.query.parameters[0] === 'other'
928
        && series.series.query.parameters && series.series.query.parameters[1] === 'other'
929 929
        && series.series.result && series.series.result.length > 0 && series.series.result[0].row) {
930 930

  
931 931
        countryPageOverviewData.name = series.series.result[0].row[3];

Also available in: Unified diff