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
45
Issues
45
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
711a7e56
Commit
711a7e56
authored
Sep 01, 2014
by
Matija Obreza
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
termStatisticsAuto
Layout for filter-block
parent
33e8a08b
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
46 additions
and
17 deletions
+46
-17
src/main/java/org/genesys2/server/service/ElasticService.java
...main/java/org/genesys2/server/service/ElasticService.java
+2
-0
src/main/java/org/genesys2/server/service/impl/ElasticsearchSearchServiceImpl.java
...2/server/service/impl/ElasticsearchSearchServiceImpl.java
+24
-2
src/main/java/org/genesys2/server/servlet/controller/ExplorerController.java
...enesys2/server/servlet/controller/ExplorerController.java
+12
-12
src/main/webapp/html/css/custom.css
src/main/webapp/html/css/custom.css
+8
-3
No files found.
src/main/java/org/genesys2/server/service/ElasticService.java
View file @
711a7e56
...
...
@@ -43,4 +43,6 @@ public interface ElasticService {
TermResult
termStatistics
(
AppliedFilters
appliedFilters
,
String
term
,
int
size
)
throws
SearchException
;
TermResult
termStatisticsAuto
(
AppliedFilters
appliedFilters
,
String
term
,
int
size
)
throws
SearchException
;
}
src/main/java/org/genesys2/server/service/impl/ElasticsearchSearchServiceImpl.java
View file @
711a7e56
...
...
@@ -110,7 +110,6 @@ public class ElasticsearchSearchServiceImpl implements ElasticService, Initializ
throw
new
SearchException
(
e
.
getMessage
(),
e
);
}
}
@Override
public
TermResult
termStatistics
(
AppliedFilters
appliedFilters
,
String
term
,
int
size
)
throws
SearchException
{
...
...
@@ -123,12 +122,35 @@ public class ElasticsearchSearchServiceImpl implements ElasticService, Initializ
try
{
FacetedPage
<
AccessionDetails
>
page
=
elasticsearchTemplate
.
queryForPage
(
searchQuery
,
AccessionDetails
.
class
);
return
(
TermResult
)
page
.
getFacet
(
"f"
);
}
catch
(
Throwable
e
)
{
throw
new
SearchException
(
e
.
getMessage
(),
e
);
}
}
/**
* Runs TermFacet, but will automatically increase size if #otherCount is
* more than 10%
*/
@Override
public
TermResult
termStatisticsAuto
(
AppliedFilters
appliedFilters
,
String
term
,
int
size
)
throws
SearchException
{
TermResult
termResult
=
null
;
int
newSize
=
size
;
do
{
termResult
=
termStatistics
(
appliedFilters
,
term
,
newSize
);
// Avoid div/0
if
(
termResult
.
getTotalCount
()
==
0
)
break
;
double
otherPerc
=
(
double
)
termResult
.
getOtherCount
()
/
(
termResult
.
getMissingCount
()
+
termResult
.
getTotalCount
());
if
(
otherPerc
<
0.1
)
break
;
newSize
+=
size
+
Math
.
max
(
1
,
(
size
/
3
));
}
while
(
newSize
<
2
*
size
);
return
termResult
;
}
private
AndFilterBuilder
getFilterBuilder
(
AppliedFilters
appliedFilters
)
{
AndFilterBuilder
filterBuilder
=
FilterBuilders
.
andFilter
();
for
(
AppliedFilter
appliedFilter
:
appliedFilters
)
{
...
...
src/main/java/org/genesys2/server/servlet/controller/ExplorerController.java
View file @
711a7e56
...
...
@@ -465,30 +465,30 @@ public class ExplorerController extends BaseController {
}
private
void
overviewInstitutes
(
ModelMap
model
,
AppliedFilters
appliedFilters
)
throws
SearchException
{
model
.
addAttribute
(
"statsInstCode"
,
elasticService
.
termStatistics
(
appliedFilters
,
FilterConstants
.
INSTCODE
,
10
));
model
.
addAttribute
(
"statsInstCountry"
,
elasticService
.
termStatistics
(
appliedFilters
,
FilterConstants
.
INSTITUTE_COUNTRY_ISO3
,
10
));
model
.
addAttribute
(
"statsInstCode"
,
elasticService
.
termStatistics
Auto
(
appliedFilters
,
FilterConstants
.
INSTCODE
,
10
));
model
.
addAttribute
(
"statsInstCountry"
,
elasticService
.
termStatistics
Auto
(
appliedFilters
,
FilterConstants
.
INSTITUTE_COUNTRY_ISO3
,
10
));
}
private
void
overviewSources
(
ModelMap
model
,
AppliedFilters
appliedFilters
)
throws
SearchException
{
model
.
addAttribute
(
"statsOrgCty"
,
elasticService
.
termStatistics
(
appliedFilters
,
FilterConstants
.
ORGCTY_ISO3
,
10
));
model
.
addAttribute
(
"statsDonorCode"
,
elasticService
.
termStatistics
(
appliedFilters
,
FilterConstants
.
DONORCODE
,
10
));
model
.
addAttribute
(
"statsOrgCty"
,
elasticService
.
termStatistics
Auto
(
appliedFilters
,
FilterConstants
.
ORGCTY_ISO3
,
10
));
model
.
addAttribute
(
"statsDonorCode"
,
elasticService
.
termStatistics
Auto
(
appliedFilters
,
FilterConstants
.
DONORCODE
,
10
));
}
private
void
overviewAvailability
(
ModelMap
model
,
AppliedFilters
appliedFilters
)
throws
SearchException
{
model
.
addAttribute
(
"statsMLS"
,
elasticService
.
termStatistics
(
appliedFilters
,
FilterConstants
.
MLSSTATUS
,
2
));
model
.
addAttribute
(
"statsAvailable"
,
elasticService
.
termStatistics
(
appliedFilters
,
FilterConstants
.
AVAILABLE
,
2
));
model
.
addAttribute
(
"statsMLS"
,
elasticService
.
termStatistics
Auto
(
appliedFilters
,
FilterConstants
.
MLSSTATUS
,
2
));
model
.
addAttribute
(
"statsAvailable"
,
elasticService
.
termStatistics
Auto
(
appliedFilters
,
FilterConstants
.
AVAILABLE
,
2
));
}
private
void
overviewManagement
(
ModelMap
model
,
AppliedFilters
appliedFilters
)
throws
SearchException
{
model
.
addAttribute
(
"statsStorage"
,
elasticService
.
termStatistics
(
appliedFilters
,
FilterConstants
.
STORAGE
,
1
0
));
model
.
addAttribute
(
"statsDuplSite"
,
elasticService
.
termStatistics
(
appliedFilters
,
FilterConstants
.
DUPLSITE
,
10
));
model
.
addAttribute
(
"statsStorage"
,
elasticService
.
termStatistics
Auto
(
appliedFilters
,
FilterConstants
.
STORAGE
,
3
0
));
model
.
addAttribute
(
"statsDuplSite"
,
elasticService
.
termStatistics
Auto
(
appliedFilters
,
FilterConstants
.
DUPLSITE
,
10
));
}
private
void
overviewComposition
(
ModelMap
model
,
AppliedFilters
appliedFilters
)
throws
SearchException
{
model
.
addAttribute
(
"statsGenus"
,
elasticService
.
termStatistics
(
appliedFilters
,
FilterConstants
.
TAXONOMY_GENUS
,
10
));
model
.
addAttribute
(
"statsSpecies"
,
elasticService
.
termStatistics
(
appliedFilters
,
FilterConstants
.
TAXONOMY_SPECIES
,
10
));
model
.
addAttribute
(
"statsCrops"
,
elasticService
.
termStatistics
(
appliedFilters
,
FilterConstants
.
CROPS
,
1
0
));
model
.
addAttribute
(
"statsSampStat"
,
elasticService
.
termStatistics
(
appliedFilters
,
FilterConstants
.
SAMPSTAT
,
1
0
));
model
.
addAttribute
(
"statsGenus"
,
elasticService
.
termStatistics
Auto
(
appliedFilters
,
FilterConstants
.
TAXONOMY_GENUS
,
10
));
model
.
addAttribute
(
"statsSpecies"
,
elasticService
.
termStatistics
Auto
(
appliedFilters
,
FilterConstants
.
TAXONOMY_SPECIES
,
10
));
model
.
addAttribute
(
"statsCrops"
,
elasticService
.
termStatistics
Auto
(
appliedFilters
,
FilterConstants
.
CROPS
,
3
0
));
model
.
addAttribute
(
"statsSampStat"
,
elasticService
.
termStatistics
Auto
(
appliedFilters
,
FilterConstants
.
SAMPSTAT
,
3
0
));
}
}
src/main/webapp/html/css/custom.css
View file @
711a7e56
...
...
@@ -1158,7 +1158,7 @@ html[dir="rtl"] #stats .stat-lists ol li img {
text-transform
:
uppercase
;
}
.applied-filters
{
#allfilters
.applied-filters
{
border-top
:
1px
solid
#c9c9c7
;
border-bottom
:
1px
solid
#c9c9c7
;
color
:
#6f6e69
;
...
...
@@ -1166,6 +1166,10 @@ html[dir="rtl"] #stats .stat-lists ol li img {
margin
:
10px
0
;
}
#allfilters
.applied-filters.disabled
{
padding
:
2px
0
;
}
.filtval
{
background
:
#e6e0c6
url('../images/icon_remove_from_list.png')
no-repeat
top
right
;
cursor
:
pointer
;
...
...
@@ -1176,6 +1180,7 @@ html[dir="rtl"] #stats .stat-lists ol li img {
#allfilters
.disabled
.filter-block
{
padding
:
2px
5px
;
margin
:
2px
0
;
}
#allfilters
.disabled
.filter-block
.filtval
{
...
...
@@ -1341,8 +1346,8 @@ table.crop-details h4 {
#allfilters
.filter-block
{
background
:
#f8f7f5
;
margin
:
5px
0
0
0
;
padding
:
10px
;
margin
:
5px
0
;
padding
:
6px
10px
;
}
#allfilters
.filter-block
.filter-new
,
#allfilters
.filter-block
.filter-apply-btn
{
...
...
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