isdnlog-3.77

corrected german zone file

isdnlog/Makefile.in

@@ -1,4 +1,4 @@
-## $Id: Makefile.in,v 1.131 1999/12/12 17:21:09 akool Exp $
+## $Id: Makefile.in,v 1.132 1999/12/14 21:02:36 akool Exp $
 ##
 ## ISDN accounting for isdn4linux.
 ##
@@ -19,6 +19,10 @@
 ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 ##
 ## $Log: Makefile.in,v $
+## Revision 1.132  1999/12/14 21:02:36  akool
+## isdnlog-3.77
+##   corrected german zone file
+##
 ## Revision 1.131  1999/12/12 17:21:09  akool
 ## isdnlog-3.76
 ## - isdnlog/Makefile.in ... added dep for Makefile.in
@@ -917,7 +921,7 @@ SERVICEFILE = /etc/services
 # DON'T EDIT BELOW THIS LINE
 ######################################################################
 
-VERSION     = 3.76
+VERSION     = 3.77
 
 MANPAGES    = isdnlog/callerid.conf.5 isdnlog/isdn.conf.5 \
 	      isdnlog/isdnformat.5 isdnlog/isdnlog.5 isdnlog/isdnlog.8 \

isdnlog/rate-de.dat.src

@@ -1,4 +1,4 @@
-V:1.10-Germany [09-Dec-1999 19:08:45]
+V:1.10-Germany [12-Dec-1999 18:42:00]
 
 # Währungsformat
 U:%.3f DM
@@ -8,7 +8,7 @@ U:%.3f DM
 #
 # (C) Copyright 1999 by Andreas Kool (akool@isdn4linux.de)
 #
-# $Id: rate-de.dat.src,v 1.17 1999/12/12 14:35:52 akool Exp $
+# $Id: rate-de.dat.src,v 1.18 1999/12/14 21:02:36 akool Exp $
 #
 #
 # Das "A:" Tag muß folgendermaßen gefüllt werden:
