refdb-cvs Mailing List for RefDB (Page 76)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/refdb/refdb/src
In directory sc8-pr-cvs1:/tmp/cvs-serv22052

Modified Files:
	refdbdnote.c 
Log Message:
call update_meta() where appropriate

Index: refdbdnote.c
===================================================================
RCS file: /cvsroot/refdb/refdb/src/refdbdnote.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -U2 -r1.8 -r1.9

--- refdbdnote.c	24 Dec 2003 21:52:08 -0000	1.8
+++ refdbdnote.c	26 Dec 2003 00:10:02 -0000	1.9
@@ -204,7 +204,13 @@
 
  Finish:
+  if (ptr_addresult->success || ptr_addresult->updated) {
+    /* database was changed, update meta info */
+    update_meta(conn, ptr_clrequest);
+  }
+
   if (conn_refdb) {
     dbi_conn_close(conn_refdb);
   }
+
   dbi_conn_close(conn);
   delete_all_lilimem(&sentinel);
@@ -233,4 +239,5 @@
   int error;
   int result;
+  int retval = 1;
   unsigned long long n_periodical_id;
   unsigned long long n_id;
@@ -328,8 +335,6 @@
       LOG_PRINT(LOG_WARNING, "begin transaction failed");
       iwrite(ptr_clrequest->fd, "begin transaction failed\n", 25);
-      dbi_conn_close(conn);
-      delete_all_lilid(&id_sentinel);
-      delete_all_lilimem(&sentinel);
-      return 0;
+      retval = 0;
+      goto Finish;
     }
   
@@ -339,8 +344,6 @@
       iwrite(ptr_clrequest->fd, "cannot lock tables", 18);
       LOG_PRINT(LOG_WARNING, "Cannot lock tables");
-      dbi_conn_close(conn);
-      delete_all_lilid(&id_sentinel);
-      delete_all_lilimem(&sentinel);
-      return 0;
+      retval = 0;
+      goto Finish;
     }
 
@@ -353,9 +356,7 @@
       my_dbi_conn_unlock(conn);
       my_dbi_conn_rollback(conn);
-      dbi_conn_close(conn);
       LOG_PRINT(LOG_WARNING, "query error");
-      delete_all_lilid(&id_sentinel);
-      delete_all_lilimem(&sentinel);
-      return 0;
+      retval = 0;
+      goto Finish;
     }
 
@@ -387,9 +388,7 @@
       my_dbi_conn_unlock(conn);
       my_dbi_conn_rollback(conn);
-      dbi_conn_close(conn);
       LOG_PRINT(LOG_WARNING, "query error");
-      delete_all_lilid(&id_sentinel);
-      delete_all_lilimem(&sentinel);
-      return 0;
+      retval = 0;
+      goto Finish;
     }
     else if (dbi_result_next_row(dbires) != 0){
@@ -432,10 +431,8 @@
 	iwrite(ptr_clrequest->fd, "delete from t_xkeyword failed\n", 30);
       }
-      delete_all_lilid(&id_sentinel);
-      delete_all_lilimem(&sentinel);
       my_dbi_conn_unlock(conn);
       my_dbi_conn_rollback(conn);
-      dbi_conn_close(conn);
-      return 0;
+      retval = 0;
+      goto Finish;
     }
 
@@ -451,10 +448,8 @@
 	iwrite(ptr_clrequest->fd, "delete from t_xnote failed\n", 27);
       }
-      delete_all_lilid(&id_sentinel);
-      delete_all_lilimem(&sentinel);
       my_dbi_conn_unlock(conn);
       my_dbi_conn_rollback(conn);
-      dbi_conn_close(conn);
-      return 0;
+      retval = 0;
+      goto Finish;
     }
 
@@ -467,9 +462,7 @@
       my_dbi_conn_unlock(conn);
       my_dbi_conn_rollback(conn);
-      dbi_conn_close(conn);
       LOG_PRINT(LOG_WARNING, "query error");
-      delete_all_lilid(&id_sentinel);
-      delete_all_lilimem(&sentinel);
-      return 0;
+      retval = 0;
+      goto Finish;
     }
     dbi_result_free(dbires);
@@ -484,9 +477,7 @@
 	my_dbi_conn_unlock(conn);
 	my_dbi_conn_rollback(conn);
-	dbi_conn_close(conn);
 	LOG_PRINT(LOG_WARNING, "query error");
-	delete_all_lilid(&id_sentinel);
-	delete_all_lilimem(&sentinel);
-	return 0;
+	retval = 0;
+	goto Finish;
       }
 
@@ -504,9 +495,7 @@
 	  my_dbi_conn_unlock(conn);
 	  my_dbi_conn_rollback(conn);
-	  dbi_conn_close(conn);
 	  LOG_PRINT(LOG_WARNING, "query error");
-	  delete_all_lilid(&id_sentinel);
-	  delete_all_lilimem(&sentinel);
-	  return 0;
+	  retval = 0;
+	  goto Finish;
 	}
 	dbi_result_free(dbires1);
@@ -527,9 +516,14 @@
   } /* end while */
 
+ Finish:
+  if (conn && ptr_delresult->success) {
+    update_meta(conn, ptr_clrequest);
+  }
+
   dbi_conn_close(conn);
   delete_all_lilid(&id_sentinel);
   delete_all_lilimem(&sentinel);
   
