[open-ils-commits] [GIT] Evergreen ILS branch master updated. b79d3ad1eab99d326190679f341b4e983125a9d6

Evergreen Git git at git.evergreen-ils.org
Fri Nov 6 11:39:59 EST 2015


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, master has been updated
       via  b79d3ad1eab99d326190679f341b4e983125a9d6 (commit)
       via  acb1c944e8dbc4882f2f5d42538ed5928765feb2 (commit)
       via  ad50eaaa85691245117943716a1ffb4ceb82a462 (commit)
      from  e1367b7c64f20a741cd7e015c3d2dea89353c448 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b79d3ad1eab99d326190679f341b4e983125a9d6
Author: Kathy Lussier <klussier at masslnc.org>
Date:   Fri Nov 6 10:43:41 2015 -0500

    lp1486294: Add sample order record file to datasets
    
    Adding a sample order record file to the datasets that can be used for test
    uploads against the current acq test data.
    
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
    Signed-off-by: Bill Erickson <berickxx at gmail.com>

diff --git a/Open-ILS/tests/datasets/sample_acq_order.mrc b/Open-ILS/tests/datasets/sample_acq_order.mrc
new file mode 100644
index 0000000..f6cf9d6
--- /dev/null
+++ b/Open-ILS/tests/datasets/sample_acq_order.mrc
@@ -0,0 +1 @@
+01056pam a22003374a 4500001000700000003000600007005001700013008004100030010001700071020002700088035002300115040002700138042001400165049000900179082001400188099000600202100001800208245006500226246002900291250001200320260004100332300002900373440006800402504006400470650002600534651003800560651001700598830006800615994001200683970002300695822290MAnMC20090602112200.0010104s2001    nyua   j b    001 0 eng    a  2001000001  a0823933865 (lib. bdg.)  a(OCoLC)ocm45804903  aDLCcDLCdMRQdUtOrBLW  apccalcac  aMRQA00a523.2221  aJ1 aTuriel, Isaac10aHow do we know the size of the solar system /cIsaac Turiel.30aSize of the solar system  a1st ed.  aNew York :bRosen Pub. Group,c2001.  a109 p. :bill. ;c21 cm. 0aGreat scientific questions and the scientists who answered them  aIncludes bibliographical references (p. 100-101) and index. 1aAstronomersxHistory. 0aSolar systemvJuvenile literature 1aSolar system 0aGreat scientific questions and th
 e scientists who answered them  aX0bMRQ  p19.99fJUVoBR1q101000pam a22003494a 4500001000700000003000600007005001700013008004100030010001700071020001500088035002300103040002200126042001400148043001200162049000900174050002300183082001400206099000600220100002100226245004400247260004200291300003300333440001900366500002000385520012400405650001700529650001200546651003800558830001900596970002300615994001200638879903MAnMC20080729170400.0020715s2003    nyua   b      001 0 eng    a  2002011217  a051622865X  a(OCoLC)ocm50251893  aDLCcDLCdUtOrBLW  apccalcac  azs-----  aMRQA00aQB501.3b.B74 200300a523.2221  aJ1 aBredeson, Carmen14aThe solar system /cby Carmen Bredeson.  aNew York :bChildren's Press,cc2003.  a31 p. :bcol. ill. ;c19 cm. 0aFowler, Allan.  aIncludes index.  aAn introduction to the planets of our solar system and other features such as asteroids, meteoroids, comets, and moons. 1aSolar system 1aPlanets 0aSolar syste
 mvJuvenile literature  aFowler, Allan.  \p5.99fJUVoBR1q1  aX0bMRQ00477nam a2200193Ka 450000100060000000300060000600500170001200800410002902000150007004000120008524500290009726000330012630000340015965000190019365000140021265100170022691300170024397000230026075336MAnMC20080721194700.0931112s1992    sp            000 0 spa d  a8429434755  dUtOrBLW03aEl universo y la tierra.  aMadrid :bSantillan,cc1992.  a224 p. :bcol. ill. ;c24 cm. 0aEarth sciences 0aAstronomy 0aSolar system00a*UYLTIE99000  \p12.99fAVoBR1q100908cam a2200277 a 4500001000700000003000600007005001700013008004100030010001700071020003800088035002300126040003200149049000900181050002200190082001400212100002000226245004800246260006400294300006900358490004600427504006400473651000900537830004400546913001700590970002300607543475MAnMC20090602130600.0951211s1996    dcuabf   b   f001 0 eng    a   95051343   a1560986344 (alk. paper) :c$29.95  a(OCoLC)ocm33971931  aDLC
 cDLCdC#PdMRQdUtOrBLW  aMRQA00aQB581b.S686 199600a523.32201 aSpudis, Paul D.14aThe once and future moon /cPaul D. Spudis.  aWashington [D.C.] :bSmithsonian Institution Press,cc1996.  axi, 308 p., [8] p. of plates :bill. (some col.), maps ;c24 cm.1 a[Smithsonian library of the solar system]  aIncludes bibliographical references (p. 292-301) and index. 0aMoon 0aSmithsonian library of the solar system00aSPUOAFM99000  \p19.99fRFoBR1q101122cam a22003738a 4500001000700000003000600007005001700013008004100030010001700071020001500088020003300103035002300136040003400159042000900193049000900202050002500211082001200236099000600248100001800254245004400272260004300316263000900359300003300368520006200401650001800463650002600481650001800507650002100525651002700546938006900573938007100642970002300713994001200736987690MAnMC20080730135300.0031215s2005    nyu    b      000 1 eng    a  2003027330  a0689859120  a0689859155 (library binding)  a(O
 CoLC)ocm54425288  aDLCcDLCdBAKERdMRQdUtOrBLW  alcac  aMRQA00aPZ8.3.S4665bDr 200500a[E]222  aJ1 aSeltzer, Eric10aDoodle Dog in space /cby Eric Seltzer.  aNew York :bAladdin Paperbacks,c2005.  a0506  a32 p. :bcol. ill. ;c23 cm.  aAn artistic dog and his friend share adventures in space. 1aDogsvfiction 1aSpace flightvfiction 1aArtvfiction. 1aStories in rhyme 1aSolar systemvfiction.  aBaker & TaylorbBKTYc3.99d2.99i0689859120n0004431669sactive  aBaker & TaylorbBKTYc11.89d11.89i0689859155n0004431670sactive  \p19.99fRFoBR1q1  aC0bMRQ01161cam a22003614a 45000010008000000030006000080050017000140080041000310100017000720200018000890200015001070350024001220400051001460430012001970490009002090500021002180820014002390990006002531000017002592450029002762500012003052600053003173000033003704400025004035000020004285050152004486510030006008300021006309380071006519380041007229700024007639940012007871144610MAnMC2009050
 5113400.0071214s2008    nyua   j      001 0 eng    a  2007051541  a9781604132076  a1604132078  a(OCoLC)ocn184906270  aDLCcDLCdBAKERdBTCTAdBIBdRLSdMRQdUtOrBLW  azmo----  aMRQA00aQB582b.B57 200800a523.3222 0aJ1 aBirch, Robin14aThe moon /cRobin Birch.  a2nd ed.  aNew York, NY :bChelsea House Publishers,c2008.  a32 p. :bcol. ill. ;c26 cm. 4aThe new solar system  aIncludes index.0 aDiscovering the moon -- The moon and the solar system -- On the moon -- The moon from earth -- Exploring the moon -- Moon fact summary -- Glossary. 0aMoonvJuvenile literature 0aNew solar system  aBaker & TaylorbBKTYc23.00d23.00i1604132078n0007584374sactive  aBaker and TaylorbBTCPnBK0007584374  \p19.99fJUVoBR1q1  aC0bMRQ00814pam a2200253 a 4500001000700000003000600007005001700013008004100030010001700071020002500088040002200113049000900135050002200144082001700166100003200183245008500215250001200300260003700312300005400349504006
 600403651005000469913001700519970002400536149366MAnMC20081121111900.0900322s1990    nyuaf    b    001 0 eng    a   90053133   a0394569830 :c$24.95  aDLCcDLCdUtOrBLW  aMRQA00aTL793b.B847 199000a919.9/042201 aBurrows, William E.,d1937-10aExploring space :bvoyages in the solar system and beyond /cWilliam E. Burrows.  a1st ed.  aNew York :bRandom House,c1990.  axvii, 502 p., [16] p. of plates :bill. ;c24 cm.  aIncludes bibliographical references (p. [471]-486) and index. 0aOuter spacexExplorationvJuvenile literature00aBURESPA99000  \p19.99fJUVoBR1q100889cam a2200289 a 4500001000700000003000600007005001700013008004100030010001700071020001500088035002300103040002700126049000900153050002300162082001400185100002100199245009600220260005000316300004100366500002000407650002500427650003000452651005000482700002700532913001700559970002300576276694MAnMC20081121111900.0980416s1998    nyua          001 0 eng    a   98021564   a0814
 731171  a(OCoLC)ocm39013767  aDLCcDLCdMRQdUtOrBLW  aMRQA00aQB501.5b.G75 199800a523.22211 aGribbin, John R.10aEmpire of the sun :bplanets and moons of the solar system /cJohn Gribbin & Simon Goodwin.  aNew York :bNew York University Press,c1998.  a136 p. :bill. (some col.) ;c29 cm.  aIncludes index. 0aPlanetsxExploration 0aAstronautics in astronomy 0aOuter spacexExplorationvJuvenile literature1 aGoodwin, Simon,d1971-00aGRIEOTS99000  \p19.99fAVoBR1q101289pam a2200361 a 4500001000700000003000600007005001700013008004100030010001700071020002400088040002700112050002100139082001200160099000600172100002200178245010200200260004300302300003400345500002000379520020700399650003500606650003400641650001400675650001700689650003400706651003800740700003700778700001600815740003700831740001800868913001700886970002400903456499MAnMC20090505135400.0891023s1990    maua   j f    001 0 eng    a   89024744   a0395524512 :c$4.95  aDLCcDLC
 dDLCdUtOrBLW00aQB46b.P377 19900 a520220  aJ1 aPasachoff, Jay M.10aPeterson first guide to the solar system /cJay M. Pasachoff ; planet-finding maps by Wil Tirion.  aBoston :bHoughton Mifflin Co.,c1990.  a128 p. :bcol. ill. ;c19 cm.  aIncludes index.  aA basic field guide for beginning observers of the solar system, introducing information on the locations and characteristics of the planets, sun, comets, meteors, and other objects in our solar system. 0aAstronomyvJuvenile literature 0aAstronomyvAmateurs' manuals. 1aAstronomy 1aSolar system 1aAstronomyvObservers' manuals 0aSolar systemvJuvenile literature1 aPeterson, Roger Tory,d1908-19961 aTirion, Wil0 aFirst guide to the solar system.0 aSolar system.00aPASPFGT99000  \p19.99fJUVoBR1q101126cam a22003614a 450000100080000000300060000800500170001400800410003101000170007202000180008902000150010703500240012204000510014604300120019704900090020905000230021808200140024109900
 06002551000017002612450028002782500013003062600053003193000033003724900025004055000020004305050117004506510029005678300021005969380071006179380041006889700023007299940012007521144619MAnMC20090505113400.0071214s2008    nyua   j      001 0 eng    a  2007051542  a9781604132052  a1604132051  a(OCoLC)ocn184906271  aDLCcDLCdBAKERdBTCTAdBIBdRLSdMRQdUtOrBLW  azsu----  aMRQA00aQB521.5b.B57 200800a523.7222 0aJ1 aBirch, Robin14aThe sun /cRobin Birch.  a2nd. ed.  aNew York, NY :bChelsea House Publishers,c2008.  a32 p. :bcol. ill. ;c26 cm.1 aThe new solar system  aIncludes index.0 aThe sun -- The sun is a star -- On the sun -- Sun and earth -- Studying the sun -- Sun fact summary -- Glossary. 0aSunvJuvenile literature 0aNew solar system  aBaker & TaylorbBKTYc23.00d23.00i1604132051n0007584378sactive  aBaker and TaylorbBTCPnBK0007584378  \p19.99fRFoBR1q1  aC0bMRQ
