local

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

diff --git a/conf/dipl/citirani-radovi.pl b/conf/dipl/citirani-radovi.pl
index 1a8ad4f..19250ad 100644 (file)
--- a/conf/dipl/citirani-radovi.pl
+++ b/conf/dipl/citirani-radovi.pl
@@ -8,8 +8,8 @@ row( 'citirani',
        cr_year => rec('D'),
        cr_vol => rec('E'),
        cr_page => rec('F'),
-       ttc => rec('H'),
-       cr => 
+       catc => rec('H'),
+       cr_full => 
                join_with(', ',
                        join_with(', P',
                                join_with(', V',
@@ -24,6 +24,6 @@ row( 'citirani',
                        ), 
                        rec('G')
                ),
-       can => rec('J'),
-       isi => rec('I')
+       isi => rec('I'),
+       camb => rec('J')
 );

diff --git a/conf/dipl/config.yml b/conf/dipl/config.yml
index fed5a27..d5c95b4 100644 (file)
--- a/conf/dipl/config.yml
+++ b/conf/dipl/config.yml
@@ -116,219 +116,1332 @@ databases:
   isi:
     name: 'ISI' 
     input:
+      - name: rajdukovicd
+        type: isi
+        path: '/data/FF/citati/2009-08-29/ajdukovicd-r.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables-radovi.pl'
+        skip: 0
       - name: ajdukovicd
         type: isi
-        path: '/data/FF/citati/citing/ajdukovicd.txt'
+        path: '/data/FF/citati/citing/ajdukovicd.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables.pl'
+        skip: 0
+      - name: rajdukovicm
+        type: isi
+        path: '/data/FF/citati/2009-08-29/ajdukovicm-r.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables-radovi.pl'
+        skip: 0
+      - name: ajdukovicm
+        type: isi
+        path: '/data/FF/citati/2009-08-29/ajdukovicm-c.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables.pl'
+        skip: 0
+      - name: rambrosirandicn
+        type: isi
+        path: '/data/FF/citati/2009-08-29/ambrosirandicn-r.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables-radovi.pl'
+        skip: 0
+      - name: ambrosirandicn
+        type: isi
+        path: '/data/FF/citati/2009-08-29/ambrosirandicn-c.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables.pl'
+        skip: 0
+      - name: randrilovicv
+        path: '/data/FF/citati/2009-08-29/andrilovicv-r.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables-radovi.pl'
+        skip: 1
+      - name: andrilovicv
+        type: isi
+        path: '/data/FF/citati/2009-08-29/andrilovicv-c.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables.pl'
+        skip: 1
+      - name: rarambasicl
+        type: isi
+        path: '/data/FF/citati/2009-08-29/arambasicl-r.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables-radovi.pl'
+        skip: 0
+      - name: arambasicl
+        type: isi
+        path: '/data/FF/citati/2009-08-29/arambasicl-c.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables.pl'
+        skip: 0
+      - name: rararlj
+        type: isi
+        path: '/data/FF/citati/2009-08-29/ararlj-r.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables-radovi.pl'
+        skip: 0
+      - name: ararlj
+        type: isi
+        path: '/data/FF/citati/2009-08-29/ararlj-c.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables.pl'
+        skip: 0
+      - name: rbajsanskii
+        type: isi
+        path: '/data/FF/citati/2009-08-29/bajsanskii-r.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables-radovi.pl'
+        skip: 0
+      - name: bajsanskii
+        type: isi
+        path: '/data/FF/citati/2009-08-29/bajsanskii-c.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables.pl'
+        skip: 1
+      - name: rbaricr
+        type: isi
+        path: '/data/FF/citati/2009-08-29/baricr-r.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables-radovi.pl'
+        skip: 0
+      - name: baricr
+        type: isi
+        path: '/data/FF/citati/2009-08-29/baricr-c.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables.pl'
+        skip: 1
+      - name: rbezinovicp
+        type: isi
+        path: '/data/FF/citati/2009-08-29/bezinovicp-r.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables-radovi.pl'
+        skip: 0
+      - name: bezinovicp
+        type: isi
+        path: '/data/FF/citati/2009-08-29/bezinovicp-c.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables.pl'
+        skip: 0
+      - name: rbosnark
+        type: isi
+        path: '/data/FF/citati/2009-08-29/bosnark-r.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables-radovi.pl'
+        skip: 0
+      - name: bosnark
+        type: isi
+        path: '/data/FF/citati/2009-08-29/bosnark-c.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables.pl'
+        skip: 0
+      - name: rbrajsazganeca
+        type: isi
+        path: '/data/FF/citati/2009-08-29/brajsazganeca-r.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables-radovi.pl'
+        skip: 0
+      - name: brajsazganeca
+        type: isi
+        path: '/data/FF/citati/2009-08-29/brajsazganeca-c.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables.pl'
+        skip: 0
+      - name: rbratkod
+        type: isi
+        path: '/data/FF/citati/2009-08-29/bratkod-r.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables-radovi.pl'
+        skip: 0
+      - name: bratkod
+        type: isi
+        path: '/data/FF/citati/2009-08-29/bratkod-c.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables.pl'
+        skip: 0
+      - name: rbrdari
+        type: isi
+        path: '/data/FF/citati/2009-08-29/brdari-r.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables-radovi.pl'
+        skip: 0
+      - name: brdari
+        type: isi
+        path: '/data/FF/citati/2009-08-29/brdari-c.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables.pl'
+        skip: 0
+      - name: rbrkljacict
+        type: isi
+        path: '/data/FF/citati/2009-08-29/brkljacict-r.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables-radovi.pl'
+        skip: 0
+      - name: brkljacict
+        type: isi
+        path: '/data/FF/citati/2009-08-29/brkljacict-c.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables.pl'
+        skip: 0
+      - name: rbuljanflanderg
+        type: isi
+        path: '/data/FF/citati/2009-08-29/buljanflanderg-r.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables-radovi.pl'
+        skip: 0
+      - name: buljanflanderg
+        type: isi
+        path: '/data/FF/citati/2009-08-29/buljanflanderg-c.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables.pl'
+        skip: 0
+      - name: rburusicj
+        type: isi
+        path: '/data/FF/citati/2009-08-29/burusicj-r.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables-radovi.pl'
+        skip: 0
+      - name: burusicj
+        type: isi
+        path: '/data/FF/citati/2009-08-29/burusicj-c.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables.pl'
+        skip: 0
+      - name: rbuskov
+        type: isi
+        path: '/data/FF/citati/2009-08-29/buskov-r.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables-radovi.pl'
+        skip: 0
+      - name: buskov
+        type: isi
+        path: '/data/FF/citati/2009-08-29/buskov-c.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables.pl'
+        skip: 0
+      - name: butkovica
+        type: isi
+        path: '/data/FF/citati/citing/butkovica.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables.pl'
+        skip: 1
+      - name: rcorkalobiruskid
+        type: isi
+        path: '/data/FF/citati/2009-08-29/corkalobiruskid-r.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables-radovi.pl'
+        skip: 0
+      - name: corkalobiruskid
+        type: isi
+        path: '/data/FF/citati/2009-08-29/corkalobiruskid-c.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables.pl'
+        skip: 0
+      - name: rcubelaadoricv
+        type: isi
+        path: '/data/FF/citati/2009-08-29/cubelaadoricv-r.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables-radovi.pl'
+        skip: 0
+      - name: cubelaadoricv
+        type: isi
+        path: '/data/FF/citati/2009-08-29/cubelaadoricv-c.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables.pl'
+        skip: 0
+      - name: rcudinaobradovicm
+        type: isi
+        path: '/data/FF/citati/2009-08-29/cudinaobradovicm-r.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables-radovi.pl'
+        skip: 0
+      - name: cudinaobradovicm
+        type: isi
+        path: '/data/FF/citati/2009-08-29/cudinaobradovicm-c.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables.pl'
+        skip: 0
+      - name: rdespotlucaninj
+        type: isi
+        path: '/data/FF/citati/2009-08-29/despotlucaninj-r.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables-radovi.pl'
+        skip: 0
+      - name: despotlucaninj
+        type: isi
+        path: '/data/FF/citati/2009-08-29/despotlucaninj-c.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables.pl'
+        skip: 0
+      - name: rdomijand
+        type: isi
+        path: '/data/FF/citati/2009-08-29/domijand-r.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables-radovi.pl'
+        skip: 0
+      - name: domijand
+        type: isi
+        path: '/data/FF/citati/2009-08-29/domijand-c.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables.pl'
+        skip: 0
+      - name: rdrenovacm
+        type: isi
+        path: '/data/FF/citati/2009-08-29/drenovacm-r.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables-radovi.pl'
+        skip: 0
+      - name: drenovacm
+        type: isi
+        path: '/data/FF/citati/2009-08-29/drenovacm-c.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables.pl'
+        skip: 0
+      - name: rduranm
+        type: isi
+        path: '/data/FF/citati/2009-08-29/duranm-r.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables-radovi.pl'
+        skip: 0
+      - name: duranm
+        type: isi
+        path: '/data/FF/citati/2009-08-29/duranm-c.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables.pl'
+        skip: 0
+      - name: rferici
+        type: isi
+        path: '/data/FF/citati/2009-08-29/ferici-r.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables-radovi.pl'
+        skip: 0
+      - name: ferici
+        type: isi
+        path: '/data/FF/citati/2009-08-29/ferici-c.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables.pl'
+        skip: 0
+      - name: rfrancr
+        type: isi
+        path: '/data/FF/citati/2009-08-29/francr-r.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables-radovi.pl'
+        skip: 0
+      - name: francr
+        type: isi
+        path: '/data/FF/citati/2009-08-29/francr-c.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables.pl'
+        skip: 0
+      - name: rgalics
+        type: isi
+        path: '/data/FF/citati/2009-08-29/galics-r.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables-radovi.pl'
+        skip: 0
+      - name: galics
+        type: isi
+        path: '/data/FF/citati/2009-08-29/galics-c.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables.pl'
+        skip: 0
+      - name: galicz
+        type: isi
+        path: '/data/FF/citati/citing/galicz.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables.pl'
+        skip: 1
+      - name: rgregovlj
+        type: isi
+        path: '/data/FF/citati/2009-08-29/gregovlj-r.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables-radovi.pl'
+        skip: 1
+      - name: gregovlj
+        type: isi
+        path: '/data/FF/citati/2009-08-29/gregovlj-c.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables.pl'
+        skip: 0
+      - name: rhavelkam
+        type: isi
+        path: '/data/FF/citati/2009-08-29/havelkam-r.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables-radovi.pl'
+        skip: 0
+      - name: horgas
+        type: isi
+        path: '/data/FF/citati/2009-08-29/horgas-c.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables.pl'
+        skip: 0
+      - name: hrend
+        type: isi
+        path: '/data/FF/citati/citing/hrend.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables-radovi.pl'
+        skip: 1
+      - name: hromatkoi
+        type: isi
+        path: '/data/FF/citati/citing/hromatkoi.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables.pl'
+        skip: 1
+      - name: hudekknezevicj
+        type: isi
+        path: '/data/FF/citati/citing/hudekknezevicj.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables.pl'
+        skip: 1
+      - name: rivanecd
+        type: isi
+        path: '/data/FF/citati/2009-08-29/ivanecd-r.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables-radovi.pl'
+        skip: 0
+      - name: ivanecd
+        type: isi
+        path: '/data/FF/citati/2009-08-29/ivanecd-c.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables.pl'
+        skip: 0
+      - name: rjerneicz
+        type: isi
+        path: '/data/FF/citati/2009-08-29/jerneicz-r.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables-radovi.pl'
+        skip: 0
+      - name: jerneicz
+        type: isi
+        path: '/data/FF/citati/2009-08-29/jerneicz-c.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables.pl'
+        skip: 0
+      - name: kaliternalipovcanlj
+        type: isi
+        path: '/data/FF/citati/citing/kaliternalipovcanlj.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables.pl'
+        skip: 1
+      - name: rkardumi
+        type: isi
+        path: '/data/FF/citati/2009-08-29/kardumi-r.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables-radovi.pl'
+        skip: 0
+      - name: kardumi
+        type: isi
+        path: '/data/FF/citati/2009-08-29/kardumi-c.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables.pl'
+        skip: 0
+      - name: rkerestesg
+        type: isi
+        path: '/data/FF/citati/2009-08-29/kerestesg-r.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables-radovi.pl'
+        skip: 0
+      - name: kerestesg
+        type: isi
+        path: '/data/FF/citati/2009-08-29/kerestesg-c.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables.pl'
+        skip: 0
+      - name: rklarinm
+        type: isi
+        path: '/data/FF/citati/2009-08-29/klarinm-r.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables-radovi.pl'
+        skip: 0
+      - name: klarinm
+        type: isi
+        path: '/data/FF/citati/2009-08-29/klarinm-c.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables.pl'
+        skip: 0
+      - name: rknezovicz
+        type: isi
+        path: '/data/FF/citati/2009-08-29/knezovicz-r.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables-radovi.pl'
+        skip: 0
+      - name: knezovicz
+        type: isi
+        path: '/data/FF/citati/2009-08-29/knezovicz-c.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables.pl'
+        skip: 0
+      - name: rkolesaricv
+        type: isi
+        path: '/data/FF/citati/2009-08-29/kolesaricv-r.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables-radovi.pl'
+        skip: 0
+      - name: kolesaricv
+        type: isi
+        path: '/data/FF/citati/2009-08-29/kolesaricv-c.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables.pl'
+        skip: 0
+      - name: rkolicvehovecs
+        type: isi
+        path: '/data/FF/citati/2009-08-29/kolicvehovecs-r.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables-radovi.pl'
+        skip: 0
+      - name: kolicvehovecs
+        type: isi
+        path: '/data/FF/citati/2009-08-29/kolicvehovecs-c.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables.pl'
+        skip: 0
+      - name: rkrapicn
+        type: isi
+        path: '/data/FF/citati/2009-08-29/krapicn-r.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables-radovi.pl'
+        skip: 0
+      - name: krapicn
+        type: isi
+        path: '/data/FF/citati/2009-08-29/krapicn-c.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables.pl'
+        skip: 0
+      - name: rkulenovica
+        type: isi
+        path: '/data/FF/citati/2009-08-29/kulenovica-r.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables-radovi.pl'
+        skip: 0
+      - name: kulenovica
+        type: isi
+        path: '/data/FF/citati/2009-08-29/kulenovica-c.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables.pl'
+        skip: 0
+      - name: rkuterovacjagodicg
+        type: isi
+        path: '/data/FF/citati/2009-08-29/kuterovacjagodicg-r.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables-radovi.pl'
+        skip: 0
+      - name: kuterovacjagodicg
+        type: isi
+        path: '/data/FF/citati/2009-08-29/kuterovacjagodicg-c.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables.pl'
+        skip: 0
+      - name: rlackovicgrgink
+        type: isi
+        path: '/data/FF/citati/2009-08-29/lackovicgrgink-r.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables-radovi.pl'
+        skip: 0
+      - name: lackovicgrgink
+        type: isi
+        path: '/data/FF/citati/2009-08-29/lackovicgrgink-c.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables.pl'
+        skip: 0
+      - name: lamzaposavecv
+        type: isi
+        path: '/data/FF/citati/citing/lamzaposavecv.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables.pl'
+        skip: 1
+      - name: rljubint
+        type: isi
+        path: '/data/FF/citati/2009-08-29/ljubint-r.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables-radovi.pl'
+        skip: 0
+      - name: ljubint
+        type: isi
+        path: '/data/FF/citati/2009-08-29/ljubint-c.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables.pl'
+        skip: 0
+      - name: rljubotinad
+        type: isi
+        path: '/data/FF/citati/2009-08-29/ljubotinad-r.txt'
         encoding: 'ISO-8859-1'
         normalize:
         # - path: 'conf/normalize/isi/isi2xls.pl'
         # - path: 'conf/dipl/isi2sorted.pl'
-          - path: 'conf/dipl/tables.pl'
-      - name: arambasicl
+          - path: 'conf/dipl/tables-radovi.pl'
+        skip: 0
+      - name: ljubotinad
         type: isi
-        path: '/data/FF/citati/citing/arambasicl.txt'
+        path: '/data/FF/citati/2009-08-29/ljubotinad-c.txt'
         encoding: 'ISO-8859-1'
         normalize:
         # - path: 'conf/normalize/isi/isi2xls.pl'
         # - path: 'conf/dipl/isi2sorted.pl'
           - path: 'conf/dipl/tables.pl'
-      - name: bratkod
+        skip: 0
+      - name: manenicai
         type: isi
-        path: '/data/FF/citati/citing/bratkod.txt'
+        path: '/data/FF/citati/citing/manenicai.txt'
         encoding: 'ISO-8859-1'
         normalize:
         # - path: 'conf/normalize/isi/isi2xls.pl'
         # - path: 'conf/dipl/isi2sorted.pl'
           - path: 'conf/dipl/tables.pl'
-      - name: buskov
+        skip: 1
+      - name: rmaslicsersicd
+        type: isi
+        path: '/data/FF/citati/2009-08-29/maslicsersicd-r.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables-radovi.pl'
+        skip: 0
+      - name: maslicsersicd
         type: isi
-        path: '/data/FF/citati/citing/buskov.txt'
+        path: '/data/FF/citati/2009-08-29/maslicsersicd-c.txt'
         encoding: 'ISO-8859-1'
         normalize:
         # - path: 'conf/normalize/isi/isi2xls.pl'
         # - path: 'conf/dipl/isi2sorted.pl'
           - path: 'conf/dipl/tables.pl'
         skip: 1
-      - name: butkovica.txt
+      - name: rmatesick
         type: isi
-        path: '/data/FF/citati/citing/butkovica.txt'
+        path: '/data/FF/citati/2009-08-29/matesick-r.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables-radovi.pl'
+        skip: 0
+      - name: matesick
+        type: isi
+        path: '/data/FF/citati/2009-08-29/matesick-c.txt'
         encoding: 'ISO-8859-1'
         normalize:
         # - path: 'conf/normalize/isi/isi2xls.pl'
         # - path: 'conf/dipl/isi2sorted.pl'
           - path: 'conf/dipl/tables.pl'
-        skip: 1
-      - name: corkalobiruskid.txt
+        skip: 0
+      - name: rmilasg
+        type: isi
+        path: '/data/FF/citati/2009-08-29/milasg-r.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables-radovi.pl'
+        skip: 0
+      - name: milasg
         type: isi
-        path: '/data/FF/citati/citing/corkalobiruskid.txt'
+        path: '/data/FF/citati/2009-08-29/milasg-c.txt'
         encoding: 'ISO-8859-1'
         normalize:
         # - path: 'conf/normalize/isi/isi2xls.pl'
         # - path: 'conf/dipl/isi2sorted.pl'
           - path: 'conf/dipl/tables.pl'
-        skip: 1
-      - name: hrend
+        skip: 0
+      - name: rmiljevicridickir
         type: isi
-        path: '/data/FF/citati/citing/hrend.txt'
+        path: '/data/FF/citati/2009-08-29/miljevicridickir-r.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables-radovi.pl'
+        skip: 0
+      - name: miljevicridickir
+        type: isi
+        path: '/data/FF/citati/2009-08-29/miljevicridickir-c.txt'
         encoding: 'ISO-8859-1'
         normalize:
         # - path: 'conf/normalize/isi/isi2xls.pl'
         # - path: 'conf/dipl/isi2sorted.pl'
           - path: 'conf/dipl/tables.pl'
-      - name: hromatkoi
+        skip: 0
+      - name: rmlacicb
         type: isi
-        path: '/data/FF/citati/citing/hromatkoi.txt'
+        path: '/data/FF/citati/2009-08-29/mlacicb-r.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables-radovi.pl'
+        skip: 0
+      - name: mlacicb
+        type: isi
+        path: '/data/FF/citati/2009-08-29/mlacicb-c.txt'
         encoding: 'ISO-8859-1'
         normalize:
         # - path: 'conf/normalize/isi/isi2xls.pl'
         # - path: 'conf/dipl/isi2sorted.pl'
           - path: 'conf/dipl/tables.pl'
-        skip: 1
-      - name: hudekknezevicj
+        skip: 0
+      - name: rnazorm
         type: isi
-        path: '/data/FF/citati/citing/hudekknezevicj.txt'
+        path: '/data/FF/citati/2009-08-29/nazorm-r.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables-radovi.pl'
+        skip: 0
+      - name: nazorm
+        type: isi
+        path: '/data/FF/citati/2009-08-29/nazorm-c.txt'
         encoding: 'ISO-8859-1'
         normalize:
         # - path: 'conf/normalize/isi/isi2xls.pl'
         # - path: 'conf/dipl/isi2sorted.pl'
           - path: 'conf/dipl/tables.pl'
-      - name: kaliternalipovcanlj
+        skip: 0
+      - name: rpecnikn
         type: isi
-        path: '/data/FF/citati/citing/kaliternalipovcanlj.txt'
+        path: '/data/FF/citati/2009-08-29/pecnikn-r.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables-radovi.pl'
+        skip: 0
+      - name: pecnikn
+        type: isi
+        path: '/data/FF/citati/2009-08-29/pecnikn-c.txt'
         encoding: 'ISO-8859-1'
         normalize:
         # - path: 'conf/normalize/isi/isi2xls.pl'
         # - path: 'conf/dipl/isi2sorted.pl'
           - path: 'conf/dipl/tables.pl'
-      - name: kardumi
+        skip: 0
+      - name: rpenezicz
+        type: isi
+        path: '/data/FF/citati/2009-08-29/penezicz-r.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables-radovi.pl'
+        skip: 0
+      - name: penezicz
         type: isi
-        path: '/data/FF/citati/citing/kardumi.txt'
+        path: '/data/FF/citati/2009-08-29/penezicz-c.txt'
         encoding: 'ISO-8859-1'
         normalize:
         # - path: 'conf/normalize/isi/isi2xls.pl'
         # - path: 'conf/dipl/isi2sorted.pl'
           - path: 'conf/dipl/tables.pl'
-      - name: kerestesg
+        skip: 0
+      - name: rpibernikokanovicm
+        type: isi
+        path: '/data/FF/citati/2009-08-29/pibernikokanovicm-r.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables-radovi.pl'
+        skip: 0
+      - name: pibernikokanovicm
         type: isi
-        path: '/data/FF/citati/citing/kerestesg.txt'
+        path: '/data/FF/citati/2009-08-29/pibernikokanovicm-c.txt'
         encoding: 'ISO-8859-1'
         normalize:
         # - path: 'conf/normalize/isi/isi2xls.pl'
         # - path: 'conf/dipl/isi2sorted.pl'
           - path: 'conf/dipl/tables.pl'
-        skip: 1
-      - name: knezovicz
+        skip: 0
+      - name: rprorokovica
         type: isi
-        path: '/data/FF/citati/citing/knezovicz.txt'
+        path: '/data/FF/citati/2009-08-29/prorokovica-r.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables-radovi.pl'
+        skip: 0
+      - name: prorokovica
+        type: isi
+        path: '/data/FF/citati/2009-08-29/prorokovica-c.txt'
         encoding: 'ISO-8859-1'
         normalize:
         # - path: 'conf/normalize/isi/isi2xls.pl'
         # - path: 'conf/dipl/isi2sorted.pl'
           - path: 'conf/dipl/tables.pl'
-        skip: 1
-      - name: kolesaricv
+        skip: 0
+      - name: rrabotegsaricz
+        type: isi
+        path: '/data/FF/citati/2009-08-29/rabotegsaricz-r.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables-radovi.pl'
+        skip: 0
+      - name: rabotegsaricz
         type: isi
-        path: '/data/FF/citati/citing/kolesaricv.txt'
+        path: '/data/FF/citati/2009-08-29/rabotegsaricz-c.txt'
         encoding: 'ISO-8859-1'
         normalize:
         # - path: 'conf/normalize/isi/isi2xls.pl'
         # - path: 'conf/dipl/isi2sorted.pl'
           - path: 'conf/dipl/tables.pl'
+        skip: 0
+      - name: rradinf
+        type: isi
+        path: '/data/FF/citati/2009-08-29/radinf-r.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables-radovi.pl'
         skip: 1
-      - name: kuterovacjagodicg
+      - name: rradosevicvidacekb
+        type: isi
+        path: '/data/FF/citati/2009-08-29/radosevicvidacekb-r.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables-radovi.pl'
+        skip: 0
+      - name: radosevicvidacekb
         type: isi
-        path: '/data/FF/citati/citing/kuterovacjagodicg.txt'
+        path: '/data/FF/citati/2009-08-29/radosevicvidacekb-c.txt'
         encoding: 'ISO-8859-1'
         normalize:
         # - path: 'conf/normalize/isi/isi2xls.pl'
         # - path: 'conf/dipl/isi2sorted.pl'
           - path: 'conf/dipl/tables.pl'
-      - name: lackovicgrgink
+        skip: 0
+      - name: rrijavecm
+        type: isi
+        path: '/data/FF/citati/2009-08-29/rijavecm-r.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables-radovi.pl'
+        skip: 0
+      - name: rijavecm
         type: isi
-        path: '/data/FF/citati/citing/lackovicgrgink.txt'
+        path: '/data/FF/citati/2009-08-29/rijavecm-c.txt'
         encoding: 'ISO-8859-1'
         normalize:
         # - path: 'conf/normalize/isi/isi2xls.pl'
         # - path: 'conf/dipl/isi2sorted.pl'
           - path: 'conf/dipl/tables.pl'
-      - name: lamzaposavecv
+        skip: 0
+      - name: rrimaci
         type: isi
-        path: '/data/FF/citati/citing/lamzaposavecv.txt'
+        path: '/data/FF/citati/2009-08-29/rimaci-r.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables-radovi.pl'
+        skip: 0
+      - name: rimaci
+        type: isi
+        path: '/data/FF/citati/2009-08-29/rimaci-c.txt'
         encoding: 'ISO-8859-1'
         normalize:
         # - path: 'conf/normalize/isi/isi2xls.pl'
         # - path: 'conf/dipl/isi2sorted.pl'
           - path: 'conf/dipl/tables.pl'
-      - name: manenicai 
+        skip: 0
+      - name: rsakicv
         type: isi
-        path: '/data/FF/citati/citing/manenicai.txt'
+        path: '/data/FF/citati/2009-08-29/sakicv-r.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables-radovi.pl'
+        skip: 0
+      - name: sakicv
+        type: isi
+        path: '/data/FF/citati/2009-08-29/sakicv-c.txt'
         encoding: 'ISO-8859-1'
         normalize:
         # - path: 'conf/normalize/isi/isi2xls.pl'
         # - path: 'conf/dipl/isi2sorted.pl'
           - path: 'conf/dipl/tables.pl'
-      - name: maslicsersicd
+        skip: 0
+      - name: rsorici
         type: isi
-        path: '/data/FF/citati/citing/maslicsersicd.txt'
+        path: '/data/FF/citati/2009-08-29/sorici-r.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables-radovi.pl'
+        skip: 0
+      - name: sorici
+        type: isi
+        path: '/data/FF/citati/2009-08-29/sorici-c.txt'
         encoding: 'ISO-8859-1'
         normalize:
         # - path: 'conf/normalize/isi/isi2xls.pl'
         # - path: 'conf/dipl/isi2sorted.pl'
           - path: 'conf/dipl/tables.pl'
-        skip: 1
-      - name: radosevicvidacekb
+        skip: 0
+      - name: rsusanjz
+        type: isi
+        path: '/data/FF/citati/2009-08-29/susanjz-r.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables-radovi.pl'
+        skip: 0
+      - name: susanjz
         type: isi
-        path: '/data/FF/citati/citing/radosevicvidacekb.txt'
+        path: '/data/FF/citati/2009-08-29/susanjz-c.txt'
         encoding: 'ISO-8859-1'
         normalize:
         # - path: 'conf/normalize/isi/isi2xls.pl'
         # - path: 'conf/dipl/isi2sorted.pl'
           - path: 'conf/dipl/tables.pl'
+        skip: 0
+      - name: rsverkob
+        type: isi
+        path: '/data/FF/citati/2009-08-29/sverkob-r.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables-radovi.pl'
+        skip: 0
       - name: sverkob
         type: isi
-        path: '/data/FF/citati/citing/sverkob.txt'
+        path: '/data/FF/citati/2009-08-29/sverkob-c.txt'
         encoding: 'ISO-8859-1'
         normalize:
         # - path: 'conf/normalize/isi/isi2xls.pl'
         # - path: 'conf/dipl/isi2sorted.pl'
           - path: 'conf/dipl/tables.pl'
-      - name: galicz
+        skip: 0
+      - name: rtadinacm
         type: isi
-        path: '/data/FF/citati/citing/galicz.txt'
+        path: '/data/FF/citati/2009-08-29/tadinacm-r.txt'
         encoding: 'ISO-8859-1'
         normalize:
         # - path: 'conf/normalize/isi/isi2xls.pl'
         # - path: 'conf/dipl/isi2sorted.pl'
-          - path: 'conf/dipl/tables.pl'
-        skip: 1
+          - path: 'conf/dipl/tables-radovi.pl'
+        skip: 0
       - name: tadinacm
         type: isi
-        path: '/data/FF/citati/citing/tadinacm.txt'
+        path: '/data/FF/citati/2009-08-29/tadinacm-c.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables.pl'
+        skip: 0
+      - name: rtaksicv
+        type: isi
+        path: '/data/FF/citati/2009-08-29/taksicv-r.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables-radovi.pl'
+        skip: 0
+      - name: taksicv
+        type: isi
+        path: '/data/FF/citati/2009-08-29/taksicv-c.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables.pl'
+        skip: 0
+      - name: rtkalcicm
+        type: isi
+        path: '/data/FF/citati/2009-08-29/tkalcicm-r.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables-radovi.pl'
+        skip: 0
+      - name: tkalcicm
+        type: isi
+        path: '/data/FF/citati/2009-08-29/tkalcicm-c.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables.pl'
+        skip: 0
+      - name: rvizekvidovicv
+        type: isi
+        path: '/data/FF/citati/2009-08-29/vizekvidovicv-r.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables-radovi.pl'
+        skip: 0
+      - name: vizekvidovicv
+        type: isi
+        path: '/data/FF/citati/2009-08-29/vizekvidovicv-c.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables.pl'
+        skip: 0
+      - name: rvlahovicsteticv
+        type: isi
+        path: '/data/FF/citati/2009-08-29/vlahovicsteticv-r.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables-radovi.pl'
+        skip: 0
+      - name: vlahovicsteticv
+        type: isi
+        path: '/data/FF/citati/2009-08-29/vlahovicsteticv-c.txt'
         encoding: 'ISO-8859-1'
         normalize:
         # - path: 'conf/normalize/isi/isi2xls.pl'
         # - path: 'conf/dipl/isi2sorted.pl'
           - path: 'conf/dipl/tables.pl'
-      - name: radovi 
+        skip: 0
+      - name: rzarevskip
+        type: isi
+        path: '/data/FF/citati/2009-08-29/zarevskip-r.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables-radovi.pl'
+        skip: 0
+      - name: zarevskip
+        type: isi
+        path: '/data/FF/citati/2009-08-29/zarevskip-c.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables.pl'
+        skip: 0
+      - name: rzivcicbecirevici
+        type: isi
+        path: '/data/FF/citati/2009-08-29/zivcicbecirevici-r.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables-radovi.pl'
+        skip: 0
+      - name: zivcicbecirevici
+        type: isi
+        path: '/data/FF/citati/2009-08-29/zivcicbecirevici-c.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/dipl/isi2sorted.pl'
+          - path: 'conf/dipl/tables.pl'
+        skip: 0
+      - name: citirani
         type: excel
-        path: '/data/FF/citati/citirani_radovi.xls'
-        worksheet: 'Sheet1'
+        path: '/data/FF/citati/2009-08-29/evidencija/citirani_radovi.xls'
+        to: 1091
         # encoding: 'ISO-8859-1'
         normalize:
         # - path: 'conf/normalize/isi/isi2xls.pl'
         # - path: 'conf/dipl/isi2sorted.pl'
           - path: 'conf/dipl/citirani-radovi.pl'
+        skip: 0
       - name: cropsy
         type: isi
         path: '/data/FF/citati/croatia-psychol.txt'
         normalize:
           - path: 'conf/dipl/tables-cropsy.pl'
-        skip: 0
+        skip: 1
       - name: jcr
         type: csv
         path: "/data/FF/citati/jcr_recs.txt"
         normalize:
           - path: 'conf/dipl/tables-jcr.pl'
+        skip: 0
       - name: izbori
         type: excel
         path: "/data/FF/citati/izbori.xls"
@@ -337,6 +1450,7 @@ databases:
         to: 886
         normalize:
           - path: 'conf/dipl/tables-izbori.pl'
+        skip: 0
     output:
 #      - module: 'Excel'
 #        path: '/data/FF/citati/data.xls'

diff --git a/conf/dipl/schema.sql b/conf/dipl/schema.sql
index eb784c7..a1a5d0d 100644 (file)
--- a/conf/dipl/schema.sql
+++ b/conf/dipl/schema.sql
@@ -2,6 +2,7 @@ drop view if exists parovi;
 drop view if exists rpcou;
 drop view if exists citingu;
 drop view if exists citiraniu;
+drop view if exists radoviu;
 
 drop table if exists utca;
 create table utca (
@@ -32,10 +33,37 @@ create table authors (
        ca text
 );
 
+drop table if exists radovi;
+create table radovi (
+       ca text,
+       ut text,
+       pt text,
+       au text,
+       af text,
+       ti text,
+       so text,
+       la text,
+       dt text,
+       de text,
+       id text,
+       c1 text,
+       rp text,
+       nr integer,
+       tc integer,
+       pi text,
+       py integer,
+       di text,
+       sc text
+);
+
+drop table if exists radoviau;
+create table radoviau (
+       ut text,
+       au text
+);
 
 drop table if exists citing;
 create table citing (
-       id serial,
        ut text,
        pt text,
        au text,
@@ -44,6 +72,8 @@ create table citing (
        so text,
        la text,
        dt text,
+       de text,
+       id text,
        c1 text,
        rp text,
        nr integer,
@@ -71,18 +101,20 @@ create table citirani (
        cr_year text,
        cr_vol text,
        cr_page text,
-       ttc integer,
-       cr text,
-       can text,
-       isi text
+       catc integer,
+       cr_full text,
+       isi text,
+       camb integer
 );
 
 create view citingu as select distinct ut,pt,au,so,la,dt,nr,tc,pi,py,di,sc,rp from citing ;
 
+create view radoviu as select distinct ut,pt,au,so,la,dt,nr,tc,pi,py,di,sc,rp from radovi ;
+
 create view rpcou as select distinct * from rpco ;
 
 create view parovi as select distinct citirani.ca,
-       citirani.cr,
+       citirani.cr_full as cr,
         cited.cr_full,
         cited.ut,
        citingu.pt,
@@ -97,12 +129,12 @@ create view parovi as select distinct citirani.ca,
        citingu.sc,
        citingu.rp
 from citirani
-left join cited on citirani.cr = cited.cr_full
+left join cited on citirani.cr_full = cited.cr_full
 left join citingu on cited.ut = citingu.ut
 left join rpcou on cited.ut = rpcou.ut
 ;
 
-create view citiraniu as select distinct cr_auth,cr_ref,cr_year,cr_vol,cr_page,ttc,cr,isi from citirani ;
+create view citiraniu as select distinct cr_auth,cr_ref,cr_year,cr_vol,cr_page,catc,cr_full,isi from citirani ;
 
 
 drop table if exists cropsy;

diff --git a/conf/dipl/tables.pl b/conf/dipl/tables.pl
index 579eda6..81e7b09 100644 (file)
--- a/conf/dipl/tables.pl
+++ b/conf/dipl/tables.pl
@@ -6,14 +6,21 @@
 row( 'citing',
        ut => rec('UT'),
        pt => rec('PT'),
-       au => regex('s/,//',
-               uc ( frec('AU') )
+       au => join_with(' ; ',
+               rec('AU')
        ),
        ti => rec('TI'),
        so => rec('SO'),
        la => rec('LA'),
        dt => rec('DT'),
-       c1 => frec('C1'),
+       de => rec('DE'),
+       id => rec('ID'),
+       de => join_with(' ; ',
+               rec('DE'),
+       ),
+       id => join_with(' ; ',
+               rec('ID'),
+       ),
        rp => uc ( rec('RP') ),
        nr => rec('NR'),
        tc => rec('TC'),