fix parsing

4 files changed, 87 insertions, 56 deletions

diff --git a/fhunit.pas b/fhunit.pas
index 176cf68..9078d96 100644
--- a/fhunit.pas
+++ b/fhunit.pas
@@ -112,6 +112,9 @@ const
   monatsNamen: array[1..12] of string =
     ('Januar','Februar','M'#$e4'rz','April','Mai','Juni','Juli',
      'August','September','Oktober','November','Dezember');
+  monatsNamen_: array[1..12] of string =
+    ('Januar','Februar','M%E4rz','April','Mai','Juni','Juli',
+     'August','September','Oktober','November','Dezember');
   farben: array[tMessGroesze] of tColor =
     ($0000DF,$CFAF7F,$007FFF,$FF00FF,$FFAF3F,$3FAFAF,$AFAFAF);
 
@@ -210,7 +213,10 @@ begin
         istZahl:=istZahl and (t[i] in ['0'..'9','.',',','-']);
       if not istZahl then
         exit;
-      _mW[mG]:=strtofloat(t);
+      if (t='--') and (mG=mgGlobalstrahlung) then
+        _mW[mG]:=0
+      else
+        _mW[mG]:=strtofloat(t);
     end;
     setzeUZeit;
   end;
@@ -418,7 +424,7 @@ begin
     uZeit2mZeit(nZeit,mZeit);
     ladeProzess.parameters.add(
       'tag='+inttostr(mZeit[zgTag])+'&'+
-      'monat='+Monatsnamen[mZeit[zgMonat]]+'&'+
+      'monat='+Monatsnamen_[mZeit[zgMonat]]+'&'+
       'jahr='+inttostr(mZeit[zgJahr])+'&'+
       'stunde='+inttostr(mZeit[zgStunde])+'&'+
       'minute='+inttostr(10*mZeit[zgMin10])+'&'+
diff --git a/wetter.lpi b/wetter.lpi
index 94e0207..6edc5fc 100644
--- a/wetter.lpi
+++ b/wetter.lpi
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="9"/>
+    <Version Value="12"/>
     <General>
+      <Flags>
+        <CompatibilityMode Value="True"/>
+      </Flags>
       <SessionStorage Value="InProjectDir"/>
-      <MainUnit Value="0"/>
       <Title Value="wetter"/>
       <ResourceType Value="res"/>
       <UseXPManifest Value="True"/>
@@ -13,9 +15,6 @@
     <i18n>
       <EnableI18N LFM="False"/>
     </i18n>
-    <VersionInfo>
-      <StringTable ProductVersion=""/>
-    </VersionInfo>
     <BuildModes Count="1">
       <Item1 Name="Default" Default="True"/>
     </BuildModes>
@@ -23,9 +22,10 @@
       <Version Value="2"/>
     </PublishOptions>
     <RunParams>
-      <local>
-        <FormatVersion Value="1"/>
-      </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default"/>
+      </Modes>
     </RunParams>
     <RequiredPackages Count="1">
       <Item1>
diff --git a/wetter.lps b/wetter.lps
index 3cabf03..cf3b6e1 100644
--- a/wetter.lps
+++ b/wetter.lps
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectSession>
-    <Version Value="11"/>
+    <Version Value="12"/>
     <BuildModes Active="Default"/>
     <Units Count="17">
       <Unit0>
@@ -9,7 +9,7 @@
         <IsPartOfProject Value="True"/>
         <EditorIndex Value="1"/>
         <CursorPos Y="17"/>
-        <UsageCount Value="60"/>
+        <UsageCount Value="61"/>
         <Loaded Value="True"/>
       </Unit0>
       <Unit1>
@@ -21,7 +21,7 @@
         <UnitName Value="Unit1"/>
         <TopLine Value="160"/>
         <CursorPos X="25" Y="177"/>
-        <UsageCount Value="60"/>
+        <UsageCount Value="61"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
       </Unit1>
@@ -29,16 +29,16 @@
         <Filename Value="original/pegelunit.pas"/>
         <IsPartOfProject Value="True"/>
         <EditorIndex Value="-1"/>
-        <UsageCount Value="60"/>
+        <UsageCount Value="61"/>
       </Unit2>
       <Unit3>
         <Filename Value="fhunit.pas"/>
         <IsPartOfProject Value="True"/>
         <IsVisibleTab Value="True"/>
         <EditorIndex Value="2"/>
-        <TopLine Value="404"/>
-        <CursorPos X="52" Y="426"/>
-        <UsageCount Value="60"/>
+        <TopLine Value="200"/>
+        <CursorPos X="45" Y="216"/>
+        <UsageCount Value="61"/>
         <Loaded Value="True"/>
       </Unit3>
       <Unit4>
@@ -47,7 +47,7 @@
         <EditorIndex Value="5"/>
         <TopLine Value="5"/>
         <CursorPos X="77" Y="30"/>
-        <UsageCount Value="29"/>
+        <UsageCount Value="30"/>
         <Loaded Value="True"/>
       </Unit4>
       <Unit5>
@@ -139,125 +139,150 @@
         <Loaded Value="True"/>
       </Unit16>
     </Units>
-    <JumpHistory Count="29" HistoryIndex="28">
+    <JumpHistory Count="30" HistoryIndex="29">
       <Position1>
-        <Filename Value="pegelunit.pas"/>
-        <Caret Line="633" Column="58" TopLine="597"/>
+        <Filename Value="fhunit.pas"/>
+        <Caret Line="214" TopLine="195"/>
       </Position1>
       <Position2>
-        <Filename Value="pegelunit.pas"/>
-        <Caret Line="635" Column="54" TopLine="599"/>
+        <Filename Value="fhunit.pas"/>
+        <Caret Line="216" Column="18" TopLine="195"/>
       </Position2>
       <Position3>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="177" Column="25" TopLine="160"/>
+        <Filename Value="fhunit.pas"/>
+        <Caret Line="221" TopLine="195"/>
       </Position3>
       <Position4>
-        <Filename Value="pegelunit.pas"/>
-        <Caret Line="622" Column="5" TopLine="606"/>
+        <Filename Value="fhunit.pas"/>
+        <Caret Line="219" Column="22" TopLine="258"/>
       </Position4>
       <Position5>
-        <Filename Value="../units/fileunit.pas"/>
-        <Caret Line="30" Column="77" TopLine="5"/>
+        <Filename Value="fhunit.pas"/>
+        <Caret Line="194" TopLine="187"/>
       </Position5>
       <Position6>
-        <Filename Value="pegelunit.pas"/>
-        <Caret Line="622" Column="5" TopLine="606"/>
+        <Filename Value="fhunit.pas"/>
+        <Caret Line="195" TopLine="187"/>
       </Position6>
       <Position7>
-        <Filename Value="pegelunit.pas"/>
+        <Filename Value="fhunit.pas"/>
+        <Caret Line="196" TopLine="187"/>
       </Position7>
       <Position8>
-        <Filename Value="pegelunit.pas"/>
-        <Caret Line="25" Column="27"/>
+        <Filename Value="fhunit.pas"/>
+        <Caret Line="197" TopLine="187"/>
       </Position8>
       <Position9>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="177" Column="25" TopLine="160"/>
+        <Filename Value="fhunit.pas"/>
+        <Caret Line="198" TopLine="187"/>
       </Position9>
       <Position10>
         <Filename Value="fhunit.pas"/>
-        <Caret Line="58" Column="33" TopLine="41"/>
+        <Caret Line="199" TopLine="187"/>
       </Position10>
       <Position11>
         <Filename Value="fhunit.pas"/>
+        <Caret Line="200" TopLine="187"/>
       </Position11>
       <Position12>
         <Filename Value="fhunit.pas"/>
-        <Caret Line="26" Column="27"/>
+        <Caret Line="203" TopLine="187"/>
       </Position12>
       <Position13>
         <Filename Value="fhunit.pas"/>
-        <Caret Line="27" Column="26"/>
+        <Caret Line="207" TopLine="187"/>
       </Position13>
       <Position14>
         <Filename Value="fhunit.pas"/>
-        <Caret Line="32" Column="40" TopLine="4"/>
+        <Caret Line="208" TopLine="202"/>
       </Position14>
       <Position15>
         <Filename Value="fhunit.pas"/>
-        <Caret Line="38" Column="35" TopLine="10"/>
+        <Caret Line="209" TopLine="202"/>
       </Position15>
       <Position16>
         <Filename Value="fhunit.pas"/>
-        <Caret Line="39" Column="35" TopLine="11"/>
+        <Caret Line="214" TopLine="202"/>
       </Position16>
       <Position17>
         <Filename Value="fhunit.pas"/>
-        <Caret Line="40" Column="29" TopLine="12"/>
+        <Caret Line="216" TopLine="202"/>
       </Position17>
       <Position18>
         <Filename Value="fhunit.pas"/>
-        <Caret Line="46" Column="45" TopLine="18"/>
+        <Caret Line="217" TopLine="202"/>
       </Position18>
       <Position19>
         <Filename Value="fhunit.pas"/>
-        <Caret Line="47" Column="47" TopLine="19"/>
+        <Caret Line="219" TopLine="202"/>
       </Position19>
       <Position20>
         <Filename Value="fhunit.pas"/>
-        <Caret Line="51" Column="39" TopLine="23"/>
+        <Caret Line="207" TopLine="201"/>
       </Position20>
       <Position21>
         <Filename Value="fhunit.pas"/>
-        <Caret Line="52" Column="42" TopLine="24"/>
+        <Caret Line="208" TopLine="201"/>
       </Position21>
       <Position22>
         <Filename Value="fhunit.pas"/>
-        <Caret Line="59" Column="55" TopLine="31"/>
+        <Caret Line="209" TopLine="201"/>
       </Position22>
       <Position23>
         <Filename Value="fhunit.pas"/>
-        <Caret Line="73" Column="28" TopLine="45"/>
+        <Caret Line="210" TopLine="201"/>
       </Position23>
       <Position24>
         <Filename Value="fhunit.pas"/>
-        <Caret Line="102" Column="53" TopLine="74"/>
+        <Caret Line="214" TopLine="201"/>
       </Position24>
       <Position25>
         <Filename Value="fhunit.pas"/>
-        <Caret Line="103" Column="53" TopLine="75"/>
+        <Caret Line="310" TopLine="293"/>
       </Position25>
       <Position26>
         <Filename Value="fhunit.pas"/>
-        <Caret Line="740" Column="53" TopLine="712"/>
+        <Caret Line="194" TopLine="178"/>
       </Position26>
       <Position27>
         <Filename Value="fhunit.pas"/>
-        <Caret Line="749" Column="53" TopLine="721"/>
+        <Caret Line="216" Column="29" TopLine="198"/>
       </Position27>
       <Position28>
         <Filename Value="fhunit.pas"/>
-        <Caret Line="421" Column="20" TopLine="410"/>
+        <Caret Line="163" Column="3" TopLine="146"/>
       </Position28>
       <Position29>
         <Filename Value="fhunit.pas"/>
-        <Caret Line="112" Column="3" TopLine="95"/>
+        <Caret Line="12" Column="51"/>
       </Position29>
+      <Position30>
+        <Filename Value="fhunit.pas"/>
+        <Caret Line="219" Column="3" TopLine="199"/>
+      </Position30>
     </JumpHistory>
     <RunParams>
       <FormatVersion Value="2"/>
-      <Modes Count="0" ActiveMode="default"/>
+      <Modes ActiveMode="default"/>
     </RunParams>
   </ProjectSession>
+  <Debugging>
+    <Watches>
+      <Item>
+        <Expression Value="s"/>
+      </Item>
+      <Item>
+        <Expression Value="t"/>
+      </Item>
+      <Item>
+        <Expression Value="mZ"/>
+      </Item>
+      <Item>
+        <Expression Value="istZahl"/>
+      </Item>
+      <Item>
+        <Expression Value="mG"/>
+      </Item>
+    </Watches>
+  </Debugging>
 </CONFIG>
diff --git a/wetter.res b/wetter.res
index f6e8499..5565379 100644
--- a/wetter.res
+++ b/wetter.res