Changeset 15795

Timestamp:

2008-05-29T14:59:42+12:00 (16 years ago)

Author:

mdewsnip

Message:

(Adding dynamic classifiers) Changing "dcn" argument to "dcl", and added support for specifying format statements in the collect.cfg file for dynamic classifiers.

File:

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

gsdl/trunk/src/recpt/dynamicclassifieraction.cpp

@@ -33 +33 @@
 
   cgiarginfo arg_ainfo;
-  arg_ainfo.shortname = "dcn";
-  arg_ainfo.longname = "dynamic classifier node";
+  arg_ainfo.shortname = "dcl";
+  arg_ainfo.longname = "dynamic classifier ID";
   arg_ainfo.multiplechar = true;
   arg_ainfo.defaultstatus = cgiarginfo::weak;
@@ -88 +88 @@
                     ostream &logout)
 {
-  // must have a valid collection server
+  // A valid collection server is vital
   recptproto *collectproto = protos->getrecptproto (args["c"], logout);
   if (collectproto == NULL)
@@ -99 +99 @@
   textout << outconvert << disp << "_document:content_\n";
 
-  text_t arg_dcn = args["dcn"];
-  if (arg_dcn.empty())
+  // Check a dynamic classifier ID has been specified
+  text_t arg_dcl = args["dcl"];
+  if (arg_dcl.empty())
   {
-    textout << outconvert << disp << "Error: Missing \"dcn\" value.\n";
+    textout << outconvert << disp << "Error: Missing \"dcl\" value.\n";
     textout << outconvert << disp << "_document:footer_\n";
-    return false;
+    return true;
   }
 
+  // Check the dynamic classifier ID is valid (ie. there is an entry in the collect.cfg file for it)
   ColInfoResponse_t *cinfo = recpt->get_collectinfo_ptr (collectproto, args["c"], logout);
-  if (cinfo->dynamic_classifiers.find(arg_dcn) == cinfo->dynamic_classifiers.end())
+  if (cinfo->dynamic_classifiers.find(arg_dcl) == cinfo->dynamic_classifiers.end())
   {
-    textout << outconvert << disp << "Error: Invalid \"dcn\" value " << arg_dcn << ".\n";
+    textout << outconvert << disp << "Error: Invalid \"dcl\" value " << arg_dcl << ".\n";
     textout << outconvert << disp << "_document:footer_\n";
-    return false;
+    return true;
   }
 
-  text_t metadata_element_name = cinfo->dynamic_classifiers[arg_dcn];
+  text_t classifier_type = "VList";
+  browserclass *bptr = browsers->getbrowser (classifier_type);
+
+  // Get the formatstring if there is one, or use the browser's default otherwise
+  text_t formatstring;
+  if (!get_formatstring (arg_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);
+
+  text_t metadata_element_name = cinfo->dynamic_classifiers[arg_dcl];
   FilterResponse_t metadata_values_response;
   get_metadata_values (metadata_element_name, args["c"], collectproto, metadata_values_response, logout);
@@ -129 +145 @@
   }
 
-  browserclass *bptr = browsers->getbrowser ("VList");
-  text_t formatstring = bptr->get_default_formatstring();
-  format_t *formatlistptr = new format_t();
-  text_tset metadata;
-  bool getParents = false;
-  parse_formatstring (formatstring, formatlistptr, metadata, getParents);
+  // Display the nodes
   bool use_table = is_table_content (formatlistptr);
   bptr->output_section_group (metadata_values_response, args, args["c"], 0, formatlistptr, use_table,