remove dead code
small bug fix
This commit is contained in:
parent
9b6281e83d
commit
f16a41ce2e
1 changed files with 2 additions and 28 deletions
|
|
@ -66,7 +66,7 @@ def get_articles(cachedir=false)
|
||||||
print "reading articles from server: #{server}\n"
|
print "reading articles from server: #{server}\n"
|
||||||
range = Set::IntSpan.new("#{@connections[server]["first"]}-#{@connections[server]["last"]}")
|
range = Set::IntSpan.new("#{@connections[server]["first"]}-#{@connections[server]["last"]}")
|
||||||
rangelist = rechunk_runlist(range.diff(@connections[server]["skip_ids"]).run_list)
|
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 "rangelist: #{rangelist.type.to_s}\n" if Debuglevel >1
|
||||||
print "rangelsit elements: #{range.diff(@connections[server]["skip_ids"]).elements}\n" if Debuglevel >1
|
print "rangelsit elements: #{range.diff(@connections[server]["skip_ids"]).elements}\n" if Debuglevel >1
|
||||||
unless rangelist == nil or rangelist =~ /^$/
|
unless rangelist == nil or rangelist =~ /^$/
|
||||||
|
|
@ -125,7 +125,6 @@ def get_articles(cachedir=false)
|
||||||
# end
|
# end
|
||||||
# end
|
# end
|
||||||
end
|
end
|
||||||
# subject_sort unless @sorted # store cache sorted
|
|
||||||
save_cache(cachedir)
|
save_cache(cachedir)
|
||||||
end
|
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)
|
def group_subject_sort(subj)
|
||||||
print "Sorting articles\n"
|
print "Sorting articles\n"
|
||||||
sort_arr = []
|
sort_arr = []
|
||||||
|
|
@ -831,6 +804,7 @@ def ward_sort(a, b)
|
||||||
end
|
end
|
||||||
|
|
||||||
def rechunk_runlist(runlist)
|
def rechunk_runlist(runlist)
|
||||||
|
return nil if runlist == nil
|
||||||
blalist = runlist.split(',')
|
blalist = runlist.split(',')
|
||||||
blalist.collect!{|x|
|
blalist.collect!{|x|
|
||||||
result = ""
|
result = ""
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue