WebSVN – indexer_suite – Diff – /trunk/IndexCreatorForm.pas

   FileTimeToSystemTime(fad.ftCreationTime, systime);
   Result := SystemTimeToDateTime(systime);
 end;
-function UTCTimeToLocalTime(const aValue: TDateTime): TDateTime;
-var
-  lBias: Integer;
-  lTZI: TTimeZoneInformation;
-begin
-  lBias := 0;
-  case GetTimeZoneInformation(lTZI) of
-    TIME_ZONE_ID_UNKNOWN:
-      lBias := lTZI.Bias;
-    TIME_ZONE_ID_DAYLIGHT:
-      lBias := lTZI.Bias + lTZI.DaylightBias;
-    TIME_ZONE_ID_STANDARD:
-      lBias := lTZI.Bias + lTZI.StandardBias;
-  end;
-  // UTC = local time + bias
-  // bias is in number of minutes, TDateTime is in days
-  Result := aValue - (lBias / (24 * 60));
-end;
 function GetFileSize(const AFileName: String): int64;
 var
   lFindData: TWin32FindData;
   lHandle: Cardinal;
 begin
   Result := StringReplace(Result, GUID_EHDD_A, 'EHDD:\', []);
   Result := StringReplace(Result, GUID_EHDD_B, 'EHDD:\', []);
 {$ENDIF}
 end;
+function SpecialCompare(a, b: TDateTime): boolean; // true = same timestamp
+begin
+  if SecondsBetween(a,b) < 2 then exit(true); // equal
+  if SecondsBetween(a,b) > 7200 then exit(false);
+  // Minute and Second equal, and difference is < 2h: fair enough, seems to be a DST issue
+  if copy(TimeToStr(a),4,5) = copy(TimeToStr(b),4,5) then exit(true);
+  result := false;
+end;
 procedure TfrmIndexCreator.CheckFile(const originalFileName,
   uniqueFilename: string);
   function DateTimeToSQL(dt: TDateTime): string;
   begin
     try
       if q.RecordCount = 0 then
         Result := erDoesNotExist
       else if not q.Fields[0].IsNull then
         Result := erHadError
-      else if (q.Fields[1].AsString <> IntToStr(size)) or
+      else if (q.Fields[1].AsString <> IntToStr(size)) or // we are combining strings because of int64
-      // we are combining strings because of int64
-        (SecondsBetween(q.Fields[2].AsDateTime, UTCTimeToLocalTime(modified)
+        not SpecialCompare(q.Fields[2].AsDateTime, modified) then
-        ) > 2) then
       begin
         Result := erChanged
       end
       else
         Result := erUnchanged;
       if not cbSimulate.Checked then
       begin
         conn.ExecSQL('INSERT INTO ' + TableName +
           ' (filename, size, created, modified, md5hash, error) values (' +
           conn.SQLStringEscape(VtsSpecial(uniqueFilename)) + ', ' +
-          IntToStr(size) + ', ' + DateTimeToSQL(UTCTimeToLocalTime(created)) +
+          IntToStr(size) + ', ' + DateTimeToSQL(created) +
-          ', ' + DateTimeToSQL(UTCTimeToLocalTime(modified)) + ', ' +
+          ', ' + DateTimeToSQL(modified) + ', ' +
           conn.SQLStringEscape(LowerCase(md5)) + ', NULL);');
       end;
       if cbVerboseLogs.Checked then
         Memo2.Lines.Add('New: ' + uniqueFilename);
       Inc(sumfiles_new);
             begin
               conn.ExecSQL('INSERT INTO ' + TableName +
                 ' (filename, size, created, modified, md5hash, error) values ('
                 + conn.SQLStringEscape(VtsSpecial(uniqueFilename)) + ', ' +
                 IntToStr(size) + ', ' +
-                DateTimeToSQL(UTCTimeToLocalTime(created)) + ', ' +
+                DateTimeToSQL(created) + ', ' +
-                DateTimeToSQL(UTCTimeToLocalTime(modified)) + ', ' +
+                DateTimeToSQL(modified) + ', ' +
                 conn.SQLStringEscape(LowerCase(md5)) + ', NULL);');
             end;
             if cbVerboseLogs.Checked then
               Memo2.Lines.Add('New: ' + uniqueFilename);
             Inc(sumfiles_new);
             if not cbSimulate.Checked and (rgModus.ItemIndex <> modusValidation)
             then
             begin
               conn.ExecSQL('UPDATE ' + TableName + ' SET size = ' +
                 IntToStr(size) + ', created = ' +
-                DateTimeToSQL(UTCTimeToLocalTime(created)) + ', modified = ' +
+                DateTimeToSQL(created) + ', modified = ' +
-                DateTimeToSQL(UTCTimeToLocalTime(modified)) + ', md5hash = ' +
+                DateTimeToSQL(modified) + ', md5hash = ' +
                 conn.SQLStringEscape(LowerCase(md5)) +
                 ', error = NULL WHERE filename = ' + conn.SQLStringEscape
                 (VtsSpecial(uniqueFilename)) + ';');
             end;
             if cbVerboseLogs.Checked then
               Memo2.Lines.Add('Updated: ' + uniqueFilename);
             Inc(sumfiles_updated);
           end;
         erUnchanged: // Date/Time+Size has not changed
           begin
+            {$REGION 'Update it to correct wrong UTC/DST datasets...'}
+            conn.ExecSQL('UPDATE ' + TableName + ' SET size = ' +
+              IntToStr(size) + ', created = ' +
+              DateTimeToSQL(created) + ', modified = ' +
+              DateTimeToSQL(modified) +
+              ', error = NULL WHERE filename = ' + conn.SQLStringEscape
+              (VtsSpecial(uniqueFilename)) + ';');
+            {$ENDREGION}
             if rgModus.ItemIndex = modusValidation then
             begin
               md5 := MD5File(uniqueFilename);
               if not SameText(md5, lastCheckedMd5) then
               begin
       begin
       ShowMessage('Finished');
       end;
     *)
   finally
-    EnableDisableControls(true);
+    if not StopRequest then EnableDisableControls(true);
   end;
+  if not StopRequest then
+  begin
-  Beep;
+    Beep;
-  Label1.Caption := 'Done.';
+    Label1.Caption := 'Done.';
-  Application.ProcessMessages;
+    Application.ProcessMessages;
-end;
+  end;
+end;
 procedure TfrmIndexCreator.FormClose(Sender: TObject; var Action: TCloseAction);
 begin
   StopRequest := true;
   Action := caFree; // TODO: müssen wir warten bis der prozess angehalten ist?

Subversion Repositories indexer_suite

indexer_suite/trunk/IndexCreatorForm.pas – Rev 4 → 6