pgz als Typ hinzugefügt

5 files changed, 87 insertions, 93 deletions

diff --git a/.gitignore b/.gitignore
index bd7ecb9..a553c96 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,7 +11,11 @@ socket
 *.txt.save
 *.txt.gz
 *.txt.gz.save
+*.txt.pgz
+*.txt.pgz.save
 *.dat
 *.dat.save
 *.dat.gz
 *.dat.gz.save
+*.dat.pgz
+*.dat.pgz.save
diff --git a/fhunit.pas b/fhunit.pas
index 51edb6a..f4e5edc 100644
--- a/fhunit.pas
+++ b/fhunit.pas
@@ -556,10 +556,7 @@ begin
     exit;
   end;
 
-  if rightStr(von,3)='.gz' then
-    loadFromGz(von,pt,len)
-  else
-    loadFromFile(von,pt,len);
+  loadFromGeneric(von,pt,len);
 
   if pLongint(pt)^ <> 314159265 then begin // magische Zahl nicht gefunden -> Rückfallebene: Text!
     sl:=tMyStringList.create;
@@ -600,10 +597,7 @@ begin
     pLongint(pt)^:=314159265; // magische Zahl
     (pLongint(pt)+1)^:=0;     // Version
     werte.dump(pt+2*sizeof(longint));
-    if rightStr(nach,3)='.gz' then
-      saveToGz(nach,pt,i+2*sizeof(longint))
-    else
-      saveToFile(nach,pt,i+2*sizeof(longint));
+    saveToGeneric(nach,pt,i+2*sizeof(longint));
     freemem(pt);
   end;
 end;
diff --git a/pegelunit.pas b/pegelunit.pas
index d5fd5a5..bfa1d6b 100644
--- a/pegelunit.pas
+++ b/pegelunit.pas
@@ -525,10 +525,7 @@ begin
     exit;
   end;
 
-  if rightStr(von,3)='.gz' then
-    loadFromGz(von,pt,len)
-  else
-    loadFromFile(von,pt,len);
+  loadFromGeneric(von,pt,len);
 
   if pLongint(pt)^ <> 314159265 then begin // magische Zahl nicht gefunden -> Rückfallebene: Text!
     sl:=tMyStringList.create;
@@ -618,10 +615,7 @@ begin
       werte[ps].dump(pt+i);
       i:=i+werte[ps].size;
     end;
-    if rightStr(nach,3)='.gz' then
-      saveToGz(nach,pt,len)
-    else
-      saveToFile(nach,pt,len);
+    saveToGeneric(nach,pt,len);
     freemem(pt);
   end;
 end;
diff --git a/wetter.konf b/wetter.konf
index 4a6d73a..e1a07b4 100644
--- a/wetter.konf
+++ b/wetter.konf
@@ -1,4 +1,4 @@
 pidDatei:       /tmp/wetter.pid
-wetterDatei:    letztes_Wetter.dat.gz
-pegelDatei:     letzte_Pegel.dat.gz
+wetterDatei:    letztes_Wetter.dat.pgz
+pegelDatei:     letzte_Pegel.dat.pgz
 datenZeitRaum:  7*4
diff --git a/wetter.lps b/wetter.lps
index cd04c8e..3bde169 100644
--- a/wetter.lps
+++ b/wetter.lps
@@ -9,7 +9,7 @@
         <IsPartOfProject Value="True"/>
         <EditorIndex Value="-1"/>
         <CursorPos X="12" Y="6"/>
-        <UsageCount Value="55"/>
+        <UsageCount Value="57"/>
       </Unit0>
       <Unit1>
         <Filename Value="unit1.pas"/>
@@ -18,9 +18,9 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="Unit1"/>
-        <TopLine Value="86"/>
-        <CursorPos Y="91"/>
-        <UsageCount Value="55"/>
+        <TopLine Value="166"/>
+        <CursorPos X="28" Y="177"/>
+        <UsageCount Value="57"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
       </Unit1>
@@ -28,24 +28,25 @@
         <Filename Value="original/pegelunit.pas"/>
         <IsPartOfProject Value="True"/>
         <EditorIndex Value="-1"/>
-        <UsageCount Value="55"/>
+        <UsageCount Value="57"/>
       </Unit2>
       <Unit3>
         <Filename Value="fhunit.pas"/>
         <IsPartOfProject Value="True"/>
         <EditorIndex Value="2"/>
