--- loncom/interface/lonsearchcat.pm	2005/04/07 06:59:55	1.244
+++ loncom/interface/lonsearchcat.pm	2005/11/26 02:42:45	1.247
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Search Catalog
 #
-# $Id: lonsearchcat.pm,v 1.244 2005/04/07 06:59:55 albertel Exp $
+# $Id: lonsearchcat.pm,v 1.247 2005/11/26 02:42:45 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -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},
@@ -1557,12 +1559,7 @@ sub parse_domain_restrictions {
     if (! exists($env{'form.domains'}) || $env{'form.domains'} eq '') {
         return (undef,'',undef);
     }
-    my @allowed_domains;
-    if (ref($env{'form.domains'})) {
-        @allowed_domains =  @{$env{'form.domains'}};
-    } else {
-        @allowed_domains = ($env{'form.domains'});
-    }
+    my @allowed_domains = &Apache::loncommon::get_env_multiple('form.domains');
     #
     my %domain_hash = ();
     my $pretty_domains_string;
@@ -3225,9 +3222,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>,'.
@@ -3296,7 +3295,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 ''){
@@ -3307,7 +3306,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>');
@@ -3355,8 +3354,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 />
@@ -3380,6 +3382,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'}) && 
@@ -3388,9 +3393,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;
 }
 
@@ -3410,11 +3415,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',