--- loncom/interface/lonstatistics.pm	2002/03/06 18:42:01	1.7
+++ loncom/interface/lonstatistics.pm	2002/05/13 15:01:54	1.16
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # (Publication Handler
 #
-# $Id: lonstatistics.pm,v 1.7 2002/03/06 18:42:01 minaeibi Exp $
+# $Id: lonstatistics.pm,v 1.16 2002/05/13 15:01:54 minaeibi Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -27,18 +27,20 @@
 #
 # (Navigate problems for statistical reports
 # YEAR=2001
-# 5/05,7/09,7/25/01,8/11,9/13,9/26,10/5,10/9,10/22,10/26 Behrouz Minaei
-# 11/1, 11/4, 11/16, 12/14, 12/16, 12/18,12/20,12/31 Behrouz Minaei
+# 5/5,7/9,7/25/1,8/11,9/13,9/26,10/5,10/9,10/22,10/26 Behrouz Minaei
+# 11/1,11/4,11/16,12/14,12/16,12/18,12/20,12/31 Behrouz Minaei
 # YEAR=2002
-# 1/22, 2/1, 2/6, 2/25, 3/2, 3/6 Behrouz Minaei
+# 1/22,2/1,2/6,2/25,3/2,3/6,3/17,3/21,3/22,3/26,4/7,5/6,5/12 Behrouz Minaei
+#
 ###
 
 package Apache::lonstatistics; 
 
-use strict;
+use strict; 
 use Apache::Constants qw(:common :http);
 use Apache::lonnet();
 use Apache::lonhomework;
+use Apache::loncommon;
 use HTML::TokeParser;
 use GDBM_File;
 
@@ -46,6 +48,7 @@ use GDBM_File;
 my %hash;
 my %CachData;
 my %GraphDat;
+my %OpResp;
 my %maps;
 my %mapsort;
 my %section;
@@ -65,9 +68,6 @@ my $Pos;
 my $r;
 my $OpSel1;
 my $OpSel2;
-my $OpSelDis1;
-my $OpSelDis2;
-my $CurDis=0;
 my $OpSel3;
 my $OpSel4;
 my $GData;
@@ -77,10 +77,335 @@ my $lastres;
 my $DiscFlag;
 my $HWN;
 my $P_Order;
