WebSVN – indexer_suite – Path Comparison – /

Regard whitespace Rev 7 → Rev 8

 /trunk/AdoConnHelper.pas
 ,7 → 3,7
 (*
  * Class helper for TAdoConnection
  * by Daniel Marschall, ViaThinkSoft <www.viathinksoft.com>
- * Revision: 28 Aug 2018
+ * Revision: 14 June 2021
  *)
 interface
 ,7 → 91,10
   result.CommandType := cmdText;
   result.CommandText := SQL;
   result.DisableControls;
-  if ATimeout <> -1 then result.CommandTimeout := ATimeout;
+  if ATimeout <> -1 then
+    result.CommandTimeout := ATimeout
+  else
+    result.CommandTimeout := self.CommandTimeout;
   result.Active := true;
 end;
 ,7 → 179,10
     cmd.ParamCheck := false;
     cmd.CommandType := cmdText;
     cmd.CommandText := SQL;
-    if ATimeOut <> -1 then cmd.CommandTimeout := ATimeout;
+    if ATimeOut <> -1 then
+      cmd.CommandTimeout := ATimeout
+    else
+      cmd.CommandTimeout := self.CommandTimeout;
     cmd.Execute;
   finally
     cmd.Free;
 ,7 → 195,7
 begin
   for s in List do
   begin
-    ExecSQL(s);
+    ExecSQL(s, ATimeout);
   end;
 end;

 /trunk/IndexCreatorForm.pas
 ,8 → 111,11
 const
   ERROR_FIELD_SIZE = 200;
 {$IFDEF VIATHINKSOFT}
+  // Example of multiple drives merging to one Index
+  // Find out via "mountvol" command
   GUID_EHDD_A = '\\?\Volume{31e044b1-28dc-11e6-9bae-d067e54bf736}\';
   GUID_EHDD_B = '\\?\Volume{560e8251-2b6a-4ab7-82fc-d03df4d93538}\';
+  GUID_EHDD_R = '\\?\Volume{9d53ea3c-175c-4a8f-a7b4-7b9e6b765e58}\';
 {$ENDIF}
 function MD5File(const filename: string): string;
 ,6 → 247,7
 {$IFDEF VIATHINKSOFT}
   Result := StringReplace(Result, GUID_EHDD_A, 'EHDD:\', []);
   Result := StringReplace(Result, GUID_EHDD_B, 'EHDD:\', []);
+  Result := StringReplace(Result, GUID_EHDD_R, 'EHDD:\', []);
 {$ENDIF}
 end;
 ,6 → 594,7
 var
   cacheAconnected: boolean;
   cacheBconnected: boolean;
+  cacheRconnected: boolean;
 {$ENDIF}
   function AllowFileCheck(AFileName: string): boolean;
   var
 ,7 → 612,11
       begin
         cacheBconnected := true;
       end;
-      Result := cacheAconnected or cacheBconnected;
+      if not cacheRconnected and SysUtils.DirectoryExists(GUID_EHDD_R) then
+      begin
+        cacheRconnected := true;
+      end;
+      Result := cacheAconnected or cacheBconnected or cacheRconnected;
     end
     else
 {$ENDIF}
 ,6 → 654,10
         GUID_EHDD_B, [])) then
         exit(true);
+      if cacheBconnected and FileExists(StringReplace(AFileName, 'EHDD:\',
+        GUID_EHDD_R, [])) then
+        exit(true);
       exit(false);
     end;
 {$ENDIF}

/trunk/VtsFileIndexerSuite.exe
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream