From f0f26c4b8fec1e57717d7875766232c6d4a9798f Mon Sep 17 00:00:00 2001
From: Ward Wouts <ward@wouts.nl>
Date: Wed, 1 Sep 2004 11:25:46 +0000
Subject: [PATCH] fix warnings & lower memory usage

---
 trunk/ripnews/news/article.rb | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/trunk/ripnews/news/article.rb b/trunk/ripnews/news/article.rb
index 9baa8d0..bf7a925 100644
--- a/trunk/ripnews/news/article.rb
+++ b/trunk/ripnews/news/article.rb
@@ -1,4 +1,4 @@
-# $Dwarf: article.rb,v 1.87 2004/06/07 21:47:51 ward Exp $
+# $Dwarf: article.rb,v 1.88 2004/06/16 08:16:23 ward Exp $
 # $Source$
 
 #
@@ -29,7 +29,7 @@ class PermError < ArticleError; end
 
 class Article
 
-Debuglevel = 2
+Debuglevel = 0
 
 def initialize(nntpservers, groupname, newsrc="~/.newsrc")
 	@messids = []
@@ -62,6 +62,9 @@ end
 def reconnect(server)
 	begin
 		@connections[server]["nntp"].quit
+		# helpt dit in geheugen gebruik? : Volgens mij niet
+		#@connections[server].delete("nntp")
+		#GC.start
 	rescue Errno::EPIPE, Errno::ECONNRESET, EOFError
 	end
 	begin
@@ -182,6 +185,7 @@ def get_articles(cachedir=false)
 		end
 		save_cache(cachedir, server)
 	end
+	GC.start
 end
 
 def get_group_info(server)
@@ -194,7 +198,7 @@ def get_group_info(server)
 		timeout(30) do
 			begin
 				resp, count, first, last, name = @connections[server]["nntp"].group(@group)
-			rescue Net::NNTP::RuntimeError
+			rescue Net::NNTPReplyError
 				printerr(server)
 				if ( $!.to_s =~ /^503|^400/ )
 					reconnect(server)
@@ -237,7 +241,7 @@ def get_xhdr(server, range, header)
 					print "got response #{resp} while reading group #{@group} from #{server}\n"
 					raise TempError
 				end
-			rescue Net::NNTP::RuntimeError
+			rescue Net::NNTPReplyError
 				printerr(server)
 				if ( $!.to_s =~ /^503|^400/ )
 					reconnect(server)
@@ -295,14 +299,15 @@ end
 
 def get_body(server, message)
 	timedout = 0
+	retries = 0
 	resp = ""
 	id = ""
 	messid = ""
 	list = []
-	retries = 0
 	begin
 		timeout(180) do
 			begin
+				list = []
 				resp, id, messid, list = @connections[server]["nntp"].body(message)
 			rescue Net::NNTPReplyError
 				a = ''
@@ -624,7 +629,8 @@ def group_subject_sort(subj)
 		sort_arr.push( [
 			@groups[subj]["subject"][i].dup,
 			@groups[subj]["messages"][i].dup,
-			@groups[subj]["ids"][i].dup,
+			#@groups[subj]["ids"][i].dup,     # eng hoor, dit wijzigen
+			@groups[subj]["ids"][i],
 			@groups[subj]["servers"][i].dup
 		] ) if serverhash[@groups[subj]["servers"][i]] != nil
 	end