/ - Diff - EDIT - EDIT Project Management

« Previous | Next »

Revision 0820cdc0

Added by Andreas Kohlbecker over 5 years ago

ID 0820cdc04519f4314c6128b0e0966a342f991f46
Parent 5a079dbf
Child 30845bda

ref #2985 output of extensions implemented generically and for occurrences

       static $default_unit = 'm';
       $min_max_array = min_max_array();
       if (is_numeric($object->$field_base_name)) {
       if (@is_numeric($object->$field_base_name)) {
         $min_max_array['Min'] = new stdClass();
         $min_max_array['Min']->_value = $object->$field_base_name;
+      }
       $field_name = $field_base_name . 'Max';
       if (is_numeric($object->$field_name)) {
       if (@is_numeric($object->$field_name)) {
         $min_max_array['Max'] = new stdClass();
         $min_max_array['Max']->_value = $object->$field_name;
+      }
       $min_max_markup = min_max_markup($min_max_array, $default_unit);
       $field_name = $field_base_name . 'Error';
       if (is_numeric($object->$field_name )) {
       if (@is_numeric($object->$field_name )) {
         $min_max_markup .= ' +/- ' . $object->$field_name . ' ' . $default_unit;
+      }
       $field_name = $field_base_name . 'Text';
       if (is_string($object->$field_name)) {
       if (@is_string($object->$field_name)) {
         $min_max_markup .= ' ' . $object->$field_name;
+      }
       return $min_max_markup;
-...
       $groups = array();
       $contact_details = null;
       $label_suffix = ':';
       $contact_field_names_map = array(
-...
       return array($contact_details);
+    }
     /**
      * Compose an render array from a CDM Extension objects.
+     *
      * @param $extensions
      *    An array of CDM Extension objects
      * @return array
      *   A render array containing the fields of the supplied $sequence
+     *
      * @ingroup compose
      */
     function compose_extensions($extensions)
+    {
       $extensions_render_array= null;
       $extensions_by_type = array();
       foreach ($extensions as $extension) {
         if (@is_string($extension->value)) {
           if (!isset($extensions_by_type[$extension->type->representation_L10n])) {
             $extensions_by_type[$extension->type->representation_L10n] = array();
+          }
           $extensions_by_type[$extension->type->representation_L10n][] = markup_to_render_array($extension->value);
+        }
+      }
       if (count($extensions_by_type)) {
         $sub_dl_groups = array();
         foreach ($extensions_by_type as $type_label => $text_list) {
           @_description_list_group_add($sub_dl_groups, $type_label . ':', $text_list);
+        }
         $extensions_render_array = array(
           array('#theme' => 'description_list', '#groups' => $sub_dl_groups)
         );
         return $extensions_render_array;
+      }
       return $extensions_render_array;
+    }

       if (!isset($exclude_occurrence_fields)) {
          $exclude_occurrence_fields = array(
             'derivationEvents',
             'extensions', // TODO ignored for now, how to handle extensions?
             'titleCache',
             'protectedTitleCache',
             'derivedUnitMedia',
-...
         if (isset($specimenOrObservation->specimenTypeDesignations)) {
           $type_status = array();
           foreach ($specimenOrObservation->specimenTypeDesignations as $typeDesignation) {
             if (isset($typeDesignation->typeStatus->representation_L10n)){
             if (isset($typeDesignation->typeStatus->representation_L10n)) {
               $type_status[] = $typeDesignation->typeStatus->representation_L10n;
+            }
+          }
           if (count($type_status) > 0){
           if (count($type_status) > 0) {
             $type_label = implode(', ', $type_status);
+          }
+        }
         $title = $type_label . ': '. $specimenOrObservation->titleCache;
         $title = $type_label . ': ' . $specimenOrObservation->titleCache;
         $groups = array();
         // --- add initialized fields
-...
               /* ---- java.lang.Object --- */
               case 'class':
                 if($value != '' /* FieldUnit' */){
                 if ($value != '' /* FieldUnit' */) {
                   @_description_list_group_add($groups, cdm_occurrence_field_name_label($field), $value);
+                }
               break;
                 break;
               case 'markers':
                 $dd_elements = array();
-...
                   $groups,
                   cdm_occurrence_field_name_label($field),
                   array(
                     '#markup'=>theme('cdm_typedesignations', array('typeDesignations' => $value)),
                     '#markup' => theme('cdm_typedesignations', array('typeDesignations' => $value)),
+                  )
                 );
                 break;
-...
                 $dd_elements = array();
                 $glue = ', ';
                 foreach  ($value as $determinationEvent){
                     $timeperiod_string = NULL;
                     if (isset($determinationEvent->timeperiod)) {
                         $timeperiod_string = timePeriodToString($determinationEvent->timeperiod);
+                    }
                     $weight = isset($determinationEvent->preferred) && $determinationEvent->preferred == 1 ? '0' : ($timeperiod_string ? $timeperiod_string : '1');
                     // check key exists
                     while (array_key_exists($weight, $dd_elements)) {
                         $weight .= '0';
+                    }
                     if($determinationEvent->taxonName){
                         $taxon_name = $determinationEvent->taxonName;
                         $name_link = "";
+                    }
                     else if($determinationEvent->taxon){
                         $taxon_name = cdm_ws_get(CDM_WS_TAXON . '/$0/name', $determinationEvent->taxon->uuid);
                         $name_link = path_to_taxon($determinationEvent->taxon->uuid);
+                    }
                 foreach ($value as $determinationEvent) {
                   $timeperiod_string = NULL;
                   if (isset($determinationEvent->timeperiod)) {
                     $timeperiod_string = timePeriodToString($determinationEvent->timeperiod);
+                  }
                   $weight = isset($determinationEvent->preferred) && $determinationEvent->preferred == 1 ? '0' : ($timeperiod_string ? $timeperiod_string : '1');
                   // check key exists
                   while (array_key_exists($weight, $dd_elements)) {
                     $weight .= '0';
+                  }
                   $taxon_name = '';
                   $name_link = '';
                   if ($determinationEvent->taxonName) {
                     $taxon_name = $determinationEvent->taxonName;
                   } else if ($determinationEvent->taxon) {
                     $taxon_name = cdm_ws_get(CDM_WS_TAXON . '/$0/name', $determinationEvent->taxon->uuid);
                     $name_link = path_to_taxon($determinationEvent->taxon->uuid);
+                  }
                   if ($taxon_name) {
                     $taxon_html = render_taxon_or_name($taxon_name, $name_link);
                     $dd_elements[$weight] = $taxon_html;
                     if (isset($determinationEvent->modifier)) {
                         $dd_elements[$weight] .= cdm_term_representation($determinationEvent->modifier);
+                    }
                     if ($timeperiod_string) {
                         $dd_elements[$weight] .= $glue . $timeperiod_string;
+                    }
                     if (isset($determinationEvent->actor->titleCache)) {
                         $dd_elements[$weight] .= $glue . $determinationEvent->actor->titleCache;
+                    }
                     if (isset($determinationEvent->description)) {
                         $dd_elements[$weight] .= $glue . $determinationEvent->description;
+                    }
+                  }
                   if (isset($determinationEvent->modifier)) {
                     $dd_elements[$weight] .= cdm_term_representation($determinationEvent->modifier);
+                  }
                   if ($timeperiod_string) {
                     $dd_elements[$weight] .= $glue . $timeperiod_string;
+                  }
                   if (isset($determinationEvent->actor->titleCache)) {
                     $dd_elements[$weight] .= $glue . $determinationEvent->actor->titleCache;
+                  }
                   if (isset($determinationEvent->description)) {
                     $dd_elements[$weight] .= $glue . $determinationEvent->description;
+                  }
+                }
                 ksort($dd_elements);
                 @_description_list_group_add($groups, cdm_occurrence_field_name_label('determinations'), $dd_elements);
                 break;
               case 'descriptions':
                 $descriptions = $value;
                 $occurrence_featureTree = cdm_get_occurrence_featureTree();
                 $dd_elements = array();
-...
                 break;
               case 'sources':
                   $dd_elements = array();
                   foreach ($value as $identifiable_source) {
                     $dd_elements[] = theme('cdm_OriginalSource', array('source' => $identifiable_source));
+                  }
                   @_description_list_group_add($groups, cdm_occurrence_field_name_label($field), $dd_elements);
                   break;
                 $dd_elements = array();
                 foreach ($value as $identifiable_source) {
                   $dd_elements[] = theme('cdm_OriginalSource', array('source' => $identifiable_source));
+                }
                 @_description_list_group_add($groups, cdm_occurrence_field_name_label($field), $dd_elements);
                 break;
               /* ---- DerivedUnitBase --- */
-...
               case 'collection':
                 $sub_dl_groups = array();
                 @_description_list_group_add($sub_dl_groups, cdm_occurrence_field_name_label('code'), $value->code, NULL, 1);
                 @_description_list_group_add($sub_dl_groups, cdm_occurrence_field_name_label('codeStandard'),  $value->codeStandard, NULL, 2);
                 @_description_list_group_add($sub_dl_groups, cdm_occurrence_field_name_label('codeStandard'), $value->codeStandard, NULL, 2);
                 @_description_list_group_add($sub_dl_groups, cdm_occurrence_field_name_label('institute'), $value->institute, NULL, 3);
                 @_description_list_group_add($sub_dl_groups, cdm_occurrence_field_name_label('townOrLocation'), $value->townOrLocation, NULL, 4);
                 // TODO "superCollection"
                 // TODO may have media
                 @_description_list_group_add($groups, cdm_occurrence_field_name_label($field),
                     array(
                         array('#markup' => $value->titleCache),
                         array('#theme' => 'description_list', '#groups' => $sub_dl_groups)
+                    )
                   array(
                     array('#markup' => $value->titleCache),
                     array('#theme' => 'description_list', '#groups' => $sub_dl_groups)
+                  )
                 );
                 break;
                 case 'storedUnder':
                   @_description_list_group_add($groups, cdm_occurrence_field_name_label('storedUnder'), render_taxon_or_name($value));
                   break;
               case 'storedUnder':
                 @_description_list_group_add($groups, cdm_occurrence_field_name_label('storedUnder'), render_taxon_or_name($value));
                 break;
                 /* ---- Specimen --- */
                 case 'sequences':
                   $dd_elements = array();
                   foreach ($value as $sequence) {
                     $dd_elements[] = compose_cdm_sequence($sequence);
+                  }
                   @_description_list_group_add($groups, cdm_occurrence_field_name_label($field), $dd_elements);
               /* ---- Specimen --- */
               case 'sequences':
                 $dd_elements = array();
                 foreach ($value as $sequence) {
                   $dd_elements[] = compose_cdm_sequence($sequence);
+                }
                 @_description_list_group_add($groups, cdm_occurrence_field_name_label($field), $dd_elements);
                 break;
                 // TODO preservation
                 // TODO exsiccatum
               // TODO preservation
               // TODO exsiccatum
               /* ---- FieldObservation --- */
-...
                 if (isset($value->collectingAreas)) {
                   $area_representations = array();
                   foreach($value->collectingAreas as $area) {
                   foreach ($value->collectingAreas as $area) {
                     $area_representations[] = $area->representation_L10n;
+                  }
                   @_description_list_group_add($groups, cdm_occurrence_field_name_label('collectingAreas'), implode(', ', $area_representations));
-...
+                  }
                   @_description_list_group_add($groups, cdm_occurrence_field_name_label('exactLocation'),
                     array(
                       array('#markup' => $value->exactLocation->sexagesimalString),
                       array(
                           array('#markup' => $value->exactLocation->sexagesimalString),
                           array(
                               '#theme' => 'description_list',
                               '#groups' => $sub_dl_groups
                           ),
+                      )
                         '#theme' => 'description_list',
                         '#groups' => $sub_dl_groups
                       ),
+                    )
                   );
+                }
                 break;
               default:
                 if(is_object($value) || is_array($value)){
                 if (is_object($value) || is_array($value)) {
                   drupal_set_message("Unhandled type in compose_cdm_specimenOrObservation() for field " . $field, "warning");
                 } else {
                   _description_list_group_add($groups, cdm_occurrence_field_name_label($field), $value);
-...
+          }
         } // END of loop over $derivedUnitFacade fields
         // Extensions
         $extensions = cdm_ws_fetch_all(CDM_WS_PORTAL_OCCURRENCE . '/'  . $specimenOrObservation->uuid . '/extensions', array($specimenOrObservation->uuid));
         if ($extensions && count($extensions)) {
           $extensions_render_array = compose_extensions($extensions);
           @_description_list_group_add($groups, t('Extensions') . ':',
             $extensions_render_array,
             '', 100);
+        }
         // template_preprocess_description_list() is not worting by weight so we do it right here
         uasort($groups, 'element_sort');
-...
       return $derivatives;
+    }
     /**
      * Compose an render array from a CDM Sequence object.
+     *

Also available in: Unified diff

Project

General

Profile

EDIT

Revision 0820cdc0

Added by Andreas Kohlbecker over 5 years ago

Project

General

Profile

EDIT

Revision 0820cdc0

Added by Andreas Kohlbecker over 5 years ago

Related issues