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
58cb6d5b
Commit
58cb6d5b
authored
Jan 29, 2020
by
LE GAC Renaud
Browse files
Update CheckAndFix to improve REG_CONF_DATES.
parent
f2b0f773
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
13 deletions
+24
-13
modules/harvest_tools/checkandfix.py
modules/harvest_tools/checkandfix.py
+12
-10
tests/basis/test_11_CheckAndFix_proceeding.py
tests/basis/test_11_CheckAndFix_proceeding.py
+12
-3
No files found.
modules/harvest_tools/checkandfix.py
View file @
58cb6d5b
...
...
@@ -57,10 +57,11 @@ MSG_UNKNOWN_COUNTRY = "Reject country is unknown."
MSG_UNKNOWN_PUBLISHER
=
"Reject publisher is unknown."
MSG_WELL_FORMED_DATE
=
"Reject submission date is not well formed"
REG_CONF_DATES_1
=
re
.
compile
(
"(\d+) *-? *(\d+) *([A-Z][a-z]{2}) *(\d{4})"
)
REG_CONF_DATES_1
=
\
re
.
compile
(
"0?(\d+) *-? *0?(\d+) *([A-Z][a-z]{2})[a-z]* *(\d{4})"
)
REG_CONF_DATES_2
=
\
re
.
compile
(
"(\d+) *([A-Z][a-z]{2}) *-? *(\d+) *([A-Z][a-z]{2}) *(\d{4})"
)
re
.
compile
(
"
0?
(\d+) *([A-Z][a-z]{2})
[a-z]*
*-? *
0?
(\d+) *([A-Z][a-z]{2})
[a-z]*
*(\d{4})"
)
REG_DOI
=
re
.
compile
(
r
"\d+\.\d+/([a-zA-Z]+)\.(\d+)\.(\w+)"
)
...
...
@@ -151,18 +152,19 @@ class CheckAndFix(object):
# dates are encoded 29 Feb - 1 Mar 2014
m
=
REG_CONF_DATES_2
.
match
(
val
)
if
not
m
:
raise
ToolException
(
MSG_NO_CONF_DATE
)
if
m
:
fmt
=
"%d-%b-%Y"
fmt
=
"%d-%b-%Y"
val
=
"%s-%s-%s"
%
(
m
.
group
(
1
),
m
.
group
(
2
),
m
.
group
(
5
))
opening
=
datetime
.
strptime
(
val
,
fmt
)
val
=
"%s-%s-%s"
%
(
m
.
group
(
1
),
m
.
group
(
2
),
m
.
group
(
5
))
open
ing
=
datetime
.
strptime
(
val
,
fmt
)
val
=
"%s-%s-%s"
%
(
m
.
group
(
3
),
m
.
group
(
4
),
m
.
group
(
5
))
clos
ing
=
datetime
.
strptime
(
val
,
fmt
)
val
=
"%s-%s-%s"
%
(
m
.
group
(
3
),
m
.
group
(
4
),
m
.
group
(
5
))
closing
=
datetime
.
strptime
(
val
,
fmt
)
return
(
opening
,
closing
)
r
eturn
(
opening
,
closing
)
r
aise
ToolException
(
MSG_NO_CONF_DATE
)
def
_get_reg_institute
(
self
):
"""Get the regular expression defining the affiliation of my institute.
...
...
tests/basis/test_11_CheckAndFix_proceeding.py
View file @
58cb6d5b
...
...
@@ -69,20 +69,29 @@ def test_conference_date_cds_11005(svc, reccds):
assert
reccds
.
conference_dates
()
==
"6-11 Dec 2010"
def
test_conference_date_ins_11006
(
svc
,
recins
):
def
test_conference_date_cds_11006
(
svc
):
reccds
=
load_record
(
"cds.cern.ch"
,
2688580
)
assert
reccds
.
conference_dates
()
==
"04-06 Sept 2019"
svc
.
conference_date
(
reccds
)
assert
reccds
.
conference_dates
()
==
"4-6 Sep 2019"
def
test_conference_date_ins_11007
(
svc
,
recins
):
assert
recins
.
conference_dates
()
==
"6-11 Dec 2010"
svc
.
conference_date
(
recins
)
assert
recins
.
conference_dates
()
==
"6-11 Dec 2010"
def
test_submitted_cds_1100
7
(
svc
,
reccds
):
def
test_submitted_cds_1100
8
(
svc
,
reccds
):
assert
reccds
.
submitted
()
==
"05 Jan 2012"
svc
.
submitted
(
reccds
)
assert
reccds
.
submitted
()
==
"2012-01-05"
def
test_submitted_ins_1100
8
(
svc
,
recins
):
def
test_submitted_ins_1100
9
(
svc
,
recins
):
assert
recins
.
submitted
()
==
"2011"
svc
.
submitted
(
recins
)
assert
recins
.
submitted
()
==
"2010-12-06"
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