oldaplib 0.4.4__py3-none-any.whl → 0.4.6__py3-none-any.whl

oldaplib/src/enums/{XXXeditor.py → editor.py}

@@ -1,3 +1,4 @@
+import json
 from enum import Enum, unique, EnumMeta
 
 from oldaplib.src.helpers.serializer import serializer
@@ -72,7 +73,3 @@ class Editor(Enum, metaclass=_ValidateEnumMeta):
     def _as_dict(self):
         return {"value": self.value }
 
-
-if __name__ == "__main__":
-    print(Editor(value="dash:TextFieldWithLangEditor"))
-

oldaplib/src/enums/haspropertyattr.py

@@ -1,6 +1,7 @@
 from enum import unique
 
 from oldaplib.src.enums.attributeclass import AttributeClass, Target
+from oldaplib.src.enums.editor import Editor
 from oldaplib.src.xsd.iri import Iri
 from oldaplib.src.xsd.xsd_decimal import Xsd_decimal
 from oldaplib.src.xsd.xsd_integer import Xsd_integer
@@ -16,5 +17,5 @@ class HasPropertyAttr(AttributeClass):
     MAX_COUNT = ('sh:maxCount', False, False, Xsd_integer)
     ORDER = ('sh:order', False, False, Xsd_decimal, Target.SHACL)
     GROUP = ('sh:group', False, False, Xsd_QName, Target.SHACL)
-    EDITOR = ('dash:editor', False, False, Xsd_QName, Target.SHACL)
+    EDITOR = ('dash:editor', False, False, Editor, Target.SHACL)
 

oldaplib/src/enums/language.py

@@ -211,6 +211,11 @@ class Language(Enum):
     def toRdf(self) -> str:
         return f'"{self.name.lower()}"^^xsd:string'
 
+    @property
+    def shortlang(self) -> str:
+        """Return the language short name in lowercase (e.g., 'de' for Language.DE)"""
+        return self.name.lower()
+
 
 if __name__ == "__main__":
     print(Language.EN.toRdf)

oldaplib/src/model.py

@@ -222,7 +222,10 @@ class Model:
                 del self._attributes[attr]
         else:
             if not isinstance(value, attr.datatype):
-                self._attributes[attr] = attr.datatype(value, validate=True)
+                try:
+                    self._attributes[attr] = attr.datatype(value, validate=True)
+                except Exception as err:
+                    raise Exception(f"Failed to set attribute '{attr}' with value '{value}': {err}")
             else:
                 self._attributes[attr] = value
             if hasattr(self._attributes[attr], 'set_notifier') and hasattr(self, 'notifier'):

oldaplib/src/objectfactory.py

@@ -1,11 +1,12 @@
 import re
 import textwrap
+from dataclasses import dataclass
 from pprint import pprint
 
 import jwt
 
 from datetime import datetime, timedelta
-from enum import Flag, auto
+from enum import Flag, auto, Enum
 from functools import partial
 from typing import Type, Any, Self, cast, Dict
 
@@ -24,7 +25,7 @@ from oldaplib.src.helpers.langstring import LangString
 from oldaplib.src.helpers.observable_dict import ObservableDict
 from oldaplib.src.helpers.observable_set import ObservableSet
 from oldaplib.src.helpers.oldaperror import OldapErrorNotFound, OldapErrorValue, OldapErrorInconsistency, \
-    OldapErrorNoPermission, OldapError, OldapErrorUpdateFailed, OldapErrorInUse, OldapErrorAlreadyExists
+    OldapErrorNoPermission, OldapError, OldapErrorUpdateFailed, OldapErrorInUse, OldapErrorAlreadyExists, OldapErrorType
 from oldaplib.src.helpers.query_processor import QueryProcessor
 from oldaplib.src.iconnection import IConnection
 from oldaplib.src.project import Project
@@ -40,10 +41,14 @@ from oldaplib.src.xsd.xsd_string import Xsd_string
 
 ValueType = LangString | ObservableSet | Xsd | Dict[Xsd_QName, DataPermission] | ObservableDict
 
-class SortBy(Flag):
-    PROPVAL = auto()
-    CREATED = auto()
-    LASTMOD = auto()
+class SortDir(str, Enum):
+    asc = "asc"
+    desc = "desc"
+
+@dataclass(frozen=True)
+class SortBy:
+    property: Xsd_QName
+    dir: SortDir = SortDir.asc
 
 
 #@strict
@@ -167,7 +172,7 @@ class ResourceInstance:
                         raise OldapErrorValue(f'{self.name}: Property {prop_iri} with MIN_COUNT={hasprop[HasPropertyAttr.MIN_COUNT]} is missing')
                     elif isinstance(self._values[prop_iri], ObservableSet) and len(self._values[prop_iri]) < 1:
                         raise OldapErrorValue(f'{self.name}: Property {prop_iri} with MIN_COUNT={hasprop[HasPropertyAttr.MIN_COUNT]} is missing')
-                if hasprop.get(HasPropertyAttr.MAX_COUNT):  # testing for MAX_COUNT conformance
+                if hasprop.get(HasPropertyAttr.MAX_COUNT) and hasprop[HasPropertyAttr.MAX_COUNT] > 0:  # testing for MAX_COUNT conformance
                     if isinstance(self._values.get(prop_iri), ObservableSet) and len(self._values[prop_iri]) > hasprop[HasPropertyAttr.MAX_COUNT]:
                         raise OldapErrorValue(f'{self.name}: Property {prop_iri} with MAX_COUNT={hasprop[HasPropertyAttr.MIN_COUNT]} has to many values (n={len(self._values[prop_iri])})')
                 if self._values.get(prop_iri):
@@ -375,12 +380,12 @@ class ResourceInstance:
                 raise OldapErrorValue(
                     f'{self.name}: Property {prop_iri} with MIN_COUNT={hasprop[HasPropertyAttr.MIN_COUNT]} has not enough values (n={n}).')
 
-        if hasprop.get(HasPropertyAttr.MAX_COUNT):  # testing for MAX_COUNT conformance
+        if hasprop.get(HasPropertyAttr.MAX_COUNT) and hasprop[HasPropertyAttr.MAX_COUNT] > 0:  # testing for MAX_COUNT conformance
             n = len(self._values[prop_iri])
             if n > hasprop[HasPropertyAttr.MAX_COUNT]:
                 self._values[prop_iri].undo()
                 raise OldapErrorValue(
-                    f'{self.name}: Property {prop_iri} with MAX_COUNT={hasprop[HasPropertyAttr.MIN_COUNT]} has to many values (n={n}).')
+                    f'{self.name}: Property {prop_iri} with MAX_COUNT={hasprop[HasPropertyAttr.MAX_COUNT]} has to many values (n={n}).')
 
         self._changeset[prop_iri] = AttributeChange(None, Action.MODIFY)
 
@@ -454,7 +459,7 @@ class ResourceInstance:
             elif isinstance(value, (list, tuple, set, ObservableSet)) and len(value) < hasprop[HasPropertyAttr.MIN_COUNT]:
                 raise OldapErrorValue(
                     f'{self.name}: Property {attr} with MIN_COUNT={hasprop[HasPropertyAttr.MIN_COUNT]} has not enough values')
-        if hasprop.get(HasPropertyAttr.MAX_COUNT):  # testing for MAX_COUNT conformance
+        if hasprop.get(HasPropertyAttr.MAX_COUNT) and hasprop[HasPropertyAttr.MAX_COUNT] > 0:  # testing for MAX_COUNT conformance
             if isinstance(value, (list, tuple, set, ObservableSet)) and len(value) > hasprop[HasPropertyAttr.MAX_COUNT]:
                 raise OldapErrorValue(
                     f'{self.name}: Property {attr} with MAX_COUNT={hasprop[HasPropertyAttr.MIN_COUNT]} has to many values (n={len(value)})')
@@ -1095,74 +1100,75 @@ class ResourceInstance:
         for r in res:
             roles[r['role']] = DataPermission.from_qname(r['dataperm'])
         data[Xsd_QName('oldap:attachedToRole')] = roles
