keep the streamText's xml:id through compilation via jf:merged/jf:com…

…bined
opensiddur · Mar 28, 2014 · 03ee2bb · 03ee2bb
1 parent c709572
commit 03ee2bb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/opensiddur-server/src/transforms/flatten.xqm b/opensiddur-server/src/transforms/flatten.xqm
@@ -157,6 +157,12 @@ declare function flatten:merge(
   $params as map
   ) as element(jf:merged) {
   element jf:merged {
+    (: jf:merged takes the place of streamText :)
+    $streamText/(@* except @xml:id),
+    if ($streamText/@xml:id)
+    then
+      attribute jf:id { $streamText/@xml:id }
+    else (),
     flatten:order-flattened(
       (
       $layers/(node() except jf:placeholder),

diff --git a/opensiddur-tests/src/tests/transforms/flatten/compile.t.xml b/opensiddur-tests/src/tests/transforms/flatten/compile.t.xml
@@ -66,7 +66,7 @@
       ]]></code>
       <xpath 
         desc="acts as an identity transform for unflattened text" 
-        >exists(./tei:TEI/tei:text/jf:combined/tei:seg[@jf:id="seg1"][@jf:stream="stream"])
+        >exists(./tei:TEI/tei:text/jf:combined[@jf:id="stream"]/tei:seg[@jf:id="seg1"][ends-with(@jf:stream,"#stream")])
       </xpath>
       <xpath 
         desc="a license statement is added"