[Greater-commits] r286 - trunk/Administration

[scm-commit@wald.intevation.org]

Author: bricks
Date: 2011-06-27 17:46:03 +0200 (Mon, 27 Jun 2011)
New Revision: 286

Modified:
   trunk/Administration/ExportDialog.cpp
   trunk/Administration/ImportDialog.cpp
   trunk/Administration/PanelSession.cpp
   trunk/Administration/SessionDialog.cpp
Log:
temp_sess_db_sid typ was changed to long

A long value for temp_sess_db_sid must be used in all dialogs


Modified: trunk/Administration/ExportDialog.cpp
===================================================================
--- trunk/Administration/ExportDialog.cpp	2011-06-27 15:44:47 UTC (rev 285)
+++ trunk/Administration/ExportDialog.cpp	2011-06-27 15:46:03 UTC (rev 286)
@@ -2715,6 +2715,7 @@
   char               res_id[20];
   char               sess_disch_id[20];
   char               temp_sess_src_id[20];
+  char               temp_sess_db_sid[20];
   char               privs[10];
   int                i=0;
 
@@ -2784,6 +2785,7 @@
     sprintf(sess_disch_id, "%ld", p_sess->sess_disch_id);
     sprintf(temp_sess_src_id, "%ld", p_sess->temp_sess_src_id);
     sprintf(privs, "%d", p_sess->privs);
+    sprintf(temp_sess_db_sid, "%ld", p_sess->temp_sess_db_sid);
     DOMText*  se1Text = doc->createTextNode(XMLConv(sess_id));
     se1Elem->appendChild(se1Text);
     DOMText*  se2Text = doc->createTextNode(XMLConv(catch_id));
@@ -2814,7 +2816,7 @@
     se14Elem->appendChild(se14Text);
     DOMText*  se15Text = doc->createTextNode(XMLConv(temp_sess_src_id));
     se15Elem->appendChild(se15Text);
-    DOMText*  se16Text = doc->createTextNode(XMLConv(p_sess->temp_sess_db_sid));
+    DOMText*  se16Text = doc->createTextNode(XMLConv(temp_sess_db_sid));
     se16Elem->appendChild(se16Text);
     DOMText*  se17Text = doc->createTextNode(XMLConv(p_sess->remark));
     se17Elem->appendChild(se17Text);

Modified: trunk/Administration/ImportDialog.cpp
===================================================================
--- trunk/Administration/ImportDialog.cpp	2011-06-27 15:44:47 UTC (rev 285)
+++ trunk/Administration/ImportDialog.cpp	2011-06-27 15:46:03 UTC (rev 286)
@@ -4252,7 +4252,8 @@
   }
   else if ((i==16) && (strcmp("TEMP_SESS_DB_SID", nodename.mb_str())) == 0)
   { 
-    strcpy(p_sess.temp_sess_db_sid, nodeval.mb_str());
+    longval = atol(nodeval.mb_str());
+    p_sess.temp_sess_db_sid = longval;
   }
   else if ((i==17) && (strcmp("REMARK", nodename.mb_str())) == 0)
   {

Modified: trunk/Administration/PanelSession.cpp
===================================================================
--- trunk/Administration/PanelSession.cpp	2011-06-27 15:44:47 UTC (rev 285)
+++ trunk/Administration/PanelSession.cpp	2011-06-27 15:46:03 UTC (rev 286)
@@ -377,7 +377,7 @@
       //type of temp_sess_src_id is long, so it must be converted
       sessionGrid->SetCellValue(i, COL_TEMP_SESS_SRC_ID, wxString::Format(wxT("%ld"),
                                 current_session->temp_sess_src_id));
-      sessionGrid->SetCellValue(i, COL_TEMP_SESS_DB_SID, wxString(current_session->temp_sess_db_sid, wxConvUTF8));
+      sessionGrid->SetCellValue(i, COL_TEMP_SESS_DB_SID, wxString::Format(wxT("%ld"), current_session->temp_sess_db_sid));
       sessionGrid->SetCellValue(i, COL_REMARK, wxString(current_session->remark, wxConvUTF8));
       current_session = current_session->next_element;
       i++;

Modified: trunk/Administration/SessionDialog.cpp
===================================================================
--- trunk/Administration/SessionDialog.cpp	2011-06-27 15:44:47 UTC (rev 285)
+++ trunk/Administration/SessionDialog.cpp	2011-06-27 15:46:03 UTC (rev 286)
@@ -356,7 +356,7 @@
   p_sessData.privs = atol(privs.mb_str());
   strcpy(p_sessData.is_temp_sess, isTempSess.mb_str());
   p_sessData.temp_sess_src_id = atol(tempSessSrcId.mb_str());
-  strcpy(p_sessData.temp_sess_db_sid, tempSessDbSid.mb_str());
+  p_sessData.temp_sess_db_sid = atol(tempSessDbSid.mb_str());
   strcpy(p_sessData.remark, remark.mb_str()); 
 
   //Call API function for update of data