Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Genesys PGR
Genesys Backend
Commits
f406d4f9
Commit
f406d4f9
authored
May 05, 2014
by
Matija Obreza
Browse files
Using AccessionAlias#usedBy instead of #instCode
parent
0012117c
Changes
5
Hide whitespace changes
Inline
Side-by-side
src/main/java/org/genesys2/server/model/genesys/AccessionAlias.java
View file @
f406d4f9
...
...
@@ -76,7 +76,7 @@ public class AccessionAlias extends BusinessModel {
@Field
(
name
=
"title"
,
store
=
Store
.
NO
)
private
String
name
;
@Column
(
length
=
7
)
@Column
(
length
=
10
)
private
String
instCode
;
@Column
...
...
@@ -85,6 +85,9 @@ public class AccessionAlias extends BusinessModel {
@Column
(
length
=
2
)
private
String
lang
;
@Column
(
length
=
64
)
private
String
usedBy
;
public
AccessionAlias
()
{
}
...
...
@@ -135,4 +138,12 @@ public class AccessionAlias extends BusinessModel {
public
void
setLang
(
String
lang
)
{
this
.
lang
=
lang
;
}
public
String
getUsedBy
()
{
return
usedBy
;
}
public
void
setUsedBy
(
String
usedBy
)
{
this
.
usedBy
=
usedBy
;
}
}
src/main/java/org/genesys2/server/model/genesys/AccessionExchange.java
View file @
f406d4f9
...
...
@@ -46,7 +46,7 @@ public class AccessionExchange extends BusinessModel {
@Column
(
name
=
"donorName"
,
length
=
200
)
private
String
donorName
;
@Column
(
name
=
"acceNumb"
,
length
=
36
)
@Column
(
name
=
"acceNumb"
,
length
=
200
)
private
String
accNumbDonor
;
public
AccessionExchange
()
{
...
...
src/main/java/org/genesys2/server/service/impl/GenesysServiceImpl.java
View file @
f406d4f9
...
...
@@ -1298,10 +1298,10 @@ public class GenesysServiceImpl implements GenesysService, TraitService, Dataset
if
(
StringUtils
.
isBlank
(
oin
[
1
]))
{
continue
;
}
alias
.
set
InstCode
(
StringUtils
.
defaultIfBlank
(
oin
[
0
].
trim
(),
null
));
alias
.
set
UsedBy
(
StringUtils
.
defaultIfBlank
(
oin
[
0
].
trim
(),
null
));
if
(
alias
.
get
InstCode
()
!=
null
&&
alias
.
get
InstCode
().
length
()
>
7
)
{
LOG
.
warn
(
"Invalid instCode: "
+
alias
.
get
InstCode
()
+
" in="
+
oi
);
if
(
alias
.
get
UsedBy
()
!=
null
&&
alias
.
get
UsedBy
().
length
()
>
7
)
{
LOG
.
warn
(
"Invalid instCode: "
+
alias
.
get
UsedBy
()
+
" in="
+
oi
);
continue
;
}
...
...
src/main/java/org/genesys2/server/servlet/controller/rest/model/AccessionAliasJson.java
View file @
f406d4f9
...
...
@@ -18,11 +18,12 @@ package org.genesys2.server.servlet.controller.rest.model;
public
class
AccessionAliasJson
{
public
String
name
;
public
String
usedBy
;
public
String
instCode
;
public
int
type
=
0
;
@Override
public
String
toString
()
{
return
""
+
name
+
"@"
+
instCode
;
return
""
+
name
+
"@"
+
usedBy
;
}
}
src/main/webapp/WEB-INF/jsp/accession/details.jsp
View file @
f406d4f9
...
...
@@ -155,6 +155,9 @@
${accessionAlias.instCode}
</a>
</c:if>
<c:if
test=
"
${
accessionAlias
.
usedBy
!=
''
}
"
>
${accessionAlias.usedBy}
</c:if>
<c:if
test=
"
${
accessionAlias
.
lang
!=
''
}
"
>
<c:out
value=
"
${
accessionAlias
.
lang
}
"
/>
</c:if>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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