Index: vhLibLogging.csp =================================================================== diff -u -r77 -r82 --- vhLibLogging.csp (.../vhLibLogging.csp) (revision 77) +++ vhLibLogging.csp (.../vhLibLogging.csp) (revision 82) @@ -21,7 +21,7 @@ .DarkRow { background:#E6E6E6; } .LightRow { background:#FCFCFC; } .clsQryTable { background-color:#DDDDFF; border-collapse:collapse; font-size:9pt; } - .clsQryTable A { color:#FF460A; text-decoration:none; } + .clsQryTable A { text-decoration:none; } .clsQryTable INPUT { margin:0; } .clsWSOrdTitle { text-align:center; width:60%; font-size:15pt; font-weight:bold; color:darkblue; padding:10px; } .clsSubHeader { font-size:12pt; font-weight:bold; } @@ -352,7 +352,11 @@ Set PrevDatum = Datum -
#($S($L(tmpVal):tmpVal,1:" "))#
+
+ #($S($L(tmpVal):tmpVal,1:" "))# +
@@ -412,16 +416,30 @@ set MaxRows = $get(%request.Data("MAXROWS",1),1000) Set AantalDagen = 0 ; 15 + Set BijkomendeCondities = ##class(%ListOfDataTypes).%New() + #dim Veld As %String = $O(%request.Data("")) + While Veld'="" { + If ##class(TECH.StringUtils).StartsWith(Veld,"fld") { + #dim VeldNaam As %String = Veld + Set VeldNaam = ##class(TECH.StringUtils).Replace(VeldNaam,"fld","") + Do BijkomendeCondities.Insert(VeldNaam_"="_%request.Data(Veld,1)) + Kill tmpRq(Veld,1) + } + Set Veld = $O(%request.Data(Veld)) + } + + /*** SQL STATEMENTS ***/ /*** ============== ***/ Set sqlLOGAllFields="SELECT Datum, Tijd, Groep, Niveau, Actie, JobID, DetailTrunc As Detail, ID , Gebruiker, LessDetail, MainIndex , Namespace , RemoteIP , Server , ProgLabel , SubID " - Set sqlLOG=LogViewerHelper.GeefSqlStatementMetFilters(AantalDagen, ##class(TECH.ArrayOneDimIterator).%New(.arFilterGroepen), ##class(TECH.ArrayOneDimIterator).%New(.arFilterNiveaus)) + Set sqlLOG=LogViewerHelper.GeefSqlStatementMetFilters(AantalDagen, ##class(TECH.ArrayOneDimIterator).%New(.arFilterGroepen), ##class(TECH.ArrayOneDimIterator).%New(.arFilterNiveaus),BijkomendeCondities) Set sqlLOG=$$$Replace(sqlLOG, "vhLib.Logging.","") ; SQLs to be displayed Set sqlActive=$G(%request.Data("QUERY",1),sqlLOG) ; URL for ToggleQueryEditor + Kill tmpAr Merge tmpAr=tmpRq Kill tmpAr("chkFilterGroep") Kill tmpAr("chkFilterNiveau") @@ -431,12 +449,11 @@ If ToonAlleNiveaus { Set tmpAr("chkToonAlleNiveaus")=1 } - Else { - Merge tmpAr("chkFilterNiveau")=%request.Data("chkFilterNiveau") - } + Kill tmpAr("chkFilterNiveau") Kill tmpAr("SQED") Set tmpAr("SQED")=('blnSQED) + m ^zJBL = tmpAr Set arUrl("ToggleQED")="?"_##class(vhLib.cspBasis).CQueryString(.tmpAr) ; Check if SQL-statement does not alter the tables data !!!