[TWiki-Dev] CVS: twiki/bin rename,1.30,1.31

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

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

Modified Files:
	rename 
Log Message:
Codev.FasterRenameWithCurrentWebRefsOnly

Index: rename
===================================================================
RCS file: /cvsroot/twiki/twiki/bin/rename,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -r1.30 -r1.31
*** rename	17 Jul 2002 07:33:17 -0000	1.30
--- rename	27 Jul 2002 08:43:29 -0000	1.31
***************
*** 44,47 ****
--- 44,48 ----
      my $theAttachment = $query->param( 'attachment' );
      my $confirm = $query->param( 'confirm' );
+     my $currentWebOnly = $query->param( 'currentwebonly' ) || "";
      my $doAllowNonWikiWord = $query->param( 'nonwikiword' ) || "";
      my $skin = $query->param( "skin" ) || TWiki::Prefs::getPreferencesValue( "SKIN" );
***************
*** 62,69 ****
      # justChangeRefs will be true when some topics that had links to $oldTopic
      # still need updating, previous update being prevented by a lock.
!     my $justChangeRefs = $query->param( 'changeRefs' );
!     if( ! $justChangeRefs ) {
!        $justChangeRefs = "";
!     }
  
      my $fileName = &TWiki::Store::getFileName($oldWeb, $oldTopic);
--- 63,67 ----
      # justChangeRefs will be true when some topics that had links to $oldTopic
      # still need updating, previous update being prevented by a lock.
!     my $justChangeRefs = $query->param( 'changeRefs' ) || "";
  
      my $fileName = &TWiki::Store::getFileName($oldWeb, $oldTopic);
***************
*** 83,87 ****
      # Has user selected new name yet?
      if( ! $newTopic || $confirm ) {
!        newTopicScreen( $oldWeb, $oldTopic, $newWeb, $newTopic, $theAttachment, $confirm, $skin );
         return;
      } 
--- 81,86 ----
      # Has user selected new name yet?
      if( ! $newTopic || $confirm ) {
!        newTopicScreen( $oldWeb, $oldTopic, $newWeb, $newTopic, $theAttachment,
!                        $confirm, $currentWebOnly, $skin );
         return;
      } 
***************
*** 373,377 ****
  sub newTopicScreen
  {
!    my( $oldWeb, $oldTopic, $newWeb, $newTopic, $theAttachment, $confirm, $skin ) = @_;
     
     my $tmpl = "";
--- 372,376 ----
  sub newTopicScreen
  {
!    my( $oldWeb, $oldTopic, $newWeb, $newTopic, $theAttachment, $confirm, $currentWebOnly, $skin ) = @_;
     
     my $tmpl = "";
***************
*** 394,397 ****
--- 393,399 ----
     $tmpl = &TWiki::handleCommonTags( $tmpl, $oldTopic, $oldWeb );
     $tmpl = &TWiki::getRenderedVersion( $tmpl );
+    if( $currentWebOnly ) {
+      $tmpl =~ s/%RESEARCH\{.*?web=\"all\".*\}%/(skipped)/o; # Remove search all web search
+    }
     $tmpl =~ s/%RESEARCH/%SEARCH/go; # Pre search result from being rendered
     $tmpl = &TWiki::handleCommonTags( $tmpl, $oldTopic, $oldWeb );