diff --git a/mostfiles/flashread.nim b/mostfiles/flashread.nim index 306908e..505656d 100644 --- a/mostfiles/flashread.nim +++ b/mostfiles/flashread.nim @@ -225,7 +225,7 @@ routes: innervarob["statustext"] = newlang(statustekst) innervarob["statusdata"] = "" innervarob["pastedtext"] = "" - innervarob["processedtext"] = filepathst + innervarob["processedtext"] = filepathst & "

" & evaluateDataFiles(datFileAll) innervarob["text_language"] = setDropDown("text-language", readOptionFromFile("text-language", "value")) innervarob["taglist"] = setDropDown("taglist", "paragraph-with-headings") innervarob["radiobuttons_1"] = setRadioButtons("orders","") diff --git a/mostfiles/install_defs/readibl_0.94_for-linux_installer-si_2.3.txt b/mostfiles/install_defs/readibl_0.94_for-linux_installer-si_2.3.txt index 0fe3e83..905bcd1 100644 --- a/mostfiles/install_defs/readibl_0.94_for-linux_installer-si_2.3.txt +++ b/mostfiles/install_defs/readibl_0.94_for-linux_installer-si_2.3.txt @@ -44,9 +44,9 @@ arguments---none . LICENSE settings_flashread.conf -dutch.dat -english.dat -german.dat +parse_dutch.dat +parse_english.dat +parse_german.dat language_template.dat summary_dutch_concise.dat summary_dutch_default.dat diff --git a/mostfiles/loadgui.nim b/mostfiles/loadgui.nim index 1d463eb..7faea6b 100644 --- a/mostfiles/loadgui.nim +++ b/mostfiles/loadgui.nim @@ -31,14 +31,12 @@ proc loadTextLangsFromConfig() = # Load the processing-languages of the dropdown "dropdownsta" of # webgui_def.nim from the config-file - var valuelist: string sourcelangsq: seq[string] langvaluelistsq: seq[array[2, string]] tbo: bool = false - # get the processing-languages from the config-file valuelist = readOptionFromFile("text-language", "value-list") sourcelangsq = valuelist.split(",,") @@ -47,7 +45,7 @@ proc loadTextLangsFromConfig() = # generate the new valuelist for langst in sourcelangsq: - if fileExists(langst & ".dat"): + if fileExists("parse_" & langst & ".dat"): langvaluelistsq.add([langst, capitalizeAscii(langst)]) if tbo: echo langvaluelistsq diff --git a/mostfiles/dutch.dat b/mostfiles/parse_dutch.dat similarity index 99% rename from mostfiles/dutch.dat rename to mostfiles/parse_dutch.dat index 53e740e..b224e6f 100644 --- a/mostfiles/dutch.dat +++ b/mostfiles/parse_dutch.dat @@ -596,6 +596,9 @@ treed treden trad traden +dreigen +dreigt +dreigd reken rekent rekend diff --git a/mostfiles/english.dat b/mostfiles/parse_english.dat similarity index 100% rename from mostfiles/english.dat rename to mostfiles/parse_english.dat diff --git a/mostfiles/german.dat b/mostfiles/parse_german.dat similarity index 100% rename from mostfiles/german.dat rename to mostfiles/parse_german.dat diff --git a/mostfiles/process_text.nim b/mostfiles/process_text.nim index 87155b0..b4a9eb7 100644 --- a/mostfiles/process_text.nim +++ b/mostfiles/process_text.nim @@ -404,7 +404,7 @@ proc applyDefinitionFileToText(input_tekst, languagest: string, if highlightbo == false: log("text coloring....") - def_filenamest = languagest & ".dat" + def_filenamest = "parse_" & languagest & ".dat" deffilest = textsourcefileta[def_filenamest] blockheadersq = @[ "PUNCTUATION OF SENTENCES TO HANDLE", diff --git a/mostfiles/source_files.nim b/mostfiles/source_files.nim index 85b72c0..73dc693 100644 --- a/mostfiles/source_files.nim +++ b/mostfiles/source_files.nim @@ -10,6 +10,14 @@ import os import fr_tools + +type + DataFileType* = enum + datFileLanguage + datFileSummary + datFileAll + + var versionfl:float = 0.2 textsourcefilesq: seq[string] = @["outer_html.html", @@ -20,8 +28,10 @@ var faultsfoundbo: bool = false -proc addLanguageFiles() = - # dynamicly add the language.dat files from the config-file +proc addLanguageFilesToList() = + # Dynamicly add the language.dat files from the config-file + # to the list textsourcefilesq + var valuelist: string sourcelangsq:seq[string] @@ -36,7 +46,8 @@ proc addLanguageFiles() = # generate the new valuelist for langst in sourcelangsq: - textsourcefilesq.add(langst & ".dat") + # textsourcefilesq.add(langst & ".dat") + textsourcefilesq.add("parse_" & langst & ".dat") if tbo: echo textsourcefilesq @@ -61,9 +72,43 @@ proc loadTextSourceFiles() = echo repr(errob) & "\p****End exception****\p" -addLanguageFiles() + + +proc writeFilePatternToSeq*(filestartwithst: string): seq[string] = + +#[ Write the files from pattern in the current dir to the sequence and + return that]# + + var + filelisq: seq[string] + filenamest: string + + + # walk thru the file-iterator and sequence the right file(names) + for kind, path in walkDir(getAppDir()): + if kind == pcFile: + filenamest = extractFileName(path) + if len(filenamest) > len(filestartwithst): + if filenamest[0..len(filestartwithst) - 1] == filestartwithst: + # log(filenamest) + filelisq.add(filenamest) + + result = filelisq + + + + +proc evaluateDataFiles*(filetypeu: DataFileType): string = + + result = "Nothing evaluated yet" + + + +addLanguageFilesToList() loadTextSourceFiles() + + when isMainModule: # echo textsourcefileta["dutch.dat"] echo sourcefilestatust diff --git a/mostfiles/summary_english_concise.dat b/mostfiles/summary_english_concise.dat index 45b6561..6653d37 100644 --- a/mostfiles/summary_english_concise.dat +++ b/mostfiles/summary_english_concise.dat @@ -14,6 +14,7 @@ definition mechanism method caus +effect result consequence reason diff --git a/mostfiles/summary_english_default.dat b/mostfiles/summary_english_default.dat index 83b0669..af05010 100644 --- a/mostfiles/summary_english_default.dat +++ b/mostfiles/summary_english_default.dat @@ -48,7 +48,7 @@ effects task influence category -classification +classif type theor supposition @@ -78,5 +78,7 @@ develop goal evidence proof +question +answer >----------------------------------<