Author: aschnell Date: Fri Jun 6 22:51:15 2008 New Revision: 48142 URL: http://svn.opensuse.org/viewcvs/yast?rev=48142&view=rev Log: - make all predicate functions take a list Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-dm.ycp branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd.ycp branches/tmp/aschnell/part-redesign/storage/src/include/ep-loop.ycp branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm-dialogs.ycp branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm.ycp branches/tmp/aschnell/part-redesign/storage/src/include/ep-nfs.ycp branches/tmp/aschnell/part-redesign/storage/src/include/ep-raid.ycp branches/tmp/aschnell/part-redesign/storage/src/modules/StorageFields.ycp Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-dm.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/include/ep-dm.ycp?rev=48142&r1=48141&r2=48142&view=diff ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-dm.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-dm.ycp Fri Jun 6 22:51:15 2008 @@ -12,7 +12,7 @@ { symbol Predicate(map disk, map partition) { - return StorageFields::PredicateType(disk, partition, [`CT_DM]); + return StorageFields::PredicateDiskType(disk, partition, [`CT_DM]); } list<symbol> fields = StorageFields::Filter([ `device, `size, `fs_type, `mount_point ]); Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd.ycp?rev=48142&r1=48141&r2=48142&view=diff ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd.ycp Fri Jun 6 22:51:15 2008 @@ -16,7 +16,7 @@ { symbol Predicate(map disk, map partition) { - return StorageFields::PredicateType(disk, partition, [`CT_DMRAID, `CT_DISK]); + return StorageFields::PredicateDiskType(disk, partition, [`CT_DMRAID, `CT_DISK]); } list<symbol> fields = StorageFields::Filter([ `device, `udev_path, `udev_id, `size, `format, @@ -198,7 +198,7 @@ symbol Predicate(map disk, map partition) { - return StorageFields::PredicateDiskDevice(disk, partition, device); + return StorageFields::PredicateDiskDevice(disk, partition, [ device ]); } list<symbol> fields = StorageFields::Filter([ `device, `udev_path, `udev_id, `size, `format, Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-loop.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/include/ep-loop.ycp?rev=48142&r1=48141&r2=48142&view=diff ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-loop.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-loop.ycp Fri Jun 6 22:51:15 2008 @@ -13,7 +13,7 @@ { symbol Predicate(map disk, map partition) { - return StorageFields::PredicateType(disk, partition, [`CT_LOOP]); + return StorageFields::PredicateDiskType(disk, partition, [`CT_LOOP]); } list<symbol> fields = StorageFields::Filter([ `device, `size, `mount_point ]); Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm-dialogs.ycp?rev=48142&r1=48141&r2=48142&view=diff ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm-dialogs.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm-dialogs.ycp Fri Jun 6 22:51:15 2008 @@ -36,7 +36,7 @@ symbol Predicate(map disk, map partition) { - return StorageFields::PredicateDevices(disk, partition, candidates_s); + return StorageFields::PredicateDevice(disk, partition, candidates_s); } fields = [ `device ]; // workaround for missing widget Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm.ycp?rev=48142&r1=48141&r2=48142&view=diff ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm.ycp Fri Jun 6 22:51:15 2008 @@ -15,7 +15,7 @@ { symbol Predicate(map disk, map partition) { - return StorageFields::PredicateType(disk, partition, [`CT_LVM]); + return StorageFields::PredicateDiskType(disk, partition, [`CT_LVM]); } list<symbol> fields = StorageFields::Filter([ `device, `size, `format, `type, @@ -119,7 +119,7 @@ symbol Predicate(map disk, map partition) { - return StorageFields::PredicateDiskDevice(disk, partition, device); + return StorageFields::PredicateDiskDevice(disk, partition, [ device ]); } list<symbol> fields = StorageFields::Filter([ `device, `size, `format, `type, @@ -177,7 +177,7 @@ symbol Predicate(map disk, map partition) { - return StorageFields::PredicateUsedByDevice(disk, partition, disk_device); + return StorageFields::PredicateUsedByDevice(disk, partition, [ disk_device ]); } list<symbol> fields = StorageFields::Filter([ `device, `udev_path, `udev_id, `size, Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-nfs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/include/ep-nfs.ycp?rev=48142&r1=48141&r2=48142&view=diff ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-nfs.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-nfs.ycp Fri Jun 6 22:51:15 2008 @@ -12,7 +12,7 @@ { symbol Predicate(map disk, map partition) { - return StorageFields::PredicateType(disk, partition, [`CT_NFS]); + return StorageFields::PredicateDiskType(disk, partition, [`CT_NFS]); } list<symbol> fields = StorageFields::Filter([ `device, `size, `mount_point ]); Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-raid.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/include/ep-raid.ycp?rev=48142&r1=48141&r2=48142&view=diff ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-raid.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-raid.ycp Fri Jun 6 22:51:15 2008 @@ -12,7 +12,7 @@ { symbol Predicate(map disk, map partition) { - return StorageFields::PredicateType(disk, partition, [`CT_MD]); + return StorageFields::PredicateDiskType(disk, partition, [`CT_MD]); } list<symbol> fields = StorageFields::Filter([ `device, `size, `raid_type, `mount_point, @@ -94,7 +94,7 @@ symbol Predicate(map disk, map partition) { - return StorageFields::PredicateUsedByDevice(disk, partition, part_device); + return StorageFields::PredicateUsedByDevice(disk, partition, [ part_device ]); } list<symbol> fields = StorageFields::Filter([ `device, `udev_path, `udev_id, `size, 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=48142&r1=48141&r2=48142&view=diff ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/modules/StorageFields.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/modules/StorageFields.ycp Fri Jun 6 22:51:15 2008 @@ -624,11 +624,11 @@ /** * Predicate function for Table and TableContents. */ - global symbol PredicateType(map disk, map partition, list<symbol> types) + global symbol PredicateDiskType(map disk, map partition, list<symbol> disk_types) { if (partition == nil) { - if (contains(types, disk["type"]:`CT_UNKNOWN)) + if (contains(disk_types, disk["type"]:`CT_UNKNOWN)) return `showandfollow; else return `ignore; @@ -643,11 +643,11 @@ /** * Predicate function for Table and TableContents. */ - global symbol PredicateDiskDevice(map disk, map partition, string disk_device) + global symbol PredicateDiskDevice(map disk, map partition, list<string> disk_devices) { if (partition == nil) { - if (disk["device"]:"" == disk_device) + if (contains(disk_devices, disk["device"]:"")) return `showandfollow; else return `ignore; @@ -662,7 +662,7 @@ /** * Predicate function for Table and TableContents. */ - global symbol PredicateDevices(map disk, map partition, list<string> devices) + global symbol PredicateDevice(map disk, map partition, list<string> devices) { if (partition == nil) { @@ -684,18 +684,18 @@ /** * Predicate function for Table and TableContents. */ - global symbol PredicateUsedByDevice(map disk, map partition, string device) + global symbol PredicateUsedByDevice(map disk, map partition, list<string> devices) { if (partition == nil) { - if ("/dev/" + disk["used_by"]:"" == device) + if (contains(devices, "/dev/" + disk["used_by"]:"")) return `showandfollow; else return `follow; } else { - if ("/dev/" + partition["used_by"]:"" == device) + if (contains(devices, "/dev/" + partition["used_by"]:"")) return `show; else return `ignore; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org