oldaplib 0.3.25__py3-none-any.whl → 0.3.26__py3-none-any.whl

oldaplib/src/objectfactory.py

@@ -1152,14 +1152,18 @@ class ResourceInstance:
         sparql = context.sparql_context
 
         sparql += f"""
-        SELECT ?subject ?graph ?path ?permval
+        SELECT ?subject ?graph ?path ?permval ?originalName ?serverUrl ?protocol ?originalMimeType
         WHERE {{
             VALUES ?inputImageId {{ {mediaObjectId.toRdf} }}
 
             GRAPH ?graph {{
                 ?subject shared:imageId ?inputImageId .
                 ?subject rdf:type shared:MediaObject .
+                ?subject shared:originalName ?originalName .
+                ?subject shared:originalMimeType ?originalMimeType .
+                ?subject shared:serverUrl ?serverUrl .
                 ?subject shared:path ?path .
+                ?subject shared:protocol ?protocol .
                 ?subject oldap:grantsPermission ?permset .
             }}
             GRAPH oldap:admin {{
@@ -1176,8 +1180,15 @@ class ResourceInstance:
             raise
         res = QueryProcessor(context, jsonres)
         if len(res) == 0 or len(res) > 1:
-            return None
-        return {'iri': res[0]['subject'], 'graph': res[0]['graph'], 'path': res[0]['path'], 'permval': res[0]['permval']}
+            raise OldapErrorNotFound(f'Media object with id {mediaObjectId} not found.')
+        return {'iri': res[0]['subject'],
+                'originalName': res[0]['originalName'],
+                'originalMimeType': res[0]['originalMimeType'],
+                'serverUrl': res[0]['serverUrl'],
+                'protocol': res[0]['protocol'],
+                'graph': res[0]['graph'],
+                'path': res[0]['path'],
+                'permval': res[0]['permval']}
 
 
     def toJsonObject(self) -> dict[str, list[str] | str]:

oldaplib/src/version.py

@@ -1 +1 @@
-__version__ = "0.3.25"
+__version__ = "0.3.26"

oldaplib/test/test_objectfactory.py

@@ -705,6 +705,5 @@ class TestObjectFactory(unittest.TestCase):
         res = ResourceInstance.get_media_object_by_id(con=self._connection,mediaObjectId='Nn3Epw1LMTNS.tif')
         print(res)
 
-
 if __name__ == '__main__':
     unittest.main()

{oldaplib-0.3.25.dist-info → oldaplib-0.3.26.dist-info}/METADATA

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

@@ -59,7 +59,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=_TldnQE6UzLAX0DKEGaRI9C-0RuZllFsfidGx4F-r5c,65746
+oldaplib/src/objectfactory.py,sha256=qAoBunuZLl7c0eoTdqnGOyAyEbpAd9n3XUVNy2aNVGk,66368
 oldaplib/src/oldaplist.py,sha256=sGAvEEJukRCjM70G0NFaR-L9YPleQTOtdWGExj3oYL8,42933
 oldaplib/src/oldaplist_helpers.py,sha256=1Gur0nS1PCKb9iUtCKPUFDOYjw6vvAwYpe-G3DdxlEc,14213
 oldaplib/src/oldaplistnode.py,sha256=NnC2juEGTtEkDO6OlB9PjSw_zTF-wSsRUgEk-6VV9DA,87344
@@ -70,7 +70,7 @@ oldaplib/src/propertyclass.py,sha256=OuzCSCRp8Qfz-PolmoH7FARfTEvWJd42ghLgvPsgT78
 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=3BcbLW1PvJr1pHJXu16ey11RhnsbUa0Urjh-utnL6WE,22
+oldaplib/src/version.py,sha256=Qx0UoE0uiKm9Exmc4sgdm-zsNEYk4Q1cPGLwdK6_XBA,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
@@ -126,7 +126,7 @@ oldaplib/test/test_hasproperty.py,sha256=r991g8kBTfv1CGs9Hf0fli-AUp7Ob7rOHWYD74h
 oldaplib/test/test_in_project.py,sha256=DYT-guwRQ9crnfEt7cQZxoEMxThin7QeymNce3jaZx4,7779
 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=SWwMmynHsYfRh86u8PDQsO8g4q7K4UR0LSb7zxZ1D1s,36773
+oldaplib/test/test_objectfactory.py,sha256=Pg1MUVDXUEY9gvYooYx5FFtgL774GeXg_PWIJh_quGE,36772
 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=9wo3tEOHt5bIuXyvSSyTzjhtdKrQHiiAA6EfVBuq4wI,20114
@@ -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.25.dist-info/METADATA,sha256=Pk52qbLPhmiiAnrbT-g8G1a1g5JElyTE7VT2tIRYMoU,3010
-oldaplib-0.3.25.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-oldaplib-0.3.25.dist-info/RECORD,,
+oldaplib-0.3.26.dist-info/METADATA,sha256=U9b_ymONaicZGqeiSmXlNEwU3k_OUlRjuUwRt3LXzac,3010
+oldaplib-0.3.26.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+oldaplib-0.3.26.dist-info/RECORD,,