greenstone.org greenstone wiki greenstone trac planet greenstone

Changeset 16131

Show
Ignore:
Timestamp:
2008-06-24 17:51:53 (5 months ago)
Author:
mdewsnip
Message:

Tidied up a last bit of grouping/hlist code.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r16128 r16131  
    179179 
    180180  // (Optional) Output an hlist to group the classifier nodes into buckets based on the first character 
    181   text_t selected_grouping_node_OID = ""; 
    182181  if (classifier_options["-group_by_first_character"] == "1") 
    183182  { 
    184     selected_grouping_node_OID = output_hlist_classifier_nodes (current_classifier_node_OID, current_metadata_value_filter, "substr(value,1,1)", classifier_options, args, collectproto, browsers, disp, outconvert, textout, logout); 
     183    text_t selected_grouping_node_OID = output_hlist_classifier_nodes (current_classifier_node_OID, current_metadata_value_filter, "substr(value,1,1)", classifier_options, args, collectproto, browsers, disp, outconvert, textout, logout); 
    185184 
    186185    current_classifier_node_OID = selected_grouping_node_OID; 
    …… 
    189188 
    190189  // (Optional) Output an hlist instead of a vlist at the top level 
    191   text_t selected_hlist_node_OID = ""; 
    192190  if (classifier_options["-use_hlist_at_top"] == "1") 
    193191  { 
    194     selected_hlist_node_OID = output_hlist_classifier_nodes (current_classifier_node_OID, current_metadata_value_filter, "", classifier_options, args, collectproto, browsers, disp, outconvert, textout, logout); 
     192    text_t selected_hlist_node_OID = output_hlist_classifier_nodes (current_classifier_node_OID, current_metadata_value_filter, "", classifier_options, args, collectproto, browsers, disp, outconvert, textout, logout); 
    195193 
    196194    current_classifier_node_OID = selected_hlist_node_OID; 
    197     current_metadata_value_filter = selected_hlist_node_OID + "*";  // !! WRONG 
    198195  } 
    199196 
    …… 
    218215 
    219216  // Simple case at the top level: just output the child classifier nodes 
    220   if (classifier_node_OID == selected_grouping_node_OID) 
    221   { 
    222     output_child_classifier_nodes (current_classifier_node_OID, "", current_metadata_value_filter, classifier_node_indent, classifier_options, args, collectproto, browsers, disp, outconvert, textout, logout); 
     217  if (classifier_node_metadata_value == "") 
     218  { 
     219    output_child_classifier_nodes (classifier_node_OID, classifier_node_metadata_value, current_metadata_value_filter, classifier_node_indent, classifier_options, args, collectproto, browsers, disp, outconvert, textout, logout); 
    223220  } 
    224221