[zaptel-commits] tzafrir: branch 1.4 r4489 - in /branches/1.4: ./ kernel/xpp/utils/zconf/Zaptel/

[SVN commits to the Zaptel project]

Author: tzafrir
Date: Sun Aug 17 12:08:21 2008
New Revision: 4489

URL: http://svn.digium.com/view/zaptel?view=rev&rev=4489
Log:
Zaptel-perl: fix leftovers from r4475 (handling of spaces)

While r4476 solved some parsing problems of channels with "strange"
encoding names, it introduced a new problem (e.g.: "RED" after "(In
use)" which is fixed here.

Merged revisions 4488 via svnmerge from 
http://svn.digium.com/svn/zaptel/branches/1.2

Modified:
    branches/1.4/   (props changed)
    branches/1.4/kernel/xpp/utils/zconf/Zaptel/Chans.pm

Propchange: branches/1.4/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: branches/1.4/kernel/xpp/utils/zconf/Zaptel/Chans.pm
URL: http://svn.digium.com/view/zaptel/branches/1.4/kernel/xpp/utils/zconf/Zaptel/Chans.pm?view=diff&rev=4489&r1=4488&r2=4489
==============================================================================
--- branches/1.4/kernel/xpp/utils/zconf/Zaptel/Chans.pm (original)
+++ branches/1.4/kernel/xpp/utils/zconf/Zaptel/Chans.pm Sun Aug 17 12:08:21 2008
@@ -104,23 +104,23 @@
 	my $info = '';
 	if(defined $rest) {
 		# remarks in parenthesis (In use), (no pcm)
-		while($rest =~ s/\s*(\([^)]+\))\s*//) {
+		while($rest =~ s/\s*(\([^)]+\))\s*/ /) {
 			$info .= " $1";
 		}
 		# Alarms
 		foreach my $alarm (@alarm_types) {
-			if($rest =~ s/\s*(\b${alarm}\b)\s*//) {
+			if($rest =~ s/\s*(\b${alarm}\b)\s*/ /) {
 				push(@alarms, $1);
 			}
 		}
 		foreach my $sig (@sigtypes) {
-			if($rest =~ s/^\Q$sig\E//) {
+			if($rest =~ s/^\Q$sig\E/ /) {
 				$signalling = $sig;
 				last;
 			}
 		}
 		warn "Unrecognized garbage '$rest' in $fqn\n"
-			if length($rest);
+			if $rest =~ /\S/;
 	}
 	$self->{NUM} = $num;
 	$self->{FQN} = $fqn;