Refactor form/report export to split VBA

Export is now splitting the VBA from Form and Report objects to separate files with a .cls extension. Moving on to the code that will stitch these files back together before import.
josef-poetzl · Nov 2, 2023 · 89101c5 · 89101c5
1 parent c87261a
commit 89101c5
Show file tree

Hide file tree

Showing 6 changed files with 280 additions and 82 deletions.
diff --git a/Version Control.accda.src/modules/clsDbForm.cls b/Version Control.accda.src/modules/clsDbForm.cls
@@ -124,6 +124,7 @@ End Sub
 Private Sub IDbComponent_MoveSource(strFromFolder As String, strToFolder As String)
     MoveFileIfExists strFromFolder & FSO.GetFileName(IDbComponent_SourceFile), strToFolder
     MoveFileIfExists strFromFolder & FSO.GetBaseName(IDbComponent_SourceFile) & ".json", strToFolder
+    MoveFileIfExists strFromFolder & FSO.GetBaseName(IDbComponent_SourceFile) & ".cls", strToFolder
 End Sub
 
 
@@ -180,7 +181,7 @@ End Function
 '
 Private Sub IDbComponent_ClearOrphanedSourceFiles()
     If Not Options.SavePrintVars Then ClearFilesByExtension IDbComponent_BaseFolder, "json"
-    ClearOrphanedSourceFiles Me, "bas", "json"
+    ClearOrphanedSourceFiles Me, "bas", "json", "cls"
 End Sub
 
 

diff --git a/Version Control.accda.src/modules/clsDbReport.cls b/Version Control.accda.src/modules/clsDbReport.cls
@@ -93,6 +93,7 @@ End Sub
 Private Sub IDbComponent_MoveSource(strFromFolder As String, strToFolder As String)
     MoveFileIfExists strFromFolder & FSO.GetFileName(IDbComponent_SourceFile), strToFolder
     MoveFileIfExists strFromFolder & FSO.GetBaseName(IDbComponent_SourceFile) & ".json", strToFolder
+    MoveFileIfExists strFromFolder & FSO.GetBaseName(IDbComponent_SourceFile) & ".cls", strToFolder
 End Sub
 
 
@@ -150,7 +151,7 @@ End Function
 Private Sub IDbComponent_ClearOrphanedSourceFiles()
     ClearFilesByExtension IDbComponent_BaseFolder, "pv" ' Remove legacy files
     If Not Options.SavePrintVars Then ClearFilesByExtension IDbComponent_BaseFolder, "json"
-    ClearOrphanedSourceFiles Me, "bas", "json"
+    ClearOrphanedSourceFiles Me, "bas", "json", "cls"
 End Sub
 
 

diff --git a/Version Control.accda.src/modules/clsDbTableData.cls b/Version Control.accda.src/modules/clsDbTableData.cls
@@ -71,7 +71,8 @@ Private Sub IDbComponent_Export(Optional strAlternatePath As String)
                     End If
                     Perf.OperationEnd
                     With New clsSanitize
-                        .SanitizeXML strFile, False
+                        .LoadSourceFile strFile
+                        WriteFile .Sanitize(ectXML), strFile
                     End With
             End Select
         End If

diff --git a/Version Control.accda.src/modules/clsDbTableDef.cls b/Version Control.accda.src/modules/clsDbTableDef.cls
@@ -60,7 +60,10 @@ Private Sub IDbComponent_Export(Optional strAlternatePath As String)
 
         ' Rewrite sanitized XML as formatted UTF-8 content
         With New clsSanitize
-            strHash = .SanitizeXML(strFile, True)
+            .LoadSourceFile strFile
+            DeleteFile strFile
+            WriteFile .Sanitize(ectXML), strFile
+            strHash = .Hash
         End With
 
     Else