populating electronic delivery fields

includes/db.inc

@@ -23,7 +23,7 @@ function upei_roblib_ill_log_request($request, $response) {
         'patron_lastname' => $request['DeliveryAddress']['Surname'],
         'patron_type' => $request['DeliveryAddress']['patron_type'],
         'patron_department' => $request['DeliveryAddress']['Department'],
-        //'patron_email' => $request['DeliveryAddress']['DeliveryAddress'],
+        'patron_email' => $request['DeliveryAddress']['DeliveryAddress'],
         'notes' => isset($request['DeliveryAddress']['notes']) ? $request['DeliveryAddress']['notes'] : '',
         'genre' => isset($request['BibliographicInfo']['Genre']) ? $request['BibliographicInfo']['Genre'] : '',
         'doi' => isset($request['BibliographicInfo']['AdditionalNumbers']) ? $request['BibliographicInfo']['AdditionalNumbers'] : '',

includes/form.inc

@@ -198,12 +198,12 @@ function upei_roblib_ill_auth_form($form, &$form_state) {
     '#options' => $departments,
     '#required' => TRUE,
   );
-  /*$form['DeliveryAddress'] = array(
+  $form['DeliveryAddress'] = array(
     '#type' => 'textfield',
     '#title' => t('Your Email'),
     '#size' => 50,
     '#required' => TRUE,
-  );   */
+  );
   $form['InstitutionName'] = array(
     '#type' => 'hidden',
     '#title' => t('Name of Institution'),

includes/relais.inc

@@ -64,6 +64,8 @@ function upei_roblib_ill_build_relais_arr($form_state) {
   );
   $relais_arr['BibliographicInfo'] = upei_roblib_ill_clean_array($form_state['storage']['upei_roblib_ill_request_form']);
   $relais_arr['DeliveryAddress'] = upei_roblib_ill_clean_array($form_state['storage']['upei_roblib_ill_auth_form']);
+  $relais_arr['ElectronicDelivery']['DeliveryAddress'] = $relais_arr['ElectronicDelivery']['MessagingAddress'] =
+    $relais_arr['DeliveryAddress']['DeliveryAddress'];
   $request_info = upei_roblib_ill_request_info_array($relais_arr['BibliographicInfo'], $form_state['values']['notes']);
   $relais_arr['RequestInfo'] = $request_info;
   $relais_arr['PublisherInfo']['PublicationDate'] = isset($form_state['storage']['upei_roblib_ill_request_form']['Date']) ?