--- loncom/interface/lonsearchcat.pm	2008/12/12 17:46:25	1.302
+++ loncom/interface/lonsearchcat.pm	2009/07/03 08:18:48	1.311
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Search Catalog
 #
-# $Id: lonsearchcat.pm,v 1.302 2008/12/12 17:46:25 raeburn Exp $
+# $Id: lonsearchcat.pm,v 1.311 2009/07/03 08:18:48 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -191,9 +191,9 @@ sub handler {
     &Apache::lonhtmlcommon::add_breadcrumb
        ({href=>'/adm/searchcat?'.
 	       &Apache::loncommon::inhibit_menu_check().
-               '&catalogmode='.$env{'form.catalogmode'}.
-               '&launch='.$env{'form.launch'}.
-               '&mode='.$env{'form.mode'},
+               '&catalogmode='.$env{'form.catalogmode'}.
+               '&launch='.$env{'form.launch'}.
+               '&mode='.$env{'form.mode'},
               text=>"$crumb_text",
               target=>'_top',
               bug=>'Searching',});
@@ -314,19 +314,19 @@ END
         }
         &Apache::lonhtmlcommon::add_breadcrumb
             ({href=>'/adm/searchcat?'.&Apache::loncommon::inhibit_menu_check().
-		  '&phase=disp_adv'.
-                  '&catalogmode='.$env{'form.catalogmode'}.
-                  '&launch='.$env{'form.launch'}.
-                  '&mode='.$env{'form.mode'},
+                  '&phase=disp_adv'.
+                  '&catalogmode='.$env{'form.catalogmode'}.
+                  '&launch='.$env{'form.launch'}.
+                  '&mode='.$env{'form.mode'},
                   text=>"Advanced $srchtype Search",
                   bug=>'Searching',});
     } elsif ($env{'form.searchmode'} eq 'course search') {
         &Apache::lonhtmlcommon::add_breadcrumb
             ({href=>'/adm/searchcat?'.&Apache::loncommon::inhibit_menu_check().
-		  '&phase=disp_adv'.
+                  '&phase=disp_adv'.
                   'catalogmode='.$env{'form.catalogmode'}.
-                  '&launch='.$env{'form.launch'}.
-                  '&mode='.$env{'form.mode'},
+                  '&launch='.$env{'form.launch'}.
+                  '&mode='.$env{'form.mode'},
                   text=>"Course Search",
                   bug=>'Searching',});
     }
@@ -488,7 +488,20 @@ sub course_search {
     my $discuss=$env{'form.crsdiscuss'};
     my @allwords=($search_string,@New_Words);
     $totalfound=0;
-    $r->print(&Apache::loncommon::start_page('Course Search').
+
+    &Apache::lonhtmlcommon::add_breadcrumb
+        ({href=>'/adm/searchcat?'.&Apache::loncommon::inhibit_menu_check().
+              '&phase=disp_adv'.
+              'catalogmode='.$env{'form.catalogmode'}.
+              '&launch='.$env{'form.launch'}.
+              '&mode='.$env{'form.mode'},
+              text=>"Course Search",
+              bug=>'Searching',});
+    $r->print(&Apache::loncommon::start_page('Course Search'));
+    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Searching','Searching',
+                        $env{'form.catalogmode'} ne 'import'));
+
+    $r->print(
 	      '<hr /><center><font size="+2" face="arial">'.
 	      $pretty_search_string.'</font></center>'.
 	      '<hr /><b>'.&mt('Course content').':</b><br />');
