Browse Source

add zip module

olivier.massot 8 năm trước cách đây
mục cha
commit
baf1098e98

BIN
OpenAccess.zip


+ 1 - 1
source/database.properties

@@ -33,7 +33,7 @@ Show Values in Non-Indexed	1	4
 Show Values in Remote	0	4
 Show Values in Remote	0	4
 Auto Compact	0	4
 Auto Compact	0	4
 NavPane Closed	0	4
 NavPane Closed	0	4
-NavPane Width	230	4
+NavPane Width	232	4
 NavPane View By	0	4
 NavPane View By	0	4
 NavPane Sort By	1	4
 NavPane Sort By	1	4
 AppTitle	OpenAccess	10
 AppTitle	OpenAccess	10

+ 3 - 3
source/modules/OA_Export.bas

@@ -221,7 +221,7 @@ next_td:
 End Sub
 End Sub
 
 
 Public Sub ExportAllRelations()
 Public Sub ExportAllRelations()
-    Dim dirpath, filepath As String
+    Dim dirpath, filePath As String
     Dim count, total As Integer
     Dim count, total As Integer
     
     
     dirpath = joinpaths(source_dir(), "relations\")
     dirpath = joinpaths(source_dir(), "relations\")
@@ -244,9 +244,9 @@ Public Sub ExportAllRelations()
                 Or (aRelation.Attributes And DAO.RelationAttributeEnum.dbRelationInherited) = _
                 Or (aRelation.Attributes And DAO.RelationAttributeEnum.dbRelationInherited) = _
                 DAO.RelationAttributeEnum.dbRelationInherited) Then
                 DAO.RelationAttributeEnum.dbRelationInherited) Then
             
             
-            filepath = joinpaths(dirpath, to_filename(aRelation.name) & ".txt")
+            filePath = joinpaths(dirpath, to_filename(aRelation.name) & ".txt")
             
             
-            ExportRelation aRelation, filepath
+            ExportRelation aRelation, filePath
             
             
             count = count + 1
             count = count + 1
             
             

+ 3 - 3
source/modules/OA_Import.bas

@@ -3,14 +3,14 @@ Option Explicit
 
 
 Public Sub ImportAll()
 Public Sub ImportAll()
     Dim db As DAO.Database
     Dim db As DAO.Database
-    Dim FSO As Object
+    Dim fso As Object
 
 
     logger "ImportAll", "INFO", "Begin 'Import all sources'"
     logger "ImportAll", "INFO", "Begin 'Import all sources'"
     
     
-    Set FSO = CreateObject("Scripting.FileSystemObject")
+    Set fso = CreateObject("Scripting.FileSystemObject")
     Set db = CurrentDb
     Set db = CurrentDb
 
 
-    If Not FSO.FolderExists(source_dir()) Then
+    If Not fso.FolderExists(source_dir()) Then
         logger "ImportAll", "CRITICAL", "No source found at:" & source_dir
         logger "ImportAll", "CRITICAL", "No source found at:" & source_dir
     End If
     End If
 
 

+ 8 - 8
source/modules/OA_Log.bas

@@ -26,15 +26,15 @@ Public Sub set_debug_mode()
 End Sub
 End Sub
 
 
 Public Sub set_log_path(ByVal path As String)
 Public Sub set_log_path(ByVal path As String)
-    Dim FSO As Object
+    Dim fso As Object
     Dim oFile As Object
     Dim oFile As Object
     
     
-    Set FSO = CreateObject("Scripting.FileSystemObject")
+    Set fso = CreateObject("Scripting.FileSystemObject")
     
     
     Call MkLogDir
     Call MkLogDir
     
     
-    If Not FSO.FileExists(path) Then
-        Set oFile = FSO.CreateTextFile(path)
+    If Not fso.FileExists(path) Then
+        Set oFile = fso.CreateTextFile(path)
         oFile.Close
         oFile.Close
     End If
     End If
     
     
@@ -44,7 +44,7 @@ End Sub
 
 
 
 
 Public Sub logger(ByVal origin As String, ByVal level As String, ByVal msg As String)
 Public Sub logger(ByVal origin As String, ByVal level As String, ByVal msg As String)
-    Dim FSO As Object
+    Dim fso As Object
     Dim oFile As Object
     Dim oFile As Object
     Dim Line As String
     Dim Line As String
     Dim new_session As Boolean
     Dim new_session As Boolean
