--- loncom/interface/lonsearchcat.pm	2010/08/13 13:32:36	1.325
+++ 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.325 2010/08/13 13:32:36 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
 #
@@ -151,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
@@ -162,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';
@@ -173,18 +174,9 @@ sub handler {
     if (&Apache::lonnet::allowed('bre',$env{'request.role.domain'})) {
         push(@allowed_searches,'res');
     } 
-    if (exists($env{'request.course.id'}) && $env{'request.course.id'} ne '') {
-        push(@allowed_searches,'course');
-    }
     my $crumb_text = 'Portfolio Search';
-    if (@allowed_searches == 3) {
-        $crumb_text = 'Course, Portfolio and Catalog Search';
-    } elsif (@allowed_searches ==2) {
-        if (grep(/^res$/,@allowed_searches)) {
-            $crumb_text = 'Portfolio and Catalog Search'; 
-        } elsif (grep(/^course$/,@allowed_searches)) {
-            $crumb_text = 'Portfolio and Course Search';
-        }
+    if (@allowed_searches ==2) {
+       $crumb_text = 'Portfolio and Catalog Search'; 
     }
     &Apache::lonhtmlcommon::add_breadcrumb
        ({href=>'/adm/searchcat?'.
@@ -301,8 +293,6 @@ END
     if ($env{'form.phase'} eq 'adv_search' ||
         $env{'form.phase'} eq 'disp_adv') {
         $env{'form.searchmode'} = 'advanced';
-    } elsif ($env{'form.phase'} eq 'course_search') {
-        $env{'form.searchmode'} = 'course_search';
     }
     #
     if ($env{'form.searchmode'} eq 'advanced') {
@@ -318,16 +308,7 @@ END
                   '&mode='.$env{'form.mode'},
                   text=>"Advanced $srchtype Search",
                   bug=>'Searching',});
-    } elsif ($env{'form.searchmode'} eq 'course search') {
-        &Apache::lonhtmlcommon::add_breadcrumb
-            ({href=>'/adm/searchcat?'.&Apache::loncommon::inhibit_menu_check().
-                  '&phase=disp_adv'.
-                  '&catalogmode='.$env{'form.catalogmode'}.
-                  '&launch='.$env{'form.launch'}.
-                  '&mode='.$env{'form.mode'},
-                  text=>"Course Search",
-                  bug=>'Searching',});
-    }
+    } 
     ##
     ## Switch on the phase
     ##
@@ -349,8 +330,6 @@ END
             &run_search($r,$query,$customquery,$customshow,
                         $libraries,$pretty_string,$env{'form.area'});
         }