-
+        #data[Xsd_QName('virtual:resourceIri')] = iri
         return data
 
     @staticmethod
     def search_fulltext(con: IConnection,
                         projectShortName: Xsd_NCName | str,
-                        s: str,
+                        searchstr: str,
                         resClass: Xsd_QName | str | None = None,
                         countOnly: bool = False,
-                        sortBy: SortBy | None = None,
+                        sortBy: list[SortBy] = [],
                         limit: int = 100,
                         offset: int = 0,
                         indent: int = 0, indent_inc: int = 4) -> int | dict[Iri, dict[str, Xsd]]:
         """
-        Search for entities in a project using a full-text search query, with optional filters and sorting
-        based on resource class and properties.
-
-        :param con: The connection instance to interact with the SPARQL endpoint or database.
-        :type con: IConnection
-        :param projectShortName: The project short name (identifier). Can be provided as an Xsd_NCName or a
-            string. If a string, it is automatically validated and converted to an Xsd_NCName.
-        :type projectShortName: Xsd_NCName | str
-        :param s: The full-text search query to identify entities matching the specified string values.
-        :type s: str
-        :param resClass: An optional entity class (Xsd_QName) used to filter results. If provided as a string,
-            it is validated and converted to Xsd_QName.
-        :type resClass: Xsd_QName | str | None
-        :param countOnly: If True, only the count of matching entities will be returned. Defaults to False.
-        :type countOnly: bool
-        :param sortBy: Optional sorting criterion for the results, such as creation date, last modification date,
-            or property values. Defaults to None.
-        :type sortBy: SortBy | None
-        :param limit: The maximum number of records to return when count_only is False. Defaults to 100.
-        :type limit: int
-        :param offset: The number of records to skip for paginated queries. Defaults to 0.
-        :type offset: int
-        :param indent: Initial indentation level for the generated SPARQL query. Defaults to 0.
-        :type indent: int
-        :param indent_inc: Incremental indentation used during SPARQL query generation. Defaults to 4.
-        :type indent_inc: int
-        :return: If count_only is True, an integer representing the count of matching entities. If count_only is
-            False, a dictionary with entity IRIs as keys and their respective property-to-value mappings
-            as values.
-        :rtype: int | dict[Iri, dict[str, Xsd]]
-
-        The SPARQL generated is as follows
-
-        ```sparql
-        SELECT DISTINCT ?s ?t ?p ?o ?creationDate
-        WHERE {
-            GRAPH test:data {
-                ?s oldap:creationDate ?creationDate .
-                ?s ?p ?o .
-                ?s rdf:type ?t .
-                ?s rdf:type test:Book .
-                ?s oldap:grantsPermission ?permset .
-            }
-            FILTER(isLiteral(?o) && (datatype(?o) = xsd:string || datatype(?o) = rdf:langString || lang(?o) != ""))
-            FILTER(CONTAINS(LCASE(STR(?o)), "gaga"))  # case-insensitive substring match
-            GRAPH oldap:admin {
-                <https://orcid.org/0000-0003-1681-4036> oldap:hasPermissions ?permset .
-                ?permset oldap:givesPermission ?DataPermission .
-                ?DataPermission oldap:permissionValue ?permval .
-            }
-            FILTER(?permval >= "2"^^xsd:integer)
-        }
-        ORDER BY ASC(?creationDate)LIMIT 100 OFFSET 0
-        ```
+            Searches and retrieves data from the database using a full-text search query. This method allows
+            users to optionally filter and sort the results based on specific criteria. It supports returning
+            either the count of matching results or the results themselves in a structured format.
+
+            :param con: The connection object used to interact with the database.
+                This must implement the IConnection interface.
+            :type con: IConnection
+
+            :param projectShortName: The short name of the project for which the data
+                needs to be queried.
+            :type projectShortName: Xsd_NCName | str
+
+            :param searchstr: The search string used for full-text search, with case-insensitive
+                substring matching.
+            :type searchstr: str
+
+            :param resClass: An optional parameter specifying the resource class of the
+                objects to be retrieved. If provided, the query will filter results for the
+                specified class.
+            :type resClass: Xsd_QName | str | None
+
+            :param countOnly: A boolean flag to indicate whether to return only the count
+                of matching results. If set to True, only the count is returned;
+                otherwise, matching records are retrieved.
+            :type countOnly: bool
+
+            :param sortBy: A list of sorting criteria. Each criterion specifies the property
+                and direction (ascending or descending) to sort the results. If not provided,
+                no sorting is applied. SortBy has the following attributes:
+                - property (Xsd_QName): The property to sort by. The property must be one of
+                  Xsd_QName('oldap:creationDate'), Xsd_QName('oldap:lastModificationDate') or
+                  Xsd_QName('oldap:propval') to sort according the property where the match has been found..
+                - direction (str): The sorting direction, either 'asc' for ascending or 'desc' for descending.
+            :type sortBy: list[SortBy]
+
+            :param limit: The maximum number of results to retrieve. Defaults to 100 if not specified.
+            :type limit: int
+
+            :param offset: The number of records to skip before starting to retrieve results.
+                This is useful for paginated responses.
+            :type offset: int
+
+            :param indent: The base indentation level used for formatting the generated SPARQL
+                query string.
+            :type indent: int
+
+            :param indent_inc: The incremental value to add to the base indent for nested query
+                components.
+            :type indent_inc: int
+
+            :return: If `countOnly` is True, an integer representing the count of matching results
+                is returned. Otherwise, a dictionary is returned where the keys are IRIs of the
+                matching resources, and the values are dictionaries containing their respective
+                properties and values.
+            :rtype: int | dict[Iri, dict[str, Xsd]]
         """
         if not isinstance(projectShortName, Xsd_NCName):
             graph = Xsd_NCName(projectShortName, validate=True)
@@ -1180,10 +1186,12 @@ class ResourceInstance:
         else:
             sparql += f'{blank:{indent * indent_inc}}SELECT DISTINCT ?s ?t ?p ?o'
             if sortBy:
-                if sortBy == SortBy.CREATED:
-                    sparql += ' ?creationDate'
-                if sortBy == SortBy.LASTMOD:
-                    sparql += '?lastModificationDate'
+                for sortby in sortBy:
+                    if sortby.property == Xsd_QName('oldap:creationDate'):
+                        sparql += ' ?creationDate'
+                    elif sortby.property == Xsd_QName('oldap:lastModificationDate'):
+                        sparql += '?lastModificationDate'
+
         sparql += f'\n{blank:{indent * indent_inc}}WHERE {{'
         sparql += f'\n{blank:{(indent + 1) * indent_inc}}GRAPH oldap:admin {{'
         sparql += f'\n{blank:{(indent + 2) * indent_inc}}{con.userIri.toRdf} oldap:hasRole ?role .'
@@ -1191,11 +1199,12 @@ class ResourceInstance:
         sparql += f'\n{blank:{(indent + 2) * indent_inc}}FILTER(?permval >= {DataPermission.DATA_VIEW.numeric.toRdf})'
         sparql += f'\n{blank:{(indent + 1) * indent_inc}}}}'
         sparql += f'\n{blank:{(indent + 1) * indent_inc}}GRAPH {graph}:data {{'
-        if sortBy:
-            if sortBy == SortBy.CREATED:
-                sparql += f'\n{blank:{(indent + 2) * indent_inc}}?s oldap:creationDate ?creationDate .'
-            if sortBy == SortBy.LASTMOD:
-                sparql += f'\n{blank:{(indent + 2) * indent_inc}}?s oldap:lastModificationDate ?lastModificationDate .'
+        if not countOnly and sortBy:
+            for sortby in sortBy:
+                if sortby.property == Xsd_QName('oldap:creationDate'):
+                    sparql += f'\n{blank:{(indent + 2) * indent_inc}}?s oldap:creationDate ?creationDate .'
+                elif sortby.property == Xsd_QName('oldap:lastModificationDate'):
+                    sparql += f'\n{blank:{(indent + 2) * indent_inc}}?s oldap:lastModificationDate ?lastModificationDate .'
         sparql += f'\n{blank:{(indent + 2) * indent_inc}}?s ?p ?o .'
         sparql += f'\n{blank:{(indent + 2) * indent_inc}}?s rdf:type ?t .'
         if resClass:
@@ -1203,17 +1212,27 @@ class ResourceInstance:
         sparql += f'\n{blank:{(indent + 2) * indent_inc}}?s oldap:attachedToRole ?role .'
         sparql += f'\n{blank:{(indent + 2) * indent_inc}}<< ?s oldap:attachedToRole ?role >> oldap:hasDataPermission ?DataPermission .'
         sparql += f'\n{blank:{(indent + 2) * indent_inc}}FILTER(isLiteral(?o) && (datatype(?o) = xsd:string || datatype(?o) = rdf:langString || lang(?o) != ""))'
