From 769db33eaa18bff9fd4504c229304fa357dbcf45 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Wed, 14 Dec 2022 15:32:00 +0100
Subject: [PATCH] WIP: file storage: link
---
src/caosdb/common/models.py | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/caosdb/common/models.py b/src/caosdb/common/models.py
index 4b4e8181..42861bf1 100644
--- a/src/caosdb/common/models.py
+++ b/src/caosdb/common/models.py
@@ -298,9 +298,9 @@ class Entity(object):
return self._wrapped_entity.path
- @link_target.setter
- def link_target(self, new_link_target):
- self.__link_target = new_link_target
+ @path.setter
+ def path(self, new_path):
+ self.__path = new_path
@property
def link_target(self):
@@ -309,9 +309,9 @@ class Entity(object):
return self._wrapped_entity.link_target
- @path.setter
- def path(self, new_path):
- self.__path = new_path
+ @link_target.setter
+ def link_target(self, new_link_target):
+ self.__link_target = new_link_target
@property
def thumbnail(self):
@@ -1076,7 +1076,7 @@ class Entity(object):
xml.set("file", self.file)
if self.link_target is not None:
- xml.set("linktarget", self.link_target)
+ xml.set("linktarget", str(self.link_target))
if self.checksum is not None:
xml.set("checksum", self.checksum)
@@ -1132,6 +1132,7 @@ class Entity(object):
entity.description = elem.get("description")
entity.path = elem.get("path")
entity._checksum = elem.get("checksum")
+ entity.link_target = elem.get("linktarget")
entity._size = elem.get("size")
entity.datatype = elem.get("datatype") # @ReservedAssignment
entity.unit = elem.get("unit")
@@ -1835,7 +1836,8 @@ class Record(Entity):
class Link(Entity):
"""This class represents CaosDB's link entities."""
- def __init__(self, name=None, id=None, description=None, path=None, target=None)
+ def __init__(self, name=None, id=None, description=None, path=None,
+ target=None):
Record.__init__(self, id=id, name=name, description=description)
self.role = "Link"
self.datatype = None
@@ -1923,6 +1925,7 @@ class File(Record):
thumbnail : str
Deprecated.
"""
+
def __init__(self, name=None, id=None, description=None,
path=None, file=None, pickup=None,
thumbnail=None):
--
GitLab