Author: rhafer Date: Fri Jun 27 15:58:58 2008 New Revision: 48623 URL: http://svn.opensuse.org/viewcvs/yast?rev=48623&view=rev Log: Renamed ambigous getIndex() methods Modified: trunk/ldap-server/src/agent/SlapdConfigAgent.cc trunk/ldap-server/src/lib/backConfigTest.cpp trunk/ldap-server/src/lib/backConfigTest.h Modified: trunk/ldap-server/src/agent/SlapdConfigAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/agent/SlapdConfigAgent.cc?rev=48623&r1=48622&r2=48623&view=diff ============================================================================== --- trunk/ldap-server/src/agent/SlapdConfigAgent.cc (original) +++ trunk/ldap-server/src/agent/SlapdConfigAgent.cc Fri Jun 27 15:58:58 2008 @@ -331,7 +331,7 @@ YCPMap ymap; ymap.add( YCPString("suffix"), YCPString((*i)->getSuffix()) ); ymap.add( YCPString("type"), YCPString((*i)->getType()) ); - ymap.add( YCPString("index"), YCPInteger((*i)->getIndex()) ); + ymap.add( YCPString("index"), YCPInteger((*i)->getEntryIndex()) ); dbList.add(ymap); } return dbList; @@ -365,7 +365,7 @@ OlcDatabaseList::const_iterator i; for ( i = databases.begin(); i != databases.end() ; i++ ) { - if ( (*i)->getIndex() == dbIndex ) + if ( (*i)->getEntryIndex() == dbIndex ) { YCPMap resMap; if ( path->length() == 1 ) @@ -380,7 +380,7 @@ } else { std::string dbComponent = path->component_str(1); y2milestone("Component %s ", dbComponent.c_str()); - IndexMap idx = (*i)->getIndexes(); + IndexMap idx = (*i)->getDatabaseIndexes(); IndexMap::const_iterator j = idx.begin(); for ( ; j != idx.end(); j++ ) { @@ -618,7 +618,7 @@ OlcDatabaseList::const_iterator i; for ( i = databases.begin(); i != databases.end() ; i++ ) { - if ( (*i)->getIndex() == dbIndex ) + if ( (*i)->getEntryIndex() == dbIndex ) { if ( path->length() == 1 ) { @@ -634,7 +634,7 @@ { std::vector<IndexType> idx; std::string attr( arg->asMap()->value(YCPString("name"))->asString()->value_cstr() ); - y2milestone("New Index for Attribute: '%s'", attr.c_str() ); + y2milestone("Edit Index for Attribute: '%s'", attr.c_str() ); if ( arg->asMap()->value(YCPString("pres"))->asBoolean()->value() == true ) { idx.push_back(Present); Modified: trunk/ldap-server/src/lib/backConfigTest.cpp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/lib/backConfigTest.cpp?rev=48623&r1=48622&r2=48623&view=diff ============================================================================== --- trunk/ldap-server/src/lib/backConfigTest.cpp (original) +++ trunk/ldap-server/src/lib/backConfigTest.cpp Fri Jun 27 15:58:58 2008 @@ -65,7 +65,7 @@ OlcBdbDatabase::OlcBdbDatabase( const LDAPEntry& le) : OlcDatabase(le) { } -IndexMap OlcBdbDatabase::getIndexes() const +IndexMap OlcBdbDatabase::getDatabaseIndexes() const { const LDAPAttributeList *al = m_dbEntryChanged.getAttributes(); const LDAPAttribute *attr = al->getAttributeByName("olcdbindex"); @@ -490,7 +490,7 @@ this->updateEntryDn(); } -int OlcConfigEntry::getIndex() const +int OlcConfigEntry::getEntryIndex() const { return this->entryIndex; } @@ -998,7 +998,7 @@ if ( dbEntry ) { std::cout << "Got DBEntry: " << dbEntry->getDN() << std::endl; OlcBdbDatabase db(*dbEntry); - OlcBdbDatabase::IndexMap idx = db.getIndexes(); + OlcBdbDatabase::IndexMap idx = db.getDatabaseIndexes(); OlcBdbDatabase::IndexMap::const_iterator i = idx.find("cn"); std::cout << "Idx: " << i->second[0] << " " << OlcBdbDatabase::Eq << std::endl; Modified: trunk/ldap-server/src/lib/backConfigTest.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/lib/backConfigTest.h?rev=48623&r1=48622&r2=48623&view=diff ============================================================================== --- trunk/ldap-server/src/lib/backConfigTest.h (original) +++ trunk/ldap-server/src/lib/backConfigTest.h Fri Jun 27 15:58:58 2008 @@ -50,7 +50,7 @@ void setIndex( int index ); void getEntryDn(); - int getIndex() const; + int getEntryIndex() const; virtual std::map<std::string, std::list<std::string> > toMap() const; virtual std::string toLdif() const; @@ -96,7 +96,7 @@ const std::string getType() const; virtual std::map<std::string, std::list<std::string> > toMap() const; - virtual IndexMap getIndexes() const {}; + virtual IndexMap getDatabaseIndexes() const {}; virtual void addIndex(const std::string& attr, const std::vector<IndexType>& idx) {}; @@ -114,7 +114,7 @@ virtual std::map<std::string, std::list<std::string> > toMap() const; void setDirectory( const std::string &dir); - virtual IndexMap getIndexes() const; + virtual IndexMap getDatabaseIndexes() const; virtual void addIndex(const std::string& attr, const std::vector<IndexType>& idx); }; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org