Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
caosdb-server
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
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-server
Commits
9b514a83
Verified
Commit
9b514a83
authored
4 years ago
by
Timm Fitschen
Browse files
Options
Downloads
Patches
Plain Diff
Fix Inheritance class
parent
2a6d4db2
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!21
Release v0.4.0
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/main/java/org/caosdb/server/jobs/core/Inheritance.java
+6
-6
6 additions, 6 deletions
src/main/java/org/caosdb/server/jobs/core/Inheritance.java
with
6 additions
and
6 deletions
src/main/java/org/caosdb/server/jobs/core/Inheritance.java
+
6
−
6
View file @
9b514a83
...
...
@@ -24,16 +24,16 @@ package org.caosdb.server.jobs.core;
import
java.util.ArrayList
;
import
java.util.List
;
import
org.caosdb.server.database.backend.transaction.RetrieveFullEntity
;
import
org.caosdb.server.database.backend.transaction.RetrieveFullEntity
Transaction
;
import
org.caosdb.server.entity.Entity
;
import
org.caosdb.server.entity.EntityInterface
;
import
org.caosdb.server.entity.InsertEntity
;
import
org.caosdb.server.entity.Message
;
import
org.caosdb.server.entity.Message.MessageType
;
import
org.caosdb.server.entity.StatementStatus
;
import
org.caosdb.server.entity.UpdateEntity
;
import
org.caosdb.server.entity.wrapper.Property
;
import
org.caosdb.server.jobs.EntityJob
;
import
org.caosdb.server.transaction.Insert
;
import
org.caosdb.server.transaction.Update
;
import
org.caosdb.server.utils.EntityStatus
;
/**
...
...
@@ -63,7 +63,7 @@ public class Inheritance extends EntityJob {
@Override
protected
void
run
()
{
if
(
get
Transaction
()
instanceof
Insert
||
get
Transaction
()
instanceof
Update
)
{
if
(
get
Entity
()
instanceof
Insert
Entity
||
get
Entity
()
instanceof
Update
Entity
)
{
if
(
getEntity
().
hasParents
())
{
final
ArrayList
<
EntityInterface
>
transfer
=
new
ArrayList
<
EntityInterface
>();
parentLoop:
...
...
@@ -87,7 +87,7 @@ public class Inheritance extends EntityJob {
EntityInterface
foreign
=
getEntityByName
(
parent
.
getName
());
if
(
foreign
==
null
)
{
// was not in container -> retrieve from database.
execute
(
new
RetrieveFullEntity
(
parent
));
execute
(
new
RetrieveFullEntity
Transaction
(
parent
));
foreign
=
parent
;
}
...
...
@@ -144,7 +144,7 @@ public class Inheritance extends EntityJob {
}
}
}
else
{
execute
(
new
RetrieveFullEntity
(
validProperty
));
execute
(
new
RetrieveFullEntity
Transaction
(
validProperty
));
}
if
(
validProperty
.
getEntityStatus
()
==
EntityStatus
.
VALID
)
{
collectInheritedProperties
(
transfer
,
validProperty
,
inheritance
);
...
...
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