Changeset 16056

Timestamp:

2008-06-18T16:11:13+12:00 (16 years ago)

Author:

mdewsnip

Message:

(Adding dynamic classifiers) Renamed a couple of functions for better descriptiveness.

Location:

gsdl/trunk/src/recpt

Files:

• dynamicclassifieraction.cpp (modified) (6 diffs)
• dynamicclassifieraction.h (modified) (1 diff)

gsdl/trunk/src/recpt/dynamicclassifieraction.cpp

@@ -333 +333 @@
     text_t child_classifier_node_label = (*child_classifier_nodes_iterator).first;
     int child_classifier_node_numleafdocs = (*child_classifier_nodes_iterator).second;
-    output_classifier_node (child_classifier_node_OID, child_classifier_node_label, child_classifier_node_numleafdocs, classifier_node_indent, args, collectproto, browsers, disp, outconvert, textout, logout);
+    display_classifier_node (child_classifier_node_OID, child_classifier_node_label, child_classifier_node_numleafdocs, classifier_node_indent, args, collectproto, browsers, disp, outconvert, textout, logout);
     child_classifier_nodes_iterator++;
   }
@@ -387 +387 @@
     text_t parent_classifier_node_label = *parent_classifier_node_labels_iterator;
     text_t parent_classifier_node_numleafdocs = "?";  // We can't determine this without more database requests
-    output_classifier_node (parent_classifier_node_OID, parent_classifier_node_label, parent_classifier_node_numleafdocs, classifier_node_indent, args, collectproto, browsers, disp, outconvert, textout, logout);
+    display_classifier_node (parent_classifier_node_OID, parent_classifier_node_label, parent_classifier_node_numleafdocs, classifier_node_indent, args, collectproto, browsers, disp, outconvert, textout, logout);
     classifier_node_indent++;
 
@@ -395 +395 @@
   // Display the selected classifier node
   int classifier_node_numleafdocs = metadata_values_response.docInfo.size() + documents_response.docInfo.size();
-  output_classifier_node (classifier_node_OID, classifier_node_label, classifier_node_numleafdocs, classifier_node_indent, args, collectproto, browsers, disp, outconvert, textout, logout);
+  display_classifier_node (classifier_node_OID, classifier_node_label, classifier_node_numleafdocs, classifier_node_indent, args, collectproto, browsers, disp, outconvert, textout, logout);
   classifier_node_indent++;
 
@@ -408 +408 @@
     text_t child_classifier_node_label = (*child_classifier_nodes_iterator).first;
     int child_classifier_node_numleafdocs = (*child_classifier_nodes_iterator).second;
-    output_classifier_node (child_classifier_node_OID, child_classifier_node_label, child_classifier_node_numleafdocs, classifier_node_indent, args, collectproto, browsers, disp, outconvert, textout, logout);
+    display_classifier_node (child_classifier_node_OID, child_classifier_node_label, child_classifier_node_numleafdocs, classifier_node_indent, args, collectproto, browsers, disp, outconvert, textout, logout);
     child_classifier_nodes_iterator++;
   }
 
   // Display the documents at this level
-  output_document_nodes (documents_response, classifier_node_indent, args, collectproto, browsers, disp, outconvert, textout, logout);
+  display_document_nodes (documents_response, classifier_node_indent, args, collectproto, browsers, disp, outconvert, textout, logout);
 }
 
@@ -458 +458 @@
 
 
-void dynamicclassifieraction::output_classifier_node (text_t classifier_node_OID, text_t classifier_node_label,
-                              text_t classifier_node_numleafdocs, int classifier_node_indent,
-                              cgiargsclass &args, recptproto *collectproto,
-                              browsermapclass *browsers, displayclass &disp,
-                              outconvertclass &outconvert, ostream &textout,
-                              ostream &logout)
+void dynamicclassifieraction::display_classifier_node (text_t classifier_node_OID, text_t classifier_node_label,
+                               text_t classifier_node_numleafdocs, int classifier_node_indent,
+                               cgiargsclass &args, recptproto *collectproto,
+                               browsermapclass *browsers, displayclass &disp,
+                               outconvertclass &outconvert, ostream &textout,
+                               ostream &logout)
 {
   // Generate the ResultDocInfo_t containing the information for the classifier node
@@ -493 +493 @@
 
 
-void dynamicclassifieraction::output_document_nodes (FilterResponse_t documents_response, int document_nodes_indent,
-                             cgiargsclass &args, recptproto *collectproto,
-                             browsermapclass *browsers, displayclass &disp,
-                             outconvertclass &outconvert, ostream &textout,
-                             ostream &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)
 {
   // Get the format statement for this classifier if there is one, or use the browser's default otherwise

gsdl/trunk/src/recpt/dynamicclassifieraction.h

@@ -89 +89 @@
                               ResultDocInfo_tarray metadata_values);
 
-  void output_classifier_node (text_t classifier_node_OID, text_t classifier_node_label,
-                   text_t classifier_node_numleafdocs, int classifier_node_indent,
+  void display_classifier_node (text_t classifier_node_OID, text_t classifier_node_label,
+                text_t classifier_node_numleafdocs, int classifier_node_indent,
+                cgiargsclass &args, recptproto *collectproto,
+                browsermapclass *browsers, displayclass &disp,
+                outconvertclass &outconvert, ostream &textout,
+                ostream &logout);
+
+  void 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);
-
-  void output_document_nodes (FilterResponse_t documents_response, int document_nodes_indent,
-                  cgiargsclass &args, recptproto *collectproto,
-                  browsermapclass *browsers, displayclass &disp,
-                  outconvertclass &outconvert, ostream &textout,
-                  ostream &logout);
 };