[LON-CAPA-cvs] cvs: loncom /xml londefdef.pm

foxr lon-capa-cvs@mail.lon-capa.org
Sun, 27 Nov 2005 23:57:17 -0000


foxr		Sun Nov 27 18:57:17 2005 EDT

  Modified files:              
    /loncom/xml	londefdef.pm 
  Log:
  Remove some logging spew I put in to figure out how this all worked.
  
  
Index: loncom/xml/londefdef.pm
diff -u loncom/xml/londefdef.pm:1.294 loncom/xml/londefdef.pm:1.295
--- loncom/xml/londefdef.pm:1.294	Sun Nov 27 18:54:00 2005
+++ loncom/xml/londefdef.pm	Sun Nov 27 18:57:15 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Tags Default Definition Module 
 #
-# $Id: londefdef.pm,v 1.294 2005/11/27 23:54:00 foxr Exp $
+# $Id: londefdef.pm,v 1.295 2005/11/27 23:57:15 foxr Exp $
 # 
 #
 # Copyright Michigan State University Board of Trustees
@@ -1987,9 +1987,7 @@
         $Apache::londefdef::table[-1]{'content'}=[];
         $Apache::londefdef::table[-1]{'align'}=[];
         $currentstring.='\keephidden{NEW TABLE ENTRY}';
-	&Apache::lonnet::logthis("------ start-table------");
-	&debug_dump_table;
-	&Apache::lonnet::logthis("-------start-table------");
+
 
     }
     return $currentstring;
@@ -2005,8 +2003,6 @@
 	my $output = '';
 	my $WARNING='';
         #width of columns from TeXwidth attributes
-	&Apache::lonnet::logthis("----------------end_table-----------------");
-	&debug_dump_table;
 
 	for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {
 	    for (my $jn=0;$jn<=$Apache::londefdef::table[-1]{'counter_columns'};$jn++) {
@@ -2213,7 +2209,6 @@
 	$Apache::londefdef::table[-1]{'output'} .= $header_of_table.$Apache::londefdef::table[-1]{'hinc'}.$output.'\end{tabular}\strut'.'\\\\'."\n".'\strut ';
 	if ($#Apache::londefdef::table > 0) {	    
 	    my $inmemory = $Apache::londefdef::table[-1]{'output'};
-	    &Apache::lonnet::logthis("--- popping nested table --");
 	    # Figure out max/and min width  by summing us and then
 	    # apply that to the current column of the table we nest in
 	    # if it's larger than the current width or the current width
@@ -2231,11 +2226,8 @@
 	    $min_nested_width += 5;
 	    $max_nested_width += 5;
 
-	    &Apache::lonnet::logthis("Nested min: $min_nested_width");
-	    &Apache::lonnet::logthis("Nested max: $max_nested_width");
 	    my $outer_column = $Apache::londefdef::table[-2]{'counter_columns'};
 	    my $outer_row    = $Apache::londefdef::table[-2]{'row_number'};
-	    &Apache::lonnet::logthis("Outer row/column: $outer_row : $outer_column");
 	    if ($min_nested_width > $Apache::londefdef::table[-2]{'minlen'}[$outer_row][$outer_column]) {
 		$Apache::londefdef::table[-2]{'minlen'}[$outer_row][$outer_column] = $min_nested_width;
 	    }
@@ -2250,9 +2242,6 @@
 	    pop @Apache::londefdef::table;
 	    undef @Apache::londefdef::table;
 	}
-	&debug_dump_table;
-	&Apache::lonnet::logthis("---------end table------");
-
     }
     return $currentstring;
 }
@@ -2264,7 +2253,6 @@
     if ($target eq 'web') {
 	$currentstring = $token->[4];     
     } elsif ($target eq 'tex') {
-	&Apache::lonnet::logthis("--------------start-tr----------");
 	$Apache::londefdef::table[-1]{'row_number'}++;
 	my $alignchar=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1);
 	if ($alignchar ne '') {
@@ -2279,8 +2267,6 @@
 	push @ {$Apache::londefdef::table[-1]{'minlen'}}, [];
 	push @ {$Apache::londefdef::table[-1]{'maxlen'}}, [];
 	push @ {$Apache::londefdef::table[-1]{'content'}}, [];
-	&debug_dump_table;
-	&Apache::lonnet::logthis("------------start-tr-----------");
     } 
     return $currentstring;
 }
@@ -2291,12 +2277,11 @@
     if ($target eq 'web') {
 	$currentstring .= $token->[2];     
     } elsif ($target eq 'tex') {
-	&Apache::lonnet::logthis("-------end-tr-----");
 	if ($Apache::londefdef::TD_redirection) {
 	    &end_td_tex($parstack,$parser,$safeeval);    
 	}
-	&debug_dump_table;
-	&Apache::lonnet::logthis("------end-tr------");
+
+
 	
     }
     return $currentstring;
@@ -2309,11 +2294,8 @@
     if ($target eq 'web') {
 	$currentstring = $token->[4];     
     } elsif ($target eq 'tex') {
-	&Apache::lonnet::logthis("------start-td----");
 	$Apache::londefdef::TD_redirection = 1;
 	&tag_check('tr','td',$tagstack,$parstack,$parser,$safeeval);
-	&debug_dump_table;
-	&Apache::lonnet::logthis("-----start-td-----");
     } 
     return $currentstring;
 }   
@@ -2446,11 +2428,8 @@
     if ($target eq 'web') {
 	$currentstring = $token->[2];     
     } elsif ($target eq 'tex') {
-	&Apache::lonnet::logthis("--------end_td-----");
         $Apache::londefdef::TD_redirection =0;
 	&end_td_tex($parstack,$parser,$safeeval);
-	&debug_dump_table;
-	&Apache::lonnet::logthis("--------end-td----");
     }
     return $currentstring;
 }