');
- $r->print(&OptionResponseProblemSelector());
+ $r->print(&Apache::lonstathelpers::ProblemSelector
+ ($problem_types));
}
}
-
#########################################################
#########################################################
##
-## Misc interface routines use by analysis code
+## Numerical Response Routines
##
#########################################################
#########################################################
-sub build_foil_index {
- my ($ORdata) = @_;
- my %Foildata = %{$ORdata->{'Foils'}};
- my @Foils = sort(keys(%Foildata));
- my %Concepts;
- foreach my $foilid (@Foils) {
- push(@{$Concepts{$Foildata{$foilid}->{'Concept'}}},
- $foilid);
+sub NumericalResponseAnalysis {
+ my ($r,$problem,$ProblemData,$Students) = @_;
+ $r->print('
This analysis is not yet supported
');
+ my ($resource,$respid) = ($problem->{'resource'},
+ $problem->{'respid'});
+ my $analysis_html;
+ my $PerformanceData =
+ &Apache::loncoursedata::get_response_data
+ ($Students,$resource->{'symb'},$respid);
+ if (! defined($PerformanceData) ||
+ ref($PerformanceData) ne 'ARRAY' ) {
+ $analysis_html = '
'.
+ &mt('There is no submission data for this resource').
+ '
';
+ $r->print($analysis_html);
+ return;
}
- undef(@Foils);
- # Having gathered the concept information in a hash, we now translate it
- # into an array because we need to be consistent about order.
- # Also put the foils in order, too.
- my $sortfunction = sub {
- my %Numbers = (one => 1,
- two => 2,
- three => 3,
- four => 4,
- five => 5,
- six => 6,
- seven => 7,
- eight => 8,
- nine => 9,
- ten => 10,);
- my $a1 = $a;
- my $b1 = $b;
- if (exists($Numbers{lc($a)})) {
- $a1 = $Numbers{lc($a)};
+ my ($max,$min) = &GetStudentAnswers($r,$problem,$Students);
+ $r->print('Maximum = '.$max.' Minimum = '.$min);
+ my $max_students = 0;
+ my %Data;
+ foreach my $student (@$Students) {
+ my $answer = $student->{'answer'};
+ $Data{$answer}++;
+ if ($max_students < $Data{$answer}) {
+ $max_students = $Data{$answer};
}
- if (exists($Numbers{lc($b)})) {
- $b1 = $Numbers{lc($b)};
+ }
+ foreach (5,10,20,25,50,75,100,150,200,250,500,1000,1500,2000,2500,5000) {
+ if ($max_students < $_) {
+ $max_students = $_;
+ last;
}
- $a1 cmp $b1;
- };
- my @Concepts;
- foreach my $concept (sort $sortfunction (keys(%Concepts))) {
- push(@Concepts,{ name => $concept,
- foils => [@{$Concepts{$concept}}]});
- push(@Foils,(@{$Concepts{$concept}}));
}
- #
- # Build up the table of row labels.
- my $table = '
'."\n";
- if (@Concepts > 1) {
- $table .= '
'.
- '
'.&mt('Concept Number').'
'.
- '
'.&mt('Concept').'
'.
- '
'.&mt('Foil Number').'
'.
- '
'.&mt('Foil Name').'
'.
- '
'.&mt('Foil Text').'
'.
- '
'.&mt('Correct Value').'
'.
- "
\n";
+ my @Labels = sort {$a <=> $b } keys(%Data);
+ $r->print('number of labels = '.scalar(@Labels));
+ my @PlotData = @Data{@Labels};
+ $r->print('number of PlotData = '.scalar(@PlotData));
+ my $graph =
+ &Apache::loncommon::DrawXYGraph('Correct Answer Distribution',
+ 'Correct Answer',
+ 'Number of students',
+ $max_students,
+ undef,
+ \@Labels,
+ [\@PlotData],
+ (xskip=>10));
+ $r->print($graph);
+ return;
+}
+
+sub GetStudentAnswers {
+ my ($r,$problem,$Students) = @_;
+ my %Answers;
+ my ($resource,$partid,$respid) = ($problem->{'resource'},
+ $problem->{'part'},
+ $problem->{'respid'});
+ # Open progress window
+ my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin
+ ($r,'Student Answer Compilation Status',
+ 'Student Answer Compilation Progress', scalar(@$Students));
+ $r->print("
\n");
+ $r->rflush();
+ my ($min,$max);
+ foreach my $student (@$Students) {
+ my $sname = $student->{'username'};
+ my $sdom = $student->{'domain'};
+ my $answer = analyze_problem_as_student($resource,
+ $sname,$sdom,
+ $partid,$respid);
+ if (! defined($min) || $min > $answer) {
+ $min = $answer;
+ }
+ if (! defined($max) || $max < $answer) {
+ $max = $answer;
+ }
+# $r->print('
\n";
+ return $analysis_html;
+}
+
+sub OR_Tries_Concept_Analysis {
+ my ($mintries,$maxtries,$Concepts,$respdat,$ORdata) = @_;
+ my %ResponseData = %$respdat;
+ my $analysis_html = "
\n";
+ #
+ # Compute the data neccessary to make the plots
+ my @PlotData;
+ # Concept analysis
+ #
+ # Note: we do not bother with characterizing the students incorrect
+ # answers at the concept level because an incorrect answer for one foil
+ # may be a correct answer for another foil.
+ my %ConceptData;
+ foreach my $concept (@{$Concepts}) {
+ for (my $i=$mintries;$i<=$maxtries;$i++) {
+ #
+ # Gather the per-attempt data
+ my $cdata = $ConceptData{$concept}->[$i];
+ foreach my $foilid (@{$concept->{'foils'}}) {
+ $cdata->{'_correct'} +=
+ $ResponseData{$foilid}->[$i]->{'_correct'};
+ $cdata->{'_total'} +=
+ $ResponseData{$foilid}->[$i]->{'_total'};
}
+ push (@{$PlotData[$i]->{'_total'}},$cdata->{'_total'});
+ if ($cdata->{'_total'} == 0) {
+ push (@{$PlotData[$i]->{'_correct'}},0);
+ } else {
+ push (@{$PlotData[$i]->{'_correct'}},
+ 100*$cdata->{'_correct'}/$cdata->{'_total'});
+ }
}
- } # End of work to fill @PlotData
- #
+ }
# Build a table for the plots
- $table .= "
\n";
- my @Plots;
for (my $i=$mintries;$i<=$maxtries;$i++) {
my $minstu = $PlotData[$i]->{'_total'}->[0];
my $maxstu = $PlotData[$i]->{'_total'}->[0];
@@ -372,58 +698,41 @@ sub tries_analysis {
$maxstu = 0 if (! defined($maxstu));
$minstu = 0 if (! defined($minstu));
my $title;
- if ($maxstu == $minstu) {
- $title = 'Attempt '.$i.', '.$maxstu.' students';
+ my $count = $ResponseData{'_total'}->[$i];
+ if ($count == 0) {
+ $count = 'no submissions';
+ } elsif ($count == 1) {
+ $count = '1 submission';
} else {
- $title = 'Attempt '.$i.', '.$minstu.'-'.$maxstu.' students';
+ $count = $count.' submissions';
}
- my @Datasets;
- foreach my $option ('_correct',@{$ORdata->{'Options'}}) {
- next if (! exists($PlotData[$i]->{$option}));
- push(@Datasets,$PlotData[$i]->{$option});
- }
- my $graphlink = &Apache::loncommon::DrawGraph($title,
- $xlabel,
- $ylabel,
- 100,
- $plotcolors,
- @Datasets);
- push(@Plots,$graphlink);
+ $title = 'Attempt '.$i.', '.$count;
+ my $graphlink = &Apache::loncommon::DrawBarGraph
+ ($title,'Concept Number','Percent Correct',
+ 100,$plotcolors,undef,$PlotData[$i]->{'_correct'});
+ $analysis_html.= '
'.$graphlink."
\n";
}
- #
- # Should this be something the user can set? Too many dialogs!
- while (my $plotlink = shift(@Plots)) {
- $table .= '
'.$plotlink.'
'.$extrakey."
\n";
- }
- $table .= "
\n";
- return ($table);
+ $analysis_html .= "
\n";
+ return $analysis_html;
}
-sub analyze_option_data_by_tries {
- my ($PerformanceData,$mintries,$maxtries) = @_;
+sub OR_analyze_by_tries {
+ my ($r,$PerformanceData,$mintries,$maxtries) = @_;
my %Trydata;
$mintries = 1 if (! defined($mintries) || $mintries < 1);
$maxtries = $mintries if (! defined($maxtries) || $maxtries < $mintries);
foreach my $row (@$PerformanceData) {
next if (! defined($row));
- my ($grading,$submission,$time,$tries) = @$row;
- next if ($grading eq 'MISSING_ANSWER');
- my @Foilgrades = split('&',$grading);
- my @Foilsubs = split('&',$submission);
- for (my $numtries = 1; $numtries <= $maxtries; $numtries++) {
- if ($tries == $numtries) {
- for (my $i=0;$i<=$#Foilgrades;$i++) {
- my ($foilid,$correct) = split('=',$Foilgrades[$i]);
- my (undef,$submission) = split('=',$Foilsubs[$i]);
- $submission = &HTML::Entities::decode($submission);
- $submission =~ s/\%20/ /g;
- if ($correct) {
- $Trydata{$foilid}->[$numtries]->{'_correct'}++;
- } else {
- $Trydata{$foilid}->[$numtries]->{$submission}++;
- }
- $Trydata{$foilid}->[$numtries]->{'_total'}++;
- }
+ my $tries = &get_tries_from_row($row);
+ my %Row = &Process_OR_Row($row);
+ next if (! %Row);
+ while (my ($foilid,$href) = each(%Row)) {
+ if (! ref($href)) {
+ $Trydata{$foilid}->[$tries] += $href;
+ next;
+ }
+ while (my ($option,$value) = each(%$href)) {
+ $Trydata{$foilid}->[$tries]->{$option}+=$value;
}
}
}
@@ -431,155 +740,778 @@ sub analyze_option_data_by_tries {
}
#########################################################
+#
+# Option Response: Time Analysis
+#
#########################################################
-##
-## Time Analysis
-##
-#########################################################
-#########################################################
-sub time_analysis {
+sub OR_time_analysis {
my ($PerformanceData,$ORdata) = @_;
- my $num_plots = $ENV{'form.NumPlots'};
my ($table,$Foils,$Concepts) = &build_foil_index($ORdata);
+ if ((@$Concepts < 2) && ($ENV{'form.AnalyzeAs'} ne 'Foils')) {
+ $table = '
'.
+ &mt('Not enough data for concept analysis. '.
+ 'Performing Foil Analysis').
+ '
'.$table;
+ $ENV{'form.AnalyzeAs'} = 'Foils';
+ }
+ my $num_plots = $ENV{'form.NumPlots'};
my $num_data = scalar(@$PerformanceData)-1;
my $percent = sprintf('%2f',100/$num_plots);
- my $extratable = '';
- if ($ENV{'form.AnalyzeAs'} eq 'Foils') {
- $extratable = &build_option_index($ORdata);
- }
+ #
$table .= "
\n";
for (my $i=0;$i<$num_plots;$i++) {
+ ##
my $starttime = &Apache::lonhtmlcommon::get_date_from_form
('startdate_'.$i);
my $endtime = &Apache::lonhtmlcommon::get_date_from_form
('enddate_'.$i);
- my ($begin_index,$end_index,$plottitle,$plothtml,$data);
if (! defined($starttime) || ! defined($endtime)) {
- $begin_index = $i*int($num_data/$num_plots);
- $end_index = ($i+1)*int($num_data/$num_plots);
- my $lownum = sprintf('%2.1f',$i*$percent);
- $lownum =~ s/(\.0)$//;
- my $highnum = sprintf('%2.1f',($i+1)*$percent);
- $highnum =~ s/(\.0)$//;
- $plottitle = $lownum.'% to '.$highnum.'% of submissions';
- } else {
- my $j;
- while (++$j < scalar(@$PerformanceData)) {
- last if ($PerformanceData->[$j]->[2] > $starttime);
- }
- $begin_index = $j;
- while (++$j < scalar(@$PerformanceData)) {
- last if ($PerformanceData->[$j]->[2] > $endtime);
- }
- $end_index = $j;
- $plottitle = $ENV{'form.plottitle_'.$i};
- }
- ($plothtml,$starttime,$endtime,$data) =
- &analyze_option_data_by_time($PerformanceData,
- $begin_index,$end_index,
- $plottitle,$Foils,
- $Concepts,$ORdata);
+ my $sec_in_day = 86400;
+ my $last_sub_time = &get_time_from_row($PerformanceData->[-1]);
+ my ($sday,$smon,$syear);
+ (undef,undef,undef,$sday,$smon,$syear) =
+ localtime($last_sub_time - $sec_in_day*$i);
+ $starttime = &Time::Local::timelocal(0,0,0,$sday,$smon,$syear);
+ $endtime = $starttime + $sec_in_day;
+ if ($i == ($num_plots -1 )) {
+ $starttime = &get_time_from_row($PerformanceData->[0]);
+ }
+ }
my $startdateform = &Apache::lonhtmlcommon::date_setter
('Statistics','startdate_'.$i,$starttime);
my $enddateform = &Apache::lonhtmlcommon::date_setter
('Statistics','enddate_'.$i,$endtime);
- $table.="
'."\n";
+ return $result;
+}
+
+sub OR_build_problem_data_worksheet {
+ my ($worksheet,$format,$Concepts,$ORdata) = @_;
+ my $rows_output = 3;
+ my $cols_output = 0;
+ $worksheet->write($rows_output++,0,'Problem Structure',$format->{'h3'});
+ ##
+ ##
+ my @Headers;
+ if (@$Concepts > 1) {
+ @Headers = ("Concept\nNumber",'Concept',"Foil\nNumber",
+ 'Foil Name','Foil Text','Correct value');
+ } else {
+ @Headers = ('Foil Number','FoilName','Foil Text','Correct value');
+ }
+ $worksheet->write_row($rows_output++,0,\@Headers,$format->{'header'});
+ my %Foildata = %{$ORdata->{'_Foils'}};
+ my $conceptindex = 1;
+ my $foilindex = 1;
+ foreach my $concept (@$Concepts) {
+ my @FoilsInConcept = @{$concept->{'foils'}};
+ my $firstfoil = shift(@FoilsInConcept);
+ if (@$Concepts > 1) {
+ $worksheet->write_row($rows_output++,0,
+ [$conceptindex,
+ $concept->{'name'},
+ $foilindex++,
+ $Foildata{$firstfoil}->{'name'},
+ $Foildata{$firstfoil}->{'text'},
+ $Foildata{$firstfoil}->{'value'},]);
+ } else {
+ $worksheet->write_row($rows_output++,0,
+ [ $foilindex++,
+ $Foildata{$firstfoil}->{'name'},
+ $Foildata{$firstfoil}->{'text'},
+ $Foildata{$firstfoil}->{'value'},]);
+ }
+ foreach my $foilid (@FoilsInConcept) {
+ if (@$Concepts > 1) {
+ $worksheet->write_row($rows_output++,0,
+ ['',
+ '',
+ $foilindex,
+ $Foildata{$foilid}->{'name'},
+ $Foildata{$foilid}->{'text'},
+ $Foildata{$foilid}->{'value'},]);
+ } else {
+ $worksheet->write_row($rows_output++,0,
+ [$foilindex,
+ $Foildata{$foilid}->{'name'},
+ $Foildata{$foilid}->{'text'},
+ $Foildata{$foilid}->{'value'},]);
+ }
+ } continue {
+ $foilindex++;
+ }
+ } continue {
+ $conceptindex++;
+ }
+ $rows_output++;
+ $rows_output++;
+ ##
+ ## Option data output
+ $worksheet->write($rows_output++,0,'Options',$format->{'header'});
+ foreach my $string (@{$ORdata->{'_Options'}}) {
+ $worksheet->write($rows_output++,0,$string);
+ }
+ return 'okay';
+}
+
+sub OR_build_student_data_worksheet {
+ my ($worksheet,$format) = @_;
+ my $rows_output = 3;
+ my $cols_output = 0;
+ $worksheet->write($rows_output++,0,'Student Data',$format->{'h3'});
+ my @Headers = ('full name','username','domain','section',
+ "student\nnumber",'identifier');
+ $worksheet->write_row($rows_output++,0,\@Headers,$format->{'header'});
+ my @Students = @Apache::lonstatistics::Students;
+ my $studentrows = &Apache::loncoursedata::get_student_data(\@Students);
+ my %ids;
+ foreach my $row (@$studentrows) {
+ my ($mysqlid,$student) = @$row;
+ $ids{$student}=$mysqlid;
+ }
+ foreach my $student (@Students) {
+ my $name_domain = $student->{'username'}.':'.$student->{'domain'};
+ $worksheet->write_row($rows_output++,0,
+ [$student->{'fullname'},
+ $student->{'username'},$student->{'domain'},
+ $student->{'section'},$student->{'id'},
+ $ids{$name_domain}]);
+ }
+ return;
+}
+
+sub OR_build_response_data_worksheet {
+ my ($worksheet,$format,$PerformanceData,$Foils,$ORdata)=@_;
+ my $rows_output = 3;
+ my $cols_output = 0;
+ $worksheet->write($rows_output++,0,'Response Data',$format->{'h3'});
+ $worksheet->set_column(1,1,20);
+ $worksheet->set_column(2,2,13);
+ my @Headers = ('identifier','time','award detail','attempt');
+ foreach my $foil (@$Foils) {
+ push (@Headers,$foil.' submission');
+ push (@Headers,$foil.' grading');
+ }
+ $worksheet->write_row($rows_output++,0,\@Headers,$format->{'header'});
+ #
+ foreach my $row (@$PerformanceData) {
+ next if (! defined($row));
+ my ($student,$award,$grading,$submission,$time,$tries) = @$row;
my @Foilgrades = split('&',$grading);
my @Foilsubs = split('&',$submission);
+ my %ResponseData;
for (my $j=0;$j<=$#Foilgrades;$j++) {
my ($foilid,$correct) = split('=',$Foilgrades[$j]);
my (undef,$submission) = split('=',$Foilsubs[$j]);
- if ($correct) {
- $TimeData{$foilid}->{'_correct'}++;
- } else {
- $submission = &HTML::Entities::decode($submission);
- $submission =~ s/\%20/ /g;
- $TimeData{$foilid}->{$submission}++;
- }
- $TimeData{$foilid}->{'_total'}++;
+ $submission = &Apache::lonnet::unescape($submission);
+ $ResponseData{$foilid.' submission'}=$submission;
+ $ResponseData{$foilid.' award'}=$correct;
+ }
+ $worksheet->write($rows_output,$cols_output++,$student);
+ $worksheet->write($rows_output,$cols_output++,
+ &calc_serial($time),$format->{'date'});
+ $worksheet->write($rows_output,$cols_output++,$award);
+ $worksheet->write($rows_output,$cols_output++,$tries);
+ foreach my $foilid (@$Foils) {
+ $worksheet->write($rows_output,$cols_output++,
+ $ResponseData{$foilid.' submission'});
+ $worksheet->write($rows_output,$cols_output++,
+ $ResponseData{$foilid.' award'});
}
+ $rows_output++;
+ $cols_output = 0;
}
- #
- # Compute the total and percent correct
- my @Plotdata;
- my ($xlabel,$ylabel);
- if ($ENV{'form.AnalyzeAs'} eq 'Foils') {
- $xlabel = 'Foil Number';
- $ylabel = 'Option Chosen';
- foreach my $foil (@$Foils) {
- my $total = $TimeData{$foil}->{'_total'};
- my $optionidx = 0;
- foreach my $option ('_correct',@{$ORdata->{'Options'}}) {
- if ($total > 0) {
- push(@{$Plotdata[$optionidx]},
- 100 * $TimeData{$foil}->{$option} / $total);
- } else {
- push(@{$Plotdata[$optionidx]},0);
+ return;
+}
+
+
+##
+## The following is copied from datecalc1.pl, part of the
+## Spreadsheet::WriteExcel CPAN module.
+##
+##
+######################################################################
+#
+# Demonstration of writing date/time cells to Excel spreadsheets,
+# using UNIX/Perl time as source of date/time.
+#
+# Copyright 2000, Andrew Benham, adsb@bigfoot.com
+#
+######################################################################
+#
+# UNIX/Perl time is the time since the Epoch (00:00:00 GMT, 1 Jan 1970)
+# measured in seconds.
+#
+# An Excel file can use exactly one of two different date/time systems.
+# In these systems, a floating point number represents the number of days
+# (and fractional parts of the day) since a start point. The floating point
+# number is referred to as a 'serial'.
+# The two systems ('1900' and '1904') use different starting points:
+# '1900'; '1.00' is 1 Jan 1900 BUT 1900 is erroneously regarded as
+# a leap year - see:
+# http://support.microsoft.com/support/kb/articles/Q181/3/70.asp
+# for the excuse^H^H^H^H^H^Hreason.
+# '1904'; '1.00' is 2 Jan 1904.
+#
+# The '1904' system is the default for Apple Macs. Windows versions of
+# Excel have the option to use the '1904' system.
+#
+# Note that Visual Basic's "DateSerial" function does NOT erroneously
+# regard 1900 as a leap year, and thus its serials do not agree with
+# the 1900 serials of Excel for dates before 1 Mar 1900.
+#
+# Note that StarOffice (at least at version 5.2) does NOT erroneously
+# regard 1900 as a leap year, and thus its serials do not agree with
+# the 1900 serials of Excel for dates before 1 Mar 1900.
+#
+######################################################################
+#
+# Calculation description
+# =======================
+#
+# 1900 system
+# -----------
+# Unix time is '0' at 00:00:00 GMT 1 Jan 1970, i.e. 70 years after 1 Jan 1900.
+# Of those 70 years, 17 (1904,08,12,16,20,24,28,32,36,40,44,48,52,56,60,64,68)
+# were leap years with an extra day.
+# Thus there were 17 + 70*365 days = 25567 days between 1 Jan 1900 and
+# 1 Jan 1970.
+# In the 1900 system, '1' is 1 Jan 1900, but as 1900 was not a leap year
+# 1 Jan 1900 should really be '2', so 1 Jan 1970 is '25569'.
+#
+# 1904 system
+# -----------
+# Unix time is '0' at 00:00:00 GMT 1 Jan 1970, i.e. 66 years after 1 Jan 1904.
+# Of those 66 years, 17 (1904,08,12,16,20,24,28,32,36,40,44,48,52,56,60,64,68)
+# were leap years with an extra day.
+# Thus there were 17 + 66*365 days = 24107 days between 1 Jan 1904 and
+# 1 Jan 1970.
+# In the 1904 system, 2 Jan 1904 being '1', 1 Jan 1970 is '24107'.
+#
+######################################################################
+#
+# Copyright (c) 2000, Andrew Benham.
+# This program is free software. It may be used, redistributed and/or
+# modified under the same terms as Perl itself.
+#
+# Andrew Benham, adsb@bigfoot.com
+# London, United Kingdom
+# 11 Nov 2000
+#
+######################################################################
+
+# Use 1900 date system on all platforms other than Apple Mac (for which
+# use 1904 date system).
+my $DATE_SYSTEM = ($^O eq 'MacOS') ? 1 : 0;
+
+#-----------------------------------------------------------
+# calc_serial()
+#
+# Called with (up to) 2 parameters.
+# 1. Unix timestamp. If omitted, uses current time.
+# 2. GMT flag. Set to '1' to return serial in GMT.
+# If omitted, returns serial in appropriate timezone.
+#
+# Returns date/time serial according to $DATE_SYSTEM selected
+#-----------------------------------------------------------
+sub calc_serial {
+ my $time = (defined $_[0]) ? $_[0] : time();
+ my $gmtflag = (defined $_[1]) ? $_[1] : 0;
+
+ # Divide timestamp by number of seconds in a day.
+ # This gives a date serial with '0' on 1 Jan 1970.
+ my $serial = $time / 86400;
+
+ # Adjust the date serial by the offset appropriate to the
+ # currently selected system (1900/1904).
+ if ($DATE_SYSTEM == 0) { # use 1900 system
+ $serial += 25569;
+ } else { # use 1904 system
+ $serial += 24107;
+ }
+
+ unless ($gmtflag) {
+ # Now have a 'raw' serial with the right offset. But this
+ # gives a serial in GMT, which is false unless the timezone
+ # is GMT. We need to adjust the serial by the appropriate
+ # timezone offset.
+ # Calculate the appropriate timezone offset by seeing what
+ # the differences between localtime and gmtime for the given
+ # time are.
+
+ my @gmtime = gmtime($time);
+ my @ltime = localtime($time);
+
+ # For the first 7 elements of the two arrays, adjust the
+ # date serial where the elements differ.
+ for (0 .. 6) {
+ my $diff = $ltime[$_] - $gmtime[$_];
+ if ($diff) {
+ $serial += _adjustment($diff,$_);
+ }
}
- } continue {
- $optionidx++;
- }
}
+
+ # Perpetuate the error that 1900 was a leap year by decrementing
+ # the serial if we're using the 1900 system and the date is prior to
+ # 1 Mar 1900. This has the effect of making serial value '60'
+ # 29 Feb 1900.
+
+ # This fix only has any effect if UNIX/Perl time on the platform
+ # can represent 1900. Many can't.
+
+ unless ($DATE_SYSTEM) {
+ $serial-- if ($serial < 61); # '61' is 1 Mar 1900
+ }
+ return $serial;
+}
+
+sub _adjustment {
+ # Based on the difference in the localtime/gmtime array elements
+ # number, return the adjustment required to the serial.
+
+ # We only look at some elements of the localtime/gmtime arrays:
+ # seconds unlikely to be different as all known timezones
+ # have an offset of integral multiples of 15 minutes,
+ # but it's easy to do.
+ # minutes will be different for timezone offsets which are
+ # not an exact number of hours.
+ # hours very likely to be different.
+ # weekday will differ when localtime/gmtime difference
+ # straddles midnight.
+ #
+ # Assume that difference between localtime and gmtime is less than
+ # 5 days, then don't have to do maths for day of month, month number,
+ # year number, etc...
+
+ my ($delta,$element) = @_;
+ my $adjust = 0;
+
+ if ($element == 0) { # Seconds
+ $adjust = $delta/86400; # 60 * 60 * 24
+ } elsif ($element == 1) { # Minutes
+ $adjust = $delta/1440; # 60 * 24
+ } elsif ($element == 2) { # Hours
+ $adjust = $delta/24; # 24
+ } elsif ($element == 6) { # Day of week number
+ # Catch difference straddling Sat/Sun in either direction
+ $delta += 7 if ($delta < -4);
+ $delta -= 7 if ($delta > 4);
+
+ $adjust = $delta;
+ }
+ return $adjust;
+}
+
+sub build_foil_index {
+ my ($ORdata) = @_;
+ return if (! exists($ORdata->{'_Foils'}));
+ my %Foildata = %{$ORdata->{'_Foils'}};
+ my @Foils = sort(keys(%Foildata));
+ my %Concepts;
+ foreach my $foilid (@Foils) {
+ push(@{$Concepts{$Foildata{$foilid}->{'_Concept'}}},
+ $foilid);
+ }
+ undef(@Foils);
+ # Having gathered the concept information in a hash, we now translate it
+ # into an array because we need to be consistent about order.
+ # Also put the foils in order, too.
+ my $sortfunction = sub {
+ my %Numbers = (one => 1,
+ two => 2,
+ three => 3,
+ four => 4,
+ five => 5,
+ six => 6,
+ seven => 7,
+ eight => 8,
+ nine => 9,
+ ten => 10,);
+ my $a1 = lc($a);
+ my $b1 = lc($b);
+ if (exists($Numbers{$a1})) {
+ $a1 = $Numbers{$a1};
+ }
+ if (exists($Numbers{$b1})) {
+ $b1 = $Numbers{$b1};
+ }
+ if (($a1 =~/^\d+$/) && ($b1 =~/^\d+$/)) {
+ return $a1 <=> $b1;
+ } else {
+ return $a1 cmp $b1;
+ }
+ };
+ my @Concepts;
+ foreach my $concept (sort $sortfunction (keys(%Concepts))) {
+ if (! defined($Concepts{$concept})) {
+ $Concepts{$concept}=[];
+# next;
+ }
+ push(@Concepts,{ name => $concept,
+ foils => [@{$Concepts{$concept}}]});
+ push(@Foils,(@{$Concepts{$concept}}));
+ }
+ #
+ # Build up the table of row labels.
+ my $table = '