@@ -519,72 +532,77 @@ sub course_search {
         my $totaldiscussions = 0;
         $r->print('<br /><br /><b>'.&mt('Discussion postings').':</b><br />'); 
         my $navmap = Apache::lonnavmaps::navmap->new();
-        my @allres=$navmap->retrieveResources();
-        my %discussiontime = &Apache::lonnet::dump('discussiontimes',
-                               $env{'course.'.$env{'request.course.id'}.'.domain'},
-                               $env{'course.'.$env{'request.course.id'}.'.num'});
-        foreach my $resource (@allres) {
-            my $result = '';
-            my $applies = 0;
-            my $symb = $resource->symb();
-            my $ressymb = $symb;
-            if ($symb =~ m#(___adm/$LONCAPA::domain_re/$LONCAPA::username_re)/(\d+)/bulletinboard$#) {
-                $ressymb = 'bulletin___'.$2.$1.'/'.$2.'/bulletinboard';
-                unless ($ressymb =~ m#bulletin___\d+___adm/wrapper#) {
-                    $ressymb=~s#(bulletin___\d+___)#$1adm/wrapper/#;
+        if (defined($navmap)) {
+            my @allres=$navmap->retrieveResources();
+            my %discussiontime = &Apache::lonnet::dump('discussiontimes',
+                                   $env{'course.'.$env{'request.course.id'}.'.domain'},
+                                   $env{'course.'.$env{'request.course.id'}.'.num'});
+            foreach my $resource (@allres) {
+                my $result = '';
+                my $applies = 0;
+                my $symb = $resource->symb();
+                my $ressymb = $symb;
+                if ($symb =~ m#(___adm/$LONCAPA::domain_re/$LONCAPA::username_re)/(\d+)/bulletinboard$#) {
+                    $ressymb = 'bulletin___'.$2.$1.'/'.$2.'/bulletinboard';
+                    unless ($ressymb =~ m#bulletin___\d+___adm/wrapper#) {
+                        $ressymb=~s#(bulletin___\d+___)#$1adm/wrapper/#;
+                    }
                 }
-            }
-            if (defined($discussiontime{$ressymb})) { 
-                my %contrib = &Apache::lonnet::restore($ressymb,$env{'request.course.id'},
-                     $env{'course.'.$env{'request.course.id'}.'.domain'},
-                     $env{'course.'.$env{'request.course.id'}.'.num'});
-                if ($contrib{'version'}) {
-                    for (my $id=1;$id<=$contrib{'version'};$id++) {
-                        unless (($contrib{'hidden'}=~/\.$id\./) || ($contrib{'deleted'}=~/\.$id\./)) { 
-                            if ($contrib{$id.':subject'}) {
-                                $result .= $contrib{$id.':subject'};
-                            }
-                            if ($contrib{$id.':message'}) {
-                                $result .= $contrib{$id.':message'};
-                            }
-                            if ($contrib{$id,':attachmenturl'}) {
-                                if ($contrib{$id,':attachmenturl'} =~ m-/([^/]+)$-) {
-                                    $result .= $1;
+                if (defined($discussiontime{$ressymb})) { 
+                    my %contrib = &Apache::lonnet::restore($ressymb,$env{'request.course.id'},
+                         $env{'course.'.$env{'request.course.id'}.'.domain'},
+                         $env{'course.'.$env{'request.course.id'}.'.num'});
+                    if ($contrib{'version'}) {
+                        for (my $id=1;$id<=$contrib{'version'};$id++) {
+                            unless (($contrib{'hidden'}=~/\.$id\./) || ($contrib{'deleted'}=~/\.$id\./)) { 
+                                if ($contrib{$id.':subject'}) {
+                                    $result .= $contrib{$id.':subject'};
+                                }
+                                if ($contrib{$id.':message'}) {
+                                    $result .= $contrib{$id.':message'};
                                 }
+                                if ($contrib{$id,':attachmenturl'}) {
+                                    if ($contrib{$id,':attachmenturl'} =~ m-/([^/]+)$-) {
+                                        $result .= $1;
+                                    }
+                                }
+                                $applies = &checkwords($result,$applies,@allwords);
                             }
-                            $applies = &checkwords($result,$applies,@allwords);
                         }
                     }
                 }
-            }
 # Does this discussion apply?
-            if ($applies) {
-                my ($map,$ind,$url)=&Apache::lonnet::decode_symb($ressymb);
-                my $disctype = &mt('resource');
-                if ($url =~ m#/bulletinboard$#) {
-                    if ($url =~m#^adm/wrapper/adm/.*/bulletinboard$#) {
-                        $url =~s#^adm/wrapper##;
+                if ($applies) {
+                    my ($map,$ind,$url)=&Apache::lonnet::decode_symb($ressymb);
+                    my $disctype = &mt('resource');
+                    if ($url =~ m#/bulletinboard$#) {
+                        if ($url =~m#^adm/wrapper/adm/.*/bulletinboard$#) {
+                            $url =~s#^adm/wrapper##;
+                        }
+                        $disctype = &mt('discussion board');
+                    } else {
+                        $url = '/res/'.$url;
                     }
-                    $disctype = &mt('bulletin board');
-                } else {
-                    $url = '/res/'.$url;
-                }
-                if ($url =~ /\?/) {
-                    $url .= '&symb=';
+                    if ($url =~ /\?/) {
+                        $url .= '&amp;symb=';
+                    } else {
+                        $url .= '?symb=';
+                    }
+                    $url .= &escape($resource->symb());
+                    my $title = $resource->compTitle();
+                    $r->print('<br /><a href="'.$url.'" target="cat">'.
+                         ($title?$title:$url).'</a>&nbsp;&nbsp;-&nbsp;'.
+                         $disctype.'<br />');
+                    $totaldiscussions++;
                 } else {
-                    $url .= '?symb=';
+                    $r->print(' .');
                 }
-                $url .= &escape($resource->symb());
-                my $title = $resource->compTitle();
-                $r->print('<br /><a href="'.$url.'" target="cat">'.
-                     ($title?$title:$url).'</a>&nbsp;&nbsp;-&nbsp;'.$disctype.'<br />');
-                $totaldiscussions++;
-            } else {
-                $r->print(' .');
             }
-        }
-        unless ($totaldiscussions) {
-            $r->print('<p>'.&mt('No matches found in postings').'.</p>');
+            unless ($totaldiscussions) {
+                $r->print('<p>'.&mt('No matches found in postings').'.</p>');
+            }
+        } else {
+            $r->print('<div class="LC_error">'.&mt('An error occurred retrieving information about resources in the course.').'<br />'.&mt('It is recommended that you [_1]re-initialize the course[_2] and then try your search again.','<a href="/adm/roles">','</a>').'</div>');
         }
     }
  
@@ -685,7 +703,7 @@ sub print_basic_search_form {
     my $bread_crumb =
         &Apache::lonhtmlcommon::breadcrumbs('Searching','Search_Basic',
 					    $env{'form.catalogmode'} ne 'import');
-    my $scrout = &Apache::loncommon::start_page('Search').$bread_crumb;
+    my $scrout = &Apache::loncommon::start_page('Content Library').$bread_crumb;
 # Search form for resource space 
     if (&Apache::lonnet::allowed('bre',$env{'request.role.domain'})) {
         $scrout .= &setup_basic_search($r,'res',$hidden_fields,$closebutton);
@@ -699,7 +717,7 @@ sub print_basic_search_form {
 	 'note' => 'Enter terms or phrases, then press "Search" below',
 	 'use' => 'use related words',
 	 'full' =>'fulltext search (time consuming)',
-         'disc' => 'search discussion postings (resources and bulletin boards)',
+         'disc' => 'search discussion postings (resources and discussion boards)',
 					   );
         $scrout.=(<<ENDCOURSESEARCH);
 <form name="loncapa_search" method="post" action="/adm/searchcat">
@@ -762,14 +780,14 @@ sub setup_basic_search {
                         '</label>';
     $adv_search_link = '<a href="/adm/searchcat?'.
 	               &Apache::loncommon::inhibit_menu_check().
-		       '&phase=disp_adv'.
-                       '&catalogmode='.$env{'form.catalogmode'}.
-                       '&launch='.$env{'form.launch'}.
-                       '&mode='.$env{'form.mode'}.
-                       '&area='.$area.
-                       '&form='.$env{'form.form'}.
-                       '&titleelement='.$env{'form.titleelement'}.
-                       '&element='.$env{'form.element'}.
+		       '&amp;phase=disp_adv'.
+                       '&amp;catalogmode='.$env{'form.catalogmode'}.
+                       '&amp;launch='.$env{'form.launch'}.
+                       '&amp;mode='.$env{'form.mode'}.
+                       '&amp;area='.$area.
+                       '&amp;form='.$env{'form.form'}.
+                       '&amp;titleelement='.$env{'form.titleelement'}.
+                       '&amp;element='.$env{'form.element'}.
                        '">'.&mt('Advanced Search').'</a>';
     #
     $scrout.='<form name="loncapa_search" method="post" '.
@@ -921,7 +939,7 @@ ENDHEADER
 	&titlefield(&mt('Domains')).'</td><td colspan="2">'. 
 	    &Apache::loncommon::domain_select('domains',
 						   $env{'form.domains'},1).
-						   '<br /><label>';
+						   '<br />';
      $scrout .= '</td></tr>'.$/;
     #
     # Misc metadata
@@ -2235,16 +2253,15 @@ sub print_sort_form {
 <script type="text/javascript">
     function change_sort() {
         var newloc = "/adm/searchcat?phase=results";
-        newloc += "&persistent_db_id=$env{'form.persistent_db_id'}";
-        newloc += "&sortby=";
+        newloc += "&amp;persistent_db_id=$env{'form.persistent_db_id'}";
+        newloc += "&amp;sortby=";
         newloc += document.forms.statusform.elements.sortby.value;
         parent.resultsframe.location= newloc;
     }
 </script>
 END
 
-    my $start_page = &Apache::loncommon::start_page('Results',$js,
-						    {'no_title' => 1});
+    my $start_page = &Apache::loncommon::start_page('Results',$js);
     my $breadcrumbs=
         &Apache::lonhtmlcommon::breadcrumbs('Searching','Searching',
 					    $env{'form.catalogmode'} ne 'import');
@@ -2450,8 +2467,8 @@ sub revise_button {
     $revise_phase = 'disp_adv' if ($env{'form.searchmode'} eq 'advanced');
     my $newloc = '/adm/searchcat'.
         '?persistent_db_id='.$env{'form.persistent_db_id'}.
-            '&cleargroupsort=1'.
-            '&phase='.$revise_phase;
+            '&amp;cleargroupsort=1'.
+            '&amp;phase='.$revise_phase;
     my $result = qq{<input type="button" value="$revisetext" name="revise"} .
         qq{ onClick="parent.location='$newloc';" /> };
     return $result;
@@ -2482,8 +2499,7 @@ sub run_search {
     #
     # Print run_search header
     #
-    my $start_page = &Apache::loncommon::start_page('Search Status',undef,
-						    {'no_title' => 1});
+    my $start_page = &Apache::loncommon::start_page('Search Status',undef);
     my $breadcrumbs =
 	&Apache::lonhtmlcommon::breadcrumbs('Searching','Searching',
 					    $env{'form.catalogmode'} ne 'import');
@@ -2966,8 +2982,8 @@ sub display_results {
             ('<center>'.
              &prev_next_buttons($min,$env{'form.show'},$total_results,
                                 "table=".$env{'form.table'}.
-                                "&phase=results".
-                                "&persistent_db_id=".
+                                "&amp;phase=results".
+                                "&amp;persistent_db_id=".
                                 $env{'form.persistent_db_id'})
              ."</center>\n"
              );
@@ -3257,7 +3273,7 @@ SCRIPT
     }
     function select_group() {
 	parent.window.location=
-    "/adm/groupsort?mode=$env{'form.mode'}&catalogmode=import$inhibit_menu&acts="+
+    "/adm/groupsort?mode=$env{'form.mode'}&amp;catalogmode=import$inhibit_menu&amp;acts="+
 	    parent.statusframe.document.forms.statusform.elements.acts.value;
     }
 </script>
@@ -3274,10 +3290,10 @@ END
 }
 
 sub results_link {
-    my $basic_link   = "/adm/searchcat?"."&table=".$env{'form.table'}.
-        "&persistent_db_id=".$env{'form.persistent_db_id'};
-    my $results_link = $basic_link."&phase=results".
-        "&pause=1"."&start=1";
+    my $basic_link   = "/adm/searchcat?"."&amp;table=".$env{'form.table'}.
+        "&amp;persistent_db_id=".$env{'form.persistent_db_id'};
+    my $results_link = $basic_link."&amp;phase=results".
+        "&amp;pause=1"."&amp;start=1";
     return $results_link;
 }
 
@@ -3285,9 +3301,9 @@ sub results_link {
 ######################################################################
 sub print_frames_interface {
     my $r = shift;
-    my $basic_link = "/adm/searchcat?"."&table=".$env{'form.table'}.
-        "&persistent_db_id=".$env{'form.persistent_db_id'};
-    my $run_search_link = $basic_link."&phase=run_search";
+    my $basic_link = "/adm/searchcat?"."&amp;table=".$env{'form.table'}.
+        "&amp;persistent_db_id=".$env{'form.persistent_db_id'};
+    my $run_search_link = $basic_link."&amp;phase=run_search";
     my $results_link = &results_link();
     my $js = <<JS;
 <script type="text/javascript">
@@ -3471,7 +3487,7 @@ sub detailed_citation_view {
     if (exists($values{'shortabstract'}) && $values{'shortabstract'} ne '') {
         $result .= '<p>'.$values{'shortabstract'}.'</p>';
     }
-    $result .= '<hr align="left" width="200" noshade />'."\n";
+    $result .= '<hr />'."\n";
     return $result;
 }
 
@@ -3523,7 +3539,7 @@ $values{'author'}, $values{'owner'} -- $
 $values{'copyrighttag'}<br />
 $values{'extrashow'}
 </p>
-<hr align='left' width='200' noshade />
+<hr />
 END
     return $result;
 }
@@ -3556,7 +3572,7 @@ sub compact_view {
     my $link = &display_url($jumpurl,[1,1,1]);
     
     my $result = 
-        $prefix.'<img src="'.&Apache::loncommon::icon($values{'url'}).'">';
+        $prefix.'<img src="'.&Apache::loncommon::icon($values{'url'}).'" alt="" />';
     if (exists($env{'form.sortfield'}) && 
         $env{'form.sortfield'} !~ /^(default|author|url|title)$/) {
         my $tmp = $values{$env{'form.sortfield'}};
@@ -3633,7 +3649,7 @@ END
     }
     $result .= "</dl>\n";
     $result .= $values{'extrashow'};
-    $result .= '<hr align="left" width="200" noshade />'."\n";
+    $result .= '<hr />'."\n";
     return $result;
 }
 
@@ -3707,7 +3723,7 @@ $prefix
 $xml
 </pre>
 $values{'extrashow'}
-<hr align='left' width='200' noshade />
+<hr />
 END
     return $result;
 }
@@ -3767,7 +3783,7 @@ $closebutton
 $errorstring
 </p>
 <p>
-<a href="/adm/searchcat?$parms&persistent_db_id=$env{'form.persistent_db_id'}">$revise</a>
+<a href="/adm/searchcat?$parms&amp;persistent_db_id=$env{'form.persistent_db_id'}">$revise</a>
 </p>
 $end_page
 ENDPAGE
@@ -3811,7 +3827,7 @@ $closebutton
 $errormsg
 </p>
 <p>
-<a href="/adm/searchcat?$parms&persistent_db_id=$env{'form.persistent_db_id'}">$revise</a>&nbsp;
+<a href="/adm/searchcat?$parms&amp;persistent_db_id=$env{'form.persistent_db_id'}">$revise</a>&nbsp;
 </p>
 $end_page
 ENDPAGE