Index: branches/TruckExpo/BrMerger/Form1.cs
===================================================================
--- branches/TruckExpo/BrMerger/Form1.cs (revision 449)
+++ branches/TruckExpo/BrMerger/Form1.cs (revision 450)
@@ -36,7 +36,9 @@
             SqlConnection conn2 = null;
             SqlConnection conn3 = null;
+            Stopwatch stopwatch = new Stopwatch();
 
             try
             {
+                stopwatch.Start();
                 string connectionString = ConfigurationManager.AppSettings["BazaReklam.ConnectionString"];
 
@@ -66,9 +68,5 @@
                        "WHERE CustomerID > 56710 ";
 
-                //cmd1.CommandText = "SELECT COUNT(*) " +
-                //        "FROM " + truckExpoDbName + ".dbo.Klienci " +
-                //        "WHERE CustomerID IN (56922, 56971, 56773) ";
                 m_waitProgressMax = (int)cmd1.ExecuteScalar();
-
 
                 cmd1.CommandText = "SELECT CustomerID, FirstName, LastName, OrganizationName, Address, City, State, PostalCode, Country, Nip, ContactName, PhoneNumber, FaxNumber, " +
@@ -77,11 +75,4 @@
                        "WHERE CustomerID > 56710 " +
                        "ORDER BY CustomerID";
-
-
-                //cmd1.CommandText = "SELECT CustomerID, FirstName, LastName, OrganizationName, Address, City, State, PostalCode, Country, Nip, ContactName, PhoneNumber, FaxNumber, " +
-                //           "Note, data, osw_nr, osw_wazne_do, Adres_Fkatura, Old_ID, Adres_Kor, Platnik_VAT, Aktywny, Email, UserName, Last_Modify, Modify_User, http, VIES, regon, krs, nipKraj " +
-                //           "FROM " + truckExpoDbName + ".dbo.Klienci " +
-                //           "WHERE CustomerID IN (56922, 56971, 56773) " +
-                //           "ORDER BY CustomerID";
 
                 SqlDataReader rdrCustomer, rdrReklama, rdrKontakt;
@@ -119,4 +110,5 @@
                             "FROM " + truckExpoDbName + ".dbo.Klienci WHERE CustomerID=" + rdrCustomer["CustomerID"];
                         n = cmd3.ExecuteNonQuery();
+
                         nKlienci += n;
 
@@ -168,5 +160,6 @@
                                 + bazaReklamDbName + ".dbo.Klienci.Aktywny=E.Aktywny,"
                                 + bazaReklamDbName + ".dbo.Klienci.Email=E.Email,"
-                                + bazaReklamDbName + ".dbo.Klienci.UserName=E.UserName,"
+                                //+ bazaReklamDbName + ".dbo.Klienci.UserName=E.UserName,"
+                                + bazaReklamDbName + ".dbo.Klienci.AgentExpo=E.UserName,"
                                 + bazaReklamDbName + ".dbo.Klienci.Last_Modify=E.Last_Modify,"
                                 + bazaReklamDbName + ".dbo.Klienci.Modify_User=E.Modify_User,"
@@ -284,6 +277,4 @@
                             //PotwierdzeniaEcard
                             //pusta
-
-                            ;
                         }
                         else
@@ -312,5 +303,7 @@
                             nReklama += n;
                             cmd3.CommandText = "SELECT SCOPE_IDENTITY()";
-                            idReklama = (int)cmd3.ExecuteScalar();
+                            obj1 = cmd3.ExecuteScalar();
+                            idReklama = Convert.ToInt32(obj1);
+
                         }
 
@@ -459,6 +452,6 @@
 
                     // dla testów
-                    if (nRead > 100)
-                        break;
+                    //if (nRead > 100)
+                    //    break;
                 }
                 rdrCustomer.Close();
@@ -582,10 +575,4 @@
                         }
                         nPlatnosciEcard += n;
-
-
-                        //PotwierdzeniaEcard
-                        //pusta
-
-                        ;
                     }
                     else
@@ -614,5 +601,6 @@
                         nReklama += n;
                         cmd3.CommandText = "SELECT SCOPE_IDENTITY()";
-                        idReklama = (int)cmd3.ExecuteScalar();
+                        obj1 = cmd3.ExecuteScalar();
+                        idReklama = Convert.ToInt32(obj1);
                     }
 
@@ -761,5 +749,8 @@
                 conn3.Close();
 
+                stopwatch.Stop();
+
                 MessageBox.Show("Zakoñczono ³¹czenie danych.\n" +
+                    " - czas: " + stopwatch.Elapsed.Minutes + " minut, " + stopwatch.Elapsed.Seconds + " sekund" + "\n" +
                     " - klienci: " + nKlienci + "\n" +
                     " - klienci, osoby do kontaktu: " + nKlienci_Osoby_Do_Kontaktu + "\n" +