Commit Graph

54 Commits

Author SHA1 Message Date
Costantino Perciante 93e4d3480e added support for sdg flag (managed as for traceability flag)
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@164582 82a268e6-3cf1-43bd-a215-b396298e98cf
2018-02-26 16:19:34 +00:00
Costantino Perciante 3c10c7467c refactoring
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@157684 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-10-27 12:51:24 +00:00
Costantino Perciante bd1cd054cc minor fixes and common-library imported
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@157682 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-10-27 12:37:41 +00:00
Costantino Perciante bcd53322e5 added requirements coming from ticket #10054
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@157576 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-10-25 14:45:34 +00:00
Costantino Perciante 0e63ab07bc semantic identifier is modified by the service, changed system:type to fishery and stocks. Other minor changes in resource names. Version is 1.4.0
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@153263 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-09-19 14:42:15 +00:00
Costantino Perciante c35c19434c minor refactoring
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@152488 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-08-04 13:06:11 +00:00
Costantino Perciante 159e2906d1 package refactoring
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@152487 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-08-04 13:04:35 +00:00
Costantino Perciante 7fd2b3a435 minor fixes before branching
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@151510 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-07-31 16:29:48 +00:00
Costantino Perciante 05de8af64f improvements for #9412
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@151390 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-07-27 14:45:18 +00:00
Costantino Perciante 76207370e9 added assessment field in time series
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@151195 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-07-21 13:33:22 +00:00
Costantino Perciante dec17269ab aligned reference year and report year to time series model plus other minor fixes
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@151051 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-07-13 09:50:05 +00:00
Costantino Perciante 93b9e3a25e added update method. Minor refactor for common code
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@151029 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-07-12 16:05:35 +00:00
Costantino Perciante 00e2a6c6fc some model changes
fao_state added (it's a new time series)
catches/landings separated
reference_year added
reporting_year is now a list
narrative_state_and_trend changed (is a time series)

species is a series with code, system and name (no longer species code and name separated)
assessment_distribution_area is now a list with objects having code, system, name 
assessment_methods  changed as list having name, reference_year and reporting_year_or_assessment

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@150670 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-06-30 13:32:38 +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 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 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 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 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 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 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 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 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 d0f7e7a960 minor fix
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@135150 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-11-30 17:43:24 +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 256e626827 fixed remove non ascii chars code
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@135111 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-11-30 13:14:02 +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 68998f3577 minor fixes
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@134967 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-11-28 13:14:23 +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 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 fb2fbee11a fixed tags and fields generation
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@134784 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-11-25 12:56:27 +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 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 f2b47b9e0a minor fixes
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@133817 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-11-02 15:02:28 +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 9bb23c991f Validation of input beans is now performed automatically
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@133247 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-15 20:34:57 +00:00
Costantino Perciante 92d8d0bc47 added <exclude> elements for hello methods (i.e. they no longer require the token to be used)
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@133198 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-14 12:44:38 +00:00
Costantino Perciante 7b347dd923 better check of version value provided
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@133173 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-13 13:34:47 +00:00
Costantino Perciante e32ccbac4d minor fix
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@133167 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-13 12:25:11 +00:00
Costantino Perciante 0c4f135002 Several improvements:
- added checks using annotations and validator for bean validations
- DatabaseSources and SourceOfInformation are now list of resources
- notations have been added according the model on the wiki page(GCube_Data_Catalogue_for_GRSF)

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@133160 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-13 09:46:42 +00:00
Costantino Perciante 87524d535f minor fix
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@133040 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-11 10:01:43 +00:00
Costantino Perciante 37eccf53bf Group association now works. Added methods to retrieve licenses' ids. By default the license_id (if not specified ) is CC-BY-SA-4.0
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@133037 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-11 09:39:25 +00:00
Costantino Perciante 9fb01322c0 Methods for publishing stock or fishery records added. The association thread that should associate the product to the groups fails. This needs to be fixed. Target selected as folder to be ignored
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@133011 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-10 16:50:11 +00:00
Costantino Perciante 1c2d7f0246 excluded author and author_contact from serialization/deserialization
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@132964 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-09 14:28:24 +00:00
Costantino Perciante 45ac9feb0b added tests for testing with jetty and junit
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@132963 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-09 14:06:45 +00:00
Costantino Perciante 91f56dca42 added junit test
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@132961 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-09 10:52:57 +00:00
Costantino Perciante 0d27ef2e17 minor fixes: added super.toString() to print common fields for fishery and stock. Added more junit tests
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@132959 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-09 10:36:25 +00:00