Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
U
Uploader
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
5
Issues
5
List
Boards
Labels
Service Desk
Milestones
Merge Requests
2
Merge Requests
2
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Genesys PGR
Uploader
Commits
ea595759
Commit
ea595759
authored
Apr 09, 2019
by
Matija Obreza
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '21-migrate-to-api-v1' into 'master'
Resolve "Migrate to API v1" Closes
#21
See merge request
!20
parents
1c6edc24
64fc0c0a
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
27 additions
and
20 deletions
+27
-20
anno-gui/src/main/java/org/genesys2/anno/gui/PushDialog.java
anno-gui/src/main/java/org/genesys2/anno/gui/PushDialog.java
+2
-2
anno-gui/src/main/java/org/genesys2/anno/predefined/GenesysJSON.java
...c/main/java/org/genesys2/anno/predefined/GenesysJSON.java
+19
-16
anno-gui/src/main/java/org/genesys2/anno/predefined/MCPD.java
...-gui/src/main/java/org/genesys2/anno/predefined/MCPD.java
+4
-1
anno-gui/src/main/java/org/genesys2/anno/predefined/RdfMCPD.java
...i/src/main/java/org/genesys2/anno/predefined/RdfMCPD.java
+2
-1
No files found.
anno-gui/src/main/java/org/genesys2/anno/gui/PushDialog.java
View file @
ea595759
...
...
@@ -819,9 +819,9 @@ public class PushDialog extends Dialog {
String
serverResponse
=
null
;
if
(
op
==
GenesysOp
.
UPSERT
)
serverResponse
=
genesysClient
.
updateAccession
s
(
instCode
,
objectMapper
.
writeValueAsString
(
accns
));
serverResponse
=
genesysClient
.
updateAccession
(
instCode
,
objectMapper
.
writeValueAsString
(
accns
));
else
if
(
op
==
GenesysOp
.
DELETE
)
serverResponse
=
genesysClient
.
deleteAccessions
ByName
(
instCode
,
objectMapper
.
writeValueAsString
(
accns
));
serverResponse
=
genesysClient
.
deleteAccessions
(
instCode
,
objectMapper
.
writeValueAsString
(
accns
));
if
(
_log
.
isTraceEnabled
())
_log
.
trace
(
serverResponse
);
...
...
anno-gui/src/main/java/org/genesys2/anno/predefined/GenesysJSON.java
View file @
ea595759
...
...
@@ -100,25 +100,10 @@ public class GenesysJSON {
JsonField
acceNumb
=
new
JsonField
(
Api1Constants
.
Accession
.
ACCENUMB
,
RdfMCPD
.
ACCENUMB
).
setRequired
(
true
);
columns
.
add
(
acceNumb
);
JsonField
newAcceNumb
=
new
JsonField
(
Api1Constants
.
Accession
.
ACCENUMB_NEW
,
RdfMCPD
.
NEWACCENUMB
).
setRequired
(
false
);
JsonField
newAcceNumb
=
new
JsonField
(
Api1Constants
.
Accession
.
ACCENUMB_NEW
,
RdfMCPD
.
ACCENUMB_NEW
).
setRequired
(
false
);
columns
.
add
(
newAcceNumb
);
JsonField
genus
=
new
JsonField
(
Api1Constants
.
Accession
.
GENUS
,
RdfMCPD
.
GENUS
).
setRequired
(
true
);
columns
.
add
(
genus
);
JsonField
species
=
new
JsonField
(
Api1Constants
.
Accession
.
SPECIES
,
RdfMCPD
.
SPECIES
);
columns
.
add
(
species
);
JsonField
columnDef
;
columnDef
=
new
JsonField
(
Api1Constants
.
Accession
.
SPAUTHOR
,
RdfMCPD
.
SPAUTHOR
);
columns
.
add
(
columnDef
);
columnDef
=
new
JsonField
(
Api1Constants
.
Accession
.
SUBTAXA
,
RdfMCPD
.
SUBTAXA
);
columns
.
add
(
columnDef
);
columnDef
=
new
JsonField
(
Api1Constants
.
Accession
.
SUBTAUTHOR
,
RdfMCPD
.
SUBTAUTHOR
);
columns
.
add
(
columnDef
);
columnDef
=
new
JsonField
(
Api1Constants
.
Accession
.
ACCENAME
,
RdfMCPD
.
ACCENAME
).
setAllowMultiple
(
true
);
columns
.
add
(
columnDef
);
...
...
@@ -188,6 +173,24 @@ public class GenesysJSON {
columnDef
=
new
JsonField
(
Api1Constants
.
Accession
.
GEO
+
"."
+
Api1Constants
.
Geo
.
ELEVATION
,
RdfMCPD
.
ELEVATION
).
setType
(
double
.
class
);
columns
.
add
(
columnDef
);
columnDef
=
new
JsonField
(
Api1Constants
.
Accession
.
TAXONOMY
+
"."
+
Api1Constants
.
Taxonomy
.
GENUS
,
RdfMCPD
.
GENUS
);
columns
.
add
(
columnDef
);
columnDef
=
new
JsonField
(
Api1Constants
.
Accession
.
TAXONOMY
+
"."
+
Api1Constants
.
Taxonomy
.
GENUS_NEW
,
RdfMCPD
.
GENUS_NEW
);
columns
.
add
(
columnDef
);
columnDef
=
new
JsonField
(
Api1Constants
.
Accession
.
TAXONOMY
+
"."
+
Api1Constants
.
Taxonomy
.
SPECIES
,
RdfMCPD
.
SPECIES
);
columns
.
add
(
columnDef
);
columnDef
=
new
JsonField
(
Api1Constants
.
Accession
.
TAXONOMY
+
"."
+
Api1Constants
.
Taxonomy
.
SPAUTHOR
,
RdfMCPD
.
SPAUTHOR
);
columns
.
add
(
columnDef
);
columnDef
=
new
JsonField
(
Api1Constants
.
Accession
.
TAXONOMY
+
"."
+
Api1Constants
.
Taxonomy
.
SUBTAXA
,
RdfMCPD
.
SUBTAXA
);
columns
.
add
(
columnDef
);
columnDef
=
new
JsonField
(
Api1Constants
.
Accession
.
TAXONOMY
+
"."
+
Api1Constants
.
Taxonomy
.
SUBTAUTHOR
,
RdfMCPD
.
SUBTAUTHOR
);
columns
.
add
(
columnDef
);
columnDef
=
new
JsonField
(
Api1Constants
.
Accession
.
BREDCODE
,
RdfMCPD
.
BREDCODE
).
setAllowMultiple
(
true
);
columns
.
add
(
columnDef
);
...
...
anno-gui/src/main/java/org/genesys2/anno/predefined/MCPD.java
View file @
ea595759
...
...
@@ -40,7 +40,7 @@ public class MCPD {
ColumnDef
acceNumb
=
new
ColumnDef
(
"ACCENUMB"
,
"Accession number"
,
ColumnDataType
.
TEXT
,
true
,
RdfMCPD
.
ACCENUMB
);
columns
.
add
(
acceNumb
);
ColumnDef
newAcceNumb
=
new
ColumnDef
(
"
NEWACCENUMB"
,
"New accession number"
,
ColumnDataType
.
TEXT
,
true
,
RdfMCPD
.
NEWACCENUMB
);
ColumnDef
newAcceNumb
=
new
ColumnDef
(
"
ACCENUMB_NEW"
,
"New accession number"
,
ColumnDataType
.
TEXT
,
true
,
RdfMCPD
.
ACCENUMB_NEW
);
columns
.
add
(
newAcceNumb
);
ColumnDef
columnDef
=
new
ColumnDef
(
"COLLNUMB"
,
"Collecting number"
,
ColumnDataType
.
TEXT
,
false
,
RdfMCPD
.
COLLNUMB
);
...
...
@@ -62,6 +62,9 @@ public class MCPD {
ColumnDef
genus
=
new
ColumnDef
(
"GENUS"
,
"Genus"
,
ColumnDataType
.
TEXT
,
false
,
RdfMCPD
.
GENUS
);
columns
.
add
(
genus
);
ColumnDef
newGenus
=
new
ColumnDef
(
"NEWGENUS"
,
"New genus"
,
ColumnDataType
.
TEXT
,
false
,
RdfMCPD
.
GENUS_NEW
);
columns
.
add
(
newGenus
);
ColumnDef
species
=
new
ColumnDef
(
"SPECIES"
,
"Species"
,
ColumnDataType
.
TEXT
,
false
,
RdfMCPD
.
SPECIES
);
columns
.
add
(
species
);
...
...
anno-gui/src/main/java/org/genesys2/anno/predefined/RdfMCPD.java
View file @
ea595759
...
...
@@ -22,9 +22,10 @@ public class RdfMCPD {
public
static
final
String
DOI
=
"http://prismstandard.org/namespaces/1.2/basic/doi"
;
public
static
final
String
ACCENUMB
=
"http://purl.org/germplasm/germplasmTerm#germplasmID"
;
public
static
final
String
NEWACCENUMB
=
"https://www.genesys-pgr.org/rdf/mcpd#newAcceNumb"
;
public
static
final
String
ACCENUMB_NEW
=
"https://www.genesys-pgr.org/rdf/mcpd#newAcceNumb"
;
public
static
final
String
GENUS
=
"http://rs.tdwg.org/dwc/terms/genus"
;
public
static
final
String
GENUS_NEW
=
"https://www.genesys-pgr.org/rdf/mcpd#newGenus"
;
public
static
final
String
SPECIES
=
"http://rs.tdwg.org/dwc/terms/specificEpithet"
;
public
static
final
String
SPAUTHOR
=
"http://rs.tdwg.org/dwc/terms/infraspecificEpithetAuthorship"
;
public
static
final
String
SUBTAXA
=
"http://rs.tdwg.org/dwc/terms/infraspecificEpithet"
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment