Apply fixes to exporting MARC records -- patch from Dan Scott.

diff --git a/1.6/admin/migratingdata_1.6.xml b/1.6/admin/migratingdata_1.6.xml
index a443dfe..dd830ae 100644 (file)
--- a/1.6/admin/migratingdata_1.6.xml
+++ b/1.6/admin/migratingdata_1.6.xml
@@ -690,17 +690,17 @@ COMMIT;
        <section xml:id="exportingbibrecordsintoMARC">\r
                <title>Exporting Bibliographic Records into MARC files</title>\r
                <indexterm><primary>migrating</primary><secondary>exporting bibliographic records</secondary><tertiary>MARC</tertiary></indexterm>\r
-               <para>The following procedure explains how to export Evergreen bibliographic records into MARC files using the marc_export support script. All steps should be performed by the \r
-               opensrf user from your Evergreen server.</para>\r
+                       <para>The following procedure explains how to export Evergreen bibliographic records into MARC files using the <command>marc_export</command> support script. All steps should be \r
+                       performed by the opensrf user from your Evergreen server.</para>\r
                <procedure>\r
                        <step> \r
-                               <para>Create a text file list of the Bibliographic record ids you would like to export from Evergreen. One way to do this is using SQL:</para>\r
+                               <para>Create a text file list of the Bibliographic record IDs you would like to export from Evergreen. One way to do this is using SQL:</para>\r
 <programlisting language="sql">\r
 SELECT DISTINCT bre.id FROM biblio.record_entry AS bre\r
-       JOIN asset.call_number AS acn ON acn.record-bre.id \r
-       WHERE bre.deleted='false' and ownling_lib=101 \g /home/opensrf/records.txt;\r
+       JOIN asset.call_number AS acn ON acn.record = bre.id \r
+       WHERE bre.deleted='false' and owning_lib=101 \g /home/opensrf/records.txt;\r
 </programlisting>\r
-                               <para>This query will create a file called <filename>records.txt</filename> containing a column of distinct ids of items owned by the organizational unit with the \r
+                               <para>This query will create a file called <filename>records.txt</filename> containing a column of distinct IDs of items owned by the organizational unit with the \r
                                <database class="field">id</database> <literal>101</literal>.</para>\r
                        </step>\r
                        <step>\r
@@ -710,13 +710,13 @@ SELECT DISTINCT bre.id FROM biblio.record_entry AS bre
 </screen>\r
                        </step>\r
                        <step>\r
-                               <para>Run <command>marc_export</command>, using the id file you created in step 1 to define which files to export.</para>\r
+                               <para>Run <command>marc_export</command>, using the ID file you created in step 1 to define which files to export.</para>\r
 <screen>\r
 <userinput>cat /home/opensrf/records.txt | ./marc_export -i -c /openils/conf/opensrf_core.xml \\r
 -x /openils/conf/fm_IDL.xml -f XML --timeout 5 > exported_files.xml\r
 </userinput>\r
 </screen>\r
-                               <para>The example above export the records into MARCXML format.</para>\r
+                               <para>The example above exports the records into MARCXML format.</para>\r
                                <note>\r
                                <para>For help or for more options when running <command>marc_export</command>, run <command>marc_export</command> with the <option>-h</option> option:</para>\r
 <screen>\r
@@ -726,8 +726,8 @@ SELECT DISTINCT bre.id FROM biblio.record_entry AS bre
                                \r
                        </step>\r
                                <note>\r
-                               <para>Processing time for exporting records will depond on several factors such as the number of records you are exporting. It is recommended that you divide the \r
-                               export id files (<filename>records.txt</filename>) into manageable number of records if you are exporting a large number of records.</para> \r
+                               <para>Processing time for exporting records depends on several factors such as the number of records you are exporting. It is recommended that you divide the \r
+                               export ID files (<filename>records.txt</filename>) into a manageable number of records if you are exporting a large number of records.</para>\r
                                </note>\r
                </procedure>\r
        </section>      \r
@@ -741,7 +741,6 @@ SELECT DISTINCT bre.id FROM biblio.record_entry AS bre
                        <para>The major advantages of the command line approach are its speed and its convenience for system administrators who can perform bulk loads of authority records in a \r
                        controlled environment.</para>          \r
                        <procedure>\r