-        <TopLine Value="513"/>
-        <CursorPos X="8" Y="574"/>
-        <UsageCount Value="55"/>
+        <TopLine Value="573"/>
+        <CursorPos X="18" Y="600"/>
+        <UsageCount Value="57"/>
         <Loaded Value="True"/>
       </Unit3>
       <Unit4>
         <Filename Value="../units/fileunit.pas"/>
         <IsPartOfProject Value="True"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="106"/>
-        <CursorPos X="20" Y="110"/>
-        <UsageCount Value="24"/>
+        <EditorIndex Value="3"/>
+        <TopLine Value="108"/>
+        <CursorPos X="62" Y="128"/>
+        <UsageCount Value="26"/>
+        <Loaded Value="True"/>
       </Unit4>
       <Unit5>
         <Filename Value="original/Unit1.pas"/>
@@ -57,10 +58,10 @@
       <Unit6>
         <Filename Value="pegelunit.pas"/>
         <IsVisibleTab Value="True"/>
-        <EditorIndex Value="3"/>
-        <TopLine Value="286"/>
-        <CursorPos Y="323"/>
-        <UsageCount Value="27"/>
+        <EditorIndex Value="4"/>
+        <TopLine Value="587"/>
+        <CursorPos X="18" Y="618"/>
+        <UsageCount Value="28"/>
         <Loaded Value="True"/>
       </Unit6>
       <Unit7>
@@ -73,8 +74,8 @@
       <Unit8>
         <Filename Value="wetter.konf"/>
         <EditorIndex Value="1"/>
-        <CursorPos X="38" Y="2"/>
-        <UsageCount Value="27"/>
+        <CursorPos X="35" Y="3"/>
+        <UsageCount Value="28"/>
         <Loaded Value="True"/>
         <DefaultSyntaxHighlighter Value="None"/>
       </Unit8>
@@ -132,123 +133,124 @@
     </Units>
     <JumpHistory Count="30" HistoryIndex="29">
       <Position1>
-        <Filename Value="fhunit.pas"/>
-        <Caret Line="469" Column="21" TopLine="444"/>
+        <Filename Value="pegelunit.pas"/>
+        <Caret Line="596" Column="7" TopLine="576"/>
       </Position1>
       <Position2>
-        <Filename Value="fhunit.pas"/>
-        <Caret Line="59" Column="30" TopLine="39"/>
+        <Filename Value="pegelunit.pas"/>
+        <Caret Line="92" Column="45" TopLine="77"/>
       </Position2>
       <Position3>
-        <Filename Value="fhunit.pas"/>
-        <Caret Line="60" Column="18" TopLine="39"/>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="91" Column="38" TopLine="80"/>
       </Position3>
       <Position4>
-        <Filename Value="fhunit.pas"/>
-        <Caret Line="246" Column="25" TopLine="213"/>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="163" Column="12" TopLine="151"/>
       </Position4>
       <Position5>
-        <Filename Value="fhunit.pas"/>
-        <Caret Line="469" Column="21" TopLine="436"/>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="291" TopLine="276"/>
       </Position5>
       <Position6>
-        <Filename Value="fhunit.pas"/>
-        <Caret Line="486" Column="19" TopLine="453"/>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="67" TopLine="40"/>
       </Position6>
       <Position7>
-        <Filename Value="fhunit.pas"/>
-        <Caret Line="505" Column="31" TopLine="472"/>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="82" Column="23" TopLine="61"/>
       </Position7>
       <Position8>
-        <Filename Value="fhunit.pas"/>
-        <Caret Line="509" Column="33" TopLine="476"/>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="72" Column="70" TopLine="62"/>
       </Position8>
       <Position9>
-        <Filename Value="fhunit.pas"/>
-        <Caret Line="568" TopLine="542"/>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="301" Column="19" TopLine="276"/>
       </Position9>
       <Position10>
-        <Filename Value="fhunit.pas"/>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="35"/>
       </Position10>
       <Position11>
-        <Filename Value="fhunit.pas"/>
-        <Caret Line="39" Column="19" TopLine="6"/>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="308" Column="19" TopLine="273"/>
       </Position11>
       <Position12>
-        <Filename Value="fhunit.pas"/>
-        <Caret Line="59" Column="19" TopLine="26"/>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="305" Column="36" TopLine="272"/>
       </Position12>
       <Position13>
         <Filename Value="fhunit.pas"/>
-        <Caret Line="239" Column="26" TopLine="206"/>
+        <Caret Line="608" Column="15" TopLine="576"/>
       </Position13>
       <Position14>
