[AppWrap-cvs] AppWrap/Apache/AppWrap Pager.pm,1.13,1.14

[<pla...@us...>]

Update of /cvsroot/appwrap/AppWrap/Apache/AppWrap
In directory sc8-pr-cvs1:/tmp/cvs-serv29281

Modified Files:
	Pager.pm 
Log Message:
Disabled visualization and navigation for summary pages

Index: Pager.pm
===================================================================
RCS file: /cvsroot/appwrap/AppWrap/Apache/AppWrap/Pager.pm,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Pager.pm	7 Dec 2002 02:08:29 -0000	1.13
--- Pager.pm	8 Dec 2002 02:42:57 -0000	1.14
***************
*** 27,31 ****
  use Apache::Constants qw(:common);
  
! $Apache::AppWrap::Pager::VERSION = "0.06";
  # 03Dec02. convert to my_tables table_type directive
  # 22Nov02. Changed $kt_label definition to silence warnings
--- 27,31 ----
  use Apache::Constants qw(:common);
  
! $Apache::AppWrap::Pager::VERSION = "0.07";
  # 03Dec02. convert to my_tables table_type directive
  # 22Nov02. Changed $kt_label definition to silence warnings
***************
*** 38,44 ****
  	@ISA	 = 'Exporter';
  }
- ############################################################
- # Subroutines
- ############################################################
  ##########################
  # Usage: ($ref, row_count) = &paginator (\%opts) returns a reference 
--- 38,41 ----
***************
*** 49,58 ****
  # hash refs of source data.  
  # 23Nov02.	Began coding for language flexibility.
- # 20 Apr 02. Migrated from Subs library; added \%args as input to 
- #	     override my_* table defaults;
- # 20 Nov 01. Allow indirect sorts, ie sort on text expansion of a 
- #	     numeric field (eg., product_id.)
- # 17 May 01. Some columns sort improperly cause $opts->{column} not 
- #	     getting set
  # 25 Jan. sorted out func_% return values
  ##########################
--- 46,49 ----
***************
*** 296,313 ****
    # If there is a page before this one show a link to it
    # else leave a blank cell
!   push @rows, '      <table width="100%" valign="top" border="0">' . $HNL, 
!               '        <tr valign="bottom">' . $HNL;
  
    # left cell, get any data visualization icons. only if this 
    # is a user data table, because other table types lack date 
    # fields, and thus be calendar'd or chart'd 
    my $left;
  	if (exists $my_tables->{$table}{table_type} && 
! 		$my_tables->{$table}{table_type} =~ m/^(user|meta)_data$/) {
! #	if ($my_tables->{$table}{user_data}) {
  		my $dv_icons = visualize($opts);
  		$left = join("", @$dv_icons) if $dv_icons && scalar(@$dv_icons);
  	}
!   push @rows, '          <td width="30%" align="left">';
    push @rows, $left || $msgs->{left} || '&nbsp;';
    push @rows, '          </td>' . $HNL;
--- 287,305 ----
    # If there is a page before this one show a link to it
    # else leave a blank cell
!   push @rows, '	<table width="100%" valign="top" border="0">' . $HNL; 
!   push @rows, '		<tr valign="bottom">' . $HNL;
  
    # left cell, get any data visualization icons. only if this 
    # is a user data table, because other table types lack date 
    # fields, and thus be calendar'd or chart'd 
+ #$log->debug("\npaginator: table=$table.");
    my $left;
  	if (exists $my_tables->{$table}{table_type} && 
! 		$my_tables->{$table}{table_type} =~ m/^(user|meta)_data$/ &&
! 		! exists $opts->{args}{top_summary}) {
  		my $dv_icons = visualize($opts);
  		$left = join("", @$dv_icons) if $dv_icons && scalar(@$dv_icons);
  	}
!   push @rows, '			<td width="30%" align="left">';
    push @rows, $left || $msgs->{left} || '&nbsp;';
    push @rows, '          </td>' . $HNL;
***************
*** 321,325 ****
  #$log->debug("\n\&paginator: got to data. Rows=$row_count.");
    # right cell, get any data navigation icons
!   my $nav = navigate($opts);
    my $right = join("", @$nav) if $nav && scalar(@$nav);
  
--- 313,317 ----
  #$log->debug("\n\&paginator: got to data. Rows=$row_count.");
    # right cell, get any data navigation icons
!   my $nav = navigate($opts) unless exists $opts->{args}{top_summary};
    my $right = join("", @$nav) if $nav && scalar(@$nav);
  
***************
*** 331,335 ****
    # use hidden fields to allow context-sensitive navigation. Save $page 
    # (current page number) and $sb (how to sort the next displayed page.)
!   my $text = '          <form method="POST"';
    $text .= ' enctype="application/x-www-form-urlencoded">' . $HNL;
    push @rows, $text;
--- 323,327 ----
    # use hidden fields to allow context-sensitive navigation. Save $page 
    # (current page number) and $sb (how to sort the next displayed page.)
!   my $text = '			<form method="POST"';
    $text .= ' enctype="application/x-www-form-urlencoded">' . $HNL;
    push @rows, $text;
***************
*** 337,346 ****
    $text .= ' value="' . $page . '">' . $HNL;
    push @rows, $text;
!   $text = '            <input type="hidden" name="sb" value="';
    $text .= $sb . '">' . $HNL;
    push @rows, $text;
!   $text = '          </form>' . $HNL . '        </tr>' . $HNL;
    push @rows, $text;
!   push @rows, '      </table>' . $HNL;
  
    ############################################################
--- 329,338 ----
    $text .= ' value="' . $page . '">' . $HNL;
    push @rows, $text;
!   $text = '			<input type="hidden" name="sb" value="';
    $text .= $sb . '">' . $HNL;
    push @rows, $text;
!   $text = '			</form>' . $HNL . '		</tr>' . $HNL;
    push @rows, $text;
!   push @rows, '	</table>' . $HNL;
  
    ############################################################