Commit Graph

62 Commits

Author SHA1 Message Date
Costantino Perciante 54fa9cee82 minor fixes
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@144756 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-03-08 16:09:34 +00:00
Costantino Perciante 1f761f5a42 minor fix for grsf-stock/fishery association group
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@144356 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-02-27 12:36:04 +00:00
Costantino Perciante a7003850ce Minor fixes for new model
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@142814 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-02-20 17:44:26 +00:00
Costantino Perciante ae05d37066 minor imports fixes
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@142738 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-02-20 08:43:46 +00:00
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 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 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 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 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 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 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 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 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 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 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 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 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 35a7c82586 Fixed group association retrieval: also the enums have been annotated with the @Group annotation
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@135147 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-11-30 17:29:44 +00:00
Costantino Perciante 1171a54f12 html tags are removed from extras as well as description field
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@135101 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-11-30 10:43:30 +00:00
Costantino Perciante 26d4f35f5c moved again code to run on top of smartgears
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@135053 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-11-29 16:18:13 +00:00
Costantino Perciante 4c740c7a95 minor fixes for tags generation (some urecognized chars are removed) and an exception is reported when creation fails
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@135030 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-11-29 11:44:36 +00:00
Costantino Perciante f69d326145 minor fixes for files creation in shared folder
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@134945 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-11-28 11:20:43 +00:00
Costantino Perciante 1894ed250c minor fix for checking type product in delete methods
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@134922 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-11-27 11:37:44 +00:00
Costantino Perciante 2c394704a5 separated types for stock and fishery. The main thread will wait for the groups association thread to finish before starting the one of the files
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@134895 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-11-25 17:25:23 +00:00
Costantino Perciante 00b2442632 manager thread and groups thread cannot run concurrently... ckan loses some information
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@134797 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-11-25 13:35:00 +00:00
Costantino Perciante e399336c3f start managing time series. The missing part is the one related to the copy of the csv resource on the shared folder of the vre. The url of this folder needs to be used to replace the one attached by ckan
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@134705 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-11-24 16:53:50 +00:00
Costantino Perciante 5ae34426be added log for user's current role
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@134518 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-11-22 11:54:41 +00:00
Costantino Perciante 6d9927196b Minor fixes
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@133931 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-11-06 20:21:11 +00:00
Costantino Perciante 6e1c4d3bac code has been updated to according the requests in ticket #5567, unfortunately ckan doesn't support extras with duplicated keys, as it is(the ticket #5650 has been opened for this issue)
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@133911 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-11-04 15:26:19 +00:00
Costantino Perciante c5d9730ef5 Start adding code to handle resources and inspect them to extract groups/tags' names
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@133782 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-11-01 21:35:52 +00:00
Costantino Perciante 08cbe4dee0 Added the following fields : short_title, uuid, traceability_flag, water_area (as list), stock_uri
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@133639 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-27 09:40:19 +00:00
Costantino Perciante 33514c202a minor fixes and added some of the fields requested by forth (short_title, stock_uri, traceability_flag etc)
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@133611 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-26 16:40:10 +00:00
Costantino Perciante d422a97bc3 minor fix
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@133334 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-18 19:42:26 +00:00
Costantino Perciante 493b4c27e9 stock and fishery in the curation area are published private. for publication purpose the role needed is the Catalogue-Admin one
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@133321 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-18 09:51:55 +00:00