[yast-commit] r44098 - in /trunk/yast2: VERSION library/modules/Mode.ycp library/types/src/URL.ycp package/yast2.changes

Author: locilka Date: Fri Feb 1 13:12:49 2008 New Revision: 44098 URL: http://svn.opensuse.org/viewcvs/yast?rev=44098&view=rev Log: - Added new functions into the URL module: MakeMapFromParams and MakeParamsFromMap. - Fixed deprecated find() calls in URL module. - 2.16.25 Modified: trunk/yast2/VERSION trunk/yast2/library/modules/Mode.ycp trunk/yast2/library/types/src/URL.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/VERSION?rev=44098&r1=44097&r2=44098&view=diff ============================================================================== --- trunk/yast2/VERSION (original) +++ trunk/yast2/VERSION Fri Feb 1 13:12:49 2008 @@ -1 +1 @@ -2.16.24 +2.16.25 Modified: trunk/yast2/library/modules/Mode.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/modules/Mode.ycp?rev=44098&r1=44097&r2=44098&view=diff ============================================================================== --- trunk/yast2/library/modules/Mode.ycp (original) +++ trunk/yast2/library/modules/Mode.ycp Fri Feb 1 13:12:49 2008 @@ -197,6 +197,10 @@ return mode () == "update"; } +global boolean Depeche () { + return true; +} + /** * normal, running system */ Modified: trunk/yast2/library/types/src/URL.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/types/src/URL.ycp?rev=44098&r1=44097&r2=44098&view=diff ============================================================================== --- trunk/yast2/library/types/src/URL.ycp (original) +++ trunk/yast2/library/types/src/URL.ycp Fri Feb 1 13:12:49 2008 @@ -251,7 +251,7 @@ if(url == nil || size(url) < 1) return false; /* We don't allow URLs with spaces */ - if(find(url, " ") != -1) return false; + if(search(url, " ") != nil) return false; map tokens = Parse(url); @@ -329,9 +329,11 @@ } y2debug("url: %1", url); - if (tokens["path"]:"" != "" && find (tokens["path"]:"", "/") != 0 ) + // path is not empty and doesn't start with "/" + if (tokens["path"]:"" != "" && ! regexpmatch (tokens["path"]:"", "^/")) url = sformat("%1/%2", url, EscapeString(tokens["path"]:"", transform_map_filename)); - else if (tokens["path"]:"" != "" && find (tokens["path"]:"", "/") == 0 ) + // patch is not empty and starts with "/" + else if (tokens["path"]:"" != "" && regexpmatch (tokens["path"]:"", "^/")) { while (substring (tokens["path"]:"", 0, 2) == "//") tokens["path"] = substring (tokens["path"]:"", 1); @@ -418,4 +420,93 @@ y2milestone("%1", Check(nil)); */ +/** + * Reads list of HTTP params and returns them as map. + * (Useful also for cd:/, dvd:/, nfs:/ ... params) + * Neither keys nor values are HTML-unescaped, see UnEscapeString(). + * + * @params string params + * @return map params + * + * @example + * MakeMapFromParams ("device=sda3&login=aaa&password=bbb") -> $[ + * "device" : "sda3", + * "login" : "aaa", + * "password" : "bbb" + * ] + */ +global map MakeMapFromParams (string params) { + // Error + if (params == nil) { + y2error ("Erroneous (nil) params!"); + return nil; + // Empty + } else if (params == "") { + return $[]; + } + + list <string> params_list = splitstring (params, "&"); + + params_list = filter (string one_param, params_list, { + return (one_param != "" && one_param != nil); + }); + + map ret = $[]; + integer eq_pos = nil; + string opt = ""; + string val = ""; + + foreach (string one_param, params_list, { + eq_pos = search (one_param, "="); + + if (eq_pos == nil) { + ret[one_param] = ""; + } else { + opt = substring (one_param, 0, eq_pos); + val = substring (one_param, (eq_pos + 1)); + + ret[opt] = val; + } + }); + + return ret; +} + +/** + * Returns string made of HTTP params. It's a reverse function to MakeMapFromParams(). + * Neither keys nor values are HTML-escaped, use EscapeString() if needed. + * + * @param map + * + * @see MakeMapFromParams + * + * @example + * MakeMapFromParams ($[ + * "param1" : "a", + * "param2" : "b", + * "param3" : "c", + * ]) -> "param1=a¶m2=b¶m3=c" + */ +global string MakeParamsFromMap (map params_map) { + // ["key1=value1", "key2=value2", ...] -> "key1=value1&key2=value2" + return mergestring ( + // ["key" : "value", ...] -> ["key=value", ...] + maplist (string key, string value, params_map, { + if (value == nil) { + y2warning ("Empty value for key %1", key); + value = ""; + } + + if (key == nil || key == "") { + y2error ("Empty key (will be skipped)"); + return ""; + } + + // "key=value" + return sformat ("%1=%2", key, value); + }), + "&" + ); +} + } Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=44098&r1=44097&r2=44098&view=diff ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Fri Feb 1 13:12:49 2008 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Fri Feb 1 13:00:18 CET 2008 - locilka@suse.cz + +- Added new functions into the URL module: MakeMapFromParams and + MakeParamsFromMap. +- Fixed deprecated find() calls in URL module. +- 2.16.25 + +------------------------------------------------------------------- Mon Jan 28 13:14:13 CET 2008 - locilka@suse.cz - Removing useless Wizard() calls in ProductControl to minimize the -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org