Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
CaosDB Crawler
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
caosdb
Software
CaosDB Crawler
Commits
7a4935c0
Commit
7a4935c0
authored
7 months ago
by
Alexander Schlemmer
Browse files
Options
Downloads
Patches
Plain Diff
FIX: correct dict in match_properties of DictElementConverter
parent
02340e8b
No related branches found
No related tags found
2 merge requests
!217
TST: Make NamedTemporaryFiles Windows-compatible
,
!199
Match properties feature for DictElementConverter
Pipeline
#57627
passed
7 months ago
Stage: info
Stage: setup
Stage: cert
Stage: style
Stage: test
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/caoscrawler/converters/converters.py
+6
-3
6 additions, 3 deletions
src/caoscrawler/converters/converters.py
with
6 additions
and
3 deletions
src/caoscrawler/converters/converters.py
+
6
−
3
View file @
7a4935c0
...
@@ -507,11 +507,14 @@ class Converter(object, metaclass=ABCMeta):
...
@@ -507,11 +507,14 @@ class Converter(object, metaclass=ABCMeta):
matched_m_prop
=
None
matched_m_prop
=
None
matched_m_prop_value
=
None
matched_m_prop_value
=
None
for
prop_key
,
prop_value
in
properties
.
items
():
for
prop_key
,
prop_value
in
properties
.
items
():
m_prop
=
re
.
match
(
prop_def_key
,
prop_key
)
print
(
"
{} = {}
"
.
format
(
prop_key
,
prop_value
))
# TODO: automatic conversion to str ok?
m_prop
=
re
.
match
(
prop_def_key
,
str
(
prop_key
))
if
m_prop
is
not
None
:
if
m_prop
is
not
None
:
match_counter
+=
1
match_counter
+=
1
matched_m_prop
=
m_prop
matched_m_prop
=
m_prop
m_prop_value
=
re
.
match
(
prop_def_value
,
prop_value
)
# TODO: automatic conversion to str ok?
m_prop_value
=
re
.
match
(
prop_def_value
,
str
(
prop_value
))
if
m_prop_value
is
None
:
if
m_prop_value
is
None
:
return
False
return
False
matched_m_prop_value
=
m_prop_value
matched_m_prop_value
=
m_prop_value
...
@@ -952,7 +955,7 @@ class DictElementConverter(Converter):
...
@@ -952,7 +955,7 @@ class DictElementConverter(Converter):
raise
RuntimeError
(
"
Element must be a DictElement.
"
)
raise
RuntimeError
(
"
Element must be a DictElement.
"
)
vardict
=
match_name_and_value
(
self
.
definition
,
element
.
name
,
element
.
value
)
vardict
=
match_name_and_value
(
self
.
definition
,
element
.
name
,
element
.
value
)
if
not
self
.
match_properties
(
element
.
value
.
items
()
,
vardict
):
if
not
self
.
match_properties
(
element
.
value
,
vardict
):
return
None
return
None
return
vardict
return
vardict
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment