--- loncom/interface/lonstatistics.pm	2002/03/22 00:18:12	1.12
+++ loncom/interface/lonstatistics.pm	2002/05/30 13:09:13	1.23
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # (Publication Handler
 #
-# $Id: lonstatistics.pm,v 1.12 2002/03/22 00:18:12 minaeibi Exp $
+# $Id: lonstatistics.pm,v 1.23 2002/05/30 13:09:13 stredwic Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -27,15 +27,17 @@
 #
 # (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, 3/17, 3/21 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 Behrouz Minaei
+# 5/12,5/14,5/15,5/19,5/26 Behrouz Minaei
+#
 ###
 
 package Apache::lonstatistics; 
 
-use strict;
+use strict; 
 use Apache::Constants qw(:common :http);
 use Apache::lonnet();
 use Apache::lonhomework;
@@ -67,8 +69,6 @@ my $Pos;
 my $r;
 my $OpSel1;
 my $OpSel2;
-my $OpSelDis1;
-my $OpSelDis2;
 my $OpSel3;
 my $OpSel4;
 my $GData;
@@ -78,9 +78,346 @@ 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.1st",12,"D.F.2nd");#,13,"OpResp");
+              9,"S.D.",10,"Skew.",11,"D.F.1st",12,"D.F.2nd");
+my %Answer = ();
+
+
+sub unescape {
+    my $str=shift;
+    $str =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg;
+    return $str;
+}
+
+sub Activity {
+    my $file="/home/minaeibi/minaei";
+    my $userid='billskat';
+    $r->print("<br>Using $file");
+    $r->rflush();
+    open(FILEID, "<$file");
+    my $line;
+    my @allaccess;
+    while ($line=<FILEID>) {
+	my ($time,$machine,$what)=split(':',$line);
+	#$r->print("time=$time machine=$machine:-> $what\n");
+	#$r->rflush();
+	$what=&unescape($what);
+	my @accesses=split('&',$what);
+	foreach my $access (@accesses) {
+	    my ($date,$resource,$who,$domain,$post,@posts)=split(':',$access);
+	    if ($who ne $userid) { next; }
+	    #if (!$resource) { next; }
+	    push (@allaccess,unescape($access));
+	    #print $machine;
+	}
+    }
+    @allaccess=sort(@allaccess);
+    my $Count=0;
+    foreach my $access (@allaccess) {
+	my ($date,$resource,$who,$domain,$post,@posts)=split(':',$access);
+	$Count++;
+#	$r->print("$Count ".localtime($date)." $who $resource\n");
+	$r->print("<br>$Count) $date: $who --> $resource");
+	$r->rflush();
+	if ($post) { 
+	    $r->print("<br><b>Sent data ".join(':',unescape(@posts)).'</b>');
+	}
+    }
+}
+
+
+
+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);
+    foreach my $concept (@{$Answer{"$parts.concepts"}}) {
+	foreach my $foil (@{$Answer{"$parts.concept.$concept"}}) {
+	    $foil_to_concept{$foil} = $concept;
+	    #$ConceptData{$foil} = $Answer{"$parts.foil.value.$foil"};
+	}
+    }
+    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);
+    $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)=@_;
+    my ($rid,$part)=split(/\:/,substr($InpStr,8));
+    $ConceptData{"Interval"}=$Int_No;
+    #Initialize the option response true answers
+    my $symb=&InitAnalysis($rid,$students[0]);
+    #compute the intervals
+    &Interval($rid,$part,$symb);
+    my $URI = $hash{'src_'.$rid};
+    my $Src = $hash{'title_'.$rid};
+    $Src =~ s/\ /"_"/eg;
+    $r->print('<br><b>'.$URI.'</b>');
+    $r->rflush();
+    
+    #Java script Progress window
+    &Create_PrgWin();
+    &Update_PrgWin("Starting to analyze problem");
+    for (my $index=0;$index<=$#students;$index++) {
+	&Update_PrgWin($index);
+	&OpStatus($rid,$students[$index]);
+    }
+    &Close_PrgWin();
+
+    $r->print('<br>');
+    for (my $k=0; $k<$Int_No; $k++ ) {
+	&DrawGraph($k,$Src);
+    }
+    for (my $k=0; $k<$Int_No; $k++ ) {
+	&DrawTable($k);
+    }
+#$Apache::lonxml::debug=1;
+#&Apache::lonhomework::showhash(%ConceptData);
+#$Apache::lonxml::debug=0;
+    my $Answ=&Apache::lonnet::ssi($URI);
+    $r->print("<br><b>Here you can see the Problem:</b><br>$Answ");
+}
+
+
+sub DrawTable {
+    my $k=shift;
+    my $Max=0;
+    my @data1;
+    my @data2;
+    my $Correct=0;
+    my $Wrong=0;
+    for (my $n=0; $n<=$#Concepts; $n++ ) {
+	my $tmp=$Concepts[$n];
+	$data1[$n]=$ConceptData{"$tmp.$k.true"};
+	$Correct+=$data1[$n];
+	$data2[$n]=$ConceptData{"$tmp.$k.false"};
+	$Wrong+=$data2[$n];
+	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]);
+	}
+    }
+    my $P_No = $#data1+1;
+#    $r->print('<br><b>From: ['.localtime($ConceptData{'Int.'.($k-1)}).
+#              '] To: ['.localtime($ConceptData{"Int.$k"}).']</b>'); 
+    my $Str = "\n".'<table border=2>'.
+              "\n".'<tr>'.
+              "\n".'<th> # </th>'.
+	      "\n".'<th> Concept </th>'.
+	      "\n".'<th> Correct </th>'.
+	      "\n".'<th> Wrong </th>'.
+	      "\n".'</tr>';
+
+    for (my $n=0; $n<=$#Concepts; $n++ ) {
+	$Str .= "\n"."<tr>".
+	        "\n"."<td>".($n+1)."</td>".
+                "\n"."<td bgcolor=#FFFFDD> ".$Concepts[$n]." </td>".
+                "\n"."<td bgcolor=#DDFFDD> ".$data1[$n]." </td>".
+                "\n"."<td bgcolor=#FFDDDD> ".$data2[$n]." </td>".
+                "\n"."</tr>";
+    }
+    $Str.='<td></td><td><b>From:['.localtime($ConceptData{'Int.'.$k}).
+          '] To: ['.localtime($ConceptData{'Int.'.($k+1)}-1).
+          "]</b></td><td>$Correct</td><td>$Wrong</td>";
+
+    $Str .= "\n".'</table>';
+
+    $r->print($Str);
+#$Apache::lonxml::debug=1;
+#&Apache::lonhomework::showhash(%ConceptData);
+#$Apache::lonxml::debug=0;
+}
+
+
+sub DrawGraph {
+    my ($k,$Src)=@_;
+    my $Max=0;
+    my @data1;
+    my @data2;
+
+    # Adjust Data and find the Max 
+    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]);
+	}
+    }
+    my $P_No = $#data1+1;
+
+    if ( $Max > 1 ) { 
+	$Max += (10 - $Max % 10);
+	$Max = int($Max);
+    } else { $Max = 1; }
+
+    
+    my $Titr=($ConceptData{'Interval'}>1) ? $Src.'_interval_'.($k+1) : $Src;
+#    $GData=$Titr.'&Concepts'.'&'.'Answers'.'&'.$Max.'&'.$P_No.'&'.$data1.'&'.$data2;
+    $GData="$Titr&Concepts&Answers&$Max&$P_No&".
+           (join(',',@data1)).'&'.(join(',',@data2));
+
+    $r->print('<IMG src="/cgi-bin/graph.gif?'.$GData.'" border=1/>');
+}
+
+
+sub AnalyzeProblem {
+    # selecting the number of intervals
+    my $OpSel='';
+    my $CurInt = $ENV{'form.interval'};
+    if ($CurInt eq '') {$CurMap = '1';}
+    my $Ptr = '<br><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 );
+
+    #the table of option response problems
+    $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> Resource </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 {
+    #deciding the true or false answer belongs to each interval
+    my ($type,$foil,$time)=@_; 
+    my $k=0;
+    while ($time>$ConceptData{'Int.'.($k+1)} && 
+           $k<$ConceptData{'Interval'}) {$k++;}
+    $ConceptData{"$foil_to_concept{$foil}.$k.$type"}++;
+}
+
+
+#restore the student submissions and finding the result
+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;
+    if ($reshash{'version'}) {
+        my $tries=0;
+	&Apache::lonhomework::showhash(%Answer);
+	for (my $version=1;$version<=$reshash{'version'};$version++) {
+	    my $time=$reshash{"$version:timestamp"};
+	   
+	    foreach my $key (sort(split(/\:/,$reshash{$version.':keys'}))) {
+		if (($key=~/\.(\w+)\.(\w+)\.submission$/)) {
+		    my $Id1 = $1; my $Id2 = $2;
+		    #check if this is a repeat submission, if so skip it
+          	    if ($reshash{"$version:resource.$Id1.previous"}) { next; }
+		    #if no solved this wasn't a real submission, ignore it
+		    if (!defined($reshash{"$version:resource.$Id1.solved"})) {
+			&Apache::lonxml::debug("skipping ");
+			next;
+		    }
+		    my $Resp = $reshash{"$version:$key"};
+		    my %submission=&Apache::lonnet::str2hash($Resp);
+		    foreach (keys %submission) {
+			my $Ansr = $Answer{"$Id1.$Id2.foil.value.$_"};
+			if ($submission{$_}) {
+			    if ($submission{$_} eq $Ansr) {
+				&Decide("true",$_,$time );
+			    }
+			    else {&Decide("false",$_,$time );}
+			}
+		    }
+	        }	  
+	    }
+        }
+    }
+}
 
 
 #------- Processing upperlist and lowerlist according to each problem
