Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
caosdb-advanced-user-tools
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-advanced-user-tools
Commits
92588f0d
Commit
92588f0d
authored
5 years ago
by
Henrik tom Wörden
Browse files
Options
Downloads
Patches
Plain Diff
API: assure_object_is_in_list allows list of values
parent
a6392966
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/caosadvancedtools/cfood.py
+42
-15
42 additions, 15 deletions
src/caosadvancedtools/cfood.py
src/caosadvancedtools/crawler.py
+5
-0
5 additions, 0 deletions
src/caosadvancedtools/crawler.py
with
47 additions
and
15 deletions
src/caosadvancedtools/cfood.py
+
42
−
15
View file @
92588f0d
...
...
@@ -78,6 +78,7 @@ class AbstractCFood(object):
self
.
to_be_updated
=
db
.
Container
()
self
.
identifiables
=
db
.
Container
()
self
.
verbose
=
verbose
self
.
attached_ones
=
[]
@staticmethod
def
get_re
():
...
...
@@ -129,6 +130,16 @@ class AbstractCFood(object):
get_ids_for_entities_with_names
(
self
.
to_be_updated
)
self
.
to_be_updated
.
update
()
def
attach
(
self
,
crawled_file
):
self
.
attached_ones
.
append
(
crawled_file
)
def
looking_for
(
self
,
crawled_file
):
"""
should set the instance variable Container with the identifiables
"""
return
False
@staticmethod
# move to api?
def
set_parents
(
entity
,
names
):
...
...
@@ -173,32 +184,48 @@ def assure_object_is_in_list(obj, containing_object, property_name,
`containing_object` should be updated.
If the property is missing, it is added first and then the entity is added.
If obj is a list, every element is added
"""
if
containing_object
.
get_property
(
property_name
)
is
None
:
containing_object
.
add_property
(
property_name
,
value
=
[],
datatype
=
db
.
LIST
(
property_name
))
current_list
=
containing_object
.
get_property
(
property_name
).
value
contained
=
False
for
el
in
current_list
:
if
el
==
obj
:
contained
=
True
if
not
isinstance
(
current_list
,
list
):
current_list
=
[
current_list
]
break
if
not
isinstance
(
obj
,
list
):
objects
=
[
obj
]
else
:
objects
=
obj
if
contained
:
if
verbose
:
print
(
"
{} is in {} of entity {}
"
.
format
(
obj
,
property_name
,
containing_object
.
id
))
update
=
False
return
for
o
in
objects
:
contained
=
False
if
verbose
:
print
(
"
Appending {} to {} of entity {}
"
.
format
(
obj
,
property_name
,
containing_object
.
id
))
current_list
.
append
(
obj
)
to_be_updated
.
append
(
containing_object
)
for
el
in
current_list
:
if
el
==
o
:
contained
=
True
break
if
verbose
:
if
contained
:
print
(
"
{} is in {} of entity {}
"
.
format
(
o
,
property_name
,
containing_object
.
id
))
else
:
print
(
"
Appending {} to {} of entity {}
"
.
format
(
o
,
property_name
,
containing_object
.
id
))
if
not
contained
:
current_list
.
append
(
o
)
update
=
True
if
update
:
to_be_updated
.
append
(
containing_object
)
def
assure_has_parent
(
entity
,
parent
,
to_be_updated
=
None
,
verbose
=
True
):
...
...
This diff is collapsed.
Click to expand it.
src/caosadvancedtools/crawler.py
+
5
−
0
View file @
92588f0d
...
...
@@ -106,6 +106,11 @@ class Crawler(object):
if
self
.
verbose
and
matches
>
1
:
print
(
"
Attention: More than one matching cfood!
"
)
for
crawled_file
in
sorted
(
files
,
key
=
lambda
x
:
x
.
path
):
for
cfood
in
cfoods
:
if
cfood
.
looking_for
(
crawled_file
):
cfood
.
attach
(
crawled_file
)
for
cfood
in
cfoods
:
try
:
cfood
.
create_identifiables
()
...
...
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