Index: vhLibLogging.csp
===================================================================
diff -u -r52 -r55
--- vhLibLogging.csp (.../vhLibLogging.csp) (revision 52)
+++ vhLibLogging.csp (.../vhLibLogging.csp) (revision 55)
@@ -38,7 +38,7 @@
.clsDetailDataHdr { color:darkblue; text-decoration:underline; cursor:pointer; }
.clsDetailInfo { font-size:8pt; font-weight:normal; padding-left:5px; }
-
+
#($G(CspPageTitle, ..%ClassName(0))_$G(OnServer))#
@@ -411,36 +411,16 @@
Set arFilterNiveaus(2)=##class(vhLib.enu.LogNiveau).Warning()
}
Set LogViewerHelper=##class(vhLib.LogViewer).%New()
-
- Set sqlAll=""
-
set MaxRows = $get(%request.Data("MAXROWS",1),1000)
- Set AantalDagen = 15
-
- Set WhereClause="" ; "Datum > '"_$zd($Horolog-AantalDagen,1)_"'"
+ Set AantalDagen = 0 ; 15
- Set FilterNiveauIt=##class(TECH.ArrayOneDimIterator).%New(.arFilterNiveaus)
- If FilterNiveauIt.HasNext() {
- Set WhereClause=WhereClause_$S(WhereClause="":"", 1:" AND ")_"("_LogViewerHelper.GeefWhereClauseVoorNiveaus(FilterNiveauIt)_")"
- }
-
- Set FilterGroepenIt=##class(TECH.ArrayOneDimIterator).%New(.arFilterGroepen)
- If FilterGroepenIt.HasNext() {
- Set WhereClause=WhereClause_$S(WhereClause="":"", 1:" AND ")_"("_LogViewerHelper.GeefWhereClauseVoorGroepen(FilterGroepenIt)_")"
- }
-
- ;d WLIP^vhDBG(97,"WhereClause : "_WhereClause)
-
-
-
/*** SQL STATEMENTS ***/
/*** ============== ***/
Set sqlLOGAllFields="SELECT Datum, Tijd, Groep, Niveau, Actie, JobID, DetailTrunc As Detail, ID , LessDetail, MainIndex , Namespace , RemoteIP , Server , ProgLabel , SubID "
- Set sqlLOG ="SELECT Datum, Tijd, Groep, Niveau, Actie, JobID, DetailTrunc As Detail"
+ Set sqlLOG=LogViewerHelper.GeefSqlStatementMetFilters(AantalDagen, ##class(TECH.ArrayOneDimIterator).%New(.arFilterGroepen), ##class(TECH.ArrayOneDimIterator).%New(.arFilterNiveaus))
+ Set sqlLOG=$$$Replace(sqlLOG, "vhLib.Logging.","")
+ ;d WLIP^vhDBG(97,"WhereClause : "_sqlLOG)
- Set sqlLOG=sqlLOG_$C(13,10)_" FROM vhLib.Logging WHERE "_WhereClause
- Set sqlLOG=sqlLOG_$C(13,10)_" ORDER BY Datum DESC, Tijd DESC, SubID DESC"
-
; SQLs to be displayed
Set sqlDFL=$S(1:sqlLOG)
Set sqlActive=$G(%request.Data("QUERY",1),sqlDFL)