+my %foil_to_concept;
+my @Concepts;
+my %ConceptData;
 my %Header = (0,"Homework Sets Order",1,"#Stdnts",2,"Tries",3,"Mod",
               4,"Mean",5,"#YES",6,"#yes",7,"%Wrng",8,"DoDiff",
-              9,"S.D.",10,"Skew.",
-              11,"D.F.",12,"U.A.",13,"L.A.",14,"U.R.",15,"L.R.");
+              9,"S.D.",10,"Skew.",11,"D.F.1st",12,"D.F.2nd");
+my %Answer = ();
+my @shown;
+
+sub InitAnalysis {
+    my ($rid, $student)=@_;
+    my ($uname,$udom)=split(/\:/,$student);
+    $rid=~/(\d+)\.(\d+)/;
+    my $symb=&Apache::lonnet::declutter($hash{'map_id_'.$1}).'___'.$2.'___'.
+	     &Apache::lonnet::declutter($hash{'src_'.$rid});
+    my $URI = $hash{'src_'.$rid};
+    my $Answ=&Apache::lonnet::ssi($URI,('grade_target' => 'analyze',
+                                  'grade_username' => $uname,
+                                  'grade_domain' => $udom,
+                                  'grade_courseid' => $cid,
+                                  'grade_symb' => $symb));
+#    my $Answ=&Apache::lonnet::ssi($URI,('grade_target' => 'analyze'));
+
+    (my $garbage,$Answ)=split(/_HASH_REF__/,$Answ,2);
+    %Answer=();
+    %Answer=&Apache::lonnet::str2hash($Answ);
+
+    my $parts='';
+    foreach my $elm (@{$Answer{"parts"}}) {
+	$parts.="$elm,";
+    }
+    chop($parts);
+    my $conc='';
+    foreach my $elm (@{$Answer{"$parts.concepts"}}) {
+	$conc.="$elm@";
+    }
+    chop($conc);
+
+    @Concepts=split(/\@/,$conc);
+    my $show='';
+    foreach my $elm (@{$Answer{"$parts.shown"}}) {
+	$show.="$elm@";
+    }
+    chop($show);
+    @shown=split(/\@/,$show);
+#    $r->print("<br> shown:".$show);
+#    $r->rflush();
+
+    foreach my $concept (@{$Answer{"$parts.concepts"}}) {
+	foreach my $foil (@{$Answer{"$parts.concept.$concept"}}) {
+	    $foil_to_concept{$foil} = $concept;
+	}
+    }
+    return $symb;
+}
+
+
+sub Interval {
+    my ($rid,$part,$symb)=@_;
+    my $Int=$ConceptData{"Interval"};
+    my $due = &Apache::lonnet::EXT('resource.$part.duedate',$symb)+1;
+    my $opn = &Apache::lonnet::EXT('resource.$part.opendate',$symb);
+    my $add=int(($due-$opn)/$Int);
+#$r->print("<br> $opn, to $due add=$add  int=$Int");
+#$r->rflush();
+    $ConceptData{"Int.0"}=$opn;
+    for (my $i=1;$i<$Int;$i++) {
+	$ConceptData{"Int.$i"}=$opn+$i*$add;
+    }
+    $ConceptData{"Int.$Int"}=$due;     
+    for (my $i=0;$i<$Int;$i++) {
+	for (my $n=0; $n<=$#Concepts; $n++ ) {
+	    my $tmp=$Concepts[$n];
+	    $ConceptData{"$tmp.$i.true"}=0;
+	    $ConceptData{"$tmp.$i.false"}=0;
+	}
+    }
+}
+
+
+sub ShowOpGraph {
+
+    my ($InpStr, $Int_No)=@_;
+
+    $r->print(<<ENDPOP);
+    <script language="JavaScript">
+
+    function display(name) {
+	document.forms.displayform.elements.dis.value=name;
+	window.status=name;
+    }
+    function cleardisplay() {
+	document.forms.displayform.elements.dis.value='';
+	window.status='No Concept in particular';
+    }
+
+    </script>
+ENDPOP
+
+    my ($rid,$part)=split(/\:/,substr($InpStr,8));
+    $ConceptData{"Interval"}=$Int_No;
+    my $symb=&InitAnalysis($rid,$students[0]);
+    &Interval($rid,$part,$symb);
+    my $URI = $hash{'src_'.$rid};
+    my $Src = $hash{'title_'.$rid};
+    $Src =~ s/\ /"_"/eg;
+    $r->print('<br><b>'.$URI.'</b>');
+    for (my $n=1; $n<=$#Concepts+1; $n++ ) {
+	my $tmp=$Concepts[$n-1];
+	$tmp =~ s/</" less than "/eg;
+	$r->print("<br><b>Concept $n</b>:$tmp");
+    }
+    $r->rflush();
+    
+    &Create_PrgWin();
+    &Update_PrgWin("Starting to analyze problem");
+    for (my $index=0;$index<=$#students;$index++) {
+	&Update_PrgWin($index);
+	&OpStatus($rid,$students[$index]);
+    }
+    &Close_PrgWin();
+
+#$Apache::lonxml::debug=1;
+#&Apache::lonhomework::showhash(%ConceptData);
+#$Apache::lonxml::debug=0;
+
+    for (my $k=0; $k<$Int_No; $k++ ) {
+ 	my $data1=''; 
+	my $data2='';
+	&DrawGraph(&AdjustData($k).'+'.$Src.'+'.($k+1));
+    }
+    my $Answ=&Apache::lonnet::ssi($URI);
+    $r->print("<br><b>Here you can see the Problem:</b><br>$Answ");
+}
+
+sub AdjustData {
+    my $k=shift;
+    my $Max=0;
+    my @data1;
+    my @data2;
+    for (my $n=0; $n<=$#Concepts; $n++ ) {
+	my $tmp=$Concepts[$n];
+	$data1[$n]=$ConceptData{"$tmp.$k.true"};
+	$data2[$n]=$ConceptData{"$tmp.$k.false"};
+	my $Sum=$data1[$n]+$data2[$n];
+	if ( $Max<$Sum ) {$Max=$Sum;}
+    }
+    for (my $n=0; $n<=$#Concepts; $n++ ) {
+	if ($data1[$n]+$data2[$n]<$Max) {
+	    $data2[$n]+=$Max-($data1[$n]+$data2[$n]);
+	}
+    }
+    return join(',',@data1).'+'.
+           join(',',@data2).'+'.
+           $Max.'+'.($#data1+1);
+}
+
+
+sub DrawGraph {
+    my $data=shift;
+    my($data1,$data2,$Max,$P_No,$Src,$k)=split(/\+/,$data);
+
+    my $Str="\n".'<table border=1>'.
+            "\n".'<tr>'.
+	    "\n".'<th> Correct Answers </th>'.
+	    "\n".'<th> Wrong Answers </th>'.
+	    "\n".'<th> From </th>'.
+	    "\n".'<th> To </th>'.
+	    "\n".'</tr>'.
+	    "\n"."<tr>".
+	    "\n"."<td> $data1 </td>".
+            "\n"."<td> $data2 </td>".
+            "\n"."<td> ".localtime($ConceptData{'Int.'.($k-1)})." </td>".
+            "\n"."<td> ".localtime($ConceptData{'Int.'.$k}-1)." </td>".
+            "\n"."</tr></table>";
+    $r->print($Str);
+
+#    $r->print('<br><b>Correct Answers:</b> '.$data1.
+#              '<br><b>Wrong Answers: </b>'.$data2); 
+#    $r->print('<br><b>From: </b>'.localtime($ConceptData{'Int.'.($k-1)}).
+#              '<br><b>To: </b>'.localtime($ConceptData{"Int.$k"})); 
+
+#   if ( $Max > 1 ) { 
+#	$Max += (10 - $Max % 10);
+#	$Max = int($Max);
+#   }
+#   else { $Max = 1; }
+
+    my $Titr=($ConceptData{'Interval'}>1) ? $Src.'_interval_'.$k : $Src;
+    $GData=$Titr.'&'.'Answers'.'&'.$Max.'&'.$P_No.'&'.$data1.'&'.$data2;
+    if($ConceptData{'Interval'}>1){
+	$r->print('<br><IMG src="/cgi-bin/graph.gif?'.$GData.'" />');
+	return;
+    }
+    $r->print('<br>Move your mouse over a bar to find out the concept'); 
+    my $ptr='';
+    $ptr.="\n".'<form method="post" action="" name="displayform"> <input type=text name="dis" size=80> </form>';
+    $ptr.="\n".'<p><img src=/cgi-bin/graph.gif?'.$GData.
+          ' usemap="#Map" border=1>'.
+          "\n".'<map name="Map">';
+    my $gap=12;
+    my $Size=340;
+    my $barsize=($P_No) ? int($Size/$P_No) : 1;
+    for (my $i=0; $i<$P_No; $i++) {
+	my $x1=80+$gap*$i+($i*$barsize);
+	my $x2=$x1+$barsize;
+	my $y1=25;
+	my $y2=350;
+	my $j=$i+1;
+	$ptr.="\n".'<area shape="rect" coords='.$x1.','.$y1.','.$x2.','.$y2.' onMouseOver="display('."'Concept $j: $Concepts[$i]'".'); " href="javascript:alert('."'Concept $j: $Concepts[$i]'".');">';
+    } 
+    $ptr.="\n".'<area shape="default" onMouseOver="cleardisplay(); " href="javascript:alert('.'No Concept  in particular'.');">';
+    $ptr.="\n".'</map></p>';
+    $r->print('<br>'.$ptr.'<br>');
+}
+
+
+sub AnalyzeProblem {
+# -------------------------------- Selecting the number of intervals
+    my $OpSel='';
+    my $CurInt = $ENV{'form.interval'};
+    if ($CurInt eq '') {$CurMap = '1';}
+    my $Ptr = '<b>Select number of intervals</b>'."\n".
+       	      '<select name="interval">'."\n";                     	     	     
+    for (my $n=1;$n<=7;$n++) {	          
+	$Ptr .= '<option';
+        if ($CurInt eq $n) {$Ptr .= ' selected';}     
+	$Ptr .= '>'.$n."</option>"."\n";	     
+    }
+    $Ptr .= '</select>'."\n";
+    $r->print( $Ptr );
+
+    $r->print('<br><b> Option Response Problems in this course:</b><br><br>');
+    my $Str = "\n".'<table border=2>'.
+              "\n".'<tr>'.
+              "\n".'<th> # </th>'.
+	      "\n".'<th> Problem Title </th>'.
+	      "\n".'<th> Resouse </th>'.
+	      "\n".'<th> Address </th>'.
+	      "\n".'</tr>';
+
+     my $P_No=1;
+     foreach (sort keys %OpResp) {
+	 my ($rid,$part)=split(/\:/,$OpResp{$_});
+	 my $Temp = '<a href="'.$hash{'src_'.$rid}.
+                    '" target="_blank">'.$hash{'title_'.$rid}.'</a>';
+	 $Str .= "\n"."<tr>".
+	         "\n"."<td> $P_No </td>".
+                 "\n"."<td bgcolor=#DDFFDD> ".$Temp." </td>".
+                 "\n"."<td bgcolor=#EEFFCC> ".$hash{'src_'.$rid}." </td>".
+	         "\n"."<td> ".'<input type="submit" name="sort" value="'.'Analyze_'.$rid.'" />'.'</td>'.
+                 "\n"."</tr>";
+	 $P_No++;
+     }
+     $Str .= "\n".'</table>';
+     $Str .= "\n".'</form>';
+     $r->print($Str);
+     $r->rflush();	
+}
+
+
+sub Decide {
+    my ($type,$foil,$time)=@_; 
+    my $k=0;
+    while ($time>$ConceptData{'Int.'.($k+1)} && 
+           $k<$ConceptData{'Interval'}) {$k++;}
+    $ConceptData{"$foil_to_concept{$foil}.$k.$type"}++;
+}
+
+
+sub OpStatus {
+    my ($rid,$student)=@_;
+    my ($uname,$udom)=split(/\:/,$student);
+    my $code='U';
+    $rid=~/(\d+)\.(\d+)/;
+    my $symb=&Apache::lonnet::declutter($hash{'map_id_'.$1}).'___'.$2.'___'.
+	     &Apache::lonnet::declutter($hash{'src_'.$rid});
+    my %reshash=&Apache::lonnet::restore($symb,$cid,$udom,$uname);
+    my @True = ();
+    my @False = ();
+    my $flag=0;
+    @shown=();
+    if ($reshash{'version'}) {
+	for (my $version=1;$version<=$reshash{'version'};$version++) {
+	    my $time=$reshash{"$version:timestamp"};
+	    foreach (sort(split(/\:/,$reshash{$version.':keys'}))) {
+		if (($_=~/\.(\w+)\.(\w+)\.submission$/)) {
+		    my $Id1 = $1;
+		    my $Id2 = $2;
+		    my $Resp = $reshash{$_};
+		    my %submission=&Apache::lonnet::str2hash($Resp);
+		    foreach (keys %submission) {
+			my $Ansr = $Answer{"$Id1.$Id2.foil.value.$_"};
+			#$r->print("<br>shown: ".join(',',@shown)." size=$#shown");     
+			if ($submission{$_}) {
+			    #if($#shown==-1){
+				#my @str=split(/\&/,$Resp);
+				#my $garb;
+				#for(my $j=0;$j<=$#str;$j++){
+				#    ($shown[$j],$garb)=split(/\=/,$str[$j]);
+				#}
+				##$r->print("<br>shown: ".join(',',@shown)." size=$#shown");     
+			    #}
+			    if ($submission{$_} eq $Ansr) {
+				&Decide("true",$_,$time );
+			    }
+			    else {&Decide("false",$_,$time );}
+			}
+			#else {
+			#    if ($#shown==-1 && $flag==0) {
+			#	$flag++;
+			#	&InitAnalysis($rid,$student);
+			#    }
+			#    my @erl=split(/\:/,$_);
+			#    for (my $i=0;$i<=$#shown; $i++){
+			#	my $Ans=$Answer{"$Id1.$Id2.foil.value.$shown[$i]"};
+			#	if ($erl[$i] eq $Ans) {
+			#	    &Decide("true",$shown[$i],$time);
+			#	}
+			#	else {&Decide("false",$shown[$i],$time);}
+			#    }
+			#}
+		    }
+	        }	  
+	    }
+        }
+    }
+}
+
 
 #------- Processing upperlist and lowerlist according to each problem
 sub ProcessDisc {
@@ -91,7 +416,8 @@ sub ProcessDisc {
     my @Dis;
     my $Slvd=0;
     my $tmp;
-    my $Sum=0;
+    my $Sum1=0;
+    my $Sum2=0;
     my $nIdx=0;
     my $nStud=0;
     my %Proc;
@@ -103,14 +429,16 @@ sub ProcessDisc {
 	do {
 	    $nIdx++;
 	    $nStud++;
-	    $Sum += $Dis[$CurDis];
+	    $Sum1 += $Dis[0];
+	    $Sum2 += $Dis[1];
 	    ($Prb,$tmp)=split(/\=/,$List[$nIdx]);
 	    @Dis=split(/\+/,$tmp);
 	} while ( $Prb eq $Temp && $nIdx < $Count );
-	$Proc{$Temp}=$Sum.':'.$nStud;
-	$Proc{$Temp}=($Sum/$nStud).':'.$nStud;
-#        $r->print("$nIdx) $Temp --> ($nStud) $Proc{$Temp} <br>");
-	$Sum=0;
+#	$Proc{$Temp}=($Sum1/$nStud).':'.$nStud;
+	$Proc{$Temp}=($Sum1/$nStud).':'.($Sum2/$nStud);
+#       $r->print("$nIdx) $Temp --> ($nStud) $Proc{$Temp} <br>");
+	$Sum1=0;
+	$Sum2=0;
 	$nStud=0;
     }
     return %Proc;
@@ -154,17 +482,13 @@ sub NumericSort {
 
 # ------ Create different Student Report 
 sub StudentReport {
-
     my ($sname,$sdom)=@_;
-
     if ( $sname eq 'All Students' ) {
 	$r->print( '<h3><font color=blue>WARNING: 
                     Please select a student</font></h3>' );
 	return;
     }
-    my $shome=&Apache::lonnet::homeserver($sname,$sdom);          
-    my $reply=&Apache::lonnet::reply('dump:'.$sdom.':'.$sname.':'.$cid,$shome );
-    my %result = ();
+    my %result = &Apache::lonnet::dump($cid,$sdom,$sname);
     my $ResId;
     my $PrOrd;
     my $Code;
@@ -185,11 +509,8 @@ sub StudentReport {
 	      "\n".'<th> Results </th>'.
 	      "\n".'<th> Tries </th>'.
 	      "\n".'</tr>';
-    unless ($reply=~/^error\:/) {
-        foreach (split(/\&/,$reply)){
-            my ($name,$value)=split(/\=/,&Apache::lonnet::unescape($_));
-            $result{$name}=$value;
-        }
+    my ($temp)=keys(%result);
+    unless ($temp=~/^error\:/) {
         foreach my $CurCol (@cols) {
 	    if (!$CurCol){
 		my $Set=&Apache::lonnet::declutter($hash{'map_id_'.$1});
@@ -217,7 +538,7 @@ sub StudentReport {
 	    my $PartNo = 0;
 	    undef %TempHash;
 	    foreach (split(/\,/,&Apache::lonnet::metadata($meta,'keys'))){
-		if ($_=~/^stores\_(\d+)\_tries$/) {
+		if ($_=~/^stores\_(\w+)\_tries$/) {
                     my $Part=&Apache::lonnet::metadata($meta,$_.'.part');
 		    if ( $TempHash{"$Part"} eq '' ) { 
 			$TempHash{"$Part"} = $Part;
@@ -312,8 +633,6 @@ sub PreStatTable {
                   "_$ENV{'user.domain'}_$cid\_statistics.db";
     my $GraphDB = "/home/httpd/perl/tmp/$ENV{'user.name'}".
                   "_$ENV{'user.domain'}_$cid\_graph.db";
-    my $CachDisFac = "/home/httpd/perl/tmp/$ENV{'user.name'}".
-		     "_$ENV{'user.domain'}_$cid\_DiscFactor.db";
     my $OpSel11='';
     my $OpSel12='';
     my $OpSel13='';
@@ -348,27 +667,21 @@ sub PreStatTable {
     '<b>  #yes   </b>: Number of students solved the problem by override.<br>'.
     '<b>  %Wrng  </b>: Percentage of students tried to solve the problem but'.
     ' still incorrect. [ 100*((#Stdnts-(#YES+#yes))/#Stdnts) ]<br>'.
-#    '  DoDiff : Degree of Difficulty of the problem. [ Tries/(#YES+#yes+0.1) ]<br>'.
-    '<b>  DoDiff </b>: Degree of Difficulty of the problem. [ 1 - ((#YES+#yes) / Tries) ]<br>'.
+#    '  DoDiff : Degree of Difficulty of the problem. [ Tries/(#YES+#yes+0.1) ]<br>'. Kashy formula
+    '<b>  DoDiff </b>: Degree of Difficulty of the problem. [ 1 - ((#YES+#yes) / Tries) ]<br>'. #Gerd formula
     '<b>  S.D.  </b> : Standard Deviation of the tries.'.
     '[ sqrt(sum((Xi - Mean)^2)) / (#Stdnts-1)'.
     ' where Xi denotes every student\'s tries ]<br>'.
     '<b>  Skew.  </b>: Skewness of the students tries.'.
-    ' [ (sqrt( sum((Xi - Mean)^3) / #Stdnts)) / (S.D.^3) ]<br>'.
-
-    '<b>  Dis.F. </b>: Discrimination Factor. [ Sum of Partial Credits'.
-    ' Awarded / Total Number of Tries in %27 upper and lower students]<br>'.	
-    '<b>  U.A.   </b>: Upper %27 Award<br>'.	
-    '<b>  L.A.   </b>: Lower %27 Award<br>'.	
-    '<b>  U.R.   </b>: Upper %27 Records<br>'.	
-    '<b>  L.R.   </b>: Lower %27 Records'.	
-
-#    "<br>The <b>Upper 27%</b> has <b>$UpCnt</b> records.".
-#    "&nbsp;&nbsp;The <b>Lower 27%</b> has <b>$UpCnt</b> records <br>".
-#    "The Criterion of sorting the students: ". 
-#    "<b>( Sum of Partial Credits Awarded / ".
-#    "Total Number of Tries )</b>".
-
+	' [ (sqrt( sum((Xi - Mean)^3) / #Stdnts)) / (S.D.^3) ]<br>'.
+    '<b>  Dis.F. </b>: Discrimination Factor: A Standard for '.
+	'evaluating the problem according to a Criterion<br>'.
+	'<b>           [Applied Criterion in %27 Upper Students - '.
+	'Applied the same Criterion in %27 Lower Students]</b><br>'.
+    '<b>           1st Criterion</b> for Sorting the Students: '.
+	'<b>Sum of Partial Credit Awarded / Total Number of Tries</b><br>'.
+    '<b>           2nd Criterion</b> for Sorting the Students: '.
+	'<b>Total number of Correct Answers / Total Number of Tries</b>'.	
             '</pre>';
 
     $r->print($Ptr);
@@ -376,7 +689,6 @@ sub PreStatTable {
 
     if ((-e "$CacheDB")&&($ENV{'form.sort'} ne 'Recalculate Statistics')) {
 	if (tie(%CachData,'GDBM_File',"$CacheDB",&GDBM_READER,0640)) {
-	    tie(%DiscFac,'GDBM_File',$CachDisFac,&GDBM_READER,0640);
 	    tie(%GraphDat,'GDBM_File',$GraphDB,&GDBM_WRCREAT,0640);
 	    &Cache_Statistics();
         }
@@ -386,7 +698,6 @@ sub PreStatTable {
     }
     else {
 	if (tie(%CachData,'GDBM_File',$CacheDB,&GDBM_WRCREAT,0640)) {
-	    tie(%DiscFac,'GDBM_File',$CachDisFac,&GDBM_WRCREAT,0640);
 	    tie(%GraphDat,'GDBM_File',$GraphDB,&GDBM_WRCREAT,0640);
 	    foreach (keys %DiscFac) {delete $CachData{$_};}
 	    foreach (keys %CachData) {delete $CachData{$_};}
@@ -397,11 +708,10 @@ sub PreStatTable {
 	    $r->print("Unable to tie hash to db file");
         }
     }
-    #$r->print('Total instances of the problems : '.($p_count*($#students+1)));
 
+#    $r->print('Total instances of the problems : '.($p_count*($#students+1)));
     untie(%CachData);
     untie(%GraphDat);
-    untie(%DiscFac);       
 }
 
 
@@ -443,13 +753,10 @@ sub usection {
 
 
 # ------ Dump the Student's DB file and handling the data for statistics table 
-
 sub ExtractStudentData {
-    my ($student,$coid)=@_;
+    my $student=shift;
     my ($sname,$sdom) = split( /\:/, $student );
-    my $shome=&Apache::lonnet::homeserver( $sname,$sdom );          
-    my $reply=&Apache::lonnet::reply('dump:'.$sdom.':'.$sname.':'.$coid,$shome );
-    my %result = ();
+    my %result = &Apache::lonnet::dump($cid,$sdom,$sname);
     my $ResId;
     my $PrOrd;
     my $Dis = '';
@@ -464,22 +771,20 @@ sub ExtractStudentData {
     my $TotParCr = 0;
     my $Wrongs;
     my %TempHash;
-    my $Version;
+    my $Version; 
     my $LatestVersion;
     my $SecLimit;
     my $MapLimit;
-    unless ($reply=~/^error\:/) {
-        foreach (split(/\&/,$reply)) {
-            my ($name,$value)=split(/\=/,&Apache::lonnet::unescape($_));
-            $result{$name}=$value;
-        }
+    my ($temp)=keys(%result);
+    unless ($temp=~/^error\:/) {
         foreach my $CurCol(@cols) {
 	    ($PrOrd,$ResId)=split(/\:/,$CurCol);
 	    if ( !$CurCol ) { next; }
             $ResId=~/(\d+)\.(\d+)/;
 	    my $MapId=$1;
 	    my $PrbId=$2;
-            my $Map = &Apache::lonnet::declutter( $hash{'map_id_'.$MapId} );
+            my $MapOrg = $hash{'map_id_'.$MapId};
+            my $Map = &Apache::lonnet::declutter($MapOrg);
             if ( $CurMap ne 'All Maps' ) {
 		my ( $ResMap, $NameMap ) = split(/\=/,$CurMap);
 		if ( $Map ne $ResMap ) { next; }
@@ -488,8 +793,9 @@ sub ExtractStudentData {
 	    my $PartNo = 0;
 	    $Dis .= ':';
 	    undef %TempHash;
-	    foreach (split(/\,/,&Apache::lonnet::metadata($meta,'keys'))) {
-		if ($_=~/^stores\_(\d+)\_tries$/) {
+
+	    foreach (split(/\,/,&Apache::lonnet::metadata($meta,'keys'))) { 
+		if ($_=~/^stores\_(\w+)\_tries$/) {
                     my $Part=&Apache::lonnet::metadata($meta,$_.'.part');
 		    if ( $TempHash{"$Part"} eq '' ) { 
 			$TempHash{"$Part"} = $Part;
@@ -498,22 +804,22 @@ sub ExtractStudentData {
 			$TempHash{"$Part.PrOrd"} = $PrOrd+$PartNo;
 			$PartNo++;
 		    }
+                    #my $Part=&Apache::lonnet::metadata($meta,$_.'.part');
 		}
             }
-
+            &Apache::lonnet::declutter( $hash{'src_'.$ResId} );
+	    my $URI = $hash{'src_'.$ResId};
             my $Prob = $Map.'___'.$PrbId.'___'.
-                       &Apache::lonnet::declutter( $hash{'src_'.$ResId} );
+                       &Apache::lonnet::declutter($URI);
             $Code='U';
             $Tries = 0;
 	    $ParCr = 0;
             $Wrongs = 0;
-  	    $LatestVersion = $result{"version:$Prob"};       
-
+  	    $LatestVersion = $result{"version:$Prob"};        
 	    if ( $LatestVersion ) {
 		for ( my $Version=1; $Version<=$LatestVersion; $Version++ ) {
 		    my $vkeys = $result{"$Version:keys:$Prob"};
 		    my @keys = split(/\:/,$vkeys);		
-  
 		    foreach my $Key (@keys) {		  
 			if (($Key=~/\.(\w+)\.solved$/) && ($Key!~/^\d+\:/)) {
 			    my $Part = $1;
@@ -525,7 +831,6 @@ sub ExtractStudentData {
 			    $TempHash{"$Part.ParCr"} = ($ParCr) ? $ParCr : 0;        
 			    $TotalTries += $TempHash{"$Part.Tries"};
 			    $TotParCr += $TempHash{"$Part.ParCr"};
-#$r->print($Version.'---'.$Prob.'==='.$Time.'<br>');
 			    my $Val = $result{"$Version:$Prob:resource.$Part.solved"};
 			    if ( $Val eq 'correct_by_student' )
                                { $Wrongs = $Tries - 1; $Code = 'C'; } 
@@ -547,11 +852,11 @@ sub ExtractStudentData {
 		       {$ProbSolved++;$Yes=1;}		
 
  #		    my $ptr = "$hash{'title_'.$ResId}";
-		    my $ptr = $TempHash{$part.'.PrOrd'}.':'.$ResId;
+		    my $ptr = $TempHash{$part.'.PrOrd'}.'&'.$ResId;
 
 		    if ( $PartNo > 1 ) {                
 			$ptr .= "*(part $part)";
-			$Dis .= ':';
+			$Dis .= '&';
 		    }
 		    my $Fac = ($TempHash{"$part.Tries"}) ? 
                               ($TempHash{"$part.ParCr"}/$TempHash{"$part.Tries"}) : 0;
@@ -560,14 +865,12 @@ sub ExtractStudentData {
 			$DisF = sprintf( "%.4f", $Fac );
 		    }
 		    else {$DisF = $Fac;}
-#		    $DisF .= '+'.$TempHash{"$part.Time"};
+#		    $DisF .= '+'.$TempHash{"$part.Time"};33333333
 		    $TimeTot += $TempHash{"$part.Time"};
 		    $Dis .= $TempHash{$part.'.PrOrd'}.'='.$DisF.'+'.$Yes;
-
-            #$r->print('<br>'.$DisFactor,'###',$DiscFac{$DisFactor});
-		    $ptr .= ":$TempHash{$part.'.Tries'}".
-		            ":$TempHash{$part.'.Wrongs'}".
-                            ":$TempHash{$part.'.Code'}";
+		    $ptr .= "&$TempHash{$part.'.Tries'}".
+		            "&$TempHash{$part.'.Wrongs'}".
+                            "&$TempHash{$part.'.Code'}";
 		    push (@list, $ptr);
 		    $TotalOpend++;
 		    $ProbTot++;
@@ -575,7 +878,7 @@ sub ExtractStudentData {
             }
 	    #else { 
 		#for(my $n=0; $n<$PartNo; $n++) {
-		#    push (@list, "$hash{'title_'.$ResId}*$ResId:0:0:U");
+		#    push (@list, "$TempHash{'0'.'.PrOrd'}.':'.$ResId:0:0:U");
 		#    $ProbTot++; 
 		#}
 	    #}
@@ -584,7 +887,6 @@ sub ExtractStudentData {
 	    my $DisFac = ( $TotalTries ) ? ($TotParCr/$TotalTries) : 0;
 	    my $DisFactor = sprintf( "%.4f", $DisFac );
 	    $DiscFac{$DisFactor}=$Dis;
-            #$r->print('<br>'.$DisFactor,'###',$DiscFac{$DisFactor});
 	    #my $time;
 	    #if ($ProbSolved){
 		#$time = int(($TimeTot/$ProbSolved)-10000000);
@@ -600,6 +902,7 @@ sub ExtractStudentData {
 # ------------------------------------------------------------ Build page table
 sub tracetable {
     my ($rid,$beenhere)=@_;
+    my $IsMap=0;
     $rid=~/(\d+)\.(\d+)/;
     $maps{&Apache::lonnet::declutter($hash{'map_id_'.$1})}='';#$hash{'title_'.$rid}; 
     #$maps{$HWN}=$hash{'title_'.$rid}; 
@@ -611,7 +914,9 @@ sub tracetable {
                $cols[$#cols+1]=0;
 	       $P_Order++;
 	       $HWN=$P_Order;
-               $mapsort{$HWN} = $rid.':'; 
+               $mapsort{$HWN} = $rid.':';
+	       $IsMap=1;
+ 
                #$maps{&Apache::lonnet::declutter($hash{'src_'.$rid})}= 
                #      $hash{'title_'.$rid}; 
            }
@@ -626,36 +931,53 @@ sub tracetable {
       
 	       my $meta=$hash{'src_'.$frid};
 	       my $PartNo = 0;
+	       my $Part;
+	#       if ($IsMap==0){
                if ($meta) {
 		   if ($meta=~/\.(problem|exam|quiz|assess|survey|form)$/) {
 		       foreach (split(/\,/,&Apache::lonnet::metadata($meta,'keys'))) {
-			   if ($_=~/^stores\_(\d+)\_tries$/) {
-			       &Apache::lonnet::metadata($meta,$_.'.part');
+			   if ($_=~/^stores\_(\w+)\_tries$/) {
+			       $Part=&Apache::lonnet::metadata($meta,$_.'.part');
 			       $P_Order++;
 			       $mapsort{$HWN} .= '&'.$P_Order;
 			       $PartNo++;
-			       $r->print('<br>'.$PartNo.'---'.$P_Order);
+			       #$r->print('<br>'.$PartNo.'---'.$P_Order);
+			   }
+			   foreach my $K(split(/\,/,&Apache::lonnet::metadata($meta,'packages'))) {
+			       if ($K=~/^optionresponse\_($Part)\_(\w+)$/) {
+				   #$r->print('<br>'.$_.'...'.$P_Order.'---'.$Part);
+				   $OpResp{$P_Order}="$frid:$Part";
+			       } 
 			   }
 		       }
 		   }
                }
 	   }
+	 #  }
        } else {
 	   $cols[$#cols+1]=($P_Order+1).':'.$rid;
 	   my $meta=$hash{'src_'.$rid};
 	   my $PartNo = 0;
-           if ($meta) {
+	   if ($meta) {
 	       if ($meta=~/\.(problem|exam|quiz|assess|survey|form)$/) {
-		   foreach (split(/\,/,&Apache::lonnet::metadata($meta,'keys'))) {
-		       if ($_=~/^stores\_(\d+)\_tries$/) {
-			   &Apache::lonnet::metadata($meta,$_.'.part');
+		   foreach my $Key(split(/\,/,&Apache::lonnet::metadata($meta,'keys'))) {
+		       if ($Key=~/^stores\_(\w+)\_tries$/) {
+			   my $Part=&Apache::lonnet::metadata($meta,$Key.'.part');
 			   $P_Order++;
 			   $mapsort{$HWN} .= '&'.$P_Order;
 			   $PartNo++;
+			   foreach (split(/\,/,&Apache::lonnet::metadata($meta,'packages'))) {
+			       if ($_=~/^optionresponse\_($Part)\_(\w+)$/) {
+				   #$r->print('<br>'.$_.'...'.$P_Order.'---'.$Part);
+				   $OpResp{$P_Order}="$rid:$Part";;
+			       } 
+		   
+			   }
+
 		       }
 		   }
 	       }
-	   }
+	   }       
        }
        if (defined($hash{'to_'.$rid})) {
           foreach (split(/\,/,$hash{'to_'.$rid})){
@@ -676,7 +998,8 @@ sub MySort {
     }
 }
 
-sub Build_Statistics {
+sub Create_PrgWin {
+#----------- Create progress
     $r->print(<<ENDPOP);
     <script>
     popwin=open('','popwin','width=400,height=100');
@@ -691,16 +1014,30 @@ sub Build_Statistics {
 ENDPOP
 
     $r->rflush();
-# ---------------------------- Gathering the Data of students' tries
-    my $index;
-    for ($index=0;$index<=$#students;$index++) {
+}
+
+
+sub Update_PrgWin {
 #----------- update progress
-        $r->print('<script>popwin.document.popremain.remaining.value="'.
-                  'Computing '.($index+1).'/'.($#students+1).': '.
-                  $students[$index].'";</script>');
-        $r->rflush();
+    my $index = shift;
+    $r->print('<script>popwin.document.popremain.remaining.value="'.
+              'Computing '.($index+1).'/'.($#students+1).': '.
+              $students[$index].'";</script>');
+    $r->rflush();
+}
 
-        &ExtractStudentData($students[$index],$cid);
+sub Close_PrgWin {
+#--------------------- close Progress Line
+    $r->print('<script>popwin.close()</script>');
+    $r->rflush(); 
+}
+
+sub Build_Statistics {
+    &Create_PrgWin();
+# ---------------------------- Gathering the Data of students' tries
+    for (my $index=0;$index<=$#students;$index++) {
+	&Update_PrgWin($index);
+        &ExtractStudentData($students[$index]);
     }
 
 # -------------------- sorting the Data
@@ -728,7 +1065,7 @@ ENDPOP
 	&CreateTable(1,$Hid);
 	for (my $i=1; $i<=$#lpr; $i++) {
 	    my %storestats=();
-	    my ($PrOrd,$Prob,$Tries,$Wrongs,$Code)=split(/\:/,$list[$nIdx]);
+	    my ($PrOrd,$Prob,$Tries,$Wrongs,$Code)=split(/\&/,$list[$nIdx]);
 	    my $Temp = $Prob;
 	    my $MxTries = 0;
 	    my $TotalTries = 0;
@@ -748,7 +1085,7 @@ ENDPOP
 		elsif( $Code eq 'I' ) { $Incorrect++; }
 		elsif( $Code eq 'O' ) { $Override++; }
 		elsif( $Code eq 'U' ) { $StdNo--; }
-		($PrOrd,$Prob,$Tries,$Wrongs,$Code)=split(/\:/,$list[$nIdx]);
+		($PrOrd,$Prob,$Tries,$Wrongs,$Code)=split(/\&/,$list[$nIdx]);
 	    }	
 
 	    $p_count++;
@@ -757,7 +1094,7 @@ ENDPOP
 
 	    $Temp = '<a href="'.$hash{'src_'.$ResId}.
                 '" target="_blank">'.$hash{'title_'.$ResId}.$Dummy.'</a>';
-    
+
 	    my $res = &Apache::lonnet::declutter($hash{'src_'.$ResId});
 	    my $urlres=$res;
 
@@ -807,18 +1144,16 @@ ENDPOP
 		    $Skewness += $Dif*$Dif*$Dif;
 		} 
 		$Skewness /= $StdNo;
-	    $Skewness /= $StdDev*$StdDev*$StdDev;
+		$Skewness /= $StdDev*$StdDev*$StdDev;
 	    }
 
 #--------------------- Compute the Discrimination Factors
-	    my ($UpD,$UpNo)=split(/\:/,$DisUp{$lpr[$i]});
-	    my ($LwD,$LwNo)=split(/\:/,$DisLow{$lpr[$i]});
-	    $UpNo = ($UpNo) ? $UpNo : 0;
-	    $LwNo = ($LwNo) ? $LwNo : 0;
-	    my $U_D = sprintf("%.2f", $UpD);
-	    my $L_D = sprintf("%.2f", $LwD);
-	    my $DisFac = $UpD - $LwD;
-	    my $_Dis = sprintf("%.2f", $DisFac);
+	    my ($Up1,$Up2)=split(/\:/,$DisUp{$lpr[$i]});
+	    my ($Lw1,$Lw2)=split(/\:/,$DisLow{$lpr[$i]});
+	    my $Dis1 = $Up1 - $Lw1;
+	    my $Dis2 = $Up2 - $Lw2;
+	    my $_D1 = sprintf("%.2f", $Dis1);
+	    my $_D2 = sprintf("%.2f", $Dis2);
 
 #-----------------  Some restition in presenting the float numbers
 	    my $Avg = sprintf( "%.2f", $Average );
@@ -826,11 +1161,11 @@ ENDPOP
 	    my $SD = sprintf( "%.1f", $StdDev );
 	    my $DoD = sprintf( "%.2f", $DoDiff );
 	    my $Sk = sprintf( "%.1f", $Skewness );
-	    my $join = $PrOrd.':'.$Temp.':'.$StdNo.':'.
-                       $TotalTries.':'.$MxTries.':'.$Avg.':'.
-                       $YES.':'.$Override.':'.$Wrng.':'.$DoD.':'.
-		       $SD.':'.$Sk.':'.$_Dis.':'.$U_D.':'.
-                       $L_D.':'.$UpNo.':'.$LwNo.':'.$Prob;
+	    my $join = $lpr[$i].'&'.$Temp.'&'.$StdNo.'&'.
+                       $TotalTries.'&'.$MxTries.'&'.$Avg.'&'.
+                       $YES.'&'.$Override.'&'.$Wrng.'&'.$DoD.'&'.
+		       $SD.'&'.$Sk.'&'.$_D1.'&'.$_D2.'&'.
+                       $Prob;
 	    $CachData{($p_count-1)}=$join;
 
 	    $urlres=~/^(\w+)\/(\w+)/;
@@ -844,9 +1179,7 @@ ENDPOP
 	}
 	&CloseTable();
     }
-#--------------------- close Progress Line
-    $r->print('<script>popwin.close()</script>');
-    $r->rflush(); 
+    &Close_PrgWin();
 }
 
 sub Cache_Statistics {
@@ -858,14 +1191,14 @@ sub Cache_Statistics {
     if ($Pos > 0) {$Pos++;}
     $p_count = 0;
     foreach my $key( keys %CachData) { 
-	my @Temp=split(/\:/,$CachData{$key});
+	my @Temp=split(/\&/,$CachData{$key});
 	if ( $Pos == 0 ) {
 	    ($UnUseful,$Useful)=split(/\>/,$Temp[$Pos]);
 	}
 	else {
 	    $Useful = $Temp[$Pos];
 	}   
-	$list[$p_count]=$Useful.'&'.$CachData{$key};
+	$list[$p_count]=$Useful.'@'.$CachData{$key};
         $p_count++;
     }
 
@@ -879,7 +1212,8 @@ sub Cache_Statistics {
 	    &CreateTable(1,$Hid);
 	    my @lpr=split(/\&/,$pr);
 	    for (my $i=1; $i<=$#lpr; $i++) {
-		my($Pre, $Post) = split(/\&/,$list[$nIdx]); 
+		my($Pre, $Post) = split(/\@/,$list[$nIdx]); 
+		#$r->print('<br>'.$Pre.'---'.$Post);
 		&TableRow($Post,$i,$nIdx);
 		$nIdx++;
 	    }
@@ -889,7 +1223,7 @@ sub Cache_Statistics {
     else {
 	&CreateTable(0);
 	for ( my $nIdx = 0; $nIdx < $p_count; $nIdx++ ) {
-	    my($Pre, $Post) = split(/\&/,$list[$nIdx]); 
+	    my($Pre, $Post) = split(/\@/,$list[$nIdx]); 
 	    &TableRow($Post,$nIdx,$nIdx);
 	} 
 	&CloseTable();
@@ -898,12 +1232,12 @@ sub Cache_Statistics {
 
 sub TableRow {
     my ($Str,$Idx,$RealIdx)=@_;
-    my($PrOrd,$Temp,$StdNo,$TotalTries,$MxTries,$Avg,$YES,
-       $Override,$Wrng,$DoD,$SD,$Sk,$_Dis,$U_D,$L_D,$UpNo,$LwNo,
-       $Prob)=split(/\:/,$Str);	
-    $r->print( "\n".'<tr>'.
+    my($PrOrd,$Temp,$StdNo,$TotalTries,$MxTries,$Avg,$YES,$Override,
+       $Wrng,$DoD,$SD,$Sk,$_D1,$_D2,$Prob)=split(/\&/,$Str);	
+    my $Ptr =  "\n".'<tr>'.
                "\n".'<td>'.($RealIdx+1).'</td>'.
-               "\n".'<td bgcolor="#FFFFFF">'.$Temp.'</td>'.
+          #     "\n".'<td>'.$PrOrd.$Temp.'</td>'.
+               "\n".'<td>'.$Temp.'</td>'.
                "\n".'<td bgcolor="#EEFFCC"> '.$StdNo.'</td>'.
                "\n".'<td bgcolor="#EEFFCC">'.$TotalTries.'</td>'.
                "\n".'<td bgcolor="#EEFFCC">'.$MxTries.'</td>'.
@@ -914,12 +1248,9 @@ sub TableRow {
                "\n".'<td bgcolor="#FFDDDD">'.$DoD.'</td>'.
                "\n".'<td bgcolor="#DDFFDD"> '.$SD.'</td>'.
                "\n".'<td bgcolor="#DDFFDD"> '.$Sk.'</td>'.
-               "\n".'<td bgcolor="#FFDDCC"> '.$_Dis.'</td>'.
-               "\n".'<td bgcolor="#FFFFDD"> '.$U_D.'</td>'.
-               "\n".'<td bgcolor="#FFFFDD"> '.$L_D.'</td>'.
-               "\n".'<td bgcolor="#FFFFDD"> '.$UpNo.'</td>'.
-               "\n".'<td bgcolor="#FFFFDD"> '.$LwNo.'</td>'.
-               "\n".'</tr>' );
+               "\n".'<td bgcolor="#FFDDFF"> '.$_D1.'</td>'.
+	       "\n".'<td bgcolor="#FFDDFF"> '.$_D2.'</td>';
+    $r->print("\n".$Ptr.'</tr>' );
     $GraphDat{$RealIdx}=$DoD.':'.$Wrng;
 }
 
@@ -952,11 +1283,15 @@ sub GetGraphData {
 		$data .= $inf.',';
 		$count++;
 	    }
+	    if ( $Max > 1 ) { 
+		$Max += (10 - $Max % 10);
+		$Max = int($Max);
+	    }
+	    else { $Max = 1; }
             untie(%GraphDat);
 	    my $Course = $ENV{'course.'.$cid.'.description'};
 	    $Course =~ s/\ /"_"/eg;
 	    $GData=$Course.'&'.$Tag.'&'.$Max.'&'.$count.'&'.$data;
-
 	}
 	else {
 	    $r->print("Unable to tie hash to db file");
@@ -976,6 +1311,8 @@ sub initial {
   undef %CachData;
   undef %GraphDat;
   undef %DiscFac;
+  undef %OpResp;
+  undef %ConceptData;
   undef $CurMap;
   undef $CurSec;
   undef $CurStu;
@@ -1017,21 +1354,23 @@ sub ClassList {
                      ( ($Status eq 'Active') ) ) { $active=0; }
 		if ( ($Status eq 'Expired') && 
                      ($end == 0 || $now < $end) ) { $active=0; }
+#//new
+#		$Status = 'Any';
+#end new
 		if ($active) {
 		    my $thisindex=$#students+1;
 		    $name=&Apache::lonnet::unescape($name);
 		    $students[$thisindex]=$name;
 		    my ($sname,$sdom)=split(/\:/,$name);
-
 		    #my %reply=&Apache::lonnet::idrget($sdom,$sname);
 		    #my $reply=&Apache::lonnet::reply('get:'.$sdom.':'.$sname.
 		    #         ':environment:lastname&generation&firstname&middlename',
 		    #         &Apache::lonnet::homeserver($sname,$sdom));
 		    my $ssec=&usection($sdom,$sname,$cid,$Status);
-		    if ($ssec==-1) {next;}
+#		    if ($ssec==-1 ) {next;}
+		    if ($ssec==-1 || $ssec eq 'adm' ) {next;}
 		    $ssec=($ssec) ? $ssec : '(none)';
 		    #$ssec=(int($ssec)) ? int($ssec) : $ssec;
-		    #$r->print($sname.'...'.$ssec.'<br>');
 		    $section{$ssec}=$ssec;
 		    if ($CurSec eq 'All Sections' || $ssec eq $CurSec) {
 			$students[$StudNo]=$name;
@@ -1048,17 +1387,16 @@ sub ClassList {
         $r->rflush();
 # --------------- Find all assessments and put them into some linear-like order
 	&tracetable($firstres,'&'.$lastres.'&');
-
 #    my $c=0;
 #    foreach (sort keys %mapsort) {
 #	$r->print('<br>'.$c.')'.$_.' ... '.$mapsort{$_});
 #	$c++;
 #    }
-#foreach(@cols) {
-#    $c++;
-#    $r->print('<br>'.$cols[$c]);
-#}
-#$r->print('<br> Count = '.$c);
+#	my $c=1;
+#	foreach (sort keys %OpResp) {
+#	    $r->print('<br>'.$c.')'.$_.' ... '.$OpResp{$_}.' ... '.$hash{'src_'.$OpResp{$_}});
+#	    $c++;
+#	}
 
     }
 
@@ -1066,62 +1404,75 @@ sub ClassList {
     else {
 	$r->print('<h3>Undefined course sequence</h3>');
     }
-    &MapSecOptions();
+}
+
+
+sub Title {
+    $r->print('<html><head><title>LON-CAPA Statistics</title></head>');
+    $r->print('<body bgcolor="#FFFFFF">'.
+              '<script>window.focus(); window.width=500;window.height=500;</script>'.
+              '<img align=right src=/adm/lonIcons/lonlogos.gif>');
+# ---------------------------------------------------------------- Course title
+    $r->print('<h1> Course : "'.
+              $ENV{'course.'.$ENV{'request.course.id'}.
+              '.description'}.'"</h1><h2>'.localtime().'</h2>');
+# ------------------------------- This is going to take a while, produce output
+    $r->rflush();	
+}
+
+sub CreateForm {
+    $r->print("\n".'<form name=stat method=post action="/adm/statistics" >');
+    my $content = $ENV{'form.sort'};
+    if ($content eq '' || $content eq 'Return to Menu') {
+	my $Ptr = '<h3>';
+	$Ptr .= '<input type=submit name=sort value="Problem Stats"/>';
+	$Ptr .= '<br><br>';
+	$Ptr .= '<input type=submit name=sort value="Problem Analysis"/>';
+	$Ptr .= '<br><br>';
+	$Ptr .= '<input type=submit name=sort value="Student Assessment"/>';
+	$Ptr .= '</h3>';
+	$r->print( $Ptr );
+    }
+    else {
+	if ( $content eq 'Student Assessment' || 
+	     $content eq 'Create Student Report' ) {
+	    &MapSecOptions();
+	    &StudentOptions();
+	    &StudentReport($CurStu,$StuBox{"$CurStu"});
+	}
+	elsif ( $content eq 'Problem Analysis' ) {
+	    &AnalyzeProblem();
+	}
+	else {
+	    &MapSecOptions();
+	    &PreStatTable();
+	}
+    }
 }
 
 
 sub Menu {
+    &initial();
+    &Title();
+    &ClassList();
     my $InpStr = $ENV{'form.sort'};
-    if ( $InpStr eq 'DoDiff Graph' || $InpStr eq '%Wrong Graph' ) {      
+    if ($InpStr=~/^Analyze\_/) {
+	&ShowOpGraph($InpStr,$ENV{'form.interval'});
+    }
+    #elsif ($InpStr=~/^View\_/) {
+#	&ShowStG();
+ #   }
+    elsif ( $InpStr eq 'DoDiff Graph' || $InpStr eq '%Wrong Graph' ) {      
 	&GetGraphData($InpStr);
     	$r->print('<IMG src="/cgi-bin/graph.gif?'.$GData.'" />');
     }
     else {
-	$r->print('<html><head><title>LON-CAPA Statistics</title></head>');
-
-
-        $r->print('<body bgcolor="#FFFFFF">'.
-                  '<script>window.focus(); window.width=500;window.height=500; </script>'.
-                  '<img align=right src=/adm/lonIcons/lonlogos.gif>');
-# ---------------------------------------------------------------- Course title
-        $r->print('<h1> Course : "'.
-                  $ENV{'course.'.$ENV{'request.course.id'}.
-                  '.description'}.'"</h1><h2>'.localtime().'</h2>');
-# ------------------------------- This is going to take a while, produce output
-        $r->rflush();	
-
-	$r->print("\n".'<form name=stat method=post action="/adm/statistics" >');
-
-	my $content = $ENV{'form.sort'};
-	if ($content eq '' || $content eq 'Return to Menu') {
-	    my $Ptr = '<h3>';
-	    $Ptr .= '<input type=submit name=sort value="Problem Evaluation"/>';
-	    $Ptr .= '<br><br>';
-	    $Ptr .= '<input type=submit name=sort value="Student Assessment"/>';
-	    $Ptr .= '</h3>';
-	    $r->print( $Ptr );
-      	}
-	else {
-	    &initial();
-	    &ClassList();
-	    if ( $content eq 'Discrimination' || #'Problem Evaluation' ||
-                 $content eq 'Recalculate Discrimintion Factor' ) {
-		&CreateDiscFac();
-	    }
-	    elsif ( $content eq 'Student Assessment' || 
-                    $content eq 'Create Student Report' ) {
-		&StudentOptions();
-		&StudentReport($CurStu,$StuBox{"$CurStu"});
-	    }
-	    else {
-		&PreStatTable();
-	    }
-	}
-	$r->print("\n".'</form>'.
-                  "\n".'</body>'.
-                  "\n".'</html>');
-	$r->rflush();
+	&CreateForm();
+	$r->print("\n".'</form>');
     }
+    $r->print("\n".'</body>'.
+	      "\n".'</html>');
+    $r->rflush();
 }
 
 sub StudentOptions {
@@ -1147,21 +1498,13 @@ sub StudentOptions {
     $r->rflush();	
 }
 
-sub GetStatus {
 
-#    $OpSelDis1='';
-#    $OpSelDis2='';
+sub GetStatus {
     $OpSel1='';
     $OpSel2='';
     $OpSel3='';
     $OpSel4='';
 
-#    if ( $ENV{'form.DisType'} eq 'Total Number of Correct Answers' ) { 
-#	$OpSelDis1='selected'; 
-#	$CurDis=0;
-#    }
-#    else { $OpSel2 = 'selected'; $CurDis = 1;}
-
     if ( $ENV{'form.order'} eq 'Descending' ) { $OpSel2='selected'; }
     else { $OpSel1 = 'selected'; }
 
@@ -1277,6 +1620,3 @@ sub handler {
 }
 1;
 __END__
-
-
-