*** TWiki.pm	Wed May 29 15:59:06 2002
--- /home/jwasson/tmp/lib/TWiki.pm	Mon Dec  3 22:59:42 2001
***************
*** 338,385 ****
  }
  
  # =========================
- sub getEmailNotifySubscriptionList
- {
-     my( $web, $topicname ) = @_;
- 
-     $topicname = $TWiki::notifyTopicname unless $topicname;
-     return() unless &TWiki::Store::topicExists( $web, $topicname );
- 
-     my %subscriptions;
-     $subscriptions{'*'} = {};
-     my $email = "";
-     foreach ( split( /\n/, &TWiki::Store::readWebTopic( $web, $topicname ) ) ) {
- 	next unless /^\s\*\s[A-Za-z0-9\.]+\s+\-\s+/;
- 	if (/([\w\-\.\+]+\@[\w\-\.\+]+)\s(.*)/)
-         {
-             $email = $1;
-             SWITCH: for ($2){
-                 /([\-+])\s+(.*)$/ && do
-                 {
-                     my @topics = split /\s/, $2;
-                     for my $t (@topics)
-                     {
-                         if (!exists $subscriptions{$t})
-                         {
-                            $subscriptions{$t} = {};
-                         }
-                         $subscriptions{$t}{$email} = $1;
-                     }
-                     last SWITCH if ($1 eq '+'); # else fall-through
-                 };
-                 do
-                 {
-                     $subscriptions{'*'}{$email} = '+'; 
-                     last SWITCH;
-                 };
-             }
-         }
-     }
- 
-     return( %subscriptions );
- }
- 
- # =========================
  sub initializeRemoteUser
  {
      my( $theRemoteUser ) = @_;
--- 338,343 ----