oldaplib 0.3.12__tar.gz → 0.3.14__tar.gz

{oldaplib-0.3.12 → oldaplib-0.3.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: oldaplib
-Version: 0.3.12
+Version: 0.3.14
 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.12 → oldaplib-0.3.14}/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.12 → oldaplib-0.3.14}/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,11 +87,88 @@ 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
+    ###############################################################################
 
+    shared:MediaObjectShape a sh:NodeShape ;
+        sh:targetClass shared:MediaObject ;
+        dcterms:created "2025-11-21T00:15:09.037880+01:00"^^xsd:dateTime ;
+        dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
+        dcterms:modified "2025-11-21T00:15:09.037880+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:node oldap:ThingShape ;
+        sh:property [
+            sh:path rdf:type ;
+        ] ;
+        sh:property [                # >>PropertyClass.property_node_shacl()
+                sh:path shared:originalName ;
+                schema:version "0.1.0"^^xsd:string ;
+                dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
+                dcterms:created "2025-11-21T00:15:09.037880+01:00"^^xsd:dateTime ;
+                dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
+                dcterms:modified "2025-11-21T00:15:09.037880+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 shared:originalMimeType ;
+                schema:version "0.1.0"^^xsd:string ;
+                dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
+                dcterms:created "2025-11-21T00:15:09.037880+01:00"^^xsd:dateTime ;
+                dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
+                dcterms:modified "2025-11-21T00:15:09.037880+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 shared:serverUrl ;
+                schema:version "0.1.0"^^xsd:string ;
+                dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
+                dcterms:created "2025-11-21T00:15:09.037880+01:00"^^xsd:dateTime ;
+                dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
+                dcterms:modified "2025-11-21T00:15:09.037880+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 shared:imageId ;
+                schema:version "0.1.0"^^xsd:string ;
+                dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
+                dcterms:created "2025-11-21T00:15:09.037880+01:00"^^xsd:dateTime ;
+                dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
+                dcterms:modified "2025-11-21T00:15:09.037880+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 ;
+        ] .
 }
 
 shared:onto {
@@ -161,6 +238,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 +288,76 @@ shared:onto {
                 owl:onDataRange xsd:decimal
             ] .
 
+    ###########################################################################
+    # Media object
+    ###########################################################################
+
+        shared:originalName rdf:type owl:DatatypeProperty ;
+            rdfs:domain shared:MediaObject ;
+            rdfs:range xsd:string ;
+            dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
+            dcterms:created "2025-11-21T00:15:09.037880+01:00"^^xsd:dateTime ;
+            dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
+            dcterms:modified "2025-11-21T00:15:09.037880+01:00"^^xsd:dateTime .
+
+        shared:originalMimeType rdf:type owl:DatatypeProperty ;
+            rdfs:domain shared:MediaObject ;
+            rdfs:range xsd:string ;
+            dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
+            dcterms:created "2025-11-21T00:15:09.037880+01:00"^^xsd:dateTime ;
+            dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
+            dcterms:modified "2025-11-21T00:15:09.037880+01:00"^^xsd:dateTime .
+
+        shared:serverUrl rdf:type owl:DatatypeProperty ;
+            rdfs:domain shared:MediaObject ;
+            rdfs:range xsd:anyURI ;
+            dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
+            dcterms:created "2025-11-21T00:15:09.037880+01:00"^^xsd:dateTime ;
+            dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
+            dcterms:modified "2025-11-21T00:15:09.037880+01:00"^^xsd:dateTime .
+
+        shared:imageId rdf:type owl:DatatypeProperty ;
+            rdfs:domain shared:MediaObject ;
+            rdfs:range xsd:string ;
+            dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
+            dcterms:created "2025-11-21T00:15:09.037880+01:00"^^xsd:dateTime ;
+            dcterms:contributor <https://orcid.org/0000-0003-1681-4036> ;
+            dcterms:modified "2025-11-21T00:15:09.037880+01:00"^^xsd:dateTime .
+
+        shared:MediaObject rdf:type owl:Class ;
+            schema:version "0.1.0"^^xsd:string ;
+            dcterms:created "2025-11-21T00:15:09.037880+01:00"^^xsd:dateTime ;
+            dcterms:creator <https://orcid.org/0000-0003-1681-4036> ;
+            dcterms:modified "2025-11-21T00:15:09.037880+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 shared:originalName ;
+                    owl:qualifiedCardinality "1"^^xsd:nonNegativeInteger ;
+                    owl:onDataRange xsd:string ;
+                ] ,
+                [
+                    rdf:type owl:Restriction ;
+                    owl:onProperty shared:originalMimeType ;
+                    owl:qualifiedCardinality "1"^^xsd:nonNegativeInteger ;
+                    owl:onDataRange xsd:string ;
+                ] ,
+                [
+                    rdf:type owl:Restriction ;
+                    owl:onProperty shared:serverUrl ;
+                    owl:qualifiedCardinality "1"^^xsd:nonNegativeInteger ;
+                    owl:onDataRange xsd:anyURI ;
+                ] ,
+                [
+                    rdf:type owl:Restriction ;
+                    owl:onProperty shared:imageId ;
+                    owl:qualifiedCardinality "1"^^xsd:nonNegativeInteger ;
+                    owl:onDataRange xsd:string ;
+                ] .
+
+
 }
 

