|
From: creedon <icr...@us...> - 2005-07-05 17:29:43
|
Update of /cvsroot/frontierkernel/odbs/mainResponderRoot/mainResponder/adminSite/macros In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8946 Modified Files: databaseInfo Log Message: fix date error for year Index: databaseInfo =================================================================== RCS file: /cvsroot/frontierkernel/odbs/mainResponderRoot/mainResponder/adminSite/macros/databaseInfo,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** databaseInfo 26 Mar 2005 21:45:10 -0000 1.1.1.1 --- databaseInfo 5 Jul 2005 17:29:18 -0000 1.2 *************** *** 1,3 **** FrontierVcsFile:1:scpt:mainResponder.adminSite.macros.databaseInfo ! on databaseInfo () { ÇChanges Ç8/14/02; 5:43:24 PM by JES ÇCreated. local (htmltext); on add (s) { htmltext = htmltext + (s + "\r");}; local (pta = html.getPageTableAddress ()); local (bgcolors = {pta^.trbg1, pta^.trbg2}); local (t); new (tableType, @t); bundle { //build sorted table of databases local (adr); for adr in @system.compiler.files { local (f = nameOf (adr^)); local (dbname = file.fileFromPath (f)); local (dbsize = file.size (f)); local (modified = file.modified (f)); local (folder = file.folderFromPath (f)); local (foldername = file.fileFromPath (folder)); local (adrdb = @[f] ); local (dbtables = sizeOf (adrdb^)); local (adrfolder = @t.[foldername]); if not defined (adrfolder^) { new (tableType, adrfolder)}; local (adrdbinfo = @adrfolder^.[dbname]); new (tableType, adrdbinfo); adrdbinfo^.size = dbsize; adrdbinfo^.modified = modified; adrdbinfo^.tables = dbtables}; local (rootpath = window.getFile (@root)); local (adrrootfolder = @t.[" "]); new (tableType, adrrootfolder); local (rootname = file.fileFromPath (rootpath)); local (adrroot = @adrrootfolder^.[rootname] ); new (tableType, adrroot); adrroot^.size = file.size (rootpath); adrroot^.modified = file.modified (rootpath); adrroot^.tables = sizeOf (root)}; add ("<table cellpadding=\"0\" cellspacing=\"0\" border=\"0\" width=\"92%\">"); bundle { //headers add ("<tr><td><b>Folder</b></td><td><b>Database</b></td><td align=\"right\"><b>Size</b></td><td align=\"right\"><b>Tables</b></td><td align=\"right\"><b>Modified</b></td></tr>")}; on datestring (d) { on pad (n) { return (string.padWithZeros (n, 2))}; local (day, month, year, hour, minute, second); date.get (d, @day, @month, @year, @hour, @minute, @second); local (meridian); if hour > 12 { hour = hour - 12; meridian = " PM"} else { if hour == 0 { hour = 12}; meridian = " AM"}; return (pad (month) + "/" + pad (day) + "/" + string.mid (year, 2, 2) + "; " + pad (hour) + ":" + pad (minute) + ":" + pad (second) + meridian)}; local (ct = 0, adrfolder, adrdb); for adrfolder in @t { local (folder = nameOf (adrfolder^)); for adrdb in adrfolder { add ("<tr bgcolor=\"" + bgcolors[(ct++% 2) + 1] + "\">"); add ("<td class=\"small\">" + folder + "</td>"); folder = ""; //only display the folder once add ("<td class=\"small\">" + nameOf (adrdb^) + "</td>"); add ("<td class=\"small\" align=\"right\">" + string.gigabyteString (adrdb^.size) + "</td>"); add ("<td class=\"small\" align=\"right\">" + adrdb^.tables + "</td>"); add ("<td class=\"small\" align=\"right\">" + datestring (adrdb^.modified) + "</td>"); add ("</tr>")}; add ("<tr><td> </td></tr>"); ct = 0}; add ("</table>"); return (htmltext)} \ No newline at end of file --- 1,3 ---- FrontierVcsFile:1:scpt:mainResponder.adminSite.macros.databaseInfo ! on databaseInfo () { ÇChanges Ç7/5/05; 10:13:51 AM by TAC Çfix date error for year Ç8/14/02; 5:43:24 PM by JES ÇCreated. local (htmltext); on add (s) { htmltext = htmltext + (s + "\r");}; local (pta = html.getPageTableAddress ()); local (bgcolors = {pta^.trbg1, pta^.trbg2}); local (t); new (tableType, @t); bundle { //build sorted table of databases local (adr); for adr in @system.compiler.files { local (f = nameOf (adr^)); local (dbname = file.fileFromPath (f)); local (dbsize = file.size (f)); local (modified = file.modified (f)); local (folder = file.folderFromPath (f)); local (foldername = file.fileFromPath (folder)); local (adrdb = @[f] ); local (dbtables = sizeOf (adrdb^)); local (adrfolder = @t.[foldername]); if not defined (adrfolder^) { new (tableType, adrfolder)}; local (adrdbinfo = @adrfolder^.[dbname]); new (tableType, adrdbinfo); adrdbinfo^.size = dbsize; adrdbinfo^.modified = modified; adrdbinfo^.tables = dbtables}; local (rootpath = window.getFile (@root)); local (adrrootfolder = @t.[" "]); new (tableType, adrrootfolder); local (rootname = file.fileFromPath (rootpath)); local (adrroot = @adrrootfolder^.[rootname] ); new (tableType, adrroot); adrroot^.size = file.size (rootpath); adrroot^.modified = file.modified (rootpath); adrroot^.tables = sizeOf (root)}; add ("<table cellpadding=\"0\" cellspacing=\"0\" border=\"0\" width=\"92%\">"); bundle { //headers add ("<tr><td><b>Folder</b></td><td><b>Database</b></td><td align=\"right\"><b>Size</b></td><td align=\"right\"><b>Tables</b></td><td align=\"right\"><b>Modified</b></td></tr>")}; on datestring (d) { on pad (n) { return (string.padWithZeros (n, 2))}; local (day, month, year, hour, minute, second); date.get (d, @day, @month, @year, @hour, @minute, @second); local (meridian); if hour > 12 { hour = hour - 12; meridian = " PM"} else { if hour == 0 { hour = 12}; meridian = " AM"}; return (pad (month) + "/" + pad (day) + "/" + string.mid (year, 3, 2) + "; " + pad (hour) + ":" + pad (minute) + ":" + pad (second) + meridian)}; local (ct = 0, adrfolder, adrdb); for adrfolder in @t { local (folder = nameOf (adrfolder^)); for adrdb in adrfolder { add ("<tr bgcolor=\"" + bgcolors[(ct++% 2) + 1] + "\">"); add ("<td class=\"small\">" + folder + "</td>"); folder = ""; //only display the folder once add ("<td class=\"small\">" + nameOf (adrdb^) + "</td>"); add ("<td class=\"small\" align=\"right\">" + string.gigabyteString (adrdb^.size) + "</td>"); add ("<td class=\"small\" align=\"right\">" + adrdb^.tables + "</td>"); add ("<td class=\"small\" align=\"right\">" + datestring (adrdb^.modified) + "</td>"); add ("</tr>")}; add ("<tr><td> </td></tr>"); ct = 0}; add ("</table>"); return (htmltext)} \ No newline at end of file |