--- loncom/interface/lonsearchcat.pm	2006/06/08 07:20:41	1.266
+++ loncom/interface/lonsearchcat.pm	2006/06/08 13:56:31	1.267
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Search Catalog
 #
-# $Id: lonsearchcat.pm,v 1.266 2006/06/08 07:20:41 www Exp $
+# $Id: lonsearchcat.pm,v 1.267 2006/06/08 13:56:31 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -215,7 +215,7 @@ sub handler {
     untie %groupsearch_db if (tied(%groupsearch_db));
     if (($env{'form.cleargroupsort'} eq '1') || 
         (($env{'form.launch'} eq '1') && 
-         ($env{'form.catalogmode'} eq 'groupsearch'))) {
+         ($env{'form.catalogmode'} eq 'import'))) {
 	if (tie(%groupsearch_db,'GDBM_File',$diropendb,&GDBM_WRCREAT(),0640)) {
 	    &start_fresh_session();
 	    untie %groupsearch_db;
@@ -260,7 +260,7 @@ sub handler {
             $closebutton .="onClick='self.close()'";
         }
         $closebutton .=">\n";
-    } elsif ($env{'form.catalogmode'} eq 'groupsearch') {
+    } elsif ($env{'form.catalogmode'} eq 'import') {
         $closebutton="<input type='button' name='close' value='CLOSE' ";
         if ($env{'form.phase'} =~ /(results|run_search)/) {
 	    $closebutton .="onClick='parent.close()'";
@@ -660,10 +660,10 @@ Prints the form for the basic search.  S
 ######################################################################
 sub print_basic_search_form {
     my ($r,$closebutton,$hidden_fields) = @_;
-    my $result = ($env{'form.catalogmode'} ne 'groupsearch');
+    my $result = ($env{'form.catalogmode'} ne 'import');
     my $bread_crumb =
         &Apache::lonhtmlcommon::breadcrumbs('Searching','Search_Basic',
-					    $env{'form.catalogmode'} ne 'groupsearch');
+					    $env{'form.catalogmode'} ne 'import');
     my $scrout = &Apache::loncommon::start_page('Search').$bread_crumb;
     if (&Apache::lonnet::allowed('bre',$env{'request.role.domain'})) {
         # Define interface components
@@ -794,7 +794,7 @@ sub print_advanced_search_form{
     my ($r,$closebutton,$hidden_fields) = @_;
     my $bread_crumb = 
         &Apache::lonhtmlcommon::breadcrumbs('Searching','Search_Advanced',
-					    $env{'form.catalogmode'} ne 'groupsearch');
+					    $env{'form.catalogmode'} ne 'import');
     my %lt=&Apache::lonlocal::texthash('srch' => 'Search',
 				       'reset' => 'Reset',
 				       'help' => 'Help');
@@ -2107,12 +2107,12 @@ END
 						    {'only_body' => 1});
     my $breadcrumbs=
         &Apache::lonhtmlcommon::breadcrumbs('Searching','Searching',
-					    $env{'form.catalogmode'} ne 'groupsearch');
+					    $env{'form.catalogmode'} ne 'import');
 
     my $result = <<END;
 $start_page
 $breadcrumbs
-<form name="statusform" action="" method="POST">
+<form name="statusform" action="" method="post" target="_top">
 <input type="hidden" name="Queue" value="" />
 END
 
@@ -2337,7 +2337,7 @@ sub run_search {
 						    {'only_body' => 1});
     my $breadcrumbs =
 	&Apache::lonhtmlcommon::breadcrumbs('Searching','Searching',
-					    $env{'form.catalogmode'} ne 'groupsearch');
+					    $env{'form.catalogmode'} ne 'import');
     $r->print(<<END);
 $start_page
 $breadcrumbs
@@ -2527,7 +2527,7 @@ END
     # results to get, so let the client know the top frame needs to be
     # loaded from /adm/searchcat
     $r->print(&Apache::loncommon::end_page());
-#    if ($env{'form.catalogmode'} ne 'groupsearch') {
+#    if ($env{'form.catalogmode'} ne 'import') {
         $r->print("<script>".
                       "window.location='/adm/searchcat?".
                       "phase=sort&".
@@ -2594,15 +2594,15 @@ sub display_results {
     }
     ##
     ## $checkbox_num is a count of the number of checkboxes output on the 
-    ## page this is used only during catalogmode=groupsearch.
+    ## page this is used only during catalogmode=import.
     my $checkbox_num = 0;
     ##
     ## Get the catalog controls setup
     ##
     my $action = "/adm/searchcat?phase=results";
     ##
-    ## Deal with groupsearch by opening the groupsearch db file.
-    if ($env{'form.catalogmode'} eq 'groupsearch') {
+    ## Deal with import by opening the import db file.
+    if ($env{'form.catalogmode'} eq 'import') {
         if (! tie(%groupsearch_db,'GDBM_File',$diropendb,
                   &GDBM_WRCREAT(),0640)) {
             $r->print('Unable to store import results.</form>'.
@@ -2825,7 +2825,7 @@ onClick="javascript:select_data('$title'
 </font>
 END
         }
-    } elsif ($env{'form.catalogmode'} eq 'groupsearch') {
+    } elsif ($env{'form.catalogmode'} eq 'import') {
         $groupsearch_db{"pre_${fnum}_link"}=$url;
         $groupsearch_db{"pre_${fnum}_title"}=$title;
         $output.=<<END;
@@ -2964,7 +2964,7 @@ The following environment variables are
 
 =item 'form.catalogmode' 
 
-Checked for 'interactive' and 'groupsearch'.
+Checked for 'interactive' and 'import'.
 
 =item 'form.mode'
 
@@ -3056,7 +3056,7 @@ function changeURL(val) {
 SCRIPT
         }
     }
-    $js.=<<SCRIPT if $env{'form.catalogmode'} eq 'groupsearch';
+    $js.=<<SCRIPT if $env{'form.catalogmode'} eq 'import';
 <script type="text/javascript">
     function queue(checkbox_num,val) {
         if (document.forms.results.returnvalues.length != "undefined" &&
@@ -3076,7 +3076,7 @@ SCRIPT
     }
     function select_group() {
 	parent.window.location=
-    "/adm/groupsort?mode=$env{'form.mode'}&catalogmode=groupsearch&acts="+
+    "/adm/groupsort?mode=$env{'form.mode'}&catalogmode=import&acts="+
 	    parent.statusframe.document.forms.statusform.elements.Queue.value;
     }
 </script>
@@ -3086,8 +3086,7 @@ SCRIPT
 						     {'only_body' =>1});
     my $result=<<END;
 $start_page
-<form name="results" method="post" action="/adm/searchcat" >
-<input type="hidden" name="Queue" value="" />
+<form name="results" method="post" action="/adm/searchcat">
 $importbutton
 END
     return $result;
@@ -3211,7 +3210,7 @@ sub detailed_citation_view {
     my $jumpurl=$values{'url'};
     $jumpurl=~s/^\/ext\//http\:\/\//;
     $result .= '<b>'.$prefix.
-        '<img src="'.&Apache::loncommon::icon($values{'url'}).' " />'.'&nbsp;'.
+        '<img src="'.&Apache::loncommon::icon($values{'url'}).'" />'.'&nbsp;'.
         '<a href="'.$jumpurl.'" '.
         'target="search_preview">'.$values{'title'}."</a></b>\n";
     $result .= "<p>\n";
@@ -3277,25 +3276,25 @@ sub detailed_citation_view {
         next if (! exists($values{$field->{'name'}}) ||
                  $values{$field->{'name'}} eq '');
         if (exists($field->{'type'}) && $field->{'type'} eq 'list') {
-            $result .= '<b>'.&mt($field->{'translate'}).'</b><ul>';
+            $result .= '<b>'.&mt($field->{'translate'}).'</b>';
             foreach my $item (split(',',$values{$field->{'name'}})){
-                $result .= '<li>'.
-                    '<a target="search_preview" '.
-                    'href="'.$jumpurl.'">'.$item.'</a></li>';
+                $result .= 
+		  &Apache::lonhtmlcommon::crumbs($item,
+		  (($env{'form.catalogmode'} eq 'import')?'_top':'preview'),
+		  '/res',
+		  (($env{'form.catalogmode'} eq 'import')?'parent.statusframe.document.forms.statusform':''),1);
             }
-            $result .= '</ul>';
         } elsif (exists($field->{'format'}) && $field->{'format'} ne ''){
             $result.= &mt($field->{'translate'},
                           sprintf($field->{'format'},
                                   $values{$field->{'name'}}))."<br />\n";
         } else {
             if ($field->{'special'} eq 'url link') {
-                $result.= 
-                     &mt($field->{'translate'},
-                         '<a href="'.$jumpurl.'" '.
-                         'target="search_preview">'.
-                         $values{$field->{'name'}}.
-                         '</a>');
+                $result.=
+		  &Apache::lonhtmlcommon::crumbs($jumpurl,
+		  (($env{'form.catalogmode'} eq 'import')?'_top':'preview'),
+		  '',
+		  (($env{'form.catalogmode'} eq 'import')?'parent.statusframe.document.forms.statusform':''),1);
             } else {
                 $result.= &mt($field->{'translate'},
                               $values{$field->{'name'}});
@@ -3352,10 +3351,14 @@ sub summary_view {
     }
     my $jumpurl=$values{'url'};
     $jumpurl=~s/^\/ext\//http\:\/\//;
+    my $link=&Apache::lonhtmlcommon::crumbs($jumpurl,
+		  (($env{'form.catalogmode'} eq 'import')?'_top':'preview'),
+		  '',
+		  (($env{'form.catalogmode'} eq 'import')?'parent.statusframe.document.forms.statusform':''),1);
 
     $result.=<<END;
 <a href="$jumpurl" 
-   target='search_preview'>$values{'title'}</a><br />
+   target='search_preview'>$values{'title'}</a>$link
 $values{'author'}, $values{'owner'} -- $values{'lastrevisiondate'}<br />
 $values{'copyrighttag'}<br />
 $values{'extrashow'}
@@ -3389,7 +3392,10 @@ sub compact_view {
     my ($prefix,%values) = @_;
     my $jumpurl=$values{'url'};
     $jumpurl=~s/^\/ext\//http\:\/\//;
-
+    my $link=&Apache::lonhtmlcommon::crumbs($jumpurl,
+		  (($env{'form.catalogmode'} eq 'import')?'_top':'preview'),
+		  '',
+		  (($env{'form.catalogmode'} eq 'import')?'parent.statusframe.document.forms.statusform':''),1);
     my $result = 
         $prefix.'<img src="'.&Apache::loncommon::icon($values{'url'}).'">';
     if (exists($env{'form.sortfield'}) && 
@@ -3399,7 +3405,7 @@ sub compact_view {
         $result .= '&nbsp;'.$tmp.'&nbsp;';
     }
     $result.='&nbsp;<a href="'.$jumpurl.'" target="search_preview">'.
-        $values{'title'}.'</a>'.('&nbsp;'x2).
+        $values{'title'}.'</a>'.('&nbsp;'x2).$link.
         '<b>'.$values{'author'}.'</b> ('.$values{'domain'}.')<br />';
     return $result;
 }