Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
limbra
limbra
Commits
3786dc78
Commit
3786dc78
authored
Jan 20, 2021
by
LE GAC Renaud
Browse files
Update get_rex_institute to use non delimiting group
parent
f7cdbbb0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
modules/harvest_tools/base.py
modules/harvest_tools/base.py
+1
-1
tests/basis/test_11_harvest_tools_base.py
tests/basis/test_11_harvest_tools_base.py
+4
-4
No files found.
modules/harvest_tools/base.py
View file @
3786dc78
...
...
@@ -104,7 +104,7 @@ def get_rex_institute(db, app):
.
replace
(
"+"
,
"\+"
)
.
replace
(
"?"
,
"\?"
))
val
=
r
"(^|\|){}($|\|)"
.
format
(
val
)
val
=
r
"(
?:
^|\|){}(
?:
$|\|)"
.
format
(
val
)
lst
.
append
(
val
)
...
...
tests/basis/test_11_harvest_tools_base.py
View file @
3786dc78
...
...
@@ -31,10 +31,10 @@ def test_family_name_11001(reccds):
def
test_get_rex_institue_11002
():
val
=
get_rex_institute
(
current
.
db
,
current
.
app
)
assert
val
==
\
r
"(^|\|)Marseille, CPPM($|\|)|"
\
r
"(^|\|)CPPM, Marseille($|\|)|"
\
r
"(^|\|)Centre de Physique des Particules de Marseille \(CPPM\)($|\|)|"
\
r
"(^|\|)Aix Marseille Univ, CNRS/IN2P3, CPPM, Marseille, France($|\|)"
r
"(
?:
^|\|)Marseille, CPPM(
?:
$|\|)|"
\
r
"(
?:
^|\|)CPPM, Marseille(
?:
$|\|)|"
\
r
"(
?:
^|\|)Centre de Physique des Particules de Marseille \(CPPM\)(
?:
$|\|)|"
\
r
"(
?:
^|\|)Aix Marseille Univ, CNRS/IN2P3, CPPM, Marseille, France(
?:
$|\|)"
def
test_order_oais_11003
(
reccds
,
recins
):
...
...
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