Changeset 5225

Timestamp:

2003-08-20T15:54:46+12:00 (21 years ago)

Author:

sjboddie

Message:

Fixed a couple of bugs in recent changes for building/displaying
collections that have no searchable indexes.

Location:

trunk/gsdl

Files:

• perllib/mgbuilder.pm (modified) (1 diff)
• src/recpt/documentaction.cpp (modified) (1 diff)
• src/recpt/pageaction.cpp (modified) (2 diffs)

trunk/gsdl/perllib/mgbuilder.pm

@@ -91 +91 @@
     $self->{'collect_cfg'} = &colcfg::read_collect_cfg ($colcfgname);
 
+    if (!defined($self->{'collect_cfg'}->{'indexes'})) {
+    $self->{'collect_cfg'}->{'indexes'} = [];
+    }
+
     # sort out subcollection indexes
     if (defined $self->{'collect_cfg'}->{'indexsubcollections'}) {

trunk/gsdl/src/recpt/documentaction.cpp

@@ -412 +412 @@
      first = false;
       }
+
+      if (numc == 1) navigationbar += "_imagespacer_";
+
       navigationbar += "\n</nobr>\n";
       navigationbar += "<!-- End of Navigation Bar -->\n";

trunk/gsdl/src/recpt/pageaction.cpp

@@ -842 +842 @@
   } else if (arg_p == "about" || arg_p == "help") {
     if (collectproto == NULL) return;
+
+    comerror_t err;
+    bool has_search_button = true;
+    collectproto->is_searchable(args["c"], has_search_button, err, logout);
+    if (err != noError) has_search_button = true;
     
     // _textbrowseoptions_ and _numbrowseoptions_
@@ -851 +856 @@
     get_children ("", args["c"], metadata, getParents, collectproto, response, logout);
 
-    disp.setmacro ("numbrowseoptions", "help", response.docInfo.size()+1);
+    int numbrowseoptions = response.docInfo.size();
+    if (has_search_button) numbrowseoptions += 1;
+    disp.setmacro ("numbrowseoptions", "help", numbrowseoptions);
 
     ResultDocInfo_tarray::iterator here = response.docInfo.begin();
     ResultDocInfo_tarray::iterator end = response.docInfo.end();
 
-    // we're assuming that we've always got a search button
-    text_t shorttext = "<ul><li>_textSearchshort_\n";
-    text_t longtext = "_textSearchlong_";
+    text_t shorttext;
+    text_t longtext;
+    if (has_search_button) {
+      shorttext = "<ul><li>_textSearchshort_\n";
+      longtext = "_textSearchlong_";
+    }
 
     while (here != end) {