{oldaplib-0.3.12 → oldaplib-0.3.14}/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.12 → oldaplib-0.3.14}/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.12 → oldaplib-0.3.14}/oldaplib/src/objectfactory.py

@@ -495,7 +495,7 @@ class ResourceInstance:
             raise OldapErrorNoPermission(message)
 
         timestamp = Xsd_dateTimeStamp()
-        if self.name == "Thing":
+        if self.name in ("Thing", "oldap:Thing"):
             self._values[Xsd_QName('oldap:createdBy', validate=False)] = ObservableSet({self._con.userIri})
             self._values[Xsd_QName('oldap:creationDate', validate=False)] = ObservableSet({timestamp})
             self._values[Xsd_QName('oldap:lastModifiedBy', validate=False)] = ObservableSet({self._con.userIri})
@@ -517,7 +517,7 @@ class ResourceInstance:
         sparql += f'{blank:{indent * indent_inc}}INSERT DATA {{'
         sparql += f'\n{blank:{(indent + 1) * indent_inc}}GRAPH {self._graph}:data {{'
 
-        sparql += f'\n{blank:{(indent + 2) * indent_inc}}{self._iri.toRdf} a {self._graph}:{self.name}'
+        sparql += f'\n{blank:{(indent + 2) * indent_inc}}{self._iri.toRdf} a {self.name}'
 
         for prop_iri, values in self._values.items():
             if self.properties.get(prop_iri) and self.properties[prop_iri].prop.datatype == XsdDatatypes.QName:
@@ -537,6 +537,7 @@ class ResourceInstance:
                 raise OldapErrorAlreadyExists(f'Resource with IRI {self._iri} already exists.')
             self._con.transaction_update(sparql)
         except OldapError as e:
+            print(sparql)
             self._con.transaction_abort()
             raise
         self._con.transaction_commit()
