merge back

include/mdbtools.h

@@ -179,6 +179,7 @@ typedef struct {
 	guint16		col_size_offset;
 	guint16		col_num_offset;
 	guint16		tab_col_entry_size;
+	guint16         tab_free_map_offset;
 } MdbFormatConstants; 
 
 typedef struct {

src/gmdb2/gladefiles/gmdb-debug.glade

@@ -163,7 +163,6 @@
 	      <child>
 		<widget class="button" id="button4">
 		  <property name="visible">True</property>
-		  <property name="tooltip" translatable="yes">Open a new debug window</property>
 		  <property name="label">gtk-new</property>
 		  <property name="use_stock">True</property>
 		  <signal name="clicked" handler="gmdb_debug_new_cb" last_modification_time="Fri, 03 Jan 2003 13:12:52 GMT"/>
@@ -173,19 +172,19 @@
 	      <child>
 		<widget class="button" id="back_button">
 		  <property name="visible">True</property>
-		  <property name="tooltip" translatable="yes">Back</property>
+		  <property name="tooltip" translatable="yes">New File</property>
 		  <property name="label">gtk-go-back</property>
 		  <property name="use_stock">True</property>
-		  <property name="new_group">True</property>
 		</widget>
 		<packing>
+		  <property name="new_group">True</property>
 		</packing>
 	      </child>
 
 	      <child>
 		<widget class="button" id="forward_button">
 		  <property name="visible">True</property>
-		  <property name="tooltip" translatable="yes">Forward</property>
+		  <property name="tooltip" translatable="yes">Open File</property>
 		  <property name="label">gtk-go-forward</property>
 		  <property name="use_stock">True</property>
 		</widget>
@@ -194,7 +193,6 @@
 	      <child>
 		<widget class="button" id="jump_button">
 		  <property name="visible">True</property>
-		  <property name="tooltip" translatable="yes">Jump to selected page</property>
 		  <property name="label">gtk-jump-to</property>
 		  <property name="use_stock">True</property>
 		</widget>
@@ -203,12 +201,12 @@
 	      <child>
 		<widget class="button" id="close_button">
 		  <property name="visible">True</property>
-		  <property name="tooltip" translatable="yes">Close this window</property>
+		  <property name="tooltip" translatable="yes">Save File</property>
 		  <property name="label">gtk-close</property>
 		  <property name="use_stock">True</property>
-		  <property name="new_group">True</property>
 		</widget>
 		<packing>
+		  <property name="new_group">True</property>
 		</packing>
 	      </child>
 	    </widget>

src/gmdb2/gladefiles/gmdb-sql.glade

@@ -246,8 +246,10 @@
 		  <property name="tooltip" translatable="yes">Execute query</property>
 		  <property name="label">gtk-execute</property>
 		  <property name="use_stock">True</property>
-		  <property name="new_group">True</property>
 		</widget>
+		<packing>
+		  <property name="new_group">True</property>
+		</packing>
 	      </child>
 
 	      <child>
@@ -266,8 +268,10 @@
 		  <property name="tooltip" translatable="yes">Close this window</property>
 		  <property name="label">gtk-close</property>
 		  <property name="use_stock">True</property>
-		  <property name="new_group">True</property>
 		</widget>
+		<packing>
+		  <property name="new_group">True</property>
+		</packing>
 	      </child>
 	    </widget>
 	  </child>

src/gmdb2/gladefiles/gmdb.glade

@@ -328,9 +328,11 @@
 		  <property name="label" translatable="yes">SQL</property>
 		  <property name="use_underline">True</property>
 		  <property name="stock_pixmap">gtk-execute</property>
-		  <property name="new_group">True</property>
 		  <signal name="clicked" handler="gmdb_sql_new_cb" last_modification_time="Sun, 29 Dec 2002 03:23:01 GMT"/>
 		</widget>
+		<packing>
+		  <property name="new_group">True</property>
+		</packing>
 	      </child>
 
 	      <child>

src/libmdb/Makefile.am

@@ -1,4 +1,4 @@
 lib_LTLIBRARIES	=	libmdb.la
-libmdb_la_SOURCES=	catalog.c mem.c file.c kkd.c table.c data.c dump.c backend.c money.c sargs.c index.c like.c write.c stats.c
+libmdb_la_SOURCES=	catalog.c mem.c file.c kkd.c table.c data.c dump.c backend.c money.c sargs.c index.c like.c write.c stats.c map.c
 INCLUDES	=	-I$(top_srcdir)/include $(GLIB_CFLAGS)
 LIBS = $(GLIB_LIBS)

src/libmdb/data.c

@@ -44,6 +44,22 @@ MdbColumn *col;
 	col=g_ptr_array_index(table->columns, col_num - 1);
 	col->bind_ptr = bind_ptr;
 }
