Merge branch 'new-comparison-backend' into devel

acdh-oeaw · Sep 10, 2024 · 83d4f40 · 83d4f40
2 parents d9462a3 + d235281
commit 83d4f40
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/vicav.xqm b/vicav.xqm
@@ -822,7 +822,7 @@ declare function vicav:compare-data(
     ) {
 
     let $features_filter := if ((empty($word) or $word = '') and (empty($features) or $features = '')) then 
-            if ($resourcetype = 'samples') then "1" else ''
+            ''
         else 
             if ($resourcetype = 'samples') then replace($features, '[^\d,]+', '') else replace($features, '[^\w:,_]+', '')
 
@@ -980,7 +980,7 @@ declare function vicav:_get_compare_markers(
                 <freq>{count($entries[vicav:get-root(.)/tei:teiHeader/tei:profileDesc/tei:settingDesc/tei:place/tei:settlement[1]/tei:name[@xml:lang="en"]/text() = $locName])}</freq>
                 <params>
                     <dataType>{$dataType}</dataType>
-                    <ids>{string-join(distinct-values(vicav:get-root($item)/@xml:id))}</ids>
+                    <ids>{string-join(distinct-values(vicav:get-root($item)/@xml:id), ",")}</ids>
                     <features>{$features}</features>
                     <translation>{$translation}</translation>
                     <comment>{$comment}</comment>

diff --git a/xslt/bibl-markers-json.xslt b/xslt/bibl-markers-json.xslt
@@ -19,7 +19,7 @@
     <xsl:param name="current-query" as="xs:string?" select='()'/>
 
     <xsl:template match="/">
-        <json objects="geometry properties" arrays="json coordinates" numbers="hitCount">
+        <json objects="geometry properties params" arrays="json coordinates" numbers="hitCount">
           <xsl:apply-templates select=".//r"/>
         </json>
     </xsl:template>
@@ -82,9 +82,7 @@
                         </xsl:when>
                     </xsl:choose>
                 </targetType>
-                <xsl:for-each select="params/*">
-                    <xsl:copy-of select="."/>
-                </xsl:for-each>
+                <xsl:copy-of select="./params"/>
                 <xsl:if test="exists($current-query)">
                     <queryString><xsl:value-of select="$current-query||'+'||(locName, alt)[1]"/></queryString>
                 </xsl:if>

diff --git a/xslt/cross_samples_03.xslt b/xslt/cross_samples_03.xslt
@@ -104,7 +104,7 @@ version="3.1">
                         </div>
                     </xsl:if>
                 </xsl:variable>
-                <xsl:sequence select="$pager">
+                <xsl:sequence select="$pager"/>
 
                 <xsl:for-each select="./feature">
                     <h3 class="mt-0" xml:space="preserve">Sentence <xsl:value-of select="@name"/></h3>
@@ -142,7 +142,7 @@ version="3.1">
                         </table>
                     </xsl:for-each>
                 </xsl:for-each>             
-                <xsl:sequence select="$pager">     
+                <xsl:sequence select="$pager" />     
             </div>         
         </div>
     </xsl:template>