Author: rhafer Date: Fri Jun 27 15:59:02 2008 New Revision: 48624 URL: http://svn.opensuse.org/viewcvs/yast?rev=48624&view=rev Log: splitted parsing of olcindex Values into separater functions Modified: trunk/ldap-server/src/lib/backConfigTest.cpp trunk/ldap-server/src/lib/backConfigTest.h Modified: trunk/ldap-server/src/lib/backConfigTest.cpp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/lib/backConfigTes... ============================================================================== --- trunk/ldap-server/src/lib/backConfigTest.cpp (original) +++ trunk/ldap-server/src/lib/backConfigTest.cpp Fri Jun 27 15:59:02 2008 @@ -65,6 +65,52 @@ OlcBdbDatabase::OlcBdbDatabase( const LDAPEntry& le) : OlcDatabase(le) { } +inline void splitIndexString( const std::string &indexString, std::string &attr, std::string &indexes ) +{ + std::string::size_type pos = indexString.find_first_of(" \t"); + attr = indexString.substr(0, pos); + std::cout << "AttributeType: <" << attr << ">" << std::endl; + if ( pos != std::string::npos ) { + pos = indexString.find_first_not_of(" \t", pos); + if ( pos != std::string::npos ) { + indexes = indexString.substr( pos, std::string::npos ); + } + } +} + +inline std::vector<IndexType> indexString2Type( const std::string &indexes ) +{ + std::string::size_type pos, oldpos = 0; + std::vector<IndexType> idx; + do { + pos = indexes.find( ',', oldpos ); + std::string index = indexes.substr( oldpos, + (pos == std::string::npos ? std::string::npos : pos - oldpos) ); + std::cout << "Index: <" << index << ">" << std::endl; + oldpos = indexes.find_first_not_of( ", ", pos ); + if ( index == "pres" ) { + idx.push_back(Present); + } else if (index == "eq" ) { + idx.push_back(Eq); + } else if (index == "approx" ) { + idx.push_back(Approx); + } else if (index == "sub" ) { + idx.push_back(Sub); + } else if (index == "subinital" ) { + idx.push_back(SpecialSubInitial); + } else if (index == "subany" ) { + idx.push_back(SpecialSubAny); + } else if (index == "subfinal" ) { + idx.push_back(SpecialSubFinal); + } else if (index == "nolang" ) { + idx.push_back(SpecialNoLang); + } else if (index == "nosubtypes" ) { + idx.push_back(SpecialNoSubTypes); + } + } while (pos != std::string::npos); + return idx; +} + IndexMap OlcBdbDatabase::getDatabaseIndexes() const { const LDAPAttributeList *al = m_dbEntryChanged.getAttributes(); @@ -77,46 +123,35 @@ StringList sl = attr->getValues(); StringList::const_iterator i; for (i = sl.begin(); i != sl.end(); i++ ) { - std::cout << "Index Value: " << *i << std::endl; - std::string::size_type pos = i->find_first_of(" \t"); - std::string attrType = i->substr(0, pos); - std::cout << "AttributeType: <" << attrType << ">" << std::endl; + std::string attrType; std::string indexes; - if ( pos != std::string::npos ) { - pos = i->find_first_not_of(" \t", pos); - if ( pos != std::string::npos ) { - indexes = i->substr( pos, std::string::npos ); - std::cout << "Indexes: <" << indexes << ">" << std::endl; - std::string::size_type oldpos = 0; - std::vector<IndexType> idx; - do { - pos = indexes.find( ',', oldpos ); - std::string index = indexes.substr( oldpos, - (pos == std::string::npos ? std::string::npos : pos - oldpos) ); - std::cout << "Index: <" << index << ">" << std::endl; - oldpos = indexes.find_first_not_of( ", ", pos ); - if ( index == "pres" ) { - idx.push_back(Present); - } else if (index == "eq" ) { - idx.push_back(Eq); - } else if (index == "approx" ) { - idx.push_back(Approx); - } else if (index == "sub" ) { - idx.push_back(Sub); - } else if (index == "subinital" ) { - idx.push_back(SpecialSubInitial); - } else if (index == "subany" ) { - idx.push_back(SpecialSubAny); - } else if (index == "subfinal" ) { - idx.push_back(SpecialSubFinal); - } else if (index == "nolang" ) { - idx.push_back(SpecialNoLang); - } else if (index == "nosubtypes" ) { - idx.push_back(SpecialNoSubTypes); - } - } while (pos != std::string::npos); - res.insert(make_pair(attrType, idx)); - } + splitIndexString(*i, attrType, indexes ); + std::cout << "Indexes: <" << indexes << ">" << std::endl; + std::vector<IndexType> idx = indexString2Type(indexes); + res.insert(make_pair(attrType, idx)); + } + return res; +} + +std::vector<IndexType> OlcBdbDatabase::getDatabaseIndex( const std::string &type ) const +{ + const LDAPAttributeList *al = m_dbEntryChanged.getAttributes(); + const LDAPAttribute *attr = al->getAttributeByName("olcdbindex"); + std::vector<IndexType> res; + if (! attr ) { + return res; + }; + + StringList sl = attr->getValues(); + StringList::const_iterator i; + for (i = sl.begin(); i != sl.end(); i++ ) { + std::string attrType; + std::string indexes; + splitIndexString(*i, attrType, indexes ); + if ( attrType == type ) + { + res = indexString2Type(indexes); + break; } } return res; @@ -152,6 +187,10 @@ this->addStringValue( "olcDbIndex", indexString ); } +void OlcBdbDatabase::deleteIndex(const std::string& attr) +{ +} + void OlcBdbDatabase::setDirectory( const std::string &dir ) { this->setStringValue("olcDbDirectory", dir); Modified: trunk/ldap-server/src/lib/backConfigTest.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/lib/backConfigTes... ============================================================================== --- trunk/ldap-server/src/lib/backConfigTest.h (original) +++ trunk/ldap-server/src/lib/backConfigTest.h Fri Jun 27 15:59:02 2008 @@ -97,6 +97,7 @@ virtual std::map<std::string, std::list<std::string> > toMap() const; virtual IndexMap getDatabaseIndexes() const {}; + virtual std::vector<IndexType> getDatabaseIndex( const std::string &attr ) const {}; virtual void addIndex(const std::string& attr, const std::vector<IndexType>& idx) {}; @@ -115,7 +116,9 @@ void setDirectory( const std::string &dir); virtual IndexMap getDatabaseIndexes() const; + virtual std::vector<IndexType> getDatabaseIndex( const std::string &attr ) const; virtual void addIndex(const std::string& attr, const std::vector<IndexType>& idx); + virtual void deleteIndex(const std::string& attr); }; class OlcTlsSettings; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org