From 8f2c8fe32a5f178bd18480fc87563d4bb82084f4 Mon Sep 17 00:00:00 2001
From: Nathan Coad <nathan@thecoads.com>
Date: Tue, 31 May 2016 18:55:05 +1000
Subject: [PATCH] prepare for release

---
 booking.admin.inc     | 12 ++++++++++--
 booking.regn_node.inc | 12 +++++++++---
 booking.tokens.inc    |  2 +-
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/booking.admin.inc b/booking.admin.inc
index 5e6eb12..05da549 100644
--- a/booking.admin.inc
+++ b/booking.admin.inc
@@ -523,11 +523,19 @@ function booking_admin()
     '#size' => 150,
     '#maxlength' => 2000
   );
-  
+ 
+   $form['management']['booking_export_include_fields_dynamic'] = array(
+    '#type' => 'select',
+    '#multiple' => TRUE,
+    '#title' => t('Not In Use - Select database fields'),
+    '#description' => t('Select database fields to export to CSV. Ensure you hold down control/command when selecting multiple options.'),
+    '#options' => _booking_get_person_fields(),
+    '#default_value' => variable_get('booking_export_include_fields_dynamic', ''),
+  );   
   $form['management']['booking_import_include_fields_dynamic'] = array(
     '#type' => 'select',
     '#multiple' => TRUE,
-    '#title' => t('Select database fields'),
+    '#title' => t('Not In Use - Select database fields'),
     '#description' => t('Select database fields to import from an uploaded CSV file. Ensure you hold down control/command when selecting multiple options.'),
     '#options' => _booking_get_person_fields(),
     '#default_value' => variable_get('booking_import_include_fields_dynamic', ''),
diff --git a/booking.regn_node.inc b/booking.regn_node.inc
index e722bdc..f2d9150 100644
--- a/booking.regn_node.inc
+++ b/booking.regn_node.inc
@@ -13,8 +13,7 @@ function booking_node_presave($node) {
 }
 
 /**
- * Function to create a mysql view of a complete person 
- * This is still in test phase and does not return any value
+ * Function to create a mysql view of all information relating to an attendee
  *
  * @param 
  * @return 
@@ -123,7 +122,7 @@ function booking_load_query($node_ids = NULL, $fetchAssoc = FALSE)
 		$result = db_query("SELECT * FROM {booking_person_view}")->fetchAllAssoc('nid');
 	}	
 
-	watchdog('booking', "<pre>Loading node query output:\n@info</pre>", array('@info' => print_r( $result, true)));
+	//watchdog('booking', "<pre>Loading node query output:\n@info</pre>", array('@info' => print_r( $result, true)));
 	return $result;
 }	
 	
@@ -238,6 +237,13 @@ function booking_load_query_old($node_ids = NULL, $fetchAssoc = FALSE)
 	return $result;
 }
 
+/**
+ * Function implementing hook_load for the node-type booking
+ * @see booking_load_query
+ *
+ * @param $nodes - An array of the nodes being loaded, keyed by nid
+ * @return nothing
+ */
 function booking_load($nodes) {
 	global $event;
 
diff --git a/booking.tokens.inc b/booking.tokens.inc
index ecb1b68..0c330e5 100644
--- a/booking.tokens.inc
+++ b/booking.tokens.inc
@@ -613,6 +613,6 @@ function booking_define_personspecific_tokens($node)
 		$tokens['room-allocation'] = _booking_room_email_summary($node);
 		$tokens['bed-type'] = _booking_room_bedtype_lookup(empty($node->booking_room_bedtype) ? '0' : $node->booking_room_bedtype);
 	}
-	watchdog('booking_debug', "<pre>Person specific tokens:\n@info</pre>", array('@info' => print_r( $tokens, true)));
+	//watchdog('booking_debug', "<pre>Person specific tokens:\n@info</pre>", array('@info' => print_r( $tokens, true)));
 	return $tokens;		
 }