-        sparql += f'\n{blank:{(indent + 2) * indent_inc}}FILTER(CONTAINS(LCASE(STR(?o)), "{s}"))  # case-insensitive substring match'
+        sparql += f'\n{blank:{(indent + 2) * indent_inc}}FILTER(CONTAINS(LCASE(STR(?o)), "{searchstr}"))  # case-insensitive substring match'
         sparql += f'\n{blank:{(indent + 1) * indent_inc}}}}'
         sparql += f'\n{blank:{indent * indent_inc}}}}'
 
-        if sortBy:
-            if sortBy == SortBy.CREATED:
-                sparql += f'\n{blank:{indent * indent_inc}}ORDER BY ASC(?creationDate)'
-            if sortBy == SortBy.LASTMOD:
-                sparql += f'\n{blank:{indent * indent_inc}}ORDER BY ASC(?lastModificationDate)'
-            if sortBy == SortBy.PROPVAL:
-                sparql += f'\n{blank:{indent * indent_inc}}ORDER BY ASC(LCASE(STR(?o)))'
+        if not countOnly and sortBy:
+            for sortby in sortBy:
+                if sortby.property == Xsd_QName('oldap:creationDate'):
+                    if sortby.dir == SortDir.asc:
+                        sparql += f'\n{blank:{indent * indent_inc}}ORDER BY ASC(?creationDate)'
+                    else:
+                        sparql += f'\n{blank:{indent * indent_inc}}ORDER BY DESC(?creationDate)'
+                elif sortby.property == Xsd_QName('oldap:lastModificationDate'):
+                    if sortby.dir == SortDir.asc:
+                        sparql += f'\n{blank:{indent * indent_inc}}ORDER BY ASC(?lastModificationDate)'
+                    else:
+                        sparql += f'\n{blank:{indent * indent_inc}}ORDER BY DESC(?lastModificationDate)'
+                elif sortby.property == Xsd_QName('oldap:propval'):
+                    if sortby.dir == SortDir.asc:
+                        sparql += f'\n{blank:{indent * indent_inc}}ORDER BY ASC(?o)'
+                    else:
+                        sparql += f'\n{blank:{indent * indent_inc}}ORDER BY DESC(?o)'
 
         if not countOnly:
             sparql += f'\n{blank:{indent * indent_inc}}LIMIT {limit} OFFSET {offset}'
@@ -1235,10 +1254,11 @@ class ResourceInstance:
                     Xsd_QName('owl:Class'): r['t']
                 }
                 if sortBy:
-                    if sortBy == SortBy.CREATED:
-                        tmp['oldap:creationDate'] = r['creationDate'],
-                    if sortBy == SortBy.LASTMOD:
-                        tmp['oldap:lastModificationDate'] = r['lastModificationDate']
+                    for sortby in sortBy:
+                        if sortby.property == Xsd_QName('oldap:creationDate'):
+                            tmp['oldap:creationDate'] = r['creationDate'],
+                        elif sortby.property == Xsd_QName('oldap:lastModificationDate'):
+                            tmp['oldap:lastModificationDate'] = r['lastModificationDate']
                 result[r['s']] = tmp
             return result
 
@@ -1247,43 +1267,19 @@ class ResourceInstance:
                       projectShortName: Xsd_NCName | str,
                       resClass: Xsd_QName | str,
                       includeProperties: list[Xsd_QName] | None = None,
-                      count_only: bool = False,
-                      sortBy: SortBy | None = None,
+                      countOnly: bool = False,
+                      sortBy: list[SortBy] = [],
                       limit: int = 100,
                       offset: int = 0,
                       indent: int = 0, indent_inc: int = 4) -> dict[Iri, dict[str, Xsd]]:
-        # TODO: PROBLEM: does not work for properties which use MAX_COUNT > 1 !!!!!!!
         """
         Retrieves all resources matching the specified parameters from a data store using a SPARQL query.
         Depending on the `count_only` flag, it can return either a count of matching resources or detailed
         information about each resource.
-
-        :param con: The connection object used to execute the SPARQL query.
-        :type con: IConnection
-        :param projectShortName: The short name of the project being queried.
-        :type projectShortName: Xsd_NCName | str
-        :param resClass: The resource class to filter the results by.
-        :type resClass: Xsd_QName | str
-        :param includeProperties: A list of resource properties to include in the query and results.
-        :type includeProperties: list[Xsd_QName] | None
-        :param count_only: If True, returns only the count of matching resources. Defaults to False.
-        :type count_only: bool
-        :param sortBy: The sorting criterion for the results. Defaults to None.
-        :type sortBy: SortBy | None
-        :param limit: The maximum number of results to retrieve. Defaults to 100.
-        :type limit: int
-        :param offset: The starting point for result retrieval in pagination. Defaults to 0.
-        :type offset: int
-        :param indent: The initial level of indentation for the SPARQL query strings. Defaults to 0.
-        :type indent: int
-        :param indent_inc: The incremental level of indentation for the SPARQL query strings. Defaults to 4.
-        :type indent_inc: int
-        :return: A dictionary where keys are resource IRIs and values are dictionaries containing resource
-            properties and their corresponding values. If `count_only` is True, returns the total count of
-            matching resources as an integer.
-        :rtype: dict[Iri, dict[str, Xsd]]
-        :raises OldapError: If there is an error during query execution in the connection object.
         """
+        # --- ensure re is imported ---
+        import re
+
         if not isinstance(projectShortName, Xsd_NCName):
             graph = Xsd_NCName(projectShortName, validate=True)
         else:
@@ -1291,22 +1287,26 @@ class ResourceInstance:
         if not isinstance(resClass, Xsd_QName):
             resClass = Xsd_QName(resClass, validate=True)
 
+        if sortBy:
+            for s in sortBy:
+                if not isinstance(s, SortBy):
+                    raise OldapErrorType(f'Expected SortBy, got {type(s)}')
+                if not includeProperties or s.property not in includeProperties:
+                    if not includeProperties:
+                        includeProperties = []
+                    includeProperties.append(s.property)
+
         blank = ''
         context = Context(name=con.context_name)
         sparql = context.sparql_context
 
-        if (count_only):
+        if (countOnly):
             sparql += f'{blank:{indent * indent_inc}}SELECT (COUNT(DISTINCT ?s) as ?numResult)'
         else:
             sparql += f'{blank:{indent * indent_inc}}SELECT DISTINCT ?s'
             if includeProperties:
                 for index, item in enumerate(includeProperties):
                     sparql += f' ?o{index}'
-            if sortBy:
-                if sortBy == SortBy.CREATED:
-                    sparql += ' ?creationDate'
-                if sortBy == SortBy.LASTMOD:
-                    sparql += '?lastModificationDate'
         sparql += f'\n{blank:{indent * indent_inc}}WHERE {{'
         sparql += f'\n{blank:{(indent + 1) * indent_inc}}GRAPH oldap:admin {{'
         sparql += f'\n{blank:{(indent + 2) * indent_inc}}{con.userIri.toRdf} oldap:hasRole ?role .'
@@ -1316,30 +1316,23 @@ class ResourceInstance:
         sparql += f'\n{blank:{(indent + 1) * indent_inc}}GRAPH {graph}:data {{'
         sparql += f'\n{blank:{(indent + 2) * indent_inc}}?s oldap:attachedToRole ?role .'
         sparql += f'\n{blank:{(indent + 2) * indent_inc}}<< ?s oldap:attachedToRole ?role >> oldap:hasDataPermission ?dataperm .'
-        if sortBy:
-            if sortBy == SortBy.CREATED:
-                sparql += f'\n{blank:{(indent + 2) * indent_inc}}?s oldap:creationDate ?creationDate .'
-            if sortBy == SortBy.LASTMOD:
-                sparql += f'\n{blank:{(indent + 2) * indent_inc}}?s oldap:lastModificationDate ?lastModificationDate .'
         if includeProperties:
             for index, prop in enumerate(includeProperties):
