loncom/interface/lonprintout.pm - diff

Return to lonprintout.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonprintout.pm between versions 1.340 and 1.342

-version 1.340, 2004/12/13 22:24:03
+version 1.342, 2004/12/20 21:15:20
  Line 45  use Apache::lonlocal;
  my $LaTeXwidth = 0;
+ #   Compare two students by name.  The students are in the form
+ #   returned by the helper:
+ #      user:domain:section:last,   first:status
+ #   This is a helper function for the perl sort built-in  therefore:
+ # Implicit Inputs:
+ #    $a     - The first element to compare (global)
+ #    $b     - The second element to compare (global)
+ # Returns:
+ #   -1   - $a < $b
+ #    0   - $a == $b
+ #   +1   - $a > $b
+ #   Note that the initial comparison is done on the last names with the
+ #   first names only used to break the tie.
+ #
+ #
+ sub compare_names {
+     #  First split the names up into the primary fields.
+     my ($u1, $d1, $s1, $n1, $stat1) = split(/:/, $a);
+     my ($u2, $d2, $s2, $n2, $stat2) = split(/:/, $b);
+     # Now split the last name and first name of each n:
+     #
+     my ($l1,$f1) = split(/,/, $n1);
+     my ($l2,$f2) = split(/,/, $n2);
+     # We don't bother to remove the leading/trailing whitespace from the
+     # firstname, unless the last names compare identical.
+     if($l1 lt $l2) {
+ 	return -1;
+     }
+     if($l1 gt $l2) {
+ 	return  1;
+     }
+     # Break the tie on the first name, but there are leading (possibly trailing
+     # whitespaces to get rid of first
+     #
+     $f1 =~ s/^\s+//;		# Remove leading...
+     $f1 =~ s/\s+$//;		# Trailing spaces from first 1...
+     $f2 =~ s/^\s+//;
+     $f2 =~ s/\s+$//;		# And the same for first 2...
+     if($f1 lt $f2) {
+ 	return -1;
+     }
+     if($f1 gt $f2) {
+ 	return 1;
+     }
+     #  Must be the same name.
+     return 0;
+ }
  sub latex_header_footer_remove {
      my $text = shift;
      $text =~ s/\\end{document}//;
- Line 1057  ENDPART
+ Line 1115  ENDPART
  	     $type='resources';
  	 }
  	 my @students=split /\|\|\|/, $helper->{'VARS'}->{'STUDENTS'};
+ 	 #   The normal sort order is by section then by students within the
+ 	 #   section. If the helper var student_sort is 1, then the user has elected
+ 	 #   to override this and output the students by name.
+ 	 #    Each element of the students array is of the form:
+ 	 #       username:domain:section:last, first:status
+ 	 #
+ 	 #
+ 	 if ($helper->{'VARS'}->{'student_sort'}    eq 1) {
+ 	     @students = sort compare_names  @students;
+ 	 }
           if ($helper->{'VARS'}->{'NUMBER_TO_PRINT'} eq '0' ||
  	     $helper->{'VARS'}->{'NUMBER_TO_PRINT'} eq 'all' ) {
  	     $helper->{'VARS'}->{'NUMBER_TO_PRINT'}=$#students+1;
- Line 1275  ENDPART
+ Line 1343  ENDPART
      my $URLback=''; #link to original document
      if ($helper->{'VARS'}->{'construction'} ne '1') {
  	#prints published resource
- 	$URLback=$helper->{'VARS'}->{'postdata'};
+ 	$URLback=&Apache::lonnet::escape('/adm/flip?postdata=return:');
      } else {
  	#prints resource from the construction space
  	$URLback='/'.$helper->{'VARS'}->{'filename'};
- Line 1606  sub printHelper {
+ Line 1674  sub printHelper {
      my $isNotMap = '!$res->is_sequence()';
      $isNotMap .= ' && !$res->randomout()' if !$userCanSeeHidden;
      my $isMap = '$res->is_map()';
-     my $symbFilter = '$res->symb()';
+     my $symbFilter = '$res->shown_symb()';
-     my $urlValue = '$res->src()';
+     my $urlValue = '$res->link()';
      $helper->declareVar('SEQUENCE');

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.340
changed lines
	Added in v.1.342