Index: csp/vhliblogging.cls.xml =================================================================== diff -u -r734 -r1074 --- csp/vhliblogging.cls.xml (.../vhliblogging.cls.xml) (revision 734) +++ csp/vhliblogging.cls.xml (.../vhliblogging.cls.xml) (revision 1074) @@ -1,15 +1,12 @@ - + CSP page for viewing the FOP Queue items via SQL User -vhLib.Macro +vhLib.Macro,vhLib.cspError cache %CSP.Page -62070,48350.276824 -61780,53182.109457 -0 1 @@ -18,24 +15,23 @@ cache ",$LB($$$EmailTo),"CSP - Error - "_$ZDT($H,4),"§DFL_HTML§",,1) + Set %cspEHandler($$$etPageLoadError,"ACTIONS","ErrPage")=$LB("csp.vhLibError","OnPageMinimum") + } + Else { + Set %cspEHandler($$$etPageLoadError,"ACTIONS")=$LB("ErrPage") + Set %cspEHandler($$$etPageLoadError,"ACTIONS","ErrPage")=$LB("%CSP.Error","OnPage") + } - #Include vhLib.cspError + Quit - #define EmailTo "jcl@vanhoecke.be" - Do ##class(csp.vhLibError).DefaultEHandlerInit(.lbErrTypes) - - // [??] - #If $$$Server="WWW01" - Set %cspEHandler($$$etPageLoadError,"ACTIONS")=$LB("Email","ErrPage") - Set %cspEHandler($$$etPageLoadError,"ACTIONS","Email")=$LB("""CSPserver "_$system.Server.HostName()_""" ",$LB($$$EmailTo),"CSP - Error - "_$ZDT($H,4),"§DFL_HTML§",,1) - Set %cspEHandler($$$etPageLoadError,"ACTIONS","ErrPage")=$LB("csp.vhLibError","OnPageMinimum") - #Else - Set %cspEHandler($$$etPageLoadError,"ACTIONS")=$LB("Email","ErrPage") - Set %cspEHandler($$$etPageLoadError,"ACTIONS","Email")=$LB("""CSPserver "_$system.Server.HostName()_""" ",$LB($$$EmailTo),"CSP - Error - "_$ZDT($H,4),"§DFL_HTML§",,1) - Set %cspEHandler($$$etPageLoadError,"ACTIONS","ErrPage")=$LB("csp.vhLibError","OnPageMinimum") - #EndIf - - Quit ]]> @@ -56,21 +52,15 @@ code %Boolean " Write !,$c(9)_"

"_($$$UCase($G(CspPageTitle, ..%ClassName(0)))_$G(OnServer))_"

