X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=explain.c;h=7da98966a2e5be9b56a3c68cd20dcc4b72d290ee;hb=c1984a321c189f1996d117e88a5d70cf09926ba5;hp=be59d5f62bb46e89869731c4832ac0022ed2b438;hpb=ccb0e753628e08a767b808487e5702f919edd351;p=ir-tcl-moved-to-github.git

diff --git a/explain.c b/explain.c
index be59d5f..7da9896 100644
--- a/explain.c
+++ b/explain.c
@@ -1,11 +1,23 @@
 /*
  * IR toolkit for tcl/tk
- * (c) Index Data 1996
+ * (c) Index Data 1996-1997
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: explain.c,v $
- * Revision 1.5  1996-08-23 11:59:47  adam
+ * Revision 1.9  1997-11-24 11:34:38  adam
+ * Using odr_nullval() instead of ODR_NULLVAL when appropriate.
+ *
+ * Revision 1.8  1997/09/09 10:19:51  adam
+ * New MSV5.0 port with fewer warnings.
+ *
+ * Revision 1.7  1997/08/28 20:17:36  adam
+ * Fixed small bug.
+ *
+ * Revision 1.6  1997/05/14 06:57:14  adam
+ * Adopted to use YAZ with C++ support.
+ *
+ * Revision 1.5  1996/08/23 11:59:47  adam
  * Bug fix: infinite look in ir_oid.
  *
  * Revision 1.4  1996/08/22  13:39:31  adam
@@ -48,6 +60,7 @@ typedef Odr_oid *Z_AttributeSetId;
 typedef char *Z_InternationalString;
 typedef char *Z_LanguageCode;
 
+
 static int ir_UnitType (IrExpArg *iea,
             Z_UnitType *p, const char *name, int argi);
 static int ir_Unit (IrExpArg *iea,
@@ -506,7 +519,7 @@ static int ir_ElementDataTypePrimitive (IrExpArg *iea,
 
     if (!ir_match_start (name, p, iea, ++argi))
         return TCL_OK;
-    ir_choice (iea, arm, p, ODR_NULLVAL, argi);
+    ir_choice (iea, arm, p, odr_nullval(), argi);
     return ir_match_end (name, iea, argi);
 }
 
@@ -667,7 +680,7 @@ static int ir_TermListElement (IrExpArg *iea,
     ir_InternationalString (iea, p->name, "name", argi);
     ir_HumanString (iea, p->title, "title", argi);
     if (p->searchCost)
-        ir_choice (iea, searchCostArm, p->searchCost, ODR_NULLVAL, argi);
+        ir_choice (iea, searchCostArm, p->searchCost, odr_nullval(), argi);
 
     ir_bool (iea, p->scanable, "scanable", argi);
     ir_sequence (ir_InternationalString, iea, p->broader,
@@ -717,7 +730,7 @@ static int ir_ExtendedServicesInfo (IrExpArg *iea,
     ir_bool (iea, p->available, "available", argi);
     ir_bool (iea, p->retentionSupported, "retentionSupported", argi);
 
-    ir_choice (iea, waitActionArm, p->waitAction, ODR_NULLVAL, argi);
+    ir_choice (iea, waitActionArm, p->waitAction, odr_nullval(), argi);
 
     ir_HumanString (iea, p->description, "description", argi);
     ir_External (iea, p->specificExplain, "specificExplain", argi);
@@ -920,7 +933,7 @@ static int ir_SortKeyDetails (IrExpArg *iea,
     ir_SortKeyDetailsSortType (iea, p->sortType, "sortType", argi);
    
     if (p->caseSensitivity) 
-        ir_choice (iea, sortArm, p->caseSensitivity, ODR_NULLVAL, argi); 
+        ir_choice (iea, sortArm, p->caseSensitivity, odr_nullval(), argi); 
 
     return ir_match_end (name, iea, argi);
 }
@@ -945,7 +958,7 @@ static int ir_ProcessingInformation (IrExpArg *iea,
     ir_CommonInfo (iea, p->commonInfo, "commonInfo", argi);
     ir_DatabaseName (iea, p->databaseName, "databaseName", argi);
 
-    ir_choice (iea, arm, p->processingContext, ODR_NULLVAL, argi);
+    ir_choice (iea, arm, p->processingContext, odr_nullval(), argi);
     ir_InternationalString (iea, p->name, "name", argi);
     ir_oid (iea, p->oid, "oid", argi);
     ir_HumanString (iea, p->description, "description", argi);
@@ -1156,7 +1169,7 @@ static int ir_IconObjectUnit (IrExpArg *iea,
         { NULL, 0, NULL }};
     if (!ir_match_start (name, p, iea, ++argi))
         return TCL_OK;
-    ir_choice (iea, arm, &p->which, ODR_NULLVAL, argi);
+    ir_choice (iea, arm, &p->which, odr_nullval(), argi);
     ir_InternationalString (iea, p->bodyType, "bodyType", argi);
     ir_octet (iea, p->content, "content", argi);
     return ir_match_end (name, iea, argi);
@@ -1280,7 +1293,7 @@ static int ir_QueryTypeDetails (IrExpArg *iea,
 
     if (!ir_match_start (name, p, iea, ++argi))
         return TCL_OK;
-    ir_choice (iea, arm, &p->which, p->u.private, argi);
+    ir_choice (iea, arm, &p->which, p->u.zprivate, argi);
     return ir_match_end (name, iea, argi);
 }
 
@@ -1354,7 +1367,7 @@ static int ir_ProxSupportUnit (IrExpArg *iea,
         { NULL, 0, NULL }};
     if (!ir_match_start (name, p, iea, ++argi))
         return TCL_OK;
-    ir_choice (iea, arm, &p->which, p->u.private, argi);
+    ir_choice (iea, arm, &p->which, p->u.zprivate, argi);
     return ir_match_end (name, iea, argi);
 }
 
@@ -1399,7 +1412,7 @@ static int ir_AccessRestrictionsUnit (IrExpArg *iea,
 
     if (!ir_match_start (name, p, iea, ++argi))
         return TCL_OK;
-    ir_choice (iea, arm, p->accessType, ODR_NULLVAL, argi);
+    ir_choice (iea, arm, p->accessType, odr_nullval(), argi);
     ir_HumanString (iea, p->accessText, "accessText", argi);
     ir_sequence (ir_oid, iea, p->accessChallenges,
                  &p->num_accessChallenges, "accessChallenges", argi);
@@ -1506,7 +1519,7 @@ static int ir_AttributeOccurrence (IrExpArg *iea,
     ir_oid (iea, p->attributeSet, "attributeSet", argi);
     ir_integer (iea, p->attributeType, "attributeType", argi);
     ir_null (iea, p->mustBeSupplied, "mustBeSupplied", argi);
-    ir_choice (iea, arm, &p->which, p->attributeValues->anyOrNone, argi);
+    ir_choice (iea, arm, &p->which, p->attributeValues.anyOrNone, argi);
     return ir_match_end (name, iea, argi);
 }