local

git-svn-id: svn+ssh://mjesec/home/dpavlin/svn/webpac2/trunk@1350 07558da8-63fa-0310-ba24-9fe276d99e06

diff --git a/vhost/ecas/config.yml b/vhost/ecas/config.yml
index 5c5aa32..202bdf3 100644 (file)
--- a/vhost/ecas/config.yml
+++ b/vhost/ecas/config.yml
@@ -115,7 +115,7 @@ databases:
           path: 'vhost/ecas/jstor.pl'
       - name: 'ovid'
         description: 'Ovid Full Text'
-        module: 'WebPAC::Input::Ovid'
+        module: 'WebPAC::Input::OvidOld'
         path: '/data/FF/ecasopisi/ovid/cites-all.txt'
         normalize:
           path: 'vhost/ecas/ovid.pl'
@@ -131,7 +131,7 @@ databases:
         module: 'WebPAC::Input::MARC'
         path: '/data/FF/ecasopisi/muse/premium.mrc'
         normalize:
-          path: 'vhost/ecas/marc.pl'
+          path: 'vhost/ecas/marc-muse.pl'
       - name: 'pubmed'
         description: 'PubMed Central' 
         module: 'WebPAC::Input::Excel'

diff --git a/vhost/ecas/ecas-labels.txt b/vhost/ecas/ecas-labels.txt
index 0bc589b..3377c08 100644 (file)
--- a/vhost/ecas/ecas-labels.txt
+++ b/vhost/ecas/ecas-labels.txt
@@ -3,6 +3,7 @@ titleen         Alternativni naslov
 issn           ISSN
 url            URL
 urlp           URL
+urlpe          URL
 urlf           URL
 keyword                Ključne riječi
 language       Jezik

diff --git a/vhost/ecas/html.pm b/vhost/ecas/html.pm
index 0567050..b45cca8 100644 (file)
--- a/vhost/ecas/html.pm
+++ b/vhost/ecas/html.pm
@@ -5,19 +5,27 @@ use warnings;
 
 sub url {
        my ($self,$url) = @_;
-       qq{ <a href="$url">Pristup iz ustanove</a> };
+       qq{ <a target="ecas" href="$url">Pristup iz ustanove</a> };
 }
 
 sub urlp {
        my ($self,$urlp) = @_;
        my $proxy = $urlp;
        $proxy =~ s{http://}{https://proxy.knjiznice.ffzg.hr/proxy/nph-proxy.cgi/000100A/http/};
-       qq{ <a href="$proxy">Pristup od kuće</a> };
+       qq{ <a target="ecas" href="$proxy">Pristup od kuće</a> };
 }
 
+sub urlpe {
+       my ($self,$urlpe) = @_;
+       my $proxy = $urlpe;
+       $proxy =~ s{http://}{https://proxy.knjiznice.ffzg.hr/proxy/nph-proxy2.cgi/000100A/http/};
+       qq{ <a target="ecas" href="$proxy">Pristup od kuće</a> };
+}
+
+
 sub urlf {
        my ($self,$urlf) = @_;
-       qq{ <a href="$urlf">Slobodni pristup</a> };
+       qq{ <a target="ecas" href="$urlf">Slobodni pristup</a> };
 }
 #sub publisher {
 #      my ($self,$publisher) = @_;

diff --git a/vhost/ecas/marc.pl b/vhost/ecas/marc.pl
index ea19b80..d7cee97 100644 (file)
--- a/vhost/ecas/marc.pl
+++ b/vhost/ecas/marc.pl
@@ -3,14 +3,19 @@ search( 'title',
                rec('245','a') 
        )
 );
-search( 'issn',        rec('022','a') );
+search( 'issn',        
+       join_with(' ; ',
+               rec('022','a'),
+               rec('022','y')
+       )
+);
 search( 'publisher',           
        regex('s/,$//',
                rec('260','b') 
        )
 );
 search( 'url',         rec('856','u') );       
-search( 'urlp',                rec('856','u') );       
+search( 'urlpe',               rec('856','u') );       
 search( 'collection',  
        config('input description')
 )