View | Details | Raw Unified | Return to bug 41210
Collapse All | Expand All

(-)a/admin/searchengine/elasticsearch/mappings.yaml (-6 / +6 lines)
Lines 1051-1067 biblios: Link Here
1051
    mandatory: ~
1051
    mandatory: ~
1052
    mappings:
1052
    mappings:
1053
    - facet: 1
1053
    - facet: 1
1054
      marc_field: 100a
1054
      marc_field: 100abcjq(abcjq)
1055
      marc_type: marc21
1055
      marc_type: marc21
1056
      sort: 1
1056
      sort: 1
1057
      suggestible: 1
1057
      suggestible: 1
1058
    - facet: 1
1058
    - facet: 1
1059
      marc_field: 110a
1059
      marc_field: 110ab(ab)
1060
      marc_type: marc21
1060
      marc_type: marc21
1061
      sort: 1
1061
      sort: 1
1062
      suggestible: 1
1062
      suggestible: 1
1063
    - facet: 1
1063
    - facet: 1
1064
      marc_field: 111a
1064
      marc_field: 111aeq(aeq)
1065
      marc_type: marc21
1065
      marc_type: marc21
1066
      sort: 1
1066
      sort: 1
1067
      suggestible: 1
1067
      suggestible: 1
Lines 1071-1087 biblios: Link Here
1071
      sort: 1
1071
      sort: 1
1072
      suggestible: ''
1072
      suggestible: ''
1073
    - facet: 1
1073
    - facet: 1
1074
      marc_field: 700a
1074
      marc_field: 700abcjq(abcjq)
1075
      marc_type: marc21
1075
      marc_type: marc21
1076
      sort: 1
1076
      sort: 1
1077
      suggestible: 1
1077
      suggestible: 1
1078
    - facet: 1
1078
    - facet: 1
1079
      marc_field: 710a
1079
      marc_field: 710ab(ab)
1080
      marc_type: marc21
1080
      marc_type: marc21
1081
      sort: 1
1081
      sort: 1
1082
      suggestible: 1
1082
      suggestible: 1
1083
    - facet: 1
1083
    - facet: 1
1084
      marc_field: 711a
1084
      marc_field: 711aeq(aeq)
1085
      marc_type: marc21
1085
      marc_type: marc21
1086
      sort: 1
1086
      sort: 1
1087
      suggestible: 1
1087
      suggestible: 1
(-)a/etc/zebradb/marc_defs/marc21/biblios/biblio-koha-indexdefs.xml (-12 / +28 lines)
Lines 269-275 Link Here
269
    <target_index>Koha-Auth-Number:w</target_index>
269
    <target_index>Koha-Auth-Number:w</target_index>
270
  </index_subfields>
270
  </index_subfields>
271
  <!--record.abs line 91: melm 100$a      Author,Author:p,Author:s,Editor,Author-personal-bibliography,Author-personal-bibliography:p,Author-personal-bibliography:s-->
271
  <!--record.abs line 91: melm 100$a      Author,Author:p,Author:s,Editor,Author-personal-bibliography,Author-personal-bibliography:p,Author-personal-bibliography:s-->
272
  <index_subfields tag="100" subfields="a">
272
  <index_subfields tag="100" subfields="abcjq">
273
    <target_index>Author:w</target_index>
273
    <target_index>Author:w</target_index>
274
    <target_index>Author:p</target_index>
274
    <target_index>Author:p</target_index>
275
    <target_index>Author:s</target_index>
275
    <target_index>Author:s</target_index>
Lines 280-288 Link Here
280
  </index_subfields>
280
  </index_subfields>
281
  <!--record.abs line 92: melm 100        Author,Author:p,Author:s,Author-title,Author-name-personal,Name,Name-and-title,Personal-name-->
281
  <!--record.abs line 92: melm 100        Author,Author:p,Author:s,Author-title,Author-name-personal,Name,Name-and-title,Personal-name-->
282
  <index_data_field tag="100">
282
  <index_data_field tag="100">
283
    <target_index>Author:w</target_index>
284
    <target_index>Author:p</target_index>
285
    <target_index>Author:s</target_index>
286
    <target_index>Author-title:w</target_index>
283
    <target_index>Author-title:w</target_index>
287
    <target_index>Author-name-personal:w</target_index>
284
    <target_index>Author-name-personal:w</target_index>
