diff options
Diffstat (limited to 'xpp/utils')
| -rw-r--r-- | xpp/utils/Makefile | 4 | ||||
| -rwxr-xr-x | xpp/utils/astribank_hook | 18 | ||||
| -rw-r--r-- | xpp/utils/fpga_load.c | 30 | ||||
| -rwxr-xr-x | xpp/utils/lszaptel | 18 | ||||
| -rwxr-xr-x | xpp/utils/zapconf | 11 | ||||
| -rwxr-xr-x | xpp/utils/zaptel_hardware | 4 | ||||
| -rw-r--r-- | xpp/utils/zconf/Zaptel.pm | 2 | ||||
| -rw-r--r-- | xpp/utils/zconf/Zaptel/Chans.pm | 102 | ||||
| -rw-r--r-- | xpp/utils/zconf/Zaptel/Config/Defaults.pm | 25 | ||||
| -rw-r--r-- | xpp/utils/zconf/Zaptel/Hardware/PCI.pm | 17 | ||||
| -rw-r--r-- | xpp/utils/zconf/Zaptel/Span.pm | 17 | ||||
| -rw-r--r-- | xpp/utils/zconf/Zaptel/Xpp/Line.pm | 59 | ||||
| -rw-r--r-- | xpp/utils/zconf/Zaptel/Xpp/Xpd.pm | 43 |
13 files changed, 287 insertions, 63 deletions
diff --git a/xpp/utils/Makefile b/xpp/utils/Makefile index 7955b27..437b359 100644 --- a/xpp/utils/Makefile +++ b/xpp/utils/Makefile @@ -31,7 +31,6 @@ PERL_MODS := $(shell cd zconf; echo $(PERL_MODS_PAT)) XPD_FIRMWARE = $(wildcard ../firmwares/*.hex) XPD_INIT_DATA = $(XPD_FIRMWARE) init_fxo_modes XPD_INIT = $(wildcard ../init_card_?_*) ../calibrate_slics xpp_fxloader -XPD_INIT_PERL = ../init_card_6_29 ../init_card_7_29 ../init_card_9_29 # Variables that should be defined above, but need sane defaults: # FIXME: Are those values really sane? @@ -82,7 +81,6 @@ install: all $(INSTALL) -d $(DESTDIR)$(DATADIR) $(INSTALL_DATA) $(XPD_INIT_DATA) $(DESTDIR)$(DATADIR)/ $(INSTALL) $(XPD_INIT) $(DESTDIR)$(DATADIR)/ - $(INSTALL) astribank_hook $(DESTDIR)$(DATADIR)/ $(INSTALL) -d $(DESTDIR)$(MANDIR) $(INSTALL_DATA) $(MAN_INSTALL) $(DESTDIR)$(MANDIR)/ $(INSTALL) -d $(DESTDIR)$(HOTPLUG_USB_DIR) @@ -130,7 +128,7 @@ wctdm_fxomodes.h: $(WCTDM) init_fxo_modes: print_modes ./$< >$@ -perlcheck: $(PERL_SCRIPTS) $(XPD_INIT_PERL) +perlcheck: $(PERL_SCRIPTS) for i in $^; do perl -I./zconf -c $$i || exit 1; done touch $@ diff --git a/xpp/utils/astribank_hook b/xpp/utils/astribank_hook index 53d42f9..351cd93 100755 --- a/xpp/utils/astribank_hook +++ b/xpp/utils/astribank_hook @@ -1,14 +1,22 @@ #! /bin/sh +# This is an example of an Astribank device hook. The xpp.rules file +# calls /usr/share/zaptel/astribank_hook after a new Astribank is ready +# and after and old Astribank device has been destroyed. +# +# This example script sets the sync source, and thus makes the call to +# xpp_sync in the init.d script unnecessary. + set -e -xpp_sync="/root/xortel/xpp_sync" +xpp_sync="/usr/sbin/xpp_sync" me=`basename $0` INIT_DIR=`dirname $0` XPP_BASE=/proc/xpp export XPP_BASE LOGGER="logger -s -t $me" +XPP_SYNC='auto' ZAPTEL_BOOT_DEBIAN=${ZAPTEL_BOOT_DEBIAN:-/etc/default/zaptel} ZAPTEL_BOOT_FEDORA=${ZAPTEL_BOOT_FEDORA:-/etc/sysconfig/zaptel} @@ -29,16 +37,14 @@ fi ## If you wish to trace this script: #exec 2> "/tmp/astribank_hook_$XBUS_NAME" -$LOGGER -p kern.info "$ACTION: $*" - -$LOGGER -p kern.info "Change Sync" +$LOGGER -p kern.info "$ACTION: $*. Setting sync to $XPP_SYNC." case "$ACTION" in add) - "$xpp_sync" auto + "$xpp_sync" $XPP_SYNC ;; remove) - "$xpp_sync" auto + "$xpp_sync" $XPP_SYNC ;; *) ;; diff --git a/xpp/utils/fpga_load.c b/xpp/utils/fpga_load.c index 92e3c33..3d6bdbe 100644 --- a/xpp/utils/fpga_load.c +++ b/xpp/utils/fpga_load.c @@ -28,6 +28,7 @@ static const char rcsid[] = "$Id$"; static int verbose = LOG_WARNING; static char *progname; +static int disconnected = 0; #define MAX_HEX_LINES 10000 #define PACKET_SIZE 512 @@ -238,18 +239,22 @@ int get_usb_string(char *buf, unsigned int len, uint16_t item, usb_dev_handle *h return snprintf(buf, len, "%s", tmp); } -void my_usb_device_cleanup(struct my_usb_device *mydev, const struct astribank_type *abtype) +void my_usb_device_cleanup(struct my_usb_device *mydev) { assert(mydev != NULL); if(!mydev->handle) { return; /* Nothing to do */ } - if(usb_release_interface(mydev->handle, abtype->my_interface_num) != 0) { - ERR("Releasing interface: usb: %s\n", usb_strerror()); + if(!disconnected) { + if(usb_release_interface(mydev->handle, mydev->abtype->my_interface_num) != 0) { + ERR("Releasing interface: usb: %s\n", usb_strerror()); + } } if(usb_close(mydev->handle) != 0) { ERR("Closing device: usb: %s\n", usb_strerror()); } + disconnected = 1; + mydev->handle = NULL; } static void show_device_info(const struct my_usb_device *mydev) @@ -295,8 +300,17 @@ int send_usb(const char *msg, struct my_usb_device *mydev, struct fpga_packet_he } ret = usb_bulk_write(mydev->handle, mydev->my_ep_out, p, len, timeout); if(ret < 0) { - ERR("bulk_write to endpoint 0x%x failed: %s\n", mydev->my_ep_out, usb_strerror()); - dump_packet("send_usb[ERR]", p, len); + /* + * If the device was gone, it may be the + * result of renumeration. Ignore it. + */ + if(ret != -ENODEV) { + ERR("bulk_write to endpoint 0x%x failed: %s\n", mydev->my_ep_out, usb_strerror()); + dump_packet("send_usb[ERR]", p, len); + } else { + disconnected = 1; + my_usb_device_cleanup(mydev); + } return ret; } else if(ret != len) { ERR("bulk_write to endpoint 0x%x short write: %s\n", mydev->my_ep_out, usb_strerror()); @@ -611,8 +625,8 @@ int renumerate_device(struct my_usb_device *mydev, enum fpga_load_packet_types p DBG("Renumerating with 0x%X\n", pt); phead->header.op = pt; ret = send_usb("renumerate[W]", mydev, phead, 1, TIMEOUT); - if(ret < 0) - return ret; + if(ret < 0 && ret != -ENODEV) + return ret; #if 0 /* * FIXME: we count on our USB firmware to reset the device... should we? @@ -984,6 +998,6 @@ int main(int argc, char *argv[]) } DBG("Exiting\n"); dev_err: - my_usb_device_cleanup(&mydev, abtype); + my_usb_device_cleanup(&mydev); return ret; } diff --git a/xpp/utils/lszaptel b/xpp/utils/lszaptel index 3126c8a..a836d98 100755 --- a/xpp/utils/lszaptel +++ b/xpp/utils/lszaptel @@ -13,8 +13,20 @@ BEGIN { my $dir = dirname($0); unshift(@INC, "$dir", "$dir/zconf"); } use Zaptel; use Zaptel::Span; +use Zaptel::Xpp; +use Zaptel::Xpp::Xbus; +use Zaptel::Xpp::Xpd; + +my @xbuses = Zaptel::Xpp::xbuses("SORT_CONNECTOR"); +my @xpds = map { $_->xpds } @xbuses; foreach my $span (Zaptel::spans()) { + my $spanno = $span->num; + my $xpd = $span->xpd; + my @lines; + my $index = 0; + + @lines = @{$xpd->lines} if defined $xpd; printf "### Span %2d: %s %s\n", $span->num, $span->name, $span->description; foreach my $chan ($span->chans()) { my %type_map = ( @@ -22,7 +34,11 @@ foreach my $span (Zaptel::spans()) { IN => 'Input' ); my ($type) = map { $type_map{$_} or $_ } $chan->type || ("unknown"); - printf "%3d %-10s %-10s %s\n", $chan->num, $type, $chan->signalling, $chan->info; + my $batt = ""; + $batt = "(battery)" if $chan->battery; + printf "%3d %-10s %-10s %s %s\n", + $chan->num, $type, $chan->signalling, $chan->info, $batt; + $index++; } } diff --git a/xpp/utils/zapconf b/xpp/utils/zapconf index 8ddbb81..dd6ab1f 100755 --- a/xpp/utils/zapconf +++ b/xpp/utils/zapconf @@ -502,16 +502,9 @@ sub gen_zapataconf($) { } sub set_defaults { - my $zaptel_boot_debian = $ENV{ZAPTEL_BOOT_DEBIAN} || "/etc/default/zaptel"; - my $zaptel_boot_fedora = $ENV{ZAPTEL_BOOT_FEDORA} || "/etc/sysconfig/zaptel"; - # Source default files - my %source_defaults; - foreach my $defaults ($zaptel_boot_debian, $zaptel_boot_fedora) { - %source_defaults = Zaptel::Config::Defaults::do_source( - $defaults, keys(%zaptel_default_vars)) - if -r $defaults; - } + my ($default_file, %source_defaults) = + Zaptel::Config::Defaults::source_vars(keys(%zaptel_default_vars)); map_zaptel_defaults(%source_defaults); # Fixups foreach my $val (values %default_zaptel_signalling, values %default_zapata_signalling) { diff --git a/xpp/utils/zaptel_hardware b/xpp/utils/zaptel_hardware index a356f2c..004a44b 100755 --- a/xpp/utils/zaptel_hardware +++ b/xpp/utils/zaptel_hardware @@ -75,9 +75,9 @@ foreach my $dev ($hardware->device_list) { my $loaded; if($dev->is_astribank) { $xbus = $dev->xbus; - $loaded = $dev->loaded; } - die "driver should be '$driver' but is actually '$loaded'" + $loaded = $dev->loaded; + warn "driver should be '$driver' but is actually '$loaded'\n" if defined($loaded) && $driver ne $loaded; $driver = "$driver" . (($loaded) ? "+" : "-"); my $description = $dev->description || ""; diff --git a/xpp/utils/zconf/Zaptel.pm b/xpp/utils/zconf/Zaptel.pm index e9d0529..a7e7d6c 100644 --- a/xpp/utils/zconf/Zaptel.pm +++ b/xpp/utils/zconf/Zaptel.pm @@ -14,7 +14,7 @@ use Zaptel::Span; Zaptel - Perl interface to Zaptel information -This package allows access from perl to information about Zaptel +This package allows access from Perl to information about Zaptel hardware and loaded Zaptel devices. =head1 SYNOPSIS diff --git a/xpp/utils/zconf/Zaptel/Chans.pm b/xpp/utils/zconf/Zaptel/Chans.pm index 16ab1d5..b02bf24 100644 --- a/xpp/utils/zconf/Zaptel/Chans.pm +++ b/xpp/utils/zconf/Zaptel/Chans.pm @@ -10,31 +10,86 @@ package Zaptel::Chans; use strict; use Zaptel::Utils; +=head1 NAME + +Zaptel::Chans - Perl interface to a Zaptel channel information + +This package allows access from perl to information about a Zaptel +channel. It is part of the Zaptel Perl package. + +=head1 battery() + +Returns 1 if channel reports to have battery (A remote PBX connected to +an FXO port), 0 if channel reports to not have battery and C<undef> +otherwise. + +Currently only wcfxo and Astribank FXO modules report battery. For the +rest of the channels + +=head1 fqn() + +(Fully Qualified Name) Returns the full "name" of the channel. + +=head1 index() + +Returns the number of this channel (in the span). + +=head1 num() + +Returns the number of this channel as a Zaptel channel. + +=head signalling() + +Returns the signalling set for this channel through /etc/zaptel.conf . +This is always empty before ztcfg was run. And shows the "other" type +for FXS and for FXO. + +=head1 span() + +Returns a reference to the span to which this channel belongs. + +=head1 type() + +Returns the type of the channel: 'FXS', 'FXO', 'EMPTY', etc. + +=cut + sub new($$$$$$) { my $pack = shift or die "Wasn't called as a class method\n"; my $span = shift or die "Missing a span parameter\n"; + my $index = shift; my $line = shift or die "Missing an input line\n"; + defined $index or die "Missing an index parameter\n"; + my $self = { + 'SPAN' => $span, + 'INDEX' => $index, + }; + bless $self, $pack; my ($num, $fqn, $rest) = split(/\s+/, $line, 3); $num or die "Missing a channel number parameter\n"; $fqn or die "Missing a channel fqn parameter\n"; my $signalling = ''; - if(defined $rest && ($rest =~ s/(\w+)//)) { - $signalling = $1; - } my $info = ''; - if(defined $rest && ($rest =~ s/(.*)//)) { - $info = $1; + if(defined $rest) { + if($rest =~ s/^\s*(\w+)\s*//) { + $signalling = $1; + } + if($rest =~ s/(.*)//) { + $info = $1; + } } - my $self = {}; - bless $self, $pack; - $self->{SPAN} = $span; $self->{NUM} = $num; $self->{FQN} = $fqn; $self->{SIGNALLING} = $signalling; $self->{INFO} = $info; my $type; if($fqn =~ m|\bXPP_(\w+)/.*$|) { - $type = $1; # One of our AB + $type = $1; # An Astribank + } elsif ($fqn =~ m{\bWCFXO/.*}) { + $type = "FXO"; # wcfxo - x100p and relatives. + # A single port card. The driver issue RED alarm when + # There's no better + $self->{BATTERY} = !($span->description =~ /\bRED\b/); } elsif ($fqn =~ m{\bFXS/.*}) { $type = "FXS"; # likely Rhino } elsif ($fqn =~ m{\bFXO/.*}) { @@ -69,6 +124,18 @@ sub new($$$$$$) { return $self; } +=head1 probe_type() + +In the case of some cards, the information in /proc/zaptel is not good +enough to tell the type of each channel. In this case an extra explicit +probe is needed. + +Currently this is implemented by using some invocations of ztcfg(8). + +It may later be replaced by ztscan(8). + +=cut + my $ztcfg = $ENV{ZTCFG} || '/sbin/ztcfg'; sub probe_type($) { my $self = shift; @@ -100,4 +167,21 @@ sub probe_type($) { return $type; } +sub battery($) { + my $self = shift or die; + my $span = $self->span or die; + + return undef unless $self->type eq 'FXO'; + return $self->{BATTERY} if defined $self->{BATTERY}; + + my $xpd = $span->xpd; + my $index = $self->index; + return undef if !$xpd; + + # It's an XPD (FXO) + my @lines = @{$xpd->lines}; + my $line = $lines[$index]; + return $line->battery; +} + 1; diff --git a/xpp/utils/zconf/Zaptel/Config/Defaults.pm b/xpp/utils/zconf/Zaptel/Config/Defaults.pm index 05f4db3..1d11403 100644 --- a/xpp/utils/zconf/Zaptel/Config/Defaults.pm +++ b/xpp/utils/zconf/Zaptel/Config/Defaults.pm @@ -26,4 +26,29 @@ sub do_source($@) { return %vars; } +sub source_vars { + my @vars = @_; + my $default_file; + my %system_files = ( + "/etc/default/zaptel" => 'Debian and friends', + "/etc/sysconfig/zaptel" => 'Red Hat and friends', + ); + + if(defined $ENV{ZAPTEL_DEFAULTS}) { + $default_file = $ENV{ZAPTEL_DEFAULTS}; + } else { + foreach my $f (keys %system_files) { + if(-r $f) { + if(defined $default_file) { + die "An '$f' collides with '$default_file'"; + } + $default_file = $f; + } + } + } + die "No default_file" unless $default_file; + my %vars = Zaptel::Config::Defaults::do_source($default_file, @vars); + return ($default_file, %vars); +} + 1; diff --git a/xpp/utils/zconf/Zaptel/Hardware/PCI.pm b/xpp/utils/zconf/Zaptel/Hardware/PCI.pm index b1a6b67..45173d4 100644 --- a/xpp/utils/zconf/Zaptel/Hardware/PCI.pm +++ b/xpp/utils/zconf/Zaptel/Hardware/PCI.pm @@ -91,7 +91,9 @@ my %pci_ids = ( '1397:08b4/b556' => { DRIVER => 'qozap', DESCRIPTION => 'Junghanns DuoBRI ISDN card' }, '1397:08b4' => { DRIVER => 'qozap', DESCRIPTION => 'Junghanns QuadBRI ISDN card' }, '1397:16b8' => { DRIVER => 'qozap', DESCRIPTION => 'Junghanns OctoBRI ISDN card' }, + '1397:30b1' => { DRIVER => 'cwain', DESCRIPTION => 'HFC-E1 ISDN E1 card' }, '1397:2bd0' => { DRIVER => 'zaphfc', DESCRIPTION => 'HFC-S ISDN BRI card' }, + '1397:f001' => { DRIVER => 'ztgsm', DESCRIPTION => 'HFC-GSM Cologne Chips GSM' }, # Rhino cards (based on pci.ids) '0b0b:0105' => { DRIVER => 'r1t1', DESCRIPTION => 'Rhino R1T1' }, @@ -159,8 +161,19 @@ sub scan_devices($) { } while(</sys/bus/pci/drivers/*/[0-9]*>) { - m,([^/]+)/([^/]+)$,,; - $pci_devs{$2}{LOADED} = $1; + m,^(.*?)/([^/]+)/([^/]+)$,; + my $prefix = $1; + my $drvname = $2; + my $id = $3; + my $l = readlink "$prefix/$drvname/module"; + # Find the real module name (if we can). + if(defined $l) { + my $moduledir = "$prefix/$drvname/$l"; + my $modname = $moduledir; + $modname =~ s:^.*/::; + $drvname = $modname; + } + $pci_devs{$id}{LOADED} = $drvname; } foreach (sort keys %pci_devs) { my $dev = $pci_devs{$_}; diff --git a/xpp/utils/zconf/Zaptel/Span.pm b/xpp/utils/zconf/Zaptel/Span.pm index f8e5f01..380dc7f 100644 --- a/xpp/utils/zconf/Zaptel/Span.pm +++ b/xpp/utils/zconf/Zaptel/Span.pm @@ -10,6 +10,7 @@ package Zaptel::Span; use strict; use Zaptel::Utils; use Zaptel::Chans; +use Zaptel::Xpp::Xpd; my $proc_base = "/proc/zaptel"; @@ -50,6 +51,12 @@ sub new($$) { my $self = { NUM => $num }; bless $self, $pack; $self->{TYPE} = "UNKNOWN"; + my @xpds = Zaptel::Xpp::Xpd::xpds_by_spanno; + my $xpd = $xpds[$num]; + if(defined $xpd) { + die "Spanno mismatch: $xpd->spanno, $num" unless $xpd->spanno == $num; + $self->{XPD} = $xpd; + } open(F, "$proc_base/$num") or die "Failed to open '$proc_base/$num\n"; my $head = <F>; chomp $head; @@ -92,16 +99,20 @@ sub new($$) { $self->{IS_ZAPTEL_SYNC_MASTER} = ($self->{DESCRIPTION} =~ /\(MASTER\)/) ? 1 : 0; $self->{CHANS} = []; + my @channels; + my $index = 0; while(<F>) { chomp; s/^\s*//; s/\s*$//; next unless /\S/; - my $c = Zaptel::Chans->new($self, $_); - push(@{$self->{CHANS}}, $c); + my $c = Zaptel::Chans->new($self, $index, $_); + push(@channels, $c); + $index++; } close F; - + @channels = sort { $a->num <=> $b->num } @channels; + $self->{CHANS} = \@channels; $self->{YELLOW} = undef; $self->{CRC4} = undef; if($self->is_bri()) { diff --git a/xpp/utils/zconf/Zaptel/Xpp/Line.pm b/xpp/utils/zconf/Zaptel/Xpp/Line.pm new file mode 100644 index 0000000..e3e04f0 --- /dev/null +++ b/xpp/utils/zconf/Zaptel/Xpp/Line.pm @@ -0,0 +1,59 @@ +package Zaptel::Xpp::Line; +# +# Written by Oron Peled <oron@actcom.co.il> +# Copyright (C) 2008, Xorcom +# This program is free software; you can redistribute and/or +# modify it under the same terms as Perl itself. +# +# $Id$ +# +use strict; +use Zaptel::Utils; + +my $proc_base = "/proc/xpp"; + +sub new($$$) { + my $pack = shift or die "Wasn't called as a class method\n"; + my $xpd = shift or die; + my $index = shift; + defined $index or die; + my $self = {}; + bless $self, ref($xpd); + $self->{XPD} = $xpd; + $self->{INDEX} = $index; + return $self; +} + +sub create_all($$) { + my $pack = shift or die "Wasn't called as a class method\n"; + my $xpd = shift || die; + my $procdir = shift || die; + local $/ = "\n"; + my @lines; + for(my $i = 0; $i < $xpd->{CHANNELS}; $i++) { + my $line = Zaptel::Xpp::Line->new($xpd, $i); + push(@lines, $line); + } + $xpd->{LINES} = \@lines; + my ($infofile) = glob "$procdir/*_info"; + die "Failed globbing '$procdir/*_info'" unless defined $infofile; + my $type = $xpd->type; + open(F, "$infofile") || die "Failed opening '$infofile': $!"; + while (<F>) { + chomp; + if($type eq 'FXO') { + if(s/^\s*battery\s*:\s*//) { + my @batt = split; + foreach my $l (@lines) { + die unless @batt; + $l->{BATTERY} = shift @batt; + } + die if @batt; + } + } + } + close F; +} + + +1; diff --git a/xpp/utils/zconf/Zaptel/Xpp/Xpd.pm b/xpp/utils/zconf/Zaptel/Xpp/Xpd.pm index c05cfdb..326aafd 100644 --- a/xpp/utils/zconf/Zaptel/Xpp/Xpd.pm +++ b/xpp/utils/zconf/Zaptel/Xpp/Xpd.pm @@ -9,6 +9,8 @@ package Zaptel::Xpp::Xpd; # use strict; use Zaptel::Utils; +use Zaptel::Xpp; +use Zaptel::Xpp::Line; my $proc_base = "/proc/xpp"; @@ -64,21 +66,15 @@ sub zt_registration($$) { return $result; } -# -# Backward compatibility for old drivers -# before changeset:5119 -# -# Newer drivers should directly have $xpd->spanno -# -sub spanno_of_xpd($) { - my $xpd = shift || die; - - warn "Running on old driver. Keep going...\n"; - use Zaptel; - my @spans = Zaptel::spans; - - my ($span) = grep { $_->name eq $xpd->fqn } @spans; - return ($span) ? $span->num : 0; +sub xpds_by_spanno() { + my @xbuses = Zaptel::Xpp::xbuses("SORT_CONNECTOR"); + my @xpds = map { $_->xpds } @xbuses; + @xpds = grep { $_->spanno } @xpds; + @xpds = sort { $a->spanno <=> $b->spanno } @xpds; + my @spanno = map { $_->spanno } @xpds; + my @idx; + @idx[@spanno] = @xpds; # The spanno is the index now + return @idx; } sub new($$) { @@ -92,8 +88,18 @@ sub new($$) { local $/ = "\n"; open(F, "$procdir/summary") || die "Missing summary file in $procdir"; my $head = <F>; - chomp $head; - # "XPD-00 (BRI_TE ,card present, span 3)" + chomp $head; # "XPD-00 (BRI_TE ,card present, span 3)" + # The driver does not export the number of channels... + # Let's find it indirectly + while(<F>) { + chomp; + if(s/^\s*offhook\s*:\s*//) { + my @offhook = split; + @offhook || die "No channels in '$procdir/summary'"; + $self->{CHANNELS} = @offhook; + last; + } + } close F; $head =~ s/^(XPD-(\d\d))\s+// || die; $self->{ID} = $2; @@ -105,13 +111,12 @@ sub new($$) { #warn "Garbage in '$procdir/summary': rest='$rest'\n" if $rest; if($span =~ s/span\s+(\d+)//) { # since changeset:5119 $self->{SPANNO} = $1; - } else { - $self->{SPANNO} = $self->spanno_of_xpd; } $self->{TYPE} = $type; $self->{IS_BRI} = ($type =~ /BRI_(NT|TE)/); $self->{IS_PRI} = ($type =~ /[ETJ]1_(NT|TE)/); $self->{IS_DIGITAL} = ( $self->{IS_BRI} || $self->{IS_PRI} ); + Zaptel::Xpp::Line->create_all($self, $procdir); return $self; } |