projects
/
pazpar2-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Avoid mixed-stmt declare
[pazpar2-moved-to-github.git]
/
src
/
record.c
diff --git
a/src/record.c
b/src/record.c
index
b767d2d
..
4dc2366
100644
(file)
--- a/
src/record.c
+++ b/
src/record.c
@@
-1,4
+1,4
@@
-/* $Id: record.c,v 1.7 2007-04-26 11:41:26 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.
Copyright (c) 2006-2007, Index Data.
This file is part of Pazpar2.
@@
-19,7
+19,7
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
02111-1307, USA.
*/
02111-1307, USA.
*/
-/* $Id: record.c,v 1.7 2007-04-26 11:41:26 marc Exp $ */
+/* $Id: record.c,v 1.10 2007-06-13 21:29:04 adam Exp $ */
#include <string.h>
#include <string.h>
@@
-58,7
+58,8
@@
union data_types * data_types_assign(NMEM nmem,
}
}
-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;
{
struct record * record = 0;
int i = 0;
@@
-68,8
+69,7
@@
struct record * record_create(NMEM nmem, int num_metadata, int num_sortkeys)
record = nmem_malloc(nmem, sizeof(struct record));
record->next = 0;
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,
record->metadata
= nmem_malloc(nmem,
@@
-82,18
+82,21
@@
struct record * record_create(NMEM nmem, int num_metadata, int num_sortkeys)
sizeof(union data_types*) * num_sortkeys);
for (i = 0; i < num_sortkeys; i++)
record->sortkeys[i] = 0;
sizeof(union data_types*) * num_sortkeys);
for (i = 0; i < num_sortkeys; i++)
record->sortkeys[i] = 0;
+
+ record->position = position;
return record;
}
return record;
}
-
-struct client * record_assign_client(struct record * record,
- struct client * client)
+struct record_metadata * record_metadata_create(NMEM nmem)
{
{
- record->client = client;
- return client;
+ 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,
union data_types data)
struct record_metadata * record_metadata_insert(NMEM nmem,
struct record_metadata ** rmd,
union data_types data)