[yast-commit] r49049 - in /branches/tmp/aschnell/part-redesign/storage/src/modules: Storage.ycp StorageFields.ycp

Author: aschnell Date: Mon Jul 14 15:21:06 2008 New Revision: 49049 URL: http://svn.opensuse.org/viewcvs/yast?rev=49049&view=rev Log: - added convenience functions Modified: branches/tmp/aschnell/part-redesign/storage/src/modules/Storage.ycp branches/tmp/aschnell/part-redesign/storage/src/modules/StorageFields.ycp Modified: branches/tmp/aschnell/part-redesign/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/modules/Storage.ycp?rev=49049&r1=49048&r2=49049&view=diff ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/modules/Storage.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/modules/Storage.ycp Mon Jul 14 15:21:06 2008 @@ -326,20 +326,43 @@ } +global string KByteToHumanString(integer kbytes) +{ + return LibStorage::StorageInterface::byteToHumanString(sint, kbytes * 1024, false, 2, false); +} + + global string ByteToHumanStringWithPrecision(integer bytes, integer precision, boolean omit_zeroes) { return LibStorage::StorageInterface::byteToHumanString(sint, bytes, false, precision, omit_zeroes); } +global string KByteToHumanStringWithPrecision(integer kbytes, integer precision, boolean omit_zeroes) +{ + return LibStorage::StorageInterface::byteToHumanString(sint, kbytes * 1024, false, precision, omit_zeroes); +} + + global boolean HumanStringToByte(string str, integer& bytes) { + integer i = 0; bytes = i; // bnc #408829 and #408891 boolean ret = LibStorage::StorageInterface::humanStringToByte(sint, str, false, bytes); y2milestone("HumanStringToByte ret:%1 str:%2 bytes:%3", ret, str, bytes); return ret; } +global boolean HumanStringToKByte(string str, integer& kbytes) +{ + integer bytes = 0; // bnc #408829 + boolean ret = LibStorage::StorageInterface::humanStringToByte(sint, str, false, bytes); + kbytes = bytes / 1024; + y2milestone("HumanStringToKByte ret:%1 str:%2 kbytes:%3", ret, str, kbytes); + return ret; +} + + global define map GetTargetMap(); /** * Modified: branches/tmp/aschnell/part-redesign/storage/src/modules/StorageFields.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/modules/StorageFields.ycp?rev=49049&r1=49048&r2=49049&view=diff ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/modules/StorageFields.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/modules/StorageFields.ycp Mon Jul 14 15:21:06 2008 @@ -214,7 +214,7 @@ case `size: { - string value = Storage::ByteToHumanString(data["size_k"]:0*1024); + string value = Storage::KByteToHumanString(data["size_k"]:0); if (style == `table) return value; else @@ -463,7 +463,7 @@ if (stripes == 1) value = sformat("%1", stripes); else - value = sformat("%1 (%2)", stripes, Storage::ByteToHumanStringWithPrecision(stripesize*1024, 2, true)); + value = sformat("%1 (%2)", stripes, Storage::KByteToHumanStringWithPrecision(stripesize, 2, true)); } if (style == `table) return value; @@ -485,7 +485,7 @@ string value = ""; if (contains(["raid0", "raid5"], data["raid_type"]:"")) { integer chunksize = data["chunk_size"]:0; - value = Storage::ByteToHumanStringWithPrecision(chunksize*1024, 2, true); + value = Storage::KByteToHumanStringWithPrecision(chunksize, 2, true); } if (style == `table) return value; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org