-                sparql += f'\n{blank:{(indent + 2) * indent_inc}}?s {prop} ?o{index} .'
+                sparql += f'\n{blank:{(indent + 2) * indent_inc}}OPTIONAL {{ ?s {prop} ?o{index} . }}'
         sparql += f'\n{blank:{(indent + 2) * indent_inc}}?s rdf:type {resClass} .'
         sparql += f'\n{blank:{(indent + 1) * indent_inc}}}}'
         sparql += f'\n{blank:{indent * indent_inc}}}}'
 
-        if sortBy:
-            if sortBy == SortBy.CREATED:
-                sparql += f'\n{blank:{indent * indent_inc}}ORDER BY ASC(?creationDate)'
-            if sortBy == SortBy.LASTMOD:
-                sparql += f'\n{blank:{indent * indent_inc}}ORDER BY ASC(?lastModificationDate)'
-            if sortBy == SortBy.PROPVAL:
-                sparql += f'\n{blank:{indent * indent_inc}}ORDER BY'
-                if includeProperties:
-                    for index, item in enumerate(includeProperties):
-                        sparql += f'\n{blank:{indent * indent_inc}} ?o{index}'
+        if not countOnly and sortBy:
+            sparql += f'\n{blank:{indent * indent_inc}}ORDER BY'
+            for s in sortBy:
+                if s.dir == SortDir.asc:
+                    sparql += f' ASC(?o{includeProperties.index(s.property)})'
+                else:
+                    sparql += f' DESC(?o{includeProperties.index(s.property)})'
+            sparql += '\n'
 
-        if not count_only:
+        if not countOnly:
             sparql += f'\n{blank:{indent * indent_inc}}LIMIT {limit} OFFSET {offset}'
         sparql += '\n'
 
@@ -1349,22 +1342,33 @@ class ResourceInstance:
             print(sparql)
             raise
         res = QueryProcessor(context, jsonres)
-        if count_only:
+        if countOnly:
             return res[0]['numResult']
         else:
             result = {}
             for r in res:
-                tmp = {}
+                if result.get(r['s'], None) is None:
+                    result[r['s']] = {}
                 if includeProperties:
-                    for index, item in enumerate(includeProperties):
-                        tmp[item] = r[f'o{index}']
+                    for index, property in enumerate(includeProperties):
+                        if result[r['s']].get(property, None) is None:
+                            result[r['s']][property] = []
+                        raw = r.get(f'o{index}')
+                        if raw is None:
+                            continue
+                        if raw not in result[r['s']][property]:
+                            result[r['s']][property].append(raw)
+            if includeProperties:
+                for k, v in result.items():
+                    for index, property in enumerate(includeProperties):
+                        is_langstring = False
+                        for val in v[property]:
+                            if isinstance(val, Xsd_string) and val.lang is not None:
+                                is_langstring = True
+                                break
+                        if is_langstring:
+                            v[property] = LangString(v[property])
 
-                if sortBy:
-                    if sortBy == SortBy.CREATED:
-                        tmp[Xsd_QName('oldap:creationDate')] = r['creationDate']
-                    if sortBy == SortBy.LASTMOD:
-                        tmp[Xsd_QName('oldap:lastModificationDate')] = r['lastModificationDate']
-                result[r['s']] = tmp
             return result
 
     @staticmethod

oldaplib/src/version.py

@@ -1 +1 @@
-__version__ = "0.4.4"
+__version__ = "0.4.6"

oldaplib/test/test_hasproperty.py

@@ -4,6 +4,7 @@ from time import sleep
 
 from oldaplib.src.connection import Connection
 from oldaplib.src.dtypes.namespaceiri import NamespaceIRI
+from oldaplib.src.enums.editor import Editor
 from oldaplib.src.enums.xsd_datatypes import XsdDatatypes
 from oldaplib.src.hasproperty import HasProperty
 from oldaplib.src.helpers.context import Context
@@ -74,14 +75,14 @@ class TestHasProperty(unittest.TestCase):
                         maxCount=1,
                         group=Xsd_QName('test:group'),
                         order=1,
