[yast-commit] r39328 - in /trunk/kdump/src: dialogs.ycp uifunctions.ycp

Author: juhliarik Date: Wed Jul 11 17:14:25 2007 New Revision: 39328 URL: http://svn.opensuse.org/viewcvs/yast?rev=39328&view=rev Log: recoding handle and store function for target of saving dump images Modified: trunk/kdump/src/dialogs.ycp trunk/kdump/src/uifunctions.ycp Modified: trunk/kdump/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/kdump/src/dialogs.ycp?rev=39328&r1=39327&r2=39328&view=diff ============================================================================== --- trunk/kdump/src/dialogs.ycp (original) +++ trunk/kdump/src/dialogs.ycp Wed Jul 11 17:14:25 2007 @@ -165,7 +165,7 @@ `Left(`RadioButton(`id("ftp"), `opt(`notify), "F&TP")), `Left(`RadioButton(`id("ssh"), `opt(`notify), "&SSH (scp)")), `Left(`RadioButton(`id("nfs"), `opt(`notify), "N&FS")), - `Left(`RadioButton(`id("smb"), `opt(`notify), "C&IFS (SMB)")) + `Left(`RadioButton(`id("cifs"), `opt(`notify), "C&IFS (SMB)")) )) ))), Modified: trunk/kdump/src/uifunctions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/kdump/src/uifunctions.ycp?rev=39328&r1=39327&r2=39328&view=diff ============================================================================== --- trunk/kdump/src/uifunctions.ycp (original) +++ trunk/kdump/src/uifunctions.ycp Wed Jul 11 17:14:25 2007 @@ -115,7 +115,7 @@ ); -term smb = `VBox( +term cifs = `VBox( `Frame(_("CIFS (SMB)"),`HBox(`HSpacing(1),`VBox( `Left(`TextEntry(`id ("server"), _("Server Nam&e"))), `Left(`HBox( @@ -243,6 +243,58 @@ } + +/** + * Function for saving KDUMP_SAVE_TARGET + * to standard outpu for KDUMP_SAVEDIR + * + * e.g. KDUMP_SAVEDIR = "ftp://[user[:pass]]@host[:port]/path + */ + +string tostringKDUMP_SAVE_TARGET() { + string result = ""; + if (KDUMP_SAVE_TARGET["target"]:nil == "file") { + result = "file://"; + if (KDUMP_SAVE_TARGET["dir"]:nil != "") + result = result+KDUMP_SAVE_TARGET["dir"]:nil; + } else if (KDUMP_SAVE_TARGET["target"]:nil == "ftp") { + result = "ftp://"; + if (KDUMP_SAVE_TARGET["user_name"]:nil == "anonymous") { + result = result+KDUMP_SAVE_TARGET["server"]:nil+":"+KDUMP_SAVE_TARGET["port"]:nil+KDUMP_SAVE_TARGET["dir"]:nil; + } else { + result = result+KDUMP_SAVE_TARGET["user_name"]:nil; + if (KDUMP_SAVE_TARGET["password"]:nil != "") + result = result+":"+KDUMP_SAVE_TARGET["password"]:nil; + result = result+"@"+KDUMP_SAVE_TARGET["server"]:nil+":"+KDUMP_SAVE_TARGET["port"]:nil+KDUMP_SAVE_TARGET["dir"]:nil; + } + } else if (KDUMP_SAVE_TARGET["target"]:nil == "ssh") { + result = "ssh://"; + if (KDUMP_SAVE_TARGET["user_name"]:nil != "") + result = result+KDUMP_SAVE_TARGET["user_name"]:nil+"@"; + result = result+KDUMP_SAVE_TARGET["server"]:nil+":"+KDUMP_SAVE_TARGET["port"]:nil+KDUMP_SAVE_TARGET["dir"]:nil; + } else if (KDUMP_SAVE_TARGET["target"]:nil == "nfs") { + result = "nfs://"+KDUMP_SAVE_TARGET["server"]:nil+KDUMP_SAVE_TARGET["dir"]:nil; + + } else if (KDUMP_SAVE_TARGET["target"]:nil == "cifs") { + result = "cifs://"; + if (KDUMP_SAVE_TARGET["user_name"]:nil == "anonymous") { + result = result+KDUMP_SAVE_TARGET["server"]:nil+"/"+KDUMP_SAVE_TARGET["share"]:nil+KDUMP_SAVE_TARGET["dir"]:nil; + } else { + result = result+KDUMP_SAVE_TARGET["user_name"]:nil; + if (KDUMP_SAVE_TARGET["password"]:nil != "") + result = result + ":" + KDUMP_SAVE_TARGET["password"]:nil; + result = result + "@"+ KDUMP_SAVE_TARGET["server"]:nil+"/"+KDUMP_SAVE_TARGET["share"]:nil+KDUMP_SAVE_TARGET["dir"]:nil; + + } + } + + //Popup::Message(result); + return result; +} + + + + /** * Function initializes option "Kdump Command Line" * or "Kdump Command Line Append" @@ -287,8 +339,8 @@ UI::ChangeWidget(`id ("password"), `Value, KDUMP_SAVE_TARGET["password"]:nil); } } else if (KDUMP_SAVE_TARGET["target"]:nil == "cifs") { - UI::ReplaceWidget (`id ("Targets"), smb); - UI::ChangeWidget(`id ("smb"), `Value, true); + UI::ReplaceWidget (`id ("Targets"), cifs); + UI::ChangeWidget(`id ("cifs"), `Value, true); foreach (string key, ["server", "dir", "share", "user_name", "password"], { UI::ChangeWidget(`id (key), `Value, KDUMP_SAVE_TARGET[key]:nil); }); @@ -335,8 +387,8 @@ UI::ReplaceWidget (`id ("Targets"), nfs); UI::ChangeWidget(`id ("server"), `Value, KDUMP_SAVE_TARGET["server"]:nil); UI::ChangeWidget(`id ("dir"), `Value, KDUMP_SAVE_TARGET["dir"]:nil); - } else if (radiobutton == "smb") { - UI::ReplaceWidget (`id ("Targets"), smb); + } else if (radiobutton == "cifs") { + UI::ReplaceWidget (`id ("Targets"), cifs); foreach (string key, ["server", "dir", "share", "user_name", "password"], { UI::ChangeWidget(`id (key), `Value, KDUMP_SAVE_TARGET[key]:nil); }); @@ -346,6 +398,16 @@ UI::ChangeWidget(`id ("dir"), `Value, dir); //KDUMP_SAVE_TARGET["dir"] = dir; + } else if (radiobutton == "anonymous") { + boolean value = (boolean) UI::QueryWidget(`id ("anonymous"), `Value); + string target = tostring(UI::QueryWidget(`id ("DumpTarget"), `Value)); + if (((value) && (target == "ftp"))||((!value) && (target == "cifs"))) { + UI::ChangeWidget(`id ("user_name"), `Enabled, false); + UI::ChangeWidget(`id ("password"), `Enabled, false); + } else if (((value) && (target == "cifs"))||((!value) && (target == "ftp"))) { + UI::ChangeWidget(`id ("user_name"), `Enabled, true); + UI::ChangeWidget(`id ("password"), `Enabled, true); + } } return nil; @@ -360,15 +422,143 @@ void StoreTargetKdump (string key, map event) { string radiobut = tostring(UI::QueryWidget(`id ("DumpTarget"), `Value)); + string value = nil; if (radiobut == "local_filesystem") { KDUMP_SAVE_TARGET["target"] = "file"; - if (UI::QueryWidget(`id ("dir"), `Value) != nil) + //directory + value = tostring(UI::QueryWidget(`id ("dir"), `Value)); + if (value != nil) + KDUMP_SAVE_TARGET["dir"] = value; + else + KDUMP_SAVE_TARGET["dir"] = ""; + } else if (radiobut == "ftp") { + KDUMP_SAVE_TARGET["target"] = "ftp"; + + //server + value = tostring(UI::QueryWidget(`id ("server"), `Value)); + if (value != nil) + KDUMP_SAVE_TARGET["server"] = value; + else + KDUMP_SAVE_TARGET["server"] = ""; + + //port + KDUMP_SAVE_TARGET["port"] = tostring(UI::QueryWidget(`id ("port"), `Value)); + + //directory + value = tostring(UI::QueryWidget(`id ("dir"), `Value)); + if (value != nil) + KDUMP_SAVE_TARGET["dir"] = value; + else + KDUMP_SAVE_TARGET["dir"] = ""; + + //user_name vs. anonymous + value = tostring(UI::QueryWidget(`id ("user_name"), `Value)); + if ((boolean) UI::QueryWidget(`id ("anonymous"), `Value)) { + KDUMP_SAVE_TARGET["user_name"] = "anonymous"; + } else if (value != nil) { + KDUMP_SAVE_TARGET["user_name"] = value; + } else { + KDUMP_SAVE_TARGET["user_name"] = ""; + } + + //password + value = tostring(UI::QueryWidget(`id ("password"), `Value)); + if (value != nil) + KDUMP_SAVE_TARGET["password"] = value; + else + KDUMP_SAVE_TARGET["password"] = ""; + + //directory + if (UI::QueryWidget(`id ("dir"), `Value) != nil) KDUMP_SAVE_TARGET["dir"] = tostring(UI::QueryWidget(`id ("dir"), `Value)); else KDUMP_SAVE_TARGET["dir"] = ""; - Kdump::KDUMP_SETTINGS["KDUMP_SAVEDIR"] = KDUMP_SAVE_TARGET["target"]:nil + "://" + KDUMP_SAVE_TARGET["dir"]:nil; + } else if (radiobut == "ssh") { + KDUMP_SAVE_TARGET["target"] = "ssh"; + + //server + value = tostring(UI::QueryWidget(`id ("server"), `Value)); + if (value != nil) + KDUMP_SAVE_TARGET["server"] = value; + else + KDUMP_SAVE_TARGET["server"] = ""; + + //port + KDUMP_SAVE_TARGET["port"] = tostring(UI::QueryWidget(`id ("port"), `Value)); + + //directory + value = tostring(UI::QueryWidget(`id ("dir"), `Value)); + if (value != nil) + KDUMP_SAVE_TARGET["dir"] = value; + else + KDUMP_SAVE_TARGET["dir"] = ""; + + //user_name + value = tostring(UI::QueryWidget(`id ("user_name"), `Value)); + if (value != nil) + KDUMP_SAVE_TARGET["user_name"] = value; + else + KDUMP_SAVE_TARGET["user_name"] = ""; + + + } else if (radiobut == "nfs") { + KDUMP_SAVE_TARGET["target"] = "nfs"; + + //server + value = tostring(UI::QueryWidget(`id ("server"), `Value)); + if (value != nil) + KDUMP_SAVE_TARGET["server"] = value; + else + KDUMP_SAVE_TARGET["server"] = ""; + + //directory + value = tostring(UI::QueryWidget(`id ("dir"), `Value)); + if (value != nil) + KDUMP_SAVE_TARGET["dir"] = value; + else + KDUMP_SAVE_TARGET["dir"] = ""; + } else if (radiobut == "cifs") { + KDUMP_SAVE_TARGET["target"] = "cifs"; + + //server + value = tostring(UI::QueryWidget(`id ("server"), `Value)); + if (value != nil) + KDUMP_SAVE_TARGET["server"] = value; + else + KDUMP_SAVE_TARGET["server"] = ""; + + //share + value = tostring(UI::QueryWidget(`id ("share"), `Value)); + if (value != nil) + KDUMP_SAVE_TARGET["share"] = value; + else + KDUMP_SAVE_TARGET["share"] = ""; + + //directory + value = tostring(UI::QueryWidget(`id ("dir"), `Value)); + if (value != nil) + KDUMP_SAVE_TARGET["dir"] = value; + else + KDUMP_SAVE_TARGET["dir"] = ""; + + //user_name vs. anonymous + value = tostring(UI::QueryWidget(`id ("user_name"), `Value)); + if (!((boolean) UI::QueryWidget(`id ("anonymous"), `Value))) { + KDUMP_SAVE_TARGET["user_name"] = "anonymous"; + } else if (value != nil) { + KDUMP_SAVE_TARGET["user_name"] = value; + } else { + KDUMP_SAVE_TARGET["user_name"] = ""; + } + + //password + value = tostring(UI::QueryWidget(`id ("password"), `Value)); + if (value != nil) + KDUMP_SAVE_TARGET["password"] = value; + else + KDUMP_SAVE_TARGET["password"] = ""; } - + Kdump::KDUMP_SETTINGS["KDUMP_SAVEDIR"] = tostringKDUMP_SAVE_TARGET(); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org