[TWiki-Dev] CVS: twiki/lib/TWiki Search.pm,1.42,1.43

[Richard D. <rd...@us...>]

Update of /cvsroot/twiki/twiki/lib/TWiki
In directory sc8-pr-cvs1:/tmp/cvs-serv4997/TWiki

Modified Files:
	Search.pm 
Log Message:
Internationalisation support for sorting of search results (mainly
WikiWords) - see Codev.InternationalisationEnhancements.


Index: Search.pm
===================================================================
RCS file: /cvsroot/twiki/twiki/lib/TWiki/Search.pm,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -r1.42 -r1.43
*** Search.pm	17 Oct 2002 21:55:52 -0000	1.42
--- Search.pm	30 Nov 2002 21:56:23 -0000	1.43
***************
*** 34,43 ****
  
  package TWiki::Search;
- 
  use strict;
  
! ##use vars qw(
! ##        $lsCmd $egrepCmd $fgrepCmd
! ##);
  
  # ===========================
--- 34,48 ----
  
  package TWiki::Search;
  use strict;
  
! # 'Use locale' for internationalisation of Perl sorting - 
! # main locale settings are done in TWiki::setupLocale
! BEGIN {
!     # Do a dynamic 'use locale' for this module
!     if( $TWiki::useLocale ) {
!         require locale;
!         import locale ();
!     }
! }
  
  # ===========================
***************
*** 60,63 ****
--- 65,70 ----
           @junk ) = @_;
  
+     ##TWiki::writeDebug "Search locale is $TWiki::siteLocale";
+ 
      ## 0501 kk : vvv new option to limit results
      # process the result limit here, this is the 'global' limit for
***************
*** 422,425 ****
--- 429,433 ----
          } else {
              # sort by filename, Schwartzian Transform
+ 	    ##TWiki::writeDebug "Topic list before sort = @topicList";
              if( $revSort ) {
                  @topicList = map { $_->[1] }
***************
*** 433,436 ****
--- 441,445 ----
                               @topicList;
              }
+ 	    ##TWiki::writeDebug "Topic list after sort = @topicList";
          }