Changeset 183

Timestamp:

1999-03-04T09:26:50+13:00 (25 years ago)

Author:

rjmcnab

Message:

Modified stuff.

Location:

trunk/gsdl/src/recpt

Files:

• comproto.asn (modified) (8 diffs)
• queryaction.cpp (modified) (3 diffs)

trunk/gsdl/src/recpt/comproto.asn

@@ -57 +57 @@
 
   -- Authority
-  authListRequest            [12] IMPLICIT AuthListRequest,
-  authListResponse           [13] IMPLICIT AuthListResponse,
-  editAuthListRequest        [14] IMPLICIT EditAuthListRequest,
-  editAuthListResponse       [15] IMPLICIT EditAuthListResponse,
+--  authListRequest            [12] IMPLICIT AuthListRequest,
+--  authListResponse           [13] IMPLICIT AuthListResponse,
+--  editAuthListRequest        [14] IMPLICIT EditAuthListRequest,
+--  editAuthListResponse       [15] IMPLICIT EditAuthListResponse,
 
   -- an authority mirror is a mirror of THIS authority
-  authMirListRequest         [16] IMPLICIT AuthMirListRequest,
-  authMirListResponse        [17] IMPLICIT AuthMirListResponse,
-  editAuthMirListRequest     [18] IMPLICIT EditAuthMirListRequest,
-  editAuthMirListResponse    [19] IMPLICIT EditAuthMirListResponse,
+--  authMirListRequest         [16] IMPLICIT AuthMirListRequest,
+--  authMirListResponse        [17] IMPLICIT AuthMirListResponse,
+--  editAuthMirListRequest     [18] IMPLICIT EditAuthMirListRequest,
+--  editAuthMirListResponse    [19] IMPLICIT EditAuthMirListResponse,
 
   colListRequest             [20] IMPLICIT ColListRequest,
   colListResponse            [21] IMPLICIT ColListResponse,
-  editColListRequest         [22] IMPLICIT EditColListRequest,
-  editColListResponse        [23] IMPLICIT EditColListResponse,
-
-  colMirListRequest          [24] IMPLICIT ColMirListRequest,
-  colMirListResponse         [25] IMPLICIT ColMirListResponse, 
-  editColMirListRequest      [26] IMPLICIT EditColMirListRequest, 
-  editColMirListResponse     [27] IMPLICIT EditColMirListResponse,
+--  editColListRequest         [22] IMPLICIT EditColListRequest,
+--  editColListResponse        [23] IMPLICIT EditColListResponse,
+
+--  colMirListRequest          [24] IMPLICIT ColMirListRequest,
+--  colMirListResponse         [25] IMPLICIT ColMirListResponse, 
+--  editColMirListRequest      [26] IMPLICIT EditColMirListRequest, 
+--  editColMirListResponse     [27] IMPLICIT EditColMirListResponse,
 
   -- Collection
@@ -132 +132 @@
 -- for simplicity.
 
