Using odr_nullval() instead of ODR_NULLVAL when appropriate.

diff --git a/clientrc.tcl b/clientrc.tcl
index c8968d8..305d4c2 100644 (file)
--- a/clientrc.tcl
+++ b/clientrc.tcl
@@ -587,7 +587,7 @@ set profile(ztest9999,smallSetUpperBound) 0
 set profile(ztest9999,targetInfoName) {}
 set profile(ztest9999,timeDefine) 878567355
 set profile(ztest9999,timeLastExplain) {}
-set profile(ztest9999,timeLastInit) 879437957
+set profile(ztest9999,timeLastInit) 880111094
 set profile(ztest9999,welcomeMessage) {}
 set profile(ztest9999,windowNumber) 7
 set queryTypes {Simple phrase}

diff --git a/explain.c b/explain.c
index 9dbbbaa..7da9896 100644 (file)
--- a/explain.c
+++ b/explain.c
@@ -5,7 +5,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: explain.c,v $
- * Revision 1.8  1997-09-09 10:19:51  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
@@ -52,8 +55,6 @@ typedef struct {
     int (*handle)();
 } IrExpChoice;
 
-static Odr_null *ODR_NULLVALUE = "NULL";
-
 typedef char *Z_ElementSetName;
 typedef Odr_oid *Z_AttributeSetId;
 typedef char *Z_InternationalString;
@@ -518,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_NULLVALUE, argi);
+    ir_choice (iea, arm, p, odr_nullval(), argi);
     return ir_match_end (name, iea, argi);
 }
 
@@ -679,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_NULLVALUE, argi);
+        ir_choice (iea, searchCostArm, p->searchCost, odr_nullval(), argi);
 
     ir_bool (iea, p->scanable, "scanable", argi);
     ir_sequence (ir_InternationalString, iea, p->broader,
@@ -729,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_NULLVALUE, argi);
+    ir_choice (iea, waitActionArm, p->waitAction, odr_nullval(), argi);
 
     ir_HumanString (iea, p->description, "description", argi);
     ir_External (iea, p->specificExplain, "specificExplain", argi);
@@ -932,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_NULLVALUE, argi); 
+        ir_choice (iea, sortArm, p->caseSensitivity, odr_nullval(), argi); 
 
     return ir_match_end (name, iea, argi);
 }
@@ -957,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_NULLVALUE, 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);
@@ -1168,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_NULLVALUE, 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);
@@ -1411,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_NULLVALUE, 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);

diff --git a/formats/line.tcl b/formats/line.tcl
index b1099bd..b3b5212 100644 (file)
--- a/formats/line.tcl
+++ b/formats/line.tcl
@@ -4,7 +4,10 @@
 # Sebastian Hammer, Adam Dickmeiss
 #
 # $Log: line.tcl,v $
-# Revision 1.14  1997-11-19 11:22:10  adam
+# Revision 1.15  1997-11-24 11:34:38  adam
+# Using odr_nullval() instead of ODR_NULLVAL when appropriate.
+#
+# Revision 1.14  1997/11/19 11:22:10  adam
 # Object identifiers can be accessed in GRS-1 records.
 #
 # Revision 1.13  1996/04/12 12:25:27  adam
@@ -57,6 +60,7 @@ proc display-grs-line {w r i} {
     if {[tk4]} {
         set start [$w index insert]
     }
+    set head Untitled
     foreach e $r {
         if {![tk4]} {
             for {set j 0} {$j < $i} {incr j} {
@@ -75,12 +79,13 @@ proc display-grs-line {w r i} {
                }
            }
            if {[lindex $e 3] == "string"} {
-               insertWithTags $w [lindex $e 4] marc-text
+                set head [lindex $e 4]
            }
-            insertWithTags $w "\n"
             break
        }
     }
+    insertWithTags $w $head marc-text
+    insertWithTags $w "\n"
     if {[tk4]} {
         $w tag configure indent$i \
                 -lmargin1 [expr $i * 10] \