Merge branch 'dev' into iss-293-ampersands

schema/staticSearch.odd

@@ -1562,7 +1562,7 @@
             <attList>
               <attDef ident="version" usage="rec">
                 <gloss>specifies the major version of staticSearch to which
-                  this configuration file corresponds. If this attribute is not used, the configuration file is assumed to have an <att>version</att> value of <val>1</val>.</gloss>
+                  this configuration file corresponds. If this attribute is not used, the configuration file is assumed to have a <att>version</att> value of <val>1</val>.</gloss>
                 <datatype>
                   <dataRef name="nonNegativeInteger"/>
                 </datatype>

xsl/json.xsl

@@ -697,7 +697,7 @@
     </xd:doc>
     <xsl:function name="hcmc:getTotalTermsInDoc" as="xs:integer" new-each-time="no">
         <xsl:param name="docUri" as="xs:string"/>
-        <xsl:variable name="thisDoc" select="$tokenizedDocs[document-uri(.) = $docUri]" as="document-node()"/>
+        <xsl:variable name="thisDoc" select="$tokenizedDocs[base-uri(.) = $docUri]" as="document-node()"/>
         <xsl:variable name="thisDocSpans" select="$thisDoc//span[@ss-stem]" as="element(span)*"/>
         <!--We tokenize these since there can be multiple stems for a given span-->
         <xsl:variable name="thisDocStems" select="for $span in $thisDocSpans return tokenize($span/@ss-stem,'\s+')" as="xs:string+"/>

xsl/makeSearchPage.xsl

@@ -233,6 +233,7 @@
                 data-allowwildcards="{if ($wildcardSearch) then 'yes' else 'no'}"
                 data-minwordlength="{if ($minWordLength) then $minWordLength else '3'}"
                 data-maxkwicstoshow="{if ($maxKwicsToShow) then $maxKwicsToShow else 10}"
+                data-scoringalgorithm="{if ($scoringAlgorithm) then $scoringAlgorithm else 'raw'}"
                 data-resultsperpage="{$resultsPerPage}"
                 onsubmit="return false;"
                 data-versionstring="{$versionString}"