X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=html.pl;h=3bd0cf27e0d1948620c3dd035d3b1fd1aa5401e0;hb=b82e1b8518c8822be87978d8dda289e9c497e61a;hp=3d9cfce0e96fcec5c2542e6ee1011e4f403af5c6;hpb=7fc6c0fdd35f196bb3dfc317fdd4c19816f2eb55;p=koha-bibliografija

diff --git a/html.pl b/html.pl
index 3d9cfce..3bd0cf2 100755
--- a/html.pl
+++ b/html.pl
@@ -128,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
 });
@@ -620,7 +621,7 @@ sub department_html {
 		foreach my $bib_num ( @biblionumber ) {
 			my @li = li_biblio( $bib_num );
 			my $li_html = join('', @li);
-			$li_html =~ s{<a name="col-\d+"></a>}{}gs;
+			$li_html =~ s{<a name="(col-\d+)"/a>}{<!-- $1 -->}gs;
 			print $fh $li_html;
 
 			next unless $csv_fh;
@@ -628,9 +629,10 @@ sub department_html {
 			my $year = $li[1];
 			my @html;
 			foreach ( split(/<a name="col-/, $li[4]) ) {
-				if ( s{(\d+)"></a>}{} ) {
+				if ( s{^(\d+)"></a>}{} ) {
+					my $nr = $1;
 					s{\s+}{ }gs;
-					$html[$1] = $_;
+					$html[$nr] = $_;
 				} else {
 					warn "SKIPPED: Can't find col in [$_] from $li[4]" unless m/^<[^>]+>$/;
 				}