2007.

[idzebra-moved-to-github.git] / util / zebramap.c

diff --git a/util/zebramap.c b/util/zebramap.c
index 7dc5d0f..2a836b0 100644 (file)
--- a/util/zebramap.c
+++ b/util/zebramap.c
@@ -1,5 +1,5 @@
-/* $Id: zebramap.c,v 1.52 2006-08-15 14:28:35 adam Exp $
-   Copyright (C) 1995-2006
+/* $Id: zebramap.c,v 1.55 2007-01-15 15:10:26 adam Exp $
+   Copyright (C) 1995-2007
    Index Data ApS
 
    This file is part of the Zebra server.
@@ -40,6 +40,7 @@ struct zebra_map {
     int completeness;
     int positioned;
     int alwaysmatches;
+    int first_in_field;
     int type;
     union {
         struct {
@@ -125,6 +126,7 @@ ZEBRA_RES zebra_maps_read_file(ZebraMaps zms, const char *fname)
            (*zm)->completeness = 0;
            (*zm)->positioned = 1;
            (*zm)->alwaysmatches = 0;
+           (*zm)->first_in_field = 0;
            zms->no_maps++;
        }
        else if (!yaz_matchstr(argv[0], "sort"))
@@ -142,6 +144,7 @@ ZEBRA_RES zebra_maps_read_file(ZebraMaps zms, const char *fname)
            (*zm)->completeness = 0;
            (*zm)->positioned = 0;
            (*zm)->alwaysmatches = 0;
+           (*zm)->first_in_field = 0;
            zms->no_maps++;
        }
         else if (!zm)
@@ -166,6 +169,10 @@ ZEBRA_RES zebra_maps_read_file(ZebraMaps zms, const char *fname)
        {
            (*zm)->alwaysmatches = atoi(argv[1]);
        }
+       else if (!yaz_matchstr(argv[0], "firstinfield") && argc == 2)
+       {
+           (*zm)->first_in_field = atoi(argv[1]);
+       }
         else if (!yaz_matchstr(argv[0], "entrysize") && argc == 2)
         {
             if ((*zm)->type == ZEBRA_MAP_TYPE_SORT)
@@ -198,7 +205,7 @@ ZebraMaps zebra_maps_open(Res res, const char *base_path,
 
     zms->nmem = nmem_create();
     zms->no_maps = 0;
-    zms->tabpath = nmem_strdup(zms->nmem, profile_path);
+    zms->tabpath = profile_path ? nmem_strdup(zms->nmem, profile_path) : 0;
     zms->tabroot = 0;
     if (base_path)
         zms->tabroot = nmem_strdup(zms->nmem, base_path);
@@ -346,6 +353,14 @@ int zebra_maps_is_alwaysmatches(ZebraMaps zms, unsigned reg_id)
     return 0;
 }
 
+int zebra_maps_is_first_in_field(ZebraMaps zms, unsigned reg_id)
+{
+    struct zebra_map *zm = zebra_map_get(zms, reg_id);
+    if (zm)
+       return zm->first_in_field;
+    return 0;
+}
+
 int zebra_maps_sort(ZebraMaps zms, Z_SortAttributes *sortAttributes,
                    int *numerical)
 {