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
6d76255071
further changes due to requests in ticket #8719
...
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@149332 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-06-07 09:04:44 +00:00
7363174702
minor fix for pressure timeseries
...
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@149067 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-05-25 10:34:58 +00:00
3b7969997c
updated model and managed mapping to namespaces ( #8719 )
...
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@149007 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-05-24 14:53:31 +00:00
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
f8e19fc73c
minor fix on time series (when unit value is empty)
...
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@144059 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-02-22 10:19:44 +00:00
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
076534d455
minor fix for stockId field/name
...
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@142736 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-02-19 15:40:19 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
39b9131fa7
added @Group annotation to product type (i.e., stock, fishery)
...
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@135145 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-11-30 16:34:14 +00:00
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
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
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
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
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
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
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
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
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
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
584cac5372
dataset_url json property moved to product_url
...
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@133366 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-20 08:40:52 +00:00
cf4b6bf37b
minor fixes
...
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@133354 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-19 12:34:19 +00:00
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
f128ca18ab
Added delete methods for stock and fishery products (both also purge the products ..). When a user is assigned to a group he has the role member if in the initial organization he was an editor, admin otherwise
...
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@133218 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-14 16:44:34 +00:00
40bcc5d462
Status in stockrecord is now a group too
...
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@133192 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-13 16:48:18 +00:00
a0a0dd48b5
Fields with @group annotation have also the @tag one.
...
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@133165 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-13 12:06:15 +00:00
9f71232585
license can also be empty, in this case the default one is used
...
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@133163 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-13 10:01:46 +00:00
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
9d435d4f26
minor fixes
...
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@133146 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-12 14:30:52 +00:00
8c7684f587
added group annotation to Status in Fishery Record
...
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@133125 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-12 12:53:51 +00:00
24fc97c02d
added 'envirnoment' property to Fishery model
...
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@133122 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-12 12:49:27 +00:00
de77721aab
fixed ignore json property for children of Common.class
...
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@133088 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-11 17:51:35 +00:00
2871d57556
@JsonIgnoreProperties added also on the other beans
...
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@133076 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-11 15:12:55 +00:00
Costantino Perciante