[LON-CAPA-cvs] cvs: loncom /xml lonlatextable.pm lontable.pm
foxr
foxr@source.lon-capa.org
Wed, 13 Apr 2011 10:44:26 -0000
foxr Wed Apr 13 10:44:26 2011 EDT
Modified files:
/loncom/xml lonlatextable.pm lontable.pm
Log:
BZ6317 - Support (W/O debug spew) rules="groups" for tables with
row groups (tbody, thead, tfoot)...also get those sections out in the
right order.
Index: loncom/xml/lonlatextable.pm
diff -u loncom/xml/lonlatextable.pm:1.3 loncom/xml/lonlatextable.pm:1.4
--- loncom/xml/lonlatextable.pm:1.3 Wed Apr 13 10:08:06 2011
+++ loncom/xml/lonlatextable.pm Wed Apr 13 10:44:26 2011
@@ -1,6 +1,6 @@
# Generating TeX tables.
#
-# $Id: lonlatextable.pm,v 1.3 2011/04/13 10:08:06 foxr Exp $
+# $Id: lonlatextable.pm,v 1.4 2011/04/13 10:44:26 foxr Exp $
#
#
# Copyright Michigan State University Board of Trustees
@@ -78,8 +78,6 @@
=cut
package Apache::lonlatextable;
-use Data::Dumper;
-use Apache::lonnet;
use strict;
=pod
@@ -166,10 +164,6 @@
sub set_data {
my ($self, $data) = @_;
- &Apache::lonnet::logthis("--------------- set_data ------------");
- &Apache::lonnet::logthis(Dumper($self->{'data'}));
- &Apache::lonnet::logthis("---------------------------------------");
- &Apache::lonnet::logthis(Dumper($data));
my $current_data = $self->{'data'};
push (@$current_data, @$data);
$self->{'data'} = $current_data;
Index: loncom/xml/lontable.pm
diff -u loncom/xml/lontable.pm:1.17 loncom/xml/lontable.pm:1.18
--- loncom/xml/lontable.pm:1.17 Wed Apr 13 10:08:06 2011
+++ loncom/xml/lontable.pm Wed Apr 13 10:44:26 2011
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Generating TeX tables.
#
-# $Id: lontable.pm,v 1.17 2011/04/13 10:08:06 foxr Exp $
+# $Id: lontable.pm,v 1.18 2011/04/13 10:44:26 foxr Exp $
#
#
# Copyright Michigan State University Board of Trustees
@@ -57,9 +57,9 @@
use strict;
use Apache::lonlatextable;
use Apache::lonnet; # for trace logging.
-use Data::Dumper;
-my $tracing = 1; # Set to 1 to enable log tracing. 2 for local sub tracing.
+
+my $tracing = 0; # Set to 1 to enable log tracing. 2 for local sub tracing.
=pod
@@ -533,8 +533,7 @@
# Mostly we need to determine if this row has the maximum
# cell count of any row in existence in the table:
- &Apache::lonnet::logthis($self->{'part'});
- &Apache::lonnet::logthis(Dumper($self->{'rows'}));
+
my $row = $self->{'rows'}->{$self->{'part'}}->[-1];
my $cells = $row->{'cells'};
@@ -1106,7 +1105,6 @@
# Do nothing if that part of the table is empty:
- &Apache::lonnet::logthis(Dumper($this->{'rows'}));
if ($this->{'rows'}->{$part} == undef) {
if ($tracing) {&Apache::lonnet::logthis("$part is empty"); }
return;