Fixed an indexing bug that was ignoring normalised forms.

papyri · Oct 7, 2014 · c81a43f · c81a43f
1 parent de94291
commit c81a43f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/pn-site/annotator/js/xpointer.js b/pn-site/annotator/js/xpointer.js
@@ -290,4 +290,4 @@ var XPointer = {
     }
     return XPointer.getLocation(contextNode, matchindex, matches[index - 1].length);
   }
-}
+}
diff --git a/pn-solr/pn-search/conf/schema.xml b/pn-solr/pn-search/conf/schema.xml
@@ -123,6 +123,7 @@
     <field name="series" type="string" indexed="true" stored="false" multiValued="false" required="true"/>
     <field name="series_led_path" type="string" indexed="true" stored="true" multiValued="true"/>
     <field name="title" type="text" indexed="false" stored="true" multiValued="false"/>
+    <field name="tm_metadata" type="lctext" indexed="true" stored="false" multiValued="true"/>
     <field name="transcription" type="text" indexed="true" stored="false" multiValued="true"/>
     <field name="transcription_ia" type="text" indexed="true" stored="false" multiValued="true"/>
     <field name="transcription_ic" type="text" indexed="true" stored="false" multiValued="true"/>
@@ -135,7 +136,7 @@
     <field name="translation_language" type="string" indexed="true" stored="false" multiValued="true"/>
     <field name="unknown_date_flag" type="boolean" indexed="true" multiValued="false" required="false"/>
     <field name="untokenized" type="untokenized" indexed="true" stored="false" multiValued="true"></field>
-   <field name="untokenized_ia" type="untokenized" indexed="true" stored="false" multiValued="true"></field>
+    <field name="untokenized_ia" type="untokenized" indexed="true" stored="false" multiValued="true"></field>
     <field name="untokenized_ic" type="untokenized" indexed="true" stored="false" multiValued="true"></field>
     <field name="untokenized_id" type="untokenized" indexed="true" stored="false" multiValued="true"></field> 
     <field name="volume" type="int" indexed="true" stored="false" multiValued="false" required="true" default="0"/>
@@ -170,8 +171,10 @@
   <copyField source="transcription_ia" dest="all"/>
   <copyField source="translation" dest="all"/>
   <copyField source="hgv_metadata" dest="all"/>
+  <copyField source="tm_metadata" dest="all"/>
   <copyField source="apis_metadata" dest="all"/>
   <copyField source="hgv_metadata" dest="metadata"/>
+  <copyField source="tm_metadata" dest="metadata"/>
   <copyField source="apis_metadata" dest="metadata"/>
   <copyField source="transcription" dest="untokenized"/>
   <copyField source="transcription_ia" dest="untokenized_ia"/>

diff --git a/pn-xslt/MakeSolr.xsl b/pn-xslt/MakeSolr.xsl
@@ -1080,12 +1080,18 @@
 
  <xsl:template name="reg-text-processing">
    <xsl:param name="temp-node"></xsl:param>
-   <xsl:apply-templates select="$temp-node//t:div[@type='edition']"></xsl:apply-templates>
+   <xsl:apply-templates select="$temp-node//t:div[@type='edition']">
+     <xsl:with-param name="parm-apparatus-style" select="$apparatus-style" tunnel="yes"/>
+     <xsl:with-param name="parm-leiden-style" select="$leiden-style" tunnel="yes"/>
+   </xsl:apply-templates>
  </xsl:template>
 
   <xsl:template name="orig-text-processing">
     <xsl:param name="temp-node"></xsl:param>
-    <xsl:apply-templates select="$temp-node//t:div[@type='edition']"></xsl:apply-templates>
+    <xsl:apply-templates select="$temp-node//t:div[@type='edition']">
+      <xsl:with-param name="parm-apparatus-style" select="$apparatus-style" tunnel="yes"/>
+      <xsl:with-param name="parm-leiden-style" select="$leiden-style" tunnel="yes"/>
+    </xsl:apply-templates>
   </xsl:template>
 
   <xsl:template name="app-link">