More renaming of country-de.dat to country.dat .
makedest needs to be changed some more when country-de.dat is renamed in CVS.
This commit is contained in:
parent
5e65c31f95
commit
7ec0ee03c0
|
@ -473,7 +473,7 @@ COUNTRYPREFIX:
|
||||||
|
|
||||||
[ISDNLOG]
|
[ISDNLOG]
|
||||||
|
|
||||||
COUNTRYFILE = /usr/lib/isdn/country-de.dat
|
COUNTRYFILE = /usr/lib/isdn/country.dat
|
||||||
|
|
||||||
Diese Datei beinhaltet Laenderbezeichnungen und Vorwahlen. Sie dient
|
Diese Datei beinhaltet Laenderbezeichnungen und Vorwahlen. Sie dient
|
||||||
als Ausgangsbasis zum Erzeugen der Destination-Datenbank dest.gdbm.
|
als Ausgangsbasis zum Erzeugen der Destination-Datenbank dest.gdbm.
|
||||||
|
|
|
@ -93,7 +93,7 @@
|
||||||
|
|
||||||
3d) dest.gdbm
|
3d) dest.gdbm
|
||||||
The destination database is built from the following textfiles:
|
The destination database is built from the following textfiles:
|
||||||
- country-de.dat ... International telephonnumbers mainly of countries
|
- country.dat ... International telephonnumbers mainly of countries
|
||||||
with german and english country names
|
with german and english country names
|
||||||
- cities.dat ... international cities
|
- cities.dat ... international cities
|
||||||
- code-CC.dat or zone/CC/code ... domestic city names with telephon numbers
|
- code-CC.dat or zone/CC/code ... domestic city names with telephon numbers
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
.\" $Id: isdn.conf.5.in,v 1.4 2000/08/22 14:33:03 paul Exp $
|
.\" $Id: isdn.conf.5.in,v 1.5 2000/09/01 12:35:43 paul Exp $
|
||||||
.\" CHECKIN $Date: 2000/08/22 14:33:03 $
|
.\" CHECKIN $Date: 2000/09/01 12:35:43 $
|
||||||
.TH isdn.conf 5 "@MANDATE_ISDN_CONF@" "ISDN 4 Linux @I4LVERSION@" "Linux System Administration"
|
.TH isdn.conf 5 "@MANDATE_ISDN_CONF@" "ISDN 4 Linux @I4LVERSION@" "Linux System Administration"
|
||||||
.PD 0
|
.PD 0
|
||||||
|
|
||||||
|
@ -65,7 +65,7 @@ The default telephone provider (carrier), if no dial prefix is dialed.
|
||||||
.TP
|
.TP
|
||||||
.B COUNTRYFILE
|
.B COUNTRYFILE
|
||||||
Location and name of
|
Location and name of
|
||||||
.IR country-de.dat .
|
.IR country.dat .
|
||||||
This file contains country names, aliases, codes and prefixes.
|
This file contains country names, aliases, codes and prefixes.
|
||||||
|
|
||||||
.TP
|
.TP
|
||||||
|
@ -301,7 +301,7 @@ REPFMT = " %X %D %15.15H %T %-15.15F %7u %U %I %O"
|
||||||
CHARGEMAX = 50.00
|
CHARGEMAX = 50.00
|
||||||
CURRENCY = 0.12,DEM
|
CURRENCY = 0.12,DEM
|
||||||
|
|
||||||
COUNTRYFILE = /usr/lib/isdn/country-de.dat
|
COUNTRYFILE = /usr/lib/isdn/country.dat
|
||||||
RATECONF= /etc/isdn/rate.conf
|
RATECONF= /etc/isdn/rate.conf
|
||||||
RATEFILE= /usr/lib/isdn/rate-de.dat
|
RATEFILE= /usr/lib/isdn/rate-de.dat
|
||||||
HOLIDAYS= /usr/lib/isdn/holiday-de.dat
|
HOLIDAYS= /usr/lib/isdn/holiday-de.dat
|
||||||
|
|
|
@ -24,7 +24,7 @@ REPFMT = " %X %D %15.15H %T %-15.15F %7u %U %I %O"
|
||||||
CHARGEMAX = 50.00
|
CHARGEMAX = 50.00
|
||||||
CURRENCY = 1.056,ATS
|
CURRENCY = 1.056,ATS
|
||||||
|
|
||||||
COUNTRYFILE = /usr/lib/isdn/country-de.dat
|
COUNTRYFILE = /usr/lib/isdn/country.dat
|
||||||
RATECONF= /etc/isdn/rate.conf
|
RATECONF= /etc/isdn/rate.conf
|
||||||
RATEFILE= /usr/lib/isdn/rate-at.dat
|
RATEFILE= /usr/lib/isdn/rate-at.dat
|
||||||
HOLIDAYS= /usr/lib/isdn/holiday-at.dat
|
HOLIDAYS= /usr/lib/isdn/holiday-at.dat
|
||||||
|
|
|
@ -24,7 +24,7 @@ REPFMT = " %X %D %15.15H %T %-15.15F %7u %U %I %O"
|
||||||
CHARGEMAX = 50.00
|
CHARGEMAX = 50.00
|
||||||
CURRENCY = 1.056,DEM
|
CURRENCY = 1.056,DEM
|
||||||
|
|
||||||
COUNTRYFILE = /usr/lib/isdn/country-de.dat
|
COUNTRYFILE = /usr/lib/isdn/country.dat
|
||||||
RATECONF= /etc/isdn/rate.conf
|
RATECONF= /etc/isdn/rate.conf
|
||||||
RATEFILE= /usr/lib/isdn/rate-de.dat
|
RATEFILE= /usr/lib/isdn/rate-de.dat
|
||||||
HOLIDAYS= /usr/lib/isdn/holiday-de.dat
|
HOLIDAYS= /usr/lib/isdn/holiday-de.dat
|
||||||
|
|
|
@ -26,7 +26,7 @@ CHARGEMAX = 50.00
|
||||||
|
|
||||||
CURRENCY = 1,LUF
|
CURRENCY = 1,LUF
|
||||||
|
|
||||||
COUNTRYFILE = /usr/lib/isdn/country-de.dat
|
COUNTRYFILE = /usr/lib/isdn/country.dat
|
||||||
# RATECONF= /etc/isdn/rate.conf.lu
|
# RATECONF= /etc/isdn/rate.conf.lu
|
||||||
RATEFILE= /usr/lib/isdn/rate-lu.dat
|
RATEFILE= /usr/lib/isdn/rate-lu.dat
|
||||||
HOLIDAYS= /usr/lib/isdn/holiday-lu.dat
|
HOLIDAYS= /usr/lib/isdn/holiday-lu.dat
|
||||||
|
|
|
@ -27,7 +27,7 @@ REPFMT = " %X %D %15.15H %T %-15.15F %7u %U %I %O"
|
||||||
CHARGEMAX = 50.00
|
CHARGEMAX = 50.00
|
||||||
CURRENCY = 1.056,NLG
|
CURRENCY = 1.056,NLG
|
||||||
|
|
||||||
COUNTRYFILE = /usr/lib/isdn/country-de.dat
|
COUNTRYFILE = /usr/lib/isdn/country.dat
|
||||||
RATECONF= /etc/isdn/rate.conf
|
RATECONF= /etc/isdn/rate.conf
|
||||||
RATEFILE= /usr/lib/isdn/rate-nl.dat
|
RATEFILE= /usr/lib/isdn/rate-nl.dat
|
||||||
HOLIDAYS= /usr/lib/isdn/holiday-nl.dat
|
HOLIDAYS= /usr/lib/isdn/holiday-nl.dat
|
||||||
|
|
|
@ -32,6 +32,6 @@ CALLFILE = /var/log/caller.log
|
||||||
LOGFILE = /var/log/isdn.log
|
LOGFILE = /var/log/isdn.log
|
||||||
HOLIDAYS = /usr/lib/isdn/holiday-no.dat
|
HOLIDAYS = /usr/lib/isdn/holiday-no.dat
|
||||||
RATEFILE = /usr/lib/isdn/rate-no.dat
|
RATEFILE = /usr/lib/isdn/rate-no.dat
|
||||||
COUNTRYFILE=/usr/lib/isdn/country-de.dat
|
COUNTRYFILE=/usr/lib/isdn/country.dat
|
||||||
DESTFILE= /usr/lib/isdn/dest.gdbm
|
DESTFILE= /usr/lib/isdn/dest.gdbm
|
||||||
|
|
||||||
|
|
|
@ -24,7 +24,7 @@ REPFMT = " %X %D %15.15H %T %-15.15F %7u %U %I %O"
|
||||||
CHARGEMAX = 50.00
|
CHARGEMAX = 50.00
|
||||||
CURRENCY = 0.33,PLN
|
CURRENCY = 0.33,PLN
|
||||||
|
|
||||||
COUNTRYFILE = /usr/lib/isdn/country-de.dat
|
COUNTRYFILE = /usr/lib/isdn/country.dat
|
||||||
RATECONF= /etc/isdn/rate.conf
|
RATECONF= /etc/isdn/rate.conf
|
||||||
RATEFILE= /usr/lib/isdn/rate-pl.dat
|
RATEFILE= /usr/lib/isdn/rate-pl.dat
|
||||||
HOLIDAYS= /usr/lib/isdn/holiday-de.dat
|
HOLIDAYS= /usr/lib/isdn/holiday-de.dat
|
||||||
|
|
|
@ -16,7 +16,7 @@ makedest makes a destination database
|
||||||
-c ... appends file or stdin to country CC (CC may be number or isocode)
|
-c ... appends file or stdin to country CC (CC may be number or isocode)
|
||||||
|
|
||||||
input files:
|
input files:
|
||||||
global (de/en) /usr/lib/isdn/country-de.dat
|
global (de/en) /usr/lib/isdn/country.dat
|
||||||
|
|
||||||
code-files /usr/lib/isdn/code-CC.dat or ../zone/CC/code
|
code-files /usr/lib/isdn/code-CC.dat or ../zone/CC/code
|
||||||
where CC is the given countrycode
|
where CC is the given countrycode
|
||||||
|
@ -51,7 +51,7 @@ makedest makes a destination database
|
||||||
-c ... appends file or stdin to country CC (CC may be number or isocode)
|
-c ... appends file or stdin to country CC (CC may be number or isocode)
|
||||||
|
|
||||||
input files:
|
input files:
|
||||||
global (de/en) /usr/lib/isdn/country-de.dat
|
global (de/en) /usr/lib/isdn/country.dat
|
||||||
|
|
||||||
code-files /usr/lib/isdn/code-CC.dat or ../zone/CC/code
|
code-files /usr/lib/isdn/code-CC.dat or ../zone/CC/code
|
||||||
where CC is the given countrycode
|
where CC is the given countrycode
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#! /usr/bin/perl
|
#! /usr/bin/perl
|
||||||
|
|
||||||
# make dest.gdbm
|
# make dest.gdbm
|
||||||
# necessary parts: /usr/lib/isdn/country-de.dat
|
# necessary parts: /usr/lib/isdn/country.dat
|
||||||
# optional parts: zone/CC/code
|
# optional parts: zone/CC/code
|
||||||
#
|
#
|
||||||
# usage:
|
# usage:
|
||||||
|
@ -10,7 +10,7 @@
|
||||||
# these entries are written as 0-terminated strings
|
# these entries are written as 0-terminated strings
|
||||||
# vErSiO\0 => 1.0 int[ cc...]
|
# vErSiO\0 => 1.0 int[ cc...]
|
||||||
#
|
#
|
||||||
# for countrys
|
# for countries
|
||||||
# KEY => name ; +numbers [ ; :RKEY ]
|
# KEY => name ; +numbers [ ; :RKEY ]
|
||||||
# name => :KEY
|
# name => :KEY
|
||||||
# +number => :KEY
|
# +number => :KEY
|
||||||
|
@ -34,7 +34,7 @@ use AnyDBM_File;
|
||||||
use POSIX;
|
use POSIX;
|
||||||
use strict;
|
use strict;
|
||||||
$|=1;
|
$|=1;
|
||||||
my $co_dat = '/usr/lib/isdn/country-de.dat';
|
my $co_dat = '/usr/lib/isdn/country.dat';
|
||||||
my $dest_gdbm = './dest.gdbm';
|
my $dest_gdbm = './dest.gdbm';
|
||||||
if (@AnyDBM_File::ISA eq @CDB_File_Dump::ISA) {
|
if (@AnyDBM_File::ISA eq @CDB_File_Dump::ISA) {
|
||||||
$dest_gdbm = './dest.cdb.dump';
|
$dest_gdbm = './dest.cdb.dump';
|
||||||
|
@ -102,7 +102,7 @@ sub write_global {
|
||||||
print "Adding global $co_dat...\n" if($verbose);
|
print "Adding global $co_dat...\n" if($verbose);
|
||||||
open(IN, '../../country-de.dat') ||
|
open(IN, '../../country-de.dat') ||
|
||||||
open(IN, $co_dat) ||
|
open(IN, $co_dat) ||
|
||||||
die("Cant find country-de.dat");
|
die("Cant find country.dat");
|
||||||
$i=0;
|
$i=0;
|
||||||
while (<IN>) {
|
while (<IN>) {
|
||||||
print "$i\r" if (++$i % 10==0 && $verbose);
|
print "$i\r" if (++$i % 10==0 && $verbose);
|
||||||
|
|
|
@ -24,7 +24,7 @@ sub get_country {
|
||||||
$names{lc $a}=$key;
|
$names{lc $a}=$key;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
my $co_dat = '/usr/lib/isdn/country-de.dat';
|
my $co_dat = '/usr/lib/isdn/country.dat';
|
||||||
open(IN,$co_dat) || die("Cant read $co_dat");
|
open(IN,$co_dat) || die("Cant read $co_dat");
|
||||||
while (<IN>) {
|
while (<IN>) {
|
||||||
chomp;
|
chomp;
|
||||||
|
@ -181,7 +181,7 @@ again:
|
||||||
goto again;
|
goto again;
|
||||||
}
|
}
|
||||||
elsif ($x =~ /^\/(.*)/) {
|
elsif ($x =~ /^\/(.*)/) {
|
||||||
print `grep -3 -i $1 /usr/lib/isdn/country-de.dat`;
|
print `grep -3 -i $1 /usr/lib/isdn/country.dat`;
|
||||||
goto again;
|
goto again;
|
||||||
}
|
}
|
||||||
if ($x eq 'j') {
|
if ($x eq 'j') {
|
||||||
|
@ -197,7 +197,7 @@ again:
|
||||||
print "+xx => xx an unbekannt anhaengen\n";
|
print "+xx => xx an unbekannt anhaengen\n";
|
||||||
print "= SO => SO uebernehmen\n";
|
print "= SO => SO uebernehmen\n";
|
||||||
print "= => unbekannt uebernehmen\n";
|
print "= => unbekannt uebernehmen\n";
|
||||||
print "/xx => in country-de.dat nach xx greppen\n";
|
print "/xx => in country.dat nach xx greppen\n";
|
||||||
print "xx => xx ausprobieren\n";
|
print "xx => xx ausprobieren\n";
|
||||||
goto again;
|
goto again;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
.\" CHECKIN $Date: 2000/08/01 20:31:31 $
|
.\" CHECKIN $Date: 2000/09/01 12:35:44 $
|
||||||
.TH ISDNRATE 1 "@MANDATE@" -lt-
|
.TH ISDNRATE 1 "@MANDATE@" -lt-
|
||||||
.SH NAME
|
.SH NAME
|
||||||
isdnrate \- Print telefon rates and various info from rate\-files(5).
|
isdnrate \- Print telefon rates and various info from rate\-files(5).
|
||||||
|
@ -43,7 +43,7 @@ a town
|
||||||
.IP
|
.IP
|
||||||
.B US
|
.B US
|
||||||
a code as defined in
|
a code as defined in
|
||||||
.IR country-de.dat .
|
.IR country.dat .
|
||||||
.IP
|
.IP
|
||||||
.B Internet
|
.B Internet
|
||||||
a Service name (if option
|
a Service name (if option
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
'\" t
|
'\" t
|
||||||
'\" ** above should format a table **
|
'\" ** above should format a table **
|
||||||
.\" CHECKIN $Date: 2000/07/17 16:34:23 $
|
.\" CHECKIN $Date: 2000/09/01 12:35:44 $
|
||||||
.TH rate-files 5 "@MANDATE@" -lt-
|
.TH rate-files 5 "@MANDATE@" -lt-
|
||||||
.SH NAME
|
.SH NAME
|
||||||
rate-files \- Format of rate-files
|
rate-files \- Format of rate-files
|
||||||
|
@ -214,7 +214,7 @@ Z:1-2,4 Interior
|
||||||
.I area
|
.I area
|
||||||
may be a telefonnumber (including +countrycode for numbers which may
|
may be a telefonnumber (including +countrycode for numbers which may
|
||||||
be reached from everywhere, a telefonnumber without +countrycode for numbers only reachable
|
be reached from everywhere, a telefonnumber without +countrycode for numbers only reachable
|
||||||
in the own country) or an area name or alias as defined in country-de.dat.
|
in the own country) or an area name or alias as defined in country.dat.
|
||||||
Country names have to be translated to their code by the rate-preprocessor
|
Country names have to be translated to their code by the rate-preprocessor
|
||||||
.IR pp_rate .
|
.IR pp_rate .
|
||||||
.IP
|
.IP
|
||||||
|
|
Loading…
Reference in New Issue