--- loncom/interface/lonsearchcat.pm	2013/12/13 16:40:01	1.331.4.8
+++ loncom/interface/lonsearchcat.pm	2016/11/09 22:32:42	1.331.4.14
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Search Catalog
 #
-# $Id: lonsearchcat.pm,v 1.331.4.8 2013/12/13 16:40:01 raeburn Exp $
+# $Id: lonsearchcat.pm,v 1.331.4.14 2016/11/09 22:32:42 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -78,6 +78,7 @@ use Apache::lonnavmaps;
 use Apache::lonindexer();
 use Apache::lonwishlist();
 use LONCAPA;
+use Time::HiRes qw(sleep);
 
 ######################################################################
 ######################################################################
@@ -143,7 +144,7 @@ sub handler {
     ##     this once, so the pause indicator is deleted
     ##
     if (exists($env{'form.pause'})) {
-        sleep(1);
+        sleep(0.1);
         delete($env{'form.pause'});
     }
     ##
@@ -170,7 +171,7 @@ sub handler {
     &Apache::lonhtmlcommon::clear_breadcrumbs();
 
     my @allowed_searches = ('portfolio');
-    if (&Apache::lonnet::allowed('bre',$env{'request.role.domain'})) {
+    if (&Apache::lonnet::allowed('bre',$env{'request.role.domain'}) eq 'F') {
         push(@allowed_searches,'res');
     } 
     my $crumb_text = 'Portfolio Search';
@@ -193,12 +194,15 @@ sub handler {
                 &Apache::lonnet::logthis('lonsearchcat:'.
                                          'Unable to recover data from '.
                                          $persistent_db_file);
-		my $msg =
-		    'We were unable to retrieve data describing your search. '.
-		    'This is a serious error and has been logged. '.
-		    'Please alert your LON-CAPA administrator.';
-		&Apache::loncommon::simple_error_page($r,'Search Error',
-						      $msg);
+                my $msg =
+                    &mt('We were unable to retrieve data describing your search.').
+                    ' '.&mt('This is a serious error and has been logged.').
+                    '<br />'.
+                    &mt('Please alert your LON-CAPA administrator.');
+                &Apache::loncommon::simple_error_page(
+                    $r,'Search Error',
+                    $msg,
+                    {'no_auto_mt_msg' => 1});
 		return OK;
             }
         }
@@ -446,7 +450,7 @@ sub print_basic_search_form {
 					    $env{'form.catalogmode'} ne 'import');
     my $scrout = &Apache::loncommon::start_page('Content Library').$bread_crumb;
 # Search form for resource space 
-    if (&Apache::lonnet::allowed('bre',$env{'request.role.domain'})) {
+    if (&Apache::lonnet::allowed('bre',$env{'request.role.domain'}) eq 'F') {
         $scrout .= &setup_basic_search($r,'res',$hidden_fields,$closebutton);
         $scrout .= '<hr /><br />';
     }
@@ -475,14 +479,31 @@ sub setup_basic_search {
                      .&mt('use related words')
                      .'</label>';
 
+    my $anydom = 1;
+    if ($area eq 'res') {
+        unless (&Apache::lonnet::allowed('bre','/res/') eq 'F') {
+            $anydom = 0;
+        }
+    }
+    my $singledom;
+    my ($disabled,$checked);
+    if ($anydom) {
+       $singledom = $r->dir_config('lonDefDomain');
+       if ($env{'form.domains'} eq $singledom) {
+           $checked = 1;
+       }
+    } else {
+       $singledom = $env{'user.domain'};
+       $disabled = ' disabled="disabled"';
+       $checked = 1;
+    }
     $onlysearchdomain = '<label>'
                        .&Apache::lonhtmlcommon::checkbox(
-                           'domains',
-                           $env{'form.domains'},
-                           $r->dir_config('lonDefDomain'))
+                           'domains',$checked,
+                           $singledom,$disabled)
                        .' '
                        .&mt('only search domain [_1]'
-                               ,'<b>'.$r->dir_config('lonDefDomain').'</b>')
+                               ,'<b>'.$singledom.'</b>')
                        .'</label>';
 
     $adv_search_link = '<a href="/adm/searchcat?'.
@@ -657,10 +678,22 @@ function additional_metadata() {
                    $env{'form.category'})
               .&Apache::lonhtmlcommon::row_closure();
 
-    $scrout .= &Apache::lonhtmlcommon::row_title(&titlefield(&mt('Domains')))
-              .&Apache::loncommon::domain_select('domains',
-                   $env{'form.domains'},1)
-              .&Apache::lonhtmlcommon::row_closure();
+    my $anydomain = 1;
+    if ($env{'form.area'} ne 'portfolio') {
+        unless (&Apache::lonnet::allowed('bre','/res/')) {
+            $anydomain = 0;
+        }
+    }
+
+    $scrout .= &Apache::lonhtmlcommon::row_title(&titlefield(&mt('Domains')));
+    if ($anydomain) {
+        $scrout .= &Apache::loncommon::domain_select('domains',
+                   $env{'form.domains'},1);
+    } else {
+        $scrout .= &Apache::loncommon::select_dom_form($env{'user.domain'},
+                                                       'domains','','','',[$env{'user.domain'}],'',1);
+    }
+    $scrout .= &Apache::lonhtmlcommon::row_closure();
 
     # Misc metadata
     if ($env{'form.area'} ne 'portfolio') {
@@ -1908,10 +1941,11 @@ sub copyright_check {
     my (undef,undef,$resdom,$resname) = split('/',
                                               $Metadata->{'url'});
     # Check for priv
-    if (($Metadata->{'copyright'} eq 'priv') && 
-        (($env{'user.name'} ne $resname) &&
-         ($env{'user.domain'} ne $resdom))) {
-        return 0;
+    if ($Metadata->{'copyright'} eq 'priv') {
+        unless (($env{'user.name'} eq $resname) &&
+                ($env{'user.domain'} eq $resdom)) {
+            return 0;
+        }
     }
     # Check for domain
     if (($Metadata->{'copyright'} eq 'domain') &&
@@ -2061,7 +2095,7 @@ sub print_sort_form {
 </script>
 END
 
-    my $start_page = &Apache::loncommon::start_page('Results',$js);
+    my $start_page = &Apache::loncommon::start_page('Results');
     my $breadcrumbs=
         &Apache::lonhtmlcommon::breadcrumbs('Searching','Searching',
 					    $env{'form.catalogmode'} ne 'import');
@@ -2225,8 +2259,21 @@ SCRIPT
     $r->rflush();
 }
 
+sub reload_result_frame {
+    my ($r) = @_;
+    my $newloc = '/adm/searchcat?phase=results&persistent_db_id='.
+        $env{'form.persistent_db_id'};
+    $r->print(<<SCRIPT);
+<script type="text/javascript">
+    parent.update_results("$newloc");
+</script>
+SCRIPT
+
+    $r->rflush();
+}
+
 {
-    my $max_time  = 300;  # seconds for the search to complete
+    my $max_time  = 60;  # seconds for the search to complete
     my $start_time = 0;
     my $last_time = 0;
 
@@ -2407,6 +2454,7 @@ END
     ##
     ## Prepare for the big loop.
     my $hitcountsum;
+    my $oldhitcountsum;
     my %matches;
     my $server; 
     my $status;
@@ -2453,7 +2501,7 @@ END
                 &update_status($r,
                        &mt('waiting on [_1]',join(' ',keys(%Server_status))));
             }
-            sleep(1); 
+            sleep(0.1); 
         }
         #
         # Loop through the servers we have contacted but do not
@@ -2529,7 +2577,13 @@ END
                 delete($Server_status{$server});
             }
             last if ($connection->aborted());
-            &update_count_status($r,$hitcountsum);
+            if ($oldhitcountsum < $hitcountsum) {
+                &update_count_status($r,$hitcountsum);
+                if ($hitcountsum <= $env{'form.show'}) {
+                    reload_result_frame($r);
+                }
+                $oldhitcountsum = $hitcountsum;
+            }
         }
         last if ($connection->aborted());
         &update_seconds($r);
@@ -2623,6 +2677,8 @@ sub display_results {
     if ($env{'form.catalogmode'} eq 'import') {
         if (! tie(%groupsearch_db,'GDBM_File',$diropendb,
                   &GDBM_WRCREAT(),0640)) {
+            # NOTE: this can happen when a previous request to searchcat?phase=results gets interrupted
+            # (%groupsearch_db is not untied)
             $r->print('<p class="LC_error">'.
               &mt('Unable to save import results.').
               '</p>'.
@@ -2630,7 +2686,11 @@ sub display_results {
 		      &Apache::loncommon::end_page());
             $r->rflush();
             return;
-        } 
+        }
+        # untie %groupsearch_db if the connection gets aborted before the end
+        $r->register_cleanup(sub {
+            untie %groupsearch_db if (tied(%groupsearch_db));
+        }); 
     }
     ##
     ## Prepare the table for querying
@@ -2772,8 +2832,7 @@ sub display_results {
     );
 
     if ($total_results == 0) {
-        $r->print('<meta HTTP-EQUIV="Refresh" CONTENT="2" />'.
-                  '<p class="LC_info">'.&mt('There are currently no results.').'</p>'.
+        $r->print('<p class="LC_info">'.&mt('There are currently no results.').'</p>'.
                   "</form>".
 		  &Apache::loncommon::end_page());
         return;
@@ -3146,9 +3205,18 @@ SCRIPT
 </script>
 SCRIPT
 
+    $js.=<<SCRIPT;
+<script type="text/javascript">
+    \$(document).ready(function() {
+        parent.done_loading_results();
+    });
+</script>
+SCRIPT
+
     my $start_page  = &Apache::loncommon::start_page(undef,$js,
 						     {'only_body' =>1,
-                                                      'add_wishlist' =>1});
+                                                      'add_wishlist' =>1,
+                                                      'add_modal' =>1});
     my $result=<<END;
 $start_page
 <form name="results" method="post" action="/adm/searchcat">
@@ -3178,6 +3246,26 @@ sub print_frames_interface {
 // <![CDATA[
 var targetwin = opener;
 var queue = '';
+
+var loading_results = true;
+var need_reloading = false;
+var new_location;
+function update_results(newloc) {
+    if (loading_results) {
+        need_reloading = true;
+        new_location = newloc;
+    } else {
+        loading_results = true;
+        resultsframe.location = newloc;
+    }
+}
+function done_loading_results() {
+    loading_results = false;
+    if (need_reloading) {
+        need_reloading = false;
+        update_results(new_location);
+    }
+}
 // ]]>
 </script>
 JS
@@ -3290,7 +3378,7 @@ sub detailed_citation_view {
         '<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" onclick="openMyModal(this.href, 500, 500, \'yes\');return false;">'.$values{'title'}."</a></b>\n".
         &display_tools($values{'title'}, $jumpurl).
         "<p>\n".
         '<b>'.$values{'author'}.'</b>,'.
@@ -3423,7 +3511,7 @@ sub summary_view {
     my $link = '<br />'.&display_url($jumpurl,1).'<br />';
     $result .=
         '<a href="'.$jumpurl.'?inhibitmenu=yes"'.
-        ' target="preview">'.$values{'title'}.'</a>'.
+        ' target="preview" onclick="openMyModal(this.href, 500, 500, \'yes\');return false;">'.$values{'title'}.'</a>'.
         &display_tools($values{'title'}, $jumpurl).<<END;
 <br />
 $link<br />
@@ -3469,7 +3557,7 @@ sub compact_view {
     }
     $jumpurl = &HTML::Entities::encode($jumpurl,'<>&"');
     $result.=' <span class="LC_nobreak">'.
-	'<a href="'.$jumpurl.'?inhibitmenu=yes" target="preview">'.
+	'<a href="'.$jumpurl.'?inhibitmenu=yes" target="preview" onclick="openMyModal(this.href, 500, 500, \'yes\');return false;">'.
         &HTML::Entities::encode($values{'title'},'<>&"').'</a></span> '.
         &display_tools($values{'title'}, $jumpurl).
 	$link.' <b>'.$values{'author'}.'</b> ('.$values{'domain'}.')';
@@ -3485,12 +3573,17 @@ sub display_url {
     } elsif ($url=~m{^(http://|/uploaded/)}) {
 	$link='<span class="LC_filename">'.$url.'</span>';
     } else {
+        # replace the links to open in a new window
+        # (because the search opens in a new window, it gets
+        # confusing when the links open a tab in the
+        # parent window; ideally we should not force windows)
+        my $onclick = " onclick=\"window.open(this.href, '_blank', 'toolbar=1,location=1,menubar=0');return false;\"";
         $link=&Apache::lonhtmlcommon::crumbs(
                   $url,
                   'preview',
                   '',
-                  (($env{'form.catalogmode'} eq 'import')?'parent.statusframe.document.forms.statusform':''),
-                  $skiplast).' ';
+                  '',
+                  $skiplast,$onclick).' ';
     }
     return $link;
 }
@@ -3796,7 +3889,7 @@ Cleans the global %groupsearch_db by rem
 ######################################################################
 sub start_fresh_session {
     delete $groupsearch_db{'mode_catalog'};
-    foreach (keys %groupsearch_db) {
+    foreach (keys(%groupsearch_db)) {
         if ($_ =~ /^pre_/) {
             delete $groupsearch_db{$_};
         }