oldaplib 0.3.11__tar.gz → 0.3.13__tar.gz

{oldaplib-0.3.11 → oldaplib-0.3.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: oldaplib
-Version: 0.3.11
+Version: 0.3.13
 Summary: Open Media Access Server Library (Linked Open Data middleware/RESTApi)
 License: GNU Affero General Public License version 3
 Author: Lukas Rosenthaler
@@ -79,4 +79,11 @@ http://oldap.org/<location>/<project>/data#
 The project name must be unique to the location and is of
 type [NCName](https://www.w3.org/TR/1999/REC-xml-names-19990114/#NT-NCName).
 
+## Media object
+
+- originalName: `<http://purl.org/dc/terms/originalName>`
+- originalMimeType: `<http://purl.org/dc/terms/format>`
+- mediaserverUri: xsd:anyURI
+- project: `<http://oldap.org/base#project>`
+
 

{oldaplib-0.3.11 → oldaplib-0.3.13}/README.md

@@ -43,3 +43,10 @@ http://oldap.org/<location>/<project>/data#
 The project name must be unique to the location and is of
 type [NCName](https://www.w3.org/TR/1999/REC-xml-names-19990114/#NT-NCName).
 
+## Media object
+
+- originalName: `<http://purl.org/dc/terms/originalName>`
+- originalMimeType: `<http://purl.org/dc/terms/format>`
+- mediaserverUri: xsd:anyURI
+- project: `<http://oldap.org/base#project>`
+

{oldaplib-0.3.11 → oldaplib-0.3.13}/oldaplib/ontologies/shared.trig

@@ -41,7 +41,7 @@ shared:shacl {
             dcterms:created "2023-11-04T12:00:00+00:00"^^xsd:dateTime ;
             dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
             dcterms:modified "2023-11-04T12:00:00+00:00"^^xsd:dateTime ;
-            sh:maxCount "1"^^xsd:integer ;
+            sh:maxCount "1"^^xsd:nonNegativeInteger ;
             sh:datatype xsd:decimal ;
         ] ;
         sh:property [
@@ -50,7 +50,7 @@ shared:shacl {
             dcterms:created "2023-11-04T12:00:00+00:00"^^xsd:dateTime ;
             dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
             dcterms:modified "2023-11-04T12:00:00+00:00"^^xsd:dateTime ;
-            sh:maxCount "1"^^xsd:integer ;
+            sh:maxCount "1"^^xsd:nonNegativeInteger ;
             sh:datatype xsd:string ;
             sh:in ("GREGORIAN"^^xsd:string "JULIAN"^^xsd:string "HEBREW"^^xsd:string "ISLAMIC"^^xsd:string "PERSIAN"^^xsd:string) ;
        ] ;
@@ -60,7 +60,7 @@ shared:shacl {
             dcterms:created "2023-11-04T12:00:00+00:00"^^xsd:dateTime ;
             dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
             dcterms:modified "2023-11-04T12:00:00+00:00"^^xsd:dateTime ;
-            sh:maxCount "1"^^xsd:integer ;
+            sh:maxCount "1"^^xsd:nonNegativeInteger ;
             sh:class oldap:ChronolgyStatement ;
         ] ;
         sh:property [
@@ -69,7 +69,7 @@ shared:shacl {
             dcterms:created "2023-11-04T12:00:00+00:00"^^xsd:dateTime ;
             dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
             dcterms:modified "2023-11-04T12:00:00+00:00"^^xsd:dateTime ;
-            sh:maxCount "1"^^xsd:integer ;
+            sh:maxCount "1"^^xsd:nonNegativeInteger ;
             sh:class oldap:ChronolgyStatement ;
         ] ;
         sh:property [
@@ -78,7 +78,7 @@ shared:shacl {
             dcterms:created "2023-11-04T12:00:00+00:00"^^xsd:dateTime ;
             dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
             dcterms:modified "2023-11-04T12:00:00+00:00"^^xsd:dateTime ;
-            sh:maxCount "1"^^xsd:integer ;
+            sh:maxCount "1"^^xsd:nonNegativeInteger ;
             sh:datatype xsd:decimal ;
         ] ;
         sh:property [
@@ -87,10 +87,89 @@ shared:shacl {
             dcterms:created "2023-11-04T12:00:00+00:00"^^xsd:dateTime ;
             dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
             dcterms:modified "2023-11-04T12:00:00+00:00"^^xsd:dateTime ;
-            sh:maxCount "1"^^xsd:integer ;
+            sh:maxCount "1"^^xsd:nonNegativeInteger ;
             sh:datatype xsd:decimal ;
         ] .
 
+    ###############################################################################
+    # Media object
+    ###############################################################################
+
+    oldap:MediaObjectShape a sh:NodeShape ;
+        sh:targetClass oldap:MediaObject ;
+        dcterms:created "2025-11-20T22:48:57.760670+01:00"^^xsd:dateTime ;
+        dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
+        dcterms:modified "2025-11-20T22:48:57.760670+01:00"^^xsd:dateTime ;
+        dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
+        oldap:externalOntology "false"^^xsd:boolean ;
+        rdfs:label "MediaObject"@en, "Medienobjekt"@de, "MediaObject"@fr, "MediaObject"@it ;
+        rdfs:comment "Page of a book"@en, "Seite eines Buches"@de ;
+        sh:closed "true"^^xsd:boolean ;
+        sh:property [
+            sh:path rdf:type ;
+        ] ;
+        sh:property [                # >>PropertyClass.property_node_shacl()
+                sh:path oldap:originalName ;
+                schema:version "0.1.0"^^xsd:string ;
+                dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
+                dcterms:created "2025-11-20T22:48:57.760670+01:00"^^xsd:dateTime ;
+                dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
+                dcterms:modified "2025-11-20T22:48:57.760670+01:00"^^xsd:dateTime ;
+                oldap:statementProperty "false"^^xsd:boolean ;
+                oldap:externalOntology "false"^^xsd:boolean ;
+                sh:datatype xsd:string ;
+                sh:name "Original Filename"@en, "Originaler Dateiname"@de, "Nom orignal du fichier"@fr, "Nome documento originale"@it ;
+                sh:minCount "1"^^xsd:integer ;
+                sh:maxCount "1"^^xsd:integer ;
+                sh:order "1.0"^^xsd:decimal ;
+        ] ;
+        sh:property [                # >>PropertyClass.property_node_shacl()
+                sh:path oldap:originalMimeType ;
+                schema:version "0.1.0"^^xsd:string ;
+                dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
+                dcterms:created "2025-11-20T22:48:57.760670+01:00"^^xsd:dateTime ;
+                dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
+                dcterms:modified "2025-11-20T22:48:57.760670+01:00"^^xsd:dateTime ;
+                oldap:statementProperty "false"^^xsd:boolean ;
+                oldap:externalOntology "false"^^xsd:boolean ;
+                sh:datatype xsd:string ;
+                sh:name "Original mimetype"@en, "Originaler Mimetype"@de, "Mimetype original"@fr, "Mimetype originale"@it ;
+                sh:minCount "1"^^xsd:integer ;
+                sh:maxCount "1"^^xsd:integer ;
+                sh:order "2.0"^^xsd:decimal ;
+        ] ;
+        sh:property [                # >>PropertyClass.property_node_shacl()
+                sh:path oldap:serverUrl ;
+                schema:version "0.1.0"^^xsd:string ;
+                dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
+                dcterms:created "2025-11-20T22:48:57.760670+01:00"^^xsd:dateTime ;
+                dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
+                dcterms:modified "2025-11-20T22:48:57.760670+01:00"^^xsd:dateTime ;
+                oldap:statementProperty "false"^^xsd:boolean ;
+                oldap:externalOntology "false"^^xsd:boolean ;
+                sh:datatype xsd:anyURI ;
+                sh:name "Server URL"@en, "URL des servers"@de, "Server URL"@fr, "Server URL"@it ;
+                sh:minCount "1"^^xsd:integer ;
+                sh:maxCount "1"^^xsd:integer ;
+                sh:order "3.0"^^xsd:decimal ;
+        ] ;
+        sh:property [                # >>PropertyClass.property_node_shacl()
+                sh:path oldap:imageId ;
+                schema:version "0.1.0"^^xsd:string ;
+                dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
+                dcterms:created "2025-11-20T22:48:57.760670+01:00"^^xsd:dateTime ;
+                dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
+                dcterms:modified "2025-11-20T22:48:57.760670+01:00"^^xsd:dateTime ;
+                oldap:statementProperty "false"^^xsd:boolean ;
+                oldap:externalOntology "false"^^xsd:boolean ;
+                sh:datatype xsd:string ;
+                sh:name "Image ID"@en, "ID des Bilder"@de, "ID de l\'image"@fr, "ID de l\'immagine"@it ;
+                sh:minCount "1"^^xsd:integer ;
+                sh:maxCount "1"^^xsd:integer ;
+                sh:order "3.0"^^xsd:decimal ;
+        ] .
+
+
 
 }
 
@@ -161,6 +240,7 @@ shared:onto {
     ###########################################################################
     # Chronology Date Resource
     ###########################################################################
+
     oldap:ChronolgyStatement rdf:type owl:Class ;
         dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
         dcterms:created "2023-11-04T12:00:00Z"^^xsd:dateTime ;
@@ -210,5 +290,76 @@ shared:onto {
                 owl:onDataRange xsd:decimal
             ] .
 
+    ###########################################################################
+    # Media object
+    ###########################################################################
+
+        oldap:originalName rdf:type owl:DatatypeProperty ;
+            rdfs:domain oldap:MediaObject ;
+            rdfs:range xsd:string ;
+            dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
+            dcterms:created "2025-11-20T22:48:57.760670+01:00"^^xsd:dateTime ;
+            dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
+            dcterms:modified "2025-11-20T22:48:57.760670+01:00"^^xsd:dateTime .
+
+        oldap:originalMimeType rdf:type owl:DatatypeProperty ;
+            rdfs:domain oldap:MediaObject ;
+            rdfs:range xsd:string ;
+            dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
+            dcterms:created "2025-11-20T22:48:57.760670+01:00"^^xsd:dateTime ;
+            dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
+            dcterms:modified "2025-11-20T22:48:57.760670+01:00"^^xsd:dateTime .
+
+        oldap:serverUrl rdf:type owl:DatatypeProperty ;
+            rdfs:domain oldap:MediaObject ;
+            rdfs:range xsd:anyURI ;
+            dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
+            dcterms:created "2025-11-20T22:48:57.760670+01:00"^^xsd:dateTime ;
+            dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
+            dcterms:modified "2025-11-20T22:48:57.760670+01:00"^^xsd:dateTime .
+
+        oldap:imageId rdf:type owl:DatatypeProperty ;
+            rdfs:domain oldap:MediaObject ;
+            rdfs:range xsd:string ;
+            dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
+            dcterms:created "2025-11-20T22:48:57.760670+01:00"^^xsd:dateTime ;
+            dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
+            dcterms:modified "2025-11-20T22:48:57.760670+01:00"^^xsd:dateTime .
+
+        oldap:MediaObject rdf:type owl:Class ;
+            schema:version "0.1.0"^^xsd:string ;
+            dcterms:created "2025-11-20T22:48:57.760670+01:00"^^xsd:dateTime ;
+            dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
+            dcterms:modified "2025-11-20T22:48:57.760670+01:00"^^xsd:dateTime ;
+            dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
+            rdfs:label "MediaObject"@en, "Medienobjekt"@de, "MediaObject"@fr, "MediaObject"@it ;
+            rdfs:comment "Page of a book"@en, "Seite eines Buches"@de ;
+            rdfs:subClassOf oldap:Thing ,
+                [
+                    rdf:type owl:Restriction ;
+                    owl:onProperty oldap:originalName ;
+                    owl:qualifiedCardinality "1"^^xsd:nonNegativeInteger ;
+                    owl:onDataRange xsd:string ;
+                ] ,
+                [
+                    rdf:type owl:Restriction ;
+                    owl:onProperty oldap:originalMimeType ;
+                    owl:qualifiedCardinality "1"^^xsd:nonNegativeInteger ;
+                    owl:onDataRange xsd:string ;
+                ] ,
+                [
+                    rdf:type owl:Restriction ;
+                    owl:onProperty oldap:serverUrl ;
+                    owl:qualifiedCardinality "1"^^xsd:nonNegativeInteger ;
+                    owl:onDataRange xsd:anyURI ;
+                ] ,
+                [
+                    rdf:type owl:Restriction ;
+                    owl:onProperty oldap:imageId ;
+                    owl:qualifiedCardinality "1"^^xsd:nonNegativeInteger ;
+                    owl:onDataRange xsd:string ;
+                ] .
+
+
 }
 

{oldaplib-0.3.11 → oldaplib-0.3.13}/oldaplib/src/datamodel.py

@@ -753,15 +753,18 @@ class DataModel(Model):
             f.write('\n')
             f.write(context.turtle_context)
             f.write(f'\n{blank:{indent * indent_inc}}{self.__graph}:shacl {{\n')
-            f.write(f'{blank:{(indent + 2) * indent_inc}}{self.__graph}:shapes schema:version {self.__version.toRdf} .\n')
+            f.write(f'{blank:{(indent + 1) * indent_inc}}{self.__graph}:shapes schema:version {self.__version.toRdf} .\n')
             f.write('\n')
             for qname, onto in self.__extontos.items():
                 f.write(onto.create_shacl(timestamp=timestamp, indent=1))
+            f.write('\n\n')
             for iri, prop in self.__propclasses.items():
                 if not prop.internal:
                     f.write(prop.create_shacl(timestamp=timestamp, indent=1))
+            f.write('\n\n')
             for iri, resclass in self.__resclasses.items():
                 f.write(resclass.create_shacl(timestamp=timestamp, indent=1))
+            f.write('\n\n')
             f.write(f'\n{blank:{indent * indent_inc}}}}\n')
 
             f.write(f'{blank:{indent * indent_inc}}{self.__graph}:onto {{\n')

{oldaplib-0.3.11 → oldaplib-0.3.13}/oldaplib/src/enums/haspropertyattr.py

@@ -12,7 +12,7 @@ from oldaplib.src.xsd.xsd_qname import Xsd_QName
 @unique
 class HasPropertyAttr(AttributeClass):
     # order: (QName, mandatory, immutable, datatype)
-    MIN_COUNT = ('sh:minCount', False, False, Xsd_nonNegativeInteger)
-    MAX_COUNT = ('sh:maxCount', False, False, Xsd_nonNegativeInteger)
+    MIN_COUNT = ('sh:minCount', False, False, Xsd_integer)
+    MAX_COUNT = ('sh:maxCount', False, False, Xsd_integer)
     ORDER = ('sh:order', False, False, Xsd_decimal)
     GROUP = ('sh:group', False, False, Xsd_QName)

{oldaplib-0.3.11 → oldaplib-0.3.13}/oldaplib/src/hasproperty.py

@@ -222,12 +222,15 @@ class HasProperty(Model, Notify):
         max_count = Xsd_nonNegativeInteger(int(self._attributes[HasPropertyAttr.MAX_COUNT])) if self._attributes.get(HasPropertyAttr.MAX_COUNT) else None
 
         if min_count and max_count and min_count == max_count:
-            sparql += f' ;\n{blank:{(indent + 1) * indent_inc}}owl:qualifiedCardinality {min_count.toRdf}'
+            tmp = Xsd_nonNegativeInteger(min_count)
+            sparql += f' ;\n{blank:{(indent + 1) * indent_inc}}owl:qualifiedCardinality {tmp.toRdf}'
         else:
             if min_count:
-                sparql += f' ;\n{blank:{(indent + 1) * indent_inc}}owl:minQualifiedCardinality {min_count.toRdf}'
+                tmp = Xsd_nonNegativeInteger(min_count)
+                sparql += f' ;\n{blank:{(indent + 1) * indent_inc}}owl:minQualifiedCardinality {tmp.toRdf}'
             if max_count:
-                sparql += f' ;\n{blank:{(indent + 1) * indent_inc}}owl:maxQualifiedCardinality {max_count.toRdf}'
+                tmp = Xsd_nonNegativeInteger(max_count)
+                sparql += f' ;\n{blank:{(indent + 1) * indent_inc}}owl:maxQualifiedCardinality {tmp.toRdf}'
         return sparql
 
     def update_shacl(self,
@@ -287,12 +290,15 @@ class HasProperty(Model, Notify):
             if min_count or max_count:
                 sparql += f'{blank:{indent * indent_inc}}INSERT {{\n'
                 if min_count and max_count and min_count == max_count:
-                    sparql += f'{blank:{(indent + 1) * indent_inc}}?prop owl:qualifiedCardinality {min_count.toRdf} .\n'
+                    tmp = Xsd_nonNegativeInteger(min_count)
+                    sparql += f'{blank:{(indent + 1) * indent_inc}}?prop owl:qualifiedCardinality {tmp.toRdf} .\n'
                 else:
                     if min_count:
-                        sparql += f'{blank:{(indent + 1) * indent_inc}}?prop owl:minQualifiedCardinality {min_count.toRdf} .\n'
+                        tmp = Xsd_nonNegativeInteger(min_count)
+                        sparql += f'{blank:{(indent + 1) * indent_inc}}?prop owl:minQualifiedCardinality {tmp.toRdf} .\n'
                     if max_count:
-                        sparql += f'{blank:{(indent + 1) * indent_inc}}?prop owl:maxQualifiedCardinality {max_count.toRdf} .\n'
+                        tmp = Xsd_nonNegativeInteger(max_count)
+                        sparql += f'{blank:{(indent + 1) * indent_inc}}?prop owl:maxQualifiedCardinality {tmp.toRdf} .\n'
                 sparql += f'{blank:{indent * indent_inc}}}}\n'
 
             sparql += f'{blank:{indent * indent_inc}}WHERE {{\n'

{oldaplib-0.3.11 → oldaplib-0.3.13}/oldaplib/src/objectfactory.py

@@ -877,7 +877,7 @@ class ResourceInstance:
                         projectShortName: Xsd_NCName | str,
                         s: str,
                         resClass: Xsd_QName | str | None = None,
-                        count_only: bool = False,
+                        countOnly: bool = False,
                         sortBy: SortBy | None = None,
                         limit: int = 100,
                         offset: int = 0,
@@ -896,8 +896,8 @@ class ResourceInstance:
         :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 count_only: If True, only the count of matching entities will be returned. Defaults to False.
-        :type count_only: bool
+        :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
@@ -949,7 +949,7 @@ class ResourceInstance:
         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 ?t ?p ?o'
@@ -989,7 +989,7 @@ class ResourceInstance:
             if sortBy == SortBy.PROPVAL:
                 sparql += f'\n{blank:{indent * indent_inc}}ORDER BY ASC(LCASE(STR(?o)))'
 
-        if not count_only:
+        if not countOnly:
             sparql += f'\n{blank:{indent * indent_inc}}LIMIT {limit} OFFSET {offset}'
         sparql += '\n'
 
@@ -1000,7 +1000,7 @@ class ResourceInstance:
             print(sparql)
             raise
         res = QueryProcessor(context, jsonres)
-        if count_only:
+        if countOnly:
             return res[0]['numResult']
         else:
             result = {}
@@ -1073,8 +1073,9 @@ class ResourceInstance:
             sparql += f'{blank:{indent * indent_inc}}SELECT (COUNT(DISTINCT ?s) as ?numResult)'
         else:
             sparql += f'{blank:{indent * indent_inc}}SELECT DISTINCT ?s'
-            for index, item in enumerate(includeProperties):
-                sparql += f' ?o{index}'
+            if includeProperties:
+                for index, item in enumerate(includeProperties):
+                    sparql += f' ?o{index}'
             if sortBy:
                 if sortBy == SortBy.CREATED:
                     sparql += ' ?creationDate'
@@ -1087,8 +1088,9 @@ class ResourceInstance:
                 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 .'
-        for index, prop in enumerate(includeProperties):
-            sparql += f'\n{blank:{(indent + 2) * indent_inc}}?s {prop} ?o{index} .'
+        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}}?s rdf:type {resClass} .'
         sparql += f'\n{blank:{(indent + 2) * indent_inc}}?s oldap:grantsPermission ?permset .'
         sparql += f'\n{blank:{(indent + 1) * indent_inc}}}}'
@@ -1107,8 +1109,9 @@ class ResourceInstance:
                 sparql += f'\n{blank:{indent * indent_inc}}ORDER BY ASC(?lastModificationDate)'
             if sortBy == SortBy.PROPVAL:
                 sparql += f'\n{blank:{indent * indent_inc}}ORDER BY'
-                for index, item in enumerate(includeProperties):
-                    sparql += f'\n{blank:{indent * indent_inc}} ?o{index}'
+                if includeProperties:
+                    for index, item in enumerate(includeProperties):
+                        sparql += f'\n{blank:{indent * indent_inc}} ?o{index}'
 
         if not count_only:
             sparql += f'\n{blank:{indent * indent_inc}}LIMIT {limit} OFFSET {offset}'
@@ -1126,8 +1129,9 @@ class ResourceInstance:
             result = {}
             for r in res:
                 tmp = {}
-                for index, item in enumerate(includeProperties):
-                    tmp[item] = r[f'o{index}']
+                if includeProperties:
+                    for index, item in enumerate(includeProperties):
+                        tmp[item] = r[f'o{index}']
 
                 if sortBy:
                     if sortBy == SortBy.CREATED:

{oldaplib-0.3.11 → oldaplib-0.3.13}/oldaplib/src/propertyclass.py

@@ -67,8 +67,8 @@ Attributes = dict[Xsd_QName, PropTypes]
 @serializer
 class HasPropertyData:
     refprop: Xsd_QName | None = None
-    minCount: Xsd_nonNegativeInteger | None = None
-    maxCount: Xsd_nonNegativeInteger | None = None
+    minCount: Xsd_integer | None = None
+    maxCount: Xsd_integer | None = None
     order: Xsd_decimal | None = None
     group: Xsd_QName | None = None
 
@@ -91,12 +91,15 @@ class HasPropertyData:
             sparql = ''
 
             if self.minCount and self.maxCount and self.minCount == self.maxCount:
-                sparql += f' ;\n{blank:{(indent + 1) * indent_inc}}owl:qualifiedCardinality {self.minCount.toRdf}'
+                tmp = Xsd_nonNegativeInteger(self.minCount)  # Convert to nonNegativeInteger
+                sparql += f' ;\n{blank:{(indent + 1) * indent_inc}}owl:qualifiedCardinality {tmp.toRdf}'
             else:
                 if self.minCount:
-                    sparql += f' ;\n{blank:{(indent + 1) * indent_inc}}owl:minQualifiedCardinality {self.minCount.toRdf}'
+                    tmp = Xsd_nonNegativeInteger(self.minCount)
+                    sparql += f' ;\n{blank:{(indent + 1) * indent_inc}}owl:minQualifiedCardinality {tmp.toRdf}'
                 if self.maxCount:
-                    sparql += f' ;\n{blank:{(indent + 1) * indent_inc}}owl:maxQualifiedCardinality {self.maxCount.toRdf}'
+                    tmp = Xsd_nonNegativeInteger(self.maxCount)
+                    sparql += f' ;\n{blank:{(indent + 1) * indent_inc}}owl:maxQualifiedCardinality {tmp.toRdf}'
             return sparql
 
 #@strict
@@ -1135,12 +1138,15 @@ class PropertyClass(Model, Notify):
         sparql += f'{blank:{(indent + 1) * indent_inc}}owl:onProperty {self._property_class_iri.toRdf}'
 
         if haspropdata.minCount and haspropdata.maxCount  and haspropdata.minCount == haspropdata.maxCount:
-            sparql += f' ;\n{blank:{(indent + 1)*indent_inc}}owl:qualifiedCardinality {haspropdata.minCount.toRdf}'
+            tmp = Xsd_nonNegativeInteger(haspropdata.minCount)
+            sparql += f' ;\n{blank:{(indent + 1)*indent_inc}}owl:qualifiedCardinality {tmp.toRdf}'
         else:
             if haspropdata.minCount:
-                sparql += f' ;\n{blank:{(indent + 1)*indent_inc}}owl:minQualifiedCardinality {haspropdata.minCount.toRdf}'
+                tmp = Xsd_nonNegativeInteger(haspropdata.minCount)
+                sparql += f' ;\n{blank:{(indent + 1)*indent_inc}}owl:minQualifiedCardinality {tmp.toRdf}'
             if haspropdata.maxCount:
-                sparql += f' ;\n{blank:{(indent + 1)*indent_inc}}owl:maxQualifiedCardinality {haspropdata.maxCount.toRdf}'
+                tmp = Xsd_nonNegativeInteger(haspropdata.maxCount)
+                sparql += f' ;\n{blank:{(indent + 1)*indent_inc}}owl:maxQualifiedCardinality {tmp.toRdf}'
         #
         # (NOTE: owl:onClass and owl:onDataRange can be used only in a restriction and are "local" to the use
         # of the property within the given resource. However, rdfs:range is "global" for all use of this property!

{oldaplib-0.3.11 → oldaplib-0.3.13}/oldaplib/src/resourceclass.py

@@ -983,12 +983,12 @@ class ResourceClass(Model, Notify):
             elif p == 'owl:onClass':
                 propdict[bnode_id]['to_node_iri'] = r['o']
             elif p == 'owl:minQualifiedCardinality':
-                propdict[bnode_id]['min_count'] = r['o']
+                propdict[bnode_id]['min_count'] = Xsd_integer(r['o'])
             elif p == 'owl:maxQualifiedCardinality':
-                propdict[bnode_id]['max_count'] = r['o']
+                propdict[bnode_id]['max_count'] = Xsd_integer(r['o'])
             elif p == 'owl:qualifiedCardinality':
-                propdict[bnode_id]['min_count'] = r['o']
-                propdict[bnode_id]['max_count'] = r['o']
+                propdict[bnode_id]['min_count'] = Xsd_integer(r['o'])
+                propdict[bnode_id]['max_count'] = Xsd_integer(r['o'])
             elif p == 'owl:onDataRange':
                 propdict[bnode_id]['datatype'] = r['o']
             else:

oldaplib-0.3.13/oldaplib/src/version.py

@@ -0,0 +1 @@
+__version__ = "0.3.13"