--- loncom/interface/lonnavmaps.pm	2004/08/27 20:34:13	1.280
+++ loncom/interface/lonnavmaps.pm	2004/09/29 19:13:20	1.298
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.280 2004/08/27 20:34:13 albertel Exp $
+# $Id: lonnavmaps.pm,v 1.298 2004/09/29 19:13:20 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -84,7 +84,7 @@ my %colormap =
 my $hurryUpColor = "#FF0000";
 
 sub launch_win {
-    my ($mode,$script)=@_;
+    my ($mode,$script,$toplinkitems)=@_;
     my $result;
     if ($script ne 'no') {
 	$result.='<script type="text/javascript">';
@@ -99,8 +99,8 @@ sub launch_win {
 	$result.='</script>';
     }
     if ($mode eq 'link') {
-	$result.='<a href="javascript:launch_navmapwin();void(0);">'
-	    .&mt("Launch navigation window")."</a>&nbsp;&nbsp;&nbsp;&nbsp;";
+	&add_linkitem($toplinkitems,'launchnav','launch_navmapwin()',
+		      "Launch navigation window");
     }
     return $result;
 }
@@ -127,7 +127,7 @@ sub nav_control_js {
 
 function gonav(url) {
    if (w_loncapanav_flag != 1) {
-      go(url);
+      gopost(url,'');
    }  else {
       navwindow=window.open(url,
                   "loncapanav","height=600,width=400,scrollbars=1"); 
@@ -178,6 +178,8 @@ sub real_handler {
     &Apache::loncommon::no_cache($r);
     $r->send_http_header;
 
+    my %toplinkitems=();
+
     if ($ENV{QUERY_STRING} eq 'collapseExternal') {
 	&Apache::lonnet::put('environment',{'remotenavmap' => 'off'});
 	&Apache::lonnet::appenv('environment.remotenavmap' => 'off');
@@ -260,13 +262,13 @@ ENDSUBM
               &Apache::loncommon::bodytag('Navigate Course Contents','',
 					  $addentries,$body_only,'',
 					  $ENV{'form.register'}));
-    $r->print('<script>window.focus();</script>'.
-	      &Apache::loncommon::help_open_menu('','Navigation Screen','Navigation_Screen','',undef,'RAT'));
+    $r->print('<script>window.focus();</script>');
      
     $r->rflush();
 
     # Check that it's defined
     if (!($navmap->courseMapDefined())) {
+	$r->print(&Apache::loncommon::help_open_menu('','Navigation Screen','Navigation_Screen','',undef,'RAT'));
         $r->print('<font size="+2" color="red">Coursemap undefined.</font>' .
                   '</body></html>');
         return OK;
@@ -308,18 +310,16 @@ ENDSUBM
     }
 
     if ($ENV{'environment.remotenavmap'} ne 'on') {
-	$r->print(&launch_win('link','yes'));
+	$r->print(&launch_win('link','yes',\%toplinkitems));
     } 
     if ($ENV{'environment.remotenavmap'} eq 'on') {
-#        $r->print("<a href='navmaps?collapseExternal'>" .
-        $r->print("<a href='javascript:collapse();void(0);'>" .
-		  &mt("Close navigation window").
-		  "</a>&nbsp;&nbsp;&nbsp;&nbsp;");
+	&add_linkitem(\%toplinkitems,'closenav','collapse()',
+		      "Close navigation window");
     } 
 
     my $jumpToFirstHomework = 0;
     # Check to see if the student is jumping to next open, do-able problem
-    if ($ENV{QUERY_STRING} eq 'jumpToFirstHomework') {
+    if ($ENV{QUERY_STRING} =~ /^jumpToFirstHomework/) {
         $jumpToFirstHomework = 1;
         # Find the next homework problem that they can do.
         my $iterator = $navmap->getIterator(undef, undef, undef, 1);
@@ -352,8 +352,9 @@ ENDSUBM
             $r->print("<font size='+2'>All homework assignments have been completed.</font><br /><br />");
         }
     } else {
-        $r->print("<a href='navmaps?jumpToFirstHomework'>" .
-       &mt("Go To My First Homework Problem")."</a>&nbsp;&nbsp;&nbsp;&nbsp;");
+	&add_linkitem(\%toplinkitems,'firsthomework',
+		      'location.href="navmaps?jumpToFirstHomework"',
+		      "Show Me My First Homework Problem");
     }
 
     my $suppressEmptySequences = 0;
@@ -368,15 +369,18 @@ ENDSUBM
         $filterFunc = sub { my $res = shift; 
                             return $res->completable() || $res->is_map();
                         };
-        $r->print("<a href='navmaps?sort=$ENV{'form.sort'}'>" .
-		  &mt("Show Everything")."</a>&nbsp;&nbsp;&nbsp;&nbsp;");
+	&add_linkitem(\%toplinkitems,'everything',
+		     'location.href="navmaps?sort='.$ENV{'form.sort'}.'"',
+		      "Show Everything");
         $r->print("<p><font size='+2'>".&mt("Uncompleted Homework")."</font></p>");
         $ENV{'form.filter'} = '';
         $ENV{'form.condition'} = 1;
 	$resource_no_folder_link = 1;
     } else {
-        $r->print("<a href='navmaps?sort=$ENV{'form.sort'}&showOnlyHomework=1'>" .
-       &mt("Show Only Uncompleted Homework")."</a>&nbsp;&nbsp;&nbsp;&nbsp;");
+	&add_linkitem(\%toplinkitems,'uncompleted',
+		      'location.href="navmaps?sort='.$ENV{'form.sort'}.
+		          '&showOnlyHomework=1"',
+		      "Show Only Uncompleted Homework");
     }
 
     my %selected=($ENV{'form.sort'} => 'selected=on');
@@ -388,11 +392,12 @@ ENDSUBM
                        <option value=\"default\" $selected{'default'}>".&mt('Default')."</option>
                        <option value=\"title\"   $selected{'title'}  >".&mt('Title')."</option>
                        <option value=\"duedate\" $selected{'duedate'}>".&mt('Duedate')."</option>
+                       <option value=\"discussion\" $selected{'discussion'}>".&mt('Has Discussion')."</option>
                     </select>
                  </nobr>
                </form>");
     # renderer call
-    my $renderArgs = { 'cols' => [0,2,3],
+    my $renderArgs = { 'cols' => [0,1,2,3],
 		       'sort' => $ENV{'form.sort'},
                        'url' => '/adm/navmaps',
                        'navmap' => $navmap,
@@ -401,7 +406,9 @@ ENDSUBM
                        'filterFunc' => $filterFunc,
 		       'resource_no_folder_link' => $resource_no_folder_link,
 		       'sort_html'=> $sort_html,
-                       'r' => $r};
+                       'r' => $r,
+                       'caller' => 'navmapsdisplay',
+                       'linkitems' => \%toplinkitems};
     my $render = render($renderArgs);
     $navmap->untieHashes();
 
@@ -1028,10 +1035,10 @@ sub render_resource {
 
     my $partLabel = "";
     my $newBranchText = "";
-    
+    my $location=&Apache::loncommon::lonhttpdurl("/adm/lonIcons");
     # If this is a new branch, label it so
     if ($params->{'isNewBranch'}) {
-        $newBranchText = "<img src='/adm/lonIcons/branch.gif' border='0' />";
+        $newBranchText = "<img src='$location/branch.gif' border='0' />";
     }
 
     # links to open and close the folder
@@ -1039,17 +1046,16 @@ sub render_resource {
     my $linkclose = "</a>";
 
     # Default icon: unknown page
-    my $icon = "<img src='/adm/lonIcons/unknown.gif' alt='' border='0' />";
+    my $icon = "<img src='$location/unknown.gif' alt='' border='0' />";
     
     if ($resource->is_problem()) {
         if ($part eq '0' || $params->{'condensed'}) {
-            $icon = '<img src="/adm/lonIcons/problem.gif" alt="" border="0" />';
+            $icon ='<img src="'.$location.'/problem.gif" alt="" border="0" />';
         } else {
             $icon = $params->{'indentString'};
         }
     } else {
-	$icon = "<img src='".&Apache::loncommon::icon($resource->src).
-	    "' alt='' border='0' />";
+	$icon = "<img src='".&Apache::loncommon::lonhttpdurl(&Apache::loncommon::icon($resource->src))."' alt='' border='0' />";
     }
 
     # Display the correct map icon to open or shut map
@@ -1064,7 +1070,7 @@ sub render_resource {
 
         if (!$params->{'resource_no_folder_link'}) {
             $icon = "navmap.$folderType." . ($nowOpen ? 'closed' : 'open') . '.gif';
-            $icon = "<img src='/adm/lonIcons/$icon' alt='' border='0' />";
+            $icon = "<img src='$location/$icon' alt='' border='0' />";
 
             $linkopen = "<a href='" . $params->{'url'} . '?' . 
                 $params->{'queryString'} . '&filter=';
@@ -1081,7 +1087,7 @@ sub render_resource {
             # Don't allow users to manipulate folder
             $icon = "navmap.$folderType." . ($nowOpen ? 'closed' : 'open') .
                 '.nomanip.gif';
-            $icon = "<img src='/adm/lonIcons/$icon' alt='' border='0' />";
+            $icon = "<img src='$location/$icon' alt='' border='0' />";
 
             $linkopen = "";
             $linkclose = "";
@@ -1149,10 +1155,10 @@ sub render_communication_status {
     my $link = $params->{"resourceLink"};
     my $linkopen = "<a href='$link'>";
     my $linkclose = "</a>";
-
+    my $location=&Apache::loncommon::lonhttpdurl("/adm/lonMisc");
     if ($resource->hasDiscussion()) {
         $discussionHTML = $linkopen .
-            '<img border="0" src="/adm/lonMisc/chat.gif" />' .
+            '<img border="0" src="'.$location.'/chat.gif" />' .
             $linkclose;
     }
     
@@ -1162,7 +1168,7 @@ sub render_communication_status {
             if ($_) {
                 $feedbackHTML .= '&nbsp;<a href="/adm/email?display='
                     . &Apache::lonnet::escape($_) . '">'
-                    . '<img src="/adm/lonMisc/feedback.gif" '
+                    . '<img src="'.$location.'/feedback.gif" '
                     . 'border="0" /></a>';
             }
         }
@@ -1177,7 +1183,7 @@ sub render_communication_status {
                 $errorcount++;
                 $errorHTML .= '&nbsp;<a href="/adm/email?display='
                     . &Apache::lonnet::escape($_) . '">'
-                    . '<img src="/adm/lonMisc/bomb.gif" '
+                    . '<img src="'.$location.'/bomb.gif" '
                     . 'border="0" /></a>';
             }
         }
@@ -1206,7 +1212,9 @@ sub render_quick_status {
         my $icon = $statusIconMap{$resource->simpleStatus($part)};
         my $alt = $iconAltTags{$icon};
         if ($icon) {
-            $result .= "<td width='30' valign='center' width='50' align='right'>$linkopen<img width='25' height='25' src='/adm/lonIcons/$icon' border='0' alt='$alt' />$linkclose</td>\n";
+	    my $location=
+		&Apache::loncommon::lonhttpdurl("/adm/lonIcons/$icon");
+            $result .= "<td width='30' valign='center' width='50' align='right'>$linkopen<img width='25' height='25' src='$location' border='0' alt='$alt' />$linkclose</td>\n";
         } else {
             $result .= "<td width='30'>&nbsp;</td>\n";
         }
@@ -1337,11 +1345,17 @@ sub setDefault {
     return $val;
 }
 
+sub cmp_title {
+    my ($atitle,$btitle) = (lc($_[0]->compTitle),lc($_[1]->compTitle));
+    $atitle=~s/^\s*//;
+    $btitle=~s/^\s*//;
+    return $atitle cmp $btitle;
+}
+
 sub render {
     my $args = shift;
     &Apache::loncommon::get_unprocessed_cgi($ENV{QUERY_STRING});
     my $result = '';
-
     # Configure the renderer.
     my $cols = $args->{'cols'};
     if (!defined($cols)) {
@@ -1422,7 +1436,7 @@ sub render {
         # We only need to do this if we need to open the maps to show the
         # current position. This will change the counter so we can't count
         # for the jump marker with this loop.
-        while (($curRes = $mapIterator->next()) && !$found) {
+        while ($here && ($curRes = $mapIterator->next()) && !$found) {
             if (ref($curRes) && $curRes->symb() eq $here) {
                 my $mapStack = $mapIterator->getStack();
                 
@@ -1498,23 +1512,24 @@ sub render {
     my $printKey = $args->{'printKey'};
     my $printCloseAll = $args->{'printCloseAll'};
     if (!defined($printCloseAll)) { $printCloseAll = 1; }
-    
+
     # Print key?
     if ($printKey) {
         $result .= '<table border="0" cellpadding="2" cellspacing="0">';
         my $date=localtime;
         $result.='<tr><td align="right" valign="bottom">Key:&nbsp;&nbsp;</td>';
+	my $location=&Apache::loncommon::lonhttpdurl("/adm/lonMisc");
         if ($navmap->{LAST_CHECK}) {
             $result .= 
-                '<img src="/adm/lonMisc/chat.gif"> '.&mt('New discussion since').' '.
+                '<img src="'.$location.'/chat.gif"> '.&mt('New discussion since').' '.
                 strftime("%A, %b %e at %I:%M %P", localtime($navmap->{LAST_CHECK})).
                 '</td><td align="center" valign="bottom">&nbsp;&nbsp;'.
-                '<img src="/adm/lonMisc/feedback.gif"> '.&mt('New message (click to open)').'<p>'.
+                '<img src="'.$location.'/feedback.gif"> '.&mt('New message (click to open)').'<p>'.
                 '</td>'; 
         } else {
             $result .= '<td align="center" valign="bottom">&nbsp;&nbsp;'.
-                '<img src="/adm/lonMisc/chat.gif"> '.&mt('Discussions').'</td><td align="center" valign="bottom">'.
-                '&nbsp;&nbsp;<img src="/adm/lonMisc/feedback.gif"> '.&mt('New message (click to open)').
+                '<img src="'.$location.'/chat.gif"> '.&mt('Discussions').'</td><td align="center" valign="bottom">'.
+                '&nbsp;&nbsp;<img src="'.$location.'/feedback.gif"> '.&mt('New message (click to open)').
                 '</td>'; 
         }
 
@@ -1522,53 +1537,86 @@ sub render {
     }
 
     if ($printCloseAll && !$args->{'resource_no_folder_link'}) {
+	my ($link,$text);
         if ($condition) {
-            $result.="<a href=\"navmaps?condition=0&filter=&$queryString" .
-                "&here=" . Apache::lonnet::escape($here) .
-                "\">".&mt('Close All Folders')."</a>";
+	    $link='"navmaps?condition=0&filter=&'.$queryString.
+		'&here='.&Apache::lonnet::escape($here).'"';
+	    $text='Close All Folders';
         } else {
-            $result.="<a href=\"navmaps?condition=1&filter=&$queryString" .
-                "&here=" . Apache::lonnet::escape($here) . 
-                "\">".&mt('Open All Folders')."</a>";
-        }
+	    $link='"navmaps?condition=1&filter=&'.$queryString.
+		'&here='.&Apache::lonnet::escape($here).'"';
+	    $text='Open All Folders';
+        }
+	if ($args->{'caller'} eq 'navmapsdisplay') {
+	    &add_linkitem($args->{'linkitems'},'changefolder',
+			  'location.href='.$link,$text);
+	} else {
+	    $result.='<a href='.$link.'>'.&mt($text).'</a>';
+	}
         $result .= "\n";
     }
 
     # Check for any unread discussions in all resources.
-    if (!$args->{'resource_no_folder_link'}) {
-	my $totdisc = 0;
-	my $haveDisc = '';
-	my @allres=$navmap->retrieveResources();
-	foreach my $resource (@allres) {
-	    if ($resource->hasDiscussion()) {
-		my $ressymb;
-		if ($resource->symb() =~ m-(___adm/\w+/\w+)/(\d+)/bulletinboard$-) {
-		    $ressymb = 'bulletin___'.$2.$1.'/'.$2.'/bulletinboard';
-		} else {
-		    $ressymb = $resource->symb();
+    if ($args->{'caller'} eq 'navmapsdisplay') {
+	&add_linkitem($args->{'linkitems'},'clearbubbles',
+		      'document.clearbubbles.submit()',
+		      'Mark all posts read');
+	my $time=time;
+	$result .= (<<END);
+    <form name="clearbubbles" method="post" action="/adm/feedback">
+	<input type="hidden" name="navurl" value="$ENV{'QUERY_STRING'}" />
+	<input type="hidden" name="navtime" value="$time" />
+END
+        if ($args->{'sort'} eq 'discussion') { 
+	    my $totdisc = 0;
+	    my $haveDisc = '';
+	    my @allres=$navmap->retrieveResources();
+	    foreach my $resource (@allres) {
+		if ($resource->hasDiscussion()) {
+		    my $ressymb;
+		    if ($resource->symb() =~ m-(___adm/\w+/\w+)/(\d+)/bulletinboard$-) {
+			$ressymb = 'bulletin___'.$2.$1.'/'.$2.'/bulletinboard';
+		    } else {
+			$ressymb = $resource->symb();
+		    }
+		    $haveDisc .= $ressymb.':';
+		    $totdisc ++;
 		}
-		$haveDisc .= $ressymb.':';
-		$totdisc ++;
 	    }
-	}
-	if ($totdisc > 0) {
-	    $haveDisc =~ s/:$//;
-	    my %lt = &Apache::lonlocal::texthash(
-						 'mapr' => 'Mark all posts read',
-						 );
-	    $result .= (<<END);
-	        &nbsp;&nbsp;&nbsp;<a href="javascript:document.clearbubbles.submit()">$lt{'mapr'}</a>&nbsp;<a href="javascript:void(open('/adm/help/NavMaps_MarkPosts_Read.hlp', 'Help_for_NavMaps_MarkPosts', 'menubar=0,toolbar=1,scrollbars=1,width=350,height=400,resizable=yes'))" title="Online Help"><image src="/adm/help/gif/smallHelp.gif" border="0" alt="(Help: NavMaps_MarkPostsLink)" /></a>
-		<form name="clearbubbles" method="post" action="/adm/feedback">
-		<input type="hidden" name="navurl" value="$ENV{'QUERY_STRING'}" />
-		<input type="hidden" name="navmaps" value="$haveDisc" />
-		</form>
+	    if ($totdisc > 0) {
+		$haveDisc =~ s/:$//;
+		my $navurl = $ENV{'QUERY_STRING'};
+		$result .= (<<END);
+	<input type="hidden" name="navmaps" value="$haveDisc" />
+    </form>
 END
-        } else {
-	    $result .= '<br />';
+            }
 	}
+	$result.='</form>';
     }
 
-    if ($args->{'sort_html'}) { $result.=$args->{'sort_html'}; }
+    if ($args->{'caller'} eq 'navmapsdisplay') {
+        $result .= '<table><tr><td>'.
+                   &Apache::loncommon::help_open_menu('','Navigation Screen','Navigation_Screen','',undef,'RAT').'</td>';
+	if ($ENV{'environment.remotenavmap'} ne 'on') {
+	    $result .= '<td>&nbsp;</td>'; 
+        } else {
+	    $result .= '</tr><tr>'; 
+        }
+	$result.=&show_linkitems($args->{'linkitems'});
+        if ($args->{'sort_html'}) {
+	    if ($ENV{'environment.remotenavmap'} ne 'on') {
+		$result.='<td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>'.
+		    '<td align="right">'.$args->{'sort_html'}.'</td></tr>';
+	    } else {
+		$result.='</tr><tr><td align="left"><br />'.
+		    $args->{'sort_html'}.'</td></tr>';
+	    }
+	}
+        $result .= '</table>';
+    } elsif ($args->{'sort_html'}) { 
+        $result.=$args->{'sort_html'}; 
+    }
 
     $result .= "<br />\n";
     if ($r) {
@@ -1592,7 +1640,9 @@ END
     $args->{'indentLevel'} = 0;
     $args->{'isNewBranch'} = 0;
     $args->{'condensed'} = 0;    
-    $args->{'indentString'} = setDefault($args->{'indentString'}, "<img src='/adm/lonIcons/whitespace1.gif' width='25' height='1' alt='' border='0' />");
+    my $location=
+	&Apache::loncommon::lonhttpdurl("/adm/lonIcons/whitespace1.gif");
+    $args->{'indentString'} = setDefault($args->{'indentString'}, "<img src='$location' width='25' height='1' alt='' border='0' />");
     $args->{'displayedHereMarker'} = 0;
 
     # If we're suppressing empty sequences, look for them here. Use DFS for speed,
@@ -1653,18 +1703,35 @@ END
 		return &$oldFilterFunc($res);
 	    };
 	@resources=$navmap->retrieveResources(undef,$filterFunc);
-	@resources= sort {lc($a->compTitle) cmp lc($b->compTitle)} @resources;
+	@resources= sort { &cmp_title($a,$b) } @resources;
     } elsif ($args->{'sort'} eq 'duedate') {
-	@resources=$navmap->retrieveResources(undef,
-					       sub { shift->is_problem(); });
-	@resources= sort
-	{
+	my $oldFilterFunc = $filterFunc;
+	my $filterFunc= 
+	    sub {
+		my ($res)=@_;
+		if (!$res->is_problem()) { return 0;}
+		return &$oldFilterFunc($res);
+	    };
+	@resources=$navmap->retrieveResources(undef,$filterFunc);
+	@resources= sort {
 	    if ($a->duedate ne $b->duedate) {
 	        return $a->duedate cmp $b->duedate;
-	    } else {
-		lc($a->compTitle) cmp lc($b->compTitle)
 	    }
+	    my $value=&cmp_title($a,$b);
+	    return $value;
 	} @resources;
+    } elsif ($args->{'sort'} eq 'discussion') {
+	my $oldFilterFunc = $filterFunc;
+	my $filterFunc= 
+	    sub {
+		my ($res)=@_;
+		if (!$res->hasDiscussion() &&
+		    !$res->getFeedback() &&
+		    !$res->getErrors()) { return 0;}
+		return &$oldFilterFunc($res);
+	    };
+	@resources=$navmap->retrieveResources(undef,$filterFunc);
+	@resources= sort { &cmp_title($a,$b) } @resources;
     } else {
 	#unknow sort mechanism or default
 	undef($args->{'sort'});
@@ -1879,6 +1946,46 @@ if (location.href.indexOf('#curloc')==-1
     return $result;
 }
 
+sub add_linkitem {
+    my ($linkitems,$name,$cmd,$text)=@_;
+    $$linkitems{$name}{'cmd'}=$cmd;
+    $$linkitems{$name}{'text'}=&mt($text);
+}
+
+sub show_linkitems {
+    my ($linkitems)=@_;
+    my @linkorder = ("launchnav","closenav","firsthomework","everything",
+		     "uncompleted","changefolder","clearbubbles");
+    
+    my $result .= (<<ENDBLOCK);
+              <td align="left">
+<script type="text/javascript">
+    function changeNavDisplay () {
+	var navchoice = document.linkitems.toplink[document.linkitems.toplink.selectedIndex].value;
+ENDBLOCK
+    foreach my $link (@linkorder) {
+	$result.= "if (navchoice == '$link') {".
+	    $linkitems->{$link}{'cmd'}."}\n";
+    }
+    $result.='}
+              </script>
+                   <form name="linkitems" method="post">
+                       <nobr><select name="toplink">'."\n";
+    foreach my $link (@linkorder) {
+	if (defined($linkitems->{$link})) {
+	    if ($linkitems->{$link}{'text'} ne '') {
+		$result .= ' <option value="'.$link.'">'.
+		    $linkitems->{$link}{'text'}."</option>\n";
+	    }
+	}
+    }
+    $result .= '</select>&nbsp;<input type="button" name="chgnav"
+                   value="Go" onClick="javascript:changeNavDisplay()" />
+                </nobr></form></td>'."\n";
+	
+    return $result;
+}
+
 1;
 
 package Apache::lonnavmaps::navmap;
@@ -2085,17 +2192,11 @@ sub generate_email_discuss_status {
     
     foreach my $msgid (split(/\&/, $keys)) {
 	$msgid=&Apache::lonnet::unescape($msgid);
-	my $plain=&Apache::lonnet::unescape(&Apache::lonnet::unescape($msgid));
-	if ($plain=~/(Error|Feedback) \[([^\]]+)\]/) {
-	    my ($what,$url)=($1,$2);
-	    my %status=
-		&Apache::lonnet::get('email_status',[$msgid]);
-	    if ($status{$msgid}=~/^error\:/) { 
-		$status{$msgid}=''; 
-	    }
-	    
-	    if (($status{$msgid} eq 'new') || 
-		(!$status{$msgid})) { 
+	if ((!$emailstatus{$msgid}) || ($emailstatus{$msgid} eq 'new')) {
+	    my $plain=
+		&Apache::lonnet::unescape(&Apache::lonnet::unescape($msgid));
+	    if ($plain=~/(Error|Feedback) \[([^\]]+)\]/) {
+		my ($what,$url)=($1,$2);
 		if ($what eq 'Error') {
 		    $error{$url}.=','.$msgid; 
 		} else {
@@ -2105,8 +2206,10 @@ sub generate_email_discuss_status {
 	}
     }
     
+    #url's of resources that have feedbacks
     $self->{FEEDBACK} = \%feedback;
-    $self->{ERROR_MSG} = \%error; # what is this? JB
+    #or errors
+    $self->{ERROR_MSG} = \%error;
     $self->{DISCUSSION_TIME} = \%discussiontime;
     $self->{EMAIL_STATUS} = \%emailstatus;
     $self->{LAST_READ} = \%lastreadtime;
@@ -3829,6 +3932,16 @@ Returns the number of parts of the probl
 for single part problems, returns 1. For multipart, it returns the
 number of parts in the problem, not including psuedo-part 0. 
 
+=item * B<countResponses>():
+
+Returns the total number of responses in the problem a student can answer.
+
+=item * B<responseTypes>():
+
+Returns a hash whose keys are the response types.  The values are the number 
+of times each response type is used.  This is for the I<entire> problem, not 
+just a single part.
+
 =item * B<multipart>():
 
 Returns true if the problem is multipart, false otherwise. Use this instead
@@ -3875,6 +3988,26 @@ sub countParts {
     return scalar(@{$parts}); # + $delta;
 }
 
+sub countResponses {
+    my $self = shift;
+    my $count;
+    foreach my $part (@{$self->parts()}) {
+        $count+= scalar($self->responseIds($part));
+    }
+    return $count;
+}
+
+sub responseTypes {
+    my $self = shift;
+    my %responses;
+    foreach my $part ($self->parts()) {
+        foreach my $responsetype ($self->responseType($part)) {
+            $responses{$responsetype}++ if (defined($responsetype));
+        }
+    }
+    return %responses;
+}
+
 sub multipart {
     my $self = shift;
     return $self->countParts() > 1;
@@ -3962,6 +4095,7 @@ sub extractParts {
         }
         
 
+        # These hashes probably do not need names that end with "Hash"....
         my %responseIdHash;
         my %responseTypeHash;
 
@@ -3997,17 +4131,27 @@ sub extractParts {
             }
         }
 	my $resorder = &Apache::lonnet::metadata($self->src(),'responseorder');
+        #
+        # Reorder the arrays in the %responseIdHash and %responseTypeHash
 	if ($resorder) {
 	    my @resorder=split(/,/,$resorder);
 	    foreach my $part (keys(%responseIdHash)) {
-		my %resids = map { ($_,1) } @{ $responseIdHash{$part} };
+		my $i=0;
+		my %resids = map { ($_,$i++) } @{ $responseIdHash{$part} };
 		my @neworder;
 		foreach my $possibleid (@resorder) {
 		    if (exists($resids{$possibleid})) {
-			push(@neworder,$possibleid);
+			push(@neworder,$resids{$possibleid});
 		    }
 		}
-		$responseIdHash{$part}=\@neworder;	
+		my @ids;
+		my @type;
+		foreach my $element (@neworder) {
+		    push (@ids,$responseIdHash{$part}->[$element]);
+		    push (@type,$responseTypeHash{$part}->[$element]);
+		}
+		$responseIdHash{$part}=\@ids;
+		$responseTypeHash{$part}=\@type;
 	    }
 	}
         $self->{RESPONSE_IDS} = \%responseIdHash;
@@ -4203,6 +4347,7 @@ sub getCompletionStatus {
 
     # Left as separate if statements in case we ever do more with this
     if ($status eq 'correct_by_student') {return $self->CORRECT;}
+    if ($status eq 'correct_by_scantron') {return $self->CORRECT;}
     if ($status eq 'correct_by_override') {return $self->CORRECT_BY_OVERRIDE; }
     if ($status eq 'incorrect_attempted') {return $self->INCORRECT; }
     if ($status eq 'incorrect_by_override') {return $self->INCORRECT_BY_OVERRIDE; }