From: Bill Erickson Date: Mon, 24 Feb 2020 15:37:48 +0000 (-0500) Subject: LP1844418 Direct indexing WIP X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=fbee1102304977be054d2a99a17a214a1fc48e34;p=working%2FEvergreen.git LP1844418 Direct indexing WIP Signed-off-by: Bill Erickson --- diff --git a/Open-ILS/examples/elastic/README.adoc b/Open-ILS/examples/elastic/README.adoc new file mode 100644 index 0000000000..1f46c9318e --- /dev/null +++ b/Open-ILS/examples/elastic/README.adoc @@ -0,0 +1,14 @@ += Elasticsearch Examples + +== Bib Transform Testing + +[source,sh] +---------------------------------------------------------------------------- +sudo apt install xsltproc + +xsltproc ../../xsl/elastic-bib-transform.xsl bib-248-marc.xml + +xsltproc ../../xsl/elastic-bib-transform.xsl bib-233-marc.xml +---------------------------------------------------------------------------- + + diff --git a/Open-ILS/examples/elastic/bib-233-marc.xml b/Open-ILS/examples/elastic/bib-233-marc.xml new file mode 100644 index 0000000000..0aad4bd77e --- /dev/null +++ b/Open-ILS/examples/elastic/bib-233-marc.xml @@ -0,0 +1,443 @@ + + + 07649cim a2200913 i 4500 + 233 + CONS + 20140128084328.0 + 140128s2013 nyuopk|zqdefhi n | ita d + + 2013565186 + + + 9781480328532 + + + 1480328537 + + + 884088883249 + + + HL50498721 + Hal Leonard + (bk.) + + + HL50490487 + Hal Leonard + (cd.) + + + HL50486260 + Hal Leonard + (cd.) + + + 63011108 + Hal Leonard + (diction coach 1) + + + 63011109 + Hal Leonard + (diction coach 2) + + + 63014792 + Hal Leonard + (CD 1) + + + 63014793 + Hal Leonard + (CD 2) + + + (OCoLC)ocn826076986 + + + (OCoLC)826076986 + + + YDXCP + eng + rda + YDXCP + CLE + NUI + MYG + DLC + + + ita + ger + fre + eng + ita + ger + fre + eng + eng + + + lccopycat + + + vf01 + ka01 + + + M1507.A+ + + + Pickins, Slim + More Stuff + + + The Arias for bass : + complete package : with diction coach and accompaniment CDs / + compiled and edited by Robert L. Larsen. + + + New York, NY : + G. Schirmer, Inc., + 2013. + + + Milwaukee, WI : + Distributed by Hal Leonard Corporation + + + 1 score (263 pages) ; + 31 cm + + 4 sound discs (digital ; 4 3/4 in.) + + + notated music + ntm + rdacontent + + + performed music + prm + rdacontent + + + unmediated + n + rdamedia + + + audio + s + rdamedia + + + volume + nc + rdacarrier + + + audio disc + sd + rdacarrier + + + G. Schirmer opera anthology + + + staff notation + + + Italian, French, German, and English words; non-English texts also printed with English translations. + + + Opera arias; acc. arr. for piano. + + + William Billingham, pianist on CDs. + + + disc 1-2 diction coach -- disc 3-4 accompaniment CDs. + + + Il barbiere di Siviglia. La calunnia / Gioachino Rossini -- La Bohè̀me. Vecchia zimarra, senti / Giacomo Puccini -- La Cenerentola. Miei rampolli femminini / Gioachino Rossini -- Don Giovanni. Madamina! Il catalogo è questo / Wolfgang Amadeus Mozart -- Don Pasquale. Ah! Un foco insolito / Gaetano Donizetti -- Die Entführung aus dem Serail. O, wie will ich triumphiren / Wolfgang Amadeus Mozart -- Ernani. Infelice! E tuo credevi / Giuseppe Verdi -- Eugene Onegin. Gremin's aria / Pyotr Il'yich Tchaikovsky -- Faust. Le veau d'or ; Vous qui faites l'endormie / Charles Gounod -- Der Freischütz. Schweig'! Schweig'! Damit dich niemand warnt / Carl Maria von Weber -- Les huguenots. Pour le couvents c'est fini (Piff, paff) / Giacomo Meyerbeer -- La jolie fille de Perth. Quand la flamme de l'amour / Georges Bizet -- Lucia di Lammermoor. Dalle stanze ove Lucia / Gaetano Donizetti -- Die lustigen Weiber von Windsor. Als Büblein klein / Otto Nicolai -- Macbeth. Come dal ciel precipita / Giuseppe Verdi -- Manon. Épouse quelque brave fille / Jules Massenet -- The mother of us all. What what is it / Virgil Thomson -- Le nozze di Figaro. La vendetta ; Se vuol ballare ; Non più andrai ; Aprite un po' quegl'occhi / Wolfgang Amadeus Mozart -- Simon Boccanegra. Il lacerato spirito / Giuseppe Verdi -- La sonnambula. Vi ravviso / Vincenzo Bellini -- Street scene. Let things be like they always was / Kurt Weill -- I vespri siciliani. O tu, Palermo / Giuseppe Verdi -- Die Zauberflöte. O Isis und Osiris ; In diesen heil'gen Hallen / Wolfgang Amadeus Mozart. + + + Operas + Excerpts + Vocal scores with piano. + + + Recorded accompaniments (Low voice) + + + Larsen, Robert L., + 1934- + editor, + compiler. + + + Billingham, William, + performer. + + + Contains (expression): + Rossini, Gioacchino, + 1792-1868. + Barbiere di Siviglia. + Calunnia è un venticello. + Vocal score. + + + Contains (expression): + Puccini, Giacomo, + 1858-1924. + Bohème. + Vecchia zimarra. + Vocal score. + + + Contains (expression): + Rossini, Gioacchino, + 1792-1868. + Cenerentola. + Miei rampolli femminini. + Vocal score. + + + Contains (expression): + Mozart, Wolfgang Amadeus, + 1756-1791. + Don Giovanni. + Madamina, il catalogo è questo. + Vocal score. + + + Contains (expression): + Donizetti, Gaetano, + 1797-1848. + Don Pasquale. + Foco insolito. + Vocal score. + + + Contains (expression): + Mozart, Wolfgang Amadeus, + 1756-1791. + Entführung aus dem Serail. + Ha! wie will ich triumphieren. + Vocal score. + + + Contains (expression): + Verdi, Giuseppe, + 1813-1901. + Ernani. + Infelice! e tu credevi. + Vocal score. + + + Contains (expression): + Tchaikovsky, Peter Ilich, + 1840-1893. + Evgeniĭ Onegin. + Arii︠a︡ kni︠a︡zi︠a︡. + Vocal score. + + + Contains (expression): + Gounod, Charles, + 1818-1893. + Faust. + Veau d'or est toujours debout. + Vocal score. + + + Contains (expression): + Gounod, Charles, + 1818-1893. + Faust. + Vous qui faites l'endormie. + Vocal score. + + + Contains (expression): + Weber, Carl Maria von, + 1786-1826. + Freischütz. + Schweig', schweig'! damit dich niemand warnt. + Vocal score. + + + Contains (expression): + Meyerbeer, Giacomo, + 1791-1864. + Huguenots. + Piff, paff. + Vocal score. + + + Contains (expression): + Bizet, Georges, + 1838-1875. + Jolie fille de Perth. + Quand la flamme de l'amour. + Vocal score. + + + Contains (expression): + Donizetti, Gaetano, + 1797-1848. + Lucia di Lammermoor. + Dalle stanze ove Lucia. + Vocal score. + + + Contains (expression): + Nicolai, Otto, + 1810-1849. + Lustigen Weiber von Windsor. + Als Büblein klein. + Vocal score. + + + Contains (expression): + Verdi, Giuseppe, + 1813-1901. + Macbeth. + Come dal ciel precipita. + Vocal score. + + + Contains (expression): + Massenet, Jules, + 1842-1912. + Manon. + Épouse quelque brave fille. + Vocal score. + + + Contains (expression): + Thomson, Virgil, + 1896-1989. + Mother of us all. + What what is it. + Vocal score. + + + Contains (expression): + Mozart, Wolfgang Amadeus, + 1756-1791. + Nozze di Figaro. + Vendetta. + Vocal score. + + + Contains (expression): + Mozart, Wolfgang Amadeus, + 1756-1791. + Nozze di Figaro. + Se vuol ballare, signor contino. + Vocal score. + + + Contains (expression): + Mozart, Wolfgang Amadeus, + 1756-1791. + Nozze di Figaro. + Non più andrai farfallone. + Vocal score. + + + Contains (expression): + Mozart, Wolfgang Amadeus, + 1756-1791. + Nozze di Figaro. + Aprite un po' quegl' occhi. + Vocal score. + + + Contains (expression): + Verdi, Giuseppe, + 1813-1901. + Simon Boccanegra. + Lacerato spirito. + Vocal score. + + + Contains (expression): + Bellini, Vincenzo, + 1801-1835. + Sonnambula. + Vi ravviso, o luoghi ameni. + Vocal score. + + + Contains (expression): + Weill, Kurt, + 1900-1950. + Street scene. + Let things be like they always was. + Vocal score. + + + Contains (expression): + Verdi, Giuseppe, + 1813-1901. + Vêpres siciliennes. + Et toi Palerme. + Italian. + Vocal score. + + + Contains (expression): + Mozart, Wolfgang Amadeus, + 1756-1791. + Zauberflöte. + O Isis und Osiris (Aria and chorus) + O Isis und Osiris. + Vocal score. + + + Contains (expression): + Mozart, Wolfgang Amadeus, + 1756-1791. + Zauberflöte. + In diesen heil'gen Hallen. + Vocal score. + + + G. Schirmer opera anthology. + + + 0 + par + copycat + 2 + ncip + 20 + y-genmusic + + + acquire + 2 shelf copies + policy default + + + vl34 2014-01-28 z-client + vl34 2014-01-28 + vl34 2014-01-28 4 sound disc to MBRS for shelf label + vl34 2014-01-28 copy 2, 4 sound disc to MBRS for shelf label + + + 233 + AUTOGEN + 233 + biblio + + + v + + + diff --git a/Open-ILS/examples/elastic/bib-248-marc.xml b/Open-ILS/examples/elastic/bib-248-marc.xml new file mode 100644 index 0000000000..a0efb653b3 --- /dev/null +++ b/Open-ILS/examples/elastic/bib-248-marc.xml @@ -0,0 +1,87 @@ + + + 00975pam a2200337 a 4500 + 248 + CONS + 20110823130500.0 + 110422s2011 nyu 000 1 eng + + 2011015247 + + + 9780307887436 : + $24.00 + + + 030788743X : + $24.00 + + + (DLC) 2011015247 + + + DLC + DLC + NjBwBT + GCmBT + + + pcc + + + PS3603.L548 + R43 2011 + + + 813/.6 + 22 + + + Cline, Ernest. + + + Ready player one / + Ernest Cline. + + + 1st ed. + + + New York : + Crown Publishers, + c2011. + + + 374 p. ; + 25 cm. + + + Regression (Civilization) + Fiction. + + + Virtual reality + Fiction. + + + Utopias + Fiction. + + + Puzzles + Fiction. + + + Fantasy fiction. + gsafd + + + 1 + + + 248 + AUTOGEN + 248 + biblio + + diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Elastic/BibSearch.pm b/Open-ILS/src/perlmods/lib/OpenILS/Elastic/BibSearch.pm index fa7f4397cd..d0415abda8 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/Elastic/BibSearch.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/Elastic/BibSearch.pm @@ -280,7 +280,7 @@ sub get_bib_data { } my $marc_doc = XML::LibXML->load_xml(string => $db_rec->{marc}); - my $result = $self->xsl_sheet->transform($marc_doc, target => '"index-values"'); + my $result = $self->xsl_sheet->transform($marc_doc); my $output = $self->xsl_sheet->output_as_chars($result); my @rows = split(/\n/, $output); diff --git a/Open-ILS/xsl/elastic-bib-transform.xsl b/Open-ILS/xsl/elastic-bib-transform.xsl index 62cfbcb9bb..9849341e10 100644 --- a/Open-ILS/xsl/elastic-bib-transform.xsl +++ b/Open-ILS/xsl/elastic-bib-transform.xsl @@ -1017,13 +1017,8 @@ sorter _ - - _ - - - - - + + @@ -1033,20 +1028,15 @@ filter _ - - _ - - - - - - - - - - - - + + + + + + + + + @@ -1104,13 +1094,11 @@ "/> + $vr_format_matches"> @@ -1172,27 +1160,18 @@ - + search - + + + + + - - - - search - - - - - - - - - - + @@ -1200,28 +1179,18 @@ - + facet - - - - _ + + + + + + + - - - - facet - - - - - - - - - - + search keyword keyword - - _ - - - - - - - + + + +