/ - Diff - EDIT - EDIT Project Management

« Previous | Next »

Revision 0ef9a709

Added by Andreas Kohlbecker over 6 years ago

ID 0ef9a70950f2b9e80c7ff3ed650b70df8b7fa3b0
Parent 4f8e61ad
Child f23ae4e3

cleaning up compose_description_element_text_data()

      * @param $element_markup
      * @param $footnote_list_key_suggestion
      */
     function cdm_description_element_render_array_add_annotations_and_sources(&$render_array, $element, $feature_block_settings, $element_markup, $footnote_list_key_suggestion)
     function compose_description_element($element, $feature_block_settings, $element_markup, $footnote_list_key_suggestion)
+    {
       $render_array = array(
         '#type' => 'html_tag',
         '#tag' => cdm_feature_block_element_tag_name($feature_block_settings),
         '#attributes' => array(
           'class' => 'DescriptionElement DescriptionElement-' . $element->class . '
           ' .  html_class_attribute_ref($element)
         ),
         '#value' => '',
         '#value_suffix' => NULL
       );
       $annotations_and_sources = handle_annotations_and_sources($element, $feature_block_settings, $element_markup, $footnote_list_key_suggestion);
       // handle the special case were the TextData is used as container for original source with name
       // used in source information without any text stored in it.
       $names_used_in_source_markup = '';
       if (!empty($annotations_and_sources['names_used_in_source']) && empty($element_markup)) {
         // $element_text ==  NULL  usually occurs only in the case of CITATIONS!!!
-...
       $render_array['#value'] = $names_used_in_source_markup . $element_markup . $source_references_markup;
       $render_array['#value_suffix'] = $annotations_and_sources['foot_note_keys'];
       return $render_array;
+    }
-...
                       switch ($element->class) {
                         case 'TextData':
                           // FIXME use compose_description_element_textdata()
                           // FIXME use compose_description_element_text_data()
                           if(isset($element->multilanguageText_L10n->text)){
                             $out_child_elements = str_replace("\n", "<br/>", $element->multilanguageText_L10n->text);
+                          }
-...
         if (isset($descriptionElements['TextData'])) {
           // --- TextData
           foreach ($descriptionElements['TextData'] as $text_data_element) {
             $asListElement = FALSE;
             $text_data_render_array = compose_description_element_textdata($text_data_element, $asListElement, $text_data_element->feature->uuid);
             $text_data_render_array = compose_description_element_text_data($text_data_element, $text_data_element->feature->uuid, $feature_block_settings);
             $repr = drupal_render($text_data_render_array);
             if (!array_search($repr, $text_data_out_array)) { // de-duplication !!
-...
        * Composes a drupal render array for single CDM TextData description element.
+       *
        * @param $element
        *    The CDN TextData  description element.
        * @param $asListElement
        *    A boolean which determines whether the citations should
        *     be rendered as a list or not.
        *    TODO remove and replace $asListElement by $feature_block_settings['as_list']
        *    The CDM TextData description element.
        *  @param $feature_uuid
+       *
        * @return array
-...
+       *
        * @ingroup compose
        */
       function compose_description_element_textdata($element, $asListElement, $feature_uuid) {
       function compose_description_element_text_data($element, $feature_uuid, $feature_block_settings) {
         $footnote_list_key_suggestion = $feature_uuid;
         // FIXME $feature_block_settings should be passed as parameter!!!!!
         $feature_block_settings = get_feature_block_settings($feature_uuid);
         /*
         // FIXME remove this hack ---------------------------
         $default_theme = variable_get('theme_default', NULL);
         if($default_theme == 'garland_cichorieae' || $default_theme == 'cyprus'
-...
           $asListElement = $feature_block_settings['as_list'] == 'ul';
+        }
         // --------------------------------------------------
         */
         $render_array = array(
           '#type' => 'html_tag',
           '#tag' => $asListElement ? 'li' : 'span',
           '#attributes' => array(
             'class' => 'DescriptionElement DescriptionElement-' . $element->class . '
           ' .  html_class_attribute_ref($element)
           ),
           '#value' => '',
           '#value_suffix' => NULL
         );
         $element_text = '';
         $element_markup = '';
         if (isset($element->multilanguageText_L10n->text)) {
           // TODO replacement of \n by <br> should be configurable
           $element_text = str_replace("\n", "<br/>", $element->multilanguageText_L10n->text);
           $element_markup = str_replace("\n", "<br/>", $element->multilanguageText_L10n->text);
+        }
         cdm_description_element_render_array_add_annotations_and_sources($render_array, $element, $feature_block_settings, $element_text, $footnote_list_key_suggestion);
         $render_array = compose_description_element($element, $feature_block_settings, $element_markup, $footnote_list_key_suggestion);
         return $render_array;
+      }
-...
+        }
+      }
       $out = '<span class="' . html_class_attribute_ref($element) . '">' . implode(', ', $state_data_strings) . '</span>';
       $feature_block_settings = get_feature_block_settings($element->feature->uuid);
-...
+      {
         $feature_block_settings = get_feature_block_settings($feature->uuid);
         if($feature_block_settings['as_list']){
           $enclosing_tag = $feature_block_settings['as_list'];
         } else {
           $out = "ERROR</body></html>";
           return;
+        }
         $enclosing_tag = $feature_block_settings['as_list'];
         $out = '<' . $enclosing_tag . ' class="feature-block-elements" id="' . $feature->representation_L10n . '">';
-...
               $feature_block_settings = get_feature_block_settings($descriptionElement->feature->uuid);
             switch ($descriptionElement->class) {
                 case 'TextData':
                   $asListElement  = $feature_block_settings['as_list'] == 'ul';
                   $text_data_render_array = compose_description_element_textdata($descriptionElement, $asListElement, $descriptionElement->feature->uuid);
                   $text_data_render_array = compose_description_element_text_data($descriptionElement, $descriptionElement->feature->uuid, $feature_block_settings);
                   $feature_block_has_content = $feature_block_has_content || !empty($text_data_render_array['#value']);
                   $elements_out_array[] = drupal_render($text_data_render_array);
                   break;
-...
           // If feature = CITATION sort the list of sources.
           // This is ONLY for FLORA MALESIANA and FLORE d'AFRIQUE CENTRALE.
           if ($descriptionElement->feature->uuid == UUID_CITATION) {
           if (isset($descriptionElement) && $descriptionElement->feature->uuid == UUID_CITATION) {
             sort($elements_out_array);
+          }
+        }
-...
       $text_data_out = array();
       foreach ($textData_commonNames as $text_data_element) {
         /* footnotes are not handled correctly in compose_description_element_textdata,
         /* footnotes are not handled correctly in compose_description_element_text_data,
            need to set 'common-names-feature-block' as $footnote_key_suggestion */
         RenderHints::setFootnoteListKey($footnote_key_suggestion);
         $text_data_render_array = compose_description_element_textdata($text_data_element, TRUE, $text_data_element->feature->uuid);
         $text_data_render_array = compose_description_element_text_data($text_data_element, $text_data_element->feature->uuid, $feature_block_settings);
         $text_data_out[] = drupal_render($text_data_render_array);
+      }

       function get_feature_block_settings($feature_uuid = 'DEFAULT') {
         // the default must conform to the default parameter values of
         // compose_feature_block_elements() : $glue = '', $sort = FALSE, $enclosing_tag = 'ul'
         // compose_description_element_textdata() : asListElement = NULL
         // compose_description_element_text_data() : asListElement = NULL
         // see #3257 (implement means to define the features to show up in the taxonprofile and in the specimen descriptions)

Also available in: Unified diff

Project

General

Profile

EDIT

Revision 0ef9a709

Added by Andreas Kohlbecker over 6 years ago