--- loncom/interface/lonsearchcat.pm	2011/01/17 20:18:02	1.327
+++ loncom/interface/lonsearchcat.pm	2011/12/09 01:04:27	1.331
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Search Catalog
 #
-# $Id: lonsearchcat.pm,v 1.327 2011/01/17 20:18:02 www Exp $
+# $Id: lonsearchcat.pm,v 1.331 2011/12/09 01:04:27 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -78,6 +78,7 @@ use HTML::Entities();
 use Parse::RecDescent;
 use Apache::lonnavmaps;
 use Apache::lonindexer();
+use Apache::lonwishlist();
 use LONCAPA;
 
 ######################################################################
@@ -151,7 +152,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
@@ -162,7 +164,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';
@@ -2382,7 +2384,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;
@@ -3058,91 +3063,9 @@ SCRIPT
 </script>
 SCRIPT
 
-    # HTML-Markup for 'Set a link for this resource to wishlist'
-    # this is written via JavaScript document.write (function set_wishlistlink) 
-    # it is split into 3 parts and the inputfields for title and path are left out
-    # these fields are inserted later to set the values for title and path
-    # automatically via JavaScript (document.title and location.pathname) 
-    my %folders = &Apache::lonnet::get('wishlist',['folders']);
-    if ($folders{'folders'} eq '') {
-        $folders{'folders'} = '<option value="" selected="selected">('.&mt('Top level').')</option>';
-    }
-    my $start_page_wishlistlink = 
-        &Apache::loncommon::start_page('Set link to wishlist',undef,
-				       {'only_body' => 1,
-					'js_ready'  => 1,
-					'bgcolor'   => '#FFFFFF',});
-
-    my $warningLink = &mt('You must insert a title!');
-
-    my $in_page_wishlistlink1 = '<h1>'.&mt('Set a link to wishlist').'</h1>'.
-                                '<form method="post" name="newlink" action="/adm/wishlist?mode=set" '.
-                                'onsubmit="return newlinksubmit();" >'.
-                                &Apache::lonhtmlcommon::start_pick_box().
-                                &Apache::lonhtmlcommon::row_title(&mt('Link Title'));
-
-    my $in_page_wishlistlink2 = &Apache::lonhtmlcommon::row_closure().
-                                &Apache::lonhtmlcommon::row_title(&mt('Path'));
-
-    my $in_page_wishlistlink3 = &Apache::lonhtmlcommon::row_closure().
-                                &Apache::lonhtmlcommon::row_title(&mt('Note')).
-                                '<textarea name="note" rows="3" cols="35" style="width:100%"></textarea>'.
-                                &Apache::lonhtmlcommon::row_closure(1).
-                                &Apache::lonhtmlcommon::end_pick_box().
-                                '<br/><br/>'.
-                                '<input type="submit" value="'.&mt('Save in').'" />'.
-                                '<select name="folders">'.
-                                $folders{'folders'}.
-                                '</select>'.
-                                '<input type="button" value="'.&mt('cancel').'" onclick="javascript:window.close();" />'.
-                                '</form>';
-
-    # remove all \n for inserting on javascript document.write
-    $in_page_wishlistlink1 =~ s/\n//g;
-    $in_page_wishlistlink2 =~ s/\n//g;
-    $in_page_wishlistlink3 =~ s/\n//g;
-
-    my $end_page_wishlistlink = 
-       &Apache::loncommon::end_page({'js_ready' => 1});
-
-    # Add JavaScript-function to set link for a ressource to wishlist
-    $js.=<<SCRIPT;
-<script type="text/javascript">
-// <![CDATA[
-function set_wishlistlink(title, path){
-   if(!title){
-       title=document.title;
-   }
-   if(!path){
-       path=location.pathname;
-   }
-   wishlistlink=window.open('','wishlistNewLink','width=560,height=350,scrollbars=0');
-   wishlistlink.document.write(
-   '$start_page_wishlistlink'
-   +'<script type="text\/javascript">'
-   +'function newlinksubmit(){'
-   +'var title = document.getElementsByName("title")[0].value;'
-   +'if (!title) {'
-   +'alert("$warningLink");'
-   +'return false;}'
-   +'return true;}'
-   +'<\/scr'+'ipt>'
-   +'$in_page_wishlistlink1'
-   +'<input type="text" name="title" size="45" value="'+title+'"/>'
-   +'$in_page_wishlistlink2'
-   +'<input type="text" name="path" size="45" value="'+path+'" '
-   +'readonly="readonly" style="background-color: #DDDDDD"/>'
-   +'$in_page_wishlistlink3'
-   +'$end_page_wishlistlink' );
-   wishlistlink.document.close();
-}
-
-// ]]>
-</script>
-SCRIPT
-
     my $start_page  = &Apache::loncommon::start_page(undef,$js,
-						     {'only_body' =>1});
+						     {'only_body' =>1,
+                                                      'add_wishlist' =>1});
     my $result=<<END;
 $start_page
 <form name="results" method="post" action="/adm/searchcat">