Endlosschleife im PDF-Tabellenmodul und damit im PDF-Export gefixt

[mfinanz.git] / modules / override / PDF / Table.pm

diff --git a/modules/override/PDF/Table.pm b/modules/override/PDF/Table.pm
index 8f5d03117b77349520ce3021c3d411a594294866..57372487cbf39f7fe86e476a1bb02bfc61580d2c 100755 (executable)
--- a/modules/override/PDF/Table.pm
+++ b/modules/override/PDF/Table.pm
@@ -211,8 +211,12 @@ sub text_block
         }
 
         # Lets take from paragraph as many words as we can put into $width - $indent;
         }
 
         # Lets take from paragraph as many words as we can put into $width - $indent;

-        while ( @paragraph and $text_object->advancewidth( join("\x20", @line)."\x20" . $paragraph[0]) +
-                                $line_width < $width )
+        # Always take at least one word; otherwise we'd end up in an infinite loop.
+        while ( !scalar(@line) || (
+          @paragraph && (
+            $text_object->advancewidth( join("\x20", @line)."\x20" . $paragraph[0]) + $line_width < $width
+          )
+        ))

         {
             push(@line, shift(@paragraph));
         }
         {
             push(@line, shift(@paragraph));
         }


@@ -328,6 +332,7 @@ sub table
         max_word_length       => 1,
         cell_render_hook      => 1,
         default_text          => 1,
         max_word_length       => 1,
         cell_render_hook      => 1,
         default_text          => 1,

+        num_header_rows       => 1,

     );
     foreach my $key (keys %arg)
     {
     );
     foreach my $key (keys %arg)
     {


@@ -373,7 +378,7 @@ sub table
     #=====================================
     # Disable header row into the table
     my $header_props = undef;
     #=====================================
     # Disable header row into the table
     my $header_props = undef;

-
+    my (@header_rows, @header_row_cell_props);

     # Check if the user enabled it ?
     if(defined $arg{'header_props'} and ref( $arg{'header_props'}) eq 'HASH')
     {
     # Check if the user enabled it ?
     if(defined $arg{'header_props'} and ref( $arg{'header_props'}) eq 'HASH')
     {


@@ -388,9 +393,8 @@ sub table
         $header_props->{'font_underline'} = $header_props->{'font_underline'} || $fnt_underline;
         $header_props->{'bg_color'      } = $header_props->{'bg_color'      } || '#FFFFAA';
         $header_props->{'justify'       } = $header_props->{'justify'       };
         $header_props->{'font_underline'} = $header_props->{'font_underline'} || $fnt_underline;
         $header_props->{'bg_color'      } = $header_props->{'bg_color'      } || '#FFFFAA';
         $header_props->{'justify'       } = $header_props->{'justify'       };

+        $header_props->{num_header_rows } = $arg{num_header_rows } || 1;

     }
     }

-
-    my $header_row  = undef;

     #=====================================
     # Other Parameters check
     #=====================================
     #=====================================
     # Other Parameters check
     #=====================================


@@ -433,7 +437,10 @@ sub table
     }
 
     # Copy the header row if header is enabled
     }
 
     # Copy the header row if header is enabled

-    @$header_row = $$data[0] if defined $header_props;
+    if (defined $header_props) {
+      map { push @header_rows,           $$data[$_]       } (0..$header_props->{num_header_rows} - 1);
+      map { push @header_row_cell_props, $$cell_props[$_] } (0..$header_props->{num_header_rows} - 1);
+    }

     # Determine column widths based on content
 
     #  an arrayref whose values are a hashref holding
     # Determine column widths based on content
 
     #  an arrayref whose values are a hashref holding


@@ -444,7 +451,7 @@ sub table
     #  the actual widths of the column/row intersection
     my $row_col_widths = [];
     # An array ref with the widths of the header row
     #  the actual widths of the column/row intersection
     my $row_col_widths = [];
     # An array ref with the widths of the header row

-    my $header_row_props = [];
+    my @header_row_widths;

 
     # Scalars that hold sum of the maximum and minimum widths of all columns
     my ( $max_col_w  , $min_col_w   ) = ( 0,0 );
 
     # Scalars that hold sum of the maximum and minimum widths of all columns
     my ( $max_col_w  , $min_col_w   ) = ( 0,0 );


@@ -456,6 +463,8 @@ sub table
 
     for( my $row_idx = 0; $row_idx < scalar(@$data) ; $row_idx++ )
     {
 
     for( my $row_idx = 0; $row_idx < scalar(@$data) ; $row_idx++ )
     {

+        push @header_row_widths, [] if $row_idx < $header_props->{num_header_rows};
+

         my $column_widths = []; #holds the width of each column
         # Init the height for this row
         $rows_height->[$row_idx] = 0;
         my $column_widths = []; #holds the width of each column
         # Init the height for this row
         $rows_height->[$row_idx] = 0;


@@ -544,7 +553,9 @@ sub table
         $row_col_widths->[$row_idx] = $column_widths;
 
         # Copy the calculated row properties of header row.
         $row_col_widths->[$row_idx] = $column_widths;
 
         # Copy the calculated row properties of header row.

-        @$header_row_props = @$column_widths if(!$row_idx and ref $header_props);
+        if (ref $header_props && $row_idx < $header_props->{num_header_rows}) {
+          push @header_row_widths, [ @{ $column_widths } ];
+        }

     }
 
     # Calc real column widths and expand table width if needed.
     }
 
     # Calc real column widths and expand table width if needed.


