From 44644b4b30da04eb288cb50db342e278b88562ab Mon Sep 17 00:00:00 2001 From: Kathy Lussier Date: Tue, 21 Feb 2017 11:27:33 -0500 Subject: [PATCH] LP#1665626: Change order of test bib loading As bshum did for e-book records, let's move MR records down to the end of the script to avoid breaking tests. Also, made some tweaks to bibs_mr.sql so that it would import bibs correctly. Signed-off-by: Kathy Lussier Signed-off-by: Ben Shum --- Open-ILS/tests/datasets/sql/bibs_mr.sql | 6 +++--- Open-ILS/tests/datasets/sql/load_all.sql | 17 +++++++---------- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/Open-ILS/tests/datasets/sql/bibs_mr.sql b/Open-ILS/tests/datasets/sql/bibs_mr.sql index 04f4895349..28b6c46411 100644 --- a/Open-ILS/tests/datasets/sql/bibs_mr.sql +++ b/Open-ILS/tests/datasets/sql/bibs_mr.sql @@ -5,8 +5,8 @@ INSERT INTO marcxml_import (tag, marc) VALUES (:bib_tag,'00918nim a22002535 4500283853420131130185904.0sd|uungnnmmneu130904 eng 9781482926323 (CMD)$19.951482926326 (CMD)$19.95Blackstone Audio Inc, Special Markets Po Box 969, Ashland, OR, USA, 97520, (541)4886035SAN 173-2811UtOrBLW813813.0000Lovecraft, H. P./ Herrmann, Edward (NRT)At the Mountains of Madness[sound recording].[Place of publication not identified] :Blackstone Audio Inc,2013.spoken wordrdacontentaudiordamediaaudio discrdacarrier'), (:bib_tag,'01423pam a2200373 a 4500307956520080108231100.0080108s2005 nyu b 001 1 eng 2005-0415550812974417 (pbk.) :$15.95(DLC)2005041555DLCDLCDLCt------813/.5222FLOVECRAFTLovecraft, H. P.(Howard Phillips),1890-1937.At the mountains of madness /H.P. Lovecraft ; introduction by China Mie ville.Definitive ed.New York :Modern Library,2005.xxv, 186 p. ;20 cm.MARCIVE 12/19/07Includes bibliographical references (p. xxiv-xxv) and index.At the mountains of madness -- Supernatural horror in literature.FossilsCollection and preservationFiction.Scientific expeditionsFiction.Supernatural in literature.Stone carvingFiction.AntarcticaFiction.Fantasy fiction.gsafdHorror fiction.gsafdLovecraft, H. P.(Howard Phillips),1890-1937.Supernatural horror in literature.'), (:bib_tag,'01639nim a2200445 a 4500410133920140714090509.0sd fungnnmmned140709s2012 tnunnnn f n eng d9781843795940DD10435Recorded Books(CtWfDGI)rdd90010435CtWfDGIengCtWfDGIt------PS3523.O833A96 2012b813/.5223VLOVEAMMR 35Lovecraft, H. P.(Howard Phillips),1890-1937.At the mountains of madness[sound recording] /H.P. Lovecraft.Unabridged.Franklin, TN :Naxos AudioBooks ;Prince Frederick, MD :Distributed by Recorded Books,p2012.4 sound discs (5 hr.) :digital ;4 3/4 in.Title from container.Compact disc.In container (17 cm.).Read by William Roberts.An old man consents to a radio interview and a number of terrible truths are revealed about an expedition of Antarctica in the 1920's where everyone died horribly.Scientific expeditionsFiction.Stone carvingFiction.Supernatural in literature.FossilsCollection and preservationFiction.AntarcticaFiction.Horror fiction.gsafdFantasy fiction.gsafdAudiobooks.lcgftRoberts, William,1943-nrtNaxos AudioBooks, Ltd.Recorded Books, LLC.'), -(:bib_tag,'01132cam a2200337Ka 4500940380020170130113807.0160622s2017 nyu d 000 1 eng d(OCoLC)952384050BTCTAengBTCTABDXTEFBTOCLCOOCLCFTEFBT97815247556141524755613HQBA813/.623LPCLINECline, Ernest.Ready player one /Ernest Cline.[New York] :Random House Large Print,[2017]608 p. (large print) ;24 cm.Regression (Civilization)Fiction.Virtual realityFiction.Shared virtual environmentsFiction.UtopiasFiction.PuzzlesFiction.Large type books.Fantasy fiction.gsafdB&T'); -(:bib_tag,'01817cim a2200481 i 4500920638120120814110343.0m h cr una||||||||sz usnnnn|||ed111201s2011 nyunnnn o || eng d9780307913166 (electronic audio bk.)(TLC)erc0000004936(OCoLC)749998216F9F9D65D-C3C8-445C-AE9D-D82B72C241D0OverDrive, Inc.http://www.overdrive.comTLCTLCTLCrdaPS3603.L548R43 2011813/.622Cline, Ernest,author.Ready player one[electronic resource] /Ernest Cline.New York :Crown Publishers©20111 sound file :digitalspoken wordspwrdacontentcomputercrdamediaonline resourcecrrdacarrieraudio filerdaeAudiobooktlcgtGeneraltlctargetElectronic audio file.Electronic reproduction.New YorkPenguin Random House Audio Publishing Group2011Available via World Wide Web.Regression (Civilization)Fiction.Virtual realityFiction.UtopiasFiction.PuzzlesFiction.Fantasy fiction.gsafdElectronic audio books.localOverDrive, Inc.,distributor.'); -(:bib_tag,'01619cam a2200409Ia 4500915027420120530113527.0sd fungnnmmned110523s2011 mdu e 000 1 eng d9780307970060 :40.00030797006X :40.00RHA3179Books on Tape3760223(OCoLC)7267535993760223Books on Tapehttp://library.booksontape.comTEFBTTEFBTTEFBTPS3603.L548R43 2011ab813/.623BCD ClineCline, ErnestReady player one /Ernest Cline.[sound recording] Unabridged sound recording[Westminster, Md.] :Books on Tape,p2011.13 sound discs ; 15 hours, 41 minutes :digital ;4 3/4 in.Unabridged.Read by Wil Wheaton.At once wildly original and stuffed with irresistible nostalgia, READY PLAYER ONE is a spectacularly genre-busting, ambitious, and charming debut-- part quest novel, part love story, and part virtual space opera set in a universe where spell-slinging mages battle giant Japanese robots, entire planets are inspired by Blade Runner, and flying DeLoreans achieve light speed.Regression (Civilization)Fiction.Virtual realityFiction.UtopiasFiction.PuzzlesFiction.Audiobooks.Fantasy fiction'); +(:bib_tag,'01132cam a2200337Ka 4500940380020170130113807.0160622s2017 nyu d 000 1 eng d(OCoLC)952384050BTCTAengBTCTABDXTEFBTOCLCOOCLCFTEFBT97815247556141524755613HQBA813/.623LPCLINECline, Ernest.Ready player one /Ernest Cline.[New York] :Random House Large Print,[2017]608 p. (large print) ;24 cm.Regression (Civilization)Fiction.Virtual realityFiction.Shared virtual environmentsFiction.UtopiasFiction.PuzzlesFiction.Large type books.Fantasy fiction.gsafdB&T'), +(:bib_tag,'01817cim a2200481 i 4500920638120120814110343.0m h cr una||||||||sz usnnnn|||ed111201s2011 nyunnnn o || eng d9780307913166 (electronic audio bk.)(TLC)erc0000004936(OCoLC)749998216F9F9D65D-C3C8-445C-AE9D-D82B72C241D0OverDrive, Inc.http://www.overdrive.comTLCTLCTLCrdaPS3603.L548R43 2011813/.622Cline, Ernest,author.Ready player one[electronic resource] /Ernest Cline.New York :Crown Publishers©20111 sound file :digitalspoken wordspwrdacontentcomputercrdamediaonline resourcecrrdacarrieraudio filerdaeAudiobooktlcgtGeneraltlctargetElectronic audio file.Electronic reproduction.New YorkPenguin Random House Audio Publishing Group2011Available via World Wide Web.Regression (Civilization)Fiction.Virtual realityFiction.UtopiasFiction.PuzzlesFiction.Fantasy fiction.gsafdElectronic audio books.localOverDrive, Inc.,distributor.'), +(:bib_tag,'01619cam a2200409Ia 4500915027420120530113527.0sd fungnnmmned110523s2011 mdu e 000 1 eng d9780307970060 :40.00030797006X :40.00RHA3179Books on Tape3760223(OCoLC)7267535993760223Books on Tapehttp://library.booksontape.comTEFBTTEFBTTEFBTPS3603.L548R43 2011ab813/.623BCD ClineCline, ErnestReady player one /Ernest Cline.[sound recording] Unabridged sound recording[Westminster, Md.] :Books on Tape,p2011.13 sound discs ; 15 hours, 41 minutes :digital ;4 3/4 in.Unabridged.Read by Wil Wheaton.At once wildly original and stuffed with irresistible nostalgia, READY PLAYER ONE is a spectacularly genre-busting, ambitious, and charming debut-- part quest novel, part love story, and part virtual space opera set in a universe where spell-slinging mages battle giant Japanese robots, entire planets are inspired by Blade Runner, and flying DeLoreans achieve light speed.Regression (Civilization)Fiction.Virtual realityFiction.UtopiasFiction.PuzzlesFiction.Audiobooks.Fantasy fiction'), (:bib_tag,'00975pam a2200337 a 4500811262820110823130500.0110422s2011 nyu 000 1 eng 20110152479780307887436 :$24.00030788743X :$24.00(DLC) 2011015247DLCDLCNjBwBTGCmBTpccPS3603.L548R43 2011813/.622Cline, Ernest.Ready player one /Ernest Cline.1st ed.New York :Crown Publishers,c2011.374 p. ;25 cm.Regression (Civilization)Fiction.Virtual realityFiction.UtopiasFiction.PuzzlesFiction.Fantasy fiction.gsafd1') ; diff --git a/Open-ILS/tests/datasets/sql/load_all.sql b/Open-ILS/tests/datasets/sql/load_all.sql index 821a7b5b84..472795d7e4 100644 --- a/Open-ILS/tests/datasets/sql/load_all.sql +++ b/Open-ILS/tests/datasets/sql/load_all.sql @@ -1,4 +1,4 @@ -N; +BEGIN; -- stop on error \set ON_ERROR_STOP on @@ -30,12 +30,6 @@ N; -- load RDA bibs \i bibs_rda.sql --- load EbookAPI bibs -\i bibs_ebook_api.sql - --- load metarecord bibs -\i bibs_mr.sql - -- insert all loaded bibs into the biblio.record_entry in insert order INSERT INTO biblio.record_entry (marc, last_xact_id) SELECT marc, tag FROM marcxml_import ORDER BY id; @@ -55,9 +49,6 @@ INSERT INTO biblio.record_entry (marc, last_xact_id) -- load RDA copies, etc. \i assets_rda.sql --- load MR copies, etc. -\i assets_mr.sql - -- load copy-related data \i assets_extras.sql @@ -80,10 +71,16 @@ DELETE FROM marcxml_import; -- load EbookAPI bibs \i bibs_ebook_api.sql +-- load metarecord bibs +\i bibs_mr.sql + -- insert all loaded bibs into the biblio.record_entry in insert order INSERT INTO biblio.record_entry (marc, last_xact_id) SELECT marc, tag FROM marcxml_import ORDER BY id; +-- load MR copies, etc. +\i assets_mr.sql + -- clean up the env \i env_destroy.sql -- 2.11.0