local

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

diff --git a/conf/isi/cited.sql b/conf/isi/cited.sql
index b700927..0a83652 100644 (file)
--- a/conf/isi/cited.sql
+++ b/conf/isi/cited.sql
@@ -1,9 +1,19 @@
+drop table if exists utca;
+
+create table utca (
+       id serial,
+       ut text,
+       ca text,
+);
+
 drop table if exists cited;
 
 create table cited (
        id serial,
-       cited_au text not null,
-       from_au text not null
+       cited_au text,
+       from_au text,
+       ut text,
+       cited_full text
 );
 
 drop table if exists authors;
@@ -13,6 +23,30 @@ create table authors (
        au text not null
 );
 
+
+drop table if exists citing;
+
+create table citing (
+       id serial,
+       ut text,
+       ca text,
+       pt text,
+       au text,
+       af text,
+       ti text,
+       so text,
+       la text,
+       dt text,
+       c1 text,
+       rp text,
+       cr text,
+       nr integer,
+       pi text,
+       py integer,
+       sc text
+);
+
+
 -- create index cited_au on cited(au);
 -- create index cited_cited on cited(cited);
 

diff --git a/conf/isi/isi.yml b/conf/isi/isi.yml
index d7217cc..7998002 100644 (file)
--- a/conf/isi/isi.yml
+++ b/conf/isi/isi.yml
@@ -99,39 +99,230 @@ databases:
       - to: isi
         credit: 10000
   
-  citirani:
-    name: 'CITIRANI' 
-    input:
-      - name: radovi
-        type: excel
-        path: '/data/FF/citati/proba.xls'
-        encoding: 'windows-1250'
-        normalize:
-          path: 'conf/isi/isi2xls-citirani.pl'
-    output:
-      - module: 'Excel'
-        path: '/data/FF/citiari/citirani.xls'
+#  citirani:
+#    name: 'CITIRANI' 
+#    input:
+#      - name: radovi
+#        type: excel
+#        path: '/data/FF/citati/proba.xls'
+#        encoding: 'windows-1250'
+#        normalize:
+#          path: 'conf/isi/isi2xls-citirani.pl'
+#    output:
+#      - module: 'Excel'
+#        path: '/data/FF/citiari/citirani.xls'
   
   isi:
     name: 'ISI' 
     input:
-      - name: sverko
+      - name: ajdukovicd
+        type: isi
+        path: '/data/FF/citati/citing/ajdukovicd.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/isi/isi2sorted.pl'
+          - path: 'conf/isi/tables.pl'
+      - name: arambasicl
+        type: isi
+        path: '/data/FF/citati/citing/arambasicl.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/isi/isi2sorted.pl'
+          - path: 'conf/isi/tables.pl'
+      - name: bratkod
+        type: isi
+        path: '/data/FF/citati/citing/bratkod.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/isi/isi2sorted.pl'
+          - path: 'conf/isi/tables.pl'
+#      - name: buskov
+#        type: isi
+#        path: '/data/FF/citati/citing/buskov.txt'
+#        encoding: 'ISO-8859-1'
+#        normalize:
+#        # - path: 'conf/normalize/isi/isi2xls.pl'
+#        # - path: 'conf/isi/isi2sorted.pl'
+#          - path: 'conf/isi/tables.pl'
+#      - name: butkovica.txt
+#        type: isi
+#        path: '/data/FF/citati/citing/butkovica.txt'
+#        encoding: 'ISO-8859-1'
+#        normalize:
+#        # - path: 'conf/normalize/isi/isi2xls.pl'
+#        # - path: 'conf/isi/isi2sorted.pl'
+#          - path: 'conf/isi/tables.pl'
+#      - name: corkalobiruskid.txt
+#        type: isi
+#        path: '/data/FF/citati/citing/corkalobiruskid.txt'
+#        encoding: 'ISO-8859-1'
+#        normalize:
+#        # - path: 'conf/normalize/isi/isi2xls.pl'
+#        # - path: 'conf/isi/isi2sorted.pl'
+#          - path: 'conf/isi/tables.pl'
+      - name: hrend
+        type: isi
+        path: '/data/FF/citati/citing/hrend.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/isi/isi2sorted.pl'
+          - path: 'conf/isi/tables.pl'
+#      - name: hromatkoi
+#        type: isi
+#        path: '/data/FF/citati/citing/hromatkoi.txt'
+#        encoding: 'ISO-8859-1'
+#        normalize:
+#        # - path: 'conf/normalize/isi/isi2xls.pl'
+#        # - path: 'conf/isi/isi2sorted.pl'
+#          - path: 'conf/isi/tables.pl'
+      - name: hudekknezevicj
+        type: isi
+        path: '/data/FF/citati/citing/hudekknezevicj.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/isi/isi2sorted.pl'
+          - path: 'conf/isi/tables.pl'
+      - name: kaliternalipovcanlj
+        type: isi
+        path: '/data/FF/citati/citing/kaliternalipovcanlj.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/isi/isi2sorted.pl'
+          - path: 'conf/isi/tables.pl'
+      - name: kardumi
         type: isi
