projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix bug #249: rstemp sets fail. Problem was that rset files were
[idzebra-moved-to-github.git]
/
index
/
main.c
diff --git
a/index/main.c
b/index/main.c
index
8a1dac4
..
52a7ab0
100644
(file)
--- a/
index/main.c
+++ b/
index/main.c
@@
-1,6
+1,6
@@
-/* $Id: main.c,v 1.114 2004-09-26 20:38:50 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
- Index Data Aps
+/* $Id: main.c,v 1.122 2005-01-16 23:14:57 adam Exp $
+ Copyright (C) 1995-2005
+ Index Data ApS
This file is part of the Zebra server.
This file is part of the Zebra server.
@@
-20,8
+20,8
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
02111-1307, USA.
*/
02111-1307, USA.
*/
-
#include <stdio.h>
#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
#include <assert.h>
#ifdef WIN32
#include <string.h>
#include <assert.h>
#ifdef WIN32
@@
-35,19
+35,22
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include <sys/times.h>
#endif
#include <sys/times.h>
#endif
-#if HAVE_TCL_H
-#include <tcl.h>
-#endif
-
-#if HAVE_EXPAT_H
-#include <expat.h>
-#endif
-
-#include <data1.h>
+#include <yaz/log.h>
+#include <yaz/options.h>
#include <idzebra/api.h>
char *prog;
#include <idzebra/api.h>
char *prog;
+static void filter_cb(void *cd, const char *name)
+{
+ puts (name);
+}
+
+static void show_filters(ZebraService zs)
+{
+ zebra_filter_info(zs, 0, filter_cb);
+}
+
int main (int argc, char **argv)
{
int ret;
int main (int argc, char **argv)
{
int ret;
@@
-75,7
+78,7
@@
int main (int argc, char **argv)
#ifdef WIN32
#else
#ifdef WIN32
#else
- sprintf(nbuf, "%.40s(%d)", *argv, getpid());
+ sprintf(nbuf, "%.40s(%ld)", *argv, (long) getpid());
yaz_log_init_prefix (nbuf);
#endif
#if HAVE_SYS_TIMES_H
yaz_log_init_prefix (nbuf);
#endif
#if HAVE_SYS_TIMES_H
@@
-120,12
+123,12
@@
int main (int argc, char **argv)
if (!zs)
{
const char *config = configName ? configName : "zebra.cfg";
if (!zs)
{
const char *config = configName ? configName : "zebra.cfg";
- logf (LOG_LOG, "Zebra version %s %s",
+ yaz_log (YLOG_LOG, "Zebra version %s %s",
ZEBRAVER, ZEBRADATE);
zs = zebra_start_res (config, 0, res);
if (!zs)
{
ZEBRAVER, ZEBRADATE);
zs = zebra_start_res (config, 0, res);
if (!zs)
{
- yaz_log (LOG_FATAL, "Cannot read config %s", config);
+ yaz_log (YLOG_FATAL, "Cannot read config %s", config);
exit (1);
}
zh = zebra_open (zs);
exit (1);
}
zh = zebra_open (zs);
@@
-134,7
+137,7
@@
int main (int argc, char **argv)
if (zebra_select_database (zh, database))
{
if (zebra_select_database (zh, database))
{
- logf(LOG_FATAL, "Could not select database %s errCode=%d",
+ yaz_log(YLOG_FATAL, "Could not select database %s errCode=%d",
database, zebra_errCode(zh) );
exit (1);
}
database, zebra_errCode(zh) );
exit (1);
}
@@
-180,9
+183,13
@@
int main (int argc, char **argv)
{
zebra_compact (zh);
}
{
zebra_compact (zh);
}
+ else if (!strcmp (arg, "filters"))
+ {
+ show_filters(zs);
+ }
else
{
else
{
- logf (LOG_FATAL, "unknown command: %s", arg);
+ yaz_log (YLOG_FATAL, "unknown command: %s", arg);
exit (1);
}
}
exit (1);
}
}
@@
-232,17
+239,6
@@
int main (int argc, char **argv)
#if HAVE_BZLIB_H
printf("Using: libbzip2, (C) 1996-1999 Julian R Seward. All rights reserved.\n");
#endif
#if HAVE_BZLIB_H
printf("Using: libbzip2, (C) 1996-1999 Julian R Seward. All rights reserved.\n");
#endif
-#if HAVE_TCL_H
- printf("Using: Tcl %s\n", TCL_VERSION);
-#endif
-#if HAVE_EXPAT_H
- if (1)
- {
- XML_Expat_Version v = XML_ExpatVersionInfo();
- printf ("Using: Expat %d.%d.%d\n",
- v.major, v.minor, v.micro);
- }
-#endif
}
else if (ret == 'v')
yaz_log_init_level (yaz_log_mask_str(arg));
}
else if (ret == 'v')
yaz_log_init_level (yaz_log_mask_str(arg));
@@
-264,10
+260,10
@@
int main (int argc, char **argv)
res_set(res, "recordType", arg);
else if (ret == 'n')
enable_commit = 0;
res_set(res, "recordType", arg);
else if (ret == 'n')
enable_commit = 0;
- else if (ret == 'L')
+ else if (ret == 'L')
res_set(res, "followLinks", "0");
else
res_set(res, "followLinks", "0");
else
- logf (LOG_WARN, "unknown option '-%s'", arg);
+ yaz_log (YLOG_WARN, "unknown option '-%s'", arg);
} /* while arg */
if (trans_started)
} /* while arg */
if (trans_started)
@@
-282,7
+278,7
@@
int main (int argc, char **argv)
usec = (end_time.tv_sec - start_time.tv_sec) * 1000000.0 +
end_time.tv_usec - start_time.tv_usec;
times(&tms2);
usec = (end_time.tv_sec - start_time.tv_sec) * 1000000.0 +
end_time.tv_usec - start_time.tv_usec;
times(&tms2);
- yaz_log (LOG_LOG, "zebraidx times: %5.2f %5.2f %5.2f",
+ yaz_log (YLOG_LOG, "zebraidx times: %5.2f %5.2f %5.2f",
usec / 1000000,
(double) (tms2.tms_utime - tms1.tms_utime)/100,
(double) (tms2.tms_stime - tms1.tms_stime)/100);
usec / 1000000,
(double) (tms2.tms_utime - tms1.tms_utime)/100,
(double) (tms2.tms_stime - tms1.tms_stime)/100);