diff --git a/bin/weewx/manager.py b/bin/weewx/manager.py index 4d9e3421..44b7ee14 100644 --- a/bin/weewx/manager.py +++ b/bin/weewx/manager.py @@ -1579,7 +1579,7 @@ class DaySummaryManager(Manager): if 'interval' not in record: raise ValueError("Missing value for record field 'interval'") elif record['interval'] <= 0: - raise ValueError("Non-positive value for record field 'interval': %s" (record['interval'], )) + raise ValueError("Non-positive value for record field 'interval': %s" % (record['interval'], )) weight = 60.0 * record['interval'] if self.version >= '2.0' else 1.0 return weight diff --git a/docs/js/weewx.js b/docs/js/weewx.js index b828e00a..5ce9f588 100644 --- a/docs/js/weewx.js +++ b/docs/js/weewx.js @@ -16,44 +16,56 @@ function wee_gen_id(text, element) { return hv } -function set_cookie(name, value, dur) { - if(dur===null || dur===0) dur=30; - var today = new Date(); - var expire = new Date(); - expire.setTime(today.getTime() + 24*3600000*dur); - document.cookie = name+"="+encodeURIComponent(value)+";expires="+expire.toUTCString(); +function set_cookie(name, value, days) { + // Default duration of 30 days + if (!days) days = 30; + var expire = new Date(Date.now() + 24 * 3600000 * days); + document.cookie = name + "=" + value + ";path=/;expires=" + expire.toUTCString(); } function get_cookie(name) { - if(name==="") return ""; - var cookie = " "+document.cookie; - var i = cookie.indexOf(" "+name+"="); - if(i<0) i = cookie.indexOf(";"+name+"="); - if(i<0) return ""; - var j = cookie.indexOf(";", i+1); - if(j<0) j = cookie.length; - return decodeURIComponent(cookie.substring(i + name.length + 2, j)); + if (!name) return ""; + var v = document.cookie.match('(^|;) ?' + name + '=([^;]*)(;|$)'); + return v ? v[2] : null; } function get_default_level() { var level = get_cookie("toc_level"); - if (level === "") { level = 2; } + if (!level) { + level = 3; + } return level; } function create_toc_control(level) { var c = document.getElementById('toc_controls'); - if(c) { + if (c) { var txt = "