Update of /cvs/scoop/scoop/lib/Scoop
In directory lithium.sabren.com:/tmp/cvs-serv1516/lib/Scoop

Modified Files:
	Search.pm Stories.pm 
Log Message:
Hulver's fixes for bugs 24, 77, 86, 160, 176, and 185

-janra



Index: Stories.pm
===================================================================
RCS file: /cvs/scoop/scoop/lib/Scoop/Stories.pm,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** Stories.pm	3 Feb 2005 15:48:30 -0000	1.47
--- Stories.pm	28 May 2005 01:56:28 -0000	1.48
***************
*** 306,310 ****
  			my $section = $S->{CGI}->param('section');
  			$S->param->{sid} = $sid;
! 			my $message = ($section eq 'Diary') ? '%%diary_submission_message%%' : '%%submission_message%%';
  			$S->{UI}->{BLOCKS}->{CONTENT} .= qq|
  			<TR>
--- 306,323 ----
  			my $section = $S->{CGI}->param('section');
  			$S->param->{sid} = $sid;
! 
! 			my $story = $S->story_data([$sid]);
! 			$story = $story->[0];
! 			my $toget = lc($section) . "_";
! 			my $msg_type;
! 			if ($story->{displaystatus} < 0) {
! 				$msg_type = "submission_message";
! 			} else {
! 				$msg_type = "post_message";
! 			}
! 			$toget .= $msg_type;
! 			my $message = $S->{UI}->{BLOCKS}->{$toget};
! 			$message = $S->{UI}->{BLOCKS}->{$msg_type} unless ($message);
! 
  			$S->{UI}->{BLOCKS}->{CONTENT} .= qq|
  			<TR>

Index: Search.pm
===================================================================
RCS file: /cvs/scoop/scoop/lib/Scoop/Search.pm,v
retrieving revision 1.72
retrieving revision 1.73
diff -C2 -d -r1.72 -r1.73
*** Search.pm	26 Jan 2005 19:24:23 -0000	1.72
--- Search.pm	28 May 2005 01:56:28 -0000	1.73
***************
*** 10,14 ****
  package Scoop;
  use strict;
! my $DEBUG = 1;
  
  
--- 10,14 ----
  package Scoop;
  use strict;
! my $DEBUG = 0;