-    } elsif ($env{'form.phase'} eq 'course_search') {
-        &course_search($r);
     } elsif(($env{'form.phase'} eq 'basic_search') ||
             ($env{'form.phase'} eq 'adv_search')) {
         #
@@ -446,244 +425,6 @@ sub hidden_field {
 }
 
 ######################################################################
-######################################################################
-##
-##   Course Search
-##
-######################################################################
-######################################################################
-{   # Scope the course search to avoid global variables
-#
-# Variables For course search
-my %alreadyseen;
-my %hash;
-my $totalfound;
-
-sub make_symb {
-    my ($id)=@_;
-    my ($mapid,$resid)=split(/\./,$id);
-    my $map=$hash{'map_id_'.$mapid};
-    my $res=$hash{'src_'.$id};
-    my $symb=&Apache::lonnet::encode_symb($map,$resid,$res);
-    return $symb;
-}
-
-sub course_search {
-    my $r=shift;
-    my $pretty_search_string = '<b>'.$env{'form.courseexp'}.'</b>';
-    my $search_string = $env{'form.courseexp'};
-    my @New_Words;
-    undef(%alreadyseen);
-    if ($env{'form.crsrelated'}) {
-        ($search_string,@New_Words) = &related_version($env{'form.courseexp'});
-        if (@New_Words) {
-            $pretty_search_string .= ' '.&mt("with related words").": <b>@New_Words</b>.";
-        } else {
-            $pretty_search_string .= ' '.&mt('with no related words').".";
-        }
-    }
-    my $fulltext=$env{'form.crsfulltext'};
-    my $discuss=$env{'form.crsdiscuss'};
-    my @allwords=($search_string,@New_Words);
-    $totalfound=0;
-
-    &Apache::lonhtmlcommon::add_breadcrumb
-        ({href=>'/adm/searchcat?'.&Apache::loncommon::inhibit_menu_check().
-              '&amp;phase=disp_adv'.
-              '&amp;catalogmode='.$env{'form.catalogmode'}.
-              '&amp;launch='.$env{'form.launch'}.
-              '&amp;mode='.$env{'form.mode'},
-              text=>"Course Search",
-              bug=>'Searching',});
-    $r->print(&Apache::loncommon::start_page('Course Search'));
-    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Searching','Searching',
-                        $env{'form.catalogmode'} ne 'import'));
-
-    $r->print(
-	      '<hr /><center><font size="+2" face="arial">'.
-	      $pretty_search_string.'</font></center>'.
-	      '<hr /><b>'.&mt('Course content').':</b><br />');
-    $r->rflush();
-# ======================================================= Go through the course
-    my $c=$r->connection;
-    if (tie(%hash,'GDBM_File',$env{'request.course.fn'}.".db",
-            &GDBM_READER(),0640)) {
-        foreach (sort(keys(%hash))) {
-            if ($c->aborted()) { last; }
-            if (($_=~/^src\_(.+)$/)) {
-		if ($hash{'randomout_'.$1} & !$env{'request.role.adv'}) {
-		    next; 
-		}
-		my $symb=&make_symb($1);
-                &checkonthis($r,$1,$hash{$_},0,&Apache::lonnet::gettitle($symb),
-			     $fulltext,$symb,@allwords);
-            }
-        }
-        untie(%hash);
-    }
-    unless ($totalfound) {
-	$r->print('<p class="LC_info">'.&mt('No matches found in resources.').'</p>');
-    }
-
-# Check discussions if requested
-    if ($discuss) {
-        my $totaldiscussions = 0;
-        $r->print('<br /><br /><b>'.&mt('Discussion postings').':</b><br />'); 
-        my $navmap = Apache::lonnavmaps::navmap->new();
-        if (defined($navmap)) {
-            my @allres=$navmap->retrieveResources();
-            my %discussiontime = &Apache::lonnet::dump('discussiontimes',
-                                   $env{'course.'.$env{'request.course.id'}.'.domain'},
-                                   $env{'course.'.$env{'request.course.id'}.'.num'});
-            foreach my $resource (@allres) {
-                my $result = '';
-                my $applies = 0;
-                my $symb = $resource->symb();
-                my $ressymb = $symb;
-                if ($symb =~ m#(___adm/$LONCAPA::domain_re/$LONCAPA::username_re)/(\d+)/bulletinboard$#) {
-                    $ressymb = 'bulletin___'.$2.$1.'/'.$2.'/bulletinboard';
-                    unless ($ressymb =~ m#bulletin___\d+___adm/wrapper#) {
-                        $ressymb=~s#(bulletin___\d+___)#$1adm/wrapper/#;
-                    }
-                }
-                if (defined($discussiontime{$ressymb})) { 
-                    my %contrib = &Apache::lonnet::restore($ressymb,$env{'request.course.id'},
-                         $env{'course.'.$env{'request.course.id'}.'.domain'},
-                         $env{'course.'.$env{'request.course.id'}.'.num'});
-                    if ($contrib{'version'}) {
-                        for (my $id=1;$id<=$contrib{'version'};$id++) {
-                            unless (($contrib{'hidden'}=~/\.$id\./) || ($contrib{'deleted'}=~/\.$id\./)) { 
-                                if ($contrib{$id.':subject'}) {
-                                    $result .= $contrib{$id.':subject'};
-                                }
-                                if ($contrib{$id.':message'}) {
-                                    $result .= $contrib{$id.':message'};
-                                }
-                                if ($contrib{$id,':attachmenturl'}) {
-                                    if ($contrib{$id,':attachmenturl'} =~ m-/([^/]+)$-) {
-                                        $result .= $1;
-                                    }
-                                }
-                                $applies = &checkwords($result,$applies,@allwords);
-                            }
-                        }
-                    }
-                }
-# Does this discussion apply?
-                if ($applies) {
-                    my ($map,$ind,$url)=&Apache::lonnet::decode_symb($ressymb);
-                    my $disctype = &mt('resource');
-                    if ($url =~ m#/bulletinboard$#) {
-                        if ($url =~m#^adm/wrapper/adm/.*/bulletinboard$#) {
-                            $url =~s#^adm/wrapper##;
-                        }
-                        $disctype = &mt('discussion board');
-                    } else {
-                        $url = '/res/'.$url;
-                    }
-                    if ($url =~ /\?/) {
-                        $url .= '&amp;symb=';
-                    } else {
-                        $url .= '?symb=';
-                    }
-                    $url .= &escape($resource->symb());
-                    my $title = $resource->compTitle();
-                    $r->print('<br /><a href="'.$url.'" target="cat">'.
-                         ($title?$title:$url).'</a>&nbsp;&nbsp;-&nbsp;'.
-                         $disctype.'<br />');
-                    $totaldiscussions++;
-                } else {
-                    $r->print(' .');
-                }
-            }
-            unless ($totaldiscussions) {
-                $r->print('<p class="LC_info">'.&mt('No matches found in postings.').'</p>');
-            }
-        } else {
-            $r->print('<div class="LC_error">'.&mt('An error occurred retrieving information about resources in the course.').'<br />'.&mt('It is recommended that you [_1]re-initialize the course[_2] and then try your search again.','<a href="/adm/roles">','</a>').'</div>');
-        }
-    }
- 
-# =================================================== Done going through course
-    $r->print(&Apache::loncommon::end_page());
-}
-
-# =============================== This pulls up a resource and its dependencies
-
-sub checkonthis {
-    my ($r,$id,$url,$level,$title,$fulltext,$symb,@allwords)=@_;
-    $alreadyseen{$id}=1;
-    if (&Apache::loncommon::connection_aborted($r)) { return; }
-    $r->rflush();
-    
-    my $result=$title.' ';
-    if ($env{'request.role.adv'} || !$hash{'encrypted_'.$id}) {
-	$result.=&Apache::lonnet::metadata($url,'title').' '.
-	    &Apache::lonnet::metadata($url,'subject').' '.
-	    &Apache::lonnet::metadata($url,'abstract').' '.
-	    &Apache::lonnet::metadata($url,'keywords');
-    }
-    my ($extension)=($url=~/\.(\w+)$/);
-    if (&Apache::loncommon::fileembstyle($extension) eq 'ssi' &&
-	($url) && ($fulltext)) {
-	$result.=&Apache::lonnet::ssi_body($url.'?symb='.&escape($symb));
-    }
-    $result=~s/\s+/ /gs;
-    my $applies = 0;
-    $applies = &checkwords($result,$applies,@allwords);
-# Does this resource apply?
-    if ($applies) {
-       $r->print('<br />');
-       for (my $i=0;$i<=$level*5;$i++) {
-           $r->print('&nbsp;');
-       }
-       my $href=$url;
-       if ($hash{'encrypted_'.$id} && !$env{'request.role.adv'}) {
-	   $href=&Apache::lonenc::encrypted($href)
-	       .'?symb='.&Apache::lonenc::encrypted($symb);
-       } else {
-	   $href.='?symb='.&escape($symb);
-       }
-       $r->print('<a href="'.$href.'" target="cat">'.($title?$title:$url).
-		 '</a><br />');
-       $totalfound++;
-    } elsif ($fulltext) {
-       $r->print(' .');
-    }
-    $r->rflush();
-# Check also the dependencies of this one
-    my $dependencies=
-                &Apache::lonnet::metadata($url,'dependencies');
-    foreach (split(/\,/,$dependencies)) {
-       if (($_=~/^\/res\//) && (!$alreadyseen{$id})) { 
-          &checkonthis($r,$id,$_,$level+1,'',$fulltext,undef,@allwords);
-       }
-    }
-}
-
-sub checkwords {
-    my ($result,$applies,@allwords) = @_;
-    foreach (@allwords) {
-        if ($_=~/\w/) {
-            if ($result=~/$_/si) {
-                $applies++;
-            }
-        }
-    }
-    return $applies;
-}
-
-sub untiehash {
-    if (tied(%hash)) {
-        untie(%hash);
-    }
-}
-
-} # End of course search scoping
-
-
-######################################################################
-######################################################################
 
 =pod 
 
