/ - Diff - EDIT - EDIT Project Management

« Previous | Next »

Revision 7ca5ef1e

Added by Andreas Kohlbecker almost 8 years ago

ID 7ca5ef1e9471257231c37d190361d6b47a4e5a21
Parent 87b304a7
Child b2ebf0d3

#5482 fixing orderBy modes for CDM terms

        */
       define('CDM_HTTP_REQUEST_TIMEOUT', 90.0);
       define('SORT_ORDER_ID', 'sort_by_order_id');
     /**
      * orderBy webservice query parameter value
      */
     define('CDM_ORDER_BY_ID_ASC', 'ORDER_BY_ID_ASC');
     /**
      * orderBy webservice query parameter value
      */
     define('CDM_ORDER_BY_ID_DESC', 'ORDER_BY_ID_DESC');
     /**
      * orderBy webservice query parameter value
      */
     define('CDM_ORDER_BY_TITLE_CACHE_ASC', 'ORDER_BY_TITLE_CACHE_ASC');
     /**
      * orderBy webservice query parameter value
      */
     define('CDM_ORDER_BY_TITLE_CACHE_DESC', 'ORDER_BY_TITLE_CACHE_DESC');
     /**
      * orderBy webservice query parameter value
      */
     define('CDM_NOMENCLATURAL_SORT_ORDER_ASC', 'NOMENCLATURAL_SORT_ORDER_ASC');
     /**
      * orderBy webservice query parameter value
      */
     define('CDM_NOMENCLATURAL_SORT_DESC', 'NOMENCLATURAL_SORT_ORDER_DESC');
     /**
      * orderBy webservice query parameter value
      */
     define('CDM_ORDER_BY_ORDER_INDEX_ASC', 'BY_ORDER_INDEX_ASC');
     /**
      * orderBy webservice query parameter value
      */
     define('CDM_ORDER_BY_ORDER_INDEX_DESC', 'BY_ORDER_INDEX_DESC');
     /**
      * Implements hook_menu().
-...
      * @param array $terms
      *   a list of CDM DefinedTermBase instances
+     *
      * @param $sort_by
      *  Optionally sort option SORT_ORDER_ID (default: sorts after the cdm order index ),
      *  to sort alphabetically: SORT_ASC, SORT_DESC
+     *
      * @param $term_label_callback
      *   A callback function to override the term representations
+     *
      * @return array
      *   the terms in an array as options for a form element that allows multiple choices.
      */
     function cdm_terms_as_options($terms, $sort_by = SORT_ORDER_ID, $term_label_callback = NULL){
     function cdm_terms_as_options($terms, $term_label_callback = NULL){
       $options = array();
       if(isset($terms) && is_array($terms)){
         foreach ($terms as $term){
       if(isset($terms) && is_array($terms)) {
         foreach ($terms as $term) {
           if ($term_label_callback && function_exists($term_label_callback)) {
             $options[$term->uuid] = call_user_func($term_label_callback, $term);
           } else {
-...
+          }
+        }
+      }
       switch($sort_by){
         case SORT_ORDER_ID: array_reverse($options);
           break;
         default: array_multisort($options, SORT_ASC);
+      }
       return $options;
+    }
     /**
      * @todo Please document this function.
      * @see http://drupal.org/node/1354
      */
     function cdm_Vocabulary_as_option($vocabularyUuid, $term_label_callback = NULL, $default_option = FALSE, $sort_by = SORT_ORDER_ID) {
      * Creates and array of options for drupal select form elements.
+     *
      * @param $vocabulary_uuid
      *   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
      *   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
      *   One of the order by constants defined in this file
      */
     function cdm_vocabulary_as_option($vocabulary_uuid, $term_label_callback = NULL, $default_option = FALSE, $order_by = CDM_ORDER_BY_ORDER_INDEX_ASC) {
       static $vocabularyOptions = array();
       if (!isset($vocabularyOptions[$vocabularyUuid])) {
         $terms = cdm_ws_fetch_all('termVocabulary/' . $vocabularyUuid . '/terms');
         $vocabularyOptions[$vocabularyUuid] = cdm_terms_as_options($terms, $sort_by, $term_label_callback);
       if (!isset($vocabularyOptions[$vocabulary_uuid])) {
         $terms = cdm_ws_fetch_all('termVocabulary/' . $vocabulary_uuid . '/terms',
           array(
             'orderBy' => $order_by
+          )
         );
         $vocabularyOptions[$vocabulary_uuid] = cdm_terms_as_options($terms, $term_label_callback);
+      }
       $options = $vocabularyOptions[$vocabularyUuid];
       $options = $vocabularyOptions[$vocabulary_uuid];
       if($default_option !== FALSE){
         array_unshift ($options, "");
+      }
-...
      *  - TextFormat
      *  - DeterminationModifier
      *  - DnaMarker
      */
     function cdm_terms_by_type_as_option($term_type, $sort_by = SORT_ORDER_ID, $term_label_callback = NULL){
       $terms = cdm_ws_fetch_all(CDM_WS_TERM, array('class' => $term_type));
       return cdm_terms_as_options($terms, $sort_by, $term_label_callback);
+     *
      * @param  $order_by
      *  Optionally sort option (default: CDM_ORDER_BY_TITLE_CACHE_ASC)
      *  possible values:
      *    - CDM_ORDER_BY_ID_ASC
      *    - CDM_ORDER_BY_ID_DESC
      *    - CDM_ORDER_BY_TITLE_CACHE_ASC
      *    - CDM_ORDER_BY_TITLE_CACHE_DESC
      *    - CDM_ORDER_BY_ORDER_INDEX_ASC (can only be used with OrderedTerms!!)
      *    - CDM_ORDER_BY_ORDER_INDEX_DESC (can only be used with OrderedTerms!!)
      */
     function cdm_terms_by_type_as_option($term_type, $order_by = CDM_ORDER_BY_TITLE_CACHE_ASC, $term_label_callback = NULL){
       $terms = cdm_ws_fetch_all(
         CDM_WS_TERM,
         array(
           'class' => $term_type,
           'orderBy' => $order_by
+        )
       );
       return cdm_terms_as_options($terms, $term_label_callback);
+    }
     /**
-...
      * @see http://drupal.org/node/1354
      */
     function cdm_rankVocabulary_as_option() {
       $options = cdm_Vocabulary_as_option(UUID_RANK, NULL, "");
       $options = cdm_vocabulary_as_option(UUID_RANK, NULL, "");
       return $options;
+    }

       //GermanFederalStates
       if($state != null){
       $nameRelationshipTypeOptions = cdm_Vocabulary_as_option($state);
       $nameRelationshipTypeOptions = cdm_vocabulary_as_option($state);
       asort($nameRelationshipTypeOptions);
       $form['regionFilter']['area'] = array(
         '#type' => 'checkboxes',

       define('CDM_DATAPORTAL_LAST_VISITED_TAB_ARRAY_INDEX', 999);
       /* annotationTypeKeys */
       $annotationTypeKeys = array_keys(cdm_Vocabulary_as_option(UUID_ANNOTATION_TYPE));
       $annotationTypeKeys = array_keys(cdm_vocabulary_as_option(UUID_ANNOTATION_TYPE));
       if (in_array(UUID_ANNOTATION_TYPE_TECHNICAL, $annotationTypeKeys)) {
         $annotationTypeKeys = array_flip($annotationTypeKeys);
-...
           ),
       );
       $marker_type_options = cdm_terms_as_options( cdm_ws_fetch_all('term', array('class' => 'MarkerType' )) );
       $marker_type_options = cdm_terms_by_type_as_option('MarkerType');
       $form['distribution'][CDM_DISTRIBUTION_FILTER]['hiddenAreaMarkerType'] = array(
           '#type' => 'checkboxes',
           '#title' => 'Hide marked area filter',
-...
               and for the inverse.'),
       );
       $taxonRelationshipTypeOptions = cdm_Vocabulary_as_option(UUID_TAXON_RELATIONSHIP_TYPE, '_cdm_relationship_type_term_label_callback');
       $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['aggregation']['aggregate_by_taxon_relationships'][CDM_AGGREGATE_BY_TAXON_RELATIONSHIPS]['direct'] = array(
-...
         '#description' => t('Check this if you do not want to show annotation footnotes'),
       );
       $annotationTypeOptions = cdm_terms_by_type_as_option('AnnotationType', SORT_ASC);
       $annotationTypeOptions = cdm_terms_by_type_as_option('AnnotationType');
       // Additional option for the NULL case.
       $annotationTypeOptions['NULL_VALUE'] = t('untyped');
       $form['footnotes']['annotations_types_as_footnotes'] = array(
-...
         ' for details on the <em>Marked area filter</em>.',
       );
       $level_options = cdm_Vocabulary_as_option(UUID_NAMED_AREA_LEVEL, NULL, FALSE, SORT_ASC);
       $level_options = cdm_vocabulary_as_option(UUID_NAMED_AREA_LEVEL, NULL, FALSE, SORT_ASC);
       $form['taxon_profile']['distribution_layout'][DISTRIBUTION_TREE_OMIT_LEVELS] = array(
         '#type' => 'checkboxes',
         '#title' => 'Omit area levels',
-...
       );
       /* === currently unused ===
       $nameRelationshipTypeOptions = cdm_Vocabulary_as_option(UUID_NAME_RELATIONSHIP_TYPE);
       $nameRelationshipTypeOptions = cdm_vocabulary_as_option(UUID_NAME_RELATIONSHIP_TYPE);
       $form['taxon_synonymy']['name_relationships']['name_relationships_to_show'] = array(
         '#type' => 'checkboxes',
         '#title' => t('Display name relationships') . ':',
-...
           below selected taxon relationships of accepted taxa.'),
       );
       $taxonRelationshipTypeOptions = cdm_Vocabulary_as_option(UUID_TAXON_RELATIONSHIP_TYPE, '_cdm_relationship_type_term_label_callback');
       $taxonRelationshipTypeOptions = cdm_vocabulary_as_option(UUID_TAXON_RELATIONSHIP_TYPE, '_cdm_relationship_type_term_label_callback');
       $form['taxon_synonymy']['taxon_relations'][CDM_TAXON_RELATIONSHIP_TYPES] = array(
         '#type' => 'checkboxes',
         '#title' => t('Taxon relationship types') . ':',
-...
         '#collapsed' => FALSE
       );
       $taxonRelationshipTypeOptions = cdm_Vocabulary_as_option(UUID_NAME_RELATIONSHIP_TYPE, '_cdm_relationship_type_term_label_callback');
       $taxonRelationshipTypeOptions = cdm_vocabulary_as_option(UUID_NAME_RELATIONSHIP_TYPE, '_cdm_relationship_type_term_label_callback');
       $form['taxon_synonymy']['name_relations'][CDM_NAME_RELATIONSHIP_TYPES] = array(
         '#type' => 'checkboxes',
         '#title' => t('Name relationship types') . ':',

Also available in: Unified diff

Project

General

Profile

EDIT

Revision 7ca5ef1e

Added by Andreas Kohlbecker almost 8 years ago