288
    <target_index>Name:w</target_index>
285
    <target_index>Name:w</target_index>
Lines 294-299 Link Here
294
    <target_index>Koha-Auth-Number:w</target_index>
291
    <target_index>Koha-Auth-Number:w</target_index>
295
  </index_subfields>
292
  </index_subfields>
296
  <!--record.abs line 94: melm 110        Author,Author:p,Author:s,Author-title,Author-name-corporate,Name,Name-and-title,Corporate-name-->
293
  <!--record.abs line 94: melm 110        Author,Author:p,Author:s,Author-title,Author-name-corporate,Name,Name-and-title,Corporate-name-->
294
  <index_data_field tag="110" subfields="ab">
295
    <target_index>Author:w</target_index>
296
    <target_index>Author:p</target_index>
297
    <target_index>Author:s</target_index>
298
    <target_index>Author-title:w</target_index>
299
    <target_index>Author-name-corporate:w</target_index>
300
    <target_index>Name:w</target_index>
301
    <target_index>Name-and-title:w</target_index>
302
    <target_index>Corporate-name:w</target_index>
303
    <target_index>Corporate-name:p</target_index>
304
  </index_data_field>
297
  <index_data_field tag="110">
305
  <index_data_field tag="110">
298
    <target_index>Author:w</target_index>
306
    <target_index>Author:w</target_index>
299
    <target_index>Author:p</target_index>
307
    <target_index>Author:p</target_index>
Lines 310-319 Link Here
310
    <target_index>Koha-Auth-Number:w</target_index>
318
    <target_index>Koha-Auth-Number:w</target_index>
311
  </index_subfields>
319
  </index_subfields>
312
  <!--record.abs line 96: melm 111        Author,Author:p,Author:s,Author-title,Author-name-corporate,Name,Name-and-title,Conference-name-->
320
  <!--record.abs line 96: melm 111        Author,Author:p,Author:s,Author-title,Author-name-corporate,Name,Name-and-title,Conference-name-->
313
  <index_data_field tag="111">
321
  <index_data_field tag="111" subfields="aeq">
314
    <target_index>Author:w</target_index>
322
    <target_index>Author:w</target_index>
315
    <target_index>Author:p</target_index>
323
    <target_index>Author:p</target_index>
316
    <target_index>Author:s</target_index>
324
    <target_index>Author:s</target_index>
325
  </index_data_field>
326
  <index_data_field tag="111">
317
    <target_index>Author-title:w</target_index>
327
    <target_index>Author-title:w</target_index>
318
    <target_index>Author-name-corporate:w</target_index>
328
    <target_index>Author-name-corporate:w</target_index>
319
    <target_index>Name:w</target_index>
329
    <target_index>Name:w</target_index>
Lines 880-889 Link Here
880
    <target_index>Cross-Reference:w</target_index>
890
    <target_index>Cross-Reference:w</target_index>
881
    <target_index>Koha-Auth-Number:w</target_index>
891
    <target_index>Koha-Auth-Number:w</target_index>
882
  </index_subfields>
892
  </index_subfields>
883
  <!--record.abs line 201: melm 700$a      Author,Author:p-->
893
  <!--record.abs line 201: melm 700$abcjq      Author,Author:p-->
884
  <index_subfields tag="700" subfields="a">
894
  <index_subfields tag="700" subfields="abcjq">
885
    <target_index>Author:w</target_index>
895
    <target_index>Author:w</target_index>
886
    <target_index>Author:p</target_index>
896
    <target_index>Author:p</target_index>
897
    <target_index>Author:s</target_index>
887
  </index_subfields>
898
  </index_subfields>
888
  <!--record.abs line 202: melm 700$n      Thematic-number-->
899
  <!--record.abs line 202: melm 700$n      Thematic-number-->
889
  <index_subfields tag="700" subfields="n">
900
  <index_subfields tag="700" subfields="n">
Lines 902-909 Link Here
902
  </index_subfields>
913
  </index_subfields>
903
  <!--record.abs line 206: melm 700        Author,Author:p,Author-name-personal,Name,Editor,Personal-name-->
914
  <!--record.abs line 206: melm 700        Author,Author:p,Author-name-personal,Name,Editor,Personal-name-->
904
  <index_data_field tag="700">
915
  <index_data_field tag="700">
