← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table_function_container.cc

  • Committer: Monty Taylor
  • Date: 2010-07-19 05:06:59 UTC
  • mto: (1662.1.2 rollup)
  • mto: This revision was merged to the branch mainline in revision 1663.
  • Revision ID: mordred@inaugust.com-20100719050659-if3thz0k66m1jkaf
Backed out two bits that snuck in to the merge.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table_function_container.cc
1
1
/* - mode: c; c-basic-offset: 2; indent-tabs-mode: nil; -*-
2
2
 *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
3
3
 *
4
 
 *  Copyright (C) 2010 Sun Microsystems, Inc.
 
4
 *  Copyright (C) 2010 Sun Microsystems
5
5
 *
6
6
 *  This program is free software; you can redistribute it and/or modify
7
7
 *  it under the terms of the GNU General Public License as published by
40
40
  return (*iter).second;
41
41
}
42
42
 
43
 
void TableFunctionContainer::getNames(const string &predicate,
 
43
void TableFunctionContainer::getNames(string predicate,
44
44
                                      std::set<std::string> &set_of_names)
45
45
{
 
46
  std::transform(predicate.begin(), predicate.end(),
 
47
                 predicate.begin(), ::tolower);
 
48
 
46
49
  for (ToolMap::iterator it= table_map.begin();
47
50
       it != table_map.end();
48
51
       it++)
49
52
  {
50
53
    plugin::TableFunction *tool= (*it).second;
51
54
 
52
 
    if (tool->visable())
 
55
    if (predicate.length())
53
56
    {
54
 
      if (predicate.length())
55
 
      {
56
 
        if (boost::iequals(predicate, tool->getSchemaHome()))
57
 
        {
58
 
          set_of_names.insert(tool->getTableLabel());
59
 
        }
60
 
      }
61
 
      else
 
57
      if (not predicate.compare(tool->getSchemaHome()))
62
58
      {
63
59
        set_of_names.insert(tool->getTableLabel());
64
60
      }
65
61
    }
 
62
    else
 
63
    {
 
64
      set_of_names.insert(tool->getTableLabel());
 
65
    }
66
66
  }
67
67
}
68
68
 
69
69
void TableFunctionContainer::addFunction(plugin::TableFunction *tool)
70
70
{
71
 
  std::pair<ToolMap::iterator, bool> ret=
72
 
    table_map.insert(std::make_pair(tool->getPath(), tool));
 
71
  std::pair<ToolMap::iterator, bool> ret;
 
72
 
 
73
  ret= table_map.insert(std::make_pair(tool->getPath(), tool));
73
74
  assert(ret.second == true);
74
75
}
75
76