-/* $Id: bfile.c,v 1.36 2004-08-04 08:35:22 adam Exp $
+/* $Id: bfile.c,v 1.35.2.1 2006-08-14 10:38:50 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
#include <zebrautl.h>
#include <bfile.h>
-
#include "cfile.h"
struct BFiles_struct {
return(tmp);
}
-int bf_read (BFile bf, zint no, int offset, int nbytes, void *buf)
+int bf_read (BFile bf, int no, int offset, int nbytes, void *buf)
{
int r;
return r;
}
-int bf_write (BFile bf, zint no, int offset, int nbytes, const void *buf)
+int bf_write (BFile bf, int no, int offset, int nbytes, const void *buf)
{
int r;
zebra_lock_rdwr_wlock (&bf->rdwr_lock);
-/* $Id: cfile.c,v 1.28 2004-08-04 08:35:22 adam Exp $
+/* $Id: cfile.c,v 1.27.2.1 2006-08-14 10:38:50 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
int i, j;
logf (LOG_DEBUG, "cf: Moving to flat shadow: %s", cf->rmf->name);
- logf (LOG_DEBUG, "cf: hits=%d miss=%d bucket_in_memory=" ZINT_FORMAT " total="
- ZINT_FORMAT,
+ logf (LOG_DEBUG, "cf: hits=%d miss=%d bucket_in_memory=%d total=%d",
cf->no_hits, cf->no_miss, cf->bucket_in_memory,
cf->head.next_bucket - cf->head.first_bucket);
assert (cf->head.state == 1);
}
-int cf_read (CFile cf, zint no, int offset, int nbytes, void *buf)
+int cf_read (CFile cf, int no, int offset, int nbytes, void *buf)
{
int block;
zebra_mutex_unlock (&cf->mutex);
if (!mf_read (cf->block_mf, block, offset, nbytes, buf))
{
- logf (LOG_FATAL|LOG_ERRNO, "cf_read no=" ZINT_FORMAT ", block=%d", no, block);
+ logf (LOG_FATAL|LOG_ERRNO, "cf_read no=%d, block=%d", no, block);
exit (1);
}
return 1;
}
-int cf_write (CFile cf, zint no, int offset, int nbytes, const void *buf)
+int cf_write (CFile cf, int no, int offset, int nbytes, const void *buf)
{
int block;
zebra_mutex_unlock (&cf->mutex);
if (mf_write (cf->block_mf, block, offset, nbytes, buf))
{
- logf (LOG_FATAL|LOG_ERRNO, "cf_write no=" ZINT_FORMAT ", block=%d", no, block);
+ logf (LOG_FATAL|LOG_ERRNO, "cf_write no=%d, block=%d", no, block);
exit (1);
}
return 0;
int cf_close (CFile cf)
{
- logf (LOG_DEBUG, "cf: close hits=%d miss=%d bucket_in_memory=" ZINT_FORMAT
- " total=" ZINT_FORMAT,
+ logf (LOG_DEBUG, "cf: close hits=%d miss=%d bucket_in_memory=%d total=%d",
cf->no_hits, cf->no_miss, cf->bucket_in_memory,
cf->head.next_bucket - cf->head.first_bucket);
flush_bucket (cf, -1);
-/* $Id: cfile.h,v 1.15 2004-08-04 08:35:22 adam Exp $
+/* $Id: cfile.h,v 1.14.2.1 2006-08-14 10:38:50 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
{
struct CFile_head {
int state; /* 1 = hash, 2 = flat */
- zint next_block; /* next free block / last block */
+ int next_block; /* next free block / last block */
int block_size; /* mfile/bfile block size */
int hash_size; /* no of chains in hash table */
- zint first_bucket; /* first hash bucket */
- zint next_bucket; /* last hash bucket + 1 = first flat bucket */
- zint flat_bucket; /* last flat bucket + 1 */
+ int first_bucket; /* first hash bucket */
+ int next_bucket; /* last hash bucket + 1 = first flat bucket */
+ int flat_bucket; /* last flat bucket + 1 */
} head;
MFile block_mf;
MFile hash_mf;
struct CFile_hash_bucket **parray;
struct CFile_hash_bucket *bucket_lru_front, *bucket_lru_back;
int dirty;
- zint bucket_in_memory;
- zint max_bucket_in_memory;
+ int bucket_in_memory;
+ int max_bucket_in_memory;
char *iobuf;
MFile rmf;
int no_hits;
int cf_close (CFile cf);
CFile cf_open (MFile mf, MFile_area area, const char *fname, int block_size,
int wflag, int *firstp);
-int cf_read (CFile cf, zint no, int offset, int nbytes, void *buf);
-int cf_write (CFile cf, zint no, int offset, int nbytes, const void *buf);
+int cf_read (CFile cf, int no, int offset, int nbytes, void *buf);
+int cf_write (CFile cf, int no, int offset, int nbytes, const void *buf);
void cf_unlink (CFile cf);
void cf_commit (CFile cf);
-/* $Id: commit.c,v 1.17 2004-08-04 08:35:22 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
+/* $Id: commit.c,v 1.16.2.1 2006-08-14 10:38:50 adam Exp $
+ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
This file is part of the Zebra server.
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
static void cf_commit_flat (CFile cf)
{
- zint *fp;
+ int *fp;
int hno;
- int i;
- zint vno = 0;
+ int i, vno = 0;
#if CF_OPTIMIZE_COMMIT
struct map_cache *m_p;
#if CF_OPTIMIZE_COMMIT
m_p = map_cache_init (cf);
#endif
- fp = (zint *) xmalloc (HASH_BSIZE);
+ fp = (int *) xmalloc (HASH_BSIZE);
for (hno = cf->head.next_bucket; hno < cf->head.flat_bucket; hno++)
{
for (i = 0; i < (int) (HASH_BSIZE/sizeof(int)); i++)
if (!mf_read (cf->hash_mf, hno, 0, 0, fp) &&
hno != cf->head.flat_bucket-1)
{
- logf (LOG_FATAL, "read index block hno=%d (" ZINT_FORMAT "-" ZINT_FORMAT ") commit",
+ logf (LOG_FATAL, "read index block hno=%d (%d-%d) commit",
hno, cf->head.next_bucket, cf->head.flat_bucket-1);
}
for (i = 0; i < (int) (HASH_BSIZE/sizeof(int)); i++)
#else
if (!mf_read (cf->block_mf, fp[i], 0, 0, cf->iobuf))
{
- logf (LOG_FATAL, "read data block hno=%d (" ZINT_FORMAT "-" ZINT_FORMAT ") "
- "i=%d commit block at " ZINT_FORMAT " (->" ZINT_FORMAT")",
+ logf (LOG_FATAL, "read data block hno=%d (%d-%d) "
+ "i=%d commit block at %d (->%d)",
hno, cf->head.next_bucket, cf->head.flat_bucket-1,
i, fp[i], vno);
exit (1);
-/* $Id: mfile.c,v 1.53 2004-08-04 08:35:22 adam Exp $
+/* $Id: mfile.c,v 1.52.2.1 2006-08-14 10:38:50 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
/*
* Read one block from a metafile. Interface mirrors bfile.
*/
-int mf_read(MFile mf, zint no, int offset, int nbytes, void *buf)
+int mf_read(MFile mf, int no, int offset, int nbytes, void *buf)
{
int rd, toread;
/*
* Write.
*/
-int mf_write(MFile mf, zint no, int offset, int nbytes, const void *buf)
+int mf_write(MFile mf, int no, int offset, int nbytes, const void *buf)
{
int ps, nblocks, towrite;
mf_dir *dp;
mf->files[mf->cur_file].blocks = 0;
mf->files[mf->cur_file].bytes = 0;
mf->files[mf->cur_file].fd = -1;
- sprintf(tmp, "%s/%s-" ZINT_FORMAT ".mf", dp->name, mf->name,
+ sprintf(tmp, "%s/%s-%d.mf", dp->name, mf->name,
mf->files[mf->cur_file].number);
mf->files[mf->cur_file].path = xstrdup(tmp);
mf->no_files++;
-/* $Id: d1_absyn.c,v 1.9.2.7 2006-02-07 00:22:25 adam Exp $
+/* $Id: d1_absyn.c,v 1.9.2.8 2006-08-14 10:38:51 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
#include <stdio.h>
-/* $Id: d1_attset.c,v 1.2 2002-10-22 13:19:50 adam Exp $
+/* $Id: d1_attset.c,v 1.2.2.1 2006-08-14 10:38:51 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
#include <stdio.h>
-/* $Id: d1_doespec.c,v 1.2.2.2 2005-02-08 00:53:13 adam Exp $
+/* $Id: d1_doespec.c,v 1.2.2.3 2006-08-14 10:38:51 adam Exp $
Copyright (C) 1995-2005
Index Data ApS
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
#include <assert.h>
-/* $Id: d1_espec.c,v 1.2.2.3 2005-02-08 00:53:14 adam Exp $
+/* $Id: d1_espec.c,v 1.2.2.4 2006-08-14 10:38:51 adam Exp $
Copyright (C) 1995-2005
Index Data ApS
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
#include <stdlib.h>
-/* $Id: d1_expout.c,v 1.2 2002-10-22 13:19:50 adam Exp $
+/* $Id: d1_expout.c,v 1.2.2.1 2006-08-14 10:38:51 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
/*
-/* $Id: d1_grs.c,v 1.3 2003-03-27 21:57:01 adam Exp $
+/* $Id: d1_grs.c,v 1.3.2.1 2006-08-14 10:38:51 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
/* converts data1 tree to GRS-1 record */
-/* $Id: d1_handle.c,v 1.3 2002-12-16 20:27:18 adam Exp $
+/* $Id: d1_handle.c,v 1.3.2.1 2006-08-14 10:38:51 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
#include <stdio.h>
-/* $Id: d1_if.c,v 1.2 2002-10-22 13:19:50 adam Exp $
+/* $Id: d1_if.c,v 1.2.2.1 2006-08-14 10:38:51 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
#include <stdio.h>
-/* $Id: d1_map.c,v 1.3 2003-03-27 21:57:01 adam Exp $
+/* $Id: d1_map.c,v 1.3.2.1 2006-08-14 10:38:51 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
#include <stdio.h>
-/* $Id: d1_marc.c,v 1.6.2.5 2006-02-10 15:19:43 adam Exp $
+/* $Id: d1_marc.c,v 1.6.2.6 2006-08-14 10:38:51 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
/* converts data1 tree to ISO2709/MARC record */
-/* $Id: d1_prtree.c,v 1.3 2003-09-08 10:26:26 adam Exp $
+/* $Id: d1_prtree.c,v 1.3.2.1 2006-08-14 10:38:51 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
#include <yaz/log.h>
-/* $Id: d1_read.c,v 1.8.2.3 2006-03-24 13:47:29 adam Exp $
+/* $Id: d1_read.c,v 1.8.2.4 2006-08-14 10:38:51 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: d1_soif.c,v 1.2 2002-10-22 13:19:50 adam Exp $
+/* $Id: d1_soif.c,v 1.2.2.1 2006-08-14 10:38:51 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: d1_sumout.c,v 1.2 2002-10-22 13:19:50 adam Exp $
+/* $Id: d1_sumout.c,v 1.2.2.1 2006-08-14 10:38:51 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
#include <assert.h>
-/* $Id: d1_sutrs.c,v 1.2 2002-10-22 13:19:50 adam Exp $
+/* $Id: d1_sutrs.c,v 1.2.2.1 2006-08-14 10:38:51 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
/* converts data1 tree to SUTRS record */
-/* $Id: d1_tagset.c,v 1.2 2002-10-22 13:19:50 adam Exp $
+/* $Id: d1_tagset.c,v 1.2.2.1 2006-08-14 10:38:51 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
#include <stdio.h>
-/* $Id: d1_varset.c,v 1.2.2.1 2005-04-23 16:31:54 adam Exp $
+/* $Id: d1_varset.c,v 1.2.2.2 2006-08-14 10:38:51 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
#include <string.h>
-/* $Id: d1_write.c,v 1.3.2.2 2006-03-29 10:47:31 adam Exp $
+/* $Id: d1_write.c,v 1.3.2.3 2006-08-14 10:38:51 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
/* converts data1 tree to XML record */
-/* $Id: agrep.c,v 1.13 2002-08-02 19:26:55 adam Exp $
+/* $Id: agrep.c,v 1.13.2.1 2006-08-14 10:38:53 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: bset.c,v 1.6 2002-08-02 19:26:55 adam Exp $
+/* $Id: bset.c,v 1.6.2.1 2006-08-14 10:38:53 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: dfa.c,v 1.30 2003-06-18 21:32:44 adam Exp $
+/* $Id: dfa.c,v 1.30.2.1 2006-08-14 10:38:53 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: dfap.h,v 1.10 2002-08-02 19:26:55 adam Exp $
+/* $Id: dfap.h,v 1.10.2.1 2006-08-14 10:38:53 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: grepper.c,v 1.10 2002-08-02 19:26:55 adam Exp $
+/* $Id: grepper.c,v 1.10.2.1 2006-08-14 10:38:53 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: imalloc.c,v 1.9 2002-08-02 19:26:55 adam Exp $
+/* $Id: imalloc.c,v 1.9.2.1 2006-08-14 10:38:53 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: imalloc.h,v 1.6 2002-08-02 19:26:55 adam Exp $
+/* $Id: imalloc.h,v 1.6.2.1 2006-08-14 10:38:53 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: lexer.c,v 1.12 2002-08-02 19:26:55 adam Exp $
+/* $Id: lexer.c,v 1.12.2.1 2006-08-14 10:38:53 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: lexer.h,v 1.5 2002-08-02 19:26:55 adam Exp $
+/* $Id: lexer.h,v 1.5.2.1 2006-08-14 10:38:53 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: readfile.c,v 1.9 2002-08-02 19:26:55 adam Exp $
+/* $Id: readfile.c,v 1.9.2.1 2006-08-14 10:38:53 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: set.c,v 1.8 2002-08-02 19:26:55 adam Exp $
+/* $Id: set.c,v 1.8.2.1 2006-08-14 10:38:53 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: states.c,v 1.7 2002-08-02 19:26:55 adam Exp $
+/* $Id: states.c,v 1.7.2.1 2006-08-14 10:38:53 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: close.c,v 1.7 2002-08-02 19:26:55 adam Exp $
+/* $Id: close.c,v 1.7.2.1 2006-08-14 10:38:54 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: dclose.c,v 1.6 2002-08-02 19:26:55 adam Exp $
+/* $Id: dclose.c,v 1.6.2.1 2006-08-14 10:38:54 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: dcompact.c,v 1.8 2002-08-02 19:26:55 adam Exp $
+/* $Id: dcompact.c,v 1.8.2.1 2006-08-14 10:38:54 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: delete.c,v 1.9 2003-06-30 15:56:48 adam Exp $
+/* $Id: delete.c,v 1.9.2.1 2006-08-14 10:38:54 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
#include <stdlib.h>
-/* $Id: dictext.c,v 1.9 2002-08-02 19:26:55 adam Exp $
+/* $Id: dictext.c,v 1.9.2.1 2006-08-14 10:38:54 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: dicttest.c,v 1.28 2004-01-22 11:27:20 adam Exp $
+/* $Id: dicttest.c,v 1.28.2.1 2006-08-14 10:38:54 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: dopen.c,v 1.9 2002-08-02 19:26:55 adam Exp $
+/* $Id: dopen.c,v 1.9.2.1 2006-08-14 10:38:54 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: drdwr.c,v 1.13 2002-08-02 19:26:55 adam Exp $
+/* $Id: drdwr.c,v 1.13.2.1 2006-08-14 10:38:54 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: insert.c,v 1.22 2002-08-02 19:26:55 adam Exp $
+/* $Id: insert.c,v 1.22.2.1 2006-08-14 10:38:54 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: lookgrep.c,v 1.26 2002-09-18 21:01:15 adam Exp $
+/* $Id: lookgrep.c,v 1.26.2.1 2006-08-14 10:38:54 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: lookup.c,v 1.11 2002-08-02 19:26:55 adam Exp $
+/* $Id: lookup.c,v 1.11.2.1 2006-08-14 10:38:54 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: lookupec.c,v 1.10 2002-08-02 19:26:55 adam Exp $
+/* $Id: lookupec.c,v 1.10.2.1 2006-08-14 10:38:54 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: open.c,v 1.19 2002-08-02 19:26:55 adam Exp $
+/* $Id: open.c,v 1.19.2.1 2006-08-14 10:38:54 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: scan.c,v 1.15.2.1 2004-12-07 20:05:17 adam Exp $
+/* $Id: scan.c,v 1.15.2.2 2006-08-14 10:38:54 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: bfile.h,v 1.22 2004-08-04 08:35:23 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
+/* $Id: bfile.h,v 1.21.2.1 2006-08-14 10:38:55 adam Exp $
+ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
This file is part of the Zebra server.
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
+
+
#ifndef BFILE_H
#define BFILE_H
#include <mfile.h>
-YAZ_BEGIN_CDECL
+#ifdef __cplusplus
+extern "C" {
+#endif
#define bf_blocksize(bf) mf_blocksize(bf->mf)
block 'no'. stores contents in buffer 'buf'.
returns 1 if whole block could be read; 0 otherwise.
*/
-int bf_read (BFile bf, zint no, int offset, int nbytes, void *buf);
+int bf_read (BFile bf, int no, int offset, int nbytes, void *buf);
/* bf_write: writes bytes to bfile 'bf'.
writes 'nbytes' bytes (or whole block if 0) at offset 'offset' to
block 'no'. retrieves contents from buffer 'buf'.
returns 0 if successful; non-zero otherwise.
*/
-int bf_write (BFile bf, zint no, int offset, int nbytes, const void *buf);
+int bf_write (BFile bf, int no, int offset, int nbytes, const void *buf);
/* bf_cache: enables bfile cache if spec is not NULL */
void bf_cache (BFiles bfs, const char *spec);
/* bf_reset: delete register and shadow completely */
void bf_reset (BFiles bfs);
-YAZ_END_CDECL
+#ifdef __cplusplus
+}
+#endif
#endif
-/* $Id: bset.h,v 1.4 2002-08-02 19:26:55 adam Exp $
+/* $Id: bset.h,v 1.4.2.1 2006-08-14 10:38:55 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: charmap.h,v 1.9.2.2 2005-03-11 21:10:12 adam Exp $
+/* $Id: charmap.h,v 1.9.2.3 2006-08-14 10:38:55 adam Exp $
Copyright (C) 1995-2005
Index Data ApS
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: d1_attset.h,v 1.2 2002-10-22 13:19:50 adam Exp $
+/* $Id: d1_attset.h,v 1.2.2.1 2006-08-14 10:38:55 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
#ifndef D1_ATTSET_H
-/* $Id: d1_map.h,v 1.2 2002-10-22 13:19:50 adam Exp $
+/* $Id: d1_map.h,v 1.2.2.1 2006-08-14 10:38:55 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
#ifndef D1_MAP_H
-/* $Id: data1.h,v 1.9.2.1 2005-04-23 16:31:55 adam Exp $
+/* $Id: data1.h,v 1.9.2.2 2006-08-14 10:38:55 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
#ifndef DATA1_H
-/* $Id: dfa.h,v 1.10 2002-08-02 19:26:55 adam Exp $
+/* $Id: dfa.h,v 1.10.2.1 2006-08-14 10:38:55 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: dict.h,v 1.32 2002-08-02 19:26:55 adam Exp $
+/* $Id: dict.h,v 1.32.2.1 2006-08-14 10:38:56 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: direntz.h,v 1.8 2003-01-13 15:43:25 adam Exp $
+/* $Id: direntz.h,v 1.8.2.1 2006-08-14 10:38:56 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: isam.h,v 1.15 2002-08-02 19:26:55 adam Exp $
+/* $Id: isam.h,v 1.15.2.1 2006-08-14 10:38:56 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: isamb.h,v 1.12 2004-08-04 09:59:03 heikki Exp $
+/* $Id: isamb.h,v 1.10.2.1 2006-08-14 10:38:56 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
#ifndef ISAMB_H
#include <bfile.h>
#include <isamc.h>
-YAZ_BEGIN_CDECL
-
typedef struct ISAMB_s *ISAMB;
typedef struct ISAMB_PP_s *ISAMB_PP;
typedef ISAMC_P ISAMB_P;
int isamb_pp_forward (ISAMB_PP pp, void *buf, const void *untilbuf);
-void isamb_pp_pos (ISAMB_PP pp, zint *current, zint *total);
+void isamb_pp_pos (ISAMB_PP pp, int *current, int *total);
void isamb_pp_close (ISAMB_PP pp);
void isamb_dump (ISAMB b, ISAMB_P pos, void (*pr)(const char *str));
-YAZ_END_CDECL
-
#endif
-/* $Id: isamc.h,v 1.13 2004-08-04 08:35:23 adam Exp $
+/* $Id: isamc.h,v 1.12.2.1 2006-08-14 10:38:56 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
+
+
#ifndef ISAMC_H
#define ISAMC_H
-#include <isam-codec.h>
#include <bfile.h>
-YAZ_BEGIN_CDECL
+#ifdef __cplusplus
+extern "C" {
+#endif
typedef struct ISAMC_s *ISAMC;
-typedef zint ISAMC_P;
+typedef int ISAMC_P;
typedef struct ISAMC_PP_s *ISAMC_PP;
typedef struct ISAMC_filecat_s {
int (*compare_item)(const void *a, const void *b);
void (*log_item)(int logmask, const void *p, const char *txt);
- ISAM_CODEC codec;
+#define ISAMC_DECODE 0
+#define ISAMC_ENCODE 1
+ void *(*code_start)(int mode);
+ void (*code_stop)(int mode, void *p);
+ void (*code_item)(int mode, void *p, char **dst, char **src);
+ void (*code_reset)(void *p);
int max_blocks_mem;
int debug;
void isc_pp_close (ISAMC_PP pp);
int isc_read_item (ISAMC_PP pp, char **dst);
int isc_pp_read (ISAMC_PP pp, void *buf);
-zint isc_pp_num (ISAMC_PP pp);
+int isc_pp_num (ISAMC_PP pp);
-zint isc_block_used (ISAMC is, int type);
+int isc_block_used (ISAMC is, int type);
int isc_block_size (ISAMC is, int type);
#define isc_type(x) ((x) & 7)
#define isc_block(x) ((x) >> 3)
-YAZ_END_CDECL
+#ifdef __cplusplus
+}
+#endif
#endif
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
#ifndef ISAMD_H
#define ISAMD_ENCODE 1
void *(*code_start)(int mode);
void (*code_stop)(int mode, void *p);
- void (*code_item)(int mode, void *p, char **dst, const char **src);
+ void (*code_item)(int mode, void *p, char **dst, char **src);
void (*code_reset)(void *p);
int max_blocks_mem;
-/* $Id: isamg.h,v 1.2 2002-08-02 19:26:55 adam Exp $
+/* $Id: isamg.h,v 1.2.2.1 2006-08-14 10:38:56 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
/*
* $Log: isamg.h,v $
- * Revision 1.2 2002-08-02 19:26:55 adam
+ * Revision 1.2.2.1 2006-08-14 10:38:56 adam
+ * Update copyright year + FSF address
+ *
+ * Revision 1.2 2002/08/02 19:26:55 adam
* Towards GPL
*
* Revision 1.1 2001/01/16 19:05:11 heikki
-/* $Id: isams.h,v 1.6 2004-08-04 08:35:23 adam Exp $
+/* $Id: isams.h,v 1.5.2.1 2006-08-14 10:38:56 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
#ifndef ISAMS_H
#define ISAMS_H
-#include <isam-codec.h>
#include <bfile.h>
-#include <isamc.h>
#ifdef __cplusplus
extern "C" {
#endif
typedef struct ISAMS_s *ISAMS;
-typedef ISAMC_P ISAMS_P;
+typedef int ISAMS_P;
typedef struct ISAMS_PP_s *ISAMS_PP;
typedef struct ISAMS_M_s {
int (*compare_item)(const void *a, const void *b);
void (*log_item)(int logmask, const void *p, const char *txt);
- ISAM_CODEC codec;
+#define ISAMC_DECODE 0
+#define ISAMC_ENCODE 1
+ void *(*code_start)(int mode);
+ void (*code_stop)(int mode, void *p);
+ void (*code_item)(int mode, void *p, char **dst, char **src);
int debug;
int block_size;
-/* $Id: mfile.h,v 1.22 2004-08-04 08:35:23 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
+/* $Id: mfile.h,v 1.21.2.1 2006-08-14 10:38:56 adam Exp $
+ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
Index Data Aps
This file is part of the Zebra server.
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
#include <stdio.h>
#include <yaz/yconfig.h>
-#include <zebraver.h>
#ifdef WIN32
+#if 0
+/* 32-bit access .. */
+typedef long mfile_off_t;
+#define mfile_seek lseek
+
+#else
/* 64-bit access .. */
typedef __int64 mfile_off_t;
#define mfile_seek _lseeki64
+#endif
#else
#include <sys/types.h>
typedef struct part_file
{
- zint number;
- zint top;
- zint blocks;
+ int number;
+ int top;
+ int blocks;
mfile_off_t bytes;
mf_dir *dir;
char *path;
/*
* Read one block from a metafile. Interface mirrors bfile.
*/
-int mf_read(MFile mf, zint no, int offset, int nbytes, void *buf);
+int mf_read(MFile mf, int no, int offset, int nbytes, void *buf);
/*
* Same.
*/
-int mf_write(MFile mf, zint no, int offset, int nbytes, const void *buf);
+int mf_write(MFile mf, int no, int offset, int nbytes, const void *buf);
/*
* Destroy a metafile, unlinking component files. File must be open.
-/* $Id: passwddb.h,v 1.4.2.1 2005-05-30 13:24:53 adam Exp $
+/* $Id: passwddb.h,v 1.4.2.2 2006-08-14 10:38:56 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: recctrl.h,v 1.40.2.1 2005-01-16 23:12:58 adam Exp $
+/* $Id: recctrl.h,v 1.40.2.2 2006-08-14 10:38:56 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
#ifndef RECCTRL_H
-/* $Id: res.h,v 1.13.2.1 2005-08-30 13:10:05 adam Exp $
+/* $Id: res.h,v 1.13.2.2 2006-08-14 10:38:56 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: rsbetween.h,v 1.5 2002-08-02 19:26:55 adam Exp $
+/* $Id: rsbetween.h,v 1.5.2.1 2006-08-14 10:38:56 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: rsbool.h,v 1.9.2.1 2005-01-23 15:06:21 adam Exp $
+/* $Id: rsbool.h,v 1.9.2.2 2006-08-14 10:38:56 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
#ifndef RSET_BOOL_H
-/* $Id: rset.h,v 1.24 2004-08-04 09:59:03 heikki Exp $
+/* $Id: rset.h,v 1.23.2.1 2006-08-14 10:38:56 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
int (*f_forward)(RSET ct, RSFD rfd, void *buf, int *term_index,
int (*cmpfunc)(const void *p1, const void *p2),
const void *untilbuf);
- void (*f_pos)(RSFD rfd, zint *current, zint *total);
+ void (*f_pos)(RSFD rfd, int *current, int *total);
+ /* FIXME - Should be 64-bit ints !*/
/* returns -1,-1 if pos function not implemented for this type */
int (*f_read)(RSFD rfd, void *buf, int *term_index);
int (*f_write)(RSFD rfd, const void *buf);
int rset_default_forward(RSET ct, RSFD rfd, void *buf, int *term_index,
int (*cmpfunc)(const void *p1, const void *p2),
const void *untilbuf);
-void rset_default_pos(RSFD rfd, zint *current, zint *total);
+void rset_default_pos(RSFD rfd, int *current, int *total);
struct rset_term {
char *name;
-/* $Id: rsisam.h,v 1.6 2002-08-02 19:26:55 adam Exp $
+/* $Id: rsisam.h,v 1.6.2.1 2006-08-14 10:38:56 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: rsisamb.h,v 1.2.2.1 2005-01-14 14:32:25 adam Exp $
+/* $Id: rsisamb.h,v 1.2.2.2 2006-08-14 10:38:56 adam Exp $
Copyright (C) 1995-2005
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: rsisamc.h,v 1.7 2002-08-02 19:26:55 adam Exp $
+/* $Id: rsisamc.h,v 1.7.2.1 2006-08-14 10:38:56 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: rsisamd.h,v 1.3 2002-08-02 19:26:55 adam Exp $
+/* $Id: rsisamd.h,v 1.3.2.1 2006-08-14 10:38:56 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: rsisams.h,v 1.2 2002-08-02 19:26:55 adam Exp $
+/* $Id: rsisams.h,v 1.2.2.1 2006-08-14 10:38:56 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: rsm_or.h,v 1.7 2004-08-04 08:35:23 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
+/* $Id: rsm_or.h,v 1.6.2.1 2006-08-14 10:38:56 adam Exp $
+ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
This file is part of the Zebra server.
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
#include <rset.h>
-YAZ_BEGIN_CDECL
+#ifdef __cplusplus
+extern "C" {
+#endif
extern const struct rset_control *rset_kind_m_or;
int (*cmp)(const void *p1, const void *p2);
ISAMC isc;
- ISAMC_P *isam_positions;
+ ISAM_P *isam_positions;
RSET_TERM rset_term;
int no_isam_positions;
int no_save_positions;
} rset_m_or_parms;
-YAZ_END_CDECL
+#ifdef __cplusplus
+}
+#endif
#endif
-/* $Id: rsnull.h,v 1.5 2002-08-02 19:26:55 adam Exp $
+/* $Id: rsnull.h,v 1.5.2.1 2006-08-14 10:38:56 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: rsprox.h,v 1.1 2004-06-09 12:15:25 adam Exp $
+/* $Id: rsprox.h,v 1.1.2.1 2006-08-14 10:38:56 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
#ifndef RSET_PROX_H
-/* $Id: rstemp.h,v 1.9 2004-01-22 11:27:21 adam Exp $
+/* $Id: rstemp.h,v 1.9.2.1 2006-08-14 10:38:56 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: set.h,v 1.4 2002-08-02 19:26:55 adam Exp $
+/* $Id: set.h,v 1.4.2.1 2006-08-14 10:38:56 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: sortidx.h,v 1.4 2004-08-04 08:35:23 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
+/* $Id: sortidx.h,v 1.3.2.1 2006-08-14 10:38:56 adam Exp $
+ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
This file is part of the Zebra server.
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
+
+
#ifndef SORTIDX_H
#define SORTIDX_H
-#include <zebraver.h>
#include <bfile.h>
#ifdef __cplusplus
SortIdx sortIdx_open (BFiles bfs, int write_flag);
void sortIdx_close (SortIdx si);
int sortIdx_type (SortIdx si, int type);
-void sortIdx_sysno (SortIdx si, SYSNO sysno);
+void sortIdx_sysno (SortIdx si, int sysno);
void sortIdx_add (SortIdx si, const char *buf, int len);
void sortIdx_read (SortIdx si, char *buf);
-/* $Id: str.h,v 1.5 2002-08-02 19:26:55 adam Exp $
+/* $Id: str.h,v 1.5.2.1 2006-08-14 10:38:56 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: zebra-flock.h,v 1.1.2.1 2006-03-24 13:47:29 adam Exp $
+/* $Id: zebra-flock.h,v 1.1.2.2 2006-08-14 10:38:56 adam Exp $
Copyright (C) 1995-2005
Index Data ApS
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
#include <yaz/yconfig.h>
-/* $Id: zebra-lock.h,v 1.7 2002-08-02 19:26:55 adam Exp $
+/* $Id: zebra-lock.h,v 1.7.2.1 2006-08-14 10:38:56 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: zebraapi.h,v 1.13.2.2 2005-08-30 13:10:05 adam Exp $
+/* $Id: zebraapi.h,v 1.13.2.3 2006-08-14 10:38:56 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
/* Return codes:
-/* $Id: zebramap.h,v 1.15.2.2 2005-03-11 21:10:12 adam Exp $
+/* $Id: zebramap.h,v 1.15.2.3 2006-08-14 10:38:56 adam Exp $
Copyright (C) 1995-2005
Index Data ApS
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
#ifndef ZEBRAMAP_H
-/* $Id: zebrautl.h,v 1.7.2.1 2004-11-26 11:06:12 adam Exp $
+/* $Id: zebrautl.h,v 1.7.2.2 2006-08-14 10:38:56 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
#ifndef ZEBRA_UTIL_H
-/* $Id: zebraver.h,v 1.38.2.15 2006-08-14 08:37:47 adam Exp $
+/* $Id: zebraver.h,v 1.38.2.16 2006-08-14 10:38:56 adam Exp $
Copyright (C) 1995-2006
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
#ifndef ZEBRAVER
#endif
#ifndef ZEBRADATE
-#define ZEBRADATE "$Date: 2006-08-14 08:37:47 $"
+#define ZEBRADATE "$Date: 2006-08-14 10:38:56 $"
#endif
-/* $Id: apitest.c,v 1.16.2.1 2005-01-16 23:13:29 adam Exp $
+/* $Id: apitest.c,v 1.16.2.2 2006-08-14 10:38:57 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
#include <stdlib.h>
-/* $Id: attribute.c,v 1.15 2004-05-26 13:52:25 adam Exp $
+/* $Id: attribute.c,v 1.15.2.1 2006-08-14 10:38:57 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: compact.c,v 1.3 2002-08-02 19:26:55 adam Exp $
+/* $Id: compact.c,v 1.3.2.1 2006-08-14 10:38:57 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: dir.c,v 1.28 2003-01-13 22:37:12 adam Exp $
+/* $Id: dir.c,v 1.28.2.1 2006-08-14 10:38:57 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: dirs.c,v 1.19.2.1 2005-05-09 19:57:38 adam Exp $
+/* $Id: dirs.c,v 1.19.2.2 2006-08-14 10:38:57 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: extract.c,v 1.157.2.3 2006-02-08 13:45:34 adam Exp $
+/* $Id: extract.c,v 1.157.2.4 2006-08-14 10:38:57 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: index.h,v 1.109.2.2 2006-03-24 13:47:29 adam Exp $
+/* $Id: index.h,v 1.109.2.3 2006-08-14 10:38:57 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: invstat.c,v 1.36 2004-08-04 08:35:23 adam Exp $
+/* $Id: invstat.c,v 1.35.2.1 2006-08-14 10:38:58 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
#include <string.h>
#include "index.h"
+#include "../isamc/isamd-p.h"
struct inv_stat_info {
ZebraHandle zh;
stat_info->no_dict_entries++;
stat_info->no_dict_bytes += strlen(name);
- assert (*info == sizeof(ISAMS_P));
- memcpy (&isam_p, info+1, sizeof(ISAMS_P));
+ if (!stat_info->zh->reg->isamd)
+ {
+ assert (*info == sizeof(ISAMS_P));
+ memcpy (&isam_p, info+1, sizeof(ISAMS_P));
+ }
if (stat_info->zh->reg->isams)
{
occur = isams_pp_num (pp);
while (isams_pp_read(pp, &key))
{
- occurx++;
-#if IT_KEY_NEW
-#else
stat_info->cksum = stat_info->cksum * 65509 +
key.sysno + 11 * key.seqno;
+ occurx++;
if (-1==firstsys)
{
firstseq=key.seqno;
}
lastsys=key.sysno;
lastseq=key.seqno;
-#endif
}
assert (occurx == occur);
stat_info->no_isam_entries[0] += occur;
occur = isc_pp_num (pp);
while (isc_pp_read(pp, &key))
{
- occurx++;
-#if IT_KEY_NEW
-#else
stat_info->cksum = stat_info->cksum * 65509 +
key.sysno + 11 * key.seqno;
+ occurx++;
if (-1==firstsys)
{
firstseq=key.seqno;
}
lastsys=key.sysno;
lastseq=key.seqno;
-#endif
}
assert (occurx == occur);
stat_info->no_isam_entries[isc_type(isam_p)] += occur;
isc_pp_close (pp);
}
+ if (stat_info->zh->reg->isamd)
+ {
+ ISAMD_PP pp;
+ int occurx = 0;
+ struct it_key key;
+ /* printf("[%d: %d %d %d %d %d %d] ", */
+ /* info[0], info[1], info[2], info[3], info[4], info[5], info[7]);*/
+ pp = isamd_pp_open (stat_info->zh->reg->isamd, info+1, info[0]);
+
+ occur = isamd_pp_num (pp);
+ while (isamd_pp_read(pp, &key))
+ {
+ stat_info->cksum = stat_info->cksum * 65509 +
+ key.sysno + 11 * key.seqno;
+ occurx++;
+ /* printf("%d.%d ", key.sysno, key.seqno); */ /*!*/
+ if (-1==firstsys)
+ {
+ firstseq=key.seqno;
+ firstsys=key.sysno;
+ }
+ lastsys=key.sysno;
+ lastseq=key.seqno;
+ if ( pp->is->method->debug >8 )
+ logf (LOG_LOG,"sysno=%d seqno=%d (%x/%x) oc=%d/%d ofs=%d ",
+ key.sysno, key.seqno,
+ key.sysno, key.seqno,
+ occur,occurx, pp->offset);
+ }
+ /* printf("\n"); */ /*!*/
+#ifdef SKIPTHIS
+ if ( pp->is->method->debug >7 )
+ logf(LOG_LOG,"item %d=%d:%d says %d keys, counted %d",
+ isam_p, isamd_type(isam_p), isamd_block(isam_p),
+ occur, occurx);
+#endif
+ if (occurx != occur)
+ logf(LOG_LOG,"Count error!!! read %d, counted %d", occur, occurx);
+ assert (occurx == occur);
+ i = pp->cat;
+ if (info[1])
+ i=SINGLETON_TYPE;
+ stat_info->no_isam_entries[i] += occur;
+ isamd_pp_close (pp);
+ }
if (stat_info->zh->reg->isamb)
{
ISAMB_PP pp;
while (isamb_pp_read(pp, &key))
{
- occur++;
-#if IT_KEY_NEW
-#else
stat_info->cksum = stat_info->cksum * 65509 +
key.sysno + 11 * key.seqno;
+ occur++;
if (-1==firstsys)
{
firstseq=key.seqno;
}
lastsys=key.sysno;
lastseq=key.seqno;
-#endif
}
isamb_pp_close_x (pp, &size, &blocks);
stat_info->isamb_blocks[cat] += blocks;
int zebra_register_statistics (ZebraHandle zh, int dumpdict)
{
+ int blocks;
+ int size;
+ int count;
int i, prev;
int before = 0;
int occur;
fprintf (stdout, " Blocks Occur Size KB Bytes/Entry\n");
for (i = 0; isc_block_used (zh->reg->isamc, i) >= 0; i++)
{
- fprintf (stdout, " %8" ZINT_FORMAT0 " %8d", isc_block_used (zh->reg->isamc, i),
+ fprintf (stdout, " %8d %8d", isc_block_used (zh->reg->isamc, i),
stat_info.no_isam_entries[i]);
if (stat_info.no_isam_entries[i])
fprintf (stdout, "\n");
}
}
+ if (zh->reg->isamd)
+ {
+ fprintf (stdout, " Blocks Occur KB Bytes/Entry\n");
+ if (zh->reg->isamd->method->debug >0)
+ logf(LOG_LOG," Blocks Occur KB Bytes/Entry");
+ for (i = 0; i<=SINGLETON_TYPE; i++)
+ {
+ blocks= isamd_block_used(zh->reg->isamd,i);
+ size= isamd_block_size(zh->reg->isamd,i);
+ count=stat_info.no_isam_entries[i];
+ if (i==SINGLETON_TYPE)
+ blocks=size=0;
+ if (stat_info.no_isam_entries[i])
+ {
+ fprintf (stdout, "%c %7d %7d %7d %5.2f\n",
+ (i==SINGLETON_TYPE)?('z'):('A'+i),
+ blocks,
+ count,
+ (int) ((1023.0 + (double) blocks * size)/1024),
+ ((double) blocks * size)/count);
+ if (zh->reg->isamd->method->debug >0)
+ logf(LOG_LOG, "%c %7d %7d %7d %5.2f",
+ (i==SINGLETON_TYPE)?('z'):('A'+i),
+ blocks,
+ count,
+ (int) ((1023.0 + (double) blocks * size)/1024),
+ ((double) blocks * size)/count);
+ } /* entries */
+ } /* for */
+ } /* isamd */
+ if ( (zh->reg->isamd) && (zh->reg->isamd->method->debug>0))
+ fprintf (stdout, "\n%d words using %d bytes\n",
+ stat_info.no_dict_entries, stat_info.no_dict_bytes);
if (zh->reg->isamb)
{
-/* $Id: kcompare.c,v 1.46.2.2 2004-08-06 09:36:07 adam Exp $
+/* $Id: kcompare.c,v 1.46.2.3 2006-08-14 10:38:58 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
#include <stdlib.h>
-/* $Id: kdump.c,v 1.25 2004-08-04 08:35:23 adam Exp $
+/* $Id: kdump.c,v 1.24.2.1 2006-08-14 10:38:58 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
+
#include <stdio.h>
#include <string.h>
#include <assert.h>
char *prog;
-#if IT_KEY_NEW
-int main(int argc, char **argv)
-{
- exit(0);
-}
-#else
+
int key_file_decode (FILE *f)
{
int c, d;
return 1;
}
-
int main (int argc, char **argv)
{
int ret;
logf (LOG_FATAL|LOG_ERRNO, "fclose %s", key_fname);
exit (1);
}
+
exit (0);
}
-#endif
-/* $Id: kinput.c,v 1.59.2.1 2005-09-09 14:22:12 adam Exp $
+/* $Id: kinput.c,v 1.59.2.2 2006-08-14 10:38:58 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: locksrv.c,v 1.17 2002-08-02 19:26:55 adam Exp $
+/* $Id: locksrv.c,v 1.17.2.1 2006-08-14 10:38:58 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: main.c,v 1.112.2.5 2006-02-23 14:30:03 adam Exp $
+/* $Id: main.c,v 1.112.2.6 2006-08-14 10:38:59 adam Exp $
Copyright (C) 1995-2005
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: rank1.c,v 1.15 2004-08-04 08:35:23 adam Exp $
+/* $Id: rank1.c,v 1.14.2.1 2006-08-14 10:38:59 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
* score should be between 0 and 1000. If score cannot be obtained
* -1 should be returned.
*/
-static int calc (void *set_handle, zint sysno)
+static int calc (void *set_handle, int sysno)
{
int i, lo, divisor, score = 0;
struct rank_set_info *si = (struct rank_set_info *) set_handle;
divisor = si->no_rank_entries * (8+log2_int (si->last_pos/si->no_entries));
score = score / divisor;
#if DEBUG_RANK
- yaz_log (LOG_LOG, "sysno=" ZINT_FORMAT " score=%d", sysno, score);
+ yaz_log (LOG_LOG, "sysno=%d score=%d", sysno, score);
#endif
if (score > 1000)
score = 1000;
-/* $Id: recindex.c,v 1.34.2.2 2005-01-16 23:13:29 adam Exp $
+/* $Id: recindex.c,v 1.34.2.3 2006-08-14 10:38:59 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: recindex.h,v 1.21 2004-08-04 08:35:23 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
+/* $Id: recindex.h,v 1.20.2.1 2006-08-14 10:38:59 adam Exp $
+ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
This file is part of the Zebra server.
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
+
+
#ifndef RECINDEX_H
#define RECINDEX_H
#define REC_NO_INFO 8
typedef struct record_info {
- SYSNO sysno;
+ int sysno;
int newFlag;
char *info[REC_NO_INFO];
size_t size[REC_NO_INFO];
void rec_rm (Record *recpp);
void rec_put (Records p, Record *recpp);
Record rec_new (Records p);
-Record rec_get (Records p, SYSNO sysno);
+Record rec_get (Records p, int sysno);
void rec_close (Records *p);
Records rec_open (BFiles bfs, int rw, int compression_method);
char *rec_strdup (const char *s, size_t *len);
-/* $Id: recindxp.h,v 1.13 2004-08-04 08:35:23 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
+/* $Id: recindxp.h,v 1.12.2.1 2006-08-14 10:38:59 adam Exp $
+ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
This file is part of the Zebra server.
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
+
+
#include "recindex.h"
#include <bfile.h>
#define REC_BLOCK_TYPES 2
#define REC_HEAD_MAGIC "recindex"
-#define REC_VERSION 5
+#define REC_VERSION 4
struct records_info {
int rw;
struct records_head {
char magic[8];
char version[4];
- zint block_size[REC_BLOCK_TYPES];
- zint block_free[REC_BLOCK_TYPES];
- zint block_last[REC_BLOCK_TYPES];
- zint block_used[REC_BLOCK_TYPES];
- zint block_move[REC_BLOCK_TYPES];
+ int block_size[REC_BLOCK_TYPES];
+ int block_free[REC_BLOCK_TYPES];
+ int block_last[REC_BLOCK_TYPES];
+ int block_used[REC_BLOCK_TYPES];
+ int block_move[REC_BLOCK_TYPES];
- zint total_bytes;
- zint index_last;
- zint index_free;
- zint no_records;
+ int total_bytes;
+ int index_last;
+ int index_free;
+ int no_records;
} head;
};
};
struct record_index_entry {
- zint next; /* first block of record info / next free entry */
- int size; /* size of record or 0 if free entry */
+ int next; /* first block of record info / next free entry */
+ int size; /* size of record or 0 if free entry */
};
YAZ_END_CDECL
-/* $Id: recstat.c,v 1.9 2004-08-04 08:35:23 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
+/* $Id: recstat.c,v 1.8.2.1 2006-08-14 10:38:59 adam Exp $
+ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
This file is part of the Zebra server.
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
void rec_prstat (Records records)
{
int i;
- zint total_bytes = 0;
+ int total_bytes = 0;
logf (LOG_LOG,
- "Total records %8" ZINT_FORMAT0,
+ "Total records %8d",
records->head.no_records);
for (i = 0; i< REC_BLOCK_TYPES; i++)
{
- logf (LOG_LOG, "Record blocks of size " ZINT_FORMAT,
+ logf (LOG_LOG, "Record blocks of size %d",
records->head.block_size[i]);
logf (LOG_LOG,
- " Used/Total/Bytes used "
- ZINT_FORMAT "/" ZINT_FORMAT "/" ZINT_FORMAT,
+ " Used/Total/Bytes used %d/%d/%d",
records->head.block_used[i], records->head.block_last[i]-1,
records->head.block_used[i] * records->head.block_size[i]);
total_bytes +=
records->head.block_used[i] * records->head.block_size[i];
}
logf (LOG_LOG,
- "Total size of record index in bytes %8" ZINT_FORMAT0,
+ "Total size of record index in bytes %8d",
records->head.total_bytes);
logf (LOG_LOG,
- "Total size with overhead %8" ZINT_FORMAT0,
- total_bytes);
+ "Total size with overhead %8d", total_bytes);
}
-/* $Id: retrieve.c,v 1.21.2.1 2005-05-31 19:28:49 adam Exp $
+/* $Id: retrieve.c,v 1.21.2.2 2006-08-14 10:38:59 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
#include <stdio.h>
-/* $Id: sortidx.c,v 1.9 2004-08-04 08:35:23 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
+/* $Id: sortidx.c,v 1.8.2.1 2006-08-14 10:38:59 adam Exp $
+ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
This file is part of the Zebra server.
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
#define SORT_IDX_BLOCKSIZE 64
struct sortFileHead {
- SYSNO sysno_max;
+ int sysno_max;
};
struct sortFile {
struct sortIdx {
BFiles bfs;
int write_flag;
- SYSNO sysno;
+ int sysno;
char *entry_buf;
struct sortFile *current_file;
struct sortFile *files;
return 0;
}
-void sortIdx_sysno (SortIdx si, SYSNO sysno)
+void sortIdx_sysno (SortIdx si, int sysno)
{
si->sysno = sysno;
}
-/* $Id: symtab.c,v 1.7 2002-08-02 19:26:55 adam Exp $
+/* $Id: symtab.c,v 1.7.2.1 2006-08-14 10:38:59 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: trav.c,v 1.44.2.1 2005-05-09 19:57:38 adam Exp $
+/* $Id: trav.c,v 1.44.2.2 2006-08-14 10:38:59 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
#include <stdio.h>
-/* $Id: trunc.c,v 1.28.2.4 2005-10-22 17:27:28 adam Exp $
+/* $Id: trunc.c,v 1.28.2.5 2006-08-14 10:39:00 adam Exp $
Copyright (C) 1995-2005
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: zebraapi.c,v 1.120.2.13 2006-06-28 09:44:12 adam Exp $
+/* $Id: zebraapi.c,v 1.120.2.14 2006-08-14 10:39:00 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
#include <assert.h>
-/* $Id: zebrash.c,v 1.28 2004-08-04 08:35:23 adam Exp $
+/* $Id: zebrash.c,v 1.27.2.1 2006-08-14 10:39:00 adam Exp $
Copyright (C) 2002,2003,2004
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
/*
static int cmd_record_insert( char *args[], WRBUF outbuff)
{
- SYSNO sysno=0;
+ int sysno=0;
int rc;
char *rec=restargs(args,1);
-/* $Id: zinfo.c,v 1.37.2.3 2005-12-08 11:10:09 adam Exp $
+/* $Id: zinfo.c,v 1.37.2.4 2006-08-14 10:39:00 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
#include <sys/types.h>
-/* $Id: zinfo.h,v 1.16 2003-06-30 19:37:12 adam Exp $
+/* $Id: zinfo.h,v 1.16.2.1 2006-08-14 10:39:01 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: zrpn.c,v 1.141.2.14 2006-06-06 13:07:54 adam Exp $
+/* $Id: zrpn.c,v 1.141.2.15 2006-08-14 10:39:01 adam Exp $
Copyright (C) 1995-2005
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: zserver.c,v 1.117.2.5 2005-11-07 12:53:47 adam Exp $
+/* $Id: zserver.c,v 1.117.2.6 2006-08-14 10:39:01 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
#include <stdlib.h>
-/* $Id: zserver.h,v 1.57 2002-08-02 19:26:56 adam Exp $
+/* $Id: zserver.h,v 1.57.2.1 2006-08-14 10:39:02 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: zsets.c,v 1.49.2.6 2006-05-30 21:43:15 adam Exp $
+/* $Id: zsets.c,v 1.49.2.7 2006-08-14 10:39:02 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004,2005
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: isam.c,v 1.28 2004-01-22 11:27:21 adam Exp $
+/* $Id: isam.c,v 1.28.2.1 2006-08-14 10:39:03 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: issh.c,v 1.6 2002-08-02 19:26:56 adam Exp $
+/* $Id: issh.c,v 1.6.2.1 2006-08-14 10:39:03 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: isutil.c,v 1.5 2002-08-02 19:26:56 adam Exp $
+/* $Id: isutil.c,v 1.5.2.1 2006-08-14 10:39:03 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: isutil.h,v 1.4 2002-08-02 19:26:56 adam Exp $
+/* $Id: isutil.h,v 1.4.2.1 2006-08-14 10:39:03 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: keyops.h,v 1.3 2002-08-02 19:26:56 adam Exp $
+/* $Id: keyops.h,v 1.3.2.1 2006-08-14 10:39:03 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: memory.c,v 1.18 2002-08-02 19:26:56 adam Exp $
+/* $Id: memory.c,v 1.18.2.1 2006-08-14 10:39:03 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: memory.h,v 1.8 2002-08-02 19:26:56 adam Exp $
+/* $Id: memory.h,v 1.8.2.1 2006-08-14 10:39:03 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: physical.c,v 1.18.2.1 2005-01-16 23:13:30 adam Exp $
+/* $Id: physical.c,v 1.18.2.2 2006-08-14 10:39:03 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: physical.h,v 1.6 2002-08-02 19:26:56 adam Exp $
+/* $Id: physical.h,v 1.6.2.1 2006-08-14 10:39:03 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: rootblk.c,v 1.4 2002-08-02 19:26:56 adam Exp $
+/* $Id: rootblk.c,v 1.4.2.1 2006-08-14 10:39:03 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: rootblk.h,v 1.4 2002-08-02 19:26:56 adam Exp $
+/* $Id: rootblk.h,v 1.4.2.1 2006-08-14 10:39:03 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: isamb.c,v 1.47.2.4 2005-01-16 23:13:30 adam Exp $
+/* $Id: isamb.c,v 1.47.2.5 2006-08-14 10:39:07 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
#include <string.h>
-/* $Id: tstisamb.c,v 1.7.2.1 2005-01-17 08:46:25 adam Exp $
+/* $Id: tstisamb.c,v 1.7.2.2 2006-08-14 10:39:07 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
#include <stdlib.h>
-/* $Id: isamc-p.h,v 1.10 2004-08-04 08:35:24 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
+/* $Id: isamc-p.h,v 1.9.2.1 2006-08-14 10:39:10 adam Exp $
+ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
Index Data Aps
This file is part of the Zebra server.
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
#include <bfile.h>
#include <isamc.h>
-YAZ_BEGIN_CDECL
+#ifdef __cplusplus
+extern "C" {
+#endif
typedef struct {
- zint lastblock;
- zint freelist;
+ int lastblock;
+ int freelist;
} ISAMC_head;
typedef unsigned ISAMC_BLOCK_SIZE;
ISAMC_BLOCK_SIZE offset;
ISAMC_BLOCK_SIZE size;
int cat;
- zint pos;
- zint next;
+ int pos;
+ int next;
ISAMC is;
void *decodeClientData;
int deleteFlag;
- zint numKeys;
+ int numKeys;
};
-/*
- first block consists of
- next pointer : zint
- size : ISAMC_BLOCK_SIZE (int)
- numkeys : zint
- data
- other blocks consists of
- next pointer : zint
- size : ISAMC_BLOCK_SIZE (int)
- data
-*/
-#define ISAMC_BLOCK_OFFSET_1 (sizeof(zint)+sizeof(ISAMC_BLOCK_SIZE)+sizeof(zint))
-#define ISAMC_BLOCK_OFFSET_N (sizeof(zint)+sizeof(ISAMC_BLOCK_SIZE))
-
-zint isc_alloc_block (ISAMC is, int cat);
-void isc_release_block (ISAMC is, int cat, zint pos);
-int isc_read_block (ISAMC is, int cat, zint pos, char *dst);
-int isc_write_block (ISAMC is, int cat, zint pos, char *src);
-
-YAZ_END_CDECL
+#define ISAMC_BLOCK_OFFSET_N (sizeof(int)+sizeof(ISAMC_BLOCK_SIZE))
+#define ISAMC_BLOCK_OFFSET_1 (sizeof(int)+sizeof(ISAMC_BLOCK_SIZE)+sizeof(int))
+int isc_alloc_block (ISAMC is, int cat);
+void isc_release_block (ISAMC is, int cat, int pos);
+int isc_read_block (ISAMC is, int cat, int pos, char *dst);
+int isc_write_block (ISAMC is, int cat, int pos, char *src);
+#ifdef __cplusplus
+}
+#endif
-/* $Id: isamc.c,v 1.25 2004-08-04 08:35:24 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
+/* $Id: isamc.c,v 1.24.2.1 2006-08-14 10:39:10 adam Exp $
+ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
Index Data Aps
This file is part of the Zebra server.
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
+
+
/*
* TODO:
* Reduction to lower categories in isc_merge
static void release_fc (ISAMC is, int cat);
static void init_fc (ISAMC is, int cat);
-#define ISAMC_FREELIST_CHUNK 0
+#define ISAMC_FREELIST_CHUNK 1
#define SMALL_TEST 0
{ 32, 28, 0, 3 },
{ 64, 54, 30, 0 },
#else
- { 64, 56, 40, 5 },
+ { 32, 26, 20, 10 },
{ 128, 120, 100, 10 },
{ 512, 490, 350, 10 },
{ 2048, 1900, 1700, 10 },
};
m->filecat = def_cat;
- m->codec.start = NULL;
- m->codec.decode = NULL;
- m->codec.encode = NULL;
- m->codec.stop = NULL;
- m->codec.reset = NULL;
+ m->code_start = NULL;
+ m->code_item = NULL;
+ m->code_stop = NULL;
+ m->code_reset = NULL;
m->compare_item = NULL;
m->log_item = NULL;
}
is->files[i].alloc_entries_num = 0;
is->files[i].alloc_entries_max =
- is->method->filecat[i].bsize / sizeof(zint) - 1;
+ is->method->filecat[i].bsize / sizeof(int) - 1;
is->files[i].alloc_buf = (char *)
xmalloc (is->method->filecat[i].bsize);
is->files[i].no_writes = 0;
return is;
}
-zint isc_block_used (ISAMC is, int type)
+int isc_block_used (ISAMC is, int type)
{
if (type < 0 || type >= is->no_files)
return -1;
return 0;
}
-int isc_read_block (ISAMC is, int cat, zint pos, char *dst)
+int isc_read_block (ISAMC is, int cat, int pos, char *dst)
{
++(is->files[cat].no_reads);
return bf_read (is->files[cat].bf, pos, 0, 0, dst);
}
-int isc_write_block (ISAMC is, int cat, zint pos, char *src)
+int isc_write_block (ISAMC is, int cat, int pos, char *src)
{
++(is->files[cat].no_writes);
if (is->method->debug > 2)
- logf (LOG_LOG, "isc: write_block %d " ZINT_FORMAT, cat, pos);
+ logf (LOG_LOG, "isc: write_block %d %d", cat, pos);
return bf_write (is->files[cat].bf, pos, 0, 0, src);
}
-int isc_write_dblock (ISAMC is, int cat, zint pos, char *src,
- zint nextpos, int offset)
+int isc_write_dblock (ISAMC is, int cat, int pos, char *src,
+ int nextpos, int offset)
{
ISAMC_BLOCK_SIZE size = offset + ISAMC_BLOCK_OFFSET_N;
if (is->method->debug > 2)
- logf (LOG_LOG, "isc: write_dblock. size=%d nextpos=" ZINT_FORMAT,
+ logf (LOG_LOG, "isc: write_dblock. size=%d nextpos=%d",
(int) size, nextpos);
src -= ISAMC_BLOCK_OFFSET_N;
- memcpy (src, &nextpos, sizeof(nextpos));
- memcpy (src + sizeof(nextpos), &size, sizeof(size));
+ memcpy (src, &nextpos, sizeof(int));
+ memcpy (src + sizeof(int), &size, sizeof(size));
return isc_write_block (is, cat, pos, src);
}
static void flush_block (ISAMC is, int cat)
{
char *abuf = is->files[cat].alloc_buf;
- zint block = is->files[cat].head.freelist;
+ int block = is->files[cat].head.freelist;
if (block && is->files[cat].alloc_entries_num)
{
- memcpy (abuf, &is->files[cat].alloc_entries_num, sizeof(block));
+ memcpy (abuf, &is->files[cat].alloc_entries_num, sizeof(int));
bf_write (is->files[cat].bf, block, 0, 0, abuf);
is->files[cat].alloc_entries_num = 0;
}
xfree (abuf);
}
-static zint alloc_block (ISAMC is, int cat)
+static int alloc_block (ISAMC is, int cat)
{
- zint block = is->files[cat].head.freelist;
+ int block = is->files[cat].head.freelist;
char *abuf = is->files[cat].alloc_buf;
(is->files[cat].no_allocated)++;
if (!is->files[cat].alloc_entries_num) /* last one in block? */
{
memcpy (&is->files[cat].head.freelist, abuf + sizeof(int),
- sizeof(zint));
+ sizeof(int));
is->files[cat].head_is_dirty = 1;
if (is->files[cat].head.freelist)
}
}
else
- memcpy (&block, abuf + sizeof(zint) + sizeof(int) *
- is->files[cat].alloc_entries_num, sizeof(zint));
+ memcpy (&block, abuf + sizeof(int) + sizeof(int) *
+ is->files[cat].alloc_entries_num, sizeof(int));
}
return block;
}
-static void release_block (ISAMC is, int cat, zint pos)
+static void release_block (ISAMC is, int cat, int pos)
{
char *abuf = is->files[cat].alloc_buf;
- zint block = is->files[cat].head.freelist;
+ int block = is->files[cat].head.freelist;
(is->files[cat].no_released)++;
}
if (!is->files[cat].alloc_entries_num) /* make new buffer? */
{
- memcpy (abuf + sizeof(int), &block, sizeof(zint));
+ memcpy (abuf + sizeof(int), &block, sizeof(int));
is->files[cat].head.freelist = pos;
is->files[cat].head_is_dirty = 1;
}
else
{
memcpy (abuf + sizeof(int) +
- is->files[cat].alloc_entries_num*sizeof(zint),
- &pos, sizeof(zint));
+ is->files[cat].alloc_entries_num*sizeof(int),
+ &pos, sizeof(int));
}
is->files[cat].alloc_entries_num++;
}
xfree (abuf);
}
-static zint alloc_block (ISAMC is, int cat)
+static int alloc_block (ISAMC is, int cat)
{
- zint block;
- char buf[sizeof(zint)];
+ int block;
+ char buf[sizeof(int)];
is->files[cat].head_is_dirty = 1;
(is->files[cat].no_allocated)++;
if ((block = is->files[cat].head.freelist))
{
- bf_read (is->files[cat].bf, block, 0, sizeof(zint), buf);
- memcpy (&is->files[cat].head.freelist, buf, sizeof(zint));
+ bf_read (is->files[cat].bf, block, 0, sizeof(int), buf);
+ memcpy (&is->files[cat].head.freelist, buf, sizeof(int));
}
else
block = (is->files[cat].head.lastblock)++;
return block;
}
-static void release_block (ISAMC is, int cat, zint pos)
+static void release_block (ISAMC is, int cat, int pos)
{
- char buf[sizeof(zint)];
+ char buf[sizeof(int)];
(is->files[cat].no_released)++;
is->files[cat].head_is_dirty = 1;
- memcpy (buf, &is->files[cat].head.freelist, sizeof(zint));
+ memcpy (buf, &is->files[cat].head.freelist, sizeof(int));
is->files[cat].head.freelist = pos;
- bf_write (is->files[cat].bf, pos, 0, sizeof(zint), buf);
+ bf_write (is->files[cat].bf, pos, 0, sizeof(int), buf);
}
#endif
-zint isc_alloc_block (ISAMC is, int cat)
+int isc_alloc_block (ISAMC is, int cat)
{
- zint block = 0;
+ int block = 0;
if (is->files[cat].fc_list)
{
- int j;
- zint nb;
+ int j, nb;
for (j = 0; j < is->files[cat].fc_max; j++)
if ((nb = is->files[cat].fc_list[j]) && (!block || nb < block))
{
if (!block)
block = alloc_block (is, cat);
if (is->method->debug > 3)
- logf (LOG_LOG, "isc: alloc_block in cat %d: " ZINT_FORMAT, cat, block);
+ logf (LOG_LOG, "isc: alloc_block in cat %d: %d", cat, block);
return block;
}
-void isc_release_block (ISAMC is, int cat, zint pos)
+void isc_release_block (ISAMC is, int cat, int pos)
{
if (is->method->debug > 3)
- logf (LOG_LOG, "isc: release_block in cat %d:" ZINT_FORMAT, cat, pos);
+ logf (LOG_LOG, "isc: release_block in cat %d: %d", cat, pos);
if (is->files[cat].fc_list)
{
int j;
{
ISAMC is = pp->is;
- (*is->method->codec.stop)(pp->decodeClientData);
+ (*is->method->code_stop)(ISAMC_DECODE, pp->decodeClientData);
xfree (pp->buf);
xfree (pp);
}
pp->size = 0;
pp->offset = 0;
pp->is = is;
- pp->decodeClientData = (*is->method->codec.start)();
+ pp->decodeClientData = (*is->method->code_start)(ISAMC_DECODE);
pp->deleteFlag = 0;
pp->numKeys = 0;
src += sizeof(pp->size);
memcpy (&pp->numKeys, src, sizeof(pp->numKeys));
src += sizeof(pp->numKeys);
- if (pp->next == pp->pos)
- {
- yaz_log(LOG_FATAL|LOG_LOG, "pp->next = " ZINT_FORMAT, pp->next);
- yaz_log(LOG_FATAL|LOG_LOG, "pp->pos = " ZINT_FORMAT, pp->pos);
- assert (pp->next != pp->pos);
- }
+ assert (pp->next != pp->pos);
pp->offset = src - pp->buf;
assert (pp->offset == ISAMC_BLOCK_OFFSET_1);
if (is->method->debug > 2)
- logf (LOG_LOG, "isc: read_block size=%d %d " ZINT_FORMAT " next="
- ZINT_FORMAT, pp->size, pp->cat, pp->pos, pp->next);
+ logf (LOG_LOG, "isc: read_block size=%d %d %d next=%d",
+ pp->size, pp->cat, pp->pos, pp->next);
}
return pp;
}
/* returns non-zero if item could be read; 0 otherwise */
int isc_pp_read (ISAMC_PP pp, void *buf)
{
- char *cp = buf;
- return isc_read_item (pp, &cp);
+ return isc_read_item (pp, (char **) &buf);
}
/* read one item from file - decode and store it in *dst.
int isc_read_item (ISAMC_PP pp, char **dst)
{
ISAMC is = pp->is;
- const char *src = pp->buf + pp->offset;
+ char *src = pp->buf + pp->offset;
if (pp->offset >= pp->size)
{
pp->pos = pp->next;
src = pp->buf;
/* read block and save 'next' and 'size' entry */
- isc_read_block (is, pp->cat, pp->pos, pp->buf);
+ isc_read_block (is, pp->cat, pp->pos, src);
memcpy (&pp->next, src, sizeof(pp->next));
src += sizeof(pp->next);
memcpy (&pp->size, src, sizeof(pp->size));
src += sizeof(pp->size);
/* assume block is non-empty */
assert (src - pp->buf == ISAMC_BLOCK_OFFSET_N);
-
- if (pp->next == pp->pos)
- {
- yaz_log(LOG_FATAL|LOG_LOG, "pp->next = " ZINT_FORMAT, pp->next);
- yaz_log(LOG_FATAL|LOG_LOG, "pp->pos = " ZINT_FORMAT, pp->pos);
- assert (pp->next != pp->pos);
- }
-
+ assert (pp->next != pp->pos);
if (pp->deleteFlag)
isc_release_block (is, pp->cat, pp->pos);
- (*is->method->codec.decode)(pp->decodeClientData, dst, &src);
+ (*is->method->code_item)(ISAMC_DECODE, pp->decodeClientData, dst, &src);
pp->offset = src - pp->buf;
if (is->method->debug > 2)
- logf (LOG_LOG, "isc: read_block size=%d %d " ZINT_FORMAT " next="
- ZINT_FORMAT, pp->size, pp->cat, pp->pos, pp->next);
+ logf (LOG_LOG, "isc: read_block size=%d %d %d next=%d",
+ pp->size, pp->cat, pp->pos, pp->next);
return 2;
}
- (*is->method->codec.decode)(pp->decodeClientData, dst, &src);
+ (*is->method->code_item)(ISAMC_DECODE, pp->decodeClientData, dst, &src);
pp->offset = src - pp->buf;
return 1;
}
-zint isc_pp_num (ISAMC_PP pp)
+int isc_pp_num (ISAMC_PP pp)
{
return pp->numKeys;
}
-/* $Id: isamd-p.h,v 1.13 2003-06-23 15:36:11 adam Exp $
+/* $Id: isamd-p.h,v 1.13.2.1 2006-08-14 10:39:10 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
/*
* $Log: isamd-p.h,v $
- * Revision 1.13 2003-06-23 15:36:11 adam
+ * Revision 1.13.2.1 2006-08-14 10:39:10 adam
+ * Update copyright year + FSF address
+ *
+ * Revision 1.13 2003/06/23 15:36:11 adam
* Implemented isamb_unlink.
*
* Revision 1.12 2002/11/26 22:18:34 adam
-/* $Id: isamd.c,v 1.27 2004-06-01 12:56:39 adam Exp $
+/* $Id: isamd.c,v 1.27.2.1 2006-08-14 10:39:10 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
#include <stdlib.h>
-/* $Id: merge-d.c,v 1.30 2003-03-05 16:41:10 adam Exp $
+/* $Id: merge-d.c,v 1.30.2.1 2006-08-14 10:39:11 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
/*
* $Log: merge-d.c,v $
- * Revision 1.30 2003-03-05 16:41:10 adam
+ * Revision 1.30.2.1 2006-08-14 10:39:11 adam
+ * Update copyright year + FSF address
+ *
+ * Revision 1.30 2003/03/05 16:41:10 adam
* Fix GCC warnings
*
* Revision 1.29 2002/11/26 22:18:34 adam
-/* $Id: merge.c,v 1.24 2004-08-04 08:35:24 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
+/* $Id: merge.c,v 1.23.2.1 2006-08-14 10:39:12 adam Exp $
+ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
This file is part of the Zebra server.
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
+
+
#include <stdlib.h>
#include <assert.h>
#include <string.h>
struct isc_merge_block {
int offset; /* offset in r_buf */
- zint block; /* block number of file (0 if none) */
+ int block; /* block number of file (0 if none) */
int dirty; /* block is different from that on file */
};
#endif
static void flush_blocks (ISAMC is, struct isc_merge_block *mb, int ptr,
- char *r_buf, zint *firstpos, int cat, int last,
- zint *numkeys)
+ char *r_buf, int *firstpos, int cat, int last,
+ int *numkeys)
{
int i;
if (!*firstpos)
*firstpos = mb[i].block;
if (is->method->debug > 2)
- logf (LOG_LOG, "isc: skip ptr=%d size=%d %d " ZINT_FORMAT,
+ logf (LOG_LOG, "isc: skip ptr=%d size=%d %d %d",
i, ssize, cat, mb[i].block);
++(is->files[cat].no_skip_writes);
continue;
src = r_buf + mb[i].offset - ISAMC_BLOCK_OFFSET_1;
ssize += ISAMC_BLOCK_OFFSET_1;
- memcpy (src+sizeof(zint)+sizeof(ssize), numkeys, sizeof(*numkeys));
+ memcpy (src+sizeof(int)+sizeof(ssize), numkeys,
+ sizeof(*numkeys));
if (is->method->debug > 2)
- logf (LOG_LOG, "isc: flush ptr=%d numk=" ZINT_FORMAT " size=%d nextpos="
- ZINT_FORMAT, i, *numkeys, (int) ssize, mb[i+1].block);
+ logf (LOG_LOG, "isc: flush ptr=%d numk=%d size=%d nextpos=%d",
+ i, *numkeys, (int) ssize, mb[i+1].block);
}
else
{
src = r_buf + mb[i].offset - ISAMC_BLOCK_OFFSET_N;
ssize += ISAMC_BLOCK_OFFSET_N;
if (is->method->debug > 2)
- logf (LOG_LOG, "isc: flush ptr=%d size=%d nextpos=" ZINT_FORMAT,
+ logf (LOG_LOG, "isc: flush ptr=%d size=%d nextpos=%d",
i, (int) ssize, mb[i+1].block);
}
- memcpy (src, &mb[i+1].block, sizeof(zint));
- memcpy (src+sizeof(zint), &ssize, sizeof(ssize));
+ memcpy (src, &mb[i+1].block, sizeof(int));
+ memcpy (src+sizeof(int), &ssize, sizeof(ssize));
isc_write_block (is, cat, mb[i].block, src);
}
}
struct isc_merge_block mb[200];
- zint firstpos = 0;
+ int firstpos = 0;
int cat = 0;
char r_item_buf[128]; /* temporary result output */
char *r_buf; /* block with resulting data */
int ptr = 0; /* pointer */
void *r_clientData; /* encode client data */
int border;
- zint numKeys = 0;
+ int numKeys = 0;
- r_clientData = (*is->method->codec.start)();
+ r_clientData = (*is->method->code_start)(ISAMC_ENCODE);
r_buf = is->merge_buf + 128;
pp = isc_pp_open (is, ipos);
cat = pp->cat;
if (debug > 1)
- logf (LOG_LOG, "isc: isc_merge begin %d " ZINT_FORMAT, cat, pp->pos);
+ logf (LOG_LOG, "isc: isc_merge begin %d %d", cat, pp->pos);
/* read first item from i */
i_item_ptr = i_item;
if (r_item) /* insert resulting item? */
{
char *r_out_ptr = r_buf + r_offset;
- const char *src = r_item;
int new_offset;
- (*is->method->codec.encode)(r_clientData, &r_out_ptr, &src);
+ (*is->method->code_item)(ISAMC_ENCODE, r_clientData,
+ &r_out_ptr, &r_item);
new_offset = r_out_ptr - r_buf;
numKeys++;
if (numKeys != isc_pp_num (pp))
{
if (debug > 2)
- logf (LOG_LOG, "isc: patch num keys firstpos=" ZINT_FORMAT " num=" ZINT_FORMAT,
+ logf (LOG_LOG, "isc: patch num keys firstpos=%d num=%d",
firstpos, numKeys);
bf_write (is->files[cat].bf, firstpos, ISAMC_BLOCK_OFFSET_N,
sizeof(numKeys), &numKeys);
/* flush rest of block(s) in r_buf */
flush_blocks (is, mb, ptr, r_buf, &firstpos, cat, 1, &numKeys);
- (*is->method->codec.stop)(r_clientData);
+ (*is->method->code_stop)(ISAMC_ENCODE, r_clientData);
if (!firstpos)
cat = 0;
if (debug > 1)
- logf (LOG_LOG, "isc: isc_merge return %d " ZINT_FORMAT, cat, firstpos);
+ logf (LOG_LOG, "isc: isc_merge return %d %d", cat, firstpos);
isc_pp_close (pp);
return cat + firstpos * 8;
}
+/*
+ * $Log: merge.c,v $
+ * Revision 1.23.2.1 2006-08-14 10:39:12 adam
+ * Update copyright year + FSF address
+ *
+ * Revision 1.23 2003/06/23 15:36:11 adam
+ * Implemented isamb_unlink.
+ *
+ * Revision 1.22 2003/03/05 16:41:10 adam
+ * Fix GCC warnings
+ *
+ * Revision 1.21 2002/08/02 19:26:56 adam
+ * Towards GPL
+ *
+ * Revision 1.20 1999/11/30 13:48:04 adam
+ * Improved installation. Updated for inclusion of YAZ header files.
+ *
+ * Revision 1.19 1999/07/14 12:12:07 heikki
+ * Large-block isam-h (may not work too well... Abandoning for isam-d)
+ *
+ * Revision 1.17 1999/07/13 14:22:17 heikki
+ * Better allocation strategy in isamh_merge
+ *
+ * Revision 1.16 1999/07/08 14:23:27 heikki
+ * Fixed a bug in isamh_pp_read and cleaned up a bit
+ *
+ * Revision 1.15 1999/07/07 09:36:04 heikki
+ * Fixed an assertion in isamh
+ *
+ * Revision 1.13 1999/07/06 09:37:05 heikki
+ * Working on isamh - not ready yet.
+ *
+ * Revision 1.12 1999/06/30 15:03:55 heikki
+ * first take on isamh, the append-only isam structure
+ *
+ * Revision 1.11 1999/05/26 07:49:14 adam
+ * C++ compilation.
+ *
+ * Revision 1.10 1998/03/19 12:22:09 adam
+ * Minor change.
+ *
+ * Revision 1.9 1998/03/19 10:04:38 adam
+ * Minor changes.
+ *
+ * Revision 1.8 1998/03/18 09:23:55 adam
+ * Blocks are stored in chunks on free list - up to factor 2 in speed.
+ * Fixed bug that could occur in block category rearrangemen.
+ *
+ * Revision 1.7 1998/03/11 11:18:18 adam
+ * Changed the isc_merge to take into account the mfill (minimum-fill).
+ *
+ * Revision 1.6 1998/03/06 13:54:03 adam
+ * Fixed two nasty bugs in isc_merge.
+ *
+ * Revision 1.5 1997/02/12 20:42:43 adam
+ * Bug fix: during isc_merge operations, some pages weren't marked dirty
+ * even though they should be. At this point the merge operation marks
+ * a page dirty if the previous page changed at all. A better approach is
+ * to mark it dirty if the last key written changed in previous page.
+ *
+ * Revision 1.4 1996/11/08 11:15:31 adam
+ * Number of keys in chain are stored in first block and the function
+ * to retrieve this information, isc_pp_num is implemented.
+ *
+ * Revision 1.3 1996/11/04 14:08:59 adam
+ * Optimized free block usage.
+ *
+ * Revision 1.2 1996/11/01 13:36:46 adam
+ * New element, max_blocks_mem, that control how many blocks of max size
+ * to store in memory during isc_merge.
+ * Function isc_merge now ignores delete/update of identical keys and
+ * the proper blocks are then non-dirty and not written in flush_blocks.
+ *
+ * Revision 1.1 1996/11/01 08:59:15 adam
+ * First version of isc_merge that supports update/delete.
+ *
+ */
+
+
-/* $Id: isamg.c,v 1.3 2003-04-02 19:01:47 adam Exp $
+/* $Id: isamg.c,v 1.3.2.1 2006-08-14 10:39:13 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
/*
* $Log: isamg.c,v $
- * Revision 1.3 2003-04-02 19:01:47 adam
+ * Revision 1.3.2.1 2006-08-14 10:39:13 adam
+ * Update copyright year + FSF address
+ *
+ * Revision 1.3 2003/04/02 19:01:47 adam
* Remove // comment
*
* Revision 1.2 2002/08/02 19:26:56 adam
-/* $Id: isams.c,v 1.6 2004-08-04 08:35:24 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
+/* $Id: isams.c,v 1.5.2.1 2006-08-14 10:39:15 adam Exp $
+ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
Index Data Aps
This file is part of the Zebra server.
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
void isams_getmethod (ISAMS_M *m)
{
- m->codec.start = NULL;
- m->codec.decode = NULL;
- m->codec.encode = NULL;
- m->codec.stop = NULL;
- m->codec.reset = NULL;
+ m->code_start = NULL;
+ m->code_item = NULL;
+ m->code_stop = NULL;
m->compare_item = NULL;
m->log_item = NULL;
ISAMS_P isams_merge (ISAMS is, ISAMS_I data)
{
- char i_item[128];
+ char i_item[128], *i_item_ptr;
int i_more, i_mode;
void *r_clientData;
int first_block = is->head.last_block;
int first_offset = is->head.last_offset;
int count = 0;
- r_clientData = (*is->method->codec.start)();
+ r_clientData = (*is->method->code_start)(ISAMC_ENCODE);
is->head.last_offset += sizeof(int);
if (is->head.last_offset > is->block_size)
}
while (1)
{
- char *tmp_ptr = i_item;
- i_more = (*data->read_item)(data->clientData, &tmp_ptr, &i_mode);
+ i_item_ptr = i_item;
+ i_more = (*data->read_item)(data->clientData, &i_item_ptr, &i_mode);
assert (i_mode);
if (!i_more)
{
char *r_out_ptr = is->merge_buf + is->head.last_offset;
- const char *i_item_ptr = i_item;
- (*is->method->codec.encode)(r_clientData, &r_out_ptr, &i_item_ptr);
+ i_item_ptr = i_item;
+ (*is->method->code_item)(ISAMC_ENCODE, r_clientData,
+ &r_out_ptr, &i_item_ptr);
is->head.last_offset = r_out_ptr - is->merge_buf;
if (is->head.last_offset > is->block_size)
{
count++;
}
}
- (*is->method->codec.stop)(r_clientData);
+ (*is->method->code_stop)(ISAMC_ENCODE, r_clientData);
if (first_block == is->head.last_block)
memcpy(is->merge_buf + first_offset, &count, sizeof(int));
else if (first_block == is->head.last_block-1)
if (is->debug > 1)
logf (LOG_LOG, "isams: isams_pp_open pos=%ld", (long) pos);
pp->is = is;
- pp->decodeClientData = (*is->method->codec.start)();
+ pp->decodeClientData = (*is->method->code_start)(ISAMC_DECODE);
pp->numKeys = 0;
pp->numRead = 0;
pp->buf = (char *) xmalloc(is->block_size*2);
void isams_pp_close (ISAMS_PP pp)
{
- (*pp->is->method->codec.stop)(pp->decodeClientData);
+ (*pp->is->method->code_stop)(ISAMC_DECODE, pp->decodeClientData);
xfree(pp->buf);
xfree(pp);
}
int isams_pp_read (ISAMS_PP pp, void *buf)
{
- char *cp = buf;
- return isams_read_item (pp, &cp);
+ return isams_read_item (pp, (char **) &buf);
}
int isams_read_item (ISAMS_PP pp, char **dst)
{
- const char *src;
+ char *src;
if (pp->numRead >= pp->numKeys)
return 0;
(pp->numRead)++;
pp->buf + pp->is->block_size);
}
src = pp->buf + pp->block_offset;
- (*pp->is->method->codec.decode)(pp->decodeClientData, dst, &src);
+ (*pp->is->method->code_item)(ISAMC_DECODE, pp->decodeClientData,
+ dst, &src);
pp->block_offset = src - pp->buf;
return 1;
}
-/* $Id: danbibr.c,v 1.4 2004-05-26 13:47:08 adam Exp $
+/* $Id: danbibr.c,v 1.4.2.1 2006-08-14 10:39:16 adam Exp $
Copyright (C) 2004
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
#include <assert.h>
-/* $Id: grsread.h,v 1.14.2.1 2005-01-16 23:13:31 adam Exp $
+/* $Id: grsread.h,v 1.14.2.2 2006-08-14 10:39:16 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: marcread.c,v 1.24.2.3 2005-12-08 11:06:31 adam Exp $
+/* $Id: marcread.c,v 1.24.2.4 2006-08-14 10:39:16 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
#include <stdio.h>
-/* $Id: perlread.c,v 1.8.2.3 2004-09-06 09:23:51 adam Exp $
+/* $Id: perlread.c,v 1.8.2.4 2006-08-14 10:39:16 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
#if HAVE_PERL
-/* $Id: recctrl.c,v 1.6 2002-08-02 19:26:56 adam Exp $
+/* $Id: recctrl.c,v 1.6.2.1 2006-08-14 10:39:16 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: recgrs.c,v 1.86.2.9 2006-02-07 00:22:25 adam Exp $
+/* $Id: recgrs.c,v 1.86.2.10 2006-08-14 10:39:16 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
#include <stdio.h>
-/* $Id: recgrs.h,v 1.5 2002-08-02 19:26:56 adam Exp $
+/* $Id: recgrs.h,v 1.5.2.1 2006-08-14 10:39:16 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: rectext.c,v 1.18 2004-06-16 20:32:41 adam Exp $
+/* $Id: rectext.c,v 1.18.2.1 2006-08-14 10:39:16 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: rectext.h,v 1.5 2002-08-02 19:26:56 adam Exp $
+/* $Id: rectext.h,v 1.5.2.1 2006-08-14 10:39:16 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: regxread.c,v 1.50.2.2 2005-03-11 20:45:25 adam Exp $
+/* $Id: regxread.c,v 1.50.2.3 2006-08-14 10:39:16 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: sgmlread.c,v 1.11.2.1 2005-11-16 04:33:11 adam Exp $
+/* $Id: sgmlread.c,v 1.11.2.2 2006-08-14 10:39:17 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: xmlread.c,v 1.12.2.1 2004-08-11 13:26:29 adam Exp $
+/* $Id: xmlread.c,v 1.12.2.2 2006-08-14 10:39:17 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
#if HAVE_EXPAT_H
-/* $Id: rsbetween.c,v 1.15.2.4 2004-12-17 13:43:09 heikki Exp $
+/* $Id: rsbetween.c,v 1.15.2.5 2006-08-14 10:39:20 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: rsbool.c,v 1.32.2.1 2005-01-23 15:06:21 adam Exp $
+/* $Id: rsbool.c,v 1.32.2.2 2006-08-14 10:39:20 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
#include <stdio.h>
-/* $Id: rset.c,v 1.22 2004-08-04 09:59:03 heikki Exp $
+/* $Id: rset.c,v 1.21.2.1 2006-08-14 10:39:20 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
return rs;
}
-void rset_default_pos (RSFD rfd, zint *current, zint *total)
+void rset_default_pos (RSFD rfd, int *current, int *total)
{ /* FIXME - This function should not be needed, only while */
/* coding the pos functions. */
assert(rfd);
-/* $Id: rsisam.c,v 1.26 2004-08-03 14:54:41 heikki Exp $
+/* $Id: rsisam.c,v 1.26.2.1 2006-08-14 10:39:20 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: rsisamb.c,v 1.10.2.2 2005-01-14 14:32:25 adam Exp $
+/* $Id: rsisamb.c,v 1.10.2.3 2006-08-14 10:39:20 adam Exp $
Copyright (C) 1995-2005
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
#include <stdio.h>
-/* $Id: rsisamc.c,v 1.16 2004-08-03 14:54:41 heikki Exp $
+/* $Id: rsisamc.c,v 1.16.2.1 2006-08-14 10:39:20 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: rsisamd.c,v 1.8 2004-08-03 14:54:41 heikki Exp $
+/* $Id: rsisamd.c,v 1.8.2.1 2006-08-14 10:39:20 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: rsisams.c,v 1.7 2004-08-04 09:59:03 heikki Exp $
+/* $Id: rsisams.c,v 1.6.2.1 2006-08-14 10:39:20 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
#include <stdio.h>
#include <assert.h>
-#include <zebrautl.h>
#include <rsisams.h>
+#include <zebrautl.h>
static void *r_create(RSET ct, const struct rset_control *sel, void *parms);
static RSFD r_open (RSET ct, int flag);
-/* $Id: rsm_or.c,v 1.16 2004-08-03 14:54:41 heikki Exp $
+/* $Id: rsm_or.c,v 1.16.2.1 2006-08-14 10:39:20 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: rsnull.c,v 1.19 2004-08-04 09:59:03 heikki Exp $
+/* $Id: rsnull.c,v 1.18.2.1 2006-08-14 10:39:20 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
#include <stdio.h>
#include <assert.h>
-#include <zebrautl.h>
#include <rsnull.h>
+#include <zebrautl.h>
static void *r_create(RSET ct, const struct rset_control *sel, void *parms);
static RSFD r_open (RSET ct, int flag);
static void r_close (RSFD rfd);
static void r_delete (RSET ct);
static void r_rewind (RSFD rfd);
-static void r_pos (RSFD rfd, zint *current, zint *total);
+static void r_pos (RSFD rfd, int *current, int *total);
static int r_read (RSFD rfd, void *buf, int *term_index);
static int r_write (RSFD rfd, const void *buf);
logf (LOG_DEBUG, "rsnull_rewind");
}
-static void r_pos (RSFD rfd, zint *current, zint *total)
+static void r_pos (RSFD rfd, int *current, int *total)
{
assert(rfd);
assert(current);
-/* $Id: rsprox.c,v 1.5.2.1 2004-10-05 13:31:42 adam Exp $
+/* $Id: rsprox.c,v 1.5.2.2 2006-08-14 10:39:20 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
#include <stdio.h>
-/* $Id: rstemp.c,v 1.38 2004-08-03 14:54:41 heikki Exp $
+/* $Id: rstemp.c,v 1.38.2.1 2006-08-14 10:39:20 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
#include <fcntl.h>
-/* $Id: t1.c,v 1.7 2004-07-28 08:15:47 adam Exp $
+/* $Id: t1.c,v 1.7.2.1 2006-08-14 10:39:23 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
#include <stdlib.h>
-/* $Id: t2.c,v 1.11 2004-07-28 08:15:47 adam Exp $
+/* $Id: t2.c,v 1.11.2.1 2006-08-14 10:39:23 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
#include <stdlib.h>
-/* $Id: t3.c,v 1.8.2.1 2005-05-04 10:40:19 adam Exp $
+/* $Id: t3.c,v 1.8.2.2 2006-08-14 10:39:23 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
#include <stdlib.h>
-/* $Id: t4.c,v 1.8.2.1 2005-05-04 10:40:19 adam Exp $
+/* $Id: t4.c,v 1.8.2.2 2006-08-14 10:39:23 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
#include <stdlib.h>
-/* $Id: t5.c,v 1.4.2.1 2005-05-04 10:40:19 adam Exp $
+/* $Id: t5.c,v 1.4.2.2 2006-08-14 10:39:23 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
#include <stdlib.h>
-/* $Id: t6.c,v 1.1.2.1 2004-08-13 09:55:29 adam Exp $
+/* $Id: t6.c,v 1.1.2.2 2006-08-14 10:39:23 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
#include <stdlib.h>
-/* $Id: charmap.c,v 1.29.2.6 2006-04-04 09:11:30 adam Exp $
+/* $Id: charmap.c,v 1.29.2.7 2006-08-14 10:39:24 adam Exp $
Copyright (C) 1995-2005
Index Data ApS
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: dirent.c,v 1.6 2002-08-02 19:26:57 adam Exp $
+/* $Id: dirent.c,v 1.6.2.1 2006-08-14 10:39:24 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: flock.c,v 1.4.2.2 2006-03-25 11:06:47 adam Exp $
+/* $Id: flock.c,v 1.4.2.3 2006-08-14 10:39:24 adam Exp $
Copyright (C) 1995-2005
Index Data ApS
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: passtest.c,v 1.4.2.1 2005-05-30 13:24:53 adam Exp $
+/* $Id: passtest.c,v 1.4.2.2 2006-08-14 10:39:24 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: passwddb.c,v 1.7.2.2 2005-05-30 13:24:54 adam Exp $
+/* $Id: passwddb.c,v 1.7.2.3 2006-08-14 10:39:24 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: res-test.c,v 1.8 2002-08-02 19:26:57 adam Exp $
+/* $Id: res-test.c,v 1.8.2.1 2006-08-14 10:39:24 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: res.c,v 1.37.2.1 2004-11-26 11:06:13 adam Exp $
+/* $Id: res.c,v 1.37.2.2 2006-08-14 10:39:24 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
#include <stdio.h>
-/* $Id: xpath.c,v 1.3 2003-03-01 22:45:38 adam Exp $
+/* $Id: xpath.c,v 1.3.2.1 2006-08-14 10:39:25 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: zebra-lock.c,v 1.7 2002-08-02 19:26:57 adam Exp $
+/* $Id: zebra-lock.c,v 1.7.2.1 2006-08-14 10:39:25 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
-/* $Id: zebramap.c,v 1.32.2.5 2006-02-23 13:27:16 adam Exp $
+/* $Id: zebramap.c,v 1.32.2.6 2006-08-14 10:39:25 adam Exp $
Copyright (C) 1995-2005
Index Data ApS
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+
*/
#include <assert.h>
projects / idzebra-moved-to-github.git / commitdiff