-\r
                                <step> \r
                                        <para>Run <command>marc2are.pl</command> against the authority records, specifying the user name, password, MARC type (USMARC or XML). Use \r
                                        <varname>STDOUT</varname> redirection \r

diff --git a/2.0/admin/migratingdata_2.0.xml b/2.0/admin/migratingdata_2.0.xml
index cf8ce7c..90268aa 100644 (file)
--- a/2.0/admin/migratingdata_2.0.xml
+++ b/2.0/admin/migratingdata_2.0.xml
@@ -669,17 +669,17 @@ COMMIT;
        <section xml:id="exportingbibrecordsintoMARC">\r
                <title>Exporting Bibliographic Records into MARC files</title>\r
                <indexterm><primary>migrating</primary><secondary>exporting bibliographic records</secondary><tertiary>MARC</tertiary></indexterm>\r
-               <para>The following procedure explains how to export Evergreen bibliographic records into MARC files using the marc_export support script. All steps should be performed by the \r
-               opensrf user from your Evergreen server.</para>\r
+               <para>The following procedure explains how to export Evergreen bibliographic records into MARC files using the <command>marc_export</command> support script. All steps should be \r
+               performed by the opensrf user from your Evergreen server.</para>\r
                <procedure>\r
                        <step> \r
-                               <para>Create a text file list of the Bibliographic record ids you would like to export from Evergreen. One way to do this is using SQL:</para>\r
+                               <para>Create a text file list of the Bibliographic record IDs you would like to export from Evergreen. One way to do this is using SQL:</para>\r
 <programlisting language="sql">\r
 SELECT DISTINCT bre.id FROM biblio.record_entry AS bre\r
-       JOIN asset.call_number AS acn ON acn.record-bre.id \r
-       WHERE bre.deleted='false' and ownling_lib=101 \g /home/opensrf/records.txt;\r
+       JOIN asset.call_number AS acn ON acn.record = bre.id \r
+       WHERE bre.deleted='false' and owning_lib=101 \g /home/opensrf/records.txt;\r
 </programlisting>\r
-                               <para>This query will create a file called <filename>records.txt</filename> containing a column of distinct ids of items owned by the organizational unit with the \r
+                               <para>This query creates file called <filename>records.txt</filename> containing a column of distinct IDs of items owned by the organizational unit with the \r
                                <database class="field">id</database> <literal>101</literal>.</para>\r
                        </step>\r
                        <step>\r
@@ -689,13 +689,13 @@ SELECT DISTINCT bre.id FROM biblio.record_entry AS bre
 </screen>\r
                        </step>\r
                        <step>\r
-                               <para>Run <command>marc_export</command>, using the id file you created in step 1 to define which files to export.</para>\r
+                               <para>Run <command>marc_export</command>, using the ID file you created in step 1 to define which files to export.</para>\r
 <screen>\r
 <userinput>cat /home/opensrf/records.txt | ./marc_export -i -c /openils/conf/opensrf_core.xml \\r
 -x /openils/conf/fm_IDL.xml -f XML --timeout 5 > exported_files.xml\r
 </userinput>\r
 </screen>\r
-                               <para>The example above export the records into MARCXML format.</para>\r
+                               <para>The example above exports the records into MARCXML format.</para>\r
                                <note>\r
                                <para>For help or for more options when running <command>marc_export</command>, run <command>marc_export</command> with the <option>-h</option> option:</para>\r
 <screen>\r
@@ -705,8 +705,8 @@ SELECT DISTINCT bre.id FROM biblio.record_entry AS bre
                                \r
                        </step>\r
                                <note>\r
-                               <para>Processing time for exporting records will depond on several factors such as the number of records you are exporting. It is recommended that you divide the \r
-                               export id files (<filename>records.txt</filename>) into manageable number of records if you are exporting a large number of records.</para> \r
+                               <para>Processing time for exporting records will depends on several factors such as the number of records you are exporting. It is recommended that you divide the \r
+                               export ID files (<filename>records.txt</filename>) into manageable number of records if you are exporting a large number of records.</para> \r
                                </note>\r
                </procedure>\r
        </section>      \r