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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
caosdb
Software
CaosDB Crawler
Commits
c484ec42
Verified
Commit
c484ec42
authored
1 year ago
by
Daniel Hornung
Browse files
Options
Downloads
Patches
Plain Diff
FIX Yet another corner case of referencing resolution resolved.
parent
d42540d0
No related branches found
No related tags found
2 merge requests
!160
STY: styling
,
!157
FIX Yet another corner case of referencing resolution resolved
Pipeline
#47723
failed
1 year ago
Stage: info
Stage: setup
Stage: cert
Stage: style
Stage: test
Changes
1
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/caoscrawler/crawl.py
+7
-0
7 additions, 0 deletions
src/caoscrawler/crawl.py
with
7 additions
and
0 deletions
src/caoscrawler/crawl.py
+
7
−
0
View file @
c484ec42
...
...
@@ -705,9 +705,11 @@ class Crawler(object):
treated_record
=
self
.
treated_records_lookup
.
get_existing
(
record
)
if
treated_record
is
not
None
:
self
.
_merge_identified
(
treated_record
,
record
,
try_to_merge_later
,
all_records
)
all_records
.
remove
(
record
)
referencing_entities
=
self
.
create_reference_mapping
(
all_records
)
else
:
self
.
treated_records_lookup
.
add
(
record
,
None
)
assert
record
.
id
del
flat
[
i
]
# 2. Can it be identified via a path?
elif
record
.
path
is
not
None
:
...
...
@@ -724,10 +726,12 @@ class Crawler(object):
treated_record
=
self
.
treated_records_lookup
.
get_any
(
record
)
if
treated_record
is
not
None
:
self
.
_merge_identified
(
treated_record
,
record
,
try_to_merge_later
,
all_records
)
all_records
.
remove
(
record
)
referencing_entities
=
self
.
create_reference_mapping
(
all_records
)
else
:
# TODO add identifiable if possible
self
.
treated_records_lookup
.
add
(
record
,
None
)
assert
record
.
id
del
flat
[
i
]
entity_was_treated
=
True
...
...
@@ -762,6 +766,7 @@ class Crawler(object):
# describe the same object.
# We merge record into treated_record in order to prevent loss of information
self
.
_merge_identified
(
treated_record
,
record
,
try_to_merge_later
,
all_records
)
all_records
.
remove
(
record
)
referencing_entities
=
self
.
create_reference_mapping
(
all_records
)
del
flat
[
i
]
...
...
@@ -780,6 +785,7 @@ class Crawler(object):
record
.
id
=
identified_record
.
id
record
.
path
=
identified_record
.
path
self
.
treated_records_lookup
.
add
(
record
,
identifiable
)
assert
record
.
id
del
flat
[
i
]
entity_was_treated
=
True
...
...
@@ -788,6 +794,7 @@ class Crawler(object):
# missing record?)
elif
self
.
_has_missing_object_in_references
(
identifiable
,
referencing_entities
):
self
.
treated_records_lookup
.
add
(
record
,
identifiable
)
assert
record
.
id
del
flat
[
i
]
entity_was_treated
=
True
...
...
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