/ - Diff - EDIT - EDIT Project Management

      * - 1 digit for Drupal core compatibility.
      * - 1 digit for your module's major release version (e.g., is this the 7.x-1.* (1) or 7.x-2.* (2) series of your module?). This digit should be 0 for initial porting of your module to a new Drupal core API.
      * - 2 digits for sequential counting, starting with 00.
+     *
      * @see http://api.drupal.org/api/drupal/modules!system!system.api.php/function/hook_update_N/7
      */
     /**
-...
      */
     function cdm_dataportal_update_7301() {
       // reset edit_map_server variable to default
       variable_del('edit_map_server');
       return t('Resetting setting for EDIT map server (edit_map_server) to default');
        return
       _remove_variable('edit_map_server');
+    }
     /**
-...
      *  - reset edit_map_server variable to default
      */
     function cdm_dataportal_update_7302() {
       // once again reset edit_map_server variable to default
       variable_del('edit_map_server');
       return t('Resetting setting for EDIT map server (edit_map_server) to default');
       return
       _remove_variable('edit_map_server') . // once again reset edit_map_server variable to default
       _rename_variable('cdm_dataportal_show_media', 'cdm_images_include_children');
+    }
     /**
      * @todo Please document this function.
      * @see http://drupal.org/node/1354
      * Renames a persistent variable.
+     *
      * @return
      *   A message string of the performed operation.
      */
     function _rename_variable($old_name, $new_name) {
       $success = FALSE;
-...
         $success = TRUE;
+      }
       return array('success' => $success, 'query' => "Renaming variable $old_name to $new_name");
       return "Variable \'$old_name\' to \'$new_name\' renamed. ";
