Diff for /loncom/xml/londefdef.pm between versions 1.300 and 1.301

version 1.300, 2005/12/05 23:22:49 version 1.301, 2005/12/06 22:37:00
Line 48  use Apache::lonmenu(); Line 48  use Apache::lonmenu();
 use Apache::lonmeta();  use Apache::lonmeta();
 use Apache::Constants qw(:common);  use Apache::Constants qw(:common);
 use File::Basename;  use File::Basename;
 #use Data::Dumper;  use Data::Dumper;
   
 BEGIN {  BEGIN {
   
Line 61  BEGIN { Line 61  BEGIN {
 #   Need this 'cause evidently when given an array, Data::Dumper only seems  #   Need this 'cause evidently when given an array, Data::Dumper only seems
 #   to dump element 0.  #   to dump element 0.
 #  #
 #sub debug_dump_table {  sub debug_dump_table {
 #    my $lastrow = $#Apache::londefdef::table;      my $lastrow = $#Apache::londefdef::table;
 #    &Apache::lonnet::logthis("Dumping table:  Last row index: $lastrow");      &Apache::lonnet::logthis("Dumping table:  Last row index: $lastrow");
 #    my $row;      my $row;
 #    for ($row =0; $row <= $lastrow; $row++ ) {      for ($row =0; $row <= $lastrow; $row++ ) {
 # my $text = Dumper($Apache::londefdef::table[$row]);   my $text = Dumper($Apache::londefdef::table[$row]);
 # &Apache::lonnet::logthis("table [ $row ]".$text);   &Apache::lonnet::logthis("table [ $row ]".$text);
 #  
 #    }  
 #}  
   
       }
   }
 sub initialize_londefdef {  sub initialize_londefdef {
     $Apache::londefdef::TD_redirection=0;      $Apache::londefdef::TD_redirection=0;
     @Apache::londefdef::table = ();      @Apache::londefdef::table = ();
Line 2425  sub end_td_tex { Line 2424  sub end_td_tex {
     push @ {$Apache::londefdef::table[-1]{'minlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$min_length;      push @ {$Apache::londefdef::table[-1]{'minlen'}[$Apache::londefdef::table[-1]{'row_number'}] },$min_length;
  }           }        
     }      }
  for (my $in=0; $in<=$#{$Apache::londefdef::table[-1]{'include'}};$in++) {          for (my $in=0; $in<=$#{$Apache::londefdef::table[-1]{'include'}};$in++) {    
     my $nested = $Apache::londefdef::table[-1]{'include'}[$in];   my $nested = shift @{$Apache::londefdef::table[-1]{'include'}};
     $nested =~ s/\\end\{tabular\}\\strut\\\\/\\end\{tabular\}/;   $nested =~ s/\\end\{tabular\}\\strut\\\\/\\end\{tabular\}/;
    # $data=~s/\\keephidden\{NEW TABLE ENTRY\}/$Apache::londefdef::table[-1]{'include'}[$in]/;   # $data=~s/\\keephidden\{NEW TABLE ENTRY\}/$Apache::londefdef::table[-1]{'include'}[$in]/;
     $data =~ s/\\keephidden\{NEW TABLE ENTRY\}/$nested/;   $data =~ s/\\keephidden\{NEW TABLE ENTRY\}/$nested/;
  }  
       }
       # Should be be killing off the 'include' elements as they're used up?
     push @ {$Apache::londefdef::table[-1]{'content'}[-1] },$data;      push @ {$Apache::londefdef::table[-1]{'content'}[-1] },$data;
     return'';      return '';
 }  }
   
 sub end_td {  sub end_td {

Removed from v.1.300  
changed lines
  Added in v.1.301


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>