@@ -112,7 +449,7 @@ sub ProcessDisc {
 	} while ( $Prb eq $Temp && $nIdx < $Count );
 #	$Proc{$Temp}=($Sum1/$nStud).':'.$nStud;
 	$Proc{$Temp}=($Sum1/$nStud).':'.($Sum2/$nStud);
-#        $r->print("$nIdx) $Temp --> ($nStud) $Proc{$Temp} <br>");
+#       $r->print("$nIdx) $Temp --> ($nStud) $Proc{$Temp} <br>");
 	$Sum1=0;
 	$Sum2=0;
 	$nStud=0;
@@ -158,17 +495,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;
@@ -189,11 +522,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=~/^(con_lost|error|no_such_host)/i) {
         foreach my $CurCol (@cols) {
 	    if (!$CurCol){
 		my $Set=&Apache::lonnet::declutter($hash{'map_id_'.$1});
@@ -231,7 +561,6 @@ sub StudentReport {
 			$PartNo++;
 		    }
 		}
-		#if ($_=~/^parameter\_(\w+)\_package$/) {
             }
 
             my $Prob = $Map.'___'.$2.'___'.
@@ -286,11 +615,17 @@ sub StudentReport {
 }
 
 sub CreateTable {
+    my ($Hd, $Hid)=@_;
+    if ($ENV{'form.showcsv'}) { 
+	if ( $Hd == 1 ) {
+	    $r->print('<br>"'.$hash{'title_'.$Hid}.'","'.$hash{'src_'.$Hid}.'"');
+	}
+	return;
+    }
     my $ColNo=0;
     foreach (keys(%Header)){ 
 	$ColNo++;
     } 
-    my ($Hd, $Hid)=@_;
     if ( $Hd == 1 ) {
 	$r->print('<br><a href="'.$hash{'src_'.$Hid}.
                   '" target="_blank">'.$hash{'title_'.$Hid}.'</a>');
@@ -307,12 +642,16 @@ sub CreateTable {
 }
 
 sub CloseTable {
+    if ($ENV{'form.showcsv'}) {
+	return;
+    }    
     $r->print("\n".'</table>'."\n");
     $r->rflush();
 }
  
 # ------------------------------------------- Prepare Statistics Table
 sub PreStatTable {
+
     my $CacheDB = "/home/httpd/perl/tmp/$ENV{'user.name'}".
                   "_$ENV{'user.domain'}_$cid\_statistics.db";
     my $GraphDB = "/home/httpd/perl/tmp/$ENV{'user.name'}".
@@ -345,7 +684,7 @@ sub PreStatTable {
     $Ptr .= '<pre>'.
     '<b>  #Stdnts</b>: Total Number of Students opened the problem.<br>'. 
     '<b>  Tries  </b>: Total Number of Tries for solving the problem.<br>'. 
-    '<b>  Mod   </b> : Maximunm Number of Tries for solving the problem.<br>'. 
+    '<b>  Mod    </b>: Maximunm Number of Tries for solving the problem.<br>'. 
     '<b>  Mean   </b>: Average Number of the tries. [ Tries / #Stdnts ]<br>'.
     '<b>  #YES   </b>: Number of students solved the problem correctly.<br>'. 
     '<b>  #yes   </b>: Number of students solved the problem by override.<br>'.
@@ -362,13 +701,18 @@ sub PreStatTable {
 	'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 </b>Criterion for Sorting the Students: '.
-	'Sum of Partial Credit Awarded / Total Number of Tries<br>'.
-    '<b>           2nd </b>Criterion for Sorting the Students: '.
-	'Total number of Correct Answers / Total Number of Tries'.	
+    '<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);
+    
+    $r->print('Output CSV format: <input type=checkbox name=showcsv onClick="submit()"');
+    if ($ENV{'form.showcsv'}) { $r->print(' checked'); }
+    $r->print('>');
+
     $r->rflush();	
 
     if ((-e "$CacheDB")&&($ENV{'form.sort'} ne 'Recalculate Statistics')) {
@@ -393,24 +737,7 @@ sub PreStatTable {
         }
     }
 
-#33333
-#    my $c=0;
-#    foreach (sort keys %OpResp) {
-#	$r->print('<br>'.$c.$_.' ====== '.$OpResp{$_});
-#	my $count=$#students+1;
-#	for (my $n=0;$n<1;$n++){
-#	    my ($sname,$sdom)=$students[$n];
-#	    my $Prob=$OpResp{$_};
-##my $userview=&Apache::lonnet::ssi($hash{'src_'.$ResId});
-#		$r->print('<br>'.$Prob.$sname.$sdom.$cid.
-#			  '<br>'.&Apache::loncommon::get_previous_attempt($Prob,$sname,$sdom,$cid));
-#		#$r->print('<br>'.$Prob.$sname. ' *** '.&Apache::lonnet::ssi($hash{'src_'.$Prob})); 
-#	}
-#	$c++;
-#    }
-
-    #$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);
 }
@@ -422,15 +749,18 @@ sub usection {
     my ($udom,$unam,$courseid,$ActiveFlag)=@_;
     $courseid=~s/\_/\//g;
     $courseid=~s/^(\w)/\/$1/;
-    foreach (split(/\&/,&Apache::lonnet::reply('dump:'.
-             $udom.':'.$unam.':roles',
-             &Apache::lonnet::homeserver($unam,$udom)))){
-        my ($key,$value)=split(/\=/,$_);
-        $key=&Apache::lonnet::unescape($key);
+
+    my %result=&Apache::lonnet::dump('roles',$udom,$unam);
+    my ($checkForResult)=keys(%result);
+    if ($checkForResult=~/^(con_lost|error|no_such_host)/i) {
+	return -1;
+    }
+    foreach my $key (keys (%result)) {
+	my $value=$result{$key};
         if ($key=~/^$courseid(?:\/)*(\w+)*\_st$/) {
             my $section=$1;
             if ($key eq $courseid.'_st') { $section=''; }
-	    my ($dummy,$end,$start)=split(/\_/,&Apache::lonnet::unescape($value));
+	    my ($dummy,$end,$start)=split(/\_/,$value);
 	    if ( $ActiveFlag ne 'Any' ) {
 		my $now=time;
 		my $notactive=0;
@@ -454,13 +784,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 = '';
@@ -475,22 +802,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=~/^(con_lost|error|no_such_host)/i) {
         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; }
@@ -510,29 +835,22 @@ sub ExtractStudentData {
 			$TempHash{"$Part.PrOrd"} = $PrOrd+$PartNo;
 			$PartNo++;
 		    }
-                    my $Part=&Apache::lonnet::metadata($meta,$_.'.part');
+                    #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} );
-	    $OpResp{$PrOrd}=$Prob;
+                       &Apache::lonnet::declutter($URI);
             $Code='U';
             $Tries = 0;
 	    $ParCr = 0;
             $Wrongs = 0;
-  	    $LatestVersion = $result{"version:$Prob"};       
-
+  	    $LatestVersion = $result{"version:$Prob"};        
 	    if ( $LatestVersion ) {
-#333333333
-#my $userview=&Apache::lonnet::ssi($hash{'src_'.$ResId});
-#$r->print('<br>'.$userview); 
-#$r->print('<br>'.$Prob.$sname.$sdom.$coid.'<br>'.&get_student_answers($Prob,$sname,$sdom,$coid)); 
-
 		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;
@@ -578,7 +896,7 @@ 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;
 		    $ptr .= "&$TempHash{$part.'.Tries'}".
@@ -612,6 +930,7 @@ sub ExtractStudentData {
 }
 
 
+
 # ------------------------------------------------------------ Build page table
 sub tracetable {
     my ($rid,$beenhere)=@_;
@@ -644,29 +963,29 @@ sub tracetable {
       
 	       my $meta=$hash{'src_'.$frid};
 	       my $PartNo = 0;
-	       if ($IsMap==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\_(\w+)\_tries$/) {
-			       &Apache::lonnet::metadata($meta,$_.'.part');
+			       $Part=&Apache::lonnet::metadata($meta,$_.'.part');
 			       $P_Order++;
 			       $mapsort{$HWN} .= '&'.$P_Order;
 			       $PartNo++;
 			       #$r->print('<br>'.$PartNo.'---'.$P_Order);
 			   }
-		       }
-		       foreach (split(/\,/,&Apache::lonnet::metadata($meta,'packages'))) {
-			   if ($_=~/^optionresponse\_(\w+)\_(\w+)$/) {
-#			       $r->print('<br>'.$_.&Apache::lonnet::metadata($meta,$_));
-			       $r->print('<br>'.$_.'...'.$P_Order);
-			       $OpResp{$P_Order+1}=$frid;
-			   } 
+			   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};
@@ -682,7 +1001,7 @@ sub tracetable {
 			   foreach (split(/\,/,&Apache::lonnet::metadata($meta,'packages'))) {
 			       if ($_=~/^optionresponse\_($Part)\_(\w+)$/) {
 				   #$r->print('<br>'.$_.'...'.$P_Order.'---'.$Part);
-				   $OpResp{$P_Order+1}=$rid;
+				   $OpResp{$P_Order}="$rid:$Part";;
 			       } 
 		   
 			   }
@@ -711,7 +1030,8 @@ sub MySort {
     }
 }
 
-sub Build_Statistics {
+sub Create_PrgWin {
+#----------- Create progress
     $r->print(<<ENDPOP);
     <script>
     popwin=open('','popwin','width=400,height=100');
@@ -726,16 +1046,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();
+}
+
+sub Close_PrgWin {
+#--------------------- close Progress Line
+    $r->print('<script>popwin.close()</script>');
+    $r->rflush(); 
+}
 
-        &ExtractStudentData($students[$index],$cid);
+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
@@ -744,7 +1078,6 @@ ENDPOP
 
     @list = sort (@list);
 
-
     &Discriminant();
 
     $OpSel2='';
@@ -792,7 +1125,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;
 
@@ -842,7 +1175,7 @@ ENDPOP
 		    $Skewness += $Dif*$Dif*$Dif;
 		} 
 		$Skewness /= $StdNo;
-	    $Skewness /= $StdDev*$StdDev*$StdDev;
+		$Skewness /= $StdDev*$StdDev*$StdDev;
 	    }
 
 #--------------------- Compute the Discrimination Factors
@@ -859,10 +1192,11 @@ ENDPOP
 	    my $SD = sprintf( "%.1f", $StdDev );
 	    my $DoD = sprintf( "%.2f", $DoDiff );
 	    my $Sk = sprintf( "%.1f", $Skewness );
-	    my $join = $PrOrd.'&'.$Temp.'&'.$StdNo.'&'.
+	    my $join = $lpr[$i].'&'.$Temp.'&'.$StdNo.'&'.
                        $TotalTries.'&'.$MxTries.'&'.$Avg.'&'.
                        $YES.'&'.$Override.'&'.$Wrng.'&'.$DoD.'&'.
-		       $SD.'&'.$Sk.'&'.$_D1.'&'.$_D2.'&'.$Prob;
+		       $SD.'&'.$Sk.'&'.$_D1.'&'.$_D2.'&'.
+                       $Prob;
 	    $CachData{($p_count-1)}=$join;
 
 	    $urlres=~/^(\w+)\/(\w+)/;
@@ -876,15 +1210,14 @@ ENDPOP
 	}
 	&CloseTable();
     }
-#--------------------- close Progress Line
-    $r->print('<script>popwin.close()</script>');
-    $r->rflush(); 
+    &Close_PrgWin();
 }
 
 sub Cache_Statistics {
     my @list = ();
     my $Useful;
     my $UnUseful;
+#    $r->print('<input type="hidden" name="show" value="excel" />'."\n"); 
     my %myHeader = reverse( %Header );
     $Pos = $myHeader{$ENV{'form.sort'}};
     if ($Pos > 0) {$Pos++;}
@@ -933,9 +1266,30 @@ sub TableRow {
     my ($Str,$Idx,$RealIdx)=@_;
     my($PrOrd,$Temp,$StdNo,$TotalTries,$MxTries,$Avg,$YES,$Override,
        $Wrng,$DoD,$SD,$Sk,$_D1,$_D2,$Prob)=split(/\&/,$Str);	
-    my $Ptr =  "\n".'<tr>'.
+    if ($ENV{'form.showcsv'}) {
+        my ($ResId,$Dummy)=split(/\*/,$Prob);
+        my $Ptr =  "\n".'<br>'.
+               "\n".'"'.($RealIdx+1).'",'.
+               "\n".'"'.$hash{'title_'.$ResId}.$Dummy.'",'.
+               "\n".'"'.$hash{'src_'.$ResId}.'",'.
+               "\n".'"'.$StdNo.'",'.
+               "\n".'"'.$TotalTries.'",'.
+               "\n".'"'.$MxTries.'",'.
+               "\n".'"'.$Avg.'",'.
+               "\n".'"'.$YES.'",'.
+               "\n".'"'.$Override.'",'.
+               "\n".'"'.$Wrng.'",'.
+               "\n".'"'.$DoD.'",'.
+               "\n".'"'.$SD.'",'.
+               "\n".'"'.$Sk.'",'.
+               "\n".'"'.$_D1.'",'.
+	       "\n".'"'.$_D2.'"';
+        $r->print("\n".$Ptr);
+    }
+    else{
+        my $Ptr =  "\n".'<tr>'.
                "\n".'<td>'.($RealIdx+1).'</td>'.
-#               "\n".'<td>'.$PrOrd.$Temp.'</td>'.
+          #     "\n".'<td>'.$PrOrd.$Temp.'</td>'.
                "\n".'<td>'.$Temp.'</td>'.
                "\n".'<td bgcolor="#EEFFCC"> '.$StdNo.'</td>'.
                "\n".'<td bgcolor="#EEFFCC">'.$TotalTries.'</td>'.
@@ -949,20 +1303,15 @@ sub TableRow {
                "\n".'<td bgcolor="#DDFFDD"> '.$Sk.'</td>'.
                "\n".'<td bgcolor="#FFDDFF"> '.$_D1.'</td>'.
 	       "\n".'<td bgcolor="#FFDDFF"> '.$_D2.'</td>';
-#    if( $OpResp{$PrOrd} ) {
-#	$Ptr.='<td>'.'<input type="submit" name="OpResp" value="'."View_$PrOrd".'" />'.'</td>';
-#    }   
-#    else {
-#	$Ptr.='<td> -------- </td>';
-#    }
-    $r->print("\n".$Ptr.'</tr>' );
+        $r->print("\n".$Ptr.'</tr>' );
+    }
     $GraphDat{$RealIdx}=$DoD.':'.$Wrng;
 }
 
 # ------------------------------------------- Prepare data for Graphical chart
 
 sub GetGraphData {
-    my $Tag = shift;
+    my $ylab = shift;
     my $Col;
     my $data='';
     my $count = 0;
@@ -973,12 +1322,12 @@ sub GetGraphData {
     foreach (keys %GraphDat) {delete $GraphDat{$_};}
     if (-e "$GraphDB") {
 	if (tie(%GraphDat,'GDBM_File',"$GraphDB",&GDBM_READER,0640)) {
-	    if ( $Tag eq 'DoDiff Graph' ) {
-		$Tag = 'Degree-of-Difficulty';
+	    if ( $ylab eq 'DoDiff Graph' ) {
+		$ylab = 'Degree-of-Difficulty';
 		$Col = 0;
 	    }
 	    else {
-		$Tag = 'Wrong-Percentage';
+		$ylab = 'Wrong-Percentage';
 		$Col = 1;
 	    }
 	    foreach (sort NumericSort keys %GraphDat) { 
@@ -988,11 +1337,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;
-
+	    $GData=$Course.'&'.'Problems'.'&'.$ylab.'&'.$Max.'&'.$count.'&'.$data;
 	}
 	else {
 	    $r->print("Unable to tie hash to db file");
@@ -1013,6 +1366,7 @@ sub initial {
   undef %GraphDat;
   undef %DiscFac;
   undef %OpResp;
+  undef %ConceptData;
   undef $CurMap;
   undef $CurSec;
   undef $CurStu;
@@ -1024,47 +1378,73 @@ sub initial {
   $HWN=$P_Order;
 }
 
+#	my $CacheDB = "/home/httpd/perl/tmp/$ENV{'user.name'}".
+#                  "_$ENV{'user.domain'}_$cid\_classlist.db";
+#	if (-e "$CacheDB") {
+#	    if (tie(%students,'GDBM_File',"$CacheDB",&GDBM_READER,0640)) {
+#		&CachClassList();
+#	    }
+#            else {
+#	        $r->print("Unable to tie hash to db file");
+#            }
+#        }
+#        else {
+#	    if (tie(%students,'GDBM_File',$CacheDB,&GDBM_WRCREAT,0640)) {
+#	        &MakeClassList();
+#	    }
+#            else {
+#	        $r->print("Unable to tie hash to db file");
+#            }
+#        }
+#        untie(%students);
+
 
 sub ClassList {
 
     &GetStatus();
 
     $cid=$ENV{'request.course.id'};
-    my $chome=$ENV{'course.'.$cid.'.home'};
     my ($cdom,$cnum)=split(/\_/,$cid);
 # ----------------------- Get first and last resource, see if there is anything
     $firstres=$hash{'map_start_/res/'.$ENV{'request.course.uri'}};
     $lastres=$hash{'map_finish_/res/'.$ENV{'request.course.uri'}};
     if (($firstres) && ($lastres)) {
-# ----------------------------------------------------------------- Render page
-	my $classlst=&Apache::lonnet::reply
-                 ('dump:'.$cdom.':'.$cnum.':classlist',$chome);
+#	my %students = &Apache::lonnet::dump('classlist',$cdom,$cnum);
+#    $Apache::lonxml::debug=1;
+#    &Apache::lonhomework::showhash(%students);
+#    $Apache::lonxml::debug=0;
+#	my $StudNo = 0;
+#	my $now=time;
+#	my ($temp)=keys(%students);
+#	unless ($temp=~/^error\:/) {
+#	    foreach my $KeyPoint(sort keys(%students)) {
+
+
 	my $StudNo = 0;
 	my $now=time;
-	unless ($classlst=~/^error\:/) {
-	    foreach (sort split(/\&/,$classlst)) {
-		my ($name,$value)=split(/\=/,$_);
-		my ($end,$start)=split(/\:/,&Apache::lonnet::unescape($value));
-		$name=&Apache::lonnet::unescape($name);
-		my ($sname,$sdom)=split(/\:/,$name);
+
+	my %classlist=&Apache::lonnet::dump('classlist',$cdom,$cnum);
+
+	my ($checkForError)=keys(%result);
+	if($checkForError=~/^(con_lost|error|no_such_host)/i) {
+	    $r->print('<h1>Could not access course data</h1>');
+	} else {
+	    foreach my $name (keys (%classlist)) {
+		my $value=$classlist{$name};
+		my ($end,$start)=split(/\:/,$value);
 		my $active=1;
 		my $Status=$ENV{'form.status'};
 		$Status = ($Status) ? $Status : 'Active';
 		if ( ( ($end) && $now > $end ) && 
-                     ( ($Status eq 'Active') ) ) { $active=0; }
+		     ( ($Status eq 'Active') ) ) { $active=0; }
 		if ( ($Status eq 'Expired') && 
-                     ($end == 0 || $now < $end) ) { $active=0; }
+		     ($end == 0 || $now < $end) ) { $active=0; }
 		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 || $ssec eq 'adm' ) {next;}
 		    $ssec=($ssec) ? $ssec : '(none)';
 		    #$ssec=(int($ssec)) ? int($ssec) : $ssec;
 		    $section{$ssec}=$ssec;
@@ -1073,12 +1453,10 @@ sub ClassList {
 			$StuBox{$sname}=$sdom;
 		    }
 		    $StudNo++;
-	        }
+		}
 	    }
 	}
-	else {
-	    $r->print('<h1>Could not access course data</h1>');
-	} 
+
         $r->print("Total number of students : ".($#students+1));
         $r->rflush();
 # --------------- Find all assessments and put them into some linear-like order
@@ -1088,66 +1466,98 @@ sub ClassList {
 #	$r->print('<br>'.$c.')'.$_.' ... '.$mapsort{$_});
 #	$c++;
 #    }
+#	my $c=1;
+#	foreach (sort keys %OpResp) {
+#	    $r->print('<br>'.$c.')'.$_.' ... '.$OpResp{$_}.' ... '.$hash{'src_'.$OpResp{$_}});
+#	    $c++;
+#	}
+
     }
 
 # ------------------------------------------------------------- End render page 
     else {
 	$r->print('<h3>Undefined course sequence</h3>');
     }
-    &MapSecOptions();
 }
 
 
-sub Menu {
-    my $InpStr = $ENV{'form.sort'};
-    if ( $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>');
+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>');
+    $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->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 );
-      	}
+sub CreateForm {
+    $r->print("\n".'<form name=stat method=post action="/adm/statistics" >');
+    my $content = $ENV{'form.sort'};
+    if (!($ENV{'form.showcsv'}) && 
+        ($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>';
+	#$Ptr .= '<input type=submit name=sort value="Activity Log"/>';
+	#$Ptr .= '</h3>';
+	$r->print( $Ptr );
+    }
+    else {
+	&ClassList();
+	if ( $content eq 'Student Assessment' || 
+	     $content eq 'Create Student Report' ) {
+	    &MapSecOptions();
+	    &StudentOptions();
+	    &StudentReport($CurStu,$StuBox{"$CurStu"});
+	}
+	elsif ( $content eq 'Problem Analysis' ) {
+	    &AnalyzeProblem();
+	}
 	else {
-	    &initial();
-	    &ClassList();
-	    if ( $content eq 'Student Assessment' || 
-                    $content eq 'Create Student Report' ) {
-		&StudentOptions();
-		&StudentReport($CurStu,$StuBox{"$CurStu"});
-	    }
-	    else {
-		&PreStatTable();
-	    }
+	    &MapSecOptions();
+	    &PreStatTable();
 	}
-	$r->print("\n".'</form>'.
-                  "\n".'</body>'.
-                  "\n".'</html>');
-	$r->rflush();
     }
 }
 
+
+sub Menu {
+    &initial();
+#    $Apache::lonxml::debug=1;
+#    &Apache::lonhomework::showhash(%ENV);
+#    $Apache::lonxml::debug=0;
+    &Title();
+    my $InpStr = $ENV{'form.sort'};
+    if ($InpStr eq 'Activity Log') {
+	&Activity();
+    }    
+    elsif ($InpStr=~/^Analyze\_/) {
+	&ClassList();
+	&ShowOpGraph($InpStr,$ENV{'form.interval'});
+    }
+    elsif ( $InpStr eq 'DoDiff Graph' || $InpStr eq '%Wrong Graph' ) {      
+	&GetGraphData($InpStr);
+    	$r->print('<IMG src="/cgi-bin/graph.gif?'.$GData.'" />');
+    }
+    else {
+	&CreateForm();
+	$r->print("\n".'</form>');
+    }
+    $r->print("\n".'</body>'.
+	      "\n".'</html>');
+    $r->rflush();
+}
+
+
 sub StudentOptions {
     my $OpSel5='';
     $CurStu = $ENV{'form.student'};
@@ -1171,6 +1581,7 @@ sub StudentOptions {
     $r->rflush();	
 }
 
+
 sub GetStatus {
     $OpSel1='';
     $OpSel2='';
@@ -1203,7 +1614,7 @@ sub GetStatus {
 sub MapSecOptions {
 # ----------------------------------- Loading the Maps Combobox
     my $Ptr = '<br>';
-    $Ptr .= '<br><input type="submit" name="sort" value="Return to Menu" />';
+    $Ptr .= '<input type="submit" name="sort" value="Return to Menu" />';
     $Ptr .= '<br><b> Select &nbsp; Map &nbsp; &nbsp; </b>'."\n".
        	    '<select name="maps">'."\n". 
 	    '<option '.$OpSel3.'>All Maps</option>';                     	     	     
@@ -1292,6 +1703,3 @@ sub handler {
 }
 1;
 __END__
-
-
-