Merge branch 'master' of webpac2.rot13.org:/srv/webpac2/ into tab

diff --git a/conf/bibliografija/baza-csa.pl b/conf/bibliografija/baza-csa.pl
index 0b5a299..be8ebaa 100644 (file)
--- a/conf/bibliografija/baza-csa.pl
+++ b/conf/bibliografija/baza-csa.pl
@@ -3,9 +3,11 @@ my $covstatus;
 
 ( $covpolicy, $covstatus ) = split(/\s*-\s*/, rec('F'));
 
+my @isn = regex('s/^.*(\d\d\d\w)(\d\d\d\w).*/$1-$2/', rec('B'));
+
 row('rbaze',
        baza => config('input name'),
-       isn => rec('B'),
+       isn => $isn[0],
        eissn => rec('C'),
        title => rec('A'),
        coverage_policy => $covpolicy,

diff --git a/conf/bibliografija/baza-geobase.pl b/conf/bibliografija/baza-geobase.pl
index 6ec739a..1b969a2 100644 (file)
--- a/conf/bibliografija/baza-geobase.pl
+++ b/conf/bibliografija/baza-geobase.pl
@@ -1,8 +1,10 @@
+my @isn = regex('s/^.*(\d\d\d\w)(\d\d\d\w).*/$1-$2/', rec('C'));
+
 row('rbaze',
        baza => config('input name'),
        title => rec('A'),
        source_type => rec('B'),
-       isn => rec('C'),
+       isn => $isn[0],
        eissn => rec('D'),
        publisher => rec('E'),
        country => rec('F'),

diff --git a/conf/bibliografija/baza-pi.pl b/conf/bibliografija/baza-pi.pl
index abd1a34..e91175e 100644 (file)
--- a/conf/bibliografija/baza-pi.pl
+++ b/conf/bibliografija/baza-pi.pl
@@ -1,4 +1,4 @@
-my @isn = regex('s/^.*(\d\d\d\w-\d\d\d\w).*/$1/', rec('B'));
+my @isn = regex('s/^.*(\d\d\d\w).*(\d\d\d\w).*/$1-$2/', rec('B'));
 
 row('rbaze',
        baza => config('input name'),

diff --git a/conf/bibliografija/config-biblio.yml b/conf/bibliografija/config-biblio.yml
index 02e348e..618561f 100644 (file)
--- a/conf/bibliografija/config-biblio.yml
+++ b/conf/bibliografija/config-biblio.yml
@@ -32,7 +32,7 @@ databases:
         encoding: 'utf-8'
       - name: 'biblio'
         module: 'WebPAC::Input::MARC'
-        path: '/data/FF/bibliografija/biblio.marc'
+        path: '/data/FF/bibliografija/koha-export/biblio.marc'
         skip: 0
         normalize:
           path: 'conf/bibliografija/biblio.pl'