905
    <target_index>Author:w</target_index>
906
    <target_index>Author:p</target_index>
907
    <target_index>Author-name-personal:w</target_index>
916
    <target_index>Author-name-personal:w</target_index>
908
    <target_index>Name:w</target_index>
917
    <target_index>Name:w</target_index>
909
    <target_index>Editor:w</target_index>
918
    <target_index>Editor:w</target_index>
Lines 917-923 Link Here
917
    <target_index>Title-uniform:w</target_index>
926
    <target_index>Title-uniform:w</target_index>
918
  </index_subfields>
927
  </index_subfields>
919
  <!--record.abs line 210: melm 710$a      Name-and-title-->
928
  <!--record.abs line 210: melm 710$a      Name-and-title-->
920
  <index_subfields tag="710" subfields="a">
929
  <index_subfields tag="710" subfields="ab">
921
    <target_index>Name-and-title:w</target_index>
930
    <target_index>Name-and-title:w</target_index>
922
  </index_subfields>
931
  </index_subfields>
923
  <!--record.abs line 211: melm 710$9      Koha-Auth-Number    -->
932
  <!--record.abs line 211: melm 710$9      Koha-Auth-Number    -->
Lines 925-937 Link Here
925
    <target_index>Koha-Auth-Number:w</target_index>
934
    <target_index>Koha-Auth-Number:w</target_index>
926
  </index_subfields>
935
  </index_subfields>
927
  <!--record.abs line 212: melm 710        Author,Author:p,Corporate-name,Name-->
936
  <!--record.abs line 212: melm 710        Author,Author:p,Corporate-name,Name-->
928
  <index_data_field tag="710">
937
  <index_data_field tag="710" subfields="ab">
929
    <target_index>Author:w</target_index>
938
    <target_index>Author:w</target_index>
930
    <target_index>Author:p</target_index>
939
    <target_index>Author:p</target_index>
931
    <target_index>Corporate-name:w</target_index>
940
    <target_index>Corporate-name:w</target_index>
932
    <target_index>Corporate-name:p</target_index>
941
    <target_index>Corporate-name:p</target_index>
933
    <target_index>Name:w</target_index>
942
    <target_index>Name:w</target_index>
934
  </index_data_field>
943
  </index_data_field>
944
  <index_data_field tag="710">
945
    <target_index>Corporate-name:w</target_index>
946
    <target_index>Corporate-name:p</target_index>
947
    <target_index>Name:w</target_index>
948
  </index_data_field>
935
  <!--record.abs line 213: melm 711$a      Name-and-title-->
949
  <!--record.abs line 213: melm 711$a      Name-and-title-->
936
  <index_subfields tag="711" subfields="a">
950
  <index_subfields tag="711" subfields="a">
937
    <target_index>Name-and-title:w</target_index>
951
    <target_index>Name-and-title:w</target_index>
Lines 947-955 Link Here
947
    <target_index>Koha-Auth-Number:w</target_index>
961
    <target_index>Koha-Auth-Number:w</target_index>
948
  </index_subfields>
962
  </index_subfields>
949
  <!--record.abs line 218: melm 711        Author,Author:p,Author-name-corporate,Name,Conference-name-->
963
  <!--record.abs line 218: melm 711        Author,Author:p,Author-name-corporate,Name,Conference-name-->
950
  <index_data_field tag="711">
964
  <index_data_field tag="711" subfields="aeq">
951
    <target_index>Author:w</target_index>
965
    <target_index>Author:w</target_index>
952
    <target_index>Author:p</target_index>
966
    <target_index>Author:p</target_index>
967
  </index_data_field>
968
  <index_data_field tag="711">
953
    <target_index>Author-name-corporate:w</target_index>
969
    <target_index>Author-name-corporate:w</target_index>
954
    <target_index>Name:w</target_index>
970
    <target_index>Name:w</target_index>
955
    <target_index>Conference-name:w</target_index>
971
    <target_index>Conference-name:w</target_index>
(-)a/etc/zebradb/marc_defs/marc21/biblios/biblio-zebra-indexdefs.xsl (-9 / +52 lines)
Lines 254-260 definition file (probably something like {biblio,authority}-koha-indexdefs.xml) Link Here
254
      </xslo:if>
254
      </xslo:if>
255
    </xslo:for-each>
255
    </xslo:for-each>
