diff --git a/Log/Web/HandlerLog.go b/Log/Web/HandlerLog.go index 352c86c..8b9374f 100644 --- a/Log/Web/HandlerLog.go +++ b/Log/Web/HandlerLog.go @@ -16,13 +16,22 @@ func HandlerWebLog(response http.ResponseWriter, request *http.Request) { return } + request.ParseForm() + countParameters := len(request.Form) + data := Scheme.Viewer{} - data.Events = make([]Scheme.LogEvent, 3) - data.Events[0].AB = Scheme.A - data.Events[0].LogLevel = Scheme.LogINFO - data.Events[0].LogLine = `hello world` data.Title = `Web Log Viewer` + if countParameters < 9 { + + // Initial view => refresh & first page (latest logs) + data.Events = readLatest() + } else { + + // Custom view + data.Events = readCustom(request.FormValue(`timeRange`), request.FormValue(`Level`), request.FormValue(`Category`), request.FormValue(`Impact`), request.FormValue(`Severity`), request.FormValue(`MSGName`), request.FormValue(`Sender`), request.FormValue(`CurrentPage`)) + } + MimeTypes.Write2HTTP(response, MimeTypes.TypeWebHTML) if executeError := templates.ExecuteTemplate(response, `WebLog`, data); executeError != nil { Log.LogFull(senderName, LM.CategorySYSTEM, LM.LevelERROR, LM.SeverityCritical, LM.ImpactCritical, LM.MessageNameEXECUTE, `Was not able to execute the web log viewer template.`, executeError.Error()) diff --git a/Log/Web/ReadCustom.go b/Log/Web/ReadCustom.go new file mode 100644 index 0000000..3ada196 --- /dev/null +++ b/Log/Web/ReadCustom.go @@ -0,0 +1,13 @@ +package Web + +import ( + "github.com/SommerEngineering/Ocean/Log/Web/Scheme" +) + +func readCustom(timeRange, logLevel, logCategory, logImpact, logSeverity, logMessageName, logSender, logPage string) (events []Scheme.LogEvent) { + // data.Events = make([]Scheme.LogEvent, 3) + // data.Events[0].AB = Scheme.A + // data.Events[0].LogLevel = Scheme.LogINFO + // data.Events[0].LogLine = `hello world` + return +} diff --git a/Log/Web/ReadLatest.go b/Log/Web/ReadLatest.go new file mode 100644 index 0000000..40f44f6 --- /dev/null +++ b/Log/Web/ReadLatest.go @@ -0,0 +1,13 @@ +package Web + +import ( + "github.com/SommerEngineering/Ocean/Log/Web/Scheme" +) + +func readLatest() (events []Scheme.LogEvent) { + // data.Events = make([]Scheme.LogEvent, 3) + // data.Events[0].AB = Scheme.A + // data.Events[0].LogLevel = Scheme.LogINFO + // data.Events[0].LogLine = `hello world` + return +} diff --git a/Log/Web/Templates/Viewer.go b/Log/Web/Templates/Viewer.go index 9fe81ea..a60b27d 100644 --- a/Log/Web/Templates/Viewer.go +++ b/Log/Web/Templates/Viewer.go @@ -81,8 +81,8 @@ var Viewer string = ` {{end}} - - {{range .Sender}}