From 4b867394d5d5dda2be8427c96e0fb0fd07eddbdc Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Thu, 2 Apr 1998 08:27:36 +0000 Subject: [PATCH] Minor change in definition of Z_TargetInfo. Furhter work on Explain schema - added AttributeDetails. --- include/prt-exp.h | 4 +--- retrieval/d1_expout.c | 14 ++++++++----- tab/explain.abs | 52 +++++++++++++++++++++++++++++++++++++++++++++++-- tab/explain.tag | 30 ++++++++++++++++++++++++++++ 4 files changed, 90 insertions(+), 10 deletions(-) diff --git a/include/prt-exp.h b/include/prt-exp.h index 832763b..1789fb5 100644 --- a/include/prt-exp.h +++ b/include/prt-exp.h @@ -34,8 +34,6 @@ extern "C" { #endif -#define multipleDbSearch multipleDBsearch - typedef struct Z_CommonInfo { char *dateAdded; /* OPTIONAL */ @@ -331,7 +329,7 @@ typedef struct Z_TargetInfo Z_HumanString *recentNews; /* OPTIONAL */ Z_IconObject *icon; /* OPTIONAL */ bool_t *namedResultSets; - bool_t *multipleDbSearch; + bool_t *multipleDBsearch; int *maxResultSets; /* OPTIONAL */ int *maxResultSize; /* OPTIONAL */ int *maxTerms; /* OPTIONAL */ diff --git a/retrieval/d1_expout.c b/retrieval/d1_expout.c index e572708..ebeed62 100644 --- a/retrieval/d1_expout.c +++ b/retrieval/d1_expout.c @@ -4,7 +4,11 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: d1_expout.c,v $ - * Revision 1.10 1998-03-31 15:13:20 adam + * Revision 1.11 1998-04-02 08:27:37 adam + * Minor change in definition of Z_TargetInfo. Furhter work on Explain + * schema - added AttributeDetails. + * + * Revision 1.10 1998/03/31 15:13:20 adam * Development towards compiled ASN.1. * * Revision 1.9 1998/03/05 08:07:58 adam @@ -460,7 +464,7 @@ static Z_TargetInfo *f_targetInfo(ExpHandle *eh, data1_node *n) res->recentNews = 0; res->icon = 0; res->namedResultSets = 0; - res->multipleDbSearch = 0; + res->multipleDBsearch = 0; res->maxResultSets = 0; res->maxResultSize = 0; res->maxTerms = 0; @@ -492,7 +496,7 @@ static Z_TargetInfo *f_targetInfo(ExpHandle *eh, data1_node *n) case 103: res->recentNews = f_humstring(eh, c); break; case 104: res->icon = NULL; break; /* fix */ case 105: res->namedResultSets = f_bool(eh, c); break; - case 106: res->multipleDbSearch = f_bool(eh, c); break; + case 106: res->multipleDBsearch = f_bool(eh, c); break; case 107: res->maxResultSets = f_integer(eh, c); break; case 108: res->maxResultSize = f_integer(eh, c); break; case 109: res->maxTerms = f_integer(eh, c); break; @@ -547,8 +551,8 @@ static Z_TargetInfo *f_targetInfo(ExpHandle *eh, data1_node *n) } if (!res->namedResultSets) res->namedResultSets = eh->false_value; - if (!res->multipleDbSearch) - res->multipleDbSearch = eh->false_value; + if (!res->multipleDBsearch) + res->multipleDBsearch = eh->false_value; return res; } diff --git a/tab/explain.abs b/tab/explain.abs index 888b933..c0cebc0 100644 --- a/tab/explain.abs +++ b/tab/explain.abs @@ -2,7 +2,7 @@ # explain data. On request, records are mapped to the proper Explain ASN.1 # before transmission. # -# $Id: explain.abs,v 1.10 1998-02-10 11:00:59 adam Exp $ +# $Id: explain.abs,v 1.11 1998-04-02 08:27:37 adam Exp $ # name explain @@ -54,7 +54,44 @@ elm (4,602) dateChanged ! elm (4,603) expiry DateExpired elm (4,604) languageCode HumanStringLanguage +section stringOrNumeric +elm (4,1001) string - +elm (4,1002) numeric - + +section attributeSetDetails +elm (4,1000) attributeSet - +elm (4,702) attributesByType - +elm (4,702)/(4,703) attributeTypeDetails - +elm (4,702)/(4,703)/(4,704) attributeType - +elm (4,702)/(4,703)/(4,705) defaultIfOmitted - +elm (4,702)/(4,703)/(4,705)/(4,706):stringOrNumeric defaultValue - +elm (4,702)/(4,703)/(4,705)/(4,707) defaultDescription - +elm (4,702)/(4,703)/(4,708) attributeValues - +elm (4,702)/(4,703)/(4,708)/(4,709) attributeValue - +elm (4,702)/(4,703)/(4,708)/(4,709)/(4,710):stringOrNumeric value - +elm (4,702)/(4,703)/(4,708)/(4,709)/(4,711) description - +elm (4,702)/(4,703)/(4,708)/(4,709)/(4,712) subAttributes - +elm (4,702)/(4,703)/(4,708)/(4,709)/(4,712)/(4,713):stringOrNumeric subAttribute - +elm (4,702)/(4,703)/(4,708)/(4,709)/(4,714) superAttributes - +elm (4,702)/(4,703)/(4,708)/(4,709)/(4,714)/(4,715):stringOrNumeric superAttributes - + +section attributeCombinations +elm (4,1000) attributeSet - +elm (4,717) legalCombinations - +elm (4,717)/(4,718) legalCombination - +elm (4,717)/(4,718)/(4,719) attributeOccurrence - +elm (4,717)/(4,718)/(4,719)/(4,1000) attributeSetId - +elm (4,717)/(4,718)/(4,719)/(4,704) attributeType - +elm (4,717)/(4,718)/(4,719)/(4,704) attributeType - +elm (4,717)/(4,718)/(4,719)/(4,720) mustBeSupplied - +elm (4,717)/(4,718)/(4,719)/(4,708) attributeValues - +elm (4,717)/(4,718)/(4,719)/(4,708)/(4,721) anyOrNone - +elm (4,717)/(4,718)/(4,719)/(4,708)/(4,722):stringOrNumeric specific - + section main +# +# TargetInfo +# elm (4,1) targetInfo ExplainCategory elm (4,1)/(4,600):commonInfo targetCommonInfo - elm (4,1)/(4,102) targetName TargetName @@ -79,7 +116,9 @@ elm (4,1)/(4,118)/(4,605) databaseList - elm (4,1)/(4,118)/(4,605)/(4,102) databaseName - elm (4,1)/(4,119) addresses - elm (4,1)/(4,500):accessInfo commonAccessInfo - - +# +# DatabaseInfo +# elm (4,2) databaseInfo ExplainCategory elm (4,2)/(4,600):commonInfo databaseCommonInfo - elm (4,2)/(4,102) databaseName DatabaseName @@ -119,3 +158,12 @@ elm (4,2)/(4,223) producerContactInfo - elm (4,2)/(4,224) supplierContactInfo - elm (4,2)/(4,225) submissionContactInfo - elm (4,2)/(4,500):accessInfo databaseAccessInfo - +# +# AttributeDetails +# +elm (4,9) attributeDetails ExplainCategory +elm (4,9)/(4,600):commonInfo attributeDetailsCommonInfo - +elm (4,9)/(4,102) databaseName DatabaseName +elm (4,9)/(4,700) attributesBySet - +elm (4,9)/(4,700)/(4,701):attributeSetDetails attributeSetDetails - +elm (4,9)/(4,716):attributeCombinations attributeCombinations - diff --git a/tab/explain.tag b/tab/explain.tag index 246de47..6ed03a2 100644 --- a/tab/explain.tag +++ b/tab/explain.tag @@ -109,6 +109,8 @@ tag 558 proximityUnitVal numeric tag 559 proximityUnitPrivate structured tag 560 proximityUnitDescription string +# CommonInfo + tag 600 commonInfo structured tag 601 dateAdded generalizedtime tag 602 dateChanged generalizedtime @@ -116,8 +118,36 @@ tag 603 expiry generalizedtime tag 604 languageCode string tag 605 databaseList structured +# AttributeDetails, AttributeSetDetails + +tag 700 attributesBySet structured +tag 701 attributeSetDetails structured +tag 702 attributesByType structured +tag 703 attributeTypeDetails structured +tag 704 attributeType numeric +tag 705 defaultIfOmitted structured +tag 706 defaultValue structured +tag 707 defaultDescription structured +tag 708 attributeValues structured +tag 709 attributeValue structured +tag 710 value structured +tag 711 description string +tag 712 subAttributes structured +tag 713 subAttribute structured +tag 714 superAttributes structured +tag 715 superAttribute structured +tag 716 attributeCombinations structured +tag 717 legalAttributeCombinations structured +tag 718 attributeCombination structured +tag 719 attributeOccurrence structured +tag 720 mustBeSupplied bool +tag 721 anyOrNone bool +tag 722 specific structured + # # General tags for list members, etc. # tag 1000 oid oid tag 1001 string string +tag 1002 numeric numeric + -- 1.7.10.4