bugfix Summenerzeugung

2 files changed, 46 insertions, 39 deletions

diff --git a/Make.lps b/Make.lps
index ee5e4a1..d6ef6d1 100644
--- a/Make.lps
+++ b/Make.lps
@@ -22,8 +22,8 @@
         <Filename Value="tools.pas"/>
         <IsPartOfProject Value="True"/>
         <EditorIndex Value="4"/>
-        <TopLine Value="251"/>
-        <CursorPos X="17" Y="274"/>
+        <TopLine Value="370"/>
+        <CursorPos X="21" Y="381"/>
         <UsageCount Value="79"/>
         <Loaded Value="True"/>
       </Unit2>
@@ -42,9 +42,9 @@
         <UnitName Value="dateiBeziehungen"/>
         <IsVisibleTab Value="True"/>
         <EditorIndex Value="1"/>
-        <TopLine Value="1005"/>
-        <CursorPos X="88" Y="1033"/>
-        <FoldState Value=" T3jZ03C14;"/>
+        <TopLine Value="583"/>
+        <CursorPos X="46" Y="615"/>
+        <FoldState Value=" T3jZ03C pjYkO0B4]9Tk70y317]B8oN0E112 pielZ0G[94djI033p"/>
         <UsageCount Value="68"/>
         <Loaded Value="True"/>
       </Unit4>
@@ -63,7 +63,7 @@
       <Unit7>
         <Filename Value="../units/lowlevelunit.pas"/>
         <EditorIndex Value="3"/>
-        <TopLine Value="1295"/>
+        <TopLine Value="1255"/>
         <CursorPos X="81" Y="1311"/>
         <UsageCount Value="16"/>
         <Loaded Value="True"/>
@@ -134,121 +134,121 @@
     <JumpHistory Count="30" HistoryIndex="29">
       <Position1>
         <Filename Value="dateibeziehungen.pas"/>
-        <Caret Line="768" Column="134" TopLine="740"/>
+        <Caret Line="757" Column="57" TopLine="739"/>
       </Position1>
       <Position2>
         <Filename Value="dateibeziehungen.pas"/>
-        <Caret Line="751" Column="23" TopLine="750"/>
+        <Caret Line="760" Column="19" TopLine="743"/>
       </Position2>
       <Position3>
         <Filename Value="dateibeziehungen.pas"/>
-        <Caret Line="101" Column="27" TopLine="83"/>
+        <Caret Line="787" Column="61" TopLine="770"/>
       </Position3>
       <Position4>
         <Filename Value="dateibeziehungen.pas"/>
+        <Caret Line="794" Column="34" TopLine="777"/>
       </Position4>
       <Position5>
         <Filename Value="dateibeziehungen.pas"/>
-        <Caret Line="101" Column="27" TopLine="72"/>
+        <Caret Line="851" Column="7" TopLine="834"/>
       </Position5>
       <Position6>
         <Filename Value="dateibeziehungen.pas"/>
-        <Caret Line="737" Column="34" TopLine="724"/>
+        <Caret Line="857" Column="19" TopLine="838"/>
       </Position6>
       <Position7>
         <Filename Value="dateibeziehungen.pas"/>
-        <Caret Line="105" TopLine="88"/>
+        <Caret Line="861" Column="22" TopLine="843"/>
       </Position7>
       <Position8>
         <Filename Value="dateibeziehungen.pas"/>
-        <Caret Line="702" Column="38" TopLine="677"/>
+        <Caret Line="862" Column="89" TopLine="845"/>
       </Position8>
       <Position9>
         <Filename Value="dateibeziehungen.pas"/>
-        <Caret Line="739" Column="25" TopLine="723"/>
+        <Caret Line="866" Column="29" TopLine="849"/>
       </Position9>
       <Position10>
         <Filename Value="dateibeziehungen.pas"/>
-        <Caret Line="99" TopLine="82"/>
+        <Caret Line="997" Column="56" TopLine="990"/>
       </Position10>
       <Position11>
         <Filename Value="dateibeziehungen.pas"/>
-        <Caret Line="708" Column="24" TopLine="689"/>
       </Position11>
       <Position12>
         <Filename Value="dateibeziehungen.pas"/>
-        <Caret Line="720" Column="13" TopLine="692"/>
+        <Caret Line="718" Column="40" TopLine="693"/>
       </Position12>
       <Position13>
         <Filename Value="dateibeziehungen.pas"/>
-        <Caret Line="757" Column="57" TopLine="739"/>
+        <Caret Line="608" Column="62" TopLine="589"/>
       </Position13>
       <Position14>
         <Filename Value="dateibeziehungen.pas"/>
-        <Caret Line="760" Column="19" TopLine="743"/>
+        <Caret Line="1033" Column="87" TopLine="989"/>
       </Position14>
       <Position15>
         <Filename Value="dateibeziehungen.pas"/>
