[FormMagick-devel] CVS: formmagick/lib/CGI/FormMagick Utils.pm,1.11,1.12

[Kirrily R. <sk...@us...>]

Update of /cvsroot/formmagick/formmagick/lib/CGI/FormMagick
In directory usw-pr-cvs1:/tmp/cvs-serv11371/lib/CGI/FormMagick

Modified Files:
	Utils.pm 
Log Message:
Fencepost error related to the finished() routine.  We have to check if
we're *past* the last page, not whether we're *on* it.


Index: Utils.pm
===================================================================
RCS file: /cvsroot/formmagick/formmagick/lib/CGI/FormMagick/Utils.pm,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** Utils.pm	2001/10/10 18:02:09	1.11
--- Utils.pm	2001/10/10 18:42:33	1.12
***************
*** 276,280 ****
      my $self = shift;
      return 1 if $self->{cgi}->param("Finish");
!     return 1 if $self->user_pressed_enter() and $self->is_last_page();
      return 0;
  }
--- 276,287 ----
      my $self = shift;
      return 1 if $self->{cgi}->param("Finish");
! 
!     # note the difference between this test and the one in is_last_page()
!     # ... it's a fencepost thing.  In the case of is_last_page we want
!     # to see if we're *on* the last page, but here we want to see if
!     # we're *past* it.
!     return 1 if $self->user_pressed_enter() 
!         and $self->{page_number} >= @{$self->form->{PAGES}};
! 
      return 0;
  }
***************
*** 314,317 ****
--- 321,325 ----
              $self->{cgi}->param("Next") or
              $self->{cgi}->param("Finish") ) {
+         $self->debug("User pressed enter.");
          return 1;
      } else {