add separate azvo report for external authors

diff --git a/html.pl b/html.pl
index 525e774..2110ca4 100755 (executable)
--- a/html.pl
+++ b/html.pl
@@ -139,6 +139,7 @@ my $parsed = $xslt->parse_stylesheet($style_doc);
 my $biblio_html;
 my $biblio_parsed;
 my $biblio_data;
+my $biblio_author_external;
 
 open(my $xml_fh, '>', '/tmp/bibliografija.xml') if $ENV{XML};
 
@@ -196,9 +197,9 @@ while( my $row = $sth_select_authors->fetchrow_hashref ) {
 
        my $extract = {
                '008' => undef,
-               '100' => '9',
+               '100' => '(9|a)',
                '680' => 'i',
-               '700' => '(9|4)',
+               '700' => '(9|4|a)',
                '942' => '(t|r|v)'
        };
 
@@ -256,7 +257,19 @@ while( my $row = $sth_select_authors->fetchrow_hashref ) {
        my $have_100 = 1;
 
        if ( exists $data->{100} ) {
-                       my @first_author = map { $_->{'9'} } @{ $data->{100} };
+                       my @first_author =
+                               map { $_->{'9'} }
+                               grep {
+                                       if ( ! exists $_->{9} ) {
+                                               $biblio_author_external->{ $row->{biblionumber} }++;
+                                               0;
+                                       } elsif ( exists $auth_header->{ $_->{9} } ) {
+                                               1; # from FFZXG
+                                       } else {
+                                               0;
+                                       }
+                               }
+                               @{ $data->{100} };
                        foreach my $authid ( @first_author ) {
                                push @{ $authors->{$authid}->{aut}->{ $category } }, $row->{biblionumber};
                        }
@@ -267,7 +280,19 @@ while( my $row = $sth_select_authors->fetchrow_hashref ) {
        my $have_edt;
 
        if ( exists $data->{700} ) {
-                       foreach my $auth ( @{ $data->{700} } ) {
+                       my @other_authors =
+                               grep {
+                                       if ( ! exists $_->{9} ) {
+                                               $biblio_author_external->{ $row->{biblionumber} }++;
+                                               0;
+                                       } elsif ( exists $auth_header->{ $_->{9} } ) {
+                                               1; # from FFZXG
+                                       } else {
+                                               0;
+                                       }
+                               }
+                               @{ $data->{700} };
+                       foreach my $auth ( @other_authors ) {
                                my $authid = $auth->{9} || next;
                                my $type   = $auth->{4} || next; #die "no 4 in ",dump($data);
 
@@ -304,6 +329,7 @@ debug 'type_stats' => $type_stats;
 debug 'skip' => $skip;
 debug 'biblio_year' => $biblio_year;
 debug 'biblio_data' => $biblio_data;
+debug 'biblio_author_external' => $biblio_author_external;
 
 my $category_label;
 my $sth_categories = $dbh->prepare(q{
@@ -558,7 +584,9 @@ sub table_count {
        my @biblionumbers = @_;
        my $unique;
        $unique->{$_}++ foreach @biblionumbers;
-       $table->{$group}->[ $label2row->{ $label } ]->[ $department2col->{$department} ] = scalar keys %$unique;
+       my @bibs = keys %$unique;
+       $table->{ffzg}->{$group}->[ $label2row->{ $label } ]->[ $department2col->{$department} ] = scalar @bibs;
+       $table->{external}->{$group}->[ $label2row->{ $label } ]->[ $department2col->{$department} ] = scalar grep { $biblio_author_external->{$_} } @bibs;
 }
 
 foreach my $group ( '', keys %$azvo_group_title ) {
@@ -610,29 +638,43 @@ foreach my $department ( @departments ) {
 debug 'table', $table;
 
 open(my $fh, '>:encoding(utf-8)', 'html/azvo.new');
+open(my $fh2, '>:encoding(utf-8)', 'html/azvo2.new');
+
+sub print_fh {
+       print $fh @_;
+       print $fh2 @_;
+}
 
-print $fh html_title('AZVO tablica');
+print $fh html_title('AZVO tablica - FFZG');
+print $fh2 html_title('AZVO tablica - kolaboracija sa FFZG');
 
-foreach my $group ( keys %$table ) {
+foreach my $group ( keys %{ $table->{ffzg} } ) {
 
-               print $fh "<h1>$group</h1>" if $group;
+               print_fh "<h1>$group</h1>" if $group;
 
-               print $fh "<table border=1>\n";
-               print $fh "<tr><th></th>";
-               print $fh "<th>$_</th>" foreach @departments;
-               print $fh "</tr>\n";
+               print_fh "<table border=1>\n";
+               print_fh "<tr><th></th>";
+               print_fh "<th>$_</th>" foreach @departments;
+               print_fh "</tr>\n";
 
-               foreach my $row ( 0 .. $#{ $table->{$group} } ) {
-                       print $fh "<tr><th>", $report_labels[$row], "</th>\n";
-                       print $fh " <td>", $table->{$group}->[ $row ]->[ $_ ] || '', "</td>\n" foreach 0 .. $#departments;
-                       print $fh "</tr>\n";
+               foreach my $row ( 0 .. $#{ $table->{ffzg}->{$group} } ) {
+                       print_fh "<tr><th>", $report_labels[$row], "</th>\n";
+                       foreach ( 0 .. $#departments ) {
+                               print_fh "<td>";
+                               print $fh $table->{ffzg}->{$group}->[ $row ]->[ $_ ] || '';
+                               print $fh2 $table->{external}->{$group}->[ $row ]->[ $_ ] || '';
+                               print_fh "</td>\n"
+                       }
+                       print_fh "</tr>\n";
                }
 
-               print $fh "</table>\n";
+               print_fh "</table>\n";
 
 } # group
 
-print $fh html_end;
+print_fh html_end;
 close($fh);
+close($fh2);
 rename 'html/azvo.new', 'html/azvo.html';
+rename 'html/azvo2.new', 'html/azvo2.html';