Project

General

Profile

Revision 72d57201

ID72d57201d9c9b557895fd7ede7a277f84d1d9b76
Parent fb308159
Child b90ef618

Added by Katja Luther over 1 year ago

ref #8182: specimen tree is collapsable, blast result table with clickable details

View differences:

modules/cdm_dataportal/cdm_dataportal.search.php
786 786
 */
787 787
function cdm_dataportal_blast_search_request($search_endpoint)
788 788
{
789

  
790 789
    $form_params = array();
791 790

  
792 791
    if (isset($_REQUEST['search']) && is_array($_REQUEST['search'])) {
793 792
        array_deep_copy($_REQUEST['search'], $form_params['data']);
794 793
    }
795

  
796

  
797
    //$query = trim($_REQUEST['query']);
798
    $form_params['data'] = formatParams($_REQUEST['search']);
799

  
800
    /*if (isset($_REQUEST['pager']) && is_array($_REQUEST['pager'])) {
801
        $form_params = array_merge($form_params, $_REQUEST['pager']);
802
    }*/
803

  
804
    $form_params['query']= trim($_REQUEST['query']);
805

  
806

  
794
    $form_params['data'] = formatWSParams($_REQUEST['search']);
795
    $form_params['query']= trim($_REQUEST['query']).$form_params['data'];
807 796
    // Store in session.
808 797
    $_SESSION['cdm']['search'] = $form_params;
809

  
810 798
    return $form_params;
811 799
}
812 800

  
813

  
814

  
815 801
/**
816 802
 * Provides the classification to which the last search has been limited to..
817 803
 *
......
933 919
    // parameters if necessary.
934 920
    $request_params = cdm_dataportal_blast_search_request($_REQUEST['ws']);
935 921
   // $url = drupal_http_build_query($_REQUEST['ws'], $request_params);
936

  
922
    $request_params['timeout'] = 200;
937 923
    $taxon_pager = drupal_http_request($_REQUEST['ws'].'?sequence='.$request_params['query'], $request_params);
938 924

  
939 925
    return $taxon_pager;

Also available in: Unified diff

Add picture from clipboard (Maximum size: 40 MB)