diff --git a/CHANGELOG.md b/CHANGELOG.md
index 01ad67ac0ea431cde6afcceb4d2429ec90559d50..84e917f07c3b8d5a7e765210b21dd42688d62da1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Security
+## [0.12.2] - 2024-03-18
+
+### Fixed
+
+* Unknown error when trying to access the user list.
+ [linkahead-server#250](https://gitlab.com/linkahead/linkahead-server/-/issues/250)
+* Legacy integer ids are incremented by 1 again, not by 2.
+
## [0.12.1] - 2023-12-13
(Timm Fitschen)
diff --git a/CITATION.cff b/CITATION.cff
index 77f724679e3c57ef44e9380af8ded72cb7a30410..263a87208f2201b2aeb0038fc82019a621b1f3af 100644
--- a/CITATION.cff
+++ b/CITATION.cff
@@ -23,6 +23,6 @@ authors:
given-names: Stefan
orcid: https://orcid.org/0000-0001-7214-8125
title: "CaosDB - Server"
-version: 0.12.1
+version: 0.12.2
doi: 10.3390/data4020083
-date-released: 2023-12-13
+date-released: 2024-03-18
diff --git a/pom.xml b/pom.xml
index abe5e2827883f9445f02505294881134aefb4c1f..a8efcdbadd335a27d4a8a3a05adad46883bb2c73 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.caosdb</groupId>
<artifactId>caosdb-server</artifactId>
- <version>0.13.0-SNAPSHOT</version>
+ <version>0.12.3-SNAPSHOT</version>
<packaging>jar</packaging>
<name>CaosDB Server</name>
<scm>
diff --git a/src/doc/administration/server_side_scripting.rst b/src/doc/administration/server_side_scripting.rst
index 23beb74eaf5a6e56d1cc5c56bbd1f077306fc48c..dc4b020ea884a170df30ddd866e77fa1f6bf5a7a 100644
--- a/src/doc/administration/server_side_scripting.rst
+++ b/src/doc/administration/server_side_scripting.rst
@@ -1,126 +1,4 @@
Server-Side Scripting
=====================
-Introduction
-------------
-
-Small computation task, like some visualization, might be easily implemented in Python or some other language, but cumbersome to integrate into the server. Furthermore, the CaosDB server should stay a general tool without burden from specific projects. Also, one might want to trigger some standardized processing task from the web interface for convenience. For these situations the "server side scripting" is intended.
-
-Concepts
-------------
-
-The basic idea is that a script or program (script in the following) can be called to run on the server (or elsewhere in future) to do some calculations. This triggering of the script is done over the API so it can be done with any client. Input arguments can be passed to the script and the STDOUT and STDERR are returned.
-
-Each script is executed in a temporary home directory, which is automatically clean up. However, scripts can store files in the "$SHARED" folder and for example provide users a link that allows them to download files.
-
-Write and Install a Script
---------------------------
-
-A server-side script must accept at least the ``--auth-token=AUTH_TOKEN`` option. All other command-line parameters which are passed to the script are not specified by the API and maybe defined by the script itself.
-
-So a minimal bash script would be
-
-.. code-block:: sh
-
- #!/bin/bash
- echo Hello, World!
-
-thereby just ignoring the ``--auth-token`` option.
-
-The script has to be executable and must be placed somewhere in one of the directory trees which are configured by the server config :doc:`SERVER_SIDE_SCRIPTING_BIN_DIRS <configuration>`.
-
-Users will need the ``SCRIPTING:EXECUTE:path:to:the:script`` permission. Here the path to the script is of course relativet to the ``SERVER_SIDE_SCRIPTING_BIN_DIRS`` where it is located.
-
-For more information see the :doc:`specification of the API <../specification/Server-side-scripting>`
-
-Environment
-------------
-
-The script is called with several special environment variables to accommodate
-for its special location.
-
-`HOME`
-^^^^^^^^^^^^
-To be able to run with reduced privileges, the script has its `HOME` environment
-variable set to a special directory with write access. This directory will be
-deleted after the script has terminated. Its content is freshly copied for each
-script invocation from a skeleton directory, located in the server directory, in
-`scripting/home/`. By default, this directory contains the following:
-
-- `readme.md` :: A small text file describing the purpose of the directory.
-
-Users of CaosDB are invited to populate the directory with whatever their
-scripts need (for example a `.pycaosdb.ini` file).
-
-Invocation
-------------
-
-Server side scripts are triggered by sending a POST to the `/scripting` resource. There are the following arguments that can be provided:
-
-- `call`: the name of the script to be called
-- `-pN`: positional arguments (e.g. `-p0`, `-p1` etc.)
-- `-ONAME`: named arguments (e.g. `-Otest`, `-Onumber` etc.)
-
-The arguments will be passed to the script.
-
-An invocation via a button in javascript could look like:
-
-.. code-block:: javascript
-
- var _make_sss_button = function (entity) {
- const script = "script.py";
-
- const scripting_form = $(`
- <form class="btn-group-xs ${_css_class_export_button}"
- method="POST"
- action="/scripting">
- <input type="hidden" name="call" value="${script}"/>
- <input name="-p0" value=""/>
- <button type="submit" class="btn btn-link">Start script</button>
- </form>`);
- return scripting_form[0];
- }
-
-For more information see the :doc:`specification of the API <../specification/Server-side-scripting>`
-
-Calling from the webui
----------------------
-Refer to `webui documentation <https://docs.indiscale.com//caosdb-webui/extension/forms.html#calling-a-server-side-script>`_ to learn how to setup the webui side of this interaction.
-
-The following example assumes that the form in the webui has only one filed
-which is a file upload with the name ``csvfile``.
-
-
-.. code-block:: python
-
- import os
- import linkahead as db
- from caosadvancedtools.serverside import helper
- from caosadvancedtools.serverside.logging import configure_server_side_logging
-
- def main():
- parser = helper.get_argument_parser()
- args = parser.parse_args()
- db.configure_connection(auth_token=args.auth_token)
- # setup logging and reporting if serverside execution
- userlog_public, htmluserlog_public, debuglog_public = configure_server_side_logging()
-
- if not hasattr(args, "filename") or not args.filename:
- raise RuntimeError("No file with form data provided!")
-
- # Read the input from the form (form.json)
- with open(args.filename) as form_json:
- form_data = json.load(form_json)
-
- # files are uploaded to this dicectory
- upload_dir = os.path.dirname((args.filename))
- # Read content of th uplaoded file
- csv_file_path = os.path.join(upload_dir, form_data["csvfile"])
-
- # Do something with the upload csv file...
-
-
- if __name__ == "__main__":
- main()
-
-
+The documentation was updated and moved to the :doc:`linkahead's documentation <caosdb-deploy/server_side_scripting.html>`.
diff --git a/src/doc/conf.py b/src/doc/conf.py
index 530d8d653c6946b1c64738d7ad129f43d00afa8e..18feeb73ba20a435ce0a9a39aeda0bcca4e302f1 100644
--- a/src/doc/conf.py
+++ b/src/doc/conf.py
@@ -26,9 +26,9 @@ copyright = '2023, IndiScale GmbH'
author = 'Daniel Hornung, Timm Fitschen'
# The short X.Y version
-version = '0.13.0'
+version = '0.12.3'
# The full version, including alpha/beta/rc tags
-release = '0.13.0-dev'
+release = '0.12.3-SNAPSHOT'
# -- General configuration ---------------------------------------------------
diff --git a/src/doc/index.rst b/src/doc/index.rst
index e34afd382f0c4a1a5520b94a4fc00e1c0a67427b..d80bcc1c0a3b79b5e03a64a0437aadf45cb73938 100644
--- a/src/doc/index.rst
+++ b/src/doc/index.rst
@@ -19,7 +19,9 @@ Welcome to caosdb-server's documentation!
Changelog <CHANGELOG>
specification/index.rst
Glossary
- Server Internals<_apidoc/packages>
+ Server Internals <_apidoc/packages>
+ Related Projects <related_projects/index>
+ Back to overview <https://docs.indiscale.com/>
Welcome to the CaosDB, the flexible semantic data management toolkit!
diff --git a/src/doc/related_projects/index.rst b/src/doc/related_projects/index.rst
new file mode 100644
index 0000000000000000000000000000000000000000..c40b581e68d33ff3e58e3fbb16761ea891c990fb
--- /dev/null
+++ b/src/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:
+
+ :`MySQL backend <https://docs.indiscale.com/caosdb-mysqlbackend>`_: The MySQL/MariaDB components 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/src/main/java/org/caosdb/server/database/backend/implementation/MySQL/MySQLListUsers.java b/src/main/java/org/caosdb/server/database/backend/implementation/MySQL/MySQLListUsers.java
index 3b68c45d0ff60473ae837f3c9ebc17ae82e68c2d..db00b1d310e636dca4c96973d3578f6ee0400369 100644
--- a/src/main/java/org/caosdb/server/database/backend/implementation/MySQL/MySQLListUsers.java
+++ b/src/main/java/org/caosdb/server/database/backend/implementation/MySQL/MySQLListUsers.java
@@ -54,7 +54,7 @@ public class MySQLListUsers extends MySQLTransaction implements ListUsersImpl {
user.realm = rs.getString("realm");
user.email = rs.getString("email");
user.entity = rs.getString("entity");
- if (user.entity.isBlank() || user.entity.equals("0")) {
+ if (user.entity == null || user.entity.isBlank() || user.entity.equals("0")) {
user.entity = null;
}
user.status = UserStatus.valueOf(rs.getString("status"));
diff --git a/src/main/java/org/caosdb/server/entity/LegacyIds.java b/src/main/java/org/caosdb/server/entity/LegacyIds.java
index 0454129397b90772a505ad5b791a823eabd3ea97..e7e869a0f5edb26c5cf05d7a87cdc06419a3675e 100644
--- a/src/main/java/org/caosdb/server/entity/LegacyIds.java
+++ b/src/main/java/org/caosdb/server/entity/LegacyIds.java
@@ -60,7 +60,6 @@ public class LegacyIds extends EntityIdRegistryStrategy {
if (!isInit) {
init();
}
- ++currentMaxId;
return Integer.toString(++currentMaxId);
}
diff --git a/src/test/docker/Dockerfile b/src/test/docker/Dockerfile
index f0ae05e65389f4b89cb0cb1373a7475b054490cd..68ec89749f06f797ba67855e7671129700075787 100644
--- a/src/test/docker/Dockerfile
+++ b/src/test/docker/Dockerfile
@@ -6,7 +6,8 @@ RUN apt-get update && \
libtiff5-dev libjpeg-dev libopenjp2-7-dev zlib1g-dev \
libfreetype6-dev liblcms2-dev libwebp-dev tcl8.6-dev tk8.6-dev python3-tk \
libharfbuzz-dev libfribidi-dev libxcb1-dev \
- python3-pip screen libpam0g-dev unzip curl shunit2
+ python3-pip screen libpam0g-dev unzip curl shunit2 \
+ python3-lxml libxml2-dev libxslt-dev
RUN apt-get install -y \
libcairo2-dev