@@ -54,7 +54,7 @@ Public Sub logger(ByVal origin As String, ByVal level As String, ByVal msg As St
 
 
     If level = "ERROR" Then p_errors_occured = True
     If level = "ERROR" Then p_errors_occured = True
 
 
-    Set FSO = CreateObject("Scripting.FileSystemObject")
+    Set fso = CreateObject("Scripting.FileSystemObject")
 
 
     If Not Len(log_file_path) > 0 Then
     If Not Len(log_file_path) > 0 Then
         log_file_path = log_dir() & "oa_" & Format(Now(), "yymmdd_hhMM") & ".log"
         log_file_path = log_dir() & "oa_" & Format(Now(), "yymmdd_hhMM") & ".log"
@@ -62,7 +62,7 @@ Public Sub logger(ByVal origin As String, ByVal level As String, ByVal msg As St
         Call set_log_path(log_file_path)
         Call set_log_path(log_file_path)
     End If
     End If
 
 
-    Set oFile = FSO.OpenTextFile(log_file_path, ForAppending)
+    Set oFile = fso.OpenTextFile(log_file_path, ForAppending)
 
 
     If new_session Then oFile.WriteLine ("**********************************")
     If new_session Then oFile.WriteLine ("**********************************")
 
 
@@ -71,7 +71,7 @@ Public Sub logger(ByVal origin As String, ByVal level As String, ByVal msg As St
     oFile.WriteLine (Line)
     oFile.WriteLine (Line)
 
 
     oFile.Close
     oFile.Close
-    Set FSO = Nothing
+    Set fso = Nothing
     Set oFile = Nothing
     Set oFile = Nothing
     
     
     If level = "CRITICAL" Then
     If level = "CRITICAL" Then

+ 4 - 3
source/modules/OA_Main.bas

@@ -173,9 +173,10 @@ Public Function zip_app_file() As Boolean
     shortname = Split(CurrentProject.name, ".")(0)
     shortname = Split(CurrentProject.name, ".")(0)
     
     
     'run the shell comand
     'run the shell comand
-    Call cmd("cd " & CurrentProject.path & " & " & _
-             "zip tmp_" & shortname & ".zip " & CurrentProject.name & _
-             " & exit")
+'    Call cmd("cd " & CurrentProject.path & " & " & _
+'             "zip tmp_" & shortname & ".zip " & CurrentProject.name & _
+'             " & exit")
+    zipfile "tmp_" & shortname & ".zip", CurrentProject.path
     
     
     'remove the old zip file
     'remove the old zip file
     If dir(CurrentProject.path & "\" & shortname & ".zip") <> "" Then
     If dir(CurrentProject.path & "\" & shortname & ".zip") <> "" Then

+ 4 - 4
source/modules/OA_Properties.bas

@@ -192,7 +192,7 @@ end_:
 
 
 End Sub
 End Sub
 
 
-Public Sub ImportTableProperties(table_name As String, filepath As String)
+Public Sub ImportTableProperties(table_name As String, filePath As String)
 
 
     Dim db As DAO.Database
     Dim db As DAO.Database
     Dim td As Object
     Dim td As Object
@@ -210,8 +210,8 @@ Public Sub ImportTableProperties(table_name As String, filepath As String)
     Dim oElt As MSXML2.IXMLDOMElement
     Dim oElt As MSXML2.IXMLDOMElement
     Dim oAttribut As IXMLDOMAttribute
     Dim oAttribut As IXMLDOMAttribute
     
     
-    filepath = norm_path(filepath)
-    buffer = ReadFile(filepath, "x-ansi")
+    filePath = norm_path(filePath)
+    buffer = ReadFile(filePath, "x-ansi")
     
     
     Set oXML = New MSXML2.DOMDocument60
     Set oXML = New MSXML2.DOMDocument60
     oXML.loadXML buffer
     oXML.loadXML buffer
@@ -251,7 +251,7 @@ Public Sub ImportTableProperties(table_name As String, filepath As String)
         
         
     Next oFieldNode
     Next oFieldNode
     
     
-    Call logger("ImportTableProperties", "DEBUG", "> " & table_name & " properties imported from " & filepath)
+    Call logger("ImportTableProperties", "DEBUG", "> " & table_name & " properties imported from " & filePath)
 end_:
 end_:
     Set oNode = Nothing
     Set oNode = Nothing
     Set oXML = Nothing
     Set oXML = Nothing

+ 7 - 7
source/modules/OA_Utils.bas

@@ -137,14 +137,14 @@ Public Function complete_gitignore()
     
     
     gitignore_path = CurrentProject.path & "\.gitignore"
     gitignore_path = CurrentProject.path & "\.gitignore"
     
     
-    Dim FSO As Object
-    Set FSO = CreateObject("Scripting.FileSystemObject")
+    Dim fso As Object
+    Set fso = CreateObject("Scripting.FileSystemObject")
     
     
     Dim oFile As Object
     Dim oFile As Object
-    If Not FSO.FileExists(gitignore_path) Then
-        Set oFile = FSO.CreateTextFile(gitignore_path)
+    If Not fso.FileExists(gitignore_path) Then
+        Set oFile = fso.CreateTextFile(gitignore_path)
     Else
     Else
-        Set oFile = FSO.OpenTextFile(gitignore_path, ForReading)
+        Set oFile = fso.OpenTextFile(gitignore_path, ForReading)
         str_existing_keys = ""
         str_existing_keys = ""
         
         
         While Not oFile.AtEndOfStream
         While Not oFile.AtEndOfStream
@@ -160,7 +160,7 @@ Public Function complete_gitignore()
         Dim existing_keys() As String
         Dim existing_keys() As String
         existing_keys = Split(str_existing_keys, ";")
         existing_keys = Split(str_existing_keys, ";")
         
         
-        Set oFile = FSO.OpenTextFile(gitignore_path, ForAppending)
+        Set oFile = fso.OpenTextFile(gitignore_path, ForAppending)
     End If
     End If
     
     
     oFile.WriteBlankLines (2)
     oFile.WriteBlankLines (2)
@@ -174,7 +174,7 @@ Public Function complete_gitignore()
     oFile.WriteBlankLines (2)
     oFile.WriteBlankLines (2)
     
     
     oFile.Close
     oFile.Close
-    Set FSO = Nothing
+    Set fso = Nothing
     Set oFile = Nothing
     Set oFile = Nothing
 
 
 End Function
 End Function

+ 40 - 0
source/modules/OA_Zip.bas

@@ -0,0 +1,40 @@
+Option Explicit
+Option Base 0
+
+Private Declare Sub Sleep Lib "kernel32" (ByVal dwMiliseconds As Long)
+
+Public Sub zipfile(zipPath As String, filePath As String)
+  createzip zipPath
+  addfile zipPath, filePath
+End Sub
+
+Public Sub zipfolder(zipPath As String, folderpath As String)
+  Dim file As Variant
+  createzip zipPath
+  For Each file In CreateObject("Scripting.FileSystemObject").GetFolder(folderpath).Files
+      addfile zipPath, CStr(file)
+  Next file
+End Sub
+
+Private Sub addfile(zipPath As String, filePath As String)
+  Dim sh As Shell32.Shell, fdr As Shell32.Folder, cntItems As Integer 'cnt = Count
+  Set sh = CreateObject("Shell.Application")
+  Set fdr = sh.NameSpace(zipPath)
+  cntItems = fdr.Items.count
+  fdr.CopyHere filePath, 4 + 16 + 1024
+  Do
+    Sleep 1000
+  Loop Until cntItems < fdr.Items.count
+  Set fdr = Nothing
+  Set sh = Nothing
+End Sub
+
+Private Sub createzip(zipPath As String)
+  Dim fso As Scripting.FileSystemObject
+  Set fso = CreateObject("Scripting.FileSystemObject")
+  If fso.FileExists(zipPath) Then
+    fso.DeleteFile zipPath
+  End If
+  fso.CreateTextFile(zipPath).Write "PK" & Chr(5) & Chr(6) & String(18, Chr(0))
+  Set fso = Nothing
+End Sub

+ 10 - 10
source/modules/VCS_DataMacro.bas

@@ -10,13 +10,13 @@ Option Explicit
 
 
 Public Sub ExportDataMacros(ByVal tableName As String, ByVal directory As String)
 Public Sub ExportDataMacros(ByVal tableName As String, ByVal directory As String)
     On Error GoTo Err_export
     On Error GoTo Err_export
-    Dim filepath As String
+    Dim filePath As String
     
     
     mktree directory
     mktree directory
-    filepath = joinpaths(directory, to_filename(tableName) & ".xml")
+    filePath = joinpaths(directory, to_filename(tableName) & ".xml")
 
 
-    ExportDocument acTableDataMacro, tableName, filepath
-    FormatDataMacro filepath
+    ExportDocument acTableDataMacro, tableName, filePath
+    FormatDataMacro filePath
 
 
     Exit Sub
     Exit Sub
 
 
@@ -26,10 +26,10 @@ End Sub
 
 
 Public Sub ImportDataMacros(ByVal tableName As String, ByVal directory As String)
 Public Sub ImportDataMacros(ByVal tableName As String, ByVal directory As String)
     On Error GoTo Err_import
     On Error GoTo Err_import
-    Dim filepath As String
+    Dim filePath As String
     
     
-    filepath = joinpaths(directory, to_filename(tableName) & ".xml")
-    ImportDocument acTableDataMacro, tableName, filepath
+    filePath = joinpaths(directory, to_filename(tableName) & ".xml")
+    ImportDocument acTableDataMacro, tableName, filePath
     
     
     Exit Sub
     Exit Sub
     
     
@@ -39,7 +39,7 @@ End Sub
 
 
 'Splits exported DataMacro XML onto multiple lines
 'Splits exported DataMacro XML onto multiple lines
 'Allows git to find changes within lines using diff
 'Allows git to find changes within lines using diff
-Private Sub FormatDataMacro(ByVal filepath As String)
+Private Sub FormatDataMacro(ByVal filePath As String)
 
 
     Dim saveStream As Object 'ADODB.Stream
     Dim saveStream As Object 'ADODB.Stream
 
 
@@ -55,7 +55,7 @@ Private Sub FormatDataMacro(ByVal filepath As String)
     objStream.Charset = "utf-8"
     objStream.Charset = "utf-8"
     objStream.Type = 2 'adTypeText
     objStream.Type = 2 'adTypeText
     objStream.Open
     objStream.Open
-    objStream.LoadFromFile (filepath)
+    objStream.LoadFromFile (filePath)
     
     
     Do While Not objStream.EOS
     Do While Not objStream.EOS
         strData = objStream.ReadText(-2) 'adReadLine
         strData = objStream.ReadText(-2) 'adReadLine
@@ -71,7 +71,7 @@ Private Sub FormatDataMacro(ByVal filepath As String)
     Loop
     Loop
     
     
     objStream.Close
     objStream.Close
-    saveStream.SaveToFile filepath, 2 'adSaveCreateOverWrite
+    saveStream.SaveToFile filePath, 2 'adSaveCreateOverWrite
     saveStream.Close
     saveStream.Close
 
 
 End Sub
 End Sub

+ 4 - 4
source/modules/VCS_File.bas

@@ -254,20 +254,20 @@ Public Function UsingUcs2() As Boolean
     Kill tempFileName
     Kill tempFileName
 End Function
 End Function
 
 
-Public Function ReadFile(filepath As String, Optional encoding As String = "utf-8") As String
+Public Function ReadFile(filePath As String, Optional encoding As String = "utf-8") As String
     Dim objStream As ADODB.Stream
     Dim objStream As ADODB.Stream
     Set objStream = New ADODB.Stream
     Set objStream = New ADODB.Stream
 
 
     objStream.Charset = encoding
     objStream.Charset = encoding
     objStream.Open
     objStream.Open
-    objStream.LoadFromFile (filepath)
+    objStream.LoadFromFile (filePath)
     ReadFile = objStream.ReadText()
     ReadFile = objStream.ReadText()
     
     
     objStream.Close
     objStream.Close
     Set objStream = Nothing
     Set objStream = Nothing
 End Function
 End Function
 
 
-Public Sub MakeFile(filepath As String, content As String, Optional encoding As String = "utf-8")
+Public Sub MakeFile(filePath As String, content As String, Optional encoding As String = "utf-8")
     Dim objStream As ADODB.Stream
     Dim objStream As ADODB.Stream
     
     
     Set objStream = CreateObject("ADODB.Stream")
     Set objStream = CreateObject("ADODB.Stream")
@@ -275,7 +275,7 @@ Public Sub MakeFile(filepath As String, content As String, Optional encoding As
     objStream.Type = 2 'Text
     objStream.Type = 2 'Text
     objStream.Charset = encoding
     objStream.Charset = encoding
     objStream.WriteText content
     objStream.WriteText content
-    objStream.SaveToFile (filepath)
+    objStream.SaveToFile (filePath)
     objStream.Close
     objStream.Close
 
 
 End Sub
 End Sub

+ 9 - 9
source/modules/VCS_IE_Functions.bas

@@ -129,11 +129,11 @@ End Function
 '    'GoTo end_  ' > on error, don't delete the file (debugging purpose)
 '    'GoTo end_  ' > on error, don't delete the file (debugging purpose)
 'End Sub
 'End Sub
 
 
-Public Sub SanitizeFile(ByVal filepath As String)
+Public Sub SanitizeFile(ByVal filePath As String)
 ' cleans the file from unnecessary lines
 ' cleans the file from unnecessary lines
 
 
-    Dim FSO As Object
-    Set FSO = CreateObject("Scripting.FileSystemObject")
+    Dim fso As Object
+    Set fso = CreateObject("Scripting.FileSystemObject")
     
     
     '  Setup Block matching Regex.
     '  Setup Block matching Regex.
     Dim rxBlock As Object
     Dim rxBlock As Object
@@ -177,10 +177,10 @@ Public Sub SanitizeFile(ByVal filepath As String)
 '    obj_name = Mid$(filename, 1, InStrRev(filename, ".") - 1)
 '    obj_name = Mid$(filename, 1, InStrRev(filename, ".") - 1)
 
 
     Dim InFile As Object
     Dim InFile As Object
-    Set InFile = FSO.OpenTextFile(filepath, iomode:=ForReading, Create:=False, Format:=TristateFalse)
+    Set InFile = fso.OpenTextFile(filePath, iomode:=ForReading, Create:=False, Format:=TristateFalse)
     
     
     Dim OutFile As Object
     Dim OutFile As Object
-    Set OutFile = FSO.CreateTextFile(filepath & ".sanitize", overwrite:=True, unicode:=False)
+    Set OutFile = fso.CreateTextFile(filePath & ".sanitize", overwrite:=True, unicode:=False)
 
 
     Dim getLine As Boolean
     Dim getLine As Boolean
     getLine = True
     getLine = True
@@ -246,13 +246,13 @@ Public Sub SanitizeFile(ByVal filepath As String)
     OutFile.Close
     OutFile.Close
     InFile.Close
     InFile.Close
 
 
-    FSO.DeleteFile (filepath)
+    fso.DeleteFile (filePath)
 
 
     Dim thisFile As Object
     Dim thisFile As Object
-    Set thisFile = FSO.GetFile(filepath & ".sanitize")
-    thisFile.Move (filepath)
+    Set thisFile = fso.GetFile(filePath & ".sanitize")
+    thisFile.Move (filePath)
     
     
-    logger "SanitizeFile", "DEBUG", "> File " & filepath & " sanitized"
+    logger "SanitizeFile", "DEBUG", "> File " & filePath & " sanitized"
 
 
 
 
 End Sub
 End Sub

+ 10 - 10
source/modules/VCS_Reference.bas

@@ -20,7 +20,7 @@ Public Function ImportReferences() As Boolean
     logger "ImportReferences", "INFO", "Import References"
     logger "ImportReferences", "INFO", "Import References"
     logger "ImportReferences", "DEBUG", "> import from: " & file_path
     logger "ImportReferences", "DEBUG", "> import from: " & file_path
     
     
-    Dim FSO As Object
+    Dim fso As Object
     Dim InFile As Object
     Dim InFile As Object
     Dim Line As String
     Dim Line As String
     Dim item() As String
     Dim item() As String
@@ -36,8 +36,8 @@ Public Function ImportReferences() As Boolean
         logger "ImportReferences", "INFO", "> No references to import"
         logger "ImportReferences", "INFO", "> No references to import"
     End If
     End If
     
     
-    Set FSO = CreateObject("Scripting.FileSystemObject")
-    Set InFile = FSO.OpenTextFile(file_path, iomode:=ForReading, Create:=False, Format:=TristateFalse)
+    Set fso = CreateObject("Scripting.FileSystemObject")
+    Set InFile = fso.OpenTextFile(file_path, iomode:=ForReading, Create:=False, Format:=TristateFalse)
     
     
     On Error GoTo failed_guid
     On Error GoTo failed_guid
     
     
@@ -63,7 +63,7 @@ go_on:
 
 
     InFile.Close
     InFile.Close
     Set InFile = Nothing
     Set InFile = Nothing
-    Set FSO = Nothing
+    Set fso = Nothing
     
     
     logger "ImportReferences", "INFO", count & " imported from " & filename
     logger "ImportReferences", "INFO", count & " imported from " & filename
     
     
@@ -82,8 +82,8 @@ End Function
 
 
 ' Export References to a CSV
 ' Export References to a CSV
 Public Sub ExportReferences()
 Public Sub ExportReferences()
-    Dim filepath As String
-    Dim FSO As Object
+    Dim filePath As String
+    Dim fso As Object
     Dim OutFile As Object
     Dim OutFile As Object
     Dim Line As String
     Dim Line As String
     Dim ref As Reference
     Dim ref As Reference
@@ -93,12 +93,12 @@ Public Sub ExportReferences()
     
     
     logger "ExportReferences", "INFO", "Export references"
     logger "ExportReferences", "INFO", "Export references"
     
     
-    filepath = joinpaths(source_dir(), "references.csv")
+    filePath = joinpaths(source_dir(), "references.csv")
     
     
-    logger "ExportReferences", "DEBUG", "> export to: " & filepath
+    logger "ExportReferences", "DEBUG", "> export to: " & filePath
     
     
-    Set FSO = CreateObject("Scripting.FileSystemObject")
-    Set OutFile = FSO.CreateTextFile(filepath, overwrite:=True, unicode:=False)
+    Set fso = CreateObject("Scripting.FileSystemObject")
+    Set OutFile = fso.CreateTextFile(filePath, overwrite:=True, unicode:=False)
     
     
     For Each ref In Application.References
     For Each ref In Application.References
         
         

+ 11 - 11
source/modules/VCS_Relation.bas

@@ -4,17 +4,17 @@ Option Private Module
 Option Explicit
 Option Explicit
 
 
 
 
-Public Sub ExportRelation(ByVal rel As DAO.Relation, ByVal filepath As String)
+Public Sub ExportRelation(ByVal rel As DAO.Relation, ByVal filePath As String)
     On Error GoTo err
     On Error GoTo err
-    Dim FSO As Object
+    Dim fso As Object
     Dim OutFile As Object
     Dim OutFile As Object
     
     
     Dim relname As String
     Dim relname As String
     relname = rel.name
     relname = rel.name
     
     
-    Set FSO = CreateObject("Scripting.FileSystemObject")
+    Set fso = CreateObject("Scripting.FileSystemObject")
     
     
-    Set OutFile = FSO.CreateTextFile(filepath, overwrite:=True, unicode:=False)
+    Set OutFile = fso.CreateTextFile(filePath, overwrite:=True, unicode:=False)
     
     
     OutFile.WriteLine rel.Attributes 'RelationAttributeEnum
     OutFile.WriteLine rel.Attributes 'RelationAttributeEnum
     OutFile.WriteLine rel.name
     OutFile.WriteLine rel.name
@@ -31,19 +31,19 @@ Public Sub ExportRelation(ByVal rel As DAO.Relation, ByVal filepath As String)
     
     
     OutFile.Close
     OutFile.Close
 
 
-    logger "ExportRelation", "DEBUG", "Relation " & relname & " exported to " & filepath
+    logger "ExportRelation", "DEBUG", "Relation " & relname & " exported to " & filePath
 
 
     Exit Sub
     Exit Sub
 err:
 err:
     logger "ImportRelation", "ERROR", "Unable to import relation " & relname & " [" & err.Description & "]"
     logger "ImportRelation", "ERROR", "Unable to import relation " & relname & " [" & err.Description & "]"
 End Sub
 End Sub
 
 
-Public Sub ImportRelation(ByVal filepath As String)
+Public Sub ImportRelation(ByVal filePath As String)
     On Error GoTo err
     On Error GoTo err
-    Dim FSO As Object
+    Dim fso As Object
     Dim InFile As Object
     Dim InFile As Object
-    Set FSO = CreateObject("Scripting.FileSystemObject")
-    Set InFile = FSO.OpenTextFile(filepath, iomode:=ForReading, Create:=False, Format:=TristateFalse)
+    Set fso = CreateObject("Scripting.FileSystemObject")
+    Set InFile = fso.OpenTextFile(filePath, iomode:=ForReading, Create:=False, Format:=TristateFalse)
     Dim rel As DAO.Relation
     Dim rel As DAO.Relation
     Set rel = New DAO.Relation
     Set rel = New DAO.Relation
 
 
@@ -63,7 +63,7 @@ Public Sub ImportRelation(ByVal filepath As String)
             f.ForeignName = InFile.readline
             f.ForeignName = InFile.readline
             If "End" <> InFile.readline Then
             If "End" <> InFile.readline Then
                 Set f = Nothing
                 Set f = Nothing
-                logger "ImportRelation", "ERROR", "Missing 'End' for a 'Begin' in " & filepath
+                logger "ImportRelation", "ERROR", "Missing 'End' for a 'Begin' in " & filePath
                 GoTo next_rel
                 GoTo next_rel
             End If
             End If
             rel.Fields.Append f
             rel.Fields.Append f
@@ -75,7 +75,7 @@ next_rel:
     
     
     CurrentDb.Relations.Append rel
     CurrentDb.Relations.Append rel
 
 
-    logger "ImportRelation", "DEBUG", "Relation " & relname & " imported from " & filepath
+    logger "ImportRelation", "DEBUG", "Relation " & relname & " imported from " & filePath
 
 
     Exit Sub
     Exit Sub
 err:
 err:

+ 10 - 10
source/modules/VCS_Report.bas

@@ -42,10 +42,10 @@ End Type
 
 
 
 
 'Exports print vars for reports
 'Exports print vars for reports
-Public Sub ExportPrintVars(ByVal obj_name As String, ByVal filepath As String)
+Public Sub ExportPrintVars(ByVal obj_name As String, ByVal filePath As String)
   DoEvents
   DoEvents
-  Dim FSO As Object
-  Set FSO = CreateObject("Scripting.FileSystemObject")
+  Dim fso As Object
+  Set fso = CreateObject("Scripting.FileSystemObject")
   
   
   Dim DevModeString As str_DEVMODE
   Dim DevModeString As str_DEVMODE
   Dim DevModeExtra As String
   Dim DevModeExtra As String
@@ -74,7 +74,7 @@ Public Sub ExportPrintVars(ByVal obj_name As String, ByVal filepath As String)
   End If
   End If
   
   
   Dim OutFile As Object
   Dim OutFile As Object
-  Set OutFile = FSO.CreateTextFile(filepath, overwrite:=True, unicode:=False)
+  Set OutFile = fso.CreateTextFile(filePath, overwrite:=True, unicode:=False)
   
   
   'print out print var values
   'print out print var values
   OutFile.WriteLine DM.intOrientation
   OutFile.WriteLine DM.intOrientation
@@ -88,13 +88,13 @@ Public Sub ExportPrintVars(ByVal obj_name As String, ByVal filepath As String)
   
   
   DoCmd.Close acReport, obj_name, acSaveYes
   DoCmd.Close acReport, obj_name, acSaveYes
   
   
-  logger "ExportPrintVars", "DEBUG", "PrintVars of report " & obj_name & " exported to " & filepath
+  logger "ExportPrintVars", "DEBUG", "PrintVars of report " & obj_name & " exported to " & filePath
 End Sub
 End Sub
 
 
-Public Sub ImportPrintVars(ByVal obj_name As String, ByVal filepath As String)
+Public Sub ImportPrintVars(ByVal obj_name As String, ByVal filePath As String)
   On err GoTo err
   On err GoTo err
-  Dim FSO As Object
-  Set FSO = CreateObject("Scripting.FileSystemObject")
+  Dim fso As Object
+  Set fso = CreateObject("Scripting.FileSystemObject")
   
   
   Dim DevModeString As str_DEVMODE
   Dim DevModeString As str_DEVMODE
   Dim DevModeExtra As String
   Dim DevModeExtra As String
@@ -121,7 +121,7 @@ Public Sub ImportPrintVars(ByVal obj_name As String, ByVal filepath As String)
   End If
   End If
   
   
   Dim InFile As Object
   Dim InFile As Object
-  Set InFile = FSO.OpenTextFile(filepath, iomode:=ForReading, Create:=False, Format:=TristateFalse)
+  Set InFile = fso.OpenTextFile(filePath, iomode:=ForReading, Create:=False, Format:=TristateFalse)
   
   
   'print out print var values
   'print out print var values
   DM.intOrientation = InFile.readline
   DM.intOrientation = InFile.readline
@@ -140,7 +140,7 @@ Public Sub ImportPrintVars(ByVal obj_name As String, ByVal filepath As String)
   
   
   DoCmd.Close acReport, obj_name, acSaveYes
   DoCmd.Close acReport, obj_name, acSaveYes
   
   
-  logger "ImportPrintVars", "DEBUG", "PrintVars of report " & obj_name & " imported from " & filepath
+  logger "ImportPrintVars", "DEBUG", "PrintVars of report " & obj_name & " imported from " & filePath
 
 
 Exit Sub
 Exit Sub
 err:
 err:

+ 6 - 6
source/modules/VCS_Table.bas

@@ -10,13 +10,13 @@ Public Sub ExportLinkedTable(ByVal tbl_name As String, ByVal dirpath As String)
 
 
     tempFilePath = VCS_File.TempFile()
     tempFilePath = VCS_File.TempFile()
     
     
-    Dim FSO As Object
+    Dim fso As Object
     Dim OutFile As Object
     Dim OutFile As Object
 
 
-    Set FSO = CreateObject("Scripting.FileSystemObject")
+    Set fso = CreateObject("Scripting.FileSystemObject")
     ' open file for writing with Create=True, Unicode=True (USC-2 Little Endian format)
     ' open file for writing with Create=True, Unicode=True (USC-2 Little Endian format)
 
 
-    Set OutFile = FSO.CreateTextFile(tempFilePath, overwrite:=True, unicode:=True)
+    Set OutFile = fso.CreateTextFile(tempFilePath, overwrite:=True, unicode:=True)
     
     
     OutFile.Write CurrentDb.TableDefs(tbl_name).name
     OutFile.Write CurrentDb.TableDefs(tbl_name).name
     OutFile.Write vbCrLf
     OutFile.Write vbCrLf
@@ -70,11 +70,11 @@ End Sub
 
 
 Public Sub ImportLinkedTable(ByVal tblName As String, ByVal obj_path As String)
 Public Sub ImportLinkedTable(ByVal tblName As String, ByVal obj_path As String)
     Dim db As DAO.Database
     Dim db As DAO.Database
-    Dim FSO As Object
+    Dim fso As Object
     Dim InFile As Object
     Dim InFile As Object
     
     
     Set db = CurrentDb
     Set db = CurrentDb
-    Set FSO = CreateObject("Scripting.FileSystemObject")
+    Set fso = CreateObject("Scripting.FileSystemObject")
     
     
     Dim tempFilePath As String
     Dim tempFilePath As String
     tempFilePath = VCS_File.TempFile()
     tempFilePath = VCS_File.TempFile()
@@ -82,7 +82,7 @@ Public Sub ImportLinkedTable(ByVal tblName As String, ByVal obj_path As String)
     ConvertUtf8Ucs2 obj_path & tblName & ".LNKD", tempFilePath
     ConvertUtf8Ucs2 obj_path & tblName & ".LNKD", tempFilePath
     
     
     ' open file for reading with Create=False, Unicode=True (USC-2 Little Endian format)
     ' open file for reading with Create=False, Unicode=True (USC-2 Little Endian format)
-    Set InFile = FSO.OpenTextFile(tempFilePath, iomode:=ForReading, Create:=False, Format:=TristateTrue)
+    Set InFile = fso.OpenTextFile(tempFilePath, iomode:=ForReading, Create:=False, Format:=TristateTrue)
     
     
     On Error GoTo err_notable:
     On Error GoTo err_notable:
     DoCmd.DeleteObject acTable, tblName
     DoCmd.DeleteObject acTable, tblName

+ 1 - 0
source/references.csv

@@ -5,3 +5,4 @@
 {00000300-0000-0010-8000-00AA006D2EA4},6,0
 {00000300-0000-0010-8000-00AA006D2EA4},6,0
 {00000600-0000-0010-8000-00AA006D2EA4},6,0
 {00000600-0000-0010-8000-00AA006D2EA4},6,0
 {B691E011-1797-432E-907A-4D8C69339129},6,1
 {B691E011-1797-432E-907A-4D8C69339129},6,1
+{50A7E9B0-70EF-11D1-B75A-00A0C90564FE},1,0

BIN
tests/__pycache__/file.cpython-36.pyc


BIN
tests/__pycache__/utilities.cpython-36.pyc