-  return 1;
+  return retval;
 }
 
@@ -1969,4 +1963,5 @@
   int result;
   int mode;
+  int retval = 1;
   int error = 0; /* codes: 0 = no error, 1 = out of memory, 2 = subselect failed */
   unsigned long long n_id;
@@ -2146,8 +2141,6 @@
     }
 /*      printf("error detected\n"); */
-    dbi_conn_close(conn);
-    delete_all_lilimem(&sentinel);
-    delete_all_liliform(&link_sentinel);
-    return 0;
+    retval = 0;
+    goto Finish;
   }
 
@@ -2158,8 +2151,6 @@
     dbires = dbi_conn_query(conn, sql_command);
     if (!dbires) {
-      dbi_conn_close(conn);
-      delete_all_lilimem(&sentinel);
-      delete_all_liliform(&link_sentinel);
-      return 0;
+      retval = 0;
+      goto Finish;
     }
 
@@ -2169,9 +2160,7 @@
     else {
       dbi_result_free(dbires);
-      dbi_conn_close(conn);
-      delete_all_lilimem(&sentinel);
-      delete_all_liliform(&link_sentinel);
       iwrite(ptr_clrequest->fd, "note not available\n", 19);
-      return 0;
+      retval = 0;
+      goto Finish;
     }
     dbi_result_free(dbires);
@@ -2251,8 +2240,6 @@
 	  iwrite(ptr_clrequest->fd, outomem_n.text, outomem_n.length);
 	  ptr_addresult->failure++;
-	  dbi_conn_close(conn);
-	  delete_all_lilimem(&sentinel);
-	  delete_all_liliform(&link_sentinel);
-	  return 0;
+	  retval = 0;
+	  goto Finish;
 	}
 
@@ -2293,8 +2280,6 @@
 	if (!dbires) {
 	  ptr_addresult->failure++;
-	  dbi_conn_close(conn);
-	  delete_all_lilimem(&sentinel);
-	  delete_all_liliform(&link_sentinel);
-	  return 0;
+	  retval = 0;
+	  goto Finish;
 	}
 
@@ -2305,9 +2290,7 @@
 	  ptr_addresult->failure++;
 	  dbi_result_free(dbires);
-	  dbi_conn_close(conn);
-	  delete_all_lilimem(&sentinel);
-	  delete_all_liliform(&link_sentinel);
 	  iwrite(ptr_clrequest->fd, "target not available\n", 20);
-	  return 0;
+	  retval = 0;
+	  goto Finish;
 	}
 	dbi_result_free(dbires);
@@ -2342,4 +2325,10 @@
       }
     }
+  }
+
+ Finish:
+  if (ptr_addresult->success) {
+    /* database was changed, update meta info */
+    update_meta(conn, ptr_clrequest);
   }
 





2003	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (47)
2004	Jan (88)	Feb (50)	Mar (36)	Apr (9)	May (30)	Jun (30)	Jul (22)	Aug (16)	Sep (42)	Oct (18)	Nov (29)	Dec (23)
2005	Jan (18)	Feb (28)	Mar (21)	Apr (35)	May (62)	Jun (22)	Jul (5)	Aug (40)	Sep (98)	Oct (81)	Nov (51)	Dec (62)
2006	Jan (46)	Feb (36)	Mar (8)	Apr (16)	May (14)	Jun (16)	Jul (47)	Aug (60)	Sep (34)	Oct (16)	Nov (46)	Dec (11)
2007	Jan (16)	Feb (13)	Mar (58)	Apr (32)	May (4)	Jun (8)	Jul (31)	Aug (46)	Sep (22)	Oct (30)	Nov (58)	Dec (15)
2008	Jan (8)	Feb (8)	Mar (2)	Apr (6)	May (3)	Jun (2)	Jul (1)	Aug	Sep	Oct (6)	Nov (3)	Dec (5)
2009	Jan (1)	Feb (20)	Mar (8)	Apr (5)	May (8)	Jun (3)	Jul (6)	Aug (4)	Sep (7)	Oct (8)	Nov (2)	Dec (1)
2010	Jan (1)	Feb (4)	Mar	Apr	May (1)	Jun (1)	Jul	Aug (1)	Sep	Oct	Nov (1)	Dec
2011	Jan (5)	Feb (5)	Mar (13)	Apr (3)	May	Jun	Jul (4)	Aug	Sep (2)	Oct	Nov	Dec
2012	Jan (1)	Feb (1)	Mar	Apr	May	Jun	Jul	Aug	Sep (1)	Oct (5)	Nov	Dec (3)
2013	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov (1)	Dec (13)
2014	Jan (2)	Feb (2)	Mar (2)	Apr (4)	May (1)	Jun (1)	Jul	Aug (6)	Sep (3)	Oct	Nov (2)	Dec
2015	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug (3)	Sep	Oct (1)	Nov (1)	Dec
2016	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov (2)	Dec
2017	Jan	Feb	Mar (5)	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2018	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug (1)	Sep	Oct	Nov	Dec
2019	Jan	Feb	Mar (1)	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2021	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (1)	Nov	Dec
2022	Jan (9)	Feb (16)	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

refdb-cvs Mailing List for RefDB (Page 76)

refdb-cvs — All cvs checkins go to this list