projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Set YAZ_VERSION (php-yaz relies on it)
[yaz-moved-to-github.git]
/
src
/
zoom-c.c
diff --git
a/src/zoom-c.c
b/src/zoom-c.c
index
cab02e5
..
51cd83e
100644
(file)
--- a/
src/zoom-c.c
+++ b/
src/zoom-c.c
@@
-1,11
+1,14
@@
/* This file is part of the YAZ toolkit.
/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2010 Index Data
+ * Copyright (C) 1995-2011 Index Data
* See the file LICENSE for details.
*/
/**
* \file zoom-c.c
* \brief Implements ZOOM C interface.
*/
* See the file LICENSE for details.
*/
/**
* \file zoom-c.c
* \brief Implements ZOOM C interface.
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <assert.h>
#include <string.h>
#include <assert.h>
#include <string.h>
@@
-178,7
+181,6
@@
ZOOM_task ZOOM_connection_insert_task(ZOOM_connection c, int which)
task->running = 0;
task->which = which;
task->running = 0;
task->which = which;
- clear_error(c);
return task;
}
return task;
}
@@
-338,6
+340,8
@@
static zoom_sru_mode get_sru_mode_from_string(const char *s)
return zoom_sru_get;
else if (!yaz_matchstr(s, "post"))
return zoom_sru_post;
return zoom_sru_get;
else if (!yaz_matchstr(s, "post"))
return zoom_sru_post;
+ else if (!yaz_matchstr(s, "solr"))
+ return zoom_sru_solr;
return zoom_sru_error;
}
return zoom_sru_error;
}
@@
-1595,7
+1599,7
@@
static void handle_http(ZOOM_connection c, Z_HTTP_Response *hres)
}
if (cret == zoom_complete)
{
}
if (cret == zoom_complete)
{
- yaz_log(YLOG_LOG, "removing tasks in handle_http");
+ yaz_log(c->log_details, "removing tasks in handle_http");
ZOOM_connection_remove_task(c);
}
{
ZOOM_connection_remove_task(c);
}
{