Changeset 16007

Timestamp:

2008-06-13T15:37:57+12:00 (16 years ago)

Author:

mdewsnip

Message:

(Adding dynamic classifiers) Changed the parameters to output_document_nodes() slightly in order to make it easier to use in the future.

Location:

gsdl/trunk/src/recpt

Files:

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

gsdl/trunk/src/recpt/dynamicclassifieraction.cpp

@@ -226 +226 @@
 
   // Get all the documents at this level
-  FilterResponse_t document_OIDs_response;
-  get_documents_with_metadata_value (metadata_element_name, classifier_node_metadata_value, "dls.Title", args["c"], collectproto, document_OIDs_response, logout);
+  FilterResponse_t documents_response;
+  get_documents_with_metadata_value (metadata_element_name, classifier_node_metadata_value, "dls.Title", args["c"], collectproto, documents_response, logout);
 
   // If there are no classifier nodes or documents at this level then the classifier node value is invalid
-  if (metadata_values_response.docInfo.empty() && document_OIDs_response.docInfo.empty())
+  if (metadata_values_response.docInfo.empty() && documents_response.docInfo.empty())
   {
     textout << outconvert << disp << "Error: Invalid classifier node \"" << classifier_node_OID << "\".\n";
@@ -258 +258 @@
 
   // Display the selected classifier node
-  int classifier_node_numleafdocs = metadata_values_response.docInfo.size() + document_OIDs_response.docInfo.size();
+  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, node_indent, args, collectproto, browsers, disp, outconvert, textout, logout);
   node_indent++;
@@ -277 +277 @@
 
   // Display the documents at this level
-  text_tarray document_OIDs;
-  ResultDocInfo_tarray::iterator document_OID_iterator = document_OIDs_response.docInfo.begin();
-  while (document_OID_iterator != document_OIDs_response.docInfo.end())
-  {
-    document_OIDs.push_back ((*document_OID_iterator).OID);
-    document_OID_iterator++;
-  }
-
-  output_document_nodes (document_OIDs, node_indent, args, collectproto, browsers, disp, outconvert, textout, logout);
+  output_document_nodes (documents_response, node_indent, args, collectproto, browsers, disp, outconvert, textout, logout);
 }
 
@@ -365 +357 @@
 
 
-void dynamicclassifieraction::output_document_nodes (text_tarray document_OIDs, int document_nodes_indent,
+void dynamicclassifieraction::output_document_nodes (FilterResponse_t documents_response, int document_nodes_indent,
                              cgiargsclass &args, recptproto *collectproto,
                              browsermapclass *browsers, displayclass &disp,
@@ -386 +378 @@
   bool use_table = is_table_content (formatlistptr);
 
-  // Request the necessary metadata for the documents
-  FilterResponse_t document_OIDs_response;
-  get_info (document_OIDs, args["c"], args["l"], metadata, getParents, collectproto, document_OIDs_response, logout);
+  // Request the necessary metadata for displaying the documents
+  text_tarray document_OIDs;
+  ResultDocInfo_tarray::iterator document_iterator = documents_response.docInfo.begin();
+  while (document_iterator != documents_response.docInfo.end())
+  {
+    document_OIDs.push_back ((*document_iterator).OID);
+    document_iterator++;
+  }
+  FilterResponse_t document_nodes_response;
+  get_info (document_OIDs, args["c"], args["l"], metadata, getParents, collectproto, document_nodes_response, logout);
 
   // Display the document nodes
-  bptr->output_section_group (document_OIDs_response, args, args["c"], document_nodes_indent, formatlistptr, use_table, metadata, getParents, collectproto, disp, outconvert, textout, logout);
-}
+  bptr->output_section_group (document_nodes_response, args, args["c"], document_nodes_indent, formatlistptr, use_table, metadata, getParents, collectproto, disp, outconvert, textout, logout);
+}

gsdl/trunk/src/recpt/dynamicclassifieraction.h

@@ -83 +83 @@
                    ostream &logout);
 
-  void output_document_nodes (text_tarray document_OIDs, int document_nodes_indent,
+  void output_document_nodes (FilterResponse_t documents_response, int document_nodes_indent,
                   cgiargsclass &args, recptproto *collectproto,
                   browsermapclass *browsers, displayclass &disp,