oldaplib 0.3.22__py3-none-any.whl → 0.3.23__py3-none-any.whl

oldaplib/src/resourceclass.py

@@ -671,11 +671,26 @@ class ResourceClass(Model, Notify):
         """
         context = Context(name=self._con.context_name)
         query = context.sparql_context
+        # query += f"""
+        # ASK {{
+        #     GRAPH {self._project.projectShortName}:data {{
+        #         ?resinstance rdf:type {self._owlclass_iri} .
+        #         FILTER(?resinstance != {self._owlclass_iri}Shape)
+        #     }}
+        # }}
+        # """
         query += f"""
         ASK {{
-            GRAPH {self._project.projectShortName}:data {{
-                ?resinstance rdf:type {self._owlclass_iri} .
-                FILTER(?resinstance != {self._owlclass_iri}Shape)
+            {{
+                GRAPH {self._project.projectShortName}:data {{
+                    ?resinstance rdf:type {self._owlclass_iri} .
+                }}
+            }}
+            UNION
+            {{
+                GRAPH {self._project.projectShortName}:onto {{
+                    ?subclass rdfs:subClassOf+ {self._owlclass_iri} .
+                }}
             }}
         }}
         """

oldaplib/src/version.py

@@ -1 +1 @@
-__version__ = "0.3.22"
+__version__ = "0.3.23"

{oldaplib-0.3.22.dist-info → oldaplib-0.3.23.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: oldaplib
-Version: 0.3.22
+Version: 0.3.23
 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.22.dist-info → oldaplib-0.3.23.dist-info}/RECORD

@@ -67,10 +67,10 @@ oldaplib/src/oldaplogging.py,sha256=IDSOylms9OSTInYPC4Y2QrTTEzRL0T5I2QssCevOhTU,
 oldaplib/src/permissionset.py,sha256=bzzVuZ7O_yVMujziwo32GEJIZYGG3g5gTds4HjLmGtU,31874
 oldaplib/src/project.py,sha256=DNwViRg19zkE1F0zuWqQFK008uTVehVAu7xNbyessig,34207
 oldaplib/src/propertyclass.py,sha256=OuzCSCRp8Qfz-PolmoH7FARfTEvWJd42ghLgvPsgT78,97213
-oldaplib/src/resourceclass.py,sha256=I6m93JhfCh4XAUFgmb6v0fD798DfU7-ImTKrUJk4g-o,102098
+oldaplib/src/resourceclass.py,sha256=uzPhwTBdWmB228R1FUddB4XaZcOfBAPAPYn-ZPZkeF0,102551
 oldaplib/src/user.py,sha256=Z4GXPRkaHXx3glUpPXQdFqYMxQPOuqayDwkTAE5RGjU,48820
 oldaplib/src/userdataclass.py,sha256=FbZkcRt0pKbOeqsZ7HbpwoKE-XPWH2AqpHG1GcsrBPo,12364
-oldaplib/src/version.py,sha256=4taJJaGNydi5cJmoZOKzj0v5QfTSj0KJZiAHh1J83MQ,22
+oldaplib/src/version.py,sha256=ovPlsd5alU9FtB_D6PMNL3UQU7LKO_8BAOVb9xu2uuk,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.22.dist-info/METADATA,sha256=5hrFKoin1P63-sfNf5-kDGfQc1sSSYBhhosn0INEUIU,3010
-oldaplib-0.3.22.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-oldaplib-0.3.22.dist-info/RECORD,,
+oldaplib-0.3.23.dist-info/METADATA,sha256=sviKAfMZrAR-Ev-cYC6M4hXwa5tbayDaOvJpIMRLqiU,3010
+oldaplib-0.3.23.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+oldaplib-0.3.23.dist-info/RECORD,,