fixing up the import process -- using the perl dumper

git-svn-id: svn://svn.open-ils.org/ILS/trunk@1962 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Evergreen/src/extras/import/import_holdings.pl b/Evergreen/src/extras/import/import_holdings.pl
index da52f67..9428d7b 100755 (executable)
--- a/Evergreen/src/extras/import/import_holdings.pl
+++ b/Evergreen/src/extras/import/import_holdings.pl
@@ -117,7 +117,7 @@ while ( $xml .= <STDIN> ) {
        my $success = 0;
        try {
                $doc = $parser->parse_string($xml);;
-               $tcn = $doc->documentElement->findvalue( '/*/*[@tag="035"][1]' );
+               $tcn = $doc->documentElement->findvalue( '//*[@tag="035"][1]' );
                $success = 1;
        } catch Error with {
                my $e = shift;
@@ -133,6 +133,7 @@ while ( $xml .= <STDIN> ) {
                $xml = '';
                next;
        }
+       $tcn = "_$tcn";
 
        unless (exists($$tcn_map{$tcn})) {
                warn "\n !! TCN $tcn not in the map!\n";

diff --git a/Open-ILS/src/extras/import/cleanse-usmarc.sh b/Open-ILS/src/extras/import/cleanse-usmarc.sh
index 631901b..f6c4a49 100755 (executable)
--- a/Open-ILS/src/extras/import/cleanse-usmarc.sh
+++ b/Open-ILS/src/extras/import/cleanse-usmarc.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-DUMPER=/home/miker/cvs/ILS/Open-ILS/src/extras/import/../marcdumper/marcdumper
+DUMPER=/home/miker/cvs/ILS/Open-ILS/src/extras/import/marcFilterDump.pl
 
 
-$DUMPER -X -f MARC8 -t UTF8 -r '/*/*[@tag="999"]' $*
+$DUMPER -X -f MARC8 -t UTF8 -r '//*[@tag="999"]' $*

diff --git a/Open-ILS/src/extras/import/extract-holdings.sh b/Open-ILS/src/extras/import/extract-holdings.sh
index d270748..b96dd2e 100755 (executable)
--- a/Open-ILS/src/extras/import/extract-holdings.sh
+++ b/Open-ILS/src/extras/import/extract-holdings.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-DUMPER=/home/miker/cvs/ILS/Open-ILS/src/extras/import/../marcdumper/marcdumper
+DUMPER=/home/miker/cvs/ILS/Open-ILS/src/extras/import/marcFilterDump.pl
 
 
-$DUMPER -X -f MARC8 -t UTF8 -r '/*/*[(local-name()="datafield" and (@tag!="035" and @tag!="999")) or local-name()!="datafield"]' $*
+$DUMPER -X -f MARC8 -t UTF8 -r '/*/*/*[(local-name()="datafield" and (@tag!="035" and @tag!="999")) or local-name()!="datafield"]' $*

diff --git a/Open-ILS/src/extras/import/marcFilterDump.pl b/Open-ILS/src/extras/import/marcFilterDump.pl
index ab138a6..0ac05ac 100755 (executable)
--- a/Open-ILS/src/extras/import/marcFilterDump.pl
+++ b/Open-ILS/src/extras/import/marcFilterDump.pl
@@ -58,9 +58,9 @@ while ($marc) {
        }
 
        my $string = $doc->toStringC14N;
-       $string =~ s/>\n\s*</></gso;
-       $string =~ s/\n/\\n /gso;
-       $string =~ s/\t/\\t/gso;
+       $string =~ s/\n/ /gso;
+       $string =~ s/\t/ /gso;
+       $string =~ s/>\s+</></gso;
 
        print "$string\n";