Changeset 649 for trunk/gsdl/src/recpt/OIDtools.cpp

Timestamp:

1999-10-10T21:14:12+13:00 (25 years ago)

Author:

sjboddie

Message:

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

won't currently work ;-)

File:

• trunk/gsdl/src/recpt/OIDtools.cpp (modified) (9 diffs)

trunk/gsdl/src/recpt/OIDtools.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.17  1999/10/10 08:14:02  sjboddie
+   - metadata now returns mp rather than array
+   - redesigned browsing support (although it's not finished so
+   won't currently work ;-)
+
    Revision 1.16  1999/09/07 04:56:51  sjboddie
    added GPL notice
@@ -135 +140 @@
 
 // get_info does a protocol call and returns (in response) the metadata 
-// associated with OID. The metadata array should be loaded with whatever
+// associated with OID. Metadata should be loaded with whatever
 // metadata fields are to be requested.
 
 bool get_info (const text_t &OID, const text_t &collection,
-           const text_tarray &metadata, bool getParents,
+           const text_tset &metadata, bool getParents,
            recptproto *collectproto, FilterResponse_t &response, 
            ostream &logout) {
@@ -163 +168 @@
     return false;
   }
-
-  // check the result to make sure we have the right amount of metadata
-  if (!response.docInfo.empty() &&
-      response.docInfo[0].metadata.size() != metadata.size()) return false;
   
   return true;
@@ -172 +173 @@
 
 bool get_info (const text_tarray &OIDs, const text_t &collection,
-           const text_tarray &metadata, bool getParents,
+           const text_tset &metadata, bool getParents,
            recptproto *collectproto, FilterResponse_t &response, 
            ostream &logout) {
@@ -198 +199 @@
   }
 
-  // check the result to make sure we have the right amount of metadata
-  if (!response.docInfo.empty() &&
-      response.docInfo[0].metadata.size() != metadata.size()) return false;
-
   return true;
 }
@@ -210 +207 @@
 
   FilterResponse_t response;
-  text_tarray metadata;
-  metadata.push_back ("haschildren");
+  text_tset metadata;
+  metadata.insert ("haschildren");
 
   if (get_info (OID, collection, metadata, false, collectproto, response, logout)) {
-    if (response.docInfo[0].metadata[0].values[0] == "1")
+    if (response.docInfo[0].metadata["haschildren"].values[0] == "1")
       return true;
   }
@@ -222 +219 @@
 
 // get_children does a protocol call and returns (in response) the OIDs and 
-// metadata of all the children of OID. The metadata array should be loaded
+// metadata of all the children of OID. The metadata set should be loaded
 // with whatever metadata fields are to be requested.
 
 bool get_children (const text_t &OID, const text_t &collection, 
-           const text_tarray &metadata, bool getParents,
+           const text_tset &metadata, bool getParents,
            recptproto *collectproto, FilterResponse_t &response, 
            ostream &logout) {
@@ -323 +320 @@
 }
 
-void recurse_contents (const ResultDocInfo_t section, const bool &classify, 
-               int &totalcols, const text_t &collection, 
-               const text_tarray &metadata, recptproto *collectproto, 
-               FilterResponse_t &response, ostream &logout) {
-  
-  int metasize = section.metadata.size();
-
-  int haschildren = section.metadata[metasize-2].values[0].getint();
-  const text_t &doctype = section.metadata[metasize-1].values[0];
-  int cols;
-
-  if ((haschildren == 1) && ((!classify) || (doctype == "classify"))) {
-    text_t parent = response.docInfo.back().OID;
-    int parentcols = countchar (parent.begin(), parent.end(), '.');
+static void recurse_contents (ResultDocInfo_t section, const bool &is_classify, 
+                  const text_t &collection, const text_tset &metadata, 
+                  recptproto *collectproto, FilterResponse_t &response, 
+                  ostream &logout) {
+
+  int haschildren = section.metadata["haschildren"].values[0].getint();
+  const text_t &doctype = section.metadata["doctype"].values[0];
+
+  if ((haschildren == 1) && ((!is_classify) || (doctype == "classify"))) {
     FilterResponse_t tmp;
     bool getParents = false;
     get_children (section.OID, collection, metadata, getParents, collectproto, tmp, logout);
-    ResultDocInfo_tarray::const_iterator thisdoc = tmp.docInfo.begin();
-    ResultDocInfo_tarray::const_iterator lastdoc = tmp.docInfo.end();
+    ResultDocInfo_tarray::iterator thisdoc = tmp.docInfo.begin();
+    ResultDocInfo_tarray::iterator lastdoc = tmp.docInfo.end();
     while (thisdoc != lastdoc) {
-      if (((*thisdoc).metadata[metasize-1].values[0] != "classify") && (classify))
-    cols = parentcols + 1;
-      else 
-    cols = countchar ((*thisdoc).OID.begin(), (*thisdoc).OID.end(), '.');
-      if (cols > totalcols) totalcols = cols;
       response.docInfo.push_back (*thisdoc);
-      recurse_contents (*thisdoc, classify, totalcols, collection, 
-            metadata, collectproto, response, logout);
+      recurse_contents (*thisdoc, is_classify, collection, metadata, 
+            collectproto, response, logout);
       thisdoc ++;
     }
@@ -358 +345 @@
 // get_contents returns OIDs and metadata of all contents 
 // below (and including) OID.
-void get_contents (const text_t &topOID, const text_t &classifytype, 
-           text_tarray &metadata, int &totalcols,
-           const text_t &collection, recptproto *collectproto, 
-           FilterResponse_t &response, ostream &logout) {
+void get_contents (const text_t &topOID, const bool &is_classify, 
+           text_tset &metadata, const text_t &collection, 
+           recptproto *collectproto, FilterResponse_t &response, 
+           ostream &logout) {
 
   if (topOID.empty()) return;
-  bool classify = false;
   response.clear();
 
-  metadata.push_back("haschildren");
-  metadata.push_back("doctype");
-
-  // we don't want to recurse all the way down through each document
-  // if we're expanding top level contents
-  if (classifytype == "classify") classify = true;
-
-  // update totalcols
-  totalcols = countchar (topOID.begin(), topOID.end(), '.');
+  metadata.insert ("haschildren");
+  metadata.insert ("doctype");
 
   // get topOIDs info
   if (get_info (topOID, collection, metadata, false, collectproto, response, logout))
-      recurse_contents (response.docInfo[0], classify, totalcols, collection, 
+      recurse_contents (response.docInfo[0], is_classify, collection, 
             metadata, collectproto, response, logout);
 }