A few more fixes from Bug 720068 reported by Demian Katz.

diff --git a/1.6/admin/migratingdata_1.6.xml b/1.6/admin/migratingdata_1.6.xml
index cb665ae..da9d890 100644 (file)
--- a/1.6/admin/migratingdata_1.6.xml
+++ b/1.6/admin/migratingdata_1.6.xml
@@ -319,7 +319,7 @@ circ_modifier 999 t
 <programlisting language="sql">\r
 BEGIN;\r
 \r
-egid, hseq, l_call_num, l_barcode, l_location, l_owning_lib, l_circ_modifier,\r
+egid, hseq, l_callnum, l_barcode, l_location, l_owning_lib, l_circ_modifier,\r
 40      0       HD3616.K853 U54 1997    30731100751928  STACKS  FENNELL BOOK\r
 41      1       HV6548.C3 S984 1998     30731100826613  STACKS  FENNELL BOOK\r
 41      2       HV6548.C3 S984 1998     30731100804958  STACKS  BRANTFORD       BOOK\r
@@ -357,13 +357,13 @@ l_location, l_owning_lib, l_circ_modifier <emphasis>FROM stdin;</emphasis>
 <programlisting language="sql">\r
 CREATE TABLE staging_items (\r
         l_callnum text, -- call number label\r
-       hseq int, -- call number label\r
+       hseq int, \r
         egid  int,  -- biblio.record_entry_id\r
         createdate      date,\r
         l_location        text,\r
         l_barcode         text,\r
         l_circ_modifier       text,\r
-        l_owning_lib      text  -- actor.org_unit.shortname\r
+        l_owning_lib      text -- actor.org_unit.shortname \r
 );\r
 </programlisting>\r
                        </step> \r
@@ -432,7 +432,7 @@ SELECT  DISTINCT ou.id AS circ_lib,
        cn.id AS call_number\r
        FROM  staging_items l\r
                JOIN actor.org_unit ou\r
-                       ON (l.owning_lib = ou.shortname)\r
+                       ON (l.l_owning_lib = ou.shortname)\r
                JOIN asset.copy_location cl\r
                        ON (ou.id = cl.owning_lib AND l.l_location = cl.name)\r
                JOIN metabib.real_full_rec m \r

diff --git a/2.0/admin/migratingdata_2.0.xml b/2.0/admin/migratingdata_2.0.xml
index 8cd94c3..fff4b6f 100644 (file)
--- a/2.0/admin/migratingdata_2.0.xml
+++ b/2.0/admin/migratingdata_2.0.xml
@@ -303,7 +303,7 @@ extract_holdings --marcfile=clean.marc.xml --holding 999 --copyid 999i --map hol
                                <para>The <option>map</option> option <filename>holdings.map</filename> refers to a file to be used for mapping subfields to the holdings data you would like extracted. Here is an example based on mapping holdings data to the 999 data field:</para>\r
 <programlisting>\r
 <![CDATA[\r
-call_num 999 a\r
+callnum 999 a\r
 barcode 999 i\r
 location 999 l\r
 owning_lib 999 m\r
@@ -314,7 +314,7 @@ circ_modifier 999 t
 <programlisting language="sql">\r
 BEGIN;\r
 \r
-egid, hseq, l_call_num, l_barcode, l_location, l_owning_lib, l_circ_modifier,\r
+egid, hseq, l_callnum, l_barcode, l_location, l_owning_lib, l_circ_modifier,\r
 40      0       HD3616.K853 U54 1997    30731100751928  STACKS  FENNELL BOOK\r
 41      1       HV6548.C3 S984 1998     30731100826613  STACKS  FENNELL BOOK\r
 41      2       HV6548.C3 S984 1998     30731100804958  STACKS  BRANTFORD       BOOK\r
@@ -352,7 +352,7 @@ l_owning_lib, l_circ_modifier <emphasis>FROM stdin;</emphasis>
 <programlisting language="sql">\r
 CREATE TABLE staging_items (\r
         l_callnum text, -- call number label\r
-       hseq int, -- call number label\r
+       hseq int, \r
         egid  int,  -- biblio.record_entry_id\r
         createdate      date,\r
         l_location        text,\r
@@ -427,7 +427,7 @@ SELECT  DISTINCT ou.id AS circ_lib,
        cn.id AS call_number\r
        FROM  staging_items l\r
                JOIN actor.org_unit ou\r
-                       ON (l.owning_lib = ou.shortname)\r
+                       ON (l.l_owning_lib = ou.shortname)\r
                JOIN asset.copy_location cl\r
                        ON (ou.id = cl.owning_lib AND l.l_location = cl.name)\r
                JOIN metabib.real_full_rec m \r