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
a32e0be5
Commit
a32e0be5
authored
Dec 02, 2015
by
Matija Obreza
Browse files
Fixed broken build
parent
374f6a48
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/main/java/org/genesys2/server/service/impl/PDCICalculator.java
View file @
a32e0be5
...
...
@@ -205,27 +205,27 @@ public class PDCICalculator implements InitializingBean {
}
if
(
coll
!=
null
)
{
if
(
StringUtils
.
isNotBlank
(
coll
.
c
ollSite
))
{
if
(
StringUtils
.
isNotBlank
(
coll
.
getC
ollSite
()
))
{
if
(
hasLatLng
)
pdci
.
setCollSite
(
20
);
else
pdci
.
setCollSite
(
70
);
}
if
(
StringUtils
.
isNotBlank
(
coll
.
c
ollDate
))
{
if
(
StringUtils
.
isNotBlank
(
coll
.
getC
ollDate
()
))
{
pdci
.
setCollDate
(
30
);
}
if
(
coll
.
c
ollSrc
!=
null
)
{
if
(
coll
.
getC
ollSrc
()
!=
null
)
{
pdci
.
setCollSrc
(
30
);
}
if
(
StringUtils
.
isNotBlank
(
coll
.
c
ollNumb
))
{
if
(
StringUtils
.
isNotBlank
(
coll
.
getC
ollNumb
()
))
{
pdci
.
setCollNumb
(
60
);
}
if
(
coll
.
c
ollCode
!=
null
&&
coll
.
c
ollCode
.
size
()
>
0
)
{
if
(
coll
.
getC
ollCode
()
!=
null
&&
coll
.
getC
ollCode
()
.
size
()
>
0
)
{
pdci
.
setCollCode
(
40
);
}
else
{
if
(
StringUtils
.
isNotBlank
(
coll
.
c
ollName
))
{
if
(
StringUtils
.
isNotBlank
(
coll
.
getC
ollName
()
))
{
pdci
.
setCollName
(
20
);
}
}
...
...
@@ -255,14 +255,14 @@ public class PDCICalculator implements InitializingBean {
}
if
(
coll
!=
null
)
{
if
(
StringUtils
.
isNotBlank
(
coll
.
c
ollSite
))
{
if
(
StringUtils
.
isNotBlank
(
coll
.
getC
ollSite
()
))
{
if
(
hasLatLng
)
pdci
.
setCollSite
(
15
);
else
pdci
.
setCollSite
(
45
);
}
if
(
StringUtils
.
isNotBlank
(
coll
.
c
ollDate
))
{
if
(
StringUtils
.
isNotBlank
(
coll
.
getC
ollDate
()
))
{
pdci
.
setCollDate
(
30
);
}
...
...
@@ -270,7 +270,7 @@ public class PDCICalculator implements InitializingBean {
pdci
.
setAncest
(
10
);
}
if
(
coll
.
c
ollSrc
!=
null
)
{
if
(
coll
.
getC
ollSrc
()
!=
null
)
{
pdci
.
setCollSrc
(
50
);
}
...
...
@@ -278,13 +278,13 @@ public class PDCICalculator implements InitializingBean {
pdci
.
setAcceName
(
50
);
}
if
(
StringUtils
.
isNotBlank
(
coll
.
c
ollNumb
))
{
if
(
StringUtils
.
isNotBlank
(
coll
.
getC
ollNumb
()
))
{
pdci
.
setCollNumb
(
40
);
}
if
(
coll
.
c
ollCode
!=
null
&&
coll
.
c
ollCode
.
size
()
>
0
)
{
if
(
coll
.
getC
ollCode
()
!=
null
&&
coll
.
getC
ollCode
()
.
size
()
>
0
)
{
pdci
.
setCollCode
(
30
);
}
else
{
if
(
StringUtils
.
isNotBlank
(
coll
.
c
ollName
))
{
if
(
StringUtils
.
isNotBlank
(
coll
.
getC
ollName
()
))
{
pdci
.
setCollName
(
15
);
}
}
...
...
@@ -307,13 +307,13 @@ public class PDCICalculator implements InitializingBean {
}
if
(
coll
!=
null
)
{
if
(
StringUtils
.
isNotBlank
(
coll
.
c
ollSite
))
{
if
(
StringUtils
.
isNotBlank
(
coll
.
getC
ollSite
()
))
{
}
if
(
StringUtils
.
isNotBlank
(
coll
.
c
ollDate
))
{
if
(
StringUtils
.
isNotBlank
(
coll
.
getC
ollDate
()
))
{
}
if
(
coll
.
c
ollSrc
!=
null
)
{
if
(
coll
.
getC
ollSrc
()
!=
null
)
{
pdci
.
setCollSrc
(
20
);
}
...
...
@@ -321,10 +321,10 @@ public class PDCICalculator implements InitializingBean {
pdci
.
setAcceName
(
80
);
}
if
(
StringUtils
.
isNotBlank
(
coll
.
c
ollNumb
))
{
if
(
StringUtils
.
isNotBlank
(
coll
.
getC
ollNumb
()
))
{
}
if
(
coll
.
c
ollCode
!=
null
&&
coll
.
c
ollCode
.
size
()
>
0
)
{
if
(
coll
.
getC
ollCode
()
!=
null
&&
coll
.
getC
ollCode
()
.
size
()
>
0
)
{
}
}
}
...
...
@@ -345,13 +345,13 @@ public class PDCICalculator implements InitializingBean {
}
if
(
coll
!=
null
)
{
if
(
StringUtils
.
isNotBlank
(
coll
.
c
ollSite
))
{
if
(
StringUtils
.
isNotBlank
(
coll
.
getC
ollSite
()
))
{
}
if
(
StringUtils
.
isNotBlank
(
coll
.
c
ollDate
))
{
if
(
StringUtils
.
isNotBlank
(
coll
.
getC
ollDate
()
))
{
}
if
(
coll
.
c
ollSrc
!=
null
)
{
if
(
coll
.
getC
ollSrc
()
!=
null
)
{
pdci
.
setCollSrc
(
20
);
}
...
...
@@ -359,10 +359,10 @@ public class PDCICalculator implements InitializingBean {
pdci
.
setAcceName
(
160
);
}
if
(
StringUtils
.
isNotBlank
(
coll
.
c
ollNumb
))
{
if
(
StringUtils
.
isNotBlank
(
coll
.
getC
ollNumb
()
))
{
}
if
(
coll
.
c
ollCode
!=
null
&&
coll
.
c
ollCode
.
size
()
>
0
)
{
if
(
coll
.
getC
ollCode
()
!=
null
&&
coll
.
getC
ollCode
()
.
size
()
>
0
)
{
}
}
}
...
...
@@ -402,28 +402,28 @@ public class PDCICalculator implements InitializingBean {
}
if
(
coll
!=
null
)
{
if
(
StringUtils
.
isNotBlank
(
coll
.
c
ollSite
))
{
if
(
StringUtils
.
isNotBlank
(
coll
.
getC
ollSite
()
))
{
if
(
hasLatLng
)
pdci
.
setCollSite
(
10
);
else
pdci
.
setCollSite
(
20
);
}
if
(
StringUtils
.
isNotBlank
(
coll
.
c
ollDate
))
{
if
(
StringUtils
.
isNotBlank
(
coll
.
getC
ollDate
()
))
{
pdci
.
setCollDate
(
10
);
}
if
(
coll
.
c
ollSrc
!=
null
)
{
if
(
coll
.
getC
ollSrc
()
!=
null
)
{
pdci
.
setCollSrc
(
25
);
}
if
(
StringUtils
.
isNotBlank
(
coll
.
c
ollNumb
))
{
if
(
StringUtils
.
isNotBlank
(
coll
.
getC
ollNumb
()
))
{
pdci
.
setCollNumb
(
20
);
}
if
(
coll
.
c
ollCode
!=
null
&&
coll
.
c
ollCode
.
size
()
>
0
)
{
if
(
coll
.
getC
ollCode
()
!=
null
&&
coll
.
getC
ollCode
()
.
size
()
>
0
)
{
pdci
.
setCollCode
(
20
);
}
else
{
if
(
StringUtils
.
isNotBlank
(
coll
.
c
ollName
))
{
if
(
StringUtils
.
isNotBlank
(
coll
.
getC
ollName
()
))
{
pdci
.
setCollName
(
10
);
}
}
...
...
src/test/java/org/genesys2/server/service/impl/ElasticsearchTest.java
View file @
a32e0be5
...
...
@@ -364,7 +364,7 @@ public class ElasticsearchTest {
Page
<
AccessionDetails
>
a
=
elasticService
.
filter
(
filters
,
new
PageRequest
(
0
,
100
));
LOG
.
info
(
"Size: "
+
a
.
getNumberOfElements
()
+
" total="
+
a
.
getTotalElements
());
for
(
AccessionDetails
aa
:
a
.
getContent
())
{
assertTrue
(
aa
.
getColl
().
c
ollMissId
.
equals
(
"SDC-CLVNET GERMPLASM COLLECTING PROJECT"
));
assertTrue
(
aa
.
getColl
().
getC
ollMissId
()
.
equals
(
"SDC-CLVNET GERMPLASM COLLECTING PROJECT"
));
LOG
.
info
(
mapper
.
writeValueAsString
(
aa
));
}
}
...
...
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