-                        editor=Xsd_QName("dash:TextAreaEditor")),
+                        editor=Editor.TEXT_AREA),
             HasProperty(con=self._connection,
                         project=self._project,
                         prop=Xsd_QName("test:comment"),
                         maxCount=1,
                         group=Xsd_QName('test:group'),
                         order=2,
-                        editor=Xsd_QName("dash:TextFieldEditor")),
+                        editor=Editor.TEXT_FIELD),
         ]
         r1 = ResourceClass(con=self._connection,
                            project=self._project,
@@ -100,13 +101,13 @@ class TestHasProperty(unittest.TestCase):
         self.assertEqual(r1[Xsd_QName('test:hasprop_test_A')].maxCount, Xsd_integer(1))
         self.assertEqual(r1[Xsd_QName('test:hasprop_test_A')].order, Xsd_decimal(1))
         self.assertEqual(r1[Xsd_QName('test:hasprop_test_A')].group, Xsd_QName('test:group'))
-        self.assertEqual(r1[Xsd_QName('test:hasprop_test_A')].editor, Xsd_QName("dash:TextAreaEditor"))
+        self.assertEqual(r1[Xsd_QName('test:hasprop_test_A')].editor, Editor.TEXT_AREA)
 
         self.assertIsNone(r1[Xsd_QName("test:comment")].minCount)
         self.assertEqual(r1[Xsd_QName("test:comment")].maxCount, Xsd_integer(1))
         self.assertEqual(r1[Xsd_QName("test:comment")].order, Xsd_decimal(2))
         self.assertEqual(r1[Xsd_QName("test:comment")].group, Xsd_QName('test:group'))
-        self.assertEqual(r1[Xsd_QName('test:comment')].editor, Xsd_QName("dash:TextFieldEditor"))
+        self.assertEqual(r1[Xsd_QName('test:comment')].editor, Editor.TEXT_FIELD)
 
     def test_creation_B(self):
         p1 = PropertyClass(con=self._connection,
@@ -117,9 +118,9 @@ class TestHasProperty(unittest.TestCase):
         hasproperties: list[HasProperty] = [
             HasProperty(con=self._connection, project=self._project, prop=p1,
                         minCount=1, maxCount=1, group=Xsd_QName('test:group'),
-                        order=1, editor=Xsd_QName("dash:TextAreaEditor")),
+                        order=1, editor=Editor.TEXT_AREA),
             HasProperty(con=self._connection, project=self._project, prop=Xsd_QName("test:comment"),
-                        maxCount=1, group=Xsd_QName('test:group'), order=2, editor=Xsd_QName("dash:TextFieldEditor")),
+                        maxCount=1, group=Xsd_QName('test:group'), order=2, editor=Editor.TEXT_FIELD),
         ]
         r1 = ResourceClass(con=self._connection,
                            project=self._project,
@@ -137,12 +138,12 @@ class TestHasProperty(unittest.TestCase):
         r1[Xsd_QName('test:hasprop_test_B')].maxCount = Xsd_integer(2)
         r1[Xsd_QName('test:hasprop_test_B')].order = Xsd_decimal(2)
         r1[Xsd_QName('test:hasprop_test_B')].group = Xsd_QName('test:groupB')
-        r1[Xsd_QName('test:hasprop_test_B')].editor = Xsd_QName("dash:TextFieldEditor")
+        r1[Xsd_QName('test:hasprop_test_B')].editor = Editor.TEXT_FIELD
 
         r1[Xsd_QName('test:comment')].maxCount = Xsd_integer(2)
         r1[Xsd_QName('test:comment')].order = Xsd_decimal(1)
         r1[Xsd_QName('test:comment')].group = Xsd_QName('test:groupB')
-        r1[Xsd_QName('test:comment')].editor = Xsd_QName("dash:TextAreaEditor")
+        r1[Xsd_QName('test:comment')].editor = Editor.TEXT_AREA
 
         r1.update()
         r1 = ResourceClass.read(con=self._connection,
@@ -151,11 +152,11 @@ class TestHasProperty(unittest.TestCase):
         self.assertEqual(Xsd_integer(2), r1[Xsd_QName('test:hasprop_test_B')].maxCount)
         self.assertEqual(Xsd_decimal(2), r1[Xsd_QName('test:hasprop_test_B')].order)
         self.assertEqual(Xsd_QName('test:groupB'), r1[Xsd_QName('test:hasprop_test_B')].group)
-        self.assertEqual(Xsd_QName("dash:TextFieldEditor"), r1[Xsd_QName('test:hasprop_test_B')].editor)
+        self.assertEqual(Editor.TEXT_FIELD, r1[Xsd_QName('test:hasprop_test_B')].editor)
 
         self.assertEqual(Xsd_integer(2), r1[Xsd_QName('test:comment')].maxCount)
         self.assertEqual(Xsd_decimal(1), r1[Xsd_QName('test:comment')].order)
-        self.assertEqual(Xsd_QName("dash:TextAreaEditor"), r1[Xsd_QName('test:comment')].editor)
+        self.assertEqual(Editor.TEXT_AREA, r1[Xsd_QName('test:comment')].editor)
 
     def test_modification_add(self):
         p1 = PropertyClass(con=self._connection,
@@ -169,7 +170,7 @@ class TestHasProperty(unittest.TestCase):
                         prop=p1,
                         minCount=1,
                         order=1,
-                        editor=Xsd_QName("dash:TextAreaEditor")),
+                        editor=Editor.TEXT_AREA),
             HasProperty(con=self._connection,
                         project=self._project,
                         prop=Xsd_QName("test:comment"),
@@ -194,7 +195,7 @@ class TestHasProperty(unittest.TestCase):
         r1[Xsd_QName('test:hasprop_test_C')].editor = None
         r1[Xsd_QName("test:comment")].minCount = Xsd_integer(1)
         r1[Xsd_QName("test:comment")].order = Xsd_decimal(1)
-        r1[Xsd_QName("test:comment")].editor = Xsd_QName("dash:TextFieldEditor")
+        r1[Xsd_QName("test:comment")].editor = Editor.TEXT_FIELD
 
         r1.update()
         r1 = ResourceClass.read(con=self._connection,
@@ -205,7 +206,7 @@ class TestHasProperty(unittest.TestCase):
         self.assertIsNone(r1[Xsd_QName('test:hasprop_test_C')].editor)
         self.assertEqual(Xsd_integer(1), r1[Xsd_QName("test:comment")].minCount)
         self.assertEqual(Xsd_decimal(1), r1[Xsd_QName("test:comment")].order)
-        self.assertEqual(Xsd_QName("dash:TextFieldEditor"), r1[Xsd_QName("test:comment")].editor)
+        self.assertEqual(Editor.TEXT_FIELD, r1[Xsd_QName("test:comment")].editor)
 
     def test_modification_delete(self):
         p1 = PropertyClass(con=self._connection,
@@ -216,10 +217,10 @@ class TestHasProperty(unittest.TestCase):
         hasproperties: list[HasProperty] = [
             HasProperty(con=self._connection, project=self._project, prop=p1,
                         minCount=1, maxCount=1, group=Xsd_QName('test:group'), order=1,
-                        editor=Xsd_QName("dash:TextFieldEditor")),
+                        editor=Editor.TEXT_FIELD),
             HasProperty(con=self._connection, project=self._project, prop=Xsd_QName("test:comment"),
                         maxCount=1, group=Xsd_QName('test:group'), order=2,
-                        editor=Xsd_QName("dash:TextAreaEditor")),
+                        editor=Editor.TEXT_AREA),
         ]
         r1 = ResourceClass(con=self._connection,
                            project=self._project,

oldaplib/test/test_objectfactory.py

@@ -10,7 +10,7 @@ import jwt
 from oldaplib.src.cachesingleton import CacheSingletonRedis
 from oldaplib.src.datamodel import DataModel
 from oldaplib.src.enums.adminpermissions import AdminPermission
-from oldaplib.src.objectfactory import ResourceInstanceFactory, SortBy, ResourceInstance
+from oldaplib.src.objectfactory import ResourceInstanceFactory, SortBy, ResourceInstance, SortDir
 from oldaplib.src.connection import Connection
 from oldaplib.src.enums.action import Action
 from oldaplib.src.enums.datapermissions import DataPermission
@@ -63,6 +63,7 @@ from oldaplib.src.xsd.xsd_unsignedbyte import Xsd_unsignedByte
 from oldaplib.src.xsd.xsd_unsignedint import Xsd_unsignedInt
 from oldaplib.src.xsd.xsd_unsignedlong import Xsd_unsignedLong
 from oldaplib.src.xsd.xsd_unsignedshort import Xsd_unsignedShort
+from redis.commands.search.aggregation import SortDirection
 
 
 def find_project_root(current_path):
@@ -486,6 +487,7 @@ class TestObjectFactory(unittest.TestCase):
         SetterTester = factory.createObjectInstance('SetterTester')
         b = SetterTester(stringSetter="This is a test string",
                          langStringSetter=["C'est un string de test@fr", "Dies ist eine Testzeichenkette@de"],
+                         langStringSetter2=["gagagagag@de"],
                          decimalSetter=Xsd_decimal(3.14),
                          integerSetter={20200, 30300},
                          attachedToRole={Xsd_QName('oldap:Unknown'): DataPermission.DATA_VIEW})
@@ -508,6 +510,7 @@ class TestObjectFactory(unittest.TestCase):
         SetterTester = factory.createObjectInstance('SetterTester')
         obj1 = SetterTester(stringSetter="This is a test string",
                             langStringSetter=LangString("This is a test string@de"),
+                            langStringSetter2=LangString("This is a test string2@de"),
                             decimalSetter=Xsd_decimal(3.14),
                             integerSetter={20200, 30300},
                             grantsPermission={Iri('oldap:GenericView'), Iri('oldap:GenericUpdate')})
@@ -563,6 +566,7 @@ class TestObjectFactory(unittest.TestCase):
         SetterTester = factory.createObjectInstance('SetterTester')
         obj1 = SetterTester(stringSetter="This is a test string",
                             langStringSetter=LangString("C'est un teste@fr", "Dies ist eine Test-Zeichenkette@de"),
+                            langStringSetter2=LangString("C'est un teste2@fr", "Dies ist eine Test-Zeichenkette2@de"),
                             decimalSetter=Xsd_decimal(3.14),
                             integerSetter={-10, 20},
                             booleanSetter=True,
@@ -591,6 +595,7 @@ class TestObjectFactory(unittest.TestCase):
         SetterTester = factory.createObjectInstance('SetterTester')
         obj1 = SetterTester(stringSetter="This is a test string",
                             langStringSetter=LangString("C'est un teste@fr", "Dies ist eine Test-Zeichenkette@de"),
+                            langStringSetter2=LangString("C'est un teste2@fr", "Dies ist eine Test-Zeichenkette2@de"),
                             decimalSetter=Xsd_decimal(3.14),
                             integerSetter={-10, 20},
                             booleanSetter=True,
@@ -619,6 +624,7 @@ class TestObjectFactory(unittest.TestCase):
         SetterTester = factory.createObjectInstance('SetterTester')
         obj1 = SetterTester(stringSetter="This is a test string",
                             langStringSetter=LangString("C'est un teste@fr", "Dies ist eine Test-Zeichenkette@de"),
+                            langStringSetter2=LangString("C'est un teste2@fr", "Dies ist eine Test-Zeichenkette2@de"),
                             decimalSetter=Xsd_decimal(3.14),
                             booleanSetter=True,
                             grantsPermission={Iri('oldap:GenericView'), Iri('oldap:GenericUpdate')})
@@ -629,11 +635,29 @@ class TestObjectFactory(unittest.TestCase):
         obj1 = SetterTester.read(con=self._connection, iri=obj1.iri)
         self.assertEqual(obj1.integerSetter, {Xsd_int(1)})
 
+    def test_value_modifier_D(self):
+        factory = ResourceInstanceFactory(con=self._connection, project='test')
+        SetterTester = factory.createObjectInstance('SetterTester')
+        obj1 = SetterTester(stringSetter="This is a test string",
+                            langStringSetter=LangString("C'est un teste@fr"),
+                            langStringSetter2=LangString("C'est un teste2@fr"),
+                            decimalSetter=Xsd_decimal(3.14),
+                            booleanSetter=True,
+                            grantsPermission={Iri('oldap:GenericView'), Iri('oldap:GenericUpdate')})
+        obj1.create()
+        obj1 = SetterTester.read(con=self._connection, iri=obj1.iri)
+        obj1[Xsd_QName('test:langStringSetter')][Language.FR] = "Qu'est-ce que c'est?"
+        obj1.update()
+        obj1 = SetterTester.read(con=self._connection, iri=obj1.iri)
+        self.assertEqual(obj1.langStringSetter, LangString("Qu'est-ce que c'est?@fr"))
+
+
     def test_value_modifier_add_lang(self):
         factory = ResourceInstanceFactory(con=self._connection, project='test')
         SetterTester = factory.createObjectInstance('SetterTester')
         obj1 = SetterTester(stringSetter="This is a test string",
                             langStringSetter=LangString("C'est un teste@fr"),
+                            langStringSetter2=LangString("C'est un teste2@fr"),
                             decimalSetter=Xsd_decimal(3.14),
                             booleanSetter=True,
                             grantsPermission={Iri('oldap:GenericView'), Iri('oldap:GenericUpdate')})
@@ -649,6 +673,7 @@ class TestObjectFactory(unittest.TestCase):
         SetterTester = factory.createObjectInstance('SetterTester')
         obj1 = SetterTester(stringSetter="This is a test string",
                             langStringSetter=LangString("Waseliwas@de", "C'est un teste@fr"),
+                            langStringSetter2=LangString("Waseliwas2@de", "C'est un teste2@fr"),
                             decimalSetter=Xsd_decimal(3.14),
                             booleanSetter=True,
                             grantsPermission={Iri('oldap:GenericView'), Iri('oldap:GenericUpdate')})
@@ -664,6 +689,7 @@ class TestObjectFactory(unittest.TestCase):
         SetterTester = factory.createObjectInstance('SetterTester')
         obj1 = SetterTester(stringSetter="This is a test string",
                             langStringSetter=LangString("Waseliwas@de", "C'est un teste@fr"),
+                            langStringSetter2=LangString("Waseliwas2@de", "C'est un teste2@fr"),
                             decimalSetter=Xsd_decimal(3.14),
                             booleanSetter=True,
                             grantsPermission={Iri('oldap:GenericView'), Iri('oldap:GenericUpdate')})
@@ -679,6 +705,7 @@ class TestObjectFactory(unittest.TestCase):
         SetterTester = factory.createObjectInstance('SetterTester')
         obj1 = SetterTester(stringSetter="This is a test string",
                             langStringSetter=LangString("Waseliwas@de", "C'est un teste@fr"),
+                            langStringSetter2=LangString("Waseliwas2@de", "C'est un teste2@fr"),
                             decimalSetter=Xsd_decimal(3.14),
                             booleanSetter=True,
                             grantsPermission={Iri('oldap:GenericView'), Iri('oldap:GenericUpdate')})
@@ -697,6 +724,7 @@ class TestObjectFactory(unittest.TestCase):
         SetterTester = factory.createObjectInstance('SetterTester')
         obj1 = SetterTester(stringSetter="This is a test string",
                             langStringSetter=LangString("C'est un teste@fr"),
+                            langStringSetter2=LangString("C'est un teste2@fr"),
                             decimalSetter=Xsd_decimal(3.14),
                             booleanSetter=True,
                             grantsPermission={Iri('oldap:GenericView'), Iri('oldap:GenericUpdate')})
@@ -712,6 +740,7 @@ class TestObjectFactory(unittest.TestCase):
         SetterTester = factory.createObjectInstance('SetterTester')
         obj1 = SetterTester(stringSetter="This is a test string",
                             langStringSetter=LangString("C'est un teste@fr"),
+                            langStringSetter2=LangString("C'est un teste2@fr"),
                             decimalSetter=Xsd_decimal(3.14),
                             booleanSetter=True,
                             integerSetter={20200, 30300},
@@ -727,6 +756,7 @@ class TestObjectFactory(unittest.TestCase):
         SetterTester = factory.createObjectInstance('SetterTester')
         obj1 = SetterTester(stringSetter="This is a test string",
                             langStringSetter=LangString("C'est un teste@fr"),
+                            langStringSetter2=LangString("C'est un teste2@fr"),
                             decimalSetter=Xsd_decimal(3.14),
                             booleanSetter=True,
                             integerSetter={20200, 30300},
@@ -761,6 +791,7 @@ class TestObjectFactory(unittest.TestCase):
         SetterTester = factory.createObjectInstance('SetterTester')
         obj1 = SetterTester(stringSetter="This is a test string",
                             langStringSetter=LangString("C'est un teste@fr", "Dies ist eine Test-Zeichenkette@de"),
+                            langStringSetter2=LangString("C'est un teste2@fr", "Dies ist eine Test-Zeichenkette2@de"),
                             decimalSetter={Xsd_decimal(3.14159), Xsd_decimal(2.71828), Xsd_decimal(1.61803)},
                             integerSetter={-10, 20},
                             booleanSetter=True,
@@ -877,8 +908,8 @@ class TestObjectFactory(unittest.TestCase):
         res = ResourceInstance.search_fulltext(con=self._connection,
                                                projectShortName='test',
                                                resClass='test:Book',
-                                               s='geschichte',
-                                               sortBy=SortBy.CREATED)
+                                               searchstr='geschichte',
+                                               sortBy=[SortBy('oldap:creationDate', SortDir.desc)])
 
         self.assertEqual(len(res), 2)
         for x, y in res.items():
@@ -886,8 +917,8 @@ class TestObjectFactory(unittest.TestCase):
 
         res = ResourceInstance.search_fulltext(con=self._connection,
                                                projectShortName='test',
-                                               s='spez',
-                                               sortBy=SortBy.CREATED)
+                                               searchstr='spez',
+                                               sortBy=[SortBy('oldap:creationDate', SortDir.desc)])
 
         self.assertEqual(len(res), 5)
         for x, y in res.items():
@@ -898,7 +929,7 @@ class TestObjectFactory(unittest.TestCase):
                                              projectShortName='test',
                                              resClass='test:Page',
                                              includeProperties=[Xsd_QName('test:pageNum'), Xsd_QName('test:pageContent')],
-                                             sortBy = SortBy.CREATED)
+                                             sortBy = [SortBy(Xsd_QName('oldap:creationDate'), SortDir.asc)])
         self.assertEqual(len(res), 8)
         for r in res:
             self.assertEqual(len(res[r]), 3)
@@ -909,6 +940,14 @@ class TestObjectFactory(unittest.TestCase):
                                              resClass='test:Page')
         self.assertEqual(len(res), 8)
 
+    def test_search_resource_D(self):
+        res = ResourceInstance.all_resources(con=self._connection,
+                                             projectShortName='test',
+                                             resClass='test:Book',
+                                             includeProperties=[Xsd_QName('test:title'), Xsd_QName('test:author')])
+        #self.assertEqual(len(res), 8)
+        pprint(res)
+
     #@unittest.skip('Work in progress')
     def test_read_media_object_by_id_A(self):
         res = ResourceInstance.get_media_object_by_id(con=self._connection, mediaObjectId='x_34db.tif')

oldaplib/testdata/instances_test.trig

@@ -1,3 +1,8 @@
+@prefix test: <https://test4.example.com/> .
+@prefix test: <https://test4.example.com/> .
+@prefix test: <https://test4.example.com/> .
+@prefix schema: <http://schema.org/> .
+@prefix schema: <http://schema.org/> .
 @prefix http: <http://www.w3.org/2011/http#> .
 @prefix : <http://oldap.org/base#> .
 @prefix test: <http://oldap.org/test#> .
@@ -5,13 +10,33 @@
 @prefix shared: <http://oldap.org/shared#> .
 
 test:data {
+
+  test:DouglasAdams a test:Person ;
+    :createdBy <https://orcid.org/0000-0003-1681-4036> ;
+    :creationDate "2025-11-13T16:43:21.284536+01:00"^^xsd:dateTimeStamp;
+    :lastModifiedBy <https://orcid.org/0000-0003-1681-4036> ;
+    :lastModificationDate "2025-11-13T16:43:21.284536+01:00"^^xsd:dateTimeStamp ;
+    :attachedToRole :Unknown ;
+    schema:familyName "Adams" ;
+    schema:givenName "Douglas" .
+
+  test:ConanDoyle a test:Person ;
+    :createdBy <https://orcid.org/0000-0003-1681-4036> ;
+    :creationDate "2025-11-13T16:43:21.284536+01:00"^^xsd:dateTimeStamp;
+    :lastModifiedBy <https://orcid.org/0000-0003-1681-4036> ;
+    :lastModificationDate "2025-11-13T16:43:21.284536+01:00"^^xsd:dateTimeStamp ;
+    :attachedToRole :Unknown ;
+    schema:familyName "Doyle" ;
+    schema:givenName "Conan" .
+
   <urn:uuid:7a1de6d7-de75-4875-ab24-74819057703f> a test:Book ;
     :createdBy <https://orcid.org/0000-0003-1681-4036> ;
     :creationDate "2025-11-13T16:43:21.284536+01:00"^^xsd:dateTimeStamp;
     :lastModifiedBy <https://orcid.org/0000-0003-1681-4036> ;
     :lastModificationDate "2025-11-13T16:43:21.284536+01:00"^^xsd:dateTimeStamp ;
     :attachedToRole :Unknown ;
-    test:title "Die Geschichte der Spez. tQh5OAgXOaK5"@de ;
+    test:title "Die Geschichte der Spez. tQh5OAgXOaK5"@de , "L'histoire de la Spez. tQh5OAgXOaK5"@fr ;
+    test:author test:DouglasAdams, test:ConanDoyle ;
     test:pubDate "2026-01-01"^^xsd:date .
 
   << <urn:uuid:7a1de6d7-de75-4875-ab24-74819057703f> :attachedToRole :Unknown>> :hasDataPermission :DATA_VIEW .

oldaplib/testdata/objectfactory_test.trig

@@ -297,6 +297,17 @@ test:shacl {
                     sh:order "2.0"^^xsd:decimal ;
                     sh:minCount "1"^^xsd:integer ;
                 ] ;
+            sh:property
+                [
+                    sh:path test:langStringSetter2 ;
+                    dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
+                    dcterms:created "2024-05-16T18:38:25.551434"^^xsd:dateTime ;
+                    dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
+                    dcterms:modified "2024-05-16T18:38:25.551434"^^xsd:dateTime ;
+                    sh:datatype rdf:langString ;
+                    sh:order "2.0"^^xsd:decimal ;
+                    sh:minCount "1"^^xsd:integer ;
+                ] ;
             sh:property
                 [
                     sh:path test:booleanSetter ;

{oldaplib-0.4.4.dist-info → oldaplib-0.4.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: oldaplib
-Version: 0.4.4
+Version: 0.4.6
 Summary: Open Media Access Server Library (Linked Open Data middleware/RESTApi)
 License: GNU Affero General Public License version 3
 Author: Lukas Rosenthaler

{oldaplib-0.4.4.dist-info → oldaplib-0.4.6.dist-info}/RECORD

@@ -2,7 +2,6 @@ oldaplib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 oldaplib/ontologies/admin-testing.trig,sha256=w2I3Fk7J9MAPfRmDunFL-4dyyvsmiwderUid18uZjaA,8763
 oldaplib/ontologies/admin.trig,sha256=0pEGowW5Zjt7_Pp_Cuf_LxHixbGfkjADnbMYBHBDsoo,6759
 oldaplib/ontologies/example.trig,sha256=MdRrFBZZ1L6aUDiT6aX4cnXiy-RoZHczF3Exn7aBSmU,1518
-oldaplib/ontologies/gaga.trigs,sha256=4SIOyCwHXE4u2AGHWNM9rElqEkGvPQk6rZ8TAWFRPqI,544
 oldaplib/ontologies/oldap.trig,sha256=OEcjBUiTdE3SuUA0Z3F20azI8abeK1OIpKqcQo1pjvw,63764
 oldaplib/ontologies/oldap.ttl,sha256=qdA0uiSjzVhkc1d5IN2y5ioK1QMzwl-TTnn3M_D1Kh8,29446
 oldaplib/ontologies/shared.trig,sha256=8BMbhsqmnGAFUotc1bGc6morWhJqU0pCGy9TlkiEKIY,27550
@@ -21,15 +20,15 @@ oldaplib/src/dtypes/languagein.py,sha256=6h3VrTH8IcTN6mvnWuGvzDoKX_Jh6h9w3wWrLuA
 oldaplib/src/dtypes/namespaceiri.py,sha256=kbLuqS-OzWCelGkGMUP0IN43LibrTDfn4s7cm8p73Ro,2797
 oldaplib/src/dtypes/rdfset.py,sha256=1RNbjQuUknaEfj84o-AsXEJvEWs3OI6QSKe4p6aDXqc,7782
 oldaplib/src/dtypes/xsdset.py,sha256=oMFSY7JGBf0CYneoHL3OtnFIeEPaULN3FdUW7u15_I4,4256
-oldaplib/src/enums/XXXeditor.py,sha256=Jh4_fEKkQjm-eCbZk8eP_DOQZVwwyrXy0UyNr6s-id0,2236
 oldaplib/src/enums/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 oldaplib/src/enums/action.py,sha256=aL7XXmoZ63_L2TTR37vqHpPPf5H_kYiPunNyiSDN28U,828
 oldaplib/src/enums/adminpermissions.py,sha256=nn76g2E8TIhkiVbZ64LGt81NuPwFXIDRISKBV6l9dyM,1969
 oldaplib/src/enums/attributeclass.py,sha256=CSXeL0QlLKxbk27vkPmLuFY4QjuUi5xsO9ncOUM3qds,3437
 oldaplib/src/enums/datapermissions.py,sha256=MiaVHXzNDKTGnZJ9pvs-IgQotyV4wA3X484s2RVMOvs,4104
+oldaplib/src/enums/editor.py,sha256=sb7jMh7eC4pq3fEGK2ufZKwcUD84wnzGLXoRrhjp6Ro,2163
 oldaplib/src/enums/externalontologyattr.py,sha256=H7SrWrhe1Dkz_t1OFCWZVh3_14lJDltYGh3dOFr1Z6w,807
-oldaplib/src/enums/haspropertyattr.py,sha256=x9z2b59aFhV3gx8IVz-743dAQ_wfMTzZuN1IqnLwpBM,831
-oldaplib/src/enums/language.py,sha256=OfQsFpIBj8lGBbZEqVCR_1F-bimPM48vqBl4EKBgggY,4623
+oldaplib/src/enums/haspropertyattr.py,sha256=i_KiPY9cUi8QHdYHjwPLmEMPIiJDFV8jBdT-JVFiZxA,873
+oldaplib/src/enums/language.py,sha256=X6x6amxmPA5pI8F_vaqh6AJ7YrZaWFS96xpw2KJ2DwQ,4790
 oldaplib/src/enums/oldaplistattr.py,sha256=xuOU3oP35-PFFmlI-jlN28yqdk5lp_OzScKCC1O4IDI,620
 oldaplib/src/enums/oldaplistnodeattr.py,sha256=qokSxE-0FLyWNipjjY3gZJC2bBEt1qS1Z2SFg-gb0kc,722
 oldaplib/src/enums/owlpropertytype.py,sha256=R7DaCV4vtkGeuDhslN3q7719J1sLKUL-x0o91Te7Qk8,989
@@ -63,8 +62,8 @@ oldaplib/src/helpers/singletonmeta.py,sha256=bz_c5LFcRxxYirL9EDaFrWlc5WhAzR2uz9k
 oldaplib/src/helpers/tools.py,sha256=sNbiOLucTGNFzZmiWwPLFOb80VTXQH0Zd9uCGubhzAk,12721
 oldaplib/src/iconnection.py,sha256=XlOc2Kh4tK_UOHydLQwlWjUFLUze-Aq_vEZpf9KS1-s,3677
 oldaplib/src/in_project.py,sha256=ZnfeOFwpdPh1oyC2mAGH8DnSD9afxYtvsh7_GrfGVgQ,10663
-oldaplib/src/model.py,sha256=wgvXaR2GVHk4hJxoL6rigFHwjPYEukBOjtf1Jmo-m9A,19326
-oldaplib/src/objectfactory.py,sha256=4pPzsbbjnmtAobMH4ZIazwFZVzCuOd8MZWCZ2lZgOz8,85862
+oldaplib/src/model.py,sha256=YG_d4qyo7kadwns-51dXGWYCLWNr9PPuIJLYSF7KmQs,19493
+oldaplib/src/objectfactory.py,sha256=yppOYyMNhrG6QeYkpkLTWhFGaeW5dXwCUUWD1Jvzc0k,85943
 oldaplib/src/oldaplist.py,sha256=s5afrHtUnvDfMUFoZTt-jMxlBlmK2c0tLeTMp0KiIfg,43077
 oldaplib/src/oldaplist_helpers.py,sha256=D_X7KdFjPNlX-OwR04D6onxhFucrGo8052WuJPRjLkA,14213
 oldaplib/src/oldaplistnode.py,sha256=NnC2juEGTtEkDO6OlB9PjSw_zTF-wSsRUgEk-6VV9DA,87344
@@ -75,7 +74,7 @@ oldaplib/src/resourceclass.py,sha256=zJNWNY1TfhGs-A2HNa1DO0KAajps_1jMQsoEkUsr7P0
 oldaplib/src/role.py,sha256=AWtZx80OVERT2xbKeuP8g32VSXkm4MVlzeUWd9nh6mQ,30741
 oldaplib/src/user.py,sha256=iTJzSvR0xfc3FFkoKG-q5LptkWB_PGpRGpG-L3271z8,55833
 oldaplib/src/userdataclass.py,sha256=4kWktau9XSv5alfEVuOvikfxnSSUSKT8cw77TWdMhQM,13921
-oldaplib/src/version.py,sha256=xw_dYipbaGm6aV2OPgH234_ODRnMNhDWYLau1HFUaAQ,21
+oldaplib/src/version.py,sha256=kz_EtUK14aaAj9cTvW7Wp3hr3-OKQMeZoE6Yry0bGJo,21
 oldaplib/src/xsd/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 oldaplib/src/xsd/floatingpoint.py,sha256=rDReKqh0mXyc4F5wslgTUxbeGf3-PGERyughj5_62YI,8852
 oldaplib/src/xsd/iri.py,sha256=VrM1rgs-DKEuYLI8SUBp7QWMEZbxzxoUcvFKKfqY7mA,8454
@@ -127,11 +126,11 @@ oldaplib/test/test_context.py,sha256=0qCTOOS6lKjjlZXRxXOoWeix5HnvgwcmKzOF17Fou6M
 oldaplib/test/test_datamodel.py,sha256=AHClO0KyYFGI44OBO5wA21GOQDXL8NrVsE3skhojrUo,59921
 oldaplib/test/test_dtypes.py,sha256=ifXWUc6ExAKGukyM1ziku7Xd9eehg4J7HZy9B63-aPo,8601
 oldaplib/test/test_externalontologies.py,sha256=WUPjTbklMmrM4OucPXOChyNmwFD9qdYVKkZyo0WHlP0,7797
-oldaplib/test/test_hasproperty.py,sha256=cU9t7uBaMxtIVbpk3UyGjPyIzQKDSS2PzqGHIINYZRw,13515
+oldaplib/test/test_hasproperty.py,sha256=_cc-wH_b4c_GIDOLQxirbAS7486KC19YSUxzykf7QTw,13320
 oldaplib/test/test_in_project.py,sha256=OV5csuPwxcctmOM2HsB_ITmXXASRcH9-A2GlWW5foa4,7580
 oldaplib/test/test_langstring.py,sha256=37BeKiQzj63G-SyS_paK_SEG7ulRbGrE89Mz40UB_bE,15146
 oldaplib/test/test_language_in.py,sha256=ELqHO-YIsZSCPF3E3rWde4J7rERL7En7sV_pzQ00zgs,8826
-oldaplib/test/test_objectfactory.py,sha256=znSEy7VagIU6tcgXyw91aPMxjFNS8Nc7Ne3sJALhpno,55447
+oldaplib/test/test_objectfactory.py,sha256=Bvka-IljFvvUnq79lMHnMv7BTUki3xB2d4jgwdbAgMA,58262
 oldaplib/test/test_observable_dict.py,sha256=GxD0sM0nsVfVRBu92SFGkJ6--YXq4ibBWI4IpjZZzDU,1396
 oldaplib/test/test_observable_set.py,sha256=JWZSoAsr8XIEBXPVgSVJjQQEEc8uSAme5IrFYLYVVXw,6313
 oldaplib/test/test_oldaplist.py,sha256=jMM3HiSFs7YcS2ltEvot6637EhK-fMV0W5DSUlFdTRI,20098
@@ -151,12 +150,12 @@ oldaplib/testdata/connection_test.trig,sha256=LFTGLEae7SaTU67rwvgvg_epi09O7oPZwf
 oldaplib/testdata/datamodel_test.trig,sha256=0n02awPthzi-Lx-_ABlrD9yZ3I1sWxp7eIbFwSxwKNA,802
 oldaplib/testdata/event_type.yaml,sha256=wpXiheSEKh4xOoUZvAxWytJQ-sNK6oUYdVpOmyW9wPc,3083
 oldaplib/testdata/hlist_schema.yaml,sha256=fgHiB-ZxOkE6OvkZKk9SL2kNn8Akj6dS6ySDFSpknTA,186
-oldaplib/testdata/instances_test.trig,sha256=suWL71fvNAnhpJfvAyq0VUvYQe2hNvDjf0rah2Ogb_M,9516
+oldaplib/testdata/instances_test.trig,sha256=npuwyxLY2H2BlFa5o8nHcio1EsTbEQujSr2wux9T1VU,10636
 oldaplib/testdata/institution_or_building_type.yaml,sha256=SA2rsQwoAdyn6eSIJU1ilmdIQf-f1XNApwBow-JlJTo,2439
 oldaplib/testdata/language.yaml,sha256=YaQA77d7QyOydqNylR5RSb-0A6h9pLM4mgadJSrYC3A,451
 oldaplib/testdata/location_type.yaml,sha256=amlhYNDc9qLv_if6urtAtBTnEXrVrb6_aulE180GYkc,1323
 oldaplib/testdata/means_of_transportation.yaml,sha256=WOqtSHlw8gCK54d5hmibCWyL_H1DRtBBpUdFNwIUBJo,788
-oldaplib/testdata/objectfactory_test.trig,sha256=ZwO2dglOmkGLoTQFNkZ2tJJwKEWdIjiyuQlLTSVYxYA,80576
+oldaplib/testdata/objectfactory_test.trig,sha256=1Gm-dYbo0FmIwhMtg70KP1Tt77gvQQ79Knv_eYRWxdo,81164
 oldaplib/testdata/playground_list.yaml,sha256=EypG4WQoq9emI10Hj-DrKjplgxr1MrQBPc0ppV_rHQQ,1620
 oldaplib/testdata/role.yaml,sha256=CLI9f2HD_ulYw67DqWntaMLWH0CGWz1cfNkvxcnK6XQ,691
 oldaplib/testdata/source_type-1.yaml,sha256=Khow4rD8oZgBAbUex4T-nKBTrx0bAseMhTShS7-MgGw,921
@@ -164,6 +163,6 @@ oldaplib/testdata/source_type.yaml,sha256=dSihKikw3O-IlGf6anj5KWMoBYLaweLVF1Zojm
 oldaplib/testdata/test_move_left_of_toL.yaml,sha256=2m1OSQrQFlsCQxeJrjzBAO74LMprNDo_HuyrYGsOeXI,787
 oldaplib/testdata/testlist.yaml,sha256=AT11nXEG81Sfyb-tr1gQV0H_dZBrOCcFuHf7YtL8P2g,1994
 oldaplib/testit.http,sha256=qW7mnr6aNLXFG6lQdLgyhXILOPN6qc5iFVZclLyVvkY,303
-oldaplib-0.4.4.dist-info/METADATA,sha256=reDfpmF7HkkCVNeb8Km1O35lldWvA2QX7YMK-SnfK6w,3035
-oldaplib-0.4.4.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-oldaplib-0.4.4.dist-info/RECORD,,
+oldaplib-0.4.6.dist-info/METADATA,sha256=hk5GKur9imdwD_w2yuHf1xf19qB_rTWx7rYdmkaKrpU,3035
+oldaplib-0.4.6.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+oldaplib-0.4.6.dist-info/RECORD,,

oldaplib/ontologies/gaga.trigs

@@ -1,23 +0,0 @@
-@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix owl: <http://www.w3.org/2002/07/owl#> .
-
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix o: <http://www.ooo.org/ns#> .
-
-@prefix : <https://gaga.com/> .
-
-:test {
-    :Unknown o:hasName "Unknown" .
-
-    :UserA o:hasName "UserA" ;
-        o:hasRole :Unknown .
-
-    :InstanceA o:hasName "InstanceA" ;
-        o:attachedToRole :Unknown .
-
-    <<:InstanceA o:attachedToRole :Unknown>> o:hasDataPermission 2 .
-
-}
-
-