-        <Caret Line="787" Column="61" TopLine="770"/>
+        <Caret Line="810" Column="62" TopLine="794"/>
       </Position15>
       <Position16>
         <Filename Value="dateibeziehungen.pas"/>
-        <Caret Line="794" Column="34" TopLine="777"/>
+        <Caret Line="605" Column="20" TopLine="623"/>
       </Position16>
       <Position17>
         <Filename Value="dateibeziehungen.pas"/>
-        <Caret Line="851" Column="7" TopLine="834"/>
+        <Caret Line="600" Column="26" TopLine="583"/>
       </Position17>
       <Position18>
         <Filename Value="dateibeziehungen.pas"/>
-        <Caret Line="857" Column="19" TopLine="838"/>
+        <Caret Line="602" Column="26" TopLine="583"/>
       </Position18>
       <Position19>
         <Filename Value="dateibeziehungen.pas"/>
-        <Caret Line="861" Column="22" TopLine="843"/>
+        <Caret Line="1033" Column="88" TopLine="1005"/>
       </Position19>
       <Position20>
         <Filename Value="dateibeziehungen.pas"/>
-        <Caret Line="862" Column="89" TopLine="845"/>
       </Position20>
       <Position21>
         <Filename Value="dateibeziehungen.pas"/>
-        <Caret Line="866" Column="29" TopLine="849"/>
+        <Caret Line="600" Column="26" TopLine="584"/>
       </Position21>
       <Position22>
         <Filename Value="dateibeziehungen.pas"/>
-        <Caret Line="997" Column="56" TopLine="990"/>
+        <Caret Line="59" Column="33" TopLine="41"/>
       </Position22>
       <Position23>
         <Filename Value="dateibeziehungen.pas"/>
+        <Caret Line="285" Column="20" TopLine="164"/>
       </Position23>
       <Position24>
         <Filename Value="dateibeziehungen.pas"/>
-        <Caret Line="718" Column="40" TopLine="693"/>
+        <Caret Line="762" Column="73" TopLine="755"/>
       </Position24>
       <Position25>
         <Filename Value="dateibeziehungen.pas"/>
-        <Caret Line="608" Column="62" TopLine="589"/>
+        <Caret Line="160" Column="74" TopLine="693"/>
       </Position25>
       <Position26>
         <Filename Value="dateibeziehungen.pas"/>
-        <Caret Line="1033" Column="87" TopLine="989"/>
+        <Caret Line="100" Column="33" TopLine="82"/>
       </Position26>
       <Position27>
         <Filename Value="dateibeziehungen.pas"/>
-        <Caret Line="810" Column="62" TopLine="794"/>
+        <Caret Line="724" Column="29" TopLine="695"/>
       </Position27>
       <Position28>
         <Filename Value="dateibeziehungen.pas"/>
-        <Caret Line="605" Column="20" TopLine="623"/>
+        <Caret Line="848" Column="35" TopLine="855"/>
       </Position28>
       <Position29>
-        <Filename Value="dateibeziehungen.pas"/>
-        <Caret Line="600" Column="26" TopLine="583"/>
+        <Filename Value="tools.pas"/>
+        <Caret Line="50" Column="21" TopLine="32"/>
       </Position29>
       <Position30>
         <Filename Value="dateibeziehungen.pas"/>
-        <Caret Line="602" Column="26" TopLine="583"/>
+        <Caret Line="727" TopLine="473"/>
       </Position30>
     </JumpHistory>
   </ProjectSession>
diff --git a/dateibeziehungen.pas b/dateibeziehungen.pas
index 555127b..e69bf56 100644
--- a/dateibeziehungen.pas
+++ b/dateibeziehungen.pas
@@ -571,9 +571,11 @@ end;
 
 procedure tGenerischeAbhaengigkeit.generiereErben(var es: tExpliziteAbhaengigkeiten);
 var
-  i,j: longint;
-  s:   string;
+  i,j:     longint;
+  s:       string;
+  neuSums: tMyStringList;
 begin
+  neuSums:=tMyStringList.create;
   for i:=0 to matchCount-1 do begin
     es.add(tExpliziteAbhaengigkeit.create);
     for j:=0 to quellen[i].count-1 do
@@ -604,13 +606,18 @@ begin
       es.last.befehle.add(s);
       s:='sha512sum';
       for j:=0 to quellen[i].count-1 do
-        s:=s+' "'+quellen[i][j].name+'"';
+        neuSums.add(quellen[i][j].name);
       for j:=0 to ziele[i].count-1 do
-        s:=s+' "'+ziele[i][j].name+'"';
+        neuSums.add(ziele[i][j].name);
+      neuSums.sort;
+      neuSums.uniq('-');
+      for j:=0 to neuSums.count-1 do
+        s:=s+' "'+escape(neuSums[j],'"\','\')+'"';
       s:=s+' >> '+_pruefsummenDatei;
       es.last.befehle.add(s);
     end;
   end;
+  neuSums.free;
 end;
 
 // tExpliziteAbhaengigkeit **************************************************************