Merge branch 'dev' into unit-tests

Author: philippepons

repo/backend/update/add_collection.xqm

@@ -6,6 +6,7 @@ import module namespace functx = 'http://www.functx.com';
 import module namespace G = "globals";
 import module namespace utils_dots = "utils_dots"; 
 import module namespace resources = "backend/resources_register_builder";
+declare namespace dc = "http://purl.org/dc/elements/1.1/";
 
 declare namespace dots = "https://github.com/chartes/dots/";
 
@@ -35,10 +36,18 @@ declare updating function add_coll:handleAddition($dbName as xs:string, $resourc
 declare updating function add_coll:addCollToResourcesReg($dbName as xs:string, $resourceId as xs:string, $parentId as xs:string) {
   let $csv := resources:getCSV-map($dbName, "collection")
   let $resources_register := db:get($dbName, $G:resourcesRegister)//dots:member
+  let $metadata := resources:getCollectionMetadata($dbName, $resourceId, $csv)
   return
     insert node 
-      <collection xmlns="https://github.com/chartes/dots/" dtsResourceId="{$resourceId}" totalChildren="0" parentIds="{$parentId}">{
-        resources:getCollectionMetadata($dbName, $resourceId, $csv)
+      <collection xmlns="https://github.com/chartes/dots/" dtsResourceId="{$resourceId}" totalChildren="0" parentIds="{$parent}">{
+        if ($metadata/descendant-or-self::*:title)
+        then
+          $metadata
+        else
+          (
+            <dc:title>{$resourceId}</dc:title>,
+            $metadata
+          )
       }</collection> as last into $resources_register
 };
 

repo/globals.xqm

@@ -17,7 +17,7 @@ declare default element namespace "https://github.com/chartes/dots/";
 (:~ Variable pour accéder aux feuilles de transformation XSLT :)
 (: "/srv/transform/" :)
 declare function G:linkToXsl() {
-  let $specificLink := db:get($G:dots)//settings/linkXSL
+  let $specificLink := db:get($G:dots)//settings/linkXSL[. != ""]
   return
     if ($specificLink != "")
     then if (ends-with($specificLink, "/")) then $specificLink else concat($specificLink, "/")

repo/resolver/utils.xqm

@@ -672,9 +672,9 @@ declare function utils:getMandatory(
   )
   let $uri := substring-before(request:uri(), "/api")
   let $resourceLink := if ($type = ("resource", "Resource")) then (
-    <pair name="collection">{concat($uri, "/api/dts/collection?id=", $resourceId, "{&amp;nav}")}</pair>,
-    <pair name="document">{concat($uri, "/api/dts/document?resource=", $resourceId, "{&amp;ref,start,end,tree,mediaType}")}</pair>,
-    <pair name="navigation">{concat($uri, "/api/dts/navigation?resource=", $resourceId, "{&amp;ref,start,end,tree,down}")}</pair>,
+    <pair name="collection">{concat($uri, "/api/dts/collection?id=", $resourceId, "{?nav}")}</pair>,
+    <pair name="document">{concat($uri, "/api/dts/document?resource=", $resourceId, "{?ref,start,end,tree,mediaType}")}</pair>,
+    <pair name="navigation">{concat($uri, "/api/dts/navigation?resource=", $resourceId, "{?ref,start,end,tree,down}")}</pair>,
     let $downloads := $resource/*:download
     where $downloads
     return

tests/project_create/project_registers_create_test.xq

@@ -67,11 +67,35 @@ declare %unit:test function local:assertUniqueResourcesIdentifiers() {
  : @return Success if all fragment references are distinct.
 :)
 declare %unit:test function local:assertUniqueFragmentsIdentifiers() {
-  let $ref := db:get($dbName, $G:fragmentsRegister)//dots:member/dots:fragment/@ref
+  let $reg := db:get($dbName, $G:fragmentsRegister)
   return
-    unit:assert(empty(duplicate-values($ref)))
+    for $fragments in $reg//dots:fragment
+    let $resourceId := $fragments/@resourceId
+    group by $resourceId
+    return
+      let $ref :=
+        for $fragment in $fragments
+        let $ref := $fragment/@ref
+        return normalize-space($ref)
+      return
+        unit:assert(empty(duplicate-values($ref)))
 };
 
+(: let $reg := db:get("theater", "dots/fragments_register.xml")
+return
+  for $fragments in $reg//*:fragment
+  let $resourceId := $fragments/@resourceId
+  group by $resourceId
+  return
+    <resource id="{$resourceId}">{
+      let $ref :=
+        for $fragment in $fragments
+        let $ref := $fragment/@ref
+        return normalize-space($ref)
+      return
+        duplicate-values($ref)
+    }</resource> :)
+
 (:~
  : This test verifies that the value of @totalChildren for each collection matches the number of members referring to it as a parent.
  : @return Success if the declared number of children equals the actual count.

webapp/WEB-INF/web.xml

@@ -56,7 +56,6 @@
     <url-pattern>/static/*</url-pattern>
   </servlet-mapping>
 
-  <!-- Set Access-Control-Allow-Origin: * -->
   <filter>
     <filter-name>cross-origin</filter-name>
     <filter-class>org.eclipse.jetty.ee9.servlets.CrossOriginFilter</filter-class>