Use Odr_oid for OIDs. Require YAZ 3.0.2 or later.

[idzebra-moved-to-github.git] / index / rpnsearch.c

diff --git a/index/rpnsearch.c b/index/rpnsearch.c
index 98fc69d..5e1b7e2 100644 (file)
--- a/index/rpnsearch.c
+++ b/index/rpnsearch.c
@@ -1,4 +1,4 @@
-/* $Id: rpnsearch.c,v 1.8 2007-01-17 12:59:38 adam Exp $
+/* $Id: rpnsearch.c,v 1.12 2007-05-08 12:50:04 adam Exp $
    Copyright (C) 1995-2007
    Index Data ApS
 
@@ -703,7 +703,7 @@ void string_rel_add_char(char **term_p, const char *src, int *indx)
  */
 static int string_relation(ZebraHandle zh, Z_AttributesPlusTerm *zapt,
                           const char **term_sub, char *term_dict,
-                          oid_value attributeSet,
+                          const Odr_oid *attributeSet,
                           int reg_type, int space_split, char *term_dst,
                           int *error_code)
 {
@@ -897,7 +897,7 @@ static int string_relation(ZebraHandle zh, Z_AttributesPlusTerm *zapt,
 
 static ZEBRA_RES string_term(ZebraHandle zh, Z_AttributesPlusTerm *zapt,
                             const char **term_sub, 
-                            oid_value attributeSet, NMEM stream,
+                            const Odr_oid *attributeSet, NMEM stream,
                             struct grep_info *grep_info,
                             int reg_type, int complete_flag,
                             int num_bases, char **basenames,
@@ -955,7 +955,7 @@ static ZEBRA_RES term_limits_APT(ZebraHandle zh,
 static ZEBRA_RES term_trunc(ZebraHandle zh,
                            Z_AttributesPlusTerm *zapt,
                            const char **term_sub, 
-                           oid_value attributeSet, NMEM stream,
+                           const Odr_oid *attributeSet, NMEM stream,
                            struct grep_info *grep_info,
                            int reg_type, int complete_flag,
                            int num_bases, char **basenames,
@@ -995,7 +995,7 @@ static ZEBRA_RES term_trunc(ZebraHandle zh,
 
 static ZEBRA_RES string_term(ZebraHandle zh, Z_AttributesPlusTerm *zapt,
                             const char **term_sub, 
-                            oid_value attributeSet, NMEM stream,
+                            const Odr_oid *attributeSet, NMEM stream,
                             struct grep_info *grep_info,
                             int reg_type, int complete_flag,
                             int num_bases, char **basenames,
@@ -1288,7 +1288,7 @@ static ZEBRA_RES grep_info_prepare(ZebraHandle zh,
 static ZEBRA_RES term_list_trunc(ZebraHandle zh,
                                 Z_AttributesPlusTerm *zapt,
                                 const char *termz,
-                                oid_value attributeSet,
+                                const Odr_oid *attributeSet,
                                 NMEM stream,
                                 int reg_type, int complete_flag,
                                 const char *rank_type,
@@ -1350,7 +1350,7 @@ static ZEBRA_RES term_list_trunc(ZebraHandle zh,
 
 static ZEBRA_RES rpn_search_APT_position(ZebraHandle zh,
                                          Z_AttributesPlusTerm *zapt,
-                                         oid_value attributeSet,
+                                         const Odr_oid *attributeSet,
                                          int reg_type,
                                          int num_bases, char **basenames,
                                          NMEM rset_nmem,
@@ -1442,7 +1442,7 @@ static ZEBRA_RES rpn_search_APT_position(ZebraHandle zh,
 static ZEBRA_RES rpn_search_APT_phrase(ZebraHandle zh,
                                       Z_AttributesPlusTerm *zapt,
                                       const char *termz_org,
-                                      oid_value attributeSet,
+                                      const Odr_oid *attributeSet,
                                       NMEM stream,
                                       int reg_type, int complete_flag,
                                       const char *rank_type,
@@ -1502,7 +1502,7 @@ static ZEBRA_RES rpn_search_APT_phrase(ZebraHandle zh,
 static ZEBRA_RES rpn_search_APT_or_list(ZebraHandle zh,
                                        Z_AttributesPlusTerm *zapt,
                                        const char *termz_org,
-                                       oid_value attributeSet,
+                                       const Odr_oid *attributeSet,
                                        NMEM stream,
                                        int reg_type, int complete_flag,
                                        const char *rank_type,
@@ -1569,7 +1569,7 @@ static ZEBRA_RES rpn_search_APT_or_list(ZebraHandle zh,
 static ZEBRA_RES rpn_search_APT_and_list(ZebraHandle zh,
                                         Z_AttributesPlusTerm *zapt,
                                         const char *termz_org,
-                                        oid_value attributeSet,
+                                        const Odr_oid *attributeSet,
                                         NMEM stream,
                                         int reg_type, int complete_flag,
                                         const char *rank_type, 
@@ -1638,7 +1638,7 @@ static ZEBRA_RES rpn_search_APT_and_list(ZebraHandle zh,
 static int numeric_relation(ZebraHandle zh, Z_AttributesPlusTerm *zapt,
                            const char **term_sub,
                            char *term_dict,
-                           oid_value attributeSet,
+                           const Odr_oid *attributeSet,
                            struct grep_info *grep_info,
                            int *max_pos,
                            int reg_type,
@@ -1723,7 +1723,7 @@ static int numeric_relation(ZebraHandle zh, Z_AttributesPlusTerm *zapt,
 
 static ZEBRA_RES numeric_term(ZebraHandle zh, Z_AttributesPlusTerm *zapt,
                              const char **term_sub, 
-                             oid_value attributeSet, NMEM stream,
+                             const Odr_oid *attributeSet, NMEM stream,
                              struct grep_info *grep_info,
                              int reg_type, int complete_flag,
                              int num_bases, char **basenames,
@@ -1800,7 +1800,7 @@ static ZEBRA_RES numeric_term(ZebraHandle zh, Z_AttributesPlusTerm *zapt,
 static ZEBRA_RES rpn_search_APT_numeric(ZebraHandle zh,
                                        Z_AttributesPlusTerm *zapt,
                                        const char *termz,
-                                       oid_value attributeSet,
+                                       const Odr_oid *attributeSet,
                                        NMEM stream,
                                        int reg_type, int complete_flag,
                                        const char *rank_type, 
@@ -1880,32 +1880,46 @@ static ZEBRA_RES rpn_search_APT_numeric(ZebraHandle zh,
 static ZEBRA_RES rpn_search_APT_local(ZebraHandle zh,
                                      Z_AttributesPlusTerm *zapt,
                                      const char *termz,
-                                     oid_value attributeSet,
+                                     const Odr_oid *attributeSet,
                                      NMEM stream,
                                      const char *rank_type, NMEM rset_nmem,
                                      RSET *rset,
                                      struct rset_key_control *kc)
 {
-    RSFD rsfd;
-    struct it_key key;
-    int sys;
-    *rset = rset_create_temp(rset_nmem, kc, kc->scope,
-                             res_get (zh->res, "setTmpDir"),0 );
-    rsfd = rset_open(*rset, RSETF_WRITE);
+    Record rec;
+    zint sysno = atozint(termz);
     
-    sys = atoi(termz);
-    if (sys <= 0)
-        sys = 1;
-    key.mem[0] = sys;
-    key.mem[1] = 1;
-    key.len = 2;
-    rset_write (rsfd, &key);
-    rset_close (rsfd);
+    if (sysno <= 0)
+        sysno = 0;
+    rec = rec_get(zh->reg->records, sysno);
+    if (!rec)
+        sysno = 0;
+
+    rec_free(&rec);
+
+    if (sysno <= 0)
+    {
+        *rset = rset_create_null(rset_nmem, kc, 0);
+    }
+    else
+    {
+        RSFD rsfd;
+        struct it_key key;
+        *rset = rset_create_temp(rset_nmem, kc, kc->scope,
+                                 res_get(zh->res, "setTmpDir"), 0);
+        rsfd = rset_open(*rset, RSETF_WRITE);
+        
+        key.mem[0] = sysno;
+        key.mem[1] = 1;
+        key.len = 2;
+        rset_write(rsfd, &key);
+        rset_close(rsfd);
+    }
     return ZEBRA_OK;
 }
 
 static ZEBRA_RES rpn_sort_spec(ZebraHandle zh, Z_AttributesPlusTerm *zapt,
-                              oid_value attributeSet, NMEM stream,
+                              const Odr_oid *attributeSet, NMEM stream,
                               Z_SortKeySpecList *sort_sequence,
                               const char *rank_type,
                               NMEM rset_nmem,
@@ -1917,8 +1931,6 @@ static ZEBRA_RES rpn_sort_spec(ZebraHandle zh, Z_AttributesPlusTerm *zapt,
     AttrType sort_relation_type;
     Z_SortKeySpec *sks;
     Z_SortKey *sk;
-    int oid[OID_SIZE];
-    oident oe;
     char termz[20];
     
     attr_init_APT(&sort_relation_type, zapt, 7);
@@ -1942,12 +1954,6 @@ static ZEBRA_RES rpn_sort_spec(ZebraHandle zh, Z_AttributesPlusTerm *zapt,
         i = 0;
     sprintf(termz, "%d", i);
 
-    oe.proto = PROTO_Z3950;
-    oe.oclass = CLASS_ATTSET;
-    oe.value = attributeSet;
-    if (!oid_ent_to_oid (&oe, oid))
-        return ZEBRA_FAIL;
-
     sks = (Z_SortKeySpec *) nmem_malloc(stream, sizeof(*sks));
     sks->sortElement = (Z_SortElement *)
         nmem_malloc(stream, sizeof(*sks->sortElement));
@@ -1958,7 +1964,7 @@ static ZEBRA_RES rpn_sort_spec(ZebraHandle zh, Z_AttributesPlusTerm *zapt,
     sk->u.sortAttributes = (Z_SortAttributes *)
         nmem_malloc(stream, sizeof(*sk->u.sortAttributes));
 
-    sk->u.sortAttributes->id = oid;
+    sk->u.sortAttributes->id = odr_oiddup_nmem(stream, attributeSet);
     sk->u.sortAttributes->list = zapt->attributes;
 
     sks->sortRelation = (int *)
@@ -1983,11 +1989,11 @@ static ZEBRA_RES rpn_sort_spec(ZebraHandle zh, Z_AttributesPlusTerm *zapt,
 
 
 static int rpn_check_xpath(ZebraHandle zh, Z_AttributesPlusTerm *zapt,
-                           oid_value attributeSet,
+                           const Odr_oid *attributeSet,
                            struct xpath_location_step *xpath, int max,
                            NMEM mem)
 {
-    oid_value curAttributeSet = attributeSet;
+    const Odr_oid *curAttributeSet = attributeSet;
     AttrType use;
     const char *use_string = 0;
     
@@ -2161,26 +2167,25 @@ ZEBRA_RES rpn_search_xpath(ZebraHandle zh,
                         cp++;
                     }
                 }
-                wrbuf_puts(wbuf, "");
                 rset_attr = xpath_trunc(
-                    zh, stream, '0', wrbuf_buf(wbuf), ZEBRA_XPATH_ATTR_NAME, 
+                    zh, stream, '0', wrbuf_cstr(wbuf), ZEBRA_XPATH_ATTR_NAME, 
                     rset_nmem, kc);
-                wrbuf_free(wbuf, 1);
+                wrbuf_destroy(wbuf);
             } 
             else 
             {
                 if (!first_path)
                 {
-                    wrbuf_free(xpath_rev, 1);
+                    wrbuf_destroy(xpath_rev);
                     continue;
                 }
             }
-            yaz_log(log_level_rpn, "xpath_rev (%d) = %.*s", level, 
-                    wrbuf_len(xpath_rev), wrbuf_buf(xpath_rev));
+            yaz_log(log_level_rpn, "xpath_rev (%d) = %s", level, 
+                    wrbuf_cstr(xpath_rev));
             if (wrbuf_len(xpath_rev))
             {
                 rset_start_tag = xpath_trunc(zh, stream, '0', 
-                                             wrbuf_buf(xpath_rev),
+                                             wrbuf_cstr(xpath_rev),
                                              ZEBRA_XPATH_ELM_BEGIN, 
                                              rset_nmem, kc);
                 if (always_matches)
@@ -2188,7 +2193,7 @@ ZEBRA_RES rpn_search_xpath(ZebraHandle zh,
                 else
                 {
                     rset_end_tag = xpath_trunc(zh, stream, '0', 
-                                               wrbuf_buf(xpath_rev),
+                                               wrbuf_cstr(xpath_rev),
                                                ZEBRA_XPATH_ELM_END, 
                                                rset_nmem, kc);
                     
@@ -2197,7 +2202,7 @@ ZEBRA_RES rpn_search_xpath(ZebraHandle zh,
                                                rset_end_tag, rset_attr);
                 }
             }
-            wrbuf_free(xpath_rev, 1);
+            wrbuf_destroy(xpath_rev);
             first_path = 0;
         }
     }
@@ -2208,7 +2213,7 @@ ZEBRA_RES rpn_search_xpath(ZebraHandle zh,
 #define MAX_XPATH_STEPS 10
 
 static ZEBRA_RES rpn_search_APT(ZebraHandle zh, Z_AttributesPlusTerm *zapt,
-                               oid_value attributeSet, NMEM stream,
+                               const Odr_oid *attributeSet, NMEM stream,
                                Z_SortKeySpecList *sort_sequence,
                                int num_bases, char **basenames, 
                                NMEM rset_nmem,
@@ -2333,7 +2338,7 @@ static ZEBRA_RES rpn_search_APT(ZebraHandle zh, Z_AttributesPlusTerm *zapt,
 }
 
 static ZEBRA_RES rpn_search_structure(ZebraHandle zh, Z_RPNStructure *zs,
-                                     oid_value attributeSet, 
+                                     const Odr_oid *attributeSet, 
                                      NMEM stream, NMEM rset_nmem,
                                      Z_SortKeySpecList *sort_sequence,
                                      int num_bases, char **basenames,
@@ -2373,7 +2378,7 @@ ZEBRA_RES rpn_get_top_approx_limit(ZebraHandle zh, Z_RPNStructure *zs,
 }
 
 ZEBRA_RES rpn_search_top(ZebraHandle zh, Z_RPNStructure *zs,
-                        oid_value attributeSet, 
+                        const Odr_oid *attributeSet, 
                         NMEM stream, NMEM rset_nmem,
                         Z_SortKeySpecList *sort_sequence,
                         int num_bases, char **basenames,
@@ -2410,7 +2415,7 @@ ZEBRA_RES rpn_search_top(ZebraHandle zh, Z_RPNStructure *zs,
 }
 
 ZEBRA_RES rpn_search_structure(ZebraHandle zh, Z_RPNStructure *zs,
-                              oid_value attributeSet, 
+                              const Odr_oid *attributeSet, 
                               NMEM stream, NMEM rset_nmem,
                               Z_SortKeySpecList *sort_sequence,
                               int num_bases, char **basenames,