Fixes for searches

scc · Apr 23, 2001 · a0bb0e5 · a0bb0e5
1 parent edd26e1
commit a0bb0e5
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 8 deletions.
diff --git a/plugins/Search/Search.pm b/plugins/Search/Search.pm
@@ -112,7 +112,7 @@ sub findUsers {
 	}
 
 	if ($form->{query}) {
-		$sql .= ' AND ' if @$users_to_ignore;
+		$sql .= ' AND ';
 		my $kw = $self->_keysearch($form->{query}, ['nickname', 'ifnull(fakeemail,"")']);
 		$kw =~ s/as kw$//;
 		$kw =~ s/\+/ OR /g;

diff --git a/plugins/Search/search.pl b/plugins/Search/search.pl
@@ -118,6 +118,7 @@ sub commentSearch {
 		back		=> $back,
 		forward		=> $forward,
 		args		=> _buildargs($form),
+		start => $start,
 	});
 }
 
@@ -192,6 +193,7 @@ sub storySearch {
 		back		=> $back,
 		forward		=> $forward,
 		args		=> _buildargs($form),
+		start => $start,
 	});
 }
 

diff --git a/plugins/Search/templates/commentsearch;search;default b/plugins/Search/templates/commentsearch;search;default
@@ -16,7 +16,7 @@ __template__
 each of the last 30,000 or so comments posted.  Older comments
 are removed and currently only visible as static HTML.<P>
 [% IF comments %]
-	[% x = 0 %]
+	[% x = start ? start : 1 %]
 	[% FOREACH comment=comments %]
 				[% user_email = Slash.db.getUser(comment.9, ['fakeemail', 'nickname']) %]
 		<BR><B>[% x %]</B>

diff --git a/plugins/Search/templates/pagination;search;default b/plugins/Search/templates/pagination;search;default
@@ -13,9 +13,6 @@ pagination
 __template__
 	[% back = back || 0;
 	   IF (back > -1) || forward %]
-		</TD></TR>
-		<TR VALIGN="TOP" BGCOLOR="#FFFFFF">
-			<TD ALIGN="RIGHT" BGCOLOR="#FFFFFF">
 				[% IF forward %]
 					<A HREF="[% constants.rootdir %]/search.pl?[% args %]&start=[% forward %]">&lt;Next [% constants.search_default_display %] matches</A>
 				[% END %]
@@ -25,8 +22,6 @@ __template__
 				[% IF (back > -1) %]
 					<A HREF="[% constants.rootdir %]/search.pl?[% args %]&start=[% back %]">Last [% constants.search_default_display %] matches&gt;</A>
 				[% END %]
-			</TD>
-		</TR>
 	[% END %]
 __seclev__
 100
diff --git a/plugins/Search/templates/storysearch;search;default b/plugins/Search/templates/storysearch;search;default
@@ -13,7 +13,7 @@ storysearch
 __template__
 [% USE Slash %]
 [% IF stories %]
-	[% x = 0 %]
+	[% x = start ? start : 1 %]
 	[% FOREACH story=stories %]
 		[% x + form.min %] 
 		[% Slash.linkStory({