[Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,1.32,1.33

[Ambrose C. LI]

Update of /cvsroot/koha/koha/misc/translator
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22556

Modified Files:
	TmplTokenizer.pm 
Log Message:
Sorry, forgot to take out debugging code before committing


Index: TmplTokenizer.pm
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -r1.32 -r1.33
*** TmplTokenizer.pm	8 Mar 2004 04:59:38 -0000	1.32
--- TmplTokenizer.pm	8 Mar 2004 05:00:42 -0000	1.33
***************
*** 546,552 ****
  		}
  	    };
- 	    print "DEBUG: optimize: entry: checking: ", join('', map {$_->string} @structure), "\n";
      &$undo_trailing_blanks;
- 	    print "DEBUG: optimize: structure length is ", scalar @structure, "\n";
      while (@structure >= 2) {
  	my $something_done_p = 0;
--- 546,550 ----
***************
*** 558,562 ****
  		&& $structure[$#structure]->string =~ /^<\//s) {
  	    my $has_other_tags_p = 0;
- 	    print "DEBUG: checking for unmatched close tag: ", join('', map {$_->string} @structure), "\n";
  	    for (my $i = 0; $i < $#structure; $i += 1) {
  		$has_other_tags_p = 1
--- 556,559 ----
***************
*** 565,574 ****
  	    }
  	    if (!$has_other_tags_p) {
- 	    print "DEBUG: requeuing ", $structure[$#structure]->string, "\n";
  		push @{$this->{_queue}}, [0, pop @structure]
  		&$undo_trailing_blanks;
  		$something_done_p = 1;
  	    }
- 	    print "DEBUG: finished checking for unmatched closed tag\n";
  	}
  	# FIXME: Do the same ugly hack for the last token being a ( or [
--- 562,569 ----
***************
*** 588,592 ****
  		&& (my $tag = $1) !~ /^(?:br|hr|img|input)\b/is
  	) {
- 	    print "DEBUG: checking for unmatched open tag: ", join('', map {$_->string} @structure), "\n";
  	    my $tag_open_count = 1;
  	    for (my $i = 1; $i <= $#structure; $i += 1) {
--- 583,586 ----
***************
*** 598,609 ****
  	    }
  	    if ($tag_open_count > 0) {
- 	    print "DEBUG: tag open count is $tag_open_count, requeuing...\n";
  		for (my $i = $#structure; $i; $i -= 1) {
- 	    print "DEBUG: requeuing ", $structure[$#structure]->string, "\n";
  		    push @{$this->{_queue}}, [1, pop @structure];
  		}
  		$something_done_p = 1;
  	    }
- 	    print "DEBUG: finished checking structure\n\n";
  	}
  	# FIXME: If the first token is an open tag, the last token is the
--- 592,600 ----
***************
*** 617,621 ****
  		&& $structure[$#structure]->string =~ /^<\/$1\s*>$/is) {
  	    my $has_other_open_or_close_tags_p = 0;
- 	    print "DEBUG: checking for matching open and close tags: ", join('', map {$_->string} @structure), "\n";
  	    for (my $i = 1; $i < $#structure; $i += 1) {
  		$has_other_open_or_close_tags_p = 1
--- 608,611 ----
***************
*** 626,635 ****
  	    if (!$has_other_open_or_close_tags_p) {
  		for (my $i = $#structure; $i; $i -= 1) {
- 	    print "DEBUG: requeuing ", $structure[$#structure]->string, "\n";
  		    push @{$this->{_queue}}, [1, pop @structure];
  		}
  		$something_done_p = 1;
  	    }
- 	    print "DEBUG: finished checking for matching open and close tags\n";
  	}
      last if !$something_done_p;
--- 616,623 ----