From 44d6bac401a53ef2f1b49101ba236486474b6d30 Mon Sep 17 00:00:00 2001
From: Chuck Scott <cscott@gaslightmedia.com>
Date: Mon, 11 May 2015 14:52:43 -0400
Subject: [PATCH] Still working on final testing of Connections import

---
 classes/glmMemberImportFromConnections.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/classes/glmMemberImportFromConnections.php b/classes/glmMemberImportFromConnections.php
index 047b6642..a25feaf4 100644
--- a/classes/glmMemberImportFromConnections.php
+++ b/classes/glmMemberImportFromConnections.php
@@ -178,7 +178,7 @@ class GlmMemberImportFromConnections
         $membTypeID = $this->wpdb->insert_id;
         $queryError = $this->wpdb->last_error;
         if ($queryError) {
-            glmMembersAdmin::addNotice('<b>Error when adding the default member type: Check following message.</b><br><pre>'.$queryError.'</pre>', 'AdminError');
+            glmMembersAdmin::addNotice('<b>Error when adding the default member type: Check following message.</b><br><pre>'.$queryError.'<p>'.$sql.'</p></pre>', 'AdminError');
             return false;
         }
 
@@ -204,7 +204,7 @@ class GlmMemberImportFromConnections
         $regionID = $this->wpdb->insert_id;
         $queryError = $this->wpdb->last_error;
         if ($queryError) {
-            glmMembersAdmin::addNotice('<b>Error when adding the default region: Check following message.</b><br><pre>'.$queryError.'</pre>', 'AdminError');
+            glmMembersAdmin::addNotice('<b>Error when adding the default region: Check following message.</b><br><pre>'.$queryError.'<p>'.$sql.'</p></pre>', 'AdminError');
             return false;
         }
 
@@ -220,7 +220,7 @@ class GlmMemberImportFromConnections
         $rawCats = $this->wpdb->get_results($sql, ARRAY_A);
         $queryError = $this->wpdb->last_error;
         if ($queryError) {
-            glmMembersAdmin::addNotice('<b>Error when reading cateory data from Connections.</b><br><pre>'.$queryError.'</pre>', 'AdminError');
+            glmMembersAdmin::addNotice('<b>Error when reading cateory data from Connections.</b><br><pre>'.$queryError.'<p>'.$sql.'</p></pre>', 'AdminError');
             return false;
         }
 
@@ -246,7 +246,7 @@ class GlmMemberImportFromConnections
         $rawTerms = $this->wpdb->get_results($sql, ARRAY_A);
         $queryError = $this->wpdb->last_error;
         if ($queryError) {
-            glmMembersAdmin::addNotice('<b>Error when reading cateory terms from Connections.</b><br><pre>'.$queryError.'</pre>', 'AdminError');
+            glmMembersAdmin::addNotice('<b>Error when reading cateory terms from Connections.</b><br><pre>'.$queryError.'<p>'.$sql.'</p></pre>', 'AdminError');
             return false;
         }
 
@@ -278,7 +278,7 @@ class GlmMemberImportFromConnections
             $catID = $this->wpdb->insert_id;
             $queryError = $this->wpdb->last_error;
             if ($queryError) {
-                glmMembersAdmin::addNotice('<b>Error when creating member: Check following message.</b><br><pre>'.$queryError.'</pre>', 'AdminError');
+                glmMembersAdmin::addNotice('<b>Error when creating member: Check following message.</b><br><pre>'.$queryError.'<p>'.$sql.'</p></pre>', 'AdminError');
             }
             $cats[$k]['new_id'] = $catID;
         }
@@ -299,7 +299,7 @@ class GlmMemberImportFromConnections
                 $this->wpdb->query($sql);
                 $queryError = $this->wpdb->last_error;
                 if ($queryError) {
-                    glmMembersAdmin::addNotice('<b>Error when creating member: Check following message.</b><br><pre>'.$queryError.'</pre>', 'AdminError');
+                    glmMembersAdmin::addNotice('<b>Error when creating member: Check following message.</b><br><pre>'.$queryError.'<p>'.$sql.'</p></pre>', 'AdminError');
                 }
             }
         }
@@ -312,7 +312,7 @@ class GlmMemberImportFromConnections
         $memberCats = $this->wpdb->get_results($sql, ARRAY_A);
         $queryError = $this->wpdb->last_error;
         if ($queryError) {
-            glmMembersAdmin::addNotice('<b>Error when reading term relationships from Connections.</b><br><pre>'.$queryError.'</pre>', 'AdminError');
+            glmMembersAdmin::addNotice('<b>Error when reading term relationships from Connections.</b><br><pre>'.$queryError.'<p>'.$sql.'</p></pre>', 'AdminError');
             return false;
         }
 
@@ -349,7 +349,7 @@ class GlmMemberImportFromConnections
                 $membID = $this->wpdb->insert_id;
                 $queryError = $this->wpdb->last_error;
                 if ($queryError) {
-                    glmMembersAdmin::addNotice('<b>Error when creating member: Check following message.</b><br><pre>'.$queryError.'</pre>', 'AdminError');
+                    glmMembersAdmin::addNotice('<b>Error when creating member: Check following message.</b><br><pre>'.$queryError.'<p>'.$sql.'</p></pre>', 'AdminError');
                 }
 
                 /*
@@ -381,7 +381,7 @@ class GlmMemberImportFromConnections
                     $cityID = $this->wpdb->insert_id;
                     $queryError = $this->wpdb->last_error;
                     if ($queryError) {
-                        glmMembersAdmin::addNotice('<b>Error when adding the default region: Check following message.</b><br><pre>'.$queryError.'</pre>', 'AdminError');
+                        glmMembersAdmin::addNotice('<b>Error when adding the default region: Check following message.</b><br><pre>'.$queryError.'<p>'.$sql.'</p></pre>', 'AdminError');
                     }
                     $cities[$addr['city']]  = $cityID;
 
@@ -482,7 +482,7 @@ class GlmMemberImportFromConnections
                 $membID = $this->wpdb->insert_id;
                 $queryError = $this->wpdb->last_error;
                 if ($queryError) {
-                    glmMembersAdmin::addNotice('<b>Error when creating member: Check following message.</b><br><pre>'.$queryError.'</pre>', 'AdminError');
+                    glmMembersAdmin::addNotice('<b>Error when creating member: Check following message.</b><br><pre>'.$queryError.'<p>'.$sql.'</p></pre>', 'AdminError');
                 }
 
                 // Scan member/category mapping array for any for this member
@@ -508,7 +508,7 @@ class GlmMemberImportFromConnections
                         $this->wpdb->query($sql);
                         $queryError = $this->wpdb->last_error;
                         if ($queryError) {
-                            glmMembersAdmin::addNotice('<b>Error when creating member/category entry: Check following message.</b><br><pre>'.$queryError.'</pre>', 'AdminError');
+                            glmMembersAdmin::addNotice('<b>Error when creating member/category entry: Check following message.</b><br><pre>'.$queryError.'<p>'.$sql.'</p></pre>', 'AdminError');
                         }
                     }
                 }
-- 
2.17.1