local

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

diff --git a/conf/mjesec.yml b/conf/mjesec.yml
index c2a38a6..1b1fcc3 100644 (file)
--- a/conf/mjesec.yml
+++ b/conf/mjesec.yml
@@ -10,7 +10,7 @@ sites_root: 'sites'
 
 # which indexing engine to use? (hyperestraier is default)
 #use_indexer: 'hyperestraier'
-use_indexer: 'hyperestraier-native'
+#use_indexer: 'hyperestraier-native'
 #use_indexer: 'kinosearch'
 
 # configuration for Hyper Estraier full text search engine
@@ -362,7 +362,8 @@ databases:
         encoding: 'cp852'
         modify_file: 'conf/modify/common.pl'
         normalize:
-          path: 'conf/normalize/ff-libri.pl'
+          - path: 'conf/normalize/ff-libri.pl'
+          - path: 'conf/normalize/ff-viseraz-proba.pl'
  
  
  
@@ -425,18 +426,26 @@ databases:
 #         normalize:
 #           path: 'conf/normalize/ff-peri.pl'
 # 
-#  ffps:
-#    name: 'Psihologija, Filozofski fakultet u Zagrebu'
-#    code: 'ps'
-#    url: 'http://www.knjiznice.ffzg.hr/psihologija'
-#    input:
-#      - name: peri
-#        type: isis
-#        path: '/backup/isis_backup/sunce2/isisdata/latest/PERI/'
-#        encoding: 'cp852'
-#        modify_file: 'conf/modify/common.pl'
-#        normalize:
-#          path: 'conf/normalize/ff-peri.pl'
+  ffps:
+    name: 'Psihologija, Filozofski fakultet u Zagrebu'
+    code: 'ps'
+    url: 'http://www.knjiznice.ffzg.hr/psihologija'
+    input:
+      - name: peri
+        type: isis
+        path: '/backup/isis_backup/sunce2/isisdata/latest/PERI/'
+        encoding: 'cp852'
+        modify_file: 'conf/modify/common.pl'
+        normalize:
+          path: 'conf/normalize/ff-peri.pl'
+      - name: libri
+        type: isis
+        path: '/backup/isis_backup/sunce2/isisdata/latest/LIBRI/'
+        encoding: 'cp852'
+        modify_file: 'conf/modify/common.pl'
+        normalize:
+          - path: 'conf/normalize/ff-libri.pl'
+          - path: 'conf/normalize/ff-viseraz-proba.pl'
 
 
 #   ffro:
@@ -562,3 +571,22 @@ databases:
 #     output:
 #       module: 'JSON'
 #       path: 'out/exhibit/po.js'
+
+  webpacus:
+    name: 'Webpacus'
+    input:
+      name: 'foobar'
+      type: marc
+#      path: 'out/marc/ffsf-peri.marc'
+      path: 'out/marc/ffkk-libri.marc'
+      encoding: 'utf-8'
+      normalize:
+        path: 'conf/normalize/webpacus.pl'
+    output:
+      - module: 'KinoSearch'
+        path: 'var/kinosearch'
+      - module: 'Sorted'
+        path: 'var/sorted'
+      - module: 'Webpacus'
+        path: '/data/Webpacus2'                         
+

diff --git a/conf/modify/common.pl b/conf/modify/common.pl
index 29ed525..266aead 100644 (file)
--- a/conf/modify/common.pl
+++ b/conf/modify/common.pl
@@ -18,10 +18,6 @@
 
 
 200
-#  '^a'
-#    '^g' => '^f'
-#  '^e'
-#    '^g' => '^f'
   '*'
     '[The]' => 'The'
     '[A]'   => 'A'
@@ -50,9 +46,6 @@
     '^f' => ' ; '
     '^d' => ' = '
   '*'
-#    '^d' => '^p'
-#    '^e' => ' : ^p'
-#    '^k' => ' ; ^p'
     '^g' => ' ; '
 
 205
@@ -175,11 +168,6 @@
 #    '^w' => '^v'
 #    ', ISSN ' => '^x'
 
-250
-  '*'
-    ' : ' => '^a'
-    ' ; ' => '^b'
-
 464
   '^a'
     '^f' => ' / '
@@ -213,3 +201,15 @@
 #    'g4' => 'q'
 #    'g'  => 'a'
 #    'g2' => 'f'
+
+250
+  '*'
+    'regex:^' => '^a'
+
+
+270
+  '*'
+    'regex:^' => '^a'
+  '^a'
+    ' ; ' => '^v'
+

diff --git a/conf/normalize/ff-peri.pl b/conf/normalize/ff-peri.pl
index 523c7cb..9f9bbc2 100644 (file)
--- a/conf/normalize/ff-peri.pl
+++ b/conf/normalize/ff-peri.pl
@@ -209,7 +209,8 @@ marc('222','a',
 #}
 
 ### 245 indikatori
-# generiraju se prema èlanu i jeziku. potrebna naknadna kontrola.
+# generiraju se prema èlanu, trebalo bi mo¾da i prema jeziku (jezika nema uvijek). 
+# potrebna naknadna kontrola
 
 marc_indicators('245', 0, 0);
 
@@ -230,14 +231,11 @@ if (      ( rec('200','a') =~ m/^Un /) ||
                marc_indicators('245', 0, 3);
 } 
 
-
 if (   ( rec('200','a') =~ m/^A /) || 
        ( rec('200','a') =~ m/^L'/) ) {
                marc_indicators('245', 0, 2);
 } 
 
-
-
 ### 245
 
 marc_compose('245',

diff --git a/conf/validate/ffiz-libri b/conf/validate/ffiz-libri
index 587e29a..4825acb 100644 (file)
--- a/conf/validate/ffiz-libri
+++ b/conf/validate/ffiz-libri
@@ -39,7 +39,7 @@
 327 
 330
 423 a b c z
-503 a b
+#503 a b
 532
 610 
 675 a b c d

diff --git a/conf/validate/ffpe-libri b/conf/validate/ffpe-libri
index 7400076..030e6a9 100644 (file)
--- a/conf/validate/ffpe-libri
+++ b/conf/validate/ffpe-libri
@@ -40,7 +40,7 @@
 330 
 423
 464 a f g 
-503 a b
+#503 a b
 532
 610 
 675 a b c d 

diff --git a/conf/validate/ffpu-libri b/conf/validate/ffpu-libri
index 9619ecd..1bcad2f 100644 (file)
--- a/conf/validate/ffpu-libri
+++ b/conf/validate/ffpu-libri
@@ -40,7 +40,6 @@
 330 
 423 a b c z
 464 a f g 
-503 
 610 
 675 a b c d 
 700 a b 

diff --git a/conf/validate/ffsf-librim b/conf/validate/ffsf-librim
index b4309b3..a924c25 100644 (file)
--- a/conf/validate/ffsf-librim
+++ b/conf/validate/ffsf-librim
@@ -39,7 +39,6 @@
 330
 423 a b c z
 464 a f c g x y
-503
 532
 610
 675 a! b c d

diff --git a/conf/validate/ffsr-libri b/conf/validate/ffsr-libri
index ec08c2c..f730ddc 100644 (file)
--- a/conf/validate/ffsr-libri
+++ b/conf/validate/ffsr-libri
@@ -40,7 +40,6 @@
 327 
 330 
 423 a 
-503 a b
 532
 610 
 675 a! b c d