\ No newline at end of file

commit acb1c944e8dbc4882f2f5d42538ed5928765feb2
Author: Bill Erickson <berickxx at gmail.com>
Date:   Thu Nov 5 13:56:15 2015 -0500

    LP#1486294 ACQ sapmle holding subfield maps
    
    Collection of holding subfield map configurations for ACQ seed data
    providers.  Maps for all providers are the same.
    
    Signed-off-by: Bill Erickson <berickxx at gmail.com>
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>

diff --git a/Open-ILS/tests/datasets/sql/acq.sql b/Open-ILS/tests/datasets/sql/acq.sql
index 794eb71..f20a208 100644
--- a/Open-ILS/tests/datasets/sql/acq.sql
+++ b/Open-ILS/tests/datasets/sql/acq.sql
@@ -46,6 +46,34 @@ INSERT INTO acq.provider
 
 SELECT SETVAL('acq.provider_id_seq'::TEXT, 4);
 
+INSERT INTO acq.provider_holding_subfield_map (provider, name, subfield) VALUES
+    (1, 'quantity',         'q'),
+    (1, 'estimated_price',  'p'),
+    (1, 'owning_lib',       'o'),
+    (1, 'call_number',      'n'),
+    (1, 'fund_code',        'f'),
+    (1, 'circ_modifier',    'm'),
+    (1, 'note',             'z'),
+    (1, 'copy_location',    'l'),
+    (1, 'barcode',          'b'),
+    (1, 'collection_code',  'c');
+
+-- give every provider the same holding subfield maps
+INSERT INTO acq.provider_holding_subfield_map (provider, name, subfield)
+    SELECT 2, name, subfield
+        FROM acq.provider_holding_subfield_map
+        WHERE provider = 1;
+
+INSERT INTO acq.provider_holding_subfield_map (provider, name, subfield)
+    SELECT 3, name, subfield
+        FROM acq.provider_holding_subfield_map
+        WHERE provider = 1;
+
+INSERT INTO acq.provider_holding_subfield_map (provider, name, subfield)
+    SELECT 4, name, subfield
+        FROM acq.provider_holding_subfield_map
+        WHERE provider = 1;
+
 INSERT INTO acq.purchase_order (id, owner, creator, 
     editor, ordering_agency, provider, state, order_date) VALUES
     (1, 1, 1, 1, 4, 1, 'pending', NULL),

