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
Fixed check for application/x-www-form-urlencoded parameters.
[pazpar2-moved-to-github.git]
/
src
/
logic.c
diff --git
a/src/logic.c
b/src/logic.c
index
3d4de11
..
92a0ecf
100644
(file)
--- a/
src/logic.c
+++ b/
src/logic.c
@@
-1016,7
+1016,7
@@
void statistics(struct session *se, struct statistics *stat)
stat->num_clients = count;
}
stat->num_clients = count;
}
-void start_http_listener(void)
+int start_http_listener(void)
{
char hp[128] = "";
struct conf_server *ser = global_parameters.server;
{
char hp[128] = "";
struct conf_server *ser = global_parameters.server;
@@
-1033,7
+1033,7
@@
void start_http_listener(void)
sprintf(hp + strlen(hp), "%d", ser->port);
}
}
sprintf(hp + strlen(hp), "%d", ser->port);
}
}
- http_init(hp);
+ return http_init(hp);
}
void start_proxy(void)
}
void start_proxy(void)
@@
-1225,8
+1225,10
@@
struct record *ingest_record(struct client *cl, Z_External *rec,
value, type);
continue;
}
value, type);
continue;
}
- rec_md->next = record->metadata[md_field_id];
- record->metadata[md_field_id] = rec_md;
+ wheretoput = &record->metadata[md_field_id];
+ while (*wheretoput)
+ wheretoput = &(*wheretoput)->next;
+ *wheretoput = rec_md;
// merged metadata
rec_md = record_metadata_init(se->nmem, (char *) value,
// merged metadata
rec_md = record_metadata_init(se->nmem, (char *) value,
@@
-1235,6
+1237,12
@@
struct record *ingest_record(struct client *cl, Z_External *rec,
// and polulate with data:
// assign cluster or record based on merge action
// and polulate with data:
// assign cluster or record based on merge action
+ if (ser_md->merge == Metadata_merge_no)
+ {
+ while (*wheretoput)
+ wheretoput = &(*wheretoput)->next;
+ *wheretoput = rec_md;
+ }
if (ser_md->merge == Metadata_merge_unique)
{
struct record_metadata *mnode;
if (ser_md->merge == Metadata_merge_unique)
{
struct record_metadata *mnode;