From 243e91422be0a4b111bc35ad64a397ca12c5ad63 Mon Sep 17 00:00:00 2001 From: Wolfram Schneider Date: Sat, 8 Nov 1997 18:22:27 +0000 Subject: [PATCH] Add sort by knob for freebsd mailinglists search. Values are author, date, subject and score. Score is the default sort option. --- data/cgi/search.cgi | 60 +++++++++++++++++++++++++++++++++++++++++-- data/search.sgml | 16 +++++++++--- en/cgi/search.cgi | 60 +++++++++++++++++++++++++++++++++++++++++-- en/search/search.sgml | 16 +++++++++--- 4 files changed, 142 insertions(+), 10 deletions(-) diff --git a/data/cgi/search.cgi b/data/cgi/search.cgi index 0b4fc626d5..9fb14aedf0 100755 --- a/data/cgi/search.cgi +++ b/data/cgi/search.cgi @@ -106,6 +106,7 @@ sub do_wais { &open2(WAISOUT, WAISIN, $waisq, "-g"); print WAISIN $w_question; + local(@mylist) = (); local($hits, $score, $headline, $lines, $bytes, $type, $date, $file); while () { /:score\s+(\d+)/ && ($score = $1); @@ -113,9 +114,64 @@ sub do_wais { /:number-of-lines\s+(\d+)/ && ($lines = $1); /:number-of-bytes\s+(\d+)/ && ($bytes = $1); /:type "(.*)"/ && ($type = $1); - /:headline "(.*)"/ && ($headline = $1); # XXX - /:date "(\d+)"/ && ($date = $1, $hits++, &docdone); + /:headline "(.*)"/ && ($headline = $1, + $headline =~ s/Re:\sRe:\s/Re: /); # XXX + /:date "(\d+)"/ && ($date = $1, $hits++, + push(@mylist, join("\t", $date, $headline, $type, + $bytes, $lines, $file, $score, $hits))); } + + if ($in{'sort'} eq "date") { + foreach (reverse sort {$a <=> $b} @mylist) { + ($date, $headline, $type, $bytes, $lines, + $file, $score, $hits) = split("\t"); + &docdone; + } + } elsif ($in{'sort'} eq "subject") { + local(@a, @c, $b, $d); + foreach (@mylist) { + @a = split("\t"); + $b = $a[0]; + # swap date and subject + if ($a[1] =~ /(^[^:]+)(Re:.*)/) { + $a[0] = "$2\t$1"; + } else { + $a[0] = "$a[1]\t."; + } + $a[1] = $b; + push(@c, join("\t", @a)); + } + local($subject, $author); + foreach (sort {$a cmp $b} @c) { + ($subject, $author, $date, $type, $bytes, + $lines, $file, $score, $hits) = split("\t"); + $headline = $author . $subject; + &docdone; + } + + } elsif ($in{'sort'} eq "author") { + local(@a, @c, $b); + foreach (@mylist) { + @a = split("\t"); + # swap date and subject + $b = $a[0]; $a[0] = $a[1]; $a[1] = $b; + push(@c, join("\t", @a)); + } + foreach (sort {$a cmp $b} @c) { + ($headline, $date, $type, $bytes, + $lines, $file, $score, $hits) = split("\t"); + &docdone; + } + + } else { + foreach (@mylist) { + ($date, $headline, $type, $bytes, + $lines, $file, $score, $hits) = split("\t"); + &docdone; + } + } + #print qq[in: $in{'sort'}\n]; + print "\n"; print "

Didn't get what you expected? "; diff --git a/data/search.sgml b/data/search.sgml index e1b48ff5f7..98815ac3ac 100644 --- a/data/search.sgml +++ b/data/search.sgml @@ -1,9 +1,9 @@ + %includes; ]> - + &header; @@ -62,7 +62,17 @@ for more information.


Limit the number of results to

+value="25" size="5"> + +sort by + + +

In archive(s):

diff --git a/en/cgi/search.cgi b/en/cgi/search.cgi index 0b4fc626d5..9fb14aedf0 100755 --- a/en/cgi/search.cgi +++ b/en/cgi/search.cgi @@ -106,6 +106,7 @@ sub do_wais { &open2(WAISOUT, WAISIN, $waisq, "-g"); print WAISIN $w_question; + local(@mylist) = (); local($hits, $score, $headline, $lines, $bytes, $type, $date, $file); while () { /:score\s+(\d+)/ && ($score = $1); @@ -113,9 +114,64 @@ sub do_wais { /:number-of-lines\s+(\d+)/ && ($lines = $1); /:number-of-bytes\s+(\d+)/ && ($bytes = $1); /:type "(.*)"/ && ($type = $1); - /:headline "(.*)"/ && ($headline = $1); # XXX - /:date "(\d+)"/ && ($date = $1, $hits++, &docdone); + /:headline "(.*)"/ && ($headline = $1, + $headline =~ s/Re:\sRe:\s/Re: /); # XXX + /:date "(\d+)"/ && ($date = $1, $hits++, + push(@mylist, join("\t", $date, $headline, $type, + $bytes, $lines, $file, $score, $hits))); } + + if ($in{'sort'} eq "date") { + foreach (reverse sort {$a <=> $b} @mylist) { + ($date, $headline, $type, $bytes, $lines, + $file, $score, $hits) = split("\t"); + &docdone; + } + } elsif ($in{'sort'} eq "subject") { + local(@a, @c, $b, $d); + foreach (@mylist) { + @a = split("\t"); + $b = $a[0]; + # swap date and subject + if ($a[1] =~ /(^[^:]+)(Re:.*)/) { + $a[0] = "$2\t$1"; + } else { + $a[0] = "$a[1]\t."; + } + $a[1] = $b; + push(@c, join("\t", @a)); + } + local($subject, $author); + foreach (sort {$a cmp $b} @c) { + ($subject, $author, $date, $type, $bytes, + $lines, $file, $score, $hits) = split("\t"); + $headline = $author . $subject; + &docdone; + } + + } elsif ($in{'sort'} eq "author") { + local(@a, @c, $b); + foreach (@mylist) { + @a = split("\t"); + # swap date and subject + $b = $a[0]; $a[0] = $a[1]; $a[1] = $b; + push(@c, join("\t", @a)); + } + foreach (sort {$a cmp $b} @c) { + ($headline, $date, $type, $bytes, + $lines, $file, $score, $hits) = split("\t"); + &docdone; + } + + } else { + foreach (@mylist) { + ($date, $headline, $type, $bytes, + $lines, $file, $score, $hits) = split("\t"); + &docdone; + } + } + #print qq[in: $in{'sort'}\n]; + print "\n"; print "

Didn't get what you expected? "; diff --git a/en/search/search.sgml b/en/search/search.sgml index e1b48ff5f7..98815ac3ac 100644 --- a/en/search/search.sgml +++ b/en/search/search.sgml @@ -1,9 +1,9 @@ + %includes; ]> - + &header; @@ -62,7 +62,17 @@ for more information.


Limit the number of results to

+value="25" size="5"> + +sort by + + +

In archive(s):