256
    <xslo:for-each select="marc:subfield">
256
    <xslo:for-each select="marc:subfield">
257
      <xslo:if test="contains('a', @code)">
257
      <xslo:if test="contains('abcjq', @code)">
258
        <z:index name="Author:w Author:p Author:s Editor:w Author-personal-bibliography:w Author-personal-bibliography:p Author-personal-bibliography:s">
258
        <z:index name="Author:w Author:p Author:s Editor:w Author-personal-bibliography:w Author-personal-bibliography:p Author-personal-bibliography:s">
259
          <xslo:value-of select="."/>
259
          <xslo:value-of select="."/>
260
        </z:index>
260
        </z:index>
Lines 849-856 definition file (probably something like {biblio,authority}-koha-indexdefs.xml) Link Here
849
      </xslo:if>
849
      </xslo:if>
850
    </xslo:for-each>
850
    </xslo:for-each>
851
    <xslo:for-each select="marc:subfield">
851
    <xslo:for-each select="marc:subfield">
852
      <xslo:if test="contains('a', @code)">
852
      <xslo:if test="contains('abcjq', @code)">
853
        <z:index name="Author:w Author:p">
853
        <z:index name="Author:w Author:p Author:s">
854
          <xslo:value-of select="."/>
854
          <xslo:value-of select="."/>
855
        </z:index>
855
        </z:index>
856
      </xslo:if>
856
      </xslo:if>
Lines 886-892 definition file (probably something like {biblio,authority}-koha-indexdefs.xml) Link Here
886
      </xslo:if>
886
      </xslo:if>
887
    </xslo:for-each>
887
    </xslo:for-each>
888
    <xslo:for-each select="marc:subfield">
888
    <xslo:for-each select="marc:subfield">
889
      <xslo:if test="contains('a', @code)">
889
      <xslo:if test="contains('ab', @code)">
890
        <z:index name="Name-and-title:w">
890
        <z:index name="Name-and-title:w">
891
          <xslo:value-of select="."/>
891
          <xslo:value-of select="."/>
892
        </z:index>
892
        </z:index>
Lines 1912-1918 definition file (probably something like {biblio,authority}-koha-indexdefs.xml) Link Here
1912
    </z:index>
1912
    </z:index>
1913
  </xslo:template>
1913
  </xslo:template>
1914
  <xslo:template mode="index_data_field" match="marc:datafield[@tag='100']">
1914
  <xslo:template mode="index_data_field" match="marc:datafield[@tag='100']">
1915
    <z:index name="Author:w Author:p Author:s Author-title:w Author-name-personal:w Name:w Name-and-title:w Personal-name:w">
1915
    <z:index name="Author-title:w Author-name-personal:w Name:w Name-and-title:w Personal-name:w">
1916
      <xslo:variable name="raw_heading">
1916
      <xslo:variable name="raw_heading">
1917
        <xslo:for-each select="marc:subfield">
1917
        <xslo:for-each select="marc:subfield">
1918
          <xslo:if test="position() &gt; 1">
1918
          <xslo:if test="position() &gt; 1">
Lines 1936-1944 definition file (probably something like {biblio,authority}-koha-indexdefs.xml) Link Here
1936
      </xslo:variable>
1936
      </xslo:variable>
1937
      <xslo:value-of select="normalize-space($raw_heading)"/>
1937
      <xslo:value-of select="normalize-space($raw_heading)"/>
1938
    </z:index>
1938
    </z:index>
1939
    <z:index name="Author:w Author:p Author:s Author-title:w Author-name-corporate:w Name:w Name-and-title:w Corporate-name:w Corporate-name:p">
1940
      <xslo:variable name="raw_heading">
1941
        <xslo:for-each select="marc:subfield">
1942
          <xslo:if test="position() &gt; 1">
1943
            <xslo:value-of select="substring(' ', 1, 1)"/>
1944
          </xslo:if>
1945
          <xslo:value-of select="."/>
1946
        </xslo:for-each>
1947
      </xslo:variable>
1948
      <xslo:value-of select="normalize-space($raw_heading)"/>
1949
    </z:index>
1939
  </xslo:template>
1950
  </xslo:template>
1940
  <xslo:template mode="index_data_field" match="marc:datafield[@tag='111']">
1951
  <xslo:template mode="index_data_field" match="marc:datafield[@tag='111']">
