Changeset 8452

Timestamp:

2004-11-04T17:19:48+13:00 (19 years ago)

Author:

jrm21

Message:

added a 'collection_macros' field to ColInfoResponse_t struct, so we
can get collection-specific macros from the collect.cfg file.

File:

• trunk/gsdl/src/recpt/comtypes.h (modified) (4 diffs)

trunk/gsdl/src/recpt/comtypes.h

@@ -2 +2 @@
  *
  * comtypes.h -- 
- * Copyright (C) 1999  The New Zealand Digital Library Project
+ * Copyright (C) 1999,2004  The New Zealand Digital Library Project
  *
  * A component of the Greenstone digital library software
@@ -34 +34 @@
 #  include <ospace\std\vector>
 #  include <ospace\std\list>
+#  include <ospace\std\memory> // for pair
 #  include <ospace\std\map>
 #elif defined(GSDL_USE_STL_H)
 #  include <vector.h>
 #  include <list.h>
+#  include <memory.h> // for pair
 #  include <map.h>
 #else
 #  include <vector>
 #  include <list>
+#  include <memory> // for pair
 #  include <map>
 #endif
@@ -64 +67 @@
 };
 
-
-// ColInfoResponse ::= SEQUENCE {
-//   shortInfo      [0]  IMPLICIT ShortCollectionInfo,
-//   isPublic       [2]  IMPLICIT BOOLEAN,    -- whether has anonymous access
-//   isBeta         [3]  IMPLICIT BOOLEAN,    -- beta if still under development
-//   buildDate      [4]  IMPLICIT GeneralizedTime,
-//   ccsCols        [5]  IMPLICIT StringSet,  -- collections that form cross-col search
-//   languages      [6]  IMPLICIT StringSet,  -- languages in the collection
-//   numDocs        [7]  IMPLICIT INTEGER,
-//   numSections    [8]  IMPLICIT INTEGER OPTIONAL,
-//   numWords       [9]  IMPLICIT INTEGER OPTIONAL,
-//   numBytes       [10] IMPLICIT INTEGER OPTIONAL
-//   collectionmeta [11] IMPLICIT StringSet
-//   format         [12] IMPLICIT StringSet
-//   building       [13] IMPLICIT StringSet
-//   receptionist   [14] IMPLICIT GeneralString
-//   buildType      [15] IMPLICIT GeneralString
-//   searchTypes    [16] IMPLICIT StringSet
-// }
+/* macro name -> (params, value) */
+typedef multimap<text_t, pair<text_t, text_t> > macros_map;
+
 struct ColInfoResponse_t {
    void clear ();
@@ -100 +87 @@
    text_tmap      collectionmeta;
    text_tmap      format;
+   macros_map     collection_macros; // for collectionmacro config directive (> gsdl 2.53)
    text_tmap      building;
    text_t         httpdomain;      // GRB: could these two http items need removing