Function ccl_rpn_query sets attributeSet to Bib-1.

diff --git a/ccl/cclfind.c b/ccl/cclfind.c
index 4e0bdb4..ff94590 100644 (file)
--- a/ccl/cclfind.c
+++ b/ccl/cclfind.c
@@ -45,7 +45,10 @@
  * Europagate, 1995
  *
  * $Log: cclfind.c,v $
  * Europagate, 1995
  *
  * $Log: cclfind.c,v $

- * Revision 1.19  2000-11-16 09:58:02  adam
+ * Revision 1.20  2000-11-16 13:03:12  adam
+ * Function ccl_rpn_query sets attributeSet to Bib-1.
+ *
+ * Revision 1.19  2000/11/16 09:58:02  adam

  * Implemented local AttributeSet setting for CCL field maps.
  *
  * Revision 1.18  2000/10/17 19:50:28  adam
  * Implemented local AttributeSet setting for CCL field maps.
  *
  * Revision 1.18  2000/10/17 19:50:28  adam

@@ -351,7 +354,7 @@ static struct ccl_rpn_node *search_term_x (CCL_parser cclp,
         int truncation_value = -1;
         int completeness_value = -1;
         int len = 0;
         int truncation_value = -1;
         int completeness_value = -1;
         int len = 0;

-        int max = 200;
+        size_t max = 200;

         if (and_list || or_list)
             max = 1;
 
         if (and_list || or_list)
             max = 1;
 

diff --git a/win/makefile b/win/makefile
index 3353ff0..8fd1671 100644 (file)
--- a/win/makefile
+++ b/win/makefile
@@ -1,5 +1,5 @@
 # makefile.mak - makefile for MS NMAKE 
 # makefile.mak - makefile for MS NMAKE 

-# $Id: makefile,v 1.18 2000-11-01 14:47:00 adam Exp $
+# $Id: makefile,v 1.19 2000-11-16 13:03:13 adam Exp $

 #
 # Programmed by
 #  HL: Heikki Levanto, Index Data
 #
 # Programmed by
 #  HL: Heikki Levanto, Index Data

@@ -153,7 +153,7 @@ SERVER_LINK_OPTIONS = -lib
 ZTEST_LINK_OPTIONS = /subsystem:console  
 
 # TCL
 ZTEST_LINK_OPTIONS = /subsystem:console  
 
 # TCL

-TCL="C:\Program Files\Tcl\bin\tclsh83.exe"
+TCL="C:\Program Files\Tcl\bin\tclsh82.exe"

 HAVE_TCL=1
 
 COMMON_TCL_OPTIONS= ..\util\yaz-comp -I$(INCLDIR) -i yaz
 HAVE_TCL=1
 
 COMMON_TCL_OPTIONS= ..\util\yaz-comp -I$(INCLDIR) -i yaz

@@ -493,35 +493,35 @@ generated_files: \
 
 # Server
 {$(SERVERDIR)}.c{$(OBJDIR)}.obj:
 
 # Server
 {$(SERVERDIR)}.c{$(OBJDIR)}.obj:

-       @$(CPP) $(COPT) $< 
+       $(CPP) $(COPT) $< 

 
 # Various YAZ source directories
 {$(ASNDIR)}.c{$(OBJDIR)}.obj:
 
 # Various YAZ source directories
 {$(ASNDIR)}.c{$(OBJDIR)}.obj:

-       @$(CPP) $(COPT) $< 
+       $(CPP) $(COPT) $< 

 
 {$(COMSTACKDIR)}.c{$(OBJDIR)}.obj:
 
 {$(COMSTACKDIR)}.c{$(OBJDIR)}.obj:

-       @$(CPP) $(COPT) $< 
+       $(CPP) $(COPT) $< 

 
 {$(ODRDIR)}.c{$(OBJDIR)}.obj:
 
 {$(ODRDIR)}.c{$(OBJDIR)}.obj:

-       @$(CPP) $(COPT) $< 
+       $(CPP) $(COPT) $< 

 
 {$(UTILDIR)}.c{$(OBJDIR)}.obj:
 
 {$(UTILDIR)}.c{$(OBJDIR)}.obj:

-       @$(CPP) $(COPT) $< 
+       $(CPP) $(COPT) $< 

 
 {$(ZUTILDIR)}.c{$(OBJDIR)}.obj:
 
 {$(ZUTILDIR)}.c{$(OBJDIR)}.obj:

-       @$(CPP) $(COPT) $< 
+       $(CPP)  $(COPT) $< 

 
 {$(RETDIR)}.c{$(OBJDIR)}.obj:
 
 {$(RETDIR)}.c{$(OBJDIR)}.obj:

-       @$(CPP) $(COPT) $<
+       $(CPP) $(COPT) $<

 
 {$(Z3950_C_DIR)}.c{$(OBJDIR)}.obj:
 
 {$(Z3950_C_DIR)}.c{$(OBJDIR)}.obj:

-       @$(CPP) $(COPT) $< 
+       $(CPP) $(COPT) $< 

 
 {$(ILL_C_DIR)}.c{$(OBJDIR)}.obj:
 
 {$(ILL_C_DIR)}.c{$(OBJDIR)}.obj:

-       @$(CPP) $(COPT) $< 
+       $(CPP) $(COPT) $< 

 
 {$(CCLDIR)}.c{$(OBJDIR)}.obj:
 
 {$(CCLDIR)}.c{$(OBJDIR)}.obj:

-       @$(CPP) $(COPT) $< 
+       $(CPP) $(COPT) $< 

 
 ############### ASN-generated files
 
 
 ############### ASN-generated files
 

@@ -675,7 +675,10 @@ $(PROTOH): $(GENERATED_C_FILES) $(GENERATED_H_FILES)
 ###########################################################
 #
 # $Log: makefile,v $
 ###########################################################
 #
 # $Log: makefile,v $

-# Revision 1.18  2000-11-01 14:47:00  adam
+# Revision 1.19  2000-11-16 13:03:13  adam
+# Function ccl_rpn_query sets attributeSet to Bib-1.
+#
+# Revision 1.18  2000/11/01 14:47:00  adam

 # Added CCL support for WIN32.
 #
 # Revision 1.17  2000/10/06 12:01:12  adam
 # Added CCL support for WIN32.
 #
 # Revision 1.17  2000/10/06 12:01:12  adam

diff --git a/zutil/yaz-ccl.c b/zutil/yaz-ccl.c
index aede44b..f32f4f1 100644 (file)
--- a/zutil/yaz-ccl.c
+++ b/zutil/yaz-ccl.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: yaz-ccl.c,v $
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: yaz-ccl.c,v $

- * Revision 1.7  2000-11-16 09:58:02  adam
+ * Revision 1.8  2000-11-16 13:03:13  adam
+ * Function ccl_rpn_query sets attributeSet to Bib-1.
+ *
+ * Revision 1.7  2000/11/16 09:58:02  adam

  * Implemented local AttributeSet setting for CCL field maps.
  *
  * Revision 1.6  2000/02/02 15:13:23  adam
  * Implemented local AttributeSet setting for CCL field maps.
  *
  * Revision 1.6  2000/02/02 15:13:23  adam

@@ -239,9 +242,14 @@ static Z_RPNStructure *ccl_rpn_structure (ODR o, struct ccl_rpn_node *p)
 Z_RPNQuery *ccl_rpn_query (ODR o, struct ccl_rpn_node *p)
 {
     Z_RPNQuery *zq;
 Z_RPNQuery *ccl_rpn_query (ODR o, struct ccl_rpn_node *p)
 {
     Z_RPNQuery *zq;

+    oident bib1;
+    int oid[OID_SIZE];
+    bib1.proto = PROTO_Z3950;
+    bib1.oclass = CLASS_ATTSET;
+    bib1.value = VAL_BIB1;

 
     zq = (Z_RPNQuery *)odr_malloc (o, sizeof(*zq));
 
     zq = (Z_RPNQuery *)odr_malloc (o, sizeof(*zq));

-    zq->attributeSetId = NULL;
+    zq->attributeSetId = odr_oiddup (o, oid_ent_to_oid (&bib1, oid));

     zq->RPNStructure = ccl_rpn_structure (o, p);
     return zq;
 }
     zq->RPNStructure = ccl_rpn_structure (o, p);
     return zq;
 }