Update of /server/cvs/freexp
In directory m6s15:/tmp/cvs-serv28627
Modified Files:
maggi.pas
Log Message:
MW: - Es werden jetzt die langen Maus-IDs zur Verkettung verwendet.
--- /server/cvs/freexp/maggi.pas2008/12/26 18:37:13 1.35
+++ /server/cvs/freexp/maggi.pas2008/12/28 10:35:26 1.36
@@ -8,7 +8,7 @@
{ Die Nutzungsbedingungen fuer diesen Quelltext finden Sie in der }
{ Datei SLIZENZ.TXT oder auf www.crosspoint.de/oldlicense.html. }
{ --- }
-{ $Id: maggi.pas,v 1.35 2008/12/26 18:37:13 mw Exp $ }
+{ $Id: maggi.pas,v 1.36 2008/12/28 10:35:26 mw Exp $ }
{ ZConnect <-> Magic/Quick - Konvertierer }
{ PM 04/92}
@@ -75,6 +75,7 @@
mausKF: boolean = true;{ fb: Filter f?r Kommentare }
MausIT_files : boolean = false; { ITI/ITG -> Box.IT* }
OldXPComp : boolean = false; { XP 3.12 Kompatibilitt: F-TO -> X-XP-FTO }
+ SmallMaus : boolean = false; { Kurze Maus-IDs verwenden }
{ attrCrash = $0002; }{ header.attrib: Crashmail }
{ attrFile= $0010; }{ File attached }
@@ -173,6 +174,7 @@
var f1,f2 : file;
bretter : integer;
brettp: array[1..maxbrett] of ^brett;
+ tstr : string;
{ 01/2000 oh : wird zum Einlesen der Customizable Headerlines bentigt }
@@ -187,6 +189,7 @@
writeln('MAGGI - Magic/Quick/Maus/ZConnect Converter (c) 1992-1999 Peter
Mandrella');
writeln(xp_display,'-Version ',verstr,betastr,' ',x_copyright,
' by ',author_name,' <',author_mail,'>');
+ writeln ('NextGeneration Maggi for Maustausch and FreeXP');
writeln;
end;
@@ -197,14 +200,15 @@
writeln('QuickMail: MAGGI [-qz|zq] [-g] ');
writeln('MausTausch: MAGGI [-sz|zs] -bBox -hBretthierarchie [-i]
');
writeln;
- writeln('-mz = MagicNET -> ZConnect -sz = MausTausch ->
ZConnect');
- writeln('-zm = ZConnect -> MagicNET -zs = ZConnect ->
MausTausch');
- writeln('-mn = MagicNET -> Netcall-i = Infofiles
bestellen');
- writeln('-m = Message-IDs erzeugen -o = Outfile erzeugen');
+ writeln('-mz = MagicNET -> ZConnect -sz= MausTausch ->
ZConnect');
+ writeln('-zm = ZConnect -> MagicNET -zs= ZConnect ->
MausTausch');
+ writeln('-mn = MagicNET -> Netcall-i = Infofiles
bestellen');
+ writeln('-m = Message-IDs erzeugen -o = Outfile erzeugen');
writeln;
- writeln('-qz = QuickNET -> ZConnect -pz = ProNET -> ZConnect');
- writeln('-zq = ZConnect -> QuickNet -zp = ZConnect -> ProNet');
- writeln('-g = GS-Mailbox -312 = Kompatibilittsmodus
zu 3.12');
+ writeln('-qz = QuickNET -> ZConnect -pz= ProNET ->
ZConnect');
+ writeln('-zq = ZConnect -> QuickNet -zp= ZConnect ->
ProNet');
+ writeln('-g = GS-Mailbox -312 =
Kompatibilittsmodus zu 3.12');
+ writeln(' -sMaus = Kurze Maus MSGIDs
verwenden');
halt(1);
end;
@@ -262,7 +266,12 @@
else if _is('on') then MausON:=false
else if _is('kf') then mausKF:=false
else if _is('it') then MausIT_Files:=true
-else if _is('312') then OldXPComp := true
+else if _is('312') then
+ begin
+ OldXPComp := true;
+ SmallMaus := true;
+ end
+else if _is('sMaus') then SmallMaus := true
else if (left(s,1)='/') or (left(s,1)='-') then parerr
else if infile='' then infile:=s
else if outfile='' then outfile:=s
@@ -1236,6 +1245,25 @@
writeln(t,':---');
end;
+ function INT2MAUS(a:string):string;
+ var f:text;
+ r,s,t:string;
+ begin
+if exist('INT2MAUS.IDS') then begin
+ assign(f,'INT2MAUS.IDS');
+ reset(f);
+ readln(f,t); {Erstmal Kopf ueberlesen}
+ readln(f,t);
+ repeat
+readln(f,r);
+readln(f,s);
+readln(f,t);
+ until ((r=a) or eof(f));
+ close (f);
+ if r=a then INT2MAUS:=s else INT2MAUS:='';
+end else INT2MAUS:='';
+ end;
+
begin
new(buf);
reset(f1,1);
@@ -1317,11 +1345,43 @@
writeln(t,'DL')
else
writeln(t,'DN');
+ {ref = org_xref => INT2MAUS}
+ {MW 11/2003}
+ if ((ref<>'') and (ref=org_xref) and SmallMaus=false) then begin
+ if (length(ref)-pos('@',ref)<5) then org_xref:=INT2MAUS(ref)
else
+ begin
+ ref:='';
+ org_xref:='';
+ end;
+ end;
+
if ref<>'' then begin
- if org_xref<>'' then
-writeln(t,'R',org_xref);
+ if SmallMaus then
+ begin
+ if org_xref<>'' then
+writeln(t,'R',org_xref);