-AuthListRequest ::= SEQUENCE {
-}
-
-AuthListResponse ::= SEQUENCE {
-  authList  [1] IMPLICIT StringSet
-}
-
-
-EditAuthListRequest ::= SEQUENCE {
-  editAction EditAction,
-  authority  GeneralString
-}
-
-EditAuthListResponse ::= SEQUENCE {
-}
-
-
-AuthMirListRequest ::= SEQUENCE {
-  limitNumber [1] IMPLICIT INTEGER OPTIONAL,
-  limitDomain [2] IMPLICIT GeneralString OPTIONAL
-}
-
-AuthMirListResponse ::= SEQUENCE {
-  authMirList [1] IMPLICIT HostPortSet
-}
-
-
-EditAuthMirListRequest ::= SEQUENCE {
-  editAction EditAction,
-  authMir    HostPort
-}
-
-EditAuthMirListResponse ::= SEQUENCE {
-}
+-- AuthListRequest ::= SEQUENCE {
+-- }
+
+-- AuthListResponse ::= SEQUENCE {
+--   authList  [1] IMPLICIT StringSet
+-- }
+
+
+-- EditAuthListRequest ::= SEQUENCE {
+--   editAction EditAction,
+--   authority  GeneralString
+-- }
+
+-- EditAuthListResponse ::= SEQUENCE {
+-- }
+
+
+-- AuthMirListRequest ::= SEQUENCE {
+--   limitNumber [1] IMPLICIT INTEGER OPTIONAL,
+--   limitDomain [2] IMPLICIT GeneralString OPTIONAL
+-- }
+
+-- AuthMirListResponse ::= SEQUENCE {
+--   authMirList [1] IMPLICIT HostPortSet
+-- }
+
+
+-- EditAuthMirListRequest ::= SEQUENCE {
+--   editAction EditAction,
+--   authMir    HostPort
+-- }
+
+-- EditAuthMirListResponse ::= SEQUENCE {
+-- }
 
 
@@ -176 +176 @@
 
 
-EditColListRequest ::= SEQUENCE {
-  editAction EditAction,
-  colInfo    ShortColInfo
-}
-
-EditColListResponse ::= SEQUENCE {
-}
-
-
-ColMirListRequest ::= SEQUENCE {
-  limitNumber [1] IMPLICIT INTEGER OPTIONAL,
-  limitDomain [2] IMPLICIT GeneralString OPTIONAL
-}
-
-ColMirListResponse ::= SEQUENCE {
-  colMirList [1] IMPLICIT ShortColInfoSet
-}
-
-
-EditColMirListRequest ::= SEQUENCE {
-  editAction EditAction,
-  colMirInfo ShortColInfo
-}
-
-EditColMirListResponse ::= SEQUENCE {
-}
+-- EditColListRequest ::= SEQUENCE {
+--   editAction EditAction,
+--   colInfo    ShortColInfo
+-- }
+
+-- EditColListResponse ::= SEQUENCE {
+-- }
+
+
+-- ColMirListRequest ::= SEQUENCE {
+--   limitNumber [1] IMPLICIT INTEGER OPTIONAL,
+--   limitDomain [2] IMPLICIT GeneralString OPTIONAL
+-- }
+
+-- ColMirListResponse ::= SEQUENCE {
+--   colMirList [1] IMPLICIT ShortColInfoSet
+-- }
+
+
+-- EditColMirListRequest ::= SEQUENCE {
+--   editAction EditAction,
+--   colMirInfo ShortColInfo
+-- }
+
+-- EditColMirListResponse ::= SEQUENCE {
+-- }
 
 
@@ -216 +216 @@
 ColInfoResponse ::= SEQUENCE {
   shortInfo   [0] IMPLICIT ShortCollectionInfo,
-  -- I've taken out fullName and put it in the interface documents
-  public      [2] IMPLICIT BOOLEAN,    -- whether has anonymous access
-  beta        [3] IMPLICIT BOOLEAN,    -- beta if still under development
+  isPublic    [2] IMPLICIT BOOLEAN,    -- whether has anonymous access
+  isBeta      [3] IMPLICIT BOOLEAN,    -- beta if still under development
   builddate   [4] IMPLICIT GeneralizedTime,
   languages   [5] IMPLICIT StringSet,  -- languages in the collection
@@ -298 +297 @@
 
 
--- filter options which might be supported for text collections
+-- filter options which might be supported for the query filter
 --
--- QueryType      enumerated
--- Index          enumerated
--- Casefold       boolean
--- Stem           boolean
--- StartResults   integer
--- EndResults     integer
--- Subcollection  enumerated
--- Query          string ???
--- Ranking        enumerated
---
--- filter options which might be supported for music collections
--- MatchAlgorithm
--- PitchMode
--- UseRhythm
--- RestMode
--- MatchMode
--- MaxDist
--- Count 
+-- onePerQuery StartResults   integer
+-- onePerQuery EndResults     integer
+-- onePerQuery InverseOrder   boolean
+-- onePerQuery Ordering       enumerated (rank, or metadata field)
+-- onePerTerm  Term           string ???
+-- onePerTerm  MimeType       enumerated
+-- onePerTerm  Language       enumerated
+-- onePerTerm  MatchOption    enumerated (must match, can match, mustn't match)
+-- onePerTerm  Casefold       boolean
+-- onePerTerm  Stem           boolean
+-- onePerTerm  Index          enumerated
+-- onePerTerm  Subcollection  enumerated
 
 InfoFilterOptionsRequest ::= SEQUENCE {
@@ -323 +316 @@
 
 InfoFilterOptionsResponse ::= SEQUENCE {
-  mimeTypes     StringSequence,
-  filterOptions SET OF FilterOption,
+  filterOptions SET OF FilterDescript
+}
+
+FilterDescript ::= SEQUENCE {
+  filterName GeneralString,
+  filterOptions SET OF FilterOption
 }
 
@@ -330 +327 @@
   name        GeneralString,
   type        ENUMERATED {boolean(0), integer(1), enumerated(2), string(3)},
+  repeatable  ENUMERATED {onePerQuery(0), onePerTerm(1), nPerTerm(2)},
   default     GeneralString,
+  -- the interpretation of the validValues depends on the type
+  -- for boolean: the first value is the false value, the second is true value
+  -- for integer: the first value is the minimum, the second the maximum
+  -- for enumerated: all values a listed
+  -- for string: this value is ignored
   validValues StringSequence
 }
@@ -342 +345 @@
 
 FilterRequest ::= SEQUENCE {
-  filterOptions       [0] IMPLICIT SEQUENCE OF OptionValue,
-  docSet              [1] IMPLICIT SEQUENCE OF GeneralString OPTIONAL,
-  filterResultOptions [2] BIT STRING {termFreq(0), matchTerms(1), docID(2), subCol(3),
+  filterName          [0] GeneralString,
+  filterOptions       [1] IMPLICIT SEQUENCE OF OptionValue,
+  docSet              [2] IMPLICIT StringSequence OPTIONAL,
+  filterResultOptions [3] BIT STRING {termFreq(0), matchTerms(1), docID(2), subCol(3),
                                       ranking(4), docFreq(5)}
 }

trunk/gsdl/src/recpt/queryaction.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.2  1999/03/03 20:26:50  rjmcnab
+
+   Modified stuff.
+
    Revision 1.1  1999/02/28 22:45:21  rjmcnab
 
@@ -30 +34 @@
   arg_ainfo.defaultstatus = cgiarginfo::weak;
   arg_ainfo.argdefault = "q";
-  arg_ainfo.savedarginfo = cgiarginfo::must;
-  argsinfo.addarginfo (NULL, arg_ainfo);
-
-  // "i"
-  arg_ainfo.shortname = "i";
-  arg_ainfo.longname = "index";
-  arg_ainfo.multiplechar = true;
-  arg_ainfo.defaultstatus = cgiarginfo::weak;
-  arg_ainfo.argdefault = "";
   arg_ainfo.savedarginfo = cgiarginfo::must;
   argsinfo.addarginfo (NULL, arg_ainfo);
@@ -142 +137 @@
 
 bool queryaction::check_cgiargs (cgiargsclass &/*args*/, ostream &/*logout*/) {
-  // extract h, j, and n arguments, use if not already defined
-
-  // combine to form i argument
-
   // check t argument