Changeset 648

Timestamp:

1999-10-10T20:49:35+13:00 (25 years ago)

Author:

sjboddie

Message:

• metadata now returns map rather than array
• redesigned browsing support (although it's not finished

so won't currently work ;-)

Location:

trunk/gsdl/src/recpt

Files:

• comtypes.cpp (modified) (2 diffs)
• comtypes.h (modified) (6 diffs)

trunk/gsdl/src/recpt/comtypes.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.19  1999/10/10 07:49:35  sjboddie
+   - metadata now returns map rather than array
+   - redesigned browsing support (although it's not finished
+   so won't currently work ;-)
+
    Revision 1.18  1999/09/07 04:56:54  sjboddie
    added GPL notice
@@ -229 +234 @@
   isRef = false;
   values.erase(values.begin(), values.end());
-  name.clear();
+  parent = NULL;
 }
 

trunk/gsdl/src/recpt/comtypes.h

@@ -197 +197 @@
 // -- any information relating to the terms is in reference to the
 // -- index specified for that term.
-// -- Metadata is presented in the same order that it is requested.
 //
 // FilterRequest ::= SEQUENCE {
@@ -212 +211 @@
 //   refParams           [5] IMPLICIT GeneralString, -- used to decide whether to return a 
 //                                                   -- reference to the data or the actual data
-//   fields              [6] IMPLICIT StringSequence
+//   fields              [6] IMPLICIT StringSet
 //   getParents          [7] IMPLICIT BOOLEAN        -- gets metadata of all parents too
 // }
@@ -234 +233 @@
   text_t requestParams; // empty if not used
   text_t refParams;     // empty if not used
-  text_tarray fields;   // empty if not used
+  text_tset fields;   // empty if not used
   bool getParents;      // defaults to false
 };
@@ -265 +264 @@
   void clear ();
   MetadataInfo_t () {clear();}
-
+  
   text_t params;
   bool isRef;
   text_tarray values;
-  text_t name;
-};
-
-typedef vector<MetadataInfo_t> MetadataInfo_tarray;
-
+  MetadataInfo_t *parent;
+};
+
+typedef map<text_t, MetadataInfo_t, lttext_t> MetadataInfo_tmap;
 
 // ResultDocInfo ::= SEQUENCE {
@@ -279 +277 @@
 //   ranking  [1] IMPLICIT INTEGER,             -- 0 if not requested, range 0-10000
 //   docFreq  [2] IMPLICIT SEQUENCE OF INTEGER, -- empty if not requested
-//   metadata [3] IMPLICIT SEQUENCE OF MetadataInfo
+//   metadata [3] IMPLICIT SEQUENCE OF MetadataInfo -- no longer a SEQUENCE (SET maybe??)
 // }
 struct ResultDocInfo_t {
@@ -292 +290 @@
 
   vector<int> docFreq; // empty if not requested
-  MetadataInfo_tarray metadata; // empty if not requested
+  MetadataInfo_tmap metadata; // empty if not requested
 
   ResultDocInfo_t &operator=(const ResultDocInfo_t &x);