Costantino Perciante
6fd75bd8bc
json field names changed
...
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@151512 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-08-01 08:26:33 +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
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
983104aad2
minor fixes
...
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@150982 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-07-10 14:41:24 +00:00
Costantino Perciante
704984215c
fixed Fishing_Pressure
...
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@150837 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-07-06 11:53:15 +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
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
Costantino Perciante
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
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
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
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
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
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
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
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
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
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
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
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
Costantino Perciante
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
Costantino Perciante
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
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
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
Costantino Perciante
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
Costantino Perciante
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
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
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
Costantino Perciante
b7f35033c9
Defined new annotation for custom fields to map them in extras fields. Defined methods to retrieve custom fields, tags and groups at run time.
...
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@132956 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-08 21:10:25 +00:00
Costantino Perciante
34aabbcf27
created package for input and output json. Created response bean and resource bean. Common has been extended with spatial, extras and resources fields
...
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@132951 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-08 18:46:17 +00:00