From 48b16d802334513c2213f88fef006d43a6d0ebd7 Mon Sep 17 00:00:00 2001 From: "michele.artini" Date: Wed, 14 Dec 2022 16:30:15 +0100 Subject: [PATCH] dsm results --- apps/dnet-is-application/pom.xml | 2 +- .../openaire/dsm/DsmAjaxController.java | 6 +- .../eu/dnetlib/openaire/dsm/DsmService.java | 8 +- .../openaire/dsm/domain/SearchApisEntry.java | 154 ++++++++++++++++++ .../dsm/utils/DsmBrowsableFields.java | 19 ++- .../src/main/resources/application.properties | 3 + .../resources/sql/dsm/ui/browseActive.sql | 2 +- .../sql/dsm/ui/browseConsentTermOfUse.sql | 2 +- .../sql/dsm/ui/browseFulltextDownload.sql | 2 +- .../resources/sql/dsm/ui/searchApis.tmpl.sql | 40 +++++ .../resources/sql/dsm/ui/searchByActive.sql | 0 .../sql/dsm/ui/searchByCompliance.sql | 0 .../sql/dsm/ui/searchByConsentTermOfUse.sql | 0 .../resources/sql/dsm/ui/searchByCountry.sql | 0 .../sql/dsm/ui/searchByFulltextDownload.sql | 0 .../resources/sql/dsm/ui/searchByProtocol.sql | 0 .../resources/sql/dsm/ui/searchByType.sql | 0 .../resources/templates/resultsDsApi.html | 56 ++++++- .../static/common/images/flags/-.gif | Bin 0 -> 807 bytes .../static/common/images/flags/AD.gif | Bin 0 -> 947 bytes .../static/common/images/flags/AE.gif | Bin 0 -> 898 bytes .../static/common/images/flags/AF.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/AG.gif | Bin 0 -> 949 bytes .../static/common/images/flags/AI.gif | Bin 0 -> 967 bytes .../static/common/images/flags/AL.gif | Bin 0 -> 1005 bytes .../static/common/images/flags/AM.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/AN.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/AO.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/AQ.gif | Bin 0 -> 990 bytes .../static/common/images/flags/AR.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/AS.gif | Bin 0 -> 1050 bytes .../static/common/images/flags/AT.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/AU.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/AW.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/AX.gif | Bin 0 -> 570 bytes .../static/common/images/flags/AZ.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/BA.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/BB.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/BD.gif | Bin 0 -> 1005 bytes .../static/common/images/flags/BE.gif | Bin 0 -> 1003 bytes .../static/common/images/flags/BF.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/BG.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/BH.gif | Bin 0 -> 998 bytes .../static/common/images/flags/BI.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/BJ.gif | Bin 0 -> 1005 bytes .../static/common/images/flags/BL.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/BM.gif | Bin 0 -> 1000 bytes .../static/common/images/flags/BN.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/BO.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/BQ.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/BR.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/BS.gif | Bin 0 -> 1004 bytes .../static/common/images/flags/BT.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/BV.gif | Bin 0 -> 934 bytes .../static/common/images/flags/BW.gif | Bin 0 -> 999 bytes .../static/common/images/flags/BY.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/BZ.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/CA.gif | Bin 0 -> 1005 bytes .../static/common/images/flags/CC.gif | Bin 0 -> 188 bytes .../static/common/images/flags/CD.gif | Bin 0 -> 908 bytes .../static/common/images/flags/CF.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/CG.gif | Bin 0 -> 1001 bytes .../static/common/images/flags/CH.gif | Bin 0 -> 998 bytes .../static/common/images/flags/CI.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/CK.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/CL.gif | Bin 0 -> 211 bytes .../static/common/images/flags/CM.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/CN.gif | Bin 0 -> 579 bytes .../static/common/images/flags/CO.gif | Bin 0 -> 999 bytes .../static/common/images/flags/CR.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/CS.gif | Bin 0 -> 1005 bytes .../static/common/images/flags/CU.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/CV.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/CW.gif | Bin 0 -> 120 bytes .../static/common/images/flags/CX.gif | Bin 0 -> 328 bytes .../static/common/images/flags/CY.gif | Bin 0 -> 1005 bytes .../static/common/images/flags/CZ.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/DE.gif | Bin 0 -> 1003 bytes .../static/common/images/flags/DJ.gif | Bin 0 -> 915 bytes .../static/common/images/flags/DK.gif | Bin 0 -> 1001 bytes .../static/common/images/flags/DM.gif | Bin 0 -> 960 bytes .../static/common/images/flags/DO.gif | Bin 0 -> 936 bytes .../static/common/images/flags/DZ.gif | Bin 0 -> 1001 bytes .../static/common/images/flags/EC.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/EE.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/EG.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/EH.gif | Bin 0 -> 193 bytes .../static/common/images/flags/ER.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/ES.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/ET.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/EU.gif | Bin 0 -> 900 bytes .../static/common/images/flags/FI.gif | Bin 0 -> 1004 bytes .../static/common/images/flags/FJ.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/FK.gif | Bin 0 -> 926 bytes .../static/common/images/flags/FM.gif | Bin 0 -> 911 bytes .../static/common/images/flags/FO.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/FR.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/GA.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/GB.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/GD.gif | Bin 0 -> 959 bytes .../static/common/images/flags/GE.gif | Bin 0 -> 581 bytes .../static/common/images/flags/GF.gif | Bin 0 -> 322 bytes .../static/common/images/flags/GG.gif | Bin 0 -> 202 bytes .../static/common/images/flags/GH.gif | Bin 0 -> 911 bytes .../static/common/images/flags/GI.gif | Bin 0 -> 1004 bytes .../static/common/images/flags/GL.gif | Bin 0 -> 1003 bytes .../static/common/images/flags/GM.gif | Bin 0 -> 897 bytes .../static/common/images/flags/GN.gif | Bin 0 -> 902 bytes .../static/common/images/flags/GP.gif | Bin 0 -> 997 bytes .../static/common/images/flags/GQ.gif | Bin 0 -> 929 bytes .../static/common/images/flags/GR.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/GS.gif | Bin 0 -> 309 bytes .../static/common/images/flags/GT.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/GU.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/GW.gif | Bin 0 -> 913 bytes .../static/common/images/flags/GY.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/HK.gif | Bin 0 -> 1005 bytes .../static/common/images/flags/HM.gif | Bin 0 -> 937 bytes .../static/common/images/flags/HN.gif | Bin 0 -> 896 bytes .../static/common/images/flags/HR.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/HT.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/HU.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/ID.gif | Bin 0 -> 1005 bytes .../static/common/images/flags/IE.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/IL.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/IM.gif | Bin 0 -> 862 bytes .../static/common/images/flags/IN.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/IO.gif | Bin 0 -> 1070 bytes .../static/common/images/flags/IQ.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/IR.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/IS.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/IT.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/JE.gif | Bin 0 -> 937 bytes .../static/common/images/flags/JM.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/JO.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/JP.gif | Bin 0 -> 596 bytes .../static/common/images/flags/KE.gif | Bin 0 -> 1003 bytes .../static/common/images/flags/KG.gif | Bin 0 -> 1004 bytes .../static/common/images/flags/KH.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/KI.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/KM.gif | Bin 0 -> 940 bytes .../static/common/images/flags/KN.gif | Bin 0 -> 971 bytes .../static/common/images/flags/KO.gif | Bin 0 -> 311 bytes .../static/common/images/flags/KP.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/KR.gif | Bin 0 -> 1004 bytes .../static/common/images/flags/KW.gif | Bin 0 -> 915 bytes .../static/common/images/flags/KY.gif | Bin 0 -> 1005 bytes .../static/common/images/flags/KZ.gif | Bin 0 -> 1004 bytes .../static/common/images/flags/LA.gif | Bin 0 -> 893 bytes .../static/common/images/flags/LB.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/LC.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/LI.gif | Bin 0 -> 897 bytes .../static/common/images/flags/LK.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/LR.gif | Bin 0 -> 917 bytes .../static/common/images/flags/LS.gif | Bin 0 -> 925 bytes .../static/common/images/flags/LT.gif | Bin 0 -> 631 bytes .../static/common/images/flags/LU.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/LV.gif | Bin 0 -> 999 bytes .../static/common/images/flags/LY.gif | Bin 0 -> 576 bytes .../static/common/images/flags/MA.gif | Bin 0 -> 1139 bytes .../static/common/images/flags/MC.gif | Bin 0 -> 1005 bytes .../static/common/images/flags/MD.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/ME.gif | Bin 0 -> 324 bytes .../static/common/images/flags/MF.gif | Bin 0 -> 101 bytes .../static/common/images/flags/MG.gif | Bin 0 -> 1005 bytes .../static/common/images/flags/MH.gif | Bin 0 -> 968 bytes .../static/common/images/flags/MK.gif | Bin 0 -> 971 bytes .../static/common/images/flags/MKD.gif | Bin 0 -> 971 bytes .../static/common/images/flags/ML.gif | Bin 0 -> 902 bytes .../static/common/images/flags/MM.gif | Bin 0 -> 919 bytes .../static/common/images/flags/MN.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/MO.gif | Bin 0 -> 1005 bytes .../static/common/images/flags/MP.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/MQ.gif | Bin 0 -> 961 bytes .../static/common/images/flags/MR.gif | Bin 0 -> 897 bytes .../static/common/images/flags/MS.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/MT.gif | Bin 0 -> 855 bytes .../static/common/images/flags/MU.gif | Bin 0 -> 892 bytes .../static/common/images/flags/MV.gif | Bin 0 -> 914 bytes .../static/common/images/flags/MW.gif | Bin 0 -> 893 bytes .../static/common/images/flags/MX.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/MY.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/MZ.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/NA.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/NC.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/NE.gif | Bin 0 -> 904 bytes .../static/common/images/flags/NF.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/NG.gif | Bin 0 -> 898 bytes .../static/common/images/flags/NI.gif | Bin 0 -> 901 bytes .../static/common/images/flags/NL.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/NO.gif | Bin 0 -> 1004 bytes .../static/common/images/flags/NP.gif | Bin 0 -> 563 bytes .../static/common/images/flags/NR.gif | Bin 0 -> 1003 bytes .../static/common/images/flags/NU.gif | Bin 0 -> 289 bytes .../static/common/images/flags/NZ.gif | Bin 0 -> 1005 bytes .../static/common/images/flags/OC.gif | Bin 0 -> 181 bytes .../static/common/images/flags/OM.gif | Bin 0 -> 1004 bytes .../static/common/images/flags/PA.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/PE.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/PF.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/PG.gif | Bin 0 -> 947 bytes .../static/common/images/flags/PH.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/PK.gif | Bin 0 -> 1004 bytes .../static/common/images/flags/PL.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/PM.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/PN.gif | Bin 0 -> 547 bytes .../static/common/images/flags/PR.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/PS.gif | Bin 0 -> 902 bytes .../static/common/images/flags/PT.gif | Bin 0 -> 1000 bytes .../static/common/images/flags/PW.gif | Bin 0 -> 855 bytes .../static/common/images/flags/PY.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/QA.gif | Bin 0 -> 596 bytes .../static/common/images/flags/RE.gif | Bin 0 -> 863 bytes .../static/common/images/flags/RO.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/RS.gif | Bin 0 -> 535 bytes .../static/common/images/flags/RU.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/RW.gif | Bin 0 -> 929 bytes .../static/common/images/flags/SA.gif | Bin 0 -> 1004 bytes .../static/common/images/flags/SB.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/SC.gif | Bin 0 -> 977 bytes .../static/common/images/flags/SD.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/SE.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/SG.gif | Bin 0 -> 1005 bytes .../static/common/images/flags/SH.gif | Bin 0 -> 511 bytes .../static/common/images/flags/SI.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/SJ.gif | Bin 0 -> 197 bytes .../static/common/images/flags/SK.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/SL.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/SM.gif | Bin 0 -> 871 bytes .../static/common/images/flags/SN.gif | Bin 0 -> 923 bytes .../static/common/images/flags/SO.gif | Bin 0 -> 998 bytes .../static/common/images/flags/SR.gif | Bin 0 -> 842 bytes .../static/common/images/flags/SS.gif | Bin 0 -> 312 bytes .../static/common/images/flags/ST.gif | Bin 0 -> 946 bytes .../static/common/images/flags/SV.gif | Bin 0 -> 901 bytes .../static/common/images/flags/SX.gif | Bin 0 -> 317 bytes .../static/common/images/flags/SY.gif | Bin 0 -> 907 bytes .../static/common/images/flags/SZ.gif | Bin 0 -> 924 bytes .../static/common/images/flags/TC.gif | Bin 0 -> 1004 bytes .../static/common/images/flags/TD.gif | Bin 0 -> 902 bytes .../static/common/images/flags/TF.gif | Bin 0 -> 863 bytes .../static/common/images/flags/TG.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/TH.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/TJ.gif | Bin 0 -> 907 bytes .../static/common/images/flags/TK.gif | Bin 0 -> 543 bytes .../static/common/images/flags/TL.gif | Bin 0 -> 182 bytes .../static/common/images/flags/TM.gif | Bin 0 -> 927 bytes .../static/common/images/flags/TN.gif | Bin 0 -> 1005 bytes .../static/common/images/flags/TO.gif | Bin 0 -> 591 bytes .../static/common/images/flags/TP.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/TR.gif | Bin 0 -> 995 bytes .../static/common/images/flags/TT.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/TV.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/TW.gif | Bin 0 -> 587 bytes .../static/common/images/flags/TZ.gif | Bin 0 -> 1005 bytes .../static/common/images/flags/UA.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/UG.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/UK.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/UM.gif | Bin 0 -> 925 bytes .../static/common/images/flags/UNKNOWN.gif | Bin 0 -> 1145 bytes .../static/common/images/flags/US.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/UY.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/UZ.gif | Bin 0 -> 920 bytes .../static/common/images/flags/VA.gif | Bin 0 -> 1004 bytes .../static/common/images/flags/VC.gif | Bin 0 -> 938 bytes .../static/common/images/flags/VE.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/VG.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/VI.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/VN.gif | Bin 0 -> 999 bytes .../static/common/images/flags/VU.gif | Bin 0 -> 964 bytes .../static/common/images/flags/WF.gif | Bin 0 -> 336 bytes .../static/common/images/flags/WS.gif | Bin 0 -> 994 bytes .../static/common/images/flags/XK.gif | Bin 0 -> 311 bytes .../static/common/images/flags/YE.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/YT.gif | Bin 0 -> 472 bytes .../static/common/images/flags/YU.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/ZA.gif | Bin 0 -> 1006 bytes .../static/common/images/flags/ZM.gif | Bin 0 -> 926 bytes .../static/common/images/flags/ZR.gif | Bin 0 -> 924 bytes .../static/common/images/flags/ZW.gif | Bin 0 -> 1006 bytes libs/dnet-is-common/pom.xml | 2 +- 281 files changed, 273 insertions(+), 23 deletions(-) create mode 100644 apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/SearchApisEntry.java create mode 100644 apps/dnet-is-application/src/main/resources/sql/dsm/ui/searchApis.tmpl.sql delete mode 100644 apps/dnet-is-application/src/main/resources/sql/dsm/ui/searchByActive.sql delete mode 100644 apps/dnet-is-application/src/main/resources/sql/dsm/ui/searchByCompliance.sql delete mode 100644 apps/dnet-is-application/src/main/resources/sql/dsm/ui/searchByConsentTermOfUse.sql delete mode 100644 apps/dnet-is-application/src/main/resources/sql/dsm/ui/searchByCountry.sql delete mode 100644 apps/dnet-is-application/src/main/resources/sql/dsm/ui/searchByFulltextDownload.sql delete mode 100644 apps/dnet-is-application/src/main/resources/sql/dsm/ui/searchByProtocol.sql delete mode 100644 apps/dnet-is-application/src/main/resources/sql/dsm/ui/searchByType.sql create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/-.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/AD.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/AE.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/AF.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/AG.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/AI.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/AL.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/AM.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/AN.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/AO.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/AQ.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/AR.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/AS.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/AT.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/AU.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/AW.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/AX.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/AZ.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/BA.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/BB.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/BD.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/BE.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/BF.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/BG.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/BH.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/BI.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/BJ.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/BL.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/BM.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/BN.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/BO.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/BQ.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/BR.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/BS.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/BT.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/BV.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/BW.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/BY.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/BZ.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/CA.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/CC.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/CD.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/CF.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/CG.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/CH.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/CI.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/CK.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/CL.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/CM.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/CN.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/CO.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/CR.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/CS.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/CU.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/CV.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/CW.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/CX.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/CY.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/CZ.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/DE.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/DJ.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/DK.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/DM.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/DO.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/DZ.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/EC.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/EE.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/EG.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/EH.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/ER.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/ES.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/ET.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/EU.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/FI.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/FJ.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/FK.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/FM.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/FO.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/FR.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/GA.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/GB.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/GD.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/GE.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/GF.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/GG.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/GH.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/GI.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/GL.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/GM.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/GN.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/GP.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/GQ.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/GR.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/GS.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/GT.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/GU.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/GW.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/GY.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/HK.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/HM.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/HN.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/HR.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/HT.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/HU.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/ID.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/IE.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/IL.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/IM.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/IN.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/IO.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/IQ.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/IR.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/IS.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/IT.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/JE.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/JM.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/JO.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/JP.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/KE.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/KG.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/KH.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/KI.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/KM.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/KN.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/KO.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/KP.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/KR.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/KW.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/KY.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/KZ.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/LA.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/LB.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/LC.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/LI.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/LK.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/LR.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/LS.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/LT.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/LU.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/LV.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/LY.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/MA.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/MC.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/MD.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/ME.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/MF.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/MG.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/MH.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/MK.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/MKD.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/ML.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/MM.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/MN.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/MO.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/MP.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/MQ.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/MR.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/MS.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/MT.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/MU.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/MV.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/MW.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/MX.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/MY.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/MZ.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/NA.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/NC.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/NE.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/NF.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/NG.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/NI.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/NL.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/NO.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/NP.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/NR.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/NU.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/NZ.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/OC.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/OM.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/PA.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/PE.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/PF.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/PG.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/PH.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/PK.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/PL.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/PM.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/PN.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/PR.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/PS.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/PT.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/PW.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/PY.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/QA.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/RE.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/RO.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/RS.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/RU.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/RW.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/SA.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/SB.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/SC.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/SD.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/SE.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/SG.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/SH.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/SI.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/SJ.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/SK.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/SL.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/SM.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/SN.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/SO.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/SR.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/SS.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/ST.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/SV.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/SX.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/SY.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/SZ.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/TC.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/TD.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/TF.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/TG.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/TH.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/TJ.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/TK.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/TL.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/TM.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/TN.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/TO.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/TP.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/TR.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/TT.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/TV.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/TW.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/TZ.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/UA.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/UG.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/UK.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/UM.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/UNKNOWN.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/US.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/UY.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/UZ.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/VA.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/VC.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/VE.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/VG.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/VI.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/VN.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/VU.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/WF.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/WS.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/XK.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/YE.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/YT.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/YU.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/ZA.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/ZM.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/ZR.gif create mode 100644 libs/dnet-apps-common/src/main/resources/static/common/images/flags/ZW.gif diff --git a/apps/dnet-is-application/pom.xml b/apps/dnet-is-application/pom.xml index 2ff3ed49..1209a44e 100644 --- a/apps/dnet-is-application/pom.xml +++ b/apps/dnet-is-application/pom.xml @@ -4,7 +4,7 @@ eu.dnetlib.dhp apps - 3.2.9-SNAPSHOT + 3.3.3-SNAPSHOT ../ diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/DsmAjaxController.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/DsmAjaxController.java index 8375d84d..43ea3e9c 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/DsmAjaxController.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/DsmAjaxController.java @@ -10,8 +10,8 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import eu.dnetlib.common.controller.AbstractDnetController; -import eu.dnetlib.data.openaire.dsm.model.Datasource; import eu.dnetlib.openaire.dsm.domain.BrowseTerm; +import eu.dnetlib.openaire.dsm.domain.SearchApisEntry; import eu.dnetlib.openaire.dsm.utils.DsmBrowsableFields; @RestController @@ -27,12 +27,12 @@ public class DsmAjaxController extends AbstractDnetController { } @GetMapping("/searchByField/{field}") - public List searchByField(@PathVariable final String field, @RequestParam final String value) { + public List searchByField(@PathVariable final String field, @RequestParam final String value) { return dsmService.searchByField(DsmBrowsableFields.valueOf(field), value); } @GetMapping("/search") - public List search(@RequestParam final String value) { + public List search(@RequestParam final String value) { return dsmService.search(value); } diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/DsmService.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/DsmService.java index 1baabe02..e50333a7 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/DsmService.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/DsmService.java @@ -56,6 +56,7 @@ import eu.dnetlib.openaire.dsm.domain.RegisteredDatasourceInfo; import eu.dnetlib.openaire.dsm.domain.RequestFilter; import eu.dnetlib.openaire.dsm.domain.RequestSort; import eu.dnetlib.openaire.dsm.domain.RequestSortOrder; +import eu.dnetlib.openaire.dsm.domain.SearchApisEntry; import eu.dnetlib.openaire.dsm.domain.SimpleDatasourceInfo; import eu.dnetlib.openaire.dsm.domain.SimpleResponse; import eu.dnetlib.openaire.dsm.utils.DsmBrowsableFields; @@ -447,12 +448,11 @@ public class DsmService { return jdbcTemplate.query(f.browseSql, new BeanPropertyRowMapper<>(BrowseTerm.class)); } - public List searchByField(final DsmBrowsableFields valueOf, final String value) { - // TODO Auto-generated method stub - return null; + public List searchByField(final DsmBrowsableFields f, final String value) { + return jdbcTemplate.query(f.searchSql, new BeanPropertyRowMapper<>(SearchApisEntry.class), value); } - public List search(final String value) { + public List search(final String value) { // TODO Auto-generated method stub return null; } diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/SearchApisEntry.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/SearchApisEntry.java new file mode 100644 index 00000000..a7e3adeb --- /dev/null +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/SearchApisEntry.java @@ -0,0 +1,154 @@ +package eu.dnetlib.openaire.dsm.domain; + +public class SearchApisEntry implements Comparable { + + private String id; + private String protocol; + private String compliance; + private Boolean active; + private String type; + private String aggrDate; + private Long aggrTotal; + private String dsId; + private String dsName; + private String websiteUrl; + private String dsOtherName; + private String organization; + private String country; + private String nsprefix; + private Boolean consenttermsofuse; + private Boolean fulltextdownload; + + public String getId() { + return id; + } + + public void setId(final String id) { + this.id = id; + } + + public String getProtocol() { + return protocol; + } + + public void setProtocol(final String protocol) { + this.protocol = protocol; + } + + public String getCompliance() { + return compliance; + } + + public void setCompliance(final String compliance) { + this.compliance = compliance; + } + + public Boolean getActive() { + return active; + } + + public void setActive(final Boolean active) { + this.active = active; + } + + public String getType() { + return type; + } + + public void setType(final String type) { + this.type = type; + } + + public String getAggrDate() { + return aggrDate; + } + + public void setAggrDate(final String aggrDate) { + this.aggrDate = aggrDate; + } + + public Long getAggrTotal() { + return aggrTotal; + } + + public void setAggrTotal(final Long aggrTotal) { + this.aggrTotal = aggrTotal; + } + + public String getDsId() { + return dsId; + } + + public void setDsId(final String dsId) { + this.dsId = dsId; + } + + public String getDsName() { + return dsName; + } + + public void setDsName(final String dsName) { + this.dsName = dsName; + } + + public String getWebsiteUrl() { + return websiteUrl; + } + + public void setWebsiteUrl(final String websiteUrl) { + this.websiteUrl = websiteUrl; + } + + public String getDsOtherName() { + return dsOtherName; + } + + public void setDsOtherName(final String dsOtherName) { + this.dsOtherName = dsOtherName; + } + + public String getOrganization() { + return organization; + } + + public void setOrganization(final String organization) { + this.organization = organization; + } + + public String getCountry() { + return country; + } + + public void setCountry(final String country) { + this.country = country; + } + + public String getNsprefix() { + return nsprefix; + } + + public void setNsprefix(final String nsprefix) { + this.nsprefix = nsprefix; + } + + public Boolean getConsenttermsofuse() { + return consenttermsofuse; + } + + public void setConsenttermsofuse(final Boolean consenttermsofuse) { + this.consenttermsofuse = consenttermsofuse; + } + + public Boolean getFulltextdownload() { + return fulltextdownload; + } + + public void setFulltextdownload(final Boolean fulltextdownload) { + this.fulltextdownload = fulltextdownload; + } + + @Override + public int compareTo(final SearchApisEntry o) { + return compliance.compareTo(o.getCompliance()); + } +} diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/utils/DsmBrowsableFields.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/utils/DsmBrowsableFields.java index e38bb35d..28d429ac 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/utils/DsmBrowsableFields.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/utils/DsmBrowsableFields.java @@ -7,23 +7,24 @@ import org.apache.commons.io.IOUtils; public enum DsmBrowsableFields { - type("Datasource typologies", "browseType.sql", "searchByType.sql"), - country("Countries", "browseCountry.sql", "searchByCountry.sql"), - compliance("Compatibility levels", "browseCompliance.sql", "searchByCompliance.sql"), - protocol("API protocols", "browseProtocol.sql", "searchByProtocol.sql"), - active("API activation", "browseActive.sql", "searchByActive.sql"), - consenttermsofuse("Consent terms of use", "browseConsentTermOfUse.sql", "searchByConsentTermOfUse.sql"), - fulltextdownload("Fulltext download", "browseFulltextDownload.sql", "searchByFulltextDownload.sql"); + type("Datasource typologies", "browseType.sql"), + country("Countries", "browseCountry.sql"), + compliance("Compatibility levels", "browseCompliance.sql"), + protocol("API protocols", "browseProtocol.sql"), + active("API activation", "browseActive.sql"), + consenttermsofuse("Consent terms of use", "browseConsentTermOfUse.sql"), + fulltextdownload("Fulltext download", "browseFulltextDownload.sql"); public final String desc; public final String browseSql; public final String searchSql; - private DsmBrowsableFields(final String desc, final String browseSqlFile, final String searchSqlFile) { + private DsmBrowsableFields(final String desc, final String browseSqlFile) { this.desc = desc; try { this.browseSql = IOUtils.toString(getClass().getResourceAsStream("/sql/dsm/ui/" + browseSqlFile), StandardCharsets.UTF_8.name()); - this.searchSql = IOUtils.toString(getClass().getResourceAsStream("/sql/dsm/ui/" + searchSqlFile), StandardCharsets.UTF_8.name()); + this.searchSql = IOUtils.toString(getClass().getResourceAsStream("/sql/dsm/ui/searchApis.tmpl.sql"), StandardCharsets.UTF_8.name()) + .replaceAll("%condition%", this.name() + "::text = ?"); } catch (final IOException e) { throw new RuntimeException(e); } diff --git a/apps/dnet-is-application/src/main/resources/application.properties b/apps/dnet-is-application/src/main/resources/application.properties index b104947f..1b27836f 100644 --- a/apps/dnet-is-application/src/main/resources/application.properties +++ b/apps/dnet-is-application/src/main/resources/application.properties @@ -1,5 +1,8 @@ server.port=8280 +server.public_url = +server.public_desc = API Base URL + spring.profiles.active=dev maven.pom.path = /META-INF/maven/eu.dnetlib.dhp/dnet-is-application/effective-pom.xml diff --git a/apps/dnet-is-application/src/main/resources/sql/dsm/ui/browseActive.sql b/apps/dnet-is-application/src/main/resources/sql/dsm/ui/browseActive.sql index 35c4746b..ea462cf0 100644 --- a/apps/dnet-is-application/src/main/resources/sql/dsm/ui/browseActive.sql +++ b/apps/dnet-is-application/src/main/resources/sql/dsm/ui/browseActive.sql @@ -1,5 +1,5 @@ select - a.active as term, + a.active::text as term, case when a.active is null then 'UNKNOWN' when a.active then 'active' else 'not active' end as name, count(*) as total from dsm_api a diff --git a/apps/dnet-is-application/src/main/resources/sql/dsm/ui/browseConsentTermOfUse.sql b/apps/dnet-is-application/src/main/resources/sql/dsm/ui/browseConsentTermOfUse.sql index 44ee464a..c331aca7 100644 --- a/apps/dnet-is-application/src/main/resources/sql/dsm/ui/browseConsentTermOfUse.sql +++ b/apps/dnet-is-application/src/main/resources/sql/dsm/ui/browseConsentTermOfUse.sql @@ -1,5 +1,5 @@ select - d.consenttermsofuse as term, + d.consenttermsofuse::text as term, case when d.consenttermsofuse is null then 'UNKNOWN' when d.consenttermsofuse then 'YES' else 'NO' end as name, count(*) as total from diff --git a/apps/dnet-is-application/src/main/resources/sql/dsm/ui/browseFulltextDownload.sql b/apps/dnet-is-application/src/main/resources/sql/dsm/ui/browseFulltextDownload.sql index 59485269..b33dab58 100644 --- a/apps/dnet-is-application/src/main/resources/sql/dsm/ui/browseFulltextDownload.sql +++ b/apps/dnet-is-application/src/main/resources/sql/dsm/ui/browseFulltextDownload.sql @@ -1,5 +1,5 @@ select - d.fulltextdownload as term, + d.fulltextdownload::text as term, case when d.fulltextdownload is null then 'UNKNOWN' when d.fulltextdownload then 'Available' else 'Not available' end as name, count(*) as total from diff --git a/apps/dnet-is-application/src/main/resources/sql/dsm/ui/searchApis.tmpl.sql b/apps/dnet-is-application/src/main/resources/sql/dsm/ui/searchApis.tmpl.sql new file mode 100644 index 00000000..51b9372c --- /dev/null +++ b/apps/dnet-is-application/src/main/resources/sql/dsm/ui/searchApis.tmpl.sql @@ -0,0 +1,40 @@ +SELECT * FROM (SELECT + a.id AS "id", + a.protocol AS "protocol", + coalesce(a.compatibility_override, a.compatibility) AS "compliance", + a.active AS "active", + ds.eosc_datasource_type AS "type", + coalesce(a.last_aggregation_date::text, a.last_download_date::text, '') AS "aggrDate", + coalesce(a.last_aggregation_total, a.last_download_total, 0) AS "aggrTotal", + ds.id AS "dsId", + ds.officialname AS "dsName", + ds.englishname AS "dsOtherName", + ds.namespaceprefix AS "nsprefix", + ds.websiteurl AS "websiteUrl", + coalesce((array_agg(o.country))[1], '-') AS "country", + (array_agg(o.legalname))[1] AS "organization", + ds.consenttermsofuse AS "consenttermsofuse", + ds.fulltextdownload AS "fulltextdownload" +FROM dsm_api a + LEFT OUTER JOIN dsm_services ds ON (a.service = ds.id) + LEFT OUTER JOIN dsm_service_organization dsorg ON (ds.id = dsorg.service) + LEFT OUTER JOIN dsm_organizations o ON (dsorg.organization = o.id) +WHERE ds.dedup_main_service = true +GROUP BY + a.id, + a.protocol, + a.compatibility_override, + a.compatibility, + a.active, + a.last_aggregation_date, + a.last_download_date, + a.last_aggregation_total, + a.last_download_total, + ds.id, + ds.officialname, + ds.namespaceprefix, + ds.websiteurl, + ds.consenttermsofuse, + ds.fulltextdownload, + eosc_datasource_type +) AS t WHERE %condition%; diff --git a/apps/dnet-is-application/src/main/resources/sql/dsm/ui/searchByActive.sql b/apps/dnet-is-application/src/main/resources/sql/dsm/ui/searchByActive.sql deleted file mode 100644 index e69de29b..00000000 diff --git a/apps/dnet-is-application/src/main/resources/sql/dsm/ui/searchByCompliance.sql b/apps/dnet-is-application/src/main/resources/sql/dsm/ui/searchByCompliance.sql deleted file mode 100644 index e69de29b..00000000 diff --git a/apps/dnet-is-application/src/main/resources/sql/dsm/ui/searchByConsentTermOfUse.sql b/apps/dnet-is-application/src/main/resources/sql/dsm/ui/searchByConsentTermOfUse.sql deleted file mode 100644 index e69de29b..00000000 diff --git a/apps/dnet-is-application/src/main/resources/sql/dsm/ui/searchByCountry.sql b/apps/dnet-is-application/src/main/resources/sql/dsm/ui/searchByCountry.sql deleted file mode 100644 index e69de29b..00000000 diff --git a/apps/dnet-is-application/src/main/resources/sql/dsm/ui/searchByFulltextDownload.sql b/apps/dnet-is-application/src/main/resources/sql/dsm/ui/searchByFulltextDownload.sql deleted file mode 100644 index e69de29b..00000000 diff --git a/apps/dnet-is-application/src/main/resources/sql/dsm/ui/searchByProtocol.sql b/apps/dnet-is-application/src/main/resources/sql/dsm/ui/searchByProtocol.sql deleted file mode 100644 index e69de29b..00000000 diff --git a/apps/dnet-is-application/src/main/resources/sql/dsm/ui/searchByType.sql b/apps/dnet-is-application/src/main/resources/sql/dsm/ui/searchByType.sql deleted file mode 100644 index e69de29b..00000000 diff --git a/apps/dnet-is-application/src/main/resources/templates/resultsDsApi.html b/apps/dnet-is-application/src/main/resources/templates/resultsDsApi.html index 51bb6578..0f9abb0c 100644 --- a/apps/dnet-is-application/src/main/resources/templates/resultsDsApi.html +++ b/apps/dnet-is-application/src/main/resources/templates/resultsDsApi.html @@ -17,13 +17,65 @@
- {{results}} + + + +

+ +

+

+ Number of APIs: {{(results | filter:apiFilter).length}} +

+ +
+
+
{{r.dsName}} + {{r.protocol}} + {{r.compliance}} +
{{r.dsOtherName}}
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Datasource Id{{r.dsId}}
API Id{{r.id}}
Namespace Prefix{{r.nsprefix}}
Organization{{r.organization}}
URL{{r.websiteUrl}}
Type{{r.type}}
Statusactivenot active
Consent Terms of UseYES
Fulltext DownloadYES
+
+ +
- +