-        path: '/data/FF/citati/sverkob.txt'
+        path: '/data/FF/citati/citing/kardumi.txt'
         encoding: 'ISO-8859-1'
         normalize:
-        #  path: 'conf/normalize/isi/isi2xls.pl'
-          - path: 'conf/isi/isi2sorted.pl'
-          - path: 'conf/isi/cu-au-count.pl'
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/isi/isi2sorted.pl'
+          - path: 'conf/isi/tables.pl'
+#      - name: kerestesg
+#        type: isi
+#        path: '/data/FF/citati/citing/kerestesg.txt'
+#        encoding: 'ISO-8859-1'
+#        normalize:
+#        # - path: 'conf/normalize/isi/isi2xls.pl'
+#        # - path: 'conf/isi/isi2sorted.pl'
+#          - path: 'conf/isi/tables.pl'
+#      - name: knezovicz
+#        type: isi
+#        path: '/data/FF/citati/citing/knezovicz.txt'
+#        encoding: 'ISO-8859-1'
+#        normalize:
+#        # - path: 'conf/normalize/isi/isi2xls.pl'
+#        # - path: 'conf/isi/isi2sorted.pl'
+#          - path: 'conf/isi/tables.pl'
+#      - name: kolesaricv
+#        type: isi
+#        path: '/data/FF/citati/citing/kolesaricv.txt'
+#        encoding: 'ISO-8859-1'
+#        normalize:
+#        # - path: 'conf/normalize/isi/isi2xls.pl'
+#        # - path: 'conf/isi/isi2sorted.pl'
+#          - path: 'conf/isi/tables.pl'
+      - name: kuterovacjagodicg
+        type: isi
+        path: '/data/FF/citati/citing/kuterovacjagodicg.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/isi/isi2sorted.pl'
+          - path: 'conf/isi/tables.pl'
+      - name: lackovicgrgink
+        type: isi
+        path: '/data/FF/citati/citing/lackovicgrgink.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/isi/isi2sorted.pl'
+          - path: 'conf/isi/tables.pl'
+      - name: lamzaposavecv
+        type: isi
+        path: '/data/FF/citati/citing/lamzaposavecv.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/isi/isi2sorted.pl'
+          - path: 'conf/isi/tables.pl'
+      - name: manenicai 
+        type: isi
+        path: '/data/FF/citati/citing/manenicai.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/isi/isi2sorted.pl'
+          - path: 'conf/isi/tables.pl'
+#      - name: maslicsersicd
+#        type: isi
+#        path: '/data/FF/citati/citing/maslicsersicd.txt'
+#        encoding: 'ISO-8859-1'
+#        normalize:
+#        # - path: 'conf/normalize/isi/isi2xls.pl'
+#        # - path: 'conf/isi/isi2sorted.pl'
+#          - path: 'conf/isi/tables.pl'
+      - name: radosevicvidacekb
+        type: isi
+        path: '/data/FF/citati/citing/radosevicvidacekb.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/isi/isi2sorted.pl'
+          - path: 'conf/isi/tables.pl'
+      - name: sverkob
+        type: isi
+        path: '/data/FF/citati/citing/sverkob.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/isi/isi2sorted.pl'
+          - path: 'conf/isi/tables.pl'
+#      - name: galicz
+#        type: isi
+#        path: '/data/FF/citati/citing/galicz.txt'
+#        encoding: 'ISO-8859-1'
+#        normalize:
+#        # - path: 'conf/normalize/isi/isi2xls.pl'
+#        # - path: 'conf/isi/isi2sorted.pl'
+#          - path: 'conf/isi/tables.pl'
+      - name: tadinacm
+        type: isi
+        path: '/data/FF/citati/citing/tadinacm.txt'
+        encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/isi/isi2sorted.pl'
+          - path: 'conf/isi/tables.pl'
+      - name: cropsy
+        type: isi
+        path: '/data/FF/citati/croatia-psychol.txt'
+        # encoding: 'ISO-8859-1'
+        normalize:
+          - path: 'conf/isi/croatia-psychol.pl'
+      - name: radovi 
+        type: excel
+        path: '/data/FF/citati/citirani_radovi.xls'
+        worksheet: 'Sheet1'
+        # encoding: 'ISO-8859-1'
+        normalize:
+        # - path: 'conf/normalize/isi/isi2xls.pl'
+        # - path: 'conf/isi/isi2sorted.pl'
+          - path: 'conf/isi/citirani_radovi.pl'
     output:
-      - module: 'Excel'
-        path: '/data/FF/citati/sverko.xls'
-      - module: 'Sorted'
-        path: '/data/FF/citati/sorted/'
+#      - module: 'Excel'
+#        path: '/data/FF/citati/data.xls'
+#      - module: 'Sorted'
+#        path: '/data/FF/citati/sorted/'
 #      - module: 'CouchDB'
 #        url: 'http://193.198.212.57:5984'
       - module: 'DBI'
-        dsn: 'dbi:Pg:dbname=webpac2'
-        schema: 'conf/isi/cited.sql'
-        table: 'cited'
+        dsn: 'dbi:Pg:dbname=dipl'
+        schema: 'conf/isi/schema.sql'
+#        table: 'citirani'