@@ -15357,6 +15357,12 @@ T:*/*=0.12/30,0.24(60)/1
 P:80 Telegate
 B:01080
 # G:01-Aug-1999
+#
+#                                ACHTUNG:
+#
+#	     Dieser Service (01080) läuft zum Jahresende 1999 aus!
+#
+#
 D:dtag
 C:Address:Aktiengesellschaft für telefonische Informationsdienste, Bahnhofstraße 26, 82211 Herrsching
 C:Name:Telegate
@@ -15434,6 +15440,12 @@ C:Special:Die Homepage der Tarif-Datenbank Crew: http://www.digitalprojects.com/
 P:85 GTS-WESTCom
 B:01085
 # G:01-Mai-1999
+#
+#                                ACHTUNG:
+#
+#	     Dieser Service (01085) läuft zum 27. Dezember 1999 aus!
+#
+#
 C:GmbH, Hebelstraße 22 c, 69115 Heidelberg 01085
 C:Homepage: http://www.westcom.de
 C:Hotline:  0800/937-8266

isdnlog/samples/rate.conf.de

@@ -1,37 +1,37 @@
-# rate.conf  1.10  26-Nov-99  16:51
+# rate.conf  1.10  12-Dec-99  18:31
 
 # P:10=0 # Teleglobe
-P:11=0 # o.tel.o CbC
+P:11 # o.tel.o CbC
 # P:11=1 # o.tel.o private Preselection
 # P:11=2 # o.tel.o private plus Preselection
 # P:11=3 # o.tel.o professional plus Preselection
 # P:11=4 # o.tel.o international plus Preselection
 # P:12=0 # Tele Danmark
-P:13=0 # Tele 2 Privatkunden
+P:13 # Tele 2 Privatkunden          # ACHTUNG: Kein CbC ... AK-spezifisch!
 # P:13=1 # Tele 2 Geschaeftskunden
-P:14=0 # EWE TEL CbC national
+# P:14 # EWE TEL CbC national
 # P:14=1 # EWE TEL CbC/pre-select regional
 # P:14=2 # EWE TEL direct
-P:15=0 # RSL clever call
+P:15 # RSL clever call
 # P:15=1 # RSL CleverLine global
 # P:15=2 # RSL CleverLine metropolitan
 # P:16=0 # LausitzNet
 # P:17=0 # SEC
-P:18=0 # debitel
+# P:18 # debitel
 # P:18=1 # debitel DirectLine Profi-Tarif 30 Sekunden
 # P:18=2 # debitel DirectLine Privat-Tarif Sekunden Takt
 # P:18=3 # debitel DirectLine Profi-Tarif Sekunden Takt
-P:19=0 # Mobilcom CbC
+P:19 # Mobilcom CbC
 # P:19=1 # Mobilcom Preselection/Business
 # P:19=2 # Mobilcom Preselection/Privat
-P:20=0 # ISIS isiFON classic
+# P:20 # ISIS isiFON classic
 # P:20=1 # ISIS isiFON plus
 # P:20=2 # ISIS Preselection
 # P:21=0 # QS
-P:22=0 # NetCologne
+# P:22 # NetCologne
 # P:23=0 # tesion connectClassic
 # P:23=1 # tesion connectProfi
-P:23=2 # tesion CbC
+# P:23=2 # tesion CbC
 # P:24=0 # Telepassport 99 Plus
 # P:24=1 # Telepassport Plus
 P:24=2 # Telepassport CbC
@@ -40,59 +40,59 @@ P:24=2 # Telepassport CbC
 # P:24=5 # Telepassport SüdOst
 # P:24=6 # Telepassport StudentenTarif
 # P:24=7 # Super 24
-P:25=0 # CityKom
+# P:25 # CityKom
 # P:25=1 # CityKom Preselection
 # P:26=0 # ECN
-P:27=0 # Nordcom Butensurf
+# P:27 # Nordcom Butensurf
 # P:27=1 # Nordcom Butensurf Plus
-P:28=0 # TeleBridge CbC
+# P:28 # TeleBridge CbC
 # P:28=1 # TeleBridge EasyBridge
 # P:28=2 # UPX Super 8
 # P:29=0 # Unisource
-P:30=0 # TelDaFax
+P:30 # TelDaFax
 # P:31=0 # HEAG
 # P:32=0 # KDD
-P:33=0 # DTAG
+P:33 # DTAG
 # P:33=1 # DTAG CityPlus
 # P:33=2 # DTAG CityWeekend
 # P:33=3 # DTAG CityWeekend & CityPlus
 # P:33=4 # DTAG AktivPlus
-P:34=0 # NEFkom
+# P:34 # NEFkom
 # P:35=0 # interCOM
-P:36=0 # Hutchison fairfon
+# P:36 # Hutchison fairfon
 # P:36=1 # Hutchison easyfon
 # P:36=2 # Hutchison o.tel.o private
 # P:36=3 # Hutchison fairfon Sekundentakt
 # P:36=4 # Hutchison easyfon Sekundentakt
 # P:37=0 # ETS
 # P:38=0 # MediaWays
-P:39=0 # First Telecom CbC
-P:40=0 # GTS Esprit
-P:41=0 # HanseNet
+P:39 # First Telecom CbC
+P:40 # GTS Esprit
+# P:41 # HanseNet
 # P:41=1 # HanseNet Preselection
-P:42=0 # TeleBeL ISDN Plus
+# P:42 # TeleBeL ISDN Plus
 # P:42=1 # TeleBeL ISDN XL
-P:43=0 # KielNet CbC
+# P:43 # KielNet CbC
 # P:43=1 # KielNet Preselection
-P:43=2 # KielNet Telefonanschluß
-P:44=0 # VEW TELNET
+# P:43=2 # KielNet Telefonanschluß
+# P:44 # VEW TELNET
 # P:45=0 # Global Network
-P:46=0 # KomTel
+# P:46 # KomTel
 # P:46=1 # KomTel MoinMoin
 # P:47=0 # PrimeTec
-P:48=0 # DOKOM
+# P:48 # DOKOM
 # P:49=0 # ACC ACCess Direkt Pre-Selection Einheitentarif
 # P:49=1 # ACC ACCess Direkt Pre-Selection Minutentarif
-P:49=2 # ACC ACCess Einheitentarif CbC
+# P:49=2 # ACC ACCess Einheitentarif CbC
 # P:49=3 # ACC ACCess Minutentarif CbC
-P:50=0 # Talkline CbC
+P:50 # Talkline CbC
 # P:50=1 # Talkline EasyLine
 # P:50=2 # Talkline talkmax
 # P:50=3 # Talkline BusinessLine Classic
 # P:50=4 # Talkline BusinessLine Local
-P:51=0 # 01051
+P:51 # 01051
 # P:52=0 # Long Distance
-P:53=0 # WOBCOM
+# P:53 # WOBCOM
 # P:54=0 # USFI
 # P:55=0 # ESPRIT Telecom Deutschland GmbH, August-Thyssen-Str. 1
 # P:56=0 # BITel
@@ -102,38 +102,38 @@ P:53=0 # WOBCOM
 # P:60=0 # Telecom-InfoService
 # P:61=0 # TelSA
 # P:62=0 # DENTEL
-P:63=0 # KDD-Conos PrivateCall easy
+# P:63 # KDD-Conos PrivateCall easy
 # P:63=1 # KDD-Conos PrivateCall genau
 # P:64=0 # Hannoversche
 # P:65=0 # Rapid Link
-P:66=0 # Interoute
+P:66 # Interoute
 # P:67=0 # RegioCom
 # P:68=0 # Tele Media
 # P:69=0 # Primus
-P:70=0 # Arcor CbC
+P:70 # Arcor CbC
 # P:70=1 # Arcor Town to Town
 # P:70=2 # Arcor Town to Town Sekunde
 # P:71=0 # DeTeMobil
 # P:72=0 # Mannesmann
 # P:73=0 # AXXON
 # P:74=0 # Alpha
-P:75=0 # Callino
+P:75 # Callino
 # P:76=0 # QuickNet
 # P:77=0 # E-Plus
-P:78=0 # 3U
-P:79=0 # Viatel
-P:80=0 # Telegate
+P:78 # 3U
+P:79 # Viatel
+P:80 # Telegate                     # nur noch bis zum Jahresende 1999!
 # P:81=0 # Infotel
 # P:82=0 # AugustaKom
 # P:83=0 # Wuerzburger
 # P:84=0 # Telegroup
-P:85=0 # GTS-WESTCom
+P:85 # GTS-WESTCom     		    # nur noch bis zum 27.Dezember 1999!
 # P:86=0 # ONE.TEL
 # P:87=0 # HAMCOM
-P:88=0 # WorldCom
+P:88 # WorldCom	                    # ACHTUNG: Kein CbC ... AK-spezifisch!
 # P:88=1 # Hutchison CbC
 # P:89=0 # M'net
-P:90=0 # Viag Interkom
+P:90 # Viag Interkom
 # P:91=0 # IDT
 # P:92=0 # Hallo Telefon Service
 # P:93=0 # Kray
@@ -141,11 +141,11 @@ P:90=0 # Viag Interkom
 # P:95=0 # Teleos
 # P:96=0 # GELSEN-NET
 # P:97=0 # AT & T-Unisource
-P:98=0 # Mox
+# P:98 # Mox
 # P:98=1 # Nikocity Study&Surf
 # P:98=2 # Nikocity
-P:99=0 # ECONOPHONE
-P:100=0 # TELELEV
+# P:99 # ECONOPHONE
+# P:100 # TELELEV
 # P:100=1 # Meocom
 # P:101=0 # Netnet
 # P:102=0 # EncoTel
@@ -169,7 +169,7 @@ P:100=0 # TELELEV
 # P:140=0 # VossNet
 # P:142=0 # connection 42
 # P:144=0 # Carrier 1
-P:150=0 # Drillisch Superregionen
+P:150 # Drillisch Superregionen
 # P:150=1 # Drillisch
 # P:154=0 # Osnatel
 # P:155=0 # Telia

isdnlog/tools/zone/de/01033/mk

@@ -0,0 +1,20 @@
+#! /bin/sh
+
+# This job fully generates a new "zone-de-dtag.gdbm"
+#
+# Be warned: This job runs about 2 day's, and requires more than
+# 100 Mb of free disk space!
+
+cd /usr/src/isdn4k-utils/isdnlog/tools/zone/de/01033
+
+bzip2 -d zneu.de9.bz2
+./mzoneall
+bzip2 -9 zneu.de9
+
+../../redzone -zzoneall -rzred.dtag -l5 -v2 -n
+bzip2 -9 zred.dtag
+rm zoneall
+
+cd ../..
+rm ../../zone-de-dtag.gdbm
+make DE

isdnlog/tools/zone/de/01033/red.de

@@ -1,3 +0,0 @@
-#! /bin/sh
-
-../../redzone -zzoneall -rzred.dtag -l5 -v2 -n

isdnlog/tools/zone/de/code

@@ -3203,7 +3203,7 @@
 6096	Wiesen Unterfr.
 6101	Bad Vilbel
 6102	Neu-Isenburg
-6103	Lagen
+6103	Langen
 6104	Heusenstamm
 6105	Mörfelden-Walldorf
 6106	Rodgau