commit ad50eaaa85691245117943716a1ffb4ceb82a462
Author: Bill Erickson <berickxx at gmail.com>
Date:   Wed Nov 4 17:00:07 2015 -0500

    LP#1486294 ACQ sample data
    
    Sample ACQ data including:
    
    * funding sources
    * funds
    * funding source credits
    * fund allocations
    * providers
    * purchase orders
    * lineitems (some canceled)
    * lineitem details (copies, some canceled)
    * fund_debits
    
    Signed-off-by: Bill Erickson <berickxx at gmail.com>
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>

diff --git a/Open-ILS/tests/datasets/sql/acq.sql b/Open-ILS/tests/datasets/sql/acq.sql
new file mode 100644
index 0000000..794eb71
--- /dev/null
+++ b/Open-ILS/tests/datasets/sql/acq.sql
@@ -0,0 +1,87 @@
+
+-- note: using hard-coded ID's for most objects or this 
+-- would require 3 times as much SQL.
+
+INSERT INTO acq.funding_source (id, owner, name, currency_type, code) VALUES
+    (1, 1, 'LSTA', 'USD', 'LSTA'),
+    (2, 2, 'State', 'USD', 'ST'),
+    (3, 4, 'Foundation', 'USD', 'FNTN');
+
+SELECT SETVAL('acq.funding_source_id_seq'::TEXT, 3);
+
+INSERT INTO acq.funding_source_credit (amount, funding_source) VALUES
+    ('10000',1), ('5000', 2), ('5000', 3);
+
+INSERT INTO acq.fund (id, org, year, currency_type, name, code) VALUES
+    (1,  1, EXTRACT(year FROM now()), 'USD', 'Adult', 'AD'),
+    (2,  2, EXTRACT(year FROM now()), 'USD', 'AV', 'AV'),
+    (3,  3, EXTRACT(year FROM now()), 'USD', 'AV', 'AV'),
+    (4,  4, EXTRACT(year FROM now()), 'USD', 'Juvenile', 'JUV'),
+    (5,  5, EXTRACT(year FROM now()), 'USD', 'Young Adult', 'YA'),
+    (6,  6, EXTRACT(year FROM now()), 'USD', 'Juvenile', 'JUV'),
+    (7,  7, EXTRACT(year FROM now()), 'USD', 'Young Adult', 'YA'),
+    (8,  2, EXTRACT(year FROM now()), 'USD', 'Reference', 'RF'),
+    (9,  2, EXTRACT(year FROM now()), 'USD', 'Fiction Print', 'FP'),
+    (10, 2, EXTRACT(year FROM now()), 'USD', 'Fiction Non-Print', 'FNP'),
+    (11, 3, EXTRACT(year FROM now()), 'USD', 'Fiction Print', 'FP'),
+    (12, 3, EXTRACT(year FROM now()), 'USD', 'Fiction Non-Print', 'FNP');
+
+SELECT SETVAL('acq.fund_id_seq'::TEXT, 12);
+
+INSERT INTO acq.fund_allocation 
+    (funding_source, fund, amount, allocator) VALUES
+    (1, 1,  '3000', 1),
+    (1, 2,  '3000', 1),
+    (1, 3,  '3000', 1),
+    (2, 9,  '500',  1),
+    (2, 10, '500',  1),
+    (3, 4,  '2000', 1);
+
+INSERT INTO acq.provider 
+    (id, name, owner, currency_type, code, holding_tag, san) VALUES
+    (1, 'Ingram', 1, 'USD', 'INGRAM', '970', '1697978'),
+    (2, 'Brodart', 2, 'USD', 'BRODART', '970', '1697684'),
+    (3, 'Baker & Taylor', 1, 'USD', 'BT', '970', '3349659'),
+    (4, 'Initech', 4, 'USD', 'IT', '970', '1001001');
+
+SELECT SETVAL('acq.provider_id_seq'::TEXT, 4);
+
+INSERT INTO acq.purchase_order (id, owner, creator, 
+    editor, ordering_agency, provider, state, order_date) VALUES
+    (1, 1, 1, 1, 4, 1, 'pending', NULL),
+    (2, 1, 1, 1, 4, 2, 'on-order', NOW());
+
+SELECT SETVAL('acq.purchase_order_id_seq'::TEXT, 2);
+
+INSERT INTO acq.lineitem (id, creator, editor, selector, 
+        provider, purchase_order, state, cancel_reason, 
+        estimated_unit_price, eg_bib_id, marc) VALUES
+    (1, 1, 1, 1, 1, 1, 'new', NULL, '25.00', 1,
+        (SELECT marc FROM biblio.record_entry WHERE id = 1)),
+    (2, 1, 1, 1, 1, 1, 'new', NULL, '15.00', 2,
+        (SELECT marc FROM biblio.record_entry WHERE id = 2)),
+    (3, 1, 1, 1, 1, 2, 'on-order', NULL, '12.00', 3,
+        (SELECT marc FROM biblio.record_entry WHERE id = 3)),
+    (4, 1, 1, 1, 1, 2, 'cancelled', 1283, '18.50', 4,
+        (SELECT marc FROM biblio.record_entry WHERE id = 4)),
+    (5, 1, 1, 1, 1, 2, 'cancelled', 1, '22.00', 5,
+        (SELECT marc FROM biblio.record_entry WHERE id = 5));
+
+SELECT SETVAL('acq.lineitem_id_seq'::TEXT, 5);
+
+INSERT INTO acq.fund_debit (id, fund, origin_amount, 
+    origin_currency_type, amount, debit_type) VALUES
+    (1, 1, '12.00', 'USD', '12.00', 'purchase'),
+    (2, 1, '12.00', 'USD', '12.00', 'purchase'),
+    (3, 1, '18.50', 'USD', '12.00', 'purchase');
+
+SELECT SETVAL('acq.fund_debit_id_seq'::TEXT, 4);
+
+INSERT INTO acq.lineitem_detail (lineitem, fund, fund_debit, eg_copy_id,
+   barcode, cn_label, owning_lib, location, cancel_reason) VALUES
+   (3, 1, 1, 3, 'ACQ0001', 'ACQ001', 4, 113, NULL),
+   (3, 1, 2, 103, 'ACQ0002', 'ACQ002', 5, 125, NULL),
+   (4, 1, 3, 4, 'ACQ0002', 'ACQ002', 4, 118, 1),
+   (5, 1, NULL, 5, 'ACQ0002', 'ACQ002', 4, 123, 1283);
+
+
diff --git a/Open-ILS/tests/datasets/sql/load_all.sql b/Open-ILS/tests/datasets/sql/load_all.sql
index 2694af9..1d4914e 100644
--- a/Open-ILS/tests/datasets/sql/load_all.sql
+++ b/Open-ILS/tests/datasets/sql/load_all.sql
@@ -62,6 +62,9 @@ INSERT INTO biblio.record_entry (marc, last_xact_id)
 \i transactions.sql
 \i neg_bal_custom_transactions.sql
 
+-- funds, orders, etc.
+\i acq.sql
+
 -- clean up the env
 \i env_destroy.sql
 

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/tests/datasets/sample_acq_order.mrc |    1 +
 Open-ILS/tests/datasets/sql/acq.sql          |  115 ++++++++++++++++++++++++++
 Open-ILS/tests/datasets/sql/load_all.sql     |    3 +
 3 files changed, 119 insertions(+), 0 deletions(-)
 create mode 100644 Open-ILS/tests/datasets/sample_acq_order.mrc
 create mode 100644 Open-ILS/tests/datasets/sql/acq.sql


hooks/post-receive
-- 
Evergreen ILS


More information about the open-ils-commits mailing list