[popfile-commit] engine/UI HTML.pm,1.213,1.214

[<jgr...@us...>]

Update of /cvsroot/popfile/engine/UI
In directory sc8-pr-cvs1:/tmp/cvs-serv32366/UI

Modified Files:
	HTML.pm 
Log Message:
Prevent an 'unclassified' bucket and set the Last Reset time correctly

Index: HTML.pm
===================================================================
RCS file: /cvsroot/popfile/engine/UI/HTML.pm,v
retrieving revision 1.213
retrieving revision 1.214
diff -C2 -d -r1.213 -r1.214
*** HTML.pm	10 Oct 2003 15:45:10 -0000	1.213
--- HTML.pm	10 Oct 2003 20:03:19 -0000	1.214
***************
*** 191,195 ****
      # The last time (textual) that the statistics were reset
  
!     $self->config_( 'last_reset', localtime );
  
      # We start by assuming that the user speaks English like the
--- 191,196 ----
      # The last time (textual) that the statistics were reset
  
!     my $lt = localtime;
!     $self->config_( 'last_reset', $lt );
  
      # We start by assuming that the user speaks English like the
***************
*** 2028,2034 ****
          }
          $stripe = 1 - $stripe;
!         $body .= "><td><a href=\"/buckets?session=$self->{session_key__}&amp;showbucket=$bucket\">\n";
!         $body .= "<font color=\"" . $self->{classifier__}->get_bucket_color($bucket) . "\">$bucket</font></a></td>\n";
!         $body .= "<td width=\"1%\">&nbsp;</td><td align=\"right\">$number</td><td width=\"1%\">&nbsp;</td>\n";
          $body .= "<td align=\"right\">$unique</td><td width=\"1%\">&nbsp;</td>";
  
--- 2029,2041 ----
          }
          $stripe = 1 - $stripe;
!         $body .= '><td>';
!         if ( $bucket ne 'unclassified' ) {
!             $body .= "<a href=\"/buckets?session=$self->{session_key__}&amp;showbucket=$bucket\">\n";
! 	}
!         $body .= "<font color=\"" . $self->{classifier__}->get_bucket_color($bucket) . "\">$bucket</font>";
!         if ( $bucket ne 'unclassified' ) {
!             $body .= '</a>';
! 	}
!         $body .= "</td>\n<td width=\"1%\">&nbsp;</td><td align=\"right\">$number</td><td width=\"1%\">&nbsp;</td>\n";
          $body .= "<td align=\"right\">$unique</td><td width=\"1%\">&nbsp;</td>";
  
***************
*** 3349,3358 ****
              $body .= "<td><a class=\"messageLink\" title=\"$subject\" href=\"/view?view=$mail_file" . $self->print_form_fields_(0,1,('start_message','session','filter','search','sort')) . "\">";
              $body .= "$short_subject</a></td>\n<td>";
              if ( $reclassified )  {
!                 $body .= "<a href=\"buckets?session=$self->{session_key__}&showbucket=$bucket\"><font color=\"" . $self->{classifier__}->get_bucket_color($bucket) . "\">$bucket</font></a></td>\n<td>";
                  $body .= sprintf( $self->{language__}{History_Already}, ($self->{classifier__}->get_bucket_color($bucket) || ''), ($bucket || '') );
                  $body .= " <input type=\"submit\" class=\"undoButton\" name=\"undo_$i\" value=\"$self->{language__}{Undo}\">\n";
              } else {
!                 $body .= "<a href=\"buckets?session=$self->{session_key__}&showbucket=$bucket\"><font color=\"" . $self->{classifier__}->get_bucket_color($bucket) . "\">$bucket</font></a></td>\n<td>";
  
                  if ( $self->{history__}{$mail_file}{magnet} eq '' )  {
--- 3356,3367 ----
              $body .= "<td><a class=\"messageLink\" title=\"$subject\" href=\"/view?view=$mail_file" . $self->print_form_fields_(0,1,('start_message','session','filter','search','sort')) . "\">";
              $body .= "$short_subject</a></td>\n<td>";
+             my $sbs = ($bucket ne 'unclassified')?"<a href=\"buckets?session=$self->{session_key__}&showbucket=$bucket\">":'';
+             my $sbe = ($bucket ne 'unclassified')?'</a>':'';
              if ( $reclassified )  {
!                 $body .= "$sbs<font color=\"" . $self->{classifier__}->get_bucket_color($bucket) . "\">$bucket</font>$sbe</td>\n<td>";
                  $body .= sprintf( $self->{language__}{History_Already}, ($self->{classifier__}->get_bucket_color($bucket) || ''), ($bucket || '') );
                  $body .= " <input type=\"submit\" class=\"undoButton\" name=\"undo_$i\" value=\"$self->{language__}{Undo}\">\n";
              } else {
!                 $body .= "$sbs<font color=\"" . $self->{classifier__}->get_bucket_color($bucket) . "\">$bucket</font>$sbe</td>\n<td>";
  
                  if ( $self->{history__}{$mail_file}{magnet} eq '' )  {
***************
*** 3550,3554 ****
              $view = $self->{language__}{View_WordScores};
  	}
!   
          $fmtlinks = "<table width=\"100%\">\n<td class=\"top20\" align=\"left\"><b>$self->{language__}{View_WordMatrix} ($view)</b></td>\n<td class=\"historyNavigatorTop\">\n";
          if ($self->config_( 'wordtable_format' ) ne 'freq' ) {
--- 3559,3563 ----
              $view = $self->{language__}{View_WordScores};
  	}
! 
          $fmtlinks = "<table width=\"100%\">\n<td class=\"top20\" align=\"left\"><b>$self->{language__}{View_WordMatrix} ($view)</b></td>\n<td class=\"historyNavigatorTop\">\n";
          if ($self->config_( 'wordtable_format' ) ne 'freq' ) {