Compare commits
40 Commits
develop-hy
...
master
Author | SHA1 | Date |
---|---|---|
Konstantina Galouni | 5f4e40a834 | |
Konstantina Galouni | 7abfb0bb49 | |
Konstantina Galouni | e356b58380 | |
Konstantina Galouni | 7ab767aec8 | |
argirok | 4ca47d7f36 | |
Konstantina Galouni | 974c43b00d | |
Konstantina Galouni | 8c3f17cc20 | |
Konstantina Galouni | 7d986a7028 | |
Konstantina Galouni | 24895a85a2 | |
Konstantina Galouni | a1ec284c63 | |
Konstantina Galouni | 3acffc3d79 | |
Konstantina Galouni | 4fc4182696 | |
Konstantina Galouni | 2754736693 | |
Konstantina Galouni | b059b300ba | |
Konstantina Galouni | d05209a54c | |
Konstantina Galouni | dbdb929a8f | |
Konstantina Galouni | 58770771ca | |
Konstantina Galouni | 2a4b92ba00 | |
Konstantina Galouni | 3d2ad5336b | |
Konstantina Galouni | 60de7eb2a0 | |
Konstantina Galouni | 9f53423ae3 | |
Konstantina Galouni | 15499aa4ca | |
Konstantina Galouni | b6db196e68 | |
Konstantina Galouni | 4258055e51 | |
Konstantina Galouni | 134c21d6be | |
Konstantina Galouni | a5019e083c | |
Konstantina Galouni | ee38203ee4 | |
Konstantina Galouni | 414ff59fd0 | |
Konstantina Galouni | 5408bd9f82 | |
Konstantina Galouni | 278fefb45a | |
Konstantina Galouni | 3562d4f6c6 | |
Konstantina Galouni | b21d7dcd93 | |
Konstantina Galouni | 2adb378467 | |
Konstantina Galouni | c3587bb2c4 | |
Konstantina Galouni | 288e106779 | |
Konstantina Galouni | 11f0f8befb | |
Konstantina Galouni | ab839498a8 | |
Konstantina Galouni | 4aa01517f2 | |
Konstantina Galouni | fb2e542c4d | |
Konstantina Galouni | c676603faa |
|
@ -1 +1 @@
|
||||||
Subproject commit 8d6c45abe39953e70764bca0fb0e5446055d6325
|
Subproject commit f1fd1ef60c5a964e283ced7840876dc5896af9be
|
|
@ -1 +1 @@
|
||||||
Subproject commit 6bc02125166daa907d39ff523cd635088bdb63c2
|
Subproject commit a4d8923b82a59ac1cc41e9c0574f1d64a61c0c1b
|
|
@ -1 +1 @@
|
||||||
Subproject commit b4d09b7cd942893c238d4152eeac1bbc822a0b13
|
Subproject commit 55765bf0829910661a55337e0e7ca7b1262b7298
|
|
@ -131,7 +131,8 @@ app.get('/explore/home', async function (req, res) {
|
||||||
funders: parseNoOfFunders(dataResponses[1].data, dataResponses[4].data),
|
funders: parseNoOfFunders(dataResponses[1].data, dataResponses[4].data),
|
||||||
datasetsInterlinked:dataResponses[5].data.meta.total,
|
datasetsInterlinked:dataResponses[5].data.meta.total,
|
||||||
softwareInterlinked:dataResponses[6].data.meta.total,
|
softwareInterlinked:dataResponses[6].data.meta.total,
|
||||||
success:allRequestsSuccessful
|
success:allRequestsSuccessful,
|
||||||
|
calculated_at: (new Date()).toUTCString()
|
||||||
|
|
||||||
};
|
};
|
||||||
// Send the aggregated data as the response
|
// Send the aggregated data as the response
|
||||||
|
@ -162,7 +163,8 @@ app.get('/explore/search', async function (req, res) {
|
||||||
datasources: dataResponses[1].data.total,
|
datasources: dataResponses[1].data.total,
|
||||||
organizations: dataResponses[2].data.meta.total,
|
organizations: dataResponses[2].data.meta.total,
|
||||||
projects:dataResponses[3].data.total,
|
projects:dataResponses[3].data.total,
|
||||||
success:allRequestsSuccessful
|
success:allRequestsSuccessful,
|
||||||
|
calculated_at: (new Date()).toUTCString()
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -204,7 +206,8 @@ app.get('/portals/countResults', async function (req, res) {
|
||||||
datasets: dataResponses[1].data.total,
|
datasets: dataResponses[1].data.total,
|
||||||
software: dataResponses[2].data.total,
|
software: dataResponses[2].data.total,
|
||||||
other:dataResponses[3].data.total,
|
other:dataResponses[3].data.total,
|
||||||
success:allRequestsSuccessful
|
success:allRequestsSuccessful,
|
||||||
|
calculated_at: (new Date()).toUTCString()
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -357,7 +360,8 @@ app.get('/explore/funders', async function (req, res) {
|
||||||
results: dataResponses[0].data.meta.total,
|
results: dataResponses[0].data.meta.total,
|
||||||
projects: dataResponses[2].data.meta.total,
|
projects: dataResponses[2].data.meta.total,
|
||||||
funders: Array.from(fundersMap.values()),
|
funders: Array.from(fundersMap.values()),
|
||||||
success:allRequestsSuccessful
|
success:allRequestsSuccessful,
|
||||||
|
calculated_at: (new Date()).toUTCString()
|
||||||
|
|
||||||
};
|
};
|
||||||
res.status(allRequestsSuccessful?200:207).json(aggregatedData);
|
res.status(allRequestsSuccessful?200:207).json(aggregatedData);
|
||||||
|
|
Loading…
Reference in New Issue