greenstone.org greenstone wiki greenstone trac planet greenstone

Changeset 16181

Show
Ignore:
Timestamp:
2008-06-25 15:45:41 (5 months ago)
Author:
mdewsnip
Message:

Changed a few variable names and comments now that multiple metadata elements are allowed.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r16179 r16181  
    231231 
    232232    // Get the document nodes at this level 
    233     text_t metadata_element_name = classifier_options["metadata_element_name"]; 
     233    text_t metadata_elements = classifier_options["metadata_elements"]; 
    234234    text_t sort_documents_by = classifier_options["-sort_documents_by"]; 
    235235    FilterResponse_t documents_response; 
    236     get_documents_with_metadata_value (metadata_element_name, classifier_node_metadata_value, sort_documents_by, args["c"], collectproto, documents_response, logout); 
     236    get_documents_with_metadata_value (metadata_elements, classifier_node_metadata_value, sort_documents_by, args["c"], collectproto, documents_response, logout); 
    237237 
    238238    // Display the document nodes 
    …… 
    258258  splitchar (classifier_specification.begin(), classifier_specification.end(), ' ', classifier_specification_parts); 
    259259 
    260   // The metadata element to classify by should be the first value 
    261   classifier_options["metadata_element_name"] = classifier_specification_parts.front(); 
     260  // The metadata element(s) to classify by should be the first value 
     261  classifier_options["metadata_elements"] = classifier_specification_parts.front(); 
    262262  classifier_specification_parts.pop_front(); 
    263263 
    …… 
    293293                                                               ostream &textout, ostream &logout) 
    294294{ 
    295   // Get all the metadata values for the specified element that match the filter 
    296   text_t metadata_element_name = classifier_options["metadata_element_name"]; 
     295  // Get all the metadata values for the specified element(s) that match the filter 
     296  text_t metadata_elements = classifier_options["metadata_elements"]; 
    297297  FilterResponse_t metadata_values_response; 
    298   bool request_success = get_metadata_values (metadata_element_name, metadata_value_filter, metadata_value_grouping_expression, args["c"], collectproto, metadata_values_response, logout); 
     298  bool request_success = get_metadata_values (metadata_elements, metadata_value_filter, metadata_value_grouping_expression, args["c"], collectproto, metadata_values_response, logout); 
    299299 
    300300  // If the request failed then it's probably because the collection isn't using an SQL infodbtype 
    …… 
    429429                                                             ostream &textout, ostream &logout) 
    430430{ 
    431   // Get all the metadata values for the specified element that match the filter 
    432   text_t metadata_element_name = classifier_options["metadata_element_name"]; 
     431  // Get all the metadata values for the specified element(s) that match the filter 
     432  text_t metadata_elements = classifier_options["metadata_elements"]; 
    433433  FilterResponse_t metadata_values_response; 
    434   bool request_success = get_metadata_values (metadata_element_name, metadata_value_filter, "", args["c"], collectproto, metadata_values_response, logout); 
     434  bool request_success = get_metadata_values (metadata_elements, metadata_value_filter, "", args["c"], collectproto, metadata_values_response, logout); 
    435435 
    436436  // If the request failed then it's probably because the collection isn't using an SQL infodbtype