From: Adam Dickmeiss Date: Mon, 14 Aug 2006 10:38:50 +0000 (+0000) Subject: Update copyright year + FSF address X-Git-Tag: ZEBRA.1.3.38~5 X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=commitdiff_plain;h=0cf7b6ddb4409d22dab3e10306826e127fb72f9e;p=idzebra-moved-to-github.git Update copyright year + FSF address --- diff --git a/bfile/bfile.c b/bfile/bfile.c index 681c050..45610b8 100644 --- a/bfile/bfile.c +++ b/bfile/bfile.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ @@ -34,7 +34,6 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #include - #include "cfile.h" struct BFiles_struct { @@ -155,7 +154,7 @@ BFile bf_open (BFiles bfs, const char *name, int block_size, int wflag) 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; @@ -171,7 +170,7 @@ int bf_read (BFile bf, zint no, int offset, int nbytes, void *buf) 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); diff --git a/bfile/cfile.c b/bfile/cfile.c index 550da60..ba149d1 100644 --- a/bfile/cfile.c +++ b/bfile/cfile.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ @@ -328,8 +328,7 @@ static void cf_moveto_flat (CFile cf) 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); @@ -448,7 +447,7 @@ int cf_new (CFile cf, int no) } -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; @@ -462,13 +461,13 @@ int cf_read (CFile cf, zint no, int offset, int nbytes, void *buf) 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; @@ -489,7 +488,7 @@ int cf_write (CFile cf, zint no, int offset, int nbytes, const void *buf) 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; @@ -497,8 +496,7 @@ int cf_write (CFile cf, zint no, int offset, int nbytes, const void *buf) 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); diff --git a/bfile/cfile.h b/bfile/cfile.h index 5b88209..cc8e91d 100644 --- a/bfile/cfile.h +++ b/bfile/cfile.h @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ @@ -53,12 +53,12 @@ typedef struct CFile_struct { 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; @@ -66,8 +66,8 @@ typedef struct CFile_struct 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; @@ -78,8 +78,8 @@ typedef struct CFile_struct 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); diff --git a/bfile/commit.c b/bfile/commit.c index 875a27d..e2f66b1 100644 --- a/bfile/commit.c +++ b/bfile/commit.c @@ -1,5 +1,5 @@ -/* $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. @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ @@ -180,10 +180,9 @@ static void cf_commit_hash (CFile cf) 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; @@ -193,7 +192,7 @@ static void cf_commit_flat (CFile cf) #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++) @@ -201,7 +200,7 @@ static void cf_commit_flat (CFile cf) 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++) @@ -213,8 +212,8 @@ static void cf_commit_flat (CFile cf) #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); diff --git a/bfile/mfile.c b/bfile/mfile.c index a96820a..e2b9b72 100644 --- a/bfile/mfile.c +++ b/bfile/mfile.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ @@ -451,7 +451,7 @@ int mf_close(MFile mf) /* * 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; @@ -486,7 +486,7 @@ int mf_read(MFile mf, zint no, int offset, int nbytes, void *buf) /* * 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; @@ -554,7 +554,7 @@ int mf_write(MFile mf, zint no, int offset, int nbytes, const void *buf) 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++; diff --git a/data1/d1_absyn.c b/data1/d1_absyn.c index 8dc0fe2..f19edbf 100644 --- a/data1/d1_absyn.c +++ b/data1/d1_absyn.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 diff --git a/data1/d1_attset.c b/data1/d1_attset.c index 4f3b032..dfa0ac6 100644 --- a/data1/d1_attset.c +++ b/data1/d1_attset.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 diff --git a/data1/d1_doespec.c b/data1/d1_doespec.c index f6b0571..b948c21 100644 --- a/data1/d1_doespec.c +++ b/data1/d1_doespec.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 diff --git a/data1/d1_espec.c b/data1/d1_espec.c index fca7f2f..4b596bb 100644 --- a/data1/d1_espec.c +++ b/data1/d1_espec.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 diff --git a/data1/d1_expout.c b/data1/d1_expout.c index 26689cd..54b6d0c 100644 --- a/data1/d1_expout.c +++ b/data1/d1_expout.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ /* diff --git a/data1/d1_grs.c b/data1/d1_grs.c index b09be77..735e14c 100644 --- a/data1/d1_grs.c +++ b/data1/d1_grs.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 */ diff --git a/data1/d1_handle.c b/data1/d1_handle.c index f990653..16f0850 100644 --- a/data1/d1_handle.c +++ b/data1/d1_handle.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 diff --git a/data1/d1_if.c b/data1/d1_if.c index 9ac8f3f..01d1d0d 100644 --- a/data1/d1_if.c +++ b/data1/d1_if.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 diff --git a/data1/d1_map.c b/data1/d1_map.c index ff1aedc..ff5c4b5 100644 --- a/data1/d1_map.c +++ b/data1/d1_map.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 diff --git a/data1/d1_marc.c b/data1/d1_marc.c index 2d68b3b..95d879b 100644 --- a/data1/d1_marc.c +++ b/data1/d1_marc.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 */ diff --git a/data1/d1_prtree.c b/data1/d1_prtree.c index 1b65f2a..ee2581a 100644 --- a/data1/d1_prtree.c +++ b/data1/d1_prtree.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 diff --git a/data1/d1_read.c b/data1/d1_read.c index 2aa821a..a0959d7 100644 --- a/data1/d1_read.c +++ b/data1/d1_read.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/data1/d1_soif.c b/data1/d1_soif.c index f380106..7303055 100644 --- a/data1/d1_soif.c +++ b/data1/d1_soif.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/data1/d1_sumout.c b/data1/d1_sumout.c index fc2aca5..e725516 100644 --- a/data1/d1_sumout.c +++ b/data1/d1_sumout.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 diff --git a/data1/d1_sutrs.c b/data1/d1_sutrs.c index 96bbc09..7714a73 100644 --- a/data1/d1_sutrs.c +++ b/data1/d1_sutrs.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 */ diff --git a/data1/d1_tagset.c b/data1/d1_tagset.c index e0a8570..5eb1614 100644 --- a/data1/d1_tagset.c +++ b/data1/d1_tagset.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 diff --git a/data1/d1_varset.c b/data1/d1_varset.c index 642ecc6..a506318 100644 --- a/data1/d1_varset.c +++ b/data1/d1_varset.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 diff --git a/data1/d1_write.c b/data1/d1_write.c index 034d3f0..12d49bd 100644 --- a/data1/d1_write.c +++ b/data1/d1_write.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 */ diff --git a/dfa/agrep.c b/dfa/agrep.c index a741c1e..38fabd2 100644 --- a/dfa/agrep.c +++ b/dfa/agrep.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/dfa/bset.c b/dfa/bset.c index b2aac53..ffef6f6 100644 --- a/dfa/bset.c +++ b/dfa/bset.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/dfa/dfa.c b/dfa/dfa.c index 50f0a1d..0ee30b3 100644 --- a/dfa/dfa.c +++ b/dfa/dfa.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/dfa/dfap.h b/dfa/dfap.h index ecd6392..74b19f3 100644 --- a/dfa/dfap.h +++ b/dfa/dfap.h @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/dfa/grepper.c b/dfa/grepper.c index d8830a1..b4a1134 100644 --- a/dfa/grepper.c +++ b/dfa/grepper.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/dfa/imalloc.c b/dfa/imalloc.c index f21b197..61c9af0 100644 --- a/dfa/imalloc.c +++ b/dfa/imalloc.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/dfa/imalloc.h b/dfa/imalloc.h index af0b314..e364eb5 100644 --- a/dfa/imalloc.h +++ b/dfa/imalloc.h @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/dfa/lexer.c b/dfa/lexer.c index b1005a6..fa02b43 100644 --- a/dfa/lexer.c +++ b/dfa/lexer.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/dfa/lexer.h b/dfa/lexer.h index 4775fe9..5467cb6 100644 --- a/dfa/lexer.h +++ b/dfa/lexer.h @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/dfa/readfile.c b/dfa/readfile.c index 7131318..c97fa13 100644 --- a/dfa/readfile.c +++ b/dfa/readfile.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/dfa/set.c b/dfa/set.c index 5a2aa99..c6d3fd5 100644 --- a/dfa/set.c +++ b/dfa/set.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/dfa/states.c b/dfa/states.c index 6492659..5fbe117 100644 --- a/dfa/states.c +++ b/dfa/states.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/dict/close.c b/dict/close.c index 0044e9a..121b648 100644 --- a/dict/close.c +++ b/dict/close.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/dict/dclose.c b/dict/dclose.c index 92142d8..0d7b27a 100644 --- a/dict/dclose.c +++ b/dict/dclose.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/dict/dcompact.c b/dict/dcompact.c index e2f8a8c..d772501 100644 --- a/dict/dcompact.c +++ b/dict/dcompact.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/dict/delete.c b/dict/delete.c index 3e36689..aabb939 100644 --- a/dict/delete.c +++ b/dict/delete.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 diff --git a/dict/dictext.c b/dict/dictext.c index 06f13e3..2c63d2c 100644 --- a/dict/dictext.c +++ b/dict/dictext.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/dict/dicttest.c b/dict/dicttest.c index 85cce13..6e869c5 100644 --- a/dict/dicttest.c +++ b/dict/dicttest.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/dict/dopen.c b/dict/dopen.c index 12e1e9c..027a2a9 100644 --- a/dict/dopen.c +++ b/dict/dopen.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/dict/drdwr.c b/dict/drdwr.c index dc6499b..ff58c69 100644 --- a/dict/drdwr.c +++ b/dict/drdwr.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/dict/insert.c b/dict/insert.c index 955a2cd..09d8cc4 100644 --- a/dict/insert.c +++ b/dict/insert.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/dict/lookgrep.c b/dict/lookgrep.c index 4d1c3d0..522364c 100644 --- a/dict/lookgrep.c +++ b/dict/lookgrep.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/dict/lookup.c b/dict/lookup.c index 465479d..f312d40 100644 --- a/dict/lookup.c +++ b/dict/lookup.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/dict/lookupec.c b/dict/lookupec.c index 3fca01d..46a0d43 100644 --- a/dict/lookupec.c +++ b/dict/lookupec.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/dict/open.c b/dict/open.c index 4feca53..40bde58 100644 --- a/dict/open.c +++ b/dict/open.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/dict/scan.c b/dict/scan.c index 9a2ea46..c9c8261 100644 --- a/dict/scan.c +++ b/dict/scan.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/include/bfile.h b/include/bfile.h index d82d7a8..215cafe 100644 --- a/include/bfile.h +++ b/include/bfile.h @@ -1,5 +1,5 @@ -/* $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. @@ -15,17 +15,21 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 -YAZ_BEGIN_CDECL +#ifdef __cplusplus +extern "C" { +#endif #define bf_blocksize(bf) mf_blocksize(bf->mf) @@ -57,14 +61,14 @@ BFile bf_open (BFiles bfs, const char *name, int block_size, int wflag); 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); @@ -81,6 +85,8 @@ void bf_commitClean (BFiles bfs, const char *spec); /* bf_reset: delete register and shadow completely */ void bf_reset (BFiles bfs); -YAZ_END_CDECL +#ifdef __cplusplus +} +#endif #endif diff --git a/include/bset.h b/include/bset.h index a4b2f07..ed99613 100644 --- a/include/bset.h +++ b/include/bset.h @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/include/charmap.h b/include/charmap.h index f3e150a..fb189a1 100644 --- a/include/charmap.h +++ b/include/charmap.h @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/include/d1_attset.h b/include/d1_attset.h index 39dbbf6..1a465db 100644 --- a/include/d1_attset.h +++ b/include/d1_attset.h @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 diff --git a/include/d1_map.h b/include/d1_map.h index a8b6944..60ba726 100644 --- a/include/d1_map.h +++ b/include/d1_map.h @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 diff --git a/include/data1.h b/include/data1.h index af72db7..d1dac78 100644 --- a/include/data1.h +++ b/include/data1.h @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 diff --git a/include/dfa.h b/include/dfa.h index 5416c13..666a4d9 100644 --- a/include/dfa.h +++ b/include/dfa.h @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/include/dict.h b/include/dict.h index 73ae9de..26aa67a 100644 --- a/include/dict.h +++ b/include/dict.h @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/include/direntz.h b/include/direntz.h index 6eeaf34..10dc812 100644 --- a/include/direntz.h +++ b/include/direntz.h @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/include/isam.h b/include/isam.h index 0e4488a..7777a1a 100644 --- a/include/isam.h +++ b/include/isam.h @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/include/isamb.h b/include/isamb.h index 358dc84..25c0b86 100644 --- a/include/isamb.h +++ b/include/isamb.h @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 @@ -26,8 +26,6 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #include -YAZ_BEGIN_CDECL - typedef struct ISAMB_s *ISAMB; typedef struct ISAMB_PP_s *ISAMB_PP; typedef ISAMC_P ISAMB_P; @@ -44,7 +42,7 @@ int isamb_pp_read (ISAMB_PP pp, void *buf); 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); @@ -59,6 +57,4 @@ int isamb_block_info (ISAMB isamb, int cat); void isamb_dump (ISAMB b, ISAMB_P pos, void (*pr)(const char *str)); -YAZ_END_CDECL - #endif diff --git a/include/isamc.h b/include/isamc.h index 0dc73ec..ce050b8 100644 --- a/include/isamc.h +++ b/include/isamc.h @@ -1,4 +1,4 @@ -/* $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 @@ -15,21 +15,24 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 #include -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 { @@ -45,7 +48,12 @@ typedef struct ISAMC_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); + void (*code_reset)(void *p); int max_blocks_mem; int debug; @@ -66,14 +74,16 @@ ISAMC_PP isc_pp_open (ISAMC is, ISAMC_P pos); 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 diff --git a/include/isamd.h b/include/isamd.h index d9112ed..7c8e271 100644 --- a/include/isamd.h +++ b/include/isamd.h @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 @@ -46,7 +46,7 @@ typedef struct ISAMD_M_s { #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; diff --git a/include/isamg.h b/include/isamg.h index 7f5cddb..68118d8 100644 --- a/include/isamg.h +++ b/include/isamg.h @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ @@ -114,7 +114,10 @@ YAZ_END_CDECL /* * $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 diff --git a/include/isams.h b/include/isams.h index 7338d93..35c361a 100644 --- a/include/isams.h +++ b/include/isams.h @@ -1,4 +1,4 @@ -/* $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 @@ -15,32 +15,34 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 #include -#include #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; diff --git a/include/mfile.h b/include/mfile.h index fd8cb63..63ce4e6 100644 --- a/include/mfile.h +++ b/include/mfile.h @@ -1,5 +1,5 @@ -/* $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. @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ @@ -27,13 +27,19 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #include -#include #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 @@ -66,9 +72,9 @@ typedef struct mf_dir 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; @@ -127,12 +133,12 @@ int mf_close(MFile mf); /* * 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. diff --git a/include/passwddb.h b/include/passwddb.h index bc7e0b6..c4a0bc3 100644 --- a/include/passwddb.h +++ b/include/passwddb.h @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/include/recctrl.h b/include/recctrl.h index 712549b..8026422 100644 --- a/include/recctrl.h +++ b/include/recctrl.h @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 diff --git a/include/res.h b/include/res.h index 6720797..45b167f 100644 --- a/include/res.h +++ b/include/res.h @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/include/rsbetween.h b/include/rsbetween.h index 540a224..416ea99 100644 --- a/include/rsbetween.h +++ b/include/rsbetween.h @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/include/rsbool.h b/include/rsbool.h index d517060..5ee08cd 100644 --- a/include/rsbool.h +++ b/include/rsbool.h @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 diff --git a/include/rset.h b/include/rset.h index 09dcf6d..817bb7f 100644 --- a/include/rset.h +++ b/include/rset.h @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ @@ -46,7 +46,8 @@ struct rset_control 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); @@ -55,7 +56,7 @@ struct rset_control 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; diff --git a/include/rsisam.h b/include/rsisam.h index 01880d7..dc3139e 100644 --- a/include/rsisam.h +++ b/include/rsisam.h @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/include/rsisamb.h b/include/rsisamb.h index f78a2e6..f8f827c 100644 --- a/include/rsisamb.h +++ b/include/rsisamb.h @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/include/rsisamc.h b/include/rsisamc.h index 04a2621..fe67100 100644 --- a/include/rsisamc.h +++ b/include/rsisamc.h @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/include/rsisamd.h b/include/rsisamd.h index 097d6ed..25a8985 100644 --- a/include/rsisamd.h +++ b/include/rsisamd.h @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/include/rsisams.h b/include/rsisams.h index 6fa58c9..6935012 100644 --- a/include/rsisams.h +++ b/include/rsisams.h @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/include/rsm_or.h b/include/rsm_or.h index 7d96e85..3d64ef3 100644 --- a/include/rsm_or.h +++ b/include/rsm_or.h @@ -1,5 +1,5 @@ -/* $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. @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ @@ -27,7 +27,9 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include -YAZ_BEGIN_CDECL +#ifdef __cplusplus +extern "C" { +#endif extern const struct rset_control *rset_kind_m_or; @@ -37,13 +39,15 @@ typedef struct rset_m_or_parms 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 diff --git a/include/rsnull.h b/include/rsnull.h index 6970455..9f2e36a 100644 --- a/include/rsnull.h +++ b/include/rsnull.h @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/include/rsprox.h b/include/rsprox.h index 49fc043..12349a4 100644 --- a/include/rsprox.h +++ b/include/rsprox.h @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 diff --git a/include/rstemp.h b/include/rstemp.h index edf1c4b..cd7ee66 100644 --- a/include/rstemp.h +++ b/include/rstemp.h @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/include/set.h b/include/set.h index a2ad0c8..0684df0 100644 --- a/include/set.h +++ b/include/set.h @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/include/sortidx.h b/include/sortidx.h index 2ca958c..79c76aa 100644 --- a/include/sortidx.h +++ b/include/sortidx.h @@ -1,5 +1,5 @@ -/* $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. @@ -15,15 +15,16 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 #include #ifdef __cplusplus @@ -37,7 +38,7 @@ typedef struct sortIdx *SortIdx; 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); diff --git a/include/str.h b/include/str.h index 786b8f9..036b824 100644 --- a/include/str.h +++ b/include/str.h @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/include/zebra-flock.h b/include/zebra-flock.h index e01f59b..48e99b5 100644 --- a/include/zebra-flock.h +++ b/include/zebra-flock.h @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 diff --git a/include/zebra-lock.h b/include/zebra-lock.h index dd6133c..6176f1d 100644 --- a/include/zebra-lock.h +++ b/include/zebra-lock.h @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/include/zebraapi.h b/include/zebraapi.h index af6da3a..4ae3541 100644 --- a/include/zebraapi.h +++ b/include/zebraapi.h @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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: diff --git a/include/zebramap.h b/include/zebramap.h index 5c27841..1292bf8 100644 --- a/include/zebramap.h +++ b/include/zebramap.h @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 diff --git a/include/zebrautl.h b/include/zebrautl.h index 2bfa5e0..86ba73a 100644 --- a/include/zebrautl.h +++ b/include/zebrautl.h @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 diff --git a/include/zebraver.h b/include/zebraver.h index 2f4d047..8bcb992 100644 --- a/include/zebraver.h +++ b/include/zebraver.h @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 @@ -25,5 +25,5 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #endif #ifndef ZEBRADATE -#define ZEBRADATE "$Date: 2006-08-14 08:37:47 $" +#define ZEBRADATE "$Date: 2006-08-14 10:38:56 $" #endif diff --git a/index/apitest.c b/index/apitest.c index ee5fd8c..cb9fd67 100644 --- a/index/apitest.c +++ b/index/apitest.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 diff --git a/index/attribute.c b/index/attribute.c index 22bba54..1509f7b 100644 --- a/index/attribute.c +++ b/index/attribute.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/index/compact.c b/index/compact.c index edc6eda..ebd908b 100644 --- a/index/compact.c +++ b/index/compact.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/index/dir.c b/index/dir.c index 868740e..745f727 100644 --- a/index/dir.c +++ b/index/dir.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/index/dirs.c b/index/dirs.c index e301b98..11a3e85 100644 --- a/index/dirs.c +++ b/index/dirs.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/index/extract.c b/index/extract.c index 995fcb6..5af7668 100644 --- a/index/extract.c +++ b/index/extract.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/index/index.h b/index/index.h index 6a9a274..7c6c347 100644 --- a/index/index.h +++ b/index/index.h @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/index/invstat.c b/index/invstat.c index 7443538..c294717 100644 --- a/index/invstat.c +++ b/index/invstat.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ @@ -26,6 +26,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #include "index.h" +#include "../isamc/isamd-p.h" struct inv_stat_info { ZebraHandle zh; @@ -83,8 +84,11 @@ static int inv_stat_handle (char *name, const char *info, int pos, 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) { @@ -96,11 +100,9 @@ static int inv_stat_handle (char *name, const char *info, int pos, 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; @@ -108,7 +110,6 @@ static int inv_stat_handle (char *name, const char *info, int pos, } lastsys=key.sysno; lastseq=key.seqno; -#endif } assert (occurx == occur); stat_info->no_isam_entries[0] += occur; @@ -133,11 +134,9 @@ static int inv_stat_handle (char *name, const char *info, int pos, 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; @@ -145,12 +144,56 @@ static int inv_stat_handle (char *name, const char *info, int pos, } 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; @@ -164,11 +207,9 @@ static int inv_stat_handle (char *name, const char *info, int pos, 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; @@ -176,7 +217,6 @@ static int inv_stat_handle (char *name, const char *info, int pos, } lastsys=key.sysno; lastseq=key.seqno; -#endif } isamb_pp_close_x (pp, &size, &blocks); stat_info->isamb_blocks[cat] += blocks; @@ -198,6 +238,9 @@ static int inv_stat_handle (char *name, const char *info, int pos, int zebra_register_statistics (ZebraHandle zh, int dumpdict) { + int blocks; + int size; + int count; int i, prev; int before = 0; int occur; @@ -260,7 +303,7 @@ int zebra_register_statistics (ZebraHandle zh, int dumpdict) 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]) @@ -274,6 +317,39 @@ int zebra_register_statistics (ZebraHandle zh, int dumpdict) 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) { diff --git a/index/kcompare.c b/index/kcompare.c index d279b37..86187a3 100644 --- a/index/kcompare.c +++ b/index/kcompare.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 diff --git a/index/kdump.c b/index/kdump.c index 6d78d70..ad4e208 100644 --- a/index/kdump.c +++ b/index/kdump.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,11 +15,12 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 #include #include @@ -35,12 +36,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA char *prog; -#if IT_KEY_NEW -int main(int argc, char **argv) -{ - exit(0); -} -#else + int key_file_decode (FILE *f) { int c, d; @@ -101,7 +97,6 @@ static int read_one (FILE *inf, char *name, char *key, struct it_key *prevk) return 1; } - int main (int argc, char **argv) { int ret; @@ -189,6 +184,6 @@ int main (int argc, char **argv) logf (LOG_FATAL|LOG_ERRNO, "fclose %s", key_fname); exit (1); } + exit (0); } -#endif diff --git a/index/kinput.c b/index/kinput.c index cc53181..799b675 100644 --- a/index/kinput.c +++ b/index/kinput.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/index/locksrv.c b/index/locksrv.c index ac79e27..8b9918c 100644 --- a/index/locksrv.c +++ b/index/locksrv.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/index/main.c b/index/main.c index a8a1ce7..de96989 100644 --- a/index/main.c +++ b/index/main.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/index/rank1.c b/index/rank1.c index b4de2dd..078bfc0 100644 --- a/index/rank1.c +++ b/index/rank1.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ @@ -168,7 +168,7 @@ static void add (void *set_handle, int seqno, int term_index) * 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; @@ -192,7 +192,7 @@ static int calc (void *set_handle, zint sysno) 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; diff --git a/index/recindex.c b/index/recindex.c index 42bce97..2610d5c 100644 --- a/index/recindex.c +++ b/index/recindex.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/index/recindex.h b/index/recindex.h index 15201a2..0314a43 100644 --- a/index/recindex.h +++ b/index/recindex.h @@ -1,5 +1,5 @@ -/* $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. @@ -15,11 +15,13 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 @@ -31,7 +33,7 @@ YAZ_BEGIN_CDECL #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]; @@ -47,7 +49,7 @@ void rec_del (Records p, Record *recpp); 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); diff --git a/index/recindxp.h b/index/recindxp.h index 1e4da12..381c50a 100644 --- a/index/recindxp.h +++ b/index/recindxp.h @@ -1,5 +1,5 @@ -/* $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. @@ -15,11 +15,13 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 @@ -28,7 +30,7 @@ YAZ_BEGIN_CDECL #define REC_BLOCK_TYPES 2 #define REC_HEAD_MAGIC "recindex" -#define REC_VERSION 5 +#define REC_VERSION 4 struct records_info { int rw; @@ -53,16 +55,16 @@ struct records_info { 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; }; @@ -76,8 +78,8 @@ struct record_cache_entry { }; 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 diff --git a/index/recstat.c b/index/recstat.c index b14f5a2..1bb11a0 100644 --- a/index/recstat.c +++ b/index/recstat.c @@ -1,5 +1,5 @@ -/* $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. @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ @@ -33,28 +33,26 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 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); } diff --git a/index/retrieve.c b/index/retrieve.c index 2ed1a57..fa72031 100644 --- a/index/retrieve.c +++ b/index/retrieve.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 diff --git a/index/sortidx.c b/index/sortidx.c index e5f2435..f7ac135 100644 --- a/index/sortidx.c +++ b/index/sortidx.c @@ -1,5 +1,5 @@ -/* $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. @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ @@ -31,7 +31,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #define SORT_IDX_BLOCKSIZE 64 struct sortFileHead { - SYSNO sysno_max; + int sysno_max; }; struct sortFile { @@ -44,7 +44,7 @@ struct sortFile { struct sortIdx { BFiles bfs; int write_flag; - SYSNO sysno; + int sysno; char *entry_buf; struct sortFile *current_file; struct sortFile *files; @@ -114,7 +114,7 @@ int sortIdx_type (SortIdx si, int type) return 0; } -void sortIdx_sysno (SortIdx si, SYSNO sysno) +void sortIdx_sysno (SortIdx si, int sysno) { si->sysno = sysno; } diff --git a/index/symtab.c b/index/symtab.c index cd18868..5a10592 100644 --- a/index/symtab.c +++ b/index/symtab.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/index/trav.c b/index/trav.c index e7997b7..35f8278 100644 --- a/index/trav.c +++ b/index/trav.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 diff --git a/index/trunc.c b/index/trunc.c index 7eaeb67..df9df2a 100644 --- a/index/trunc.c +++ b/index/trunc.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/index/zebraapi.c b/index/zebraapi.c index 4853b50..4560842 100644 --- a/index/zebraapi.c +++ b/index/zebraapi.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 diff --git a/index/zebrash.c b/index/zebrash.c index 3ad9819..b573f5d 100644 --- a/index/zebrash.c +++ b/index/zebrash.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ /* @@ -347,7 +347,7 @@ static int cmd_end_trans( char *args[], WRBUF outbuff) static int cmd_record_insert( char *args[], WRBUF outbuff) { - SYSNO sysno=0; + int sysno=0; int rc; char *rec=restargs(args,1); diff --git a/index/zinfo.c b/index/zinfo.c index 9d3c4ef..8e992fe 100644 --- a/index/zinfo.c +++ b/index/zinfo.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 diff --git a/index/zinfo.h b/index/zinfo.h index 25b9c4f..8a43a52 100644 --- a/index/zinfo.h +++ b/index/zinfo.h @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/index/zrpn.c b/index/zrpn.c index 124c9d0..c57d115 100644 --- a/index/zrpn.c +++ b/index/zrpn.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/index/zserver.c b/index/zserver.c index c07f344..754c53c 100644 --- a/index/zserver.c +++ b/index/zserver.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 diff --git a/index/zserver.h b/index/zserver.h index 6fc2eea..56e3451 100644 --- a/index/zserver.h +++ b/index/zserver.h @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/index/zsets.c b/index/zsets.c index a045216..e157f4b 100644 --- a/index/zsets.c +++ b/index/zsets.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/isam/isam.c b/isam/isam.c index 6b55f50..74b7ef2 100644 --- a/isam/isam.c +++ b/isam/isam.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/isam/issh.c b/isam/issh.c index 7d77fce..59ef271 100644 --- a/isam/issh.c +++ b/isam/issh.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/isam/isutil.c b/isam/isutil.c index 215bee8..b5e8547 100644 --- a/isam/isutil.c +++ b/isam/isutil.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/isam/isutil.h b/isam/isutil.h index e2772cc..72b0301 100644 --- a/isam/isutil.h +++ b/isam/isutil.h @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/isam/keyops.h b/isam/keyops.h index 7a384cb..78007cc 100644 --- a/isam/keyops.h +++ b/isam/keyops.h @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/isam/memory.c b/isam/memory.c index 800d74e..1720198 100644 --- a/isam/memory.c +++ b/isam/memory.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/isam/memory.h b/isam/memory.h index 77bc660..b74a208 100644 --- a/isam/memory.h +++ b/isam/memory.h @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/isam/physical.c b/isam/physical.c index 4075c02..5e41db2 100644 --- a/isam/physical.c +++ b/isam/physical.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/isam/physical.h b/isam/physical.h index 02f2f49..c6f7e99 100644 --- a/isam/physical.h +++ b/isam/physical.h @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/isam/rootblk.c b/isam/rootblk.c index 592fecc..a5356ea 100644 --- a/isam/rootblk.c +++ b/isam/rootblk.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/isam/rootblk.h b/isam/rootblk.h index c1440d3..d79f1f8 100644 --- a/isam/rootblk.h +++ b/isam/rootblk.h @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/isamb/isamb.c b/isamb/isamb.c index 9dbd406..016177c 100644 --- a/isamb/isamb.c +++ b/isamb/isamb.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 diff --git a/isamb/tstisamb.c b/isamb/tstisamb.c index c56a98f..2b4ad2a 100644 --- a/isamb/tstisamb.c +++ b/isamb/tstisamb.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 diff --git a/isamc/isamc-p.h b/isamc/isamc-p.h index 02d212a..799f65d 100644 --- a/isamc/isamc-p.h +++ b/isamc/isamc-p.h @@ -1,5 +1,5 @@ -/* $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. @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ @@ -25,11 +25,13 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #include -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; @@ -74,33 +76,22 @@ struct ISAMC_PP_s { 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 diff --git a/isamc/isamc.c b/isamc/isamc.c index 0a0d53c..e63e03e 100644 --- a/isamc/isamc.c +++ b/isamc/isamc.c @@ -1,5 +1,5 @@ -/* $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. @@ -15,11 +15,13 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 @@ -36,7 +38,7 @@ static void flush_block (ISAMC is, int cat); 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 @@ -48,7 +50,7 @@ void isc_getmethod (ISAMC_M *m) { 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 }, @@ -58,11 +60,10 @@ void isc_getmethod (ISAMC_M *m) }; 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; @@ -132,7 +133,7 @@ ISAMC isc_open (BFiles bfs, const char *name, int writeflag, ISAMC_M *method) } 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; @@ -153,7 +154,7 @@ ISAMC isc_open (BFiles bfs, const char *name, int writeflag, ISAMC_M *method) 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; @@ -216,30 +217,30 @@ int isc_close (ISAMC is) 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); } @@ -247,19 +248,19 @@ int isc_write_dblock (ISAMC is, int cat, zint pos, char *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)++; @@ -284,7 +285,7 @@ static zint alloc_block (ISAMC is, int cat) 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) @@ -297,16 +298,16 @@ static zint alloc_block (ISAMC is, int cat) } } 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)++; @@ -327,15 +328,15 @@ static void release_block (ISAMC is, int cat, zint pos) } 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++; } @@ -346,43 +347,42 @@ static void flush_block (ISAMC is, int cat) 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)) { @@ -394,14 +394,14 @@ zint isc_alloc_block (ISAMC is, int cat) 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; @@ -442,7 +442,7 @@ void isc_pp_close (ISAMC_PP pp) { ISAMC is = pp->is; - (*is->method->codec.stop)(pp->decodeClientData); + (*is->method->code_stop)(ISAMC_DECODE, pp->decodeClientData); xfree (pp->buf); xfree (pp); } @@ -461,7 +461,7 @@ ISAMC_PP isc_pp_open (ISAMC is, ISAMC_P ipos) 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; @@ -475,17 +475,12 @@ ISAMC_PP isc_pp_open (ISAMC is, ISAMC_P ipos) 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; } @@ -493,8 +488,7 @@ ISAMC_PP isc_pp_open (ISAMC is, ISAMC_P ipos) /* 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. @@ -505,7 +499,7 @@ int isc_pp_read (ISAMC_PP pp, void *buf) 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) { @@ -538,36 +532,29 @@ int isc_read_item (ISAMC_PP pp, char **dst) 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; } diff --git a/isamc/isamd-p.h b/isamc/isamd-p.h index fa0b748..9b3b9eb 100644 --- a/isamc/isamd-p.h +++ b/isamc/isamd-p.h @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ @@ -141,7 +141,10 @@ int singleton_encode(struct it_key *k); /* * $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 diff --git a/isamc/isamd.c b/isamc/isamd.c index f6d17dc..ac05647 100644 --- a/isamc/isamd.c +++ b/isamc/isamd.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 diff --git a/isamc/merge-d.c b/isamc/merge-d.c index 2912ecf..d029626 100644 --- a/isamc/merge-d.c +++ b/isamc/merge-d.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ @@ -1100,7 +1100,10 @@ int isamd_append (ISAMD is, char *dictentry, int dictlen, ISAMD_I data) /* * $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 diff --git a/isamc/merge.c b/isamc/merge.c index 5b5669f..f8da385 100644 --- a/isamc/merge.c +++ b/isamc/merge.c @@ -1,5 +1,5 @@ -/* $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. @@ -15,11 +15,13 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 #include #include @@ -29,7 +31,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 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 */ }; @@ -64,8 +66,8 @@ static void opt_blocks (ISAMC is, struct isc_merge_block *mb, int ptr, #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; @@ -103,7 +105,7 @@ static void flush_blocks (ISAMC is, struct isc_merge_block *mb, int ptr, 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; @@ -116,21 +118,22 @@ static void flush_blocks (ISAMC is, struct isc_merge_block *mb, int ptr, 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); } } @@ -165,7 +168,7 @@ ISAMC_P isc_merge (ISAMC is, ISAMC_P ipos, ISAMC_I *data) 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 */ @@ -173,9 +176,9 @@ ISAMC_P isc_merge (ISAMC is, ISAMC_P ipos, ISAMC_I *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); @@ -187,7 +190,7 @@ ISAMC_P isc_merge (ISAMC is, ISAMC_P ipos, ISAMC_I *data) 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; @@ -334,10 +337,10 @@ ISAMC_P isc_merge (ISAMC is, ISAMC_P ipos, ISAMC_I *data) 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++; @@ -453,7 +456,7 @@ ISAMC_P isc_merge (ISAMC is, ISAMC_P ipos, ISAMC_I *data) 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); @@ -468,12 +471,91 @@ ISAMC_P isc_merge (ISAMC is, ISAMC_P ipos, ISAMC_I *data) /* 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. + * + */ + + diff --git a/isamg/isamg.c b/isamg/isamg.c index 987930f..a868d0c 100644 --- a/isamg/isamg.c +++ b/isamg/isamg.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ @@ -148,7 +148,10 @@ int isamg_close (ISAMG is){ /* * $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 diff --git a/isams/isams.c b/isams/isams.c index 44c4a33..ce30444 100644 --- a/isams/isams.c +++ b/isams/isams.c @@ -1,5 +1,5 @@ -/* $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. @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ @@ -59,11 +59,9 @@ struct ISAMS_PP_s { 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; @@ -113,14 +111,14 @@ int isams_close (ISAMS is) 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) @@ -135,8 +133,8 @@ ISAMS_P isams_merge (ISAMS is, ISAMS_I data) } 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) @@ -145,8 +143,9 @@ ISAMS_P isams_merge (ISAMS is, ISAMS_I data) { 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) { @@ -159,7 +158,7 @@ ISAMS_P isams_merge (ISAMS is, ISAMS_I data) 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) @@ -190,7 +189,7 @@ ISAMS_PP isams_pp_open (ISAMS is, ISAMS_P pos) 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); @@ -213,7 +212,7 @@ ISAMS_PP isams_pp_open (ISAMS is, ISAMS_P pos) 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); } @@ -225,13 +224,12 @@ int isams_pp_num (ISAMS_PP 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)++; @@ -244,7 +242,8 @@ int isams_read_item (ISAMS_PP pp, char **dst) 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; } diff --git a/recctrl/danbibr.c b/recctrl/danbibr.c index 6459d98..17e8909 100644 --- a/recctrl/danbibr.c +++ b/recctrl/danbibr.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 diff --git a/recctrl/grsread.h b/recctrl/grsread.h index bc55db0..04e8d87 100644 --- a/recctrl/grsread.h +++ b/recctrl/grsread.h @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/recctrl/marcread.c b/recctrl/marcread.c index 41f0132..42096f0 100644 --- a/recctrl/marcread.c +++ b/recctrl/marcread.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 diff --git a/recctrl/perlread.c b/recctrl/perlread.c index ca8dc15..c6ba072 100644 --- a/recctrl/perlread.c +++ b/recctrl/perlread.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 diff --git a/recctrl/recctrl.c b/recctrl/recctrl.c index 4c3a605..fa93e65 100644 --- a/recctrl/recctrl.c +++ b/recctrl/recctrl.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/recctrl/recgrs.c b/recctrl/recgrs.c index cb842a2..030432c 100644 --- a/recctrl/recgrs.c +++ b/recctrl/recgrs.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 diff --git a/recctrl/recgrs.h b/recctrl/recgrs.h index 4fda9f1..a8fdacf 100644 --- a/recctrl/recgrs.h +++ b/recctrl/recgrs.h @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/recctrl/rectext.c b/recctrl/rectext.c index de72fdb..902eb4f 100644 --- a/recctrl/rectext.c +++ b/recctrl/rectext.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/recctrl/rectext.h b/recctrl/rectext.h index 59cbffd..0aa032a 100644 --- a/recctrl/rectext.h +++ b/recctrl/rectext.h @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/recctrl/regxread.c b/recctrl/regxread.c index 79d8314..df7694c 100644 --- a/recctrl/regxread.c +++ b/recctrl/regxread.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/recctrl/sgmlread.c b/recctrl/sgmlread.c index 915ff61..84f2e84 100644 --- a/recctrl/sgmlread.c +++ b/recctrl/sgmlread.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/recctrl/xmlread.c b/recctrl/xmlread.c index bc639b1..4769927 100644 --- a/recctrl/xmlread.c +++ b/recctrl/xmlread.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 diff --git a/rset/rsbetween.c b/rset/rsbetween.c index 0d6301d..779e93e 100644 --- a/rset/rsbetween.c +++ b/rset/rsbetween.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/rset/rsbool.c b/rset/rsbool.c index e3a0731..8d003c3 100644 --- a/rset/rsbool.c +++ b/rset/rsbool.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 diff --git a/rset/rset.c b/rset/rset.c index 4421587..7ec81d1 100644 --- a/rset/rset.c +++ b/rset/rset.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ @@ -65,7 +65,7 @@ RSET rset_dup (RSET rs) 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); diff --git a/rset/rsisam.c b/rset/rsisam.c index d8f7225..692625a 100644 --- a/rset/rsisam.c +++ b/rset/rsisam.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/rset/rsisamb.c b/rset/rsisamb.c index 8639889..f2697d5 100644 --- a/rset/rsisamb.c +++ b/rset/rsisamb.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 diff --git a/rset/rsisamc.c b/rset/rsisamc.c index d9f85db..8f408f3 100644 --- a/rset/rsisamc.c +++ b/rset/rsisamc.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/rset/rsisamd.c b/rset/rsisamd.c index 8506716..9050680 100644 --- a/rset/rsisamd.c +++ b/rset/rsisamd.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/rset/rsisams.c b/rset/rsisams.c index 7ebdc4b..a26280e 100644 --- a/rset/rsisams.c +++ b/rset/rsisams.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,17 +15,17 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 #include -#include #include +#include static void *r_create(RSET ct, const struct rset_control *sel, void *parms); static RSFD r_open (RSET ct, int flag); diff --git a/rset/rsm_or.c b/rset/rsm_or.c index 0569d83..68885bf 100644 --- a/rset/rsm_or.c +++ b/rset/rsm_or.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/rset/rsnull.c b/rset/rsnull.c index c02ff4f..9bc3c91 100644 --- a/rset/rsnull.c +++ b/rset/rsnull.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,24 +15,24 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 #include -#include #include +#include 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); @@ -93,7 +93,7 @@ static void r_rewind (RSFD rfd) 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); diff --git a/rset/rsprox.c b/rset/rsprox.c index 9876029..dc70fd6 100644 --- a/rset/rsprox.c +++ b/rset/rsprox.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 diff --git a/rset/rstemp.c b/rset/rstemp.c index f3fc8de..4fe7c6b 100644 --- a/rset/rstemp.c +++ b/rset/rstemp.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 diff --git a/test/api/t1.c b/test/api/t1.c index 8c5e48b..0467292 100644 --- a/test/api/t1.c +++ b/test/api/t1.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 diff --git a/test/api/t2.c b/test/api/t2.c index 7a93156..2316204 100644 --- a/test/api/t2.c +++ b/test/api/t2.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 diff --git a/test/api/t3.c b/test/api/t3.c index 3659552..d91161c 100644 --- a/test/api/t3.c +++ b/test/api/t3.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 diff --git a/test/api/t4.c b/test/api/t4.c index 98da891..308fb0e 100644 --- a/test/api/t4.c +++ b/test/api/t4.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 diff --git a/test/api/t5.c b/test/api/t5.c index d1de56c..3cb4a08 100644 --- a/test/api/t5.c +++ b/test/api/t5.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 diff --git a/test/api/t6.c b/test/api/t6.c index c0e8ee9..db92f8e 100644 --- a/test/api/t6.c +++ b/test/api/t6.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 diff --git a/util/charmap.c b/util/charmap.c index da027e5..298c058 100644 --- a/util/charmap.c +++ b/util/charmap.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/util/dirent.c b/util/dirent.c index 36e1f0c..a119c53 100644 --- a/util/dirent.c +++ b/util/dirent.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/util/flock.c b/util/flock.c index 47704e6..8972d97 100644 --- a/util/flock.c +++ b/util/flock.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/util/passtest.c b/util/passtest.c index 6722231..61902c7 100644 --- a/util/passtest.c +++ b/util/passtest.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/util/passwddb.c b/util/passwddb.c index c789476..785ec56 100644 --- a/util/passwddb.c +++ b/util/passwddb.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/util/res-test.c b/util/res-test.c index e345a73..5afcaa1 100644 --- a/util/res-test.c +++ b/util/res-test.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/util/res.c b/util/res.c index 512a006..df6d221 100644 --- a/util/res.c +++ b/util/res.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 diff --git a/util/xpath.c b/util/xpath.c index 9007200..d2523b3 100644 --- a/util/xpath.c +++ b/util/xpath.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/util/zebra-lock.c b/util/zebra-lock.c index 14cc1d1..8c188a4 100644 --- a/util/zebra-lock.c +++ b/util/zebra-lock.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ diff --git a/util/zebramap.c b/util/zebramap.c index 0f26405..18a9f67 100644 --- a/util/zebramap.c +++ b/util/zebramap.c @@ -1,4 +1,4 @@ -/* $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 @@ -15,9 +15,10 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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