X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fextract.c;h=c031719524813fd92aae8cc4b2f5d7c0979f80d8;hb=e19bd45069a282b054015f9cf88e109968b9fa7f;hp=dfde4a2a251c9cfbec5178454e76bc501efd8d1d;hpb=2d6227440bb26674cab2091b3d79c1934995b762;p=idzebra-moved-to-github.git

diff --git a/index/extract.c b/index/extract.c
index dfde4a2..c031719 100644
--- a/index/extract.c
+++ b/index/extract.c
@@ -4,7 +4,20 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: extract.c,v $
- * Revision 1.85  1998-09-22 10:03:41  adam
+ * Revision 1.89  1998-10-28 10:54:38  adam
+ * SDRKit integration.
+ *
+ * Revision 1.88  1998/10/16 08:14:29  adam
+ * Updated record control system.
+ *
+ * Revision 1.87  1998/10/15 13:10:33  adam
+ * Fixed bug in Zebra that caused it to stop indexing when empty
+ * record was read.
+ *
+ * Revision 1.86  1998/10/13 20:33:53  adam
+ * Fixed one log message and change use ordinal to be an unsigned char.
+ *
+ * Revision 1.85  1998/09/22 10:03:41  adam
  * Changed result sets to be persistent in the sense that they can
  * be re-searched if needed.
  * Fixed memory leak in rsm_or.
@@ -327,6 +340,14 @@
 
 #include "zinfo.h"
 
+#ifndef ZEBRASDR
+#define ZEBRASDR 0
+#endif
+
+#if ZEBRASDR
+#include "zebrasdr.h"
+#endif
+
 static Dict matchDict;
 
 static Records records = NULL;
@@ -612,8 +633,8 @@ static struct recKeys {
 static void addIndexString (RecWord *p, const char *string, int length)
 {
     char *dst;
-    char attrSet;
-    short attrUse;
+    unsigned char attrSet;
+    unsigned short attrUse;
     int lead = 0;
     int diff = 0;
     int *pseqno = &p->seqnos[p->reg_type];
@@ -821,8 +842,8 @@ static void flushSortKeys (SYSNO sysno, int cmd)
 
 static void flushRecordKeys (SYSNO sysno, int cmd, struct recKeys *reckeys)
 {
-    char attrSet = -1;
-    short attrUse = -1;
+    unsigned char attrSet = (unsigned char) -1;
+    unsigned short attrUse = (unsigned short) -1;
     int seqno = 0;
     int off = 0;
 
@@ -940,11 +961,13 @@ static const char **searchRecordKey (struct recKeys *reckeys,
 }
 
 struct file_read_info {
-    off_t file_max;
-    off_t file_offset;
-    off_t file_moffset;
+    off_t file_max;	    /* maximum offset so far */
+    off_t file_offset;      /* current offset */
+    off_t file_moffset;     /* offset of rec/rec boundary */
     int file_more;
     int fd;
+    char *sdrbuf;
+    int sdrmax;
 };
 
 static struct file_read_info *file_read_start (int fd)
@@ -954,6 +977,8 @@ static struct file_read_info *file_read_start (int fd)
     fi->fd = fd;
     fi->file_max = 0;
     fi->file_moffset = 0;
+    fi->sdrbuf = 0;
+    fi->sdrmax = 0;
     return fi;
 }
 
@@ -966,6 +991,8 @@ static off_t file_seek (void *handle, off_t offset)
 {
     struct file_read_info *p = handle;
     p->file_offset = offset;
+    if (p->sdrbuf)
+	return offset;
     return lseek (p->fd, offset, SEEK_SET);
 }
 
@@ -980,7 +1007,16 @@ static int file_read (void *handle, char *buf, size_t count)
     struct file_read_info *p = handle;
     int fd = p->fd;
     int r;
-    r = read (fd, buf, count);
+    if (p->sdrbuf)
+    {
+	r = count;
+	if (r > p->sdrmax - p->file_offset)
+	    r = p->sdrmax - p->file_offset;
+	if (r)
+	    memcpy (buf, p->sdrbuf + p->file_offset, r);
+    }
+    else
+	r = read (fd, buf, count);
     if (r > 0)
     {
         p->file_offset += r;
@@ -995,7 +1031,7 @@ static void file_begin (void *handle)
     struct file_read_info *p = handle;
 
     p->file_offset = p->file_moffset;
-    if (p->file_moffset)
+    if (!p->sdrbuf && p->file_moffset)
         lseek (p->fd, p->file_moffset, SEEK_SET);
     p->file_more = 0;
 }
@@ -1254,7 +1290,7 @@ static int recordExtract (SYSNO *sysno, const char *fname,
                 return 1;
             logf (LOG_WARN, "No keys generated for file %s", fname);
             logf (LOG_WARN, " The file is probably empty");
-            return 0;
+            return 1;
         }
     }
 
@@ -1427,8 +1463,8 @@ static int recordExtract (SYSNO *sysno, const char *fname,
         rec->info[recInfo_storeData] = xmalloc (recordAttr->recordSize);
         if (lseek (fi->fd, recordOffset, SEEK_SET) < 0)
         {
-            logf (LOG_ERRNO|LOG_FATAL, "seek to %ld in %s", fname,
-                  (long) recordOffset);
+            logf (LOG_ERRNO|LOG_FATAL, "seek to %ld in %s",
+                  (long) recordOffset, fname);
             exit (1);
         }
         if (read (fi->fd, rec->info[recInfo_storeData], recordAttr->recordSize)
@@ -1508,7 +1544,8 @@ int fileExtract (SYSNO *sysno, const char *fname,
     }
     if (!*rGroup->recordType)
 	return 0;
-    if (!(recType = recType_byName (rGroup->recordType, subType)))
+    if (!(recType =
+	  recType_byName (rGroup->recTypes, rGroup->recordType, subType)))
     {
         logf (LOG_WARN, "No such record type: %s", rGroup->recordType);
         return 0;
@@ -1579,6 +1616,57 @@ int fileExtract (SYSNO *sysno, const char *fname,
     if (rGroup->flagStoreKeys == -1)
         rGroup->flagStoreKeys = 0;
 
+#if ZEBRASDR
+    if (1)
+    {
+	ZebraSdrHandle h;
+	char xname[128], *xp;
+
+	strncpy (xname, fname, 127);
+	if ((xp = strchr (xname, '.')))
+	    *xp = '\0';
+
+        h = zebraSdr_open (xname);
+	if (!h)
+	{
+	    logf (LOG_WARN, "sdr open %s", xname);
+	    return 0;
+	}
+	for (;;)
+	{
+    	    unsigned char *buf;
+	    char sdr_name[128];
+	    int r, segmentno;
+
+	    segmentno = zebraSdr_segment (h, 0);
+	    sprintf (sdr_name, "%%%s.%d", xname, segmentno);
+	    logf (LOG_LOG, "SDR: %s", sdr_name);
+
+#if 1
+	    if (segmentno > 20)
+		break;
+#endif
+	    r = zebraSdr_read (h, &buf);
+
+    	    if (!r)
+		break;
+
+            fi = file_read_start (0);
+	    fi->sdrbuf = buf;
+	    fi->sdrmax = r;
+	    do
+	    {
+		file_begin (fi);
+		r = recordExtract (sysno, sdr_name, rGroup, deleteFlag, fi,
+                           recType, subType);
+	    } while (r && !sysno && fi->file_more);
+	    file_read_stop (fi);
+	    free (buf);
+	}
+	zebraSdr_close (h);
+	return 1;
+    }
+#endif
     if (sysno && deleteFlag)
         fd = -1;
     else