[or-cvs] r19633: {torctl} Add support for a display filter independent of stats and ot (torctl/trunk/python/TorCtl)

[mikeperry at seul.org]

Author: mikeperry
Date: 2009-06-05 08:23:45 -0400 (Fri, 05 Jun 2009)
New Revision: 19633

Modified:
   torctl/trunk/python/TorCtl/SQLSupport.py
Log:

Add support for a display filter independent of stats and
other filters.



Modified: torctl/trunk/python/TorCtl/SQLSupport.py
===================================================================
--- torctl/trunk/python/TorCtl/SQLSupport.py	2009-06-05 12:22:36 UTC (rev 19632)
+++ torctl/trunk/python/TorCtl/SQLSupport.py	2009-06-05 12:23:45 UTC (rev 19633)
@@ -492,7 +492,7 @@
     tc_session.commit()
   compute = Callable(compute)  
 
-  def write_stats(f, pct_low=0, pct_high=100, order_by=None, recompute=False, stat_clause=None, filter_clause=None):
+  def write_stats(f, pct_low=0, pct_high=100, order_by=None, recompute=False, stat_clause=None, filter_clause=None, disp_clause=None):
 
     if not order_by:
       order_by=RouterStats.avg_first_ext
@@ -548,7 +548,7 @@
     f.write("  PR="+str(cvt(percentile,2))+"\n\n\n")
 
     for s in RouterStats.query.filter(pct_clause).filter(stat_clause).\
-           order_by(order_by).all():
+             filter(disp_clause).order_by(order_by).all():
       f.write(s.router.idhex+" ("+s.router.nickname+")\n")
       f.write("   CF="+str(cvt(s.circ_from_rate,2)))
       f.write("  CT="+str(cvt(s.circ_to_rate,2)))
@@ -572,7 +572,7 @@
   write_stats = Callable(write_stats)  
   
 
-  def write_bws(f, pct_low=0, pct_high=100, order_by=None, recompute=False, stat_clause=None, filter_clause=None):
+  def write_bws(f, pct_low=0, pct_high=100, order_by=None, recompute=False, stat_clause=None, filter_clause=None, disp_clause=None):
     if not order_by:
       order_by=RouterStats.avg_first_ext
 
@@ -599,7 +599,7 @@
       else: return type(a)
 
     for s in RouterStats.query.filter(pct_clause).filter(stat_clause).\
-           order_by(order_by).all():
+           filter(disp_clause).order_by(order_by).all():
       f.write("node_id=$"+s.router.idhex+" nick="+s.router.nickname)
       f.write(" strm_bw="+str(cvt(s.sbw,0)))
       f.write(" filt_bw="+str(cvt(s.filt_sbw,0)))