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
c7c218a4
Commit
c7c218a4
authored
Apr 08, 2014
by
Matija Obreza
Browse files
Fixed
#19
parent
67e6a1e8
Changes
6
Hide whitespace changes
Inline
Side-by-side
src/main/java/org/genesys2/server/service/GenesysService.java
View file @
c7c218a4
...
...
@@ -104,9 +104,9 @@ public interface GenesysService {
Page
<
Accession
>
listAccessionsByInstituteAndSpecies
(
FaoInstitute
institute
,
long
taxSpecies
,
Pageable
pageable
);
Page
<
Accession
>
listAccessionsByTax
Specie
s
(
long
tax
Specie
sId
,
Pageable
pageable
);
Page
<
Accession
>
listAccessionsByTax
Genu
s
(
long
tax
Genu
sId
,
Pageable
pageable
);
Page
<
Accession
>
listAccessionsBy
Genus
(
String
genus
,
Pageable
pageable
);
Page
<
Accession
>
listAccessionsBy
TaxSpecies
(
long
taxSpeciesId
,
Pageable
pageable
);
Page
<
Accession
>
listAccessions
(
Pageable
pageable
);
...
...
src/main/java/org/genesys2/server/service/impl/DirectMysqlQuery.java
View file @
c7c218a4
...
...
@@ -94,7 +94,8 @@ public class DirectMysqlQuery {
}
protected
DirectMysqlQuery
filter
(
ObjectNode
jsonTree
,
MethodResolver
methodResolver
)
{
createQuery
(
whereBuffer
,
"a.taxSpecies"
,
jsonTree
.
get
(
"species"
),
params
);
createQuery
(
whereBuffer
,
"a.taxGenus"
,
jsonTree
.
get
(
"genusId"
),
params
);
createQuery
(
whereBuffer
,
"a.taxSpecies"
,
jsonTree
.
get
(
"speciesId"
),
params
);
createQuery
(
whereBuffer
,
"a.acceNumb"
,
jsonTree
.
get
(
"acceNumb"
),
params
);
createQuery
(
whereBuffer
,
"a.orgCty"
,
jsonTree
.
get
(
"orgCty"
),
params
);
createQuery
(
whereBuffer
,
"a.instCode"
,
jsonTree
.
get
(
"instCode"
),
params
);
...
...
src/main/java/org/genesys2/server/service/impl/GenesysServiceImpl.java
View file @
c7c218a4
...
...
@@ -390,8 +390,7 @@ public class GenesysServiceImpl implements GenesysService, TraitService, Dataset
}
@Override
public
Page
<
Accession
>
listAccessionsByGenus
(
String
genus
,
Pageable
pageable
)
{
long
taxGenusId
=
taxonomyService
.
getTaxonomy2Id
(
genus
);
public
Page
<
Accession
>
listAccessionsByTaxGenus
(
long
taxGenusId
,
Pageable
pageable
)
{
return
accessionRepository
.
findByTaxGenus
(
taxGenusId
,
pageable
);
}
...
...
src/main/java/org/genesys2/server/servlet/controller/AccessionController.java
View file @
c7c218a4
...
...
@@ -123,7 +123,6 @@ public class AccessionController extends BaseController {
* @param model
* @param wiewsCode
* @param genus
* @param species
* @param page
* @return
*/
...
...
@@ -131,15 +130,25 @@ public class AccessionController extends BaseController {
public
String
viewDataByGenus
(
ModelMap
model
,
@PathVariable
(
value
=
"genus"
)
String
genus
,
@RequestParam
(
value
=
"page"
,
required
=
false
,
defaultValue
=
"1"
)
int
page
)
{
// Taxonomy
long
taxGenusId
;
try
{
taxGenusId
=
taxonomyService
.
getTaxonomy2Id
(
genus
);
}
catch
(
NullPointerException
e
)
{
throw
new
ResourceNotFoundException
(
"No taxonomy with genus="
+
genus
);
}
HashMap
<
Object
,
Object
>
filters
=
new
HashMap
<
Object
,
Object
>();
filters
.
put
(
"filter.genus"
,
genus
);
model
.
addAttribute
(
"filters"
,
filters
);
Page
<
Accession
>
accessions
=
genesysService
.
listAccessionsByGenus
(
g
enus
,
new
PageRequest
(
page
-
1
,
50
,
new
Sort
(
"accessionName"
)));
Page
<
Accession
>
accessions
=
genesysService
.
listAccessionsBy
Tax
Genus
(
taxG
enus
Id
,
new
PageRequest
(
page
-
1
,
50
,
new
Sort
(
"accessionName"
)));
_logger
.
info
(
"Got: "
+
accessions
);
model
.
addAttribute
(
"pagedData"
,
accessions
);
model
.
addAttribute
(
"jsonFilter"
,
"{\"genusId\":[\""
+
taxGenusId
+
"\"]}"
);
return
"/accession/data"
;
}
...
...
@@ -158,19 +167,24 @@ public class AccessionController extends BaseController {
@RequestParam
(
value
=
"page"
,
required
=
false
,
defaultValue
=
"1"
)
int
page
)
{
// Taxonomy
long
taxSpeciesId
=
taxonomyService
.
getTaxonomy2Id
(
genus
,
species
);
long
taxSpeciesId
;
try
{
taxSpeciesId
=
taxonomyService
.
getTaxonomy2Id
(
genus
,
species
);
}
catch
(
NullPointerException
e
)
{
throw
new
ResourceNotFoundException
(
"No taxonomy with genus="
+
genus
+
" and species="
+
species
);
}
HashMap
<
Object
,
Object
>
filters
=
new
HashMap
<
Object
,
Object
>();
model
.
addAttribute
(
"filters"
,
filters
);
filters
.
put
(
"filter.tax
onomy"
,
taxS
pecies
Id
);
filters
.
put
(
"filter.tax
Species"
,
genus
+
" "
+
s
pecies
);
Page
<
Accession
>
accessions
=
genesysService
.
listAccessionsByTaxSpecies
(
taxSpeciesId
,
new
PageRequest
(
page
-
1
,
50
,
new
Sort
(
"accessionName"
)));
_logger
.
info
(
"Got: "
+
accessions
);
model
.
addAttribute
(
"pagedData"
,
accessions
);
model
.
addAttribute
(
"jsonFilter"
,
"{\"species\":[\""
+
taxSpeciesId
+
"\"]}"
);
model
.
addAttribute
(
"jsonFilter"
,
"{\"species
Id
\":[\""
+
taxSpeciesId
+
"\"]}"
);
return
"/accession/data"
;
}
...
...
src/main/java/org/genesys2/server/servlet/controller/AdminController.java
View file @
c7c218a4
...
...
@@ -319,7 +319,10 @@ public class AdminController {
public
String
clearTilesCache
()
{
Cache
tileServerCache
=
cacheManager
.
getCache
(
"tileserver"
);
System
.
err
.
println
(
"tileServerCache="
+
tileServerCache
.
getNativeCache
());
@SuppressWarnings
(
"rawtypes"
)
IMap
hazelCache
=
(
IMap
)
tileServerCache
.
getNativeCache
();
LOG
.
info
(
"Tiles cache size="
+
hazelCache
.
size
());
int
count
=
0
;
for
(
Object
key
:
hazelCache
.
keySet
())
{
...
...
src/main/resources/content/language.properties
View file @
c7c218a4
...
...
@@ -326,6 +326,7 @@ filter.latitude=Latitude
filter.longitude
=
Longitude
filter.elevation
=
Elevation
filter.genus
=
Genus
filter.taxSpecies
=
Species
filter.taxon
=
Taxonomy name
filter.inSvalbard
=
In Svalbard
filter.mlsStat
=
In Multilateral System
...
...
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