@@ -709,52 +450,6 @@ sub print_basic_search_form {
     }
 # Search form for accessible portfolio files
     $scrout.= &setup_basic_search($r,'portfolio',$hidden_fields,$closebutton);
-    if ($env{'request.course.id'}) {
-	my %lt=&Apache::lonlocal::texthash('srch' => 'Search',
-                                           'header' => 'Course Search',
-	 'note' => 'Enter terms or phrases, then press "Search" below',
-	 'use' => 'use related words',
-	 'full' =>'fulltext search (time consuming)',
-         'disc' => 'search discussion postings (resources and discussion boards)',
-					   );
-        $scrout.=(<<ENDCOURSESEARCH);
-<form name="loncapa_search" method="post" action="/adm/searchcat">
-<center>
-<hr />
-<h1>$lt{'header'}</h1>    
-<input type="hidden" name="phase" value="course_search" />
-$hidden_fields
-<p>
-$lt{'note'}.
-</p>
-<table>
-<tr><td>
-ENDCOURSESEARCH
-        $scrout.='&nbsp;'.
-            &Apache::lonhtmlcommon::textbox('courseexp',
-                                  $env{'form.courseexp'},40);
-        my $crscheckbox = 
-            &Apache::lonhtmlcommon::checkbox('crsfulltext',
-                                   $env{'form.crsfulltext'});
-        my $relcheckbox = 
-            &Apache::lonhtmlcommon::checkbox('crsrelated',
-				   $env{'form.crsrelated'});
-        my $discheckbox = 
-            &Apache::lonhtmlcommon::checkbox('crsdiscuss',
-                                   $env{'form.crsrelated'});
-        $scrout.=(<<ENDENDCOURSE);
-</td></tr>
-<tr><td><label>$relcheckbox $lt{'use'}</label></td><td></td></tr>
-<tr><td><label>$crscheckbox $lt{'full'}</label></td><td></td></tr>
-<tr><td><label>$discheckbox $lt{'disc'}</label></td><td></td></tr>
-</table>
-<p>
-<input type="submit" name="coursesubmit" value='$lt{'srch'}' />
-</p>
-</center>
-</form>
-ENDENDCOURSE
-    }
     $scrout .= &Apache::loncommon::end_page();
     $r->print($scrout);
     return;
@@ -2688,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;
@@ -3364,87 +3062,8 @@ 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 $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">'.
-                                &Apache::lonwishlist::getfoldersOption().
-                                '</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,});
     my $result=<<END;
 $start_page
 <form name="results" method="post" action="/adm/searchcat">
@@ -3563,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 />';
@@ -3698,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 />
@@ -3753,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;
 }
@@ -3799,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',