+int
+mdb_bind_column_by_name(MdbTableDef *table, gchar *col_name, void *bind_ptr)
+{
+	int i, col_num = -1;
+	MdbColumn *col;
+	
+	for (i=0;i<table->num_cols;i++) {
+		col=g_ptr_array_index(table->columns,i);
+		if (!strcmp(col->name,col_name))
+		col_num = col->col_num + 1;
+	}
+
+	mdb_bind_column(table, col_num, bind_ptr);
+
+	return col_num;
+}
 void mdb_bind_len(MdbTableDef *table, int col_num, int *len_ptr)
 {
 MdbColumn *col;

src/libmdb/file.c

@@ -24,10 +24,10 @@
 #endif
 
 MdbFormatConstants MdbJet4Constants = {
-	4096, 0x0c, 12, 45, 47, 51, 55, 56, 63, 12, 15, 23, 5, 25
+	4096, 0x0c, 12, 45, 47, 51, 55, 56, 63, 12, 15, 23, 5, 25, 59
 };
 MdbFormatConstants MdbJet3Constants = {
-	2048, 0x08, 12, 25, 27, 31, 35, 36, 43, 8, 13, 16, 1, 18
+	2048, 0x08, 12, 25, 27, 31, 35, 36, 43, 8, 13, 16, 1, 18, 39
 };
 
 static size_t _mdb_read_pg(MdbHandle *mdb, unsigned char *pg_buf, unsigned long pg);

src/libmdb/map.c

@@ -0,0 +1,125 @@
+/* MDB Tools - A library for reading MS Access database file
+ * Copyright (C) 2000 Brian Bruns
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#include "mdbtools.h"
+
+#ifdef DMALLOC
+#include "dmalloc.h"
+#endif
+
+guint32 
+mdb_map_find_next0(MdbHandle *mdb, unsigned char *map, int map_sz, guint32 start_pg)
+{
+	int pgnum, i, bitn;
+
+	pgnum = _mdb_get_int32(map,1);
+	/* the first 5 bytes of the usage map mean something */
+	for (i=5;i<map_sz;i++) {
+		for (bitn=0;bitn<8;bitn++) {
+			if (map[i] & 1 << bitn && pgnum > start_pg) {
+				return pgnum;
+			}
+			pgnum++;
+		}
+	}
+	/* didn't find anything */
+	return 0;
+}
+int 
+mdb_map_find_next1(MdbHandle *mdb, unsigned char *map, int map_sz, guint32 start_pg)
+{
+	guint32 pgnum, i, j, bitn, map_pg;
+
+	pgnum = 0;
+	//printf("map size %ld\n", table->map_sz);
+	for (i=1;i<map_sz-1;i+=4) {
+		map_pg = _mdb_get_int32(map, i);
+		//printf("loop %d pg %ld %02x%02x%02x%02x\n",i, map_pg,table->usage_map[i],table->usage_map[i+1],table->usage_map[i+2],table->usage_map[i+3]);
+
+		if (!map_pg) continue;
+
+		if(mdb_read_alt_pg(mdb, map_pg) != mdb->fmt->pg_size) {
+			fprintf(stderr, "Oops! didn't get a full page at %d\n", map_pg);
+			exit(1);
+		} 
+		//printf("reading page %ld\n",map_pg);
+		for (j=4;j<mdb->fmt->pg_size;j++) {
+			for (bitn=0;bitn<8;bitn++) {
+				if (mdb->alt_pg_buf[j] & 1 << bitn && pgnum > start_pg) {
+					return pgnum;
+				}
+				pgnum++;
+			}
+		}
+	}
+	/* didn't find anything */
+	//printf("returning 0\n");
+	return 0;
+}
+guint32 
+mdb_map_find_next(MdbHandle *mdb, unsigned char *map, int map_sz, guint32 start_pg)
+{
+	int map_type;
+
+	map_type = map[0];
+	if (map_type==0) {
+		return mdb_map_find_next0(mdb, map, map_sz, start_pg);
+	} else if (map_type==1) {
+		return mdb_map_find_next1(mdb, map, map_sz, start_pg);
+	} else {
+		fprintf(stderr,"Warning: unrecognized usage map type: %d, defaulting to brute force read\n",map[0]);
+	}
+	return 0;
+}
+guint32
+mdb_alloc_page(MdbTableDef *table)
+{
+	printf("Allocating new page\n");
+	return 0;
+}
+guint32 
+mdb_map_find_next_freepage(MdbTableDef *table, int row_size)
+{
+	MdbCatalogEntry *entry = table->entry;
+	MdbHandle *mdb = entry->mdb;
+	guint32 pgnum;
+	guint32 cur_pg = 0;
+	int free_space;
+
+	do {
+		pgnum = mdb_map_find_next(mdb, 
+				table->free_usage_map, 
+				table->freemap_sz, cur_pg);
+		printf("looking at page %d\n", pgnum);
+		if (!pgnum) {
+			/* allocate new page */
+			pgnum = mdb_alloc_page(table);
+			return pgnum;
+		}
+		cur_pg = pgnum;
+
+		mdb_read_pg(mdb, pgnum);
+		free_space = mdb_pg_get_freespace(mdb);
+		
+	} while (free_space < row_size);
+
+	printf("page %d has %d bytes left\n", pgnum, free_space);
+
+	return pgnum;
+}

