oldaplib 0.3.29__py3-none-any.whl → 0.3.30__py3-none-any.whl

oldaplib/src/objectfactory.py

@@ -1271,7 +1271,6 @@ class ResourceInstance:
             }}
         }}
         """
-        print(sparql)
         try:
             jsonres = con.query(sparql)
         except OldapError:

oldaplib/src/resourceclass.py

@@ -1601,10 +1601,21 @@ class ResourceClass(Model, Notify):
         sparql = f'INSERT DATA {{#E\n'
         sparql += f'    GRAPH {self._graph}:onto {{\n'
         sparql += f'{blank:{indent * indent_inc}}{self._owlclass_iri} rdfs:subClassOf [\n'
+        sparql += f'{blank:{(indent + 1) * indent_inc}}rdf:type owl:Restriction ;\n'
         if isinstance(prop, Xsd_QName):
-            sparql += prop.create_owl_part2(haspropdata=hasprop.haspropdata)
+            # sparql += prop.create_owl_part2(haspropdata=hasprop.haspropdata)
+            sparql += f'{blank:{(indent + 1) * indent_inc}}owl:onProperty {prop.toRdf}'
+            if hasprop.haspropdata.minCount and hasprop.haspropdata.maxCount and hasprop.haspropdata.minCount == hasprop.haspropdata.maxCount:
+                tmp = Xsd_nonNegativeInteger(hasprop.haspropdata.minCount)
+                sparql += f' ;\n{blank:{(indent + 1) * indent_inc}}owl:qualifiedCardinality {tmp.toRdf}'
+            else:
+                if hasprop.haspropdata.minCount:
+                    tmp = Xsd_nonNegativeInteger(hasprop.haspropdata.minCount)
+                    sparql += f' ;\n{blank:{(indent + 1) * indent_inc}}owl:minQualifiedCardinality {tmp.toRdf}'
+                if hasprop.haspropdata.maxCount:
+                    tmp = Xsd_nonNegativeInteger(hasprop.haspropdata.maxCount)
+                    sparql += f' ;\n{blank:{(indent + 1) * indent_inc}}owl:maxQualifiedCardinality {tmp.toRdf}'
         elif isinstance(prop, PropertyClass):
-            sparql += f'{blank:{(indent + 1) * indent_inc}}rdf:type owl:Restriction ;\n'
             sparql += f'{blank:{(indent + 1) * indent_inc}}owl:onProperty {prop.property_class_iri.toRdf}'
             sparql += hasprop.create_owl(indent=1)
         else:

oldaplib/src/version.py

@@ -1 +1 @@
-__version__ = "0.3.29"
+__version__ = "0.3.30"

{oldaplib-0.3.29.dist-info → oldaplib-0.3.30.dist-info}/METADATA

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

{oldaplib-0.3.29.dist-info → oldaplib-0.3.30.dist-info}/RECORD

@@ -58,7 +58,7 @@ oldaplib/src/helpers/tools.py,sha256=sNbiOLucTGNFzZmiWwPLFOb80VTXQH0Zd9uCGubhzAk
 oldaplib/src/iconnection.py,sha256=XlOc2Kh4tK_UOHydLQwlWjUFLUze-Aq_vEZpf9KS1-s,3677
 oldaplib/src/in_project.py,sha256=2KuhHPj8DNveFRBeImrRfxlCOYhBK-mcxXYUp6s--j8,10672
 oldaplib/src/model.py,sha256=VACR3T6zJYFaE5J1PFFdP0OSwhbu4sahoLMWg6_L_rE,19267
-oldaplib/src/objectfactory.py,sha256=4HHgkCNATZVgZD-PZHvAEs-Ndl2Q2yDFnAm5W0P-itI,72103
+oldaplib/src/objectfactory.py,sha256=O9f4U74aMYb-ilRRp4-0Bf02Nr242zkpSGjQieXCx-w,72081
 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
@@ -66,10 +66,10 @@ oldaplib/src/oldaplogging.py,sha256=IDSOylms9OSTInYPC4Y2QrTTEzRL0T5I2QssCevOhTU,
 oldaplib/src/permissionset.py,sha256=JU9cwgAEf3ppHvSzPZEgKxhYcYVxZoN1mqP96lexOSA,32912
 oldaplib/src/project.py,sha256=ic0cIYYcPk--7XsfbymuGkFbiUFmFJqNgjTWY2Rws7Q,35266
 oldaplib/src/propertyclass.py,sha256=OuzCSCRp8Qfz-PolmoH7FARfTEvWJd42ghLgvPsgT78,97213
-oldaplib/src/resourceclass.py,sha256=_WEyZRlt_sA_q8vzoOP8PdkBtjje8khiVHyvr_-1_ro,102817
+oldaplib/src/resourceclass.py,sha256=E_CT3MKgFyLUtvtrUtRU7sV5s0TPwxEb6l74PsnbgrI,103724
 oldaplib/src/user.py,sha256=fJVTbKjFi2WvnEzyDt77_Yh9s1X1Er3JkWHBQd-hF20,51805
 oldaplib/src/userdataclass.py,sha256=FbZkcRt0pKbOeqsZ7HbpwoKE-XPWH2AqpHG1GcsrBPo,12364
-oldaplib/src/version.py,sha256=paNs3dbDlGHdAwO8lKlskh0eO_-9UA9yzRqzr3R1j0E,22
+oldaplib/src/version.py,sha256=oBh5g9gWulwxsDtRAyFCLUGwW6sQ-rbAyv9UolefvTY,22
 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=w1Dr0z-REi7yPe3GPGnyzGrLVMvLY03kEeK-AmZ9sxw,8383
@@ -158,6 +158,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.3.29.dist-info/METADATA,sha256=jDHfVZ4RdSPGmoYYWcql2Spq5a0Bvpk6K1esAf0alGA,3010
-oldaplib-0.3.29.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-oldaplib-0.3.29.dist-info/RECORD,,
+oldaplib-0.3.30.dist-info/METADATA,sha256=vOTAT5ZHrbqKmyOnlj995JTMD0YM4Seco8czXKub8uw,3010
+oldaplib-0.3.30.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+oldaplib-0.3.30.dist-info/RECORD,,