Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Genesys PGR
Genesys Backend
Commits
8c7f843f
Commit
8c7f843f
authored
Sep 20, 2013
by
Matija Obreza
Browse files
Allow dots in species names as PathVariable
parent
82a09912
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/main/java/org/genesys2/server/servlet/controller/AccessionController.java
View file @
8c7f843f
...
...
@@ -84,7 +84,7 @@ public class AccessionController extends BaseController {
return
"/accession/details"
;
}
@RequestMapping
(
"/{holdingInstitute}/{accessionName}"
)
@RequestMapping
(
"/{holdingInstitute}/{accessionName
:.+
}"
)
public
String
viewInstituteAccession
(
ModelMap
model
,
@PathVariable
(
value
=
"holdingInstitute"
)
String
holdingInstitute
,
@PathVariable
(
value
=
"accessionName"
)
String
accessionName
)
{
_logger
.
debug
(
"Viewing ACN "
+
accessionName
);
...
...
@@ -133,7 +133,7 @@ public class AccessionController extends BaseController {
* @param page
* @return
*/
@RequestMapping
(
"/t/{genus}/{species}"
)
@RequestMapping
(
"/t/{genus}/{species
:.+
}"
)
public
String
viewDataByGenusSpecies
(
ModelMap
model
,
@PathVariable
(
value
=
"genus"
)
String
genus
,
@PathVariable
(
value
=
"species"
)
String
species
,
@RequestParam
(
value
=
"page"
,
required
=
false
,
defaultValue
=
"1"
)
int
page
)
{
...
...
src/main/java/org/genesys2/server/servlet/controller/WiewsController.java
View file @
8c7f843f
...
...
@@ -107,7 +107,7 @@ public class WiewsController extends BaseController {
return
"/accession/data"
;
}
@RequestMapping
(
"/{wiewsCode}/t/{genus}/{species}"
)
@RequestMapping
(
"/{wiewsCode}/t/{genus}/{species
:.+
}"
)
public
String
viewDataByGenusSpecies
(
ModelMap
model
,
@PathVariable
(
value
=
"wiewsCode"
)
String
wiewsCode
,
@PathVariable
(
value
=
"genus"
)
String
genus
,
@PathVariable
(
value
=
"species"
)
String
species
,
@RequestParam
(
value
=
"page"
,
required
=
false
,
defaultValue
=
"1"
)
int
page
)
{
_logger
.
debug
(
"Viewing country "
+
wiewsCode
);
...
...
src/main/webapp/WEB-INF/jsp/accession/details.jsp
View file @
8c7f843f
...
...
@@ -48,7 +48,7 @@
</tr>
<tr>
<td><spring:message
code=
"accession.holdingCountry"
/></td>
<td><c:out
value=
"
${
accession
.
institute
.
country
.
name
}
"
/></td>
<td><
a
href=
"
<c:url
value=
"/geo/${accession.institute.country.code3.toLowerCase()}"
/>
"
><
c:out
value=
"
${
accession
.
institute
.
country
.
name
}
"
/></
a></
td>
</tr>
<tr>
<td><spring:message
code=
"accession.accessionName"
/></td>
...
...
@@ -177,9 +177,9 @@
<c:if
test=
"
${
methods
.
size
()
gt
0
}
"
>
<h
2
>
<h
4
>
<spring:message
code=
"accession.methods"
/>
</h
2
>
</h
4
>
<table>
<tbody>
<c:forEach
items=
"
${
methods
}
"
var=
"method"
varStatus=
"status"
>
...
...
@@ -191,7 +191,7 @@
<span
class=
"uom"
><c:out
value=
"
${
method
.
unit
}
"
/></span>
<sup><a
href=
"#metadata-${val.experimentId}"
><c:out
value=
"
${
val
.
experimentId
}
"
/></a></sup>
</div>
</c:forEach></td>
<td><c:out
value=
"
${
method
.
method
}
"
/></td>
<td
class=
"notimportant"
><c:out
value=
"
${
method
.
method
}
"
/></td>
</tr>
</c:forEach>
</tbody>
...
...
@@ -199,9 +199,9 @@
</c:if>
<c:if
test=
"
${
metadatas
.
size
()
gt
0
}
"
>
<h
3
>
<h
4
>
<spring:message
code=
"accession.metadatas"
/>
</h
3
>
</h
4
>
<ul
class=
"funny-list"
>
<c:forEach
items=
"
${
metadatas
}
"
var=
"metadata"
varStatus=
"status"
>
<li
class=
"clearfix targeted ${status.count % 2 == 0 ? 'even' : 'odd'}"
id=
"metadata-${metadata.id}"
>
...
...
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