X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=html.pl;h=28da23f578ed0541f9e9a767d7dbf9184d3432f9;hb=0ef375d61858198a781fbbc9479662b040c6de4f;hp=661423d6e9fab457866f625053eef268ae4b4c49;hpb=0cdbd10b14a8e99c23973238c47238c81b11f7ec;p=koha-bibliografija

diff --git a/html.pl b/html.pl
index 661423d..28da23f 100755
--- a/html.pl
+++ b/html.pl
@@ -14,6 +14,7 @@ use Carp qw(confess);
 use utf8;
 use JSON;
 use POSIX qw(strftime);
+use Storable;
 
 use lib '/srv/koha_ffzg';
 use C4::Context;
@@ -103,6 +104,7 @@ foreach my $department ( keys %$department_in_sum ) {
 }
 
 debug 'auth_department' => $auth_department;
+store $auth_department, '/dev/shm/auth_department.storable';
 debug 'auth_group' => $auth_group;
 debug 'department_in_sum' => $department_in_sum;
 
@@ -130,6 +132,7 @@ where
 =cut
 
 my $biblio_year;
+my $biblio_full_name;
 my $type_stats;
 
 my $parser = XML::LibXML->new();
@@ -200,6 +203,7 @@ while( my $row = $sth_select_authors->fetchrow_hashref ) {
 	my $extract = {
 		'008' => undef,
 		'100' => '(9|a)',
+		'245' => 'a',
 		'680' => 'i',
 		'700' => '(9|4|a)',
 		'942' => '(t|r|v)'
@@ -279,10 +283,13 @@ while( my $row = $sth_select_authors->fetchrow_hashref ) {
 			foreach my $authid ( @first_author ) {
 				push @{ $authors->{$authid}->{aut}->{ $category } }, $row->{biblionumber};
 			}
+			$biblio_full_name->{ $row->{biblionumber} } = $data->{100}->[0]->{a};
 	} else {
 		$have_100 = 0;
 	}
 
+	$biblio_full_name->{ $row->{biblionumber} } ||= $data->{245}->[0]->{a};
+
 	my $have_edt;
 
 	if ( exists $data->{700} ) {
@@ -331,9 +338,11 @@ while( my $row = $sth_select_authors->fetchrow_hashref ) {
 }
 
 debug 'authors' => $authors;
+store $authors, '/dev/shm/authors.storable';
 debug 'type_stats' => $type_stats;
 debug 'skip' => $skip;
 debug 'biblio_year' => $biblio_year;
+debug 'biblio_full_name' => $biblio_full_name;
 debug 'biblio_data' => $biblio_data;
 debug 'biblio_author_external' => $biblio_author_external;
 
@@ -385,6 +394,17 @@ sub li_biblio {
 		qq|</li>\n|;
 }
 
+sub unique_biblionumber {
+	my @v = @_;
+	my $u;
+	$u->{$_}++ foreach @v;
+	return sort {
+		$biblio_year->{$b} <=> $biblio_year->{$a} ||
+		$biblio_full_name->{$a} cmp $biblio_full_name->{$b} ||
+		$a <=> $b
+	} keys %$u;
+}
+
 sub author_html {
 	my ( $fh, $authid, $type, $label ) = @_;
 
@@ -395,18 +415,17 @@ sub author_html {
 	foreach my $category ( sort keys %{ $authors->{$authid}->{$type} } ) {
 		my $label = $category_label->{$category} || 'Bez kategorije';
 		print $fh qq|<a name="$type-$category"><h3>$label</h3></a>\n<ul>\n|;
-		foreach my $biblionumber ( sort {
-				$biblio_year->{$b} <=> $biblio_year->{$a} || $a <=> $b
-			} @{ $authors->{$authid}->{$type}->{$category} } ) {
+		foreach my $biblionumber ( unique_biblionumber @{ $authors->{$authid}->{$type}->{$category} } ) {
 			print $fh li_biblio( $biblionumber );
 		}
 		print $fh qq|</ul>\n|;
 	}
 }
 
+
 sub count_author_years {
+	my $years = shift;
 	my ($authid) = @_;
-	my $years;
 	foreach my $type ( keys %{ $authors->{$authid} } ) {
 		foreach my $category ( keys %{ $authors->{$authid}->{$type} } ) {
 			foreach my $biblionumber ( @{ $authors->{$authid}->{$type}->{$category} } ) {
@@ -417,24 +436,18 @@ sub count_author_years {
 	return $years;
 }
 
-foreach my $row ( sort { $a->{full_name} cmp $b->{full_name} } @authors ) {
-
-	my $first = substr( $row->{full_name}, 0, 1 );
-	if ( $first ne $first_letter ) {
-		print $index qq{</ul>\n} if $first_letter;
-		$first_letter = $first;
-		print $index qq{<h1>$first</h1>\n<ul>\n};
-	}
-	print $index qq{<li><a href="}, $row->{authid}, qq{.html">}, $row->{full_name}, "</a></li>\n";
+sub html_year_selection {
+	my $fh = shift;
+	my @authids = @_;
 
-	my $path = "html/$row->{authid}";
-	open(my $fh, '>:encoding(utf-8)', "$path.new");
-	print $fh html_title($row->{full_name}, "bibliografija");
-	print $fh qq|<h1>$row->{full_name} - bibliografija</h1>\n|;
-
-	my $years = count_author_years( $row->{authid} );
 	print $fh qq|<span id="years">Godine:\n|;
 	my $type_cat_count = {};
+	my $years;
+
+	foreach my $authid ( @authids ) {
+		$years = count_author_years( $years, $authid );
+	}
+
 	foreach my $year ( sort { $b <=> $a } keys %$years ) {
 		print $fh qq|<label><input name="year_selection" value="$year" type=checkbox onClick="toggle_year($year, this)" checked="checked">$year</label>&nbsp;\n|;
 		foreach my $type_cat ( keys %{ $years->{$year} } ) {
@@ -514,6 +527,24 @@ $(document).ready( function() {
 });
 </script>
 	|;
+}
+
+foreach my $row ( sort { $a->{full_name} cmp $b->{full_name} } @authors ) {
+
+	my $first = substr( $row->{full_name}, 0, 1 );
+	if ( $first ne $first_letter ) {
+		print $index qq{</ul>\n} if $first_letter;
+		$first_letter = $first;
+		print $index qq{<h1>$first</h1>\n<ul>\n};
+	}
+	print $index qq{<li><a href="}, $row->{authid}, qq{.html">}, $row->{full_name}, "</a></li>\n";
+
+	my $path = "html/$row->{authid}";
+	open(my $fh, '>:encoding(utf-8)', "$path.new");
+	print $fh html_title($row->{full_name}, "bibliografija");
+	print $fh qq|<h1>$row->{full_name} - bibliografija</h1>\n|;
+
+	html_year_selection $fh => $row->{authid};
 
 	author_html( $fh, $row->{authid}, 'aut' => 'Primarno autorstvo' );
 	author_html( $fh, $row->{authid}, 'sec' => 'Uredništva, prijevodi, krička izdanja' );
@@ -550,67 +581,54 @@ foreach my $department ( sort keys %$auth_department ) {
 
 debug 'department_category_author' => $department_category_author;
 
-mkdir 'html/departments' unless -d 'html/departments';
-
-sub unique_biblionumber {
-	my @v = @_;
-	my $u;
-	$u->{$_}++ foreach @v;
-	return sort { $biblio_year->{$b} <=> $biblio_year->{$a} || $a <=> $b } keys %$u;
-}
-
-open(my $dep_fh, '>:encoding(utf-8)', 'html/departments/index.new');
-print $dep_fh html_title('Odsijeci Filozofskog fakulteta u Zagrebu'), qq|<ul>\n|;
-foreach my $department ( sort keys %$department_category_author ) {
-	my $dep = $department || 'Nema odsjeka';
-	my $dep_file = unac_string('utf-8',$dep);
-	print $dep_fh qq|<li><a href="$dep_file.html">$dep</a></li>\n|;
-	open(my $fh, '>:encoding(utf-8)', "html/departments/$dep_file.new");
 
-	print $fh html_title($department . ' bibliografija');
-	print $fh qq|<h1>$department bibliografija</h1>\n|;
+sub department_html {
+	my ( $fh, $department, $type, $label ) = @_;
 
-	print $fh qq|<h2>Primarno autorstvo</h2>\n|;
+	print $fh qq|<h2>$label</h2>\n|;
 
 	foreach my $category ( sort keys %{ $department_category_author->{$department} } ) {
 
 		my @authids = @{ $department_category_author->{$department}->{$category} };
 		next unless @authids;
 
-		my @biblionumber = unique_biblionumber map { @{ $authors->{$_}->{aut}->{$category} } } grep { exists $authors->{$_}->{aut}->{$category} } @authids;
-		my $unique;
-		$unique->{$_}++ foreach @biblionumber;
+		my @biblionumber = unique_biblionumber map { @{ $authors->{$_}->{$type}->{$category} } } grep { exists $authors->{$_}->{$type}->{$category} } @authids;
 
 		next unless @biblionumber;
 
  		my $label = $category_label->{$category} || 'Bez kategorije';
-		print $fh qq|<h3>$label</h3>\n<ul>\n|;
+		print $fh qq|<a name="$type-$category"><h3>$label</h3></a>\n<ul>\n|;
 
 		print $fh li_biblio( $_ ) foreach @biblionumber;
 
 		print $fh qq|</ul>|;
 	}
 
+}
 
-	print $fh qq|<h2>Sekundarno autorstvo</h2>\n|;
-
-	foreach my $category ( sort keys %{ $department_category_author->{$department} } ) {
-
-		my @authids = @{ $department_category_author->{$department}->{$category} };
-		next unless @authids;
-
-		my @biblionumber = unique_biblionumber map { @{ $authors->{$_}->{sec}->{$category} } } grep { exists $authors->{$_}->{sec}->{$category} } @authids;
 
-		next unless @biblionumber;
+mkdir 'html/departments' unless -d 'html/departments';
 
- 		my $label = $category_label->{$category} || 'Bez kategorije';
-		print $fh qq|<h3>$label</h3>\n<ul>\n|;
+open(my $dep_fh, '>:encoding(utf-8)', 'html/departments/index.new');
+print $dep_fh html_title('Odsijeci Filozofskog fakulteta u Zagrebu'), qq|<ul>\n|;
+foreach my $department ( sort keys %$department_category_author ) {
+	my $dep = $department || 'Nema odsjeka';
+	my $dep_file = unac_string('utf-8',$dep);
+	print $dep_fh qq|<li><a href="$dep_file.html">$dep</a></li>\n|;
+	open(my $fh, '>:encoding(utf-8)', "html/departments/$dep_file.new");
 
-		print $fh li_biblio( $_ ) foreach @biblionumber;
+	print $fh html_title($department . ' bibliografija');
+	print $fh qq|<h1>$department bibliografija</h1>\n|;
 
-		print $fh qq|</ul>|;
+	my @authids;
+	foreach my $category ( sort keys %{ $department_category_author->{$department} } ) {
+		push @authids, @{ $department_category_author->{$department}->{$category} };
 	}
+	html_year_selection $fh => @authids;
+
+	department_html( $fh, $department, 'aut', 'Primarno autorstvo' );
 
+	department_html( $fh, $department, 'sec', 'Sekundarno autorstvo' );
 
 	print $fh html_end;
 	close($fh);