Zbiór zmian 456 dla branches

Pokaż
Ignoruj:
Data:
2009-03-18 09:38:12 (17 years ago)
Autor:
marek
Opis:

re #75 - wersja 1.0.0.84

Lokalizacja:
branches/TruckExpo
Pliki:
4 zmodyfikowane

Legenda:

Bez zmian
Dodane
Usunięte

  • branches/TruckExpo/BazaReklam/Properties/AssemblyInfo.cs

    r436 r456  
    3030// 
    3131[assembly: AssemblyVersion("1.0.0.0")] 
    32 [assembly: AssemblyFileVersion("1.0.0.83")] 
     32[assembly: AssemblyFileVersion("1.0.0.84")] 

  • branches/TruckExpo/BazaReklam/app.config

    r452 r456  
    88  <connectionStrings> 
    99    <clear /> 
    10     <add name="BAZA_REKLAM_LOCAL" connectionString="Data Source=.\sql2k;Initial Catalog=BAZA_REKLAM;Persist Security Info=True" 
     10    <add name="BAZA_REKLAM_LOCAL" connectionString="Data Source=10.0.0.21;Initial Catalog=BAZA_REKLAM;Persist Security Info=True" 
    1111      providerName="System.Data.SqlClient" /> 
    1212    <add name="BAZA_REKLAM" connectionString="Data Source=sql.ct.com.pl;Initial Catalog=BAZA_REKLAM;Persist Security Info=True" 
    1313      providerName="System.Data.SqlClient" /> 
    14     <add name="BAZA_REKLAM_TEST" connectionString="Data Source=sql.ct.com.pl;Initial Catalog=BAZA_REKLAM_TEST;Persist Security Info=True" 
    15       providerName="System.Data.SqlClient" /> 
    16     <!--<add name="Baza_Reklam.Properties.Settings.BAZA_REKLAMConnectionString1" 
    17       connectionString="Data Source=DOROTA-PC\SQL2005MSDN;Initial Catalog=BAZA_REKLAM;Integrated Security=True" 
    18       providerName="System.Data.SqlClient" /> 
    19     <add name="Baza_Reklam.Properties.Settings.BAZA_REKLAM" connectionString="Data Source=DOROTA-PC\SQL2005MSDN;Initial Catalog=BAZA_REKLAM;Integrated Security=True" 
    20       providerName="System.Data.SqlClient" /> 
    21     <add name="Baza_Reklam.Properties.Settings.BAZA_REKLAM_PROMO" 
    22       connectionString="Data Source=DOROTA-PC\SQL2005MSDN;Initial Catalog=BAZA_REKLAM;Integrated Security=True" /> 
    23     <add name="Baza_Reklam.Properties.Settings.testowe" connectionString="Data Source=sql.ct.com.pl;Initial Catalog=BAZA_REKLAM_TEST;User ID=sa" 
    24       providerName="System.Data.SqlClient" /> 
    25     <add name="Baza_Reklam.Properties.Settings.BAZA_REKLAM_TESTConnectionString" 
    26       connectionString="Data Source=WSIEDZIK\SQL2005DEV;Initial Catalog=BAZA_REKLAM_TEST;Integrated Security=True" 
    27       providerName="System.Data.SqlClient" /> 
    28     <add name="Baza_Reklam.Properties.Settings.Baza_ReklamConnectionString" 
    29       connectionString="Data Source=HP-LAPTOP\sql2k;Initial Catalog=Baza_Reklam;User ID=sa;Password=mageroni" 
    30       providerName="System.Data.SqlClient" />--> 
    3114  </connectionStrings> 
    3215  <applicationSettings> 

  • branches/TruckExpo/BrMerger/App.config

    r448 r456  
    55    <add key="TruckExpo.DbName" value="Truck_Expo" /> 
    66 
    7     <add key="BazaReklam.ConnectionString" value="Data Source=.\sql2k;Initial Catalog=Baza_Reklam;Persist Security Info=True;User=sa;Password=mageroni;" /> 
    8     <add key="TruckExpo.ConnectionString" value="Data Source=.\sql2k;Initial Catalog=Truck_Expo;Persist Security Info=True;User=sa;Password=mageroni;" /> 
     7    <add key="BazaReklam.ConnectionString" value="Data Source=sql.ct.com.pl;Initial Catalog=Baza_Reklam;Persist Security Info=True;User=sa;Password=9ar6u$ek;" /> 
     8    <add key="TruckExpo.ConnectionString" value="Data Source=sql.ct.com.pl;Initial Catalog=Truck_Expo;Persist Security Info=True;User=sa;Password=9ar6u$ek;" /> 
    99  </appSettings> 
    1010</configuration> 

  • branches/TruckExpo/BrMerger/Form1.cs

    r455 r456  
    3131        private void RunProcess() 
    3232        { 
    33             SqlTransaction tr1 = null; 
     33            //SqlTransaction tr1 = null; 
    3434 
    3535            SqlConnection conn1 = null; 
    … …  
    8484                        = nKontakty = nKONTAKTY_Log = nKLIENCI_Log = nKlienci_Tytul = nOferty_Main = nSheduler = nKl_Klienci = 0; 
    8585 
    86                 tr1 = conn3.BeginTransaction(); 
    87                 cmd3.Transaction = tr1; 
     86                //tr1 = conn3.BeginTransaction(); 
     87                //cmd3.Transaction = tr1; 
    8888 
    8989                int nRead = 0; 
    … …  
    737737                //test: anulujemy operacjê 
    738738                //tr1.Rollback(); 
    739                 tr1.Commit(); 
    740                 tr1 = null; 
     739                //tr1.Commit(); 
     740                //tr1 = null; 
    741741 
    742742                conn1.Close(); 
    … …  
    767767            catch (Exception ex) 
    768768            { 
    769                 if (tr1 != null) 
    770                 { 
    771                     tr1.Rollback(); 
    772                     tr1 = null; 
    773                 } 
     769                //if (tr1 != null) 
     770                //{ 
     771                //    tr1.Rollback(); 
     772                //    tr1 = null; 
     773                //} 
    774774 
    775775                MessageBox.Show(ex.ToString());