--- googlecode.com/svn/trunk/Meteor/Subscriber.pm	2008/02/04 21:06:42	47
+++ googlecode.com/svn/trunk/Meteor/Subscriber.pm	2008/02/28 13:33:06	56
@@ -80,7 +80,7 @@
 	
 	if(exists($PersistentConnections{$id}))
 	{
-		$PersistentConnections{$id}->close();
+		$PersistentConnections{$id}->close(0,'newSubscriberWithSameID');
 	}
 }
 
@@ -134,34 +134,20 @@
 		#
 		# Find the 'GET' line
 		#
-		if($self->{'headerBuffer'}=~/GET\s+$::CONF{'SubscriberDynamicPageAddress'}\/([0-9a-z]+)\/([0-9a-z]+)\/(\S+)/i)
+		if($self->{'headerBuffer'}=~/GET\s+$::CONF{'SubscriberDynamicPageAddress'}\/([0-9a-z]+)\/([0-9a-z]+)\/([a-z0-9_\-\%\.\/]+).*?/i)
 		{
-			my $subscriberID=$1;
+			$self->{'subscriberID'}=$1;
 			$self->{'mode'}=$2;
 			my $persist=$self->getConf('Persist');
-			
-			if ($self->{'mode'} eq "xhrinteractive" || $self->{'mode'} eq "iframe" || $self->{'mode'} eq "serversent" || $self->{'mode'} eq "longpoll") {
-				$persist=1;
-				$self->{'MaxMessageCount'}=1 unless(!($self->{'mode'} eq "longpoll"));
-			}
-			if ($self->{'mode'} eq "iframe") {
-				$self->{'HeaderTemplateNumber'}=1;
-			} else {
-				$self->{'HeaderTemplateNumber'}=2;
-			}
-			
 			my $maxTime=$self->getConf('MaxTime');
-			if($maxTime>0)
-			{
-				$self->{'ConnectionTimeLimit'}=$self->{'ConnectionStart'}+$maxTime;
-			}
+			$self->{'ConnectionTimeLimit'} = ($self->{'ConnectionStart'}+$maxTime) if ($maxTime>0);
 			
 			my @channelData=split('/',$3);
 			my $channels={};
 			my $channelName;
 			my $offset;
 			foreach my $chandef (@channelData) {
-				if($chandef=~/^([a-z0-9]+)(.(r|b|h)([0-9]*))?$/i) {
+				if($chandef=~/^([a-z0-9_\-\%]+)(.(r|b|h)([0-9]*))?$/i) {
 					$channelName = $1;
 					$channels->{$channelName}->{'startIndex'} = undef;
 					if ($3) {
@@ -172,21 +158,32 @@
 					}
 				}
 			}
+			my $useragent = ($self->{'headerBuffer'}=~/User-Agent: (.+)/i) ? $1 : "-";
 			
 			delete($self->{'headerBuffer'});
 			
-			if($persist)
-			{
-				$self->{'subscriberID'}=$subscriberID;
-				$self->deleteSubscriberWithID($subscriberID);
-				$PersistentConnections{$subscriberID}=$self;
+			if ($persist) {
+				$self->deleteSubscriberWithID($self->{'subscriberID'});
+				$PersistentConnections{$self->{'subscriberID'}}=$self;
 			}
 			
-			if(scalar(keys %{$channels}))
-			{
+			if(scalar(keys %{$channels})) {
+
+				$self->{'channelinfo'} = '';
+				my $citemplate = $self->getConf('ChannelInfoTemplate');
+				foreach $channelName (keys %{$channels}) {
+					my $channel=Meteor::Channel->channelWithName($channelName);
+					$self->{'channels'}->{$channelName}=$channel;
+					$self->{'channelinfo'} .= $channel->descriptionWithTemplate($citemplate);
+					
+				}
 				$self->emitOKHeader();
-				$self->setChannels($channels,$persist,$self->{'mode'},'');
-				$self->close(1) unless($persist);
+				foreach $channelName (keys %{$channels}) {
+					my $startIndex=$channels->{$channelName}->{'startIndex'};
+					$self->{'channels'}->{$channelName}->addSubscriber($self,$startIndex,$persist,$self->{'mode'},$useragent);
+				}
+				delete ($self->{'channels'}) unless($persist);
+				$self->close(1, 'responseComplete') unless($persist);
 				return;
 			}
 		}
@@ -194,13 +191,13 @@
 		{
 			$self->deleteSubscriberWithID($1);
 			$self->emitOKHeader();
-			$self->close(1);
+			$self->close(1, 'disconnectRequested');
 			return;
 		}
 		elsif($self->{'headerBuffer'}=~/GET\s+([^\s\?]+)/)
 		{
 			Meteor::Document->serveFileToClient($1,$self);
-			$self->close(1);
+			$self->close(1, 'responseComplete');
 			return;
 		}
 		
@@ -211,25 +208,6 @@
 	}
 }
 
-sub setChannels {
-	my $self=shift;
-	my $channels=shift;
-	my $persist=shift;
-	my $mode=shift || '';
-	my $userAgent=shift || '';
-	
-	foreach my $channelName (keys %{$channels})
-	{
-		my $startIndex=$channels->{$channelName}->{'startIndex'};
-		
-		my $channel=Meteor::Channel->channelWithName($channelName);
-		
-		$self->{'channels'}->{$channelName}=$channel if($persist);
-		
-		$channel->addSubscriber($self,$startIndex,$persist,$mode,$userAgent);
-	}
-}
-
 sub emitOKHeader {
 	my $self=shift;
 	
@@ -243,45 +221,27 @@
 	$::Statistics->{'errors_served'}++;
 	
 	# close up shop here!
-	$self->close();
+	$self->close(0, 'error');
 }
 
 sub emitHeader {
 	my $self=shift;
 	my $status=shift;
 	
-	my $header=undef;
-	if(exists($self->{'HeaderTemplateNumber'}))
-	{
-		my $hn='HeaderTemplate'.$self->{'HeaderTemplateNumber'};
-		
-		$header=$self->getConf($hn);
-	}
-	$header=$self->getConf('HeaderTemplate') unless(defined($header));
+	my $header=$self->getConf('HeaderTemplate');
 	
 	$header=~s/~([^~]*)~/
-		if(!defined($1) || $1 eq '')
-		{
+		if(!defined($1) || $1 eq '') {
 			'~';
-		}
-		elsif($1 eq 'server')
-		{
+		} elsif($1 eq 'server') {
 			$::PGM;
-		}
-		elsif($1 eq 'status')
-		{
+		} elsif($1 eq 'status') {
 			$status;
-		}
-		elsif($1 eq 'servertime')
-		{
+		} elsif($1 eq 'servertime') {
 			time;
-		}
-		elsif($1 eq 'channelinfo')
-		{
-			Meteor::Channel->listChannelsUsingTemplate($self->getConf('ChannelInfoTemplate'));
-		}
-		else
-		{
+		} elsif($1 eq 'channelinfo') {
+			$self->{'channelinfo'};
+		} else {
 			'';
 		}
 	/gex;
@@ -293,7 +253,7 @@
 	my $self=shift;
 	
 	my $numMessages=0;
-	my $msgTemplate=$self->getConf('Messagetemplate');
+	my $msgTemplate=$self->getConf('MessageTemplate');
 	my $msgData='';
 	
 	foreach my $message (@_)
@@ -315,12 +275,12 @@
 	my $maxMsg=$self->getConf('MaxMessages');
 	if(defined($maxMsg) && $maxMsg>0 && $msgCount>=$maxMsg)
 	{
-		$self->close(1);
+		$self->close(1, 'maxMessageCountReached');
 	}
 	
 	if($self->{'MaxMessageCount'}>0 && $msgCount>=$self->{'MaxMessageCount'})
 	{
-		$self->close(1);
+		$self->close(1, 'maxMessageCountReached');
 	}
 	
 }
@@ -343,29 +303,31 @@
 	
 	delete($self->{'channels'}->{$channelName});
 	
-	$self->close(0,'channelsClosed') if(scalar(keys %{$self->{'channels'}})==0);
+	$self->close(0,'channelClose') if(scalar(keys %{$self->{'channels'}})==0);
 }
 
 sub close {
 	my $self=shift;
 	my $noShutdownMsg=shift;
+	my $reason=shift;
 	
 	foreach my $channelName (keys %{$self->{'channels'}})
 	{
 		my $channel=$self->{'channels'}->{$channelName};
-		$channel->removeSubscriber($self,'subscriberClose');
+		$channel->removeSubscriber($self,$reason);
 	}
 	delete($self->{'channels'});
 	
-	if(exists($self->{'subscriberID'}))
-	{
+	# If this connection is in the PersistentConnections array, delete it, then anonymise 
+	# it so that if we have to wait for the write buffer to empty before close, it's only
+	# removed once.
+	if(exists($self->{'subscriberID'})) {
 		delete($PersistentConnections{$self->{'subscriberID'}});
+		delete($self->{'subscriberID'});
 	}
 	
-	#
 	# Send shutdown message unless remote closed or
 	# connection not yet established
-	#
 	unless($noShutdownMsg || $self->{'remoteClosed'} || exists($self->{'headerBuffer'}))
 	{
 		my $msg=$self->getConf('SubscriberShutdownMsg');
@@ -387,7 +349,7 @@
 	my $self=shift;
 	my $time=shift;
 	
-	$self->close(1) if(exists($self->{'ConnectionTimeLimit'}) && $self->{'ConnectionTimeLimit'}<$time);
+	$self->close(1,'maxTime') if(exists($self->{'ConnectionTimeLimit'}) && $self->{'ConnectionTimeLimit'}<$time);
 }
 
 sub getConf {
@@ -396,9 +358,11 @@
 	
 	if(exists($self->{'mode'}) && $self->{'mode'} ne '')
 	{
-		my $k=$key.'.'.$self->{'mode'};
+		my $k=$key.$self->{'mode'};
 		
-		return $::CONF{$k} if(exists($::CONF{$k}));
+		if(exists($::CONF{$k})) {
+			return $::CONF{$k};
+		}
 	}
 	
 	$::CONF{$key};