Work towards phrases and multiple registers

diff --git a/include/recctrl.h b/include/recctrl.h
index 25bc1f6..9b31655 100644 (file)
--- a/include/recctrl.h
+++ b/include/recctrl.h
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: recctrl.h,v $
- * Revision 1.13  1996-05-01 13:44:05  adam
+ * Revision 1.14  1996-05-09 07:28:49  quinn
+ * Work towards phrases and multiple registers
+ *
+ * Revision 1.13  1996/05/01  13:44:05  adam
  * Added seek function to the recExtractCtrl and recRetrieveCtrl control
  * structures. Added end-of-file indicator function and start offset to
  * recExtractCtrl.
@@ -62,6 +65,7 @@ typedef struct {
     int  attrUse;
     enum {
        Word_String,
+       Word_Phrase,
         Word_Numeric
     } which;
     union {

diff --git a/index/attribute.c b/index/attribute.c
index e96e572..5b5c886 100644 (file)
--- a/index/attribute.c
+++ b/index/attribute.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: attribute.c,v $
- * Revision 1.2  1995-11-15 19:13:07  adam
+ * Revision 1.3  1996-05-09 07:28:54  quinn
+ * Work towards phrases and multiple registers
+ *
+ * Revision 1.2  1995/11/15  19:13:07  adam
  * Work on record management.
  *
  *
@@ -78,6 +81,6 @@ attent *att_getentbyatt(oid_value set, int att)
     if (!p)
        return 0;
     res.attset_ordinal = r->parent->ordinal;
-    res.local_attribute = r->local;
+    res.local_attributes = r->locals;
     return &res;
 }

diff --git a/index/extract.c b/index/extract.c
index 479e8bd..0662621 100644 (file)
--- a/index/extract.c
+++ b/index/extract.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: extract.c,v $
- * Revision 1.54  1996-05-01 13:46:35  adam
+ * Revision 1.55  1996-05-09 07:28:55  quinn
+ * Work towards phrases and multiple registers
+ *
+ * Revision 1.54  1996/05/01  13:46:35  adam
  * First work on multiple records in one file.
  * New option, -offset, to the "unread" command in the filter module.
  *
@@ -420,7 +423,7 @@ static void addRecordKey (const RecWord *p)
 
     switch (p->which)
     {
-    case Word_String:
+    case Word_String: case Word_Phrase:
         *dst++ = lead;
 
         if (!(lead & 1))
@@ -878,7 +881,7 @@ static int recordExtract (SYSNO *sysno, const char *fname,
         }
         logInfo.op = "add";
         if (rGroup->fileVerboseFlag)
-            logf (LOG_LOG, "add %s %s %ld", rGroup->recordType,
+            logf (LOG_LOG, "add %s %s+%ld", rGroup->recordType,
                   fname, (long) recordOffset);
         rec = rec_new (records);
         *sysno = rec->sysno;

diff --git a/index/zrpn.c b/index/zrpn.c
index 866af77..0da593d 100644 (file)
--- a/index/zrpn.c
+++ b/index/zrpn.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: zrpn.c,v $
- * Revision 1.41  1996-03-20 09:36:43  adam
+ * Revision 1.42  1996-05-09 07:28:56  quinn
+ * Work towards phrases and multiple registers
+ *
+ * Revision 1.41  1996/03/20  09:36:43  adam
  * Function dict_lookup_grep got extra parameter, init_pos, which marks
  * from which position in pattern approximate pattern matching should occur.
  * Approximate pattern matching is used in relevance=re-2.
@@ -169,7 +172,7 @@ int index_word_prefix_map (char *string, oid_value attrSet, int attrUse,
         return -1;
     logf (LOG_DEBUG, "ord=%d", attp->attset_ordinal);
     return index_word_prefix (string, attp->attset_ordinal,
-                              attp->local_attribute, basename);
+                              attp->local_attributes->local, basename);
 }
 
 typedef struct {