X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=html.pl;h=e8a959b98f701aa06480bfbf1552073368774813;hb=d3a5d2d0e37c55ea15e119b89e3c4e6173397623;hp=ab97e14e6d98076ef4eecb368b362dd1d621bd95;hpb=f15093dd781dc41c58c2b9af67d4fab4fc177a12;p=koha-bibliografija

diff --git a/html.pl b/html.pl
index ab97e14..e8a959b 100755
--- a/html.pl
+++ b/html.pl
@@ -21,7 +21,7 @@ my $dbh = C4::Context->dbh;
 
 sub debug {
 	my ($title, $data) = @_;
-	print "# $title ",dump($data), $/;
+	print "# $title ",dump($data), $/ if $ENV{DEBUG};
 }
 
 my $xslfilename = 'compact.xsl';
@@ -90,13 +90,14 @@ my $xslt = XML::LibXSLT->new();
 my $parsed = $xslt->parse_stylesheet($style_doc);
 
 my $biblio_html;
+my $biblio_parsed;
 
 open(my $xml_fh, '>', '/tmp/bibliografija.xml') if $ENV{XML};
 
 sub biblioitem_html {
-	my $biblionumber = shift;
+	my ($biblionumber, $parse_only) = @_;
 
-	return $biblio_html->{$biblionumber} if exists $biblio_html->{$biblionumber};
+	return $biblio_html->{$biblionumber} if exists $biblio_html->{$biblionumber} && ! $parse_only;
 
 	my $xmlrecord = $marcxml->{$biblionumber} || confess "missing $biblionumber marcxml";
 
@@ -109,10 +110,16 @@ sub biblioitem_html {
 		return;
 	}
 
+	if ( $parse_only ) {
+		$biblio_parsed->{$biblionumber} = $source;
+		return $source;
+	}
+
 	my $transformed = $parsed->transform($source);
 	$biblio_html->{$biblionumber} = $parsed->output_string( $transformed );
 
-	return ( $biblio_html->{$biblionumber}, $source ) if wantarray;
+	delete $biblio_parsed->{$biblionumber};
+
 	return $biblio_html->{$biblionumber};
 }
 
@@ -124,9 +131,9 @@ while( my $row = $sth_select_authors->fetchrow_hashref ) {
 
 	$marcxml->{ $row->{biblionumber} } = $row->{marcxml};
 
-	my ( undef, $doc ) = biblioitem_html( $row->{biblionumber} );
+	my $doc = biblioitem_html( $row->{biblionumber}, 1 );
 	if ( ! $doc ) {
-		warn "ERROR can't parse MARCXML ", $row->{biblionumber}, " ", $row->{marcxml}, "\n";
+#		warn "ERROR can't parse MARCXML ", $row->{biblionumber}, " ", $row->{marcxml}, "\n";
 		next;
 	}
 
@@ -155,7 +162,12 @@ while( my $row = $sth_select_authors->fetchrow_hashref ) {
 
         if ($elt->localname eq 'controlfield') {
 			if ( $tag eq '008' ) {
-				 $biblio_year->{ $row->{biblionumber} } = $data->{year} = substr($elt->textContent, 7, 4 );
+				my $year = substr($elt->textContent, 7, 4 );
+				if ( $year !~ m/^\d+$/ ) {
+					$year = 0;
+					push @{ $skip->{invalid_year} }, $row->{biblionumber};
+				}
+				$biblio_year->{ $row->{biblionumber} } = $data->{year} = $year;
 			}
 			next;
         } elsif ($elt->localname eq 'datafield') {
@@ -316,7 +328,7 @@ foreach my $row ( sort { $a->{full_name} cmp $b->{full_name} } @authors ) {
 	print $fh qq|<h1>$row->{full_name} - bibliografija za razdoblje 2008-2013</h1>|;
 
 	author_html( $fh, $row->{authid}, 'aut' => 'Primarno autorstvo' );
-	author_html( $fh, $row->{authid}, 'sec' => 'Sekundarno autorstvo' );
+	author_html( $fh, $row->{authid}, 'sec' => 'Uredništva, prijevodi, krička izdanja' );
 
 	print $fh html_end;
 	close($fh);
@@ -414,20 +426,27 @@ print $dep_fh qq|</ul>\n|, html_end;
 close($dep_fh);
 rename 'html/departments/index.new', 'html/departments/index.html';
 
-my $azvo_stat;
+my $azvo_stat_authors;
+my $azvo_stat_biblio;
 
 foreach my $department ( sort keys %$department_category_author ) {
 	foreach my $category ( sort keys %{ $department_category_author->{$department} } ) {
 		foreach my $authid ( @{ $department_category_author->{$department}->{$category} } ) {
 			foreach my $type ( keys %{ $authors->{$authid} } ) {
 				next unless exists $authors->{$authid}->{$type}->{$category};
-				$azvo_stat->{ $department }->{ $category }->{ $type } += $#{ $authors->{$authid}->{$type}->{$category} } + 1;
+				$azvo_stat_authors->{ $department }->{ $category }->{ $type } += $#{ $authors->{$authid}->{$type}->{$category} } + 1;
+				push @{ $azvo_stat_biblio->{ $department }->{ $category }->{ $type } },  @{ $authors->{$authid}->{$type}->{$category} };
 			}
 		}
+		foreach my $type ( keys %{ $azvo_stat_biblio->{ $department }->{ $category } } ) {
+				my @biblios = unique_biblionumber @{ $azvo_stat_biblio->{ $department }->{ $category }->{ $type } };
+				$azvo_stat_biblio->{ $department }->{ $category }->{ $type } = $#biblios + 1;
+		}
 	}
 }
 
-debug 'azvo_stat' => $azvo_stat;
+debug 'azvo_stat_authors' => $azvo_stat_authors;
+debug 'azvo_stat_biblio' => $azvo_stat_biblio;
 
 =for later
 open(my $fh, '>', 'html/azvo.new');