[TWiki-Dev] CVS: twiki/bin rdiff,1.9,1.9.2.1 view,1.16.2.1,1.16.2.2

[Nicholas L. <nic...@us...>]

Update of /cvsroot/TWiki/twiki/bin
In directory usw-pr-cvs1:/tmp/cvs-serv5034

Modified Files:
      Tag: expt-TWikiModularization
	rdiff view 
Log Message:
Some fixes, should be functional. (For a period ;)

Index: rdiff
===================================================================
RCS file: /cvsroot/TWiki/twiki/bin/rdiff,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -C2 -r1.9 -r1.9.2.1
*** rdiff	2001/02/17 09:58:44	1.9
--- rdiff	2001/03/17 09:22:19	1.9.2.1
***************
*** 140,144 ****
      my $topicExists = &TWiki::Store::topicExists( $webName, $topic );
      if( $topicExists ) {
! 	$maxrev = &TWiki::Store::getRevisionNumber( $topic );
          $maxrev =~ s/1\.//go;  # cut major
  	if( ! $rev1 ) { $rev1 = 0; }
--- 140,144 ----
      my $topicExists = &TWiki::Store::topicExists( $webName, $topic );
      if( $topicExists ) {
! 	$maxrev = &TWiki::Store::getRevisionNumber( $webName, $topic );
          $maxrev =~ s/1\.//go;  # cut major
  	if( ! $rev1 ) { $rev1 = 0; }
***************
*** 182,186 ****
              $rInfo = getRevInfo( $r1, $topic, 1 );
              $diff =~ s/%REVINFO1%/$rInfo/go;
!             $text = &TWiki::Store::getRevisionDiff( $topic, "1.$r2", "1.$r1" );
              $text = renderRevisionDiff( $text, $topic );
              $diff =~ s/%TEXT%/$text/go;
--- 182,186 ----
              $rInfo = getRevInfo( $r1, $topic, 1 );
              $diff =~ s/%REVINFO1%/$rInfo/go;
!             $text = &TWiki::Store::getRevisionDiff( $webName, $topic, "1.$r2", "1.$r1" );
              $text = renderRevisionDiff( $text, $topic );
              $diff =~ s/%TEXT%/$text/go;

Index: view
===================================================================
RCS file: /cvsroot/TWiki/twiki/bin/view,v
retrieving revision 1.16.2.1
retrieving revision 1.16.2.2
diff -C2 -r1.16.2.1 -r1.16.2.2
*** view	2001/03/17 05:03:01	1.16.2.1
--- view	2001/03/17 09:22:19	1.16.2.2
***************
*** 125,129 ****
  	$tmpl =~  s/%REVTITLE%//go;
      } else {
! 	$text = &TWiki::Store::readVersion( $topic, "1.$rev" );
  	( $revdate, $revuser ) = &TWiki::Store::getRevisionInfo( $topic, "1.$rev", 1 );
  	$extra .= "r1.$rev";
--- 125,129 ----
  	$tmpl =~  s/%REVTITLE%//go;
      } else {
! 	$text = &TWiki::Store::readVersion( $web, $topic, "1.$rev" );
  	( $revdate, $revuser ) = &TWiki::Store::getRevisionInfo( $topic, "1.$rev", 1 );
  	$extra .= "r1.$rev";
***************
*** 161,165 ****
  
      $revuser = &TWiki::userToWikiName( $revuser );
!     $tmpl =~ s/%REVINFO%/"r1.$rev - $revdate GMT - $revuser"/go;
  
      return ($tmpl, $text, $extra);
--- 161,166 ----
  
      $revuser = &TWiki::userToWikiName( $revuser );
!     my $tmp = "r1.$rev - $revdate GMT - $revuser";
!     $tmpl =~ s/%REVINFO%/$tmp/go;
  
      return ($tmpl, $text, $extra);