--- rat/lonpage.pm	2007/06/22 22:30:45	1.81
+++ rat/lonpage.pm	2007/11/30 19:14:14	1.87
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Page Handler
 #
-# $Id: lonpage.pm,v 1.81 2007/06/22 22:30:45 albertel Exp $
+# $Id: lonpage.pm,v 1.87 2007/11/30 19:14:14 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -78,7 +78,7 @@ sub tracetable {
                     my $frid=$hash{'map_finish_'.$hash{'src_'.$rid}};
 	            $sofar=
                        &tracetable($sofar,$hash{'map_start_'.$hash{'src_'.$rid}},
-                       '&'.$frid.'&');
+                       '&'.$frid.$beenhere);
                     $sofar++;
                     if ($hash{'src_'.$frid}) {
                         my $brepriv=&Apache::lonnet::allowed('bre',$hash{'src_'.$frid});
@@ -206,8 +206,6 @@ sub handler {
                   my %ssivlink=();
                   my %ssialink=();
      
-                  my %metalink=();
-
                   my %cellemb=();
 
                   my $allscript='';
@@ -230,7 +228,6 @@ sub handler {
 			  if ($hash{'encrypted_'.$_}) {
 			      $src=&Apache::lonenc::encrypted($src);
 			  }
-                          $metalink{$_}=$src.'.meta';
                           $cellemb{$_}=
 			      &Apache::loncommon::fileembstyle($extension);
                           if ($cellemb{$_} eq 'ssi') {
@@ -381,17 +378,18 @@ sub handler {
 			  $r->send_http_header;
 # ------------------------------------------------------------------------ Head
 			  if ($allscript) {
-			      $allscript .= 
-				  "\n<script type=\"text/javascript\">\n".
-				  $allscript."\n</script>\n";
+			      $allscript = 
+				  "\n".'<script type="text/javascript">'."\n".
+				  $allscript.
+				  "\n</script>\n";
 			  }
 # ------------------------------------------------------------------ Start body
-			  $r->print(&Apache::loncommon::start_page(undef,undef,
+			  $r->print(&Apache::loncommon::start_page(undef,$allscript,
 								   {'force_register' => 1,
 								    'bgcolor'        => '#ffffff',}));
 # ------------------------------------------------------------------ Start form
 			  if ($nforms) {
-			      $r->print('<form method="post" action="'.
+			      $r->print('<form name="lonhomework" method="post"  enctype="multipart/form-data" action="'.
 					&Apache::lonenc::check_encrypt($requrl)
 					.'">');
 			  }
@@ -411,9 +409,6 @@ sub handler {
 		      } else {
 			  $r->print('<table width="100%" cols="'.$lcm.'" border="0">');
 		      }
-# which icons do we use?
-                      my $extension='png';
-                      if ($env{'environment.icons'} eq 'classic') { $extension='gif'; }
 # generate rows
                       for ($i=0;$i<=$#rows;$i++) {
 			if ($rows[$i]) {
@@ -424,55 +419,8 @@ sub handler {
                           my $avespan=$lcm/($#colcont+1);
                           for ($j=0;$j<=$#colcont;$j++) {
                               my $rid=$colcont[$j];
-                              my $metainfo = '';
-			      my $esrc=&Apache::lonnet::declutter($hash{'src_'.$rid});
-			      my ($mapid,$resid)=split(/\./,$rid);
-			      my $symb=&Apache::lonnet::encode_symb($hash{'map_id_'.$mapid},$resid,$hash{'src_'.$rid});
-			      if ($hash{'encrypted_'.$rid}) {
-				  $symb=&Apache::lonenc::encrypted($symb);
-				  $esrc=&Apache::lonenc::encrypted($esrc);
-			      }
-                              if ($hash{'src_'.$rid} !~ m-^/uploaded/-
-				  && !$env{'request.enc'}
-				  && ($env{'request.role.adv'}
-				      || !$hash{'encrypted_'.$rid})) { 
-                                  $metainfo ='<a name="'.&escape($symb).'" />'.
-                                  '<a href="'.$metalink{$rid}.'" target="LONcatInfo">'.
-                                  '<img src="/adm/lonMisc/cat_button.'.$extension.'" class="LC_icon" />'.
-                                  '</a>';
-                              }
-                              $metainfo .= '<a href="/adm/evaluate?postdata='.
-				  &escape($esrc).
-                                  '" target="LONcatInfo">'.
-                                  '<img src="/adm/lonMisc/eval_button.'.$extension.'" class="LC_icon" />'.
-                                  '</a>';
-                              if (
- ($hash{'src_'.$rid}=~/\.(problem|exam|quiz|assess|survey|form)$/) &&
- (&Apache::lonnet::allowed('mgr',$env{'request.course.id'})) && 
- ($hash{'src_'.$rid} !~ m-^/uploaded/-)) {
-				  my ($mapid,$resid)=split(/\./,$rid);
-                                 my $symb=
-                &Apache::lonnet::declutter($hash{'map_id_'.$mapid}).
-                '___'.$resid.'___'.
-		&Apache::lonnet::declutter($hash{'src_'.$rid});
-                                 $metainfo.=
-                  '<a href="/adm/grades?symb='.&escape($symb).
-#                 '&command=submission" target="LONcatInfo">'.
-                  '&command=submission">'.
-                          '<img src="/adm/lonMisc/subm_button.'.$extension.'" class="LC_icon" />'.
-			  '</a>'.
-                  '<a href="/adm/grades?symb='.&escape($symb).
-#                  '&command=gradingmenu" target="LONcatInfo">'.
-                  '&command=gradingmenu">'.
-                          '<img src="/adm/lonMisc/pgrd_button.'.$extension.'" class="LC_icon" />'.
-			  '</a>'.
-                  '<a href="/adm/parmset?symb='.&escape($symb).
-#                          '" target="LONcatInfo">'.
-                          '" >'.
-                          '<img src="/adm/lonMisc/pprm_button.'.$extension.'" class="LC_icon" />'.
-			      '</a>';
-                              }
-                              $metainfo.='<br></br>';
+
+			      my $metainfo =&get_buttons(\%hash,$rid).'<br />';
 			    unless ($target eq 'tex') {
 				$r->print('<td colspan="'.$avespan.'"');
 			    }
@@ -580,6 +528,65 @@ sub handler {
   return OK; 
 }
 
+sub get_buttons {
+    my ($hash,$rid) = @_;
+
+    # which icons do we use?
+    my $extension='png';
+    if ($env{'environment.icons'} eq 'classic') { $extension='gif'; }
+
+    my $metainfo = '';
+    my $esrc=&Apache::lonnet::declutter($hash->{'src_'.$rid});
+    my ($mapid,$resid)=split(/\./,$rid);
+    my $symb=&Apache::lonnet::encode_symb($hash->{'map_id_'.$mapid},
+					  $resid,
+					  $hash->{'src_'.$rid});
+    if ($hash->{'encrypted_'.$rid}) {
+	$symb=&Apache::lonenc::encrypted($symb);
+	$esrc=&Apache::lonenc::encrypted($esrc);
+    }
+    if ($hash->{'src_'.$rid} !~ m-^/uploaded/-
+	&& !$env{'request.enc'}
+	&& ($env{'request.role.adv'}
+	    || !$hash->{'encrypted_'.$rid})) { 
+	$metainfo .='<a name="'.&escape($symb).'" />'.
+	    '<a href="'.$hash->{'src_'.$rid}.'.meta'.'" target="LONcatInfo">'.
+	    '<img src="/adm/lonMisc/cat_button.'.$extension.'" class="LC_icon" />'.
+	    '</a>';
+    }
+    $metainfo .= '<a href="/adm/evaluate?postdata='.
+	&escape($esrc).
+	'" target="LONcatInfo">'.
+	'<img src="/adm/lonMisc/eval_button.'.$extension.'" class="LC_icon" />'.
+	'</a>';
+    if (($hash->{'src_'.$rid}=~/\.(problem|exam|quiz|assess|survey|form)$/) &&
+	($hash->{'src_'.$rid} !~ m-^/uploaded/-)) {
+
+	if (&Apache::lonnet::allowed('mgr',$env{'request.course.id'})) {
+	    $metainfo.=
+		'<a href="/adm/grades?symb='.&escape($symb).
+#               '&command=submission" target="LONcatInfo">'.
+		'&command=submission">'.
+		'<img src="/adm/lonMisc/subm_button.'.$extension.'" class="LC_icon" />'.
+		'</a>'.
+		'<a href="/adm/grades?symb='.&escape($symb).
+#               '&command=gradingmenu" target="LONcatInfo">'.
+		'&command=gradingmenu">'.
+		'<img src="/adm/lonMisc/pgrd_button.'.$extension.'" class="LC_icon" />'.
+		'</a>';
+	}
+	if (&Apache::lonnet::allowed('opa',$env{'request.course.id'})) {
+	    $metainfo.=
+		'<a href="/adm/parmset?symb='.&escape($symb).
+#               '" target="LONcatInfo">'.
+		'" >'.
+		'<img src="/adm/lonMisc/pprm_button.'.$extension.'" class="LC_icon" />'.
+		'</a>';
+	}
+    }
+    return $metainfo;
+}
+
 1;
 __END__