[Ipac-ng-commit] ipac-ng ipacsum,1.17,1.18

[Friedrich L. <fr...@us...>]

Update of /cvsroot/ipac-ng/ipac-ng
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10230

Modified Files:
	ipacsum 
Log Message:
applied ipacsum.sorting.patch by xavier <list.ipac-ng-developer AT natch DOT dyndns DOT org>
BUT the option --png-sort-by-max has been dropped as it doesn't seem to work as expected


Index: ipacsum
===================================================================
RCS file: /cvsroot/ipac-ng/ipac-ng/ipacsum,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- ipacsum	7 Oct 2004 21:42:16 -0000	1.17
+++ ipacsum	6 Feb 2005 00:35:04 -0000	1.18
@@ -140,6 +140,8 @@
 $png_normalized = 1;		# normalize png: show bps (not b per 
 				# graph_interval)
 $png_caption_in_index = 0;	# make max: and Average: in html index file
+$png_sort_by_bytes = 0;		# no sorting by default
+$png_sort_by_pkts = 0;		# no sorting by default
 $png_no_average = 0;		# dont draw dotted horizontal line with average
 $png_asis = 0;			# create 'asis' files (apache)
 $png_average_curve = 0;		# create 'average on n dots around' line
@@ -231,6 +233,8 @@
 	"png-average-curve=i" =>\$png_average_curve,
 	"png-no-average" =>	\$png_no_average,
 	"png-caption-in-index"=>\$png_caption_in_index,
+	"png-sort-by-bytes" =>	\$png_sort_by_bytes,
+	"png-sort-by-pkts" =>	\$png_sort_by_pkts,
 	"png-height=i"	=>	\$png_height,
 	"png-index:s"	=>	\$png_index,
 	"png-normalize=i"=>	\$png_normalized,
@@ -436,6 +440,8 @@
 &read_data;
 
 @rules_presorted = sort keys %rulenames;
+@rules_presorted = sort { $bytes{$b} <=> $bytes{$a} } keys %rulenames if $png_sort_by_bytes;
+@rules_presorted = sort { $pkts{$b} <=> $pkts{$a} } keys %rulenames if $png_sort_by_pkts;
 foreach (@rules_presorted) {
 	if (/$rule_regex/ && !($opt_z && $bytes{$_} eq "0")) {
 		push @rules_sorted, $_;