src/libmdb/mem.c

@@ -108,6 +108,7 @@ void
 mdb_free_tabledef(MdbTableDef *table)
 {
 	if (table->usage_map) free(table->usage_map);
+	if (table->free_usage_map) free(table->free_usage_map);
 	if (table) free(table);
 }
 void

src/libmdb/table.c

@@ -67,7 +67,7 @@ int rownum, row_start, row_end;
 	mdb_read_alt_pg(mdb, mdb_get_int24(mdb, fmt->tab_usage_map_offset + 1)); 
 	mdb_swap_pgbuf(mdb);
 	row_start = mdb_get_int16(mdb, (fmt->row_count_offset + 2) + (rownum*2));
-   row_end = mdb_find_end_of_row(mdb, rownum);
+	row_end = mdb_find_end_of_row(mdb, rownum);
 	table->map_sz = row_end - row_start + 1;
 	table->usage_map = malloc(table->map_sz);
 	memcpy(table->usage_map, &mdb->pg_buf[row_start], table->map_sz);
@@ -81,6 +81,17 @@ int rownum, row_start, row_end;
 #endif
 
 
+	/* now grab the free space page map */
+	mdb_swap_pgbuf(mdb);
+	rownum = mdb->pg_buf[fmt->tab_free_map_offset];
+	mdb_read_alt_pg(mdb, mdb_get_int24(mdb, fmt->tab_free_map_offset + 1));
+	mdb_swap_pgbuf(mdb);
+	row_start = mdb_get_int16(mdb, (fmt->row_count_offset + 2) + (rownum*2));
+	row_end = mdb_find_end_of_row(mdb, rownum);
+	table->freemap_sz = row_end - row_start + 1;
+	table->free_usage_map = malloc(table->freemap_sz);
+	memcpy(table->free_usage_map, &mdb->pg_buf[row_start], table->freemap_sz);
+
 	table->first_data_pg = mdb_get_int16(mdb, fmt->tab_first_dpg_offset);
 
 	return table;

src/libmdb/write.c

@@ -276,6 +276,91 @@ int rows, free_start, free_end;
 #endif
 	return (free_end - free_start + 1);
 }
