local

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

diff --git a/conf/mjesec.yml b/conf/mjesec.yml
index d9efc66..effe08e 100644 (file)
--- a/conf/mjesec.yml
+++ b/conf/mjesec.yml
@@ -190,68 +190,32 @@ databases:
   'webpac2':
     name: 'Search all'
     links:
-      - to: ffps 
+      - to: hrz 
         credit: 10000
       - to: nsk 
         credit: 10000
 
-
-  ffps:
-    # all variables here will be available as config variables in template
-    name: 'Psihologija, Filozofski fakultet u Zagrebu'
-    code: 'ps'
-    url: 'http://www.knjiznice.ffzg.hr/psihologija'
-
-    # define input source
+  hrz:
+    name: 'Hrvatski restauratorski zavod'
     input:
-      # this will create unique name with name of database and mfn
-      - name: libri
-        # isis
-        type: isis
-
-        # full path to database
-        path: '/backup/isis_backup/sunce2/isisdata/latest/LIBRI/'
-        # path: '/data/isis_data/PS/LIBRI/'
-
-        # encoding of character set in isis data
-        encoding: 'cp852'
-
-        # lookup
-        # lookup: 'conf/lookup/isis_ffzg.yml'
-
-        # limit number of records to read from database
-        #limit: 10
-
-        modify_file: 'conf/modify/common.pl'
-        
-        # define normalisation for that source
-        normalize:
-          # which tag to use in normalize xml for data?
-          # tag: 'isis'
-          # path to normalization xml
-          #- path: 'conf/normalize/ff-nakladnicka.pl'
-          path: 'conf/normalize/ff-libri.pl'
-          #- path: 'conf/normalize/minimal.pl'
-          #- path: 'conf/normalize/ff-dupli.pl'
-          #- path: 'conf/normalize/ffps-spec.pl'
+      name: knjige
+      type: isis
+      path: '/data/humanistika/hrz/knjige/KNJIGE'
+      encoding: 'cp852'
+      #limit: 10
+      #modify_file: 'conf/modify/common.pl'
+      normalize:
+        path: 'conf/normalize/minimal.pl'
 
-      # another input database
-      - name: peri
-        type: isis
-        path: '/backup/isis_backup/sunce2/isisdata/latest/PERI/PERI'
-        encoding: 'cp852'
-        #limit: 10
-        # modify_file: 'conf/modify/common.pl'
-        normalize:
-          path: 'conf/normalize/ff-peri.pl'
 
   nsk:
     name: 'Nacionalna i sveucilisna knjiznica'
     input:
-      name: baza
+      name: analitika
       type: marc
       path: '/backup/data/NSK/BBaza.ISO'
       encoding: 'ISO-8859-2'
+      modify: 'conf/modify/analitika.pl'
       normalize:
         path: 'conf/normalize/ps-casopisi.pl'
 

diff --git a/conf/normalize/minimal.pl b/conf/normalize/minimal.pl
index 3ceb8ed..27b00d1 100644 (file)
--- a/conf/normalize/minimal.pl
+++ b/conf/normalize/minimal.pl
@@ -22,62 +22,10 @@ marc('022','a',
 
 marc_indicators('245', 1, 0);
 
-if (   ( rec('200','a') =~ m/^Die /) || 
-       ( rec('200','a') =~ m/^Das /) || 
-       ( rec('200','a') =~ m/^The /) ) {
-               marc_indicators('245', 1, 4);
-} 
-
-if (   ( rec('200','a') =~ m/^A /) && ( rec(101) =~ m/ENG/ ) )
-       {
-               marc_indicators('245', 1, 2);
-} 
-
-
-### 245
-# redoslijed polja
-
-#_debug(3);
-marc_compose('245',
-       'a', suffix(
-               rec('200','b') ? '. '   :
-               rec('200','k') ? ' ; '  :
-               rec('200','d') ? ' = '  :
-               rec('200','e') ? ' : '  :
-               rec('200','f') ? ' / '  :
-                                '.',
-                       rec('200','a')
-       ),
-#      'h', rec('200','b'),
-       'b', suffix(
-               ( rec('200','k') && rec('200','f') ) ? ' / ' :
-                                    ' ',
-                       join_with(' ; ',
-                               rec('200','k'),
-                       ),
-       ),
-       'b', suffix(
-               ( rec('200','d') && rec('200','f') ) ? ' / ' :
-                                                      ' ',
-                               rec('200','d'), 
-       ),
-       'b', suffix(
-               ( rec('200','e') && rec('200','f') ) ? ' / ' :
-                                                      ' ',
-                       join_with(' : ',
-                               rec('200','e'),
-                       ),
-       ),
-
-       'c', rec('200','f'),
-
-# append to last subfield
-       '+', prefix('. ', 
-               rec('200','c') 
-       ),
+marc('245','a',
+       rec('200','a')
 );
 
-
 marc('260','c',
        rec('210','d')
        

diff --git a/conf/validate/ffet-libri b/conf/validate/ffet-libri
index fbbdec3..f3f7f2d 100644 (file)
--- a/conf/validate/ffet-libri
+++ b/conf/validate/ffet-libri
@@ -3,9 +3,9 @@
 101 
 200 a c d e* f g k 
 205 a
-210 a b c d 
+210 a c d 
 215 a c d e
-225 a d e h i v w
+225 a e h i v w
 230 a e f v
 231 a e f v
 232 a e f v

diff --git a/conf/validate/ffro-libri b/conf/validate/ffro-libri
index 605bc65..f2ab6bd 100644 (file)
--- a/conf/validate/ffro-libri
+++ b/conf/validate/ffro-libri
@@ -40,7 +40,7 @@
 327 
 330 
 423 a b c z
-464 a b c f g x y
+464 a c f g x y
 503 a b
 532
 610