@@ -1172,7 +1173,9 @@ class ResourceInstanceFactory:
     """
     _con: IConnection
     _project: Project
+    _sharedProject: Project
     _datamodel: DataModel
+    _sharedModel: DataModel
 
     def __init__(self,
                  con: IConnection,
@@ -1182,20 +1185,30 @@ class ResourceInstanceFactory:
             self._project = project
         else:
             self._project = Project.read(self._con, project)
+        self._sharedProject = Project.read(self._con, "oldap:SharedProject")
 
-        self._datamodel = DataModel.read(con=self._con, project=self._project, ignore_cache=True)
+        self._datamodel = DataModel.read(con=self._con, project=self._project)
+        self._sharedModel = DataModel.read(con=self._con, project=self._sharedProject)
 
-    def createObjectInstance(self, name: Xsd_NCName | str) -> Type:  ## ToDo: Get name automatically from IRI
-        classiri = Xsd_QName(self._project.projectShortName, name)
+    def createObjectInstance(self, name: Xsd_NCName | Xsd_QName | str) -> Type:  ## ToDo: Get name automatically from IRI
+        if isinstance(name, Xsd_QName):
+            classiri = name
+        else:
+            try:
+                classiri = Xsd_QName(name, validate=True)
+            except (ValueError, OldapErrorValue):
+                if not isinstance(name, Xsd_NCName):
+                    name = Xsd_NCName(name, validate=True)
+                classiri = Xsd_QName(self._project.projectShortName, name)
         resclass = self._datamodel.get(classiri)
-        if not isinstance(name, Xsd_NCName):
-            name = Xsd_NCName(name)
+        if not resclass:
+            resclass = self._sharedModel.get(classiri)
         if resclass is None:
             raise OldapErrorNotFound(f'Given Resource Class "{classiri}" not found.')
         return type(str(name), (ResourceInstance,), {
             '_con': self._con,
             'project': self._project,
-            'name': name,
+            'name': resclass.owl_class_iri,
             'factory': self,
             'properties': resclass.properties,
             'superclass': resclass.superclass})

{oldaplib-0.3.12 → oldaplib-0.3.14}/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.12 → oldaplib-0.3.14}/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.14/oldaplib/src/version.py

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

{oldaplib-0.3.12 → oldaplib-0.3.14}/oldaplib/test/test_objectfactory.py

@@ -357,6 +357,25 @@ class TestObjectFactory(unittest.TestCase):
         mycat = Cat(name="Fluffy", subName="Fluffy the Cat")
         mycat.create()
 
+    def test_create_from_shared(self):
+        dm = DataModel.read(con=self._connection, project='test')
+        factory = ResourceInstanceFactory(con=self._connection, project='test')
+        MO = factory.createObjectInstance('shared:MediaObject')
+        mo = MO(originalName='Cat.tif',
+                originalMimeType='image/tiff',
+                serverUrl='http://iiif.oldap.org/iiif/3/',
+                imageId='cat.tif',
+                grantsPermission=Iri('oldap:GenericView'))
+        mo.create()
+        data = ResourceInstance.read_data(con=self._connection, iri=mo.iri, projectShortName='test')
+        print(data)
+        self.assertEqual(data[Xsd_QName("oldap:grantsPermission")], ['oldap:GenericView'])
+        self.assertEqual(data[Xsd_QName("shared:originalName")], ['Cat.tif'])
+        self.assertEqual(data[Xsd_QName("shared:originalMimeType")], ['image/tiff'])
+        self.assertEqual(data[Xsd_QName("shared:serverUrl")], ['http://iiif.oldap.org/iiif/3/'])
+        self.assertEqual(data[Xsd_QName("shared:imageId")], ['cat.tif'])
+        mo.delete()
+
     def test_read_A(self):
         factory = ResourceInstanceFactory(con=self._connection, project='test')
         Book = factory.createObjectInstance('Book')
@@ -381,7 +400,7 @@ class TestObjectFactory(unittest.TestCase):
                  grantsPermission=Iri('oldap:GenericView'))
         b.create()
         bb = factory.read(iri=b.iri)
-        self.assertEqual(bb.name, "Book")
+        self.assertEqual(bb.name, "test:Book")
         self.assertEqual(bb.title, {Xsd_string("The Life and Times of Scrooge")})
         self.assertEqual(bb.author, {Iri("test:TuomasHolopainen")})
         jsonobj = bb.toJsonObject()
@@ -398,7 +417,7 @@ class TestObjectFactory(unittest.TestCase):
                  grantsPermission=Iri('oldap:GenericView'))
         b.create()
         bb = Book.read(con=self._connection, iri=b.iri)
-        self.assertEqual(bb.name, "Book")
+        self.assertEqual(bb.name, "test:Book")
         self.assertEqual(bb.title, {Xsd_string("The Life and Times of Scrooge")})
         self.assertEqual(bb.author, {Iri("test:TuomasHolopainen")})
         jsonobj = bb.toJsonObject()

{oldaplib-0.3.12 → oldaplib-0.3.14}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "oldaplib"
-version = "0.3.12"
+version = "0.3.14"
 description = "Open Media Access Server Library (Linked Open Data middleware/RESTApi)"
 authors = ["Lukas Rosenthaler <lukas.rosenthaler@unibas.ch>"]
 license = "GNU Affero General Public License version 3"

oldaplib-0.3.12/oldaplib/src/version.py

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