--- loncom/interface/lonsearchcat.pm	2009/10/06 10:31:41	1.315
+++ loncom/interface/lonsearchcat.pm	2010/08/13 13:32:36	1.325
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Search Catalog
 #
-# $Id: lonsearchcat.pm,v 1.315 2009/10/06 10:31:41 bisitz Exp $
+# $Id: lonsearchcat.pm,v 1.325 2010/08/13 13:32:36 wenzelju Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -118,8 +118,6 @@ sub handler {
                       # This is set and used in &handler() and is also used in 
                       # &output_results().
 
-    my $loaderror=&Apache::lonnet::overloaderror($r);
-    if ($loaderror) { return $loaderror; }
     #
     my $closebutton;  # button that closes the search window 
                       # This button is different for the RAT compared to
@@ -324,7 +322,7 @@ END
         &Apache::lonhtmlcommon::add_breadcrumb
             ({href=>'/adm/searchcat?'.&Apache::loncommon::inhibit_menu_check().
                   '&phase=disp_adv'.
-                  'catalogmode='.$env{'form.catalogmode'}.
+                  '&catalogmode='.$env{'form.catalogmode'}.
                   '&launch='.$env{'form.launch'}.
                   '&mode='.$env{'form.mode'},
                   text=>"Course Search",
@@ -492,7 +490,7 @@ sub course_search {
     &Apache::lonhtmlcommon::add_breadcrumb
         ({href=>'/adm/searchcat?'.&Apache::loncommon::inhibit_menu_check().
               '&phase=disp_adv'.
-              'catalogmode='.$env{'form.catalogmode'}.
+              '&catalogmode='.$env{'form.catalogmode'}.
               '&launch='.$env{'form.launch'}.
               '&mode='.$env{'form.mode'},
               text=>"Course Search",
@@ -770,14 +768,26 @@ sub setup_basic_search {
                               portfolio => 'Portfolio Search',
     );
     my ($userelatedwords,$onlysearchdomain,$inclext,$adv_search_link,$scrout);
-    $userelatedwords = '<label>'.&mt('[_1] use related words',
-      &Apache::lonhtmlcommon::checkbox('related',$env{'form.related'},'related')).
-                       '</label>';
-    $onlysearchdomain = '<label>'.&mt('[_1] only search domain [_2]',
-      &Apache::lonhtmlcommon::checkbox('domains',$env{'form.domains'},
-                                       $r->dir_config('lonDefDomain')),
-				      $r->dir_config('lonDefDomain')).
-                        '</label>';
+
+    $userelatedwords = '<label>'
+                      .&Apache::lonhtmlcommon::checkbox(
+                           'related',
+                           $env{'form.related'},
+                           'related')
+                      .' '
+                     .&mt('use related words')
+                     .'</label>';
+
+    $onlysearchdomain = '<label>'
+                       .&Apache::lonhtmlcommon::checkbox(
+                           'domains',
+                           $env{'form.domains'},
+                           $r->dir_config('lonDefDomain'))
+                       .' '
+                       .&mt('only search domain [_1]'
+                               ,'<b>'.$r->dir_config('lonDefDomain').'</b>')
+                       .'</label>';
+
     $adv_search_link = '<a href="/adm/searchcat?'.
 	               &Apache::loncommon::inhibit_menu_check().
 		       '&amp;phase=disp_adv'.
@@ -1723,7 +1733,7 @@ sub parse_domain_restrictions {
         foreach (sort @allowed_domains) {
             $pretty_domains_string .= "<b>".$_."</b> ";
         }
-	my %servers = &Apache::lonnet::get_servers(\@allowed_domains,
+	my %servers = &Apache::lonnet::get_unique_servers(\@allowed_domains,
 						   'library');
 	$libraries_to_query = [keys(%servers)];
     }
@@ -2286,8 +2296,8 @@ sub print_sort_form {
 // <![CDATA[
     function change_sort() {
         var newloc = "/adm/searchcat?phase=results";
-        newloc += "&amp;persistent_db_id=$env{'form.persistent_db_id'}";
-        newloc += "&amp;sortby=";
+        newloc += "&persistent_db_id=$env{'form.persistent_db_id'}";
+        newloc += "&sortby=";
         newloc += document.forms.statusform.elements.sortby.value;
         parent.resultsframe.location= newloc;
     }
@@ -2581,7 +2591,7 @@ END
             @Servers_to_contact = ($serverlist);
         }
     } else {
-	my %all_library_servers = &Apache::lonnet::all_library();
+	my %all_library_servers = &Apache::lonnet::unique_library();
         @Servers_to_contact = sort(keys(%all_library_servers));
     }
     my %Server_status;
@@ -2960,13 +2970,13 @@ sub display_results {
                   .&mt('Sort by:').' '
                   .&Apache::loncommon::select_form($env{'form.sortfield'},
                                                       'sortfield',
-                                                      %sort_fields)
+                                                      \%sort_fields)
                   .' '
                   .&Apache::loncommon::select_form($env{'form.sortorder'},
                                                       'sortorder',
-                                                      (asc =>&mt('Ascending'),
+                                                      {asc =>&mt('Ascending'),
                                                        desc=>&mt('Descending')
-                                                       ))
+                                                       })
                   .'</span>';
     ##
     ## Display links for 'prev' and 'next' pages (if necessary) and Display Options
@@ -3347,13 +3357,92 @@ SCRIPT
     }
     function select_group() {
 	parent.window.location=
-    "/adm/groupsort?mode=$env{'form.mode'}&amp;catalogmode=import$inhibit_menu&amp;acts="+
+    "/adm/groupsort?mode=$env{'form.mode'}&catalogmode=import$inhibit_menu&acts="+
 	    parent.statusframe.document.forms.statusform.elements.acts.value;
     }
 // ]]>
 </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});
     my $result=<<END;
@@ -3474,7 +3563,11 @@ 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";
+        '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>';
     $result .= "<p>\n";
     $result .= '<b>'.$values{'author'}.'</b>,'.
         ' <i>'.$values{'owner'}.'</i><br />';
@@ -3541,7 +3634,7 @@ sub detailed_citation_view {
             $result .= '<b>'.&mt($field->{'translate'}).'</b>';
             foreach my $item (split(',',$values{$field->{'name'}})){
                 $item = &Apache::lonnet::clutter($item);
-                $result .= &display_url($item,[2,0,1]);
+                $result .= '<br />'.&display_url($item,1).'<br />';
             }
         } elsif (exists($field->{'format'}) && $field->{'format'} ne ''){
             $result.= &mt($field->{'translate'},
@@ -3549,7 +3642,7 @@ sub detailed_citation_view {
                                   $values{$field->{'name'}}))."<br />\n";
         } else {
             if ($field->{'special'} eq 'url link') {
-                $result .= &display_url($jumpurl,[3,0,1]);
+                $result .= '<br />'.&display_url($jumpurl,1).'<br />';
             } else {
                 $result.= &mt($field->{'translate'},
                               $values{$field->{'name'}});
@@ -3603,11 +3696,18 @@ sub summary_view {
     }
     my $jumpurl=$values{'url'};
     $jumpurl=~s|^/ext/|http://|;
-    my $link = &display_url($jumpurl,[2,0,1]);
+    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><br />
+   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 />
 $values{'copyrighttag'}<br />
@@ -3639,7 +3739,7 @@ sub compact_view {
     my $jumpurl=$values{'url'};
     $jumpurl=~s|^/ext/|http://|;
 
-    my $link = &display_url($jumpurl,[1,1,1]);
+    my $link = &display_url($jumpurl,1);
     
     my $result = 
         $prefix.'<img src="'.&Apache::loncommon::icon($values{'url'}).'" alt="" />';
@@ -3653,12 +3753,17 @@ 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;
 }
 
 sub display_url {
-    my ($url,$crumb_args) = @_;
+    my ($url,$skiplast) = @_;
     my $link;
     if ($url=~m|^/ext/|) {
 	$url=~s|^/ext/|http://|;
@@ -3666,10 +3771,12 @@ sub display_url {
     } elsif ($url=~m{^(http://|/uploaded/)}) {
 	$link='<span class="LC_filename">'.$url.'</span>';
     } else {
-        $link=&Apache::lonhtmlcommon::crumbs($url,
-		  'preview',
-		  '',
-		  (($env{'form.catalogmode'} eq 'import')?'parent.statusframe.document.forms.statusform':''),@{$crumb_args}).' ';
+        $link=&Apache::lonhtmlcommon::crumbs(
+                  $url,
+                  'preview',
+                  '',
+                  (($env{'form.catalogmode'} eq 'import')?'parent.statusframe.document.forms.statusform':''),
+                  $skiplast).' ';
     }
     return $link;
 }
@@ -3692,12 +3799,19 @@ 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></dd>
+         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',
                        'mimetag','language','creationdate','lastrevisiondate',