Merge branch 'main' into dependabot/pip/opentelemetry-proto-1.38.0

Author: Zalfsten

.github/workflows/code_check.yml

@@ -17,10 +17,10 @@ jobs:
 
     steps:
       - name: Checkout git repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Set up Python ${{ env.PYTHON_VERSION }}
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: "${{ env.PYTHON_VERSION }}"
 

.github/workflows/codeql.yml

@@ -48,11 +48,11 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
+      uses: github/codeql-action/init@v4
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -66,7 +66,7 @@ jobs:
     # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v3
+      uses: github/codeql-action/autobuild@v4
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -79,6 +79,6 @@ jobs:
     #     ./location_of_script_within_repo/buildscript.sh
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
+      uses: github/codeql-action/analyze@v4
       with:
         category: "/language:${{matrix.language}}"

.github/workflows/docker_build.yml

@@ -29,7 +29,7 @@ jobs:
       Patch: ${{ steps.gitversion.outputs.Patch }}
     steps:
       - name: Checkout git repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0 # This is needed for GitVersion not to crash
 
@@ -59,7 +59,7 @@ jobs:
 
     steps:
       - name: Checkout git repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3

middleware/scripts/publiso_conversor.jq

@@ -1,40 +1,59 @@
-..[] | {
+.[] | {
     "@context": {
         "@language": "en",
         "@vocab":"https://schema.org/"},
     "@type": "Dataset",
-    "@id": ("https://doi.org/" + .doi),
+    "@id":
+        (if has("doi")
+            then "https://doi.org/" + .doi
+            else "https://repository.publisso.de/resource/" + .["@id"]
+        end),
     "name": (if has("title") then (.title[]) else null end),
     "alternativeHeadline": (if has("alternative") then .alternative[0] else null end),
     "description": (if has("description") then (.description[]) else null end),
-		"identifier": (if has("doi") then (.doi | {"@type":"PropertyValue", "value":., "propertyID": "https://registry.identifiers.org/registry/doi", "url": ("https://doi.org/" +  .)}) else null end),
-    "creator":
-				[
-
-                     (if has("creator") then
-    (.creator[] 
-      | {
-          "@type": "Person",
-          "familyName": (.prefLabel | split(", ")[0]),
-          "givenName":  (.prefLabel | split(", ")[1: ] | join(" ")),
-          "identifier": ."@id"
+    "identifier": ([
+        (if has("doi") then
+            {
+              "@type": "PropertyValue",
+              "propertyID": "https://registry.identifiers.org/registry/doi",
+              "value": .doi,
+              "url": ("https://doi.org/" +  .doi)
+            }
+         else empty end),
+        {
+          "@type": "PropertyValue",
+          "propertyID": "frl-internal",
+          "value": .["@id"],
+          "url": ("https://repository.publisso.de/resource/" +  .["@id"])
         }
-    )
-   else null end)
-				],
+    ]),
+
+    "creator":
+        [
+            (if has("creator") then
+                (.creator[]
+                  | {
+                      "@type": "Person",
+                      "familyName": (.prefLabel | split(", ")[0]),
+                      "givenName":  (.prefLabel | split(", ")[1: ] | join(" ")),
+                      "identifier": ."@id"
+                    }
+                )
+            else null end)
+        ],
     "contributor":
         [
-  (if has("contributor") then
-    (.contributor[] 
-      | {
-          "@type": "Person",
-          "familyName": (.prefLabel | split(", ")[0]),
-          "givenName":  (.prefLabel | split(", ")[1: ] | join(" ")),
-          "identifier": ."@id"
-        }
-    )
-   else null end)
-],
+            (if has("contributor") then
+                (.contributor[]
+                  | {
+                      "@type": "Person",
+                      "familyName": (.prefLabel | split(", ")[0]),
+                      "givenName":  (.prefLabel | split(", ")[1: ] | join(" ")),
+                      "identifier": ."@id"
+                    }
+                )
+            else null end)
+        ],
     "sourceOrganization":
         [
             (if has("institution") then (.institution[] | {"@type":"Organization", "@id": ."@id", "name": .prefLabel}) else null end)
@@ -46,7 +65,7 @@
             (if has("ddc") then (.ddc[] | {"@type":"DefinedTerm", "name": .prefLabel, "identifier": ."@id", "inDefinedTermSet": "https://www.oclc.org/en/dewey.html"}) else null end),
             (if has("subject") then (.subject[] | {"@type":"DefinedTerm", "name": .prefLabel, "identifier": ."@id"}) else null end)
         ],
-		"measurementTechnique":
+    "measurementTechnique":
         [
             (if has("dataOrigin") then (.dataOrigin[] | {"@type":"DefinedTerm", "name": .prefLabel, "identifier": ."@id"}) else null end)
         ],
@@ -56,7 +75,7 @@
         ],
     "funding":
         [
-						(if has("joinedFunding") then (.joinedFunding[] | {"@type":"Grant", "name": .fundingProgramJoined, "funder": .fundingJoined | {"@type":"Organization", "@id": ."@id", "name": .prefLabel}}) else (if has("fundingProgram") then (.fundingProgram[] | {"@type":"Grant", "name": .}) else null end) end)
+            (if has("joinedFunding") then (.joinedFunding[] | {"@type":"Grant", "name": .fundingProgramJoined, "funder": .fundingJoined | {"@type":"Organization", "@id": ."@id", "name": .prefLabel}}) else (if has("fundingProgram") then (.fundingProgram[] | {"@type":"Grant", "name": .}) else null end) end)
         ],
     "distribution":
         [