-/* $Id: record.c,v 1.4 2007-04-24 13:50:07 marc Exp $
+/* $Id: record.c,v 1.5 2007-04-24 22:17:05 marc Exp $
Copyright (c) 2006-2007, Index Data.
This file is part of Pazpar2.
02111-1307, USA.
*/
-/* $Id: record.c,v 1.4 2007-04-24 13:50:07 marc Exp $ */
+/* $Id: record.c,v 1.5 2007-04-24 22:17:05 marc 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){
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 = 0;
+ int i = 0;
// assert(nmem);
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;
return record;
}
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);
-/* $Id: record.h,v 1.4 2007-04-23 12:33:00 marc Exp $
+/* $Id: record.h,v 1.5 2007-04-24 22:17:05 marc Exp $
Copyright (c) 2006-2007, Index Data.
This file is part of Pazpar2.
};
union data_types * data_types_assign(NMEM nmem,
- union data_types * data1,
+ union data_types ** data1,
union data_types data2);
-/* $Id: test_record.c,v 1.2 2007-04-24 13:50:07 marc Exp $
+/* $Id: test_record.c,v 1.3 2007-04-24 22:17:05 marc Exp $
Copyright (c) 2006-2007, Index Data.
This file is part of Pazpar2.
YAZ_CHECK(record->metadata[1]->next);
+ YAZ_CHECK(0 == record->sortkeys[0]);
YAZ_CHECK(record_assign_sortkey_field_id(nmem, record, 0, data_text));
+ YAZ_CHECK(record->sortkeys[0]);
+ YAZ_CHECK(0 == record->sortkeys[1]);
YAZ_CHECK(record_assign_sortkey_field_id(nmem, record, 1, data_text));
+ YAZ_CHECK(record->sortkeys[1]);
+ YAZ_CHECK(0 == record->sortkeys[2]);
YAZ_CHECK(record_assign_sortkey_field_id(nmem, record, 2, data_num));
+ YAZ_CHECK(record->sortkeys[2]);
YAZ_CHECK(record_assign_sortkey(nmem, record, service, "relevance", data_text));