diff --git a/doc/conf.py b/doc/conf.py index 5fdc05d730471fc610d2b3c5971ced9cfc14f192..b91de6f657f719e49fee9777062c9d3504e070cb 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -22,7 +22,7 @@ import sphinx_rtd_theme # -- Project information ----------------------------------------------------- project = 'caosdb-mysqlbackend' -copyright = '2021, IndiScale GmbH' +copyright = '2021 - 2024, IndiScale GmbH' author = 'Daniel Hornung' # The short X.Y version diff --git a/doc/index.rst b/doc/index.rst index 3924201bb5ab51ac7e1517f4eb1de95968dcb7b8..eac53ba65a937e1d57664af6a22780b262e35492 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -10,7 +10,9 @@ Welcome to documentation of CaosDB's MySQL Backend! Getting started <README_SETUP> Concepts <concepts> Maintenance - API documentation<functions> + API documentation <functions> + Related Projects <related_projects/index> + Back to Overview <https://docs.indiscale.com/> This documentation helps you to :doc:`get started<README_SETUP>`, explains the most important :doc:`concepts<concepts>` . diff --git a/doc/related_projects/index.rst b/doc/related_projects/index.rst new file mode 100644 index 0000000000000000000000000000000000000000..78abfd939a097245042a8487eee8ae0d6b4d9e44 --- /dev/null +++ b/doc/related_projects/index.rst @@ -0,0 +1,25 @@ +Related Projects +++++++++++++++++ + +.. toctree:: + :maxdepth: 2 + :caption: Contents: + :hidden: + +.. container:: projects + + For in-depth documentation for users, administrators and developers, you may want to visit the subproject-specific documentation pages for: + + :`Server <https://docs.indiscale.com/caosdb-server>`_: The Java part of the LinkAhead server. + + :`WebUI <https://docs.indiscale.com/caosdb-webui>`_: The default web frontend for the LinkAhead server. + + :`PyLinkAhead <https://docs.indiscale.com/caosdb-pylib>`_: The LinkAhead Python library. + + :`Advanced user tools <https://docs.indiscale.com/caosdb-advanced-user-tools>`_: The advanced Python tools for LinkAhead. + + :`LinkAhead Crawler <https://docs.indiscale.com/caosdb-crawler/>`_: The crawler is the main tool for automatic data integration in LinkAhead. + + :`LinkAhead <https://docs.indiscale.com/caosdb-deploy>`_: Your all inclusive LinkAhead software package. + + :`Back to Overview <https://docs.indiscale.com/>`_: LinkAhead Documentation. diff --git a/procedures/query/initEntity.sql b/procedures/query/initEntity.sql index d63c7773867cb9e5c29bdc4f95cbe866c3b426c4..5d1f978baabae19691bb84eb172bb06898ed61b9 100644 --- a/procedures/query/initEntity.sql +++ b/procedures/query/initEntity.sql @@ -80,9 +80,10 @@ initEntityLabel: BEGIN IF(versioned, '` (id, _iversion) SELECT eids.internal_id, _get_head_iversion(eids.internal_id) ', '` (id) SELECT eids.internal_id '), - 'FROM entity_ids AS eids WHERE eids.id=',eid,';'); + 'FROM entity_ids AS eids WHERE eids.id=?;'); + SET @query_param = eid; PREPARE initEntityStmt FROM @initEntityStmtStr; - EXECUTE initEntityStmt; + EXECUTE initEntityStmt USING @query_param; DEALLOCATE PREPARE initEntityStmt; END IF;