ESDet / esdportal_api

esdportal_api.module

Indentation +6 added lines, -6 removed lines

@@ -838,8 +838,8 @@ 
           $data_table_identifier = $table_info->name;
 
           $q = db_select($table_info->name)
-                 ->fields($table_info->name)
-                 ->condition($table_info->table_schema['primary key'][0], $school->bcode);
+                  ->fields($table_info->name)
+                  ->condition($table_info->table_schema['primary key'][0], $school->bcode);
 
           try {
             $res = $q->execute();
@@ -872,8 +872,8 @@ 
           $data_table_identifier = $table_info->name;
 
           $q = db_select($table_info->name)
-                 ->fields($table_info->name)
-                 ->condition($table_info->meta['join']['field_data_field_esd_schid']['field'], $school->esd_schid);
+                  ->fields($table_info->name)
+                  ->condition($table_info->meta['join']['field_data_field_esd_schid']['field'], $school->esd_schid);
 
           try {
             $res = $q->execute();
@@ -961,8 +961,8 @@ 
           $data_table_identifier = $table_info->name;
 
           $q = db_select($table_info->name)
-                 ->fields($table_info->name)
-                 ->condition($table_info->table_schema['primary key'][0], $ec->program_id);
+                  ->fields($table_info->name)
+                  ->condition($table_info->table_schema['primary key'][0], $ec->program_id);
 
           try {
             $res = $q->execute();

Spacing +43 added lines, -43 removed lines

@@ -1338,7 +1338,7 @@ 
  * = “Early Head Start” {tid:5158} OR “Head Start” {tid:5155} OR
  * “Great Start Readiness Program {tid:5154}
  */
-function esdportal_api_query_ec_profile_is_free_or_reduced_cost_alter(\QueryAlterableInterface &$query) {
+function esdportal_api_query_ec_profile_is_free_or_reduced_cost_alter(\QueryAlterableInterface & $query) {
   // First, inner join with ec_profiles.
   if (!$query->hasTag('has_ec_profile')) {
     esdportal_api_query_has_ec_profile_alter($query);
@@ -1355,7 +1355,7 @@ 
  *
  * IF ec_profile.field_ec_transportation = 1
  */
-function esdportal_api_query_ec_profile_has_transportation_alter(\QueryAlterableInterface &$query) {
+function esdportal_api_query_ec_profile_has_transportation_alter(\QueryAlterableInterface & $query) {
   // First, inner join with ec_profiles.
   if (!$query->hasTag('has_ec_profile')) {
     esdportal_api_query_has_ec_profile_alter($query);
@@ -1371,7 +1371,7 @@ 
  *
  * IF ec_profile.field_ec_special {vid:34} CONTAINS more than 5 values/items.
  */
-function esdportal_api_query_ec_profile_has_special_needs_experience_alter(\QueryAlterableInterface &$query) {
+function esdportal_api_query_ec_profile_has_special_needs_experience_alter(\QueryAlterableInterface & $query) {
   // First, inner join with ec_profiles.
   if (!$query->hasTag('has_ec_profile')) {
     esdportal_api_query_has_ec_profile_alter($query);
@@ -1389,7 +1389,7 @@ 
  * IF ec_profile.field_ec_meals {vid:30} = “Lunch” {tid:5163}
  * AND “Afternoon Snack” {tid:5164}
  */
-function esdportal_api_query_ec_profile_has_meals_alter(\QueryAlterableInterface &$query) {
+function esdportal_api_query_ec_profile_has_meals_alter(\QueryAlterableInterface & $query) {
   // First, inner join with ec_profiles.
   if (!$query->hasTag('has_ec_profile')) {
     esdportal_api_query_has_ec_profile_alter($query);
@@ -1410,7 +1410,7 @@ 
  *
  * Only return early childhood centers with a record in esd_el_2014.
  */
-function esdportal_api_query_has_esd_el_2014_alter(\QueryAlterableInterface &$query) {
+function esdportal_api_query_has_esd_el_2014_alter(\QueryAlterableInterface & $query) {
   // Join with field_data_field_esd_ec_id to get program_id.
   if (!$query->hasTag('has_esd_ec_id')) {
     esdportal_api_query_has_esd_ec_id_alter($query);
@@ -1425,7 +1425,7 @@ 
  *
  * Only return early childhood centers with a record in esd_el_2015.
  */
-function esdportal_api_query_has_esd_el_2015_alter(\QueryAlterableInterface &$query) {
+function esdportal_api_query_has_esd_el_2015_alter(\QueryAlterableInterface & $query) {
   // Join with field_data_field_esd_ec_id to get program_id.
   if (!$query->hasTag('has_esd_ec_id')) {
     esdportal_api_query_has_esd_ec_id_alter($query);
@@ -1440,7 +1440,7 @@ 
  *
  * Only return early childhood centers with an ec_id.
  */
-function esdportal_api_query_has_esd_ec_id_alter(\QueryAlterableInterface &$query) {
+function esdportal_api_query_has_esd_ec_id_alter(\QueryAlterableInterface & $query) {
   $query->join('field_data_field_esd_ec_id', 'ec_id', 'ec_id.entity_id=taxonomy_term_data.tid');
 }
 
@@ -1449,7 +1449,7 @@ 
  *
  * Only return early childhood centers with a record in ec_state_ratings.
  */
-function esdportal_api_query_has_ec_state_rating_alter(\QueryAlterableInterface &$query) {
+function esdportal_api_query_has_ec_state_rating_alter(\QueryAlterableInterface & $query) {
   // Join with field_data_field_esd_ec_id to get program_id.
   if (!$query->hasTag('has_esd_ec_id')) {
     esdportal_api_query_has_esd_ec_id_alter($query);
@@ -1465,7 +1465,7 @@ 
  * @param \QueryAlterableInterface &$query
  *   A query, probably looking for ec taxonomy terms.
  */
-function esdportal_api_query_has_ec_profile_alter(\QueryAlterableInterface &$query) {
+function esdportal_api_query_has_ec_profile_alter(\QueryAlterableInterface & $query) {
   $query->join('field_data_field_ec', 'ec_profile_ref', 'ec_profile_ref.field_ec_tid=taxonomy_term_data.tid');
   $query->condition('ec_profile_ref.bundle', 'ec_profile', '=');
 }
@@ -1478,7 +1478,7 @@ 
  * @param \QueryAlterableInterface &$query
  *   A query.
  */
-function _esdportal_api_add_ec_ti_join(\QueryAlterableInterface &$query) {
+function _esdportal_api_add_ec_ti_join(\QueryAlterableInterface & $query) {
   $query->join('taxonomy_index', 'ti', 'ti.nid=ec_profile_ref.entity_id');
   $query->groupBy('ti.nid');
 }
@@ -1491,7 +1491,7 @@ 
  * @param \QueryAlterableInterface &$query
  *   A query.
  */
-function esdportal_api_query_join_special_ed_level_alter(\QueryAlterableInterface &$query) {
+function esdportal_api_query_join_special_ed_level_alter(\QueryAlterableInterface & $query) {
   // First, inner join with school_profiles.
   if (!$query->hasTag('has_school_profile')) {
     esdportal_api_query_has_school_profile_alter($query);
@@ -1509,7 +1509,7 @@ 
  * @param \QueryAlterableInterface &$query
  *   A query.
  */
-function esdportal_api_query_join_special_ed_programs_alter(\QueryAlterableInterface &$query) {
+function esdportal_api_query_join_special_ed_programs_alter(\QueryAlterableInterface & $query) {
   // First, inner join with school_profiles.
   if (!$query->hasTag('has_school_profile')) {
     esdportal_api_query_has_school_profile_alter($query);
@@ -1524,7 +1524,7 @@ 
  *
  * IF school_profile.field_special_ed_level = moderate OR intensive.
  */
-function esdportal_api_query_school_profile_has_specialed_alter(\QueryAlterableInterface &$query) {
+function esdportal_api_query_school_profile_has_specialed_alter(\QueryAlterableInterface & $query) {
   // First, inner join with field_data_field_special_ed.
   if (!$query->hasTag('join_special_ed_level')) {
     esdportal_api_query_join_special_ed_level_alter($query);
@@ -1544,7 +1544,7 @@ 
  * OR IF schools.field_academic_focus = all_arts OR visual_arts OR
  * performing_arts OR music.
  */
-function esdportal_api_query_school_profile_has_arts_alter(\QueryAlterableInterface &$query) {
+function esdportal_api_query_school_profile_has_arts_alter(\QueryAlterableInterface & $query) {
   // First, inner join with school_profiles.
   if (!$query->hasTag('has_school_profile')) {
     esdportal_api_query_has_school_profile_alter($query);
@@ -1594,7 +1594,7 @@ 
  * IF school_profile.field_boys_sports CONTAINS 4 or more values/items
  * AND IF schools.field_girls_sports CONTAINS 4 or more values/items.
  */
-function esdportal_api_query_school_profile_has_sports_alter(\QueryAlterableInterface &$query) {
+function esdportal_api_query_school_profile_has_sports_alter(\QueryAlterableInterface & $query) {
   // First, inner join with school_profiles.
   if (!$query->hasTag('has_school_profile')) {
     esdportal_api_query_has_school_profile_alter($query);
@@ -1626,7 +1626,7 @@ 
  * IF school_profile.field_transportation_options = passes OR busses OR
  * shared_bus.
  */
-function esdportal_api_query_school_profile_has_transportation_alter(\QueryAlterableInterface &$query) {
+function esdportal_api_query_school_profile_has_transportation_alter(\QueryAlterableInterface & $query) {
   // First, inner join with school_profiles.
   if (!$query->hasTag('has_school_profile')) {
     esdportal_api_query_has_school_profile_alter($query);
@@ -1641,7 +1641,7 @@ 
  *
  * IF school_profile.field_before_after_care = after OR before.
  */
-function esdportal_api_query_school_profile_has_before_after_care_alter(\QueryAlterableInterface &$query) {
+function esdportal_api_query_school_profile_has_before_after_care_alter(\QueryAlterableInterface & $query) {
   // First, inner join with school_profiles.
   if (!$query->hasTag('has_school_profile')) {
     esdportal_api_query_has_school_profile_alter($query);
@@ -1656,7 +1656,7 @@ 
  *
  * IF school_profile.field_application_process = yes.
  */
-function esdportal_api_query_school_profile_application_required_alter(\QueryAlterableInterface &$query) {
+function esdportal_api_query_school_profile_application_required_alter(\QueryAlterableInterface & $query) {
   // First, inner join with school_profiles.
   if (!$query->hasTag('has_school_profile')) {
     esdportal_api_query_has_school_profile_alter($query);
@@ -1674,7 +1674,7 @@ 
  * OR IF school_profile.field_staff_resources = college_counselor
  * AND IF school_profile.field_college_prep CONTAINS any value EXCEPT none.
  */
-function esdportal_api_query_school_profile_collegereadiness_alter(\QueryAlterableInterface &$query) {
+function esdportal_api_query_school_profile_collegereadiness_alter(\QueryAlterableInterface & $query) {
   // First, inner join with school_profiles.
   if (!$query->hasTag('has_school_profile')) {
     esdportal_api_query_has_school_profile_alter($query);
@@ -1693,7 +1693,7 @@ 
  * @param \QueryAlterableInterface &$query
  *   A query, probably looking for school taxonomy terms.
  */
-function esdportal_api_query_has_school_profile_alter(\QueryAlterableInterface &$query) {
+function esdportal_api_query_has_school_profile_alter(\QueryAlterableInterface & $query) {
   $query->join('field_data_field_school', 'school_profile_ref', 'school_profile_ref.field_school_tid=taxonomy_term_data.tid');
   $query->condition('school_profile_ref.bundle', 'school_profile', '=');
   $query->addField('school_profile_ref', 'entity_id', 'school_profile_id');
@@ -1705,7 +1705,7 @@ 
  * @param \QueryAlterableInterface &$query
  *   A query, probably looking for school taxonomy terms.
  */
-function esdportal_api_query_ec_profile_changed_asc_alter(\QueryAlterableInterface &$query) {
+function esdportal_api_query_ec_profile_changed_asc_alter(\QueryAlterableInterface & $query) {
   if (!$query->hasTag('has_ec_profile')) {
     esdportal_api_query_has_ec_profile_alter($query);
     $query->addTag('has_ec_profile');
@@ -1714,7 +1714,7 @@ 
   $query->join('node', 'n', 'ec_profile_ref.entity_id=n.nid');
 
   // Our orderBy comes first!
-  $order =& $query->getOrderBy();
+  $order = & $query->getOrderBy();
   $order = array_reverse($order, TRUE);
   $order['n.changed'] = 'ASC';
   $order = array_reverse($order, TRUE);
@@ -1726,7 +1726,7 @@ 
  * @param \QueryAlterableInterface &$query
  *   A query, probably looking for school taxonomy terms.
  */
-function esdportal_api_query_ec_profile_changed_desc_alter(\QueryAlterableInterface &$query) {
+function esdportal_api_query_ec_profile_changed_desc_alter(\QueryAlterableInterface & $query) {
   if (!$query->hasTag('has_ec_profile')) {
     esdportal_api_query_has_ec_profile_alter($query);
     $query->addTag('has_ec_profile');
@@ -1735,7 +1735,7 @@ 
   $query->join('node', 'n', 'ec_profile_ref.entity_id=n.nid');
 
   // Our orderBy comes first!
-  $order =& $query->getOrderBy();
+  $order = & $query->getOrderBy();
   $order = array_reverse($order, TRUE);
   $order['n.changed'] = 'DESC';
   $order = array_reverse($order, TRUE);
@@ -1747,7 +1747,7 @@ 
  * @param \QueryAlterableInterface &$query
  *   A query, probably looking for school taxonomy terms.
  */
-function esdportal_api_query_school_profile_changed_asc_alter(\QueryAlterableInterface &$query) {
+function esdportal_api_query_school_profile_changed_asc_alter(\QueryAlterableInterface & $query) {
   if (!$query->hasTag('has_school_profile')) {
     esdportal_api_query_has_school_profile_alter($query);
     $query->addTag('has_school_profile');
@@ -1756,7 +1756,7 @@ 
   $query->join('node', 'n', 'school_profile_ref.entity_id=n.nid');
 
   // Our orderBy comes first!
-  $order =& $query->getOrderBy();
+  $order = & $query->getOrderBy();
   $order = array_reverse($order, TRUE);
   $order['n.changed'] = 'ASC';
   $order = array_reverse($order, TRUE);
@@ -1768,7 +1768,7 @@ 
  * @param \QueryAlterableInterface &$query
  *   A query, probably looking for school taxonomy terms.
  */
-function esdportal_api_query_school_profile_changed_desc_alter(\QueryAlterableInterface &$query) {
+function esdportal_api_query_school_profile_changed_desc_alter(\QueryAlterableInterface & $query) {
   if (!$query->hasTag('has_school_profile')) {
     esdportal_api_query_has_school_profile_alter($query);
     $query->addTag('has_school_profile');
@@ -1777,7 +1777,7 @@ 
   $query->join('node', 'n', 'school_profile_ref.entity_id=n.nid');
 
   // Our orderBy comes first!
-  $order =& $query->getOrderBy();
+  $order = & $query->getOrderBy();
   $order = array_reverse($order, TRUE);
   $order['n.changed'] = 'DESC';
   $order = array_reverse($order, TRUE);
@@ -1789,7 +1789,7 @@ 
  * @param \QueryAlterableInterface &$query
  *   A query, probably looking for school taxonomy terms.
  */
-function esdportal_api_query_ec_total_pts_desc_alter(\QueryAlterableInterface &$query) {
+function esdportal_api_query_ec_total_pts_desc_alter(\QueryAlterableInterface & $query) {
   // Add tag (which also adds needed joins)
   if (!$query->hasTag('has_ec_state_rating')) {
     esdportal_api_query_has_ec_state_rating_alter($query);
@@ -1797,7 +1797,7 @@ 
   }
 
   // Our orderBy comes first.
-  $order =& $query->getOrderBy();
+  $order = & $query->getOrderBy();
   $order = array_reverse($order, TRUE);
   $order['esr.total_points'] = 'DESC';
   $order = array_reverse($order, TRUE);
@@ -1809,7 +1809,7 @@ 
  * @param \QueryAlterableInterface &$query
  *   A query, probably looking for school taxonomy terms.
  */
-function esdportal_api_query_ec_total_pts_asc_alter(\QueryAlterableInterface &$query) {
+function esdportal_api_query_ec_total_pts_asc_alter(\QueryAlterableInterface & $query) {
   // Add tag (which also adds needed joins)
   if (!$query->hasTag('has_ec_state_rating')) {
     esdportal_api_query_has_ec_state_rating_alter($query);
@@ -1817,7 +1817,7 @@ 
   }
 
   // Our orderBy comes first.
-  $order =& $query->getOrderBy();
+  $order = & $query->getOrderBy();
   $order = array_reverse($order, TRUE);
   $order['esr.total_points'] = 'ASC';
   $order = array_reverse($order, TRUE);
@@ -1829,7 +1829,7 @@ 
  * @param \QueryAlterableInterface &$query
  *   A query, probably looking for school taxonomy terms.
  */
-function esdportal_api_query_has_bcode_alter(\QueryAlterableInterface &$query) {
+function esdportal_api_query_has_bcode_alter(\QueryAlterableInterface & $query) {
   $query->join('field_data_field_bcode', 'field_bcode', "field_bcode.entity_id=taxonomy_term_data.tid AND field_bcode.bundle='schools'");
 }
 
@@ -1839,7 +1839,7 @@ 
  * @param \QueryAlterableInterface &$query
  *   A query, probably looking for school taxonomy terms.
  */
-function esdportal_api_query_esd_k8hs_2015_highscore_alter(\QueryAlterableInterface &$query) {
+function esdportal_api_query_esd_k8hs_2015_highscore_alter(\QueryAlterableInterface & $query) {
   // Add bcode join.
   if (!$query->hasTag('has_bcode')) {
     esdportal_api_query_has_bcode_alter($query);
@@ -1868,7 +1868,7 @@ 
  * @param \QueryAlterableInterface &$query
  *   A query, probably looking for early childhood taxonomy terms.
  */
-function esdportal_api_query_esd_el_highscore_alter(\QueryAlterableInterface &$query) {
+function esdportal_api_query_esd_el_highscore_alter(\QueryAlterableInterface & $query) {
   // Join with ec_state_ratings.
   if (!$query->hasTag('has_ec_state_rating')) {
     esdportal_api_query_has_ec_state_rating_alter($query);
@@ -1884,7 +1884,7 @@ 
  * @param \QueryAlterableInterface &$query
  *   A query, probably looking for school taxonomy terms.
  */
-function esdportal_api_query_school_combined_total_pts_desc_alter(\QueryAlterableInterface &$query) {
+function esdportal_api_query_school_combined_total_pts_desc_alter(\QueryAlterableInterface & $query) {
   // Add bcode join.
   if (!$query->hasTag('has_bcode')) {
     esdportal_api_query_has_bcode_alter($query);
@@ -1906,7 +1906,7 @@ 
   $query->join($k8_scores, 'scores', 'score_bcode=field_bcode.field_bcode_value');
 
   // Our orderBy comes first.
-  $order =& $query->getOrderBy();
+  $order = & $query->getOrderBy();
   $order = array_reverse($order, TRUE);
   $order['scores.score'] = 'DESC';
   $order = array_reverse($order, TRUE);
@@ -1918,7 +1918,7 @@ 
  * @param \QueryAlterableInterface &$query
  *   A query, probably looking for school taxonomy terms.
  */
-function esdportal_api_query_school_combined_total_pts_asc_alter(\QueryAlterableInterface &$query) {
+function esdportal_api_query_school_combined_total_pts_asc_alter(\QueryAlterableInterface & $query) {
   // Add bcode join.
   if (!$query->hasTag('has_bcode')) {
     esdportal_api_query_has_bcode_alter($query);
@@ -1940,7 +1940,7 @@ 
   $query->join($k8_scores, 'scores', 'score_bcode=field_bcode.field_bcode_value');
 
   // Our orderBy comes first.
-  $order =& $query->getOrderBy();
+  $order = & $query->getOrderBy();
   $order = array_reverse($order, TRUE);
   $order['scores.score'] = 'ASC';
   $order = array_reverse($order, TRUE);
@@ -1952,7 +1952,7 @@ 
  * @param \QueryAlterableInterface &$query
  *   A query, probably looking for school or EC taxonomy terms.
  */
-function esdportal_api_query_has_geo_alter(\QueryAlterableInterface &$query) {
+function esdportal_api_query_has_geo_alter(\QueryAlterableInterface & $query) {
   $query->join('field_data_field_geo', 'field_geo', 'field_geo.entity_id=taxonomy_term_data.tid');
 }
 
@@ -1967,7 +1967,7 @@ 
  * @param \QueryAlterableInterface &$query
  *   A query, probably looking for school or EC taxonomy terms.
  */
-function esdportal_api_query_geoproximity_alter(\QueryAlterableInterface &$query) {
+function esdportal_api_query_geoproximity_alter(\QueryAlterableInterface & $query) {
   // Add geo join.
   if (!$query->hasTag('has_geo')) {
     esdportal_api_query_has_geo_alter($query);
@@ -2016,7 +2016,7 @@ 
 /**
  * Adds a field_special_ed_level filter.
  */
-function esdportal_api_query_field_special_ed_level_filter_alter(\QueryAlterableInterface &$query) {
+function esdportal_api_query_field_special_ed_level_filter_alter(\QueryAlterableInterface & $query) {
   // Get parameters from query metadata.
   $levels = $query->getMetaData('field_special_ed_level_filter');
 
@@ -2036,7 +2036,7 @@ 
 /**
  * Adds a field_special_ed_programs filter.
  */
-function esdportal_api_query_field_special_ed_programs_filter_alter(\QueryAlterableInterface &$query) {
+function esdportal_api_query_field_special_ed_programs_filter_alter(\QueryAlterableInterface & $query) {
   // Get parameters from query metadata.
   $programs = $query->getMetaData('field_special_ed_programs_filter');
 

Braces +17 added lines, -34 removed lines

@@ -583,8 +583,7 @@ 
 function _esdportal_api_retrieve_ec_state_rating($esd_ec_id, $batch_timestamp = NULL) {
   if (isset($batch_timestamp) && $batch_timestamp > 0) {
     $rating = db_query('SELECT * FROM {ec_state_ratings} WHERE timestamp=:batch_timestamp AND esd_ec_id=:esd_ec_id', array(':esd_ec_id' => $esd_ec_id, ':batch_timestamp' => $batch_timestamp))->fetchAssoc();
-  }
-  else {
+  } else {
     $rating = db_query('SELECT * FROM {ec_state_ratings} WHERE timestamp=(SELECT MAX(timestamp) FROM {ec_state_ratings}) AND esd_ec_id=:esd_ec_id', array(':esd_ec_id' => $esd_ec_id))->fetchAssoc();
   }
   return $rating;
@@ -615,8 +614,7 @@ 
 function _esdportal_api_index_ec_state_ratings($batch_timestamp = NULL) {
   if (isset($batch_timestamp) && $batch_timestamp > 0) {
     $ratings = db_query('SELECT * FROM {ec_state_ratings} WHERE timestamp=:batch_timestamp', array(':batch_timestamp' => $batch_timestamp))->fetchAssoc();
-  }
-  else {
+  } else {
     $ratings = db_query('SELECT * FROM {ec_state_ratings} WHERE timestamp=(SELECT MAX(timestamp) FROM {ec_state_ratings})')->fetchAll();
   }
 
@@ -794,16 +792,14 @@ 
     // Some schools don't have BCODEs.
     if (!isset($school->field_bcode[LANGUAGE_NONE])) {
       $school->bcode = NULL;
-    }
-    else {
+    } else {
       $school->bcode = $school->field_bcode[LANGUAGE_NONE][0]['value'];
     }
 
     // Some schools don't have ESD internal school IDs.
     if (!isset($school->field_esd_schid[LANGUAGE_NONE])) {
       $school->esd_schid = NULL;
-    }
-    else {
+    } else {
       $school->esd_schid = $school->field_esd_schid[LANGUAGE_NONE][0]['value'];
     }
 
@@ -843,13 +839,11 @@ 
 
           try {
             $res = $q->execute();
-          }
-          catch (Exception $e) {
+          } catch (Exception $e) {
             // No table?
             if ($e->getCode() == '42') {
               // Do nothing for now...
-            }
-            else {
+            } else {
               watchdog_exception('_esdportal_api_load_includes_for_schools', $e);
             }
           }
@@ -877,13 +871,11 @@ 
 
           try {
             $res = $q->execute();
-          }
-          catch (Exception $e) {
+          } catch (Exception $e) {
             // No table?
             if ($e->getCode() == '42') {
               // Do nothing for now...
-            }
-            else {
+            } else {
               watchdog_exception('_esdportal_api_load_includes_for_schools', $e);
             }
           }
@@ -919,8 +911,7 @@ 
     // Some ecs don't have program_ids.
     if (!isset($ec->field_esd_ec_id[LANGUAGE_NONE])) {
       $ec->program_id = NULL;
-    }
-    else {
+    } else {
       $ec->program_id = $ec->field_esd_ec_id[LANGUAGE_NONE][0]['value'];
     }
 
@@ -966,13 +957,11 @@ 
 
           try {
             $res = $q->execute();
-          }
-          catch (Exception $e) {
+          } catch (Exception $e) {
             // No table?
             if ($e->getCode() == '42') {
               // Do nothing for now...
-            }
-            else {
+            } else {
               watchdog_exception('_esdportal_api_load_includes_for_schools', $e);
             }
           }
@@ -1136,16 +1125,14 @@ 
   // Execute the query and load the terms it returns, if any.
   try {
     $result = $query->execute();
-  }
-  catch (Exception $e) {
+  } catch (Exception $e) {
     return services_error(t('request error'), 400);
   }
 
   if (!empty($result['taxonomy_term'])) {
     $tids = array_keys($result['taxonomy_term']);
     $terms = taxonomy_term_load_multiple($tids);
-  }
-  else {
+  } else {
     // Empty set.
     $terms = [];
   }
@@ -1240,14 +1227,12 @@ 
       if (!empty($args[$key])) {
         if (is_string($args[$key])) {
           $args[$key] = explode($value['commerce_services_explode'], $args[$key]);
-        }
-        elseif (is_array($args[$key])) {
+        } elseif (is_array($args[$key])) {
           foreach ($args[$key] as &$param) {
             $param = explode($value['commerce_services_explode'], $param);
           }
         }
-      }
-      else {
+      } else {
         // Otherwise ensure it is just converted to an array.
         $args[$key] = array();
       }
@@ -1278,8 +1263,7 @@ 
         // add it to the argument's value array now.
         if (in_array($param_key, array_keys(\Drupal\esdportal_api\EcDataUtils::entityTypeProperties($value['commerce_services_field_populate'])), TRUE)) {
           $args[$key][$param_key] = $param_value;
-        }
-        else {
+        } else {
           // Otherwise look and see if the parameter key begins with a field
           // name, assuming it must be either a field name or field column name.
           foreach (array_keys(\Drupal\esdportal_api\EcDataUtils::entityTypeFields($value['commerce_services_field_populate'])) as $field_name) {
@@ -1291,8 +1275,7 @@ 
               if ($field_name == $param_key && count($field_info['columns']) == 1) {
                 $args[$key][$param_key] = $param_value;
                 break;
-              }
-              else {
+              } else {
                 // Otherwise if the parameter key contains a valid column
                 // specification for the field type, add it to the argument's
                 // value array as well.