Commit Graph

185 Commits

Author SHA1 Message Date
Costantino Perciante 6b1e41d577 Added regular expression for paths of the services in order to ensure that it contains one among ram, fishsource, grsf, firms values. Update the methods to delete a stock/fishery by id (they checked the id actually belonged to a fishery/stock of a given group). The methods used to retrieve fishery/stock ids have been changed too: in case grsf source was used it is straightforward, in the other case the full set of records of the group needs to be scanned to separate stock and fishery ones.
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@142734 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-02-19 14:53:42 +00:00
Costantino Perciante 3c9b149d54 some minor changes: Product Type changed to GRSF Type, Record Type changed to Source
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@142718 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-02-17 17:05:41 +00:00
Costantino Perciante 90a19689f5 record url changed to item url
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@142574 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-02-15 15:57:03 +00:00
Costantino Perciante 481feb093f @Tag annotation fixes
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@142570 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-02-15 15:34:49 +00:00
Costantino Perciante b0b56dc1a1 code changed to match the new hierarchy structure as well as tags and groups reported in ticket #7059
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@142563 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-02-15 14:11:45 +00:00
Costantino Perciante 7f608a504f Merge with 1.0.1 branch version: products are always published as private in manage context; they are published as public in the public context
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@142375 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-02-08 11:56:26 +00:00
Costantino Perciante 28388712f1 social service method paths fixed
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@141921 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-01-30 17:17:07 +00:00
Costantino Perciante f14049cc36 imports changed due to updated ckan-library packages declaration. Social EndPoint is now switched to a GcoreEndpoint
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@141920 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-01-30 16:58:22 +00:00
Costantino Perciante 092cd2d4c2 minor fixes
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@141266 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-12-20 10:05:33 +00:00
Costantino Perciante 516c2b4697 Changed the way the url of the product is generated (now it is no longer encrypted). The list of ids of products in a group is now returned (there is no longer the limit of the ckan api)
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@141264 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-12-19 16:18:37 +00:00
Costantino Perciante bf3d0675ce added another cache for VRE catalogue folder
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@140059 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-12-16 20:31:52 +00:00
Costantino Perciante ceca8a5497 minor fixes for the caches
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@140058 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-12-16 18:00:54 +00:00
Costantino Perciante 5dfa58909a added cache for user'sfullname and email to speed up execution
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@140057 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-12-16 17:53:08 +00:00
Costantino Perciante cd4a2ebe8f added url of the product to the result set of the methods get-catalogue-id-and-url-from-name (previously known as get-catalogue-id-from-name)
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@140043 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-12-16 15:02:03 +00:00
Costantino Perciante a2fc076aa4 minor fix: Fishery_Activity changed to Fishing_Activity
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@139975 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-12-13 13:14:36 +00:00
Costantino Perciante 487ba3a00c minor fixes
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@139877 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-12-10 10:24:47 +00:00
Costantino Perciante ae56c46861 database_sources is no longer a tag
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@139876 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-12-10 10:01:43 +00:00
Costantino Perciante 01b08a10ba added methods to retrieve a catalogue identifier, given the product name (i.e., the knowledge base identifier)
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@139858 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-12-09 15:56:52 +00:00
Costantino Perciante 928b6dbabc hashtags are not used for writing product post in grsf case since the underneath regex of tags splits them
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@139857 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-12-09 15:12:51 +00:00
Costantino Perciante dc9aedd214 minor fixes before branching
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@139848 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-12-09 13:54:48 +00:00
Costantino Perciante a81d440671 management_entity generates tag for grsf records
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@139847 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-12-09 13:44:15 +00:00
Costantino Perciante 3d3e7843fd minor fix
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@139846 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-12-09 13:30:28 +00:00
Costantino Perciante df011a3669 minor fixes after some changes in the fishery record model. Added code to write a new post about the new available record in the public grsf vre
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@139843 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-12-09 13:06:19 +00:00
Costantino Perciante 917fd74330 minor fixes. Abundance level and Exploration rate (standard) are used for tagging purposes only. The related groups will not be present
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@139828 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-12-08 20:57:08 +00:00
Costantino Perciante 0ac739e926 minor fix on status enum
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@139817 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-12-08 18:09:16 +00:00
Costantino Perciante 56f905c3c7 Updated exploitation rate/abundance level vocabularies
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@139814 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-12-08 17:32:44 +00:00
Costantino Perciante 2cc81250cd minor fixes
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@139809 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-12-07 17:41:05 +00:00
Costantino Perciante 878a39cd57 changed the record_type from original to source
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@139782 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-12-07 13:45:22 +00:00
Costantino Perciante e69ba794f1 minor fixes
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@139737 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-12-06 18:12:41 +00:00
Costantino Perciante b2c05a2641 minor fixes for url generation
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@139733 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-12-06 18:04:02 +00:00
Costantino Perciante d409a4dd10 added methods to retrieve products of type stock/fishery for the different sources. At most 1000 datasets'ids are returned
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@139725 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-12-06 16:06:51 +00:00
Costantino Perciante d3f3eeddd9 Added the GRSF_Admin (manage context) and GRSF (public context) contexts in web.xml for production environment. Better checks for status field in manage context
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@139705 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-12-06 10:16:31 +00:00
Costantino Perciante 2df95eb79f minor fixes
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@135279 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-12-04 14:40:58 +00:00
Costantino Perciante 7baff1b51c added toString to Record_Type enum
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@135278 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-12-04 14:12:29 +00:00
Costantino Perciante cb11117297 minor fixes
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@135277 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-12-04 13:53:15 +00:00
Costantino Perciante b47e21b4f4 minor fixes
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@135276 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-12-04 11:24:37 +00:00
Costantino Perciante 382e5fc2a7 minor fixes
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@135269 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-12-03 16:28:58 +00:00
Costantino Perciante fbba9e2864 minor fixes
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@135268 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-12-03 11:00:58 +00:00
Costantino Perciante be06481c8f made some optimizations to speed up the publication. Some minor changes
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@135267 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-12-03 10:50:38 +00:00
Costantino Perciante f076015318 added some chances to upload the resource on the ckan as time series. Added a new @TimeSeries annotation
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@135199 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-12-01 22:21:37 +00:00
Costantino Perciante 291b542d61 stock_name and fishery_name cannot be null
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@135198 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-12-01 21:41:24 +00:00
Costantino Perciante 6a91d90023 Minor changes: added some check when the record type has source GRSF
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@135197 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-12-01 21:20:46 +00:00
Costantino Perciante 1a0f61e437 minor fixes
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@135192 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-12-01 18:27:40 +00:00
Costantino Perciante 40413be914 minor fix when reading from the path the type of source
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@135191 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-12-01 18:25:30 +00:00
Costantino Perciante c216799898 now the Source (Ram, GRSF, Fishsource, FIRMS) is specified in the path of the request. Other changes to help methods
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@135190 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-12-01 18:19:22 +00:00
Costantino Perciante 62d111688e Several changes to the model
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@135170 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-12-01 14:37:26 +00:00
Costantino Perciante 41c877cda7 improved Group annotation with parent field: Indicator group can now be managed
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@135154 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-11-30 21:11:47 +00:00
Costantino Perciante ba87596f27 added @tag and @group annotations to the common field database_source
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@135153 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-11-30 20:34:10 +00:00
Costantino Perciante 2a1dee01eb minor fixes
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@135152 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-11-30 18:05:32 +00:00
Costantino Perciante 78a6125c16 added log for generated group name
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@135151 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-11-30 17:43:57 +00:00