Changeset 730 for trunk/gsdl

Timestamp:

1999-10-20T16:54:21+13:00 (25 years ago)

Author:

sjboddie

Message:

problem with expanded contents

Location:

trunk/gsdl/src/recpt

Files:

• browsetools.cpp (modified) (3 diffs)
• hlistbrowserclass.cpp (modified) (2 diffs)

trunk/gsdl/src/recpt/browsetools.cpp

@@ -29 +29 @@
 /*
    $Log$
+   Revision 1.31  1999/10/20 03:54:20  sjboddie
+   problem with expanded contents
+
    Revision 1.30  1999/10/19 21:36:59  sjboddie
    fixed bug in DocumentContents
@@ -289 +292 @@
   int haschildren = section.metadata["haschildren"].values[0].getint();
   const text_t &doctype = section.metadata["doctype"].values[0];
-  text_t classifytype = section.metadata["classifytype"].values[0];
+  text_t classifytype = section.metadata["childtype"].values[0];
   // HLists are displayed as VLists when contents are expanded,
   // Paged documents are displayed as HLists
@@ -383 +386 @@
 
   // HLists are displayed as VLists when contents are expanded,
-  // Books are displayed as HLists
+  // Paged documents are displayed as HLists
   if (classifytype == "HList") classifytype = "VList";
-  if (classifytype == "Book") classifytype = "HList";
+  if (classifytype == "Paged") classifytype = "HList";
 
   metadata.erase (metadata.begin(), metadata.end());
           
   // metadata elements needed by recurse_contents
-  metadata.insert ("classifytype");
+  metadata.insert ("childtype");
   metadata.insert ("doctype");
   metadata.insert ("haschildren");

trunk/gsdl/src/recpt/hlistbrowserclass.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.3  1999/10/20 03:54:21  sjboddie
+   problem with expanded contents
+
    Revision 1.2  1999/10/14 22:59:34  sjboddie
    finished off browser classes
@@ -98 +101 @@
                          outconvertclass &outconvert, ostream &textout, ostream &logout) {
 
+  // expanded contents are going to cause some nasty recursions
+  // so we'll only continue if being passed the current section
+  if ((args["gc"] == 1) && (section.OID != args["d"])) return 0;
+
   // get all siblings
   FilterResponse_t response;