Merge pull request #1120 from Ensembl/fix/ajax_psychic

Enable Psychic without redirect

Author: EbiArnie

modules/EnsEMBL/Web/Controller/Psychic.pm

@@ -19,7 +19,7 @@ limitations under the License.
 
 package EnsEMBL::Web::Controller::Psychic;
 
-### Psychic search - tries to guess where the user wanted to go 
+### Psychic search - tries to guess where the user wanted to go
 ### based on analysis of the search string!
 
 use strict;
@@ -39,10 +39,28 @@ sub process {
   }
 }
 
+# Guess what a user is searching for and redirect
 sub psychic {
+    my $self = shift;
+
+    my $url = $self->_psychic();
+    return $self->redirect($url);
+}
+
+# Guess what a user is searching for.
+# Returns a URL, does not redirect
+sub psychic_no_redir {
+    my $self = shift;
+
+    my $url = $self->_psychic();
+    return $url;
+}
+
+sub _psychic {
   my $self          = shift;
-  my $hub           = $self->hub;
-  my $species_defs  = $self->species_defs;
+
+  my $hub = $self->hub;
+  my $species_defs  = $hub->species_defs;
   my $site_type     = lc $species_defs->ENSEMBL_SITETYPE;
   my $script        = 'Search/Results';
   my %sp_hash       = %{$species_defs->multi_val('ENSEMBL_SPECIES_URL_MAP')||{}};
@@ -68,9 +86,9 @@ sub psychic {
   push @extra,"facet_feature_type=Documentation" if $species eq 'help';
   $species = undef if $dest_site =~ /_all/ or $species eq 'help';
 
-  return $self->redirect("//www.ebi.ac.uk/ebisearch/search.ebi?db=allebi&query=$query")  if $dest_site eq 'ebi';
-  return $self->redirect("//www.sanger.ac.uk/search?db=allsanger&t=$query")              if $dest_site eq 'sanger';
-  return $self->redirect("//www.ensemblgenomes.org/search/eg/$query")                    if $dest_site eq 'ensembl_genomes';
+  return "//www.ebi.ac.uk/ebisearch/search.ebi?db=allebi&query=$query"  if $dest_site eq 'ebi';
+  return "//www.sanger.ac.uk/search?db=allsanger&t=$query"              if $dest_site eq 'sanger';
+  return "//www.ensemblgenomes.org/search/eg/$query"                    if $dest_site eq 'ensembl_genomes';
 
   my $extra = '';
   if(@extra) {
@@ -90,7 +108,7 @@ sub psychic {
     }
   } elsif ($site_type eq 'vega') {
     $url  = "/Multi/Search/Results?species=all&idx=All&q=$query";
-    $site = '//www.ensembl.org'; 
+    $site = '//www.ensembl.org';
   }
 
   my $flag = 0;
@@ -104,7 +122,7 @@ sub psychic {
       $query_without_species =~ s/^ //;
       $query_species = $sp;
     }
-  }  
+  }
 
   my $species_path = $species_defs->species_path($species) || "/$species";
 
@@ -113,12 +131,12 @@ sub psychic {
 
     if ($query =~ /^rs\d+$/) {
 
-      return $self->redirect($site.$hub->url({
+      return $site.$hub->url({
         'species'   => $species || $query_species,
         'type'      => 'Variation',
         'action'    => 'Explore',
         'v'         => $query
-      }));
+      });
     }
 
     my $real_chrs = $hub->species_defs->ENSEMBL_CHROMOSOMES;
@@ -140,7 +158,7 @@ sub psychic {
       $index_t = 'Sequence';
       $flag = $1;
     }
- 
+
     ## match any of the following:
     if ($jump_query =~ /^\s*([-\.\w]+)[:]/i ) {
     #using core api to return location value (see perl documentation for core to see the available combination)
@@ -228,12 +246,12 @@ sub psychic {
       if (defined $variant){
         my $variant_name = $variant->name();
         $flag  = 1;
-        return $self->redirect($site.$hub->url({
+        return $site.$hub->url({
           'species'   => 'human',
           'type'      => 'Variation',
           'action'    => 'Explore',
           'v'         => $variant_name
-          }));
+          });
         }
       }
   }
@@ -248,12 +266,12 @@ sub psychic {
      if (defined $variant){
        my $variant_name = $variant->name();
        $flag  = 1;
-       return $self->redirect($site.$hub->url({
+       return $site.$hub->url({
          'species'   => 'human',
          'type'      => 'Variation',
          'action'    => 'Explore',
          'v'         => $variant_name
-         }));
+         });
        }
      }
   }
@@ -279,7 +297,7 @@ sub psychic {
     $url .= join(";",map {; "$_=".$hub->param($_) } @params).$extra;
   }
 
-  $self->redirect($site . $url);
+  return $site . $url;
 }
 
 sub psychic_gene_location {
@@ -289,7 +307,7 @@ sub psychic_gene_location {
   my $adaptor = $hub->get_adaptor('get_GeneAdaptor', $hub->param('db'));
   my $gene    = $adaptor->fetch_by_stable_id($query) || $adaptor->fetch_by_display_label($query);
   my $url;
-  
+
   if ($gene) {
     $url = $hub->url({
       %{$hub->multi_params(0)},
@@ -299,7 +317,7 @@ sub psychic_gene_location {
     });
   } else {
     $url = $hub->referer->{'absolute_url'};
-    
+
     $hub->session->set_record_data({
       type     => 'message',
       function => '_warning',
@@ -308,7 +326,7 @@ sub psychic_gene_location {
     });
     $hub->session->store_records;
   }
-  
+
   $self->redirect($url);
 }