-        <Filename Value="fhunit.pas"/>
-        <Caret Line="490" Column="140" TopLine="464"/>
+        <Filename Value="../units/fileunit.pas"/>
+        <Caret Line="30" Column="40" TopLine="3"/>
       </Position14>
       <Position15>
-        <Filename Value="fhunit.pas"/>
-        <Caret Line="476" Column="28" TopLine="456"/>
+        <Filename Value="../units/fileunit.pas"/>
+        <Caret Line="101" Column="42" TopLine="78"/>
       </Position15>
       <Position16>
-        <Filename Value="fhunit.pas"/>
-        <Caret Line="58" Column="28" TopLine="50"/>
+        <Filename Value="../units/fileunit.pas"/>
+        <Caret Line="25" Column="42" TopLine="18"/>
       </Position16>
       <Position17>
-        <Filename Value="fhunit.pas"/>
-        <Caret Line="464" Column="41" TopLine="445"/>
+        <Filename Value="../units/fileunit.pas"/>
+        <Caret Line="134" TopLine="96"/>
       </Position17>
       <Position18>
-        <Filename Value="fhunit.pas"/>
-        <Caret Line="59" Column="24" TopLine="58"/>
+        <Filename Value="../units/fileunit.pas"/>
+        <Caret Line="46" Column="29" TopLine="21"/>
       </Position18>
       <Position19>
-        <Filename Value="pegelunit.pas"/>
-        <Caret Line="56" TopLine="19"/>
+        <Filename Value="../units/fileunit.pas"/>
+        <Caret Line="84" Column="23" TopLine="53"/>
       </Position19>
       <Position20>
-        <Filename Value="pegelunit.pas"/>
-        <Caret Line="191" Column="8" TopLine="153"/>
+        <Filename Value="../units/fileunit.pas"/>
+        <Caret Line="141" Column="7" TopLine="106"/>
       </Position20>
       <Position21>
-        <Filename Value="pegelunit.pas"/>
-        <Caret Line="56" TopLine="33"/>
+        <Filename Value="../units/fileunit.pas"/>
+        <Caret Line="27" TopLine="20"/>
       </Position21>
       <Position22>
-        <Filename Value="pegelunit.pas"/>
-        <Caret Line="284" Column="60" TopLine="260"/>
+        <Filename Value="../units/fileunit.pas"/>
+        <Caret Line="133" Column="13" TopLine="110"/>
       </Position22>
       <Position23>
-        <Filename Value="pegelunit.pas"/>
-        <Caret Line="54" Column="52" TopLine="38"/>
+        <Filename Value="../units/fileunit.pas"/>
+        <Caret Line="31" TopLine="9"/>
       </Position23>
       <Position24>
-        <Filename Value="pegelunit.pas"/>
-        <Caret Line="62" Column="52" TopLine="33"/>
+        <Filename Value="../units/fileunit.pas"/>
+        <Caret Line="216" Column="11" TopLine="177"/>
       </Position24>
       <Position25>
-        <Filename Value="pegelunit.pas"/>
-        <Caret Line="515" Column="6" TopLine="509"/>
+        <Filename Value="../units/fileunit.pas"/>
+        <Caret Line="153" TopLine="147"/>
       </Position25>
       <Position26>
-        <Filename Value="pegelunit.pas"/>
-        <Caret Line="584" Column="45" TopLine="560"/>
+        <Filename Value="../units/fileunit.pas"/>
+        <Caret Line="168" Column="18" TopLine="135"/>
       </Position26>
       <Position27>
-        <Filename Value="pegelunit.pas"/>
-        <Caret Line="590" Column="39" TopLine="564"/>
+        <Filename Value="../units/fileunit.pas"/>
+        <Caret Line="160" Column="21" TopLine="140"/>
       </Position27>
       <Position28>
-        <Filename Value="pegelunit.pas"/>
-        <Caret Line="599" Column="17" TopLine="571"/>
+        <Filename Value="../units/fileunit.pas"/>
+        <Caret Line="173" TopLine="143"/>
       </Position28>
       <Position29>
         <Filename Value="pegelunit.pas"/>
-        <Caret Line="596" Column="7" TopLine="576"/>
+        <Caret Line="528" Column="18" TopLine="515"/>
       </Position29>
       <Position30>
-        <Filename Value="pegelunit.pas"/>
-        <Caret Line="92" Column="45" TopLine="77"/>
+        <Filename Value="../units/fileunit.pas"/>
+        <Caret Line="26" Column="62" TopLine="17"/>
       </Position30>
     </JumpHistory>
   </ProjectSession>