X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=html.pl;h=3bd0cf27e0d1948620c3dd035d3b1fd1aa5401e0;hb=b82e1b8518c8822be87978d8dda289e9c497e61a;hp=11a47a0cd9d8c7ac0621401e4d74e246a2001de9;hpb=f9cb8cc0e3f47e3cc928fc092363ad9f44fb6c42;p=koha-bibliografija
diff --git a/html.pl b/html.pl
index 11a47a0..3bd0cf2 100755
--- a/html.pl
+++ b/html.pl
@@ -21,6 +21,20 @@ use C4::Context;
use XML::LibXML;
use XML::LibXSLT;
+my $pid_file = '/dev/shm/bibliografija.pid';
+{
+ if ( -e $pid_file ) {
+ open(my $fh, '<', $pid_file);
+ my $pid = <$fh>;
+ no autodie; # it will die on kill
+ kill 0, $pid || die "$0 allready running as pid $pid";
+ }
+ open(my $fh, '>', $pid_file);
+ print $fh $$;
+ close($fh);
+}
+
+
my $dbh = C4::Context->dbh;
sub debug {
@@ -100,7 +114,7 @@ while( my $row = $sth_auth->fetchrow_hashref ) {
debug 'department_in_group' => $department_in_group;
foreach my $department ( keys %$department_in_sum ) {
- $department_in_sum->{$department} = 0 unless $department =~ m/(centar|croaticum|katedra|odsjek)/i;
+# $department_in_sum->{$department} = 0 unless $department =~ m/(centar|croaticum|katedra|odsjek)/i;
}
debug 'auth_department' => $auth_department;
@@ -114,10 +128,11 @@ my $marcxml;
my $sth_select_authors = $dbh->prepare(q{
select
- biblionumber,
+ biblioitems.biblionumber,
itemtype,
- marcxml
+ metadata as marcxml
from biblioitems
+join biblio_metadata on (biblio_metadata.biblionumber = biblioitems.biblionumber)
where
agerestriction > 0
});
@@ -311,13 +326,14 @@ while( my $row = $sth_select_authors->fetchrow_hashref ) {
$type_stats->{$type}++;
- my @types = split(/\s+/, $type);
+ my @types = split(/[\s\/]+/, $type);
foreach my $type ( @types ) {
+ my $type = substr($type,0,3);
$type_stats->{_count_each_type}->{$type}++;
if ( $type =~ m/(edt|trl|com|ctb)/ ) {
- push @{ $authors->{$authid}->{sec}->{ $category } }, $row->{biblionumber};
+ push @{ $authors->{$authid}->{__sec}->{ $category } }, $row->{biblionumber};
push @{ $authors->{$authid}->{$type}->{ $category } }, $row->{biblionumber};
$type =~ s/(com|ctb)/_ostalo/;
push @{ $authors->{$authid}->{$type}->{ $category } }, $row->{biblionumber};
@@ -373,6 +389,7 @@ sub html_title {
|, join(" ", @_), qq|
+
|;
@@ -403,15 +420,19 @@ sub li_biblio {
qq|\n|;
}
+sub unique {
+ my $unique;
+ $unique->{$_}++ foreach @_;
+ return keys %$unique;
+}
+
sub unique_biblionumber {
- my @v = @_;
- my $u;
- $u->{$_}++ foreach @v;
+ my @v = unique @_;
return sort {
$biblio_year->{$b} <=> $biblio_year->{$a} ||
$biblio_full_name->{$a} cmp $biblio_full_name->{$b} ||
$a <=> $b
- } keys %$u;
+ } @v;
}
sub author_html {
@@ -419,7 +440,7 @@ sub author_html {
return unless exists $authors->{$authid}->{$type};
- print $fh qq|$label
\n|;
+ print $fh qq|$label
\n|;
foreach my $category ( sort keys %{ $authors->{$authid}->{$type} } ) {
my $label = $category_label->{$category} || 'Bez kategorije';
@@ -431,14 +452,22 @@ sub author_html {
}
}
+my @toc_type_label = (
+'aut' => 'Primarno autorstvo',
+'edt' => 'Uredništva',
+'trl' => 'Prijevodi',
+'_ostalo' => 'Ostalo',
+);
+
sub count_author_years {
my $years = shift;
my ($authid) = @_;
foreach my $type ( keys %{ $authors->{$authid} } ) {
+# next if $type =~ m/^_/; # FIXME
foreach my $category ( keys %{ $authors->{$authid}->{$type} } ) {
- foreach my $biblionumber ( @{ $authors->{$authid}->{$type}->{$category} } ) {
- $years->{ $biblio_year->{ $biblionumber } }->{ $type . '-' . $category }++;
+ foreach my $biblionumber ( unique_biblionumber @{ $authors->{$authid}->{$type}->{$category} } ) {
+ $years->{ $biblio_year->{ $biblionumber } }->{ $type . '-' . $category }->{ $biblionumber }++;
}
}
}
@@ -447,7 +476,9 @@ sub count_author_years {
sub html_year_selection {
my $fh = shift;
- my @authids = @_;
+ my @authids = unique @_;
+
+ debug 'html_year_selection authids=', [ @authids ];
print $fh qq|Godine:\n|;
my $type_cat_count = {};
@@ -457,10 +488,17 @@ sub html_year_selection {
$years = count_author_years( $years, $authid );
}
+ debug 'years' => $years;
+
foreach my $year ( sort { $b <=> $a } keys %$years ) {
print $fh qq| \n|;
foreach my $type_cat ( keys %{ $years->{$year} } ) {
- $type_cat_count->{ $type_cat } += $years->{$year}->{$type_cat};
+ my $count = scalar keys %{ $years->{$year}->{$type_cat} };
+ $years->{$year}->{$type_cat} = $count; # remove biblionumbers and use count
+ $type_cat_count->{ $type_cat } += $count;
+ my ($type,$cat) = split(/-/, $type_cat);
+ $type_cat_count->{_toc}->{$type}->{$cat}++;
+ $type_cat_count->{_toc_count}->{$type} += $count;
}
}
@@ -478,65 +516,33 @@ var years = |, encode_json($years), q|;
var type_cat_count = |, encode_json($type_cat_count), q|;
-function year_show(year) {
- $('.y'+year).show();
- console.debug('show', year);
- for(var type_cat in years[year]) {
- if ( ( type_cat_count[ type_cat ] += years[year][type_cat] ) == years[year][type_cat]) {
- $('a[name="'+type_cat+'"]').show();
- console.debug(type_cat, 'show');
- }
- }
-}
+
-function year_hide(year) {
- $('.y'+year).hide();
- console.debug('hide', year);
- for(var type_cat in years[year]) {
- if ( ( type_cat_count[ type_cat ] -= years[year][type_cat] ) == 0 ) {
- $('a[name="'+type_cat+'"]').hide();
- console.debug(type_cat, 'hide');
+ |;
+
+ debug 'type_cat_count' => $type_cat_count;
+
+ # TOC
+ print $fh qq|\n|;
+ my $i = 0;
+ while ( $i < $#toc_type_label ) {
+ my $type = $toc_type_label[$i++] || die "type";
+ my $label = $toc_type_label[$i++] || die "label";
+ next unless exists $type_cat_count->{_toc}->{$type};
+ print $fh qq| - $label $type_cat_count->{_toc_count}->{$type}
\n \n|;
+ foreach my $category ( sort keys %{ $type_cat_count->{_toc}->{$type} } ) {
+ my $label = $category_label->{$category} || 'Bez kategorije';
+ my $count = $type_cat_count->{ $type . '-' . $category };
+ my $cat_html = $category;
+ $cat_html =~ s/\./-/g;
+ print $fh qq| - $label $count
\n|;
}
+ print $fh qq|
\n|;
}
-}
+ print $fh qq|
\n|;
-function toggle_year(year, el) {
- if ( el.checked ) {
- year_show(year);
- } else {
- year_hide(year);
- }
}
-function all_years( turn_on ) {
- $('input[name=year_selection]').each( function(i,el) {
- if ( turn_on ) {
- if ( ! el.checked ) {
- el.checked = true;
- year_show( el.value );
- }
- } else {
- if ( el.checked ) {
- el.checked = false;
- year_hide( el.value );
- }
- }
- } );
-}
-
-$(document).ready( function() {
- console.info('ready');
-
- $('input[name=year_selection]').each( function(i, el) {
- var year = el.value;
- console.debug( 'on load', year, el.checked );
- if (! el.checked) year_hide(year);
- });
-
-});
-
- |;
-}
foreach my $row ( sort { $a->{full_name} cmp $b->{full_name} } @authors ) {
@@ -555,11 +561,12 @@ foreach my $row ( sort { $a->{full_name} cmp $b->{full_name} } @authors ) {
html_year_selection $fh => $row->{authid};
- author_html( $fh, $row->{authid}, 'aut' => 'Primarno autorstvo' );
- #author_html( $fh, $row->{authid}, 'sec' => 'UredniÅ¡tva, prijevodi, kritiÄka izdanja' );
- author_html( $fh, $row->{authid}, 'edt' => 'Uredništva' );
- author_html( $fh, $row->{authid}, 'trl' => 'Prijevodi' );
- author_html( $fh, $row->{authid}, '_ostalo' => 'Ostalo' );
+ my $i = 0;
+ while ( $i < $#toc_type_label ) {
+ my $type = $toc_type_label[$i++] || die "type";
+ my $label = $toc_type_label[$i++] || die "label";
+ author_html( $fh, $row->{authid}, $type => $label );
+ }
print $fh html_end;
close($fh);
@@ -578,7 +585,7 @@ my $department_category_author;
foreach my $department ( sort keys %$auth_department ) {
foreach my $authid ( sort @{ $auth_department->{$department} } ) {
my @categories = keys %{ $authors->{$authid}->{aut} };
- push @categories, keys %{ $authors->{$authid}->{sec} };
+ push @categories, keys %{ $authors->{$authid}->{__sec} };
foreach my $category ( sort @categories ) {
push @{ $department_category_author->{$department}->{$category} }, $authid;
push @{ $department_category_author->{'AAA_ukupno'}->{$category} }, $authid if $department_in_sum->{$department};
@@ -595,9 +602,9 @@ debug 'department_category_author' => $department_category_author;
sub department_html {
- my ( $fh, $department, $type, $label ) = @_;
+ my ( $fh, $department, $type, $label, $csv_fh ) = @_;
- print $fh qq|$label
\n|;
+ print $fh qq|$label
\n|;
foreach my $category ( sort keys %{ $department_category_author->{$department} } ) {
@@ -608,10 +615,34 @@ sub department_html {
next unless @biblionumber;
- my $label = $category_label->{$category} || 'Bez kategorije';
- print $fh qq|$label
\n\n|;
+ my $cat_label = $category_label->{$category} || 'Bez kategorije';
+ print $fh qq|$cat_label
\n\n|;
+
+ foreach my $bib_num ( @biblionumber ) {
+ my @li = li_biblio( $bib_num );
+ my $li_html = join('', @li);
+ $li_html =~ s{}{}gs;
+ print $fh $li_html;
- print $fh li_biblio( $_ ) foreach @biblionumber;
+ next unless $csv_fh;
+
+ my $year = $li[1];
+ my @html;
+ foreach ( split(/}{} ) {
+ my $nr = $1;
+ s{\s+}{ }gs;
+ $html[$nr] = $_;
+ } else {
+ warn "SKIPPED: Can't find col in [$_] from $li[4]" unless m/^<[^>]+>$/;
+ }
+ }
+ my $html = join("\t", @html);
+
+ $html =~ s{]*>}{}gs;
+ $html =~ s{\s+$}{}gs;
+ print $csv_fh "$bib_num\t$year\t$type\t$label\t$category\t$cat_label\t$html\n";
+ }
print $fh qq|
|;
}
@@ -638,16 +669,24 @@ foreach my $department ( sort keys %$department_category_author ) {
}
html_year_selection $fh => @authids;
- department_html( $fh, $department, 'aut', 'Primarno autorstvo' );
+ my $csv_fh;
+ if ( $department eq 'AAA_ukupno' ) {
+ open($csv_fh, '>:encoding(utf-8)', "html/departments/$department.csv");
+ }
-# department_html( $fh, $department, 'sec', 'Sekundarno autorstvo' );
- department_html( $fh, $department, 'edt', 'Uredništva' );
- department_html( $fh, $department, 'trl', 'Prijevodi' );
- department_html( $fh, $department, '_ostalo', 'Ostalo' );
+ my $i = 0;
+ while ( $i < $#toc_type_label ) {
+ my $type = $toc_type_label[$i++] || die "type";
+ my $label = $toc_type_label[$i++] || die "label";
+ department_html( $fh, $department, $type, $label, $csv_fh );
+ }
+
+ close($csv_fh) if $csv_fh;
print $fh html_end;
close($fh);
rename "html/departments/$dep_file.new", "html/departments/$dep_file.html";
+
}
print $dep_fh qq|\n|, html_end;
close($dep_fh);
@@ -722,12 +761,9 @@ sub table_count {
my $label = shift @_;
my $department = shift @_;
my $group = shift @_;
- my @biblionumbers = @_;
- my $unique;
- $unique->{$_}++ foreach @biblionumbers;
- 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;
+ my @biblionumbers = unique @_;
+ $table->{ffzg}->{$group}->[ $label2row->{ $label } ]->[ $department2col->{$department} ] = scalar @biblionumbers;
+ $table->{external}->{$group}->[ $label2row->{ $label } ]->[ $department2col->{$department} ] = scalar grep { $biblio_author_external->{$_} } @biblionumbers;
}
foreach my $group ( '', keys %$azvo_group_title ) {
@@ -819,3 +855,5 @@ close($fh2);
rename 'html/azvo.new', 'html/azvo.html';
rename 'html/azvo2.new', 'html/azvo2.html';
+unlink $pid_file;
+