Compressed word list and WListGen update

sfx2000 · Jul 31, 2024 · c979eb0 · c979eb0
1 parent f306f32
commit c979eb0
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 4 deletions.
diff --git a/Appl/Tools/WListGen/appui.goc b/Appl/Tools/WListGen/appui.goc
@@ -86,7 +86,7 @@
 	HINT_PLACE_MONIKER_ABOVE;
 	GI_comp = @MainBoolean1, @MainBoolean2;
 	HINT_ORIENT_CHILDREN_VERTICALLY;
-	GBGI_selectedBooleans = /* BOOL_ID_1 | */ BOOL_ID_2;
+	GBGI_selectedBooleans = BOOL_ID_1 | BOOL_ID_2;
 	/*HINT_BOOLEAN_GROUP_TOOLBOX_STYLE;	/**/
 	}
 @object GenBooleanClass MainBoolean1 = {
@@ -270,8 +270,11 @@
 @chunk char VeryLongWord[] = "** Very long word: ";
 @chunk char LongWord[] = "* Word too long: ";
 @chunk char ShortWord[] = "* Word too short: ";
-@chunk char BuildCancel[] = "\r*** Building word list canceled ***\r";	
-@chunk char BuildDone[] = "\r*** Building word list done ***\r";	
+@chunk char BuildCancel[] = "\r*** Building word list canceled ***";	
+@chunk char BuildDone[] = "\r*** Building word list done ***";	
+@chunk char FinishDBStart[] = "\r*** Clean up ...";
+@chunk char FinishDBStartCompress[] = "\r*** Compress data and clean up ...";
+@chunk char FinishDone[] = " done ***\rOK.\r";
 
 @end DataResource; /*-------------------------------------------------------*/
 

diff --git a/Appl/Tools/WListGen/appui.goh b/Appl/Tools/WListGen/appui.goh
@@ -16,6 +16,7 @@
 @extern object GEOSItem;
 @extern object Spacer1;
 @extern object WListInputText;
+@extern object WordsGroup;
 @extern object ReadCounter;
 @extern object WordCounter;
 @extern object CurrentWordText;
@@ -44,3 +45,6 @@
 @extern chunk ShortWord;
 @extern chunk BuildCancel;
 @extern chunk BuildDone;
+@extern chunk FinishDBStart;
+@extern chunk FinishDBStartCompress;
+@extern chunk FinishDone;
diff --git a/Appl/Tools/WListGen/wlistgen.goc b/Appl/Tools/WListGen/wlistgen.goc
@@ -485,7 +485,11 @@ word 		value;
     @send WListFileSelector::MSG_GEN_SET_ENABLED(VUM_NOW);
 
     FileClose(srcFile, FALSE);
+
+    if (g_compress) {	PrintMessageOptr(@FinishDBStartCompress); }
+    		else {	PrintMessageOptr(@FinishDBStart); }
     WMFinishNewDB(listFile, TRUE);	// close DB file
+    PrintMessageOptr(@FinishDone);
 
 
 }

diff --git a/Library/Breadbox/WMLib/wmlib.goc b/Library/Breadbox/WMLib/wmlib.goc
@@ -849,7 +849,8 @@ VMBlockHandle	block, next;
     	} 
 
     }
-
+
+    VMSave(fh);
     if (closeFile) VMClose(fh, FALSE); 
     return FALSE;
 }

diff --git a/Tools/build/product/bbxensem/Trans/german/unreleased/WORDLIST.000 b/Tools/build/product/bbxensem/Trans/german/unreleased/WORDLIST.000
diff --git a/Tools/build/product/bbxensem/Userdata/german/wordmat/WM_WORDS.000 b/Tools/build/product/bbxensem/Userdata/german/wordmat/WM_WORDS.000
-Original file line number
+Diff line change
@@ Expand Up / @@ -849,7 +849,8 @@ VMBlockHandle block, next; @@
         	}
         }
+        VMSave(fh);
         if (closeFile) VMClose(fh, FALSE);
         return FALSE;
     }
@@ Expand Down @@