+unsigned char *
+mdb_new_data_pg(MdbCatalogEntry *entry)
+{
+	MdbHandle *mdb = entry->mdb;
+	unsigned char *new_pg;
+
+	new_pg = (unsigned char *) g_malloc0(mdb->fmt->pg_size);
+		
+	new_pg[0]=0x01;
+	new_pg[1]=0x01;
+	_mdb_put_int32(new_pg, 4, entry->table_pg);
+	
+	return new_pg;
+}
+
+int
+mdb_update_indexes(MdbTableDef *table, int num_fields, MdbField *fields)
+{
+	int i;
+	MdbIndex *idx;
+	
+	for (i=0;i<table->num_idxs;i++) {
+		idx = g_ptr_array_index (table->indices, i);
+#if MDB_DEBUG_WRITE
+		fprintf(stderr,"Updating %s (%d).\n", idx->name, idx->index_type);
+#endif
+	}
+}
+
+int
+mdb_insert_row(MdbTableDef *table, int num_fields, MdbField *fields)
+{
+	int new_row_size, num_rows, i, pos, row_start, row_end, row_size;
+	unsigned char row_buffer[4096];
+	MdbCatalogEntry *entry = table->entry;
+	MdbHandle *mdb = entry->mdb;
+	MdbFormatConstants *fmt = mdb->fmt;
+	guint32 pgnum;
+	unsigned char *new_pg;
+
+	if (!mdb->f->writable) {
+		fprintf(stderr, "File is not open for writing\n");
+		return 0;
+	}
+	new_row_size = mdb_pack_row(table, row_buffer, num_fields, fields);
+#if MDB_DEBUG_WRITE
+	buffer_dump(row_buffer, 0, new_row_size-1);
+#endif
+	pgnum = mdb_map_find_next_freepage(table, new_row_size);
+	if (!pgnum) {
+		fprintf(stderr, "Unable to allocate new page.\n");
+		return 0;
+	}
+
+
+	new_pg = mdb_new_data_pg(entry);
+	num_rows = mdb_get_int16(mdb, fmt->row_count_offset);
+	pos = mdb->fmt->pg_size;
+
+	for (i=0;i<num_rows;i++) {
+		row_start = mdb_get_int16(mdb, (fmt->row_count_offset + 2) + (i*2));
+		row_end = mdb_find_end_of_row(mdb, i);
+		row_size = row_end - row_start + 1;
+		pos -= row_size;
+		memcpy(&new_pg[pos], &mdb->pg_buf[row_start], row_size);
+		_mdb_put_int16(new_pg, (fmt->row_count_offset + 2) + (i*2), pos);
+	}
+
+	/* add our new row */
+	pos -= new_row_size;
+	memcpy(&new_pg[pos], row_buffer, new_row_size);
+	_mdb_put_int16(new_pg, (fmt->row_count_offset + 2) + (num_rows*2), pos);
+
+	num_rows++;
+	_mdb_put_int16(new_pg, fmt->row_count_offset, num_rows);
+
+	memcpy(mdb->pg_buf, new_pg, fmt->pg_size);
+	g_free(new_pg);
+#if MDB_DEBUG_WRITE
+	buffer_dump(mdb->pg_buf, 0, 39);
+	buffer_dump(mdb->pg_buf, fmt->pg_size - 160, fmt->pg_size-1);
+#endif
+
+	mdb_update_indexes(table, num_fields, fields);
+}
 int 
 mdb_update_row(MdbTableDef *table)
 {
@@ -356,12 +441,7 @@ int i, pos;
 	buffer_dump(mdb->pg_buf, fmt->pg_size - 160, fmt->pg_size-1);
 	printf("updating row %d on page %lu\n", row, (unsigned long) table->cur_phys_pg);
 #endif
-	new_pg = (unsigned char *) g_malloc0(fmt->pg_size);
-	g_free(new_pg);
-
-	new_pg[0]=0x01;
-	new_pg[1]=0x01;
-	_mdb_put_int32(new_pg, 4, entry->table_pg);
+	new_pg = mdb_new_data_pg(entry);
 
 	num_rows = mdb_get_int16(mdb, fmt->row_count_offset);
 	_mdb_put_int16(new_pg, fmt->row_count_offset, num_rows);
@@ -396,6 +476,8 @@ int i, pos;
 	/* almost done, copy page over current */
 	memcpy(mdb->pg_buf, new_pg, fmt->pg_size);
 
+	g_free(new_pg);
+
 	_mdb_put_int16(mdb->pg_buf, 2, mdb_pg_get_freespace(mdb));
 #if MDB_DEBUG_WRITE
 	buffer_dump(mdb->pg_buf, 0, 39);