Changeset 10988 for trunk/gsdl

Timestamp:

2005-12-14T12:30:46+13:00 (18 years ago)

Author:

mdewsnip

Message:

Fixed a bug where entering an invalid "gp" value with a top-level "d" value would go to a bad page. Also removed the restriction that the "gp" value has to be numeric, since I have "i", "ii", "iii", "iv" etc. Title values.

File:

• trunk/gsdl/src/recpt/pagedbrowserclass.cpp (modified) (2 diffs)

trunk/gsdl/src/recpt/pagedbrowserclass.cpp

@@ -65 +65 @@
   FilterResponse_t response;
 
-  if ((!arg_d.empty()) && (!arg_gp.empty()) && (is_number (arg_gp))) {
+  if (!arg_d.empty() && !arg_gp.empty()) {
     text_t top;
     get_top (arg_d, top);
@@ -75 +75 @@
       if ((*dochere).metadata["Title"].values[0] == arg_gp) {
         arg_d = (*dochere).OID;
-        break;
+        return;
       }
       ++dochere;
     }
-
-  } else if (!arg_d.empty() && is_top(arg_d)) { // if top level doc, check if not invisible
+  }
+
+  // The "gp" argument was either empty or invalid, so display the first child if given a document OID
+  if (!arg_d.empty() && is_top(arg_d)) { // if top level doc, check if not invisible
     metadata.insert("thistype");
     if (get_info(arg_d, args["c"], args["l"], metadata, getParents, collectproto, response, logout)) {