Changeset 15834

Timestamp:

2008-05-30T14:31:36+12:00 (16 years ago)

Author:

mdewsnip

Message:

(Adding dynamic classifiers) Now displays the parent classifier node as well as the documents.

File:

• gsdl/trunk/src/recpt/dynamicclassifieraction.cpp (modified) (4 diffs)

gsdl/trunk/src/recpt/dynamicclassifieraction.cpp

@@ -111 +111 @@
   if (arg_dcl.empty())
   {
-    textout << outconvert << disp << "Error: Missing \"dcl\" value.\n";
+    textout << outconvert << disp << "Error: Missing dcl argument.\n";
     textout << outconvert << disp << "_document:footer_\n";
     return true;
@@ -120 +120 @@
   if (cinfo->dynamic_classifiers.find(arg_dcl) == cinfo->dynamic_classifiers.end())
   {
-    textout << outconvert << disp << "Error: Invalid \"dcl\" value " << arg_dcl << ".\n";
+    textout << outconvert << disp << "Error: Invalid dcl value \"" << arg_dcl << "\".\n";
     textout << outconvert << disp << "_document:footer_\n";
     return true;
@@ -170 +170 @@
     get_documents_with_metadata_value (metadata_element_name, metadata_value, args["c"], collectproto, document_OIDs_response, logout);
 
+    // Check the metadata value is valid
+    if (document_OIDs_response.docInfo.empty())
+    {
+      textout << outconvert << disp << "Error: No documents have metadata value \"" << arg_dcn << "\".\n";
+      textout << outconvert << disp << "_document:footer_\n";
+      return true;
+    }
+
     // Make an array of matching document OIDs
     text_tarray document_OIDs;
@@ -179 +187 @@
     }
 
-    // Request the necessary metadata for these documents
+    // Display the classifier node
+    ResultDocInfo_t classifier_node;
+    classifier_node.OID = arg_dcn;
+    classifier_node.metadata["doctype"].values.push_back("classify");
+    classifier_node.metadata["haschildren"].values.push_back("1");
+    classifier_node.metadata["numleafdocs"].values.push_back(document_OIDs.size());
+    classifier_node.metadata["Title"].values.push_back(classifier_node.OID);
+    bptr->output_section_group (classifier_node, args, args["c"], 0, formatlistptr, use_table, metadata, getParents, collectproto, disp, outconvert, textout, logout);
+
+    // Request the necessary metadata for the documents under this node
     FilterResponse_t document_info_response;
     get_info (document_OIDs, args["c"], args["l"], metadata, getParents, collectproto, document_info_response, logout);
 
     // Display the document nodes
-    bptr->output_section_group (document_info_response, args, args["c"], 0, formatlistptr, use_table, metadata, getParents, collectproto, disp, outconvert, textout, logout);
+    bptr->output_section_group (document_info_response, args, args["c"], 1, formatlistptr, use_table, metadata, getParents, collectproto, disp, outconvert, textout, logout);
   }