-/* $Id: record.c,v 1.3 2007-04-23 12:33:00 marc Exp $
+/* $Id: record.c,v 1.10 2007-06-13 21:29:04 adam Exp $
Copyright (c) 2006-2007, Index Data.
This file is part of Pazpar2.
02111-1307, USA.
*/
-/* $Id: record.c,v 1.3 2007-04-23 12:33:00 marc Exp $ */
+/* $Id: record.c,v 1.10 2007-06-13 21:29:04 adam Exp $ */
#include <string.h>
union data_types * data_types_assign(NMEM nmem,
- union data_types * data1,
+ union data_types ** data1,
union data_types data2)
{
// assert(nmem);
- if (!data1){
+ if (!data1)
+ return 0;
+
+ if (!*data1){
if (!nmem)
return 0;
else
- data1 = nmem_malloc(nmem, sizeof(union data_types));
+ *data1 = nmem_malloc(nmem, sizeof(union data_types));
}
- *data1 = data2;
- return data1;
+ **data1 = data2;
+ return *data1;
}
-struct record * record_create(NMEM nmem, int num_metadata, int num_sortkeys)
+struct record * record_create(NMEM nmem, int num_metadata, int num_sortkeys,
+ struct client *client, int position)
{
struct record * record = 0;
+ int i = 0;
// assert(nmem);
record = nmem_malloc(nmem, sizeof(struct record));
record->next = 0;
- // which client should I use for record->client = cl; ??
- record->client = 0;
+ record->client = client;
record->metadata
= nmem_malloc(nmem,
sizeof(struct record_metadata*) * num_metadata);
- memset(record->metadata, 0,
- sizeof(struct record_metadata*) * num_metadata);
+ for (i = 0; i < num_metadata; i++)
+ record->metadata[i] = 0;
record->sortkeys
= nmem_malloc(nmem,
sizeof(union data_types*) * num_sortkeys);
- memset(record->metadata, 0,
- sizeof(union data_types*) * num_sortkeys);
-
+ for (i = 0; i < num_sortkeys; i++)
+ record->sortkeys[i] = 0;
+
+ record->position = position;
return record;
}
+struct record_metadata * record_metadata_create(NMEM nmem)
+{
+ struct record_metadata * rec_md
+ = nmem_malloc(nmem, sizeof(struct record_metadata));
+ rec_md->next = 0;
+ return rec_md;
+}
+
struct record_metadata * record_metadata_insert(NMEM nmem,
struct record_metadata ** rmd,
tmp_rmd->data = data;
- // insert in *rmd's place
+ // insert in *rmd's place, moving *rmd one down the list
tmp_rmd->next = *rmd;
*rmd = tmp_rmd;
- return tmp_rmd;
+ return *rmd;
}
struct record_metadata * record_add_metadata_field_id(NMEM nmem,
if (field_id < 0 || !record || !record->sortkeys)
return 0;
- return data_types_assign(nmem, record->sortkeys[field_id], data);
+ return data_types_assign(nmem, &(record->sortkeys[field_id]), data);
}
field_id = conf_service_sortkey_field_id(service, name);
- if (!(field_id < service->num_sortkeys))
+ if (!(-1 < field_id) || !(field_id < service->num_sortkeys))
return 0;
return record_assign_sortkey_field_id(nmem, record, field_id, data);