Changeset 16107

Timestamp:

2008-06-23T16:26:59+12:00 (16 years ago)

Author:

mdewsnip

Message:

Adding a new argument to display_classifier_nodes() for indicating whether an HList or VList should be output, in preparation for adding top-level hlist support.

Location:

gsdl/trunk/src/recpt

Files:

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

gsdl/trunk/src/recpt/dynamicclassifieraction.cpp

@@ -361 +361 @@
     FilterResponse_t upper_classifier_node_response;
     upper_classifier_node_response.docInfo.push_back(upper_classifier_node);
-    display_classifier_nodes (upper_classifier_node_response, classifier_node_indent, args, collectproto, browsers, disp, outconvert, textout, logout);
+    display_classifier_nodes (upper_classifier_node_response, "VList", classifier_node_indent, args, collectproto, browsers, disp, outconvert, textout, logout);
     classifier_node_indent++;
 
@@ -445 +445 @@
   }
 
-  display_classifier_nodes (child_classifier_nodes_response, classifier_node_indent, args, collectproto, browsers, disp, outconvert, textout, logout);
+  display_classifier_nodes (child_classifier_nodes_response, "VList", classifier_node_indent, args, collectproto, browsers, disp, outconvert, textout, logout);
 }
 
 
 void dynamicclassifieraction::display_classifier_nodes (FilterResponse_t classifier_nodes_response,
-                                int classifier_node_indent,
+                                text_t classifier_nodes_type,
+                            int classifier_nodes_indent,
                             cgiargsclass &args, recptproto *collectproto,
                             browsermapclass *browsers, displayclass &disp,
@@ -458 +459 @@
   // Check there are some classifier nodes to display
   if (classifier_nodes_response.docInfo.empty()) return;
+
+  // Get the format statement for this classifier if there is one, or use the browser's default otherwise
+  text_t formatstring;
+  browserclass *bptr = browsers->getbrowser (classifier_nodes_type);
+  ColInfoResponse_t *cinfo = recpt->get_collectinfo_ptr (collectproto, args["c"], logout);
+  if (!get_formatstring (args["dcl"], classifier_nodes_type, cinfo->format, formatstring))
+  {
+    formatstring = bptr->get_default_formatstring();
+  }
+  format_t *formatlistptr = new format_t();
+  text_tset metadata;
+  bool getParents = false;
+  parse_formatstring (formatstring, formatlistptr, metadata, getParents);
+  bool use_table = is_table_content (formatlistptr);
+
+  // Display the classifier nodes
+  bptr->output_section_group (classifier_nodes_response, args, args["c"], classifier_nodes_indent, formatlistptr, use_table, metadata, getParents, collectproto, disp, outconvert, textout, logout);
+}
+
+
+void dynamicclassifieraction::display_document_nodes (FilterResponse_t documents_response,
+                              int document_nodes_indent,
+                              cgiargsclass &args, recptproto *collectproto,
+                              browsermapclass *browsers, displayclass &disp,
+                              outconvertclass &outconvert, ostream &textout,
+                              ostream &logout)
+{
+  // Check there are some documents to display
+  if (documents_response.docInfo.empty()) return;
 
   // Get the format statement for this classifier if there is one, or use the browser's default otherwise
@@ -474 +504 @@
   bool use_table = is_table_content (formatlistptr);
 
-  // Display the classifier nodes
-  bptr->output_section_group (classifier_nodes_response, args, args["c"], classifier_node_indent, formatlistptr, use_table, metadata, getParents, collectproto, disp, outconvert, textout, logout);
-}
-
-
-void dynamicclassifieraction::display_document_nodes (FilterResponse_t documents_response, int document_nodes_indent,
-                              cgiargsclass &args, recptproto *collectproto,
-                              browsermapclass *browsers, displayclass &disp,
-                              outconvertclass &outconvert, ostream &textout,
-                              ostream &logout)
-{
-  // Check there are some documents to display
-  if (documents_response.docInfo.empty()) return;
-
-  // Get the format statement for this classifier if there is one, or use the browser's default otherwise
-  text_t formatstring;
-  text_t classifier_type = "VList";
-  browserclass *bptr = browsers->getbrowser (classifier_type);
-  ColInfoResponse_t *cinfo = recpt->get_collectinfo_ptr (collectproto, args["c"], logout);
-  if (!get_formatstring (args["dcl"], classifier_type, cinfo->format, formatstring))
-  {
-    formatstring = bptr->get_default_formatstring();
-  }
-  format_t *formatlistptr = new format_t();
-  text_tset metadata;
-  bool getParents = false;
-  parse_formatstring (formatstring, formatlistptr, metadata, getParents);
-  bool use_table = is_table_content (formatlistptr);
-
   // Request the necessary metadata for displaying the documents
   text_tarray document_OIDs;

gsdl/trunk/src/recpt/dynamicclassifieraction.h

@@ -95 +95 @@
 
   void display_classifier_nodes (FilterResponse_t classifier_nodes_response,
-                 int classifier_node_indent,
+                 text_t classifier_nodes_type,
+                 int classifier_nodes_indent,
                  cgiargsclass &args, recptproto *collectproto,
                  browsermapclass *browsers, displayclass &disp,
@@ -101 +102 @@
                  ostream &logout);
 
-  void display_document_nodes (FilterResponse_t documents_response, int document_nodes_indent,
+  void display_document_nodes (FilterResponse_t documents_response,
+                   int document_nodes_indent,
                    cgiargsclass &args, recptproto *collectproto,
                    browsermapclass *browsers, displayclass &disp,