/ - Diff - EDIT - EDIT Project Management

      *   The UUID of the CDM Term Vocabulary
      * @param $term_label_callback
      *   An optional call back function which can be used to modify the term label
      * @param $default_option
      * @param bool $default_option
      *   An additional element do be placed at the beginning og the list. This element will be the default option.
      *   In order to put an empty element the begining of the options pass an " " as argument.
      * @param $order_by
      * @param array $include_filter
      *   An associative array consisting of a field name an regular expression. All term matching
      *   these filter are included. The value of the field is converted to a String by var_export()
      *   so a boolean 'true' can be matched by '/true/'
      * @param string $order_by
      *   One of the order by constants defined in this file
      * @return mixed
      */
     function cdm_vocabulary_as_option($vocabulary_uuid, $term_label_callback = NULL, $default_option = FALSE, $order_by = CDM_ORDER_BY_ORDER_INDEX_ASC) {
     function cdm_vocabulary_as_option($vocabulary_uuid, $term_label_callback = NULL, $default_option = FALSE,
                                       array $include_filter = null, $order_by = CDM_ORDER_BY_ORDER_INDEX_ASC) {
       static $vocabularyOptions = array();
       if (!isset($vocabularyOptions[$vocabulary_uuid])) {
-...
             'orderBy' => $order_by
+          )
         );
         // apply the include filter
         if($include_filter != null){
           $included_terms = array();
           foreach ($terms as $term){
             $include = true;
             foreach ($include_filter as $field=>$regex){
               $include =  preg_match($regex, var_export($term->$field, true)) === 1;
               if(!$include){
                 break;
+              }
+            }
             if($include){
               $included_terms[] = $term;
+            }
+          }
           $terms = $included_terms;
+        }
         // make options list
         $vocabularyOptions[$vocabulary_uuid] = cdm_terms_as_options($terms, $term_label_callback);
+      }

       define('UUID_NAMED_AREA_LEVEL', '49034253-27c8-4219-97e8-f8d987d3d122');
       define('UUID_FEATURE', 'b187d555-f06f-4d65-9e53-da7c93f8eaa8');
       define('UUID_TDWG_AREA', '1fb40504-d1d7-44b0-9731-374fbe6cac77');
       define('UUID_PRESENCE_TERM', 'adbbbe15-c4d3-47b7-80a8-c7d104e53a05');
       define('UUID_ABSENCE_TERM', '5cd438c8-a8a1-4958-842e-169e83e2ceee');
       define('UUID_PRESENCE_ABSENCE_TERM', 'adbbbe15-c4d3-47b7-80a8-c7d104e53a05');
       define('UUID_SEX', '9718b7dd-8bc0-4cad-be57-3c54d4d432fe');
       define('UUID_DERIVATION_EVENT_TYPE', '398b50bb-348e-4fe0-a7f5-a75afd846d1f');
       define('UUID_PRESERVATION_METHOD', 'a7dc20c9-e6b3-459e-8f05-8d6d8fceb465');

      *   the processed request parameters submitted by the search form and
      *   also stores them in $_SESSION['cdm']['search']
      */
     function cdm_dataportal_search_form_request()
     function cdm_dataportal_search_request()
+    {
       $form_params = array();
-...
         foreach ($_REQUEST['search']['areas']['area'] as $areas) {
           $area_uuids = array_merge($area_uuids, $areas);
+        }
         // The area filter is limited to areas with non absent distribution status
         $presence_terms_options = cdm_vocabulary_as_option(UUID_PRESENCE_ABSENCE_TERM, null, FALSE, array('absenceTerm' => '/false/'));
         $presence_term_uuids = array_keys($presence_terms_options);
         $form_params['status'] = $presence_term_uuids;
+      }
       if(count($area_uuids) > 0){
         $form_params['area'] = implode(',', $area_uuids);
-...
       if (!isset($form_params['tree']) && !variable_get(SIMPLE_SEARCH_IGNORE_CLASSIFICATION, 0)) {
         $form_params['tree'] = get_current_classification_uuid();
+      }
       // If the 'NONE' classification has been chosen (adanced search)
       // If the 'NONE' classification has been chosen (advanced search)
       // delete the tree information to avoid unknown uuid exceptions in the
       // cdm service.
       if (isset($form_params['tree'])
-...
      * Provides the classification to which the last search has been limited to..
+     *
      * This function should only be used after the cdm_dataportal_search_execute()
      * handler has been run, otherwise it will return the infomation from the last
      * handler has been run, otherwise it will return the information from the last
      * search executed. The information is retrieved from
      * the $_SESSION variable:  $_SESSION['cdm']['search']['tree']
+     *
-...
      * Sends a search request at the cdm web server.
+     *
      * The parameters to build the query are taken obtained by calling
      * cdm_dataportal_search_form_request() which reads the query parameters
      * cdm_dataportal_search_request() which reads the query parameters
      * from $_REQUEST and add additional query parameters if nessecary.
+     *
      * @see cdm_dataportal_search_form_request()
      * @see cdm_dataportal_search_request()
      */
     function cdm_dataportal_search_execute() {
-...
       // Read the query parameters from $_REQUEST and add additional query
       // parameters if necessary.
       $request_params = cdm_dataportal_search_form_request();
       $request_params = cdm_dataportal_search_request();
       $taxon_pager = cdm_ws_get($_REQUEST['ws'], NULL, queryString($request_params));

Project

General

Profile

EDIT

Revision efa372e9

Added by Andreas Kohlbecker over 7 years ago