Changeset 16055


Ignore:
Timestamp:
2008-06-18T16:07:34+12:00 (16 years ago)
Author:
mdewsnip
Message:

(Adding dynamic classifiers) Made the classifier_node_indent variable a parameter in preparation for moving the document node display out of output_internal_node().

Location:
gsdl/trunk/src/recpt
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • gsdl/trunk/src/recpt/dynamicclassifieraction.cpp

    r16054 r16055  
    170170    text_t classifier_node_OID = args["dcn"];
    171171    text_t classifier_node_metadata_value = args["dcn"];
    172     output_top_level_node (classifier_node_OID, classifier_node_metadata_value, classifier_options, args, collectproto, browsers, disp, outconvert, textout, logout);
     172    int classifier_node_indent = 0;
     173    output_top_level_node (classifier_node_OID, classifier_node_metadata_value, classifier_node_indent, classifier_options, args, collectproto, browsers, disp, outconvert, textout, logout);
    173174  }
    174175  else
    … …  
    177178    text_t classifier_node_OID = args["dcn"];
    178179    text_t classifier_node_metadata_value = args["dcn"];
    179     output_internal_node (classifier_node_OID, classifier_node_metadata_value, classifier_options, args, collectproto, browsers, disp, outconvert, textout, logout);
     180    int classifier_node_indent = 0;
     181    output_internal_node (classifier_node_OID, classifier_node_metadata_value, classifier_node_indent, classifier_options, args, collectproto, browsers, disp, outconvert, textout, logout);
    180182  }
    181183
    … …  
    298300void dynamicclassifieraction::output_top_level_node (text_t classifier_node_OID,
    299301                             text_t classifier_node_metadata_value,
     302                             int& classifier_node_indent,
    300303                             text_tmap classifier_options, cgiargsclass &args,
    301304                             recptproto *collectproto, browsermapclass *browsers,
    … …  
    330333    text_t child_classifier_node_label = (*child_classifier_nodes_iterator).first;
    331334    int child_classifier_node_numleafdocs = (*child_classifier_nodes_iterator).second;
    332     output_classifier_node (child_classifier_node_OID, child_classifier_node_label, child_classifier_node_numleafdocs, 0, args, collectproto, browsers, disp, outconvert, textout, logout);
     335    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);
    333336    child_classifier_nodes_iterator++;
    334337  }
    … …  
    338341void dynamicclassifieraction::output_internal_node (text_t classifier_node_OID,
    339342                            text_t classifier_node_metadata_value,
     343                            int& classifier_node_indent,
    340344                            text_tmap classifier_options, cgiargsclass &args,
    341345                            recptproto *collectproto, browsermapclass *browsers,
    … …  
    343347                            ostream &textout, ostream &logout)
    344348{
    345   int node_indent = 0;
    346 
    347349  // Get all the classifier nodes at this level
    348350  text_t metadata_element_name = classifier_options["metadata_element_name"];
    … …  
    385387    text_t parent_classifier_node_label = *parent_classifier_node_labels_iterator;
    386388    text_t parent_classifier_node_numleafdocs = "?";  // We can't determine this without more database requests
    387     output_classifier_node (parent_classifier_node_OID, parent_classifier_node_label, parent_classifier_node_numleafdocs, node_indent, args, collectproto, browsers, disp, outconvert, textout, logout);
    388     node_indent++;
     389    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);
     390    classifier_node_indent++;
    389391
    390392    parent_classifier_node_labels_iterator++;
    … …  
    393395  // Display the selected classifier node
    394396  int classifier_node_numleafdocs = metadata_values_response.docInfo.size() + documents_response.docInfo.size();
    395   output_classifier_node (classifier_node_OID, classifier_node_label, classifier_node_numleafdocs, node_indent, args, collectproto, browsers, disp, outconvert, textout, logout);
    396   node_indent++;
     397  output_classifier_node (classifier_node_OID, classifier_node_label, classifier_node_numleafdocs, classifier_node_indent, args, collectproto, browsers, disp, outconvert, textout, logout);
     398  classifier_node_indent++;
    397399
    398400  // After processing any hierarchical metadata values, we're left with the child classifer nodes
    … …  
    406408    text_t child_classifier_node_label = (*child_classifier_nodes_iterator).first;
    407409    int child_classifier_node_numleafdocs = (*child_classifier_nodes_iterator).second;
    408     output_classifier_node (child_classifier_node_OID, child_classifier_node_label, child_classifier_node_numleafdocs, node_indent, args, collectproto, browsers, disp, outconvert, textout, logout);
     410    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);
    409411    child_classifier_nodes_iterator++;
    410412  }
    411413
    412414  // Display the documents at this level
    413   output_document_nodes (documents_response, node_indent, args, collectproto, browsers, disp, outconvert, textout, logout);
     415  output_document_nodes (documents_response, classifier_node_indent, args, collectproto, browsers, disp, outconvert, textout, logout);
    414416}
    415417

  • gsdl/trunk/src/recpt/dynamicclassifieraction.h

    r16054 r16055  
    7272  void output_top_level_node (text_t classifier_node_OID,
    7373                  text_t classifier_node_metadata_value,
     74                  int& classifier_node_indent,
    7475                  text_tmap classifier_options, cgiargsclass &args,
    7576                  recptproto *collectproto, browsermapclass *browsers,
    … …  
    7980  void output_internal_node (text_t classifier_node_OID,
    8081                 text_t classifier_node_metadata_value,
     82                 int& classifier_node_indent,
    8183                 text_tmap classifier_options, cgiargsclass &args,
    8284                 recptproto *collectproto, browsermapclass *browsers,
Note: See TracChangeset for help on using the changeset viewer.