",! Write ! If '((blnSQED)) Goto %csp00001 ;{ Write !,$c(9)_"
",! - Write $c(9)_"
"_(sqlAll)_"
",! + Write $c(9)_"
"_(sqlLOGAllFields)_"
",! Write $c(9) Write "
" Write !,..InsertHiddenFields(""),! - Write !,$c(9,9) - Write "" - Write !,$c(9,9) - Write "" Write !,$c(9,9)_"",! Write $c(9,9,9)_"",! Write $c(9,9,9,9)_"",! Write $c(9,9,9)_"",! Write $c(9,9)_"
",! @@ -87,7 +77,7 @@ Write "" Write !,$c(9,9,9,9,9)_"
",! Write $c(9,9,9,9,9) - Write "" + Write "" Write !,$c(9,9,9,9)_"
",! @@ -117,7 +107,7 @@ Set queryA.RuntimeMode=2 Set sqlStatement=$zstrip($tr((sqlActive),$C(9,13,10)," "),"<>W") If $zcvt($extract(sqlStatement,1,6),"U")'="SELECT" { - Do ..ShowError($$$ERROR($$$CSPSQLOnlySelect,100)) + Do ..ShowError($$$ERROR($$$CSPSQLOnlySelect,175)) Quit } // translate tab/cr/nl to spaces @@ -134,8 +124,8 @@ Write !,$c(9) Set qryAColCount=queryA.GetColumnCount() Write !,$c(9) - Write "" - Write !,..InsertHiddenFields("vhLibLogging.csp"),! + Write "" + Write !,..InsertHiddenFields("vhLogging.csp"),! Write !,$c(9)_"",! Write $c(9,9)_""_$c(9,9),! Write $c(9,9,9)_""_$c(9,9,9),! @@ -144,7 +134,7 @@ %csp00005 If '((col"_$c(9,9,9),! + Write !,$c(9,9,9)_""_$c(9,9,9),! Write $c(9,9,9) Goto %csp00005 %csp00004 ;} @@ -172,8 +162,7 @@ %csp00009 If '(queryA.Next()) Goto %csp00008 ;{ Set row=row+1 Write " " - Write !,$c(9,9)_"",! + Write !,$c(9,9)_"",! Write $c(9,9,9) ;Set blnAddLink=(queryA.GetDataByName("ID")?1(1"MAINPAGE",1"WIZARD_CALC")) Write !,$c(9,9,9)_"",! @@ -182,16 +171,69 @@ %csp00011 If '((col
"_$$$HTML2($S($L(tmpVal):tmpVal,1:" "))_"
",! + Set DataIsSimpleValue=1 + Set UsePreFormattedHtml=0 + Set UseCollapsedSection=0 + If $$$UCase(queryA.GetColumnName(col))?1(1"LESSDETAIL")&&(tmpVal'="") { + Set UsePreFormattedHtml=1 + Set DataIsSimpleValue=0 + Set tmpVal=$$$HTML2(tmpVal) } - else - { - Write !,$c(9,9,9)_"",! - } - Write $c(9,9,9) + ElseIf $$$UCase(queryA.GetColumnName(col))?1(1"DETAIL",1"DETAILTRUNC")&&(tmpVal'="") { + ;Set DataIsXML=1 ; TBD ... + Set UseCollapsedSection=1 + Set UsePreFormattedHtml=1 + Set DataIsSimpleValue=0 + Set tmpDataSummary=$$$HTML2($TR($E(tmpVal,1,150),$C(13,10)," ")) + Set tmpVal=$$$HTML2(tmpVal) + } + Write !,$c(9,9) + If '((DataIsSimpleValue)) Goto %csp00012 ;{ + Write !,$c(9,9,9)_"",! + Write $c(9,9) + Goto %csp00013 ;} +%csp00012 If '((UseCollapsedSection)) Goto %csp00014 ;{ + Write !,$c(9,9,9)_"",! + Write $c(9,9) + Goto %csp00013 ;} +%csp00014 ;{ + Write !,$c(9,9,9)_"",! + Write $c(9,9) +%csp00013 ;} + Write !,$c(9,9,9) Goto %csp00011 %csp00010 ;} Write !,$c(9,9)_"",! @@ -225,7 +267,7 @@ Write "" Write !,! Set BodyBgColor=##class(TECH.Config.ConfigMgr).Instance().GetString("WebpaginaAchtergrondKleur") - Set OnServer = "  ["_$$$NSpace_"]" + Set OnServer = "  ["_$$$Server_" - "_$$$NSpace_"]" Write !,!,"" + Write !," .clsDetailDataExp { position:relative; margin-top:2px; width:1000; overflow-x:visible; overflow-y:hidden; height:auto; background-color:transparent; border:solid 1px darkblue; }",! + Write " .clsDetailDataCol { position:relative; margin-top:0px; width:1000; overflow-x:hidden; overflow-y:hidden; height:16px; background-color:transparent; border:none; padding:0px; }",! + Write " .clsDetailDataHdr { color:darkblue; text-decoration:underline; cursor:pointer; }",! + Write " .clsDetailInfo { font-size:8pt; font-weight:normal; padding-left:5px; }",! + Write !,"" Write $c(9),! Write !,$c(9)_""_($G(CspPageTitle, ..%ClassName(0))_$G(OnServer))_"",! Write $c(9),! @@ -274,6 +320,76 @@ Write $c(9)_"} ",! Write $c(9),! Write $c(9)_" -->" + Write !,!,!,$c(9) + Write "" Write !,!,"" ]]> @@ -333,9 +449,11 @@ /*** SQL STATEMENTS ***/ /*** ============== ***/ ; SQL-statement for FOP Queue - Set sqlLOG="SELECT Top 100 Datum , Tijd , Groep, Niveau , Actie , JobID , Detail" + Set sqlLOGAllFields="SELECT Top 100 Datum, Tijd, Groep, Niveau, Actie, JobID, DetailTrunc As Detail, ID , LessDetail, MainIndex , Namespace , RemoteIP , Server , ProgLabel , SubID " + Set sqlLOG ="SELECT Top 100 Datum, Tijd, Groep, Niveau, Actie, JobID, DetailTrunc As Detail" + Set sqlLOG=sqlLOG_$C(13,10)_" FROM vhLib.Logging WHERE Niveau = 'E' OR Niveau = 'W' " - Set sqlLOG=sqlLOG_$C(13,10)_" ORDER BY Datum DESC, Tijd DESC" + Set sqlLOG=sqlLOG_$C(13,10)_" ORDER BY Datum DESC, Tijd DESC, SubID DESC" ; SQLs to be displayed Set sqlDFL=$S(1:sqlLOG) @@ -348,24 +466,23 @@ ; Check if SQL-statement does not alter the tables data !!! Set lbAvoidSQL=$LB("CREATE TABLE","ALTER TABLE","DROP TABLE","CREATE QUERY","DROP QUERY","INSERT","UPDATE","DELETE") - Set CspPageTitle="VH LOGGING" Quit 1 + ]]> -c:\cachesys\csp\wss\vhLibLogging.csp +c:\cachesys\csp\admin1\vhLibLogging.csp -/csp/wss/vhLibLogging.csp +/csp/admin1/vhLibLogging.csp -61780,53152 +62157,37063 -
"_($S(blnAddLink:">", 1:" "))_""_$$$HTML2($S($L(tmpVal):tmpVal,1:" "))_"" + Write "
" + Write ($S($L(tmpVal):tmpVal,1:" ")) + Write "
" + Write "		",! + Write $c(9,9,9,9) + Write "
" + Write !,$c(9,9,9,9,9)_"

",! + Write $c(9,9,9,9,9,9) + Write "" + Write "Summary:" + Write "" + Write !,$c(9,9,9,9,9,9) + Write "" + Write ($S($L(tmpDataSummary):tmpDataSummary, 1:" ")) + Write "" + Write !,$c(9,9,9,9,9)_"

",! + Write $c(9,9,9,9,9) + Write "
" + Write "
"_($S($L(tmpVal):tmpVal,1:" "))_"
" + Write "
" + Write !,$c(9,9,9,9) + Write "
" + Write !,$c(9,9,9)_"		",! + Write $c(9,9,9,9) + Write "
" + Write !,$c(9,9,9,9,9)_"
",!
+                 Write ($E(tmpVal,1,32000)),!
+                 Write $c(9,9,9,9,9)_"
",! + Write $c(9,9,9,9) + Write "
" + Write !,$c(9,9,9)_"