--- loncom/interface/lonsearchcat.pm	2011/02/15 14:54:51	1.329
+++ loncom/interface/lonsearchcat.pm	2012/05/10 18:34:18	1.331.4.1
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Search Catalog
 #
-# $Id: lonsearchcat.pm,v 1.329 2011/02/15 14:54:51 wenzelju Exp $
+# $Id: lonsearchcat.pm,v 1.331.4.1 2012/05/10 18:34:18 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -78,7 +78,6 @@ use HTML::Entities();
 use Parse::RecDescent;
 use Apache::lonnavmaps;
 use Apache::lonindexer();
-use Apache::lonwishlist();
 use LONCAPA;
 
 ######################################################################
@@ -152,7 +151,8 @@ sub handler {
     ## Initialize global variables
     ##
     my $domain  = $r->dir_config('lonDefDomain');
-    $diropendb= "/home/httpd/perl/tmp/".
+    my $temp_file_dir = LONCAPA::tempdir();
+    $diropendb= $temp_file_dir .
         "$env{'user.domain'}_$env{'user.name'}_sel_res.db";
     #
     # set the name of the persistent database
@@ -163,7 +163,7 @@ sub handler {
         $env{'form.persistent_db_id'} = time;
     }
 
-    my $persistent_db_file = "/home/httpd/perl/tmp/".
+    my $persistent_db_file = $temp_file_dir .
         &escape($domain).
             '_'.&escape($env{'user.name'}).
                 '_'.$env{'form.persistent_db_id'}.'_persistent_search.db';
@@ -2383,7 +2383,10 @@ END
                 next;
             }
             $status=~s|/||g;
-       	    my $datafile=$r->dir_config('lonDaemons').'/tmp/'.$status;
+
+
+
+       	    my $datafile=LONCAPA::tempdir().$status;
             if (-e $datafile && ! -e "$datafile.end") {
                 &update_status($r,&mt('Receiving results from [_1]',$server));
                 next;
@@ -3059,22 +3062,8 @@ SCRIPT
 </script>
 SCRIPT
 
-
-    # Add JavaScript-function to set link for a ressource to wishlist
-    $js.=<<SCRIPT;
-<script type="text/javascript">
-// <![CDATA[
-function set_wishlistlink(title, path){
-       Win = window.open('/adm/wishlist?mode=newLink&setTitle='+title+'&setPath='+path,
-                            'wishlistNewLink','width=560,height=350,scrollbars=0');
-}
-
-// ]]>
-</script>
-SCRIPT
-
     my $start_page  = &Apache::loncommon::start_page(undef,$js,
-						     {'only_body' =>1});
+						     {'only_body' =>1,});
     my $result=<<END;
 $start_page
 <form name="results" method="post" action="/adm/searchcat">
@@ -3193,11 +3182,7 @@ sub detailed_citation_view {
     $result .= '<b>'.$prefix.
         '<img src="'.&Apache::loncommon::icon($values{'url'}).'" alt="" />'.'&nbsp;'.
         '<a href="'.$jumpurl.'?inhibitmenu=yes" '.
-        'target="preview">'.$values{'title'}."</a></b>\n".
-        '<a href="javascript:;" onclick="set_wishlistlink('."'$values{'title'}','$jumpurl'".')" '.
-        'title="'.&mt('Set link to wishlist').'">'.
-        '<img class="LC_icon" src="/res/adm/pages/wishlist.png" '.
-        'alt="set wishlistlink" style="width:22px;"/></a>';
+        'target="preview">'.$values{'title'}."</a></b>\n";
     $result .= "<p>\n";
     $result .= '<b>'.$values{'author'}.'</b>,'.
         ' <i>'.$values{'owner'}.'</i><br />';
@@ -3328,15 +3313,9 @@ sub summary_view {
     $jumpurl=~s|^/ext/|http://|;
     my $link = '<br />'.&display_url($jumpurl,1).'<br />';
 
-    my $titleWL = &mt('Set link to wishlist');
     $result.=<<END;
 <a href="$jumpurl?inhibitmenu=yes" 
    target="preview">$values{'title'}</a>
-<a href="javascript:;" onclick="set_wishlistlink('$values{'title'}','$jumpurl')" 
-   title="$titleWL">
-   <img class="LC_icon" src="/res/adm/pages/wishlist.png"
-        alt="set wishlistlink" style="width:22px;"/>
-</a>
 <br />
 $link<br />
 $values{'author'}, $values{'owner'} -- $values{'lastrevisiondate'}<br />
@@ -3383,11 +3362,6 @@ sub compact_view {
     $result.=' <span class="LC_nobreak">'.
 	'<a href="'.$jumpurl.'?inhibitmenu=yes" target="preview">'.
         &HTML::Entities::encode($values{'title'},'<>&"').'</a></span> '.
-        '<a href="javascript:;" onclick="set_wishlistlink('."'$values{'title'}','$jumpurl'".')" '.
-        'title="'.&mt('Set link to wishlist').'">'.
-        '<img class="LC_icon" src="/res/adm/pages/wishlist.png" '.
-        'alt="set wishlistlink" style="width:22px;"/>'.
-        '</a>'.
 	$link.' <b>'.$values{'author'}.'</b> ('.$values{'domain'}.')';
     return $result;
 }
@@ -3429,18 +3403,12 @@ sub fielded_format_view {
     my $jumpurl=$values{'url'};
     $jumpurl=~s|^/ext/|http://|;
 
-    my $titleWL = ('Set link to wishlist');
     my $result=<<END;
 $prefix <img src="$icon" alt="" />
 <dl>
 <dt>URL:</dt>
     <dd><a href="$jumpurl?inhibitmenu=yes" 
          target='preview'>$values{'url'}</a>
-         <a href="javascript:;" onclick="set_wishlistlink('$values{'title'}','$jumpurl')"
-            title="$titleWL">
-            <img class="LC_icon" src="/res/adm/pages/wishlist.png"
-            alt="set wishlistlink" style="width:22px;"/>
-         </a>
     </dd>
 END
     foreach my $field ('title','author','domain','subject','keywords','notes',