FreeXP

CVS daily diff

FreeXP CVS-Server cvs-list at freexp.de
Die Nov 9 00:00:28 CET 2004


Index: freexp/touch.pas
===================================================================
RCS file: /server/cvs/freexp/touch.pas,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- freexp/touch.pas	7 Nov 2004 09:31:05 -0000	1.14
+++ freexp/touch.pas	8 Nov 2004 06:56:20 -0000	1.15
@@ -14,7 +14,7 @@
 { finden Sie in der Datei TOUCH.TXT oder auf                      }
 { http://www.martinwodrich.de/Software/Touch/nutzung.htm          }
 { --------------------------------------------------------------- }
-{ $Id: touch.pas,v 1.14 2004/11/07 09:31:05 mw Exp $ }
+{ $Id: touch.pas,v 1.15 2004/11/08 06:56:20 mw Exp $ }
 program touch;
 {$I TOUCH.INC }
 
@@ -105,7 +105,7 @@
 begin
     writeln ('Parameter fehlt');
     writeln ('');
-    writeln ('touch file1 file2 ... /t=hh:mm:ss /d=tt.mm.[yy]yy /r=refdatei /H /S /V /G /K /LFN');
+    writeln ('touch file1 file2 ... /t=hh:mm:ss /d=tt.mm.[yy]yy /r=refdatei /H /S /V /G /K');
     write ('                      ');
     {$IFDEF BPLFN}
     write('/LFN ');
@@ -612,6 +612,9 @@
 end.
 {
   $Log: touch.pas,v $
+  Revision 1.15  2004/11/08 06:56:20  mw
+  MW: - Fehler in der Hilfe beseitigt.
+
   Revision 1.14  2004/11/07 09:31:05  mw
   MW: - Übernahme von TOUCH 1.1c
 
Index: freexp/xp10p.inc
===================================================================
RCS file: /server/cvs/freexp/xp10p.inc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- freexp/xp10p.inc	9 Jan 2004 16:19:00 -0000	1.6
+++ freexp/xp10p.inc	8 Nov 2004 12:07:16 -0000	1.7
@@ -8,7 +8,7 @@
 { Die Nutzungsbedingungen fuer diesen Quelltext finden Sie in der }
 { Datei SLIZENZ.TXT oder auf www.crosspoint.de/oldlicense.html.   }
 { --------------------------------------------------------------- }
-{ $Id: xp10p.inc,v 1.6 2004/01/09 16:19:00 mw Exp $ }
+{ $Id: xp10p.inc,v 1.7 2004/11/08 12:07:16 mw Exp $ }
 
 procedure SavePhonezones;
 var t     : text;
@@ -127,7 +127,7 @@
 
 
   procedure bereich(tnr,bereichnr:integer; _von,_bis:string;
-                    g1,p1,g2,p2,g3,p3,g4,p4,g5,p5,g6,p6,g7,p7,g8,p8,g9,p9,g10,p10,g11,p11,g12,p12:real);
+                    g1,p1,g2,p2,g3,p3,g4,p4,g5,p5,g6,p6,g7,p7,g8,p8,g9,p9,g10,p10,g11,p11,g12,p12,g13,p13,g14,p14:real);
   var i : integer;
   begin
     with tarif^[tnr].zeitbereich[bereichnr] do begin
@@ -145,6 +145,8 @@
       tarif[10].sekunden:=g10; tarif[10].pfennig:=p10;
       tarif[11].sekunden:=g11; tarif[11].pfennig:=p11;
       tarif[12].sekunden:=g12; tarif[12].pfennig:=p12;
+      tarif[13].sekunden:=g13; tarif[13].pfennig:=p13;
+      tarif[14].sekunden:=g14; tarif[14].pfennig:=p14;
       for i:=1 to 16 do tarif[i].anwahl:=0;
       end;
   end;
@@ -210,19 +212,40 @@
     end
 
   else begin   { not exist(GebuehrDat) }
-    AddP('DTAG T-NET City',0);
-    AddP('DTAG T-NET Fern',0);
-    AddP('DTAG T-NET100 City',0);
-    AddP('DTAG T-NET100 Fern',0);
-    AddP('DTAG T-ISDN City',0);
-    AddP('DTAG T-ISDN Fern',0);
-    AddP('DTAG Aktiv+ City',0);
-    AddP('DTAG Aktiv+ Fern',0);
-    AddP('DTAG XXL City',0);
-    AddP('DTAG XXL Fern',0);
-    AddP('Freecall (0800)',2);
+    AddP('T-Com Fern (T-Net)',0);
+    AddP('T-Com Welt 4',0);
+    AddP('T-Com Ort (T-Net)',0);
+    AddP('T-Com Nah (T-Net)',0);
+    AddP('T-Com VoIP',1);
+    xs('032');
+    AddP('T-Com Freecall',2);
     xs('0800'); x(800);
-    AddP('3U Normaltarif',0);
+    AddP('T-Com Service 0700',1);
+    xs('032');
+    AddP('T-Com Mobil E-Netze',9);
+    xs('0155'); xs('0156'); xs('0157'); xs('0159'); xs('0163'); xs('0176'); xs('0177'); xs('0178');
+    xs('0179');
+    AddP('T-Com Mobil D-Netze',10);
+    xs('0151'); xs('0152'); xs('0160'); xs('0162'); xs('0170'); xs('0171'); xs('0172'); xs('0173');
+    xs('0174'); xs('0175');
+    AddP('T-Com Euro 1',22);
+    x(298); x(30); x(31); x(32); x(33); x(34); x(351); x(352);
+    x(353); x(354); x(358); x(376); x(378); x(39); x(41); x(42);
+    x(43); x(44); x(45); x(46); x(47); x(48);
+    AddP('T-Com Euro 2',41);
+    x(20); x(212); x(213); x(216); x(218); x(350); x(355); x(356);
+    x(357); x(359); x(36); x(370); x(371); x(372); x(373); x(375);
+    x(380); x(381); x(385); x(386); x(387); x(389); x(40);
+    xs('7-01'); xs('7-07'); xs('7-08'); xs('7-095'); xs('7-096');
+    x7(811); x7(812); x7(815); x7(816); x7(820); x7(861); x7(862); x7(863);
+    x(90); x(961); x(962); x(963); x(972);
+    AddP('T-Com Welt 1',1);
+    x(1);
+    AddP('T-Com Welt 2',7);
+    x(61); x(64); x(65); xs('672-3-'); x(81); x(82); x(852);
+    AddP('T-Com Welt 3',14);
+    xs('1-809'); x(27); x(54); x(55); x(56); x(57); x(599); x(63);
+    x7(31); x7(32); x(886); x(966); x(971); x(98);
     loadt:=false;
     end;
   new(tarif);
@@ -273,50 +296,50 @@
     end
 
   else begin   { not loadt }
-    tables:=3;
+    tables:=2;
     for i:=1 to maxwotage do
       tarif^[1].wochentag[i]:=(i<=5);
-    tarif^[1].zeitbereiche:=7;
+    tarif^[1].zeitbereiche:=5;
     if not newgeb then begin
-       bereich(1,1,'00:00','04:59',240,6,60,3.1,60,1.6,60,2.6,240,6,60,3.1,60,1.6,60,2.6,60,1.6,60,2.6,0,0,1,0.04);
-       bereich(1,2,'05:00','06:59',150,6,60,3.1,60,1.6,60,2.6,240,6,60,3.1,60,1.6,60,2.6,60,1.6,60,2.6,0,0,1,0.04);
-       bereich(1,3,'07:00','07:59',150,6,60,12.3,60,3.1,60,4.6,90,6,60,9.2,60,1.6,60,2.6,60,1.6,60,2.6,0,0,1,0.04);
-       bereich(1,4,'08:00','08:59',150,6,60,12.3,60,3.1,60,4.6,90,6,60,9.2,60,1.6,60,2.6,60,1.6,60,2.6,0,0,1,0.08);
-       bereich(1,5,'09:00','17:59',90,6,60,12.3,60,3.1,60,4.6,90,6,60,9.2,60,3.1,60,4.6,60,3.1,60,4.6,0,0,1,0.08);
-       bereich(1,6,'18:00','20:59',150,6,60,6.2,60,1.6,60,2.6,240,6,60,3.1,60,1.6,60,2.6,60,1.6,60,2.6,0,0,1,0.04);
-       bereich(1,7,'21:00','23:59',240,6,60,3.1,60,1.6,60,2.6,240,6,60,3.1,60,1.6,60,2.6,60,1.6,60,2.6,0,0,1,0.04);
+       bereich(1,1,'00:00','06:59',60,3,60,149,240,6,60,1.50,60,3,0,0,60,6,60,29.20,60,24.60,60,12.30,
+                                 60,246,60,12.30,60,30.70,60,59);
+       bereich(1,2,'07:00','08:59',60,12,60,149,240,6,60,1.50,60,12,0,0,60,6,60,29.20,60,24.60,60,12.30,
+                                 60,246,60,12.30,60,30.70,60,59);
+       bereich(1,3,'09:00','17:59',60,12,60,149,90,6,60,4,60,12,0,0,60,12,60,29.20,60,24.60,60,12.30,
+                                 60,246,60,12.30,60,30.70,60,59);
+       bereich(1,4,'18:00','20:59',60,6,60,149,240,6,60,1.50,60,6,0,0,60,6,60,29.20,60,24.60,60,12.30,
+                                 60,246,60,12.30,60,30.70,60,59);
+       bereich(1,5,'21:00','23:59',60,3,60,149,240,6,60,1.50,60,3,0,0,60,6,60,29.20,60,24.60,60,12.30,
+                                 60,246,60,12.30,60,30.70,60,59);
     end else begin
-       bereich(1,1,'00:00','04:59',240,1.5,60,3.1,60,1.6,60,2.6,240,1.5,60,3.1,60,1.6,60,2.6,60,1.6,60,2.6,0,0,1,2.5);
-       bereich(1,2,'05:00','06:59',150,2.4,60,3.1,60,1.6,60,2.6,240,1.5,60,3.1,60,1.6,60,2.6,60,1.6,60,2.6,0,0,1,2.5);
-       bereich(1,3,'07:00','07:59',150,2.4,60,12.3,60,3.1,60,4.6,90,4,60,9.2,60,1.6,60,2.6,60,1.6,60,2.6,0,0,1,2.5);
-       bereich(1,4,'08:00','08:59',150,2.4,60,12.3,60,3.1,60,4.6,90,4,60,9.2,60,1.6,60,2.6,60,1.6,60,2.6,0,0,1,4.6);
-       bereich(1,5,'09:00','17:59',90,4,60,12.3,60,3.1,60,4.6,90,4,60,9.2,60,3.1,60,4.6,60,3.1,60,4.6,0,0,1,4.6);
-       bereich(1,6,'18:00','20:59',150,2.4,60,6.2,60,1.6,60,2.6,240,1.5,60,3.1,60,1.6,60,2.6,60,1.6,60,2.6,0,0,1,2.5);
-       bereich(1,7,'21:00','23:59',240,1.5,60,3.1,60,1.6,60,2.6,240,1.5,60,3.1,60,1.6,60,2.6,60,1.6,60,2.6,0,0,1,2.5);
+       bereich(1,1,'00:00','06:59',60,3,60,149,240,1.50,60,1.50,60,3,0,0,60,6,60,29.20,60,24.60,60,12.30,
+                                 60,246,60,12.30,60,30.70,60,59);
+       bereich(1,2,'07:00','08:59',60,12,60,149,240,1.50,60,1.50,60,12,0,0,60,6,60,29.20,60,24.60,60,12.30,
+                                 60,246,60,12.30,60,30.70,60,59);
+       bereich(1,3,'09:00','17:59',60,12,60,149,90,4,60,4,60,12,0,0,60,12,60,29.20,60,24.60,60,12.30,
+                                 60,246,60,12.30,60,30.70,60,59);
+       bereich(1,4,'18:00','20:59',60,6,60,149,240,1.50,60,1.50,60,6,0,0,60,6,60,29.20,60,24.60,60,12.30,
+                                 60,246,60,12.30,60,30.70,60,59);
+       bereich(1,5,'21:00','23:59',60,3,60,149,240,1.50,60,1.50,60,3,0,0,60,6,60,29.20,60,24.60,60,12.30,
+                                 60,246,60,12.30,60,30.70,60,59);
     end;
     for i:=1 to maxwotage do
-      tarif^[2].wochentag[i]:=(i=6);
+      tarif^[2].wochentag[i]:=(i in [6,7,8,9,10]);
     tarif^[2].zeitbereiche:=3;
     if not newgeb then begin
-       bereich(2,1,'00:00','06:59',240,6,60,3.1,60,1.6,60,2.6,240,6,60,3.1,60,1.6,60,2.6,60,1.6,60,2.6,0,0,1,0.04);
-       bereich(2,2,'07:00','20:59',150,6,60,4.6,60,1.6,60,2.6,240,6,60,3.1,60,1.6,60,2.6,60,1.6,60,2.6,0,0,1,0.04);
-       bereich(2,3,'21:00','23:59',240,6,60,3.1,60,1.6,60,2.6,240,6,60,3.1,60,1.6,60,2.6,60,1.6,60,2.6,0,0,1,0.04);
+       bereich(2,1,'00:00','06:59',60,3,60,149,240,6,60,1.50,60,3,0,0,60,6,60,29.20,60,24.60,60,12.30,
+                                 60,246,60,12.30, 60,30.70,60,59);
+       bereich(2,2,'07:00','20:59',60,4.50,60,149,240,6,60,1.50,60,4.50,0,0,60,6,60,29.20,60,24.60,60,12.30,
+                                 60,246, 60,12.30,60,30.70,60,59);
+       bereich(2,3,'21:00','23:59',60,3,60,149,240,6,60,1.50,60,3,0,0,60,6,60,29.20,60,24.60,60,12.30,
+                                 60,246,60,12.30, 60,30.70,60,59);
     end else begin
-       bereich(2,1,'00:00','06:59',240,1.5,60,3.1,60,1.6,60,2.6,240,1.5,60,3.1,60,1.6,60,2.6,60,1.6,60,2.6,0,0,1,2.5);
-       bereich(2,2,'07:00','20:59',150,2.4,60,4.6,60,1.6,60,2.6,240,1.5,60,3.1,60,1.6,60,2.6,60,1.6,60,2.6,0,0,1,2.5);
-       bereich(2,3,'21:00','23:59',240,1.5,60,3.1,60,1.6,60,2.6,240,1.5,60,3.1,60,1.6,60,2.6,60,1.6,60,2.6,0,0,1,2.5);
-    end;
-    for i:=1 to maxwotage do
-      tarif^[3].wochentag[i]:=(i in [7,8]);
-    tarif^[3].zeitbereiche:=3;
-    if not newgeb then begin
-       bereich(3,1,'00:00','06:59',240,6,60,3.1,60,1.6,60,2.6,240,6,60,3.1,60,1.6,60,2.6,0,0,0,0,0,0,1,0.04);
-       bereich(3,2,'07:00','20:59',150,6,60,4.6,60,1.6,60,2.6,240,6,60,3.1,60,1.6,60,2.6,0,0,0,0,0,0,1,0.04);
-       bereich(3,3,'21:00','23:59',240,6,60,3.1,60,1.6,60,2.6,240,6,60,3.1,60,1.6,60,2.6,0,0,0,0,0,0,1,0.04);
-    end else begin
-       bereich(3,1,'00:00','06:59',240,1.5,60,3.1,60,1.6,60,2.6,240,1.5,60,3.1,60,1.6,60,2.6,0,0,0,0,0,0,1,2.5);
-       bereich(3,2,'07:00','20:59',150,2.4,60,4.6,60,1.6,60,2.6,240,1.5,60,3.1,60,1.6,60,2.6,0,0,0,0,0,0,1,2.5);
-       bereich(3,3,'21:00','23:59',240,1.5,60,3.1,60,1.6,60,2.6,240,1.5,60,3.1,60,1.6,60,2.6,0,0,0,0,0,0,1,2.5);
+       bereich(2,1,'00:00','06:59',60,3,60,149,240,1.50,60,1.50,60,3,0,0,60,6,60,29.20,60,24.60,60,12.30,
+                                 60,246,60,12.30, 60,30.70,60,59);
+       bereich(2,2,'07:00','20:59',60,4.50,60,149,240,1.50,60,1.50,60,4.50,0,0,60,6,60,29.20,60,24.60,60,12.30,
+                                 60,246, 60,12.30,60,30.70,60,59);
+       bereich(2,3,'21:00','23:59',60,3,60,149,240,1.50,60,1.50,60,3,0,0,60,6,60,29.20,60,24.60,60,12.30,
+                                 60,246,60,12.30, 60,30.70,60,59);
     end;
     end;
   if not loadt then SavePhonezones;
@@ -336,6 +359,9 @@
 
 {
   $Log: xp10p.inc,v $
+  Revision 1.7  2004/11/08 12:07:16  mw
+  MW: - Anpassung an aktuelle Telefon-Tarife
+
   Revision 1.6  2004/01/09 16:19:00  mw
   MW: - Wir haben jetzt 2004!!
 
Index: freexp/doc/snapshot.dq
===================================================================
RCS file: /server/cvs/freexp/doc/snapshot.dq,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- freexp/doc/snapshot.dq	5 Oct 2004 02:05:42 -0000	1.22
+++ freexp/doc/snapshot.dq	8 Nov 2004 15:14:32 -0000	1.23
@@ -4553,3 +4553,30 @@
   nicht mehr existierende) Datei XP.OVR ermittelt, sondern über
   eine Assemblerfunktion.
   OVERXMS.ASM, OVERXMS.OBJ, OVERXMS.PAS, FILEIO.PAS
+
+
+
+■  07.11.2004
+-------------
+
+MW:
+%!  Bugfix: Die Ausgabe von ZPR kann wieder umgeleitet werden.
+- Aufgrund eines Seiteneffektes mit der Erkennung von Windows NT
+  funktionierte die Umleitung der Ausgaben von ZPR nicht mehr.
+  jetzt werden die Standard-IO-Kanäle expliziet geöffnet.
+  DOSX.PAS, ZPR.PAS
+
+
+
+■  08.11.2004
+-------------
+
+MW:
+%*  Erneuerung der Gebührentarife.
+- Die Default-Gebührentabellen wurden jetzt an den aktuellen
+  Stand der Tarife der T-Com angepasst.
+  Die Tabellen sind jetzt direkt für den Tarif T-Net Standard
+  der T-Com geeignet.
+  XP10P.INC
+
+



Mehr Informationen über die CVS-List Mailingliste