Index: ossp-pkg/as/as-gui/ChangeLog
RCS File: /v/ossp/cvs/ossp-pkg/as/as-gui/ChangeLog,v
rcsdiff -q -kk '-r1.31' '-r1.32' -u '/v/ossp/cvs/ossp-pkg/as/as-gui/ChangeLog,v' 2>/dev/null
--- ChangeLog	2003/02/04 19:40:52	1.31
+++ ChangeLog	2003/02/04 20:32:46	1.32
@@ -8,6 +8,7 @@
        Load logic now replaces period with fresh newly generated GUIDs
        Tried to fix tarball rolling file name exceptions in devtool
        Replaced __u format datatypes in Uuid class with U from master header
+       Completed the AS tuple in IDL, and transmit only CORBA duped strings
 
 030203 Better implement 'please add entries' announcement to beginning users
        Improved edit control [en|dis]ablement condition, and remove pixmap
Index: ossp-pkg/as/as-gui/as_slot.cpp
RCS File: /v/ossp/cvs/ossp-pkg/as/as-gui/as_slot.cpp,v
rcsdiff -q -kk '-r1.109' '-r1.110' -u '/v/ossp/cvs/ossp-pkg/as/as-gui/as_slot.cpp,v' 2>/dev/null
--- as_slot.cpp	2003/02/04 19:30:31	1.109
+++ as_slot.cpp	2003/02/04 20:32:46	1.110
@@ -1521,10 +1521,20 @@
 
         // Fill an account object to marshall and transmit
         int nRow = m_pMaintable->currentRow();
-        Singlerow.nDate = m_pMaintable->text(nRow, TITRAQ_IDXDATE).toInt();
-        Singlerow.nTime = m_pMaintable->text(nRow, TITRAQ_IDXSTART).toInt();
-        Singlerow.szName = CORBA::string_dup(m_pMaintable->text(nRow, TITRAQ_IDXUSER));
-        Singlerow.szTask = CORBA::string_dup(m_pMaintable->text(nRow, TITRAQ_IDXTASK));
+        Singlerow.szUser   = CORBA::string_dup(m_pMaintable->text(nRow, TITRAQ_IDXUSER));
+        Singlerow.szGuid   = CORBA::string_dup(m_pMaintable->text(nRow, TITRAQ_IDXGUID));
+        Singlerow.szCrc    = CORBA::string_dup(m_pMaintable->text(nRow, TITRAQ_IDXCRC).remove("0x"));
+        Singlerow.szRev    = CORBA::string_dup(m_pMaintable->text(nRow, TITRAQ_IDXREV));
+        Singlerow.szDate   = CORBA::string_dup(m_pMaintable->text(nRow, TITRAQ_IDXDATE));
+        Singlerow.szStart  = CORBA::string_dup(m_pMaintable->text(nRow, TITRAQ_IDXSTART));
+        Singlerow.szFinish = CORBA::string_dup(m_pMaintable->text(nRow, TITRAQ_IDXFINISH));
+        Singlerow.szAmount = CORBA::string_dup(m_pMaintable->text(nRow, TITRAQ_IDXAMOUNT));
+//        Singlerow.nRev     = m_pMaintable->text(nRow, TITRAQ_IDXREV).toUInt();
+//        Singlerow.nDate    = m_pMaintable->text(nRow, TITRAQ_IDXDATE).toUInt();
+//        Singlerow.nStart   = m_pMaintable->text(nRow, TITRAQ_IDXSTART).toUInt();
+//        Singlerow.nFinish  = m_pMaintable->text(nRow, TITRAQ_IDXFINISH).toUInt();
+//        Singlerow.nAmount  = m_pMaintable->text(nRow, TITRAQ_IDXAMOUNT).toUInt();
+        Singlerow.szTask   = CORBA::string_dup(m_pMaintable->text(nRow, TITRAQ_IDXTASK));
         Singlerow.szRemark = CORBA::string_dup(m_pMaintable->text(nRow, TITRAQ_IDXREMARK));
 
         Account->Log(Singlerow); // Finally transmit to server
Index: ossp-pkg/as/as-gui/as_stub.idl
RCS File: /v/ossp/cvs/ossp-pkg/as/as-gui/as_stub.idl,v
rcsdiff -q -kk '-r1.4' '-r1.5' -u '/v/ossp/cvs/ossp-pkg/as/as-gui/as_stub.idl,v' 2>/dev/null
--- as_stub.idl	2003/01/24 19:44:40	1.4
+++ as_stub.idl	2003/02/04 20:32:46	1.5
@@ -30,11 +30,21 @@
 //
 
 struct Astuple {
-    unsigned long nDate;       
-    unsigned long nTime;     
-    string szName;     
-    string szTask;     
-    string szRemark;     
+    string szUser;
+    string szGuid;
+    string szCrc;
+    string szRev;
+    string szDate;
+    string szStart;
+    string szFinish;
+    string szAmount;
+//    unsigned long nRev;
+//    unsigned long nDate;
+//    unsigned long nStart;
+//    unsigned long nFinish;
+//    unsigned long nAmount;
+    string szTask;
+    string szRemark;
 };
 
 interface Account {
Index: ossp-pkg/as/as-gui/devtool.conf
RCS File: /v/ossp/cvs/ossp-pkg/as/as-gui/devtool.conf,v
rcsdiff -q -kk '-r1.11' '-r1.12' -u '/v/ossp/cvs/ossp-pkg/as/as-gui/devtool.conf,v' 2>/dev/null
--- devtool.conf	2003/02/04 19:30:31	1.11
+++ devtool.conf	2003/02/04 20:32:46	1.12
@@ -48,7 +48,7 @@
     V=`./shtool version -l c -d short as_version.cpp`
     ./shtool tarball -o as-gui-${V}.tar.gz -d as-gui-${V} \
                      -e 'CVS,\.cvsignore,\.[ao]$,^\.,devtool*,*.tar.gz,^#.*,.*~$,*.bak' \
-                     -e 'autom4te\.cache,asdb.cpp,asdb.h,as_scrap,as_gfx/*.png' \
+                     -e 'autom4te\.cache,as_stub.cpp,as_stub.h,as_scrap,as_gfx/*.png' \
                      -c 'gzip --best' .
     ls -l as-gui-${V}.tar.gz
     echo "+++ testing"