--- loncom/interface/lonsearchcat.pm	2005/04/07 07:34:52	1.245
+++ loncom/interface/lonsearchcat.pm	2005/11/29 20:37:06	1.249
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Search Catalog
 #
-# $Id: lonsearchcat.pm,v 1.245 2005/04/07 07:34:52 albertel Exp $
+# $Id: lonsearchcat.pm,v 1.249 2005/11/29 20:37:06 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -283,12 +283,7 @@ END
     ## Sanity checks on form elements
     ##
     if (!defined($env{'form.viewselect'})) {
-        if (($env{'form.catalogmode'} eq 'groupsearch') ||
-            ($env{'form.catalogmode'} eq 'interactive')) {
-            $env{'form.viewselect'} ="Compact View";
-        } else {
-            $env{'form.viewselect'} ="Detailed Citation View";
-        }
+	$env{'form.viewselect'} ="summary";
     }
     $env{'form.phase'} = 'disp_basic' if (! exists($env{'form.phase'}));
     $env{'form.show'} = 20 if (! exists($env{'form.show'}));
@@ -708,6 +703,10 @@ sub print_basic_search_form {
                                                  ),
                 $r->dir_config('lonDefDomain')
                 ).'</label>';
+        my $inclext= '<label>'.
+            &mt('[_1] include external resources',
+                &Apache::lonhtmlcommon::checkbox
+                ('inclext',$env{'form.inclext'})).'</label>';
         my $adv_search_link = 
             '<a href="/adm/searchcat?'.
             'phase=disp_adv&'.
@@ -740,7 +739,8 @@ sub print_basic_search_form {
             '<nobr>'.('&nbsp;'x3).$adv_search_link.'</nobr>'.'<br />'.
             '<nobr>'.('&nbsp;'x1).$userelatedwords.'</nobr>'.'<br />'.
             '<nobr>'.('&nbsp;'x1).$onlysearchdomain.'</nobr>'.'<br />'.
-            '</font></td>'.
+            '<nobr>'.('&nbsp;'x1).$inclext.'</nobr>'.'<br />'.
+             '</font></td>'.
             '</tr>'.$/;
         #
         $scrout .= '<tr><td align="center" colspan="2">'.
@@ -860,10 +860,12 @@ ENDHEADER
          'abstract' => 1,
          'standards'=> 1,
          'mime'     => 1,
+	 'subject'  => 1,
          );
     #
