beginings of some editing safety thingies

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@684 57a11ea4-9604-0410-9ed3-97b8803252fd

src/engine/Account.c

@@ -82,6 +82,7 @@ xaccInitAccount (Account * acc)
   acc->splits[0]   = NULL;
   
   acc->changed     = 0;
+  acc->open        = 0;
 }
 
 /********************************************************************\
@@ -165,12 +166,33 @@ xaccFreeAccount( Account *acc )
   acc->description = NULL;
   acc->notes       = NULL;
   
+  acc->changed     = 0;
+  acc->open        = 0;
+
   _free(acc);
 }
 
 /********************************************************************\
 \********************************************************************/
 
+void 
+xaccAccountBeginEdit (Account *acc)
+{
+   if (!acc) return;
+   acc->open = 1;
+}
+
+void 
+xaccAccountCommitEdit (Account *acc)
+{
+   if (!acc) return;
+   acc->changed = 1;
+   acc->open = 0;
+}
+
+/********************************************************************\
+\********************************************************************/
+
 int
 xaccGetAccountID (Account *acc)
 {
@@ -181,6 +203,16 @@ xaccGetAccountID (Account *acc)
 /********************************************************************\
 \********************************************************************/
 
+#define CHECK(acc) {					\
+   if (0 == acc->open) {				\
+      printf ("Error: Account not open for editing\n");	\
+      return;						\
+   }							\
+}
+
+/********************************************************************\
+\********************************************************************/
+
 void
 xaccInsertSplit ( Account *acc, Split *split )
   {
@@ -191,6 +223,7 @@ xaccInsertSplit ( Account *acc, Split *split )
 
   if (!acc) return;
   if (!split) return;
+  CHECK (acc);
 
   /* mark the account as having changed, and
    * the account group as requiring a save */
@@ -250,6 +283,7 @@ xaccRemoveSplit ( Account *acc, Split *split )
 
   if (!acc) return;
   if (!split) return;
+  CHECK (acc);
 
   /* mark the account as having changed, and
    * the account group as requiring a save */
@@ -593,6 +627,7 @@ xaccConsolidateTransactions (Account * acc)
    int i,j;
 
    if (!acc) return;
+   CHECK (acc);
 
    for (i=0; i<acc->numSplits; i++) {
       sa = acc->splits[i];
@@ -630,6 +665,9 @@ void
 xaccAccountSetType (Account *acc, int tip)
 {
    if (!acc) return;
+   CHECK (acc);
+
+   /* hack alert -- check for a valid type */
    acc->type = tip;
 }
 
@@ -637,6 +675,8 @@ void
 xaccAccountSetName (Account *acc, char *str)
 {
    if (!acc) return;
+   CHECK (acc);
+
    if (acc->accountName) free (acc->accountName);
    acc->accountName = strdup (str);
 }
@@ -645,6 +685,8 @@ void
 xaccAccountSetDescription (Account *acc, char *str)
 {
    if (!acc) return;
+   CHECK (acc);
+
    if (acc->description) free (acc->description);
    acc->description = strdup (str);
 }
@@ -653,6 +695,8 @@ void
 xaccAccountSetNotes (Account *acc, char *str)
 {
    if (!acc) return;
+   CHECK (acc);
+
    if (acc->notes) free (acc->notes);
    acc->notes = strdup (str);
 }

src/engine/Account.h

@@ -58,6 +58,16 @@ Account     *xaccMallocAccount( void );
 void         xaccInitAccount( Account * );
 void         xaccFreeAccount( Account * );
 
+/* 
+ * The xaccAccountBeginEdit() and xaccAccountCommitEdit() subroutines
+ * provide a pseudo-two-phase-commit wrapper for account updates. 
+ * They are mildly useful for detecting attempted updates outside
+ * of thier scope. However, they do not provide any true two-phase-anything
+ * in the current implementation.
+ */
+void         xaccAccountBeginEdit (Account *);
+void         xaccAccountCommitEdit (Account *);
+
 int          xaccGetAccountID (Account *);
 
 void         xaccInsertSplit (Account *, Split *);

src/engine/AccountP.h

@@ -64,9 +64,13 @@ struct _account {
   int numSplits;                /* length of splits array below   */
   Split **splits;               /* ptr to array of ptrs to splits */
 
-  /* the modified flag helps the gui keep track of 
+  /* the "changed" flag helps the gui keep track of 
    * changes to this account */
   short changed;
+
+  /* the "open" flag indicates if the account has been 
+   * opened for editing. */
+  short open;
 };