generate csv output for AAA_ukupno

diff --git a/compact.xsl b/compact.xsl
index 23e1e61..ebbe4f3 100644 (file)
--- a/compact.xsl
+++ b/compact.xsl
@@ -290,6 +290,7 @@
         </xsl:if>
 
                <br/>
+               <hr/>
         <xsl:call-template name="showAuthor100">
                        <xsl:with-param name="authorfield100" select="marc:datafield[@tag=100]"/>
                </xsl:call-template>
@@ -305,7 +306,8 @@
                                </xsl:call-template>
                </xsl:otherwise>
                </xsl:choose>
-               <br/>   
+               <br/>
+               <hr/>
                <span class="results_summary">
         <xsl:if test="marc:datafield[@tag=245]">
                <span class="title">
@@ -373,7 +375,6 @@
         <xsl:with-param name="label">Publisher: </xsl:with-param>
       </xsl:call-template>
     </xsl:if>
-
     <xsl:if test="marc:datafield[@tag=250]">
     <span class="results_summary edition">
             <xsl:for-each select="marc:datafield[@tag=250]">
@@ -384,7 +385,6 @@
             <xsl:text> - </xsl:text>
     </span>
     </xsl:if>
-
     <xsl:if test="marc:datafield[@tag=260]">
         <span class="results_summary publisher">
             <xsl:for-each select="marc:datafield[@tag=260]">
@@ -411,7 +411,6 @@
             </xsl:for-each>
         </span>
     </xsl:if>
-
     <xsl:if test="marc:datafield[@tag=300] and marc:datafield[@tag=942]/marc:subfield[@code='c'] ='KNJ'">
     <span class="results_summary description"><span class="label">. - </span>
         <xsl:for-each select="marc:datafield[@tag=300]">
@@ -426,7 +425,6 @@
         </xsl:for-each>
     </span>
    </xsl:if>
-
 <xsl:if test="$DisplayIconsXSLT!='0'">
     <span class="results_summary">
     <xsl:if test="$typeOf008!=''">
@@ -750,7 +748,6 @@
 <xsl:text> </xsl:text> <!-- added blank space to fix font display problem, see Bug 3671 -->
        </span>
 </xsl:if> <!-- DisplayIconsXSLT -->
-
     <xsl:if test="marc:datafield[@tag=020] and marc:datafield[@tag=942]/marc:subfield[@code='c'] ='KNJ'">
     <span class="results_summary isbn"><span class="label"> ISBN: </span>
     <xsl:for-each select="marc:datafield[@tag=020]">
@@ -760,7 +757,6 @@
     </xsl:for-each>
     </span>
     </xsl:if>
-
     <xsl:if test="marc:datafield[@tag=022] and (marc:datafield[@tag=942]/marc:subfield[@code='c'] ='KNJ' or marc:datafield[@tag=942]/marc:subfield[@code='c'] ='PER')">
     <span class="results_summary issn"><span class="label"> ISSN: </span>
     <xsl:for-each select="marc:datafield[@tag=022]">
@@ -827,6 +823,7 @@
 
        <xsl:if test="marc:datafield[@tag=856]">
                        <br/>
+                       <hr/>
          <span class="results_summary">
                             <xsl:for-each select="marc:datafield[@tag=856]">
                             <xsl:variable name="SubqText"><xsl:value-of select="marc:subfield[@code='q']"/></xsl:variable>
@@ -1052,7 +1049,6 @@
         </span>
         </xsl:if>
     </xsl:template>
-    
        <xsl:template name="showAuthor700">
        <xsl:param name="authorfield700"/>
        <xsl:if test="count($authorfield700)&gt;0">
@@ -1077,7 +1073,6 @@
         </span>
         </xsl:if>
     </xsl:template>
-       
        <xsl:template name="showAuthor700k">
        <xsl:param name="authorfield700k"/>
        <xsl:if test="count($authorfield700k)&gt;0">

diff --git a/html.pl b/html.pl
index b6f4861..8467a55 100755 (executable)
--- a/html.pl
+++ b/html.pl
@@ -601,7 +601,7 @@ 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|<a name="$type"><h2>$label</h2></a>\n|;
 
@@ -614,10 +614,24 @@ sub department_html {
 
                next unless @biblionumber;
 
-               my $label = $category_label->{$category} || 'Bez kategorije';
-               print $fh qq|<a name="$type-$category"><h3>$label</h3></a>\n<ol>\n|;
+               my $cat_label = $category_label->{$category} || 'Bez kategorije';
+               print $fh qq|<a name="$type-$category"><h3>$cat_label</h3></a>\n<ol>\n|;
+
+               foreach my $bib_num ( @biblionumber ) {
+                       my @li = li_biblio( $bib_num );
+                       my $li_html = join('', @li);
+                       $li_html =~ s{<hr/?>}{}g;
+                       print $fh $li_html;
 
-               print $fh li_biblio( $_ ) foreach @biblionumber;
+                       next unless $csv_fh;
+
+                       my $year = $li[1];
+                       my $html = $li[4];
+                       $html =~ s{<hr/?>}{\t}gs;
+#                      $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|</ol>|;
        }
@@ -644,16 +658,24 @@ foreach my $department ( sort keys %$department_category_author ) {
        }
        html_year_selection $fh => @authids;
 
+       my $csv_fh;
+       if ( $department eq 'AAA_ukupno' ) {
+               open($csv_fh, '>:encoding(utf-8)', "html/departments/$department.csv");
+       }
+
        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 );
+               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|</ul>\n|, html_end;
 close($dep_fh);