June 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r48670 - in /trunk/add-on: package/yast2-add-on.changes src/add-on-workflow.ycp src/add-on.ycp yast2-add-on.spec.in
by locilka＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: locilka Date: Fri Jun 27 18:13:26 2008 New Revision: 48670 URL: http://svn.opensuse.org/viewcvs/yast?rev=48670&view=rev Log: - Implemented Add-Ons overview (FATE #303588). - Implemented deinstallation of Add-On (FATE #300654). Modified: trunk/add-on/package/yast2-add-on.changes trunk/add-on/src/add-on-workflow.ycp trunk/add-on/src/add-on.ycp trunk/add-on/yast2-add-on.spec.in Modified: trunk/add-on/package/yast2-add-on.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/package/yast2-add-on.chan… ============================================================================== --- trunk/add-on/package/yast2-add-on.changes (original) +++ trunk/add-on/package/yast2-add-on.changes Fri Jun 27 18:13:26 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jun 27 18:11:27 CEST 2008 - locilka(a)suse.cz + +- Implemented Add-Ons overview (FATE #303588). +- Implemented deinstallation of Add-On (FATE #300654). + +------------------------------------------------------------------- Tue Jun 17 14:23:45 CEST 2008 - lslezak(a)suse.cz - use Pkg::SourceSaveAll() instead of Pkg::SourceFinishAll() Modified: trunk/add-on/src/add-on-workflow.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/src/add-on-workflow.ycp?r… ============================================================================== --- trunk/add-on/src/add-on-workflow.ycp (original) +++ trunk/add-on/src/add-on-workflow.ycp Fri Jun 27 18:13:26 2008 @@ -1021,5 +1021,316 @@ return ret; } +// AddOnsOverviewDialog --> + +void CreateAddOnsOverviewDialog () { + y2milestone ("Creating OverviewDialog"); + + Wizard::SetContents ( + // TRANSLATORS: dialog caption + _("Installed Add-On Products"), + `VBox ( + `Table ( + `id ("list_of_addons"), + `opt (`notify, `immediate), + `header ( + // TRANSLATORS: table header item + _("Add-On Product"), + // TRANSLATORS: table header item + _("URL") + ), + [] + ), + `VSquash( + `MinHeight (3, + `RichText (`id ("product_details"), "") + ) + ), + `HBox ( + `PushButton (`id (`add), Label::AddButton()), + `HSpacing (1), + `PushButton (`id (`delete), Label::DeleteButton()), + `HStretch() + ) + ), + // TRANSLATORS: dialog help adp/1 + _("Here you can see all add-on products installed on your system.") + + // TRANSLATORS: dialog help adp/2 + _("Use Add button to use a new add-on product or Delete to remove an add-on in use."), + false, + true + ); + + Wizard::SetNextButton (`next, Label::FinishButton()); + Wizard::SetAbortButton (`abort, Label::CancelButton()); +} + +map product_infos = $[]; + +map ReturnCurrentlySelectedProductInfo () { + if (! UI::WidgetExists (`id ("list_of_addons"))) { + y2error ("No such widget: %1", "list_of_addons"); + return nil; + } + + string item_id = (string) UI::QueryWidget (`id ("list_of_addons"), `CurrentItem); + + // no items + if (item_id == nil) { + return nil; + } + + if (! regexpmatch (item_id, "product_")) { + y2error ("Wrong product ID '%1'", item_id); + return nil; + } + + item_id = substring (item_id, 8); + + return product_infos[item_id]:$[]; +} + +void AdjustInfoWidget () { + map pi = ReturnCurrentlySelectedProductInfo(); + if (pi == nil || pi == $[]) { + UI::ChangeWidget (`id ("product_details"), `Value, ""); + return; + } + + string rt_description = sformat ( + _("Vendor: %1 Repository URL: %2"), + pi["product","vendor"]:_("Unknown vendor"), + pi["repository","url"]:_("Unknown repository URL") + ); + UI::ChangeWidget (`id ("product_details"), `Value, rt_description); +} + +void RedrawAddOnsOverviewTable () { + list <map <string,any> > all_products = Pkg::ResolvableProperties ("", `product, ""); + + integer medium_nr = nil; + map repository_info = nil; + integer counter = -1; + + list <term> products = []; + product_infos = $[]; + + foreach (map <string,any> one_product, all_products, { + medium_nr = one_product["medium_nr"]:-1; + if (medium_nr != nil && medium_nr != -1) { + counter = counter + 1; + + repository_info = Pkg::SourceGeneralData (one_product["source"]:-1); + + y2milestone ("Product: %1", one_product); + y2milestone ("Info: %1", repository_info); + + product_infos[tostring(counter)] = $[ + "product" : one_product, + "repository" : repository_info, + ]; + + products = add (products, `item ( + `id (sformat ("product_%1", counter)), + one_product["display_name"]:one_product["name"]:_("Unknown product"), + repository_info["url"]:repository_info["base_urls",0]:_("Unknown URL") + )); + } + }); + + UI::ChangeWidget (`id ("list_of_addons"), `Items, products); + AdjustInfoWidget(); + + UI::ChangeWidget (`id(`delete), `Enabled, (size (all_products) > 0)); +} + +/** + * Removes the currently selected Add-On + * + * @return boolean whether something has changed its state + */ +boolean RemoveProductWithDependencies () { + // FIXME: UI feedback is needed + + map pi = ReturnCurrentlySelectedProductInfo(); + if (pi == nil || pi == $[]) { + y2error ("Cannot remove unknown product"); + return false; + } + + string product_name = pi["product","display_name"]:pi["product","name"]:_("Unknown product"); + if (! Confirm::Delete (product_name)) { + y2milestone ("Deleting '%1' canceled", product_name); + return false; + } + + integer src_id = pi["product","source"]:-1; + + // Temporary definitions + boolean pack_ret = false; + string package_string = ""; + + // ["pkg1 version release arch", "pkg2 version release arch", ... ] + list <string> installed_packages = maplist (string inst_package, Pkg::GetPackages (`installed, false), { + // ... but we need ["pkg1 version-release arch", "pkg2 version-release arch", ... ] + return regexpsub (inst_package, "(.*) (.*) (.*) (.*)", "\\1 \\2-\\3 \\4"); + }); + + // y2milestone ("Installed packages: %1", installed_packages); + + // All packages from Add-On / Repository + list <map <string,any> > packages_from_repo = Pkg::ResolvableProperties ("", `package, ""); + + packages_from_repo = filter (map <string, any> one_package, packages_from_repo, { + // Package is not at the repository to be deleted + if (one_package["source"]:-1 != src_id) + return false; + + // Package *is* at the repository to delete + + // "name version-release arch", "version" already contains a release + package_string = sformat ("%1 %2 %3", one_package["name"]:"", one_package["version"]:"", one_package["arch"]:""); + + // The very same package (which is avaliable at the source) is also installed + return contains (installed_packages, package_string); + }); + + y2milestone ("%1 packages installed from repository", size (packages_from_repo)); + + // Removing selected product, whatever it means + if ((pi["product","status"]:`unknown == `installed || pi["product","status"]:`unknown == `selected) && pi["product","name"]:"" != "") { + y2milestone ("Removing product: '%1'", pi["product","name"]:""); + Pkg::ResolvableRemove (pi["product","name"]:"", `product); + } else { + y2milestone ("Product is neither `installed nor `selected"); + } + + // Removing repository of the selected product + if (src_id > -1) { + y2milestone ("Removing repository: %1, url: %2", src_id, pi["repository","url"]:""); + Pkg::SourceDelete (src_id); + } else { + y2milestone ("Product doesn't have any repository in use"); + } + + // The product repository is already removed, checking all installed packages + + // All available packages + list <string> available_packages = maplist (string inst_package, Pkg::GetPackages (`available, false), { + // ... but we need ["pkg1 version-release arch", "pkg2 version-release arch", ... ] + return regexpsub (inst_package, "(.*) (.*) (.*) (.*)", "\\1 \\2-\\3 \\4"); + }); + + list <string> available_package_names = Pkg::GetPackages (`available, true); + y2milestone ("%1 available packages", size (available_package_names)); + + boolean status_changed = false; + + // check all packages installed from the just removed repository + foreach (map <string, any> one_package, packages_from_repo, { + // "name version-release arch", "version" already contains a release + package_string = sformat ("%1 %2 %3", one_package["name"]:"", one_package["version"]:"", one_package["arch"]:""); + + // installed package is not available anymore + if (! contains (available_packages, package_string)) { + status_changed = true; + + // it must be removed + y2milestone ("Removing: %1", package_string); + Pkg::ResolvableRemove (one_package["name"]:"~~~", `package); + + // but if another version is present, select if for installation + if (contains (available_package_names, one_package["name"]:"~~~")) { + y2milestone ("Installing another version of %1", one_package["name"]:""); + Pkg::ResolvableInstall (one_package["name"]:"", `package); + } + } + }); + + if (status_changed) { + boolean solve_ret = Pkg::PkgSolve (false); + y2milestone ("Calling Solve() retutned: %1", solve_ret); + + map opts = $[ "dialog_type" : `summaryMode, "repo_mgmt" : true ]; + + y2milestone ("Running inst_packages: Using packager widget options: %1", opts); + symbol result = (symbol) WFM::CallFunction ("inst_packages", [opts]); + y2milestone ("inst_packages returned: %1", result); + + if (result == `accept) { + y2error ("FIXME: ....."); + // set variable to run inst_rpmcopy at the end... + } + } + + return true; +} + +void RunAddProductWorkflow () { + // feedback heading + string heading = _("Add-On Product Installation"); + // feedback message + string message + = _("Reading packages available at the installation repositories..."); + + Popup::ShowFeedback (heading, message); + + y2milestone ("syncing srcid %1 to zmd", AddOnProduct::src_id); + boolean synced + = SourceManager::SyncAddedAndDeleted ([AddOnProduct::src_id], []); + y2milestone ("sync status: %1", synced); + + Popup::ClearFeedback (); + + WFM::CallFunction ("inst_addon_update_sources", []); + AddOnProduct::DoInstall(); + // Write only when there are some changes + Write(); + + Pkg::SourceReleaseAll(); +} + +symbol RunAddOnsOverviewDialog () { + y2milestone ("Overview Dialog"); + symbol ret = `next; + + // to see which products are installed + Pkg::PkgSolve (true); + + CreateAddOnsOverviewDialog(); + RedrawAddOnsOverviewTable(); + + any userret = nil; + + while (true) { + userret = UI::UserInput(); + + if (userret == `abort) { + ret = `abort; + break; + } else if (userret == `next || userret == `finish) { + ret = `next; + break; + } else if (userret == `add) { + if (RunWizard() == `next) { + RunAddProductWorkflow(); + } + + CreateAddOnsOverviewDialog(); + RedrawAddOnsOverviewTable(); + } else if (userret == `delete) { + if (RemoveProductWithDependencies()) + RedrawAddOnsOverviewTable(); + } else if (userret == "list_of_addons") { + AdjustInfoWidget(); + } else { + y2error ("Uknown ret: %1", userret); + } + } + + return ret; +} + +// <-- AddOnsOverviewDialog } //end of include Modified: trunk/add-on/src/add-on.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/src/add-on.ycp?rev=48670&… ============================================================================== --- trunk/add-on/src/add-on.ycp (original) +++ trunk/add-on/src/add-on.ycp Fri Jun 27 18:13:26 2008 @@ -53,7 +53,7 @@ Wizard::SetContents ( // dialog caption - _("Add-On Product Media"), + _("Add-On Products"), // busy message (dialog) `VBox(`Label(_("Initializing..."))), // help @@ -79,7 +79,8 @@ } // initialize target to import all trusted keys (#165849) -Pkg::TargetInit( "/", false ); +Pkg::TargetInitialize ("/"); +Pkg::TargetLoad(); PackageCallbacksInit::InitPackageCallbacks (); @@ -94,8 +95,8 @@ if (size (WFM::Args()) == 0) { - y2milestone ("Url not specified in the command line, asking user"); - ret = RunWizard(); + y2milestone ("Url not specified in cmdline, starting full-featured module"); + ret = RunAddOnsOverviewDialog(); } else { @@ -109,33 +110,15 @@ ret = RunAutorunWizard (); } - // bugzilla #293428 - // Release all sources before adding a new one - // because of CD/DVD + url cd:// - Pkg::SourceReleaseAll(); - -if (ret == `next) -{ - // feedback heading - string heading = _("Add-On Product Installation"); - // feedback message - string message - = _("Reading packages available at the installation repositories..."); - - Popup::ShowFeedback (heading, message); - - y2milestone ("syncing srcid %1 to zmd", AddOnProduct::src_id); - boolean synced - = SourceManager::SyncAddedAndDeleted ([AddOnProduct::src_id], []); - y2milestone ("sync status: %1", synced); - - Popup::ClearFeedback (); - - WFM::CallFunction ("inst_addon_update_sources", []); - ret = AddOnProduct::DoInstall (); - // Write only when there are some changes - Write(); +if (ret == `next) { + Pkg::SourceSaveAll(); } + +// bugzilla #293428 +// Release all sources before adding a new one +// because of CD/DVD + url cd:// +Pkg::SourceReleaseAll(); + UI::CloseDialog(); return ret; Modified: trunk/add-on/yast2-add-on.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/yast2-add-on.spec.in?rev=… ============================================================================== --- trunk/add-on/yast2-add-on.spec.in (original) +++ trunk/add-on/yast2-add-on.spec.in Fri Jun 27 18:13:26 2008 @@ -22,6 +22,9 @@ # SCR::RegisterNewAgents, bugzilla #245508 Conflicts: yast2-core < 2.15.4 +# Fixed Pkg::GetPackages(`available) to ignore installed packages +Conflicts: yast2-pkg-bindings < 2.17.2 + BuildArchitectures: noarch Summary: Add-On Configuration -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r48669 - in /branches/tmp/aschnell/part-redesign: libstorage/src/ storage/src/include/ storage/src/modules/
by aschnell＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: aschnell Date: Fri Jun 27 17:58:55 2008 New Revision: 48669 URL: http://svn.opensuse.org/viewcvs/yast?rev=48669&view=rev Log: - backup commit Modified: branches/tmp/aschnell/part-redesign/libstorage/src/Storage.cc branches/tmp/aschnell/part-redesign/libstorage/src/Storage.h branches/tmp/aschnell/part-redesign/libstorage/src/StorageInterface.h branches/tmp/aschnell/part-redesign/libstorage/src/Volume.cc branches/tmp/aschnell/part-redesign/storage/src/include/ep-dialogs.ycp branches/tmp/aschnell/part-redesign/storage/src/modules/Storage.ycp Modified: branches/tmp/aschnell/part-redesign/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/li… ============================================================================== --- branches/tmp/aschnell/part-redesign/libstorage/src/Storage.cc (original) +++ branches/tmp/aschnell/part-redesign/libstorage/src/Storage.cc Fri Jun 27 17:58:55 2008 @@ -16,6 +16,7 @@ #include <fstream> #include <sstream> #include <iostream> +#include <boost/algorithm/string.hpp> #include <sys/utsname.h> @@ -6381,28 +6382,53 @@ } -string Storage::byteToHumanString(unsigned long long size, int precision, bool omit_zeroes) const +static int numSuffixes() { - const char* prefixes[] = { - /* Byte abbreviated */ - _("B"), - /* KiloByte abbreviated */ - _("kB"), - /* MegaByte abbreviated */ - _("MB"), - /* GigaByte abbreviated */ - _("GB"), - /* TeraByte abbreviated */ - _("TB") - }; + return 5; +} + + +static string suffixes(int i, bool classic) +{ + switch (i) + { + case 0: + /* Byte abbreviated */ + return classic ? "B" : _("B"); + + case 1: + /* KiloByte abbreviated */ + return classic ? "kB" : _("kB"); + + case 2: + /* MegaByte abbreviated */ + return classic ? "MB" : _("MB"); + + case 3: + /* GigaByte abbreviated */ + return classic ? "GB" : _("GB"); + + case 4: + /* TeraByte abbreviated */ + return classic ? "TB" : _("TB"); + } + + return string("error"); +} + + +string Storage::byteToHumanString(unsigned long long size, bool classic, int precision, + bool omit_zeroes) const +{ + const locale loc = locale::classic(); double f = (double)(size); - unsigned int prefix = 0; + int suffix = 0; - while (f >= 1024.0 && prefix + 1 < lengthof(prefixes)) + while (f >= 1024.0 && suffix + 1 < numSuffixes()) { f /= 1024.0; - prefix++; + suffix++; } if (omit_zeroes && (f == (unsigned long long)(f))) @@ -6411,13 +6437,47 @@ } ostringstream s; + s.imbue(loc); s.setf(ios::fixed); s.precision(precision); - s << f << ' ' << prefixes[prefix]; + + s << f << ' ' << suffixes(suffix, classic); + return s.str(); } +bool Storage::humanStringToByte(const string& str, bool classic, unsigned long long& size) const +{ + const locale loc = locale::classic(); + + istringstream s(boost::trim_copy(str, loc)); + s.imbue(loc); + + double f; + string suffix; + s >> f >> suffix; + + if (s.fail() || !s.eof() || f < 0.0) + return false; + + boost::to_lower(suffix, loc); + + for(int i = 0; i < numSuffixes(); i++) + { + if (suffix == boost::to_lower_copy(suffixes(i, classic))) + { + size = f; + return true; + } + + f *= 1024.0; + } + + return false; +} + + namespace storage { std::ostream& operator<< (std::ostream& s, Storage &v ) Modified: branches/tmp/aschnell/part-redesign/libstorage/src/Storage.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/li… ============================================================================== --- branches/tmp/aschnell/part-redesign/libstorage/src/Storage.h (original) +++ branches/tmp/aschnell/part-redesign/libstorage/src/Storage.h Fri Jun 27 17:58:55 2008 @@ -470,8 +470,9 @@ void updateDmEmptyPeMap(); void dumpObjectList(); - string byteToHumanString(unsigned long long size, int precision, bool omit_zeroes) const; - + string byteToHumanString(unsigned long long size, bool classic, int precision, bool omit_zeroes) const; + bool humanStringToByte(const string& str, bool classic, unsigned long long& size) const; + void setCallbackProgressBar( storage::CallbackProgressBar pfnc ) { progress_bar_cb=pfnc; } storage::CallbackProgressBar getCallbackProgressBar() const Modified: branches/tmp/aschnell/part-redesign/libstorage/src/StorageInterface.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/li… ============================================================================== --- branches/tmp/aschnell/part-redesign/libstorage/src/StorageInterface.h (original) +++ branches/tmp/aschnell/part-redesign/libstorage/src/StorageInterface.h Fri Jun 27 17:58:55 2008 @@ -2170,17 +2170,33 @@ * and using B, kB, MB, GB or TB as unit as appropriate. * * @param size size in bytes + * @param classic use classic locale * @param precision number of fraction digits in output * @param omit_zeroes if true omit trailing zeroes for exact values * @return formatted string * - * @example byteToHumanString(128, 2, true) -> "128 B" - * @example byteToHumanString(4096, 2, true) -> "4 kB" - * @example byteToHumanString(4096, 2, false) -> "4.00 kB" - * @example byteToHumanString(1024*1024, 2, true) -> "1 MB" + * @example byteToHumanString(128, true, 2, true) -> "128 B" + * @example byteToHumanString(4096, true, 2, true) -> "4 kB" + * @example byteToHumanString(4096, true, 2, false) -> "4.00 kB" + * @example byteToHumanString(1024*1024, true, 2, true) -> "1 MB" */ - virtual string byteToHumanString(unsigned long long size, int precision, + virtual string byteToHumanString(unsigned long long size, bool classic, int precision, bool omit_zeroes) const = 0; + + /** + * Converts a size description using B, kB, MB, GB or TB into an integer. + * + * @param str size string + * @param classic use classic locale + * @param size size in bytes + * @return true on successful conversion + * + * @example humanStringToByte("4kB", true, size) -> true and size = 4*1024 + * @example humanStringToByte("4 MB", true, size) -> true and size = 4*1024*1024 + * @example humanStringToByte("0.5 GB", true, size) -> true and size = 512*1024*1024 + */ + virtual bool humanStringToByte(const string& str, bool classic, unsigned long long& + size) const = 0; }; Modified: branches/tmp/aschnell/part-redesign/libstorage/src/Volume.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/li… ============================================================================== --- branches/tmp/aschnell/part-redesign/libstorage/src/Volume.cc (original) +++ branches/tmp/aschnell/part-redesign/libstorage/src/Volume.cc Fri Jun 27 17:58:55 2008 @@ -2558,7 +2558,7 @@ string Volume::sizeString() const { - return cont->getStorage()->byteToHumanString(1024 * size_k, 2, false); + return cont->getStorage()->byteToHumanString(1024 * size_k, false, 2, false); } bool Volume::canUseDevice() const Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/st… ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-dialogs.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-dialogs.ycp Fri Jun 27 17:58:55 2008 @@ -80,7 +80,11 @@ { // TODO string s = (string) UI::QueryWidget(`id(`size_input), `Value); - integer i = Storage::KmgtStrToByte(s); + + integer i = 0; + Storage::HumanStringToByte(s, i); + // integer i = Storage::KmgtStrToByte(s); + integer num_cyl = tointeger(float::ceil(tofloat(i) / tofloat(data["cyl_size"]:42))); data["region"] = [ slot[0]:0, num_cyl ]; break; @@ -113,6 +117,9 @@ string tmp = Storage::ByteToHumanString(max_size); + symbol what = `max_size; + integer manual_size = 0; + frames = add(frames, `Frame(_("Size"), `RadioButtonGroup(`id(`size), @@ -172,7 +179,19 @@ break; case `next: - // TODO: checks + what = (symbol) UI::QueryWidget(`id(`size), `Value); + if (what == `manual_size) + { + string s = (string) UI::QueryWidget(`id(`size_input), `Value); + if (!Storage::HumanStringToByte(s, manual_size)) + { + Error(_("The size in invalid. TODO")); + widget = `again; + } + } + + // TODO min-size check + stripes = (integer) UI::QueryWidget(`id(`stripes), `Value); stripe_size = (integer) UI::QueryWidget(`id(`stripe_size), `Value); break; @@ -182,16 +201,14 @@ if (widget == `next) { - switch ((symbol) UI::QueryWidget(`id(`size), `Value)) + switch (what) { case `max_size: data["size_k"] = max_size / 1024; break; case `manual_size: - string s = (string) UI::QueryWidget(`id(`size_input), `Value); - integer i = Storage::KmgtStrToByte(s); - data["size_k"] = i / 1024; + data["size_k"] = manual_size / 1024; break; } Modified: branches/tmp/aschnell/part-redesign/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/st… ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/modules/Storage.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/modules/Storage.ycp Fri Jun 27 17:58:55 2008 @@ -322,13 +322,21 @@ global string ByteToHumanString(integer bytes) { - return LibStorage::StorageInterface::byteToHumanString(sint, bytes, 2, false); + return LibStorage::StorageInterface::byteToHumanString(sint, bytes, false, 2, false); } global string ByteToHumanStringWithPrecision(integer bytes, integer precision, boolean omit_zeroes) { - return LibStorage::StorageInterface::byteToHumanString(sint, bytes, precision, omit_zeroes); + return LibStorage::StorageInterface::byteToHumanString(sint, bytes, false, precision, omit_zeroes); +} + + +global boolean HumanStringToByte(string str, integer& bytes) +{ + boolean ret = LibStorage::StorageInterface::humanStringToByte(sint, str, false, bytes); + y2milestone("HumanStringToByte ret:%1 str:%2 bytes:%3", ret, str, bytes); + return ret; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r48668 - /trunk/python-bindings/src/YCP.cc
by juhliarik＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: juhliarik Date: Fri Jun 27 17:31:56 2008 New Revision: 48668 URL: http://svn.opensuse.org/viewcvs/yast?rev=48668&view=rev Log: added description of functions M python-bindings/src/YCP.cc * added description Modified: trunk/python-bindings/src/YCP.cc Modified: trunk/python-bindings/src/YCP.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/src/YCP.cc?rev=4… ============================================================================== --- trunk/python-bindings/src/YCP.cc (original) +++ trunk/python-bindings/src/YCP.cc Fri Jun 27 17:31:56 2008 @@ -69,6 +69,13 @@ void InitYCPTermList(); +/** + * Function check SymbolEntry and add name + * to ycpListFunctions if it is function or + * add it to ycpListVariables if it is variable + * @param const SymbolEntry for analyse + * @return bool always return true + */ static bool HandleSymbolTable (const SymbolEntry & se) { if (se.isFunction ()) { @@ -108,42 +115,76 @@ return ns; } - +/** + * defined function for "run" from static python module ycp + * it is in static PyMethodDef YCPMethods[] + * @param PyObject *self + * @param PyObject *args + * @return PyObject * return value from CallYCPFunction() + */ static PyObject * ycp_handle_function(PyObject *self, PyObject *args) { return CallYCPFunction (args); } - +/** + * defined function for "import_module" from static python module ycp + * it is in static PyMethodDef YCPMethods[] + * @param PyObject *self + * @param PyObject *args + * @return PyObject * return value from ImportYCPNameSpace() + */ static PyObject * ycp_import_namespace(PyObject *self, PyObject *args) { return ImportYCPNameSpace (args); } +/** + * defined function for "init_ui" from static python module ycp + * it is in static PyMethodDef YCPMethods[] + * @param PyObject *self + * @param PyObject *args + * @return PyObject * return value from InitUI() + */ static PyObject * ycp_init_ui(PyObject *self, PyObject *args) { return InitUI (args); } -static PyObject * ycp_scr_handle(PyObject *self, PyObject *args) -{ - return _SCR_Run(args); -} - - +/** + * defined function for "y2logger" from static python module ycp + * it is in static PyMethodDef YCPMethods[] + * @param PyObject *self + * @param PyObject *args + * @return PyObject * always Py_None + */ static PyObject * ycp_y2logger (PyObject *self, PyObject *args) { PyY2logger(args); return Py_None; } - +/** + * defined function for "widget_names" from static python module ycp + * it is in static PyMethodDef YCPMethods[] + * @param PyObject *self + * @param PyObject *args + * @return PyObject * return value from InitTerm() + */ static PyObject * ycp_init_term(PyObject *self, PyObject *args) { return InitTerm(args); } + +/** + * defined function for "__change_widget_name" from static python module ycp + * it is in static PyMethodDef YCPMethods[] + * @param PyObject *self + * @param PyObject *args + * @return PyObject * return value from ChangeWidgetName() + */ static PyObject * ycp_change_widget_name(PyObject *self, PyObject *args) { return ChangeWidgetName(args); @@ -159,9 +200,21 @@ {NULL, NULL, 0, NULL} }; +/** + * defined function for "__scr_run" from python module for SCR + * it is in static PyMethodDef scr_methods[] + * @param PyObject *self + * @param PyObject *args + * @return PyObject * return value from _SCR_Run() + */ +static PyObject * ycp_scr_handle(PyObject *self, PyObject *args) +{ + return _SCR_Run(args); +} + /** - * This is necessary for regulat (python style) calling SCR from python + * This is necessary for regular (python style) calling SCR from python */ static PyMethodDef scr_methods[] = { @@ -178,6 +231,9 @@ {NULL, NULL, 0, NULL} }; +/** + * Basic definition of methods python module ycp + */ static PyMethodDef YCPMethods[] = { {"run", ycp_handle_function, METH_VARARGS, "Calling YCP from Python"}, @@ -189,6 +245,12 @@ {NULL, NULL, 0, NULL} /* Sentinel */ }; + +/** + * Init function for python module ycp + * it includes definition of debug function and support for localization + */ + PyMODINIT_FUNC initycp(void) { @@ -287,7 +349,9 @@ //InitTerm(NULL); } - +/** + * All names of known widget from YCP are added to ycpTermList + */ void InitYCPTermList() { // adding terms @@ -360,12 +424,15 @@ } - +/** + * Function handle adding all known widgets to python namespace (module ycp) + * it is usefull for writting UI in python. + */ PyObject * InitTerm(PyObject *args) { int number_args = PyTuple_Size(args); - // adding false into pResult + // adding false into pResult PyObject *pResult = PyBool_FromLong(0); PyObject *dict = PyModule_GetDict(Self); @@ -380,7 +447,7 @@ { PyObject *pPythonValue = PyTuple_GetItem(args, 0); - string widget_ns = "term"; + string widget_ns = "term"; if (pPythonValue) { @@ -401,7 +468,7 @@ PyObject *new_module = Py_InitModule(widget_ns.c_str(), term_methods); if (new_module == NULL) return pResult; - initYCPTermType(new_module); + initYCPTermType(new_module); // Add new initialized module into ycp dictionary @@ -670,6 +737,9 @@ /** * Returns true if NameSpace is registered (is key) in dictionary dict. * Otherwise returns false; + * @param PyObject *dict - main dictionary of module ycp(python) + * @param char *NameSpace - name of namespace + * @return true on success */ bool isRegistered(PyObject *dict, const char *NameSpace) { @@ -684,6 +754,13 @@ return ret; } +/** + * Register functions and variables from namespace to python module + * @param char *NameSpace - name of namespace + * @param YCPList list_functions - names of functions + * @param YCPList list_variables - names of variables + * @return true on success + */ bool RegFunctions(char *NameSpace, YCPList list_functions, YCPList list_variables) { @@ -736,7 +813,10 @@ } - +/** + * Register SCR namespace with 4 functions: Read, Write, Dir and Execute + * @return true on success + */ bool RegSCR() { string func_read = @@ -792,6 +872,9 @@ Y2Component *owned_wfmc = 0; +/** + * Init WFM + */ void init_wfm () { @@ -806,6 +889,12 @@ Y2Component *owned_uic = 0; + +/** + * Init UI - select: ncurses, qt or gtk + * @param PyObject *args - string - type of UI + * @return PyObject * true on success + */ PyObject * InitUI (PyObject *args) { @@ -862,7 +951,12 @@ return PyBool_FromLong(1); } - +/** + * Function import module written in YCP. + * It means that create module into namespace of python module ycp + * @param PyObject *args - string - include name of module written in YCP + * @return PyObject * true on success + */ PyObject * ImportYCPNameSpace (PyObject *args) { PyObject* pResult = PyBool_FromLong(0); @@ -908,7 +1002,11 @@ return pResult; } - +/** + * General function handles running SCR command + * @param PyObject *args - tuple of arguments for running SCR + * @return PyObject * result of running SCR + */ PyObject * _SCR_Run (PyObject *args) { // access directly the statically declared builtins @@ -1096,7 +1194,11 @@ } - +/** + * Function handles calling ycp function from python + * @param PyObject *args - tuple with namespace name of function and args for function + * @return PyObject return result of running function + */ PyObject * CallYCPFunction (PyObject *args) { int number_args = PyTuple_Size(args); @@ -1258,6 +1360,12 @@ } } +/** + * General function handles calling debug function in python like: + * y2mileston(), y2error() etc. + * @param PyObject *args - tuple of args for debug function + */ + void PyY2logger(PyObject *args) { int number_args = PyTuple_Size(args); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r48667 - in /trunk/pkg-bindings: package/yast2-pkg-bindings.changes src/Package.cc
by lslezak＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: lslezak Date: Fri Jun 27 16:57:32 2008 New Revision: 48667 URL: http://svn.opensuse.org/viewcvs/yast?rev=48667&view=rev Log: - Fixed Pkg::GetPackages(`available) to ignore installed packages Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes trunk/pkg-bindings/src/Package.cc Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/package/yast2-pkg-b… ============================================================================== --- trunk/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ trunk/pkg-bindings/package/yast2-pkg-bindings.changes Fri Jun 27 16:57:32 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Jun 27 16:54:00 CEST 2008 - lslezak(a)suse.cz + +- Fixed Pkg::GetPackages(`available) to ignore installed packages + +------------------------------------------------------------------- Fri Jun 27 10:46:36 CEST 2008 - lslezak(a)suse.cz - support for patch messages and patch scripts (bnc#401220) Modified: trunk/pkg-bindings/src/Package.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Package.cc?rev=… ============================================================================== --- trunk/pkg-bindings/src/Package.cc (original) +++ trunk/pkg-bindings/src/Package.cc Fri Jun 27 16:57:32 2008 @@ -1544,7 +1544,10 @@ } else if (which == "available") { - pkg2list(packages, it, names_only); + if (!it->status().isInstalled()) + { + pkg2list(packages, it, names_only); + } } else if (which == "locked") { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r48666 - /trunk/python-bindings/src/YCP.cc
by juhliarik＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: juhliarik Date: Fri Jun 27 16:49:13 2008 New Revision: 48666 URL: http://svn.opensuse.org/viewcvs/yast?rev=48666&view=rev Log: added comment for function M python-bindings/src/YCP.cc * added comment for function get_setVariable() Modified: trunk/python-bindings/src/YCP.cc Modified: trunk/python-bindings/src/YCP.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/src/YCP.cc?rev=4… ============================================================================== --- trunk/python-bindings/src/YCP.cc (original) +++ trunk/python-bindings/src/YCP.cc Fri Jun 27 16:49:13 2008 @@ -1065,7 +1065,13 @@ else return Py_None; } - +/** + * function handle GET/SET value for YCP variable in python + * @param char * name of module + * @param SymbolEntryPtr pointer to symbol entry + * @param PyObject * value or NULL if GET value is called + * @return PyObject return value of variable or None if SET is called + */ PyObject * get_setYCPVariable (const char * ns_name, SymbolEntryPtr var_se, PyObject * pPythonValue) { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r48665 - in /trunk/ldap-server: src/agent/Makefile.am src/lib/Makefile.am yast2-ldap-server.spec.in
by rhafer＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: rhafer Date: Fri Jun 27 16:01:34 2008 New Revision: 48665 URL: http://svn.opensuse.org/viewcvs/yast?rev=48665&view=rev Log: - call ldconfig in %post - lookup include files in builddir before /usr/include/YaST - don't package .so and .la files Modified: trunk/ldap-server/src/agent/Makefile.am trunk/ldap-server/src/lib/Makefile.am trunk/ldap-server/yast2-ldap-server.spec.in Modified: trunk/ldap-server/src/agent/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/agent/Makefile.a… ============================================================================== --- trunk/ldap-server/src/agent/Makefile.am (original) +++ trunk/ldap-server/src/agent/Makefile.am Fri Jun 27 16:01:34 2008 @@ -1,8 +1,8 @@ # # Makefile.am for SlapdConfig agent # -AM_CPPFLAGS= -I$(top_srcdir)/src/lib -AM_CXXFLAGS = -DY2LOG=\"agent-slapdconfig\" -Wall -I/usr/include/YaST2 +AM_CPPFLAGS= -I$(top_srcdir)/src/lib -I/usr/include/YaST2 +AM_CXXFLAGS = -DY2LOG=\"agent-slapdconfig\" -Wall plugin_LTLIBRARIES = libpy2ag_slapdconfig.la noinst_LTLIBRARIES = liby2ag_slapdconfig.la Modified: trunk/ldap-server/src/lib/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/lib/Makefile.am?… ============================================================================== --- trunk/ldap-server/src/lib/Makefile.am (original) +++ trunk/ldap-server/src/lib/Makefile.am Fri Jun 27 16:01:34 2008 @@ -1,3 +1,6 @@ +# +# Makefile.am for slapdconfig library +# lib_LTLIBRARIES = libslapdconfig.la libslapdconfig_la_SOURCES = slapd-config.cpp Modified: trunk/ldap-server/yast2-ldap-server.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/yast2-ldap-server.sp… ============================================================================== --- trunk/ldap-server/yast2-ldap-server.spec.in (original) +++ trunk/ldap-server/yast2-ldap-server.spec.in Fri Jun 27 16:01:34 2008 @@ -16,9 +16,15 @@ @INSTALL@ rm -f $RPM_BUILD_ROOT/%{_libdir}/libslapdconfig.la rm -f $RPM_BUILD_ROOT/%{_libdir}/libslapdconfig.so +rm -f $RPM_BUILD_ROOT/@plugindir@/libpy2ag_slapdconfig.la +rm -f $RPM_BUILD_ROOT/@plugindir@/libpy2ag_slapdconfig.so @CLEAN@ +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + %files %defattr(-,root,root) %dir @yncludedir@/ldap-server -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r48664 - /trunk/ldap-server/src/lib/slapd-config.cpp
by rhafer＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: rhafer Date: Fri Jun 27 16:01:31 2008 New Revision: 48664 URL: http://svn.opensuse.org/viewcvs/yast?rev=48664&view=rev Log: Silence gcc warnings Modified: trunk/ldap-server/src/lib/slapd-config.cpp Modified: trunk/ldap-server/src/lib/slapd-config.cpp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/lib/slapd-config… ============================================================================== --- trunk/ldap-server/src/lib/slapd-config.cpp (original) +++ trunk/ldap-server/src/lib/slapd-config.cpp Fri Jun 27 16:01:31 2008 @@ -1001,7 +1001,7 @@ LDAPSearchResults *sr = m_lc->search( "cn=config", LDAPConnection::SEARCH_ONE, "objectclass=olcDatabaseConfig" ); LDAPEntry *dbEntry; - while ( (dbEntry = sr->getNext()) != 0 ) + while ( (dbEntry = sr->getNext()) ) { std::string dbDn(dbEntry->getDN()); log_it(0,"Got Database Entry: " + dbDn); @@ -1009,7 +1009,7 @@ LDAPSearchResults *overlaySearchRes = m_lc->search( dbDn, LDAPConnection::SEARCH_ONE, "objectclass=olcOverlayConfig" ); LDAPEntry *overlayEntry; - while ( (overlayEntry = overlaySearchRes->getNext()) != 0 ) + while ( (overlayEntry = overlaySearchRes->getNext()) ) { log_it(0,"Got Overlay: " + overlayEntry->getDN() ); boost::shared_ptr<OlcOverlay> overlay(OlcOverlay::createFromLdapEntry(*overlayEntry) ); @@ -1032,7 +1032,7 @@ LDAPSearchResults *sr = m_lc->search( "cn=schema,cn=config", LDAPConnection::SEARCH_SUB, "objectclass=olcSchemaConfig" ); LDAPEntry *entry; - while ( entry = sr->getNext() ) + while ( (entry = sr->getNext()) ) { log_it(0,"Got Schema Entry: " + entry->getDN() ); boost::shared_ptr<OlcSchemaConfig> olce(new OlcSchemaConfig(*entry)); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r48663 - in /trunk/ldap-server/src: agent/SlapdConfigAgent.cc tree_structure.ycp
by rhafer＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: rhafer Date: Fri Jun 27 16:01:27 2008 New Revision: 48663 URL: http://svn.opensuse.org/viewcvs/yast?rev=48663&view=rev Log: Don't add/delete ppolicy when nothing was changed Modified: trunk/ldap-server/src/agent/SlapdConfigAgent.cc trunk/ldap-server/src/tree_structure.ycp Modified: trunk/ldap-server/src/agent/SlapdConfigAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/agent/SlapdConfi… ============================================================================== --- trunk/ldap-server/src/agent/SlapdConfigAgent.cc (original) +++ trunk/ldap-server/src/agent/SlapdConfigAgent.cc Fri Jun 27 16:01:27 2008 @@ -844,42 +844,48 @@ break; } } - boost::shared_ptr<OlcOverlay> ppolicyOlc; - if ( j == overlays.end() ) + YCPMap argMap = arg->asMap(); + if ( j == overlays.end() && argMap.size() == 0 ) { - y2milestone("New Overlay added"); - boost::shared_ptr<OlcOverlay> tmp(new OlcOverlay("ppolicy", (*i)->getDn())); - ppolicyOlc = tmp; - (*i)->addOverlay(ppolicyOlc); + y2milestone("Empty overlay nothing to do"); } - else + else { - y2milestone("Update existing Overlay"); - ppolicyOlc = *j; - } - YCPMap argMap = arg->asMap(); - y2milestone("Mapsize: %ld", argMap.size()); - if ( argMap.size() == 0 ){ - y2milestone("Delete ppolicy overlay"); - ppolicyOlc->clearChangedEntry(); - } else { - ppolicyOlc->setStringValue("olcPpolicyDefault", - argMap->value(YCPString("defaultPolicy"))->asString()->value_cstr() ); - if ( argMap->value(YCPString("useLockout"))->asBoolean()->value() == true ) + boost::shared_ptr<OlcOverlay> ppolicyOlc; + if ( j == overlays.end() ) { - ppolicyOlc->setStringValue("olcPpolicyUseLockout", "TRUE"); + y2milestone("New Overlay added"); + boost::shared_ptr<OlcOverlay> tmp(new OlcOverlay("ppolicy", (*i)->getDn())); + ppolicyOlc = tmp; + (*i)->addOverlay(ppolicyOlc); } else { - ppolicyOlc->setStringValue("olcPpolicyUseLockout", "FALSE"); + y2milestone("Update existing Overlay"); + ppolicyOlc = *j; } - if ( argMap->value(YCPString("hashClearText"))->asBoolean()->value() == true ) - { - ppolicyOlc->setStringValue("olcPpolicyHashCleartext", "TRUE"); - } - else - { - ppolicyOlc->setStringValue("olcPpolicyHashCleartext", "FALSE"); + if ( argMap.size() == 0 ){ + y2milestone("Delete ppolicy overlay"); + ppolicyOlc->clearChangedEntry(); + } else { + ppolicyOlc->setStringValue("olcPpolicyDefault", + argMap->value(YCPString("defaultPolicy"))->asString()->value_cstr() ); + if ( argMap->value(YCPString("useLockout"))->asBoolean()->value() == true ) + { + ppolicyOlc->setStringValue("olcPpolicyUseLockout", "TRUE"); + } + else + { + ppolicyOlc->setStringValue("olcPpolicyUseLockout", "FALSE"); + } + if ( argMap->value(YCPString("hashClearText"))->asBoolean()->value() == true ) + { + ppolicyOlc->setStringValue("olcPpolicyHashCleartext", "TRUE"); + } + else + { + ppolicyOlc->setStringValue("olcPpolicyHashCleartext", "FALSE"); + } } } ret = true; Modified: trunk/ldap-server/src/tree_structure.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/tree_structure.y… ============================================================================== --- trunk/ldap-server/src/tree_structure.ycp (original) +++ trunk/ldap-server/src/tree_structure.ycp Fri Jun 27 16:01:27 2008 @@ -1096,12 +1096,19 @@ // LdapServer::WriteSchemaIncludeList(inclist); // } } else { - // delete ppolicy - result = LdapServer::AddPasswordPolicy( index, $[] ); - if ( ! result ) { - map<string, string> err = LdapServer::GetError(); - callback_error = err["msg"]:"" + "\n" + err["details"]:""; + map<string,any> ppolicy_map = LdapServer::GetPpolicyOverlay(index); + if ( size(ppolicy_map) == 0 ) + { + result = true; } + else + { + // delete ppolicy + result = LdapServer::AddPasswordPolicy( index, $[] ); + if ( ! result ) { + map<string, string> err = LdapServer::GetError(); + callback_error = err["msg"]:"" + "\n" + err["details"]:""; + } // map<string,string> ppolicy_map = LdapServer::GetPasswordPolicyOverlay(suffix); // if ( ppolicy_map != nil ){ @@ -1117,6 +1124,7 @@ // }); // db["overlay"] = newoverlay; // } + } } return result; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r48662 - /trunk/ldap-server/src/lib/slapd-config.cpp
by rhafer＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: rhafer Date: Fri Jun 27 16:01:24 2008 New Revision: 48662 URL: http://svn.opensuse.org/viewcvs/yast?rev=48662&view=rev Log: Fixed logging output Modified: trunk/ldap-server/src/lib/slapd-config.cpp Modified: trunk/ldap-server/src/lib/slapd-config.cpp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/lib/slapd-config… ============================================================================== --- trunk/ldap-server/src/lib/slapd-config.cpp (original) +++ trunk/ldap-server/src/lib/slapd-config.cpp Fri Jun 27 16:01:24 2008 @@ -949,7 +949,7 @@ sr = m_lc->search( "cn=config", LDAPConnection::SEARCH_BASE); dbEntry = sr->getNext(); } catch (LDAPException e) { - log_it(0, e.getResultMsg() + ": " + e.getServerMsg() ); + log_it(0, e.getResultMsg() + " " + e.getServerMsg() ); throw; } if ( dbEntry ) { @@ -967,7 +967,7 @@ LDAPModList ml = olcg.entryDifftoMod(); m_lc->modify( olcg.getDn(), &ml ); } catch (LDAPException e) { - log_it(0, e.getResultMsg() + ": " + e.getServerMsg() ); + log_it(0, e.getResultMsg() + " " + e.getServerMsg() ); throw; } } @@ -989,7 +989,7 @@ } } } catch (LDAPException e) { - log_it(0, e.getResultMsg() + e.getServerMsg() ); + log_it(0, e.getResultMsg() + " " + e.getServerMsg() ); throw; } } @@ -1018,7 +1018,7 @@ res.push_back(olce); } } catch (LDAPException e ) { - log_it(0, e.getResultMsg() + e.getServerMsg() ); + log_it(0, e.getResultMsg() + " " + e.getServerMsg() ); throw; } return res; @@ -1039,7 +1039,7 @@ res.push_back(olce); } } catch (LDAPException e ) { - log_it(0, e.getResultMsg() + e.getServerMsg() ); + log_it(0, e.getResultMsg() + " " + e.getServerMsg() ); throw; } return res; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r48661 - in /trunk/ldap-server/src: agent/SlapdConfigAgent.cc lib/slapd-config.h
by rhafer＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: rhafer Date: Fri Jun 27 16:01:21 2008 New Revision: 48661 URL: http://svn.opensuse.org/viewcvs/yast?rev=48661&view=rev Log: Fixed compiler warnings Modified: trunk/ldap-server/src/agent/SlapdConfigAgent.cc trunk/ldap-server/src/lib/slapd-config.h Modified: trunk/ldap-server/src/agent/SlapdConfigAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/agent/SlapdConfi… ============================================================================== --- trunk/ldap-server/src/agent/SlapdConfigAgent.cc (original) +++ trunk/ldap-server/src/agent/SlapdConfigAgent.cc Fri Jun 27 16:01:21 2008 @@ -476,24 +476,33 @@ y2milestone("Component %s ", dbComponent.c_str()); if ( dbComponent == "indexes" ) { - IndexMap idx = (*i)->getDatabaseIndexes(); - IndexMap::const_iterator j = idx.begin(); - for ( ; j != idx.end(); j++ ) - { - YCPMap ycpIdx; - y2milestone("indexed Attribute: \"%s\"", j->first.c_str() ); - std::vector<IndexType>::const_iterator k = j->second.begin(); - for ( ; k != j->second.end(); k++ ) + boost::shared_ptr<OlcBdbDatabase> bdb = + boost::dynamic_pointer_cast<OlcBdbDatabase>(*i); + if ( bdb == 0 ) + { + y2milestone("Database doesn't provide indexing\n"); + } + else + { + IndexMap idx = bdb->getDatabaseIndexes(); + IndexMap::const_iterator j = idx.begin(); + for ( ; j != idx.end(); j++ ) { - if ( *k == Eq ){ - ycpIdx.add(YCPString("eq"), YCPBoolean(true) ); - } else if ( *k == Present ){ - ycpIdx.add(YCPString("pres"), YCPBoolean(true) ); - } else if ( *k == Sub ){ - ycpIdx.add(YCPString("sub"), YCPBoolean(true) ); + YCPMap ycpIdx; + y2milestone("indexed Attribute: \"%s\"", j->first.c_str() ); + std::vector<IndexType>::const_iterator k = j->second.begin(); + for ( ; k != j->second.end(); k++ ) + { + if ( *k == Eq ){ + ycpIdx.add(YCPString("eq"), YCPBoolean(true) ); + } else if ( *k == Present ){ + ycpIdx.add(YCPString("pres"), YCPBoolean(true) ); + } else if ( *k == Sub ){ + ycpIdx.add(YCPString("sub"), YCPBoolean(true) ); + } } + resMap.add( YCPString(j->first), ycpIdx ); } - resMap.add( YCPString(j->first), ycpIdx ); } return resMap; } @@ -791,28 +800,38 @@ y2milestone("Component '%s'", dbComponent.c_str()); if ( dbComponent == "index" ) { - std::vector<IndexType> idx; - std::string attr( arg->asMap()->value(YCPString("name"))->asString()->value_cstr() ); - y2milestone("Edit Index for Attribute: '%s'", attr.c_str() ); - if ( arg->asMap()->value(YCPString("pres"))->asBoolean()->value() == true ) + boost::shared_ptr<OlcBdbDatabase> bdb = + boost::dynamic_pointer_cast<OlcBdbDatabase>(*i); + if ( bdb == 0 ) { - idx.push_back(Present); + y2milestone("Database doesn't provide indexing\n"); + ret = false; } - if ( arg->asMap()->value(YCPString("eq"))->asBoolean()->value() == true ) - { - idx.push_back(Eq); - } - if ( arg->asMap()->value(YCPString("sub"))->asBoolean()->value() == true ) + else { - idx.push_back(Sub); - } - if ( ( idx.empty()) || ( ! (*i)->getDatabaseIndex(attr).empty() ) ) { - (*i)->deleteIndex( attr ); - } - if ( ! idx.empty() ) { - (*i)->addIndex(attr, idx); + std::vector<IndexType> idx; + std::string attr( arg->asMap()->value(YCPString("name"))->asString()->value_cstr() ); + y2milestone("Edit Index for Attribute: '%s'", attr.c_str() ); + if ( arg->asMap()->value(YCPString("pres"))->asBoolean()->value() == true ) + { + idx.push_back(Present); + } + if ( arg->asMap()->value(YCPString("eq"))->asBoolean()->value() == true ) + { + idx.push_back(Eq); + } + if ( arg->asMap()->value(YCPString("sub"))->asBoolean()->value() == true ) + { + idx.push_back(Sub); + } + if ( ( idx.empty()) || ( ! bdb->getDatabaseIndex(attr).empty() ) ) { + bdb->deleteIndex( attr ); + } + if ( ! idx.empty() ) { + bdb->addIndex(attr, idx); + } + ret = true; } - ret = true; } else if (dbComponent == "ppolicy" ) { Modified: trunk/ldap-server/src/lib/slapd-config.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/lib/slapd-config… ============================================================================== --- trunk/ldap-server/src/lib/slapd-config.h (original) +++ trunk/ldap-server/src/lib/slapd-config.h Fri Jun 27 16:01:21 2008 @@ -127,10 +127,6 @@ const std::string getType() const; //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) {}; - virtual void deleteIndex(const std::string& attr) {}; void addOverlay(boost::shared_ptr<OlcOverlay> overlay); OlcOverlayList& getOverlays() ; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0