From f16a41ce2e94319592d63c14f52ce4819c41937f Mon Sep 17 00:00:00 2001
From: Ward Wouts <ward@wouts.nl>
Date: Tue, 7 May 2002 13:46:17 +0000
Subject: [PATCH] remove dead code small bug fix

---
 trunk/ripnews/news/article.rb | 30 ++----------------------------
 1 file changed, 2 insertions(+), 28 deletions(-)

diff --git a/trunk/ripnews/news/article.rb b/trunk/ripnews/news/article.rb
index 92131ff..8aec0e9 100644
--- a/trunk/ripnews/news/article.rb
+++ b/trunk/ripnews/news/article.rb
@@ -66,7 +66,7 @@ def get_articles(cachedir=false)
 		print "reading articles from server: #{server}\n"
 		range = Set::IntSpan.new("#{@connections[server]["first"]}-#{@connections[server]["last"]}")
 		rangelist = rechunk_runlist(range.diff(@connections[server]["skip_ids"]).run_list)
-		print "rangelist: #{rangelist}\n"# if Debuglevel >1
+		print "rangelist: #{rangelist}\n" if Debuglevel >1
 		print "rangelist: #{rangelist.type.to_s}\n" if Debuglevel >1
 		print "rangelsit elements: #{range.diff(@connections[server]["skip_ids"]).elements}\n" if Debuglevel >1
 		unless rangelist == nil or rangelist =~ /^$/
@@ -125,7 +125,6 @@ def get_articles(cachedir=false)
 #			end
 #		end
 	end
-#	subject_sort unless @sorted	# store cache sorted
 	save_cache(cachedir)
 end
 
@@ -756,32 +755,6 @@ end
 
 ###############################################################
 
-def subject_sort
-	print "Sorting articles\n"
-	sort_arr = []
-	for i in (0..@subjects.length)
-		print "subj sort #{@subjects[i]}\n" if Debuglevel >2
-		print "subj sort #{@messids[i]}\n" if Debuglevel >2
-		print "subj sort #{@ids[i]}\n" if Debuglevel >2
-		print "subj sort #{@servers[i]}\n" if Debuglevel >2
-		sort_arr += ["#{@subjects[i]} #{@messids[i]} #{@ids[i]} #{@servers[i]}"]
-	end
-	sort_arr.sort!{|a,b| ward_sort(a, b)}
-	@messids = []
-	@ids = []
-	@subjects = []
-	@servers = []
-	sort_arr.collect{|i|
-		i =~ /^(.*) (<[^<]*>) (\d+) (\S*)$/ || i =~ /^(.*) \[<[^<]*>\] (\d+) (\S*)$/
-		@messids += [$2]
-		@ids += [$3]
-		@subjects += [$1]
-		@servers += [$4]
-		print "subject sort: #{$1}\n" if Debuglevel >2
-	}
-	@sorted = true
-end
-
 def group_subject_sort(subj)
 	print "Sorting articles\n"
 	sort_arr = []
@@ -831,6 +804,7 @@ def ward_sort(a, b)
 end
 
 def rechunk_runlist(runlist)
+	return nil if runlist == nil
 	blalist = runlist.split(',')
 	blalist.collect!{|x|
 	result = ""