X-Git-Url: http://git.equinoxoli.org/?p=migration-tools.git;a=blobdiff_plain;f=mig-bin%2Fmig-loadbibs;h=1d2e4fb5dc2ae3c00cc1bec94897be5675390eb8;hp=d89dfb6aab5bd0d1eedeb476d3dba19f1148f10c;hb=1a510ad110ab208ec615a0bf6d8931ad20137159;hpb=d5f19c6b68f57060ece9c04a0f08e685b062dab6

diff --git a/mig-bin/mig-loadbibs b/mig-bin/mig-loadbibs
index d89dfb6..1d2e4fb 100755
--- a/mig-bin/mig-loadbibs
+++ b/mig-bin/mig-loadbibs
@@ -39,6 +39,7 @@ use MARC::Record;
 use MARC::Batch;
 use MARC::File;
 use MARC::File::XML;
+binmode STDIN, ':bytes';
 use Env qw(
     HOME PGHOST PGPORT PGUSER PGDATABASE MIGSCHEMA
     MIGBASEWORKDIR MIGBASEGITDIR MIGGITDIR MIGWORKDIR
@@ -96,27 +97,17 @@ foreach my $arg (@ARGV) {
     }
 }
 
-$dbh->do(qq{
-	DO $$
-	DECLARE
-    	t   BOOLEAN;
-	BEGIN
-	SELECT EXISTS(SELECT 1 FROM information_schema.tables WHERE table_schema = '$MIGSCHEMA' AND table_name = 'biblio_record_entry') INTO t;
-	IF t = FALSE THEN
-    	PERFORM migration_tools.build_specific_base_staging_table ('$MIGSCHEMA','biblio.record_entry');
-	END IF;
-	END $$;
-});
+create_child_table($dbh);
 
 # normal stage table creation
 if ($append_is_false) { create_stage_table($dbh); }
 
-#sanity check and create stage table if --append is set but there isn't a stage table
+#sanity check and create stage table if it doesn't exist 
 my $query = "SELECT EXISTS(SELECT 1 FROM information_schema.tables WHERE table_schema = '$MIGSCHEMA' AND table_name = 'biblio_record_entry_stage')";
 my $qsth = $dbh->prepare($query);
 $qsth->execute();
 my $f;
-while (my @row = $sth->fetchrow_array) { $f = ($row[0] }
+while (my @row = $qsth->fetchrow_array) { $f = $row[0]; }
 if ($f eq 'f') { create_stage_table($dbh); }
 
 if ($append_is_false == 0) { create_stage_table($dbh); }
@@ -153,15 +144,32 @@ print "Finis.\n";
 
 sub create_stage_table {
 	my $dbh = shift;
-    $dbh->do(qq{
-        DROP TABLE IF EXISTS $MIGSCHEMA.biblio_record_entry_stage;
-        CREATE UNLOGGED TABLE $MIGSCHEMA.biblio_record_entry_stage (
+
+    $dbh->do("DROP TABLE IF EXISTS $MIGSCHEMA.biblio_record_entry_stage;");
+    $dbh->do("CREATE UNLOGGED TABLE $MIGSCHEMA.biblio_record_entry_stage (
             l_bib_id    TEXT,
             x_source    TEXT,
             x_warnings  TEXT,
             x_migrate   BOOLEAN DEFAULT TRUE
-        ) INHERITS ($MIGSCHEMA.biblio_record_entry);
-    });
+        ) INHERITS ($MIGSCHEMA.biblio_record_entry);");
+
+    return();
+}
+
+sub create_child_table {
+    my $dbh = shift;
+
+    $dbh->do("DO \$\$ 
+        DECLARE
+            t   BOOLEAN;
+        BEGIN
+        SELECT EXISTS(SELECT 1 FROM information_schema.tables WHERE table_schema = '$MIGSCHEMA' AND table_name = 'biblio_record_entry') INTO t;
+        IF t = FALSE THEN
+            PERFORM migration_tools.build_specific_base_staging_table ('$MIGSCHEMA','biblio.record_entry');
+        END IF;
+        END \$\$;");
+
+    return ();
 }
 
 sub clean_marc {