diff options
Diffstat (limited to 'src/settings.sml')
| -rw-r--r-- | src/settings.sml | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/settings.sml b/src/settings.sml index b72789df..70ea1861 100644 --- a/src/settings.sml +++ b/src/settings.sml @@ -290,7 +290,7 @@ val jsFuncsBase = basisM [("alert", "alert"), ("attrifyInt", "ts"), ("attrifyFloat", "ts"), ("attrifyBool", "bs"), - ("boolToString", "ts"), + ("boolToString", "bs"), ("str1", "id"), ("strsub", "sub"), ("strsuffix", "suf"), @@ -818,7 +818,7 @@ fun mangleSqlCatalog s = else lowercase s -val html5 = ref false +val html5 = ref true fun setIsHtml5 b = html5 := b fun getIsHtml5 () = !html5 @@ -844,7 +844,7 @@ fun noMime () = fun readMimeTypes () = let - val inf = TextIO.openIn "/etc/mime.types" + val inf = FileIO.txtOpenIn "/etc/mime.types" fun loop m = case TextIO.inputLine inf of @@ -914,7 +914,7 @@ fun addFile {Uri, LoadFromFilename} = ErrorMsg.error ("Two different files requested for URI " ^ Uri ^ " ( " ^ path' ^ " vs. " ^ path ^ ")") | NONE => let - val inf = BinIO.openIn path + val inf = FileIO.binOpenIn path in files := SM.insert (!files, Uri, @@ -937,7 +937,7 @@ val jsFiles = ref (SM.empty : {Filename : string, Content : string} SM.map) fun addJsFile LoadFromFilename = let val path = OS.Path.concat (!filePath, LoadFromFilename) - val inf = TextIO.openIn path + val inf = FileIO.txtOpenIn path in jsFiles := SM.insert (!jsFiles, path, @@ -952,7 +952,8 @@ fun addJsFile LoadFromFilename = fun listJsFiles () = SM.listItems (!jsFiles) fun reset () = - (urlPrefixFull := "/"; + (Globals.setResetTime (); + urlPrefixFull := "/"; urlPrefix := "/"; urlPrePrefix := ""; timeout := 0; |