Changeset 941

Timestamp:

2000-02-17T15:42:25+13:00 (24 years ago)

Author:

sjboddie

Message:

minor stuff - fixed some cvs conflicts

Location:

trunk/gsdl/src/recpt

Files:

• browsetools.cpp (modified) (4 diffs)
• browsetools.h (modified) (2 diffs)

trunk/gsdl/src/recpt/browsetools.cpp

@@ -29 +29 @@
 /*
    $Log$
+   Revision 1.38  2000/02/17 02:42:24  sjboddie
+   minor stuff - fixed some cvs conflicts
+
    Revision 1.37  2000/02/15 22:53:47  kjm18
    search history stuff added.
@@ -230 +233 @@
 // server which would send a link to the cover image if there
 // was one otherwise send title, author and stuff
- void output_cover_image (cgiargsclass &args, recptproto * /*collectproto*/, 
-                displayclass &disp, outconvertclass &outconvert, 
-                ostream &textout, ostream &/*logout*/) {
+void output_cover_image (cgiargsclass &args, recptproto * /*collectproto*/, 
+             displayclass &disp, outconvertclass &outconvert, 
+             ostream &textout, ostream &/*logout*/) {
   
   if (args["d"].empty()) return;
@@ -238 +241 @@
   textout << outconvert << disp << 
     "<img src=\"_httpcollection_/archives/_thisOID_/cover.jpg\"><br>\n";
- }
-
- void output_titles (cgiargsclass &args, recptproto *collectproto, 
-               formatinfo_t &formatinfo, displayclass &disp, 
-               outconvertclass &outconvert, ostream &textout, 
-               ostream &logout) {
+}
+
+void output_titles (cgiargsclass &args, recptproto *collectproto, 
+            formatinfo_t &formatinfo, displayclass &disp, 
+            outconvertclass &outconvert, ostream &textout, 
+            ostream &logout) {
 
   if (args["d"].empty()) return;
-
+  
   text_tset metadata;
   bool getParents;
@@ -622 +625 @@
     get_children (OID, args["c"], metadata, getParents,
           collectproto, response, logout);
-  else 
+  else if (!is_top(OID)) {
     get_children (OID + ".pr", args["c"], metadata, getParents, 
           collectproto, response, logout);
+    haschildren = true;
+  }
 
   // display children
-  bool use_table = is_table_content (formatlistptr);
-  bptr->output_section_group (response, args, "", tabcount, formatlistptr, use_table, 
-                  metadata, getParents, collectproto, disp, outconvert, 
-                  textout, logout);
+  if (haschildren) {
+    bool use_table = is_table_content (formatlistptr);
+    bptr->output_section_group (response, args, "", tabcount, formatlistptr, use_table, 
+                metadata, getParents, collectproto, disp, outconvert, 
+                textout, logout);
+  }
   
   delete formatlistptr;

trunk/gsdl/src/recpt/browsetools.h

@@ -45 +45 @@
             outconvertclass &outconvert, ostream &textout, 
             ostream &logout);
+
 void contracted_contents (cgiargsclass &args, int tabcount, bool fulltoc, 
               browsermapclass *browsermap, formatinfo_t &formatinfo, 
@@ -56 +57 @@
                  ostream &textout, ostream &logout);
 
+void output_titles (cgiargsclass &args, recptproto *collectproto, 
+            formatinfo_t &formatinfo, displayclass &disp, 
+            outconvertclass &outconvert, ostream &textout, 
+            ostream &logout);
 
-// output_controls displays the detach, expand/contract contents,
-// expand/contract text and highlighting/no highlighting buttons
- void output_controls (cgiargsclass &args, const text_tarray &ibuttons,
-                 recptproto * /*collectproto*/, displayclass &disp, 
-                 outconvertclass &outconvert, ostream &textout, 
-                 ostream &/*logout*/);
+void output_controls (cgiargsclass &args, const text_tarray &ibuttons,
+              recptproto *collectproto, displayclass &disp, 
+              outconvertclass &outconvert, ostream &textout, 
+              ostream &logout);
     
- void output_cover_image (cgiargsclass &args, recptproto * /*collectproto*/, 
-                displayclass &disp, outconvertclass &outconvert, 
-                ostream &textout, ostream &/*logout*/);
-
- void output_titles (cgiargsclass &args, recptproto *collectproto, 
-               formatinfo_t &formatinfo, displayclass &disp, 
-               outconvertclass &outconvert, ostream &textout, 
-               ostream &logout);
-void contracted_contents (cgiargsclass &args, int tabcount, bool fulltoc, 
-                 browsermapclass *browsermap, formatinfo_t &formatinfo, 
-                 recptproto *collectproto, displayclass &disp, 
-                 outconvertclass &outconvert, ostream &textout, 
-                 ostream &logout);
-
- void expanded_contents (cgiargsclass &args, int tabcount, bool fulltoc,
-                   browsermapclass *browsermap, formatinfo_t &formatinfo, 
-                   recptproto *collectproto, displayclass &disp, 
-                   outconvertclass &outconvert, ostream &textout, 
-                   ostream &logout);
+void output_cover_image (cgiargsclass &args, recptproto *collectproto, 
+             displayclass &disp, outconvertclass &outconvert, 
+             ostream &textout, ostream &logout);