1941
    <z:index name="Author:w Author:p Author:s Author-title:w Author-name-corporate:w Name:w Name-and-title:w Conference-name:w">
1952
    <z:index name="Author:w Author:p Author:s">
1953
      <xslo:variable name="raw_heading">
1954
        <xslo:for-each select="marc:subfield">
1955
          <xslo:if test="position() &gt; 1">
1956
            <xslo:value-of select="substring(' ', 1, 1)"/>
1957
          </xslo:if>
1958
          <xslo:value-of select="."/>
1959
        </xslo:for-each>
1960
      </xslo:variable>
1961
      <xslo:value-of select="normalize-space($raw_heading)"/>
1962
    </z:index>
1963
    <z:index name="Author-title:w Author-name-corporate:w Name:w Name-and-title:w Conference-name:w">
1942
      <xslo:variable name="raw_heading">
1964
      <xslo:variable name="raw_heading">
1943
        <xslo:for-each select="marc:subfield">
1965
        <xslo:for-each select="marc:subfield">
1944
          <xslo:if test="position() &gt; 1">
1966
          <xslo:if test="position() &gt; 1">
Lines 2445-2451 definition file (probably something like {biblio,authority}-koha-indexdefs.xml) Link Here
2445
    </z:index>
2467
    </z:index>
2446
  </xslo:template>
2468
  </xslo:template>
2447
  <xslo:template mode="index_data_field" match="marc:datafield[@tag='700']">
2469
  <xslo:template mode="index_data_field" match="marc:datafield[@tag='700']">
2448
    <z:index name="Author:w Author:p Author-name-personal:w Name:w Editor:w Personal-name:w">
2470
    <z:index name="Author-name-personal:w Name:w Editor:w Personal-name:w">
2449
      <xslo:variable name="raw_heading">
2471
      <xslo:variable name="raw_heading">
2450
        <xslo:for-each select="marc:subfield">
2472
        <xslo:for-each select="marc:subfield">
2451
          <xslo:if test="position() &gt; 1">
2473
          <xslo:if test="position() &gt; 1">
Lines 2469-2477 definition file (probably something like {biblio,authority}-koha-indexdefs.xml) Link Here
2469
      </xslo:variable>
2491
      </xslo:variable>
2470
      <xslo:value-of select="normalize-space($raw_heading)"/>
2492
      <xslo:value-of select="normalize-space($raw_heading)"/>
2471
    </z:index>
2493
    </z:index>
2494
    <z:index name="Corporate-name:w Corporate-name:p Name:w">
2495
      <xslo:variable name="raw_heading">
2496
        <xslo:for-each select="marc:subfield">
2497
          <xslo:if test="position() &gt; 1">
2498
            <xslo:value-of select="substring(' ', 1, 1)"/>
2499
          </xslo:if>
2500
          <xslo:value-of select="."/>
2501
        </xslo:for-each>
2502
      </xslo:variable>
2503
      <xslo:value-of select="normalize-space($raw_heading)"/>
2504
    </z:index>
2472
  </xslo:template>
2505
  </xslo:template>
2473
  <xslo:template mode="index_data_field" match="marc:datafield[@tag='711']">
2506
  <xslo:template mode="index_data_field" match="marc:datafield[@tag='711']">
2474
    <z:index name="Author:w Author:p Author-name-corporate:w Name:w Conference-name:w">
2507
    <z:index name="Author:w Author:p">
2508
      <xslo:variable name="raw_heading">
2509
        <xslo:for-each select="marc:subfield">
2510
          <xslo:if test="position() &gt; 1">
2511
            <xslo:value-of select="substring(' ', 1, 1)"/>
2512
          </xslo:if>
2513
          <xslo:value-of select="."/>
2514
        </xslo:for-each>
2515
      </xslo:variable>
2516
      <xslo:value-of select="normalize-space($raw_heading)"/>
2517
    </z:index>
2518
    <z:index name="Author-name-corporate:w Name:w Conference-name:w">
2475
      <xslo:variable name="raw_heading">
2519
      <xslo:variable name="raw_heading">
2476
        <xslo:for-each select="marc:subfield">
2520
        <xslo:for-each select="marc:subfield">
2477
          <xslo:if test="position() &gt; 1">
2521
          <xslo:if test="position() &gt; 1">
2478
- 

Return to bug 41210