Revision 58947
Added by Stefania Martziou almost 4 years ago
| data-handler.service.ts | ||
|---|---|---|
| 771 | 771 |
for (const series of rawData.datasets) {
|
| 772 | 772 |
|
| 773 | 773 |
if ((series.series.query.name === 'new.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[0] === 'publication' |
|
| 775 |
&& series.series.result && series.series.result.length > 0 && series.series.result[0].row) {
|
|
| 775 | 776 |
|
| 776 | 777 |
countryPageOverviewData.name = series.series.result[0].row[3]; |
| 777 | 778 |
countryPageOverviewData.code = series.series.result[0].row[4]; |
| ... | ... | |
| 783 | 784 |
countryPageOverviewData.publicationsAffiliated = publicationsAffiliatedIndicator; |
| 784 | 785 |
|
| 785 | 786 |
} else if ((series.series.query.name === 'new.oso.results.oa_percentage.deposited.country') |
| 786 |
&& series.series.query.parameters && series.series.query.parameters[0] === 'publication') {
|
|
| 787 |
&& series.series.query.parameters && series.series.query.parameters[0] === 'publication' |
|
| 788 |
&& series.series.result && series.series.result.length > 0 && series.series.result[0].row) {
|
|
| 787 | 789 |
|
| 788 | 790 |
countryPageOverviewData.name = series.series.result[0].row[3]; |
| 789 | 791 |
countryPageOverviewData.code = series.series.result[0].row[4]; |
| ... | ... | |
| 795 | 797 |
countryPageOverviewData.publicationsDeposited = publicationsDepositedIndicator; |
| 796 | 798 |
|
| 797 | 799 |
} else if ((series.series.query.name === 'new.oso.results.oa_percentage.country') |
| 798 |
&& series.series.query.parameters && series.series.query.parameters[0] === 'dataset') {
|
|
| 800 |
&& series.series.query.parameters && series.series.query.parameters[0] === 'dataset' |
|
| 801 |
&& series.series.result && series.series.result.length > 0 && series.series.result[0].row) {
|
|
| 799 | 802 |
|
| 800 | 803 |
countryPageOverviewData.name = series.series.result[0].row[3]; |
| 801 | 804 |
countryPageOverviewData.code = series.series.result[0].row[4]; |
| ... | ... | |
| 807 | 810 |
countryPageOverviewData.datasetsAffiliated = datasetsAffiliatedIndicator; |
| 808 | 811 |
|
| 809 | 812 |
} else if ((series.series.query.name === 'new.oso.results.oa_percentage.deposited.country') |
| 810 |
&& series.series.query.parameters && series.series.query.parameters[0] === 'dataset') {
|
|
| 813 |
&& series.series.query.parameters && series.series.query.parameters[0] === 'dataset' |
|
| 814 |
&& series.series.result && series.series.result.length > 0 && series.series.result[0].row) {
|
|
| 811 | 815 |
|
| 812 | 816 |
countryPageOverviewData.name = series.series.result[0].row[3]; |
| 813 | 817 |
countryPageOverviewData.code = series.series.result[0].row[4]; |
| ... | ... | |
| 818 | 822 |
datasetsDepositedIndicator.total = Number(series.series.result[0].row[2]); |
| 819 | 823 |
countryPageOverviewData.datasetsDeposited = datasetsDepositedIndicator; |
| 820 | 824 |
|
| 821 |
} else if (series.series.query.name === 'new.oso.repositories.doar_re3data.validated.country') {
|
|
| 825 |
} else if (series.series.query.name === 'new.oso.repositories.doar_re3data.validated.country' |
|
| 826 |
&& series.series.result && series.series.result.length > 0 && series.series.result[0].row) {
|
|
| 822 | 827 |
|
| 823 | 828 |
countryPageOverviewData.name = series.series.result[0].row[3]; |
| 824 | 829 |
countryPageOverviewData.code = series.series.result[0].row[4]; |
| ... | ... | |
| 829 | 834 |
repositoriesIndicator.total = Number(series.series.result[0].row[2]); |
| 830 | 835 |
countryPageOverviewData.repositories = repositoriesIndicator; |
| 831 | 836 |
|
| 832 |
} else if (series.series.query.name === 'new.oso.journals.doaj.validated.country') {
|
|
| 837 |
} else if (series.series.query.name === 'new.oso.journals.doaj.validated.country' |
|
| 838 |
&& series.series.result && series.series.result.length > 0 && series.series.result[0].row) {
|
|
| 833 | 839 |
|
| 834 | 840 |
countryPageOverviewData.name = series.series.result[0].row[3]; |
| 835 | 841 |
countryPageOverviewData.code = series.series.result[0].row[4]; |
| ... | ... | |
| 840 | 846 |
journalsIndicator.total = Number(series.series.result[0].row[2]); |
| 841 | 847 |
countryPageOverviewData.journals = journalsIndicator; |
| 842 | 848 |
|
| 843 |
} else if (series.series.query.name === 'new.oso.oa_policies.country') {
|
|
| 849 |
} else if (series.series.query.name === 'new.oso.oa_policies.country' |
|
| 850 |
&& series.series.result && series.series.result.length > 0 && series.series.result[0].row) {
|
|
| 844 | 851 |
|
| 845 | 852 |
countryPageOverviewData.policies = Number(series.series.result[0].row[0]); |
| 846 | 853 |
|
| 847 |
} else if (series.series.query.name === 'new.oso.funder.country') {
|
|
| 854 |
} else if (series.series.query.name === 'new.oso.funder.country' |
|
| 855 |
&& series.series.result && series.series.result.length > 0 && series.series.result[0].row) {
|
|
| 848 | 856 |
|
| 849 | 857 |
countryPageOverviewData.funders = Number(series.series.result[0].row[0]); |
| 850 | 858 |
|
| 851 |
} else if (series.series.query.name === 'new.oso.funding_organizations.country') {
|
|
| 859 |
} else if (series.series.query.name === 'new.oso.funding_organizations.country' |
|
| 860 |
&& series.series.result && series.series.result.length > 0 && series.series.result[0].row) {
|
|
| 852 | 861 |
|
| 853 | 862 |
countryPageOverviewData.fundingOrganizations = Number(series.series.result[0].row[0]); |
| 854 | 863 |
|
| 855 |
} else if (series.series.query.name === 'new.oso.ec_funded_organizations.country') {
|
|
| 864 |
} else if (series.series.query.name === 'new.oso.ec_funded_organizations.country' |
|
| 865 |
&& series.series.result && series.series.result.length > 0 && series.series.result[0].row) {
|
|
| 856 | 866 |
|
| 857 | 867 |
countryPageOverviewData.ec_fundedOrganizations = Number(series.series.result[0].row[0]); |
| 858 | 868 |
} |
| ... | ... | |
| 868 | 878 |
for (const series of rawData.datasets) {
|
| 869 | 879 |
|
| 870 | 880 |
if ((series.series.query.name === 'new.oso.results.oa_percentage.country') |
| 871 |
&& series.series.query.parameters && series.series.query.parameters[0] === 'publication') {
|
|
| 881 |
&& series.series.query.parameters && series.series.query.parameters[0] === 'publication' |
|
| 882 |
&& series.series.result && series.series.result.length > 0 && series.series.result[0].row) {
|
|
| 872 | 883 |
|
| 873 | 884 |
countryPageOverviewData.name = series.series.result[0].row[3]; |
| 874 | 885 |
countryPageOverviewData.code = series.series.result[0].row[4]; |
| ... | ... | |
| 880 | 891 |
countryPageOverviewData.publicationsAffiliated = publicationsAffiliatedIndicator; |
| 881 | 892 |
|
| 882 | 893 |
} else if ((series.series.query.name === 'new.oso.results.oa_percentage.country') |
| 883 |
&& series.series.query.parameters && series.series.query.parameters[0] === 'dataset') {
|
|
| 894 |
&& series.series.query.parameters && series.series.query.parameters[0] === 'dataset' |
|
| 895 |
&& series.series.result && series.series.result.length > 0 && series.series.result[0].row) {
|
|
| 884 | 896 |
|
| 885 | 897 |
countryPageOverviewData.name = series.series.result[0].row[3]; |
| 886 | 898 |
countryPageOverviewData.code = series.series.result[0].row[4]; |
| ... | ... | |
| 892 | 904 |
countryPageOverviewData.datasetsAffiliated = datasetsAffiliatedIndicator; |
| 893 | 905 |
|
| 894 | 906 |
} else if ((series.series.query.name === 'new.oso.results.oa_percentage.country') |
| 895 |
&& series.series.query.parameters && series.series.query.parameters[0] === 'software') {
|
|
| 907 |
&& series.series.query.parameters && series.series.query.parameters[0] === 'software' |
|
| 908 |
&& series.series.result && series.series.result.length > 0 && series.series.result[0].row) {
|
|
| 896 | 909 |
|
| 897 | 910 |
countryPageOverviewData.name = series.series.result[0].row[3]; |
| 898 | 911 |
countryPageOverviewData.code = series.series.result[0].row[4]; |
| ... | ... | |
| 904 | 917 |
countryPageOverviewData.software = softwareIndicator; |
| 905 | 918 |
|
| 906 | 919 |
} else if ((series.series.query.name === 'new.oso.results.oa_percentage.country') |
| 907 |
&& series.series.query.parameters && series.series.query.parameters[0] === 'other') {
|
|
| 920 |
&& series.series.query.parameters && series.series.query.parameters[0] === 'other' |
|
| 921 |
&& series.series.result && series.series.result.length > 0 && series.series.result[0].row) {
|
|
| 908 | 922 |
|
| 909 | 923 |
countryPageOverviewData.name = series.series.result[0].row[3]; |
| 910 | 924 |
countryPageOverviewData.code = series.series.result[0].row[4]; |
Also available in: Unified diff
Added some fixes for the country page handling data