@@ -555,10 +566,12 @@ sub table
     # Lets draw what we have!
     my $row_index    = 0;
     # Store header row height for later use if headers have to be repeated
     # Lets draw what we have!
     my $row_index    = 0;
     # Store header row height for later use if headers have to be repeated

-    my $header_row_height = $rows_height->[0];
+    my @header_row_heights = @$rows_height[0 .. $header_props->{num_header_rows}-1];

 
     my ( $gfx, $gfx_bg, $background_color, $font_color, $bot_marg, $table_top_y, $text_start);
 
 
     my ( $gfx, $gfx_bg, $background_color, $font_color, $bot_marg, $table_top_y, $text_start);
 

+    my $remaining_header_rows = $header_props ? $header_props->{num_header_rows} : 0;
+

     # Each iteration adds a new page as neccessary
     while(scalar(@{$data}))
     {
     # Each iteration adds a new page as neccessary
     while(scalar(@{$data}))
     {


@@ -601,17 +614,13 @@ sub table
 
             if( ref $header_props and $header_props->{'repeat'})
             {
 
             if( ref $header_props and $header_props->{'repeat'})
             {

-                # Copy Header Data
-                @$page_header = @$header_row;
-                my $hrp ;
-                @$hrp = @$header_row_props ;
-                # Then prepend it to master data array
-                unshift @$data, @$page_header;
-                unshift @$row_col_widths, $hrp;
-                unshift @$rows_height, $header_row_height;
-
-                $first_row = 1; # Means YES
-                $row_index--; # Rollback the row_index because a new header row has been added
+                for my $idx (0 .. $header_props->{num_header_rows} - 1) {
+                  unshift @$data,           [ @{ $header_rows[$idx]      } ];
+                  unshift @$row_col_widths, [ @{ $header_row_widths[$idx] } ];
+                  unshift @$rows_height,    $header_row_heights[$idx];
+                }
+                $remaining_header_rows = $header_props->{num_header_rows};
+                $first_row = 1;

             }
         }
 
             }
         }
 


@@ -695,7 +704,7 @@ sub table
                 # look for font information for this cell
                 my ($cell_font, $cell_font_size, $cell_font_color, $cell_font_underline, $justify);
 
                 # look for font information for this cell
                 my ($cell_font, $cell_font_size, $cell_font_color, $cell_font_underline, $justify);
 

-                if( $first_row and ref $header_props)
+                if( $remaining_header_rows and ref $header_props)

                 {
                     $cell_font           = $header_props->{'font'};
                     $cell_font_size      = $header_props->{'font_size'};
                 {
                     $cell_font           = $header_props->{'font'};
                     $cell_font_size      = $header_props->{'font_size'};


@@ -737,13 +746,16 @@ sub table
                                        //  $default_text;
 
                 my $this_width;
                                        //  $default_text;
 
                 my $this_width;

-                if (!$first_row && $cell_props->[$row_index][$column_idx]->{colspan}) {
-                    $colspan     = -1 == $cell_props->[$row_index][$column_idx]->{colspan}
-                                 ? $num_cols - $column_idx
-                                 : $cell_props->[$row_index][$column_idx]->{colspan};
+                if (!$remaining_header_rows && $cell_props->[$row_index][$column_idx]->{colspan}) {
+                    $colspan = $cell_props->[$row_index][$column_idx]->{colspan};
+                } elsif ($remaining_header_rows && $header_row_cell_props[$header_props->{num_header_rows} - $remaining_header_rows][$column_idx]->{colspan}) {
+                    $colspan = $header_row_cell_props[$header_props->{num_header_rows} - $remaining_header_rows][$column_idx]->{colspan};
+                }
+
+                if ($colspan) {
+                    $colspan     = $num_cols - $column_idx if (-1 == $colspan);

                     my $last_idx = $column_idx + $colspan - 1;
                     $this_width  = sum @{ $calc_column_widths }[$column_idx..$last_idx];
                     my $last_idx = $column_idx + $colspan - 1;
                     $this_width  = sum @{ $calc_column_widths }[$column_idx..$last_idx];

-

                 } else {
                     $this_width = $calc_column_widths->[$column_idx];
                 }
                 } else {
                     $this_width = $calc_column_widths->[$column_idx];
                 }


@@ -828,7 +840,7 @@ sub table
             {
                 my $cell_bg_color;
 
             {
                 my $cell_bg_color;
 

-                if( $first_row and ref $header_props)
+                if( $remaining_header_rows and ref $header_props)

                 {                                  #Compatibility                 Consistency with other props
                     $cell_bg_color = $header_props->{'bg_color'} || $header_props->{'background_color'};
                 }
                 {                                  #Compatibility                 Consistency with other props
                     $cell_bg_color = $header_props->{'bg_color'} || $header_props->{'background_color'};
                 }


@@ -860,8 +872,12 @@ sub table
                 $gfx->hline( $xbase + $width );
             }
 
                 $gfx->hline( $xbase + $width );
             }
 

-            $row_index++ unless ( $do_leftovers );

             $first_row = 0;
             $first_row = 0;

+            if ($remaining_header_rows) {
+              $remaining_header_rows--;
+            } else {
+              $row_index++ unless $do_leftovers;
+            }

         }# End of Row_Loop
 
         if ($gfx)
         }# End of Row_Loop
 
         if ($gfx)