[TWiki-Dev] CVS: twiki/bin TWiki.cfg,1.2,1.3 TWiki.pm,1.9,1.10 search,1.8,1.9

[Peter T. <pet...@us...>]

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

Modified Files:
	TWiki.cfg TWiki.pm search 
Log Message:
Codev.AttachmentsUnderRevisionControl, Codev.RenameTopic

Index: TWiki.cfg
===================================================================
RCS file: /cvsroot/twiki/twiki/bin/TWiki.cfg,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** TWiki.cfg	2001/02/12 05:12:32	1.2
--- TWiki.cfg	2001/03/03 18:58:41	1.3
***************
*** 80,83 ****
--- 80,86 ----
  #                   RCS directory (find out by 'which rcs') :
  $rcsDir           = "/usr/bin";
+ #                   Initialise RCS file, ignored if empty string,
+ #                   needed on Windows for binary files. Added JET 22-Feb-01
+ $revInitBinaryCmd = "$rcsDir/rcs -q -i -kb %FILENAME%";
  #                   RCS check in command :
  $revCiCmd         = "$rcsDir/ci -l -q -mnone -t-none -w'%USERNAME%' %FILENAME%";
***************
*** 173,176 ****
--- 176,181 ----
  #                   Log topic saves to $logFilename. Default "1"
  $doLogTopicSave     = "1";
+ #                   Log renames to $logFilename. Default "1".  Added JET 22-Feb-01
+ $doLogRename        = "1";
  #                   Log view attach to $logFilename. Default "1"
  $doLogTopicAttach   = "1";

Index: TWiki.pm
===================================================================
RCS file: /cvsroot/twiki/twiki/bin/TWiki.pm,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** TWiki.pm	2001/03/02 07:55:17	1.9
--- TWiki.pm	2001/03/03 18:58:41	1.10
***************
*** 76,80 ****
          $doRememberRemoteUser $doPluralToSingular
          $doHidePasswdInRegistration $doSecureInclude
!         $doLogTopicView $doLogTopicEdit $doLogTopicSave
          $doLogTopicAttach $doLogTopicUpload $doLogTopicRdiff 
          $doLogTopicChanges $doLogTopicSearch $doLogRegistration
--- 76,80 ----
          $doRememberRemoteUser $doPluralToSingular
          $doHidePasswdInRegistration $doSecureInclude
!         $doLogTopicView $doLogTopicEdit $doLogTopicSave $doLogRename
          $doLogTopicAttach $doLogTopicUpload $doLogTopicRdiff 
          $doLogTopicChanges $doLogTopicSearch $doLogRegistration
***************
*** 87,92 ****
  # TWiki::Store config:
  use vars qw(
!         $revCoCmd $revCiCmd $revCiDateCmd $revHistCmd $revInfoCmd
!         $revDiffCmd $revDelRevCmd $revUnlockCmd $revLockCmd
      );
  
--- 87,92 ----
  # TWiki::Store config:
  use vars qw(
!         $revInitBinaryCmd $revCoCmd $revCiCmd $revCiDateCmd $revHistCmd
!         $revInfoCmd $revDiffCmd $revDelRevCmd $revUnlockCmd $revLockCmd
      );
  
***************
*** 100,104 ****
  # ===========================
  # TWiki version:
! $wikiversion      = "01 Mar 2001";
  
  # ===========================
--- 100,104 ----
  # ===========================
  # TWiki version:
! $wikiversion      = "02 Mar 2001";
  
  # ===========================
***************
*** 575,595 ****
      }
  
!     my $attrWeb = extractNameValuePair( $attributes, "web" );
!     my $attrScope = extractNameValuePair( $attributes, "scope" );
!     my $attrOrder = extractNameValuePair( $attributes, "order" );
!     my $attrRegex = extractNameValuePair( $attributes, "regex" );
!     my $attrLimit = extractNameValuePair( $attributes, "limit" );
!     my $attrReverse = extractNameValuePair( $attributes, "reverse" );
      my $attrCasesensitive = extractNameValuePair( $attributes, "casesensitive" );
!     my $attrNosummary = extractNameValuePair( $attributes, "nosummary" );
!     my $attrNosearch = extractNameValuePair( $attributes, "nosearch" );
!     my $attrNoheader = extractNameValuePair( $attributes, "noheader" );
!     my $attrNototal = extractNameValuePair( $attributes, "nototal" );
!     my $attrBookview = extractNameValuePair( $attributes, "bookview" );
  
      return &TWiki::Search::searchWeb( "1", $attrWeb, $searchVal, $attrScope,
         $attrOrder, $attrRegex, $attrLimit, $attrReverse,
         $attrCasesensitive, $attrNosummary, $attrNosearch,
!        $attrNoheader, $attrNototal, $attrBookview
      );
  }
--- 575,596 ----
      }
  
!     my $attrWeb           = extractNameValuePair( $attributes, "web" );
!     my $attrScope         = extractNameValuePair( $attributes, "scope" );
!     my $attrOrder         = extractNameValuePair( $attributes, "order" );
!     my $attrRegex         = extractNameValuePair( $attributes, "regex" );
!     my $attrLimit         = extractNameValuePair( $attributes, "limit" );
!     my $attrReverse       = extractNameValuePair( $attributes, "reverse" );
      my $attrCasesensitive = extractNameValuePair( $attributes, "casesensitive" );
!     my $attrNosummary     = extractNameValuePair( $attributes, "nosummary" );
!     my $attrNosearch      = extractNameValuePair( $attributes, "nosearch" );
!     my $attrNoheader      = extractNameValuePair( $attributes, "noheader" );
!     my $attrNototal       = extractNameValuePair( $attributes, "nototal" );
!     my $attrBookview      = extractNameValuePair( $attributes, "bookview" );
!     my $attrRenameview    = extractNameValuePair( $attributes, "renameview" );
  
      return &TWiki::Search::searchWeb( "1", $attrWeb, $searchVal, $attrScope,
         $attrOrder, $attrRegex, $attrLimit, $attrReverse,
         $attrCasesensitive, $attrNosummary, $attrNosearch,
!        $attrNoheader, $attrNototal, $attrBookview, $attrRenameview
      );
  }

Index: search
===================================================================
RCS file: /cvsroot/twiki/twiki/bin/search,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** search	2001/02/17 09:58:45	1.8
--- search	2001/03/03 18:58:41	1.9
***************
*** 88,94 ****
      my $nototal       = $query->param( "nototal" ) || "";
      my $bookView      = $query->param( "bookview" )  || ""; # PTh 20 Jul 2000
  
      &TWiki::Search::searchWeb( "0", $websStr, $search, $scope, $order, $regex,
                                 $limit, $revSort, $caseSensitive, $nosummary,
!                                $nosearch, $noheader, $nototal, $bookView );
  }
--- 88,95 ----
      my $nototal       = $query->param( "nototal" ) || "";
      my $bookView      = $query->param( "bookview" )  || ""; # PTh 20 Jul 2000
+     my $renameView    = $query->param( "renameview" )  || "";
  
      &TWiki::Search::searchWeb( "0", $websStr, $search, $scope, $order, $regex,
                                 $limit, $revSort, $caseSensitive, $nosummary,
!                                $nosearch, $noheader, $nototal, $bookView, $renameView );
  }