Added "tagsysno" and "tagrank" directives to zebra.cfg.

diff --git a/include/recctrl.h b/include/recctrl.h
index d35c3ac..1b646bd 100644 (file)
--- a/include/recctrl.h
+++ b/include/recctrl.h
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: recctrl.h,v $
- * Revision 1.27  1998-10-16 08:14:28  adam
+ * Revision 1.28  1999-03-02 16:15:42  quinn
+ * Added "tagsysno" and "tagrank" directives to zebra.cfg.
+ *
+ * Revision 1.27  1998/10/16 08:14:28  adam
  * Updated record control system.
  *
  * Revision 1.26  1998/05/20 10:12:12  adam
@@ -145,6 +148,7 @@ struct recExtractCtrl {
 /* Retrieve record control */
 struct recRetrieveCtrl {
     /* Input parameters ... */
+    Res       res;                   /* Resource pool                     */
     ODR       odr;                    /* ODR used to create response       */
     void     *fh;                     /* File descriptor and read function */
     int       (*readf)(void *fh, char *buf, size_t count);

diff --git a/index/retrieve.c b/index/retrieve.c
index 8e7aeca..dcc17b9 100644 (file)
--- a/index/retrieve.c
+++ b/index/retrieve.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: retrieve.c,v $
- * Revision 1.6  1999-02-18 15:01:25  adam
+ * Revision 1.7  1999-03-02 16:15:43  quinn
+ * Added "tagsysno" and "tagrank" directives to zebra.cfg.
+ *
+ * Revision 1.6  1999/02/18 15:01:25  adam
  * Minor changes.
  *
  * Revision 1.5  1999/02/17 11:29:56  adam
@@ -233,6 +236,7 @@ int zebra_record_fetch (ZebraHandle zh, int sysno, int score, ODR stream,
     retrieveCtrl.comp = comp;
     retrieveCtrl.diagnostic = 0;
     retrieveCtrl.dh = zh->dh;
+    retrieveCtrl.res = zh->res;
     (*rt->retrieve)(&retrieveCtrl);
     *output_format = retrieveCtrl.output_format;
     *rec_bufp = retrieveCtrl.rec_buf;

diff --git a/recctrl/recgrs.c b/recctrl/recgrs.c
index 7f25b55..b4ef25c 100644 (file)
--- a/recctrl/recgrs.c
+++ b/recctrl/recgrs.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: recgrs.c,v $
- * Revision 1.25  1999-02-18 15:01:26  adam
+ * Revision 1.26  1999-03-02 16:15:44  quinn
+ * Added "tagsysno" and "tagrank" directives to zebra.cfg.
+ *
+ * Revision 1.25  1999/02/18 15:01:26  adam
  * Minor changes.
  *
  * Revision 1.24  1999/02/02 14:51:28  adam
@@ -466,6 +469,7 @@ static int grs_retrieve(struct recRetrieveCtrl *p)
     int res, selected = 0;
     NMEM mem;
     struct grs_read_info gri;
+    char *tagname;
     
     mem = nmem_create();
     gri.readf = p->readf;
@@ -495,22 +499,24 @@ static int grs_retrieve(struct recRetrieveCtrl *p)
        dnew->u.data.len = strlen(dnew->u.data.data);
     }
 
-    logf (LOG_DEBUG, "grs_retrieve: score");
-    if (p->score >= 0 && (dnew =
+    tagname = res_get_def(p->res, "tagrank", "rank");
+    if (strcmp(tagname, "0") && p->score >= 0 && (dnew =
                          data1_insert_taggeddata(p->dh, node,
-                                                 node, "rank",
+                                                 node, tagname,
                                                  mem)))
     {
+        logf (LOG_DEBUG, "grs_retrieve: %s", tagname);
        dnew->u.data.what = DATA1I_num;
        dnew->u.data.data = dnew->lbuf;
        sprintf(dnew->u.data.data, "%d", p->score);
        dnew->u.data.len = strlen(dnew->u.data.data);
     }
 
-    logf (LOG_DEBUG, "grs_retrieve: localControlNumber");
-    if (p->localno > 0 && (dnew = data1_insert_taggeddata(p->dh, node, node,
-                                      "localControlNumber", mem)))
+    tagname = res_get_def(p->res, "tagsysno", "localControlNumber");
+    if (strcmp(tagname, "0") && p->localno > 0 &&
+        (dnew = data1_insert_taggeddata(p->dh, node, node, tagname, mem)))
     {
+        logf (LOG_DEBUG, "grs_retrieve: %s", tagname);
        dnew->u.data.what = DATA1I_text;
        dnew->u.data.data = dnew->lbuf;
        sprintf(dnew->u.data.data, "%d", p->localno);

diff --git a/tab/urx.chr b/tab/urx.chr
index a65e9d4..1bd935e 100644 (file)
--- a/tab/urx.chr
+++ b/tab/urx.chr
@@ -1,11 +1,11 @@
 # URX character map
 #
-# $Id: urx.chr,v 1.2 1998-01-26 10:36:49 adam Exp $
+# $Id: urx.chr,v 1.3 1999-03-02 16:15:45 quinn Exp $
 
 # Basic character(s)
 
-lowercase {0-9}{a-y}üzæäøöå/.~:-,#!?=<;\{|}
-uppercase {0-9}{A-Y}ÜZÆÄØÖÅ/.~:-,#!?=>;\{|}
+lowercase {0-9}{a-y}üzæäøöå/.~:-,#!?=<;\{|}+
+uppercase {0-9}{A-Y}ÜZÆÄØÖÅ/.~:-,#!?=>;\{|}+
 
 # Breaking characters