-    foreach my $field ('title','author','owner','authorspace','modifyinguser',
-	     'keywords','notes','abstract','standards','mime') {
+    foreach my $field ('title','author','subject','owner','authorspace',
+		       'modifyinguser','keywords','notes','abstract',
+		       'standards','mime') {
 	$scrout.='<tr><td align="right">'.&titlefield($fields{$field}).'</td><td>'.
 	    &Apache::lonmeta::prettyinput($field,
                                           $env{'form.'.$field},
@@ -900,7 +902,10 @@ ENDHEADER
 	&titlefield(&mt('Domains')).'</td><td colspan="2">'. 
 	    &Apache::loncommon::domain_select('domains',
 						   $env{'form.domains'},1).
-	    '</td></tr>'.$/;
+						   '<br /><label>'.
+            &mt('[_1] include external resources',
+                &Apache::lonhtmlcommon::checkbox
+                ('inclext',$env{'form.inclext'})).'</label></td></tr>'.$/;
     #
     # Misc metadata
     $scrout.='<tr><td align="right" valign="top">'.
@@ -2520,8 +2525,11 @@ END
                     my %Fields = &parse_raw_result($result,$server);
                     $Fields{'hostname'} = $server;
                     #
+                    # Skip if external and we did not want that
+                    next if ((! $env{'form.inclext'}) && ($Fields{'url'}=~/^\/ext\//));
                     # Skip based on copyright
                     next if (! &copyright_check(\%Fields));
+
                     #
                     # Store the result in the mysql database
                     my $result = &Apache::lonmysql::store_row($table,\%Fields);
@@ -2723,7 +2731,15 @@ sub display_results {
     }
     my %sort_fields = map {$_->{'key'},$_->{'desc'}} @fields;
     $sort_fields{'select_form_order'} = \@field_order;
-    $env{'form.sortorder'} = 'asc' if (! exists($env{'form.sortorder'}));
+    $env{'form.sortorder'} = 'desc' if (! exists($env{'form.sortorder'}));
+    $env{'form.sortfield'} = 'count' if (! exists($env{'form.sortfield'}));
+    if (! exists($env{'form.sortorder'})) {
+	if ($env{'form.sortfield'}=~/^(count|stdno|disc|clear|technical|correct|helpful)$/) {
+	    $env{'form.sortorder'}='desc';
+	} else {
+	    $env{'form.sortorder'}='asc';
+	}
+    }
     my $sortform = &mt('Sort by [_1] [_2]',
                        &Apache::loncommon::select_form($env{'form.sortfield'},
                                                       'sortfield',
@@ -2774,7 +2790,7 @@ sub display_results {
         exists($sort_fields{$env{'form.sortfield'}})) {
         $sort_command = $env{'form.sortfield'}.' IS NOT NULL '.
             'ORDER BY '.$env{'form.sortfield'}.' '.$order.
-            '  LIMIT '.($min-1).','.($max-$min);
+            '  LIMIT '.($min-1).','.($max-$min+1);
     }
     my @Results = &Apache::lonmysql::get_rows($table,$sort_command);
     ##
@@ -3220,9 +3236,11 @@ extra custom metadata to show.
 sub detailed_citation_view {
     my ($prefix,%values) = @_;
     my $result;
+    my $jumpurl=$values{'url'};
+    $jumpurl=~s/^\/ext\//http\:\/\//;
     $result .= '<b>'.$prefix.
         '<img src="'.&Apache::loncommon::icon($values{'url'}).' " />'.'&nbsp;'.
-        '<a href="http://'.$ENV{'HTTP_HOST'}.$values{'url'}.'" '.
+        '<a href="'.$jumpurl.'" '.
         'target="search_preview">'.$values{'title'}."</a></b>\n";
     $result .= "<p>\n";
     $result .= '<b>'.$values{'author'}.'</b>,'.
@@ -3291,7 +3309,7 @@ sub detailed_citation_view {
             foreach my $item (split(',',$values{$field->{'name'}})){
                 $result .= '<li>'.
                     '<a target="search_preview" '.
-                    'href="/res/'.$item.'">'.$item.'</a></li>';
+                    'href="'.$jumpurl.'">'.$item.'</a></li>';
             }
             $result .= '</ul>';
         } elsif (exists($field->{'format'}) && $field->{'format'} ne ''){
@@ -3302,7 +3320,7 @@ sub detailed_citation_view {
             if ($field->{'special'} eq 'url link') {
                 $result.= 
                      &mt($field->{'translate'},
-                         '<a href="'.$values{'url'}.'" '.
+                         '<a href="'.$jumpurl.'" '.
                          'target="search_preview">'.
                          $values{$field->{'name'}}.
                          '</a>');
@@ -3350,8 +3368,11 @@ sub summary_view {
         if (! defined($tmp)) { $tmp = 'undefined'; }
         $result .= '&nbsp;'.$tmp.'&nbsp;';
     }
+    my $jumpurl=$values{'url'};
+    $jumpurl=~s/^\/ext\//http\:\/\//;
+
     $result.=<<END;
-<a href="http://$ENV{'HTTP_HOST'}$values{'url'}" 
+<a href="$jumpurl" 
    target='search_preview'>$values{'title'}</a><br />
 $values{'author'}, $values{'owner'} -- $values{'lastrevisiondate'}<br />
 $values{'copyrighttag'}<br />
@@ -3375,6 +3396,9 @@ END
 ######################################################################
 sub compact_view {
     my ($prefix,%values) = @_;
+    my $jumpurl=$values{'url'};
+    $jumpurl=~s/^\/ext\//http\:\/\//;
+
     my $result = 
         $prefix.'<img src="'.&Apache::loncommon::icon($values{'url'}).'">';
     if (exists($env{'form.sortfield'}) && 
@@ -3383,9 +3407,9 @@ sub compact_view {
         if (! defined($tmp)) { $tmp = 'undefined'; }
         $result .= '&nbsp;'.$tmp.'&nbsp;';
     }
-    $result.='&nbsp;<a href="'.$values{'url'}.'" target="search_preview">'.
+    $result.='&nbsp;<a href="'.$jumpurl.'" target="search_preview">'.
         $values{'title'}.'</a>'.('&nbsp;'x2).
-        '<b>'.$values{'author'}.'</b><br />';
+        '<b>'.$values{'author'}.'</b> ('.$values{'domain'}.')<br />';
     return $result;
 }
 
@@ -3405,11 +3429,14 @@ sub fielded_format_view {
     my ($prefix,%values) = @_;
     my $icon=&Apache::loncommon::icon($values{'url'});
     my %Translated = &Apache::lonmeta::fieldnames();
+    my $jumpurl=$values{'url'};
+    $jumpurl=~s/^\/ext\//http\:\/\//;
+
     my $result=<<END;
 $prefix <img src="$icon" />
 <dl>
 <dt>URL:</dt>
-    <dd><a href="http://$ENV{'HTTP_HOST'}$values{'url'}" 
+    <dd><a href="$jumpurl" 
          target='search_preview'>$values{'url'}</a></dd>
 END
     foreach my $field ('title','author','domain','subject','keywords','notes',