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
Genesys Backend
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
15
Issues
15
List
Boards
Labels
Service Desk
Milestones
Operations
Operations
Incidents
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
Genesys Backend
Commits
3300aee0
Commit
3300aee0
authored
Jul 22, 2014
by
Matija Obreza
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
FIX: Don't split COLLNUMB, ACCENAME
parent
4254684d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
8 deletions
+8
-8
src/main/java/org/genesys2/server/service/impl/BatchRESTServiceImpl.java
...rg/genesys2/server/service/impl/BatchRESTServiceImpl.java
+8
-8
No files found.
src/main/java/org/genesys2/server/service/impl/BatchRESTServiceImpl.java
View file @
3300aee0
...
...
@@ -414,10 +414,10 @@ public class BatchRESTServiceImpl implements BatchRESTService {
genesysService
.
removeRemarks
(
toRemoveRemarks
);
}
updateAccessionAliases
(
acceNames
,
AliasType
.
ACCENAME
);
updateAccessionAliases
(
otherNumbs
,
AliasType
.
OTHERNUMB
);
updateAccessionAliases
(
donorNumbs
,
AliasType
.
DONORNUMB
);
updateAccessionAliases
(
collNumbs
,
AliasType
.
COLLNUMB
);
updateAccessionAliases
(
acceNames
,
AliasType
.
ACCENAME
,
false
);
updateAccessionAliases
(
otherNumbs
,
AliasType
.
OTHERNUMB
,
true
);
updateAccessionAliases
(
donorNumbs
,
AliasType
.
DONORNUMB
,
true
);
updateAccessionAliases
(
collNumbs
,
AliasType
.
COLLNUMB
,
false
);
return
toSave
.
size
()
>
0
||
toSaveColl
.
size
()
>
0
||
toSaveGeo
.
size
()
>
0
||
toSaveBreed
.
size
()
>
0
||
toSaveExch
.
size
()
>
0
;
}
...
...
@@ -663,7 +663,7 @@ public class BatchRESTServiceImpl implements BatchRESTService {
*
* @param acceNames
*/
private
void
updateAccessionAliases
(
Map
<
Accession
,
ArrayNode
>
acceNames
,
AliasType
aliasType
)
{
private
void
updateAccessionAliases
(
Map
<
Accession
,
ArrayNode
>
acceNames
,
AliasType
aliasType
,
boolean
splitInstCode
)
{
final
List
<
AccessionAlias
>
toSave
=
new
ArrayList
<
AccessionAlias
>();
final
List
<
AccessionAlias
>
toRemove
=
new
ArrayList
<
AccessionAlias
>();
...
...
@@ -674,13 +674,13 @@ public class BatchRESTServiceImpl implements BatchRESTService {
for
(
final
JsonNode
item
:
acceName
)
{
if
(
item
.
isTextual
()
&&
StringUtils
.
isNotBlank
(
item
.
textValue
()))
{
final
AccessionAliasJson
alias
=
new
AccessionAliasJson
();
final
String
val
=
item
.
textValue
();
if
(
val
.
contains
(
":"
))
{
final
String
val
=
item
.
textValue
()
.
trim
()
;
if
(
splitInstCode
&&
val
.
contains
(
":"
))
{
final
String
[]
s
=
val
.
split
(
":"
,
2
);
alias
.
usedBy
=
s
[
0
].
trim
();
alias
.
name
=
s
[
1
].
trim
();
}
else
{
alias
.
name
=
item
.
textValue
().
trim
()
;
alias
.
name
=
val
;
}
alias
.
type
=
aliasType
.
getId
();
aliases
.
add
(
alias
);
...
...
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