+    }
     /**
      * @todo Please document this function.
      * @see http://drupal.org/node/1354
      * Unsets a persistent variable.
+     *
      * Calls variable_del() and returns a message string.
+     *
      * @return
      *   A message string of the performed operation.
      */
     function _remove_variable($name) {
       variable_del($name);
       return array('success' => TRUE, 'query' => "Removing variable $name");
       return "Variable \'$name\' removed. ";
+    }
     /**
      * @todo Please document this function.
      * @see http://drupal.org/node/1354
      * Sets a persistent variable.
+     *
      * Calls variable_set() and returns a message string.
+     *
      * @return
      *   A message string of the performed operation.
      */
     function _create_variable($name, $value) {
       variable_set($name, $value);
       return array('success' => TRUE, 'query' => "Creating variable $name new value: $value");
       return "Variable \'$name\' created with value: \'$value\'. ";
+    }
     /**
      * @todo Please document this function.
      * @see http://drupal.org/node/1354
      * Overwrites a persistent variable.
+     *
      * Calls _create_variable() and returns a message string.
+     *
      * @return
      *   A message string of the performed operation.
      */
     function _modify_variable($name, $value_override) {
       /*

+      }
+    }
     /**
      * Loads the media associated to the given taxon from the cdm server.
      * The aggregation settings regarding taxon relathionships and
      * taxonnomic childen are taken into account.
+     *
      * The media lists are cached in a static variable.
+     *
      * @param Taxon $taxon
      *   A CDM Taxon entitiy
+     *
      * @return array
      *   An array of CDM Media entities
+     *
      */
     function _load_media_for_taxon($taxon) {
       static $media = NULL;
       if(!isset($media)) {
         $media = array();
+      }
       if (!isset($media[$taxon->uuid])) {
         // --- GET Images --- //
         $mediaQueryParameters = array(
             "type" => "ImageFile",
         );
         $relationship_choice = variable_get(CDM_AGGREGATE_BY_TAXON_RELATIONSHIPS, unserialize(CDM_AGGREGATE_BY_TAXON_RELATIONSHIPS_DEFAULT));
         $mediaQueryParameters['relationships'] = implode(',', get_selection($relationship_choice['direct']));
         $mediaQueryParameters['relationshipsInvers'] = implode(',', get_selection($relationship_choice['invers']));
         $ws_endpoint = NULL;
         if ( variable_get('cdm_images_include_children', 0) == 0) {
           $ws_endpoint = CDM_WS_PORTAL_TAXON_MEDIA;
         } else {
           $ws_endpoint = CDM_WS_PORTAL_TAXON_SUBTREE_MEDIA;
+        }
         $media[$taxon->uuid] = cdm_ws_get($ws_endpoint,
             array(
                 $taxon->uuid,
             ),
             queryString($mediaQueryParameters)
            );
+      }
       return $media[$taxon->uuid];
+    }
     /**
+     *
      * @param Taxon $taxon
      *   A CDM Taxon entitiy
+     *
      * @return array
      *   An array of CDM SpecimenOrObservation entities
+     *
     function _load_occurences_for_taxon($taxon){
       static $occurences = NULL;
       if(!isset($occurences)) {
         $occurences = array();
+      }
       if (!isset($occurences[$taxon->uuid])){
         $relationship_choice = variable_get(CDM_AGGREGATE_BY_TAXON_RELATIONSHIPS, unserialize(CDM_AGGREGATE_BY_TAXON_RELATIONSHIPS_DEFAULT));
         $relationship_choice['direct'] = get_selection($relationship_choice['direct']);
         $relationship_choice['invers'] = get_selection($relationship_choice['invers']);
         $by_associatedtaxon_query = http_build_query(array(
             'relationshipsInvers' => implode(',', $relationship_choice['invers']),
             'relationships' => implode(',', $relationship_choice['direct']),
             'pageSize' => null // all hits in one page
+        )
         );
         $pager = cdm_ws_get(CDM_WS_OCCURRENCE_BY_ASSOCIATEDTAXON,
             null,
             $by_associatedtaxon_query . '&taxonUuid=' . $taxon->uuid
         );
         if(isset($pager->records[0])){
           $occurences[$taxon->uuid] =  $pager->records;
+        }
+      }
       return $occurences[$taxon->uuid];
+    }
      */
     /**
      * Gets a Drupal variable, string or array and returns it.
+     *

     /**
      * Implements the hook_preprocess_HOOK() for theme_menu_local_tasks()
+     *
      * Removes the tabs to be hidden, @see taxon_page_tabs_hidden()
      *  - Removes the tabs to be hidden, @see taxon_page_tabs_hidden()
      *  - Renames tabs according to the settings // TODO (this will replace the theme_cdm_taxonpage_tab() function !!!)
+     *
      * @param array $variables
      *   The variables array
-...
       $hidden_tabs = taxon_page_tabs_hidden();
       foreach ($variables['primary'] as $key => &$element) {
         foreach ($hidden_tabs as $tab) {
           if ($element['#link']['path'] == 'cdm_dataportal/taxon/%/' . $tab) {
             // remove the tab
             unset($variables['primary'][$key]);
       if (is_array($variables['primary'])) {
         foreach ($variables['primary'] as $key => &$element) {
           foreach ($hidden_tabs as $tab) {
             if ($element['#link']['path'] == 'cdm_dataportal/taxon/%/' . $tab) {
               // remove the tab
               unset($variables['primary'][$key]);
+            }
+          }
+        }
+      }

         '#title' => t('CDM Server'),
         '#collapsible' => FALSE,
         '#collapsed' => FALSE,
         '#description' => t('<em>CDM Server</em> makes the dialogue possible with
           <em>CDM Data Portal</em> thanks to its web services.'),
         '#description' => t('The <em>CDM Server</em> exposes data stored in a
             CDM data base to the web via RESTful web services and thus is the source of the data
             to be displayed by a CDM DataPotal.'),
       );
       $form['cdm_webservice']['cdm_webservice_url'] = array(
-...
       // TODO: settings are still incomplete, compare with
       // trunk/dataportal/inc/config_default.php.inc.
       $form['cdm_dataportal'] = array(
       $form['taxon_tree'] = array(
         '#type' => 'fieldset',
         '#title' => t('Taxon Tree'),
         '#collapsible' => FALSE,
-...
           </a></p>'),
       );
       $form['cdm_dataportal'][CDM_TAXONOMICTREE_UUID] = array(
       $form['taxon_tree'][CDM_TAXONOMICTREE_UUID] = array(
         '#type' => 'select',
         '#title' => t('Available classifications') . ':',
         '#default_value' => variable_get(CDM_TAXONOMICTREE_UUID, FALSE),
-...
           with a manual user change.'),
       );
       $form['cdm_dataportal']['taxontree_ranklimit'] = array(
       $form['taxon_tree']['taxontree_ranklimit'] = array(
         '#type' => 'select',
         '#title' => t('Rank of highest displayed taxon') . ':',
          // Before DEFAULT_TAXONTREE_RANKLIMIT_UUID.
-...
           level of the tree structure.'),
       );
       $form['cdm_dataportal'][CDM_AGGREGATE_BY_TAXON_RELATIONSHIPS] = array(
       $form['aggregation'] = array(
           '#type' => 'fieldset',
           '#title' => t('Aggregation of data'),
           '#collapsible' => FALSE,
           '#description' => t("This section covers the different aspects of aggregating information.
               <p>
               <strong>NOTICE:</strong> Aggregation may slow down your data portal, so you may want to sensibly apply these setting and you may also
               whant to make use of the caching capabilities of the dataportal.</p>"),
       );
       $form['aggregation']['media_aggregation'] = array(
           '#type' => 'fieldset',
           '#title' => t('Media aggregation'),
           '#collapsible' => FALSE,
           '#collapsed' => TRUE,
           '#description' => t("The media aggregation is also affected by the settigs in \"<strong>Aggregation via taxon relationsships</strong>\" below."),
       );
       $form['aggregation']['media_aggregation']['cdm_images_include_children'] = array(
           '#type' => 'select',
           '#title' => t('Aggregation of taxon pictures') . ':',
           '#default_value' => variable_get('cdm_images_include_children', FALSE),
           '#options' => array(
 => "Show only pictures of the current taxon",
 => "Include pictures of taxonomic children",
           ),
           '#description' => t("Choose whether to include the images of the taxonomic children. This will affect the <em>Images</em> tab and image tumbnails like in the search results."),
       );
       $form['aggregation']['aggregate_by_taxon_relationships'][CDM_AGGREGATE_BY_TAXON_RELATIONSHIPS] = array(
           '#type' => 'fieldset',
           '#attributes' => array('class'=>array('clearfix')),
           '#title' => t('Information aggregation via taxon relationsships'),
           '#title' => t('Aggregation via taxon relationsships'),
           '#collapsible' => TRUE,
           '#collapsed' => TRUE,
           '#tree' => TRUE,
-...
       $taxonRelationshipTypeOptions = cdm_Vocabulary_as_option(UUID_TAXON_RELATIONSHIP_TYPE, '_cdm_relationship_type_term_label_callback');
       $aggregate_by_taxon_relationships = variable_get(CDM_AGGREGATE_BY_TAXON_RELATIONSHIPS, unserialize(CDM_AGGREGATE_BY_TAXON_RELATIONSHIPS_DEFAULT));
       $form['cdm_dataportal'][CDM_AGGREGATE_BY_TAXON_RELATIONSHIPS]['direct'] = array(
       $form['aggregation']['aggregate_by_taxon_relationships'][CDM_AGGREGATE_BY_TAXON_RELATIONSHIPS]['direct'] = array(
           '#type' => 'checkboxes',
           '#title' => t('Direct'),
           '#options' => $taxonRelationshipTypeOptions,
           '#default_value' => $aggregate_by_taxon_relationships['direct'],
       );
       $form['cdm_dataportal'][CDM_AGGREGATE_BY_TAXON_RELATIONSHIPS]['invers'] = array(
       $form['aggregation']['aggregate_by_taxon_relationships'][CDM_AGGREGATE_BY_TAXON_RELATIONSHIPS]['invers'] = array(
           '#type' => 'checkboxes',
           '#title' => t('Invers'),
           '#options' => $taxonRelationshipTypeOptions,
-...
       $form['taxon_profile'] = array(
         '#type' => 'fieldset',
         '#title' => t('Taxon profile (tab)'),
         '#description' => t('<p>This section covers the setting related to the taxon
         '#description' => t('<p>This section covers the settings related to the taxon
           profile tab, also known as the <strong>"General"</strong> tab.</p>'),
         '#collapsible' => TRUE,
         '#collapsed' => TRUE,
-...
       // ---- PROFILE PICTURE ----//
       $form['taxon_profile']['picture'] = array(
         '#type' => 'fieldset',
         '#title' => t('Profile Picture'),
         '#title' => t('Taxon profile picture'),
         '#collapsible' => TRUE,
         '#collapsed' => FALSE,
         '#description' => t('Select a profile picture for taxa. Like a facebook of plants.'),
         '#description' => t('This sections allows configuring the display of the so called taxon profile image which is displayed in the taxon profile tab.'),
       );
       $form['taxon_profile']['picture']['cdm_dataportal_show_default_image'] = array(
-...
       array_unshift($options, '-- DISABLED --');
       $form['taxon_profile']['picture']['image_hide_rank'] = array(
         '#type' => 'select',
         '#title' => t('Hide picture for taxa above') . ':',
         '#title' => t('Hide profile picture for higher ranks') . ':',
         '#default_value' => variable_get('image_hide_rank', '0'),
         '#options' => $options,
         '#description' => t('Select which rank of pictures should not have
           a profile picture.'),
       );
       // Show picture.
       $selectShowMedia = array(
 => "Show only taxon pictures",
 => "Show taxon and child taxa pictures",
       );
       $form['taxon_profile']['picture']['cdm_dataportal_show_media'] = array(
         '#type' => 'select',
         '#title' => t('Available picture files') . ':',
         '#default_value' => variable_get('cdm_dataportal_show_media', FALSE),
         '#options' => $selectShowMedia,
         '#description' => t("Show the profile pictures current taxon's children."),
         '#description' => t('The taxon profile picture will not be shown for taxa with rank higher that the selected.'),
       );
       // -- MEDIA THUMBNAILS -- //

       $page_part = variable_get('cdm_dataportal_taxonpage_tabs', 1) ? $page_part : 'all';
       // --- GET Images --- //
       $mediaQueryParameters = array(
         "type" => "ImageFile",
       );
       $media = _load_media_for_taxon($taxon);
       $selectShowMedia = variable_get('cdm_dataportal_show_media', 0);
       if ($selectShowMedia == 0) {
         $media = cdm_ws_get(CDM_WS_PORTAL_TAXON_MEDIA, array(
           $taxon->uuid,
         ), queryString($mediaQueryParameters));
+      }
       else {
         $media = cdm_ws_get(CDM_WS_PORTAL_TAXON_SUBTREE_MEDIA, array(
           $taxon->uuid,
         ), queryString($mediaQueryParameters));
+      }
       if (!isset($media[0]) || ($tabsToDisplay["Images"] == '0')) {
         taxon_page_tabs_hidden('images');
+      }
       // HideImage flag depending on administative preset.
       $hideImages = FALSE;
       if (variable_get('image_hide_rank', '0') != '0' && isset($taxon->name->rank->uuid)) {

       $gallery_name = $taxon->uuid;
       $mediaQueryParameters = array(
         "type" => "ImageFile",
       );
       $galleryLinkUri = path_to_taxon($taxon->uuid, 'images');
       $mediaList = _load_media_for_taxon($taxon);
       // TODO cdm_dataportal_show_media = ????
       $selectShowMedia = variable_get('cdm_dataportal_show_media', 0);
       if ($selectShowMedia == 0) {
         $mediaList = cdm_ws_get(CDM_WS_PORTAL_TAXON_MEDIA, array(
           $taxon->uuid,
         ), queryString($mediaQueryParameters));
+      }
       else {
         $mediaList = cdm_ws_get(CDM_WS_PORTAL_TAXON_SUBTREE_MEDIA, array(
           $taxon->uuid,
         ), queryString($mediaQueryParameters));
+      }
       $galleryLinkUri = path_to_taxon($taxon->uuid, 'images');
       $out .= theme('cdm_media_gallerie', array(
         'mediaList' => $mediaList,

       $gallery_name = $taxon->uuid;
       $mediaQueryParameters = array("type" => "ImageFile");
       $galleryLinkUri = path_to_taxon($taxon->uuid, 'images');
       // TODO cdm_dataportal_show_media = ????
       $selectShowMedia = variable_get('cdm_dataportal_show_media', 0);
       if ($selectShowMedia == 0) {
         $mediaList = cdm_ws_get(
           CDM_WS_PORTAL_TAXON_MEDIA,
           array($taxon->uuid),
           queryString($mediaQueryParameters
         ));
+      }
       else {
         $mediaList = cdm_ws_get(
           CDM_WS_PORTAL_TAXON_SUBTREE_MEDIA,
           array($taxon->uuid),
           queryString($mediaQueryParameters
         ));
+      }
       $mediaList = $mediaList = _load_media_for_taxon($taxon);
       $out .= theme('cdm_media_gallerie', array(
         'mediaList' => $mediaList,
         'galleryName' => $gallery_name,

Project

General

Profile

EDIT

Revision 9438ad3a

Added by Andreas Kohlbecker about 11 years ago