/ - Diff - EDIT - EDIT Project Management

+    }
     /**
      * Returns the FeatureTree profile as selected.
      * Returns the chosen FeatureTree for the taxon profile.
+     *
      * The FeatureTree profile returned is the one that has been set in the
      * dataportal settings (layout->taxon:profile).
-...
      * the standard feature tree (UUID_DEFAULT_FEATURETREE) will be returned.
+     *
      * @return mixed
      *   A feature profile tree object.
      *   A cdm FeatureTree object.
      */
     function get_profile_featureTree() {
       $profile_featureTree = cdm_ws_get(
         CDM_WS_FEATURETREE,
         variable_get(CDM_PROFILE_FEATURETREE_UUID, UUID_DEFAULT_FEATURETREE)
       );
       if (!$profile_featureTree) {
       static $profile_featureTree;
       if($profile_featureTree == NULL) {
         $profile_featureTree = cdm_ws_get(
           CDM_WS_FEATURETREE,
           UUID_DEFAULT_FEATURETREE
           variable_get(CDM_PROFILE_FEATURETREE_UUID, UUID_DEFAULT_FEATURETREE)
         );
         if (!$profile_featureTree) {
           $profile_featureTree = cdm_ws_get(CDM_WS_FEATURETREE, UUID_DEFAULT_FEATURETREE);
+        }
+      }
       return $profile_featureTree;
+    }
     /**
      * Returns the chosen FeatureTree for SpecimenDescriptions.
+     *
      * The FeatureTree returned is the one that has been set in the
      * dataportal settings (layout->taxon:specimen).
      * When the chosen FeatureTree is not found in the database,
      * the standard feature tree (UUID_DEFAULT_FEATURETREE) will be returned.
+     *
      * @return mixed
      *   A cdm FeatureTree object.
      */
     function cdm_get_occurrence_featureTree() {
       static $occurrence_featureTree;
       if($occurrence_featureTree == NULL) {
         $occurrence_featureTree = cdm_ws_get(
           CDM_WS_FEATURETREE,
           variable_get(CDM_OCCURRENCE_FEATURETREE_UUID, UUID_DEFAULT_FEATURETREE)
         );
         if (!$occurrence_featureTree) {
           $occurrence_featureTree = cdm_ws_get(CDM_WS_FEATURETREE, UUID_DEFAULT_FEATURETREE);
+        }
+      }
       return $occurrence_featureTree;
+    }
     /**
      * Returns the FeatureTree for structured descriptions
+     *
      * The FeatureTree returned is the one that has been set in the
      * dataportal settings (layout->taxon:profile).
      * When the chosen FeatureTree is not found in the database,
      * the standard feature tree (UUID_DEFAULT_FEATURETREE) will be returned.
+     *
      * @return mixed
      *   A cdm FeatureTree object.
      */
     function get_structured_description_featureTree() {
       static $structured_description_featureTree;
       if($structured_description_featureTree == NULL) {
         $structured_description_featureTree = cdm_ws_get(
             CDM_WS_FEATURETREE,
             variable_get(CDM_DATAPORTAL_STRUCTURED_DESCRIPTION_FEATURETREE_UUID, UUID_DEFAULT_FEATURETREE)
         );
         if (!$structured_description_featureTree) {
           $structured_description_featureTree = cdm_ws_get(
               CDM_WS_FEATURETREE,
               UUID_DEFAULT_FEATURETREE
           );
+        }
+      }
       return $structured_description_featureTree;
+    }
     /**
      * @todo Please document this function.
      * @see http://drupal.org/node/1354
-...
+    }
     /**
      * @todo Please document this function.
      * @see http://drupal.org/node/1354
      * Merges the given featureNodes structure with the descriptionElements.
+     *
      * This method is used in preparation for rendering the descriptionElements.
      * The descriptionElements wich belong to a specific feature node are appended
      * to a the feature node by creating a new field: FeatureNode->descriptionElements
      * which originally is not existing in the cdm.
+     *
      * @param array $featureNodes
      *    An array of cdm FeatureNodes which may be hierachical since feature nodes
      *    may have children.
      * @param array $descriptionElements
      *    An flat array of cdm DescriptionElements
      * @return array
      *    The $featureNodes structure enriched with the accoding $descriptionElements
      */
     function _mergeFeatureTreeDescriptions($featureNodes, $descriptionElements) {
       foreach ($featureNodes as &$node) {

7.x/modules/cdm_dataportal/cdm_api/webservice_uris.php
56	56	define('CDM_WS_DESCRIPTION_NATURALLANGUAGE_DESCRIPTION', 'description/$0/naturalLanguageDescription/$1');
57	57	define('CDM_WS_DESCRIPTION_HAS_STRUCTRURED_DATA', 'description/$0/hasStructuredData');
58	58
	59	define('CDM_WS_PORTAL_DESCRIPTION', 'portal/description/$0');
59	60	define('CDM_WS_PORTAL_DESCRIPTION_AREAS_TREE', 'portal/description/$0/namedAreaTree');
60	61	define('CDM_WS_PORTAL_DESCRIPTION_DISTRIBUTION_TREE', 'portal/description/$0/DistributionTree');
61	62

      */
     /**
      * update function for RELEASE 3.13
      * update for RELEASE 3.13:
      *  - reset edit_map_server variable to default
      */
     function cdm_dataportal_update_7301() {
       // reset edit_map_server variable to default

                 // TODO compose descriptions
                 // store in variable so we don't need to ask the cdmserver for them again
                 $descriptions = $value;
                 $occurrence_featureTree = cdm_get_occurrence_featureTree();
                 $dd_elements = array();
                 foreach ($value as $description) {
                   @_description_list_group_add($groups, cdm_occurrence_field_name_label($field), $description->titleCache . ' ' . $description->uuid);
+                }
                   $dd_elements[] = array('#markup' => $description->titleCache . ' ' . $description->uuid);
                   $description = cdm_ws_get(CDM_WS_PORTAL_DESCRIPTION, $description->uuid);
                   $elements_by_feature = _mergeFeatureTreeDescriptions($occurrence_featureTree->root->children, $description->elements);
                   $rendered_description = theme(
                      'cdm_feature_nodes',
                      array('mergedFeatureNodes' => $elements_by_feature)
                   );
                   $dd_elements[] = array('#markup' => $rendered_description);
+                }
                 @_description_list_group_add($groups, cdm_occurrence_field_name_label($field), $dd_elements);
                 break;
               case 'sources':

     define('CDM_DATAPORTAL_DISPLAY_NAME_RELATIONSHIPS_DEFAULT', 1);
     define('CDM_TAXON_RELATIONSHIP_TYPES', 'cdm_taxon_relationship_types');
     define('CDM_PROFILE_FEATURETREE_UUID', 'cdm_dataportal_featuretree_uuid');
     define('CDM_OCCURRENCE_FEATURETREE_UUID', 'cdm_occurrence_featuretree_uuid');
     define('CDM_DATAPORTAL_STRUCTURED_DESCRIPTION_FEATURETREE_UUID', 'cdm_dataportal_structdesc_featuretree_uuid');
     /**
-...
           <strong>specimens</strong> tab.'),
       );
       $featureTrees = cdm_get_featureTrees_as_options(TRUE);
       $form['taxon_specimens']['feature_trees'][CDM_OCCURRENCE_FEATURETREE_UUID] = array(
           '#type' => 'radios',
           '#title' => t('Specimen description feature tree') . ':',
           '#default_value' => variable_get(CDM_OCCURRENCE_FEATURETREE_UUID, UUID_DEFAULT_FEATURETREE),
           '#options' =>  $featureTrees['options'],
           // Comment @WA: because #options are sanitized in D7, it would
           // strip html like <fieldset>, so we put the fieldset in a suffix.
           '#field_suffix' => $featureTrees['treeRepresentations'],
           '#description' => t('Select the feature tree to be used for displaying specimen descriptions. Click "Show Details" to see the Feature Tree elements.'
           ),
       );
       $form_name = CDM_DATAPORTAL_SPECIMEN_GALLERY_NAME;
       $form_title = t('Specimen media');
       $form_description = t('Specimens may have media which is displayed at the
-...
+      }
+    }
     /**
      * Implements hook_element_info().
+     *

             */
             else {
               if (isset($node->descriptionElements)) {
                 $taxon_uuid = NULL;
                 if(isset($taxon) ) {
                   $taxon_uuid = $taxon->uuid;
+                }
                 $block->content .= theme('cdm_descriptionElements', array(
                   'descriptionElements' => $node->descriptionElements,
                   'featureUuid' => $node->feature->uuid,
                   'taxon_uuid' => $taxon->uuid,
                   'taxon_uuid' => $taxon_uuid,
                 ));
+              }
               /*
-...
+     *
      * @param array $variables
      *   An associative array containing:
      *   - descriptionElements
      *   - featureUuid
      *   - taxon_uuid
      *   - array of descriptionElements which belong to the same feature.
      *     These descriptions elements of a Description must be ordered by the chosen feature tree by
      *     calling the function _mergeFeatureTreeDescriptions().
      *     @see _mergeFeatureTreeDescriptions()
      *   - featureUuid: currently unused, accoding code disabled
      *   - taxon_uuid: only used for ordered dditributions (will be removed!)
+     *
      * @ingroup themeable
      */
-...
       $outArray = array();
       /*
       $userDefined = mixed_variable_get(LAYOUT_SETTING_PREFIX . $featureUuid,
       FEATURE_TREE_LAYOUT_DEFAULTS); if(variable_get('distribution_sort',
       'NO_SORT') != 'NO_SORT'){ $glue = ''; $enclosingTag = 'dl';
       $entryEnclosingTag = NULL; } else if($userDefined &&
       $userDefined['enabled']){ $glue = $userDefined['glue']; $enclosingTag =
       $userDefined['enclosingTag']; $entryEnclosingTag =
       $userDefined['entryEnclosingTag']; } else { // TODO remove once
       LAYOUT_SETTING_PREFIX-{uuid} seeting are confired to work for all portals
       (selenium test still missing!!!) $glue = ''; $enclosingTag = 'ul';
       $entryEnclosingTag = NULL ; }
       $userDefined = mixed_variable_get(LAYOUT_SETTING_PREFIX . $featureUuid, FEATURE_TREE_LAYOUT_DEFAULTS);
       if(variable_get('distribution_sort',
           'NO_SORT') != 'NO_SORT'){
           $glue = '';
           $enclosingTag = 'dl';
           $entryEnclosingTag = NULL;
       } else if($userDefined &&
           $userDefined['enabled']){
         $glue = $userDefined['glue'];
         $enclosingTag =  $userDefined['enclosingTag'];
         $entryEnclosingTag = $userDefined['entryEnclosingTag'];
       } else { // TODO remove once  LAYOUT_SETTING_PREFIX-{uuid} setting are configured to work for all portals(selenium test still missing!!!)
         $glue = ''; $enclosingTag = 'ul';
         $entryEnclosingTag = NULL ;
+      }
       */
       if (variable_get('distribution_sort', 'NO_SORT') != 'NO_SORT') {
         $glue = '';
         $enclosingTag = 'dl';
-...
      * @see http://drupal.org/node/1354
      */
     function theme_cdm_description_ordered_distributions($variables) {
       $taxon_uuid = $variables['taxon_uuid'];
       $descriptionElements = $variables['descriptionElements'];
       // Returning NULL if there are no description elements.
       if ($descriptionElements == NULL) {
         return '';
       if ($taxon_uuid == null || $descriptionElements == NULL) {
         return NULL;
+      }
       // Initialization of some variables.
       $out = '';
       $separator = ',';
       RenderHints::pushToRenderStack('descriptionElementDistribution');
       RenderHints::setFootnoteListKey(UUID_DISTRIBUTION);
       // Getting all the taxon description for a given taxon.
       $markerTypesEmpty = array();
       // $markerTypesEmpty['markerTypes'] = 'af9860ff-08f5-4b4d-863c-49ae96985115';
-...
       foreach ($taxonDescriptions as $description) {
         $descriptions_uuids[] = $description->uuid;
+      }
       // Getting the sortered distributions (omitting level ??).
       $request_params = array();
       $request_params['omitLevels'] = UUID_NAMEDAREALEVEL_TDWGLEVEL_2;

Project

General

Profile

EDIT

Revision bfb2b81a

Added by Andreas Kohlbecker over 11 years ago