[system] / trunk / webwork / system / scripts / HTMLglue.pl Repository:
ViewVC logotype

Diff of /trunk/webwork/system/scripts/HTMLglue.pl

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 5 Revision 6
1#!/usr/bin/perl 1#!/usr/local/bin/perl
2 2
3## $Id$ 3## $Id$
4 4
5#strings for HTML display in webwork 5#strings for HTML display in webwork
6 6
7use lib '/ww/webwork/development/'; # mainWeBWorKDirectory; 7use lib '/ww/webwork/gage_system/webwork/system/lib/'; # mainWeBWorKDirectory
8use strict; 8use strict;
9 9
10use Global; 10use Global;
11 11
12sub htmlTOP { 12sub htmlTOP {
41 $out; 41 $out;
42} 42}
43 43
44sub htmlBOTTOM { 44sub htmlBOTTOM {
45 my ($scriptName,$inputsref, $helpFile) = @_; 45 my ($scriptName,$inputsref, $helpFile) = @_;
46 my ($studentID, $studentName, $studentEmail, $setNumber, $sectionName,$recitationName) = ('','','','','',''); 46 my ($studentLogin, $studentID, $studentName, $studentEmail, $setNumber, $sectionName,$recitationName) = ('','','','','','','');
47 47
48# kludge alert! (need better way of getting email address)
49# my $studentEmail = $$inputsref{'user'} . '@uhura.cc.rochester.edu';
50 my ($psvn,$probNum); 48 my ($psvn,$probNum);
51 $psvn = ( defined($$inputsref{'probSetKey'}) ) ? $$inputsref{'probSetKey'}: ""; 49 $psvn = ( defined($$inputsref{'probSetKey'}) ) ? $$inputsref{'probSetKey'}: "";
52 $probNum = ( defined($$inputsref{'probNum'} ) ) ? $$inputsref{'probNum'} : ""; 50 $probNum = ( defined($$inputsref{'probNum'} ) ) ? $$inputsref{'probNum'} : "";
53 my $mode = $$inputsref{'Mode'}; 51 my $mode = $$inputsref{'Mode'};
54 $mode = $Global::htmlModeDefault unless $mode; 52 $mode = $Global::htmlModeDefault unless $mode;
55 if ($psvn) { 53 if ($psvn) {
56 &attachProbSetRecord($psvn); 54 attachProbSetRecord($psvn);
55 $studentLogin = getStudentLogin($psvn);
56 attachCLRecord($studentLogin);
57
57 $studentID = &getStudentID($psvn); 58 $studentID = CL_getStudentID($studentLogin);
58 $studentEmail = &getStudentEmailAddress($psvn); 59 $studentEmail = CL_getStudentEmailAddress($studentLogin);
59 $studentName = &getStudentName($psvn); 60 $studentName = CL_getStudentName($studentLogin);
60 $setNumber = &getSetNumber($psvn); 61 $setNumber = getSetNumber($psvn);
61 $sectionName = &getClassSection($psvn); 62 $sectionName = CL_getClassSection($studentLogin);
62 $sectionName = '' unless defined($recitationName); 63 $sectionName = '' unless defined($sectionName);
63 $recitationName = &getClassRecitation($psvn); 64 $recitationName = CL_getClassRecitation($studentLogin);
64 $recitationName = '' unless defined($recitationName); 65 $recitationName = '' unless defined($recitationName);
65 } 66 }
66 67
67 68
68 #This put in to work with the old stuff (before EmailAddress was added to DB) 69 #This put in to work with the old stuff (before EmailAddress was added to DB)

Legend:
Removed from v.5  
changed lines
  Added in v.6

aubreyja at gmail dot com
ViewVC Help
Powered by ViewVC 1.0.9