March 2010 - rhmessaging-commits - Jboss List Archives

rhmessaging commits: r3880 - mgmt/trunk/wooly/resources.

by rhmessaging-commits＠lists.jboss.org

Author: eallen Date: 2010-03-23 15:37:38 -0400 (Tue, 23 Mar 2010) New Revision: 3880 Modified: mgmt/trunk/wooly/resources/mootools.js Log: Updated to version 1.2.4 of mootools Modified: mgmt/trunk/wooly/resources/mootools.js =================================================================== --- mgmt/trunk/wooly/resources/mootools.js 2010-03-23 18:32:07 UTC (rev 3879) +++ mgmt/trunk/wooly/resources/mootools.js 2010-03-23 19:37:38 UTC (rev 3880) @@ -1,3928 +1,405 @@ -/* -Script: Core.js - MooTools - My Object Oriented JavaScript Tools. +//MooTools, <http://mootools.net>, My Object Oriented (JavaScript) Tools. Copyright (c) 2006-2009 Valerio Proietti, <http://mad4milk.net>, MIT Style License. -License: - MIT-style license. +var MooTools={version:"1.2.4",build:"0d9113241a90b9cd5643b926795852a2026710d4"};var Native=function(k){k=k||{};var a=k.name;var i=k.legacy;var b=k.protect; +var c=k.implement;var h=k.generics;var f=k.initialize;var g=k.afterImplement||function(){};var d=f||i;h=h!==false;d.constructor=Native;d.$family={name:"native"}; +if(i&&f){d.prototype=i.prototype;}d.prototype.constructor=d;if(a){var e=a.toLowerCase();d.prototype.$family={name:e};Native.typize(d,e);}var j=function(n,l,o,m){if(!b||m||!n.prototype[l]){n.prototype[l]=o; +}if(h){Native.genericize(n,l,b);}g.call(n,l,o);return n;};d.alias=function(n,l,p){if(typeof n=="string"){var o=this.prototype[n];if((n=o)){return j(this,l,n,p); +}}for(var m in n){this.alias(m,n[m],l);}return this;};d.implement=function(m,l,o){if(typeof m=="string"){return j(this,m,l,o);}for(var n in m){j(this,n,m[n],l); +}return this;};if(c){d.implement(c);}return d;};Native.genericize=function(b,c,a){if((!a||!b[c])&&typeof b.prototype[c]=="function"){b[c]=function(){var d=Array.prototype.slice.call(arguments); +return b.prototype[c].apply(d.shift(),d);};}};Native.implement=function(d,c){for(var b=0,a=d.length;b<a;b++){d[b].implement(c);}};Native.typize=function(a,b){if(!a.type){a.type=function(c){return($type(c)===b); +};}};(function(){var a={Array:Array,Date:Date,Function:Function,Number:Number,RegExp:RegExp,String:String};for(var h in a){new Native({name:h,initialize:a[h],protect:true}); +}var d={"boolean":Boolean,"native":Native,object:Object};for(var c in d){Native.typize(d[c],c);}var f={Array:["concat","indexOf","join","lastIndexOf","pop","push","reverse","shift","slice","sort","splice","toString","unshift","valueOf"],String:["charAt","charCodeAt","concat","indexOf","lastIndexOf","match","replace","search","slice","split","substr","substring","toLowerCase","toUpperCase","valueOf"]}; +for(var e in f){for(var b=f[e].length;b--;){Native.genericize(a[e],f[e][b],true);}}})();var Hash=new Native({name:"Hash",initialize:function(a){if($type(a)=="hash"){a=$unlink(a.getClean()); +}for(var b in a){this[b]=a[b];}return this;}});Hash.implement({forEach:function(b,c){for(var a in this){if(this.hasOwnProperty(a)){b.call(c,this[a],a,this); +}}},getClean:function(){var b={};for(var a in this){if(this.hasOwnProperty(a)){b[a]=this[a];}}return b;},getLength:function(){var b=0;for(var a in this){if(this.hasOwnProperty(a)){b++; +}}return b;}});Hash.alias("forEach","each");Array.implement({forEach:function(c,d){for(var b=0,a=this.length;b<a;b++){c.call(d,this[b],b,this);}}});Array.alias("forEach","each"); +function $A(b){if(b.item){var a=b.length,c=new Array(a);while(a--){c[a]=b[a];}return c;}return Array.prototype.slice.call(b);}function $arguments(a){return function(){return arguments[a]; +};}function $chk(a){return !!(a||a===0);}function $clear(a){clearTimeout(a);clearInterval(a);return null;}function $defined(a){return(a!=undefined);}function $each(c,b,d){var a=$type(c); +((a=="arguments"||a=="collection"||a=="array")?Array:Hash).each(c,b,d);}function $empty(){}function $extend(c,a){for(var b in (a||{})){c[b]=a[b];}return c; +}function $H(a){return new Hash(a);}function $lambda(a){return($type(a)=="function")?a:function(){return a;};}function $merge(){var a=Array.slice(arguments); +a.unshift({});return $mixin.apply(null,a);}function $mixin(e){for(var d=1,a=arguments.length;d<a;d++){var b=arguments[d];if($type(b)!="object"){continue; +}for(var c in b){var g=b[c],f=e[c];e[c]=(f&&$type(g)=="object"&&$type(f)=="object")?$mixin(f,g):$unlink(g);}}return e;}function $pick(){for(var b=0,a=arguments.length; +b<a;b++){if(arguments[b]!=undefined){return arguments[b];}}return null;}function $random(b,a){return Math.floor(Math.random()*(a-b+1)+b);}function $splat(b){var a=$type(b); +return(a)?((a!="array"&&a!="arguments")?[b]:b):[];}var $time=Date.now||function(){return +new Date;};function $try(){for(var b=0,a=arguments.length;b<a; +b++){try{return arguments[b]();}catch(c){}}return null;}function $type(a){if(a==undefined){return false;}if(a.$family){return(a.$family.name=="number"&&!isFinite(a))?false:a.$family.name; +}if(a.nodeName){switch(a.nodeType){case 1:return"element";case 3:return(/\S/).test(a.nodeValue)?"textnode":"whitespace";}}else{if(typeof a.length=="number"){if(a.callee){return"arguments"; +}else{if(a.item){return"collection";}}}}return typeof a;}function $unlink(c){var b;switch($type(c)){case"object":b={};for(var e in c){b[e]=$unlink(c[e]); +}break;case"hash":b=new Hash(c);break;case"array":b=[];for(var d=0,a=c.length;d<a;d++){b[d]=$unlink(c[d]);}break;default:return c;}return b;}var Browser=$merge({Engine:{name:"unknown",version:0},Platform:{name:(window.orientation!=undefined)?"ipod":(navigator.platform.match(/mac|win|linux/i)||["other"])[0].toLowerCase()},Features:{xpath:!!(document.evaluate),air:!!(window.runtime),query:!!(document.querySelector)},Plugins:{},Engines:{presto:function(){return(!window.opera)?false:((arguments.callee.caller)?960:((document.getElementsByClassName)?950:925)); +},trident:function(){return(!window.ActiveXObject)?false:((window.XMLHttpRequest)?((document.querySelectorAll)?6:5):4);},webkit:function(){return(navigator.taintEnabled)?false:((Browser.Features.xpath)?((Browser.Features.query)?525:420):419); +},gecko:function(){return(!document.getBoxObjectFor&&window.mozInnerScreenX==null)?false:((document.getElementsByClassName)?19:18);}}},Browser||{});Browser.Platform[Browser.Platform.name]=true; +Browser.detect=function(){for(var b in this.Engines){var a=this.Engines[b]();if(a){this.Engine={name:b,version:a};this.Engine[b]=this.Engine[b+a]=true; +break;}}return{name:b,version:a};};Browser.detect();Browser.Request=function(){return $try(function(){return new XMLHttpRequest();},function(){return new ActiveXObject("MSXML2.XMLHTTP"); +},function(){return new ActiveXObject("Microsoft.XMLHTTP");});};Browser.Features.xhr=!!(Browser.Request());Browser.Plugins.Flash=(function(){var a=($try(function(){return navigator.plugins["Shockwave Flash"].description; +},function(){return new ActiveXObject("ShockwaveFlash.ShockwaveFlash").GetVariable("$version");})||"0 r0").match(/\d+/g);return{version:parseInt(a[0]||0+"."+a[1],10)||0,build:parseInt(a[2],10)||0}; +})();function $exec(b){if(!b){return b;}if(window.execScript){window.execScript(b);}else{var a=document.createElement("script");a.setAttribute("type","text/javascript"); +a[(Browser.Engine.webkit&&Browser.Engine.version<420)?"innerText":"text"]=b;document.head.appendChild(a);document.head.removeChild(a);}return b;}Native.UID=1; +var $uid=(Browser.Engine.trident)?function(a){return(a.uid||(a.uid=[Native.UID++]))[0];}:function(a){return a.uid||(a.uid=Native.UID++);};var Window=new Native({name:"Window",legacy:(Browser.Engine.trident)?null:window.Window,initialize:function(a){$uid(a); +if(!a.Element){a.Element=$empty;if(Browser.Engine.webkit){a.document.createElement("iframe");}a.Element.prototype=(Browser.Engine.webkit)?window["[[DOMElement.prototype]]"]:{}; +}a.document.window=a;return $extend(a,Window.Prototype);},afterImplement:function(b,a){window[b]=Window.Prototype[b]=a;}});Window.Prototype={$family:{name:"window"}}; +new Window(window);var Document=new Native({name:"Document",legacy:(Browser.Engine.trident)?null:window.Document,initialize:function(a){$uid(a);a.head=a.getElementsByTagName("head")[0]; +a.html=a.getElementsByTagName("html")[0];if(Browser.Engine.trident&&Browser.Engine.version<=4){$try(function(){a.execCommand("BackgroundImageCache",false,true); +});}if(Browser.Engine.trident){a.window.attachEvent("onunload",function(){a.window.detachEvent("onunload",arguments.callee);a.head=a.html=a.window=null; +});}return $extend(a,Document.Prototype);},afterImplement:function(b,a){document[b]=Document.Prototype[b]=a;}});Document.Prototype={$family:{name:"document"}}; +new Document(document);Array.implement({every:function(c,d){for(var b=0,a=this.length;b<a;b++){if(!c.call(d,this[b],b,this)){return false;}}return true; +},filter:function(d,e){var c=[];for(var b=0,a=this.length;b<a;b++){if(d.call(e,this[b],b,this)){c.push(this[b]);}}return c;},clean:function(){return this.filter($defined); +},indexOf:function(c,d){var a=this.length;for(var b=(d<0)?Math.max(0,a+d):d||0;b<a;b++){if(this[b]===c){return b;}}return -1;},map:function(d,e){var c=[]; +for(var b=0,a=this.length;b<a;b++){c[b]=d.call(e,this[b],b,this);}return c;},some:function(c,d){for(var b=0,a=this.length;b<a;b++){if(c.call(d,this[b],b,this)){return true; +}}return false;},associate:function(c){var d={},b=Math.min(this.length,c.length);for(var a=0;a<b;a++){d[c[a]]=this[a];}return d;},link:function(c){var a={}; +for(var e=0,b=this.length;e<b;e++){for(var d in c){if(c[d](this[e])){a[d]=this[e];delete c[d];break;}}}return a;},contains:function(a,b){return this.indexOf(a,b)!=-1; +},extend:function(c){for(var b=0,a=c.length;b<a;b++){this.push(c[b]);}return this;},getLast:function(){return(this.length)?this[this.length-1]:null;},getRandom:function(){return(this.length)?this[$random(0,this.length-1)]:null; +},include:function(a){if(!this.contains(a)){this.push(a);}return this;},combine:function(c){for(var b=0,a=c.length;b<a;b++){this.include(c[b]);}return this; +},erase:function(b){for(var a=this.length;a--;a){if(this[a]===b){this.splice(a,1);}}return this;},empty:function(){this.length=0;return this;},flatten:function(){var d=[]; +for(var b=0,a=this.length;b<a;b++){var c=$type(this[b]);if(!c){continue;}d=d.concat((c=="array"||c=="collection"||c=="arguments")?Array.flatten(this[b]):this[b]); +}return d;},hexToRgb:function(b){if(this.length!=3){return null;}var a=this.map(function(c){if(c.length==1){c+=c;}return c.toInt(16);});return(b)?a:"rgb("+a+")"; +},rgbToHex:function(d){if(this.length<3){return null;}if(this.length==4&&this[3]==0&&!d){return"transparent";}var b=[];for(var a=0;a<3;a++){var c=(this[a]-0).toString(16); +b.push((c.length==1)?"0"+c:c);}return(d)?b:"#"+b.join("");}});Function.implement({extend:function(a){for(var b in a){this[b]=a[b];}return this;},create:function(b){var a=this; +b=b||{};return function(d){var c=b.arguments;c=(c!=undefined)?$splat(c):Array.slice(arguments,(b.event)?1:0);if(b.event){c=[d||window.event].extend(c); +}var e=function(){return a.apply(b.bind||null,c);};if(b.delay){return setTimeout(e,b.delay);}if(b.periodical){return setInterval(e,b.periodical);}if(b.attempt){return $try(e); +}return e();};},run:function(a,b){return this.apply(b,$splat(a));},pass:function(a,b){return this.create({bind:b,arguments:a});},bind:function(b,a){return this.create({bind:b,arguments:a}); +},bindWithEvent:function(b,a){return this.create({bind:b,arguments:a,event:true});},attempt:function(a,b){return this.create({bind:b,arguments:a,attempt:true})(); +},delay:function(b,c,a){return this.create({bind:c,arguments:a,delay:b})();},periodical:function(c,b,a){return this.create({bind:b,arguments:a,periodical:c})(); +}});Number.implement({limit:function(b,a){return Math.min(a,Math.max(b,this));},round:function(a){a=Math.pow(10,a||0);return Math.round(this*a)/a;},times:function(b,c){for(var a=0; +a<this;a++){b.call(c,a,this);}},toFloat:function(){return parseFloat(this);},toInt:function(a){return parseInt(this,a||10);}});Number.alias("times","each"); +(function(b){var a={};b.each(function(c){if(!Number[c]){a[c]=function(){return Math[c].apply(null,[this].concat($A(arguments)));};}});Number.implement(a); +})(["abs","acos","asin","atan","atan2","ceil","cos","exp","floor","log","max","min","pow","sin","sqrt","tan"]);String.implement({test:function(a,b){return((typeof a=="string")?new RegExp(a,b):a).test(this); +},contains:function(a,b){return(b)?(b+this+b).indexOf(b+a+b)>-1:this.indexOf(a)>-1;},trim:function(){return this.replace(/^\s+|\s+$/g,"");},clean:function(){return this.replace(/\s+/g," ").trim(); +},camelCase:function(){return this.replace(/-\D/g,function(a){return a.charAt(1).toUpperCase();});},hyphenate:function(){return this.replace(/[A-Z]/g,function(a){return("-"+a.charAt(0).toLowerCase()); +});},capitalize:function(){return this.replace(/\b[a-z]/g,function(a){return a.toUpperCase();});},escapeRegExp:function(){return this.replace(/([-.*+?^${}()|[\]\/\\])/g,"\\$1"); +},toInt:function(a){return parseInt(this,a||10);},toFloat:function(){return parseFloat(this);},hexToRgb:function(b){var a=this.match(/^#?(\w{1,2})(\w{1,2})(\w{1,2})$/); +return(a)?a.slice(1).hexToRgb(b):null;},rgbToHex:function(b){var a=this.match(/\d{1,3}/g);return(a)?a.rgbToHex(b):null;},stripScripts:function(b){var a=""; +var c=this.replace(/<script[^>]*>([\s\S]*?)<\/script>/gi,function(){a+=arguments[1]+"\n";return"";});if(b===true){$exec(a);}else{if($type(b)=="function"){b(a,c); +}}return c;},substitute:function(a,b){return this.replace(b||(/\\?\{([^{}]+)\}/g),function(d,c){if(d.charAt(0)=="\\"){return d.slice(1);}return(a[c]!=undefined)?a[c]:""; +});}});Hash.implement({has:Object.prototype.hasOwnProperty,keyOf:function(b){for(var a in this){if(this.hasOwnProperty(a)&&this[a]===b){return a;}}return null; +},hasValue:function(a){return(Hash.keyOf(this,a)!==null);},extend:function(a){Hash.each(a||{},function(c,b){Hash.set(this,b,c);},this);return this;},combine:function(a){Hash.each(a||{},function(c,b){Hash.include(this,b,c); +},this);return this;},erase:function(a){if(this.hasOwnProperty(a)){delete this[a];}return this;},get:function(a){return(this.hasOwnProperty(a))?this[a]:null; +},set:function(a,b){if(!this[a]||this.hasOwnProperty(a)){this[a]=b;}return this;},empty:function(){Hash.each(this,function(b,a){delete this[a];},this); +return this;},include:function(a,b){if(this[a]==undefined){this[a]=b;}return this;},map:function(b,c){var a=new Hash;Hash.each(this,function(e,d){a.set(d,b.call(c,e,d,this)); +},this);return a;},filter:function(b,c){var a=new Hash;Hash.each(this,function(e,d){if(b.call(c,e,d,this)){a.set(d,e);}},this);return a;},every:function(b,c){for(var a in this){if(this.hasOwnProperty(a)&&!b.call(c,this[a],a)){return false; +}}return true;},some:function(b,c){for(var a in this){if(this.hasOwnProperty(a)&&b.call(c,this[a],a)){return true;}}return false;},getKeys:function(){var a=[]; +Hash.each(this,function(c,b){a.push(b);});return a;},getValues:function(){var a=[];Hash.each(this,function(b){a.push(b);});return a;},toQueryString:function(a){var b=[]; +Hash.each(this,function(f,e){if(a){e=a+"["+e+"]";}var d;switch($type(f)){case"object":d=Hash.toQueryString(f,e);break;case"array":var c={};f.each(function(h,g){c[g]=h; +});d=Hash.toQueryString(c,e);break;default:d=e+"="+encodeURIComponent(f);}if(f!=undefined){b.push(d);}});return b.join("&");}});Hash.alias({keyOf:"indexOf",hasValue:"contains"}); +var Event=new Native({name:"Event",initialize:function(a,f){f=f||window;var k=f.document;a=a||f.event;if(a.$extended){return a;}this.$extended=true;var j=a.type; +var g=a.target||a.srcElement;while(g&&g.nodeType==3){g=g.parentNode;}if(j.test(/key/)){var b=a.which||a.keyCode;var m=Event.Keys.keyOf(b);if(j=="keydown"){var d=b-111; +if(d>0&&d<13){m="f"+d;}}m=m||String.fromCharCode(b).toLowerCase();}else{if(j.match(/(click|mouse|menu)/i)){k=(!k.compatMode||k.compatMode=="CSS1Compat")?k.html:k.body; +var i={x:a.pageX||a.clientX+k.scrollLeft,y:a.pageY||a.clientY+k.scrollTop};var c={x:(a.pageX)?a.pageX-f.pageXOffset:a.clientX,y:(a.pageY)?a.pageY-f.pageYOffset:a.clientY}; +if(j.match(/DOMMouseScroll|mousewheel/)){var h=(a.wheelDelta)?a.wheelDelta/120:-(a.detail||0)/3;}var e=(a.which==3)||(a.button==2);var l=null;if(j.match(/over|out/)){switch(j){case"mouseover":l=a.relatedTarget||a.fromElement; +break;case"mouseout":l=a.relatedTarget||a.toElement;}if(!(function(){while(l&&l.nodeType==3){l=l.parentNode;}return true;}).create({attempt:Browser.Engine.gecko})()){l=false; +}}}}return $extend(this,{event:a,type:j,page:i,client:c,rightClick:e,wheel:h,relatedTarget:l,target:g,code:b,key:m,shift:a.shiftKey,control:a.ctrlKey,alt:a.altKey,meta:a.metaKey}); +}});Event.Keys=new Hash({enter:13,up:38,down:40,left:37,right:39,esc:27,space:32,backspace:8,tab:9,"delete":46});Event.implement({stop:function(){return this.stopPropagation().preventDefault(); +},stopPropagation:function(){if(this.event.stopPropagation){this.event.stopPropagation();}else{this.event.cancelBubble=true;}return this;},preventDefault:function(){if(this.event.preventDefault){this.event.preventDefault(); +}else{this.event.returnValue=false;}return this;}});function Class(b){if(b instanceof Function){b={initialize:b};}var a=function(){Object.reset(this);if(a._prototyping){return this; +}this._current=$empty;var c=(this.initialize)?this.initialize.apply(this,arguments):this;delete this._current;delete this.caller;return c;}.extend(this); +a.implement(b);a.constructor=Class;a.prototype.constructor=a;return a;}Function.prototype.protect=function(){this._protected=true;return this;};Object.reset=function(a,c){if(c==null){for(var e in a){Object.reset(a,e); +}return a;}delete a[c];switch($type(a[c])){case"object":var d=function(){};d.prototype=a[c];var b=new d;a[c]=Object.reset(b);break;case"array":a[c]=$unlink(a[c]); +break;}return a;};new Native({name:"Class",initialize:Class}).extend({instantiate:function(b){b._prototyping=true;var a=new b;delete b._prototyping;return a; +},wrap:function(a,b,c){if(c._origin){c=c._origin;}return function(){if(c._protected&&this._current==null){throw new Error('The method "'+b+'" cannot be called.'); +}var e=this.caller,f=this._current;this.caller=f;this._current=arguments.callee;var d=c.apply(this,arguments);this._current=f;this.caller=e;return d;}.extend({_owner:a,_origin:c,_name:b}); +}});Class.implement({implement:function(a,d){if($type(a)=="object"){for(var e in a){this.implement(e,a[e]);}return this;}var f=Class.Mutators[a];if(f){d=f.call(this,d); +if(d==null){return this;}}var c=this.prototype;switch($type(d)){case"function":if(d._hidden){return this;}c[a]=Class.wrap(this,a,d);break;case"object":var b=c[a]; +if($type(b)=="object"){$mixin(b,d);}else{c[a]=$unlink(d);}break;case"array":c[a]=$unlink(d);break;default:c[a]=d;}return this;}});Class.Mutators={Extends:function(a){this.parent=a; +this.prototype=Class.instantiate(a);this.implement("parent",function(){var b=this.caller._name,c=this.caller._owner.parent.prototype[b];if(!c){throw new Error('The method "'+b+'" has no parent.'); +}return c.apply(this,arguments);}.protect());},Implements:function(a){$splat(a).each(function(b){if(b instanceof Function){b=Class.instantiate(b);}this.implement(b); +},this);}};var Chain=new Class({$chain:[],chain:function(){this.$chain.extend(Array.flatten(arguments));return this;},callChain:function(){return(this.$chain.length)?this.$chain.shift().apply(this,arguments):false; +},clearChain:function(){this.$chain.empty();return this;}});var Events=new Class({$events:{},addEvent:function(c,b,a){c=Events.removeOn(c);if(b!=$empty){this.$events[c]=this.$events[c]||[]; +this.$events[c].include(b);if(a){b.internal=true;}}return this;},addEvents:function(a){for(var b in a){this.addEvent(b,a[b]);}return this;},fireEvent:function(c,b,a){c=Events.removeOn(c); +if(!this.$events||!this.$events[c]){return this;}this.$events[c].each(function(d){d.create({bind:this,delay:a,"arguments":b})();},this);return this;},removeEvent:function(b,a){b=Events.removeOn(b); +if(!this.$events[b]){return this;}if(!a.internal){this.$events[b].erase(a);}return this;},removeEvents:function(c){var d;if($type(c)=="object"){for(d in c){this.removeEvent(d,c[d]); +}return this;}if(c){c=Events.removeOn(c);}for(d in this.$events){if(c&&c!=d){continue;}var b=this.$events[d];for(var a=b.length;a--;a){this.removeEvent(d,b[a]); +}}return this;}});Events.removeOn=function(a){return a.replace(/^on([A-Z])/,function(b,c){return c.toLowerCase();});};var Options=new Class({setOptions:function(){this.options=$merge.run([this.options].extend(arguments)); +if(!this.addEvent){return this;}for(var a in this.options){if($type(this.options[a])!="function"||!(/^on[A-Z]/).test(a)){continue;}this.addEvent(a,this.options[a]); +delete this.options[a];}return this;}});var Element=new Native({name:"Element",legacy:window.Element,initialize:function(a,b){var c=Element.Constructors.get(a); +if(c){return c(b);}if(typeof a=="string"){return document.newElement(a,b);}return document.id(a).set(b);},afterImplement:function(a,b){Element.Prototype[a]=b; +if(Array[a]){return;}Elements.implement(a,function(){var c=[],g=true;for(var e=0,d=this.length;e<d;e++){var f=this[e][a].apply(this[e],arguments);c.push(f); +if(g){g=($type(f)=="element");}}return(g)?new Elements(c):c;});}});Element.Prototype={$family:{name:"element"}};Element.Constructors=new Hash;var IFrame=new Native({name:"IFrame",generics:false,initialize:function(){var f=Array.link(arguments,{properties:Object.type,iframe:$defined}); +var d=f.properties||{};var c=document.id(f.iframe);var e=d.onload||$empty;delete d.onload;d.id=d.name=$pick(d.id,d.name,c?(c.id||c.name):"IFrame_"+$time()); +c=new Element(c||"iframe",d);var b=function(){var g=$try(function(){return c.contentWindow.location.host;});if(!g||g==window.location.host){var h=new Window(c.contentWindow); +new Document(c.contentWindow.document);$extend(h.Element.prototype,Element.Prototype);}e.call(c.contentWindow,c.contentWindow.document);};var a=$try(function(){return c.contentWindow; +});((a&&a.document.body)||window.frames[d.id])?b():c.addListener("load",b);return c;}});var Elements=new Native({initialize:function(f,b){b=$extend({ddup:true,cash:true},b); +f=f||[];if(b.ddup||b.cash){var g={},e=[];for(var c=0,a=f.length;c<a;c++){var d=document.id(f[c],!b.cash);if(b.ddup){if(g[d.uid]){continue;}g[d.uid]=true; +}if(d){e.push(d);}}f=e;}return(b.cash)?$extend(f,this):f;}});Elements.implement({filter:function(a,b){if(!a){return this;}return new Elements(Array.filter(this,(typeof a=="string")?function(c){return c.match(a); +}:a,b));}});Document.implement({newElement:function(a,b){if(Browser.Engine.trident&&b){["name","type","checked"].each(function(c){if(!b[c]){return;}a+=" "+c+'="'+b[c]+'"'; +if(c!="checked"){delete b[c];}});a="<"+a+">";}return document.id(this.createElement(a)).set(b);},newTextNode:function(a){return this.createTextNode(a); +},getDocument:function(){return this;},getWindow:function(){return this.window;},id:(function(){var a={string:function(d,c,b){d=b.getElementById(d);return(d)?a.element(d,c):null; +},element:function(b,e){$uid(b);if(!e&&!b.$family&&!(/^object|embed$/i).test(b.tagName)){var c=Element.Prototype;for(var d in c){b[d]=c[d];}}return b;},object:function(c,d,b){if(c.toElement){return a.element(c.toElement(b),d); +}return null;}};a.textnode=a.whitespace=a.window=a.document=$arguments(0);return function(c,e,d){if(c&&c.$family&&c.uid){return c;}var b=$type(c);return(a[b])?a[b](c,e,d||document):null; +};})()});if(window.$==null){Window.implement({$:function(a,b){return document.id(a,b,this.document);}});}Window.implement({$$:function(a){if(arguments.length==1&&typeof a=="string"){return this.document.getElements(a); +}var f=[];var c=Array.flatten(arguments);for(var d=0,b=c.length;d<b;d++){var e=c[d];switch($type(e)){case"element":f.push(e);break;case"string":f.extend(this.document.getElements(e,true)); +}}return new Elements(f);},getDocument:function(){return this.document;},getWindow:function(){return this;}});Native.implement([Element,Document],{getElement:function(a,b){return document.id(this.getElements(a,true)[0]||null,b); +},getElements:function(a,d){a=a.split(",");var c=[];var b=(a.length>1);a.each(function(e){var f=this.getElementsByTagName(e.trim());(b)?c.extend(f):c=f; +},this);return new Elements(c,{ddup:b,cash:!d});}});(function(){var h={},f={};var i={input:"checked",option:"selected",textarea:(Browser.Engine.webkit&&Browser.Engine.version<420)?"innerHTML":"value"}; +var c=function(l){return(f[l]||(f[l]={}));};var g=function(n,l){if(!n){return;}var m=n.uid;if(Browser.Engine.trident){if(n.clearAttributes){var q=l&&n.cloneNode(false); +n.clearAttributes();if(q){n.mergeAttributes(q);}}else{if(n.removeEvents){n.removeEvents();}}if((/object/i).test(n.tagName)){for(var o in n){if(typeof n[o]=="function"){n[o]=$empty; +}}Element.dispose(n);}}if(!m){return;}h[m]=f[m]=null;};var d=function(){Hash.each(h,g);if(Browser.Engine.trident){$A(document.getElementsByTagName("object")).each(g); +}if(window.CollectGarbage){CollectGarbage();}h=f=null;};var j=function(n,l,s,m,p,r){var o=n[s||l];var q=[];while(o){if(o.nodeType==1&&(!m||Element.match(o,m))){if(!p){return document.id(o,r); +}q.push(o);}o=o[l];}return(p)?new Elements(q,{ddup:false,cash:!r}):null;};var e={html:"innerHTML","class":"className","for":"htmlFor",defaultValue:"defaultValue",text:(Browser.Engine.trident||(Browser.Engine.webkit&&Browser.Engine.version<420))?"innerText":"textContent"}; +var b=["compact","nowrap","ismap","declare","noshade","checked","disabled","readonly","multiple","selected","noresize","defer"];var k=["value","type","defaultValue","accessKey","cellPadding","cellSpacing","colSpan","frameBorder","maxLength","readOnly","rowSpan","tabIndex","useMap"]; +b=b.associate(b);Hash.extend(e,b);Hash.extend(e,k.associate(k.map(String.toLowerCase)));var a={before:function(m,l){if(l.parentNode){l.parentNode.insertBefore(m,l); +}},after:function(m,l){if(!l.parentNode){return;}var n=l.nextSibling;(n)?l.parentNode.insertBefore(m,n):l.parentNode.appendChild(m);},bottom:function(m,l){l.appendChild(m); +},top:function(m,l){var n=l.firstChild;(n)?l.insertBefore(m,n):l.appendChild(m);}};a.inside=a.bottom;Hash.each(a,function(l,m){m=m.capitalize();Element.implement("inject"+m,function(n){l(this,document.id(n,true)); +return this;});Element.implement("grab"+m,function(n){l(document.id(n,true),this);return this;});});Element.implement({set:function(o,m){switch($type(o)){case"object":for(var n in o){this.set(n,o[n]); +}break;case"string":var l=Element.Properties.get(o);(l&&l.set)?l.set.apply(this,Array.slice(arguments,1)):this.setProperty(o,m);}return this;},get:function(m){var l=Element.Properties.get(m); +return(l&&l.get)?l.get.apply(this,Array.slice(arguments,1)):this.getProperty(m);},erase:function(m){var l=Element.Properties.get(m);(l&&l.erase)?l.erase.apply(this):this.removeProperty(m); +return this;},setProperty:function(m,n){var l=e[m];if(n==undefined){return this.removeProperty(m);}if(l&&b[m]){n=!!n;}(l)?this[l]=n:this.setAttribute(m,""+n); +return this;},setProperties:function(l){for(var m in l){this.setProperty(m,l[m]);}return this;},getProperty:function(m){var l=e[m];var n=(l)?this[l]:this.getAttribute(m,2); +return(b[m])?!!n:(l)?n:n||null;},getProperties:function(){var l=$A(arguments);return l.map(this.getProperty,this).associate(l);},removeProperty:function(m){var l=e[m]; +(l)?this[l]=(l&&b[m])?false:"":this.removeAttribute(m);return this;},removeProperties:function(){Array.each(arguments,this.removeProperty,this);return this; +},hasClass:function(l){return this.className.contains(l," ");},addClass:function(l){if(!this.hasClass(l)){this.className=(this.className+" "+l).clean(); +}return this;},removeClass:function(l){this.className=this.className.replace(new RegExp("(^|\\s)"+l+"(?:\\s|$)"),"$1");return this;},toggleClass:function(l){return this.hasClass(l)?this.removeClass(l):this.addClass(l); +},adopt:function(){Array.flatten(arguments).each(function(l){l=document.id(l,true);if(l){this.appendChild(l);}},this);return this;},appendText:function(m,l){return this.grab(this.getDocument().newTextNode(m),l); +},grab:function(m,l){a[l||"bottom"](document.id(m,true),this);return this;},inject:function(m,l){a[l||"bottom"](this,document.id(m,true));return this;},replaces:function(l){l=document.id(l,true); +l.parentNode.replaceChild(this,l);return this;},wraps:function(m,l){m=document.id(m,true);return this.replaces(m).grab(m,l);},getPrevious:function(l,m){return j(this,"previousSibling",null,l,false,m); +},getAllPrevious:function(l,m){return j(this,"previousSibling",null,l,true,m);},getNext:function(l,m){return j(this,"nextSibling",null,l,false,m);},getAllNext:function(l,m){return j(this,"nextSibling",null,l,true,m); +},getFirst:function(l,m){return j(this,"nextSibling","firstChild",l,false,m);},getLast:function(l,m){return j(this,"previousSibling","lastChild",l,false,m); +},getParent:function(l,m){return j(this,"parentNode",null,l,false,m);},getParents:function(l,m){return j(this,"parentNode",null,l,true,m);},getSiblings:function(l,m){return this.getParent().getChildren(l,m).erase(this); +},getChildren:function(l,m){return j(this,"nextSibling","firstChild",l,true,m);},getWindow:function(){return this.ownerDocument.window;},getDocument:function(){return this.ownerDocument; +},getElementById:function(o,n){var m=this.ownerDocument.getElementById(o);if(!m){return null;}for(var l=m.parentNode;l!=this;l=l.parentNode){if(!l){return null; +}}return document.id(m,n);},getSelected:function(){return new Elements($A(this.options).filter(function(l){return l.selected;}));},getComputedStyle:function(m){if(this.currentStyle){return this.currentStyle[m.camelCase()]; +}var l=this.getDocument().defaultView.getComputedStyle(this,null);return(l)?l.getPropertyValue([m.hyphenate()]):null;},toQueryString:function(){var l=[]; +this.getElements("input, select, textarea",true).each(function(m){if(!m.name||m.disabled||m.type=="submit"||m.type=="reset"||m.type=="file"){return;}var n=(m.tagName.toLowerCase()=="select")?Element.getSelected(m).map(function(o){return o.value; +}):((m.type=="radio"||m.type=="checkbox")&&!m.checked)?null:m.value;$splat(n).each(function(o){if(typeof o!="undefined"){l.push(m.name+"="+encodeURIComponent(o)); +}});});return l.join("&");},clone:function(o,l){o=o!==false;var r=this.cloneNode(o);var n=function(v,u){if(!l){v.removeAttribute("id");}if(Browser.Engine.trident){v.clearAttributes(); +v.mergeAttributes(u);v.removeAttribute("uid");if(v.options){var w=v.options,s=u.options;for(var t=w.length;t--;){w[t].selected=s[t].selected;}}}var x=i[u.tagName.toLowerCase()]; +if(x&&u[x]){v[x]=u[x];}};if(o){var p=r.getElementsByTagName("*"),q=this.getElementsByTagName("*");for(var m=p.length;m--;){n(p[m],q[m]);}}n(r,this);return document.id(r); +},destroy:function(){Element.empty(this);Element.dispose(this);g(this,true);return null;},empty:function(){$A(this.childNodes).each(function(l){Element.destroy(l); +});return this;},dispose:function(){return(this.parentNode)?this.parentNode.removeChild(this):this;},hasChild:function(l){l=document.id(l,true);if(!l){return false; +}if(Browser.Engine.webkit&&Browser.Engine.version<420){return $A(this.getElementsByTagName(l.tagName)).contains(l);}return(this.contains)?(this!=l&&this.contains(l)):!!(this.compareDocumentPosition(l)&16); +},match:function(l){return(!l||(l==this)||(Element.get(this,"tag")==l));}});Native.implement([Element,Window,Document],{addListener:function(o,n){if(o=="unload"){var l=n,m=this; +n=function(){m.removeListener("unload",n);l();};}else{h[this.uid]=this;}if(this.addEventListener){this.addEventListener(o,n,false);}else{this.attachEvent("on"+o,n); +}return this;},removeListener:function(m,l){if(this.removeEventListener){this.removeEventListener(m,l,false);}else{this.detachEvent("on"+m,l);}return this; +},retrieve:function(m,l){var o=c(this.uid),n=o[m];if(l!=undefined&&n==undefined){n=o[m]=l;}return $pick(n);},store:function(m,l){var n=c(this.uid);n[m]=l; +return this;},eliminate:function(l){var m=c(this.uid);delete m[l];return this;}});window.addListener("unload",d);})();Element.Properties=new Hash;Element.Properties.style={set:function(a){this.style.cssText=a; +},get:function(){return this.style.cssText;},erase:function(){this.style.cssText="";}};Element.Properties.tag={get:function(){return this.tagName.toLowerCase(); +}};Element.Properties.html=(function(){var c=document.createElement("div");var a={table:[1,"<table>","</table>"],select:[1,"<select>","</select>"],tbody:[2,"<table><tbody>","</tbody></table>"],tr:[3,"<table><tbody><tr>","</tr></tbody></table>"]}; +a.thead=a.tfoot=a.tbody;var b={set:function(){var e=Array.flatten(arguments).join("");var f=Browser.Engine.trident&&a[this.get("tag")];if(f){var g=c;g.innerHTML=f[1]+e+f[2]; +for(var d=f[0];d--;){g=g.firstChild;}this.empty().adopt(g.childNodes);}else{this.innerHTML=e;}}};b.erase=b.set;return b;})();if(Browser.Engine.webkit&&Browser.Engine.version<420){Element.Properties.text={get:function(){if(this.innerText){return this.innerText; +}var a=this.ownerDocument.newElement("div",{html:this.innerHTML}).inject(this.ownerDocument.body);var b=a.innerText;a.destroy();return b;}};}Element.Properties.events={set:function(a){this.addEvents(a); +}};Native.implement([Element,Window,Document],{addEvent:function(e,g){var h=this.retrieve("events",{});h[e]=h[e]||{keys:[],values:[]};if(h[e].keys.contains(g)){return this; +}h[e].keys.push(g);var f=e,a=Element.Events.get(e),c=g,i=this;if(a){if(a.onAdd){a.onAdd.call(this,g);}if(a.condition){c=function(j){if(a.condition.call(this,j)){return g.call(this,j); +}return true;};}f=a.base||f;}var d=function(){return g.call(i);};var b=Element.NativeEvents[f];if(b){if(b==2){d=function(j){j=new Event(j,i.getWindow()); +if(c.call(i,j)===false){j.stop();}};}this.addListener(f,d);}h[e].values.push(d);return this;},removeEvent:function(c,b){var a=this.retrieve("events");if(!a||!a[c]){return this; +}var f=a[c].keys.indexOf(b);if(f==-1){return this;}a[c].keys.splice(f,1);var e=a[c].values.splice(f,1)[0];var d=Element.Events.get(c);if(d){if(d.onRemove){d.onRemove.call(this,b); +}c=d.base||c;}return(Element.NativeEvents[c])?this.removeListener(c,e):this;},addEvents:function(a){for(var b in a){this.addEvent(b,a[b]);}return this; +},removeEvents:function(a){var c;if($type(a)=="object"){for(c in a){this.removeEvent(c,a[c]);}return this;}var b=this.retrieve("events");if(!b){return this; +}if(!a){for(c in b){this.removeEvents(c);}this.eliminate("events");}else{if(b[a]){while(b[a].keys[0]){this.removeEvent(a,b[a].keys[0]);}b[a]=null;}}return this; +},fireEvent:function(d,b,a){var c=this.retrieve("events");if(!c||!c[d]){return this;}c[d].keys.each(function(e){e.create({bind:this,delay:a,"arguments":b})(); +},this);return this;},cloneEvents:function(d,a){d=document.id(d);var c=d.retrieve("events");if(!c){return this;}if(!a){for(var b in c){this.cloneEvents(d,b); +}}else{if(c[a]){c[a].keys.each(function(e){this.addEvent(a,e);},this);}}return this;}});Element.NativeEvents={click:2,dblclick:2,mouseup:2,mousedown:2,contextmenu:2,mousewheel:2,DOMMouseScroll:2,mouseover:2,mouseout:2,mousemove:2,selectstart:2,selectend:2,keydown:2,keypress:2,keyup:2,focus:2,blur:2,change:2,reset:2,select:2,submit:2,load:1,unload:1,beforeunload:2,resize:1,move:1,DOMContentLoaded:1,readystatechange:1,error:1,abort:1,scroll:1}; +(function(){var a=function(b){var c=b.relatedTarget;if(c==undefined){return true;}if(c===false){return false;}return($type(this)!="document"&&c!=this&&c.prefix!="xul"&&!this.hasChild(c)); +};Element.Events=new Hash({mouseenter:{base:"mouseover",condition:a},mouseleave:{base:"mouseout",condition:a},mousewheel:{base:(Browser.Engine.gecko)?"DOMMouseScroll":"mousewheel"}}); +})();Element.Properties.styles={set:function(a){this.setStyles(a);}};Element.Properties.opacity={set:function(a,b){if(!b){if(a==0){if(this.style.visibility!="hidden"){this.style.visibility="hidden"; +}}else{if(this.style.visibility!="visible"){this.style.visibility="visible";}}}if(!this.currentStyle||!this.currentStyle.hasLayout){this.style.zoom=1;}if(Browser.Engine.trident){this.style.filter=(a==1)?"":"alpha(opacity="+a*100+")"; +}this.style.opacity=a;this.store("opacity",a);},get:function(){return this.retrieve("opacity",1);}};Element.implement({setOpacity:function(a){return this.set("opacity",a,true); +},getOpacity:function(){return this.get("opacity");},setStyle:function(b,a){switch(b){case"opacity":return this.set("opacity",parseFloat(a));case"float":b=(Browser.Engine.trident)?"styleFloat":"cssFloat"; +}b=b.camelCase();if($type(a)!="string"){var c=(Element.Styles.get(b)||"@").split(" ");a=$splat(a).map(function(e,d){if(!c[d]){return"";}return($type(e)=="number")?c[d].replace("@",Math.round(e)):e; +}).join(" ");}else{if(a==String(Number(a))){a=Math.round(a);}}this.style[b]=a;return this;},getStyle:function(g){switch(g){case"opacity":return this.get("opacity"); +case"float":g=(Browser.Engine.trident)?"styleFloat":"cssFloat";}g=g.camelCase();var a=this.style[g];if(!$chk(a)){a=[];for(var f in Element.ShortStyles){if(g!=f){continue; +}for(var e in Element.ShortStyles[f]){a.push(this.getStyle(e));}return a.join(" ");}a=this.getComputedStyle(g);}if(a){a=String(a);var c=a.match(/rgba?$[\d\s,]+$/); +if(c){a=a.replace(c[0],c[0].rgbToHex());}}if(Browser.Engine.presto||(Browser.Engine.trident&&!$chk(parseInt(a,10)))){if(g.test(/^(height|width)$/)){var b=(g=="width")?["left","right"]:["top","bottom"],d=0; +b.each(function(h){d+=this.getStyle("border-"+h+"-width").toInt()+this.getStyle("padding-"+h).toInt();},this);return this["offset"+g.capitalize()]-d+"px"; +}if((Browser.Engine.presto)&&String(a).test("px")){return a;}if(g.test(/(border(.+)Width|margin|padding)/)){return"0px";}}return a;},setStyles:function(b){for(var a in b){this.setStyle(a,b[a]); +}return this;},getStyles:function(){var a={};Array.flatten(arguments).each(function(b){a[b]=this.getStyle(b);},this);return a;}});Element.Styles=new Hash({left:"@px",top:"@px",bottom:"@px",right:"@px",width:"@px",height:"@px",maxWidth:"@px",maxHeight:"@px",minWidth:"@px",minHeight:"@px",backgroundColor:"rgb(@, @, @)",backgroundPosition:"@px @px",color:"rgb(@, @, @)",fontSize:"@px",letterSpacing:"@px",lineHeight:"@px",clip:"rect(@px @px @px @px)",margin:"@px @px @px @px",padding:"@px @px @px @px",border:"@px @ rgb(@, @, @) @px @ rgb(@, @, @) @px @ rgb(@, @, @)",borderWidth:"@px @px @px @px",borderStyle:"@ @ @ @",borderColor:"rgb(@, @, @) rgb(@, @, @) rgb(@, @, @) rgb(@, @, @)",zIndex:"@",zoom:"@",fontWeight:"@",textIndent:"@px",opacity:"@"}); +Element.ShortStyles={margin:{},padding:{},border:{},borderWidth:{},borderStyle:{},borderColor:{}};["Top","Right","Bottom","Left"].each(function(g){var f=Element.ShortStyles; +var b=Element.Styles;["margin","padding"].each(function(h){var i=h+g;f[h][i]=b[i]="@px";});var e="border"+g;f.border[e]=b[e]="@px @ rgb(@, @, @)";var d=e+"Width",a=e+"Style",c=e+"Color"; +f[e]={};f.borderWidth[d]=f[e][d]=b[d]="@px";f.borderStyle[a]=f[e][a]=b[a]="@";f.borderColor[c]=f[e][c]=b[c]="rgb(@, @, @)";});(function(){Element.implement({scrollTo:function(h,i){if(b(this)){this.getWindow().scrollTo(h,i); +}else{this.scrollLeft=h;this.scrollTop=i;}return this;},getSize:function(){if(b(this)){return this.getWindow().getSize();}return{x:this.offsetWidth,y:this.offsetHeight}; +},getScrollSize:function(){if(b(this)){return this.getWindow().getScrollSize();}return{x:this.scrollWidth,y:this.scrollHeight};},getScroll:function(){if(b(this)){return this.getWindow().getScroll(); +}return{x:this.scrollLeft,y:this.scrollTop};},getScrolls:function(){var i=this,h={x:0,y:0};while(i&&!b(i)){h.x+=i.scrollLeft;h.y+=i.scrollTop;i=i.parentNode; +}return h;},getOffsetParent:function(){var h=this;if(b(h)){return null;}if(!Browser.Engine.trident){return h.offsetParent;}while((h=h.parentNode)&&!b(h)){if(d(h,"position")!="static"){return h; +}}return null;},getOffsets:function(){if(this.getBoundingClientRect){var j=this.getBoundingClientRect(),m=document.id(this.getDocument().documentElement),p=m.getScroll(),k=this.getScrolls(),i=this.getScroll(),h=(d(this,"position")=="fixed"); +return{x:j.left.toInt()+k.x-i.x+((h)?0:p.x)-m.clientLeft,y:j.top.toInt()+k.y-i.y+((h)?0:p.y)-m.clientTop};}var l=this,n={x:0,y:0};if(b(this)){return n; +}while(l&&!b(l)){n.x+=l.offsetLeft;n.y+=l.offsetTop;if(Browser.Engine.gecko){if(!f(l)){n.x+=c(l);n.y+=g(l);}var o=l.parentNode;if(o&&d(o,"overflow")!="visible"){n.x+=c(o); +n.y+=g(o);}}else{if(l!=this&&Browser.Engine.webkit){n.x+=c(l);n.y+=g(l);}}l=l.offsetParent;}if(Browser.Engine.gecko&&!f(this)){n.x-=c(this);n.y-=g(this); +}return n;},getPosition:function(k){if(b(this)){return{x:0,y:0};}var l=this.getOffsets(),i=this.getScrolls();var h={x:l.x-i.x,y:l.y-i.y};var j=(k&&(k=document.id(k)))?k.getPosition():{x:0,y:0}; +return{x:h.x-j.x,y:h.y-j.y};},getCoordinates:function(j){if(b(this)){return this.getWindow().getCoordinates();}var h=this.getPosition(j),i=this.getSize(); +var k={left:h.x,top:h.y,width:i.x,height:i.y};k.right=k.left+k.width;k.bottom=k.top+k.height;return k;},computePosition:function(h){return{left:h.x-e(this,"margin-left"),top:h.y-e(this,"margin-top")}; +},setPosition:function(h){return this.setStyles(this.computePosition(h));}});Native.implement([Document,Window],{getSize:function(){if(Browser.Engine.presto||Browser.Engine.webkit){var i=this.getWindow(); +return{x:i.innerWidth,y:i.innerHeight};}var h=a(this);return{x:h.clientWidth,y:h.clientHeight};},getScroll:function(){var i=this.getWindow(),h=a(this); +return{x:i.pageXOffset||h.scrollLeft,y:i.pageYOffset||h.scrollTop};},getScrollSize:function(){var i=a(this),h=this.getSize();return{x:Math.max(i.scrollWidth,h.x),y:Math.max(i.scrollHeight,h.y)}; +},getPosition:function(){return{x:0,y:0};},getCoordinates:function(){var h=this.getSize();return{top:0,left:0,bottom:h.y,right:h.x,height:h.y,width:h.x}; +}});var d=Element.getComputedStyle;function e(h,i){return d(h,i).toInt()||0;}function f(h){return d(h,"-moz-box-sizing")=="border-box";}function g(h){return e(h,"border-top-width"); +}function c(h){return e(h,"border-left-width");}function b(h){return(/^(?:body|html)$/i).test(h.tagName);}function a(h){var i=h.getDocument();return(!i.compatMode||i.compatMode=="CSS1Compat")?i.html:i.body; +}})();Element.alias("setPosition","position");Native.implement([Window,Document,Element],{getHeight:function(){return this.getSize().y;},getWidth:function(){return this.getSize().x; +},getScrollTop:function(){return this.getScroll().y;},getScrollLeft:function(){return this.getScroll().x;},getScrollHeight:function(){return this.getScrollSize().y; +},getScrollWidth:function(){return this.getScrollSize().x;},getTop:function(){return this.getPosition().y;},getLeft:function(){return this.getPosition().x; +}});Native.implement([Document,Element],{getElements:function(h,g){h=h.split(",");var c,e={};for(var d=0,b=h.length;d<b;d++){var a=h[d],f=Selectors.Utils.search(this,a,e); +if(d!=0&&f.item){f=$A(f);}c=(d==0)?f:(c.item)?$A(c).concat(f):c.concat(f);}return new Elements(c,{ddup:(h.length>1),cash:!g});}});Element.implement({match:function(b){if(!b||(b==this)){return true; +}var d=Selectors.Utils.parseTagAndID(b);var a=d[0],e=d[1];if(!Selectors.Filters.byID(this,e)||!Selectors.Filters.byTag(this,a)){return false;}var c=Selectors.Utils.parseSelector(b); +return(c)?Selectors.Utils.filter(this,c,{}):true;}});var Selectors={Cache:{nth:{},parsed:{}}};Selectors.RegExps={id:(/#([\w-]+)/),tag:(/^(\w+|\*)/),quick:(/^(\w+|\*)$/),splitter:(/\s*([+>~\s])\s*([a-zA-Z#.*:\[])/g),combined:(/\.([\w-]+)|\[(\w+)(?:([!*^$~|]?=)(["']?)([^\4]*?)\4)?\]|:([\w-]+)(?:$["']?(.*?)?["']?$|$)/g)}; +Selectors.Utils={chk:function(b,c){if(!c){return true;}var a=$uid(b);if(!c[a]){return c[a]=true;}return false;},parseNthArgument:function(h){if(Selectors.Cache.nth[h]){return Selectors.Cache.nth[h]; +}var e=h.match(/^([+-]?\d*)?([a-z]+)?([+-]?\d*)?$/);if(!e){return false;}var g=parseInt(e[1],10);var d=(g||g===0)?g:1;var f=e[2]||false;var c=parseInt(e[3],10)||0; +if(d!=0){c--;while(c<1){c+=d;}while(c>=d){c-=d;}}else{d=c;f="index";}switch(f){case"n":e={a:d,b:c,special:"n"};break;case"odd":e={a:2,b:0,special:"n"}; +break;case"even":e={a:2,b:1,special:"n"};break;case"first":e={a:0,special:"index"};break;case"last":e={special:"last-child"};break;case"only":e={special:"only-child"}; +break;default:e={a:(d-1),special:"index"};}return Selectors.Cache.nth[h]=e;},parseSelector:function(e){if(Selectors.Cache.parsed[e]){return Selectors.Cache.parsed[e]; +}var d,h={classes:[],pseudos:[],attributes:[]};while((d=Selectors.RegExps.combined.exec(e))){var i=d[1],g=d[2],f=d[3],b=d[5],c=d[6],j=d[7];if(i){h.classes.push(i); +}else{if(c){var a=Selectors.Pseudo.get(c);if(a){h.pseudos.push({parser:a,argument:j});}else{h.attributes.push({name:c,operator:"=",value:j});}}else{if(g){h.attributes.push({name:g,operator:f,value:b}); +}}}}if(!h.classes.length){delete h.classes;}if(!h.attributes.length){delete h.attributes;}if(!h.pseudos.length){delete h.pseudos;}if(!h.classes&&!h.attributes&&!h.pseudos){h=null; +}return Selectors.Cache.parsed[e]=h;},parseTagAndID:function(b){var a=b.match(Selectors.RegExps.tag);var c=b.match(Selectors.RegExps.id);return[(a)?a[1]:"*",(c)?c[1]:false]; +},filter:function(f,c,e){var d;if(c.classes){for(d=c.classes.length;d--;d){var g=c.classes[d];if(!Selectors.Filters.byClass(f,g)){return false;}}}if(c.attributes){for(d=c.attributes.length; +d--;d){var b=c.attributes[d];if(!Selectors.Filters.byAttribute(f,b.name,b.operator,b.value)){return false;}}}if(c.pseudos){for(d=c.pseudos.length;d--;d){var a=c.pseudos[d]; +if(!Selectors.Filters.byPseudo(f,a.parser,a.argument,e)){return false;}}}return true;},getByTagAndID:function(b,a,d){if(d){var c=(b.getElementById)?b.getElementById(d,true):Element.getElementById(b,d,true); +return(c&&Selectors.Filters.byTag(c,a))?[c]:[];}else{return b.getElementsByTagName(a);}},search:function(o,h,t){var b=[];var c=h.trim().replace(Selectors.RegExps.splitter,function(k,j,i){b.push(j); +return":)"+i;}).split(":)");var p,e,A;for(var z=0,v=c.length;z<v;z++){var y=c[z];if(z==0&&Selectors.RegExps.quick.test(y)){p=o.getElementsByTagName(y); +continue;}var a=b[z-1];var q=Selectors.Utils.parseTagAndID(y);var B=q[0],r=q[1];if(z==0){p=Selectors.Utils.getByTagAndID(o,B,r);}else{var d={},g=[];for(var x=0,w=p.length; +x<w;x++){g=Selectors.Getters[a](g,p[x],B,r,d);}p=g;}var f=Selectors.Utils.parseSelector(y);if(f){e=[];for(var u=0,s=p.length;u<s;u++){A=p[u];if(Selectors.Utils.filter(A,f,t)){e.push(A); +}}p=e;}}return p;}};Selectors.Getters={" ":function(h,g,j,a,e){var d=Selectors.Utils.getByTagAndID(g,j,a);for(var c=0,b=d.length;c<b;c++){var f=d[c];if(Selectors.Utils.chk(f,e)){h.push(f); +}}return h;},">":function(h,g,j,a,f){var c=Selectors.Utils.getByTagAndID(g,j,a);for(var e=0,d=c.length;e<d;e++){var b=c[e];if(b.parentNode==g&&Selectors.Utils.chk(b,f)){h.push(b); +}}return h;},"+":function(c,b,a,e,d){while((b=b.nextSibling)){if(b.nodeType==1){if(Selectors.Utils.chk(b,d)&&Selectors.Filters.byTag(b,a)&&Selectors.Filters.byID(b,e)){c.push(b); +}break;}}return c;},"~":function(c,b,a,e,d){while((b=b.nextSibling)){if(b.nodeType==1){if(!Selectors.Utils.chk(b,d)){break;}if(Selectors.Filters.byTag(b,a)&&Selectors.Filters.byID(b,e)){c.push(b); +}}}return c;}};Selectors.Filters={byTag:function(b,a){return(a=="*"||(b.tagName&&b.tagName.toLowerCase()==a));},byID:function(a,b){return(!b||(a.id&&a.id==b)); +},byClass:function(b,a){return(b.className&&b.className.contains&&b.className.contains(a," "));},byPseudo:function(a,d,c,b){return d.call(a,c,b);},byAttribute:function(c,d,b,e){var a=Element.prototype.getProperty.call(c,d); +if(!a){return(b=="!=");}if(!b||e==undefined){return true;}switch(b){case"=":return(a==e);case"*=":return(a.contains(e));case"^=":return(a.substr(0,e.length)==e); +case"$=":return(a.substr(a.length-e.length)==e);case"!=":return(a!=e);case"~=":return a.contains(e," ");case"|=":return a.contains(e,"-");}return false; +}};Selectors.Pseudo=new Hash({checked:function(){return this.checked;},empty:function(){return !(this.innerText||this.textContent||"").length;},not:function(a){return !Element.match(this,a); +},contains:function(a){return(this.innerText||this.textContent||"").contains(a);},"first-child":function(){return Selectors.Pseudo.index.call(this,0);},"last-child":function(){var a=this; +while((a=a.nextSibling)){if(a.nodeType==1){return false;}}return true;},"only-child":function(){var b=this;while((b=b.previousSibling)){if(b.nodeType==1){return false; +}}var a=this;while((a=a.nextSibling)){if(a.nodeType==1){return false;}}return true;},"nth-child":function(g,e){g=(g==undefined)?"n":g;var c=Selectors.Utils.parseNthArgument(g); +if(c.special!="n"){return Selectors.Pseudo[c.special].call(this,c.a,e);}var f=0;e.positions=e.positions||{};var d=$uid(this);if(!e.positions[d]){var b=this; +while((b=b.previousSibling)){if(b.nodeType!=1){continue;}f++;var a=e.positions[$uid(b)];if(a!=undefined){f=a+f;break;}}e.positions[d]=f;}return(e.positions[d]%c.a==c.b); +},index:function(a){var b=this,c=0;while((b=b.previousSibling)){if(b.nodeType==1&&++c>a){return false;}}return(c==a);},even:function(b,a){return Selectors.Pseudo["nth-child"].call(this,"2n+1",a); +},odd:function(b,a){return Selectors.Pseudo["nth-child"].call(this,"2n",a);},selected:function(){return this.selected;},enabled:function(){return(this.disabled===false); +}});Element.Events.domready={onAdd:function(a){if(Browser.loaded){a.call(this);}}};(function(){var b=function(){if(Browser.loaded){return;}Browser.loaded=true; +window.fireEvent("domready");document.fireEvent("domready");};window.addEvent("load",b);if(Browser.Engine.trident){var a=document.createElement("div"); +(function(){($try(function(){a.doScroll();return document.id(a).inject(document.body).set("html","temp").dispose();}))?b():arguments.callee.delay(50);})(); +}else{if(Browser.Engine.webkit&&Browser.Engine.version<525){(function(){(["loaded","complete"].contains(document.readyState))?b():arguments.callee.delay(50); +})();}else{document.addEvent("DOMContentLoaded",b);}}})();var JSON=new Hash(this.JSON&&{stringify:JSON.stringify,parse:JSON.parse}).extend({$specialChars:{"\b":"\\b","\t":"\\t","\n":"\\n","\f":"\\f","\r":"\\r",'"':'\\"',"\\":"\\\\"},$replaceChars:function(a){return JSON.$specialChars[a]||"\\u00"+Math.floor(a.charCodeAt()/16).toString(16)+(a.charCodeAt()%16).toString(16); +},encode:function(b){switch($type(b)){case"string":return'"'+b.replace(/[\x00-\x1f\\"]/g,JSON.$replaceChars)+'"';case"array":return"["+String(b.map(JSON.encode).clean())+"]"; +case"object":case"hash":var a=[];Hash.each(b,function(e,d){var c=JSON.encode(e);if(c){a.push(JSON.encode(d)+":"+c);}});return"{"+a+"}";case"number":case"boolean":return String(b); +case false:return"null";}return null;},decode:function(string,secure){if($type(string)!="string"||!string.length){return null;}if(secure&&!(/^[,:{}\[\]0-9.\-+Eaeflnr-u \n\r\t]*$/).test(string.replace(/\\./g,"@").replace(/"[^"\\\n\r]*"/g,""))){return null; +}return eval("("+string+")");}});Native.implement([Hash,Array,String,Number],{toJSON:function(){return JSON.encode(this);}});var Cookie=new Class({Implements:Options,options:{path:false,domain:false,duration:false,secure:false,document:document},initialize:function(b,a){this.key=b; +this.setOptions(a);},write:function(b){b=encodeURIComponent(b);if(this.options.domain){b+="; domain="+this.options.domain;}if(this.options.path){b+="; path="+this.options.path; +}if(this.options.duration){var a=new Date();a.setTime(a.getTime()+this.options.duration*24*60*60*1000);b+="; expires="+a.toGMTString();}if(this.options.secure){b+="; secure"; +}this.options.document.cookie=this.key+"="+b;return this;},read:function(){var a=this.options.document.cookie.match("(?:^|;)\\s*"+this.key.escapeRegExp()+"=([^;]*)"); +return(a)?decodeURIComponent(a[1]):null;},dispose:function(){new Cookie(this.key,$merge(this.options,{duration:-1})).write("");return this;}});Cookie.write=function(b,c,a){return new Cookie(b,a).write(c); +};Cookie.read=function(a){return new Cookie(a).read();};Cookie.dispose=function(b,a){return new Cookie(b,a).dispose();};var Fx=new Class({Implements:[Chain,Events,Options],options:{fps:50,unit:false,duration:500,link:"ignore"},initialize:function(a){this.subject=this.subject||this; +this.setOptions(a);this.options.duration=Fx.Durations[this.options.duration]||this.options.duration.toInt();var b=this.options.wait;if(b===false){this.options.link="cancel"; +}},getTransition:function(){return function(a){return -(Math.cos(Math.PI*a)-1)/2;};},step:function(){var a=$time();if(a<this.time+this.options.duration){var b=this.transition((a-this.time)/this.options.duration); +this.set(this.compute(this.from,this.to,b));}else{this.set(this.compute(this.from,this.to,1));this.complete();}},set:function(a){return a;},compute:function(c,b,a){return Fx.compute(c,b,a); +},check:function(){if(!this.timer){return true;}switch(this.options.link){case"cancel":this.cancel();return true;case"chain":this.chain(this.caller.bind(this,arguments)); +return false;}return false;},start:function(b,a){if(!this.check(b,a)){return this;}this.from=b;this.to=a;this.time=0;this.transition=this.getTransition(); +this.startTimer();this.onStart();return this;},complete:function(){if(this.stopTimer()){this.onComplete();}return this;},cancel:function(){if(this.stopTimer()){this.onCancel(); +}return this;},onStart:function(){this.fireEvent("start",this.subject);},onComplete:function(){this.fireEvent("complete",this.subject);if(!this.callChain()){this.fireEvent("chainComplete",this.subject); +}},onCancel:function(){this.fireEvent("cancel",this.subject).clearChain();},pause:function(){this.stopTimer();return this;},resume:function(){this.startTimer(); +return this;},stopTimer:function(){if(!this.timer){return false;}this.time=$time()-this.time;this.timer=$clear(this.timer);return true;},startTimer:function(){if(this.timer){return false; +}this.time=$time()-this.time;this.timer=this.step.periodical(Math.round(1000/this.options.fps),this);return true;}});Fx.compute=function(c,b,a){return(b-c)*a+c; +};Fx.Durations={"short":250,normal:500,"long":1000};Fx.CSS=new Class({Extends:Fx,prepare:function(d,e,b){b=$splat(b);var c=b[1];if(!$chk(c)){b[1]=b[0]; +b[0]=d.getStyle(e);}var a=b.map(this.parse);return{from:a[0],to:a[1]};},parse:function(a){a=$lambda(a)();a=(typeof a=="string")?a.split(" "):$splat(a); +return a.map(function(c){c=String(c);var b=false;Fx.CSS.Parsers.each(function(f,e){if(b){return;}var d=f.parse(c);if($chk(d)){b={value:d,parser:f};}}); +b=b||{value:c,parser:Fx.CSS.Parsers.String};return b;});},compute:function(d,c,b){var a=[];(Math.min(d.length,c.length)).times(function(e){a.push({value:d[e].parser.compute(d[e].value,c[e].value,b),parser:d[e].parser}); +});a.$family={name:"fx:css:value"};return a;},serve:function(c,b){if($type(c)!="fx:css:value"){c=this.parse(c);}var a=[];c.each(function(d){a=a.concat(d.parser.serve(d.value,b)); +});return a;},render:function(a,d,c,b){a.setStyle(d,this.serve(c,b));},search:function(a){if(Fx.CSS.Cache[a]){return Fx.CSS.Cache[a];}var b={};Array.each(document.styleSheets,function(e,d){var c=e.href; +if(c&&c.contains("://")&&!c.contains(document.domain)){return;}var f=e.rules||e.cssRules;Array.each(f,function(j,g){if(!j.style){return;}var h=(j.selectorText)?j.selectorText.replace(/^\w+/,function(i){return i.toLowerCase(); +}):null;if(!h||!h.test("^"+a+"$")){return;}Element.Styles.each(function(k,i){if(!j.style[i]||Element.ShortStyles[i]){return;}k=String(j.style[i]);b[i]=(k.test(/^rgb/))?k.rgbToHex():k; +});});});return Fx.CSS.Cache[a]=b;}});Fx.CSS.Cache={};Fx.CSS.Parsers=new Hash({Color:{parse:function(a){if(a.match(/^#[0-9a-f]{3,6}$/i)){return a.hexToRgb(true); +}return((a=a.match(/(\d+),\s*(\d+),\s*(\d+)/)))?[a[1],a[2],a[3]]:false;},compute:function(c,b,a){return c.map(function(e,d){return Math.round(Fx.compute(c[d],b[d],a)); +});},serve:function(a){return a.map(Number);}},Number:{parse:parseFloat,compute:Fx.compute,serve:function(b,a){return(a)?b+a:b;}},String:{parse:$lambda(false),compute:$arguments(1),serve:$arguments(0)}}); +Fx.Tween=new Class({Extends:Fx.CSS,initialize:function(b,a){this.element=this.subject=document.id(b);this.parent(a);},set:function(b,a){if(arguments.length==1){a=b; +b=this.property||this.options.property;}this.render(this.element,b,a,this.options.unit);return this;},start:function(c,e,d){if(!this.check(c,e,d)){return this; +}var b=Array.flatten(arguments);this.property=this.options.property||b.shift();var a=this.prepare(this.element,this.property,b);return this.parent(a.from,a.to); +}});Element.Properties.tween={set:function(a){var b=this.retrieve("tween");if(b){b.cancel();}return this.eliminate("tween").store("tween:options",$extend({link:"cancel"},a)); +},get:function(a){if(a||!this.retrieve("tween")){if(a||!this.retrieve("tween:options")){this.set("tween",a);}this.store("tween",new Fx.Tween(this,this.retrieve("tween:options"))); +}return this.retrieve("tween");}};Element.implement({tween:function(a,c,b){this.get("tween").start(arguments);return this;},fade:function(c){var e=this.get("tween"),d="opacity",a; +c=$pick(c,"toggle");switch(c){case"in":e.start(d,1);break;case"out":e.start(d,0);break;case"show":e.set(d,1);break;case"hide":e.set(d,0);break;case"toggle":var b=this.retrieve("fade:flag",this.get("opacity")==1); +e.start(d,(b)?0:1);this.store("fade:flag",!b);a=true;break;default:e.start(d,arguments);}if(!a){this.eliminate("fade:flag");}return this;},highlight:function(c,a){if(!a){a=this.retrieve("highlight:original",this.getStyle("background-color")); +a=(a=="transparent")?"#fff":a;}var b=this.get("tween");b.start("background-color",c||"#ffff88",a).chain(function(){this.setStyle("background-color",this.retrieve("highlight:original")); +b.callChain();}.bind(this));return this;}});Fx.Morph=new Class({Extends:Fx.CSS,initialize:function(b,a){this.element=this.subject=document.id(b);this.parent(a); +},set:function(a){if(typeof a=="string"){a=this.search(a);}for(var b in a){this.render(this.element,b,a[b],this.options.unit);}return this;},compute:function(e,d,c){var a={}; +for(var b in e){a[b]=this.parent(e[b],d[b],c);}return a;},start:function(b){if(!this.check(b)){return this;}if(typeof b=="string"){b=this.search(b);}var e={},d={}; +for(var c in b){var a=this.prepare(this.element,c,b[c]);e[c]=a.from;d[c]=a.to;}return this.parent(e,d);}});Element.Properties.morph={set:function(a){var b=this.retrieve("morph"); +if(b){b.cancel();}return this.eliminate("morph").store("morph:options",$extend({link:"cancel"},a));},get:function(a){if(a||!this.retrieve("morph")){if(a||!this.retrieve("morph:options")){this.set("morph",a); +}this.store("morph",new Fx.Morph(this,this.retrieve("morph:options")));}return this.retrieve("morph");}};Element.implement({morph:function(a){this.get("morph").start(a); +return this;}});Fx.implement({getTransition:function(){var a=this.options.transition||Fx.Transitions.Sine.easeInOut;if(typeof a=="string"){var b=a.split(":"); +a=Fx.Transitions;a=a[b[0]]||a[b[0].capitalize()];if(b[1]){a=a["ease"+b[1].capitalize()+(b[2]?b[2].capitalize():"")];}}return a;}});Fx.Transition=function(b,a){a=$splat(a); +return $extend(b,{easeIn:function(c){return b(c,a);},easeOut:function(c){return 1-b(1-c,a);},easeInOut:function(c){return(c<=0.5)?b(2*c,a)/2:(2-b(2*(1-c),a))/2; +}});};Fx.Transitions=new Hash({linear:$arguments(0)});Fx.Transitions.extend=function(a){for(var b in a){Fx.Transitions[b]=new Fx.Transition(a[b]);}};Fx.Transitions.extend({Pow:function(b,a){return Math.pow(b,a[0]||6); +},Expo:function(a){return Math.pow(2,8*(a-1));},Circ:function(a){return 1-Math.sin(Math.acos(a));},Sine:function(a){return 1-Math.sin((1-a)*Math.PI/2); +},Back:function(b,a){a=a[0]||1.618;return Math.pow(b,2)*((a+1)*b-a);},Bounce:function(f){var e;for(var d=0,c=1;1;d+=c,c/=2){if(f>=(7-4*d)/11){e=c*c-Math.pow((11-6*d-11*f)/4,2); +break;}}return e;},Elastic:function(b,a){return Math.pow(2,10*--b)*Math.cos(20*b*Math.PI*(a[0]||1)/3);}});["Quad","Cubic","Quart","Quint"].each(function(b,a){Fx.Transitions[b]=new Fx.Transition(function(c){return Math.pow(c,[a+2]); +});});var Request=new Class({Implements:[Chain,Events,Options],options:{url:"",data:"",headers:{"X-Requested-With":"XMLHttpRequest",Accept:"text/javascript, text/html, application/xml, text/xml, */*"},async:true,format:false,method:"post",link:"ignore",isSuccess:null,emulation:true,urlEncoded:true,encoding:"utf-8",evalScripts:false,evalResponse:false,noCache:false},initialize:function(a){this.xhr=new Browser.Request(); +this.setOptions(a);this.options.isSuccess=this.options.isSuccess||this.isSuccess;this.headers=new Hash(this.options.headers);},onStateChange:function(){if(this.xhr.readyState!=4||!this.running){return; +}this.running=false;this.status=0;$try(function(){this.status=this.xhr.status;}.bind(this));this.xhr.onreadystatechange=$empty;if(this.options.isSuccess.call(this,this.status)){this.response={text:this.xhr.responseText,xml:this.xhr.responseXML}; +this.success(this.response.text,this.response.xml);}else{this.response={text:null,xml:null};this.failure();}},isSuccess:function(){return((this.status>=200)&&(this.status<300)); +},processScripts:function(a){if(this.options.evalResponse||(/(ecma|java)script/).test(this.getHeader("Content-type"))){return $exec(a);}return a.stripScripts(this.options.evalScripts); +},success:function(b,a){this.onSuccess(this.processScripts(b),a);},onSuccess:function(){this.fireEvent("complete",arguments).fireEvent("success",arguments).callChain(); +},failure:function(){this.onFailure();},onFailure:function(){this.fireEvent("complete").fireEvent("failure",this.xhr);},setHeader:function(a,b){this.headers.set(a,b); +return this;},getHeader:function(a){return $try(function(){return this.xhr.getResponseHeader(a);}.bind(this));},check:function(){if(!this.running){return true; +}switch(this.options.link){case"cancel":this.cancel();return true;case"chain":this.chain(this.caller.bind(this,arguments));return false;}return false;},send:function(k){if(!this.check(k)){return this; +}this.running=true;var i=$type(k);if(i=="string"||i=="element"){k={data:k};}var d=this.options;k=$extend({data:d.data,url:d.url,method:d.method},k);var g=k.data,b=String(k.url),a=k.method.toLowerCase(); +switch($type(g)){case"element":g=document.id(g).toQueryString();break;case"object":case"hash":g=Hash.toQueryString(g);}if(this.options.format){var j="format="+this.options.format; +g=(g)?j+"&"+g:j;}if(this.options.emulation&&!["get","post"].contains(a)){var h="_method="+a;g=(g)?h+"&"+g:h;a="post";}if(this.options.urlEncoded&&a=="post"){var c=(this.options.encoding)?"; charset="+this.options.encoding:""; +this.headers.set("Content-type","application/x-www-form-urlencoded"+c);}if(this.options.noCache){var f="noCache="+new Date().getTime();g=(g)?f+"&"+g:f; +}var e=b.lastIndexOf("/");if(e>-1&&(e=b.indexOf("#"))>-1){b=b.substr(0,e);}if(g&&a=="get"){b=b+(b.contains("?")?"&":"?")+g;g=null;}this.xhr.open(a.toUpperCase(),b,this.options.async); +this.xhr.onreadystatechange=this.onStateChange.bind(this);this.headers.each(function(m,l){try{this.xhr.setRequestHeader(l,m);}catch(n){this.fireEvent("exception",[l,m]); +}},this);this.fireEvent("request");this.xhr.send(g);if(!this.options.async){this.onStateChange();}return this;},cancel:function(){if(!this.running){return this; +}this.running=false;this.xhr.abort();this.xhr.onreadystatechange=$empty;this.xhr=new Browser.Request();this.fireEvent("cancel");return this;}});(function(){var a={}; +["get","post","put","delete","GET","POST","PUT","DELETE"].each(function(b){a[b]=function(){var c=Array.link(arguments,{url:String.type,data:$defined}); +return this.send($extend(c,{method:b}));};});Request.implement(a);})();Element.Properties.send={set:function(a){var b=this.retrieve("send");if(b){b.cancel(); +}return this.eliminate("send").store("send:options",$extend({data:this,link:"cancel",method:this.get("method")||"post",url:this.get("action")},a));},get:function(a){if(a||!this.retrieve("send")){if(a||!this.retrieve("send:options")){this.set("send",a); +}this.store("send",new Request(this.retrieve("send:options")));}return this.retrieve("send");}};Element.implement({send:function(a){var b=this.get("send"); +b.send({data:this,url:a||b.options.url});return this;}});Request.HTML=new Class({Extends:Request,options:{update:false,append:false,evalScripts:true,filter:false},processHTML:function(c){var b=c.match(/<body[^>]*>([\s\S]*?)<\/body>/i); +c=(b)?b[1]:c;var a=new Element("div");return $try(function(){var d="<root>"+c+"</root>",g;if(Browser.Engine.trident){g=new ActiveXObject("Microsoft.XMLDOM"); +g.async=false;g.loadXML(d);}else{g=new DOMParser().parseFromString(d,"text/xml");}d=g.getElementsByTagName("root")[0];if(!d){return null;}for(var f=0,e=d.childNodes.length; +f<e;f++){var h=Element.clone(d.childNodes[f],true,true);if(h){a.grab(h);}}return a;})||a.set("html",c);},success:function(d){var c=this.options,b=this.response; +b.html=d.stripScripts(function(e){b.javascript=e;});var a=this.processHTML(b.html);b.tree=a.childNodes;b.elements=a.getElements("*");if(c.filter){b.tree=b.elements.filter(c.filter); +}if(c.update){document.id(c.update).empty().set("html",b.html);}else{if(c.append){document.id(c.append).adopt(a.getChildren());}}if(c.evalScripts){$exec(b.javascript); +}this.onSuccess(b.tree,b.elements,b.html,b.javascript);}});Element.Properties.load={set:function(a){var b=this.retrieve("load");if(b){b.cancel();}return this.eliminate("load").store("load:options",$extend({data:this,link:"cancel",update:this,method:"get"},a)); +},get:function(a){if(a||!this.retrieve("load")){if(a||!this.retrieve("load:options")){this.set("load",a);}this.store("load",new Request.HTML(this.retrieve("load:options"))); +}return this.retrieve("load");}};Element.implement({load:function(){this.get("load").send(Array.link(arguments,{data:Object.type,url:String.type}));return this; +}});Request.JSON=new Class({Extends:Request,options:{secure:true},initialize:function(a){this.parent(a);this.headers.extend({Accept:"application/json","X-Request":"JSON"}); +},success:function(a){this.response.json=JSON.decode(a,this.options.secure);this.onSuccess(this.response.json,a);}}); -Copyright: - Copyright (c) 2006-2008 [Valerio Proietti](http://mad4milk.net/). +//MooTools More, <http://mootools.net/more>. Copyright (c) 2006-2009 Aaron Newton <http://clientcide.com/>, Valerio Proietti <http://mad4milk.net> & the MooTools team <http://mootools.net/developers>, MIT Style License. -Code & Documentation: - [The MooTools production team](http://mootools.net/developers/). - -Inspiration: - - Class implementation inspired by [Base.js](http://dean.edwards.name/weblog/2006/03/base/) Copyright (c) 2006 Dean Edwards, [GNU Lesser General Public License](http://opensource.org/licenses/lgpl-license.php) - - Some functionality inspired by [Prototype.js](http://prototypejs.org) Copyright (c) 2005-2007 Sam Stephenson, [MIT License](http://opensource.org/licenses/mit-license.php) -*/ - -var MooTools = { - 'version': '1.2.3', - 'build': '4980aa0fb74d2f6eb80bcd9f5b8e1fd6fbb8f607' -}; - -var Native = function(options){ - options = options || {}; - var name = options.name; - var legacy = options.legacy; - var protect = options.protect; - var methods = options.implement; - var generics = options.generics; - var initialize = options.initialize; - var afterImplement = options.afterImplement || function(){}; - var object = initialize || legacy; - generics = generics !== false; - - object.constructor = Native; - object.$family = {name: 'native'}; - if (legacy && initialize) object.prototype = legacy.prototype; - object.prototype.constructor = object; - - if (name){ - var family = name.toLowerCase(); - object.prototype.$family = {name: family}; - Native.typize(object, family); - } - - var add = function(obj, name, method, force){ - if (!protect || force || !obj.prototype[name]) obj.prototype[name] = method; - if (generics) Native.genericize(obj, name, protect); - afterImplement.call(obj, name, method); - return obj; - }; - - object.alias = function(a1, a2, a3){ - if (typeof a1 == 'string'){ - var pa1 = this.prototype[a1]; - if ((a1 = pa1)) return add(this, a2, a1, a3); - } - for (var a in a1) this.alias(a, a1[a], a2); - return this; - }; - - object.implement = function(a1, a2, a3){ - if (typeof a1 == 'string') return add(this, a1, a2, a3); - for (var p in a1) add(this, p, a1[p], a2); - return this; - }; - - if (methods) object.implement(methods); - - return object; -}; - -Native.genericize = function(object, property, check){ - if ((!check || !object[property]) && typeof object.prototype[property] == 'function') object[property] = function(){ - var args = Array.prototype.slice.call(arguments); - return object.prototype[property].apply(args.shift(), args); - }; -}; - -Native.implement = function(objects, properties){ - for (var i = 0, l = objects.length; i < l; i++) objects[i].implement(properties); -}; - -Native.typize = function(object, family){ - if (!object.type) object.type = function(item){ - return ($type(item) === family); - }; -}; - -(function(){ - var natives = {'Array': Array, 'Date': Date, 'Function': Function, 'Number': Number, 'RegExp': RegExp, 'String': String}; - for (var n in natives) new Native({name: n, initialize: natives[n], protect: true}); - - var types = {'boolean': Boolean, 'native': Native, 'object': Object}; - for (var t in types) Native.typize(types[t], t); - - var generics = { - 'Array': ["concat", "indexOf", "join", "lastIndexOf", "pop", "push", "reverse", "shift", "slice", "sort", "splice", "toString", "unshift", "valueOf"], - 'String': ["charAt", "charCodeAt", "concat", "indexOf", "lastIndexOf", "match", "replace", "search", "slice", "split", "substr", "substring", "toLowerCase", "toUpperCase", "valueOf"] - }; - for (var g in generics){ - for (var i = generics[g].length; i--;) Native.genericize(natives[g], generics[g][i], true); - } -})(); - -var Hash = new Native({ - - name: 'Hash', - - initialize: function(object){ - if ($type(object) == 'hash') object = $unlink(object.getClean()); - for (var key in object) this[key] = object[key]; - return this; - } - -}); - -Hash.implement({ - - forEach: function(fn, bind){ - for (var key in this){ - if (this.hasOwnProperty(key)) fn.call(bind, this[key], key, this); - } - }, - - getClean: function(){ - var clean = {}; - for (var key in this){ - if (this.hasOwnProperty(key)) clean[key] = this[key]; - } - return clean; - }, - - getLength: function(){ - var length = 0; - for (var key in this){ - if (this.hasOwnProperty(key)) length++; - } - return length; - } - -}); - -Hash.alias('forEach', 'each'); - -Array.implement({ - - forEach: function(fn, bind){ - for (var i = 0, l = this.length; i < l; i++) fn.call(bind, this[i], i, this); - } - -}); - -Array.alias('forEach', 'each'); - -function $A(iterable){ - if (iterable.item){ - var l = iterable.length, array = new Array(l); - while (l--) array[l] = iterable[l]; - return array; - } - return Array.prototype.slice.call(iterable); -}; - -function $arguments(i){ - return function(){ - return arguments[i]; - }; -}; - -function $chk(obj){ - return !!(obj || obj === 0); -}; - -function $clear(timer){ - clearTimeout(timer); - clearInterval(timer); - return null; -}; - -function $defined(obj){ - return (obj != undefined); -}; - -function $each(iterable, fn, bind){ - var type = $type(iterable); - ((type == 'arguments' || type == 'collection' || type == 'array') ? Array : Hash).each(iterable, fn, bind); -}; - -function $empty(){}; - -function $extend(original, extended){ - for (var key in (extended || {})) original[key] = extended[key]; - return original; -}; - -function $H(object){ - return new Hash(object); -}; - -function $lambda(value){ - return ($type(value) == 'function') ? value : function(){ - return value; - }; -}; - -function $merge(){ - var args = Array.slice(arguments); - args.unshift({}); - return $mixin.apply(null, args); -}; - -function $mixin(mix){ - for (var i = 1, l = arguments.length; i < l; i++){ - var object = arguments[i]; - if ($type(object) != 'object') continue; - for (var key in object){ - var op = object[key], mp = mix[key]; - mix[key] = (mp && $type(op) == 'object' && $type(mp) == 'object') ? $mixin(mp, op) : $unlink(op); - } - } - return mix; -}; - -function $pick(){ - for (var i = 0, l = arguments.length; i < l; i++){ - if (arguments[i] != undefined) return arguments[i]; - } - return null; -}; - -function $random(min, max){ - return Math.floor(Math.random() * (max - min + 1) + min); -}; - -function $splat(obj){ - var type = $type(obj); - return (type) ? ((type != 'array' && type != 'arguments') ? [obj] : obj) : []; -}; - -var $time = Date.now || function(){ - return +new Date; -}; - -function $try(){ - for (var i = 0, l = arguments.length; i < l; i++){ - try { - return arguments[i](); - } catch(e){} - } - return null; -}; - -function $type(obj){ - if (obj == undefined) return false; - if (obj.$family) return (obj.$family.name == 'number' && !isFinite(obj)) ? false : obj.$family.name; - if (obj.nodeName){ - switch (obj.nodeType){ - case 1: return 'element'; - case 3: return (/\S/).test(obj.nodeValue) ? 'textnode' : 'whitespace'; - } - } else if (typeof obj.length == 'number'){ - if (obj.callee) return 'arguments'; - else if (obj.item) return 'collection'; - } - return typeof obj; -}; - -function $unlink(object){ - var unlinked; - switch ($type(object)){ - case 'object': - unlinked = {}; - for (var p in object) unlinked[p] = $unlink(object[p]); - break; - case 'hash': - unlinked = new Hash(object); - break; - case 'array': - unlinked = []; - for (var i = 0, l = object.length; i < l; i++) unlinked[i] = $unlink(object[i]); - break; - default: return object; - } - return unlinked; -}; - - /* -Script: Browser.js - The Browser Core. Contains Browser initialization, Window and Document, and the Browser Hash. +--- -License: - MIT-style license. -*/ +script: More.js -var Browser = $merge({ +description: MooTools More - Engine: {name: 'unknown', version: 0}, +license: MIT-style license - Platform: {name: (window.orientation != undefined) ? 'ipod' : (navigator.platform.match(/mac|win|linux/i) || ['other'])[0].toLowerCase()}, +authors: +- Guillermo Rauch +- Thomas Aylott +- Scott Kyle - Features: {xpath: !!(document.evaluate), air: !!(window.runtime), query: !!(document.querySelector)}, +requires: +- core:1.2.4/MooTools - Plugins: {}, +provides: [MooTools.More] - Engines: { - - presto: function(){ - return (!window.opera) ? false : ((arguments.callee.caller) ? 960 : ((document.getElementsByClassName) ? 950 : 925)); - }, - - trident: function(){ - return (!window.ActiveXObject) ? false : ((window.XMLHttpRequest) ? 5 : 4); - }, - - webkit: function(){ - return (navigator.taintEnabled) ? false : ((Browser.Features.xpath) ? ((Browser.Features.query) ? 525 : 420) : 419); - }, - - gecko: function(){ - return (document.getBoxObjectFor == undefined) ? false : ((document.getElementsByClassName) ? 19 : 18); - } - - } - -}, Browser || {}); - -Browser.Platform[Browser.Platform.name] = true; - -Browser.detect = function(){ - - for (var engine in this.Engines){ - var version = this.Engines[engine](); - if (version){ - this.Engine = {name: engine, version: version}; - this.Engine[engine] = this.Engine[engine + version] = true; - break; - } - } - - return {name: engine, version: version}; - -}; - -Browser.detect(); - -Browser.Request = function(){ - return $try(function(){ - return new XMLHttpRequest(); - }, function(){ - return new ActiveXObject('MSXML2.XMLHTTP'); - }); -}; - -Browser.Features.xhr = !!(Browser.Request()); - -Browser.Plugins.Flash = (function(){ - var version = ($try(function(){ - return navigator.plugins['Shockwave Flash'].description; - }, function(){ - return new ActiveXObject('ShockwaveFlash.ShockwaveFlash').GetVariable('$version'); - }) || '0 r0').match(/\d+/g); - return {version: parseInt(version[0] || 0 + '.' + version[1], 10) || 0, build: parseInt(version[2], 10) || 0}; -})(); - -function $exec(text){ - if (!text) return text; - if (window.execScript){ - window.execScript(text); - } else { - var script = document.createElement('script'); - script.setAttribute('type', 'text/javascript'); - script[(Browser.Engine.webkit && Browser.Engine.version < 420) ? 'innerText' : 'text'] = text; - document.head.appendChild(script); - document.head.removeChild(script); - } - return text; -}; - -Native.UID = 1; - -var $uid = (Browser.Engine.trident) ? function(item){ - return (item.uid || (item.uid = [Native.UID++]))[0]; -} : function(item){ - return item.uid || (item.uid = Native.UID++); -}; - -var Window = new Native({ - - name: 'Window', - - legacy: (Browser.Engine.trident) ? null: window.Window, - - initialize: function(win){ - $uid(win); - if (!win.Element){ - win.Element = $empty; - if (Browser.Engine.webkit) win.document.createElement("iframe"); //fixes safari 2 - win.Element.prototype = (Browser.Engine.webkit) ? window["[[DOMElement.prototype]]"] : {}; - } - win.document.window = win; - return $extend(win, Window.Prototype); - }, - - afterImplement: function(property, value){ - window[property] = Window.Prototype[property] = value; - } - -}); - -Window.Prototype = {$family: {name: 'window'}}; - -new Window(window); - -var Document = new Native({ - - name: 'Document', - - legacy: (Browser.Engine.trident) ? null: window.Document, - - initialize: function(doc){ - $uid(doc); - doc.head = doc.getElementsByTagName('head')[0]; - doc.html = doc.getElementsByTagName('html')[0]; - if (Browser.Engine.trident && Browser.Engine.version <= 4) $try(function(){ - doc.execCommand("BackgroundImageCache", false, true); - }); - if (Browser.Engine.trident) doc.window.attachEvent('onunload', function() { - doc.window.detachEvent('onunload', arguments.callee); - doc.head = doc.html = doc.window = null; - }); - return $extend(doc, Document.Prototype); - }, - - afterImplement: function(property, value){ - document[property] = Document.Prototype[property] = value; - } - -}); - -Document.Prototype = {$family: {name: 'document'}}; - -new Document(document); - - -/* -Script: Array.js - Contains Array Prototypes like each, contains, and erase. - -License: - MIT-style license. +... */ -Array.implement({ - - every: function(fn, bind){ - for (var i = 0, l = this.length; i < l; i++){ - if (!fn.call(bind, this[i], i, this)) return false; - } - return true; - }, - - filter: function(fn, bind){ - var results = []; - for (var i = 0, l = this.length; i < l; i++){ - if (fn.call(bind, this[i], i, this)) results.push(this[i]); - } - return results; - }, - - clean: function() { - return this.filter($defined); - }, - - indexOf: function(item, from){ - var len = this.length; - for (var i = (from < 0) ? Math.max(0, len + from) : from || 0; i < len; i++){ - if (this[i] === item) return i; - } - return -1; - }, - - map: function(fn, bind){ - var results = []; - for (var i = 0, l = this.length; i < l; i++) results[i] = fn.call(bind, this[i], i, this); - return results; - }, - - some: function(fn, bind){ - for (var i = 0, l = this.length; i < l; i++){ - if (fn.call(bind, this[i], i, this)) return true; - } - return false; - }, - - associate: function(keys){ - var obj = {}, length = Math.min(this.length, keys.length); - for (var i = 0; i < length; i++) obj[keys[i]] = this[i]; - return obj; - }, - - link: function(object){ - var result = {}; - for (var i = 0, l = this.length; i < l; i++){ - for (var key in object){ - if (object[key](this[i])){ - result[key] = this[i]; - delete object[key]; - break; - } - } - } - return result; - }, - - contains: function(item, from){ - return this.indexOf(item, from) != -1; - }, - - extend: function(array){ - for (var i = 0, j = array.length; i < j; i++) this.push(array[i]); - return this; - }, - - getLast: function(){ - return (this.length) ? this[this.length - 1] : null; - }, - - getRandom: function(){ - return (this.length) ? this[$random(0, this.length - 1)] : null; - }, - - include: function(item){ - if (!this.contains(item)) this.push(item); - return this; - }, - - combine: function(array){ - for (var i = 0, l = array.length; i < l; i++) this.include(array[i]); - return this; - }, - - erase: function(item){ - for (var i = this.length; i--; i){ - if (this[i] === item) this.splice(i, 1); - } - return this; - }, - - empty: function(){ - this.length = 0; - return this; - }, - - flatten: function(){ - var array = []; - for (var i = 0, l = this.length; i < l; i++){ - var type = $type(this[i]); - if (!type) continue; - array = array.concat((type == 'array' || type == 'collection' || type == 'arguments') ? Array.flatten(this[i]) : this[i]); - } - return array; - }, - - hexToRgb: function(array){ - if (this.length != 3) return null; - var rgb = this.map(function(value){ - if (value.length == 1) value += value; - return value.toInt(16); - }); - return (array) ? rgb : 'rgb(' + rgb + ')'; - }, - - rgbToHex: function(array){ - if (this.length < 3) return null; - if (this.length == 4 && this[3] == 0 && !array) return 'transparent'; - var hex = []; - for (var i = 0; i < 3; i++){ - var bit = (this[i] - 0).toString(16); - hex.push((bit.length == 1) ? '0' + bit : bit); - } - return (array) ? hex : '#' + hex.join(''); - } - -}); - - -/* -Script: Function.js - Contains Function Prototypes like create, bind, pass, and delay. - -License: - MIT-style license. -*/ - -Function.implement({ - - extend: function(properties){ - for (var property in properties) this[property] = properties[property]; - return this; - }, - - create: function(options){ - var self = this; - options = options || {}; - return function(event){ - var args = options.arguments; - args = (args != undefined) ? $splat(args) : Array.slice(arguments, (options.event) ? 1 : 0); - if (options.event) args = [event || window.event].extend(args); - var returns = function(){ - return self.apply(options.bind || null, args); - }; - if (options.delay) return setTimeout(returns, options.delay); - if (options.periodical) return setInterval(returns, options.periodical); - if (options.attempt) return $try(returns); - return returns(); - }; - }, - - run: function(args, bind){ - return this.apply(bind, $splat(args)); - }, - - pass: function(args, bind){ - return this.create({bind: bind, arguments: args}); - }, - - bind: function(bind, args){ - return this.create({bind: bind, arguments: args}); - }, - - bindWithEvent: function(bind, args){ - return this.create({bind: bind, arguments: args, event: true}); - }, - - attempt: function(args, bind){ - return this.create({bind: bind, arguments: args, attempt: true})(); - }, - - delay: function(delay, bind, args){ - return this.create({bind: bind, arguments: args, delay: delay})(); - }, - - periodical: function(periodical, bind, args){ - return this.create({bind: bind, arguments: args, periodical: periodical})(); - } - -}); - - -/* -Script: Number.js - Contains Number Prototypes like limit, round, times, and ceil. - -License: - MIT-style license. -*/ - -Number.implement({ - - limit: function(min, max){ - return Math.min(max, Math.max(min, this)); - }, - - round: function(precision){ - precision = Math.pow(10, precision || 0); - return Math.round(this * precision) / precision; - }, - - times: function(fn, bind){ - for (var i = 0; i < this; i++) fn.call(bind, i, this); - }, - - toFloat: function(){ - return parseFloat(this); - }, - - toInt: function(base){ - return parseInt(this, base || 10); - } - -}); - -Number.alias('times', 'each'); - -(function(math){ - var methods = {}; - math.each(function(name){ - if (!Number[name]) methods[name] = function(){ - return Math[name].apply(null, [this].concat($A(arguments))); - }; - }); - Number.implement(methods); -})(['abs', 'acos', 'asin', 'atan', 'atan2', 'ceil', 'cos', 'exp', 'floor', 'log', 'max', 'min', 'pow', 'sin', 'sqrt', 'tan']); - - -/* -Script: String.js - Contains String Prototypes like camelCase, capitalize, test, and toInt. - -License: - MIT-style license. -*/ - -String.implement({ - - test: function(regex, params){ - return ((typeof regex == 'string') ? new RegExp(regex, params) : regex).test(this); - }, - - contains: function(string, separator){ - return (separator) ? (separator + this + separator).indexOf(separator + string + separator) > -1 : this.indexOf(string) > -1; - }, - - trim: function(){ - return this.replace(/^\s+|\s+$/g, ''); - }, - - clean: function(){ - return this.replace(/\s+/g, ' ').trim(); - }, - - camelCase: function(){ - return this.replace(/-\D/g, function(match){ - return match.charAt(1).toUpperCase(); - }); - }, - - hyphenate: function(){ - return this.replace(/[A-Z]/g, function(match){ - return ('-' + match.charAt(0).toLowerCase()); - }); - }, - - capitalize: function(){ - return this.replace(/\b[a-z]/g, function(match){ - return match.toUpperCase(); - }); - }, - - escapeRegExp: function(){ - return this.replace(/([-.*+?^${}()|[\]\/\\])/g, '\\$1'); - }, - - toInt: function(base){ - return parseInt(this, base || 10); - }, - - toFloat: function(){ - return parseFloat(this); - }, - - hexToRgb: function(array){ - var hex = this.match(/^#?(\w{1,2})(\w{1,2})(\w{1,2})$/); - return (hex) ? hex.slice(1).hexToRgb(array) : null; - }, - - rgbToHex: function(array){ - var rgb = this.match(/\d{1,3}/g); - return (rgb) ? rgb.rgbToHex(array) : null; - }, - - stripScripts: function(option){ - var scripts = ''; - var text = this.replace(/<script[^>]*>([\s\S]*?)<\/script>/gi, function(){ - scripts += arguments[1] + '\n'; - return ''; - }); - if (option === true) $exec(scripts); - else if ($type(option) == 'function') option(scripts, text); - return text; - }, - - substitute: function(object, regexp){ - return this.replace(regexp || (/\\?\{([^{}]+)\}/g), function(match, name){ - if (match.charAt(0) == '\\') return match.slice(1); - return (object[name] != undefined) ? object[name] : ''; - }); - } - -}); - - -/* -Script: Hash.js - Contains Hash Prototypes. Provides a means for overcoming the JavaScript practical impossibility of extending native Objects. - -License: - MIT-style license. -*/ - -Hash.implement({ - - has: Object.prototype.hasOwnProperty, - - keyOf: function(value){ - for (var key in this){ - if (this.hasOwnProperty(key) && this[key] === value) return key; - } - return null; - }, - - hasValue: function(value){ - return (Hash.keyOf(this, value) !== null); - }, - - extend: function(properties){ - Hash.each(properties || {}, function(value, key){ - Hash.set(this, key, value); - }, this); - return this; - }, - - combine: function(properties){ - Hash.each(properties || {}, function(value, key){ - Hash.include(this, key, value); - }, this); - return this; - }, - - erase: function(key){ - if (this.hasOwnProperty(key)) delete this[key]; - return this; - }, - - get: function(key){ - return (this.hasOwnProperty(key)) ? this[key] : null; - }, - - set: function(key, value){ - if (!this[key] || this.hasOwnProperty(key)) this[key] = value; - return this; - }, - - empty: function(){ - Hash.each(this, function(value, key){ - delete this[key]; - }, this); - return this; - }, - - include: function(key, value){ - if (this[key] == undefined) this[key] = value; - return this; - }, - - map: function(fn, bind){ - var results = new Hash; - Hash.each(this, function(value, key){ - results.set(key, fn.call(bind, value, key, this)); - }, this); - return results; - }, - - filter: function(fn, bind){ - var results = new Hash; - Hash.each(this, function(value, key){ - if (fn.call(bind, value, key, this)) results.set(key, value); - }, this); - return results; - }, - - every: function(fn, bind){ - for (var key in this){ - if (this.hasOwnProperty(key) && !fn.call(bind, this[key], key)) return false; - } - return true; - }, - - some: function(fn, bind){ - for (var key in this){ - if (this.hasOwnProperty(key) && fn.call(bind, this[key], key)) return true; - } - return false; - }, - - getKeys: function(){ - var keys = []; - Hash.each(this, function(value, key){ - keys.push(key); - }); - return keys; - }, - - getValues: function(){ - var values = []; - Hash.each(this, function(value){ - values.push(value); - }); - return values; - }, - - toQueryString: function(base){ - var queryString = []; - Hash.each(this, function(value, key){ - if (base) key = base + '[' + key + ']'; - var result; - switch ($type(value)){ - case 'object': result = Hash.toQueryString(value, key); break; - case 'array': - var qs = {}; - value.each(function(val, i){ - qs[i] = val; - }); - result = Hash.toQueryString(qs, key); - break; - default: result = key + '=' + encodeURIComponent(value); - } - if (value != undefined) queryString.push(result); - }); - - return queryString.join('&'); - } - -}); - -Hash.alias({keyOf: 'indexOf', hasValue: 'contains'}); - - -/* -Script: Event.js - Contains the Event Native, to make the event object completely crossbrowser. - -License: - MIT-style license. -*/ - -var Event = new Native({ - - name: 'Event', - - initialize: function(event, win){ - win = win || window; - var doc = win.document; - event = event || win.event; - if (event.$extended) return event; - this.$extended = true; - var type = event.type; - var target = event.target || event.srcElement; - while (target && target.nodeType == 3) target = target.parentNode; - - if (type.test(/key/)){ - var code = event.which || event.keyCode; - var key = Event.Keys.keyOf(code); - if (type == 'keydown'){ - var fKey = code - 111; - if (fKey > 0 && fKey < 13) key = 'f' + fKey; - } - key = key || String.fromCharCode(code).toLowerCase(); - } else if (type.match(/(click|mouse|menu)/i)){ - doc = (!doc.compatMode || doc.compatMode == 'CSS1Compat') ? doc.html : doc.body; - var page = { - x: event.pageX || event.clientX + doc.scrollLeft, - y: event.pageY || event.clientY + doc.scrollTop - }; - var client = { - x: (event.pageX) ? event.pageX - win.pageXOffset : event.clientX, - y: (event.pageY) ? event.pageY - win.pageYOffset : event.clientY - }; - if (type.match(/DOMMouseScroll|mousewheel/)){ - var wheel = (event.wheelDelta) ? event.wheelDelta / 120 : -(event.detail || 0) / 3; - } - var rightClick = (event.which == 3) || (event.button == 2); - var related = null; - if (type.match(/over|out/)){ - switch (type){ - case 'mouseover': related = event.relatedTarget || event.fromElement; break; - case 'mouseout': related = event.relatedTarget || event.toElement; - } - if (!(function(){ - while (related && related.nodeType == 3) related = related.parentNode; - return true; - }).create({attempt: Browser.Engine.gecko})()) related = false; - } - } - - return $extend(this, { - event: event, - type: type, - - page: page, - client: client, - rightClick: rightClick, - - wheel: wheel, - - relatedTarget: related, - target: target, - - code: code, - key: key, - - shift: event.shiftKey, - control: event.ctrlKey, - alt: event.altKey, - meta: event.metaKey - }); - } - -}); - -Event.Keys = new Hash({ - 'enter': 13, - 'up': 38, - 'down': 40, - 'left': 37, - 'right': 39, - 'esc': 27, - 'space': 32, - 'backspace': 8, - 'tab': 9, - 'delete': 46 -}); - -Event.implement({ - - stop: function(){ - return this.stopPropagation().preventDefault(); - }, - - stopPropagation: function(){ - if (this.event.stopPropagation) this.event.stopPropagation(); - else this.event.cancelBubble = true; - return this; - }, - - preventDefault: function(){ - if (this.event.preventDefault) this.event.preventDefault(); - else this.event.returnValue = false; - return this; - } - -}); - - -/* -Script: Class.js - Contains the Class Function for easily creating, extending, and implementing reusable Classes. - -License: - MIT-style license. -*/ - -function Class(params){ - - if (params instanceof Function) params = {initialize: params}; - - var newClass = function(){ - Object.reset(this); - if (newClass._prototyping) return this; - this._current = $empty; - var value = (this.initialize) ? this.initialize.apply(this, arguments) : this; - delete this._current; delete this.caller; - return value; - }.extend(this); - - newClass.implement(params); - - newClass.constructor = Class; - newClass.prototype.constructor = newClass; - - return newClass; - +MooTools.More = { + 'version': '1.2.4.4', + 'build': '6f6057dc645fdb7547689183b2311063bd653ddf' }; -Function.prototype.protect = function(){ - this._protected = true; - return this; -}; - -Object.reset = function(object, key){ - - if (key == null){ - for (var p in object) Object.reset(object, p); - return object; - } - - delete object[key]; - - switch ($type(object[key])){ - case 'object': - var F = function(){}; - F.prototype = object[key]; - var i = new F; - object[key] = Object.reset(i); - break; - case 'array': object[key] = $unlink(object[key]); break; - } - - return object; - -}; - -new Native({name: 'Class', initialize: Class}).extend({ - - instantiate: function(F){ - F._prototyping = true; - var proto = new F; - delete F._prototyping; - return proto; - }, - - wrap: function(self, key, method){ - if (method._origin) method = method._origin; - - return function(){ - if (method._protected && this._current == null) throw new Error('The method "' + key + '" cannot be called.'); - var caller = this.caller, current = this._current; - this.caller = current; this._current = arguments.callee; - var result = method.apply(this, arguments); - this._current = current; this.caller = caller; - return result; - }.extend({_owner: self, _origin: method, _name: key}); - - } - -}); - -Class.implement({ - - implement: function(key, value){ - - if ($type(key) == 'object'){ - for (var p in key) this.implement(p, key[p]); - return this; - } - - var mutator = Class.Mutators[key]; - - if (mutator){ - value = mutator.call(this, value); - if (value == null) return this; - } - - var proto = this.prototype; - - switch ($type(value)){ - - case 'function': - if (value._hidden) return this; - proto[key] = Class.wrap(this, key, value); - break; - - case 'object': - var previous = proto[key]; - if ($type(previous) == 'object') $mixin(previous, value); - else proto[key] = $unlink(value); - break; - - case 'array': - proto[key] = $unlink(value); - break; - - default: proto[key] = value; - - } - - return this; - - } - -}); - -Class.Mutators = { - - Extends: function(parent){ - - this.parent = parent; - this.prototype = Class.instantiate(parent); - - this.implement('parent', function(){ - var name = this.caller._name, previous = this.caller._owner.parent.prototype[name]; - if (!previous) throw new Error('The method "' + name + '" has no parent.'); - return previous.apply(this, arguments); - }.protect()); - - }, - - Implements: function(items){ - $splat(items).each(function(item){ - if (item instanceof Function) item = Class.instantiate(item); - this.implement(item); - }, this); - - } - -}; - - /* -Script: Class.Extras.js - Contains Utility Classes that can be implemented into your own Classes to ease the execution of many common tasks. +--- -License: - MIT-style license. -*/ +script: MooTools.Lang.js -var Chain = new Class({ +description: Provides methods for localization. - $chain: [], +license: MIT-style license - chain: function(){ - this.$chain.extend(Array.flatten(arguments)); - return this; - }, +authors: +- Aaron Newton - callChain: function(){ - return (this.$chain.length) ? this.$chain.shift().apply(this, arguments) : false; - }, +requires: +- core:1.2.4/Events +- /MooTools.More - clearChain: function(){ - this.$chain.empty(); - return this; - } +provides: [MooTools.Lang] -}); - -var Events = new Class({ - - $events: {}, - - addEvent: function(type, fn, internal){ - type = Events.removeOn(type); - if (fn != $empty){ - this.$events[type] = this.$events[type] || []; - this.$events[type].include(fn); - if (internal) fn.internal = true; - } - return this; - }, - - addEvents: function(events){ - for (var type in events) this.addEvent(type, events[type]); - return this; - }, - - fireEvent: function(type, args, delay){ - type = Events.removeOn(type); - if (!this.$events || !this.$events[type]) return this; - this.$events[type].each(function(fn){ - fn.create({'bind': this, 'delay': delay, 'arguments': args})(); - }, this); - return this; - }, - - removeEvent: function(type, fn){ - type = Events.removeOn(type); - if (!this.$events[type]) return this; - if (!fn.internal) this.$events[type].erase(fn); - return this; - }, - - removeEvents: function(events){ - var type; - if ($type(events) == 'object'){ - for (type in events) this.removeEvent(type, events[type]); - return this; - } - if (events) events = Events.removeOn(events); - for (type in this.$events){ - if (events && events != type) continue; - var fns = this.$events[type]; - for (var i = fns.length; i--; i) this.removeEvent(type, fns[i]); - } - return this; - } - -}); - -Events.removeOn = function(string){ - return string.replace(/^on([A-Z])/, function(full, first) { - return first.toLowerCase(); - }); -}; - -var Options = new Class({ - - setOptions: function(){ - this.options = $merge.run([this.options].extend(arguments)); - if (!this.addEvent) return this; - for (var option in this.options){ - if ($type(this.options[option]) != 'function' || !(/^on[A-Z]/).test(option)) continue; - this.addEvent(option, this.options[option]); - delete this.options[option]; - } - return this; - } - -}); - - -/* -Script: Element.js - One of the most important items in MooTools. Contains the dollar function, the dollars function, and an handful of cross-browser, - time-saver methods to let you easily work with HTML Elements. - -License: - MIT-style license. +... */ -var Element = new Native({ - - name: 'Element', - - legacy: window.Element, - - initialize: function(tag, props){ - var konstructor = Element.Constructors.get(tag); - if (konstructor) return konstructor(props); - if (typeof tag == 'string') return document.newElement(tag, props); - return document.id(tag).set(props); - }, - - afterImplement: function(key, value){ - Element.Prototype[key] = value; - if (Array[key]) return; - Elements.implement(key, function(){ - var items = [], elements = true; - for (var i = 0, j = this.length; i < j; i++){ - var returns = this[i][key].apply(this[i], arguments); - items.push(returns); - if (elements) elements = ($type(returns) == 'element'); - } - return (elements) ? new Elements(items) : items; - }); - } - -}); - -Element.Prototype = {$family: {name: 'element'}}; - -Element.Constructors = new Hash; - -var IFrame = new Native({ - - name: 'IFrame', - - generics: false, - - initialize: function(){ - var params = Array.link(arguments, {properties: Object.type, iframe: $defined}); - var props = params.properties || {}; - var iframe = document.id(params.iframe); - var onload = props.onload || $empty; - delete props.onload; - props.id = props.name = $pick(props.id, props.name, iframe ? (iframe.id || iframe.name) : 'IFrame_' + $time()); - iframe = new Element(iframe || 'iframe', props); - var onFrameLoad = function(){ - var host = $try(function(){ - return iframe.contentWindow.location.host; - }); - if (!host || host == window.location.host){ - var win = new Window(iframe.contentWindow); - new Document(iframe.contentWindow.document); - $extend(win.Element.prototype, Element.Prototype); - } - onload.call(iframe.contentWindow, iframe.contentWindow.document); - }; - var contentWindow = $try(function(){ - return iframe.contentWindow; - }); - ((contentWindow && contentWindow.document.body) || window.frames[props.id]) ? onFrameLoad() : iframe.addListener('load', onFrameLoad); - return iframe; - } - -}); - -var Elements = new Native({ - - initialize: function(elements, options){ - options = $extend({ddup: true, cash: true}, options); - elements = elements || []; - if (options.ddup || options.cash){ - var uniques = {}, returned = []; - for (var i = 0, l = elements.length; i < l; i++){ - var el = document.id(elements[i], !options.cash); - if (options.ddup){ - if (uniques[el.uid]) continue; - uniques[el.uid] = true; - } - returned.push(el); - } - elements = returned; - } - return (options.cash) ? $extend(elements, this) : elements; - } - -}); - -Elements.implement({ - - filter: function(filter, bind){ - if (!filter) return this; - return new Elements(Array.filter(this, (typeof filter == 'string') ? function(item){ - return item.match(filter); - } : filter, bind)); - } - -}); - -Document.implement({ - - newElement: function(tag, props){ - if (Browser.Engine.trident && props){ - ['name', 'type', 'checked'].each(function(attribute){ - if (!props[attribute]) return; - tag += ' ' + attribute + '="' + props[attribute] + '"'; - if (attribute != 'checked') delete props[attribute]; - }); - tag = '<' + tag + '>'; - } - return document.id(this.createElement(tag)).set(props); - }, - - newTextNode: function(text){ - return this.createTextNode(text); - }, - - getDocument: function(){ - return this; - }, - - getWindow: function(){ - return this.window; - }, - - id: (function(){ - - var types = { - - string: function(id, nocash, doc){ - id = doc.getElementById(id); - return (id) ? types.element(id, nocash) : null; - }, - - element: function(el, nocash){ - $uid(el); - if (!nocash && !el.$family && !(/^object|embed$/i).test(el.tagName)){ - var proto = Element.Prototype; - for (var p in proto) el[p] = proto[p]; - }; - return el; - }, - - object: function(obj, nocash, doc){ - if (obj.toElement) return types.element(obj.toElement(doc), nocash); - return null; - } - - }; - - types.textnode = types.whitespace = types.window = types.document = $arguments(0); - - return function(el, nocash, doc){ - if (el && el.$family && el.uid) return el; - var type = $type(el); - return (types[type]) ? types[type](el, nocash, doc || document) : null; - }; - - })() - -}); - -if (window.$ == null) Window.implement({ - $: function(el, nc){ - return document.id(el, nc, this.document); - } -}); - -Window.implement({ - - $$: function(selector){ - if (arguments.length == 1 && typeof selector == 'string') return this.document.getElements(selector); - var elements = []; - var args = Array.flatten(arguments); - for (var i = 0, l = args.length; i < l; i++){ - var item = args[i]; - switch ($type(item)){ - case 'element': elements.push(item); break; - case 'string': elements.extend(this.document.getElements(item, true)); - } - } - return new Elements(elements); - }, - - getDocument: function(){ - return this.document; - }, - - getWindow: function(){ - return this; - } - -}); - -Native.implement([Element, Document], { - - getElement: function(selector, nocash){ - return document.id(this.getElements(selector, true)[0] || null, nocash); - }, - - getElements: function(tags, nocash){ - tags = tags.split(','); - var elements = []; - var ddup = (tags.length > 1); - tags.each(function(tag){ - var partial = this.getElementsByTagName(tag.trim()); - (ddup) ? elements.extend(partial) : elements = partial; - }, this); - return new Elements(elements, {ddup: ddup, cash: !nocash}); - } - -}); - (function(){ -var collected = {}, storage = {}; -var props = {input: 'checked', option: 'selected', textarea: (Browser.Engine.webkit && Browser.Engine.version < 420) ? 'innerHTML' : 'value'}; - -var get = function(uid){ - return (storage[uid] || (storage[uid] = {})); -}; - -var clean = function(item, retain){ - if (!item) return; - var uid = item.uid; - if (Browser.Engine.trident){ - if (item.clearAttributes){ - var clone = retain && item.cloneNode(false); - item.clearAttributes(); - if (clone) item.mergeAttributes(clone); - } else if (item.removeEvents){ - item.removeEvents(); - } - if ((/object/i).test(item.tagName)){ - //for (var p in item){ - // if (typeof item[p] == 'function') item[p] = $empty; - //} - Element.dispose(item); - } - } - if (!uid) return; - collected[uid] = storage[uid] = null; -}; - -var purge = function(){ - Hash.each(collected, clean); - if (Browser.Engine.trident) $A(document.getElementsByTagName('object')).each(clean); - if (window.CollectGarbage) CollectGarbage(); - collected = storage = null; -}; - -var walk = function(element, walk, start, match, all, nocash){ - var el = element[start || walk]; - var elements = []; - while (el){ - if (el.nodeType == 1 && (!match || Element.match(el, match))){ - if (!all) return document.id(el, nocash); - elements.push(el); - } - el = el[walk]; - } - return (all) ? new Elements(elements, {ddup: false, cash: !nocash}) : null; -}; - -var attributes = { - 'html': 'innerHTML', - 'class': 'className', - 'for': 'htmlFor', - 'defaultValue': 'defaultValue', - 'text': (Browser.Engine.trident || (Browser.Engine.webkit && Browser.Engine.version < 420)) ? 'innerText' : 'textContent' -}; -var bools = ['compact', 'nowrap', 'ismap', 'declare', 'noshade', 'checked', 'disabled', 'readonly', 'multiple', 'selected', 'noresize', 'defer']; -var camels = ['value', 'type', 'defaultValue', 'accessKey', 'cellPadding', 'cellSpacing', 'colSpan', 'frameBorder', 'maxLength', 'readOnly', 'rowSpan', 'tabIndex', 'useMap']; - -bools = bools.associate(bools); - -Hash.extend(attributes, bools); -Hash.extend(attributes, camels.associate(camels.map(String.toLowerCase))); - -var inserters = { - - before: function(context, element){ - if (element.parentNode) element.parentNode.insertBefore(context, element); - }, - - after: function(context, element){ - if (!element.parentNode) return; - var next = element.nextSibling; - (next) ? element.parentNode.insertBefore(context, next) : element.parentNode.appendChild(context); - }, - - bottom: function(context, element){ - element.appendChild(context); - }, - - top: function(context, element){ - var first = element.firstChild; - (first) ? element.insertBefore(context, first) : element.appendChild(context); - } - -}; - -inserters.inside = inserters.bottom; - -Hash.each(inserters, function(inserter, where){ - - where = where.capitalize(); - - Element.implement('inject' + where, function(el){ - inserter(this, document.id(el, true)); - return this; - }); - - Element.implement('grab' + where, function(el){ - inserter(document.id(el, true), this); - return this; - }); - -}); - -Element.implement({ - - set: function(prop, value){ - switch ($type(prop)){ - case 'object': - for (var p in prop) this.set(p, prop[p]); - break; - case 'string': - var property = Element.Properties.get(prop); - (property && property.set) ? property.set.apply(this, Array.slice(arguments, 1)) : this.setProperty(prop, value); - } - return this; - }, - - get: function(prop){ - var property = Element.Properties.get(prop); - return (property && property.get) ? property.get.apply(this, Array.slice(arguments, 1)) : this.getProperty(prop); - }, - - erase: function(prop){ - var property = Element.Properties.get(prop); - (property && property.erase) ? property.erase.apply(this) : this.removeProperty(prop); - return this; - }, - - setProperty: function(attribute, value){ - var key = attributes[attribute]; - if (value == undefined) return this.removeProperty(attribute); - if (key && bools[attribute]) value = !!value; - (key) ? this[key] = value : this.setAttribute(attribute, '' + value); - return this; - }, - - setProperties: function(attributes){ - for (var attribute in attributes) this.setProperty(attribute, attributes[attribute]); - return this; - }, - - getProperty: function(attribute){ - var key = attributes[attribute]; - var value = (key) ? this[key] : this.getAttribute(attribute, 2); - return (bools[attribute]) ? !!value : (key) ? value : value || null; - }, - - getProperties: function(){ - var args = $A(arguments); - return args.map(this.getProperty, this).associate(args); - }, - - removeProperty: function(attribute){ - var key = attributes[attribute]; - (key) ? this[key] = (key && bools[attribute]) ? false : '' : this.removeAttribute(attribute); - return this; - }, - - removeProperties: function(){ - Array.each(arguments, this.removeProperty, this); - return this; - }, - - hasClass: function(className){ - return this.className.contains(className, ' '); - }, - - addClass: function(className){ - if (!this.hasClass(className)) this.className = (this.className + ' ' + className).clean(); - return this; - }, - - removeClass: function(className){ - this.className = this.className.replace(new RegExp('(^|\\s)' + className + '(?:\\s|$)'), '$1'); - return this; - }, - - toggleClass: function(className){ - return this.hasClass(className) ? this.removeClass(className) : this.addClass(className); - }, - - adopt: function(){ - Array.flatten(arguments).each(function(element){ - element = document.id(element, true); - if (element) this.appendChild(element); - }, this); - return this; - }, - - appendText: function(text, where){ - return this.grab(this.getDocument().newTextNode(text), where); - }, - - grab: function(el, where){ - inserters[where || 'bottom'](document.id(el, true), this); - return this; - }, - - inject: function(el, where){ - inserters[where || 'bottom'](this, document.id(el, true)); - return this; - }, - - replaces: function(el){ - el = document.id(el, true); - el.parentNode.replaceChild(this, el); - return this; - }, - - wraps: function(el, where){ - el = document.id(el, true); - return this.replaces(el).grab(el, where); - }, - - getPrevious: function(match, nocash){ - return walk(this, 'previousSibling', null, match, false, nocash); - }, - - getAllPrevious: function(match, nocash){ - return walk(this, 'previousSibling', null, match, true, nocash); - }, - - getNext: function(match, nocash){ - return walk(this, 'nextSibling', null, match, false, nocash); - }, - - getAllNext: function(match, nocash){ - return walk(this, 'nextSibling', null, match, true, nocash); - }, - - getFirst: function(match, nocash){ - return walk(this, 'nextSibling', 'firstChild', match, false, nocash); - }, - - getLast: function(match, nocash){ - return walk(this, 'previousSibling', 'lastChild', match, false, nocash); - }, - - getParent: function(match, nocash){ - return walk(this, 'parentNode', null, match, false, nocash); - }, - - getParents: function(match, nocash){ - return walk(this, 'parentNode', null, match, true, nocash); - }, - - getSiblings: function(match, nocash) { - return this.getParent().getChildren(match, nocash).erase(this); - }, - - getChildren: function(match, nocash){ - return walk(this, 'nextSibling', 'firstChild', match, true, nocash); - }, - - getWindow: function(){ - return this.ownerDocument.window; - }, - - getDocument: function(){ - return this.ownerDocument; - }, - - getElementById: function(id, nocash){ - var el = this.ownerDocument.getElementById(id); - if (!el) return null; - for (var parent = el.parentNode; parent != this; parent = parent.parentNode){ - if (!parent) return null; - } - return document.id(el, nocash); - }, - - getSelected: function(){ - return new Elements($A(this.options).filter(function(option){ - return option.selected; - })); - }, - - getComputedStyle: function(property){ - if (this.currentStyle) return this.currentStyle[property.camelCase()]; - var computed = this.getDocument().defaultView.getComputedStyle(this, null); - return (computed) ? computed.getPropertyValue([property.hyphenate()]) : null; - }, - - toQueryString: function(){ - var queryString = []; - this.getElements('input, select, textarea', true).each(function(el){ - if (!el.name || el.disabled || el.type == 'submit' || el.type == 'reset' || el.type == 'file') return; - var value = (el.tagName.toLowerCase() == 'select') ? Element.getSelected(el).map(function(opt){ - return opt.value; - }) : ((el.type == 'radio' || el.type == 'checkbox') && !el.checked) ? null : el.value; - $splat(value).each(function(val){ - if (typeof val != 'undefined') queryString.push(el.name + '=' + encodeURIComponent(val)); - }); - }); - return queryString.join('&'); - }, - - clone: function(contents, keepid){ - contents = contents !== false; - var clone = this.cloneNode(contents); - var clean = function(node, element){ - if (!keepid) node.removeAttribute('id'); - if (Browser.Engine.trident){ - node.clearAttributes(); - node.mergeAttributes(element); - node.removeAttribute('uid'); - if (node.options){ - var no = node.options, eo = element.options; - for (var j = no.length; j--;) no[j].selected = eo[j].selected; - } - } - var prop = props[element.tagName.toLowerCase()]; - if (prop && element[prop]) node[prop] = element[prop]; - }; - - if (contents){ - var ce = clone.getElementsByTagName('*'), te = this.getElementsByTagName('*'); - for (var i = ce.length; i--;) clean(ce[i], te[i]); - } - - clean(clone, this); - return document.id(clone); - }, - - destroy: function(){ - Element.empty(this); - Element.dispose(this); - clean(this, true); - return null; - }, - - empty: function(){ - $A(this.childNodes).each(function(node){ - Element.destroy(node); - }); - return this; - }, - - dispose: function(){ - return (this.parentNode) ? this.parentNode.removeChild(this) : this; - }, - - hasChild: function(el){ - el = document.id(el, true); - if (!el) return false; - if (Browser.Engine.webkit && Browser.Engine.version < 420) return $A(this.getElementsByTagName(el.tagName)).contains(el); - return (this.contains) ? (this != el && this.contains(el)) : !!(this.compareDocumentPosition(el) & 16); - }, - - match: function(tag){ - return (!tag || (tag == this) || (Element.get(this, 'tag') == tag)); - } - -}); - -Native.implement([Element, Window, Document], { - - addListener: function(type, fn){ - if (type == 'unload'){ - var old = fn, self = this; - fn = function(){ - self.removeListener('unload', fn); - old(); - }; - } else { - collected[this.uid] = this; - } - if (this.addEventListener) this.addEventListener(type, fn, false); - else this.attachEvent('on' + type, fn); - return this; - }, - - removeListener: function(type, fn){ - if (this.removeEventListener) this.removeEventListener(type, fn, false); - else this.detachEvent('on' + type, fn); - return this; - }, - - retrieve: function(property, dflt){ - var storage = get(this.uid), prop = storage[property]; - if (dflt != undefined && prop == undefined) prop = storage[property] = dflt; - return $pick(prop); - }, - - store: function(property, value){ - var storage = get(this.uid); - storage[property] = value; - return this; - }, - - eliminate: function(property){ - var storage = get(this.uid); - delete storage[property]; - return this; - } - -}); - -window.addListener('unload', purge); - -})(); - -Element.Properties = new Hash; - -Element.Properties.style = { - - set: function(style){ - this.style.cssText = style; - }, - - get: function(){ - return this.style.cssText; - }, - - erase: function(){ - this.style.cssText = ''; - } - -}; - -Element.Properties.tag = { - - get: function(){ - return this.tagName.toLowerCase(); - } - -}; - -Element.Properties.html = (function(){ - var wrapper = document.createElement('div'); - - var translations = { - table: [1, '<table>', '</table>'], - select: [1, '<select>', '</select>'], - tbody: [2, '<table><tbody>', '</tbody></table>'], - tr: [3, '<table><tbody><tr>', '</tr></tbody></table>'] - }; - translations.thead = translations.tfoot = translations.tbody; - - var html = { - set: function(){ - var html = Array.flatten(arguments).join(''); - var wrap = Browser.Engine.trident && translations[this.get('tag')]; - if (wrap){ - var first = wrapper; - first.innerHTML = wrap[1] + html + wrap[2]; - for (var i = wrap[0]; i--;) first = first.firstChild; - this.empty().adopt(first.childNodes); - } else { - this.innerHTML = html; - } - } - }; - - html.erase = html.set; - - return html; -})(); - -if (Browser.Engine.webkit && Browser.Engine.version < 420) Element.Properties.text = { - get: function(){ - if (this.innerText) return this.innerText; - var temp = this.ownerDocument.newElement('div', {html: this.innerHTML}).inject(this.ownerDocument.body); - var text = temp.innerText; - temp.destroy(); - return text; - } -}; - - -/* -Script: Element.Event.js - Contains Element methods for dealing with events, and custom Events. - -License: - MIT-style license. -*/ - -Element.Properties.events = {set: function(events){ - this.addEvents(events); -}}; - -Native.implement([Element, Window, Document], { - - addEvent: function(type, fn){ - var events = this.retrieve('events', {}); - events[type] = events[type] || {'keys': [], 'values': []}; - if (events[type].keys.contains(fn)) return this; - events[type].keys.push(fn); - var realType = type, custom = Element.Events.get(type), condition = fn, self = this; - if (custom){ - if (custom.onAdd) custom.onAdd.call(this, fn); - if (custom.condition){ - condition = function(event){ - if (custom.condition.call(this, event)) return fn.call(this, event); - return true; - }; - } - realType = custom.base || realType; - } - var defn = function(){ - return fn.call(self); - }; - var nativeEvent = Element.NativeEvents[realType]; - if (nativeEvent){ - if (nativeEvent == 2){ - defn = function(event){ - event = new Event(event, self.getWindow()); - if (condition.call(self, event) === false) event.stop(); - }; - } - this.addListener(realType, defn); - } - events[type].values.push(defn); - return this; - }, - - removeEvent: function(type, fn){ - var events = this.retrieve('events'); - if (!events || !events[type]) return this; - var pos = events[type].keys.indexOf(fn); - if (pos == -1) return this; - events[type].keys.splice(pos, 1); - var value = events[type].values.splice(pos, 1)[0]; - var custom = Element.Events.get(type); - if (custom){ - if (custom.onRemove) custom.onRemove.call(this, fn); - type = custom.base || type; - } - return (Element.NativeEvents[type]) ? this.removeListener(type, value) : this; - }, - - addEvents: function(events){ - for (var event in events) this.addEvent(event, events[event]); - return this; - }, - - removeEvents: function(events){ - var type; - if ($type(events) == 'object'){ - for (type in events) this.removeEvent(type, events[type]); - return this; - } - var attached = this.retrieve('events'); - if (!attached) return this; - if (!events){ - for (type in attached) this.removeEvents(type); - this.eliminate('events'); - } else if (attached[events]){ - while (attached[events].keys[0]) this.removeEvent(events, attached[events].keys[0]); - attached[events] = null; - } - return this; - }, - - fireEvent: function(type, args, delay){ - var events = this.retrieve('events'); - if (!events || !events[type]) return this; - events[type].keys.each(function(fn){ - fn.create({'bind': this, 'delay': delay, 'arguments': args})(); - }, this); - return this; - }, - - cloneEvents: function(from, type){ - from = document.id(from); - var fevents = from.retrieve('events'); - if (!fevents) return this; - if (!type){ - for (var evType in fevents) this.cloneEvents(from, evType); - } else if (fevents[type]){ - fevents[type].keys.each(function(fn){ - this.addEvent(type, fn); - }, this); - } - return this; - } - -}); - -Element.NativeEvents = { - click: 2, dblclick: 2, mouseup: 2, mousedown: 2, contextmenu: 2, //mouse buttons - mousewheel: 2, DOMMouseScroll: 2, //mouse wheel - mouseover: 2, mouseout: 2, mousemove: 2, selectstart: 2, selectend: 2, //mouse movement - keydown: 2, keypress: 2, keyup: 2, //keyboard - focus: 2, blur: 2, change: 2, reset: 2, select: 2, submit: 2, //form elements - load: 1, unload: 1, beforeunload: 2, resize: 1, move: 1, DOMContentLoaded: 1, readystatechange: 1, //window - error: 1, abort: 1, scroll: 1 //misc -}; - -(function(){ - -var $check = function(event){ - var related = event.relatedTarget; - if (related == undefined) return true; - if (related === false) return false; - return ($type(this) != 'document' && related != this && related.prefix != 'xul' && !this.hasChild(related)); -}; - -Element.Events = new Hash({ - - mouseenter: { - base: 'mouseover', - condition: $check - }, - - mouseleave: { - base: 'mouseout', - condition: $check - }, - - mousewheel: { - base: (Browser.Engine.gecko) ? 'DOMMouseScroll' : 'mousewheel' - } - -}); - -})(); - - -/* -Script: Element.Style.js - Contains methods for interacting with the styles of Elements in a fashionable way. - -License: - MIT-style license. -*/ - -Element.Properties.styles = {set: function(styles){ - this.setStyles(styles); -}}; - -Element.Properties.opacity = { - - set: function(opacity, novisibility){ - if (!novisibility){ - if (opacity == 0){ - if (this.style.visibility != 'hidden') this.style.visibility = 'hidden'; - } else { - if (this.style.visibility != 'visible') this.style.visibility = 'visible'; - } - } - if (!this.currentStyle || !this.currentStyle.hasLayout) this.style.zoom = 1; - if (Browser.Engine.trident) this.style.filter = (opacity == 1) ? '' : 'alpha(opacity=' + opacity * 100 + ')'; - this.style.opacity = opacity; - this.store('opacity', opacity); - }, - - get: function(){ - return this.retrieve('opacity', 1); - } - -}; - -Element.implement({ - - setOpacity: function(value){ - return this.set('opacity', value, true); - }, - - getOpacity: function(){ - return this.get('opacity'); - }, - - setStyle: function(property, value){ - switch (property){ - case 'opacity': return this.set('opacity', parseFloat(value)); - case 'float': property = (Browser.Engine.trident) ? 'styleFloat' : 'cssFloat'; - } - property = property.camelCase(); - if ($type(value) != 'string'){ - var map = (Element.Styles.get(property) || '@').split(' '); - value = $splat(value).map(function(val, i){ - if (!map[i]) return ''; - return ($type(val) == 'number') ? map[i].replace('@', Math.round(val)) : val; - }).join(' '); - } else if (value == String(Number(value))){ - value = Math.round(value); - } - this.style[property] = value; - return this; - }, - - getStyle: function(property){ - switch (property){ - case 'opacity': return this.get('opacity'); - case 'float': property = (Browser.Engine.trident) ? 'styleFloat' : 'cssFloat'; - } - property = property.camelCase(); - var result = this.style[property]; - if (!$chk(result)){ - result = []; - for (var style in Element.ShortStyles){ - if (property != style) continue; - for (var s in Element.ShortStyles[style]) result.push(this.getStyle(s)); - return result.join(' '); - } - result = this.getComputedStyle(property); - } - if (result){ - result = String(result); - var color = result.match(/rgba?$[\d\s,]+$/); - if (color) result = result.replace(color[0], color[0].rgbToHex()); - } - if (Browser.Engine.presto || (Browser.Engine.trident && !$chk(parseInt(result, 10)))){ - if (property.test(/^(height|width)$/)){ - var values = (property == 'width') ? ['left', 'right'] : ['top', 'bottom'], size = 0; - values.each(function(value){ - size += this.getStyle('border-' + value + '-width').toInt() + this.getStyle('padding-' + value).toInt(); - }, this); - return this['offset' + property.capitalize()] - size + 'px'; - } - if ((Browser.Engine.presto) && String(result).test('px')) return result; - if (property.test(/(border(.+)Width|margin|padding)/)) return '0px'; - } - return result; - }, - - setStyles: function(styles){ - for (var style in styles) this.setStyle(style, styles[style]); - return this; - }, - - getStyles: function(){ - var result = {}; - Array.flatten(arguments).each(function(key){ - result[key] = this.getStyle(key); - }, this); - return result; - } - -}); - -Element.Styles = new Hash({ - left: '@px', top: '@px', bottom: '@px', right: '@px', - width: '@px', height: '@px', maxWidth: '@px', maxHeight: '@px', minWidth: '@px', minHeight: '@px', - backgroundColor: 'rgb(@, @, @)', backgroundPosition: '@px @px', color: 'rgb(@, @, @)', - fontSize: '@px', letterSpacing: '@px', lineHeight: '@px', clip: 'rect(@px @px @px @px)', - margin: '@px @px @px @px', padding: '@px @px @px @px', border: '@px @ rgb(@, @, @) @px @ rgb(@, @, @) @px @ rgb(@, @, @)', - borderWidth: '@px @px @px @px', borderStyle: '@ @ @ @', borderColor: 'rgb(@, @, @) rgb(@, @, @) rgb(@, @, @) rgb(@, @, @)', - zIndex: '@', 'zoom': '@', fontWeight: '@', textIndent: '@px', opacity: '@' -}); - -Element.ShortStyles = {margin: {}, padding: {}, border: {}, borderWidth: {}, borderStyle: {}, borderColor: {}}; - -['Top', 'Right', 'Bottom', 'Left'].each(function(direction){ - var Short = Element.ShortStyles; - var All = Element.Styles; - ['margin', 'padding'].each(function(style){ - var sd = style + direction; - Short[style][sd] = All[sd] = '@px'; - }); - var bd = 'border' + direction; - Short.border[bd] = All[bd] = '@px @ rgb(@, @, @)'; - var bdw = bd + 'Width', bds = bd + 'Style', bdc = bd + 'Color'; - Short[bd] = {}; - Short.borderWidth[bdw] = Short[bd][bdw] = All[bdw] = '@px'; - Short.borderStyle[bds] = Short[bd][bds] = All[bds] = '@'; - Short.borderColor[bdc] = Short[bd][bdc] = All[bdc] = 'rgb(@, @, @)'; -}); - - -/* -Script: Element.Dimensions.js - Contains methods to work with size, scroll, or positioning of Elements and the window object. - -License: - MIT-style license. - -Credits: - - Element positioning based on the [qooxdoo](http://qooxdoo.org/) code and smart browser fixes, [LGPL License](http://www.gnu.org/licenses/lgpl.html). - - Viewport dimensions based on [YUI](http://developer.yahoo.com/yui/) code, [BSD License](http://developer.yahoo.com/yui/license.html). -*/ - -(function(){ - -Element.implement({ - - scrollTo: function(x, y){ - if (isBody(this)){ - this.getWindow().scrollTo(x, y); - } else { - this.scrollLeft = x; - this.scrollTop = y; - } - return this; - }, - - getSize: function(){ - if (isBody(this)) return this.getWindow().getSize(); - return {x: this.offsetWidth, y: this.offsetHeight}; - }, - - getScrollSize: function(){ - if (isBody(this)) return this.getWindow().getScrollSize(); - return {x: this.scrollWidth, y: this.scrollHeight}; - }, - - getScroll: function(){ - if (isBody(this)) return this.getWindow().getScroll(); - return {x: this.scrollLeft, y: this.scrollTop}; - }, - - getScrolls: function(){ - var element = this, position = {x: 0, y: 0}; - while (element && !isBody(element)){ - position.x += element.scrollLeft; - position.y += element.scrollTop; - element = element.parentNode; - } - return position; - }, - - getOffsetParent: function(){ - var element = this; - if (isBody(element)) return null; - if (!Browser.Engine.trident) return element.offsetParent; - while ((element = element.parentNode) && !isBody(element)){ - if (styleString(element, 'position') != 'static') return element; - } - return null; - }, - - getOffsets: function(){ - if (this.getBoundingClientRect){ - var bound = this.getBoundingClientRect(), - html = document.id(this.getDocument().documentElement), - scroll = html.getScroll(), - isFixed = (styleString(this, 'position') == 'fixed'); - return { - x: parseInt(bound.left, 10) + ((isFixed) ? 0 : scroll.x) - html.clientLeft, - y: parseInt(bound.top, 10) + ((isFixed) ? 0 : scroll.y) - html.clientTop - }; - } - - var element = this, position = {x: 0, y: 0}; - if (isBody(this)) return position; - - while (element && !isBody(element)){ - position.x += element.offsetLeft; - position.y += element.offsetTop; - - if (Browser.Engine.gecko){ - if (!borderBox(element)){ - position.x += leftBorder(element); - position.y += topBorder(element); - } - var parent = element.parentNode; - if (parent && styleString(parent, 'overflow') != 'visible'){ - position.x += leftBorder(parent); - position.y += topBorder(parent); - } - } else if (element != this && Browser.Engine.webkit){ - position.x += leftBorder(element); - position.y += topBorder(element); - } - - element = element.offsetParent; - } - if (Browser.Engine.gecko && !borderBox(this)){ - position.x -= leftBorder(this); - position.y -= topBorder(this); - } - return position; - }, - - getPosition: function(relative){ - if (isBody(this)) return {x: 0, y: 0}; - var offset = this.getOffsets(), scroll = this.getScrolls(); - var position = {x: offset.x - scroll.x, y: offset.y - scroll.y}; - var relativePosition = (relative && (relative = document.id(relative))) ? relative.getPosition() : {x: 0, y: 0}; - return {x: position.x - relativePosition.x, y: position.y - relativePosition.y}; - }, - - getCoordinates: function(element){ - if (isBody(this)) return this.getWindow().getCoordinates(); - var position = this.getPosition(element), size = this.getSize(); - var obj = {left: position.x, top: position.y, width: size.x, height: size.y}; - obj.right = obj.left + obj.width; - obj.bottom = obj.top + obj.height; - return obj; - }, - - computePosition: function(obj){ - return {left: obj.x - styleNumber(this, 'margin-left'), top: obj.y - styleNumber(this, 'margin-top')}; - }, - - setPosition: function(obj){ - return this.setStyles(this.computePosition(obj)); - } - -}); - - -Native.implement([Document, Window], { - - getSize: function(){ - if (Browser.Engine.presto || Browser.Engine.webkit) { - var win = this.getWindow(); - return {x: win.innerWidth, y: win.innerHeight}; - } - var doc = getCompatElement(this); - return {x: doc.clientWidth, y: doc.clientHeight}; - }, - - getScroll: function(){ - var win = this.getWindow(), doc = getCompatElement(this); - return {x: win.pageXOffset || doc.scrollLeft, y: win.pageYOffset || doc.scrollTop}; - }, - - getScrollSize: function(){ - var doc = getCompatElement(this), min = this.getSize(); - return {x: Math.max(doc.scrollWidth, min.x), y: Math.max(doc.scrollHeight, min.y)}; - }, - - getPosition: function(){ - return {x: 0, y: 0}; - }, - - getCoordinates: function(){ - var size = this.getSize(); - return {top: 0, left: 0, bottom: size.y, right: size.x, height: size.y, width: size.x}; - } - -}); - -// private methods - -var styleString = Element.getComputedStyle; - -function styleNumber(element, style){ - return styleString(element, style).toInt() || 0; -}; - -function borderBox(element){ - return styleString(element, '-moz-box-sizing') == 'border-box'; -}; - -function topBorder(element){ - return styleNumber(element, 'border-top-width'); -}; - -function leftBorder(element){ - return styleNumber(element, 'border-left-width'); -}; - -function isBody(element){ - return (/^(?:body|html)$/i).test(element.tagName); -}; - -function getCompatElement(element){ - var doc = element.getDocument(); - return (!doc.compatMode || doc.compatMode == 'CSS1Compat') ? doc.html : doc.body; -}; - -})(); - -//aliases -Element.alias('setPosition', 'position'); //compatability - -Native.implement([Window, Document, Element], { - - getHeight: function(){ - return this.getSize().y; - }, - - getWidth: function(){ - return this.getSize().x; - }, - - getScrollTop: function(){ - return this.getScroll().y; - }, - - getScrollLeft: function(){ - return this.getScroll().x; - }, - - getScrollHeight: function(){ - return this.getScrollSize().y; - }, - - getScrollWidth: function(){ - return this.getScrollSize().x; - }, - - getTop: function(){ - return this.getPosition().y; - }, - - getLeft: function(){ - return this.getPosition().x; - } - -}); - - -/* -Script: Selectors.js - Adds advanced CSS Querying capabilities for targeting elements. Also includes pseudoselectors support. - -License: - MIT-style license. -*/ - -Native.implement([Document, Element], { - - getElements: function(expression, nocash){ - expression = expression.split(','); - var items, local = {}; - for (var i = 0, l = expression.length; i < l; i++){ - var selector = expression[i], elements = Selectors.Utils.search(this, selector, local); - if (i != 0 && elements.item) elements = $A(elements); - items = (i == 0) ? elements : (items.item) ? $A(items).concat(elements) : items.concat(elements); - } - return new Elements(items, {ddup: (expression.length > 1), cash: !nocash}); - } - -}); - -Element.implement({ - - match: function(selector){ - if (!selector || (selector == this)) return true; - var tagid = Selectors.Utils.parseTagAndID(selector); - var tag = tagid[0], id = tagid[1]; - if (!Selectors.Filters.byID(this, id) || !Selectors.Filters.byTag(this, tag)) return false; - var parsed = Selectors.Utils.parseSelector(selector); - return (parsed) ? Selectors.Utils.filter(this, parsed, {}) : true; - } - -}); - -var Selectors = {Cache: {nth: {}, parsed: {}}}; - -Selectors.RegExps = { - id: (/#([\w-]+)/), - tag: (/^(\w+|\*)/), - quick: (/^(\w+|\*)$/), - splitter: (/\s*([+>~\s])\s*([a-zA-Z#.*:\[])/g), - combined: (/\.([\w-]+)|\[(\w+)(?:([!*^$~|]?=)(["']?)([^\4]*?)\4)?\]|:([\w-]+)(?:$["']?(.*?)?["']?$|$)/g) -}; - -Selectors.Utils = { - - chk: function(item, uniques){ - if (!uniques) return true; - var uid = $uid(item); - if (!uniques[uid]) return uniques[uid] = true; - return false; - }, - - parseNthArgument: function(argument){ - if (Selectors.Cache.nth[argument]) return Selectors.Cache.nth[argument]; - var parsed = argument.match(/^([+-]?\d*)?([a-z]+)?([+-]?\d*)?$/); - if (!parsed) return false; - var inta = parseInt(parsed[1], 10); - var a = (inta || inta === 0) ? inta : 1; - var special = parsed[2] || false; - var b = parseInt(parsed[3], 10) || 0; - if (a != 0){ - b--; - while (b < 1) b += a; - while (b >= a) b -= a; - } else { - a = b; - special = 'index'; - } - switch (special){ - case 'n': parsed = {a: a, b: b, special: 'n'}; break; - case 'odd': parsed = {a: 2, b: 0, special: 'n'}; break; - case 'even': parsed = {a: 2, b: 1, special: 'n'}; break; - case 'first': parsed = {a: 0, special: 'index'}; break; - case 'last': parsed = {special: 'last-child'}; break; - case 'only': parsed = {special: 'only-child'}; break; - default: parsed = {a: (a - 1), special: 'index'}; - } - - return Selectors.Cache.nth[argument] = parsed; - }, - - parseSelector: function(selector){ - if (Selectors.Cache.parsed[selector]) return Selectors.Cache.parsed[selector]; - var m, parsed = {classes: [], pseudos: [], attributes: []}; - while ((m = Selectors.RegExps.combined.exec(selector))){ - var cn = m[1], an = m[2], ao = m[3], av = m[5], pn = m[6], pa = m[7]; - if (cn){ - parsed.classes.push(cn); - } else if (pn){ - var parser = Selectors.Pseudo.get(pn); - if (parser) parsed.pseudos.push({parser: parser, argument: pa}); - else parsed.attributes.push({name: pn, operator: '=', value: pa}); - } else if (an){ - parsed.attributes.push({name: an, operator: ao, value: av}); - } - } - if (!parsed.classes.length) delete parsed.classes; - if (!parsed.attributes.length) delete parsed.attributes; - if (!parsed.pseudos.length) delete parsed.pseudos; - if (!parsed.classes && !parsed.attributes && !parsed.pseudos) parsed = null; - return Selectors.Cache.parsed[selector] = parsed; - }, - - parseTagAndID: function(selector){ - var tag = selector.match(Selectors.RegExps.tag); - var id = selector.match(Selectors.RegExps.id); - return [(tag) ? tag[1] : '*', (id) ? id[1] : false]; - }, - - filter: function(item, parsed, local){ - var i; - if (parsed.classes){ - for (i = parsed.classes.length; i--; i){ - var cn = parsed.classes[i]; - if (!Selectors.Filters.byClass(item, cn)) return false; - } - } - if (parsed.attributes){ - for (i = parsed.attributes.length; i--; i){ - var att = parsed.attributes[i]; - if (!Selectors.Filters.byAttribute(item, att.name, att.operator, att.value)) return false; - } - } - if (parsed.pseudos){ - for (i = parsed.pseudos.length; i--; i){ - var psd = parsed.pseudos[i]; - if (!Selectors.Filters.byPseudo(item, psd.parser, psd.argument, local)) return false; - } - } - return true; - }, - - getByTagAndID: function(ctx, tag, id){ - if (id){ - var item = (ctx.getElementById) ? ctx.getElementById(id, true) : Element.getElementById(ctx, id, true); - return (item && Selectors.Filters.byTag(item, tag)) ? [item] : []; - } else { - return ctx.getElementsByTagName(tag); - } - }, - - search: function(self, expression, local){ - var splitters = []; - - var selectors = expression.trim().replace(Selectors.RegExps.splitter, function(m0, m1, m2){ - splitters.push(m1); - return ':)' + m2; - }).split(':)'); - - var items, filtered, item; - - for (var i = 0, l = selectors.length; i < l; i++){ - - var selector = selectors[i]; - - if (i == 0 && Selectors.RegExps.quick.test(selector)){ - items = self.getElementsByTagName(selector); - continue; - } - - var splitter = splitters[i - 1]; - - var tagid = Selectors.Utils.parseTagAndID(selector); - var tag = tagid[0], id = tagid[1]; - - if (i == 0){ - items = Selectors.Utils.getByTagAndID(self, tag, id); - } else { - var uniques = {}, found = []; - for (var j = 0, k = items.length; j < k; j++) found = Selectors.Getters[splitter](found, items[j], tag, id, uniques); - items = found; - } - - var parsed = Selectors.Utils.parseSelector(selector); - - if (parsed){ - filtered = []; - for (var m = 0, n = items.length; m < n; m++){ - item = items[m]; - if (Selectors.Utils.filter(item, parsed, local)) filtered.push(item); - } - items = filtered; - } - - } - - return items; - - } - -}; - -Selectors.Getters = { - - ' ': function(found, self, tag, id, uniques){ - var items = Selectors.Utils.getByTagAndID(self, tag, id); - for (var i = 0, l = items.length; i < l; i++){ - var item = items[i]; - if (Selectors.Utils.chk(item, uniques)) found.push(item); - } - return found; - }, - - '>': function(found, self, tag, id, uniques){ - var children = Selectors.Utils.getByTagAndID(self, tag, id); - for (var i = 0, l = children.length; i < l; i++){ - var child = children[i]; - if (child.parentNode == self && Selectors.Utils.chk(child, uniques)) found.push(child); - } - return found; - }, - - '+': function(found, self, tag, id, uniques){ - while ((self = self.nextSibling)){ - if (self.nodeType == 1){ - if (Selectors.Utils.chk(self, uniques) && Selectors.Filters.byTag(self, tag) && Selectors.Filters.byID(self, id)) found.push(self); - break; - } - } - return found; - }, - - '~': function(found, self, tag, id, uniques){ - while ((self = self.nextSibling)){ - if (self.nodeType == 1){ - if (!Selectors.Utils.chk(self, uniques)) break; - if (Selectors.Filters.byTag(self, tag) && Selectors.Filters.byID(self, id)) found.push(self); - } - } - return found; - } - -}; - -Selectors.Filters = { - - byTag: function(self, tag){ - return (tag == '*' || (self.tagName && self.tagName.toLowerCase() == tag)); - }, - - byID: function(self, id){ - return (!id || (self.id && self.id == id)); - }, - - byClass: function(self, klass){ - return (self.className && self.className.contains(klass, ' ')); - }, - - byPseudo: function(self, parser, argument, local){ - return parser.call(self, argument, local); - }, - - byAttribute: function(self, name, operator, value){ - var result = Element.prototype.getProperty.call(self, name); - if (!result) return (operator == '!='); - if (!operator || value == undefined) return true; - switch (operator){ - case '=': return (result == value); - case '*=': return (result.contains(value)); - case '^=': return (result.substr(0, value.length) == value); - case '$=': return (result.substr(result.length - value.length) == value); - case '!=': return (result != value); - case '~=': return result.contains(value, ' '); - case '|=': return result.contains(value, '-'); - } - return false; - } - -}; - -Selectors.Pseudo = new Hash({ - - // w3c pseudo selectors - - checked: function(){ - return this.checked; - }, - - empty: function(){ - return !(this.innerText || this.textContent || '').length; - }, - - not: function(selector){ - return !Element.match(this, selector); - }, - - contains: function(text){ - return (this.innerText || this.textContent || '').contains(text); - }, - - 'first-child': function(){ - return Selectors.Pseudo.index.call(this, 0); - }, - - 'last-child': function(){ - var element = this; - while ((element = element.nextSibling)){ - if (element.nodeType == 1) return false; - } - return true; - }, - - 'only-child': function(){ - var prev = this; - while ((prev = prev.previousSibling)){ - if (prev.nodeType == 1) return false; - } - var next = this; - while ((next = next.nextSibling)){ - if (next.nodeType == 1) return false; - } - return true; - }, - - 'nth-child': function(argument, local){ - argument = (argument == undefined) ? 'n' : argument; - var parsed = Selectors.Utils.parseNthArgument(argument); - if (parsed.special != 'n') return Selectors.Pseudo[parsed.special].call(this, parsed.a, local); - var count = 0; - local.positions = local.positions || {}; - var uid = $uid(this); - if (!local.positions[uid]){ - var self = this; - while ((self = self.previousSibling)){ - if (self.nodeType != 1) continue; - count ++; - var position = local.positions[$uid(self)]; - if (position != undefined){ - count = position + count; - break; - } - } - local.positions[uid] = count; - } - return (local.positions[uid] % parsed.a == parsed.b); - }, - - // custom pseudo selectors - - index: function(index){ - var element = this, count = 0; - while ((element = element.previousSibling)){ - if (element.nodeType == 1 && ++count > index) return false; - } - return (count == index); - }, - - even: function(argument, local){ - return Selectors.Pseudo['nth-child'].call(this, '2n+1', local); - }, - - odd: function(argument, local){ - return Selectors.Pseudo['nth-child'].call(this, '2n', local); - }, - - selected: function(){ - return this.selected; - }, - - enabled: function(){ - return (this.disabled === false); - } - -}); - - -/* -Script: Domready.js - Contains the domready custom event. - -License: - MIT-style license. -*/ - -Element.Events.domready = { - - onAdd: function(fn){ - if (Browser.loaded) fn.call(this); - } - -}; - -(function(){ - - var domready = function(){ - if (Browser.loaded) return; - Browser.loaded = true; - window.fireEvent('domready'); - document.fireEvent('domready'); - }; - - if (Browser.Engine.trident){ - var temp = document.createElement('div'); - (function(){ - ($try(function(){ - temp.doScroll(); // Technique by Diego Perini - return document.id(temp).inject(document.body).set('html', 'temp').dispose(); - })) ? domready() : arguments.callee.delay(50); - })(); - } else if (Browser.Engine.webkit && Browser.Engine.version < 525){ - (function(){ - (['loaded', 'complete'].contains(document.readyState)) ? domready() : arguments.callee.delay(50); - })(); - } else { - window.addEvent('load', domready); - document.addEvent('DOMContentLoaded', domready); - } - -})(); - - -/* -Script: JSON.js - JSON encoder and decoder. - -License: - MIT-style license. - -See Also: - <http://www.json.org/> -*/ - -var JSON = new Hash({ - - $specialChars: {'\b': '\\b', '\t': '\\t', '\n': '\\n', '\f': '\\f', '\r': '\\r', '"' : '\\"', '\\': '\\\\'}, - - $replaceChars: function(chr){ - return JSON.$specialChars[chr] || '\\u00' + Math.floor(chr.charCodeAt() / 16).toString(16) + (chr.charCodeAt() % 16).toString(16); - }, - - encode: function(obj){ - switch ($type(obj)){ - case 'string': - return '"' + obj.replace(/[\x00-\x1f\\"]/g, JSON.$replaceChars) + '"'; - case 'array': - return '[' + String(obj.map(JSON.encode).clean()) + ']'; - case 'object': case 'hash': - var string = []; - Hash.each(obj, function(value, key){ - var json = JSON.encode(value); - if (json) string.push(JSON.encode(key) + ':' + json); - }); - return '{' + string + '}'; - case 'number': case 'boolean': return String(obj); - case false: return 'null'; - } - return null; - }, - - decode: function(string, secure){ - if ($type(string) != 'string' || !string.length) return null; - if (secure && !(/^[,:{}\[\]0-9.\-+Eaeflnr-u \n\r\t]*$/).test(string.replace(/\\./g, '@').replace(/"[^"\\\n\r]*"/g, ''))) return null; - return eval('(' + string + ')'); - } - -}); - -Native.implement([Hash, Array, String, Number], { - - toJSON: function(){ - return JSON.encode(this); - } - -}); - - -/* -Script: Cookie.js - Class for creating, loading, and saving browser Cookies. - -License: - MIT-style license. - -Credits: - Based on the functions by Peter-Paul Koch (http://quirksmode.org). -*/ - -var Cookie = new Class({ - - Implements: Options, - - options: { - path: false, - domain: false, - duration: false, - secure: false, - document: document - }, - - initialize: function(key, options){ - this.key = key; - this.setOptions(options); - }, - - write: function(value){ - value = encodeURIComponent(value); - if (this.options.domain) value += '; domain=' + this.options.domain; - if (this.options.path) value += '; path=' + this.options.path; - if (this.options.duration){ - var date = new Date(); - date.setTime(date.getTime() + this.options.duration * 24 * 60 * 60 * 1000); - value += '; expires=' + date.toGMTString(); - } - if (this.options.secure) value += '; secure'; - this.options.document.cookie = this.key + '=' + value; - return this; - }, - - read: function(){ - var value = this.options.document.cookie.match('(?:^|;)\\s*' + this.key.escapeRegExp() + '=([^;]*)'); - return (value) ? decodeURIComponent(value[1]) : null; - }, - - dispose: function(){ - new Cookie(this.key, $merge(this.options, {duration: -1})).write(''); - return this; - } - -}); - -Cookie.write = function(key, value, options){ - return new Cookie(key, options).write(value); -}; - -Cookie.read = function(key){ - return new Cookie(key).read(); -}; - -Cookie.dispose = function(key, options){ - return new Cookie(key, options).dispose(); -}; - - -/* -Script: Fx.js - Contains the basic animation logic to be extended by all other Fx Classes. - -License: - MIT-style license. -*/ - -var Fx = new Class({ - - Implements: [Chain, Events, Options], - - options: { - /* - onStart: $empty, - onCancel: $empty, - onComplete: $empty, - */ - fps: 50, - unit: false, - duration: 500, - link: 'ignore' - }, - - initialize: function(options){ - this.subject = this.subject || this; - this.setOptions(options); - this.options.duration = Fx.Durations[this.options.duration] || this.options.duration.toInt(); - var wait = this.options.wait; - if (wait === false) this.options.link = 'cancel'; - }, - - getTransition: function(){ - return function(p){ - return -(Math.cos(Math.PI * p) - 1) / 2; - }; - }, - - step: function(){ - var time = $time(); - if (time < this.time + this.options.duration){ - var delta = this.transition((time - this.time) / this.options.duration); - this.set(this.compute(this.from, this.to, delta)); - } else { - this.set(this.compute(this.from, this.to, 1)); - this.complete(); - } - }, - - set: function(now){ - return now; - }, - - compute: function(from, to, delta){ - return Fx.compute(from, to, delta); - }, - - check: function(){ - if (!this.timer) return true; - switch (this.options.link){ - case 'cancel': this.cancel(); return true; - case 'chain': this.chain(this.caller.bind(this, arguments)); return false; - } - return false; - }, - - start: function(from, to){ - if (!this.check(from, to)) return this; - this.from = from; - this.to = to; - this.time = 0; - this.transition = this.getTransition(); - this.startTimer(); - this.onStart(); - return this; - }, - - complete: function(){ - if (this.stopTimer()) this.onComplete(); - return this; - }, - - cancel: function(){ - if (this.stopTimer()) this.onCancel(); - return this; - }, - - onStart: function(){ - this.fireEvent('start', this.subject); - }, - - onComplete: function(){ - this.fireEvent('complete', this.subject); - if (!this.callChain()) this.fireEvent('chainComplete', this.subject); - }, - - onCancel: function(){ - this.fireEvent('cancel', this.subject).clearChain(); - }, - - pause: function(){ - this.stopTimer(); - return this; - }, - - resume: function(){ - this.startTimer(); - return this; - }, - - stopTimer: function(){ - if (!this.timer) return false; - this.time = $time() - this.time; - this.timer = $clear(this.timer); - return true; - }, - - startTimer: function(){ - if (this.timer) return false; - this.time = $time() - this.time; - this.timer = this.step.periodical(Math.round(1000 / this.options.fps), this); - return true; - } - -}); - -Fx.compute = function(from, to, delta){ - return (to - from) * delta + from; -}; - -Fx.Durations = {'short': 250, 'normal': 500, 'long': 1000}; - - -/* -Script: Fx.CSS.js - Contains the CSS animation logic. Used by Fx.Tween, Fx.Morph, Fx.Elements. - -License: - MIT-style license. -*/ - -Fx.CSS = new Class({ - - Extends: Fx, - - //prepares the base from/to object - - prepare: function(element, property, values){ - values = $splat(values); - var values1 = values[1]; - if (!$chk(values1)){ - values[1] = values[0]; - values[0] = element.getStyle(property); - } - var parsed = values.map(this.parse); - return {from: parsed[0], to: parsed[1]}; - }, - - //parses a value into an array - - parse: function(value){ - value = $lambda(value)(); - value = (typeof value == 'string') ? value.split(' ') : $splat(value); - return value.map(function(val){ - val = String(val); - var found = false; - Fx.CSS.Parsers.each(function(parser, key){ - if (found) return; - var parsed = parser.parse(val); - if ($chk(parsed)) found = {value: parsed, parser: parser}; - }); - found = found || {value: val, parser: Fx.CSS.Parsers.String}; - return found; - }); - }, - - //computes by a from and to prepared objects, using their parsers. - - compute: function(from, to, delta){ - var computed = []; - (Math.min(from.length, to.length)).times(function(i){ - computed.push({value: from[i].parser.compute(from[i].value, to[i].value, delta), parser: from[i].parser}); - }); - computed.$family = {name: 'fx:css:value'}; - return computed; - }, - - //serves the value as settable - - serve: function(value, unit){ - if ($type(value) != 'fx:css:value') value = this.parse(value); - var returned = []; - value.each(function(bit){ - returned = returned.concat(bit.parser.serve(bit.value, unit)); - }); - return returned; - }, - - //renders the change to an element - - render: function(element, property, value, unit){ - element.setStyle(property, this.serve(value, unit)); - }, - - //searches inside the page css to find the values for a selector - - search: function(selector){ - if (Fx.CSS.Cache[selector]) return Fx.CSS.Cache[selector]; - var to = {}; - Array.each(document.styleSheets, function(sheet, j){ - var href = sheet.href; - if (href && href.contains('://') && !href.contains(document.domain)) return; - var rules = sheet.rules || sheet.cssRules; - Array.each(rules, function(rule, i){ - if (!rule.style) return; - var selectorText = (rule.selectorText) ? rule.selectorText.replace(/^\w+/, function(m){ - return m.toLowerCase(); - }) : null; - if (!selectorText || !selectorText.test('^' + selector + '$')) return; - Element.Styles.each(function(value, style){ - if (!rule.style[style] || Element.ShortStyles[style]) return; - value = String(rule.style[style]); - to[style] = (value.test(/^rgb/)) ? value.rgbToHex() : value; - }); - }); - }); - return Fx.CSS.Cache[selector] = to; - } - -}); - -Fx.CSS.Cache = {}; - -Fx.CSS.Parsers = new Hash({ - - Color: { - parse: function(value){ - if (value.match(/^#[0-9a-f]{3,6}$/i)) return value.hexToRgb(true); - return ((value = value.match(/(\d+),\s*(\d+),\s*(\d+)/))) ? [value[1], value[2], value[3]] : false; - }, - compute: function(from, to, delta){ - return from.map(function(value, i){ - return Math.round(Fx.compute(from[i], to[i], delta)); - }); - }, - serve: function(value){ - return value.map(Number); - } - }, - - Number: { - parse: parseFloat, - compute: Fx.compute, - serve: function(value, unit){ - return (unit) ? value + unit : value; - } - }, - - String: { - parse: $lambda(false), - compute: $arguments(1), - serve: $arguments(0) - } - -}); - - -/* -Script: Fx.Tween.js - Formerly Fx.Style, effect to transition any CSS property for an element. - -License: - MIT-style license. -*/ - -Fx.Tween = new Class({ - - Extends: Fx.CSS, - - initialize: function(element, options){ - this.element = this.subject = document.id(element); - this.parent(options); - }, - - set: function(property, now){ - if (arguments.length == 1){ - now = property; - property = this.property || this.options.property; - } - this.render(this.element, property, now, this.options.unit); - return this; - }, - - start: function(property, from, to){ - if (!this.check(property, from, to)) return this; - var args = Array.flatten(arguments); - this.property = this.options.property || args.shift(); - var parsed = this.prepare(this.element, this.property, args); - return this.parent(parsed.from, parsed.to); - } - -}); - -Element.Properties.tween = { - - set: function(options){ - var tween = this.retrieve('tween'); - if (tween) tween.cancel(); - return this.eliminate('tween').store('tween:options', $extend({link: 'cancel'}, options)); - }, - - get: function(options){ - if (options || !this.retrieve('tween')){ - if (options || !this.retrieve('tween:options')) this.set('tween', options); - this.store('tween', new Fx.Tween(this, this.retrieve('tween:options'))); - } - return this.retrieve('tween'); - } - -}; - -Element.implement({ - - tween: function(property, from, to){ - this.get('tween').start(arguments); - return this; - }, - - fade: function(how){ - var fade = this.get('tween'), o = 'opacity', toggle; - how = $pick(how, 'toggle'); - switch (how){ - case 'in': fade.start(o, 1); break; - case 'out': fade.start(o, 0); break; - case 'show': fade.set(o, 1); break; - case 'hide': fade.set(o, 0); break; - case 'toggle': - var flag = this.retrieve('fade:flag', this.get('opacity') == 1); - fade.start(o, (flag) ? 0 : 1); - this.store('fade:flag', !flag); - toggle = true; - break; - default: fade.start(o, arguments); - } - if (!toggle) this.eliminate('fade:flag'); - return this; - }, - - highlight: function(start, end){ - if (!end){ - end = this.retrieve('highlight:original', this.getStyle('background-color')); - end = (end == 'transparent') ? '#fff' : end; - } - var tween = this.get('tween'); - tween.start('background-color', start || '#ffff88', end).chain(function(){ - this.setStyle('background-color', this.retrieve('highlight:original')); - tween.callChain(); - }.bind(this)); - return this; - } - -}); - - -/* -Script: Fx.Morph.js - Formerly Fx.Styles, effect to transition any number of CSS properties for an element using an object of rules, or CSS based selector rules. - -License: - MIT-style license. -*/ - -Fx.Morph = new Class({ - - Extends: Fx.CSS, - - initialize: function(element, options){ - this.element = this.subject = document.id(element); - this.parent(options); - }, - - set: function(now){ - if (typeof now == 'string') now = this.search(now); - for (var p in now) this.render(this.element, p, now[p], this.options.unit); - return this; - }, - - compute: function(from, to, delta){ - var now = {}; - for (var p in from) now[p] = this.parent(from[p], to[p], delta); - return now; - }, - - start: function(properties){ - if (!this.check(properties)) return this; - if (typeof properties == 'string') properties = this.search(properties); - var from = {}, to = {}; - for (var p in properties){ - var parsed = this.prepare(this.element, p, properties[p]); - from[p] = parsed.from; - to[p] = parsed.to; - } - return this.parent(from, to); - } - -}); - -Element.Properties.morph = { - - set: function(options){ - var morph = this.retrieve('morph'); - if (morph) morph.cancel(); - return this.eliminate('morph').store('morph:options', $extend({link: 'cancel'}, options)); - }, - - get: function(options){ - if (options || !this.retrieve('morph')){ - if (options || !this.retrieve('morph:options')) this.set('morph', options); - this.store('morph', new Fx.Morph(this, this.retrieve('morph:options'))); - } - return this.retrieve('morph'); - } - -}; - -Element.implement({ - - morph: function(props){ - this.get('morph').start(props); - return this; - } - -}); - - -/* -Script: Fx.Transitions.js - Contains a set of advanced transitions to be used with any of the Fx Classes. - -License: - MIT-style license. - -Credits: - Easing Equations by Robert Penner, <http://www.robertpenner.com/easing/>, modified and optimized to be used with MooTools. -*/ - -Fx.implement({ - - getTransition: function(){ - var trans = this.options.transition || Fx.Transitions.Sine.easeInOut; - if (typeof trans == 'string'){ - var data = trans.split(':'); - trans = Fx.Transitions; - trans = trans[data[0]] || trans[data[0].capitalize()]; - if (data[1]) trans = trans['ease' + data[1].capitalize() + (data[2] ? data[2].capitalize() : '')]; - } - return trans; - } - -}); - -Fx.Transition = function(transition, params){ - params = $splat(params); - return $extend(transition, { - easeIn: function(pos){ - return transition(pos, params); - }, - easeOut: function(pos){ - return 1 - transition(1 - pos, params); - }, - easeInOut: function(pos){ - return (pos <= 0.5) ? transition(2 * pos, params) / 2 : (2 - transition(2 * (1 - pos), params)) / 2; - } - }); -}; - -Fx.Transitions = new Hash({ - - linear: $arguments(0) - -}); - -Fx.Transitions.extend = function(transitions){ - for (var transition in transitions) Fx.Transitions[transition] = new Fx.Transition(transitions[transition]); -}; - -Fx.Transitions.extend({ - - Pow: function(p, x){ - return Math.pow(p, x[0] || 6); - }, - - Expo: function(p){ - return Math.pow(2, 8 * (p - 1)); - }, - - Circ: function(p){ - return 1 - Math.sin(Math.acos(p)); - }, - - Sine: function(p){ - return 1 - Math.sin((1 - p) * Math.PI / 2); - }, - - Back: function(p, x){ - x = x[0] || 1.618; - return Math.pow(p, 2) * ((x + 1) * p - x); - }, - - Bounce: function(p){ - var value; - for (var a = 0, b = 1; 1; a += b, b /= 2){ - if (p >= (7 - 4 * a) / 11){ - value = b * b - Math.pow((11 - 6 * a - 11 * p) / 4, 2); - break; - } - } - return value; - }, - - Elastic: function(p, x){ - return Math.pow(2, 10 * --p) * Math.cos(20 * p * Math.PI * (x[0] || 1) / 3); - } - -}); - -['Quad', 'Cubic', 'Quart', 'Quint'].each(function(transition, i){ - Fx.Transitions[transition] = new Fx.Transition(function(p){ - return Math.pow(p, [i + 2]); - }); -}); - - -/* -Script: Request.js - Powerful all purpose Request Class. Uses XMLHTTPRequest. - -License: - MIT-style license. -*/ - -var Request = new Class({ - - Implements: [Chain, Events, Options], - - options: {/* - onRequest: $empty, - onComplete: $empty, - onCancel: $empty, - onSuccess: $empty, - onFailure: $empty, - onException: $empty,*/ - url: '', - data: '', - headers: { - 'X-Requested-With': 'XMLHttpRequest', - 'Accept': 'text/javascript, text/html, application/xml, text/xml, */*' - }, - async: true, - format: false, - method: 'post', - link: 'ignore', - isSuccess: null, - emulation: true, - urlEncoded: true, - encoding: 'utf-8', - evalScripts: false, - evalResponse: false, - noCache: false - }, - - initialize: function(options){ - this.xhr = new Browser.Request(); - this.setOptions(options); - this.options.isSuccess = this.options.isSuccess || this.isSuccess; - this.headers = new Hash(this.options.headers); - }, - - onStateChange: function(){ - if (this.xhr.readyState != 4 || !this.running) return; - this.running = false; - this.status = 0; - $try(function(){ - this.status = this.xhr.status; - }.bind(this)); - this.xhr.onreadystatechange = $empty; - if (this.options.isSuccess.call(this, this.status)){ - this.response = {text: this.xhr.responseText, xml: this.xhr.responseXML}; - this.success(this.response.text, this.response.xml); - } else { - this.response = {text: null, xml: null}; - this.failure(); - } - }, - - isSuccess: function(){ - return ((this.status >= 200) && (this.status < 300)); - }, - - processScripts: function(text){ - if (this.options.evalResponse || (/(ecma|java)script/).test(this.getHeader('Content-type'))) return $exec(text); - return text.stripScripts(this.options.evalScripts); - }, - - success: function(text, xml){ - this.onSuccess(this.processScripts(text), xml); - }, - - onSuccess: function(){ - this.fireEvent('complete', arguments).fireEvent('success', arguments).callChain(); - }, - - failure: function(){ - this.onFailure(); - }, - - onFailure: function(){ - this.fireEvent('complete').fireEvent('failure', this.xhr); - }, - - setHeader: function(name, value){ - this.headers.set(name, value); - return this; - }, - - getHeader: function(name){ - return $try(function(){ - return this.xhr.getResponseHeader(name); - }.bind(this)); - }, - - check: function(){ - if (!this.running) return true; - switch (this.options.link){ - case 'cancel': this.cancel(); return true; - case 'chain': this.chain(this.caller.bind(this, arguments)); return false; - } - return false; - }, - - send: function(options){ - if (!this.check(options)) return this; - this.running = true; - - var type = $type(options); - if (type == 'string' || type == 'element') options = {data: options}; - - var old = this.options; - options = $extend({data: old.data, url: old.url, method: old.method}, options); - var data = options.data, url = options.url, method = options.method.toLowerCase(); - - switch ($type(data)){ - case 'element': data = document.id(data).toQueryString(); break; - case 'object': case 'hash': data = Hash.toQueryString(data); - } - - if (this.options.format){ - var format = 'format=' + this.options.format; - data = (data) ? format + '&' + data : format; - } - - if (this.options.emulation && !['get', 'post'].contains(method)){ - var _method = '_method=' + method; - data = (data) ? _method + '&' + data : _method; - method = 'post'; - } - - if (this.options.urlEncoded && method == 'post'){ - var encoding = (this.options.encoding) ? '; charset=' + this.options.encoding : ''; - this.headers.set('Content-type', 'application/x-www-form-urlencoded' + encoding); - } - - if (this.options.noCache){ - var noCache = 'noCache=' + new Date().getTime(); - data = (data) ? noCache + '&' + data : noCache; - } - - var trimPosition = url.lastIndexOf('/'); - if (trimPosition > -1 && (trimPosition = url.indexOf('#')) > -1) url = url.substr(0, trimPosition); - - if (data && method == 'get'){ - url = url + (url.contains('?') ? '&' : '?') + data; - data = null; - } - - this.xhr.open(method.toUpperCase(), url, this.options.async); - - this.xhr.onreadystatechange = this.onStateChange.bind(this); - - this.headers.each(function(value, key){ - try { - this.xhr.setRequestHeader(key, value); - } catch (e){ - this.fireEvent('exception', [key, value]); - } - }, this); - - this.fireEvent('request'); - this.xhr.send(data); - if (!this.options.async) this.onStateChange(); - return this; - }, - - cancel: function(){ - if (!this.running) return this; - this.running = false; - this.xhr.abort(); - this.xhr.onreadystatechange = $empty; - this.xhr = new Browser.Request(); - this.fireEvent('cancel'); - return this; - } - -}); - -(function(){ - -var methods = {}; -['get', 'post', 'put', 'delete', 'GET', 'POST', 'PUT', 'DELETE'].each(function(method){ - methods[method] = function(){ - var params = Array.link(arguments, {url: String.type, data: $defined}); - return this.send($extend(params, {method: method})); - }; -}); - -Request.implement(methods); - -})(); - -Element.Properties.send = { - - set: function(options){ - var send = this.retrieve('send'); - if (send) send.cancel(); - return this.eliminate('send').store('send:options', $extend({ - data: this, link: 'cancel', method: this.get('method') || 'post', url: this.get('action') - }, options)); - }, - - get: function(options){ - if (options || !this.retrieve('send')){ - if (options || !this.retrieve('send:options')) this.set('send', options); - this.store('send', new Request(this.retrieve('send:options'))); - } - return this.retrieve('send'); - } - -}; - -Element.implement({ - - send: function(url){ - var sender = this.get('send'); - sender.send({data: this, url: url || sender.options.url}); - return this; - } - -}); - - -/* -Script: Request.HTML.js - Extends the basic Request Class with additional methods for interacting with HTML responses. - -License: - MIT-style license. -*/ - -Request.HTML = new Class({ - - Extends: Request, - - options: { - update: false, - append: false, - evalScripts: true, - filter: false - }, - - processHTML: function(text){ - var match = text.match(/<body[^>]*>([\s\S]*?)<\/body>/i); - text = (match) ? match[1] : text; - - var container = new Element('div'); - - return $try(function(){ - var root = '<root>' + text + '</root>', doc; - if (Browser.Engine.trident){ - doc = new ActiveXObject('Microsoft.XMLDOM'); - doc.async = false; - doc.loadXML(root); - } else { - doc = new DOMParser().parseFromString(root, 'text/xml'); - } - root = doc.getElementsByTagName('root')[0]; - if (!root) return null; - for (var i = 0, k = root.childNodes.length; i < k; i++){ - var child = Element.clone(root.childNodes[i], true, true); - if (child) container.grab(child); - } - return container; - }) || container.set('html', text); - }, - - success: function(text){ - var options = this.options, response = this.response; - - response.html = text.stripScripts(function(script){ - response.javascript = script; - }); - - var temp = this.processHTML(response.html); - - response.tree = temp.childNodes; - response.elements = temp.getElements('*'); - - if (options.filter) response.tree = response.elements.filter(options.filter); - if (options.update) document.id(options.update).empty().set('html', response.html); - else if (options.append) document.id(options.append).adopt(temp.getChildren()); - if (options.evalScripts) $exec(response.javascript); - - this.onSuccess(response.tree, response.elements, response.html, response.javascript); - } - -}); - -Element.Properties.load = { - - set: function(options){ - var load = this.retrieve('load'); - if (load) load.cancel(); - return this.eliminate('load').store('load:options', $extend({data: this, link: 'cancel', update: this, method: 'get'}, options)); - }, - - get: function(options){ - if (options || ! this.retrieve('load')){ - if (options || !this.retrieve('load:options')) this.set('load', options); - this.store('load', new Request.HTML(this.retrieve('load:options'))); - } - return this.retrieve('load'); - } - -}; - -Element.implement({ - - load: function(){ - this.get('load').send(Array.link(arguments, {data: Object.type, url: String.type})); - return this; - } - -}); - -//MooTools More, <http://mootools.net/more>. Copyright (c) 2006-2009 Aaron Newton <http://clientcide.com/>, Valerio Proietti <http://mad4milk.net> & the MooTools team <http://mootools.net/developers>, MIT Style License. - -MooTools.More = { - 'version': '1.2.3.1' -}; - -/* -Script: MooTools.Lang.js - Provides methods for localization. - - License: - MIT-style license. - - Authors: - Aaron Newton -*/ - -(function(){ - var data = { language: 'en-US', languages: { @@ -4004,40 +481,104 @@ })(); /* -Script: Log.js - Provides basic logging functionality for plugins to implement. +--- - License: - MIT-style license. +script: Log.js - Authors: - Guillermo Rauch +description: Provides basic logging functionality for plugins to implement. + +license: MIT-style license + +authors: +- Guillermo Rauch +- Thomas Aylott +- Scott Kyle + +requires: +- core:1.2.4/Class +- /MooTools.More + +provides: [Log] + +... */ -var Log = new Class({ +(function(){ + +var global = this; + +var log = function(){ + if (global.console && console.log){ + try { + console.log.apply(console, arguments); + } catch(e) { + console.log(Array.slice(arguments)); + } + } else { + Log.logged.push(arguments); + } + return this; +}; + +var disabled = function(){ + this.logged.push(arguments); + return this; +}; + +this.Log = new Class({ - log: function(){ - Log.logger.call(this, arguments); + logged: [], + + log: disabled, + + resetLog: function(){ + this.logged.empty(); + return this; + }, + + enableLog: function(){ + this.log = log; + this.logged.each(function(args){ + this.log.apply(this, args); + }, this); + return this.resetLog(); + }, + + disableLog: function(){ + this.log = disabled; + return this; } }); -Log.logged = []; +Log.extend(new Log).enableLog(); +// legacy Log.logger = function(){ - if(window.console && console.log) console.log.apply(console, arguments); - else Log.logged.push(arguments); + return this.log.apply(this, arguments); }; +})(); + /* -Script: Class.Binds.js - Automagically binds specified methods in a class to the instance of the class. +--- - License: - MIT-style license. +script: Class.Binds.js - Authors: - Aaron Newton +description: Automagically binds specified methods in a class to the instance of the class. + +license: MIT-style license + +authors: +- Aaron Newton + +requires: +- core:1.2.4/Class +- /MooTools.More + +provides: [Class.Binds] + +... */ Class.Mutators.Binds = function(binds){ @@ -4054,15 +595,27 @@ }; }; + /* -Script: Class.Occlude.js - Prevents a class from being applied to a DOM element twice. +--- - License: - MIT-style license. +script: Class.Occlude.js - Authors: - Aaron Newton +description: Prevents a class from being applied to a DOM element twice. + +license: MIT-style license. + +authors: +- Aaron Newton + +requires: +- core/1.2.4/Class +- core:1.2.4/Element +- /MooTools.More + +provides: [Class.Occlude] + +... */ Class.Occlude = new Class({ @@ -4070,57 +623,67 @@ occlude: function(property, element){ element = document.id(element || this.element); var instance = element.retrieve(property || this.property); - if (instance && !$defined(this.occluded)){ - this.occluded = instance; - } else { - this.occluded = false; - element.store(property || this.property, this); - } + if (instance && !$defined(this.occluded)) + return this.occluded = instance; + + this.occluded = false; + element.store(property || this.property, this); return this.occluded; } }); /* -Script: Date.js - Extends the Date native object to include methods useful in managing dates. +--- - License: - MIT-style license. +script: Date.js - Authors: - Aaron Newton - Nicholas Barthelemy - https://svn.nbarthelemy.com/date-js/ - Harald Kirshner - mail [at] digitarald.de; http://digitarald.de - Scott Kyle - scott [at] appden.com; http://appden.com +description: Extends the Date native object to include methods useful in managing dates. +license: MIT-style license + +authors: +- Aaron Newton +- Nicholas Barthelemy - https://svn.nbarthelemy.com/date-js/ +- Harald Kirshner - mail [at] digitarald.de; http://digitarald.de +- Scott Kyle - scott [at] appden.com; http://appden.com + +requires: +- core:1.2.4/Array +- core:1.2.4/String +- core:1.2.4/Number +- core:1.2.4/Lang +- core:1.2.4/Date.English.US +- /MooTools.More + +provides: [Date] + +... */ (function(){ +var Date = this.Date; + if (!Date.now) Date.now = $time; -Date.Methods = {}; - -['Date', 'Day', 'FullYear', 'Hours', 'Milliseconds', 'Minutes', 'Month', 'Seconds', 'Time', 'TimezoneOffset', - 'Week', 'Timezone', 'GMTOffset', 'DayOfYear', 'LastMonth', 'LastDayOfMonth', 'UTCDate', 'UTCDay', 'UTCFullYear', - 'AMPM', 'Ordinal', 'UTCHours', 'UTCMilliseconds', 'UTCMinutes', 'UTCMonth', 'UTCSeconds'].each(function(method){ - Date.Methods[method.toLowerCase()] = method; -}); - -$each({ +Date.Methods = { ms: 'Milliseconds', year: 'FullYear', min: 'Minutes', mo: 'Month', sec: 'Seconds', hr: 'Hours' -}, function(value, key){ - Date.Methods[key] = value; +}; + +['Date', 'Day', 'FullYear', 'Hours', 'Milliseconds', 'Minutes', 'Month', 'Seconds', 'Time', 'TimezoneOffset', + 'Week', 'Timezone', 'GMTOffset', 'DayOfYear', 'LastMonth', 'LastDayOfMonth', 'UTCDate', 'UTCDay', 'UTCFullYear', + 'AMPM', 'Ordinal', 'UTCHours', 'UTCMilliseconds', 'UTCMinutes', 'UTCMonth', 'UTCSeconds'].each(function(method){ + Date.Methods[method.toLowerCase()] = method; }); -var zeroize = function(what, length){ - return new Array(length - what.toString().length + 1).join('0') + what; +var pad = function(what, length){ + return new Array(length - String(what).length + 1).join('0') + what; }; Date.implement({ @@ -4183,23 +746,10 @@ return this.set({hr: 0, min: 0, sec: 0, ms: 0}); }, - diff: function(d, resolution){ - resolution = resolution || 'day'; - if ($type(d) == 'string') d = Date.parse(d); - - switch (resolution){ - case 'year': - return d.get('year') - this.get('year'); - case 'month': - var months = (d.get('year') - this.get('year')) * 12; - return months + d.get('mo') - this.get('mo'); - default: - var diff = d.get('time') - this.get('time'); - if (Date.units[resolution]() > diff.abs()) return 0; - return ((d.get('time') - this.get('time')) / Date.units[resolution]()).round(); - } - - return null; + diff: function(date, resolution){ + if ($type(date) == 'string') date = Date.parse(date); + + return ((date - this) / Date.units[resolution || 'day'](3, 3)).toInt(); // non-leap year, 30-day month }, getLastDayOfMonth: function(){ @@ -4227,7 +777,7 @@ getGMTOffset: function(){ var off = this.get('timezoneOffset'); - return ((off > 0) ? '-' : '+') + zeroize((off.abs() / 60).floor(), 2) + zeroize(off % 60, 2); + return ((off > 0) ? '-' : '+') + pad((off.abs() / 60).floor(), 2) + pad(off % 60, 2); }, setAMPM: function(ampm){ @@ -4257,23 +807,23 @@ f = formats[f.toLowerCase()] || f; // replace short-hand with actual format var d = this; return f.replace(/%([a-z%])/gi, - function($1, $2){ - switch ($2){ + function($0, $1){ + switch ($1){ case 'a': return Date.getMsg('days')[d.get('day')].substr(0, 3); case 'A': return Date.getMsg('days')[d.get('day')]; case 'b': return Date.getMsg('months')[d.get('month')].substr(0, 3); case 'B': return Date.getMsg('months')[d.get('month')]; case 'c': return d.toString(); - case 'd': return zeroize(d.get('date'), 2); - case 'H': return zeroize(d.get('hr'), 2); + case 'd': return pad(d.get('date'), 2); + case 'H': return pad(d.get('hr'), 2); case 'I': return ((d.get('hr') % 12) || 12); - case 'j': return zeroize(d.get('dayofyear'), 3); - case 'm': return zeroize((d.get('mo') + 1), 2); - case 'M': return zeroize(d.get('min'), 2); + case 'j': return pad(d.get('dayofyear'), 3); + case 'm': return pad((d.get('mo') + 1), 2); + case 'M': return pad(d.get('min'), 2); case 'o': return d.get('ordinal'); case 'p': return Date.getMsg(d.get('ampm')); - case 'S': return zeroize(d.get('seconds'), 2); - case 'U': return zeroize(d.get('week'), 2); + case 'S': return pad(d.get('seconds'), 2); + case 'U': return pad(d.get('week'), 2); case 'w': return d.get('day'); case 'x': return d.format(Date.getMsg('shortDate')); case 'X': return d.format(Date.getMsg('shortTime')); @@ -4282,7 +832,7 @@ case 'T': return d.get('GMTOffset'); case 'Z': return d.get('Timezone'); } - return $2; + return $1; } ); }, @@ -4293,6 +843,7 @@ }); +Date.alias('toISOString', 'toJSON'); Date.alias('diff', 'compare'); Date.alias('format', 'strftime'); @@ -4305,6 +856,7 @@ 'long': '%B %d, %Y %H:%M' }; +var parsePatterns = []; var nativeParse = Date.parse; var parseWord = function(type, word, num){ @@ -4331,7 +883,6 @@ return (num) ? translated.indexOf(ret) : ret; }; - Date.extend({ getMsg: function(key, args) { @@ -4360,7 +911,7 @@ }, isLeapYear: function(year){ - return new Date(year, 1, 29).get('date') == 29; + return ((year % 4 === 0) && (year % 100 !== 0)) || (year % 400 === 0); }, parse: function(from){ @@ -4371,9 +922,9 @@ if (!from.length) return null; var parsed; - Date.parsePatterns.some(function(pattern){ - var r = pattern.re.exec(from); - return (r) ? (parsed = pattern.handler(r)) : false; + parsePatterns.some(function(pattern){ + var bits = pattern.re.exec(from); + return (bits) ? (parsed = pattern.handler(bits)) : false; }); return parsed || new Date(nativeParse(from)); @@ -4389,12 +940,14 @@ parseUTC: function(value){ var localDate = new Date(value); - var utcSeconds = Date.UTC(localDate.get('year'), - localDate.get('mo'), - localDate.get('date'), - localDate.get('hr'), - localDate.get('min'), - localDate.get('sec')); + var utcSeconds = Date.UTC( + localDate.get('year'), + localDate.get('mo'), + localDate.get('date'), + localDate.get('hr'), + localDate.get('min'), + localDate.get('sec') + ); return new Date(utcSeconds); }, @@ -4407,13 +960,13 @@ }, defineFormats: function(formats){ - for (var name in formats) Date.defineFormat(name, formats[f]); + for (var name in formats) Date.defineFormat(name, formats[name]); }, - parsePatterns: [], + parsePatterns: parsePatterns, // this is deprecated defineParser: function(pattern){ - Date.parsePatterns.push( pattern.re && pattern.handler ? pattern : build(pattern) ); + parsePatterns.push((pattern.re && pattern.handler) ? pattern : build(pattern)); }, defineParsers: function(){ @@ -4421,84 +974,96 @@ }, define2DigitYearStart: function(year){ - yr_start = year % 100; - yr_base = year - yr_start; + startYear = year % 100; + startCentury = year - startYear; } }); -var yr_base = 1900; -var yr_start = 70; +var startCentury = 1900; +var startYear = 70; +var regexOf = function(type){ + return new RegExp('(?:' + Date.getMsg(type).map(function(name){ + return name.substr(0, 3); + }).join('|') + ')[a-z]*'); +}; + var replacers = function(key){ switch(key){ case 'x': // iso8601 covers yyyy-mm-dd, so just check if month is first - return (Date.orderIndex('month') == 1) ? '%m[.-/]%d([.-/]%y)?' : '%d[.-/]%m([.-/]%y)?'; + return ((Date.orderIndex('month') == 1) ? '%m[.-/]%d' : '%d[.-/]%m') + '([.-/]%y)?'; case 'X': - return '%H([.:]%M)?([.:]%S([.:]%s)?)?\\s?%p?\\s?%T?'; - case 'o': - return '[^\\d\\s]*'; + return '%H([.:]%M)?([.:]%S([.:]%s)?)? ?%p? ?%T?'; } return null; }; var keys = { - a: /[a-z]{3,}/, d: /[0-2]?[0-9]|3[01]/, H: /[01]?[0-9]|2[0-3]/, I: /0?[1-9]|1[0-2]/, M: /[0-5]?\d/, s: /\d+/, + o: /[a-z]*/, p: /[ap]\.?m\.?/, y: /\d{2}|\d{4}/, Y: /\d{4}/, T: /Z|[+-]\d{2}(?::?\d{2})?/ }; -keys.B = keys.b = keys.A = keys.a; keys.m = keys.I; keys.S = keys.M; -var lang; +var currentLanguage; -var build = function(format){ - if (!lang) return {format: format}; // wait until language is set +var recompile = function(language){ + currentLanguage = language; - var parsed = [null]; + keys.a = keys.A = regexOf('days'); + keys.b = keys.B = regexOf('months'); + + parsePatterns.each(function(pattern, i){ + if (pattern.format) parsePatterns[i] = build(pattern.format); + }); +}; +var build = function(format){ + if (!currentLanguage) return {format: format}; + + var parsed = []; var re = (format.source || format) // allow format to be regex .replace(/%([a-z])/gi, - function($1, $2){ - return replacers($2) || $1; + function($0, $1){ + return replacers($1) || $0; } ).replace(/\((?!\?)/g, '(?:') // make all groups non-capturing .replace(/ (?!\?|\*)/g, ',? ') // be forgiving with spaces and commas .replace(/%([a-z%])/gi, - function($1, $2){ - var p = keys[$2]; - if (!p) return $2; - parsed.push($2); + function($0, $1){ + var p = keys[$1]; + if (!p) return $1; + parsed.push($1); return '(' + p.source + ')'; } - ); + ).replace(/\[a-z\]/gi, '[a-z\\u00c0-\\uffff]'); // handle unicode words return { format: format, re: new RegExp('^' + re + '$', 'i'), handler: function(bits){ + bits = bits.slice(1).associate(parsed); var date = new Date().clearTime(); - for (var i = 1; i < parsed.length; i++) - date = handle.call(date, parsed[i], bits[i]); + if ('d' in bits) handle.call(date, 'd', 1); + if ('m' in bits || 'b' in bits || 'B' in bits) handle.call(date, 'm', 1); + for (var key in bits) handle.call(date, key, bits[key]); return date; } }; }; var handle = function(key, value){ - if (!value){ - if (key == 'm' || key == 'd') value = 1; - else return this; - } + if (!value) return this; switch(key){ case 'a': case 'A': return this.set('day', Date.parseDay(value, true)); @@ -4514,13 +1079,13 @@ case 'Y': return this.set('year', value); case 'y': value = +value; - if (value < 100) value += yr_base + (value < yr_start ? 100 : 0); + if (value < 100) value += startCentury + (value < startYear ? 100 : 0); return this.set('year', value); case 'T': if (value == 'Z') value = '+00'; var offset = value.match(/([+-])(\d{2}):?(\d{2})?/); offset = (offset[1] + '1') * (offset[2] * 60 + (+offset[3] || 0)) + this.getTimezoneOffset(); - return this.set('time', (this * 1) - offset * 60000); + return this.set('time', this - offset * 60000); } return this; @@ -4531,32 +1096,36 @@ '%Y%m%d(T%H(%M%S?)?)?', // "19991231", "19991231T1159", compact '%x( %X)?', // "12/31", "12.31.99", "12-31-1999", "12/31/2008 11:59 PM" '%d%o( %b( %Y)?)?( %X)?', // "31st", "31st December", "31 Dec 1999", "31 Dec 1999 11:59pm" - '%b %d%o?( %Y)?( %X)?', // Same as above with month and day switched - '%b %Y' // "December 1999" + '%b( %d%o)?( %Y)?( %X)?', // Same as above with month and day switched + '%Y %b( %d%o( %X)?)?', // Same as above with year coming first + '%o %b %d %X %T %Y' // "Thu Oct 22 08:11:23 +0000 2009" ); MooTools.lang.addEvent('langChange', function(language){ - if (!MooTools.lang.get('Date')) return; - - lang = language; - Date.parsePatterns.each(function(pattern, i){ - if (pattern.format) Date.parsePatterns[i] = build(pattern.format); - }); - + if (MooTools.lang.get('Date')) recompile(language); }).fireEvent('langChange', MooTools.lang.getCurrentLanguage()); })(); /* -Script: Element.Forms.js - Extends the Element native object to include methods useful in managing inputs. +--- - License: - MIT-style license. +script: Element.Forms.js - Authors: - Aaron Newton +description: Extends the Element native object to include methods useful in managing inputs. +license: MIT-style license + +authors: +- Aaron Newton + +requires: +- core:1.2.4/Element +- /MooTools.More + +provides: [Element.Forms] + +... */ Element.implement({ @@ -4585,9 +1154,10 @@ pos.end = pos.start + range.text.length; } else { var value = this.get('value'); - var offset = value.length - value.match(/[\n\r]*$/)[0].length; + var offset = value.length; dup.moveToElementText(this); dup.setEndPoint('StartToEnd', range); + if(dup.text.length) offset -= value.match(/[\n\r]*$/)[0].length; pos.end = offset - dup.text.length; dup.setEndPoint('StartToStart', range); pos.start = offset - dup.text.length; @@ -4664,19 +1234,27 @@ }); /* -Script: Element.Measure.js - Extends the Element native object to include methods useful in measuring dimensions. +--- - Element.measure / .expose methods by Daniel Steigerwald - License: MIT-style license. - Copyright: Copyright (c) 2008 Daniel Steigerwald, daniel.steigerwald.cz +script: Element.Measure.js - License: - MIT-style license. +description: Extends the Element native object to include methods useful in measuring dimensions. - Authors: - Aaron Newton +credits: "Element.measure / .expose methods by Daniel Steigerwald License: MIT-style license. Copyright: Copyright (c) 2008 Daniel Steigerwald, daniel.steigerwald.cz" +license: MIT-style license + +authors: +- Aaron Newton + +requires: +- core:1.2.4/Element.Style +- core:1.2.4/Element.Dimensions +- /MooTools.More + +provides: [Element.Measure] + +... */ Element.implement({ @@ -4687,8 +1265,8 @@ }; if (vis(this)) return fn.apply(this); var parent = this.getParent(), - toMeasure = [], - restorers = []; + restorers = [], + toMeasure = []; while (!vis(parent) && parent != document.body) { toMeasure.push(parent.expose()); parent = parent.getParent(); @@ -4721,14 +1299,17 @@ var getSize = function(el, options){ return (options.computeSize)?el.getComputedSize(options):el.getSize(); }; - if (this.getStyle('display') == 'none'){ + var parent = this.getParent('body'); + if (parent && this.getStyle('display') == 'none'){ dim = this.measure(function(){ return getSize(this, options); }); - } else { + } else if (parent){ try { //safari sometimes crashes here, so catch it dim = getSize(this, options); }catch(e){} + } else { + dim = {x: 0, y: 0}; } return $chk(dim.x) ? $extend(dim, {width: dim.x, height: dim.y}) : $extend(dim, {x: dim.width, y: dim.height}); }, @@ -4767,8 +1348,7 @@ var subtracted = []; $each(options.plains, function(plain, key){ //keys: width, height, plains: ['left', 'right'], ['top','bottom'] var capitalized = key.capitalize(); - size['total' + capitalized] = 0; - size['computed' + capitalized] = 0; + size['total' + capitalized] = size['computed' + capitalized] = 0; plain.each(function(edge){ //top, left, right, bottom size['computed' + edge.capitalize()] = 0; getStyles.each(function(style, i){ //padding, border, etc. @@ -4803,14 +1383,26 @@ }); /* -Script: Element.Pin.js - Extends the Element native object to include the pin method useful for fixed positioning for elements. +--- - License: - MIT-style license. +script: Element.Pin.js - Authors: - Aaron Newton +description: Extends the Element native object to include the pin method useful for fixed positioning for elements. + +license: MIT-style license + +authors: +- Aaron Newton + +requires: +- core:1.2.4/Element.Event +- core:1.2.4/Element.Dimensions +- core:1.2.4/Element.Style +- /MooTools.More + +provides: [Element.Pin] + +... */ (function(){ @@ -4830,13 +1422,14 @@ pin: function(enable){ if (this.getStyle('display') == 'none') return null; - var p; + var p, + scroll = window.getScroll(); if (enable !== false){ p = this.getPosition(); if (!this.retrieve('pinned')){ var pos = { - top: p.y - window.getScroll().y, - left: p.x - window.getScroll().x + top: p.y - scroll.y, + left: p.x - scroll.x }; if (supportsPositionFixed){ this.setStyle('position', 'fixed').setStyles(pos); @@ -4846,12 +1439,13 @@ position: 'absolute', top: p.y, left: p.x - }); + }).addClass('isPinned'); this.store('scrollFixer', (function(){ if (this.retrieve('pinned')) + var scroll = window.getScroll(); this.setStyles({ - top: pos.top.toInt() + window.getScroll().y, - left: pos.left.toInt() + window.getScroll().x + top: pos.top.toInt() + scroll.y, + left: pos.left.toInt() + scroll.x }); }).bind(this)); window.addEvent('scroll', this.retrieve('scrollFixer')); @@ -4861,16 +1455,16 @@ } else { var op; if (!Browser.Engine.trident){ - if (this.getParent().getComputedStyle('position') != 'static') op = this.getParent(); - else op = this.getParent().getOffsetParent(); + var parent = this.getParent(); + op = (parent.getComputedStyle('position') != 'static' ? parent : parent.getOffsetParent()); } p = this.getPosition(op); this.store('pinned', false); var reposition; if (supportsPositionFixed && !this.retrieve('pinnedByJS')){ reposition = { - top: p.y + window.getScroll().y, - left: p.x + window.getScroll().x + top: p.y + scroll.y, + left: p.x + scroll.x }; } else { this.store('pinnedByJS', false); @@ -4880,13 +1474,13 @@ left: p.x }; } - this.setStyles($merge(reposition, {position: 'absolute'})); + this.setStyles($merge(reposition, {position: 'absolute'})).removeClass('isPinned'); } - return this.addClass('isPinned'); + return this; }, unpin: function(){ - return this.pin(false).removeClass('isPinned'); + return this.pin(false); }, togglepin: function(){ @@ -4898,14 +1492,24 @@ })(); /* -Script: Element.Position.js - Extends the Element native object to include methods useful positioning elements relative to others. +--- - License: - MIT-style license. +script: Element.Position.js - Authors: - Aaron Newton +description: Extends the Element native object to include methods useful positioning elements relative to others. + +license: MIT-style license + +authors: +- Aaron Newton + +requires: +- core:1.2.4/Element.Dimensions +- /Element.Measure + +provides: [Elements.Position] + +... */ (function(){ @@ -4919,6 +1523,8 @@ if (options && ($defined(options.x) || $defined(options.y))) return original ? original.apply(this, arguments) : this; $each(options||{}, function(v, k){ if (!$defined(v)) delete options[k]; }); options = $merge({ + // minimum: { x: 0, y: 0 }, + // maximum: { x: 0, y: 0}, relativeTo: document.body, position: { x: 'center', //left, center, right @@ -4929,11 +1535,12 @@ returnPos: false, relFixedPosition: false, ignoreMargins: false, + ignoreScroll: false, allowNegative: false }, options); //compute the offset of the parent positioned element if this element is in one - var parentOffset = {x: 0, y: 0}; - var parentPositioned = false; + var parentOffset = {x: 0, y: 0}, + parentPositioned = false; /* dollar around getOffsetParent should not be necessary, but as it does not return * a mootools extended element in IE, an error occurs on the call to expose. See: * http://mootools.lighthouseapp.com/projects/2706/tickets/333-element-getof... */ @@ -4944,7 +1551,7 @@ parentOffset = offsetParent.measure(function(){ return this.getPosition(); }); - parentPositioned = true; + parentPositioned = offsetParent != document.id(options.relativeTo); options.offset.x = options.offset.x - parentOffset.x; options.offset.y = options.offset.y - parentOffset.y; } @@ -4970,26 +1577,15 @@ } this.setStyle('position', 'absolute'); - var rel = document.id(options.relativeTo) || document.body; - var calc = rel == document.body ? window.getScroll() : rel.getPosition(); - var top = calc.y; - var left = calc.x; + var rel = document.id(options.relativeTo) || document.body, + calc = rel == document.body ? window.getScroll() : rel.getPosition(), + top = calc.y, left = calc.x; - if (Browser.Engine.trident){ - var scrolls = rel.getScrolls(); - top += scrolls.y; - left += scrolls.x; - } - var dim = this.getDimensions({computeSize: true, styles:['padding', 'border','margin']}); - if (options.ignoreMargins){ - options.offset.x = options.offset.x - dim['margin-left']; - options.offset.y = options.offset.y - dim['margin-top']; - } - var pos = {}; - var prefY = options.offset.y; - var prefX = options.offset.x; - var winSize = window.getSize(); + var pos = {}, + prefY = options.offset.y, + prefX = options.offset.x, + winSize = window.getSize(); switch(options.position.x){ case 'left': pos.x = left + prefX; @@ -5012,7 +1608,6 @@ pos.y = top + ((rel == document.body ? winSize.y : rel.offsetHeight)/2) + prefY; break; } - if (options.edge){ var edgeOffset = {}; @@ -5024,7 +1619,7 @@ edgeOffset.x = -dim.x-dim.computedRight-dim.computedLeft; break; default: //center - edgeOffset.x = -(dim.x/2); + edgeOffset.x = -(dim.totalWidth/2); break; } switch(options.edge.y){ @@ -5035,22 +1630,47 @@ edgeOffset.y = -dim.y-dim.computedTop-dim.computedBottom; break; default: //center - edgeOffset.y = -(dim.y/2); + edgeOffset.y = -(dim.totalHeight/2); break; } - pos.x = pos.x + edgeOffset.x; - pos.y = pos.y + edgeOffset.y; + pos.x += edgeOffset.x; + pos.y += edgeOffset.y; } pos = { left: ((pos.x >= 0 || parentPositioned || options.allowNegative) ? pos.x : 0).toInt(), top: ((pos.y >= 0 || parentPositioned || options.allowNegative) ? pos.y : 0).toInt() }; + var xy = {left: 'x', top: 'y'}; + ['minimum', 'maximum'].each(function(minmax) { + ['left', 'top'].each(function(lr) { + var val = options[minmax] ? options[minmax][xy[lr]] : null; + if (val != null && pos[lr] < val) pos[lr] = val; + }); + }); if (rel.getStyle('position') == 'fixed' || options.relFixedPosition){ var winScroll = window.getScroll(); - pos.top = pos.top.toInt() + winScroll.y; - pos.left = pos.left.toInt() + winScroll.x; + pos.top+= winScroll.y; + pos.left+= winScroll.x; } - + if (options.ignoreScroll) { + var relScroll = rel.getScroll(); + pos.top-= relScroll.y; + pos.left-= relScroll.x; + } + if (options.ignoreMargins) { + pos.left += ( + options.edge.x == 'right' ? dim['margin-right'] : + options.edge.x == 'center' ? -dim['margin-left'] + ((dim['margin-right'] + dim['margin-left'])/2) : + - dim['margin-left'] + ); + pos.top += ( + options.edge.y == 'bottom' ? dim['margin-bottom'] : + options.edge.y == 'center' ? -dim['margin-top'] + ((dim['margin-bottom'] + dim['margin-top'])/2) : + - dim['margin-top'] + ); + } + pos.left = Math.ceil(pos.left); + pos.top = Math.ceil(pos.top); if (options.returnPos) return pos; else this.setStyles(pos); return this; @@ -5061,15 +1681,24 @@ })(); /* -Script: Element.Shortcuts.js - Extends the Element native object to include some shortcut methods. +--- - License: - MIT-style license. +script: Element.Shortcuts.js - Authors: - Aaron Newton +description: Extends the Element native object to include some shortcut methods. +license: MIT-style license + +authors: +- Aaron Newton + +requires: +- core:1.2.4/Element.Style +- /MooTools.More + +provides: [Element.Shortcuts] + +... */ Element.implement({ @@ -5078,6 +1707,12 @@ return this.getStyle('display') != 'none'; }, + isVisible: function(){ + var w = this.offsetWidth, + h = this.offsetHeight; + return (w == 0 && h == 0) ? false : (w > 0 && h > 0) ? true : this.isDisplayed(); + }, + toggle: function(){ return this[this.isDisplayed() ? 'hide' : 'show'](); }, @@ -5086,14 +1721,14 @@ var d; try { //IE fails here if the element is not in the dom - if ('none' != this.getStyle('display')) d = this.getStyle('display'); + d = this.getStyle('display'); } catch(e){} - - return this.store('originalDisplay', d || 'block').setStyle('display', 'none'); + return this.store('originalDisplay', d || '').setStyle('display', 'none'); }, show: function(display){ - return this.setStyle('display', display || this.retrieve('originalDisplay') || 'block'); + display = display || this.retrieve('originalDisplay') || 'block'; + return this.setStyle('display', (display == 'none') ? 'block' : display); }, swapClass: function(remove, add){ @@ -5104,493 +1739,24 @@ /* -Script: FormValidator.js - A css-class based form validation system. +--- - License: - MIT-style license. +script: Fx.Elements.js - Authors: - Aaron Newton -*/ -var InputValidator = new Class({ +description: Effect to change any number of CSS properties of any number of Elements. - Implements: [Options], +license: MIT-style license - options: { - errorMsg: 'Validation failed.', - test: function(field){return true;} - }, +authors: +- Valerio Proietti - initialize: function(className, options){ - this.setOptions(options); - this.className = className; - }, +requires: +- core:1.2.4/Fx.CSS +- /MooTools.More - test: function(field, props){ - if (document.id(field)) return this.options.test(document.id(field), props||this.getProps(field)); - else return false; - }, +provides: [Fx.Elements] - getError: function(field, props){ - var err = this.options.errorMsg; - if ($type(err) == 'function') err = err(document.id(field), props||this.getProps(field)); - return err; - }, - - getProps: function(field){ - if (!document.id(field)) return {}; - return field.get('validatorProps'); - } - -}); - -Element.Properties.validatorProps = { - - set: function(props){ - return this.eliminate('validatorProps').store('validatorProps', props); - }, - - get: function(props){ - if (props) this.set(props); - if (this.retrieve('validatorProps')) return this.retrieve('validatorProps'); - if (this.getProperty('validatorProps')){ - try { - this.store('validatorProps', JSON.decode(this.getProperty('validatorProps'))); - }catch(e){ - return {}; - } - } else { - var vals = this.get('class').split(' ').filter(function(cls){ - return cls.test(':'); - }); - if (!vals.length){ - this.store('validatorProps', {}); - } else { - props = {}; - vals.each(function(cls){ - var split = cls.split(':'); - if (split[1]) { - try { - props[split[0]] = JSON.decode(split[1]); - } catch(e) {} - } - }); - this.store('validatorProps', props); - } - } - return this.retrieve('validatorProps'); - } - -}; - -var FormValidator = new Class({ - - Implements:[Options, Events], - - Binds: ['onSubmit'], - - options: {/* - onFormValidate: $empty(isValid, form, event), - onElementValidate: $empty(isValid, field, className, warn), - onElementPass: $empty(field), - onElementFail: $empty(field, validatorsFailed) */ - fieldSelectors: 'input, select, textarea', - ignoreHidden: true, - useTitles: false, - evaluateOnSubmit: true, - evaluateFieldsOnBlur: true, - evaluateFieldsOnChange: true, - serial: true, - stopOnFailure: true, - warningPrefix: function(){ - return FormValidator.getMsg('warningPrefix') || 'Warning: '; - }, - errorPrefix: function(){ - return FormValidator.getMsg('errorPrefix') || 'Error: '; - } - }, - - initialize: function(form, options){ - this.setOptions(options); - this.element = document.id(form); - this.element.store('validator', this); - this.warningPrefix = $lambda(this.options.warningPrefix)(); - this.errorPrefix = $lambda(this.options.errorPrefix)(); - if (this.options.evaluateOnSubmit) this.element.addEvent('submit', this.onSubmit); - if (this.options.evaluateFieldsOnBlur || this.options.evaluateFieldsOnChange) this.watchFields(this.getFields()); - }, - - toElement: function(){ - return this.element; - }, - - getFields: function(){ - return (this.fields = this.element.getElements(this.options.fieldSelectors)); - }, - - watchFields: function(fields){ - fields.each(function(el){ - if (this.options.evaluateFieldsOnBlur) - el.addEvent('blur', this.validationMonitor.pass([el, false], this)); - if (this.options.evaluateFieldsOnChange) - el.addEvent('change', this.validationMonitor.pass([el, true], this)); - }, this); - }, - - validationMonitor: function(){ - $clear(this.timer); - this.timer = this.validateField.delay(50, this, arguments); - }, - - onSubmit: function(event){ - if (!this.validate(event) && event) event.preventDefault(); - else this.reset(); - }, - - reset: function(){ - this.getFields().each(this.resetField, this); - return this; - }, - - validate: function(event){ - var result = this.getFields().map(function(field){ - return this.validateField(field, true); - }, this).every(function(v){ return v;}); - this.fireEvent('formValidate', [result, this.element, event]); - if (this.options.stopOnFailure && !result && event) event.preventDefault(); - return result; - }, - - validateField: function(field, force){ - if (this.paused) return true; - field = document.id(field); - var passed = !field.hasClass('validation-failed'); - var failed, warned; - if (this.options.serial && !force){ - failed = this.element.getElement('.validation-failed'); - warned = this.element.getElement('.warning'); - } - if (field && (!failed || force || field.hasClass('validation-failed') || (failed && !this.options.serial))){ - var validators = field.className.split(' ').some(function(cn){ - return this.getValidator(cn); - }, this); - var validatorsFailed = []; - field.className.split(' ').each(function(className){ - if (className && !this.test(className, field)) validatorsFailed.include(className); - }, this); - passed = validatorsFailed.length === 0; - if (validators && !field.hasClass('warnOnly')){ - if (passed){ - field.addClass('validation-passed').removeClass('validation-failed'); - this.fireEvent('elementPass', field); - } else { - field.addClass('validation-failed').removeClass('validation-passed'); - this.fireEvent('elementFail', [field, validatorsFailed]); - } - } - if (!warned){ - var warnings = field.className.split(' ').some(function(cn){ - if (cn.test('^warn-') || field.hasClass('warnOnly')) - return this.getValidator(cn.replace(/^warn-/,'')); - else return null; - }, this); - field.removeClass('warning'); - var warnResult = field.className.split(' ').map(function(cn){ - if (cn.test('^warn-') || field.hasClass('warnOnly')) - return this.test(cn.replace(/^warn-/,''), field, true); - else return null; - }, this); - } - } - return passed; - }, - - test: function(className, field, warn){ - var validator = this.getValidator(className); - field = document.id(field); - if (field.hasClass('ignoreValidation')) return true; - warn = $pick(warn, false); - if (field.hasClass('warnOnly')) warn = true; - var isValid = validator ? validator.test(field) : true; - if (validator && this.isVisible(field)) this.fireEvent('elementValidate', [isValid, field, className, warn]); - if (warn) return true; - return isValid; - }, - - isVisible : function(field){ - if (!this.options.ignoreHidden) return true; - while(field != document.body){ - if (document.id(field).getStyle('display') == 'none') return false; - field = field.getParent(); - } - return true; - }, - - resetField: function(field){ - field = document.id(field); - if (field){ - field.className.split(' ').each(function(className){ - if (className.test('^warn-')) className = className.replace(/^warn-/, ''); - field.removeClass('validation-failed'); - field.removeClass('warning'); - field.removeClass('validation-passed'); - }, this); - } - return this; - }, - - stop: function(){ - this.paused = true; - return this; - }, - - start: function(){ - this.paused = false; - return this; - }, - - ignoreField: function(field, warn){ - field = document.id(field); - if (field){ - this.enforceField(field); - if (warn) field.addClass('warnOnly'); - else field.addClass('ignoreValidation'); - } - return this; - }, - - enforceField: function(field){ - field = document.id(field); - if (field) field.removeClass('warnOnly').removeClass('ignoreValidation'); - return this; - } - -}); - -FormValidator.getMsg = function(key){ - return MooTools.lang.get('FormValidator', key); -}; - -FormValidator.adders = { - - validators:{}, - - add : function(className, options){ - this.validators[className] = new InputValidator(className, options); - //if this is a class (this method is used by instances of FormValidator and the FormValidator namespace) - //extend these validators into it - //this allows validators to be global and/or per instance - if (!this.initialize){ - this.implement({ - validators: this.validators - }); - } - }, - - addAllThese : function(validators){ - $A(validators).each(function(validator){ - this.add(validator[0], validator[1]); - }, this); - }, - - getValidator: function(className){ - return this.validators[className.split(':')[0]]; - } - -}; - -$extend(FormValidator, FormValidator.adders); - -FormValidator.implement(FormValidator.adders); - -FormValidator.add('IsEmpty', { - - errorMsg: false, - test: function(element){ - if (element.type == 'select-one' || element.type == 'select') - return !(element.selectedIndex >= 0 && element.options[element.selectedIndex].value != ''); - else - return ((element.get('value') == null) || (element.get('value').length == 0)); - } - -}); - -FormValidator.addAllThese([ - - ['required', { - errorMsg: function(){ - return FormValidator.getMsg('required'); - }, - test: function(element){ - return !FormValidator.getValidator('IsEmpty').test(element); - } - }], - - ['minLength', { - errorMsg: function(element, props){ - if ($type(props.minLength)) - return FormValidator.getMsg('minLength').substitute({minLength:props.minLength,length:element.get('value').length }); - else return ''; - }, - test: function(element, props){ - if ($type(props.minLength)) return (element.get('value').length >= $pick(props.minLength, 0)); - else return true; - } - }], - - ['maxLength', { - errorMsg: function(element, props){ - //props is {maxLength:10} - if ($type(props.maxLength)) - return FormValidator.getMsg('maxLength').substitute({maxLength:props.maxLength,length:element.get('value').length }); - else return ''; - }, - test: function(element, props){ - //if the value is <= than the maxLength value, element passes test - return (element.get('value').length <= $pick(props.maxLength, 10000)); - } - }], - - ['validate-integer', { - errorMsg: FormValidator.getMsg.pass('integer'), - test: function(element){ - return FormValidator.getValidator('IsEmpty').test(element) || (/^(-?[1-9]\d*|0)$/).test(element.get('value')); - } - }], - - ['validate-numeric', { - errorMsg: FormValidator.getMsg.pass('numeric'), - test: function(element){ - return FormValidator.getValidator('IsEmpty').test(element) || - (/^-?(?:0$0(?=\d*\.)|[1-9]|0)\d*(\.\d+)?$/).test(element.get('value')); - } - }], - - ['validate-digits', { - errorMsg: FormValidator.getMsg.pass('digits'), - test: function(element){ - return FormValidator.getValidator('IsEmpty').test(element) || (/^[\d() .:\-\+#]+$/.test(element.get('value'))); - } - }], - - ['validate-alpha', { - errorMsg: FormValidator.getMsg.pass('alpha'), - test: function(element){ - return FormValidator.getValidator('IsEmpty').test(element) || (/^[a-zA-Z]+$/).test(element.get('value')); - } - }], - - ['validate-alphanum', { - errorMsg: FormValidator.getMsg.pass('alphanum'), - test: function(element){ - return FormValidator.getValidator('IsEmpty').test(element) || !(/\W/).test(element.get('value')); - } - }], - - ['validate-date', { - errorMsg: function(element, props){ - if (Date.parse){ - var format = props.dateFormat || '%x'; - return FormValidator.getMsg('dateSuchAs').substitute({date: new Date().format(format)}); - } else { - return FormValidator.getMsg('dateInFormatMDY'); - } - }, - test: function(element, props){ - if (FormValidator.getValidator('IsEmpty').test(element)) return true; - var d; - if (Date.parse){ - var format = props.dateFormat || '%x'; - d = Date.parse(element.get('value')); - var formatted = d.format(format); - if (formatted != 'invalid date') element.set('value', formatted); - return !isNaN(d); - } else { - var regex = /^(\d{2})\/(\d{2})\/(\d{4})$/; - if (!regex.test(element.get('value'))) return false; - d = new Date(element.get('value').replace(regex, '$1/$2/$3')); - return (parseInt(RegExp.$1, 10) == (1 + d.getMonth())) && - (parseInt(RegExp.$2, 10) == d.getDate()) && - (parseInt(RegExp.$3, 10) == d.getFullYear()); - } - } - }], - - ['validate-email', { - errorMsg: FormValidator.getMsg.pass('email'), - test: function(element){ - return FormValidator.getValidator('IsEmpty').test(element) || (/^[A-Z0-9._%+-]+(a)[A-Z0-9.-]+\.[A-Z]{2,4}$/i).test(element.get('value')); - } - }], - - ['validate-url', { - errorMsg: FormValidator.getMsg.pass('url'), - test: function(element){ - return FormValidator.getValidator('IsEmpty').test(element) || (/^(https?|ftp|rmtp|mms):\/\/(([A-Z0-9][A-Z0-9_-]*)(\.[A-Z0-9][A-Z0-9_-]*)+)(:(\d+))?\/?/i).test(element.get('value')); - } - }], - - ['validate-currency-dollar', { - errorMsg: FormValidator.getMsg.pass('currencyDollar'), - test: function(element){ - // [$]1[##][,###]+[.##] - // [$]1###+[.##] - // [$]0.## - // [$].## - return FormValidator.getValidator('IsEmpty').test(element) || (/^\$?\-?([1-9]{1}[0-9]{0,2}(\,[0-9]{3})*(\.[0-9]{0,2})?|[1-9]{1}\d*(\.[0-9]{0,2})?|0(\.[0-9]{0,2})?|(\.[0-9]{1,2})?)$/).test(element.get('value')); - } - }], - - ['validate-one-required', { - errorMsg: FormValidator.getMsg.pass('oneRequired'), - test: function(element, props){ - var p = document.id(props['validate-one-required']) || element.parentNode; - return p.getElements('input').some(function(el){ - if (['checkbox', 'radio'].contains(el.get('type'))) return el.get('checked'); - return el.get('value'); - }); - } - }] - -]); - -Element.Properties.validator = { - - set: function(options){ - var validator = this.retrieve('validator'); - if (validator) validator.setOptions(options); - return this.store('validator:options'); - }, - - get: function(options){ - if (options || !this.retrieve('validator')){ - if (options || !this.retrieve('validator:options')) this.set('validator', options); - this.store('validator', new FormValidator(this, this.retrieve('validator:options'))); - } - return this.retrieve('validator'); - } - -}; - -Element.implement({ - - validate: function(options){ - this.set('validator', options); - return this.get('validator', options).validate(); - } - -}); - -/* -Script: Fx.Elements.js - Effect to change any number of CSS properties of any number of Elements. - - License: - MIT-style license. - - Authors: - Valerio Proietti +... */ Fx.Elements = new Class({ @@ -5636,42 +1802,58 @@ }); /* -Script: Fx.Accordion.js - An Fx.Elements extension which allows you to easily create accordion type controls. +--- - License: - MIT-style license. +script: Fx.Accordion.js - Authors: - Valerio Proietti +description: An Fx.Elements extension which allows you to easily create accordion type controls. + +license: MIT-style license + +authors: +- Valerio Proietti + +requires: +- core:1.2.4/Element.Event +- /Fx.Elements + +provides: [Fx.Accordion] + +... */ -var Accordion = Fx.Accordion = new Class({ +Fx.Accordion = new Class({ Extends: Fx.Elements, options: {/* onActive: $empty(toggler, section), - onBackground: $empty(toggler, section),*/ + onBackground: $empty(toggler, section), + fixedHeight: false, + fixedWidth: false, + */ display: 0, show: false, height: true, width: false, opacity: true, - fixedHeight: false, - fixedWidth: false, - wait: false, alwaysHide: false, trigger: 'click', - initialDisplayFx: true + initialDisplayFx: true, + returnHeightToAuto: true }, initialize: function(){ - var params = Array.link(arguments, {'container': Element.type, 'options': Object.type, 'togglers': $defined, 'elements': $defined}); + var params = Array.link(arguments, { + 'container': Element.type, //deprecated + 'options': Object.type, + 'togglers': $defined, + 'elements': $defined + }); this.parent(params.elements, params.options); this.togglers = $$(params.togglers); - this.container = document.id(params.container); this.previous = -1; + this.internalChain = new Chain(); if (this.options.alwaysHide) this.options.wait = true; if ($chk(this.options.show)){ this.options.display = false; @@ -5693,7 +1875,9 @@ for (var fx in this.effects) el.setStyle(fx, 0); } }, this); - if ($chk(this.options.display)) this.display(this.options.display, this.options.initialDisplayFx); + if ($chk(this.options.display) || this.options.initialDisplayFx === false) this.display(this.options.display, this.options.initialDisplayFx); + if (this.options.fixedHeight !== false) this.options.returnHeightToAuto = false; + this.addEvent('complete', this.internalChain.callChain.bind(this.internalChain)); }, addSection: function(toggler, element){ @@ -5703,7 +1887,9 @@ this.togglers.include(toggler); this.elements.include(element); var idx = this.togglers.indexOf(toggler); - toggler.addEvent(this.options.trigger, this.display.bind(this, idx)); + var displayer = this.display.bind(this, idx); + toggler.store('accordion:display', displayer); + toggler.addEvent(this.options.trigger, displayer); if (this.options.height) element.setStyles({'padding-top': 0, 'border-top': 'none', 'padding-bottom': 0, 'border-bottom': 'none'}); if (this.options.width) element.setStyles({'padding-left': 0, 'border-left': 'none', 'padding-right': 0, 'border-right': 'none'}); element.fullOpacity = 1; @@ -5716,33 +1902,100 @@ return this; }, + detach: function(){ + this.togglers.each(function(toggler) { + toggler.removeEvent(this.options.trigger, toggler.retrieve('accordion:display')); + }, this); + }, + display: function(index, useFx){ + if (!this.check(index, useFx)) return this; useFx = $pick(useFx, true); + if (this.options.returnHeightToAuto){ + var prev = this.elements[this.previous]; + if (prev && !this.selfHidden){ + for (var fx in this.effects){ + prev.setStyle(fx, prev[this.effects[fx]]); + } + } + } index = ($type(index) == 'element') ? this.elements.indexOf(index) : index; if ((this.timer && this.options.wait) || (index === this.previous && !this.options.alwaysHide)) return this; this.previous = index; var obj = {}; this.elements.each(function(el, i){ obj[i] = {}; - var hide = (i != index) || (this.options.alwaysHide && (el.offsetHeight > 0)); + var hide; + if (i != index){ + hide = true; + } else if (this.options.alwaysHide && ((el.offsetHeight > 0 && this.options.height) || el.offsetWidth > 0 && this.options.width)){ + hide = true; + this.selfHidden = true; + } this.fireEvent(hide ? 'background' : 'active', [this.togglers[i], el]); for (var fx in this.effects) obj[i][fx] = hide ? 0 : el[this.effects[fx]]; }, this); + this.internalChain.chain(function(){ + if (this.options.returnHeightToAuto && !this.selfHidden){ + var el = this.elements[index]; + if (el) el.setStyle('height', 'auto'); + }; + }.bind(this)); return useFx ? this.start(obj) : this.set(obj); } }); /* -Script: Fx.Move.js - Defines Fx.Move, a class that works with Element.Position.js to transition an element from one location to another. + Compatibility with 1.2.0 +*/ +var Accordion = new Class({ - License: - MIT-style license. + Extends: Fx.Accordion, - Authors: - Aaron Newton + initialize: function(){ + this.parent.apply(this, arguments); + var params = Array.link(arguments, {'container': Element.type}); + this.container = params.container; + }, + addSection: function(toggler, element, pos){ + toggler = document.id(toggler); + element = document.id(element); + var test = this.togglers.contains(toggler); + var len = this.togglers.length; + if (len && (!test || pos)){ + pos = $pick(pos, len - 1); + toggler.inject(this.togglers[pos], 'before'); + element.inject(toggler, 'after'); + } else if (this.container && !test){ + toggler.inject(this.container); + element.inject(this.container); + } + return this.parent.apply(this, arguments); + } + +}); + +/* +--- + +script: Fx.Move.js + +description: Defines Fx.Move, a class that works with Element.Position.js to transition an element from one location to another. + +license: MIT-style license + +authors: +- Aaron Newton + +requires: +- core:1.2.4/Fx.Morph +- /Element.Position + +provides: [Fx.Move] + +... */ Fx.Move = new Class({ @@ -5791,15 +2044,25 @@ /* -Script: Fx.Reveal.js - Defines Fx.Reveal, a class that shows and hides elements with a transition. +--- - License: - MIT-style license. +script: Fx.Reveal.js - Authors: - Aaron Newton +description: Defines Fx.Reveal, a class that shows and hides elements with a transition. +license: MIT-style license + +authors: +- Aaron Newton + +requires: +- core:1.2.4/Fx.Morph +- /Element.Shortcuts +- /Element.Measure + +provides: [Fx.Reveal] + +... */ Fx.Reveal = new Class({ @@ -5812,6 +2075,7 @@ onComplete: $empty(thisElement), heightOverride: null, widthOverride: null, */ + link: 'cancel', styles: ['padding', 'border', 'margin'], transitionOpacity: !Browser.Engine.trident4, mode: 'vertical', @@ -5826,18 +2090,17 @@ this.hiding = true; this.showing = false; this.hidden = true; + this.cssText = this.element.style.cssText; var startStyles = this.element.getComputedSize({ styles: this.options.styles, mode: this.options.mode }); - var setToAuto = (this.element.style.height === ''||this.element.style.height == 'auto'); - this.element.setStyle('display', 'block'); + this.element.setStyle('display', this.options.display); if (this.options.transitionOpacity) startStyles.opacity = 1; var zero = {}; $each(startStyles, function(style, name){ zero[name] = [style, 0]; }, this); - var overflowBefore = this.element.getStyle('overflow'); this.element.setStyle('overflow', 'hidden'); var hideThese = this.options.hideInputs ? this.element.getElements(this.options.hideInputs) : null; this.$chain.unshift(function(){ @@ -5846,11 +2109,8 @@ $each(startStyles, function(style, name){ startStyles[name] = style; }, this); - this.element.setStyles($merge({display: 'none', overflow: overflowBefore}, startStyles)); - if (setToAuto){ - if (['vertical', 'both'].contains(this.options.mode)) this.element.style.height = ''; - if (['width', 'both'].contains(this.options.mode)) this.element.style.width = ''; - } + this.element.style.cssText = this.cssText; + this.element.setStyle('display', 'none'); if (hideThese) hideThese.setStyle('visibility', 'visible'); } this.fireEvent('hide', this.element); @@ -5886,12 +2146,11 @@ this.element.getStyle('visiblity') == 'hidden' || this.element.getStyle('opacity') == 0){ this.showing = true; - this.hiding = false; - this.hidden = false; - var setToAuto, startStyles; + this.hiding = this.hidden = false; + var startStyles; + this.cssText = this.element.style.cssText; //toggle display, but hide it this.element.measure(function(){ - setToAuto = (this.element.style.height === '' || this.element.style.height == 'auto'); //create the styles for the opened/visible state startStyles = this.element.getComputedSize({ styles: this.options.styles, @@ -5914,7 +2173,6 @@ display: this.options.display }; $each(startStyles, function(style, name){ zero[name] = 0; }); - var overflowBefore = this.element.getStyle('overflow'); //set to zero this.element.setStyles($merge(zero, {overflow: 'hidden'})); //hide inputs @@ -5923,11 +2181,8 @@ //start the effect this.start(startStyles); this.$chain.unshift(function(){ - this.element.setStyle('overflow', overflowBefore); - if (!this.options.heightOverride && setToAuto){ - if (['vertical', 'both'].contains(this.options.mode)) this.element.style.height = ''; - if (['width', 'both'].contains(this.options.mode)) this.element.style.width = ''; - } + this.element.style.cssText = this.cssText; + this.element.setStyle('display', this.options.display); if (!this.hidden) this.showing = false; if (hideThese) hideThese.setStyle('visibility', 'visible'); this.callChain(); @@ -5967,6 +2222,13 @@ this.dissolve(); } return this; + }, + + cancel: function(){ + this.parent.apply(this, arguments); + this.element.style.cssText = this.cssText; + this.hidding = false; + this.showing = false; } }); @@ -5976,7 +2238,7 @@ set: function(options){ var reveal = this.retrieve('reveal'); if (reveal) reveal.cancel(); - return this.eliminate('reveal').store('reveal:options', $extend({link: 'cancel'}, options)); + return this.eliminate('reveal').store('reveal:options', options); }, get: function(options){ @@ -6025,14 +2287,26 @@ }); /* -Script: Fx.Scroll.js - Effect to smoothly scroll any element, including the window. +--- - License: - MIT-style license. +script: Fx.Scroll.js - Authors: - Valerio Proietti +description: Effect to smoothly scroll any element, including the window. + +license: MIT-style license + +authors: +- Valerio Proietti + +requires: +- core:1.2.4/Fx +- core:1.2.4/Element.Event +- core:1.2.4/Element.Dimensions +- /MooTools.More + +provides: [Fx.Scroll] + +... */ Fx.Scroll = new Class({ @@ -6065,6 +2339,7 @@ set: function(){ var now = Array.flatten(arguments); + if (Browser.Engine.gecko) now = [Math.round(now[0]), Math.round(now[1])]; this.element.scrollTo(now[0], now[1]); }, @@ -6076,11 +2351,12 @@ start: function(x, y){ if (!this.check(x, y)) return this; - var offsetSize = this.element.getSize(), scrollSize = this.element.getScrollSize(); - var scroll = this.element.getScroll(), values = {x: x, y: y}; + var scrollSize = this.element.getScrollSize(), + scroll = this.element.getScroll(), + values = {x: x, y: y}; for (var z in values){ - var max = scrollSize[z] - offsetSize[z]; - if ($chk(values[z])) values[z] = ($type(values[z]) == 'number') ? values[z].limit(0, max) : max; + var max = scrollSize[z]; + if ($chk(values[z])) values[z] = ($type(values[z]) == 'number') ? values[z] : max; else values[z] = scroll[z]; values[z] += this.options.offset[z]; } @@ -6130,162 +2406,54 @@ }, this); if (to.x != scroll.x || to.y != scroll.y) this.start(to.x, to.y); return this; - } - -}); - - -/* -Script: Fx.Slide.js - Effect to slide an element in and out of view. - - License: - MIT-style license. - - Authors: - Valerio Proietti -*/ - -Fx.Slide = new Class({ - - Extends: Fx, - - options: { - mode: 'vertical' }, - initialize: function(element, options){ - this.addEvent('complete', function(){ - this.open = (this.wrapper['offset' + this.layout.capitalize()] != 0); - if (this.open && Browser.Engine.webkit419) this.element.dispose().inject(this.wrapper); - }, true); - this.element = this.subject = document.id(element); - this.parent(options); - var wrapper = this.element.retrieve('wrapper'); - this.wrapper = wrapper || new Element('div', { - styles: $extend(this.element.getStyles('margin', 'position'), {overflow: 'hidden'}) - }).wraps(this.element); - this.element.store('wrapper', this.wrapper).setStyle('margin', 0); - this.now = []; - this.open = true; - }, + scrollToCenter: function(el, axes, offset){ + axes = axes ? $splat(axes) : ['x', 'y']; + el = $(el); + var to = {}, + pos = el.getPosition(this.element), + size = el.getSize(), + scroll = this.element.getScroll(), + containerSize = this.element.getSize(), + edge = { + x: pos.x + size.x, + y: pos.y + size.y + }; - vertical: function(){ - this.margin = 'margin-top'; - this.layout = 'height'; - this.offset = this.element.offsetHeight; - }, - - horizontal: function(){ - this.margin = 'margin-left'; - this.layout = 'width'; - this.offset = this.element.offsetWidth; - }, - - set: function(now){ - this.element.setStyle(this.margin, now[0]); - this.wrapper.setStyle(this.layout, now[1]); + ['x','y'].each(function(axis){ + if(axes.contains(axis)){ + to[axis] = pos[axis] - (containerSize[axis] - size[axis])/2; + } + if(to[axis] == null) to[axis] = scroll[axis]; + if(offset && offset[axis]) to[axis] = to[axis] + offset[axis]; + }, this); + if (to.x != scroll.x || to.y != scroll.y) this.start(to.x, to.y); return this; - }, - - compute: function(from, to, delta){ - return [0, 1].map(function(i){ - return Fx.compute(from[i], to[i], delta); - }); - }, - - start: function(how, mode){ - if (!this.check(how, mode)) return this; - this[mode || this.options.mode](); - var margin = this.element.getStyle(this.margin).toInt(); - var layout = this.wrapper.getStyle(this.layout).toInt(); - var caseIn = [[margin, layout], [0, this.offset]]; - var caseOut = [[margin, layout], [-this.offset, 0]]; - var start; - switch (how){ - case 'in': start = caseIn; break; - case 'out': start = caseOut; break; - case 'toggle': start = (layout == 0) ? caseIn : caseOut; - } - return this.parent(start[0], start[1]); - }, - - slideIn: function(mode){ - return this.start('in', mode); - }, - - slideOut: function(mode){ - return this.start('out', mode); - }, - - hide: function(mode){ - this[mode || this.options.mode](); - this.open = false; - return this.set([-this.offset, 0]); - }, - - show: function(mode){ - this[mode || this.options.mode](); - this.open = true; - return this.set([0, this.offset]); - }, - - toggle: function(mode){ - return this.start('toggle', mode); } }); -Element.Properties.slide = { - set: function(options){ - var slide = this.retrieve('slide'); - if (slide) slide.cancel(); - return this.eliminate('slide').store('slide:options', $extend({link: 'cancel'}, options)); - }, +/* +--- - get: function(options){ - if (options || !this.retrieve('slide')){ - if (options || !this.retrieve('slide:options')) this.set('slide', options); - this.store('slide', new Fx.Slide(this, this.retrieve('slide:options'))); - } - return this.retrieve('slide'); - } +script: Fx.SmoothScroll.js -}; +description: Class for creating a smooth scrolling effect to all internal links on the page. -Element.implement({ +license: MIT-style license - slide: function(how, mode){ - how = how || 'toggle'; - var slide = this.get('slide'), toggle; - switch (how){ - case 'hide': slide.hide(mode); break; - case 'show': slide.show(mode); break; - case 'toggle': - var flag = this.retrieve('slide:flag', slide.open); - slide[flag ? 'slideOut' : 'slideIn'](mode); - this.store('slide:flag', !flag); - toggle = true; - break; - default: slide.start(how, mode); - } - if (!toggle) this.eliminate('slide:flag'); - return this; - } +authors: +- Valerio Proietti -}); +requires: +- core:1.2.4/Selectors +- /Fx.Scroll +provides: [Fx.SmoothScroll] -/* -Script: Fx.SmoothScroll.js - Class for creating a smooth scrolling effect to all internal links on the page. - - License: - MIT-style license. - - Authors: - Valerio Proietti +... */ var SmoothScroll = Fx.SmoothScroll = new Class({ @@ -6297,7 +2465,7 @@ this.doc = context.getDocument(); var win = context.getWindow(); this.parent(this.doc, options); - this.links = this.options.links ? $$(this.options.links) : $$(this.doc.links); + this.links = $$(this.options.links || this.doc.links); var location = win.location.href.match(/^[^#]*/)[0] + '#'; this.links.each(function(link){ if (link.href.indexOf(location) != 0) {return;} @@ -6318,25 +2486,38 @@ if (el) { event.preventDefault(); this.anchor = anchor; - this.toElement(el); + this.toElement(el).chain(function(){ + this.fireEvent('scrolledTo', [link, el]); + }.bind(this)); link.blur(); } }.bind(this)); } - }); /* -Script: Drag.js - The base Drag Class. Can be used to drag and resize Elements using mouse events. +--- - License: - MIT-style license. +script: Drag.js - Authors: - Valerio Proietti - Tom Occhinno - Jan Kassens +description: The base Drag Class. Can be used to drag and resize Elements using mouse events. + +license: MIT-style license + +authors: +- Valerio Proietti +- Tom Occhinno +- Jan Kassens + +requires: +- core:1.2.4/Events +- core:1.2.4/Options +- core:1.2.4/Element.Event +- core:1.2.4/Element.Style +- /MooTools.More + +provides: [Drag] + */ var Drag = new Class({ @@ -6358,6 +2539,7 @@ handle: false, invert: false, preventDefault: false, + stopPropagation: false, modifiers: {x: 'left', y: 'top'} }, @@ -6395,7 +2577,9 @@ }, start: function(event){ + if (event.rightClick) return; if (this.options.preventDefault) event.preventDefault(); + if (this.options.stopPropagation) event.stopPropagation(); this.mouse.start = event.page; this.fireEvent('beforeStart', this.element); var limit = this.options.limit; @@ -6445,8 +2629,11 @@ } } if (this.options.grid[z]) this.value.now[z] -= ((this.value.now[z] - (this.limit[z][0]||0)) % this.options.grid[z]); - if (this.options.style) this.element.setStyle(this.options.modifiers[z], this.value.now[z] + this.options.unit); - else this.element[this.options.modifiers[z]] = this.value.now[z]; + if (this.options.style) { + this.element.setStyle(this.options.modifiers[z], this.value.now[z] + this.options.unit); + } else { + this.element[this.options.modifiers[z]] = this.value.now[z]; + } } this.fireEvent('drag', [this.element, event]); }, @@ -6483,14 +2670,27 @@ /* -Script: Slider.js - Class for creating horizontal and vertical slider controls. +--- - License: - MIT-style license. +script: Slider.js - Authors: - Valerio Proietti +description: Class for creating horizontal and vertical slider controls. + +license: MIT-style license + +authors: +- Valerio Proietti + +requires: +- core:1.2.4/Element.Dimensions +- /Class.Binds +- /Drag +- /Element.Dimensions +- /Element.Measure + +provides: [Slider] + +... */ var Slider = new Class({ @@ -6499,11 +2699,15 @@ Binds: ['clickedElement', 'draggedKnob', 'scrolledElement'], - options: { + options: {/* + onTick: $empty(intPosition), + onChange: $empty(intStep), + onComplete: $empty(strStep),*/ onTick: function(position){ if (this.options.snap) position = this.toPosition(this.step); this.knob.setStyle(this.property, position); }, + initialStep: 0, snap: false, offset: 0, range: false, @@ -6529,8 +2733,12 @@ this.property = 'left'; offset = 'offsetWidth'; } - this.half = this.knob[offset] / 2; - this.full = this.element[offset] - this.knob[offset] + (this.options.offset * 2); + + this.full = this.element.measure(function(){ + this.half = this.knob[offset] / 2; + return this.element[offset] - this.knob[offset] + (this.options.offset * 2); + }.bind(this)); + this.min = $chk(this.options.range[0]) ? this.options.range[0] : 0; this.max = $chk(this.options.range[1]) ? this.options.range[1] : this.options.steps; this.range = this.max - this.min; @@ -6538,25 +2746,22 @@ this.stepSize = Math.abs(this.range) / this.steps; this.stepWidth = this.stepSize * this.full / Math.abs(this.range) ; - this.knob.setStyle('position', 'relative').setStyle(this.property, - this.options.offset); + this.knob.setStyle('position', 'relative').setStyle(this.property, this.options.initialStep ? this.toPosition(this.options.initialStep) : - this.options.offset); modifiers[this.axis] = this.property; limit[this.axis] = [- this.options.offset, this.full - this.options.offset]; - this.bound = { - clickedElement: this.clickedElement.bind(this), - scrolledElement: this.scrolledElement.bindWithEvent(this), - draggedKnob: this.draggedKnob.bind(this) - }; - var dragOptions = { snap: 0, limit: limit, modifiers: modifiers, - onDrag: this.bound.draggedKnob, - onStart: this.bound.draggedKnob, + onDrag: this.draggedKnob, + onStart: this.draggedKnob, onBeforeStart: (function(){ this.isDragging = true; }).bind(this), + onCancel: function() { + this.isDragging = false; + }.bind(this), onComplete: function(){ this.isDragging = false; this.draggedKnob(); @@ -6573,28 +2778,20 @@ }, attach: function(){ - this.element.addEvent('mousedown', this.bound.clickedElement); - - // keep track from firing the 'mousedown' event if the knob has been hovored - this.knob.addEvent('mouseenter',function(){ - this.element.removeEvents('mousedown'); - }.bind(this)); - this.knob.addEvent('mouseleave',function(){ - this.element.addEvent('mousedown', this.clickedElement.bind(this)); - }.bind(this)); - - if (this.options.wheel) this.element.addEvent('mousewheel', this.bound.scrolledElement); + this.element.addEvent('mousedown', this.clickedElement); + if (this.options.wheel) this.element.addEvent('mousewheel', this.scrolledElement); this.drag.attach(); return this; }, detach: function(){ - this.element.removeEvent('mousedown', this.bound.clickedElement); - this.element.removeEvent('mousewheel', this.bound.scrolledElement); + this.element.removeEvent('mousedown', this.clickedElement); + this.element.removeEvent('mousewheel', this.scrolledElement); this.drag.detach(); return this; }, +// XXX added check argument to fire checkStep() set: function(step, check){ if (arguments.length == 1) check = true; @@ -6662,55 +2859,77 @@ }); /* -Script: Tips.js - Class for creating nice tips that follow the mouse cursor when hovering an element. +--- - License: - MIT-style license. +script: Tips.js - Authors: - Valerio Proietti - Christoph Pojer +description: Class for creating nice tips that follow the mouse cursor when hovering an element. + +license: MIT-style license + +authors: +- Valerio Proietti +- Christoph Pojer + +requires: +- core:1.2.4/Options +- core:1.2.4/Events +- core:1.2.4/Element.Event +- core:1.2.4/Element.Style +- core:1.2.4/Element.Dimensions +- /MooTools.More + +provides: [Tips] + +... */ -var Tips = new Class({ +(function(){ +var read = function(option, element){ + return (option) ? ($type(option) == 'function' ? option(element) : element.get(option)) : ''; +}; + +this.Tips = new Class({ + Implements: [Events, Options], options: { - onShow: function(tip){ - tip.setStyle('visibility', 'visible'); + /* + onAttach: $empty(element), + onDetach: $empty(element), + */ + onShow: function(){ + this.tip.setStyle('display', 'block'); }, - onHide: function(tip){ - tip.setStyle('visibility', 'hidden'); + onHide: function(){ + this.tip.setStyle('display', 'none'); }, title: 'title', - text: function(el){ - return el.get('rel') || el.get('href'); + text: function(element){ + return element.get('rel') || element.get('href'); }, showDelay: 100, hideDelay: 100, - className: null, + className: 'tip-wrap', offset: {x: 16, y: 16}, + windowPadding: {x:0, y:0}, fixed: false }, initialize: function(){ var params = Array.link(arguments, {options: Object.type, elements: $defined}); - if (params.options && params.options.offsets) params.options.offset = params.options.offsets; this.setOptions(params.options); - this.container = new Element('div', {'class': 'tip'}); - this.tip = this.getTip(); - if (params.elements) this.attach(params.elements); + this.container = new Element('div', {'class': 'tip'}); }, - getTip: function(){ - return new Element('div', { + toElement: function(){ + if (this.tip) return this.tip; + + return this.tip = new Element('div', { 'class': this.options.className, styles: { - visibility: 'hidden', - display: 'none', position: 'absolute', top: 0, left: 0 @@ -6723,20 +2942,22 @@ }, attach: function(elements){ - var read = function(option, element){ - if (option == null) return ''; - return $type(option) == 'function' ? option(element) : element.get(option); - }; $$(elements).each(function(element){ - var title = read(this.options.title, element); + var title = read(this.options.title, element), + text = read(this.options.text, element); + element.erase('title').store('tip:native', title).retrieve('tip:title', title); - element.retrieve('tip:text', read(this.options.text, element)); + element.retrieve('tip:text', text); + this.fireEvent('attach', [element]); var events = ['enter', 'leave']; if (!this.options.fixed) events.push('move'); events.each(function(value){ - element.addEvent('mouse' + value, element.retrieve('tip:' + value, this['element' + value.capitalize()].bindWithEvent(this, element))); + var event = element.retrieve('tip:' + value); + if (!event) event = this['element' + value.capitalize()].bindWithEvent(this, element); + + element.store('tip:' + value, event).addEvent('mouse' + value, event); }, this); }, this); @@ -6746,12 +2967,12 @@ detach: function(elements){ $$(elements).each(function(element){ ['enter', 'leave', 'move'].each(function(value){ - element.removeEvent('mouse' + value, element.retrieve('tip:' + value) || $empty); + element.removeEvent('mouse' + value, element.retrieve('tip:' + value)).eliminate('tip:' + value); }); - element.eliminate('tip:enter').eliminate('tip:leave').eliminate('tip:move'); + this.fireEvent('detach', [element]); - if ($type(this.options.title) == 'string' && this.options.title == 'title'){ + if (this.options.title == 'title'){ // This is necessary to check if we can revert the title var original = element.retrieve('tip:native'); if (original) element.set('title', original); } @@ -6761,33 +2982,40 @@ }, elementEnter: function(event, element){ - $A(this.container.childNodes).each(Element.dispose); + this.container.empty(); ['title', 'text'].each(function(value){ var content = element.retrieve('tip:' + value); - if (!content) return; - - this[value + 'Element'] = new Element('div', {'class': 'tip-' + value}).inject(this.container); - this.fill(this[value + 'Element'], content); + if (content) this.fill(new Element('div', {'class': 'tip-' + value}).inject(this.container), content); }, this); - this.timer = $clear(this.timer); - this.timer = this.show.delay(this.options.showDelay, this, element); - this.tip.setStyle('display', 'block'); - this.position((!this.options.fixed) ? event : {page: element.getPosition()}); + $clear(this.timer); + this.timer = (function(){ + this.show(this, element); + this.position((this.options.fixed) ? {page: element.getPosition()} : event); + }).delay(this.options.showDelay, this); }, elementLeave: function(event, element){ $clear(this.timer); - this.tip.setStyle('display', 'none'); this.timer = this.hide.delay(this.options.hideDelay, this, element); + this.fireForParent(event, element); }, - elementMove: function(event){ + fireForParent: function(event, element){ + element = element.getParent(); + if (!element || element == document.body) return; + if (element.retrieve('tip:enter')) element.fireEvent('mouseenter', event); + else this.fireForParent(event, element); + }, + + elementMove: function(event, element){ this.position(event); }, position: function(event){ + if (!this.tip) document.id(this); + var size = window.getSize(), scroll = window.getScroll(), tip = {x: this.tip.offsetWidth, y: this.tip.offsetHeight}, props = {x: 'left', y: 'top'}, @@ -6795,7 +3023,7 @@ for (var z in props){ obj[props[z]] = event.page[z] + this.options.offset[z]; - if ((obj[props[z]] + tip[z] - scroll[z]) > size[z]) obj[props[z]] = event.page[z] - this.options.offset[z] - tip[z]; + if ((obj[props[z]] + tip[z] - scroll[z]) > size[z] - this.options.windowPadding[z]) obj[props[z]] = event.page[z] - this.options.offset[z] - tip[z]; } this.tip.setStyles(obj); @@ -6806,26 +3034,39 @@ else element.adopt(contents); }, - show: function(el){ - this.fireEvent('show', [this.tip, el]); + show: function(element){ + if (!this.tip) document.id(this); + this.fireEvent('show', [this.tip, element]); }, - hide: function(el){ - this.fireEvent('hide', [this.tip, el]); + hide: function(element){ + if (!this.tip) document.id(this); + this.fireEvent('hide', [this.tip, element]); } }); +})(); + /* -Script: Date.English.US.js - Date messages for US English. +--- - License: - MIT-style license. +script: Date.English.US.js - Authors: - Aaron Newton +description: Date messages for US English. +license: MIT-style license + +authors: +- Aaron Newton + +requires: +- /Lang +- /Date + +provides: [Date.English.US] + +... */ MooTools.lang.set('en-US', 'Date', { @@ -6852,60 +3093,24 @@ hoursAgo: 'about {delta} hours ago', dayAgo: '1 day ago', daysAgo: '{delta} days ago', + weekAgo: '1 week ago', + weeksAgo: '{delta} weeks ago', + monthAgo: '1 month ago', + monthsAgo: '{delta} months ago', + yearAgo: '1 year ago', + yearsAgo: '{delta} years ago', lessThanMinuteUntil: 'less than a minute from now', minuteUntil: 'about a minute from now', minutesUntil: '{delta} minutes from now', hourUntil: 'about an hour from now', hoursUntil: 'about {delta} hours from now', dayUntil: '1 day from now', - daysUntil: '{delta} days from now' + daysUntil: '{delta} days from now', + weekUntil: '1 week from now', + weeksUntil: '{delta} weeks from now', + monthUntil: '1 month from now', + monthsUntil: '{delta} months from now', + yearUntil: '1 year from now', + yearsUntil: '{delta} years from now' -}); - -/* -Script: FormValidator.English.js - Date messages for English. - - License: - MIT-style license. - - Authors: - Aaron Newton - -*/ - -MooTools.lang.set('en-US', 'FormValidator', { - - required:'This field is required.', - minLength:'Please enter at least {minLength} characters (you entered {length} characters).', - maxLength:'Please enter no more than {maxLength} characters (you entered {length} characters).', - integer:'Please enter an integer in this field. Numbers with decimals (e.g. 1.25) are not permitted.', - numeric:'Please enter only numeric values in this field (i.e. "1" or "1.1" or "-1" or "-1.1").', - digits:'Please use numbers and punctuation only in this field (for example, a phone number with dashes or dots is permitted).', - alpha:'Please use letters only (a-z) with in this field. No spaces or other characters are allowed.', - alphanum:'Please use only letters (a-z) or numbers (0-9) only in this field. No spaces or other characters are allowed.', - dateSuchAs:'Please enter a valid date such as {date}', - dateInFormatMDY:'Please enter a valid date such as MM/DD/YYYY (i.e. "12/31/1999")', - email:'Please enter a valid email address. For example "fred(a)domain.com".', - url:'Please enter a valid URL such as http://www.google.com.', - currencyDollar:'Please enter a valid $ amount. For example $100.00 .', - oneRequired:'Please enter something for at least one of these inputs.', - errorPrefix: 'Error: ', - warningPrefix: 'Warning: ', - - //FormValidator.Extras - - noSpace: 'There can be no spaces in this input.', - reqChkByNode: 'No items are selected.', - requiredChk: 'This field is required.', - reqChkByName: 'Please select a {label}.', - match: 'This field needs to match the {matchName} field', - startDate: 'the start date', - endDate: 'the end date', - currendDate: 'the current date', - afterDate: 'The date should be the same or after {label}.', - beforeDate: 'The date should be the same or before {label}.', - startMonth: 'Please select a start month', - sameMonth: 'These two dates must be in the same month - you must change one or the other.' - }); \ No newline at end of file

16 years, 1 month

1
0
0 / 0

rhmessaging commits: r3879 - mgmt/trunk/cumin/resources.

by rhmessaging-commits＠lists.jboss.org

Author: eallen Date: 2010-03-23 14:32:07 -0400 (Tue, 23 Mar 2010) New Revision: 3879 Modified: mgmt/trunk/cumin/resources/incrementalSearch.js Log: More changes from the original to use mootools library Size the autocomplete list to match the associated edit box width Modified: mgmt/trunk/cumin/resources/incrementalSearch.js =================================================================== --- mgmt/trunk/cumin/resources/incrementalSearch.js 2010-03-23 18:29:24 UTC (rev 3878) +++ mgmt/trunk/cumin/resources/incrementalSearch.js 2010-03-23 18:32:07 UTC (rev 3879) @@ -29,15 +29,16 @@ }; p.show = function(){ - for(var thisObject = this, s = thisObject.c.style, o = thisObject.input, x = o.offsetLeft, - y = o.offsetTop + o.offsetHeight; o = o.offsetParent; x += o.offsetLeft, y += o.offsetTop); - s.left = x + "px", s.top = y + "px", + var i = $(this.input), s = $(this.c); + var iSize = i.getSize(), iPos = i.getPosition(); + var sPos = iPos; sPos.y = iPos.y + iSize.y; + s.setPosition(sPos); s.setStyle('width', iSize.x); + var thisObject = this, s = thisObject.c.style; thisObject.l.length ? (s.display = "block", !thisObject.visible && (thisObject._callEvent("onshow"), ++thisObject.visible), thisObject.highlite(0)) : s.display = "none"; }; p.hide = function(){ var thisObject = this, d = document, s = (thisObject.c && thisObject.c.parentNode.removeChild(thisObject.c), thisObject.c = d.body.appendChild(d.createElement("div"))).style; - //thisObject.c.width = thisObject.input.offsetwidth + "px"; thisObject.l = [], thisObject.i = -1, thisObject.c.className = thisObject.className, s.position = "absolute", s.display = "none"; thisObject._old = null, thisObject.visible && (thisObject._callEvent("onhide"), --thisObject.visible); }; @@ -77,6 +78,7 @@ }; p._fadeOut = function(){ var f = (f = function(){arguments.callee.x.hide();}, f.x = this, setTimeout(f, 200)); + this.select(); }; p._handler = function(e){ var thisObject = this, t = e.type, k = e.key; @@ -94,29 +96,13 @@ return thisObject[e] instanceof Function ? thisObject[e].apply(thisObject, [].slice.call(arguments, 1)) : undefined; }; } -//-- Searches for multiple matches ---- -function Inc_CIAnywhere(o, search){ - if(search = search.toLowerCase()) { - var ul = $(o.listObjectID); - var list = ul.getElements("li"); - for(var i = -1, l = list.length; ++i < l;){ - /*searches all the matches of "search" and adds the indexes in an array */ - for(var j = 0, indices = []; j = list[i].firstChild.nodeValue.toLowerCase().indexOf(search, j) + 1; - indices[indices.length] = j - 1); - /*if any ocurrence was found, adds the item and pass the position of the matches*/ - if(indices.length) - o.add(list[i].firstChild.nodeValue, indices); - } - } - o.show(); -} function Inc_CIBeginning(o, search) { if (search = search.toLowerCase()) { - var ul = $(o.listObjectID); - var list = ul.getElements("li"); - for(var i = -1, l = list.length; ++i < l;) - if( list[i].firstChild.nodeValue.toLowerCase().indexOf(search) == 0) - o.add(list[i].firstChild.nodeValue, 0); + var select = $(o.listObjectID); + for (var i = 0, l = select.options.length; i < l; ++i) { + if (select.options[i].text.toLowerCase().indexOf(search) == 0) + o.add(select.options[i].text, 0, select.options[i].value); + } } if ((o.l.length == 0) && (search.length > 0)) { o.add("No Matches", -1);

16 years, 1 month

1
0
0 / 0

rhmessaging commits: r3878 - in mgmt/trunk/cumin: python/cumin/messaging and 1 other directories.

by rhmessaging-commits＠lists.jboss.org

Author: eallen Date: 2010-03-23 14:29:24 -0400 (Tue, 23 Mar 2010) New Revision: 3878 Modified: mgmt/trunk/cumin/python/cumin/messaging/binding.py mgmt/trunk/cumin/python/cumin/messaging/binding.strings mgmt/trunk/cumin/python/cumin/messaging/broker.py mgmt/trunk/cumin/python/cumin/messaging/broker.strings mgmt/trunk/cumin/python/cumin/messaging/exchange.py mgmt/trunk/cumin/python/cumin/messaging/main.py mgmt/trunk/cumin/python/cumin/messaging/model.py mgmt/trunk/cumin/python/cumin/messaging/queue.py mgmt/trunk/cumin/python/cumin/widgets.py mgmt/trunk/cumin/python/cumin/widgets.strings mgmt/trunk/cumin/resources/app.css mgmt/trunk/cumin/resources/app.js Log: Add 'Add binding" form to broker pages Modified Add binding form to: work given either a broker, queue, or exchange parameter use an autocomplete edit box for queue and exchange names bind to only one exchange at a time display optional argumnents fields based on exchange type Modified: mgmt/trunk/cumin/python/cumin/messaging/binding.py =================================================================== --- mgmt/trunk/cumin/python/cumin/messaging/binding.py 2010-03-23 17:06:23 UTC (rev 3877) +++ mgmt/trunk/cumin/python/cumin/messaging/binding.py 2010-03-23 18:29:24 UTC (rev 3878) @@ -93,234 +93,6 @@ binding = Binding.get(data["id"]) return self.app.model.binding.msgMatched.value(binding) -class ExchangeInput(Widget): - def __init__(self, app, name): - super(ExchangeInput, self).__init__(app, name) - - self.exchange = None - self.instance_data = None - - self.name_tmpl = WidgetTemplate(self, "name_html") - self.key_tmpl = WidgetTemplate(self, "key_html") - - self.form = None - - def init(self): - super(ExchangeInput, self).init() - - for anc in self.ancestors: - if isinstance(anc, Form): - self.form = anc - - def get_args(self, session): - return (self.exchange,) - - def get_exchange_info(self, session, exchange): - binding_info = self.form.bindings.dict_param.get(session) - if str(exchange.id) in binding_info: - return binding_info[str(exchange.id)] - - def get_exchange_info_for(self, session, exchange, key): - exchange_info = self.get_exchange_info(session, exchange) - if exchange_info: - if key in exchange_info: - return exchange_info[key] - - def render_exchange_name(self, session, exchange): - return exchange.name - - def render_exchange_fmt_name(self, session, exchange): - return fmt_shorten(exchange.name) - - def render_name_path(self, session, *args): - return DictParameter.sep().join((self.instance_data, "name")) - - def render_exchange_type(self, session, exchange): - return exchange.type - - def render_exchange_type_path(self, session, exchange): - return DictParameter.sep().join((self.instance_data, "type")) - - def render_exchange_id(self, session, exchange): - return exchange.id - - def render_exchange_checked(self, session, exchange): - exchange_info = self.get_exchange_info(session, exchange) - if exchange_info: - if "name" in exchange_info: - return "checked=\"checked\"" - - def render_exchange_name_input(self, session, exchange): - writer = Writer() - self.name_tmpl.render(writer, session, exchange) - return writer.to_string() - - def render_exchange_key_input(self, session, exchange): - writer = Writer() - self.key_tmpl.render(writer, session, exchange) - return writer.to_string() - - def render_onclick(self, session, exchange): - pass - - def render_list_error(self, session, exchange): - errors = self.parent.binding_errors.get(session) - if exchange.name in errors: - return "<ul class=\"errors\" style=\"margin:0; float:left;\"><li>%s</li></ul>" % \ - "</li><li>".join(errors[exchange.name]) - - def render_dict_error(self, session, exchange, key): - errors = self.parent.binding_errors.get(session) - if exchange.name in errors: - exchange_errors = errors[exchange.name] - if key in exchange_errors: - return "<ul class=\"errors\" style=\"margin:0; float:left;\"><li>%s</li></ul>" % \ - "</li><li>".join(exchange_errors[key]) - - def set_instance_data(self, exchange, dict_key): - self.exchange = exchange - self.instance_data = dict_key - -class FanoutExchangeInput(ExchangeInput): - pass - -class BindingKeyExchangeInput(ExchangeInput): - def __init__(self, app, name): - super(BindingKeyExchangeInput, self).__init__(app, name) - - def render_key_path(self, session, exchange): - return DictParameter.sep().join((self.instance_data, "key")) - - def render_key_error(self, session, exchange): - return self.render_list_error(session, exchange) - - def render_key_value(self, session, exchange): - return self.get_exchange_info_for(session, exchange, "key") - -class DirectExchangeInput(BindingKeyExchangeInput): - pass - -class TopicExchangeInput(BindingKeyExchangeInput): - pass - -class XMLExchangeInput(BindingKeyExchangeInput): - def __init__(self, app, name): - super(XMLExchangeInput, self).__init__(app, name) - - def render_xquery_path(self, session, exchange): - return DictParameter.sep().join((self.instance_data, "xquery")) - - def render_headers_class(self, session, exchange): - exchange_info = self.get_exchange_info(session, exchange) - if not exchange_info or not "name" in exchange_info: - return "initial_header_state" - - def render_key_error(self, session, exchange): - return self.render_dict_error(session, exchange, "key") - - def render_onclick(self, session, exchange): - return "onclick=\"toggle_row(this, 'xml_extra.%s')\"" % str(exchange.id) - - def render_xml_extra(self, session, exchange): - return "xml_extra.%s" % str(exchange.id) - - def render_xquery_error(self, session, exchange): - return self.render_dict_error(session, exchange, "xquery") - - def render_xquery_value(self, session, exchange): - return self.get_exchange_info_for(session, exchange, "xquery") - - def process_input(self, this_exchange, arguments): - if "xquery" in this_exchange: - arguments["xquery"] = this_exchange["xquery"] - -class HeadersExchangeInput(BindingKeyExchangeInput): - def __init__(self, app, name): - super(HeadersExchangeInput, self).__init__(app, name) - - def render_x_match_path(self, session, exchange): - return DictParameter.sep().join((self.instance_data, "x-match")) - - def render_mkey_path(self, session, exchange): - return DictParameter.sep().join((self.instance_data, "mkey")) - - def render_headers_class(self, session, exchange): - exchange_info = self.get_exchange_info(session, exchange) - if not exchange_info or not "name" in exchange_info: - return "initial_header_state" - - def render_all_checked(self, session, exchange): - checked = self.render_any_checked(session, exchange) - if not checked: - return "checked=\"checked\"" - - def render_any_checked(self, session, exchange): - exchange_info = self.get_exchange_info(session, exchange) - if exchange_info: - if "x-match" in exchange_info: - if exchange_info["x-match"] == "any": - return "checked=\"checked\"" - - def render_mkey1_value(self, session, exchange): - return self.get_exchange_info_for(session, exchange, "mkey.1") - - def render_mkey2_value(self, session, exchange): - return self.get_exchange_info_for(session, exchange, "mkey.2") - - def render_mkey3_value(self, session, exchange): - return self.get_exchange_info_for(session, exchange, "mkey.3") - - def render_mnv1_value(self, session, exchange): - return self.get_exchange_info_for(session, exchange, "mkey.1.nv") - - def render_mnv2_value(self, session, exchange): - return self.get_exchange_info_for(session, exchange, "mkey.2.nv") - - def render_mnv3_value(self, session, exchange): - return self.get_exchange_info_for(session, exchange, "mkey.3.nv") - - def render_key_error(self, session, exchange): - return self.render_dict_error(session, exchange, "key") - - def render_mkey1_error(self, session, exchange): - return self.render_dict_error(session, exchange, "mkey.1") - - def render_mkey2_error(self, session, exchange): - return self.render_dict_error(session, exchange, "mkey.2") - - def render_mkey3_error(self, session, exchange): - return self.render_dict_error(session, exchange, "mkey.3") - - def render_onclick(self, session, exchange): - return "onclick=\"toggle_row(this, 'headers_extra.%s')\"" % str(exchange.id) - - def render_headers_extra(self, session, exchange): - return "headers_extra.%s" % str(exchange.id) - - def process_input(self, this_exchange, arguments): - # x-match is a radio button, it must have a value - arguments["x-match"] = this_exchange["x-match"] - # Fill out the other arguments. - # The form has input boxes named mkey.* and mkey.*.nv - # We need to create an arguments dictionary entry - # of the form {mkey.*.value: mkey.*.nv.value} - for match_info in this_exchange: - if this_exchange[match_info]: - if match_info.startswith("mkey") \ - and not match_info.endswith("nv"): - # find the value in the matching .nv field - match_value = self._find_match_value(this_exchange, match_info) - # it is valid for the value in the .nv field - # to be empty - arguments[this_exchange[match_info]] = \ - match_value or None - - def _find_match_value(self, this_exchange, match_info): - for m_info in this_exchange: - if m_info.startswith(match_info): - if m_info.endswith("nv"): - return this_exchange[m_info] - class ExchangeState(SubmitSwitch): def __init__(self, app, name): super(ExchangeState, self).__init__(app, name) @@ -335,168 +107,109 @@ return self.get(session) == "c" class ExchangeKeysField(FormField): - def __init__(self, app, name, vhost, title="Initial bindings:"): + def __init__(self, app, name, exchange): super(ExchangeKeysField, self).__init__(app, name) - assert vhost + self.title = "Initial bindings" + self.exchange = exchange - self.vhost = vhost + name = StringParameter(app, "name") + self.names = ListParameter(app, "names", name) + self.add_parameter(self.names) - self.dict_param = DictParameter(app, "exchange") - self.add_parameter(self.dict_param) + value = StringParameter(app, "value") + self.values = ListParameter(app, "values", value) + self.add_parameter(self.values) - self.direct_input = DirectExchangeInput(app, "direct") - self.add_child(self.direct_input) + self.count = IntegerParameter(app, "count") + self.count.default = 3 + self.add_parameter(self.count) - self.topic_input = TopicExchangeInput(app, "topic") - self.add_child(self.topic_input) + self.inputs_container_tmpl = WidgetTemplate(self, "input_container_html") + self.inputs_tmpl = WidgetTemplate(self, "inputs_html") - self.fanout_input = FanoutExchangeInput(app, "fanout") - self.add_child(self.fanout_input) + def init(self): + """ we added parameters directly to the FormField instead + of adding FormInputs. XXX should this logic be moved up to FormField? """ + super(ExchangeKeysField, self).init() + for param in self.parameters: + self.form.form_params.add(param) - self.xml_input = XMLExchangeInput(app, "xml") - self.add_child(self.xml_input) - - self.headers_input = HeadersExchangeInput(app, "headers") - self.add_child(self.headers_input) - - self.title = title - - self.binding_errors = self.Errors(self, "binding_errors") - self.add_attribute(self.binding_errors) - - self.state = ExchangeState(app, "phase") - self.add_child(self.state) - - class Errors(Attribute): - def get_default(self, session): - return dict() - def render_title(self, session): return self.title - def render_exchanges(self, session): - vhost = self.vhost.get(session) - sortedExchanges = sorted_by(vhost.exchanges) - - # render each exchange we support + def render_input_fields(self, session, *args): + count = self.count.get(session) writer = Writer() - for exchange in sortedExchanges: - if ExchangeInfo.is_builtin(exchange) or \ - (not exchange._get_qmfDeleteTime() and \ - not (self.state.is_active(session) and not is_active(exchange))): - # instance_key gives us a unique path for each exchange - # we will be rendering - instance_key = self.dict_param.get_instance_key(str(exchange.id)) - if exchange.type == "direct": - if exchange.name: - self.direct_input.set_instance_data(exchange, instance_key) - writer.write(self.direct_input.render(session)) - elif exchange.type == "topic": - if not exchange.name == "qpid.management": - self.topic_input.set_instance_data(exchange, instance_key) - writer.write(self.topic_input.render(session)) - elif exchange.type == "fanout": - self.fanout_input.set_instance_data(exchange, instance_key) - writer.write(self.fanout_input.render(session)) - elif exchange.type == "xml": - self.xml_input.set_instance_data(exchange, instance_key) - writer.write(self.xml_input.render(session)) - elif exchange.type == "headers": - self.headers_input.set_instance_data(exchange, instance_key) - writer.write(self.headers_input.render(session)) + for i in range(count): + self.inputs_tmpl.render(writer, session, i) + return writer.to_string() + def render_inputs(self, session, *args): + writer = Writer() + self.inputs_container_tmpl.render(writer, session, *args) return writer.to_string() - def get_binding_errors(self, session, queue_name): - form_binding_info = self.process_binding_info(session, queue_name) - binding_info = self.dict_param.get(session) - berrs = self.binding_errors.get(session) + def render_n_name(self, session, i): + return self.names.path - for exchange in form_binding_info: - type = form_binding_info[exchange]["type"] - if (type == "topic") or (type == "direct"): - try: - val = form_binding_info[exchange]["key"] - if not val: - raise KeyError - except KeyError: - name = form_binding_info[exchange]["name"] - errs = berrs.setdefault(name, list()) - errs.append("A binding key is required") - elif type == "headers": - try: - val = form_binding_info[exchange]["key"] - if not val: - raise KeyError - except KeyError: - name = form_binding_info[exchange]["name"] - errs = berrs.setdefault(name, dict()) - errs["key"] = ["A binding key is required"] - for key_num in ("1", "2", "3"): - mkey = "mkey."+key_num - mkeynv = mkey+".nv" - if mkeynv in binding_info[exchange] and binding_info[exchange][mkeynv]: - try: - val = binding_info[exchange][mkey] - if not val: - raise KeyError - except KeyError: - name = binding_info[exchange]["name"] - if not name in berrs: - berrs.setdefault(name, dict()) - berrs[name][mkey] = ["Missing key"] - elif type == "xml": - try: - val = form_binding_info[exchange]["key"] - if not val: - raise KeyError - except KeyError: - name = form_binding_info[exchange]["name"] - errs = berrs.setdefault(name, dict()) - errs["key"] = ["A binding key is required"] - try: - val = binding_info[exchange]["xquery"] - if not val: - raise KeyError - except KeyError: - name = binding_info[exchange]["name"] - if not name in berrs: - berrs.setdefault(name, dict()) - berrs[name]["xquery"] = ["Missing xquery"] + def render_v_name(self, session, i): + return self.values.path - return (len(berrs), form_binding_info) + def render_n_value(self, session, i): + names = self.names.get(session) + return len(names) > i and names[i] or "" - def process_binding_info(self, session, queue_name): - """ Processes the raw binding_info from the DictParameter into - a "form_binding_info" dictionary that contains four keys: - name, key, arguments, and type - """ - binding_info = self.dict_param.get(session) - form_binding_info = dict() - for this_exchange in binding_info: - # if the exchange checkbox is checked - if "name" in binding_info[this_exchange]: - type = binding_info[this_exchange]["type"] - #if type == "direct": - # binding_info[this_exchange]["key"] = queue_name + def render_v_value(self, session, i): + values = self.values.get(session) + return len(values) > i and values[i] or "" - form_binding_info[this_exchange] = dict() - form_binding_info[this_exchange]["name"] = binding_info[this_exchange]["name"] - if "key" in binding_info[this_exchange] and binding_info[this_exchange]["key"]: - form_binding_info[this_exchange]["key"] = binding_info[this_exchange]["key"] - form_binding_info[this_exchange]["type"] = type + def get(self, session): + ret_dict = dict() + exchange = self.exchange.get(session) + if exchange: + if exchange.type == "headers" or exchange.type == "xml": + names = self.names.get(session) + values = self.values.get(session) - arguments = dict() - if type == "headers": - self.headers_input.process_input(binding_info[this_exchange], arguments) - elif type == "xml": - self.xml_input.process_input(binding_info[this_exchange], arguments) - #direct, topic and fanout exchanges don't have aditional arguments - form_binding_info[this_exchange]["arguments"] = arguments + for name, value in zip(names, values): + if name: + ret_dict[name] = value + return ret_dict - return form_binding_info + def validate(self, session): + exchange = self.exchange.get(session) + names = self.names.get(session) + values = self.values.get(session) + if exchange: + if exchange.type == "headers": + if not "x-match" in names: + error = FormError("x-match argument is required for this exchange") + self.form.errors.add(session, error) + + for i in range(len(names)): + if names[i]: + if names[i] == "x-match": + if not values[i] == "all" and not values[i] == "any": + error = FormError("Argument name x-match must have a value of <i>all</i> or <i>any</i>") + self.form.errors.add(session, error) + else: + if not values[i]: + error = FormError("Missing argument value for name: %s" % names[i]) + self.form.errors.add(session, error) + + for i in range(len(values)): + if values[i]: + if not names[i]: + error = FormError("Missing argument name for value: %s" % values[i]) + self.form.errors.add(session, error) + + elif exchange.type == "xml": + if not "xquery" in names: + error = FormError("xquery argument is required for this exchange") + self.form.errors.add(session, error) + class BindingSetTaskForm(CuminTaskForm): def __init__(self, app, name, task): super(BindingSetTaskForm, self).__init__(app, name, task) @@ -505,5 +218,3 @@ self.object = ListParameter(app, "binding", item) self.add_parameter(self.object) - -from exchange import ExchangeInfo Modified: mgmt/trunk/cumin/python/cumin/messaging/binding.strings =================================================================== --- mgmt/trunk/cumin/python/cumin/messaging/binding.strings 2010-03-23 17:06:23 UTC (rev 3877) +++ mgmt/trunk/cumin/python/cumin/messaging/binding.strings 2010-03-23 18:29:24 UTC (rev 3878) @@ -16,172 +16,26 @@ left outer join binding_stats as c on c.id = b.stats_curr_id {sql_where} -[ExchangeInput.name_html] -<td> - <input type="checkbox" id="{id}.{exchange_id}" name="{name_path}" - value="{exchange_name}" size="15" tabindex="100" {exchange_checked} - {onclick} /> - <input type="hidden" name="{exchange_type_path}" value="{exchange_type}" /> -</td> -<td><label class="exchange_name" for="{id}.{exchange_id}">{exchange_fmt_name}</label></td> -<td class="exchange_type">{exchange_type}</td> - -[ExchangeInput.key_html] -<td> - <input type="text" name="{key_path}" id="{exchange_name}" - value="{key_value}" size="32" maxlength="256" tabindex="100" /> - {key_error} -</td> - -[DirectExchangeInput.html] -<tr> - {exchange_name_input} - {exchange_key_input} -</tr> - -[TopicExchangeInput.html] -<tr> - {exchange_name_input} - {exchange_key_input} -</tr> - -[FanoutExchangeInput.html] -<tr> - {exchange_name_input} - <td> </td> -</tr> - -[XMLExchangeInput.html] -<tr> - {exchange_name_input} - {exchange_key_input} -</tr> -<tr id="{xml_extra}" class="{headers_class}"> - <td colspan="4"><table> - <tr> - <td>XQuery:</td> - <td colspan="3"><textarea name="{xquery_path}" id="{exchange_name}" tabindex="100" rows="4" cols="40">{xquery_value}</textarea>{xquery_error}</td> - </tr> - </table></td> -</tr> - -[HeadersExchangeInput.html] -<tr> - {exchange_name_input} - {exchange_key_input} -</tr> -<tr id="{headers_extra}" class="{headers_class}"> - <td colspan="4"><table> - <tr> - <td> </td> - <td>x-match Type:</td> - <td colspan="2"> - <input type="radio" id="headers.x-match.all" name="{x_match_path}" value="all" {all_checked}/> - <label for="headers.x-match.all">All</label> - <input type="radio" id="headers.x-match.any" name="{x_match_path}" value="any" {any_checked}/> - <label for="headers.x-match.any">Any</label> - </td> - </tr> - <tr> - <td> </td> - <td>Match Keys:</td> - <td colspan="2"> - <table class="xmlExchange"> - <thead> - <tr> - <th>Key</th><th>type, value</th> - </tr> - </thead> - <tbody> - <tr> - <td><input type="text" name="{mkey_path}.1" value="{mkey1_value}" tabindex="100" />{mkey1_error}</td> - <td><input type="text" name="{mkey_path}.1.nv" value="{mnv1_value}" tabindex="100" /></td> - </tr> - <tr> - <td><input type="text" name="{mkey_path}.2" value="{mkey2_value}" tabindex="100" />{mkey2_error}</td> - <td><input type="text" name="{mkey_path}.2.nv" value="{mnv2_value}" tabindex="100" /></td> - </tr> - <tr> - <td><input type="text" name="{mkey_path}.3" value="{mkey3_value}" tabindex="100" />{mkey3_error}</td> - <td><input type="text" name="{mkey_path}.3.nv" value="{mnv3_value}" tabindex="100" /></td> - </tr> - </tbody> - </table> - </td> - </tr> -</table></td></tr> - [ExchangeKeysField.css] -table.FormFieldSet div.inputs { - position: relative; - left: -4em; -} - -td.exchange_type { - font-style: italic; -} - -table.mobjects tr#headers_extra { - border-top: 0px; -} - -table.mobjects tr.initial_header_state { - display:none; -} - -table.xmlExchange { - border-collapse: collapse; - border: 1px dotted #ccc; - margin: 0; -} - -table.xmlExchange tr { - border-top: 0px solid #fff; -} - -table.mobjects label.exchange_name { +table th.NameHeader { + color: red; + font-size: 0.8em; font-weight: bold; + text-align: left; } -table.mobjects td.exchange_type, table.mobjects th.exchange_type { - font-style: italic; -} -[ExchangeKeysField.javascript] -function toggle_row(chk, row_id) { - var display = "none"; - var headers_extra = document.getElementById(row_id); +[ExchangeKeysField.input_container_html] +<table> + <tr> + <th class="NameHeader">Name</th> + <th class="NameHeader">Value</th> + </tr> + {input_fields} +</table> - if (chk.checked) { - display = "table-row"; - } - - headers_extra.style.display = display; -} - -[ExchangeKeysField.html] +[ExchangeKeysField.inputs_html] <tr> - <th> - <div class="title">{title}</div> - <div class="help">{help}</div> - </th> - <td> - <div class="rfloat">{phase}</div> - <div class="rclear"> </div> - - <div class="inputs"> - <table class="mobjects" id="exchange_types"> - <thead> - <tr> - <th colspan="2"><label class="exchange_name">Exchange Name</label></th> - <th class="exchange_type">Exchange Type</th> - <th>Binding Key</th> - </tr> - </thead> - <tbody> - {exchanges} - </tbody> - </table> - </div> - </td> + <td><input class="NameInput" type="text" size="15" name="{n_name}" value="{n_value}" tabindex="100"/> = </td> + <td><input class="ValueInput" type="text" size="15" name="{v_name}" value="{v_value}" tabindex="100"/></td> </tr> Modified: mgmt/trunk/cumin/python/cumin/messaging/broker.py =================================================================== --- mgmt/trunk/cumin/python/cumin/messaging/broker.py 2010-03-23 17:06:23 UTC (rev 3877) +++ mgmt/trunk/cumin/python/cumin/messaging/broker.py 2010-03-23 18:29:24 UTC (rev 3878) @@ -358,3 +358,164 @@ if len(brokers): self.task.invoke(session, brokers, groups) self.task.exit_with_redirect(session, brokers) + +class BindingAddForm(FieldSubmitForm): + def __init__(self, app, name, task): + super(BindingAddForm, self).__init__(app, name) + + self.task = task + + self.vhost = VhostParameter(app, "vhost") + self.add_parameter(self.vhost) + + self.queue = QueueParameter(app, "queue") + self.add_parameter(self.queue) + self.q_field = self.QueueBindingField(app, "q_field", self.vhost, self.queue) + self.add_field(self.q_field) + + self.exchange = ExchangeParameter(app, "exchange") + self.add_parameter(self.exchange) + self.x_field = self.ExchangeBindingField(app, "x_field", self.vhost, self.exchange) + self.add_field(self.x_field) + + self.key = self.KeyField(app, "key") + self.add_field(self.key) + + self.bindings = self.ExchangeBindings(app, "bindings", self.exchange) + self.add_field(self.bindings) + + def init(self): + super(BindingAddForm, self).init() + self.form_params.add(self.queue) + self.form_params.add(self.exchange) + + def render_title(self, session): + obj = self.vhost.get(session) + if self.queue.get(session): + obj = self.queue.get(session) + if self.exchange.get(session): + obj = self.exchange.get(session) + return self.task.get_description(session, obj) + + def render_key_id(self, session): + return self.key.path + + def validate(self, session): + super(BindingAddForm, self).validate(session) + + queue = self.queue.get(session) + exchange = self.exchange.get(session) + key = self.key.get(session) + + if not queue: + error = FormError("A valid queue name is required") + self.errors.add(session, error) + if not exchange: + error = FormError("A valid exchange name is required") + self.errors.add(session, error) + else: + if not exchange.type == "fanout": + if not key: + error = MissingValueError(self.key) + self.errors.add(session, error) + + def process_submit(self, session): + self.validate(session) + if not self.errors.get(session): + vhost = self.vhost.get(session) + queue = self.queue.get(session) + exchange = self.exchange.get(session) + key = self.key.get(session) + arguments = self.bindings.get(session) + + self.task.task_invoke(session, vhost, queue, exchange, key, arguments) + self.task.exit_with_redirect(session, queue) + + class KeyField(StringField): + def render_row_id(self, session): + return "id='%s'" % self.path + + def render_title(self, session): + return "Binding Key" + + class QueueBindingField(ScalarField): + def __init__(self, app, name, vhost, queue): + input = QueueInput(app, "input", vhost, queue) + super(BindingAddForm.QueueBindingField, self).__init__(app, name, input) + self.add_child(input) + + def render_title(self, session): + return "Queue" + + class ExchangeBindingField(ScalarField): + def __init__(self, app, name, vhost, exchange): + input = ExchangeInput(app, "input", vhost, exchange) + super(BindingAddForm.ExchangeBindingField, self).__init__(app, name, input) + self.add_child(input) + + def render_title(self, session): + return "Exchange" + + class ExchangeBindings(ExchangeKeysField): + def render_id(self, session, *args): + s = fmt_bytes(1) + cls = "ExchangeHiddenRow" + exchange = self.exchange.get(session) + if exchange and exchange.type == 'headers': + cls = "" + return cls and "%s\" class=\"%s" % (self.path, cls) or self.path + + def render_title(self, session): + return "Arguments" + +class BaseBindingInput(IncrementalSearchInput): + def __init__(self, app, name, vhost, field_param): + super(BaseBindingInput, self).__init__(app, name, field_param) + + self.vhost = vhost + self.field = field_param + + def render_item_content(self, session, field): + return field.name or "Default" + + def render_item_value(self, session, field): + return field.id + + def render_value(self, session): + if self.disabled: + field = self.field.get(session) + return fmt_shorten(field.name, pre=36, post=4) + else: + input_value = self.param.get(session) + return input_value and input_value or "" + + def base_get_items(self, session, objects): + obj_list = [] + if not self.disabled: + obj_list_full = sorted_by(list(objects)) + + delta = timedelta(minutes=10) + for _obj in obj_list_full: + if (_obj.qmfUpdateTime > (datetime.now() - delta)): + obj_list.append(_obj) + + return obj_list + +class QueueInput(BaseBindingInput): + def do_get_items(self, session): + vhost = self.vhost.get(session) + return self.base_get_items(session, vhost.queues) + +class ExchangeInput(BaseBindingInput): + def render_item_value(self, session, exchange): + return "%s|%s" % (exchange.id, exchange.type) + + def render_key_id(self, session): + return self.parent.parent.parent.key.path + + def render_args_id(self, session): + return self.parent.parent.parent.bindings.path + + def do_get_items(self, session): + vhost = self.vhost.get(session) + return sorted_by(list(vhost.exchanges)) \ No newline at end of file Modified: mgmt/trunk/cumin/python/cumin/messaging/broker.strings =================================================================== --- mgmt/trunk/cumin/python/cumin/messaging/broker.strings 2010-03-23 17:06:23 UTC (rev 3877) +++ mgmt/trunk/cumin/python/cumin/messaging/broker.strings 2010-03-23 18:29:24 UTC (rev 3878) @@ -149,3 +149,45 @@ window.addEvent('domready',function () { $$('button')[0].focus(); }); + +[BindingAddForm.javascript] +function bindingExchangeChanged(xtype, keyid, argsid) { + var keyrow = $(keyid); + var keytitle = keyrow.getElement('div'); + var keyinput = keyrow.getElement('input'); + if (xtype == 'fanout') { + keyinput.setProperty('disabled', true); + } else { + keyinput.setProperty('disabled', false); + } + var argsrow = $(argsid); + if (xtype == 'headers') { + argsrow.setStyle('display', 'table-row'); + var names = argsrow.getElements("input.NameInput"); + names.each( function (item, index) { item.value = ""; } ); + names[0].value = "x-match"; + names[1].focus(); + var values = argsrow.getElements("input.ValueInput"); + values.each( function (item, index) { item.value = ""; } ); + values[0].value = "all"; + } else { + argsrow.setStyle('display', 'none'); + } +} + +[ExchangeBindings.css] +tr.ExchangeHiddenRow { + display: none; +} + +[ExchangeInput.select_html] + function (value, data) { + if (typeof data == "undefined") + data = "|"; + var exchangeData = data.split('|'); + var xid = exchangeData[0], xtype = exchangeData[1]; + var xinput = document.forms[0].elements['{alt_value_path}']; + xinput.value = xid; + bindingExchangeChanged(xtype, '{key_id}', '{args_id}'); + } + Modified: mgmt/trunk/cumin/python/cumin/messaging/exchange.py =================================================================== --- mgmt/trunk/cumin/python/cumin/messaging/exchange.py 2010-03-23 17:06:23 UTC (rev 3877) +++ mgmt/trunk/cumin/python/cumin/messaging/exchange.py 2010-03-23 18:29:24 UTC (rev 3878) @@ -228,6 +228,9 @@ self.set_default_column_name("q_id") + task = main.module.xbinding_add + self.links.add_child(TaskLink(app, "add", task, self.exchange)) + def get_visible_columns(self, session): return self.get_request_visible_columns(session, ["q_id"]) Modified: mgmt/trunk/cumin/python/cumin/messaging/main.py =================================================================== --- mgmt/trunk/cumin/python/cumin/messaging/main.py 2010-03-23 17:06:23 UTC (rev 3877) +++ mgmt/trunk/cumin/python/cumin/messaging/main.py 2010-03-23 18:29:24 UTC (rev 3878) @@ -19,6 +19,7 @@ self.exchange_add = ExchangeAddTask(app, broker) self.link_add = LinkAddTask(app, broker) self.queue_add = QueueAddTask(app, broker) + self.bbinding_add = BindingAddTask(app, broker) broker_group = app.model.broker_group @@ -34,13 +35,14 @@ self.queue_set_remove = QueueSetRemoveTask(app, queue) self.queue_purge = QueuePurgeTask(app, queue) self.queue_set_purge = QueueSetPurgeTask(app, queue) - self.binding_add = BindingAddTask(app, queue) + self.qbinding_add = QBindingAddTask(app, queue) self.move_messages = MoveMessagesTask(app, queue) exchange = app.model.exchange self.exchange_remove = ExchangeRemoveTask(app, exchange) self.exchange_set_remove = ExchangeSetRemoveTask(app, exchange) + self.xbinding_add = XBindingAddTask(app, exchange) binding = app.model.binding Modified: mgmt/trunk/cumin/python/cumin/messaging/model.py =================================================================== --- mgmt/trunk/cumin/python/cumin/messaging/model.py 2010-03-23 17:06:23 UTC (rev 3877) +++ mgmt/trunk/cumin/python/cumin/messaging/model.py 2010-03-23 18:29:24 UTC (rev 3878) @@ -161,27 +161,6 @@ def do_enter(self, session, queues): self.form.object.set(session, queues) -class BindingAddTask(Task): - def __init__(self, app, cls): - super(BindingAddTask, self).__init__(app, cls) - - self.form = BindingAddForm(app, "binding_add", self) - - def get_title(self, session): - return "Add binding" - - def get_description(self, session, queue): - return "Add binding to queue '%s'" % queue.name - - def do_enter(self, session, queue): - self.form.queue.set(session, queue) - - def do_invoke(self, session, queue, exchange, binding_key, arguments): - session = self.app.model.get_session_by_object(queue) - session.exchange_bind(queue=queue.name, exchange=exchange.name, - binding_key=binding_key, arguments=arguments) - session.sync() - class BindingRemoveTask(Task): def __init__(self, app, cls): super(BindingRemoveTask, self).__init__(app, cls) @@ -492,3 +471,68 @@ port = broker.port return "%s:%i" % (name, port) + +class BindingAddTask(Task): + def __init__(self, app, cls, name=None): + super(BindingAddTask, self).__init__(app, cls) + + name = name or "bbinding_add" + self.form = BindingAddForm(app, name, self) + + def get_title(self, session): + return "Add binding" + + def get_description(self, session, vhost): + return "Add binding to broker '%s'" % get_vhost_name(vhost) + + def do_enter(self, session, vhost): + self.form.vhost.set(session, vhost) + + def task_invoke(self, session, vhost, queue, exchange, key, arguments): + self.invoke(session, vhost, queue, exchange, key, arguments) + + def do_invoke(self, session, vhost, queue, exchange, binding_key, arguments): + msess = self.app.model.get_session_by_object(vhost) + msess.exchange_bind(queue=queue.name, exchange=exchange.name, + binding_key=binding_key, arguments=arguments) + msess.sync() + +class QBindingAddTask(BindingAddTask): + def __init__(self, app, cls): + super(QBindingAddTask, self).__init__(app, cls, "qbinding_add") + + self.form.q_field.input.disabled = True + + def get_description(self, session, queue): + return "Add binding to queue '%s'" % queue.name + + def do_enter(self, session, queue): + super(QBindingAddTask, self).do_enter(session, queue.vhost) + self.form.queue.set(session, queue) + + def task_invoke(self, session, vhost, queue, exchange, key, arguments): + """ invoke needs to be called with the tasks's object first """ + self.invoke(session, queue, vhost, exchange, key, arguments) + + def do_invoke(self, session, queue, vhost, exchange, binding_key, arguments): + super(QBindingAddTask, self).do_invoke(session, vhost, queue, exchange, binding_key, arguments) + +class XBindingAddTask(BindingAddTask): + def __init__(self, app, cls): + super(XBindingAddTask, self).__init__(app, cls, "xbinding_add") + + self.form.x_field.input.disabled = True + + def get_description(self, session, exchange): + return "Add binding to exchange '%s'" % exchange.name + + def do_enter(self, session, exchange): + super(XBindingAddTask, self).do_enter(session, exchange.vhost) + self.form.exchange.set(session, exchange) + + def task_invoke(self, session, vhost, queue, exchange, key, arguments): + """ invoke needs to be called with the tasks's object first """ + self.invoke(session, exchange, vhost, queue, key, arguments) + + def do_invoke(self, session, exchange, vhost, queue, binding_key, arguments): + super(XBindingAddTask, self).do_invoke(session, vhost, queue, exchange, binding_key, arguments) Modified: mgmt/trunk/cumin/python/cumin/messaging/queue.py =================================================================== --- mgmt/trunk/cumin/python/cumin/messaging/queue.py 2010-03-23 17:06:23 UTC (rev 3877) +++ mgmt/trunk/cumin/python/cumin/messaging/queue.py 2010-03-23 18:29:24 UTC (rev 3878) @@ -220,7 +220,7 @@ self.set_default_column_name("e_id") - task = main.module.binding_add + task = main.module.qbinding_add self.links.add_child(TaskLink(app, "add", task, self.queue)) def get_visible_columns(self, session): @@ -289,8 +289,8 @@ self.q_count = self.QCountField(app, "q_count") self.more.add_field(self.q_count) - self.bindings = ExchangeKeysField(app, "bindings", self.vhost) - self.add_field(self.bindings) + #self.bindings = ExchangeKeysField(app, "bindings", self.vhost) + #self.add_field(self.bindings) class AdvancedOptions(MoreFieldSet): def render_title(self, session): @@ -450,11 +450,11 @@ errors = self.errors.get(session) - binding_errors, binding_info = self.bindings.get_binding_errors \ - (session, name) + #binding_errors, binding_info = self.bindings.get_binding_errors \ + # (session, name) - if not errors: - errors = binding_errors + #if not errors: + # errors = binding_errors if not errors: invoc = self.task.start(session, vhost) @@ -486,6 +486,7 @@ durable=durable, arguments=args) + """ for exchange in binding_info: if "key" in binding_info[exchange]: binding_key = binding_info[exchange]["key"] @@ -499,6 +500,7 @@ exchange=ename, binding_key=binding_key, arguments=eargs) + """ self.task.end(invoc) except Exception, e: @@ -587,53 +589,6 @@ def render_prop_items(self, session): return self.sum_props.render_items(session) -class BindingAddForm(FieldSubmitForm): - def __init__(self, app, name, task): - super(BindingAddForm, self).__init__(app, name) - - self.task = task - - self.queue = QueueParameter(app, "queue") - self.add_parameter(self.queue) - - self.vhost = self.VhostAttribute(app, "vhost") - self.add_attribute(self.vhost) - - self.props = BindSummaryPropertiesField(app, "props", self.queue) - self.add_field(self.props) - - self.bindings = self.ExchangeBindings(app, "bindings", self.vhost) - self.add_field(self.bindings) - - class ExchangeBindings(ExchangeKeysField): - def render_title(self, session): - return "Exchange Bindings" - - class VhostAttribute(Attribute): - def get(self, session): - return self.widget.queue.get(session).vhost - - def process_submit(self, session): - queue = self.queue.get(session) - errors, form_binding_info = self.bindings.get_binding_errors \ - (session, queue.name) - - if not len(form_binding_info): - # no exchanges were selected is not an error that - # ExchangeKeysField looks for - error = FormError("At least one exchange must be selected") - self.errors.add(session, error) - - if not self.errors.get(session): - print "XXX queue binding add", queue, form_binding_info - - #self.task.invoke(session, queue, args) - self.task.exit_with_redirect(session, queue) - - def render_title(self, session): - queue = self.queue.get(session) - return self.task.get_description(session, queue) - class BindingRemoveForm(CuminTaskForm): def __init__(self, app, name, task): super(BindingRemoveForm, self).__init__(app, name, task) @@ -767,17 +722,15 @@ return "Transactional messages enqueued and dequeued" class QueueSelectField(FormField): - def __init__(self, app, name, form): + def __init__(self, app, name, form, queue): super(QueueSelectField, self).__init__(app, name) - self.queue_set = self.QueueSearchInputSet(app, "queue_set") + self.queue = queue + self.queue_set = self.QueueSearchInputSet(app, "queue_set", self.queue) self.add_child(self.queue_set) - self.param = self.QueueStringParameter(app, "param", self.queue_set) - self.add_parameter(self.param) - def get(self, session): - return self.param.get(session) + return self.queue.get(session) def render_title(self, session): return "Select the destination queue" @@ -787,7 +740,7 @@ class QueueSearchInputSet(IncrementalSearchInput): def do_get_items(self, session): - queue = self.form.queue.get(session) # XXX + queue = self.value_param.get(session) # XXX queue_list_full = sorted_by(list(queue.vhost.queues)) delta = timedelta(minutes=10) queue_list = [] @@ -800,20 +753,6 @@ def render_item_content(self, session, queue): return queue.name or "<em>Default</em>" - class QueueStringParameter(Parameter): - def __init__(self, app, name, queue_string): - super(QueueSelectField.QueueStringParameter, self).__init__(app, name) - - self.queue_string = queue_string - - def get(self, session): - queue_string = self.queue_string.get(session) - queue_where = "name = '%s'" % queue_string - try: - return Queue.select(queue_where)[0] - except IndexError: - return None - class MoveMessagesForm(FieldSubmitForm): def __init__(self, app, name, task): super(MoveMessagesForm, self).__init__(app, name) @@ -823,7 +762,7 @@ self.queue = QueueParameter(app, "queue") self.add_parameter(self.queue) - self.dest_queue = QueueSelectField(app, "dest", self) + self.dest_queue = QueueSelectField(app, "dest", self, self.queue) self.add_field(self.dest_queue) self.count = MultiplicityField(app, "count") Modified: mgmt/trunk/cumin/python/cumin/widgets.py =================================================================== --- mgmt/trunk/cumin/python/cumin/widgets.py 2010-03-23 17:06:23 UTC (rev 3877) +++ mgmt/trunk/cumin/python/cumin/widgets.py 2010-03-23 18:29:24 UTC (rev 3878) @@ -1529,8 +1529,39 @@ import cumin.account.model class IncrementalSearchInput(StringInput, ItemSet): + def __init__(self, app, name, field_param): + super(IncrementalSearchInput, self).__init__(app, name) + + self.disabled_tmpl = WidgetTemplate(self, "disabled_html") + self.select_tmpl = WidgetTemplate(self, "select_html") + + self.value_param = field_param + def do_get_items(self, session): return () def render_item_class(self, session, item): return "list_item" + + def render_alt_value_path(self, session): + return self.value_param.path + + def render_alt_value(self, session): + value_param = self.value_param.get(session) + return value_param and value_param.id or "" + + def render_select(self, session, *args): + writer = Writer() + self.select_tmpl.render(writer, session, *args) + return writer.to_string() + + def do_render(self, session, *args): + if self.disabled: + writer = Writer() + + self.disabled_tmpl.render(writer, session, *args) + + return writer.to_string() + else: + return super(IncrementalSearchInput, self).do_render(session, *args) + Modified: mgmt/trunk/cumin/python/cumin/widgets.strings =================================================================== --- mgmt/trunk/cumin/python/cumin/widgets.strings 2010-03-23 17:06:23 UTC (rev 3877) +++ mgmt/trunk/cumin/python/cumin/widgets.strings 2010-03-23 18:29:24 UTC (rev 3878) @@ -326,9 +326,17 @@ div.CuminSummary { width: 50em; margin: 0 0 2em 0; - min-height: 6em; + min-height: 4em; } +div.CuminSummary:after { + content: "."; + display: block; + height: 0; + clear: both; + visibility: hidden; +} + div.CuminSummary h1 { font-size: 1.1em; margin: 0; @@ -894,20 +902,45 @@ width: 80%; } +[IncrementalSearchInput.javascript] +addJavascript('resource?name=incrementalSearch.js', 'head'); + [IncrementalSearchInput.css] -div.IncrementalSearchInput ul { +div.IncrementalSearchInput select { display: none; } +div.IncrementalSearchInput input[disabled='disabled'] { + background:white; + color:black; + border: 0px solid white; + cursor:default; +} [IncrementalSearchInput.html] <div class="IncrementalSearchInput"> -<input id="{id}" type="text" name="{name}" value="{value}" tabindex="{tab_index}" {disabled_attr} size="{size}" autocomplete="off"/> -<ul id="{id}.list">{items}</ul> + <input id="{id}" type="text" name="{name}" value="{value}" tabindex="{tab_index}" size="{size}" autocomplete="off"/> + <input id="{alt_value_path}" name="{alt_value_path}" type="hidden" value="{alt_value}" /> + <select id="{id}.list">{items}</select> </div> <script type="text/javascript"> //<![CDATA[ -window.addEvent("domready", function () { - new IncrementalSearch($("{id}"), Inc_CIBeginning, "autocomplete", "{id}.list", 8); }); +window.addEvent("domready", + function () { + new IncrementalSearch($("{id}"), Inc_CIBeginning, "autocomplete", "{id}.list", 8).onselect= + {select} + } +); //]]> </script> +[IncrementalSearchInput.item_html] +<option value="{item_value}">{item_content}</option> + +[IncrementalSearchInput.select_html] + function (value, data) { if (typeof data == "undefined") data = ""; $('{alt_value_path}').value = data; } + +[IncrementalSearchInput.disabled_html] +<div class="IncrementalSearchInput"> +{value} +<input id="{alt_value_path}" name="{alt_value_path}" type="hidden" value="{alt_value}" /> +</div> Modified: mgmt/trunk/cumin/resources/app.css =================================================================== --- mgmt/trunk/cumin/resources/app.css 2010-03-23 17:06:23 UTC (rev 3877) +++ mgmt/trunk/cumin/resources/app.css 2010-03-23 18:29:24 UTC (rev 3878) @@ -592,6 +592,9 @@ border-top: none; background: #fff; z-index: 2; + /* padding: 0 0 0 0.25em; */ +} +.autocomplete div { padding: 0 0.25em; } .autocomplete .normal{border-top: 1px solid #fefefe;} Modified: mgmt/trunk/cumin/resources/app.js =================================================================== --- mgmt/trunk/cumin/resources/app.js 2010-03-23 17:06:23 UTC (rev 3877) +++ mgmt/trunk/cumin/resources/app.js 2010-03-23 18:29:24 UTC (rev 3878) @@ -482,4 +482,3 @@ s.setAttribute('src',jsname); th.appendChild(s); } -addJavascript('resource?name=incrementalSearch.js', 'head');

16 years, 1 month

1
0
0 / 0

rhmessaging commits: r3877 - mgmt/newdata/cumin/python/cumin/grid.

by rhmessaging-commits＠lists.jboss.org

Author: justi9 Date: 2010-03-23 13:06:23 -0400 (Tue, 23 Mar 2010) New Revision: 3877 Modified: mgmt/newdata/cumin/python/cumin/grid/negotiator.py mgmt/newdata/cumin/python/cumin/grid/negotiator.strings mgmt/newdata/cumin/python/cumin/grid/pool.py mgmt/newdata/cumin/python/cumin/grid/pool.strings mgmt/newdata/cumin/python/cumin/grid/scheduler.py mgmt/newdata/cumin/python/cumin/grid/scheduler.strings mgmt/newdata/cumin/python/cumin/grid/submitter.py mgmt/newdata/cumin/python/cumin/grid/submitter.strings Log: More new data integration Modified: mgmt/newdata/cumin/python/cumin/grid/negotiator.py =================================================================== --- mgmt/newdata/cumin/python/cumin/grid/negotiator.py 2010-03-23 16:42:18 UTC (rev 3876) +++ mgmt/newdata/cumin/python/cumin/grid/negotiator.py 2010-03-23 17:06:23 UTC (rev 3877) @@ -1,79 +1,55 @@ - from wooly import * -from wooly.widgets import * from wooly.forms import * from wooly.resources import * from wooly.tables import * -from cumin.stat import * -from cumin.widgets import * -from cumin.parameters import * +from wooly.widgets import * + from cumin.formats import * +from cumin.model import FetchRawConfig, FetchRawConfigSet +from cumin.objectframe import * +from cumin.objectselector import * +from cumin.parameters import * +from cumin.stat import * from cumin.util import * +from cumin.widgets import * -from submitter import SubmitterSet -from cumin.model import FetchRawConfig, FetchRawConfigSet import main strings = StringCatalog(__file__) -log = logging.getLogger("cumin.negotiator") +log = logging.getLogger("cumin.grid.negotiator") -class NegotiatorSet(CuminSelectionTable): - def __init__(self, app, name): - item = NegotiatorParameter(app, "item") - super(NegotiatorSet, self).__init__(app, name, item) +class NegotiatorSelector(ObjectSelector): + def __init__(self, app, name, pool): + cls = app.rosemary.mrg_grid.Negotiator - col = self.NameColumn(app, "name") - self.add_column(col) - self.set_default_column(col) + super(NegotiatorSelector, self).__init__(app, name, cls) - col = self.SystemColumn(app, "system") - self.add_column(col) + self.pool = pool - task = main.module.negotiator_set_start - button = TaskButton(app, "start", task, self.selection) - self.buttons.add_child(button) + self.add_filter(self.pool, cls.Pool, cls.Pool) - task = main.module.negotiator_set_stop - button = TaskButton(app, "stop", task, self.selection) - self.buttons.add_child(button) + frame = "main.grid.pool.negotiator" + col = ObjectLinkColumn(app, "name", cls.Name, cls._id, frame) + self.add_column(col) - def render_title(self, session): - count = self.get_item_count(session) - return "Negotiators %s" % fmt_count(count) + # self.add_attribute_column(cls.MyAddress) + self.add_attribute_column(cls.Machine) + self.add_attribute_column(cls.System) - def render_sql_where(self, session): - sql = "((c.qmf_update_time is not null and " + \ - "c.qmf_update_time > now() - interval '10 minutes')" + \ - " and qmf_delete_time is null)" - return "where %s" % sql + self.add_selection_task(main.module.negotiator_set_start) + self.add_selection_task(main.module.negotiator_set_stop) - class NameColumn(SqlTableColumn): - def render_title(self, session): - return "Name" +class NegotiatorFrame(ObjectFrame): + def __init__(self, app, name): + cls = app.rosemary.mrg_grid.Negotiator - def render_content(self, session, data): - branch = session.branch() + super(NegotiatorFrame, self).__init__(app, name, cls) - neg = Identifiable(data["id"]) - self.app.model.negotiator.show_object(branch, neg) + # self.icon_href = "resource?name=negotiator-36.png" - return fmt_olink(branch, neg, name=data["name"]) - - class SystemColumn(SqlTableColumn): - def render_title(self, session): - return "System" - - def render_content(self, session, data): - id = data["system_id"] - - if id: - sys = Identifiable(id) - href = self.page.main.inventory.system.get_href(session, sys) - return fmt_link(href, data["system_name"]) - -class NegotiatorFrame(CuminFrame): +class OldNegotiatorFrame(CuminFrame): def __init__(self, app, name): - super(NegotiatorFrame, self).__init__(app, name) + super(OldNegotiatorFrame, self).__init__(app, name) self.object = NegotiatorParameter(app, "id") self.add_parameter(self.object) @@ -307,9 +283,7 @@ self.negotiator = negotiator - self.users = self.Users(app, "users") - self.users.update_enabled = False - self.add_child(self.users) + self.users = self.Users() def get_group_names(self, session): groups = self.groups.get(session) @@ -405,8 +379,11 @@ def get_default(self, session): return list() - class Users(SubmitterSet): + class Users(object): def get(self, session, groups): + # XXX rewrite this for the new data + return dict() + #returns {group: [user, user], group: [user, user], ...} users = self.items.get(session) if not users: @@ -423,9 +400,6 @@ self.items.set(session, users) return users - def render_sql_limit(self, session, *args): - return "" - class AddGroupForm(CuminTaskForm): def __init__(self, app, name, task): super(AddGroupForm, self).__init__(app, name, task) @@ -926,4 +900,3 @@ link = TaskLink(app, "edit", task, negotiator) self.add_child(link) - Modified: mgmt/newdata/cumin/python/cumin/grid/negotiator.strings =================================================================== --- mgmt/newdata/cumin/python/cumin/grid/negotiator.strings 2010-03-23 16:42:18 UTC (rev 3876) +++ mgmt/newdata/cumin/python/cumin/grid/negotiator.strings 2010-03-23 17:06:23 UTC (rev 3877) @@ -1,21 +1,3 @@ -[NegotiatorSet.sql] -select - n.id, - n.name, - y.id as system_id, - y.node_name as system_name -from negotiator as n -left outer join negotiator_stats as c on c.id = n.stats_curr_id -left outer join sysimage as y on n.system = y.node_name -{sql_where} -{sql_orderby} -{sql_limit} - -[NegotiatorSet.count_sql] -select count(1) from negotiator as n -left outer join negotiator_stats as c on c.id = n.stats_curr_id -{sql_where} - [NegotiatorOverview.css] div.GroupTable ul.actions { display: inline; Modified: mgmt/newdata/cumin/python/cumin/grid/pool.py =================================================================== --- mgmt/newdata/cumin/python/cumin/grid/pool.py 2010-03-23 16:42:18 UTC (rev 3876) +++ mgmt/newdata/cumin/python/cumin/grid/pool.py 2010-03-23 17:06:23 UTC (rev 3877) @@ -1,11 +1,12 @@ import logging from wooly import * -from wooly.widgets import * from wooly.forms import * from wooly.resources import * from wooly.sql import * from wooly.tables import * +from wooly.widgets import * + from cumin.objectframe import * from cumin.objectselector import * from cumin.stat import * @@ -14,14 +15,14 @@ from cumin.formats import * from cumin.util import * +from collector import * from job import * +from limit import * +from negotiator import * from scheduler import * +from slot import * from submission import * -from submitter import SubmitterSet, SubmitterFrame -from collector import CollectorSet, CollectorFrame -from negotiator import NegotiatorSet, NegotiatorFrame -from limit import LimitSet, LimitFrame -from slot import * #SlotSet, SlotFrame, SlotMap, SlotMapPage, SlotActivities +from submitter import * from cumin.widgets import Session @@ -59,9 +60,12 @@ self.slot = SlotFrame(app, "slot") self.add_mode(self.slot) - self.scheduler = SchedulerFrame(app, "scheduler") + self.scheduler = SchedulerFrame(app, "scheduler", self.object) self.add_mode(self.scheduler) + self.negotiator = NegotiatorFrame(app, "negotiator") + self.add_mode(self.negotiator) + submissions = SubmissionSelector(app, "submissions", self.object) self.view.add_tab(submissions) @@ -71,6 +75,9 @@ schedulers = SchedulerSelector(app, "schedulers", self.object) self.view.add_tab(schedulers) + negotiators = NegotiatorSelector(app, "negotiators", self.object) + self.view.add_tab(negotiators) + class OldPoolFrame(CuminFrame): def __init__(self, app, name): super(OldPoolFrame, self).__init__(app, name) @@ -172,52 +179,6 @@ pool = self.pool.get(session) return {"pool": pool.id} -class PoolSchedulerSet(SchedulerSet): - def render_sql_where(self, session): - return "where s.pool = %(pool)s" - - def get_sql_values(self, session): - pool = self.frame.object.get(session) - return {"pool": pool.id} - - def render_title(self, session): - count = self.get_item_count(session) - return "Schedulers %s" % fmt_count(count) - -class PoolCollectorSet(CollectorSet): - def __init__(self, app, name, pool): - super(PoolCollectorSet, self).__init__(app, name) - - self.pool = pool - - def render_sql_where(self, session): - return "where c.pool = %(pool)s" - - def get_sql_values(self, session): - pool = self.pool.get(session) - return {"pool": pool.id} - - def render_title(self, session): - count = self.get_item_count(session) - return "Collectors %s" % fmt_count(count) - -class PoolNegotiatorSet(NegotiatorSet): - def __init__(self, app, name, pool): - super(PoolNegotiatorSet, self).__init__(app, name) - - self.pool = pool - - def render_sql_where(self, session): - return "where n.pool = %(pool)s" - - def get_sql_values(self, session): - pool = self.pool.get(session) - return {"pool": pool.id} - - def render_title(self, session): - count = self.get_item_count(session) - return "Negotiators %s" % fmt_count(count) - class PoolOverview(Widget): def __init__(self, app, name, pool): super(PoolOverview, self).__init__(app, name) @@ -448,4 +409,3 @@ def render_content(self, session): return self.flash_chart.render(session) - Modified: mgmt/newdata/cumin/python/cumin/grid/pool.strings =================================================================== --- mgmt/newdata/cumin/python/cumin/grid/pool.strings 2010-03-23 16:42:18 UTC (rev 3876) +++ mgmt/newdata/cumin/python/cumin/grid/pool.strings 2010-03-23 17:06:23 UTC (rev 3877) @@ -1,19 +1,3 @@ -[PoolSet.sql] -select - p.pool as id, - p.name, - c.running_jobs, - c.idle_jobs, - c.hosts_total as slots -from collector as p -left outer join collector_stats as c on c.id = p.stats_curr_id -{sql_where} - -[PoolSet.count_sql] -select count(*) -from collector as p -{sql_where} - [PoolOverview.css] div#PoolOverview div.col1, div#PoolOverview div.col2 { float: left; Modified: mgmt/newdata/cumin/python/cumin/grid/scheduler.py =================================================================== --- mgmt/newdata/cumin/python/cumin/grid/scheduler.py 2010-03-23 16:42:18 UTC (rev 3876) +++ mgmt/newdata/cumin/python/cumin/grid/scheduler.py 2010-03-23 17:06:23 UTC (rev 3877) @@ -46,79 +46,22 @@ self.add_selection_task(main.module.scheduler_set_stop) class SchedulerFrame(ObjectFrame): - def __init__(self, app, name): + def __init__(self, app, name, pool): cls = app.rosemary.mrg_grid.Scheduler super(SchedulerFrame, self).__init__(app, name, cls) -class SchedulerSet(CuminSelectionTable): - def __init__(self, app, name, pool): - item = SchedulerParameter(app, "item") - super(SchedulerSet, self).__init__(app, name, item) + self.submitter = SubmitterFrame(app, "submitter") + self.add_mode(self.submitter) - col = self.NameColumn(app, "name") - self.add_column(col) - self.set_default_column(col) + submissions = SubmissionSelector(app, "submissions", pool) + submissions.add_reference_filter \ + (self.object, submissions.cls.schedulerRef) + self.view.add_tab(submissions) - col = self.SystemColumn(app, "system") - self.add_column(col) + submitters = SubmitterSelector(app, "submitters", self.object) + self.view.add_tab(submitters) - col = self.UsersColumn(app, "users") - col.align = "right" - self.add_column(col) - - col = self.RunningJobsColumn(app, "running") - col.align = "right" - self.add_column(col) - - col = self.HeldJobsColumn(app, "held") - col.align = "right" - self.add_column(col) - - task = main.module.scheduler_set_start - button = TaskButton(app, "start", task, self.selection) - self.buttons.add_child(button) - - task = main.module.scheduler_set_stop - button = TaskButton(app, "stop", task, self.selection) - self.buttons.add_child(button) - - def render_title(self, session, *args): - return "Schedulers %s" % fmt_count(Scheduler.select().count()) - - class NameColumn(SqlTableColumn): - def render_title(self, session): - return "Name" - - def render_content(self, session, data): - sched = Identifiable(data["id"]) - href = self.page.main.grid.pool.scheduler.get_href(session, sched) - return fmt_link(href, data["name"]) - - class UsersColumn(SqlTableColumn): - def render_title(self, session): - return "Users" - - class RunningJobsColumn(SqlTableColumn): - def render_title(self, session): - return "Running Jobs" - - class HeldJobsColumn(SqlTableColumn): - def render_title(self, session): - return "Held Jobs" - - class SystemColumn(SqlTableColumn): - def render_title(self, session): - return "System" - - def render_content(self, session, data): - id = data["system_id"] - - if id: - sys = Identifiable(id) - href = self.page.main.inventory.system.get_href(session, sys) - return fmt_link(href, data["system_name"]) - class SchedulerSelectField(ScalarField): def __init__(self, app, name, pool): super(SchedulerSelectField, self).__init__(app, name, None) @@ -226,34 +169,6 @@ def render_title(self, session): return "Jobs" -class SchedulerSubmissionSet(SubmissionSet): - def __init__(self, app, name, scheduler): - super(SchedulerSubmissionSet, self).__init__(app, name) - - self.scheduler = scheduler - - self.scheduler_col.visible = False - - def render_sql_where(self, session): - return "where d.id = %(id)r" - - def get_sql_values(self, session): - scheduler = self.scheduler.get(session) - return {"id": scheduler.id} - -class SchedulerSubmitterSet(SubmitterSet): - def __init__(self, app, name, scheduler): - super(SchedulerSubmitterSet, self).__init__(app, name) - - self.scheduler = scheduler - - def render_sql_where(self, session): - return "where d.id = %(id)r" - - def get_sql_values(self, session): - scheduler = self.scheduler.get(session) - return {"id": scheduler.id} - class SchedulerJobSet(JobTab): def __init__(self, app, name, pool): super(SchedulerJobSet, self).__init__(app, name, pool) Modified: mgmt/newdata/cumin/python/cumin/grid/scheduler.strings =================================================================== --- mgmt/newdata/cumin/python/cumin/grid/scheduler.strings 2010-03-23 16:42:18 UTC (rev 3876) +++ mgmt/newdata/cumin/python/cumin/grid/scheduler.strings 2010-03-23 17:06:23 UTC (rev 3877) @@ -1,23 +1,3 @@ -[SchedulerSet.sql] -select - s.id, - s.name, - y.id as system_id, - y.node_name as system_name, - c.num_users as users, - c.total_running_jobs as running, - c.total_held_jobs as held -from scheduler as s -left outer join scheduler_stats as c on c.id = s.stats_curr_id -left outer join sysimage as y on s.system = y.node_name -{sql_where} -{sql_orderby} -{sql_limit} - -[SchedulerSet.count_sql] -select count(1) from scheduler as s -{sql_where} - [SchedulerStats.html] <table class="twocol"> <tbody> Modified: mgmt/newdata/cumin/python/cumin/grid/submitter.py =================================================================== --- mgmt/newdata/cumin/python/cumin/grid/submitter.py 2010-03-23 16:42:18 UTC (rev 3876) +++ mgmt/newdata/cumin/python/cumin/grid/submitter.py 2010-03-23 17:06:23 UTC (rev 3877) @@ -16,31 +16,35 @@ strings = StringCatalog(__file__) log = logging.getLogger("cumin.grid.submitter") -class SubmitterSet(CuminTable): - def __init__(self, app, name): - super(SubmitterSet, self).__init__(app, name) +class SubmitterSelector(ObjectSelector): + def __init__(self, app, name, scheduler): + cls = app.rosemary.mrg_grid.Submitter - col = self.NameColumn(app, "name") + super(SubmitterSelector, self).__init__(app, name, cls) + + self.scheduler = scheduler + + self.add_reference_filter(self.scheduler, cls.schedulerRef) + + frame = "main.grid.pool.scheduler.submitter" + col = ObjectLinkColumn(app, "name", cls.Name, cls._id, frame) self.add_column(col) - self.set_default_column(col) + self.add_attribute_column(cls.Machine) + self.add_attribute_column(cls.ScheddName) + self.add_attribute_column(cls.IdleJobs) + self.add_attribute_column(cls.RunningJobs) + self.add_attribute_column(cls.HeldJobs) - def render_title(self, session): - return "Submitters %s" % fmt_count(Submitter.select().count()) +class SubmitterFrame(ObjectFrame): + def __init__(self, app, name): + cls = app.rosemary.mrg_grid.Submitter - class NameColumn(SqlTableColumn): - def render_title(self, session): - return "Name" + super(SubmitterFrame, self).__init__(app, name, cls) - def render_content(self, session, data): - sub = Identifiable(data["id"]) - href = self.page.main.grid.pool.scheduler.submitter.get_href \ - (session, sub) - return fmt_link(href, data["name"]) - -class SubmitterFrame(CuminFrame): +class OldSubmitterFrame(CuminFrame): def __init__(self, app, name, pool): - super(SubmitterFrame, self).__init__(app, name) + super(OldSubmitterFrame, self).__init__(app, name) self.object = SubmitterParameter(app, "id") self.add_parameter(self.object) Modified: mgmt/newdata/cumin/python/cumin/grid/submitter.strings =================================================================== --- mgmt/newdata/cumin/python/cumin/grid/submitter.strings 2010-03-23 16:42:18 UTC (rev 3876) +++ mgmt/newdata/cumin/python/cumin/grid/submitter.strings 2010-03-23 17:06:23 UTC (rev 3877) @@ -1,18 +1,3 @@ -[SubmitterSet.sql] -select - s.id, - s.name -from submitter as s -inner join scheduler as d on s.scheduler_id = d.id -{sql_where} -{sql_orderby} -{sql_limit} - -[SubmitterSet.count_sql] -select count(*) from submitter as s -inner join scheduler as d on s.scheduler_id = d.id -{sql_where} - [SubmitterStats.html] <table class="twocol"> <tbody>

16 years, 1 month

1
0
0 / 0

rhmessaging commits: r3876 - mgmt/trunk/wooly/python/wooly.

by rhmessaging-commits＠lists.jboss.org

Author: eallen Date: 2010-03-23 12:42:18 -0400 (Tue, 23 Mar 2010) New Revision: 3876 Modified: mgmt/trunk/wooly/python/wooly/forms.py mgmt/trunk/wooly/python/wooly/forms.strings Log: Added id to form fields Cleaned up form field class Modified: mgmt/trunk/wooly/python/wooly/forms.py =================================================================== --- mgmt/trunk/wooly/python/wooly/forms.py 2010-03-23 14:18:50 UTC (rev 3875) +++ mgmt/trunk/wooly/python/wooly/forms.py 2010-03-23 16:42:18 UTC (rev 3876) @@ -321,8 +321,6 @@ def __init__(self, app, name): super(FormField, self).__init__(app, name) - self.css_class = "field" - self.form = None self.required = False @@ -350,10 +348,6 @@ def render_help(self, session, *args): return self.help - # XXX hmmm - def render_form_field_class(self, session, *args): - return self.css_class - class FormFieldSet(Widget): def __init__(self, app, name): super(FormFieldSet, self).__init__(app, name) Modified: mgmt/trunk/wooly/python/wooly/forms.strings =================================================================== --- mgmt/trunk/wooly/python/wooly/forms.strings 2010-03-23 14:18:50 UTC (rev 3875) +++ mgmt/trunk/wooly/python/wooly/forms.strings 2010-03-23 16:42:18 UTC (rev 3876) @@ -149,7 +149,7 @@ <option value="{item_value}" {item_selected_attr}>{item_content}</option> [FormField.html] -<tr> +<tr id="{id}"> <th> <div class="title">{title}{required}</div> <div class="help">{help}</div>

16 years, 1 month

1
0
0 / 0

rhmessaging commits: r3875 - in mgmt/newdata/cumin/python/cumin: grid and 2 other directories.

by rhmessaging-commits＠lists.jboss.org

Author: justi9 Date: 2010-03-23 10:18:50 -0400 (Tue, 23 Mar 2010) New Revision: 3875 Modified: mgmt/newdata/cumin/python/cumin/grid/main.py mgmt/newdata/cumin/python/cumin/grid/pool.py mgmt/newdata/cumin/python/cumin/grid/scheduler.py mgmt/newdata/cumin/python/cumin/grid/slot.py mgmt/newdata/cumin/python/cumin/grid/slot.strings mgmt/newdata/cumin/python/cumin/grid/submission.py mgmt/newdata/cumin/python/cumin/inventory/system.py mgmt/newdata/cumin/python/cumin/inventory/system.strings mgmt/newdata/cumin/python/cumin/model.py mgmt/newdata/cumin/python/cumin/objectframe.py mgmt/newdata/cumin/python/cumin/usergrid/widgets.py Log: Add grid ui objects, setting aside the older versions for now Modified: mgmt/newdata/cumin/python/cumin/grid/main.py =================================================================== --- mgmt/newdata/cumin/python/cumin/grid/main.py 2010-03-22 18:06:01 UTC (rev 3874) +++ mgmt/newdata/cumin/python/cumin/grid/main.py 2010-03-23 14:18:50 UTC (rev 3875) @@ -75,7 +75,7 @@ self.pool = PoolFrame(app, "pool") self.add_mode(self.pool) - self.add_sticky_view(self.pool) + # XXX self.add_sticky_view(self.pool) def render_title(self, session): return "Grid" @@ -90,7 +90,7 @@ self.tabs = TabbedModeSet(app, "tabs") self.add_child(self.tabs) - self.pools = PoolSet(app, "pools") + self.pools = PoolSelector(app, "pools") self.tabs.add_tab(self.pools) class Heading(CuminHeading): Modified: mgmt/newdata/cumin/python/cumin/grid/pool.py =================================================================== --- mgmt/newdata/cumin/python/cumin/grid/pool.py 2010-03-22 18:06:01 UTC (rev 3874) +++ mgmt/newdata/cumin/python/cumin/grid/pool.py 2010-03-23 14:18:50 UTC (rev 3875) @@ -1,10 +1,13 @@ import logging + from wooly import * from wooly.widgets import * from wooly.forms import * from wooly.resources import * from wooly.sql import * from wooly.tables import * +from cumin.objectframe import * +from cumin.objectselector import * from cumin.stat import * from cumin.widgets import * from cumin.parameters import * @@ -12,13 +15,13 @@ from cumin.util import * from job import * -from scheduler import SchedulerSet, SchedulerFrame +from scheduler import * from submission import * from submitter import SubmitterSet, SubmitterFrame from collector import CollectorSet, CollectorFrame from negotiator import NegotiatorSet, NegotiatorFrame from limit import LimitSet, LimitFrame -from slot import SlotSet, SlotFrame, SlotMap, SlotMapPage, SlotActivities +from slot import * #SlotSet, SlotFrame, SlotMap, SlotMapPage, SlotActivities from cumin.widgets import Session @@ -26,53 +29,51 @@ import main strings = StringCatalog(__file__) - log = logging.getLogger("cumin.pool") -class PoolSet(CuminTable): +class PoolSelector(ObjectSelector): def __init__(self, app, name): - super(PoolSet, self).__init__(app, name) + cls = app.rosemary.mrg_grid.Collector - col = self.NameColumn(app, "name") - self.add_column(col) + super(PoolSelector, self).__init__(app, name, cls) - col = self.JobsRunningColumn(app, "running_jobs") + frame = "main.grid.pool" + col = ObjectLinkColumn(app, "name", cls.Pool, cls._id, frame) self.add_column(col) - col = self.JobsIdleColumn(app, "idle_jobs") - self.add_column(col) + self.add_attribute_column(cls.RunningJobs) + self.add_attribute_column(cls.IdleJobs) + self.add_attribute_column(cls.HostsTotal) - col = self.SlotsColumn(app, "slots") - self.add_column(col) - - def render_title(self, session): - count = self.get_item_count(session) - return "Pools %s" % fmt_count(count) +class PoolFrame(ObjectFrame): + def __init__(self, app, name): + cls = app.rosemary.mrg_grid.Collector - class NameColumn(SqlTableColumn): - def render_title(self, session): - return "Name" + super(PoolFrame, self).__init__(app, name, cls) - def render_content(self, session, data): - pool = Identifiable(data["id"]) - href = self.page.main.grid.pool.get_href(session, pool) - return fmt_link(href, data["name"]) + self.icon_href = "resource?name=pool-36.png" - class JobsRunningColumn(SqlTableColumn): - def render_title(self, session): - return "Running Jobs" + self.submission = SubmissionFrame(app, "submission") + self.add_mode(self.submission) - class JobsIdleColumn(SqlTableColumn): - def render_title(self, session): - return "Idle Jobs" + self.slot = SlotFrame(app, "slot") + self.add_mode(self.slot) - class SlotsColumn(SqlTableColumn): - def render_title(self, session): - return "Slots" + self.scheduler = SchedulerFrame(app, "scheduler") + self.add_mode(self.scheduler) -class PoolFrame(CuminFrame): + submissions = SubmissionSelector(app, "submissions", self.object) + self.view.add_tab(submissions) + + slots = SlotSelector(app, "slots", self.object) + self.view.add_tab(slots) + + schedulers = SchedulerSelector(app, "schedulers", self.object) + self.view.add_tab(schedulers) + +class OldPoolFrame(CuminFrame): def __init__(self, app, name): - super(PoolFrame, self).__init__(app, name) + super(OldPoolFrame, self).__init__(app, name) self.object = PoolParameter(app, "id") self.add_parameter(self.object) @@ -217,37 +218,6 @@ count = self.get_item_count(session) return "Negotiators %s" % fmt_count(count) -class PoolSlotSet(SlotSet): - def __init__(self, app, name, pool): - super(PoolSlotSet, self).__init__(app, name) - - self.pool = pool - - def render_sql_where(self, session): - elems = list() - elems.append("s.pool = %(pool)s") - - recent = self.get_recent_sql_where(session) - - if recent: - elems.append(recent) - - return "where %s" % " and ".join(elems) - - def get_sql_values(self, session): - pool = self.pool.get(session) - return {"pool": pool.id} - - def render_title(self, session): - count = self.get_item_count(session) - return "Slots %s" % fmt_count(count) - - def filter(self, session, system, slots): - return slots - - def render_sql_order_by(self, session): - return "order by machine, name asc" - class PoolOverview(Widget): def __init__(self, app, name, pool): super(PoolOverview, self).__init__(app, name) Modified: mgmt/newdata/cumin/python/cumin/grid/scheduler.py =================================================================== --- mgmt/newdata/cumin/python/cumin/grid/scheduler.py 2010-03-22 18:06:01 UTC (rev 3874) +++ mgmt/newdata/cumin/python/cumin/grid/scheduler.py 2010-03-23 14:18:50 UTC (rev 3875) @@ -7,7 +7,8 @@ from wooly.forms import * from wooly.resources import * from wooly.tables import * - +from cumin.objectframe import * +from cumin.objectselector import * from cumin.formats import * from cumin.model import * from cumin.parameters import * @@ -20,9 +21,36 @@ from submission import * strings = StringCatalog(__file__) - log = logging.getLogger("cumin.scheduler") +class SchedulerSelector(ObjectSelector): + def __init__(self, app, name, pool): + cls = app.rosemary.mrg_grid.Scheduler + + super(SchedulerSelector, self).__init__(app, name, cls) + + self.pool = pool + + self.add_filter(self.pool, cls.Pool, cls.Pool) + + frame = "main.grid.pool.scheduler" + col = ObjectLinkColumn(app, "name", cls.Name, cls._id, frame) + self.add_column(col) + + self.add_attribute_column(cls.NumUsers) + self.add_attribute_column(cls.TotalIdleJobs) + self.add_attribute_column(cls.TotalRunningJobs) + self.add_attribute_column(cls.TotalHeldJobs) + + self.add_selection_task(main.module.scheduler_set_start) + self.add_selection_task(main.module.scheduler_set_stop) + +class SchedulerFrame(ObjectFrame): + def __init__(self, app, name): + cls = app.rosemary.mrg_grid.Scheduler + + super(SchedulerFrame, self).__init__(app, name, cls) + class SchedulerSet(CuminSelectionTable): def __init__(self, app, name, pool): item = SchedulerParameter(app, "item") @@ -138,9 +166,9 @@ if item is self.param.get(session): return "selected=\"selected\"" -class SchedulerFrame(CuminFrame): +class OldSchedulerFrame(CuminFrame): def __init__(self, app, name, pool): - super(SchedulerFrame, self).__init__(app, name) + super(OldSchedulerFrame, self).__init__(app, name) self.object = SchedulerParameter(app, "id") self.add_parameter(self.object) Modified: mgmt/newdata/cumin/python/cumin/grid/slot.py =================================================================== --- mgmt/newdata/cumin/python/cumin/grid/slot.py 2010-03-22 18:06:01 UTC (rev 3874) +++ mgmt/newdata/cumin/python/cumin/grid/slot.py 2010-03-23 14:18:50 UTC (rev 3875) @@ -6,101 +6,50 @@ from wooly.resources import * from wooly.tables import * +from cumin.objectframe import * +from cumin.objectselector import * from cumin.stat import * from cumin.widgets import * strings = StringCatalog(__file__) log = logging.getLogger("cumin.slot") -class SlotDataSet(CuminSqlDataSet): - def __init__(self, app): - super(SlotDataSet, self).__init__(app) +class SlotSelector(ObjectSelector): + def __init__(self, app, name, pool): + cls = app.rosemary.mrg_grid.Slot - exprs = list() - exprs.append("s.qmf_update_time > now() - interval '60 minutes'") + super(SlotSelector, self).__init__(app, name, cls) - self.where_exprs.default = exprs + self.pool = pool -class SlotSet(CuminTable): - def __init__(self, app, name): - super(SlotSet, self).__init__(app, name) + self.add_filter(self.pool, cls.Pool, cls.Pool) - col = self.NameColumn(app, "name") + frame = "main.grid.pool.slot" + col = ObjectLinkColumn(app, "name", cls.Name, cls._id, frame) self.add_column(col) - col = self.ActivityColumn(app, "activity") - self.add_column(col) + self.add_attribute_column(cls.Activity) + self.add_attribute_column(cls.State) + self.add_attribute_column(cls.LoadAvg) - col = self.StateColumn(app, "state") - self.add_column(col) +class SlotFrame(ObjectFrame): + def __init__(self, app, name): + cls = app.rosemary.mrg_grid.Slot - col = self.LoadAvgColumn(app, "load_avg") - self.add_column(col) + super(SlotFrame, self).__init__(app, name, cls) - col = self.JobColumn(app, "job_id") - self.add_column(col) +class SlotDataSet(CuminSqlDataSet): + def __init__(self, app): + super(SlotDataSet, self).__init__(app) - def get_recent_sql_where(self, session): - return """ - s.qmf_update_time > now() - interval '60 minutes' - """ + exprs = list() + exprs.append("s.qmf_update_time > now() - interval '60 minutes'") - def render_title(self, session): - count = self.get_item_count(session) - return "Slots %s" % fmt_count(count) + self.where_exprs.default = exprs - class NameColumn(SqlTableColumn): - def render_title(self, session): - return "Name" - - def render_content(self, session, data): - slot = Identifiable(data["id"]) - href = self.frame.slot.get_href(session, slot) - return fmt_link(href, data["name"]) - - class ActivityColumn(SqlTableColumn): - def render_title(self, session): - return "Activity" - - class StateColumn(SqlTableColumn): - def render_title(self, session): - return "State" - - class LoadAvgColumn(SqlTableColumn): - def render_title(self, session): - return "Load" - - def render_value(self, session, value): - if value: - return "%2.02f" % value - else: - return fmt_none_brief() - - class JobColumn(SqlTableColumn): - def render_title(self, session): - return "Current Job" - - def render_content(self, session, data): - if data[self.name]: - job = Identifiable(data[self.name]) - pool = self.frame.get_object(session) - scheduler = None - - for scheduler in Scheduler.select("pool='%s'" % pool.id): - break - - if scheduler: - href = self.page.main.grid.pool.job.get_href \ - (session, job, scheduler) - return fmt_link(href, data[self.name]) - else: - return fmt_none() - else: - return fmt_none() - -class SlotFrame(CuminFrame): +class OldSlotFrame(CuminFrame): def __init__(self, app, name): - super(SlotFrame, self).__init__(app, name) + super(OldSlotFrame, self).__init__(app, name) self.object = SlotParameter(app, "id") self.add_parameter(self.object) Modified: mgmt/newdata/cumin/python/cumin/grid/slot.strings =================================================================== --- mgmt/newdata/cumin/python/cumin/grid/slot.strings 2010-03-22 18:06:01 UTC (rev 3874) +++ mgmt/newdata/cumin/python/cumin/grid/slot.strings 2010-03-23 14:18:50 UTC (rev 3875) @@ -23,27 +23,6 @@ from slot as s {sql_where} -[SlotSet.sql] -select - s.id, - s.name, - s.machine, - s.system, - s.job_id, - s.activity, - s.state, - c.load_avg -from slot as s -left outer join slot_stats as c on c.id = s.stats_curr_id -{sql_where} -{sql_orderby} -{sql_limit} - -[SlotSet.count_sql] -select count(*) -from slot as s -{sql_where} - [SlotStats.html] <table class="twocol"> <tbody> Modified: mgmt/newdata/cumin/python/cumin/grid/submission.py =================================================================== --- mgmt/newdata/cumin/python/cumin/grid/submission.py 2010-03-22 18:06:01 UTC (rev 3874) +++ mgmt/newdata/cumin/python/cumin/grid/submission.py 2010-03-23 14:18:50 UTC (rev 3875) @@ -1,6 +1,8 @@ import logging import shlex +from cumin.objectframe import * +from cumin.objectselector import * from cumin.widgets import * from cumin.util import * from job import JobSet @@ -10,6 +12,30 @@ strings = StringCatalog(__file__) log = logging.getLogger("cumin.grid.submission") +class SubmissionSelector(ObjectSelector): + def __init__(self, app, name, pool): + cls = app.rosemary.mrg_grid.Submission + + super(SubmissionSelector, self).__init__(app, name, cls) + + self.pool = pool + + # XXX self.add_filter(self.pool, cls.Pool, cls.Pool) + + frame = "main.grid.pool.submission" + col = ObjectLinkColumn(app, "name", cls.Name, cls._id, frame) + self.add_column(col) + + self.add_attribute_column(cls.Idle) + self.add_attribute_column(cls.Running) + self.add_attribute_column(cls.Completed) + +class SubmissionFrame(ObjectFrame): + def __init__(self, app, name): + cls = app.rosemary.mrg_grid.Submission + + super(SubmissionFrame, self).__init__(app, name, cls) + class SubmissionSet(CuminTable): def __init__(self, app, name): super(SubmissionSet, self).__init__(app, name) @@ -84,9 +110,9 @@ def render_title(self, session): return "Completed Jobs" -class SubmissionFrame(CuminFrame): +class OldSubmissionFrame(CuminFrame): def __init__(self, app, name): - super(SubmissionFrame, self).__init__(app, name) + super(OldSubmissionFrame, self).__init__(app, name) self.object = SubmissionParameter(app, "submission") self.add_parameter(self.object) Modified: mgmt/newdata/cumin/python/cumin/inventory/system.py =================================================================== --- mgmt/newdata/cumin/python/cumin/inventory/system.py 2010-03-22 18:06:01 UTC (rev 3874) +++ mgmt/newdata/cumin/python/cumin/inventory/system.py 2010-03-23 14:18:50 UTC (rev 3875) @@ -152,7 +152,6 @@ self.add_child(self.tabs) self.tabs.add_tab(SystemStats(app, "stats", system)) - self.tabs.add_tab(SystemSlotSet(app, "slots", system)) self.tabs.add_tab(SystemServices(app, "services", system)) self.tabs.add_tab(CuminDetails(app, "details", system)) @@ -172,32 +171,6 @@ system = self.frame.get_object(session) return {"nodeName": system.nodeName} -from cumin.grid.slot import SlotSet - -class SystemSlotSet(SlotSet): - def __init__(self, app, name, system): - super(SystemSlotSet, self).__init__(app, name) - - self.system = system - - def render_title(self, session): - return "Grid Slots %s" % fmt_count(self.get_item_count(session)) - - def render_sql_where(self, session): - elems = list() - elems.append("system = %(nodeName)s") - - recent = self.get_recent_sql_where(session) - - if recent: - elems.append(recent) - - return "where %s" % " and ".join(elems) - - def get_sql_values(self, session): - system = self.system.get(session) - return {"nodeName": system.nodeName} - class SystemServices(ItemSet): def __init__(self, app, name, system): super(SystemServices, self).__init__(app, name) Modified: mgmt/newdata/cumin/python/cumin/inventory/system.strings =================================================================== --- mgmt/newdata/cumin/python/cumin/inventory/system.strings 2010-03-22 18:06:01 UTC (rev 3874) +++ mgmt/newdata/cumin/python/cumin/inventory/system.strings 2010-03-23 14:18:50 UTC (rev 3875) @@ -1,38 +1,3 @@ -[SystemSet.sql] -select - s.id, - s.node_name as name, - (s.os_name || ' ' || s.release) as kernel, - s.machine as arch, - c.mem_free, - c.load_average1_min as load -from sysimage as s -left outer join sysimage_stats as c on c.id = s.stats_curr_id -{sql_where} -{sql_orderby} -{sql_limit} - -[SystemSet.count_sql] -select count(*) from sysimage as s -{sql_where} - -[SystemSet.html] -<form id="{id}" method="post" action="?"> - <table class="mobjects"> - <thead> - <tr> - <th class="setnav" colspan="{column_count}"> - <div class="rfloat">{page}</div> - {count} - </th> - </tr> - <tr>{headers}</tr> - </thead> - <tbody>{items}</tbody> - </table> - <div>{hidden_inputs}</div> -</form> - [TopSystemSet.sql] select s.id, Modified: mgmt/newdata/cumin/python/cumin/model.py =================================================================== --- mgmt/newdata/cumin/python/cumin/model.py 2010-03-22 18:06:01 UTC (rev 3874) +++ mgmt/newdata/cumin/python/cumin/model.py 2010-03-23 14:18:50 UTC (rev 3875) @@ -1821,7 +1821,7 @@ def init(self): super(CuminLimit, self).init() - self.frame = self.model.frame.grid.pool.limit + #self.frame = self.model.frame.grid.pool.limit def get_title(self, session): return "Concurrency Limit" @@ -2054,7 +2054,7 @@ def init(self): super(CuminJob, self).init() - self.frame = self.model.frame.grid.pool.job + #self.frame = self.model.frame.grid.pool.job def get_title(self, session): return "Job" @@ -2214,7 +2214,7 @@ def init(self): super(CuminScheduler, self).init() - self.frame = self.model.frame.grid.pool.scheduler + # self.frame = self.model.frame.grid.pool.scheduler def get_title(self, session): return "Scheduler" @@ -2271,7 +2271,7 @@ def init(self): super(CuminSubmitter, self).init() - self.frame = self.model.frame.grid.pool.scheduler.submitter + #self.frame = self.model.frame.grid.pool.scheduler.submitter def get_title(self, session): return "Submitter" @@ -2323,7 +2323,7 @@ def init(self): super(CuminCollector, self).init() - self.frame = self.model.frame.grid.pool.collector + #self.frame = self.model.frame.grid.pool.collector def get_title(self, session): return "Collector" @@ -2374,7 +2374,7 @@ def init(self): super(CuminNegotiator, self).init() - self.frame = self.model.frame.grid.pool.negotiator + #self.frame = self.model.frame.grid.pool.negotiator def get_title(self, session): return "Negotiator" Modified: mgmt/newdata/cumin/python/cumin/objectframe.py =================================================================== --- mgmt/newdata/cumin/python/cumin/objectframe.py 2010-03-22 18:06:01 UTC (rev 3874) +++ mgmt/newdata/cumin/python/cumin/objectframe.py 2010-03-23 14:18:50 UTC (rev 3875) @@ -108,7 +108,7 @@ return name def render_value(self, session, name, value): - return value + return xml_escape(str(value)) class ObjectTaskLinks(WidgetSet): def __init__(self, app, name, object): Modified: mgmt/newdata/cumin/python/cumin/usergrid/widgets.py =================================================================== --- mgmt/newdata/cumin/python/cumin/usergrid/widgets.py 2010-03-22 18:06:01 UTC (rev 3874) +++ mgmt/newdata/cumin/python/cumin/usergrid/widgets.py 2010-03-23 14:18:50 UTC (rev 3875) @@ -44,9 +44,6 @@ self.submissions = SubmissionsFrame(app, "submissions", user) self.add_tab(self.submissions) - self.slots = SlotsFrame(app, "slots", user) - self.add_tab(self.slots) - class OverviewFrame(CuminFrame): def __init__(self, app, name, user): super(OverviewFrame, self).__init__(app, name) @@ -64,9 +61,6 @@ self.stats = UserJobStatSet(self.app, "jobs", user) self.add_child(self.stats) - self.stats = UserSlotStatSet(self.app, "slots", user) - self.add_child(self.stats) - class SubmissionsFrame(CuminFrame): def __init__(self, app, name, user): super(SubmissionsFrame, self).__init__(app, name) @@ -105,32 +99,6 @@ user = self.page.user.get(session) return {"name": user.name} -class SlotsFrame(CuminFrame): - def __init__(self, app, name, user): - super(SlotsFrame, self).__init__(app, name) - - self.view = UserSlotSet(app, "view", user) - self.add_mode(self.view) - - self.slot = SlotFrame(app, "slot") - self.add_mode(self.slot) - - def render_title(self, session): - return "Slots" - -class UserSlotSet(SlotSet): - def __init__(self, app, name, user): - super(UserSlotSet, self).__init__(app, name) - - self.user = user - - def render_sql_where(self, session): - return "where s.remote_user like %(name)s" - - def get_sql_values(self, session): - user = self.user.get(session) - return {"name": "%s@%%" % user.name} - class UserJobStatSet(NewStatSet): def __init__(self, app, name, user): super(UserJobStatSet, self).__init__(app, name)

16 years, 1 month

1
0
0 / 0

rhmessaging commits: r3874 - in mgmt/newdata/cumin/python/cumin: inventory and 1 other directory.

by rhmessaging-commits＠lists.jboss.org

Author: justi9 Date: 2010-03-22 14:06:01 -0400 (Mon, 22 Mar 2010) New Revision: 3874 Modified: mgmt/newdata/cumin/python/cumin/grid/job.py mgmt/newdata/cumin/python/cumin/inventory/main.py mgmt/newdata/cumin/python/cumin/inventory/system.py Log: Add new table and frame for systems Modified: mgmt/newdata/cumin/python/cumin/grid/job.py =================================================================== --- mgmt/newdata/cumin/python/cumin/grid/job.py 2010-03-22 17:45:10 UTC (rev 3873) +++ mgmt/newdata/cumin/python/cumin/grid/job.py 2010-03-22 18:06:01 UTC (rev 3874) @@ -213,7 +213,7 @@ def render_content(self, session): return "Go" -from cumin.inventory.system import SystemFrame, SystemSet +from cumin.inventory.system import SystemFrame class JobGroupFrame(CuminFrame): def __init__(self, app, name, pool): @@ -237,7 +237,7 @@ self.tabs.add_tab(JobGroupStats(app, "stats")) self.tabs.add_tab(JobGroupJobSet(app, "jobs", pool)) - self.tabs.add_tab(JobGroupSystemSet(app, "systems")) + #self.tabs.add_tab(JobGroupSystemSet(app, "systems")) #self.tabs.add_tab(CuminDetails(app, "details")) class JobGroupStats(Widget): @@ -321,20 +321,20 @@ str = super(JobGroupJobSet, self).render_count(session) return "%s in Job Group '%s'" % (str, group.get_id()) -class JobGroupSystemSet(SystemSet): - def render_sql_where(self, session): - subquery = """ - select 1 - from slot as l - join job as j on j.custom_id = l.job_id - where j.custom_group = %(id)s and l.system = s.node_name - """ +# class JobGroupSystemSet(SystemSet): +# def render_sql_where(self, session): +# subquery = """ +# select 1 +# from slot as l +# join job as j on j.custom_id = l.job_id +# where j.custom_group = %(id)s and l.system = s.node_name +# """ - return "where exists (%s)" % subquery +# return "where exists (%s)" % subquery - def get_sql_values(self, session): - group = self.frame.object.get(session) - return {"id": group.id} +# def get_sql_values(self, session): +# group = self.frame.object.get(session) +# return {"id": group.id} class JobFrame(CuminFrame): def __init__(self, app, name): @@ -380,23 +380,23 @@ #self.tabs.add_tab(JobSystemSet(app, "systems", job)) #self.tabs.add_tab(CuminDetails(app, "details", job)) -class JobSystemSet(SystemSet): - def __init__(self, app, name, job): - super(JobSystemSet, self).__init__(app, name) +# class JobSystemSet(SystemSet): +# def __init__(self, app, name, job): +# super(JobSystemSet, self).__init__(app, name) - self.job = job +# self.job = job - def render_sql_where(self, session): - return """ - where exists - (select 1 - from slot - where system = s.node_name and job_id = %(id)s) - """ +# def render_sql_where(self, session): +# return """ +# where exists +# (select 1 +# from slot +# where system = s.node_name and job_id = %(id)s) +# """ - def get_sql_values(self, session): - job = self.job.get(session) - return {"id": "%i.%i" % (job.ClusterId, job.ProcId)} +# def get_sql_values(self, session): +# job = self.job.get(session) +# return {"id": "%i.%i" % (job.ClusterId, job.ProcId)} class JobAdsSet(PropertySet): types = {0: "expression", Modified: mgmt/newdata/cumin/python/cumin/inventory/main.py =================================================================== --- mgmt/newdata/cumin/python/cumin/inventory/main.py 2010-03-22 17:45:10 UTC (rev 3873) +++ mgmt/newdata/cumin/python/cumin/inventory/main.py 2010-03-22 18:06:01 UTC (rev 3874) @@ -42,7 +42,7 @@ self.tabs = TabbedModeSet(app, "tabs") self.add_child(self.tabs) - self.tabs.add_tab(SystemSet(app, "systems")) + self.tabs.add_tab(SystemSelector(app, "systems")) class Heading(CuminHeading): def render_title(self, session): Modified: mgmt/newdata/cumin/python/cumin/inventory/system.py =================================================================== --- mgmt/newdata/cumin/python/cumin/inventory/system.py 2010-03-22 17:45:10 UTC (rev 3873) +++ mgmt/newdata/cumin/python/cumin/inventory/system.py 2010-03-22 18:06:01 UTC (rev 3874) @@ -1,6 +1,8 @@ from mint import * from wooly import * from wooly.widgets import * +from cumin.objectframe import * +from cumin.objectselector import * from cumin.stat import * from cumin.widgets import * from cumin.parameters import * @@ -13,75 +15,27 @@ strings = StringCatalog(__file__) -class SystemSet(CuminTable, Form): +class SystemSelector(ObjectSelector): def __init__(self, app, name): - super(SystemSet, self).__init__(app, name) + cls = app.rosemary.com_redhat_sesame.Sysimage - self.ids = CheckboxIdColumn(app, "id") - self.add_column(self.ids) + super(SystemSelector, self).__init__(app, name, cls) - col = self.NameColumn(app, "name") + frame = "main.inventory.system" + col = ObjectLinkColumn(app, "name", cls.nodeName, cls._id, frame) self.add_column(col) - self.set_default_column(col) - col = self.KernelColumn(app, "kernel") - self.add_column(col) + self.add_attribute_column(cls.osName) + self.add_attribute_column(cls.machine) + self.add_attribute_column(cls.memFree) + self.add_attribute_column(cls.loadAverage1Min) - col = self.ArchColumn(app, "arch") - self.add_column(col) +class SystemFrame(ObjectFrame): + def __init__(self, app, name): + cls = app.rosemary.com_redhat_sesame.Sysimage - col = self.FreeMemoryColumn(app, "mem_free") - col.align = "right" - self.add_column(col) + super(SystemFrame, self).__init__(app, name, cls) - col = self.LoadColumn(app, "load") - col.align = "right" - self.add_column(col) - - def render_title(self, session, *args): - return "Systems %s" % fmt_count(self.get_item_count(session, *args)) - - class NameColumn(SqlTableColumn): - def render_title(self, session): - return "Name" - - def render_content(self, session, data): - system = Identifiable(data["id"]) - href = self.page.main.inventory.system.get_href(session, system) - return fmt_link(href, fmt_shorten(data["name"])) - - class KernelColumn(SqlTableColumn): - def render_title(self, session): - return "Kernel" - - class ArchColumn(SqlTableColumn): - def render_title(self, session): - return "Arch" - - class FreeMemoryColumn(SqlTableColumn): - def render_title(self, session): - return "Free Memory" - - def render_content(self, session, data): - mem_free = data["mem_free"] - - if mem_free: - return "%i KB" % mem_free - else: - return fmt_none_brief() - - class LoadColumn(SqlTableColumn): - def render_title(self, session): - return "Load Average" - - def render_content(self, session, data): - load = data["load"] - - if load: - return "%0.3f" % load - else: - return fmt_none_brief() - class TopSystemSet(TopTable): def __init__(self, app, name): super(TopSystemSet, self).__init__(app, name) @@ -113,19 +67,6 @@ def render_content(self, session, data): return "%0.3f" % data["load_avg"] -class SystemFrame(CuminFrame): - def __init__(self, app, name): - super(SystemFrame, self).__init__(app, name) - - self.object = SystemParameter(app, "id") - self.add_parameter(self.object) - - self.view = SystemView(app, "view", self.object) - self.add_mode(self.view) - - self.slot = SlotFrame(app, "slot") - self.add_mode(self.slot) - class SystemStats(Widget): def __init__(self, app, name, system): super(SystemStats, self).__init__(app, name) @@ -203,9 +144,9 @@ def render_slot_chart_height(self, session): return 200 -class SystemView(CuminView): +class OldSystemView(CuminView): def __init__(self, app, name, system): - super(SystemView, self).__init__(app, name, system) + super(OldSystemView, self).__init__(app, name, system) self.tabs = TabbedModeSet(app, "tabs") self.add_child(self.tabs)

16 years, 1 month

1
0
0 / 0

rhmessaging commits: r3873 - mgmt/newdata/mint/python/mint.

by rhmessaging-commits＠lists.jboss.org

Author: justi9 Date: 2010-03-22 13:45:10 -0400 (Mon, 22 Mar 2010) New Revision: 3873 Modified: mgmt/newdata/mint/python/mint/model.py mgmt/newdata/mint/python/mint/newupdate.py Log: More stat -> sample name changes Modified: mgmt/newdata/mint/python/mint/model.py =================================================================== --- mgmt/newdata/mint/python/mint/model.py 2010-03-22 16:54:24 UTC (rev 3872) +++ mgmt/newdata/mint/python/mint/model.py 2010-03-22 17:45:10 UTC (rev 3873) @@ -255,7 +255,7 @@ self.model.app.update_thread.enqueue(up) if self.model.app.new_update_thread.isAlive(): - up = NewStatsUpdate(self.model, agent, object) + up = NewSampleUpdate(self.model, agent, object) self.model.app.new_update_thread.enqueue(up) def event(self, broker, event): Modified: mgmt/newdata/mint/python/mint/newupdate.py =================================================================== --- mgmt/newdata/mint/python/mint/newupdate.py 2010-03-22 16:54:24 UTC (rev 3872) +++ mgmt/newdata/mint/python/mint/newupdate.py 2010-03-22 17:45:10 UTC (rev 3873) @@ -59,9 +59,9 @@ self.deleted = 0 self.dropped = 0 - self.stats_updated = 0 - self.stats_expired = 0 - self.stats_dropped = 0 + self.samples_updated = 0 + self.samples_expired = 0 + self.samples_dropped = 0 class NewUpdate(object): def __init__(self, model): @@ -295,30 +295,30 @@ stats.deleted += 1 -class NewStatsUpdate(NewObjectUpdate): +class NewSampleUpdate(NewObjectUpdate): def do_process(self, conn, stats): cls = self.get_class() obj = self.get_object(cls, self.object_id) if not cls._statistics: - stats.stats_dropped += 1; return + stats.samples_dropped += 1; return if not obj._id: - stats.stats_dropped += 1; return + stats.samples_dropped += 1; return if stats.enqueued - stats.dequeued > 100: if obj._qmf_update_time > datetime.now() - timedelta(seconds=60): - stats.stats_dropped += 1; return + stats.samples_dropped += 1; return update_columns = list() update_columns.append(cls.sql_table._qmf_update_time) insert_columns = list() - insert_columns.append(cls.sql_table._qmf_update_time) + insert_columns.append(cls.sql_samples_table._qmf_update_time) obj._qmf_update_time = self.update_time - self.process_statistics(obj, update_columns, insert_columns) + self.process_samples(obj, update_columns, insert_columns) cursor = conn.cursor() @@ -329,9 +329,9 @@ finally: cursor.close() - stats.stats_updated += 1 + stats.samples_updated += 1 - def process_statistics(self, obj, update_columns, insert_columns): + def process_samples(self, obj, update_columns, insert_columns): for stat, value in self.object.getStatistics(): try: col = obj._class._statistics_by_name[stat.name].sql_column

16 years, 1 month

1
0
0 / 0

rhmessaging commits: r3872 - in mgmt/newdata: mint/instance and 3 other directories.

by rhmessaging-commits＠lists.jboss.org

Author: justi9 Date: 2010-03-22 12:54:24 -0400 (Mon, 22 Mar 2010) New Revision: 3872 Added: mgmt/newdata/cumin/instance/xml mgmt/newdata/mint/instance/xml Modified: mgmt/newdata/mint/python/mint/expire.py mgmt/newdata/mint/python/mint/newupdate.py mgmt/newdata/mint/sql/rosemary.sql mgmt/newdata/rosemary/python/rosemary/model.py Log: Rename stats to samples; add missing xml dir links Added: mgmt/newdata/cumin/instance/xml =================================================================== --- mgmt/newdata/cumin/instance/xml (rev 0) +++ mgmt/newdata/cumin/instance/xml 2010-03-22 16:54:24 UTC (rev 3872) @@ -0,0 +1 @@ +link ../../mint/xml \ No newline at end of file Property changes on: mgmt/newdata/cumin/instance/xml ___________________________________________________________________ Name: svn:special + * Added: mgmt/newdata/mint/instance/xml =================================================================== --- mgmt/newdata/mint/instance/xml (rev 0) +++ mgmt/newdata/mint/instance/xml 2010-03-22 16:54:24 UTC (rev 3872) @@ -0,0 +1 @@ +link ../xml \ No newline at end of file Property changes on: mgmt/newdata/mint/instance/xml ___________________________________________________________________ Name: svn:special + * Modified: mgmt/newdata/mint/python/mint/expire.py =================================================================== --- mgmt/newdata/mint/python/mint/expire.py 2010-03-22 14:58:08 UTC (rev 3871) +++ mgmt/newdata/mint/python/mint/expire.py 2010-03-22 16:54:24 UTC (rev 3872) @@ -92,23 +92,23 @@ def do_process(self, conn, stats): seconds = self.model.app.expire_threshold - log.info("Expiring stats older than %i seconds", seconds) + log.info("Expiring samples older than %i seconds", seconds) count = 0 for pkg in self.model.rosemary._packages: for cls in pkg._classes: - count += self.delete_stats(conn, cls, seconds) + count += self.delete_samples(conn, cls, seconds) conn.commit() - log.info("Expired %i stat records", count) + log.info("Expired %i samples", count) - def delete_stats(self, conn, cls, seconds): + def delete_samples(self, conn, cls, seconds): cursor = conn.cursor() try: - cls.sql_stats_delete.execute(cursor, (), {"seconds": seconds}) + cls.sql_samples_delete.execute(cursor, (), {"seconds": seconds}) log.debug("Deleted %i %s", cursor.rowcount, cls) Modified: mgmt/newdata/mint/python/mint/newupdate.py =================================================================== --- mgmt/newdata/mint/python/mint/newupdate.py 2010-03-22 14:58:08 UTC (rev 3871) +++ mgmt/newdata/mint/python/mint/newupdate.py 2010-03-22 16:54:24 UTC (rev 3872) @@ -324,7 +324,8 @@ try: cls.sql_update.execute(cursor, update_columns, obj.__dict__) - cls.sql_stats_insert.execute(cursor, insert_columns, obj.__dict__) + cls.sql_samples_insert.execute \ + (cursor, insert_columns, obj.__dict__) finally: cursor.close() Modified: mgmt/newdata/mint/sql/rosemary.sql =================================================================== --- mgmt/newdata/mint/sql/rosemary.sql 2010-03-22 14:58:08 UTC (rev 3871) +++ mgmt/newdata/mint/sql/rosemary.sql 2010-03-22 16:54:24 UTC (rev 3872) @@ -27,11 +27,11 @@ constraint "Cluster_pk" primary key ("_id"), constraint "Cluster_qmf_ids_uq" unique ("_qmf_agent_id", "_qmf_object_id") ) - create table "Cluster_stats" ( + create table "Cluster_samples" ( "_id" serial8 not null, "_parent_id" int8 not null, "_qmf_update_time" timestamp not null, - constraint "Cluster_stats_pk" primary key ("_id") + constraint "Cluster_samples_pk" primary key ("_id") ) ; create schema "org.apache.qpid.broker" @@ -53,11 +53,11 @@ constraint "System_pk" primary key ("_id"), constraint "System_qmf_ids_uq" unique ("_qmf_agent_id", "_qmf_object_id") ) - create table "System_stats" ( + create table "System_samples" ( "_id" serial8 not null, "_parent_id" int8 not null, "_qmf_update_time" timestamp not null, - constraint "System_stats_pk" primary key ("_id") + constraint "System_samples_pk" primary key ("_id") ) create table "Broker" ( "_id" serial8 not null, @@ -81,12 +81,12 @@ constraint "Broker_pk" primary key ("_id"), constraint "Broker_qmf_ids_uq" unique ("_qmf_agent_id", "_qmf_object_id") ) - create table "Broker_stats" ( + create table "Broker_samples" ( "_id" serial8 not null, "_parent_id" int8 not null, "_qmf_update_time" timestamp not null, "uptime" numeric(19) not null, - constraint "Broker_stats_pk" primary key ("_id") + constraint "Broker_samples_pk" primary key ("_id") ) create table "Agent" ( "_id" serial8 not null, @@ -106,11 +106,11 @@ constraint "Agent_pk" primary key ("_id"), constraint "Agent_qmf_ids_uq" unique ("_qmf_agent_id", "_qmf_object_id") ) - create table "Agent_stats" ( + create table "Agent_samples" ( "_id" serial8 not null, "_parent_id" int8 not null, "_qmf_update_time" timestamp not null, - constraint "Agent_stats_pk" primary key ("_id") + constraint "Agent_samples_pk" primary key ("_id") ) create table "Vhost" ( "_id" serial8 not null, @@ -127,11 +127,11 @@ constraint "Vhost_pk" primary key ("_id"), constraint "Vhost_qmf_ids_uq" unique ("_qmf_agent_id", "_qmf_object_id") ) - create table "Vhost_stats" ( + create table "Vhost_samples" ( "_id" serial8 not null, "_parent_id" int8 not null, "_qmf_update_time" timestamp not null, - constraint "Vhost_stats_pk" primary key ("_id") + constraint "Vhost_samples_pk" primary key ("_id") ) create table "Queue" ( "_id" serial8 not null, @@ -170,7 +170,7 @@ constraint "Queue_pk" primary key ("_id"), constraint "Queue_qmf_ids_uq" unique ("_qmf_agent_id", "_qmf_object_id") ) - create table "Queue_stats" ( + create table "Queue_samples" ( "_id" serial8 not null, "_parent_id" int8 not null, "_qmf_update_time" timestamp not null, @@ -192,7 +192,7 @@ "bindingCount" int8 not null, "unackedMessages" int8 not null, "messageLatency" numeric(19), - constraint "Queue_stats_pk" primary key ("_id") + constraint "Queue_samples_pk" primary key ("_id") ) create table "Exchange" ( "_id" serial8 not null, @@ -221,7 +221,7 @@ constraint "Exchange_pk" primary key ("_id"), constraint "Exchange_qmf_ids_uq" unique ("_qmf_agent_id", "_qmf_object_id") ) - create table "Exchange_stats" ( + create table "Exchange_samples" ( "_id" serial8 not null, "_parent_id" int8 not null, "_qmf_update_time" timestamp not null, @@ -233,7 +233,7 @@ "byteReceives" numeric(19) not null, "byteDrops" numeric(19) not null, "byteRoutes" numeric(19) not null, - constraint "Exchange_stats_pk" primary key ("_id") + constraint "Exchange_samples_pk" primary key ("_id") ) create table "Binding" ( "_id" serial8 not null, @@ -253,12 +253,12 @@ constraint "Binding_pk" primary key ("_id"), constraint "Binding_qmf_ids_uq" unique ("_qmf_agent_id", "_qmf_object_id") ) - create table "Binding_stats" ( + create table "Binding_samples" ( "_id" serial8 not null, "_parent_id" int8 not null, "_qmf_update_time" timestamp not null, "msgMatched" numeric(19) not null, - constraint "Binding_stats_pk" primary key ("_id") + constraint "Binding_samples_pk" primary key ("_id") ) create table "Subscription" ( "_id" serial8 not null, @@ -281,12 +281,12 @@ constraint "Subscription_pk" primary key ("_id"), constraint "Subscription_qmf_ids_uq" unique ("_qmf_agent_id", "_qmf_object_id") ) - create table "Subscription_stats" ( + create table "Subscription_samples" ( "_id" serial8 not null, "_parent_id" int8 not null, "_qmf_update_time" timestamp not null, "delivered" numeric(19) not null, - constraint "Subscription_stats_pk" primary key ("_id") + constraint "Subscription_samples_pk" primary key ("_id") ) create table "Connection" ( "_id" serial8 not null, @@ -315,7 +315,7 @@ constraint "Connection_pk" primary key ("_id"), constraint "Connection_qmf_ids_uq" unique ("_qmf_agent_id", "_qmf_object_id") ) - create table "Connection_stats" ( + create table "Connection_samples" ( "_id" serial8 not null, "_parent_id" int8 not null, "_qmf_update_time" timestamp not null, @@ -324,7 +324,7 @@ "framesToClient" numeric(19) not null, "bytesFromClient" numeric(19) not null, "bytesToClient" numeric(19) not null, - constraint "Connection_stats_pk" primary key ("_id") + constraint "Connection_samples_pk" primary key ("_id") ) create table "Link" ( "_id" serial8 not null, @@ -345,13 +345,13 @@ constraint "Link_pk" primary key ("_id"), constraint "Link_qmf_ids_uq" unique ("_qmf_agent_id", "_qmf_object_id") ) - create table "Link_stats" ( + create table "Link_samples" ( "_id" serial8 not null, "_parent_id" int8 not null, "_qmf_update_time" timestamp not null, "state" text not null, "lastError" text not null, - constraint "Link_stats_pk" primary key ("_id") + constraint "Link_samples_pk" primary key ("_id") ) create table "Bridge" ( "_id" serial8 not null, @@ -377,11 +377,11 @@ constraint "Bridge_pk" primary key ("_id"), constraint "Bridge_qmf_ids_uq" unique ("_qmf_agent_id", "_qmf_object_id") ) - create table "Bridge_stats" ( + create table "Bridge_samples" ( "_id" serial8 not null, "_parent_id" int8 not null, "_qmf_update_time" timestamp not null, - constraint "Bridge_stats_pk" primary key ("_id") + constraint "Bridge_samples_pk" primary key ("_id") ) create table "Session" ( "_id" serial8 not null, @@ -409,7 +409,7 @@ constraint "Session_pk" primary key ("_id"), constraint "Session_qmf_ids_uq" unique ("_qmf_agent_id", "_qmf_object_id") ) - create table "Session_stats" ( + create table "Session_samples" ( "_id" serial8 not null, "_parent_id" int8 not null, "_qmf_update_time" timestamp not null, @@ -419,7 +419,7 @@ "TxnRejects" numeric(19) not null, "TxnCount" int8 not null, "clientCredit" int8 not null, - constraint "Session_stats_pk" primary key ("_id") + constraint "Session_samples_pk" primary key ("_id") ) create table "ManagementSetupState" ( "_id" serial8 not null, @@ -435,11 +435,11 @@ constraint "ManagementSetupState_pk" primary key ("_id"), constraint "ManagementSetupState_qmf_ids_uq" unique ("_qmf_agent_id", "_qmf_object_id") ) - create table "ManagementSetupState_stats" ( + create table "ManagementSetupState_samples" ( "_id" serial8 not null, "_parent_id" int8 not null, "_qmf_update_time" timestamp not null, - constraint "ManagementSetupState_stats_pk" primary key ("_id") + constraint "ManagementSetupState_samples_pk" primary key ("_id") ) ; create schema "com.redhat.sesame" @@ -471,7 +471,7 @@ constraint "Sysimage_pk" primary key ("_id"), constraint "Sysimage_qmf_ids_uq" unique ("_qmf_agent_id", "_qmf_object_id") ) - create table "Sysimage_stats" ( + create table "Sysimage_samples" ( "_id" serial8 not null, "_parent_id" int8 not null, "_qmf_update_time" timestamp not null, @@ -482,7 +482,7 @@ "loadAverage10Min" float4 not null, "procTotal" int8 not null, "procRunning" int8 not null, - constraint "Sysimage_stats_pk" primary key ("_id") + constraint "Sysimage_samples_pk" primary key ("_id") ) ; create schema "org.apache.qpid.acl" @@ -504,12 +504,12 @@ constraint "Acl_pk" primary key ("_id"), constraint "Acl_qmf_ids_uq" unique ("_qmf_agent_id", "_qmf_object_id") ) - create table "Acl_stats" ( + create table "Acl_samples" ( "_id" serial8 not null, "_parent_id" int8 not null, "_qmf_update_time" timestamp not null, "aclDenyCount" numeric(19) not null, - constraint "Acl_stats_pk" primary key ("_id") + constraint "Acl_samples_pk" primary key ("_id") ) ; create schema "com.redhat.cumin" @@ -527,11 +527,11 @@ constraint "BrokerGroup_pk" primary key ("_id"), constraint "BrokerGroup_qmf_ids_uq" unique ("_qmf_agent_id", "_qmf_object_id") ) - create table "BrokerGroup_stats" ( + create table "BrokerGroup_samples" ( "_id" serial8 not null, "_parent_id" int8 not null, "_qmf_update_time" timestamp not null, - constraint "BrokerGroup_stats_pk" primary key ("_id") + constraint "BrokerGroup_samples_pk" primary key ("_id") ) create table "BrokerGroupMapping" ( "_id" serial8 not null, @@ -547,11 +547,11 @@ constraint "BrokerGroupMapping_pk" primary key ("_id"), constraint "BrokerGroupMapping_qmf_ids_uq" unique ("_qmf_agent_id", "_qmf_object_id") ) - create table "BrokerGroupMapping_stats" ( + create table "BrokerGroupMapping_samples" ( "_id" serial8 not null, "_parent_id" int8 not null, "_qmf_update_time" timestamp not null, - constraint "BrokerGroupMapping_stats_pk" primary key ("_id") + constraint "BrokerGroupMapping_samples_pk" primary key ("_id") ) ; create schema "com.redhat.rhm.store" @@ -583,7 +583,7 @@ constraint "Store_pk" primary key ("_id"), constraint "Store_qmf_ids_uq" unique ("_qmf_agent_id", "_qmf_object_id") ) - create table "Store_stats" ( + create table "Store_samples" ( "_id" serial8 not null, "_parent_id" int8 not null, "_qmf_update_time" timestamp not null, @@ -592,7 +592,7 @@ "tplTxnCommits" numeric(19) not null, "tplTxnAborts" numeric(19) not null, "tplOutstandingAIOs" int8 not null, - constraint "Store_stats_pk" primary key ("_id") + constraint "Store_samples_pk" primary key ("_id") ) create table "Journal" ( "_id" serial8 not null, @@ -636,7 +636,7 @@ constraint "Journal_pk" primary key ("_id"), constraint "Journal_qmf_ids_uq" unique ("_qmf_agent_id", "_qmf_object_id") ) - create table "Journal_stats" ( + create table "Journal_samples" ( "_id" serial8 not null, "_parent_id" int8 not null, "_qmf_update_time" timestamp not null, @@ -657,7 +657,7 @@ "readBusyFailures" numeric(19) not null, "writePageCacheDepth" int8 not null, "readPageCacheDepth" int8 not null, - constraint "Journal_stats_pk" primary key ("_id") + constraint "Journal_samples_pk" primary key ("_id") ) ; create schema "mrg.grid" @@ -754,7 +754,7 @@ constraint "Slot_pk" primary key ("_id"), constraint "Slot_qmf_ids_uq" unique ("_qmf_agent_id", "_qmf_object_id") ) - create table "Slot_stats" ( + create table "Slot_samples" ( "_id" serial8 not null, "_parent_id" int8 not null, "_qmf_update_time" timestamp not null, @@ -781,7 +781,7 @@ "TotalTimePreemptingVacating" int8 not null, "TotalTimeUnclaimedBenchmarking" int8 not null, "TotalTimeUnclaimedIdle" int8 not null, - constraint "Slot_stats_pk" primary key ("_id") + constraint "Slot_samples_pk" primary key ("_id") ) create table "Scheduler" ( "_id" serial8 not null, @@ -808,7 +808,7 @@ constraint "Scheduler_pk" primary key ("_id"), constraint "Scheduler_qmf_ids_uq" unique ("_qmf_agent_id", "_qmf_object_id") ) - create table "Scheduler_stats" ( + create table "Scheduler_samples" ( "_id" serial8 not null, "_parent_id" int8 not null, "_qmf_update_time" timestamp not null, @@ -818,7 +818,7 @@ "TotalJobAds" int8 not null, "TotalRemovedJobs" int8 not null, "TotalRunningJobs" int8 not null, - constraint "Scheduler_stats_pk" primary key ("_id") + constraint "Scheduler_samples_pk" primary key ("_id") ) create table "Submitter" ( "_id" serial8 not null, @@ -840,14 +840,14 @@ constraint "Submitter_pk" primary key ("_id"), constraint "Submitter_qmf_ids_uq" unique ("_qmf_agent_id", "_qmf_object_id") ) - create table "Submitter_stats" ( + create table "Submitter_samples" ( "_id" serial8 not null, "_parent_id" int8 not null, "_qmf_update_time" timestamp not null, "HeldJobs" int8 not null, "IdleJobs" int8 not null, "RunningJobs" int8 not null, - constraint "Submitter_stats_pk" primary key ("_id") + constraint "Submitter_samples_pk" primary key ("_id") ) create table "Negotiator" ( "_id" serial8 not null, @@ -866,11 +866,11 @@ constraint "Negotiator_pk" primary key ("_id"), constraint "Negotiator_qmf_ids_uq" unique ("_qmf_agent_id", "_qmf_object_id") ) - create table "Negotiator_stats" ( + create table "Negotiator_samples" ( "_id" serial8 not null, "_parent_id" int8 not null, "_qmf_update_time" timestamp not null, - constraint "Negotiator_stats_pk" primary key ("_id") + constraint "Negotiator_samples_pk" primary key ("_id") ) create table "Collector" ( "_id" serial8 not null, @@ -896,7 +896,7 @@ constraint "Collector_pk" primary key ("_id"), constraint "Collector_qmf_ids_uq" unique ("_qmf_agent_id", "_qmf_object_id") ) - create table "Collector_stats" ( + create table "Collector_samples" ( "_id" serial8 not null, "_parent_id" int8 not null, "_qmf_update_time" timestamp not null, @@ -906,7 +906,7 @@ "HostsClaimed" int8 not null, "HostsUnclaimed" int8 not null, "HostsOwner" int8 not null, - constraint "Collector_stats_pk" primary key ("_id") + constraint "Collector_samples_pk" primary key ("_id") ) create table "Master" ( "_id" serial8 not null, @@ -926,11 +926,11 @@ constraint "Master_pk" primary key ("_id"), constraint "Master_qmf_ids_uq" unique ("_qmf_agent_id", "_qmf_object_id") ) - create table "Master_stats" ( + create table "Master_samples" ( "_id" serial8 not null, "_parent_id" int8 not null, "_qmf_update_time" timestamp not null, - constraint "Master_stats_pk" primary key ("_id") + constraint "Master_samples_pk" primary key ("_id") ) create table "Grid" ( "_id" serial8 not null, @@ -958,7 +958,7 @@ constraint "Grid_pk" primary key ("_id"), constraint "Grid_qmf_ids_uq" unique ("_qmf_agent_id", "_qmf_object_id") ) - create table "Grid_stats" ( + create table "Grid_samples" ( "_id" serial8 not null, "_parent_id" int8 not null, "_qmf_update_time" timestamp not null, @@ -969,7 +969,7 @@ "SubmitsWanted" int8 not null, "RunningJobs" int8 not null, "IdleJobs" int8 not null, - constraint "Grid_stats_pk" primary key ("_id") + constraint "Grid_samples_pk" primary key ("_id") ) create table "Submission" ( "_id" serial8 not null, @@ -991,7 +991,7 @@ constraint "Submission_pk" primary key ("_id"), constraint "Submission_qmf_ids_uq" unique ("_qmf_agent_id", "_qmf_object_id") ) - create table "Submission_stats" ( + create table "Submission_samples" ( "_id" serial8 not null, "_parent_id" int8 not null, "_qmf_update_time" timestamp not null, @@ -1000,151 +1000,151 @@ "Removed" int8 not null, "Completed" int8 not null, "Held" int8 not null, - constraint "Submission_stats_pk" primary key ("_id") + constraint "Submission_samples_pk" primary key ("_id") ) ; alter table "org.apache.qpid.cluster"."Cluster" add constraint "_brokerRef_id_fk" foreign key ("_brokerRef_id") references "org.apache.qpid.broker"."Broker" ("_id") on update cascade on delete set null ; -alter table "org.apache.qpid.cluster"."Cluster_stats" +alter table "org.apache.qpid.cluster"."Cluster_samples" add constraint "_parent_id_fk" foreign key ("_parent_id") references "org.apache.qpid.cluster"."Cluster" ("_id") on update cascade on delete cascade ; -alter table "org.apache.qpid.broker"."System_stats" +alter table "org.apache.qpid.broker"."System_samples" add constraint "_parent_id_fk" foreign key ("_parent_id") references "org.apache.qpid.broker"."System" ("_id") on update cascade on delete cascade ; alter table "org.apache.qpid.broker"."Broker" add constraint "_systemRef_id_fk" foreign key ("_systemRef_id") references "org.apache.qpid.broker"."System" ("_id") on update cascade on delete set null ; -alter table "org.apache.qpid.broker"."Broker_stats" +alter table "org.apache.qpid.broker"."Broker_samples" add constraint "_parent_id_fk" foreign key ("_parent_id") references "org.apache.qpid.broker"."Broker" ("_id") on update cascade on delete cascade ; alter table "org.apache.qpid.broker"."Agent" add constraint "_connectionRef_id_fk" foreign key ("_connectionRef_id") references "org.apache.qpid.broker"."Connection" ("_id") on update cascade on delete set null, add constraint "_registeredTo_id_fk" foreign key ("_registeredTo_id") references "org.apache.qpid.broker"."Broker" ("_id") on update cascade on delete set null ; -alter table "org.apache.qpid.broker"."Agent_stats" +alter table "org.apache.qpid.broker"."Agent_samples" add constraint "_parent_id_fk" foreign key ("_parent_id") references "org.apache.qpid.broker"."Agent" ("_id") on update cascade on delete cascade ; alter table "org.apache.qpid.broker"."Vhost" add constraint "_brokerRef_id_fk" foreign key ("_brokerRef_id") references "org.apache.qpid.broker"."Broker" ("_id") on update cascade on delete set null ; -alter table "org.apache.qpid.broker"."Vhost_stats" +alter table "org.apache.qpid.broker"."Vhost_samples" add constraint "_parent_id_fk" foreign key ("_parent_id") references "org.apache.qpid.broker"."Vhost" ("_id") on update cascade on delete cascade ; alter table "org.apache.qpid.broker"."Queue" add constraint "_vhostRef_id_fk" foreign key ("_vhostRef_id") references "org.apache.qpid.broker"."Vhost" ("_id") on update cascade on delete set null, add constraint "_altExchange_id_fk" foreign key ("_altExchange_id") references "org.apache.qpid.broker"."Exchange" ("_id") on update cascade on delete set null ; -alter table "org.apache.qpid.broker"."Queue_stats" +alter table "org.apache.qpid.broker"."Queue_samples" add constraint "_parent_id_fk" foreign key ("_parent_id") references "org.apache.qpid.broker"."Queue" ("_id") on update cascade on delete cascade ; alter table "org.apache.qpid.broker"."Exchange" add constraint "_vhostRef_id_fk" foreign key ("_vhostRef_id") references "org.apache.qpid.broker"."Vhost" ("_id") on update cascade on delete set null, add constraint "_altExchange_id_fk" foreign key ("_altExchange_id") references "org.apache.qpid.broker"."Exchange" ("_id") on update cascade on delete set null ; -alter table "org.apache.qpid.broker"."Exchange_stats" +alter table "org.apache.qpid.broker"."Exchange_samples" add constraint "_parent_id_fk" foreign key ("_parent_id") references "org.apache.qpid.broker"."Exchange" ("_id") on update cascade on delete cascade ; alter table "org.apache.qpid.broker"."Binding" add constraint "_exchangeRef_id_fk" foreign key ("_exchangeRef_id") references "org.apache.qpid.broker"."Exchange" ("_id") on update cascade on delete set null, add constraint "_queueRef_id_fk" foreign key ("_queueRef_id") references "org.apache.qpid.broker"."Queue" ("_id") on update cascade on delete set null ; -alter table "org.apache.qpid.broker"."Binding_stats" +alter table "org.apache.qpid.broker"."Binding_samples" add constraint "_parent_id_fk" foreign key ("_parent_id") references "org.apache.qpid.broker"."Binding" ("_id") on update cascade on delete cascade ; alter table "org.apache.qpid.broker"."Subscription" add constraint "_sessionRef_id_fk" foreign key ("_sessionRef_id") references "org.apache.qpid.broker"."Session" ("_id") on update cascade on delete set null, add constraint "_queueRef_id_fk" foreign key ("_queueRef_id") references "org.apache.qpid.broker"."Queue" ("_id") on update cascade on delete set null ; -alter table "org.apache.qpid.broker"."Subscription_stats" +alter table "org.apache.qpid.broker"."Subscription_samples" add constraint "_parent_id_fk" foreign key ("_parent_id") references "org.apache.qpid.broker"."Subscription" ("_id") on update cascade on delete cascade ; alter table "org.apache.qpid.broker"."Connection" add constraint "_vhostRef_id_fk" foreign key ("_vhostRef_id") references "org.apache.qpid.broker"."Vhost" ("_id") on update cascade on delete set null ; -alter table "org.apache.qpid.broker"."Connection_stats" +alter table "org.apache.qpid.broker"."Connection_samples" add constraint "_parent_id_fk" foreign key ("_parent_id") references "org.apache.qpid.broker"."Connection" ("_id") on update cascade on delete cascade ; alter table "org.apache.qpid.broker"."Link" add constraint "_vhostRef_id_fk" foreign key ("_vhostRef_id") references "org.apache.qpid.broker"."Vhost" ("_id") on update cascade on delete set null ; -alter table "org.apache.qpid.broker"."Link_stats" +alter table "org.apache.qpid.broker"."Link_samples" add constraint "_parent_id_fk" foreign key ("_parent_id") references "org.apache.qpid.broker"."Link" ("_id") on update cascade on delete cascade ; alter table "org.apache.qpid.broker"."Bridge" add constraint "_linkRef_id_fk" foreign key ("_linkRef_id") references "org.apache.qpid.broker"."Link" ("_id") on update cascade on delete set null ; -alter table "org.apache.qpid.broker"."Bridge_stats" +alter table "org.apache.qpid.broker"."Bridge_samples" add constraint "_parent_id_fk" foreign key ("_parent_id") references "org.apache.qpid.broker"."Bridge" ("_id") on update cascade on delete cascade ; alter table "org.apache.qpid.broker"."Session" add constraint "_vhostRef_id_fk" foreign key ("_vhostRef_id") references "org.apache.qpid.broker"."Vhost" ("_id") on update cascade on delete set null, add constraint "_connectionRef_id_fk" foreign key ("_connectionRef_id") references "org.apache.qpid.broker"."Connection" ("_id") on update cascade on delete set null ; -alter table "org.apache.qpid.broker"."Session_stats" +alter table "org.apache.qpid.broker"."Session_samples" add constraint "_parent_id_fk" foreign key ("_parent_id") references "org.apache.qpid.broker"."Session" ("_id") on update cascade on delete cascade ; -alter table "org.apache.qpid.broker"."ManagementSetupState_stats" +alter table "org.apache.qpid.broker"."ManagementSetupState_samples" add constraint "_parent_id_fk" foreign key ("_parent_id") references "org.apache.qpid.broker"."ManagementSetupState" ("_id") on update cascade on delete cascade ; -alter table "com.redhat.sesame"."Sysimage_stats" +alter table "com.redhat.sesame"."Sysimage_samples" add constraint "_parent_id_fk" foreign key ("_parent_id") references "com.redhat.sesame"."Sysimage" ("_id") on update cascade on delete cascade ; alter table "org.apache.qpid.acl"."Acl" add constraint "_brokerRef_id_fk" foreign key ("_brokerRef_id") references "org.apache.qpid.broker"."Broker" ("_id") on update cascade on delete set null ; -alter table "org.apache.qpid.acl"."Acl_stats" +alter table "org.apache.qpid.acl"."Acl_samples" add constraint "_parent_id_fk" foreign key ("_parent_id") references "org.apache.qpid.acl"."Acl" ("_id") on update cascade on delete cascade ; -alter table "com.redhat.cumin"."BrokerGroup_stats" +alter table "com.redhat.cumin"."BrokerGroup_samples" add constraint "_parent_id_fk" foreign key ("_parent_id") references "com.redhat.cumin"."BrokerGroup" ("_id") on update cascade on delete cascade ; alter table "com.redhat.cumin"."BrokerGroupMapping" add constraint "_broker_id_fk" foreign key ("_broker_id") references "org.apache.qpid.broker"."Broker" ("_id") on update cascade on delete set null, add constraint "_group_id_fk" foreign key ("_group_id") references "com.redhat.cumin"."BrokerGroup" ("_id") on update cascade on delete set null ; -alter table "com.redhat.cumin"."BrokerGroupMapping_stats" +alter table "com.redhat.cumin"."BrokerGroupMapping_samples" add constraint "_parent_id_fk" foreign key ("_parent_id") references "com.redhat.cumin"."BrokerGroupMapping" ("_id") on update cascade on delete cascade ; alter table "com.redhat.rhm.store"."Store" add constraint "_brokerRef_id_fk" foreign key ("_brokerRef_id") references "org.apache.qpid.broker"."Broker" ("_id") on update cascade on delete set null ; -alter table "com.redhat.rhm.store"."Store_stats" +alter table "com.redhat.rhm.store"."Store_samples" add constraint "_parent_id_fk" foreign key ("_parent_id") references "com.redhat.rhm.store"."Store" ("_id") on update cascade on delete cascade ; alter table "com.redhat.rhm.store"."Journal" add constraint "_queueRef_id_fk" foreign key ("_queueRef_id") references "org.apache.qpid.broker"."Queue" ("_id") on update cascade on delete set null ; -alter table "com.redhat.rhm.store"."Journal_stats" +alter table "com.redhat.rhm.store"."Journal_samples" add constraint "_parent_id_fk" foreign key ("_parent_id") references "com.redhat.rhm.store"."Journal" ("_id") on update cascade on delete cascade ; -alter table "mrg.grid"."Slot_stats" +alter table "mrg.grid"."Slot_samples" add constraint "_parent_id_fk" foreign key ("_parent_id") references "mrg.grid"."Slot" ("_id") on update cascade on delete cascade ; -alter table "mrg.grid"."Scheduler_stats" +alter table "mrg.grid"."Scheduler_samples" add constraint "_parent_id_fk" foreign key ("_parent_id") references "mrg.grid"."Scheduler" ("_id") on update cascade on delete cascade ; alter table "mrg.grid"."Submitter" add constraint "_schedulerRef_id_fk" foreign key ("_schedulerRef_id") references "mrg.grid"."Scheduler" ("_id") on update cascade on delete set null ; -alter table "mrg.grid"."Submitter_stats" +alter table "mrg.grid"."Submitter_samples" add constraint "_parent_id_fk" foreign key ("_parent_id") references "mrg.grid"."Submitter" ("_id") on update cascade on delete cascade ; -alter table "mrg.grid"."Negotiator_stats" +alter table "mrg.grid"."Negotiator_samples" add constraint "_parent_id_fk" foreign key ("_parent_id") references "mrg.grid"."Negotiator" ("_id") on update cascade on delete cascade ; -alter table "mrg.grid"."Collector_stats" +alter table "mrg.grid"."Collector_samples" add constraint "_parent_id_fk" foreign key ("_parent_id") references "mrg.grid"."Collector" ("_id") on update cascade on delete cascade ; -alter table "mrg.grid"."Master_stats" +alter table "mrg.grid"."Master_samples" add constraint "_parent_id_fk" foreign key ("_parent_id") references "mrg.grid"."Master" ("_id") on update cascade on delete cascade ; -alter table "mrg.grid"."Grid_stats" +alter table "mrg.grid"."Grid_samples" add constraint "_parent_id_fk" foreign key ("_parent_id") references "mrg.grid"."Grid" ("_id") on update cascade on delete cascade ; alter table "mrg.grid"."Submission" add constraint "_schedulerRef_id_fk" foreign key ("_schedulerRef_id") references "mrg.grid"."Scheduler" ("_id") on update cascade on delete set null ; -alter table "mrg.grid"."Submission_stats" +alter table "mrg.grid"."Submission_samples" add constraint "_parent_id_fk" foreign key ("_parent_id") references "mrg.grid"."Submission" ("_id") on update cascade on delete cascade ; Modified: mgmt/newdata/rosemary/python/rosemary/model.py =================================================================== --- mgmt/newdata/rosemary/python/rosemary/model.py 2010-03-22 14:58:08 UTC (rev 3871) +++ mgmt/newdata/rosemary/python/rosemary/model.py 2010-03-22 16:54:24 UTC (rev 3872) @@ -167,29 +167,29 @@ # Stats table - name = "%s_stats" % self._name - self.sql_stats_table = SqlTable(self._package.sql_schema, name) + name = "%s_samples" % self._name + self.sql_samples_table = SqlTable(self._package.sql_schema, name) - stats_id_col = SqlColumn(self.sql_stats_table, "_id", sql_serial8) - self.sql_stats_table.key_column = stats_id_col + stats_id_col = SqlColumn(self.sql_samples_table, "_id", sql_serial8) + self.sql_samples_table.key_column = stats_id_col - name = "%s_pk" % self.sql_stats_table._name - SqlPrimaryKeyConstraint(self.sql_stats_table, name, (stats_id_col,)) + name = "%s_pk" % self.sql_samples_table._name + SqlPrimaryKeyConstraint(self.sql_samples_table, name, (stats_id_col,)) name = "_parent_id" - parent_col = SqlColumn(self.sql_stats_table, name, sql_int8) + parent_col = SqlColumn(self.sql_samples_table, name, sql_int8) parent_col.foreign_key_column = id_col - table = self.sql_stats_table + table = self.sql_samples_table name = "%s_fk" % parent_col.name constraint = SqlForeignKeyConstraint(table, name, parent_col, id_col) constraint.on_delete = "cascade" name = "_qmf_update_time" - SqlColumn(self.sql_stats_table, name, sql_timestamp) + SqlColumn(self.sql_samples_table, name, sql_timestamp) - self.sql_stats_insert = SqlInsertItemStats(self.sql_stats_table) - self.sql_stats_delete = SqlDeleteItemStats(self.sql_stats_table) + self.sql_samples_insert = SqlInsertItemStats(self.sql_samples_table) + self.sql_samples_delete = SqlDeleteItemStats(self.sql_samples_table) def add_headers(self): name = "_qmf_agent_id" @@ -290,36 +290,7 @@ meth.init() self.add_constraints() - -# def add_id_columns(self): - # id_col = SqlColumn(self.sql_table, "_id", sql_serial8) - # self.sql_table.key_column = id_col -# name = "%s_pk" % self._name -# SqlPrimaryKeyConstraint(self.sql_table, name, (id_col,)) - - -# def add_qmf_columns(self): -# agent = SqlColumn(self.sql_table, "_qmf_agent_id", sql_text) -# object = SqlColumn(self.sql_table, "_qmf_object_id", sql_text) - -# name = "%s_qmf_ids_uq" % self._name - - #SqlUniqueConstraint(self.sql_table, name, (agent, object)) - - #col = SqlColumn(self.sql_table, "_qmf_session_id", sql_text) - #col.nullable = True - - #SqlColumn(self.sql_table, "_qmf_class_key", sql_text) - - #SqlColumn(self.sql_table, "_qmf_update_time", sql_timestamp) - #SqlColumn(self.sql_table, "_qmf_create_time", sql_timestamp) - - #col = SqlColumn(self.sql_table, "_qmf_delete_time", sql_timestamp) - #col.nullable = True - - #SqlColumn(self.sql_stats_table, "_qmf_update_time", sql_timestamp) - def select_objects(self, cursor, **kwargs): objects = list() @@ -539,7 +510,7 @@ self.sql_column = SqlColumn(self.cls.sql_table, self.name, type) self.sql_column.nullable = True - col = SqlColumn(self.cls.sql_stats_table, self.name, type) + col = SqlColumn(self.cls.sql_samples_table, self.name, type) col.nullable = self.optional class RosemaryMethod(object):

16 years, 1 month

1
0
0 / 0

rhmessaging commits: r3871 - in mgmt: newdata/cumin/python/cumin and 12 other directories.

by rhmessaging-commits＠lists.jboss.org

Author: justi9 Date: 2010-03-22 10:58:08 -0400 (Mon, 22 Mar 2010) New Revision: 3871 Added: mgmt/newdata/ mgmt/newdata/cumin/python/cumin/messaging/subscription.py mgmt/newdata/cumin/python/cumin/objectform.py mgmt/newdata/cumin/python/cumin/objectframe.py mgmt/newdata/cumin/python/cumin/objectframe.strings mgmt/newdata/cumin/python/cumin/objectselector.py mgmt/newdata/cumin/python/cumin/objectselector.strings mgmt/newdata/cumin/python/cumin/objecttask.py mgmt/newdata/cumin/python/cumin/sqladapter.py mgmt/newdata/cumin/python/cumin/table.py mgmt/newdata/cumin/python/cumin/table.strings mgmt/newdata/mint/python/mint/newupdate.py mgmt/newdata/mint/sql/rosemary.sql mgmt/newdata/rosemary/python/rosemary/sqlquery.py mgmt/newdata/rosemary/xml/cumin.xml mgmt/newdata/wooly/python/wooly/datatable.py mgmt/newdata/wooly/python/wooly/datatable.strings mgmt/newdata/wooly/python/wooly/table.py mgmt/newdata/wooly/python/wooly/table.strings Modified: mgmt/newdata/cumin/python/cumin/config.py mgmt/newdata/cumin/python/cumin/grid/collector.py mgmt/newdata/cumin/python/cumin/grid/job.py mgmt/newdata/cumin/python/cumin/grid/limit.py mgmt/newdata/cumin/python/cumin/grid/negotiator.py mgmt/newdata/cumin/python/cumin/grid/pool.py mgmt/newdata/cumin/python/cumin/grid/scheduler.py mgmt/newdata/cumin/python/cumin/grid/slot.py mgmt/newdata/cumin/python/cumin/grid/submission.py mgmt/newdata/cumin/python/cumin/grid/submitter.py mgmt/newdata/cumin/python/cumin/inventory/system.py mgmt/newdata/cumin/python/cumin/main.py mgmt/newdata/cumin/python/cumin/messaging/binding.py mgmt/newdata/cumin/python/cumin/messaging/broker.py mgmt/newdata/cumin/python/cumin/messaging/brokergroup.py mgmt/newdata/cumin/python/cumin/messaging/brokerlink.py mgmt/newdata/cumin/python/cumin/messaging/connection.py mgmt/newdata/cumin/python/cumin/messaging/exchange.py mgmt/newdata/cumin/python/cumin/messaging/main.py mgmt/newdata/cumin/python/cumin/messaging/model.py mgmt/newdata/cumin/python/cumin/messaging/queue.py mgmt/newdata/cumin/python/cumin/model.py mgmt/newdata/cumin/python/cumin/parameters.py mgmt/newdata/cumin/python/cumin/tools.py mgmt/newdata/cumin/python/cumin/usergrid/widgets.py mgmt/newdata/cumin/python/cumin/widgets.py mgmt/newdata/cumin/resources/app.css mgmt/newdata/mint/python/mint/database.py mgmt/newdata/mint/python/mint/demo.py mgmt/newdata/mint/python/mint/expire.py mgmt/newdata/mint/python/mint/main.py mgmt/newdata/mint/python/mint/model.py mgmt/newdata/mint/python/mint/sql.py mgmt/newdata/mint/python/mint/tools.py mgmt/newdata/mint/python/mint/update.py mgmt/newdata/mint/python/mint/util.py mgmt/newdata/mint/python/mint/vacuum.py mgmt/newdata/mint/sql/Makefile mgmt/newdata/rosemary/bin/rosemary-test mgmt/newdata/rosemary/python/rosemary/model.py mgmt/newdata/rosemary/python/rosemary/sqlmodel.py mgmt/newdata/rosemary/python/rosemary/sqloperation.py mgmt/newdata/rosemary/xml/condor.xml mgmt/newdata/rosemary/xml/qpid.xml mgmt/newdata/rosemary/xml/rosemary.xml mgmt/newdata/wooly/python/wooly/__init__.py mgmt/newdata/wooly/python/wooly/forms.py mgmt/newdata/wooly/python/wooly/parameters.py mgmt/newdata/wooly/python/wooly/profile.py mgmt/newdata/wooly/python/wooly/server.py mgmt/newdata/wooly/python/wooly/tables.py mgmt/newdata/wooly/python/wooly/tables.strings mgmt/newdata/wooly/python/wooly/template.py mgmt/newdata/wooly/python/wooly/widgets.py mgmt/newdata/wooly/python/wooly/widgets.strings mgmt/newdata/wooly/python/wooly/wsgiserver/__init__.py Log: A temporary branch for integration of data-layer changes Copied: mgmt/newdata (from rev 3870, mgmt/trunk) Modified: mgmt/newdata/cumin/python/cumin/config.py =================================================================== --- mgmt/trunk/cumin/python/cumin/config.py 2010-03-22 14:00:07 UTC (rev 3870) +++ mgmt/newdata/cumin/python/cumin/config.py 2010-03-22 14:58:08 UTC (rev 3871) @@ -51,12 +51,11 @@ if opts: self.load_dict(opts) - enable_logging("cumin", self.log_level, self.log_file) - enable_logging("mint", self.log_level, self.log_file) - enable_logging("wooly", self.log_level, self.log_file) + modules = ("cumin", "mint", "parsley", "rosemary", "wooly") - if self.debug: - modules = ("cumin", "mint", "wooly", "parsley") + for name in modules: + enable_logging(name, self.log_level, self.log_file) - for module in modules: - enable_logging(module, "debug", sys.stderr) + if self.debug: + for name in modules: + enable_logging(name, "debug", sys.stderr) Modified: mgmt/newdata/cumin/python/cumin/grid/collector.py =================================================================== --- mgmt/trunk/cumin/python/cumin/grid/collector.py 2010-03-22 14:00:07 UTC (rev 3870) +++ mgmt/newdata/cumin/python/cumin/grid/collector.py 2010-03-22 14:58:08 UTC (rev 3871) @@ -45,7 +45,7 @@ return "where %s" % sql class NameColumn(SqlTableColumn): - def render_title(self, session, data): + def render_title(self, session): return "Name" def render_content(self, session, data): @@ -54,7 +54,7 @@ return fmt_link(href, data["name"]) class SystemColumn(SqlTableColumn): - def render_title(self, session, data): + def render_title(self, session): return "System" def render_content(self, session, data): Modified: mgmt/newdata/cumin/python/cumin/grid/job.py =================================================================== --- mgmt/trunk/cumin/python/cumin/grid/job.py 2010-03-22 14:00:07 UTC (rev 3870) +++ mgmt/newdata/cumin/python/cumin/grid/job.py 2010-03-22 14:58:08 UTC (rev 3871) @@ -87,11 +87,11 @@ return self.phase.get_title(state) class ArgsColumn(ItemTableColumn): - def render_title(self, session, data): + def render_title(self, session): return "Arguments" class CustomIdColumn(ItemTableColumn): - def render_title(self, session, data): + def render_title(self, session): return "ID" def render_content(self, session, data): @@ -105,7 +105,7 @@ return fmt_link(href, job_id, link_title=id) class StatusColumn(ItemTableColumn): - def render_title(self, session, data): + def render_title(self, session): return "Status" def render_content(self, session, data): @@ -113,7 +113,7 @@ return JobStatusInfo.get_status_string(int(stat)) class CommandColumn(ItemTableColumn): - def render_title(self, session, data): + def render_title(self, session): return "Command" def render_content(self, session, data): @@ -868,7 +868,7 @@ self.add_column(col) class GroupColumn(SqlTableColumn): - def render_title(self, session, data): + def render_title(self, session): return "Job Group" def render_content(self, session, data): @@ -881,7 +881,7 @@ return fmt_link(href, fmt_shorten(name)) class JobsCountColumn(SqlTableColumn): - def render_title(self, session, data): + def render_title(self, session): return "Jobs" class JobsAndGroupsTab(TabbedModeSet): Modified: mgmt/newdata/cumin/python/cumin/grid/limit.py =================================================================== --- mgmt/trunk/cumin/python/cumin/grid/limit.py 2010-03-22 14:00:07 UTC (rev 3870) +++ mgmt/newdata/cumin/python/cumin/grid/limit.py 2010-03-22 14:58:08 UTC (rev 3871) @@ -80,7 +80,7 @@ return len(self.parent.get_items(session)) class NameColumn(ItemTableColumn): - def render_title(self, session, data): + def render_title(self, session): return "Name" def render_content(self, session, data): @@ -89,11 +89,11 @@ return fmt_link(href, limit) class CurrentColumn(ItemTableColumn): - def render_title(self, session, data): + def render_title(self, session): return "Current Usage" class MaxColumn(ItemTableColumn): - def render_title(self, session, data): + def render_title(self, session): return "Max Allowance" class Limits(Attribute): Modified: mgmt/newdata/cumin/python/cumin/grid/negotiator.py =================================================================== --- mgmt/trunk/cumin/python/cumin/grid/negotiator.py 2010-03-22 14:00:07 UTC (rev 3870) +++ mgmt/newdata/cumin/python/cumin/grid/negotiator.py 2010-03-22 14:58:08 UTC (rev 3871) @@ -48,7 +48,7 @@ return "where %s" % sql class NameColumn(SqlTableColumn): - def render_title(self, session, data): + def render_title(self, session): return "Name" def render_content(self, session, data): @@ -60,7 +60,7 @@ return fmt_olink(branch, neg, name=data["name"]) class SystemColumn(SqlTableColumn): - def render_title(self, session, data): + def render_title(self, session): return "System" def render_content(self, session, data): Modified: mgmt/newdata/cumin/python/cumin/grid/pool.py =================================================================== --- mgmt/trunk/cumin/python/cumin/grid/pool.py 2010-03-22 14:00:07 UTC (rev 3870) +++ mgmt/newdata/cumin/python/cumin/grid/pool.py 2010-03-22 14:58:08 UTC (rev 3871) @@ -50,7 +50,7 @@ return "Pools %s" % fmt_count(count) class NameColumn(SqlTableColumn): - def render_title(self, session, data): + def render_title(self, session): return "Name" def render_content(self, session, data): @@ -59,15 +59,15 @@ return fmt_link(href, data["name"]) class JobsRunningColumn(SqlTableColumn): - def render_title(self, session, data): + def render_title(self, session): return "Running Jobs" class JobsIdleColumn(SqlTableColumn): - def render_title(self, session, data): + def render_title(self, session): return "Idle Jobs" class SlotsColumn(SqlTableColumn): - def render_title(self, session, data): + def render_title(self, session): return "Slots" class PoolFrame(CuminFrame): Modified: mgmt/newdata/cumin/python/cumin/grid/scheduler.py =================================================================== --- mgmt/trunk/cumin/python/cumin/grid/scheduler.py 2010-03-22 14:00:07 UTC (rev 3870) +++ mgmt/newdata/cumin/python/cumin/grid/scheduler.py 2010-03-22 14:58:08 UTC (rev 3871) @@ -59,7 +59,7 @@ return "Schedulers %s" % fmt_count(Scheduler.select().count()) class NameColumn(SqlTableColumn): - def render_title(self, session, data): + def render_title(self, session): return "Name" def render_content(self, session, data): @@ -68,19 +68,19 @@ return fmt_link(href, data["name"]) class UsersColumn(SqlTableColumn): - def render_title(self, session, data): + def render_title(self, session): return "Users" class RunningJobsColumn(SqlTableColumn): - def render_title(self, session, data): + def render_title(self, session): return "Running Jobs" class HeldJobsColumn(SqlTableColumn): - def render_title(self, session, data): + def render_title(self, session): return "Held Jobs" class SystemColumn(SqlTableColumn): - def render_title(self, session, data): + def render_title(self, session): return "System" def render_content(self, session, data): Modified: mgmt/newdata/cumin/python/cumin/grid/slot.py =================================================================== --- mgmt/trunk/cumin/python/cumin/grid/slot.py 2010-03-22 14:00:07 UTC (rev 3870) +++ mgmt/newdata/cumin/python/cumin/grid/slot.py 2010-03-22 14:58:08 UTC (rev 3871) @@ -50,7 +50,7 @@ return "Slots %s" % fmt_count(count) class NameColumn(SqlTableColumn): - def render_title(self, session, data): + def render_title(self, session): return "Name" def render_content(self, session, data): @@ -59,15 +59,15 @@ return fmt_link(href, data["name"]) class ActivityColumn(SqlTableColumn): - def render_title(self, session, data): + def render_title(self, session): return "Activity" class StateColumn(SqlTableColumn): - def render_title(self, session, data): + def render_title(self, session): return "State" class LoadAvgColumn(SqlTableColumn): - def render_title(self, session, data): + def render_title(self, session): return "Load" def render_value(self, session, value): @@ -77,7 +77,7 @@ return fmt_none_brief() class JobColumn(SqlTableColumn): - def render_title(self, session, data): + def render_title(self, session): return "Current Job" def render_content(self, session, data): Modified: mgmt/newdata/cumin/python/cumin/grid/submission.py =================================================================== --- mgmt/trunk/cumin/python/cumin/grid/submission.py 2010-03-22 14:00:07 UTC (rev 3870) +++ mgmt/newdata/cumin/python/cumin/grid/submission.py 2010-03-22 14:58:08 UTC (rev 3871) @@ -47,7 +47,7 @@ return "Submissions %s" % fmt_count(self.get_item_count(session)) class NameColumn(TopTableColumn): - def render_title(self, session, data): + def render_title(self, session): return "Name" def render_content(self, session, data): @@ -55,7 +55,7 @@ return fmt_link(href, data["name"]) class SchedulerColumn(SqlTableColumn): - def render_title(self, session, data): + def render_title(self, session): return "Scheduler" def render_content(self, session, data): @@ -64,7 +64,7 @@ return fmt_link(href, data["scheduler_name"]) class SubmitterColumn(SqlTableColumn): - def render_title(self, session, data): + def render_title(self, session): return "Submitter" def render_content(self, session, data): @@ -73,15 +73,15 @@ return fmt_link(href, data["owner"]) class IdleColumn(SqlTableColumn): - def render_title(self, session, data): + def render_title(self, session): return "Idle Jobs" class RunningColumn(SqlTableColumn): - def render_title(self, session, data): + def render_title(self, session): return "Running Jobs" class CompletedColumn(SqlTableColumn): - def render_title(self, session, data): + def render_title(self, session): return "Completed Jobs" class SubmissionFrame(CuminFrame): @@ -299,7 +299,7 @@ self.add_column(col) class NameColumn(TopTableColumn): - def render_title(self, session, data): + def render_title(self, session): return "Name" def render_content(self, session, data): @@ -313,7 +313,7 @@ return fmt_link(branch.marshal(), data["name"], link_title=data["name"]) class DurationColumn(TopTableColumn): - def render_title(self, session, data): + def render_title(self, session): return "Duration" def render_content(self, session, data): Modified: mgmt/newdata/cumin/python/cumin/grid/submitter.py =================================================================== --- mgmt/trunk/cumin/python/cumin/grid/submitter.py 2010-03-22 14:00:07 UTC (rev 3870) +++ mgmt/newdata/cumin/python/cumin/grid/submitter.py 2010-03-22 14:58:08 UTC (rev 3871) @@ -29,7 +29,7 @@ return "Submitters %s" % fmt_count(Submitter.select().count()) class NameColumn(SqlTableColumn): - def render_title(self, session, data): + def render_title(self, session): return "Name" def render_content(self, session, data): Modified: mgmt/newdata/cumin/python/cumin/inventory/system.py =================================================================== --- mgmt/trunk/cumin/python/cumin/inventory/system.py 2010-03-22 14:00:07 UTC (rev 3870) +++ mgmt/newdata/cumin/python/cumin/inventory/system.py 2010-03-22 14:58:08 UTC (rev 3871) @@ -42,7 +42,7 @@ return "Systems %s" % fmt_count(self.get_item_count(session, *args)) class NameColumn(SqlTableColumn): - def render_title(self, session, data): + def render_title(self, session): return "Name" def render_content(self, session, data): @@ -51,15 +51,15 @@ return fmt_link(href, fmt_shorten(data["name"])) class KernelColumn(SqlTableColumn): - def render_title(self, session, data): + def render_title(self, session): return "Kernel" class ArchColumn(SqlTableColumn): - def render_title(self, session, data): + def render_title(self, session): return "Arch" class FreeMemoryColumn(SqlTableColumn): - def render_title(self, session, data): + def render_title(self, session): return "Free Memory" def render_content(self, session, data): @@ -71,7 +71,7 @@ return fmt_none_brief() class LoadColumn(SqlTableColumn): - def render_title(self, session, data): + def render_title(self, session): return "Load Average" def render_content(self, session, data): @@ -98,7 +98,7 @@ self.add_column(col) class NameColumn(TopTableColumn): - def render_title(self, session, data): + def render_title(self, session): return "Name" def render_content(self, session, data): @@ -107,7 +107,7 @@ return fmt_link(href, data["name"], link_title=data["name"]) class LoadColumn(TopTableColumn): - def render_title(self, session, data): + def render_title(self, session): return "Load Average" def render_content(self, session, data): Modified: mgmt/newdata/cumin/python/cumin/main.py =================================================================== --- mgmt/trunk/cumin/python/cumin/main.py 2010-03-22 14:00:07 UTC (rev 3870) +++ mgmt/newdata/cumin/python/cumin/main.py 2010-03-22 14:58:08 UTC (rev 3871) @@ -5,6 +5,7 @@ from mint import * from parsley.config import Config, ConfigParameter from parsley.loggingex import * +from rosemary.model import RosemaryModel from stat import StatChartPage, StatStackedPage, \ StatFlashPage, FlashFullPage from wooly import Application, Session, Page @@ -13,6 +14,8 @@ from config import * from model import * +from sqladapter import * +from table import * from user import * from widgets import * @@ -49,7 +52,14 @@ self.model = CuminModel(self, self.config.data) + self.rosemary = RosemaryModel() + self.rosemary.sql_logging_enabled = True + self.rosemary.load_xml_dir(os.path.join(self.home, "xml")) + self.rosemary.init() + self.main_page = MainPage(self, "index.html") + self.main_page.page_html_class = "Cumin" + self.add_page(self.main_page) self.set_default_page(self.main_page) @@ -111,6 +121,9 @@ self.set_default_frame(self.main) def render_title(self, session): + return self.get_title(session) + + def get_title(self, session): return "MRG Administration" class MainView(CuminMainView): @@ -120,6 +133,8 @@ self.overview = OverviewFrame(app, "overview") self.add_tab(self.overview) +# XXX Add qmf tab + class OverviewFrame(CuminFrame): def __init__(self, app, name): super(OverviewFrame, self).__init__(app, name) Modified: mgmt/newdata/cumin/python/cumin/messaging/binding.py =================================================================== --- mgmt/trunk/cumin/python/cumin/messaging/binding.py 2010-03-22 14:00:07 UTC (rev 3870) +++ mgmt/newdata/cumin/python/cumin/messaging/binding.py 2010-03-22 14:58:08 UTC (rev 3871) @@ -4,95 +4,61 @@ from wooly.forms import FormInput, FormField, Form from wooly.parameters import DictParameter from wooly.resources import StringCatalog +from cumin.formats import * +from cumin.objectselector import * +from cumin.sqladapter import * from cumin.util import sorted_by from cumin.widgets import * -from cumin.formats import * import main strings = StringCatalog(__file__) log = logging.getLogger("cumin.messaging.exchange") -class BindingSet(CuminSelectionTable): - def __init__(self, app, name): - item = BindingParameter(app, "item") - super(BindingSet, self).__init__(app, name, item) +class BindingData(ObjectSqlAdapter): + def __init__(self, app): + binding = app.rosemary.org_apache_qpid_broker.Binding + exchange = app.rosemary.org_apache_qpid_broker.Exchange + queue = app.rosemary.org_apache_qpid_broker.Queue - col = self.QNameColumn(app, "q_id") - col.visible = False - self.add_column(col) + super(BindingData, self).__init__(app, binding) - col = self.ENameColumn(app, "e_id") - col.visible = False - self.add_column(col) + self.add_join(exchange, binding.exchangeRef, exchange._id) + self.add_join(queue, binding.queueRef, queue._id) - col = self.KeyColumn(app, "key") - self.add_column(col) +class BindingSelector(ObjectSelector): + def __init__(self, app, name): + binding = app.rosemary.org_apache_qpid_broker.Binding + exchange = app.rosemary.org_apache_qpid_broker.Exchange + queue = app.rosemary.org_apache_qpid_broker.Queue - col = self.RateColumn(app, "rate") - col.align = "right" - self.add_column(col) + data = BindingData(app) - col = self.MatchedColumn(app, "matched") - col.align = "right" - self.add_column(col) + super(BindingSelector, self).__init__(app, name, binding, data) - self.phase = PhaseSwitch(app, "phase") - self.filters.add_child(self.phase) + frame = "main.messaging.broker.exchange" + self.exchange_column = self.Exchange \ + (app, "exchange", exchange.name, exchange._id, frame) - task = main.module.binding_set_remove - button = TaskButton(app, "remove", task, self.selection) - self.buttons.add_child(button) + frame = "main.messaging.broker.queue" + self.queue_column = self.Queue \ + (app, "queue", queue.name, queue._id, frame) - class QNameColumn(SqlTableColumn): - def render_title(self, session, data): - return "Queue" + self.add_attribute_column(binding.bindingKey) + self.add_attribute_column(binding.arguments) + self.add_attribute_column(binding.origin) + self.add_attribute_column(binding.msgMatched) - def render_content(self, session, data): - queue = Queue.get(data["q_id"]) - href = self.page.main.messaging.broker.queue.get_href \ - (session, queue) - return fmt_link(href, fmt_shorten(queue.name)) + self.add_selection_task(main.module.binding_set_remove) - class ENameColumn(SqlTableColumn): - def render_title(self, session, data): + class Exchange(ObjectLinkColumn): + def render_header_content(self, session): return "Exchange" - def render_content(self, session, data): - exchange = Exchange.get(data["e_id"]) - href = self.page.main.messaging.broker.exchange.get_href \ - (session, exchange) + class Queue(ObjectLinkColumn): + def render_header_content(self, session): + return "Queue" - if exchange.name: - name = fmt_shorten(exchange.name) - else: - name = "<em>Default</em>" - - return fmt_link(href, name) - - class KeyColumn(SqlTableColumn): - def render_title(self, session, data): - return "Key" - - def render_value(self, session, value): - return fmt_shorten(value) - - class RateColumn(ItemTableColumn): - def render_title(self, session, data): - return "Message Rate" - - def render_content(self, session, data): - binding = Binding.get(data["id"]) - return self.app.model.binding.msgMatched.rate_html(binding) - - class MatchedColumn(ItemTableColumn): - def render_title(self, session, data): - return "Messages Matched" - - def render_content(self, session, data): - binding = Binding.get(data["id"]) - return self.app.model.binding.msgMatched.value(binding) - class ExchangeInput(Widget): def __init__(self, app, name): super(ExchangeInput, self).__init__(app, name) @@ -112,12 +78,9 @@ if isinstance(anc, Form): self.form = anc - def get_args(self, session): - return (self.exchange,) - def get_exchange_info(self, session, exchange): binding_info = self.form.bindings.dict_param.get(session) - if str(exchange.id) in binding_info: + if str(exchange._id) in binding_info: return binding_info[str(exchange.id)] def get_exchange_info_for(self, session, exchange, key): @@ -142,7 +105,7 @@ return DictParameter.sep().join((self.instance_data, "type")) def render_exchange_id(self, session, exchange): - return exchange.id + return exchange._id def render_exchange_checked(self, session, exchange): exchange_info = self.get_exchange_info(session, exchange) @@ -292,10 +255,11 @@ return self.render_dict_error(session, exchange, "mkey.3") def render_onclick(self, session, exchange): - return "onclick=\"toggle_row(this, 'headers_extra.%s')\"" % str(exchange.id) + return "onclick=\"toggle_row(this, 'headers_extra.%s')\"" % \ + str(exchange._id) def render_headers_extra(self, session, exchange): - return "headers_extra.%s" % str(exchange.id) + return "headers_extra.%s" % str(exchange._id) def process_input(self, this_exchange, arguments): # x-match is a radio button, it must have a value @@ -377,35 +341,61 @@ def render_exchanges(self, session): vhost = self.vhost.get(session) - sortedExchanges = sorted_by(vhost.exchanges) + cls = self.app.rosemary.org_apache_qpid_broker.Exchange + + conn = self.app.model.get_sql_connection() + cursor = conn.cursor() + + try: + exchanges = cls.select_objects(cursor, _vhostRef_id=vhost._id) + finally: + cursor.close() + + print "XXX", exchanges + # render each exchange we support writer = Writer() - for exchange in sortedExchanges: - if ExchangeInfo.is_builtin(exchange) or \ - (not exchange._get_qmfDeleteTime() and \ - not (self.state.is_active(session) and not is_active(exchange))): - # instance_key gives us a unique path for each exchange - # we will be rendering - instance_key = self.dict_param.get_instance_key(str(exchange.id)) - if exchange.type == "direct": - if exchange.name: - self.direct_input.set_instance_data(exchange, instance_key) - writer.write(self.direct_input.render(session)) - elif exchange.type == "topic": - if not exchange.name == "qpid.management": - self.topic_input.set_instance_data(exchange, instance_key) - writer.write(self.topic_input.render(session)) - elif exchange.type == "fanout": - self.fanout_input.set_instance_data(exchange, instance_key) - writer.write(self.fanout_input.render(session)) - elif exchange.type == "xml": - self.xml_input.set_instance_data(exchange, instance_key) - writer.write(self.xml_input.render(session)) - elif exchange.type == "headers": - self.headers_input.set_instance_data(exchange, instance_key) - writer.write(self.headers_input.render(session)) + for exchange in exchanges: + if not ExchangeInfo.is_builtin(exchange): + continue + + if exchange._qmf_delete_time: + continue + + # if self.state.is_active(session) and not is_active(exchange): + # continue + + if exchange.name == "qpid.management": + continue + + # XXX + # if ExchangeInfo.is_builtin(exchange) or \ + # (not exchange._qmf_delete_time and \ + # not (self.state.is_active(session) and not is_active(exchange))): + + # instance_key gives us a unique path for each exchange + # we will be rendering + + instance_key = self.dict_param.get_instance_key(str(exchange._id)) + + if exchange.type == "direct" and exchange.name: + self.direct_input.set_instance_data(exchange, instance_key) + writer.write(self.direct_input.render(session, exchange)) + elif exchange.type == "topic": + self.topic_input.set_instance_data(exchange, instance_key) + writer.write(self.topic_input.render(session, exchange)) + elif exchange.type == "fanout": + self.fanout_input.set_instance_data(exchange, instance_key) + writer.write(self.fanout_input.render(session, exchange)) + elif exchange.type == "xml": + self.xml_input.set_instance_data(exchange, instance_key) + writer.write(self.xml_input.render(session, exchange)) + elif exchange.type == "headers": + self.headers_input.set_instance_data(exchange, instance_key) + writer.write(self.headers_input.render(session, exchange)) + return writer.to_string() def get_binding_errors(self, session, queue_name): Modified: mgmt/newdata/cumin/python/cumin/messaging/broker.py =================================================================== --- mgmt/trunk/cumin/python/cumin/messaging/broker.py 2010-03-22 14:00:07 UTC (rev 3870) +++ mgmt/newdata/cumin/python/cumin/messaging/broker.py 2010-03-22 14:58:08 UTC (rev 3871) @@ -3,10 +3,14 @@ from wooly.widgets import * from random import random from psycopg2 import IntegrityError -from cumin.widgets import * -from cumin.parameters import * + from cumin.formats import * +from cumin.objectframe import * +from cumin.parameters import * +from cumin.sqladapter import * +from cumin.table import * from cumin.util import * +from cumin.widgets import * from queue import * from exchange import * @@ -17,181 +21,110 @@ strings = StringCatalog(__file__) -class BrokerSet(CuminSelectionTable): - def __init__(self, app, name): - item = BrokerGroupParameter(app, "item") - super(BrokerSet, self).__init__(app, name, item) +class BrokerData(ObjectSqlAdapter): + def __init__(self, app): + broker = app.rosemary.org_apache_qpid_broker.Broker + system = app.rosemary.org_apache_qpid_broker.System + cluster = app.rosemary.org_apache_qpid_cluster.Cluster + mapping = app.rosemary.com_redhat_cumin.BrokerGroupMapping - self.group = BrokerGroupParameter(app, "group") - self.add_parameter(self.group) + super(BrokerData, self).__init__(app, broker) - col = self.NameColumn(app, "name") - col.width = "40%" - self.add_column(col) - self.set_default_column(col) + self.add_join(system, broker.systemRef, system._id) + self.add_outer_join(cluster, broker._id, cluster.brokerRef) - col = self.StatusColumn(app, "status") - self.add_column(col) + subquery = SqlQuery(mapping.sql_table) + this = mapping.sql_table._group_id + that = "%(group_id)s" - col = self.ClusterColumn(app, "cluster") - self.add_column(col) + SqlComparisonFilter(subquery, this, that) - task = main.module.broker_set_engroup - button = TaskButton(app, "engroup", task, self.selection) - self.buttons.add_child(button) + text = subquery.emit(("1",)) - def render_title(self, session): - count = self.get_item_count(session) - return "Brokers %s" % fmt_count(count) + self.group_filter = SqlExistenceFilter(None, text) - def render_sql_where(self, session): - constraints = self.get_sql_where_constraints(session) + def get_sql_options(self, options): + sql_options = super(BrokerData, self).get_sql_options(options) - if constraints: - return "where %s" % " and ".join(constraints) + if "group" in options.attributes: + sql_options.filters.append(self.group_filter) - def get_sql_where_constraints(self, session): - constraints = list() - group = self.group.get(session) + return sql_options - if group: - subquery = \ - "select 1 from broker_group_mapping " + \ - "where broker_group_id = %(group_id)r " + \ - "and broker_id = b.id" +class BrokerSelector(ObjectSelector): + def __init__(self, app, name, data): + broker = app.rosemary.org_apache_qpid_broker.Broker + system = app.rosemary.org_apache_qpid_broker.System + cluster = app.rosemary.org_apache_qpid_cluster.Cluster - constraints.append("exists (%s)" % subquery) + data = BrokerData(app) - return constraints + super(BrokerSelector, self).__init__(app, name, broker, data) - def get_sql_values(self, session): - group = self.group.get(session) + self.group = BrokerGroupParameter(app, "group") + self.add_parameter(self.group) - if group: - return {"group_id": group.id} + frame = "main.messaging.broker" + col = ObjectLinkColumn(app, "name", system.nodeName, broker._id, frame) + self.add_column(col) - class NameColumn(SqlTableColumn): - def render_title(self, session, data): - return "Name" + self.add_attribute_column(broker.port) + self.add_attribute_column(cluster.clusterName) - def render_content(self, session, data): - broker = Identifiable(data["id"]) - href = self.page.main.messaging.broker.get_href(session, broker) - return fmt_link(href, fmt_shorten(data["name"], 32, 8)) + self.add_selection_task(main.module.broker_set_engroup) - class StatusColumn(SqlTableColumn): - def render_title(self, session, data): - return "Status" + def get_data_values(self, session): + values = super(BrokerSelector, self).get_data_values(session) - def render_content(self, session, data): - agent = self.app.model.mint.model.agents.get(data["qmf_agent_id"]) + group = self.group.get(session) - if agent: - if agent.last_heartbeat is None: - return fmt_none() - else: - return fmt_datetime(agent.last_heartbeat) + if group: + values["group_id"] = group.id - class ClusterColumn(SqlTableColumn): - def render_title(self, session, data): - return "Cluster" + return values - def render_content(self, session, data): - return data["cluster"] or fmt_none() + def get_data_options(self, session): + options = super(BrokerSelector, self).get_data_options(session) -class TopBrokerSet(CuminTable): - def __init__(self, app, name): - super(TopBrokerSet, self).__init__(app, name) + group = self.group.get(session) - col = self.NameColumn(app, "name") - self.add_column(col) - self.set_default_column(col) + if group: + options.attributes["group"] = True - class NameColumn(SqlTableColumn): - def render_title(self, session, data): - return "Name" + return options - def render_content(self, session, data): - reg = Identifiable(data["id"]) - href = self.page.main.messaging.broker.get_href(session, reg) - return fmt_link(href, fmt_shorten(data["name"])) - -class BrokerFrame(CuminFrame): +class BrokerFrame(ObjectFrame): def __init__(self, app, name): - super(BrokerFrame, self).__init__(app, name) + cls = app.rosemary.org_apache_qpid_broker.Broker - self.object = BrokerParameter(app, "id") - self.add_parameter(self.object) + super(BrokerFrame, self).__init__(app, name, cls) - self.view = BrokerView(app, "view", self.object) - self.add_mode(self.view) + self.icon_href = "resource?name=broker-36.png" - self.queue = QueueFrame(app, "queue") + self.vhost = BrokerVhostAttribute(app, "vhost", self.object) + self.add_attribute(self.vhost) + + self.queue = QueueFrame(app, "queue") # XXX pass self.vhost self.add_mode(self.queue) self.exchange = ExchangeFrame(app, "exchange") self.add_mode(self.exchange) - self.connection = ConnectionFrame(app, "conn") + self.connection = ConnectionFrame(app, "connection") self.add_mode(self.connection) - self.link = LinkFrame(app, "link") - self.add_mode(self.link) + self.brokerlink = BrokerLinkFrame(app, "link") + self.add_mode(self.brokerlink) -class BrokerView(CuminView): - def __init__(self, app, name, broker): - super(BrokerView, self).__init__(app, name, broker) + self.view.add_tab(QueueSelector(app, "queues", self.vhost)) + self.view.add_tab(ExchangeSelector(app, "exchanges", self.vhost)) + self.view.add_tab(ConnectionSelector(app, "connections", self.vhost)) + self.view.add_tab(BrokerLinkSelector(app, "brokerlinks", self.vhost)) - self.vhost = BrokerVhostAttribute(app, "vhost", broker) - self.add_attribute(self.vhost) + self.add_summary_attribute(cls.port) + self.add_summary_task(main.module.exchange_add) + self.add_summary_task(main.module.queue_add) - self.tabs = TabbedModeSet(app, "tabs") - self.add_child(self.tabs) - - self.tabs.add_tab(QueueSet(app, "queues", self.vhost)) - self.tabs.add_tab(ExchangeSet(app, "exchanges", self.vhost)) - self.tabs.add_tab(ConnectionSet(app, "conns", self.vhost)) - self.tabs.add_tab(LinkSet(app, "links", self.vhost)) - self.tabs.add_tab(BrokerAccessControl(app, "access", self.vhost)) - self.tabs.add_tab(BrokerClustering(app, "cluster", self.vhost)) - self.tabs.add_tab(BrokerDetails(app, "details", self.vhost)) - -class BrokerDetails(Widget): - def __init__(self, app, name, vhost): - super(BrokerDetails, self).__init__(app, name) - - props = self.Properties(app, "properties", vhost) - self.add_child(props) - - tasks = self.Tasks(app, "tasks", vhost) - self.add_child(tasks) - - def render_title(self, session): - return "Details" - - class Properties(CuminProperties): - def do_get_items(self, session): - broker = self.object.get(session).broker - cls = self.app.model.get_class_by_object(broker) - - props = [(x.get_title(session), x.value(session, broker)) - for x in cls.properties] - - return props - - class Tasks(CuminTasks): - def do_get_items(self, session): - broker = self.object.get(session).broker - cls = self.app.model.get_class_by_object(broker) - - tasks = [(x.get_href(session, broker), - x.get_title(session), - x.get_enabled(session, broker)) - for x in cls.actions # XXX can't be right - if x.navigable and not x.aggregate] - - return tasks - class ModuleNotEnabled(Widget): def do_render(self, session): return "This module is not enabled" @@ -282,7 +215,8 @@ self.group_tmpl = WidgetTemplate(self, "group_html") - self.brokers = BrokerSet(app, "brokers") + data = BrokerData(app) + self.brokers = BrokerSelector(app, "brokers", data) self.add_child(self.brokers) def render_title(self, session, *args): @@ -358,3 +292,20 @@ if len(brokers): self.task.invoke(session, brokers, groups) self.task.exit_with_redirect(session, brokers) + +class TopBrokerSet(CuminTable): + def __init__(self, app, name): + super(TopBrokerSet, self).__init__(app, name) + + col = self.NameColumn(app, "name") + self.add_column(col) + self.set_default_column(col) + + class NameColumn(SqlTableColumn): + def render_title(self, session): + return "Name" + + def render_content(self, session, data): + reg = Identifiable(data["id"]) + href = self.page.main.messaging.broker.get_href(session, reg) + return fmt_link(href, fmt_shorten(data["name"])) Modified: mgmt/newdata/cumin/python/cumin/messaging/brokergroup.py =================================================================== --- mgmt/trunk/cumin/python/cumin/messaging/brokergroup.py 2010-03-22 14:00:07 UTC (rev 3870) +++ mgmt/newdata/cumin/python/cumin/messaging/brokergroup.py 2010-03-22 14:58:08 UTC (rev 3871) @@ -5,45 +5,32 @@ from cumin.model import * from cumin.widgets import * from cumin.parameters import * +from cumin.sqladapter import * +from cumin.table import * from cumin.formats import * from cumin.util import * +from broker import * + import main -from broker import BrokerSet - strings = StringCatalog(__file__) -class BrokerGroupSet(CuminSelectionTable): +class BrokerGroupSelector(ObjectSelector): def __init__(self, app, name): - item = BrokerGroupParameter(app, "item") - super(BrokerGroupSet, self).__init__(app, name, item) + cls = app.rosemary.com_redhat_cumin.BrokerGroup - col = self.NameColumn(app, "name") + super(BrokerGroupSelector, self).__init__(app, name, cls) + + frame = "main.messaging.brokergroup" + col = ObjectLinkColumn(app, "name", cls.name, cls._id, frame) self.add_column(col) - self.set_default_column(col) - task = main.module.broker_group_set_remove - button = TaskButton(self.app, "remove", task, self.selection) - self.buttons.add_child(button) + self.add_attribute_column(cls.description) - task = main.module.broker_group_add - link = TaskLink(self.app, "add", task, None) - self.links.add_child(link) + self.add_task(main.module.broker_group_add, None) + self.add_selection_task(main.module.broker_group_set_remove) - def render_title(self, session): - return "Broker Groups" - - class NameColumn(SqlTableColumn): - def render_title(self, session, data): - return "Name" - - def render_content(self, session, data): - group = Identifiable(data["id"]) - href = self.page.main.messaging.broker_group.get_href \ - (session, group) - return fmt_link(href, xml_escape(data["name"])) - class BrokerGroupInputSet(CheckboxInputSet): def __init__(self, app, name): super(BrokerGroupInputSet, self).__init__(app, name, None) @@ -65,16 +52,12 @@ if group in self.param.get(session): return "checked=\"checked\"" -class BrokerGroupFrame(CuminFrame): +class BrokerGroupFrame(ObjectFrame): def __init__(self, app, name): - super(BrokerGroupFrame, self).__init__(app, name) + cls = app.rosemary.com_redhat_cumin.BrokerGroup - self.object = BrokerGroupParameter(app, "id") - self.add_parameter(self.object) + super(BrokerGroupFrame, self).__init__(app, name, cls) - self.view = BrokerGroupView(app, "view", self.object) - self.add_child(self.view) - class BrokerGroupView(CuminView): def __init__(self, app, name, group): super(BrokerGroupView, self).__init__(app, name, group) @@ -82,8 +65,8 @@ self.tabs = TabbedModeSet(app, "tabs") self.add_child(self.tabs) - # XXX - brokers = BrokerSet(app, "brokers") + data = BrokerData(app) + brokers = BrokerSelector(app, "brokers", data) brokers.group = group self.tabs.add_tab(brokers) @@ -115,7 +98,7 @@ def __init__(self, app, name, task): super(BrokerGroupEditForm, self).__init__(app, name, task) - self.group = BrokerGroupParameter(app, "group") + self.group = NewBrokerGroupParameter(app, "group") self.add_parameter(self.group) def process_submit(self, session): @@ -140,7 +123,7 @@ def __init__(self, app, name, task): super(BrokerGroupRemoveForm, self).__init__(app, name, task) - self.object = BrokerGroupParameter(app, "group") + self.object = NewBrokerGroupParameter(app, "group") self.add_parameter(self.object) class BrokerGroupSetTaskForm(CuminTaskForm): Modified: mgmt/newdata/cumin/python/cumin/messaging/brokerlink.py =================================================================== --- mgmt/trunk/cumin/python/cumin/messaging/brokerlink.py 2010-03-22 14:00:07 UTC (rev 3870) +++ mgmt/newdata/cumin/python/cumin/messaging/brokerlink.py 2010-03-22 14:58:08 UTC (rev 3871) @@ -15,186 +15,60 @@ strings = StringCatalog(__file__) -class LinkSet(CuminSelectionTable): +class BrokerLinkSelector(ObjectSelector): def __init__(self, app, name, vhost): - item = LinkParameter(app, "item") - super(LinkSet, self).__init__(app, name, item) + cls = app.rosemary.org_apache_qpid_broker.Link + super(BrokerLinkSelector, self).__init__(app, name, cls) + self.vhost = vhost - col = self.AddressColumn(app, "addr") - self.add_column(col) - self.set_default_column(col) + self.add_reference_filter(self.vhost, cls.vhostRef) - col = self.DurableColumn(app, "durable") + frame = "main.messaging.broker.brokerlink" + col = ObjectLinkColumn(app, "name", cls.host, cls._id, frame) self.add_column(col) - col = self.StateColumn(app, "state") - self.add_column(col) + self.add_attribute_column(cls.port) + self.add_attribute_column(cls.state) + self.add_attribute_column(cls.transport) + self.add_attribute_column(cls.durable) - col = self.LastErrorColumn(app, "last_error") - self.add_column(col) + self.add_task(main.module.link_add, self.vhost) + self.add_selection_task(main.module.link_set_remove) - #col = self.FromPeerColumn(app, "from_peer") - #self.add_column(col) + # Address column XXX - #col = self.ToPeerColumn(app, "to_peer") - #self.add_column(col) +class BrokerLinkFrame(ObjectFrame): + def __init__(self, app, name): + cls = app.rosemary.org_apache_qpid_broker.Link - task = main.module.link_add - self.links.add_child(TaskLink(app, "link_add", task, vhost)) + super(BrokerLinkFrame, self).__init__(app, name, cls) - task = main.module.link_set_remove - button = TaskButton(app, "remove", task, self.selection) - self.buttons.add_child(button) + routes = RouteSelector(app, "routes", self.object) + self.view.add_tab(routes) - def render_title(self, session): - count = self.get_item_count(session) - return "Broker Links %s" % fmt_count(count) - - def get_sql_where_constraints(self, session): - constraints = super(LinkSet, self).get_sql_where_constraints(session) - constraints.append("v.id = %(vhost_id)r") - return constraints - - def get_sql_values(self, session): - vhost = self.vhost.get(session) - return {"vhost_id": vhost.id} - - def disable_closed(self, session, data): - return data["state"] == "Closed" - - class AddressColumn(SqlTableColumn): - def render_title(self, session, data): - return "Address" - - def render_content(self, session, data): - link = Identifiable(data["id"]) - href = self.frame.link.get_href(session, link) - name = "%s:%i" % (data["host"], data["port"]) - return fmt_link(href, fmt_shorten(name)) - - def get_order_by_sql(self, session): - dir = self.parent.is_reversed(session) and "desc" or "asc" - return "order by host, port %s" % dir - - class StateColumn(SqlTableColumn): - def render_title(self, session, data): - return "State" - - class LastErrorColumn(SqlTableColumn): - def render_title(self, session, data): - return "Last Error" - - class DurableColumn(SqlTableColumn): - def render_title(self, session, data): - return "Durable" - - class FromPeerColumn(NullSortColumn, FreshDataOnlyColumn): - def render_title(self, session, data): - return "Bytes from Broker" - - def render_value(self, session, value): - return fmt_rate(value) - - class ToPeerColumn(NullSortColumn, FreshDataOnlyColumn): - def render_title(self, session, data): - return "Bytes to Broker" - - def render_value(self, session, value): - return fmt_rate(value) - -class RouteSet(CuminSelectionTable): +class RouteSelector(ObjectSelector): def __init__(self, app, name, link): - item = RouteParameter(app, "item") - super(RouteSet, self).__init__(app, name, item) + cls = app.rosemary.org_apache_qpid_broker.Bridge + super(RouteSelector, self).__init__(app, name, cls) + self.link = link - #col = self.SourceColumn(app, "source") - #self.add_column(col) + self.add_reference_filter(self.link, cls.linkRef) - #col = self.DestinationColumn(app, "managed_broker") - #self.add_column(col) + self.add_attribute_column(cls.src) + self.add_attribute_column(cls.dest) + self.add_attribute_column(cls.key) + self.add_attribute_column(cls.tag) + self.add_attribute_column(cls.excludes) - col = self.ExchangeColumn(app, "exchange") - self.add_column(col) - self.set_default_column(col) + self.add_task(main.module.route_add, self.link) + self.add_selection_task(main.module.route_set_remove) - col = self.KeyColumn(app, "key") - self.add_column(col) +# XXX RouteFrame - col = self.TagColumn(app, "tag") - self.add_column(col) - - col = self.ExcludesColumn(app, "excludes") - self.add_column(col) - - task = main.module.route_add - self.links.add_child(TaskLink(app, "add", task, self.link)) - - task = main.module.route_set_remove - button = TaskButton(app, "remove", task, self.selection) - self.buttons.add_child(button) - - def render_title(self, session): - count = self.get_item_count(session) - return "Link Routes %s" % fmt_count(count) - - def render_sql_where(self, session): - return "where l.id = %(link_id)r and b.qmf_delete_time is null" - - def get_sql_values(self, session): - link = self.link.get(session) - return {"link_id": link.id} - - class SourceColumn(SqlTableColumn): - def render_title(self, session, data): - return "Source" - - def render_content(self, session, data): - return "%s:%i" % (data["host"], data["port"]) - - def get_order_by_sql(self, session): - dir = self.parent.is_reversed(session) and "desc" or "asc" - return "order by l.host, l.port %s" % dir - - class DestinationColumn(SqlTableColumn): - def render_title(self, session, data): - return "Destination" - - class ExchangeColumn(SqlTableColumn): - def render_title(self, session, data): - return "Exchange" - - class KeyColumn(SqlTableColumn): - def render_title(self, session, data): - return "Routing Key" - - class TagColumn(SqlTableColumn): - def render_title(self, session, data): - return "Tag" - - class ExcludesColumn(SqlTableColumn): - def render_title(self, session, data): - return "Excludes" - -class LinkFrame(CuminFrame): - def __init__(self, app, name): - super(LinkFrame, self).__init__(app, name) - - self.object = LinkParameter(app, "id") - self.add_parameter(self.object) - - self.view = LinkView(app, "view", self.object) - self.add_mode(self.view) - - def show_object(self, session, link): - if hasattr(link, "vhost"): - self.page.main.messaging.broker.set_object(session, link.vhost) - - return super(LinkFrame, self).show_object(session, link) - class LinkRemoveForm(CuminTaskForm): def __init__(self, app, name, task): super(LinkRemoveForm, self).__init__(app, name, task) Modified: mgmt/newdata/cumin/python/cumin/messaging/connection.py =================================================================== --- mgmt/trunk/cumin/python/cumin/messaging/connection.py 2010-03-22 14:00:07 UTC (rev 3870) +++ mgmt/newdata/cumin/python/cumin/messaging/connection.py 2010-03-22 14:58:08 UTC (rev 3871) @@ -2,6 +2,8 @@ from wooly.widgets import * from wooly.tables import * from datetime import datetime +from cumin.objectframe import * +from cumin.objectselector import * from cumin.stat import * from cumin.widgets import * from cumin.parameters import * @@ -12,6 +14,55 @@ strings = StringCatalog(__file__) +class ConnectionSelector(ObjectSelector): + def __init__(self, app, name, vhost): + cls = app.rosemary.org_apache_qpid_broker.Connection + + super(ConnectionSelector, self).__init__(app, name, cls) + + self.vhost = vhost + + frame = "main.messaging.broker.connection" + col = ObjectLinkColumn(app, "address", cls.address, cls._id, frame) + self.add_column(col) + + col = ConnectionProcessColumn \ + (app, "process", cls.remoteProcessName, cls.remotePid) + self.add_column(col) + + self.add_attribute_column(cls.authIdentity) + self.add_attribute_column(cls.SystemConnection) + self.add_attribute_column(cls.federationLink) + self.add_attribute_column(cls.bytesFromClient) + self.add_attribute_column(cls.bytesToClient) + +class ConnectionProcessColumn(ObjectAttributeColumn): + def __init__(self, app, name, attr, pid_attr): + super(ConnectionProcessColumn, self).__init__(app, name, attr) + + self.pid_attr = pid_attr + + def init(self): + super(ConnectionProcessColumn, self).init() + + try: + self.pid_field = self.table.adapter.fields_by_attr[self.pid_attr] + except KeyError: + self.pid_field = ObjectSqlField(self.table.adapter, self.pid_attr) + + def render_header_content(self, session): + return "Process (PID)" + + def render_cell_content(self, session, record): + args = (record[self.field.index], record[self.pid_field.index]) + return "%s (%i)" % args + +class ConnectionFrame(ObjectFrame): + def __init__(self, app, name): + cls = app.rosemary.org_apache_qpid_broker.Connection + + super(ConnectionFrame, self).__init__(app, name, cls) + class ConnectionSet(CuminSelectionTable): def __init__(self, app, name, vhost): item = ConnectionParameter(app, "item") @@ -73,7 +124,7 @@ return {"id": vhost.id} class AddressColumn(SqlTableColumn): - def render_title(self, session, data): + def render_title(self, session): return "Address" def render_content(self, session, data): @@ -82,7 +133,7 @@ return fmt_link(href, fmt_shorten(data["addr"])) class SystemConnectionColumn(SqlTableColumn): - def render_title(self, session, data): + def render_title(self, session): return "Connect Type" def render_content(self, session, data): @@ -92,11 +143,12 @@ return "Client" class AuthIdentityColumn(SqlTableColumn): - def render_title(self, session, data): + def render_title(self, session): return "Auth Id" class FedLinkColumn(SqlTableColumn): - def render_title(self, session, data): + + def render_title(self, session): return "Fed Link" def render_content(self, session, data): @@ -106,7 +158,7 @@ return "No" class SentColumn(NullSortColumn, FreshDataOnlyColumn): - def render_title(self, session, data): + def render_title(self, session): return "%s Sent" % self.parent.get_unit_plural(session) def get_column_key(self, session): @@ -117,7 +169,7 @@ return fmt_rate(value, "", "sec") class ReceivedColumn(NullSortColumn, FreshDataOnlyColumn): - def render_title(self, session, data): + def render_title(self, session): return "%s Received" % self.parent.get_unit_plural(session) def get_column_key(self, session): @@ -127,22 +179,6 @@ def render_value(self, session, value): return fmt_rate(value, "", "sec") -class ConnectionFrame(CuminFrame): - def __init__(self, app, name): - super(ConnectionFrame, self).__init__(app, name) - - self.object = ConnectionParameter(app, "id") - self.add_parameter(self.object) - - self.view = ConnectionView(app, "view", self.object) - self.add_mode(self.view) - - def show_object(self, session, conn): - if hasattr(conn, "vhost"): - self.frame.set_object(session, conn.vhost.broker) - - return super(ConnectionFrame, self).show_object(session, conn) - class ConnectionCloseForm(CuminTaskForm): def __init__(self, app, name, task): super(ConnectionCloseForm, self).__init__(app, name, task) @@ -245,18 +281,18 @@ return {"id": conn.id} class NameColumn(SqlTableColumn): - def render_title(self, session, data): + def render_title(self, session): return "Name" class ExpiresColumn(SqlTableColumn): - def render_title(self, session, data): + def render_title(self, session): return "Expires" def render_value(self, session, value): return fmt_datetime(value) class StatusColumn(SqlTableColumn): - def render_title(self, session, data): + def render_title(self, session): return "Attached?" def render_content(self, session, data): Modified: mgmt/newdata/cumin/python/cumin/messaging/exchange.py =================================================================== --- mgmt/trunk/cumin/python/cumin/messaging/exchange.py 2010-03-22 14:00:07 UTC (rev 3870) +++ mgmt/newdata/cumin/python/cumin/messaging/exchange.py 2010-03-22 14:58:08 UTC (rev 3871) @@ -18,178 +18,84 @@ strings = StringCatalog(__file__) log = logging.getLogger("cumin.messaging.exchange") -class ExchangeInputSet(RadioInputSet): - def __init__(self, app, name): - super(ExchangeInputSet, self).__init__(app, name) - - param = ExchangeParameter(app, "param") - self.add_parameter(param) - self.set_parameter(param) - - def do_get_items(self, session, vhost): - return sorted_by(vhost.exchanges) - - def render_item_value(self, session, exchange): - return exchange.id - - def render_item_content(self, session, exchange): - return exchange.name or "<em>Default</em>" - - def render_item_checked_attr(self, session, exchange): - return exchange is self.param.get(session) and "checked=\"checked\"" - -class ExchangeSet(CuminSelectionTable): +class ExchangeSelector(ObjectSelector): def __init__(self, app, name, vhost): - item = ExchangeParameter(app, "item") - super(ExchangeSet, self).__init__(app, name, item) + cls = app.rosemary.org_apache_qpid_broker.Exchange + super(ExchangeSelector, self).__init__(app, name, cls) + self.vhost = vhost - col = self.NameColumn(app, "name") + frame = "main.messaging.broker.exchange" + col = ObjectLinkColumn(app, "name", cls.name, cls._id, frame) self.add_column(col) - self.set_default_column(col) - col = self.ProducersColumn(app, "name") - col.align = "right" - self.add_column(col) + self.add_attribute_column(cls.producerCount) + self.add_attribute_column(cls.bindingCount) + self.add_attribute_column(cls.msgRoutes) + self.add_attribute_column(cls.byteRoutes) + + self.add_reference_filter(vhost, cls.vhostRef) - col = self.BindingsColumn(app, "bindings") - col.align = "right" - self.add_column(col) + self.add_task(main.module.exchange_add, self.vhost) + self.add_selection_task(main.module.exchange_set_remove) - col = self.ReceivedColumn(app, "received") - col.align = "right" - self.add_column(col) +class ExchangeFrame(ObjectFrame): + def __init__(self, app, name): + cls = app.rosemary.org_apache_qpid_broker.Exchange - col = self.RoutedColumn(app, "routed") - col.align = "right" - self.add_column(col) + super(ExchangeFrame, self).__init__(app, name, cls) - col = self.DroppedColumn(app, "dropped") - col.align = "right" - self.add_column(col) + self.icon_href = "resource?name=exchange-36.png" - self.unit = UnitSwitch(app, "unit") - self.switches.add_child(self.unit) + # XXX + #self.overview = ExchangeOverview(app, "overview", self.object) + #self.view.add_tab(self.overview) - self.phase = PhaseSwitch(app, "phase") - self.filters.add_child(self.phase) + self.bindings = ExchangeBindingSelector(app, "bindings", self.object) + self.view.add_tab(self.bindings) - task = main.module.exchange_add - self.links.add_child(TaskLink(app, "exchange_add", task, self.vhost)) + # XXX self.add_summary_task(main.module.exchange_remove) - task = main.module.exchange_set_remove - button = TaskButton(app, "remove", task, self.selection) - self.buttons.add_child(button) - - def disable_exchange(self, session, data): - return data["name"] in ExchangeInfo.get_builtins() - def render_title(self, session): - vhost = self.vhost.get(session) - return "Exchanges %s" % fmt_count(vhost.exchanges.count()) + exchange = self.object.get(session) - def render_sql_where(self, session): - vhost = self.vhost.get(session) + if exchange: + if exchange.name: + return super(ExchangeFrame, self).render_title(session) + else: + return "Default exchange" - elems = list() - elems.append("e.vhost_id = %(id)r") - elems.append(self.phase.get_sql_constraint(session, vhost)) +class ExchangeBindingSelector(BindingSelector): + def __init__(self, app, name, exchange): + super(ExchangeBindingSelector, self).__init__(app, name) - return "where %s" % " and ".join(elems) + self.exchange = exchange - def get_sql_values(self, session): - vhost = self.vhost.get(session) - return {"id": vhost.id} + self.add_reference_filter(self.exchange, self.cls.exchangeRef) - class NameColumn(SqlTableColumn): - def render_title(self, session, data): - return "Name" + self.exchange_column.visible = False - def render_content(self, session, data): - exchange = Identifiable(data["id"]) - href = self.frame.exchange.get_href(session, exchange) - name = data["name"] or "<em>Default</em>" - return fmt_link(href, fmt_shorten(name)) - - class ProducersColumn(SqlTableColumn): - def render_title(self, session, data): - return "Producers" - - def render_content(self, session, data): - return data["producers"] - - class BindingsColumn(SqlTableColumn): - def render_title(self, session, data): - return "Bindings" - - def render_content(self, session, data): - exchange = Identifiable(data["id"]) - href = self.frame.exchange.get_href(session, exchange) - return fmt_link(href, data["bindings"]) - - class ReceivedColumn(NullSortColumn, FreshDataOnlyColumn): - def render_title(self, session, data): - return "%s Received" % self.parent.unit.get_brief_plural(session) - - def get_column_key(self, session): - unit = self.parent.unit.get(session) - return unit == "b" and "breceived" or "mreceived" - - def render_value(self, session, value): - return fmt_rate(value, "", "sec") - - class RoutedColumn(NullSortColumn, FreshDataOnlyColumn): - def render_title(self, session, data): - return "%s Routed" % self.parent.unit.get_brief_plural(session) - - def get_column_key(self, session): - unit = self.parent.unit.get(session) - return unit == "b" and "brouted" or "mrouted" - - def render_value(self, session, value): - return fmt_rate(value, "", "sec") - - class DroppedColumn(SqlTableColumn): - def render_title(self, session, data): - return "%s Dropped" % self.parent.unit.get_brief_plural(session) - - def get_column_key(self, session): - unit = self.parent.unit.get(session) - return unit == "b" and "bdropped" or "mdropped" - -class ExchangeFrame(CuminFrame): +class ExchangeInputSet(RadioInputSet): def __init__(self, app, name): - super(ExchangeFrame, self).__init__(app, name) + super(ExchangeInputSet, self).__init__(app, name) - self.object = ExchangeParameter(app, "id") - self.add_parameter(self.object) + param = ExchangeParameter(app, "param") + self.add_parameter(param) + self.set_parameter(param) - self.view = ExchangeView(app, "view", self.object) - self.add_mode(self.view) + def do_get_items(self, session, vhost): + return sorted_by(vhost.exchanges) - def show_object(self, session, exchange): - if isinstance(exchange, SQLObject): - self.page.main.messaging.broker.set_object \ - (session, exchange.vhost.broker) + def render_item_value(self, session, exchange): + return exchange.id - return super(ExchangeFrame, self).show_object(session, exchange) + def render_item_content(self, session, exchange): + return exchange.name or "<em>Default</em>" - def render_title(self, session): - exchange = self.object.get(session) + def render_item_checked_attr(self, session, exchange): + return exchange is self.param.get(session) and "checked=\"checked\"" - if exchange: - if exchange.name: - return super(ExchangeFrame, self).render_title(session) - else: - return "Default exchange" - - def render_href(self, session): - exchange = self.object.get(session) - - if exchange: - return super(ExchangeFrame, self).render_href(session, exchange) - class ExchangeRemoveForm(CuminTaskForm): def __init__(self, app, name, task): super(ExchangeRemoveForm, self).__init__(app, name, task) @@ -206,46 +112,6 @@ self.object = ListParameter(app, "exchange", item) self.add_parameter(self.object) -class ExchangeView(CuminView): - def __init__(self, app, name, exchange): - super(ExchangeView, self).__init__(app, name, exchange) - - self.tabs = TabbedModeSet(app, "tabs") - self.add_child(self.tabs) - - self.tabs.add_tab(ExchangeStats(app, "stats", exchange)) - - self.bindings = ExchangeBindingSet(app, "bindings", exchange) - self.tabs.add_tab(self.bindings) - - self.tabs.add_tab(CuminDetails(app, "details", exchange)) - -class ExchangeBindingSet(BindingSet): - def __init__(self, app, name, exchange): - super(ExchangeBindingSet, self).__init__(app, name) - - self.exchange = exchange - - self.set_default_column_name("q_id") - - def get_visible_columns(self, session): - return self.get_request_visible_columns(session, ["q_id"]) - - def get_sql_values(self, session): - exchange = self.exchange.get(session) - return {"id": exchange.id} - - def render_title(self, session): - exchange = self.exchange.get(session) - return "Queue Bindings %s" % fmt_count(exchange.bindings.count()) - - def render_sql_where(self, session): - exchange = self.exchange.get(session) - elems = list() - elems.append("b.exchange_id = %(id)r") - elems.append(self.phase.get_sql_constraint(session, exchange)) - return "where %s" % " and ".join(elems) - class ExchangeTypeField(RadioItemSetField): def __init__(self, app, name): param = SymbolParameter(app, "param") @@ -387,9 +253,9 @@ vhost = self.vhost.get(session) return self.task.get_description(session, vhost) -class ExchangeStats(Widget): +class ExchangeOverview(Widget): def __init__(self, app, name, exchange): - super(ExchangeStats, self).__init__(app, name) + super(ExchangeOverview, self).__init__(app, name) self.add_child(StatSet(app, "io", exchange, "io")) self.add_child(StatSet(app, "general", exchange, "general")) @@ -404,7 +270,7 @@ self.add_child(chart) def render_title(self, session): - return "Statistics" + return "Overview" class ReceiveRouteDropRateChart(StatFlashChart): def render_title(self, session): Modified: mgmt/newdata/cumin/python/cumin/messaging/main.py =================================================================== --- mgmt/trunk/cumin/python/cumin/messaging/main.py 2010-03-22 14:00:07 UTC (rev 3870) +++ mgmt/newdata/cumin/python/cumin/messaging/main.py 2010-03-22 14:58:08 UTC (rev 3871) @@ -87,7 +87,7 @@ self.add_mode(self.broker) self.add_sticky_view(self.broker) - self.broker_group = BrokerGroupFrame(app, "group") + self.broker_group = BrokerGroupFrame(app, "brokergroup") self.add_mode(self.broker_group) def render_title(self, session): @@ -104,7 +104,7 @@ self.add_child(self.tabs) self.tabs.add_tab(BrokerBrowser(app, "brokers")) - self.tabs.add_tab(BrokerGroupSet(app, "groups")) + self.tabs.add_tab(BrokerGroupSelector(app, "brokergroups")) class Heading(CuminHeading): def render_title(self, session): Modified: mgmt/newdata/cumin/python/cumin/messaging/model.py =================================================================== --- mgmt/trunk/cumin/python/cumin/messaging/model.py 2010-03-22 14:00:07 UTC (rev 3870) +++ mgmt/newdata/cumin/python/cumin/messaging/model.py 2010-03-22 14:58:08 UTC (rev 3871) @@ -93,8 +93,18 @@ return "Add queue" def get_description(self, session, vhost): - return "Add queue to broker '%s'" % get_vhost_name(vhost) + cls = self.app.rosemary.org_apache_qpid_broker.Broker + conn = self.app.model.get_sql_connection() + cursor = conn.cursor() + + try: + broker = cls.get_object(cursor, vhost._brokerRef_id) + finally: + cursor.close() + + return "Add queue to broker '%s'" % broker.get_title() + def do_enter(self, session, vhost): self.form.vhost.set(session, vhost) @@ -116,8 +126,6 @@ self.app.main_page.main.messaging.broker.view.show(session) def do_invoke(self, session, queue): - assert isinstance(queue, Queue) - session = self.app.model.get_session_by_object(queue) session.queue_delete(queue=queue.name) session.sync() @@ -129,8 +137,8 @@ self.form = QueueSetTaskForm(app, "queue_set_remove", self) self.item_task = QueueRemoveTask(app, cls) - def do_enter(self, session, queues): - self.form.object.set(session, queues) + def do_enter(self, session, selection): + self.form.selection.set(session, selection) class QueuePurgeTask(QmfTask): def __init__(self, app, cls): @@ -144,13 +152,12 @@ def do_enter(self, session, queue): self.form.queue.set(session, queue) - def do_invoke(self, completion, session, queue, count=0): + def do_invoke(self, completion, session, obj, count=0): """A count of 0 purges all""" - assert isinstance(queue, Queue) + agent = self.app.model.mint.model.agents[obj._qmf_agent_id] + agent.call_method(obj, "purge", completion, (count,)) - queue.purge(completion, count) - class QueueSetPurgeTask(SetTask): def __init__(self, app, cls): super(QueueSetPurgeTask, self).__init__(app, cls) @@ -158,8 +165,8 @@ self.form = QueueSetTaskForm(app, "queue_set_purge", self) self.item_task = QueuePurgeTask(app, cls) - def do_enter(self, session, queues): - self.form.object.set(session, queues) + def do_enter(self, session, ids): + self.form.selection.set(session, ids) class BindingAddTask(Task): def __init__(self, app, cls): @@ -396,8 +403,29 @@ return "Add broker group" def do_invoke(self, session, object, name): - group = BrokerGroup(name=name) - group.syncUpdate() + cls = self.app.rosemary.com_redhat_cumin.BrokerGroup + + group = cls.create_object() + group.name = name + group.description = "XXX" + + # XXX ugh + group._qmf_agent_id = "cumin" + group._qmf_object_id = str(uuid4()) + group._qmf_create_time = datetime.now() + group._qmf_update_time = datetime.now() + group._qmf_class_key = "cumin" + + conn = self.app.model.get_sql_connection() + cursor = conn.cursor() + + try: + group.save(cursor) + finally: + cursor.close() + + conn.commit() + return group class BrokerGroupEditTask(Task): @@ -413,11 +441,20 @@ self.form.group.set(session, group) def do_invoke(self, session, group, name): - assert isinstance(group, BrokerGroup) + assert group - group.set(name=name) - group.syncUpdate() + group.name = name + conn = self.app.model.get_sql_connection() + cursor = conn.cursor() + + try: + group.save(cursor) + finally: + cursor.close() + + conn.commit() + class BrokerGroupRemoveTask(Task): def __init__(self, app, cls): super(BrokerGroupRemoveTask, self).__init__(app, cls) @@ -434,11 +471,18 @@ self.app.main_page.main.messaging.view.show(session) def do_invoke(self, session, group): - assert isinstance(group, BrokerGroup) + assert group - group.destroySelf() - group.syncUpdate() + conn = self.app.model.get_sql_connection() + cursor = conn.cursor() + try: + group.delete(cursor) + finally: + cursor.close() + + conn.commit() + class BrokerGroupSetRemoveTask(SetTask): def __init__(self, app, cls): super(BrokerGroupSetRemoveTask, self).__init__(app, cls) Modified: mgmt/newdata/cumin/python/cumin/messaging/queue.py =================================================================== --- mgmt/trunk/cumin/python/cumin/messaging/queue.py 2010-03-22 14:00:07 UTC (rev 3870) +++ mgmt/newdata/cumin/python/cumin/messaging/queue.py 2010-03-22 14:58:08 UTC (rev 3871) @@ -8,7 +8,11 @@ from wooly.tables import * from datetime import datetime from sqlobject.sqlbuilder import LEFTJOINOn +from cumin.objectselector import * +from cumin.objectform import * +from cumin.sqladapter import * from cumin.stat import * +from cumin.table import * from cumin.widgets import * from cumin.parameters import * from cumin.formats import * @@ -16,241 +20,73 @@ from binding import * from exchange import ExchangeInputSet +from subscription import * import main strings = StringCatalog(__file__) log = logging.getLogger("cumin.messaging.queue") -class QueueSet(CuminSelectionTable): +class QueueSelector(ObjectSelector): def __init__(self, app, name, vhost): - item = QueueParameter(app, "item") - super(QueueSet, self).__init__(app, name, item) + cls = app.rosemary.org_apache_qpid_broker.Queue + super(QueueSelector, self).__init__(app, name, cls) + self.vhost = vhost - col = self.NameColumn(app, "name") - col.width = "30%" + frame = "main.messaging.broker.queue" + col = ObjectLinkColumn(app, "name", cls.name, cls._id, frame) self.add_column(col) - self.set_default_column(col) - col = self.ConsumersColumn(app, "consumers") - col.align = "right" - self.add_column(col) + self.add_attribute_column(cls.consumerCount) + self.add_attribute_column(cls.bindingCount) + self.add_attribute_column(cls.msgDepth) + self.add_attribute_column(cls.byteDepth) - col = self.BindingsColumn(app, "bindings") - col.align = "right" - self.add_column(col) + self.add_reference_filter(vhost, cls.vhostRef) - col = self.EnqueuedColumn(app, "enqueued") - col.align = "right" - self.add_column(col) + self.add_task(main.module.queue_add, self.vhost) + self.add_selection_task(main.module.queue_set_purge) + self.add_selection_task(main.module.queue_set_remove) - col = self.DequeuedColumn(app, "dequeued") - col.align = "right" - self.add_column(col) - - col = self.DepthColumn(app, "depth") - col.align = "right" - self.add_column(col) - - self.unit = UnitSwitch(app, "unit") - self.switches.add_child(self.unit) - - self.phase = PhaseSwitch(app, "phase") - self.filters.add_child(self.phase) - - task = main.module.queue_add - self.links.add_child(TaskLink(app, "add", task, vhost)) - - task = main.module.queue_set_purge - button = TaskButton(app, "purge", task, self.selection) - self.buttons.add_child(button) - - task = main.module.queue_set_remove - button = TaskButton(app, "remove", task, self.selection) - self.buttons.add_child(button) - - def render_title(self, session): - vhost = self.vhost.get(session) - return "Queues %s" % fmt_count(vhost.queues.count()) - - def render_sql_where(self, session): - vhost = self.vhost.get(session) - - constraints = list() - constraints.append("q.vhost_id = %(id)r") - constraints.append(self.phase.get_sql_constraint(session, vhost)) - - return "where %s" % " and ".join(constraints) - - def get_sql_values(self, session): - vhost = self.vhost.get(session) - return {"id": vhost.id} - - class NameColumn(SqlTableColumn): - def render_title(self, session, data): - return "Name" - - def render_content(self, session, data): - queue = Identifiable(data["id"]) - href = main.module.frame.broker.queue.get_href(session, queue) - return fmt_link(href, data["name"], link_title=data["name"]) - - class ConsumersColumn(SqlTableColumn): - def render_title(self, session, data): - return "Consumers" - - def render_value(self, session, value): - if value is None: - return fmt_none_brief() - else: - return value - - class BindingsColumn(SqlTableColumn): - def render_title(self, session, data): - return "Bindings" - - def render_content(self, session, data): - queue = Identifiable(data["id"]) - branch = session.branch() - self.frame.queue.object.set(branch, queue) - self.frame.queue.view.bindings.show(branch) - return fmt_link(branch.marshal(), data["bindings"] or "0") - - class EnqueuedColumn(NullSortColumn, FreshDataOnlyColumn): - def render_title(self, session, data): - return "%s Enqueued" % self.parent.unit.get_brief_plural(session) - - def get_column_key(self, session): - unit = self.parent.unit.get(session) - return unit == "b" and "benqueued" or "menqueued" - - def render_value(self, session, value): - return fmt_rate(value, "", "sec") - - class DequeuedColumn(NullSortColumn, FreshDataOnlyColumn): - def render_title(self, session, data): - return "%s Dequeued" % self.parent.unit.get_brief_plural(session) - - def get_column_key(self, session): - unit = self.parent.unit.get(session) - return unit == "b" and "bdequeued" or "mdequeued" - - def render_value(self, session, value): - return fmt_rate(value, "", "sec") - - class DepthColumn(SqlTableColumn): - def render_title(self, session, data): - return "%s Depth" % self.parent.unit.get_brief_singular(session) - - def get_column_key(self, session): - unit = self.parent.unit.get(session) - return unit == "b" and "bdepth" or "mdepth" - - def render_value(self, session, value): - if value is None: - return fmt_none_brief() - else: - return value - -class TopQueueSet(TopTable): +class QueueFrame(ObjectFrame): def __init__(self, app, name): - super(TopQueueSet, self).__init__(app, name) + cls = app.rosemary.org_apache_qpid_broker.Queue - col = self.NameColumn(app, "name") - col.width = "60%" - self.add_column(col) + super(QueueFrame, self).__init__(app, name, cls) - self.set_default_column(col) + self.icon_href = "resource?name=queue-36.png" - col = self.EnqueuesColumn(app, "enqueues") - col.width = "35%" - col.align = "right" - self.add_column(col) + self.bindings = QueueBindingSelector(app, "bindings", self.object) + self.view.add_tab(self.bindings) - class NameColumn(TopTableColumn): - def render_title(self, session, data): - return "Name" + self.subscriptions = SubscriptionSelector \ + (app, "subscriptions", self.object) + self.view.add_tab(self.subscriptions) - def render_content(self, session, data): - broker = Identifiable(data["broker_id"]) - queue = Identifiable(data["id"]) + self.subscription = SubscriptionFrame(app, "subscription") + self.add_mode(self.subscription) - branch = session.branch() - self.page.main.messaging.broker.object.set(branch, broker) - self.page.main.messaging.broker.queue.object.set(branch, queue) - self.page.main.messaging.broker.queue.show(branch) - return fmt_link \ - (branch.marshal(), data["name"], link_title=data["name"]) - - class EnqueuesColumn(TopTableColumn): - def render_title(self, session, data): - return "Recent Enqueues" - -class QueueFrame(CuminFrame): - def __init__(self, app, name): - super(QueueFrame, self).__init__(app, name) - - self.object = QueueParameter(app, "id") - self.add_parameter(self.object) - - self.view = QueueView(app, "view", self.object) - self.add_mode(self.view) - -class QueueView(CuminView): +class QueueBindingSelector(BindingSelector): def __init__(self, app, name, queue): - super(QueueView, self).__init__(app, name, queue) + super(QueueBindingSelector, self).__init__(app, name) - self.tabs = TabbedModeSet(app, "tabs") - self.add_child(self.tabs) - - self.tabs.add_tab(QueueStats(app, "stats", queue)) - - self.bindings = QueueBindingSet(app, "bindings", queue) - self.tabs.add_tab(self.bindings) - - self.tabs.add_tab(CuminDetails(app, "details", queue)) - -class QueueBindingSet(BindingSet): - def __init__(self, app, name, queue): - super(QueueBindingSet, self).__init__(app, name) - self.queue = queue - self.set_default_column_name("e_id") + self.add_reference_filter(self.queue, self.cls.queueRef) - task = main.module.binding_add - self.links.add_child(TaskLink(app, "add", task, self.queue)) + self.queue_column.visible = False - def get_visible_columns(self, session): - return self.get_request_visible_columns(session, ["e_id"]) - - def get_sql_values(self, session): - queue = self.queue.get(session) - return {"id": queue.id} - - def render_sql_where(self, session): - queue = self.queue.get(session) - - elems = list() - elems.append("b.queue_id = %(id)r") - elems.append(self.phase.get_sql_constraint(session, queue)) - - return "where %s" % " and ".join(elems) - - def render_title(self, session): - queue = self.queue.get(session) - return "Exchange Bindings %s" % \ - fmt_count(queue.bindings.count()) - class QueueAddForm(FieldSubmitForm): def __init__(self, app, name, task): super(QueueAddForm, self).__init__(app, name) self.task = task - self.vhost = VhostParameter(app, "vhost") + cls = self.app.rosemary.org_apache_qpid_broker.Vhost + + self.vhost = RosemaryObjectParameter(app, "vhost", cls) self.add_parameter(self.vhost) self.namef = NameField(app, "name") @@ -552,15 +388,12 @@ self.task.invoke(session, queue, count) self.task.exit_with_redirect(session, queue) -class QueueSetTaskForm(CuminTaskForm): +class QueueSetTaskForm(SelectionTaskForm): def __init__(self, app, name, task): - super(QueueSetTaskForm, self).__init__(app, name, task) + cls = app.rosemary.org_apache_qpid_broker.Queue - item = QueueParameter(app, "item") + super(QueueSetTaskForm, self).__init__(app, name, cls, task) - self.object = ListParameter(app, "queue", item) - self.add_parameter(self.object) - class BindSummaryPropertiesField(FormField): def __init__(self, app, name, queue): super(BindSummaryPropertiesField, self).__init__(app, name) @@ -848,3 +681,37 @@ self.task.invoke(session, queue, dest_queue, count) self.task.exit_with_redirect(session, queue) + +class TopQueueSet(TopTable): + def __init__(self, app, name): + super(TopQueueSet, self).__init__(app, name) + + col = self.NameColumn(app, "name") + col.width = "60%" + self.add_column(col) + + self.set_default_column(col) + + col = self.EnqueuesColumn(app, "enqueues") + col.width = "35%" + col.align = "right" + self.add_column(col) + + class NameColumn(TopTableColumn): + def render_title(self, session): + return "Name" + + def render_content(self, session, data): + broker = Identifiable(data["broker_id"]) + queue = Identifiable(data["id"]) + + branch = session.branch() + self.page.main.messaging.broker.object.set(branch, broker) + self.page.main.messaging.broker.queue.object.set(branch, queue) + self.page.main.messaging.broker.queue.show(branch) + return fmt_link \ + (branch.marshal(), data["name"], link_title=data["name"]) + + class EnqueuesColumn(TopTableColumn): + def render_title(self, session): + return "Recent Enqueues" Added: mgmt/newdata/cumin/python/cumin/messaging/subscription.py =================================================================== --- mgmt/newdata/cumin/python/cumin/messaging/subscription.py (rev 0) +++ mgmt/newdata/cumin/python/cumin/messaging/subscription.py 2010-03-22 14:58:08 UTC (rev 3871) @@ -0,0 +1,25 @@ +from cumin.objectframe import * +from cumin.objectselector import * +from cumin.util import * + +class SubscriptionSelector(ObjectSelector): + def __init__(self, app, name, queue): + cls = app.rosemary.org_apache_qpid_broker.Subscription + + super(SubscriptionSelector, self).__init__(app, name, cls) + + self.queue = queue + + frame = "main.messaging.broker.queue.subscription" + col = ObjectLinkColumn(app, "name", cls.name, cls._id, frame) + self.add_column(col) + + self.add_attribute_column(cls.creditMode) + self.add_attribute_column(cls.arguments) + self.add_attribute_column(cls.delivered) + +class SubscriptionFrame(ObjectFrame): + def __init__(self, app, name): + cls = app.rosemary.org_apache_qpid_broker.Subscription + + super(SubscriptionFrame, self).__init__(app, name, cls) Modified: mgmt/newdata/cumin/python/cumin/model.py =================================================================== --- mgmt/trunk/cumin/python/cumin/model.py 2010-03-22 14:00:07 UTC (rev 3870) +++ mgmt/newdata/cumin/python/cumin/model.py 2010-03-22 14:58:08 UTC (rev 3871) @@ -124,9 +124,9 @@ def get_session_by_object(self, object): assert object - agent = self.mint.model.agents[object.qmfAgentId] + agent = self.mint.model.agents[object._qmf_agent_id] - return agent.agent.getBroker().getAmqpSession() + return agent.qmf_agent.getBroker().getAmqpSession() def get_negotiator_limits(self, negotiator): assert negotiator @@ -1607,11 +1607,6 @@ stat.unit = "byte" stat.category = "io" - def init(self): - super(CuminLink, self).init() - - self.frame = self.model.frame.messaging.broker.link - def get_title(self, session): return "Broker Link" Added: mgmt/newdata/cumin/python/cumin/objectform.py =================================================================== --- mgmt/newdata/cumin/python/cumin/objectform.py (rev 0) +++ mgmt/newdata/cumin/python/cumin/objectform.py 2010-03-22 14:58:08 UTC (rev 3871) @@ -0,0 +1,97 @@ +from wooly import * +from wooly.forms import * +from wooly.parameters import * + +from util import * + +class ObjectForm(SubmitForm, Frame): + def __init__(self, app, name, cls): + super(ObjectForm, self).__init__(app, name) + + self.cls = cls + + self.id = IntegerParameter(app, "id") + self.add_parameter(self.id) + + self.object = Attribute(app, "object") + + def init(self): + super(ObjectForm, self).init() + + assert self.cls, self + + def do_process(self, session): + conn = self.app.model.get_sql_connection() + cursor = conn.cursor() + + try: + obj = self.cls.get_object(cursor, id) + self.object.set(session, obj) + finally: + cursor.close() + + super(ObjectForm, self).do_process(session) + +class SelectionForm(SubmitForm, Frame): + def __init__(self, app, name, cls): + super(SelectionForm, self).__init__(app, name) + + self.cls = cls + + item = IntegerParameter(app, "item") + + self.selection = ListParameter(app, "id", item) + self.add_parameter(self.selection) + + self.objects = Attribute(app, "objects") + + def init(self): + super(SelectionForm, self).init() + + assert self.cls, self + + def do_process(self, session): + objects = list() + + self.objects.set(session, objects) + + conn = self.app.model.get_sql_connection() + cursor = conn.cursor() + + try: + for id in self.selection.get(session): + obj = self.cls.get_object(cursor, id) + objects.append(obj) + finally: + cursor.close() + + super(SelectionForm, self).do_process(session) + +class SelectionTaskForm(SelectionForm): + def __init__(self, app, name, cls, task): + super(SelectionTaskForm, self).__init__(app, name, cls) + + self.cls = cls + self.task = task + + def init(self): + super(SelectionForm, self).init() + + assert self.task, self + + def process_submit(self, session): + objects = self.objects.get(session) + + self.task.invoke(session, objects) + self.task.exit_with_redirect(session, objects) + + def render_submit_content(self, session): + return self.task.get_title(session) + + def render_title(self, session): + return "Confirm" + + def render_content(self, session): + objects = self.objects.get(session) + + return "%s?" % self.task.get_description(session, objects) Added: mgmt/newdata/cumin/python/cumin/objectframe.py =================================================================== --- mgmt/newdata/cumin/python/cumin/objectframe.py (rev 0) +++ mgmt/newdata/cumin/python/cumin/objectframe.py 2010-03-22 14:58:08 UTC (rev 3871) @@ -0,0 +1,276 @@ +from wooly import * +from wooly.resources import * +from wooly.widgets import * + +from formats import * +from util import * +from widgets import * + +log = logging.getLogger("cumin.objectframe") +strings = StringCatalog(__file__) + +class ObjectFrame(Frame, ModeSet): + def __init__(self, app, name, cls): + super(ObjectFrame, self).__init__(app, name) + + self.cls = cls + + self.id = IntegerParameter(app, "id") + self.add_parameter(self.id) + + self.object = Attribute(app, "object") + self.add_attribute(self.object) + + self.view = ObjectView(app, name, self.object) + self.add_child(self.view) + + self.icon_href = "resource?name=action-36.png" + + self.summary_attributes = list() + self.summary_tasks = list() + + self.add_summary_attribute(cls._qmf_update_time) + + def add_summary_attribute(self, attr): + assert attr not in self.summary_attributes, attr + + self.summary_attributes.append(attr) + + def add_summary_task(self, task): + assert task not in self.summary_tasks, task + + self.summary_tasks.append(task) + + def init(self): + super(ObjectFrame, self).init() + + assert self.cls, self + + def get_href(self, session, id): + branch = session.branch() + + self.id.set(branch, id) + self.view.show(branch) + + return branch.marshal() + + def get_title(self, session): + obj = self.object.get(session) + + return "%s '%s'" % (obj._class._title, obj.get_title()) + + def do_process(self, session): + # XXX don't process if this frame is invisible + + id = self.id.get(session) + + assert id + + conn = self.app.model.get_sql_connection() + cursor = conn.cursor() + + try: + obj = self.cls.get_object(cursor, id) + finally: + cursor.close() + + self.object.set(session, obj) + + super(ObjectFrame, self).do_process(session) + +class ObjectAttributes(Widget): + def __init__(self, app, name, object): + super(ObjectAttributes, self).__init__(app, name) + + self.object = object + + self.entry = ObjectAttributesEntry(app, "entry") + self.add_child(self.entry) + + def get_attributes(self, session): + return () + + def render_attributes(self, session): + writer = Writer() + + obj = self.object.get(session) + + for attr in self.get_attributes(session): + name = attr.title + value = getattr(obj, attr.name, fmt_none()) + + writer.write(self.entry.render(session, name, value)) + + return writer.to_string() + +class ObjectAttributesEntry(Widget): + def render_name(self, session, name, value): + return name + + def render_value(self, session, name, value): + return value + +class ObjectTaskLinks(WidgetSet): + def __init__(self, app, name, object): + super(ObjectTaskLinks, self).__init__(app, name) + + self.object = object + +class SummaryAttributes(ObjectAttributes): + pass + +class SummaryLinks(ObjectTaskLinks): + pass + +class ObjectView(Widget): + def __init__(self, app, name, object): + super(ObjectView, self).__init__(app, name) + + self.object = object + + self.context = ObjectViewContext(app, "context", self.object) + self.add_child(self.context) + + self.heading = ObjectViewHeading(app, "heading", self.object) + self.add_child(self.heading) + + self.summary = ObjectViewSummary(app, "summary", self.object) + self.add_child(self.summary) + + self.body = TabbedModeSet(app, "body") + self.add_child(self.body) + + def init(self): + self.add_tab(ObjectDetails(self.app, "details", self.object)) + + super(ObjectView, self).init() + + def add_tab(self, widget): + self.body.add_tab(widget) + + def render_title(self, session): + obj = self.object.get(session) + return obj.get_title() + +class ObjectViewChild(Widget): + def __init__(self, app, name, object): + super(ObjectViewChild, self).__init__(app, name) + + self.object = object + +class ObjectViewContext(ObjectViewChild): + def __init__(self, app, name, object): + super(ObjectViewContext, self).__init__(app, name, object) + + self.link = ObjectViewContextLink(app, "link") + self.add_child(self.link) + + def render_links(self, session): + links = list() + + for frame in self.parent.ancestors: + if not isinstance(frame, Frame): + break + + links.append(self.link.render(session, frame)) + + return " > ".join(reversed(links)) + +class ObjectViewContextLink(Link): + def __init__(self, app, name): + super(ObjectViewContextLink, self).__init__(app, name) + + def edit_session(self, session, frame): + frame.view.show(session) + + def render_class(self, session, frame): + cls = super(ObjectViewContextLink, self).render_class(session) + + if self.frame is frame: + cls = "%s selected" % cls + + return cls + + def render_content(self, session, frame): + return frame.get_title(session) + +class ObjectViewHeading(ObjectViewChild): + def __init__(self, app, name, object): + super(ObjectViewHeading, self).__init__(app, name, object) + + def render_icon_href(self, session): + return self.frame.icon_href + + def render_title(self, session): + return self.parent.render_title(session) + +class ObjectViewSummary(ObjectViewChild): + def __init__(self, app, name, object): + super(ObjectViewSummary, self).__init__(app, name, object) + + attributes = self.Attributes(app, "attributes", self.object) + self.add_child(attributes) + + links = self.Links(app, "links", self.object) + self.add_child(links) + + class Attributes(SummaryAttributes): + def get_attributes(self, session): + return self.frame.summary_attributes + + class Links(SummaryLinks): + def init(self): + super(ObjectViewSummary.Links, self).init() + + for task in self.frame.summary_tasks: + name = task.__class__.__name__ + link = TaskLink(self.app, name, task, self.object) + + self.add_child(link) + + link.init() + +class ObjectDetails(Widget): + def __init__(self, app, name, object): + super(ObjectDetails, self).__init__(app, name) + + self.object = object + + props = self.Headers(app, "headers", self.object) + props.update_enabled = True + self.add_child(props) + + props = self.Properties(app, "props", self.object) + props.update_enabled = True + self.add_child(props) + + stats = self.Statistics(app, "stats", self.object) + stats.update_enabled = True + self.add_child(stats) + + def render_title(self, session): + return "Details" + + class Headers(ObjectAttributes): + def get_attributes(self, session): + obj = self.object.get(session) + return obj._class._headers + + def render_title(self, session): + return "QMF Headers" + + class Properties(ObjectAttributes): + def get_attributes(self, session): + obj = self.object.get(session) + return obj._class._properties + + def render_title(self, session): + return "Properties" + + class Statistics(ObjectAttributes): + def get_attributes(self, session): + obj = self.object.get(session) + return obj._class._statistics + + def render_title(self, session): + return "Statistics" Added: mgmt/newdata/cumin/python/cumin/objectframe.strings =================================================================== --- mgmt/newdata/cumin/python/cumin/objectframe.strings (rev 0) +++ mgmt/newdata/cumin/python/cumin/objectframe.strings 2010-03-22 14:58:08 UTC (rev 3871) @@ -0,0 +1,151 @@ +[ObjectAttributes.css] +div.ObjectAttributes h2 { + margin: 0 0 1em 0; + font-size: 0.9em; +} + +div.ObjectAttributes table { + width: 100%; + margin: 0 0 1em 0; + border-collapse: collapse; + font-size: 0.9em; +} + +div.ObjectAttributes th, div.ObjectAttributes td { + padding: 0.35em 0.5em 0.35em 0; + text-align: left; + vertical-align: top; +} + +div.ObjectAttributes thead th { + font-weight: normal; + font-style: italic; + font-size: 0.9em; + color: #666; +} + +div.ObjectAttributes tbody tr { + border-top: 1px dotted #ccc; +} + +div.ObjectAttributes tbody th { + width: 40%; + font-weight: normal; +} + +div.ObjectAttributes tbody td { + width: 60%; +} + +[ObjectAttributes.html] +<div id="{id}" class="{class}"> + <h2>{title}</h2> + + <table> + <thead> + <tr> + <th>Name</th> + <th>Value</th> + </tr> + </thead> + <tbody>{attributes}</tbody> + </table> +</div> + +[ObjectAttributesEntry.html] +<tr><th>{name}</th><td>{value}</td></tr> + +[SummaryAttributes.css] +div.SummaryAttributes { + width: 20em; +} + +div.SummaryAttributes tbody tr { + border-top: none; +} + +div.SummaryAttributes tbody th, div.SummaryAttributes tbody td { + padding: 0.125em 0; +} + +div.SummaryAttributes tbody th { + color: #666; +} + +[SummaryAttributes.html] +<div id="{id}" class="{class}"> + <table> + <tbody>{attributes}</tbody> + </table> +</div> + +[SummaryLinks.css] +ul.SummaryLinks { + width: 15em; + float: right; + list-style: none; + margin: 0; +} + +[ObjectView.css] +div.ObjectViewChild { + margin: 0 0 0.5em 0; +} + +div.ObjectViewContext { + color: #666; + font-size: 0.9em; +} + +div.ObjectViewContext a.selected { + color: #666; +} + +div.ObjectViewHeading h1 { + margin: 0; + display: inline; +} + +div.ObjectViewHeading img { + vertical-align: -70%; + margin: 0 0.25em 0 0; +} + +div.ObjectViewSummary { + border-top: 1px dotted #ccc; + padding: 0.5em 0 0 0; + width: 40em; + font-size: 0.9em; +} + +[ObjectView.html] +{context} + +{heading} + +{summary} + +{body} + +[ObjectViewHeading.html] +<div class="{class}"> + <img src="{icon_href}" alt="icon"/> + + <h1>{title}</h1> +</div> + +[ObjectViewSummary.html] +<div class="{class}"> + {links} + {attributes} +</div> + +[ObjectViewContext.html] +<div class="{class}">{links}</div> + +[ObjectDetails.html] +{headers} + +{props} + +{stats} Added: mgmt/newdata/cumin/python/cumin/objectselector.py =================================================================== --- mgmt/newdata/cumin/python/cumin/objectselector.py (rev 0) +++ mgmt/newdata/cumin/python/cumin/objectselector.py 2010-03-22 14:58:08 UTC (rev 3871) @@ -0,0 +1,184 @@ +from wooly import * +from wooly.datatable import * +from wooly.forms import * +from wooly.widgets import * + +from objectframe import * +from sqladapter import * +from util import * + +strings = StringCatalog(__file__) + +# XXX ObjectTable + +class ObjectSelector(DataTable, Form): + def __init__(self, app, name, cls, adapter=None): + assert isinstance(cls, RosemaryClass), cls + + if not adapter: + adapter = ObjectSqlAdapter(app, cls) + + assert isinstance(adapter, ObjectSqlAdapter), adapter + + super(ObjectSelector, self).__init__(app, name, adapter) + + self.cls = cls + + item = IntegerParameter(app, "item") + + self.selection = ListParameter(app, "selection", item) + self.add_parameter(self.selection) + + self.checkbox_column = ObjectCheckboxColumn \ + (app, "id", cls._id, self.selection) + self.add_column(self.checkbox_column) + + self.links = ObjectSelectorLinks(app, "links") + self.add_child(self.links) + + self.switches = ObjectSelectorSwitches(app, "switches") + self.add_child(self.switches) + + self.filters = ObjectSelectorFilters(app, "filters") + self.add_child(self.filters) + + self.buttons = ObjectSelectorButtons(app, "buttons") + self.add_child(self.buttons) + + # (RosemaryAttribute this, RosemaryAttribute that, Attribute object) + self.filter_specs = list() + + def init(self): + assert self.cls, self + assert self.adapter, self + assert self.adapter.id_field, self + + super(ObjectSelector, self).init() + + def add_attribute_column(self, attr): + assert isinstance(attr, RosemaryAttribute), attr + + col = ObjectAttributeColumn(self.app, attr.name, attr) + self.add_column(col) + + def add_task(self, task, parameter): + link = TaskLink(self.app, task.__class__.__name__, task, parameter) + + self.links.add_child(link) + + return link + + def add_selection_task(self, task): + name = task.__class__.__name__ + button = TaskButton(self.app, name, task, self.selection) + + self.buttons.add_child(button) + + return button + + def add_filter(self, object, this, that=None): + if not that: + that = this + + assert isinstance(object, Attribute), object + assert isinstance(this, RosemaryAttribute), this + assert isinstance(that, RosemaryAttribute), that + + self.filter_specs.append((this, that, object)) + self.adapter.add_value_filter(this) + + def add_reference_filter(self, object, ref): + assert isinstance(ref, RosemaryReference), ref + + this = ref + that = ref.that_cls._id + + self.add_filter(object, this, that) + + def get_data_values(self, session): + values = dict() + + for this, that, object in self.filter_specs: + obj = object.get(session) + + values[this.name] = getattr(obj, that.name) + + return values + + def render_title(self, session): + return "%ss" % self.cls._title + +class ObjectAttributeColumn(DataTableColumn): + def __init__(self, app, name, attr): + super(ObjectAttributeColumn, self).__init__(app, name, None) + + self.attr = attr + + def init(self): + super(ObjectAttributeColumn, self).init() + + try: + self.field = self.table.adapter.fields_by_attr[self.attr] + except KeyError: + self.field = ObjectSqlField(self.table.adapter, self.attr) + +class ObjectCheckboxColumn(ObjectAttributeColumn): + def __init__(self, app, name, attr, selection): + super(ObjectCheckboxColumn, self).__init__(app, name, attr) + + self.selection = selection + + self.header = CheckboxColumnHeader(app, "header") + self.replace_child(self.header) + + self.cell = CheckboxColumnCell(app, "cell", selection) + self.replace_child(self.cell) + + self.width = "1%" + + def render_cell_value(self, session, record): + return record[self.field.index] + +class ObjectLinkColumn(ObjectAttributeColumn, LinkColumn): + def __init__(self, app, name, attr, id_attr, frame_path): + super(ObjectLinkColumn, self).__init__(app, name, attr) + + self.id_attr = id_attr + self.frame_path = frame_path + + def init(self): + super(ObjectLinkColumn, self).init() + + try: + self.id_field = self.table.adapter.fields_by_attr[self.id_attr] + except KeyError: + self.id_field = ObjectSqlField(self.table.adapter, self.id_attr) + + def render_cell_href(self, session, record): + id = record[self.id_field.index] + frame = self.page.page_widgets_by_path[self.frame_path] + + if isinstance(frame, ObjectFrame): + return frame.get_href(session, id) + else: + return frame.get_href(session, Identifiable(id)) # XXX + + def render_cell_content(self, session, record): + return record[self.field.index] + +class ObjectSelectorControl(WidgetSet): + def do_render(self, session): + if len(self.children): + return super(ObjectSelectorControl, self).do_render(session) + +class ObjectSelectorLinks(ObjectSelectorControl): + pass + +class ObjectSelectorSwitches(ObjectSelectorControl): + pass + +class ObjectSelectorFilters(ObjectSelectorControl): + pass + +class ObjectSelectorButtons(ObjectSelectorControl): + pass Added: mgmt/newdata/cumin/python/cumin/objectselector.strings =================================================================== --- mgmt/newdata/cumin/python/cumin/objectselector.strings (rev 0) +++ mgmt/newdata/cumin/python/cumin/objectselector.strings 2010-03-22 14:58:08 UTC (rev 3871) @@ -0,0 +1,75 @@ +[ObjectSelector.css] +//div.ObjectSelector form { +// clear: both; +//} + +div.ObjectSelectorControl ul { + list-style: none; + display: inline; + padding: 0; +} + +div.ObjectSelectorLinks { + margin: 0 0 1em 0; + font-size: 0.9em; +} + +div.ObjectSelectorFilters { + float: right; +} + +div.ObjectSelectorButtons { + background-color: #e7e7f7; + padding: 0.35em 0.75em; +} + +div.ObjectSelectorButtons span { + font-size: 0.9em; + margin: 0 0.5em 0 0; +} + +div.ObjectSelectorButtons ul { + padding: 0; + margin: 0; +} + +div.ObjectSelectorButtons ul li { + margin: 0 0.4em 0 0; + display: inline; +} + +[ObjectSelector.html] +<div id="{id}" class="{class}"> + {links} + + {filters} + + {switches} + + <form method="post" action="?"> + {buttons} + + <table id="{id}" class="{class}"> + <style type="text/css"> + {css} + </style> + {header} + {footer} + <tbody>{rows}</tbody> + </table> + + <div>{hidden_inputs}</div> + </form> +</div> + +[ObjectSelectorControl.html] +<div class="{class}"> + <ul>{widgets}</ul> +</div> + +[ObjectSelectorButtons.html] +<div class="{class}"> + <span>Act on selection:</span> + + <ul>{widgets}</ul> +</div> Added: mgmt/newdata/cumin/python/cumin/objecttask.py =================================================================== --- mgmt/newdata/cumin/python/cumin/objecttask.py (rev 0) +++ mgmt/newdata/cumin/python/cumin/objecttask.py 2010-03-22 14:58:08 UTC (rev 3871) @@ -0,0 +1,5 @@ +from util import * + +class ObjectTaskLink(object): + def __init__(self, app, cls): + self.cls = cls Modified: mgmt/newdata/cumin/python/cumin/parameters.py =================================================================== --- mgmt/trunk/cumin/python/cumin/parameters.py 2010-03-22 14:00:07 UTC (rev 3870) +++ mgmt/newdata/cumin/python/cumin/parameters.py 2010-03-22 14:58:08 UTC (rev 3871) @@ -37,6 +37,30 @@ def do_marshal(self, cls): return cls.cumin_name +class RosemaryObjectParameter(Parameter): + def __init__(self, app, name, cls): + super(RosemaryObjectParameter, self).__init__(app, name) + + self.cls = cls + + def do_unmarshal(self, string): + conn = self.app.model.get_sql_connection() + cursor = conn.cursor() + + try: + return self.cls.get_object(cursor, int(string)) + finally: + cursor.close() + + def do_marshal(self, obj): + return str(obj._id) + +class VhostParameter(RosemaryObjectParameter): + def __init__(self, app, name): + cls = app.rosemary.org_apache_qpid_broker.Vhost + + super(VhostParameter, self).__init__(app, name, cls) + class BindingParameter(Parameter): def do_unmarshal(self, string): return Binding.get(int(string)) @@ -59,6 +83,19 @@ def do_marshal(self, group): return str(group.id) +class NewBrokerGroupParameter(Parameter): + def do_unmarshal(self, string): + id = int(string) + cls = self.app.rosemary.com_redhat_cumin.BrokerGroup + + conn = self.app.model.get_sql_connection() + cursor = conn.cursor() + + try: + return cls.get_object(cursor, id) + finally: + cursor.close() + class BrokerParameter(Parameter): def do_unmarshal(self, string): return Broker.get(int(string)) @@ -68,9 +105,19 @@ class BrokerVhostAttribute(ObjectAssociateAttribute): def get_associate(self, session, broker): - for vhost in Vhost.selectBy(broker=broker, name="/"): - return vhost + cls = self.app.rosemary.org_apache_qpid_broker.Vhost + conn = self.app.model.get_sql_connection() + cursor = conn.cursor() + + try: + kwargs = {"_brokerRef_id": broker._id, "name": "'/'"} + + for obj in cls.select_objects(cursor, **kwargs): + return obj + finally: + cursor.close() + class ConnectionParameter(Parameter): def do_unmarshal(self, string): return ClientConnection.get(int(string)) @@ -188,13 +235,6 @@ def do_marshal(self, sub): return str(sub.id) -class VhostParameter(Parameter): - def do_unmarshal(self, string): - return Vhost.get(int(string)) - - def do_marshal(self, vhost): - return str(vhost.id) - class CollectorParameter(Parameter): def do_unmarshal(self, string): return Collector.get(int(string)) Added: mgmt/newdata/cumin/python/cumin/sqladapter.py =================================================================== --- mgmt/newdata/cumin/python/cumin/sqladapter.py (rev 0) +++ mgmt/newdata/cumin/python/cumin/sqladapter.py 2010-03-22 14:58:08 UTC (rev 3871) @@ -0,0 +1,147 @@ +from rosemary.sqlquery import * +from wooly.datatable import * + +from util import * + +class SqlAdapter(DataAdapter): + def __init__(self, app, table): + super(SqlAdapter, self).__init__() + + self.app = app + self.table = table + + self.query = SqlQuery(self.table) + self.columns = list() + + def init(self): + for field in self.fields: + field.init() + + def get_count(self, values): + conn = self.app.model.get_sql_connection() + cursor = conn.cursor() + + try: + self.query.execute(cursor, ("count(1)",), values) + + return cursor.fetchone()[0] + finally: + cursor.close() + + def get_sql_options(self, options): + sql_options = SqlQueryOptions() + + if options.sort_field: + sql_options.sort_column = options.sort_field.column + + sql_options.sort_ascending = options.sort_ascending + sql_options.limit = options.limit + sql_options.offset = options.offset + + return sql_options + + def get_data(self, values, options): + sql_options = self.get_sql_options(options) + + conn = self.app.model.get_sql_connection() + cursor = conn.cursor() + + try: + self.query.execute(cursor, self.columns, values, sql_options) + + return cursor.fetchall() + finally: + cursor.close() + +class SqlField(DataAdapterField): + def __init__(self, adapter, column): + python_type = column.type.python_type + + super(SqlField, self).__init__(adapter, column.name, python_type) + + self.column = column + + self.adapter.columns.append(column) + +class ObjectSqlAdapter(SqlAdapter): + def __init__(self, app, cls): + super(ObjectSqlAdapter, self).__init__(app, cls.sql_table) + + self.cls = cls + + self.fields_by_attr = dict() + + # XXX eliminate this? + self.id_field = ObjectSqlField(self, self.cls._id) + + def add_join(self, cls, this, that): + assert cls + assert this + assert that + + SqlInnerJoin(self.query, cls.sql_table, + this.sql_column, that.sql_column) + + def add_outer_join(self, cls, this, that): + assert cls + assert this + assert that + + SqlOuterJoin(self.query, cls.sql_table, + this.sql_column, that.sql_column) + + def add_value_filter(self, attr): + assert attr + value = "%%(%s)s" % attr.name + + SqlComparisonFilter(self.query, attr.sql_column, value) + +class ObjectSqlField(SqlField): + def __init__(self, adapter, attr): + assert isinstance(adapter, ObjectSqlAdapter), adapter + + super(ObjectSqlField, self).__init__(adapter, attr.sql_column) + + self.attr = attr + + self.adapter.fields_by_attr[self.attr] = self + + def get_title(self, session): + return self.attr.title or self.attr.name + +class HeartbeatField(SqlField): + def get_title(self, session): + return "Status" + + def get_content(self, session, record): + id = record[self.index] + + try: + last = self.adapter.app.model.mint.model.agents[id].last_heartbeat + except KeyError: + last = None + + if last is None: + return "Unknown" + + if last < datetime.now() - timedelta(seconds=10): + return "Stale" + + return "Fresh" + +class TestData(ObjectSqlAdapter): + def __init__(self, app): + broker = app.rosemary.org_apache_qpid_broker.Broker + system = app.rosemary.org_apache_qpid_broker.System + cluster = app.rosemary.org_apache_qpid_cluster.Cluster + + super(TestData, self).__init__(app, broker) + + self.add_join(system, broker.systemRef, system.id) + self.add_outer_join(cluster, broker.id, cluster.brokerRef) + + col = self.table._qmf_agent_id + field = HeartbeatField(self, col) + + for prop in broker._properties + system._properties: + field = ObjectSqlField(self, prop) Added: mgmt/newdata/cumin/python/cumin/table.py =================================================================== --- mgmt/newdata/cumin/python/cumin/table.py (rev 0) +++ mgmt/newdata/cumin/python/cumin/table.py 2010-03-22 14:58:08 UTC (rev 3871) @@ -0,0 +1,109 @@ +from wooly import * +from wooly.datatable import * +from wooly.forms import * +from wooly.widgets import * + +from util import * +from widgets import * + +strings = StringCatalog(__file__) + +# XXX delete this + +class SelectionTable(Form): + def __init__(self, app, name, data): + super(SelectionTable, self).__init__(app, name) + + self.table = self.SelectionDataTable(app, "table", data) + self.table.update_enabled = True + self.add_child(self.table) + + item = IntegerParameter(app, "item") + + self.selection = ListParameter(app, "selection", item) + self.add_parameter(self.selection) + + self.links = SelectionTableLinks(app, "links") + self.add_child(self.links) + + self.switches = SelectionTableSwitches(app, "switches") + self.add_child(self.switches) + + self.filters = SelectionTableFilters(app, "filters") + self.add_child(self.filters) + + self.buttons = SelectionTableButtons(app, "buttons") + self.add_child(self.buttons) + + col = self.Checkbox(app, "checkbox", self.table, self.selection) + self.table.add_column(col) + + col = self.Name(app, "name", self.table) + self.table.add_column(col) + + self.frame_path = None + + def init(self): + super(SelectionTable, self).init() + + assert self.frame_path, self + + # XXX this isn't what we do now + def do_get_data(self, session, sort, ascending, limit, offset): + return self.table.adapter.get_data(sort, ascending, limit, offset) + + def add_task(self, task): + link = TaskLink(self.app, task.__class__.__name__, task, None) + self.links.add_child(link) + + def add_selection_task(self, task): + name = task.__class__.__name__ + button = TaskButton(self.app, name, task, self.selection) + self.buttons.add_child(button) + + class Checkbox(NewCheckboxColumn): + def render_cell_value(self, session, record): + return record[self.table.adapter.id_field.index] + + class Name(LinkColumn): + def render_header_content(self, session): + return "Name" + + def render_cell_href(self, session, record): + branch = session.branch() + + path = self.table.parent.frame_path + id = record[self.table.adapter.id_field.index] + + frame = self.page.page_widgets_by_path[path] + + return frame.get_href(session, id) + + def render_cell_content(self, session, record): + return record[self.table.adapter.name_field.index] + + class SelectionDataTable(DataTable): + def do_get_data(self, session, sort, ascending, limit, offset): + return self.parent.do_get_data \ + (session, sort, ascending, limit, offset) + +class SelectionTableControl(WidgetSet): + def do_render(self, session): + if len(self.children): + return super(SelectionTableControl, self).do_render(session) + +class SelectionTableLinks(SelectionTableControl): + def render_title(self, session): + return "Links" + +class SelectionTableSwitches(SelectionTableControl): + def render_title(self, session): + return "Switches" + +class SelectionTableFilters(SelectionTableControl): + def render_title(self, session): + return "Filters" + +class SelectionTableButtons(SelectionTableControl): + def render_title(self, session): + return "Act on selection:" Added: mgmt/newdata/cumin/python/cumin/table.strings =================================================================== --- mgmt/newdata/cumin/python/cumin/table.strings (rev 0) +++ mgmt/newdata/cumin/python/cumin/table.strings 2010-03-22 14:58:08 UTC (rev 3871) @@ -0,0 +1,73 @@ +[SelectionTable.css] +div.SelectionTable div.switches ul, +div.SelectionTable div.filters ul, +div.SelectionTable div.buttons ul { + list-style: none; + display: inline; + padding: 0; + margin: 0; +} + +div.SelectionTable div.filters { + float: right; +} + +div.SelectionTable div.buttons ul li { + margin: 0 0.4em 0 0; + display: inline; +} + +div.SelectionTable form { + clear: both; +} + +[SelectionTable.html] +<div id="{id}" class="{class}"> + {links} + + {filters} + + {switches} + + <form method="post" action="?"> + {buttons} + + {table} + + <div>{hidden_inputs}</div> + </form> +</div> + +[SelectionTableControl.css] +div.SelectionTableControl { + padding: 0.35em 0.75em; +} + +div.SelectionTableControl ul { + list-style: none; + display: inline; + padding: 0; + margin: 0; +} + +[SelectionTableControl.html] +<div class="{class}"> + <span>{title}</span> + + <ul>{widgets}</ul> +</div> + +[SelectionTableButtons.css] +div.SelectionTableButtons { + background-color: #e7e7f7; +} + +div.SelectionTableButtons span { + font-size: 0.9em; + margin: 0 0.5em 0 0; +} + +div.SelectionTableButtons ul li { + margin: 0 0.4em 0 0; + display: inline; +} Modified: mgmt/newdata/cumin/python/cumin/tools.py =================================================================== --- mgmt/trunk/cumin/python/cumin/tools.py 2010-03-22 14:00:07 UTC (rev 3870) +++ mgmt/newdata/cumin/python/cumin/tools.py 2010-03-22 14:58:08 UTC (rev 3871) @@ -146,8 +146,13 @@ app.start() try: + server.start() + try: - server.start() # XXX fix the weird api here + while True: + print "Sleeping!" + + sleep(1) finally: server.stop() finally: Modified: mgmt/newdata/cumin/python/cumin/usergrid/widgets.py =================================================================== --- mgmt/trunk/cumin/python/cumin/usergrid/widgets.py 2010-03-22 14:00:07 UTC (rev 3870) +++ mgmt/newdata/cumin/python/cumin/usergrid/widgets.py 2010-03-22 14:58:08 UTC (rev 3871) @@ -29,6 +29,9 @@ self.set_default_frame(self.main) def render_title(self, session): + return self.get_title(session) + + def get_title(self, session): return "User Grid" class MainView(CuminMainView): Modified: mgmt/newdata/cumin/python/cumin/widgets.py =================================================================== --- mgmt/trunk/cumin/python/cumin/widgets.py 2010-03-22 14:00:07 UTC (rev 3870) +++ mgmt/newdata/cumin/python/cumin/widgets.py 2010-03-22 14:58:08 UTC (rev 3871) @@ -1,10 +1,10 @@ from datetime import datetime, timedelta from wooly import * from wooly.pages import * +from wooly.datatable import * from wooly.widgets import * from wooly.forms import * from wooly.sql import * -from wooly.tables import * from mint.schema import * from action import * @@ -19,6 +19,7 @@ from wooly import Session from wooly.widgets import Link +from wooly.tables import SqlTable strings = StringCatalog(__file__) @@ -73,17 +74,21 @@ return lsess.marshal() def render_tab_href(self, session, tab): - if tab.sticky_view: - try: - obj = session.client_session.attributes["sticky_%s" % tab.name] - return tab.sticky_view.frame.get_href(session, obj) - except KeyError: - pass + if hasattr(tab, "sticky_view"): + if tab.sticky_view: + try: + name = "sticky_%s" % tab.name + obj = session.client_session.attributes[name] + return tab.sticky_view.frame.get_href(session, obj) + except KeyError: + pass - branch = session.branch() - tab.mode.set(branch, None) - tab.show(branch) - return branch.marshal() + branch = session.branch() + tab.mode.set(branch, None) + tab.show(branch) + return branch.marshal() + else: + return super(CuminMainView, self).render_tab_href(session, tab) class CuminPageLinks(ItemSet): def __init__(self, app, name): @@ -135,13 +140,18 @@ def __init__(self, app, name): super(CuminFrame, self).__init__(app, name) - self.sticky_view = None self.object = None + self.__view = None self.__add = None self.__edit = None self.__remove = None + self.sticky_view = None + + def init(self): + super(CuminFrame, self).init() + def show_object(self, session, object): if self.object: self.object.set(session, object) @@ -151,12 +161,6 @@ return self - def get_args(self, session): - if self.object: - return (self.get_object(session),) - else: - return () - def get_object(self, session): if self.object: return self.object.get(session) @@ -188,6 +192,10 @@ if cls: return cls.get_object_title(session, obj) + # XXX + def get_title(self, session): + return self.render_title(session) + class CuminView(Widget): def __init__(self, app, name, object): super(CuminView, self).__init__(app, name) @@ -492,6 +500,8 @@ if cls: return xml_escape(cls.get_object_name(obj)) + elif obj: + return obj.get_title() def render_icon_href(self, session): obj = self.object.get(session) Modified: mgmt/newdata/cumin/resources/app.css =================================================================== --- mgmt/trunk/cumin/resources/app.css 2010-03-22 14:00:07 UTC (rev 3870) +++ mgmt/newdata/cumin/resources/app.css 2010-03-22 14:58:08 UTC (rev 3871) @@ -91,7 +91,7 @@ border-left: 1px solid #ddd; border-bottom: 1px solid #bbb; border-right: 1px solid #bbb; - padding: 0.25em 0.5em 0.30em 0.5em; + padding: 0.2em 0.4em; background: url(resource?name=button-background.png) repeat; color: #000; font-size: 0.9em; @@ -586,6 +586,35 @@ position: absolute; z-index: 1000; } + +table.DataTable.Cumin tr { + border-top: 1px dotted #ccc; +} + +table.DataTable.Cumin td, table.DataTable.Cumin th { + padding: 0.35em 0.5em; +} + +table.DataTable.Cumin th { + font-weight: normal; +} + +table.DataTable.Cumin thead, table.DataTable.Cumin tfoot { + background-color: #f7f7f7; +} + +table.DataTable.Cumin tfoot { + text-align: center; + font-style: italic; + font-size: 0.9em; +} + +a.TaskLink.Cumin:before { + content: "\00BB \0020"; + font-weight: bold; + color: #dc9f2e; +} + .autocomplete{ cursor: pointer; border: 1px solid #999; @@ -597,4 +626,3 @@ .autocomplete .normal{border-top: 1px solid #fefefe;} .autocomplete .selected{background: #ddf;} .autocomplete .highlited{font-weight: bold; color: #008;} - Modified: mgmt/newdata/mint/python/mint/database.py =================================================================== --- mgmt/trunk/mint/python/mint/database.py 2010-03-22 14:00:07 UTC (rev 3870) +++ mgmt/newdata/mint/python/mint/database.py 2010-03-22 14:58:08 UTC (rev 3871) @@ -83,6 +83,7 @@ paths.append(os.path.join(self.app.config.home, "sql", "schema.sql")) paths.append(os.path.join(self.app.config.home, "sql", "indexes.sql")) paths.append(os.path.join(self.app.config.home, "sql", "triggers.sql")) + paths.append(os.path.join(self.app.config.home, "sql", "rosemary.sql")) scripts = list() Modified: mgmt/newdata/mint/python/mint/demo.py =================================================================== --- mgmt/trunk/mint/python/mint/demo.py 2010-03-22 14:00:07 UTC (rev 3870) +++ mgmt/newdata/mint/python/mint/demo.py 2010-03-22 14:58:08 UTC (rev 3871) @@ -1,11 +1,33 @@ from mint import * class DemoData(object): + def __init__(self, app): + self.app = app + def load(self): - for name in ("Engineering", "Marketing", "Sales"): - group = BrokerGroup(name=name) - group.syncUpdate() + cls = self.app.model.rosemary.com_redhat_cumin.BrokerGroup + conn = self.app.database.get_connection() + cursor = conn.cursor() + + try: + for name in ("Engineering", "Marketing", "Sales"): + group = cls.create_object() + group.name = name + + # XXX ugh + group._qmf_agent_id = "cumin" + group._qmf_object_id = str(datetime.now()) + group._qmf_create_time = datetime.now() + group._qmf_update_time = datetime.now() + group._qmf_class_key = "cumin" + + group.save(cursor) + finally: + cursor.close() + conn.commit() + conn.close() + def main(): config = MintConfig() config.init() @@ -14,7 +36,7 @@ app.check() app.init() - data = DemoData() + data = DemoData(app) data.load() if __name__ == "__main__": Modified: mgmt/newdata/mint/python/mint/expire.py =================================================================== --- mgmt/trunk/mint/python/mint/expire.py 2010-03-22 14:00:07 UTC (rev 3870) +++ mgmt/newdata/mint/python/mint/expire.py 2010-03-22 14:58:08 UTC (rev 3871) @@ -1,3 +1,4 @@ +from newupdate import * from schema import * from sql import * from update import * @@ -34,7 +35,6 @@ log.debug("Expiring database records older than %d %s, every %d %s" \ % args) - def run(self): frequency = self.app.expire_frequency @@ -46,6 +46,9 @@ up = ExpireUpdate() self.app.update_thread.enqueue(up) + up = NewExpireUpdate(self.app.model) + self.app.new_update_thread.enqueue(up) + sleep(frequency) def __convertTimeUnits(self, t): @@ -84,3 +87,31 @@ log.debug("%i total records expired", total) stats.expired += 1 + +class NewExpireUpdate(NewUpdate): + def do_process(self, conn, stats): + seconds = self.model.app.expire_threshold + + log.info("Expiring stats older than %i seconds", seconds) + + count = 0 + + for pkg in self.model.rosemary._packages: + for cls in pkg._classes: + count += self.delete_stats(conn, cls, seconds) + + conn.commit() + + log.info("Expired %i stat records", count) + + def delete_stats(self, conn, cls, seconds): + cursor = conn.cursor() + + try: + cls.sql_stats_delete.execute(cursor, (), {"seconds": seconds}) + + log.debug("Deleted %i %s", cursor.rowcount, cls) + + return cursor.rowcount + finally: + cursor.close() Modified: mgmt/newdata/mint/python/mint/main.py =================================================================== --- mgmt/trunk/mint/python/mint/main.py 2010-03-22 14:00:07 UTC (rev 3870) +++ mgmt/newdata/mint/python/mint/main.py 2010-03-22 14:58:08 UTC (rev 3871) @@ -1,17 +1,12 @@ -import sys -import os -import logging - -from parsley.config import Config, ConfigParameter -from parsley.loggingex import enable_logging -from parsley.threadingex import Lifecycle - from database import MintDatabase from expire import ExpireThread from model import MintModel +from newupdate import NewUpdateThread from update import UpdateThread from vacuum import VacuumThread +from util import * + log = logging.getLogger("mint.main") class Mint(Lifecycle): @@ -24,6 +19,7 @@ self.update_enabled = True self.update_thread = UpdateThread(self) + self.new_update_thread = NewUpdateThread(self) self.expire_enabled = True self.expire_frequency = self.config.expire_frequency @@ -48,6 +44,7 @@ log.info("Expiration is %s", state(self.expire_enabled)) self.update_thread.init() + self.new_update_thread.init() self.expire_thread.init() self.vacuum_thread.init() @@ -55,7 +52,8 @@ self.model.start() if self.update_enabled: - self.update_thread.start() + # XXX self.update_thread.start() + self.new_update_thread.start() if self.expire_enabled: self.expire_thread.start() @@ -68,6 +66,7 @@ if self.update_enabled: self.update_thread.stop() + self.new_update_thread.stop() if self.expire_enabled: self.expire_thread.stop() Modified: mgmt/newdata/mint/python/mint/model.py =================================================================== --- mgmt/trunk/mint/python/mint/model.py 2010-03-22 14:00:07 UTC (rev 3870) +++ mgmt/newdata/mint/python/mint/model.py 2010-03-22 14:58:08 UTC (rev 3871) @@ -1,12 +1,12 @@ -from parsley.collectionsex import defaultdict -from parsley.threadingex import Lifecycle +from rosemary.model import * from sqlobject import * -from mint.cache import MintCache -from mint.schema import * -from mint.schemalocal import * -from mint.update import * -from mint.util import * +from cache import MintCache +from newupdate import * +from schema import * +from schemalocal import * +from update import * +from util import * import mint.schema @@ -17,12 +17,12 @@ class MintModel(Lifecycle): def __init__(self, app): self.log = log + self.app = app assert mint.schema.model is None mint.schema.model = self - self.app = app - + self.rosemary = RosemaryModel() self.qmf_session = None self.qmf_brokers = list() @@ -44,6 +44,9 @@ manageConnections=True, rcvObjects=self.app.update_enabled) + self.rosemary.load_xml_dir(os.path.join(self.app.config.home, "xml")) + self.rosemary.init() + def do_start(self): # Clean up any transient objects that a previous instance may # have left behind in the DB; it's basically an unconstrained @@ -72,18 +75,21 @@ self.lock.release() class MintAgent(object): - def __init__(self, model, agent): + def __init__(self, model, qmf_agent): self.model = model - self.agent = agent + self.qmf_agent = qmf_agent - self.id = str(QmfAgentId.fromAgent(agent)) + self.id = str(QmfAgentId.fromAgent(self.qmf_agent)) self.last_heartbeat = None # qmfObjectId => int database id self.database_ids = MintCache() + self.objects_by_id = dict() + # qmfObjectId => list of ModelUpdate objects + # XXX we're no longer using this; remove it self.deferred_updates = defaultdict(list) self.model.lock.acquire() @@ -93,16 +99,18 @@ finally: self.model.lock.release() - def call_method(self, object, name, callback, args): - classKey = ClassKey(object.qmfClassKey) - objectId = QmfObjectId.fromString(object.qmfObjectId).toObjectId() + def call_method(self, obj, name, callback, args): + assert isinstance(obj, RosemaryObject) + + class_key = ClassKey(obj._qmf_class_key) + oid = QmfObjectId.fromString(obj._qmf_object_id).toObjectId() self.model.lock.acquire() try: - broker = self.agent.getBroker() + broker = self.qmf_agent.getBroker() seq = self.model.qmf_session._sendMethodRequest \ - (broker, classKey, objectId, name, args) + (broker, class_key, oid, name, args) if seq is not None: self.model.outstanding_method_calls[seq] = callback @@ -147,8 +155,8 @@ log.info("Creating %s", qagent) # Some agents come down without a brokerId, meaning we can't - # generate a fully qualified agent ID for them. Those we handle - # in brokerInfo. + # generate a fully qualified agent ID for them. Those we + # handle in brokerInfo. if qagent.getBroker().brokerId: agent = MintAgent(self.model, qagent) @@ -182,7 +190,11 @@ id = str(QmfAgentId.fromAgent(qagent)) - agent = self.model.agents[id] + try: + agent = self.model.agents[id] + except KeyError: + return + agent.last_heartbeat = datetime.fromtimestamp(timestamp) def newPackage(self, name): @@ -191,9 +203,15 @@ def newClass(self, kind, classKey): log.info("New class %s", classKey) + # XXX I want to store class keys using this, but I can't, + # because I don't get any agent info; instead + def objectProps(self, broker, object): - if not self.model.app.update_thread.isAlive(): - return + self.model.lock.acquire() + try: + pass + finally: + self.model.lock.release() self.model.lock.acquire() try: @@ -207,15 +225,19 @@ finally: self.model.lock.release() - up = PropertyUpdate(agent, object) - self.model.app.update_thread.enqueue(up) + if self.model.app.update_thread.isAlive(): + up = PropertyUpdate(agent, object) + self.model.app.update_thread.enqueue(up) - def objectStats(self, broker, object): - """ Invoked when an object is updated. """ + if self.model.app.new_update_thread.isAlive(): + if object.getTimestamps()[2]: + up = NewObjectDelete(self.model, agent, object) + else: + up = NewObjectUpdate(self.model, agent, object) - if not self.model.app.update_thread.isAlive(): - return + self.model.app.new_update_thread.enqueue(up) + def objectStats(self, broker, object): self.model.lock.acquire() try: id = str(QmfAgentId.fromObject(object)) @@ -228,9 +250,14 @@ finally: self.model.lock.release() - up = StatisticUpdate(agent, object) - self.model.app.update_thread.enqueue(up) + if self.model.app.update_thread.isAlive(): + up = StatisticUpdate(agent, object) + self.model.app.update_thread.enqueue(up) + if self.model.app.new_update_thread.isAlive(): + up = NewStatsUpdate(self.model, agent, object) + self.model.app.new_update_thread.enqueue(up) + def event(self, broker, event): """ Invoked when an event is raised. """ pass Added: mgmt/newdata/mint/python/mint/newupdate.py =================================================================== --- mgmt/newdata/mint/python/mint/newupdate.py (rev 0) +++ mgmt/newdata/mint/python/mint/newupdate.py 2010-03-22 14:58:08 UTC (rev 3871) @@ -0,0 +1,369 @@ +import pickle + +from psycopg2 import IntegrityError, TimestampFromTicks +from rosemary.model import * +from util import * + +log = logging.getLogger("mint.newupdate") + +class NewUpdateThread(MintDaemonThread): + def __init__(self, app): + super(NewUpdateThread, self).__init__(app) + + self.conn = None + self.stats = None + + self.updates = ConcurrentQueue() + + self.halt_on_error = True + + def init(self): + self.conn = self.app.database.get_connection() + self.stats = NewUpdateStats() + + def enqueue(self, update): + update.thread = self + + self.updates.put(update) + + if self.stats: + self.stats.enqueued += 1 + + # This is an attempt to yield from the enqueueing thread (this + # method's caller) to the update thread + + if self.updates.qsize() > 1000: + sleep(0.1) + + def run(self): + while True: + if self.stop_requested: + break + + try: + update = self.updates.get(True, 1) + except Empty: + continue + + if self.stats: + self.stats.dequeued += 1 + + update.process(self.conn, self.stats) + +class NewUpdateStats(object): + def __init__(self): + self.enqueued = 0 + self.dequeued = 0 + + self.updated = 0 + self.deleted = 0 + self.dropped = 0 + + self.stats_updated = 0 + self.stats_expired = 0 + self.stats_dropped = 0 + +class NewUpdate(object): + def __init__(self, model): + self.model = model + + def process(self, conn, stats): + log.debug("Processing %s", self) + + try: + self.do_process(conn, stats) + + conn.commit() + except UpdateException, e: + log.info("Update could not be completed; %s", e) + + conn.rollback() + except: + log.exception("Update failed") + + conn.rollback() + + if self.model.app.new_update_thread.halt_on_error: + raise + + def do_process(self, conn, stats): + raise Exception("Not implemented") + + def __repr__(self): + return self.__class__.__name__ + +class NewObjectUpdate(NewUpdate): + def __init__(self, model, agent, object): + super(NewObjectUpdate, self).__init__(model) + + self.agent = agent + self.object = object + self.object_id = str(QmfObjectId.fromObject(object)) + self.session_id = None + + sequence = object.getObjectId().getSequence() + + if sequence != 0: + self.session_id = str(sequence) + + update_time, create_time, delete_time = self.object.getTimestamps() + + self.update_time = datetime.fromtimestamp(update_time / 1000000000) + self.create_time = datetime.fromtimestamp(create_time / 1000000000) + self.delete_time = datetime.fromtimestamp(delete_time / 1000000000) + + def do_process(self, conn, stats): + cls = self.get_class() + obj = self.get_object(cls, self.object_id) + + columns = list() + + update_time, create_time, delete_time = self.object.getTimestamps() + + if obj._id: + # This object is already in the database + + obj._qmf_update_time = self.update_time + columns.append(cls.sql_table._qmf_update_time) + + # XXX session_id may have changed too? + else: + obj._qmf_agent_id = self.agent.id + obj._qmf_object_id = self.object_id + obj._qmf_session_id = self.session_id + obj._qmf_class_key = str(self.object.getClassKey()) + obj._qmf_update_time = self.update_time + obj._qmf_create_time = self.create_time + + columns.append(cls.sql_table._qmf_agent_id) + columns.append(cls.sql_table._qmf_object_id) + columns.append(cls.sql_table._qmf_session_id) + columns.append(cls.sql_table._qmf_class_key) + columns.append(cls.sql_table._qmf_update_time) + columns.append(cls.sql_table._qmf_create_time) + + self.process_references(obj, columns) + self.process_properties(obj, columns) + + cursor = conn.cursor() + + try: + obj.save(cursor, columns) + finally: + cursor.close() + + stats.updated += 1 + + def get_class(self): + class_key = self.object.getClassKey() + + name = class_key.getPackageName() + + try: + pkg = self.model.rosemary._packages_by_name[name] + except KeyError: + raise PackageUnknown(name) + + name = class_key.getClassName() + name = name[0].upper() + name[1:] + + try: + cls = pkg._classes_by_name[name] + except KeyError: + raise ClassUnknown(name) + + return cls + + def get_object(self, cls, object_id): + try: + return self.agent.objects_by_id[object_id] + except KeyError: + obj = cls.create_object() + obj._qmf_agent_id = self.agent.id + obj._qmf_object_id = object_id + + conn = self.model.app.database.get_connection() + cursor = conn.cursor() + + try: + try: + cls.load_object(cursor, obj) + except RosemaryNotFound: + pass + finally: + cursor.close() + + self.agent.objects_by_id[object_id] = obj + + return obj + + def process_references(self, obj, columns): + for prop, value in self.object.getProperties(): + if prop.type != 10: + continue + + try: + ref = obj._class._references_by_name[prop.name] + except KeyError: + log.debug("Reference %s is unknown", prop.name) + + continue + + if not ref.sql_column: + log.warn("Reference %s has no column; skipping it", ref.name) + + continue + + col = ref.sql_column + + if value: + that_id = str(QmfObjectId(value.first, value.second)) + that = self.get_object(ref.that_cls, that_id) + + if not that._id: + continue + + value = that._id + + columns.append(col) + + setattr(obj, col.name, value) + + def process_properties(self, obj, columns): + for prop, value in self.object.getProperties(): + if prop.type == 10: + continue + + try: + col = obj._class._properties_by_name[prop.name].sql_column + except KeyError: + log.debug("Property %s is unknown", prop) + + continue + + if value is not None: + value = self.transform_value(prop, value) + + # XXX This optimization will be obsolete when QMF does it + # instead + + if value == getattr(obj, col.name): + continue + + columns.append(col) + + setattr(obj, col.name, value) + + def transform_value(self, attr, value): + if attr.type == 8: # absTime + if value == 0: + value = None + else: + value = datetime.fromtimestamp(value / 1000000000) + # XXX value = TimestampFromTicks(value / 1000000000) + elif attr.type == 15: # map + value = pickle.dumps(value) + elif attr.type == 10: # objId + value = str(value) + elif attr.type == 14: # uuid + value = str(value) + + return value + + def __repr__(self): + name = self.__class__.__name__ + cls = self.object.getClassKey().getClassName() + + return "%s(%s,%s,%s)" % (name, self.agent.id, cls, self.object_id) + +class NewObjectDelete(NewObjectUpdate): + def do_process(self, conn, stats): + cls = self.get_class() + obj = self.get_object(cls, self.object_id) + + cursor = conn.cursor() + + try: + cls.sql_delete.execute(cursor, (), obj.__dict__) + finally: + cursor.close() + + try: + del self.agent.objects_by_id[self.object_id] + except KeyError: + pass + + stats.deleted += 1 + +class NewStatsUpdate(NewObjectUpdate): + def do_process(self, conn, stats): + cls = self.get_class() + obj = self.get_object(cls, self.object_id) + + if not cls._statistics: + stats.stats_dropped += 1; return + + if not obj._id: + stats.stats_dropped += 1; return + + if stats.enqueued - stats.dequeued > 100: + if obj._qmf_update_time > datetime.now() - timedelta(seconds=60): + stats.stats_dropped += 1; return + + update_columns = list() + update_columns.append(cls.sql_table._qmf_update_time) + + insert_columns = list() + insert_columns.append(cls.sql_table._qmf_update_time) + + obj._qmf_update_time = self.update_time + + self.process_statistics(obj, update_columns, insert_columns) + + cursor = conn.cursor() + + try: + cls.sql_update.execute(cursor, update_columns, obj.__dict__) + cls.sql_stats_insert.execute(cursor, insert_columns, obj.__dict__) + finally: + cursor.close() + + stats.stats_updated += 1 + + def process_statistics(self, obj, update_columns, insert_columns): + for stat, value in self.object.getStatistics(): + try: + col = obj._class._statistics_by_name[stat.name].sql_column + except KeyError: + log.debug("Statistic %s is unknown", stat) + + continue + + if value is not None: + value = self.transform_value(stat, value) + + # XXX This optimization will be obsolete when QMF does it + # instead + + if value != getattr(obj, col.name): + update_columns.append(col) + + insert_columns.append(col) + + setattr(obj, col.name, value) + +class UpdateException(Exception): + def __init__(self, name): + self.name = name + + def __str__(self): + return "%s(%s)" % (self.__class__.__name__, self.name) + +class PackageUnknown(UpdateException): + pass + +class ClassUnknown(UpdateException): + pass + +class ObjectUnknown(UpdateException): + pass Modified: mgmt/newdata/mint/python/mint/sql.py =================================================================== --- mgmt/trunk/mint/python/mint/sql.py 2010-03-22 14:00:07 UTC (rev 3870) +++ mgmt/newdata/mint/python/mint/sql.py 2010-03-22 14:58:08 UTC (rev 3871) @@ -60,7 +60,7 @@ if values: for item in values.items(): - log.warn(" %-20s %r", *item) + log.warn(" %-20s %r", *item) raise Modified: mgmt/newdata/mint/python/mint/tools.py =================================================================== --- mgmt/trunk/mint/python/mint/tools.py 2010-03-22 14:00:07 UTC (rev 3870) +++ mgmt/newdata/mint/python/mint/tools.py 2010-03-22 14:58:08 UTC (rev 3871) @@ -72,6 +72,7 @@ if self.config.debug: self.config.prt() + enable_logging("rosemary", "debug", sys.stderr) enable_logging("mint", "debug", sys.stderr) self.do_run(opts, args) @@ -439,10 +440,10 @@ app.init() app.start() - head = "%6s %6s %6s %6s %6s %6s %6s %6s" % \ - ("enqs", "deqs", "depth", "drop", "defer", - "prop", "stat", "exp") - row = "%6i %6i %6i %6i %6i %6i %6i %6i" + head = "%8s %8s %8s %8s %8s %8s %8s %8s %8s" % \ + ("enqs", "deqs", "depth", "update", "delete", "drop", + "s.update", "s.expire", "s.drop") + row = "%8i %8i %8i %8i %8i %8i %8i %8i %8i" try: for arg in args[1:]: @@ -454,13 +455,15 @@ try: enq_last = 0 deq_last = 0 + + upd_last = 0 + dlt_last = 0 drp_last = 0 - dfr_last = 0 - prop_last = 0 - stat_last = 0 - meth_last = 0 - exp_last = 0 + supd_last = 0 + sexp_last = 0 + sdrp_last = 0 + samples = 0 while True: @@ -471,45 +474,51 @@ sleep(1) - stats = app.update_thread.stats + stats = app.new_update_thread.stats enq = stats.enqueued deq = stats.dequeued + + upd = stats.updated + dlt = stats.deleted drp = stats.dropped - dfr = stats.deferred - prop = stats.prop_updated - stat = stats.stat_updated - exp = stats.expired + supd = stats.stats_updated + sexp = stats.stats_expired + sdrp = stats.stats_dropped print row % (enq - enq_last, deq - deq_last, enq - deq, + upd - upd_last, + dlt - dlt_last, drp - drp_last, - dfr - dfr_last, - prop - prop_last, - stat - stat_last, - exp - exp_last) + supd - supd_last, + sexp - sexp_last, + sdrp - sdrp_last) enq_last = enq deq_last = deq + + upd_last = upd + dlt_last = dlt drp_last = drp - dfr_last = dfr - prop_last = prop - stat_last = stat - exp_last = exp + supd_last = supd + sexp_last = sexp + sdrp_last = sdrp finally: print "Totals:" print row % (enq, deq, enq - deq, + upd, + dlt, drp, - dfr, - prop, - stat, - exp) + supd, + sexp, + sdrp) finally: #from threading import enumerate #for item in enumerate(): Modified: mgmt/newdata/mint/python/mint/update.py =================================================================== --- mgmt/trunk/mint/python/mint/update.py 2010-03-22 14:00:07 UTC (rev 3870) +++ mgmt/newdata/mint/python/mint/update.py 2010-03-22 14:58:08 UTC (rev 3871) @@ -87,6 +87,9 @@ try: self.do_process(conn, stats) + for notice in conn.notices: + log.debug("Database: %s", notice) + conn.commit() except: log.exception("Update failed") @@ -362,44 +365,3 @@ op = SqlAgentDisconnect(self.agent) op.execute(cursor, args) - -class UpdateQueue(ConcurrentQueue): - def __init__(self, maxsize=0, slotCount=1): - self.slotCount = slotCount - ConcurrentQueue.__init__(self, maxsize) - - def _init(self, maxsize): - self.maxsize = maxsize - self.slots = [] - - for i in range(self.slotCount): - self.slots.append(deque()) - - def _qsize(self): - size = 0 - - for i in range(self.slotCount): - size += len(self.slots[i]) - - return size - - def _empty(self): - return self._qsize() == 0 - - def _full(self): - return self.maxsize > 0 and self._qsize() == self.maxsize - - def _put(self, update): - slot = update.priority - - if slot in range(self.slotCount): - self.slots[slot].append(update) - else: - raise ValueError("Invalid priority slot") - - def _get(self): - for slot in range(self.slotCount): - if len(self.slots[slot]) > 0: - return self.slots[slot].popleft() - - return None Modified: mgmt/newdata/mint/python/mint/util.py =================================================================== --- mgmt/trunk/mint/python/mint/util.py 2010-03-22 14:00:07 UTC (rev 3870) +++ mgmt/newdata/mint/python/mint/util.py 2010-03-22 14:58:08 UTC (rev 3871) @@ -1,5 +1,6 @@ import logging import os +import random import sys from Queue import Queue as ConcurrentQueue, Full, Empty @@ -12,6 +13,11 @@ from time import clock, sleep from traceback import print_exc +from parsley.collectionsex import * +from parsley.config import * +from parsley.loggingex import * +from parsley.threadingex import * + log = logging.getLogger("mint.util") class MintDaemonThread(Thread): @@ -113,6 +119,47 @@ def __str__(self): return "%i.%i" % (self.first, self.second) +class UpdateQueue(ConcurrentQueue): + def __init__(self, maxsize=0, slotCount=1): + self.slotCount = slotCount + ConcurrentQueue.__init__(self, maxsize) + + def _init(self, maxsize): + self.maxsize = maxsize + self.slots = [] + + for i in range(self.slotCount): + self.slots.append(deque()) + + def _qsize(self): + size = 0 + + for i in range(self.slotCount): + size += len(self.slots[i]) + + return size + + def _empty(self): + return self._qsize() == 0 + + def _full(self): + return self.maxsize > 0 and self._qsize() == self.maxsize + + def _put(self, update): + slot = update.priority + + if slot in range(self.slotCount): + self.slots[slot].append(update) + else: + raise ValueError("Invalid priority slot") + + def _get(self): + for slot in range(self.slotCount): + if len(self.slots[slot]) > 0: + return self.slots[slot].popleft() + + return None + password_chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz" def crypt_password(password, salt=None): Modified: mgmt/newdata/mint/python/mint/vacuum.py =================================================================== --- mgmt/trunk/mint/python/mint/vacuum.py 2010-03-22 14:00:07 UTC (rev 3870) +++ mgmt/newdata/mint/python/mint/vacuum.py 2010-03-22 14:58:08 UTC (rev 3871) @@ -1,3 +1,4 @@ +from newupdate import * from update import * from util import * @@ -4,26 +5,56 @@ log = logging.getLogger("mint.vacuum") class VacuumThread(MintDaemonThread): - def run(self): - while True: - if self.stop_requested: - break + def run(self): + while True: + if self.stop_requested: + break - up = VacuumUpdate() - self.app.update_thread.enqueue(up) + up = VacuumUpdate() + self.app.update_thread.enqueue(up) - sleep(60 * 10) + up = NewVacuumUpdate(self.app.model) + self.app.new_update_thread.enqueue(up) + sleep(60 * 60 * 10) + class VacuumUpdate(Update): - def do_process(self, conn, stats): - log.info("Vacuuming") + def do_process(self, conn, stats): + log.info("Vacuuming") - conn.commit() + conn.commit() - level = conn.isolation_level - conn.set_isolation_level(0) + level = conn.isolation_level + conn.set_isolation_level(0) - cursor = conn.cursor() - cursor.execute("vacuum") + cursor = conn.cursor() + cursor.execute("vacuum") - conn.set_isolation_level(level) + conn.set_isolation_level(level) + +class NewVacuumUpdate(NewUpdate): + def do_process(self, conn, stats): + log.info("Vacumming tables") + + level = conn.isolation_level + conn.set_isolation_level(0) + + for pkg in self.model.rosemary._packages: + for cls in pkg._classes: + self.vacuum(conn, cls) + + conn.set_isolation_level(level) + + log.info("Vacuumed tables") + + def vacuum(self, conn, cls): + cursor = conn.cursor() + + try: + cursor.execute("vacuum verbose %s" % cls.sql_table.identifier) + + for notice in conn.notices: + log.debug("Database: %s", notice.replace("\n", " ")) + finally: + cursor.close() + Modified: mgmt/newdata/mint/sql/Makefile =================================================================== --- mgmt/trunk/mint/sql/Makefile 2010-03-22 14:00:07 UTC (rev 3870) +++ mgmt/newdata/mint/sql/Makefile 2010-03-22 14:58:08 UTC (rev 3871) @@ -2,10 +2,13 @@ dsn := "postgresql://localhost/" -schema: schema.sql +schema: schema.sql rosemary.sql schema.sql: ../python/mint/*.py sqlobject-admin sql -m mint.schema -m mint.schemalocal -c ${dsn} | sed -e '1,2d' > schema.sql +rosemary.sql: + rosemary-test ddl > rosemary.sql + clean: - rm -f schema.sql + rm -f schema.sql rosemary.sql Added: mgmt/newdata/mint/sql/rosemary.sql =================================================================== --- mgmt/newdata/mint/sql/rosemary.sql (rev 0) +++ mgmt/newdata/mint/sql/rosemary.sql 2010-03-22 14:58:08 UTC (rev 3871) @@ -0,0 +1,1150 @@ +drop schema "org.apache.qpid.cluster" cascade; +drop schema "org.apache.qpid.broker" cascade; +drop schema "com.redhat.sesame" cascade; +drop schema "org.apache.qpid.acl" cascade; +drop schema "com.redhat.cumin" cascade; +drop schema "com.redhat.rhm.store" cascade; +drop schema "mrg.grid" cascade; +create schema "org.apache.qpid.cluster" + create table "Cluster" ( + "_id" serial8 not null, + "_qmf_agent_id" text not null, + "_qmf_object_id" text not null, + "_qmf_session_id" text, + "_qmf_class_key" text not null, + "_qmf_create_time" timestamp not null, + "_qmf_update_time" timestamp not null, + "_qmf_delete_time" timestamp, + "_brokerRef_id" int8, + "clusterName" text not null, + "clusterID" text not null, + "memberID" text not null, + "publishedURL" text not null, + "clusterSize" int4 not null, + "status" text not null, + "members" text not null, + "memberIDs" text not null, + constraint "Cluster_pk" primary key ("_id"), + constraint "Cluster_qmf_ids_uq" unique ("_qmf_agent_id", "_qmf_object_id") + ) + create table "Cluster_stats" ( + "_id" serial8 not null, + "_parent_id" int8 not null, + "_qmf_update_time" timestamp not null, + constraint "Cluster_stats_pk" primary key ("_id") + ) + ; +create schema "org.apache.qpid.broker" + create table "System" ( + "_id" serial8 not null, + "_qmf_agent_id" text not null, + "_qmf_object_id" text not null, + "_qmf_session_id" text, + "_qmf_class_key" text not null, + "_qmf_create_time" timestamp not null, + "_qmf_update_time" timestamp not null, + "_qmf_delete_time" timestamp, + "systemId" text not null, + "osName" text not null, + "nodeName" text not null, + "release" text not null, + "version" text not null, + "machine" text not null, + constraint "System_pk" primary key ("_id"), + constraint "System_qmf_ids_uq" unique ("_qmf_agent_id", "_qmf_object_id") + ) + create table "System_stats" ( + "_id" serial8 not null, + "_parent_id" int8 not null, + "_qmf_update_time" timestamp not null, + constraint "System_stats_pk" primary key ("_id") + ) + create table "Broker" ( + "_id" serial8 not null, + "_qmf_agent_id" text not null, + "_qmf_object_id" text not null, + "_qmf_session_id" text, + "_qmf_class_key" text not null, + "_qmf_create_time" timestamp not null, + "_qmf_update_time" timestamp not null, + "_qmf_delete_time" timestamp, + "_systemRef_id" int8, + "port" int4 not null, + "workerThreads" int4 not null, + "maxConns" int4 not null, + "connBacklog" int4 not null, + "stagingThreshold" int8 not null, + "mgmtPubInterval" int4 not null, + "version" text not null, + "dataDir" text, + "uptime" numeric(19), + constraint "Broker_pk" primary key ("_id"), + constraint "Broker_qmf_ids_uq" unique ("_qmf_agent_id", "_qmf_object_id") + ) + create table "Broker_stats" ( + "_id" serial8 not null, + "_parent_id" int8 not null, + "_qmf_update_time" timestamp not null, + "uptime" numeric(19) not null, + constraint "Broker_stats_pk" primary key ("_id") + ) + create table "Agent" ( + "_id" serial8 not null, + "_qmf_agent_id" text not null, + "_qmf_object_id" text not null, + "_qmf_session_id" text, + "_qmf_class_key" text not null, + "_qmf_create_time" timestamp not null, + "_qmf_update_time" timestamp not null, + "_qmf_delete_time" timestamp, + "_connectionRef_id" int8, + "_registeredTo_id" int8, + "label" text not null, + "systemId" text not null, + "brokerBank" int8 not null, + "agentBank" int8 not null, + constraint "Agent_pk" primary key ("_id"), + constraint "Agent_qmf_ids_uq" unique ("_qmf_agent_id", "_qmf_object_id") + ) + create table "Agent_stats" ( + "_id" serial8 not null, + "_parent_id" int8 not null, + "_qmf_update_time" timestamp not null, + constraint "Agent_stats_pk" primary key ("_id") + ) + create table "Vhost" ( + "_id" serial8 not null, + "_qmf_agent_id" text not null, + "_qmf_object_id" text not null, + "_qmf_session_id" text, + "_qmf_class_key" text not null, + "_qmf_create_time" timestamp not null, + "_qmf_update_time" timestamp not null, + "_qmf_delete_time" timestamp, + "_brokerRef_id" int8, + "name" text not null, + "federationTag" text not null, + constraint "Vhost_pk" primary key ("_id"), + constraint "Vhost_qmf_ids_uq" unique ("_qmf_agent_id", "_qmf_object_id") + ) + create table "Vhost_stats" ( + "_id" serial8 not null, + "_parent_id" int8 not null, + "_qmf_update_time" timestamp not null, + constraint "Vhost_stats_pk" primary key ("_id") + ) + create table "Queue" ( + "_id" serial8 not null, + "_qmf_agent_id" text not null, + "_qmf_object_id" text not null, + "_qmf_session_id" text, + "_qmf_class_key" text not null, + "_qmf_create_time" timestamp not null, + "_qmf_update_time" timestamp not null, + "_qmf_delete_time" timestamp, + "_vhostRef_id" int8, + "_altExchange_id" int8, + "name" text not null, + "durable" bool not null, + "autoDelete" bool not null, + "exclusive" bool not null, + "arguments" text not null, + "msgTotalEnqueues" numeric(19), + "msgTotalDequeues" numeric(19), + "msgTxnEnqueues" numeric(19), + "msgTxnDequeues" numeric(19), + "msgPersistEnqueues" numeric(19), + "msgPersistDequeues" numeric(19), + "msgDepth" int8, + "byteDepth" int8, + "byteTotalEnqueues" numeric(19), + "byteTotalDequeues" numeric(19), + "byteTxnEnqueues" numeric(19), + "byteTxnDequeues" numeric(19), + "bytePersistEnqueues" numeric(19), + "bytePersistDequeues" numeric(19), + "consumerCount" int8, + "bindingCount" int8, + "unackedMessages" int8, + "messageLatency" numeric(19), + constraint "Queue_pk" primary key ("_id"), + constraint "Queue_qmf_ids_uq" unique ("_qmf_agent_id", "_qmf_object_id") + ) + create table "Queue_stats" ( + "_id" serial8 not null, + "_parent_id" int8 not null, + "_qmf_update_time" timestamp not null, + "msgTotalEnqueues" numeric(19) not null, + "msgTotalDequeues" numeric(19) not null, + "msgTxnEnqueues" numeric(19) not null, + "msgTxnDequeues" numeric(19) not null, + "msgPersistEnqueues" numeric(19) not null, + "msgPersistDequeues" numeric(19) not null, + "msgDepth" int8 not null, + "byteDepth" int8 not null, + "byteTotalEnqueues" numeric(19) not null, + "byteTotalDequeues" numeric(19) not null, + "byteTxnEnqueues" numeric(19) not null, + "byteTxnDequeues" numeric(19) not null, + "bytePersistEnqueues" numeric(19) not null, + "bytePersistDequeues" numeric(19) not null, + "consumerCount" int8 not null, + "bindingCount" int8 not null, + "unackedMessages" int8 not null, + "messageLatency" numeric(19), + constraint "Queue_stats_pk" primary key ("_id") + ) + create table "Exchange" ( + "_id" serial8 not null, + "_qmf_agent_id" text not null, + "_qmf_object_id" text not null, + "_qmf_session_id" text, + "_qmf_class_key" text not null, + "_qmf_create_time" timestamp not null, + "_qmf_update_time" timestamp not null, + "_qmf_delete_time" timestamp, + "_vhostRef_id" int8, + "_altExchange_id" int8, + "name" text not null, + "type" text not null, + "durable" bool not null, + "autoDelete" bool not null, + "arguments" text not null, + "producerCount" int8, + "bindingCount" int8, + "msgReceives" numeric(19), + "msgDrops" numeric(19), + "msgRoutes" numeric(19), + "byteReceives" numeric(19), + "byteDrops" numeric(19), + "byteRoutes" numeric(19), + constraint "Exchange_pk" primary key ("_id"), + constraint "Exchange_qmf_ids_uq" unique ("_qmf_agent_id", "_qmf_object_id") + ) + create table "Exchange_stats" ( + "_id" serial8 not null, + "_parent_id" int8 not null, + "_qmf_update_time" timestamp not null, + "producerCount" int8 not null, + "bindingCount" int8 not null, + "msgReceives" numeric(19) not null, + "msgDrops" numeric(19) not null, + "msgRoutes" numeric(19) not null, + "byteReceives" numeric(19) not null, + "byteDrops" numeric(19) not null, + "byteRoutes" numeric(19) not null, + constraint "Exchange_stats_pk" primary key ("_id") + ) + create table "Binding" ( + "_id" serial8 not null, + "_qmf_agent_id" text not null, + "_qmf_object_id" text not null, + "_qmf_session_id" text, + "_qmf_class_key" text not null, + "_qmf_create_time" timestamp not null, + "_qmf_update_time" timestamp not null, + "_qmf_delete_time" timestamp, + "_exchangeRef_id" int8, + "_queueRef_id" int8, + "bindingKey" text not null, + "arguments" text not null, + "origin" text, + "msgMatched" numeric(19), + constraint "Binding_pk" primary key ("_id"), + constraint "Binding_qmf_ids_uq" unique ("_qmf_agent_id", "_qmf_object_id") + ) + create table "Binding_stats" ( + "_id" serial8 not null, + "_parent_id" int8 not null, + "_qmf_update_time" timestamp not null, + "msgMatched" numeric(19) not null, + constraint "Binding_stats_pk" primary key ("_id") + ) + create table "Subscription" ( + "_id" serial8 not null, + "_qmf_agent_id" text not null, + "_qmf_object_id" text not null, + "_qmf_session_id" text, + "_qmf_class_key" text not null, + "_qmf_create_time" timestamp not null, + "_qmf_update_time" timestamp not null, + "_qmf_delete_time" timestamp, + "_sessionRef_id" int8, + "_queueRef_id" int8, + "name" text not null, + "browsing" bool not null, + "acknowledged" bool not null, + "exclusive" bool not null, + "creditMode" text not null, + "arguments" text not null, + "delivered" numeric(19), + constraint "Subscription_pk" primary key ("_id"), + constraint "Subscription_qmf_ids_uq" unique ("_qmf_agent_id", "_qmf_object_id") + ) + create table "Subscription_stats" ( + "_id" serial8 not null, + "_parent_id" int8 not null, + "_qmf_update_time" timestamp not null, + "delivered" numeric(19) not null, + constraint "Subscription_stats_pk" primary key ("_id") + ) + create table "Connection" ( + "_id" serial8 not null, + "_qmf_agent_id" text not null, + "_qmf_object_id" text not null, + "_qmf_session_id" text, + "_qmf_class_key" text not null, + "_qmf_create_time" timestamp not null, + "_qmf_update_time" timestamp not null, + "_qmf_delete_time" timestamp, + "_vhostRef_id" int8, + "address" text not null, + "incoming" bool not null, + "SystemConnection" bool not null, + "federationLink" bool not null, + "authIdentity" text not null, + "remoteProcessName" text, + "remotePid" int8, + "remoteParentPid" int8, + "shadow" bool not null, + "closing" bool, + "framesFromClient" numeric(19), + "framesToClient" numeric(19), + "bytesFromClient" numeric(19), + "bytesToClient" numeric(19), + constraint "Connection_pk" primary key ("_id"), + constraint "Connection_qmf_ids_uq" unique ("_qmf_agent_id", "_qmf_object_id") + ) + create table "Connection_stats" ( + "_id" serial8 not null, + "_parent_id" int8 not null, + "_qmf_update_time" timestamp not null, + "closing" bool not null, + "framesFromClient" numeric(19) not null, + "framesToClient" numeric(19) not null, + "bytesFromClient" numeric(19) not null, + "bytesToClient" numeric(19) not null, + constraint "Connection_stats_pk" primary key ("_id") + ) + create table "Link" ( + "_id" serial8 not null, + "_qmf_agent_id" text not null, + "_qmf_object_id" text not null, + "_qmf_session_id" text, + "_qmf_class_key" text not null, + "_qmf_create_time" timestamp not null, + "_qmf_update_time" timestamp not null, + "_qmf_delete_time" timestamp, + "_vhostRef_id" int8, + "host" text not null, + "port" int4 not null, + "transport" text not null, + "durable" bool not null, + "state" text, + "lastError" text, + constraint "Link_pk" primary key ("_id"), + constraint "Link_qmf_ids_uq" unique ("_qmf_agent_id", "_qmf_object_id") + ) + create table "Link_stats" ( + "_id" serial8 not null, + "_parent_id" int8 not null, + "_qmf_update_time" timestamp not null, + "state" text not null, + "lastError" text not null, + constraint "Link_stats_pk" primary key ("_id") + ) + create table "Bridge" ( + "_id" serial8 not null, + "_qmf_agent_id" text not null, + "_qmf_object_id" text not null, + "_qmf_session_id" text, + "_qmf_class_key" text not null, + "_qmf_create_time" timestamp not null, + "_qmf_update_time" timestamp not null, + "_qmf_delete_time" timestamp, + "_linkRef_id" int8, + "channelId" int4 not null, + "durable" bool not null, + "src" text not null, + "dest" text not null, + "key" text not null, + "srcIsQueue" bool not null, + "srcIsLocal" bool not null, + "tag" text not null, + "excludes" text not null, + "dynamic" bool not null, + "sync" int4 not null, + constraint "Bridge_pk" primary key ("_id"), + constraint "Bridge_qmf_ids_uq" unique ("_qmf_agent_id", "_qmf_object_id") + ) + create table "Bridge_stats" ( + "_id" serial8 not null, + "_parent_id" int8 not null, + "_qmf_update_time" timestamp not null, + constraint "Bridge_stats_pk" primary key ("_id") + ) + create table "Session" ( + "_id" serial8 not null, + "_qmf_agent_id" text not null, + "_qmf_object_id" text not null, + "_qmf_session_id" text, + "_qmf_class_key" text not null, + "_qmf_create_time" timestamp not null, + "_qmf_update_time" timestamp not null, + "_qmf_delete_time" timestamp, + "_vhostRef_id" int8, + "_connectionRef_id" int8, + "name" text not null, + "channelId" int4 not null, + "detachedLifespan" int8 not null, + "attached" bool not null, + "expireTime" timestamp, + "maxClientRate" int8, + "framesOutstanding" int8, + "TxnStarts" numeric(19), + "TxnCommits" numeric(19), + "TxnRejects" numeric(19), + "TxnCount" int8, + "clientCredit" int8, + constraint "Session_pk" primary key ("_id"), + constraint "Session_qmf_ids_uq" unique ("_qmf_agent_id", "_qmf_object_id") + ) + create table "Session_stats" ( + "_id" serial8 not null, + "_parent_id" int8 not null, + "_qmf_update_time" timestamp not null, + "framesOutstanding" int8 not null, + "TxnStarts" numeric(19) not null, + "TxnCommits" numeric(19) not null, + "TxnRejects" numeric(19) not null, + "TxnCount" int8 not null, + "clientCredit" int8 not null, + constraint "Session_stats_pk" primary key ("_id") + ) + create table "ManagementSetupState" ( + "_id" serial8 not null, + "_qmf_agent_id" text not null, + "_qmf_object_id" text not null, + "_qmf_session_id" text, + "_qmf_class_key" text not null, + "_qmf_create_time" timestamp not null, + "_qmf_update_time" timestamp not null, + "_qmf_delete_time" timestamp, + "objectNum" numeric(19) not null, + "bootSequence" int4 not null, + constraint "ManagementSetupState_pk" primary key ("_id"), + constraint "ManagementSetupState_qmf_ids_uq" unique ("_qmf_agent_id", "_qmf_object_id") + ) + create table "ManagementSetupState_stats" ( + "_id" serial8 not null, + "_parent_id" int8 not null, + "_qmf_update_time" timestamp not null, + constraint "ManagementSetupState_stats_pk" primary key ("_id") + ) + ; +create schema "com.redhat.sesame" + create table "Sysimage" ( + "_id" serial8 not null, + "_qmf_agent_id" text not null, + "_qmf_object_id" text not null, + "_qmf_session_id" text, + "_qmf_class_key" text not null, + "_qmf_create_time" timestamp not null, + "_qmf_update_time" timestamp not null, + "_qmf_delete_time" timestamp, + "uuid" text not null, + "osName" text not null, + "nodeName" text not null, + "release" text not null, + "version" text not null, + "machine" text not null, + "distro" text, + "memTotal" int8 not null, + "swapTotal" int8 not null, + "memFree" int8, + "swapFree" int8, + "loadAverage1Min" float4, + "loadAverage5Min" float4, + "loadAverage10Min" float4, + "procTotal" int8, + "procRunning" int8, + constraint "Sysimage_pk" primary key ("_id"), + constraint "Sysimage_qmf_ids_uq" unique ("_qmf_agent_id", "_qmf_object_id") + ) + create table "Sysimage_stats" ( + "_id" serial8 not null, + "_parent_id" int8 not null, + "_qmf_update_time" timestamp not null, + "memFree" int8 not null, + "swapFree" int8 not null, + "loadAverage1Min" float4 not null, + "loadAverage5Min" float4 not null, + "loadAverage10Min" float4 not null, + "procTotal" int8 not null, + "procRunning" int8 not null, + constraint "Sysimage_stats_pk" primary key ("_id") + ) + ; +create schema "org.apache.qpid.acl" + create table "Acl" ( + "_id" serial8 not null, + "_qmf_agent_id" text not null, + "_qmf_object_id" text not null, + "_qmf_session_id" text, + "_qmf_class_key" text not null, + "_qmf_create_time" timestamp not null, + "_qmf_update_time" timestamp not null, + "_qmf_delete_time" timestamp, + "_brokerRef_id" int8, + "policyFile" text not null, + "enforcingAcl" bool not null, + "transferAcl" bool not null, + "lastAclLoad" timestamp not null, + "aclDenyCount" numeric(19), + constraint "Acl_pk" primary key ("_id"), + constraint "Acl_qmf_ids_uq" unique ("_qmf_agent_id", "_qmf_object_id") + ) + create table "Acl_stats" ( + "_id" serial8 not null, + "_parent_id" int8 not null, + "_qmf_update_time" timestamp not null, + "aclDenyCount" numeric(19) not null, + constraint "Acl_stats_pk" primary key ("_id") + ) + ; +create schema "com.redhat.cumin" + create table "BrokerGroup" ( + "_id" serial8 not null, + "_qmf_agent_id" text not null, + "_qmf_object_id" text not null, + "_qmf_session_id" text, + "_qmf_class_key" text not null, + "_qmf_create_time" timestamp not null, + "_qmf_update_time" timestamp not null, + "_qmf_delete_time" timestamp, + "name" text not null, + "description" text, + constraint "BrokerGroup_pk" primary key ("_id"), + constraint "BrokerGroup_qmf_ids_uq" unique ("_qmf_agent_id", "_qmf_object_id") + ) + create table "BrokerGroup_stats" ( + "_id" serial8 not null, + "_parent_id" int8 not null, + "_qmf_update_time" timestamp not null, + constraint "BrokerGroup_stats_pk" primary key ("_id") + ) + create table "BrokerGroupMapping" ( + "_id" serial8 not null, + "_qmf_agent_id" text not null, + "_qmf_object_id" text not null, + "_qmf_session_id" text, + "_qmf_class_key" text not null, + "_qmf_create_time" timestamp not null, + "_qmf_update_time" timestamp not null, + "_qmf_delete_time" timestamp, + "_broker_id" int8, + "_group_id" int8, + constraint "BrokerGroupMapping_pk" primary key ("_id"), + constraint "BrokerGroupMapping_qmf_ids_uq" unique ("_qmf_agent_id", "_qmf_object_id") + ) + create table "BrokerGroupMapping_stats" ( + "_id" serial8 not null, + "_parent_id" int8 not null, + "_qmf_update_time" timestamp not null, + constraint "BrokerGroupMapping_stats_pk" primary key ("_id") + ) + ; +create schema "com.redhat.rhm.store" + create table "Store" ( + "_id" serial8 not null, + "_qmf_agent_id" text not null, + "_qmf_object_id" text not null, + "_qmf_session_id" text, + "_qmf_class_key" text not null, + "_qmf_create_time" timestamp not null, + "_qmf_update_time" timestamp not null, + "_qmf_delete_time" timestamp, + "_brokerRef_id" int8, + "location" text not null, + "defaultInitialFileCount" int4 not null, + "defaultDataFileSize" int8 not null, + "tplIsInitialized" bool not null, + "tplDirectory" text not null, + "tplWritePageSize" int8 not null, + "tplWritePages" int8 not null, + "tplInitialFileCount" int4 not null, + "tplDataFileSize" int8 not null, + "tplCurrentFileCount" int8 not null, + "tplTransactionDepth" int8, + "tplTxnPrepares" numeric(19), + "tplTxnCommits" numeric(19), + "tplTxnAborts" numeric(19), + "tplOutstandingAIOs" int8, + constraint "Store_pk" primary key ("_id"), + constraint "Store_qmf_ids_uq" unique ("_qmf_agent_id", "_qmf_object_id") + ) + create table "Store_stats" ( + "_id" serial8 not null, + "_parent_id" int8 not null, + "_qmf_update_time" timestamp not null, + "tplTransactionDepth" int8 not null, + "tplTxnPrepares" numeric(19) not null, + "tplTxnCommits" numeric(19) not null, + "tplTxnAborts" numeric(19) not null, + "tplOutstandingAIOs" int8 not null, + constraint "Store_stats_pk" primary key ("_id") + ) + create table "Journal" ( + "_id" serial8 not null, + "_qmf_agent_id" text not null, + "_qmf_object_id" text not null, + "_qmf_session_id" text, + "_qmf_class_key" text not null, + "_qmf_create_time" timestamp not null, + "_qmf_update_time" timestamp not null, + "_qmf_delete_time" timestamp, + "_queueRef_id" int8, + "name" text not null, + "directory" text not null, + "baseFileName" text not null, + "writePageSize" int8 not null, + "writePages" int8 not null, + "readPageSize" int8 not null, + "readPages" int8 not null, + "initialFileCount" int4 not null, + "autoExpand" bool not null, + "currentFileCount" int4 not null, + "maxFileCount" int4 not null, + "dataFileSize" int8 not null, + "recordDepth" int8, + "enqueues" numeric(19), + "dequeues" numeric(19), + "txn" int8, + "txnEnqueues" numeric(19), + "txnDequeues" numeric(19), + "txnCommits" numeric(19), + "txnAborts" numeric(19), + "outstandingAIOs" int8, + "freeFileCount" int8, + "availableFileCount" int8, + "writeWaitFailures" numeric(19), + "writeBusyFailures" numeric(19), + "readRecordCount" numeric(19), + "readBusyFailures" numeric(19), + "writePageCacheDepth" int8, + "readPageCacheDepth" int8, + constraint "Journal_pk" primary key ("_id"), + constraint "Journal_qmf_ids_uq" unique ("_qmf_agent_id", "_qmf_object_id") + ) + create table "Journal_stats" ( + "_id" serial8 not null, + "_parent_id" int8 not null, + "_qmf_update_time" timestamp not null, + "recordDepth" int8 not null, + "enqueues" numeric(19) not null, + "dequeues" numeric(19) not null, + "txn" int8 not null, + "txnEnqueues" numeric(19) not null, + "txnDequeues" numeric(19) not null, + "txnCommits" numeric(19) not null, + "txnAborts" numeric(19) not null, + "outstandingAIOs" int8 not null, + "freeFileCount" int8 not null, + "availableFileCount" int8 not null, + "writeWaitFailures" numeric(19) not null, + "writeBusyFailures" numeric(19) not null, + "readRecordCount" numeric(19) not null, + "readBusyFailures" numeric(19) not null, + "writePageCacheDepth" int8 not null, + "readPageCacheDepth" int8 not null, + constraint "Journal_stats_pk" primary key ("_id") + ) + ; +create schema "mrg.grid" + create table "Slot" ( + "_id" serial8 not null, + "_qmf_agent_id" text not null, + "_qmf_object_id" text not null, + "_qmf_session_id" text, + "_qmf_class_key" text not null, + "_qmf_create_time" timestamp not null, + "_qmf_update_time" timestamp not null, + "_qmf_delete_time" timestamp, + "Pool" text not null, + "System" text not null, + "AccountingGroup" text, + "Activity" text not null, + "Arch" text not null, + "CheckpointPlatform" text not null, + "ClientMachine" text, + "ConcurrencyLimits" text, + "Cpus" int8 not null, + "CurrentRank" float8, + "Disk" int8 not null, + "EnteredCurrentActivity" timestamp not null, + "EnteredCurrentState" timestamp not null, + "FileSystemDomain" text not null, + "GlobalJobId" text, + "IsValidCheckpointPlatform" text not null, + "JobId" text, + "JobStart" timestamp, + "KFlops" int8 not null, + "LastBenchmark" timestamp not null, + "LastFetchWorkCompleted" timestamp, + "LastFetchWorkSpawned" timestamp, + "LastPeriodicCheckpoint" timestamp, + "Machine" text not null, + "MaxJobRetirementTime" text not null, + "Memory" int8 not null, + "Mips" int8 not null, + "MyAddress" text not null, + "Name" text not null, + "NextFetchWorkDelay" int4 not null, + "OpSys" text not null, + "PreemptingConcurrencyLimits" text, + "PreemptingOwner" text, + "PreemptingUser" text, + "PreemptingRank" float8, + "RemoteOwner" text, + "RemoteUser" text, + "Requirements" text not null, + "Rank" text not null, + "SlotID" int8 not null, + "Start" text not null, + "StarterAbilityList" text not null, + "State" text not null, + "TimeToLive" int8 not null, + "TotalClaimRunTime" int8, + "TotalClaimSuspendTime" int8, + "TotalCpus" int8 not null, + "TotalDisk" int8 not null, + "TotalJobRunTime" int8, + "TotalJobSuspendTime" int8, + "TotalMemory" int8 not null, + "TotalSlots" int8 not null, + "TotalVirtualMemory" int8 not null, + "UidDomain" text not null, + "VirtualMemory" int8 not null, + "WindowsBuildNumber" int8 not null, + "WindowsMajorVersion" int8 not null, + "WindowsMinorVersion" int8 not null, + "ClockDay" int8, + "ClockMin" int8, + "CondorLoadAvg" float8, + "ConsoleIdle" int8, + "ImageSize" int8, + "KeyboardIdle" int8, + "LoadAvg" float8, + "MyCurrentTime" timestamp, + "TotalCondorLoadAvg" float8, + "TotalLoadAvg" float8, + "TotalTimeBackfillBusy" int8, + "TotalTimeBackfillIdle" int8, + "TotalTimeBackfillKilling" int8, + "TotalTimeClaimedBusy" int8, + "TotalTimeClaimedIdle" int8, + "TotalTimeClaimedRetiring" int8, + "TotalTimeClaimedSuspended" int8, + "TotalTimeMatchedIdle" int8, + "TotalTimeOwnerIdle" int8, + "TotalTimePreemptingKilling" int8, + "TotalTimePreemptingVacating" int8, + "TotalTimeUnclaimedBenchmarking" int8, + "TotalTimeUnclaimedIdle" int8, + constraint "Slot_pk" primary key ("_id"), + constraint "Slot_qmf_ids_uq" unique ("_qmf_agent_id", "_qmf_object_id") + ) + create table "Slot_stats" ( + "_id" serial8 not null, + "_parent_id" int8 not null, + "_qmf_update_time" timestamp not null, + "ClockDay" int8 not null, + "ClockMin" int8 not null, + "CondorLoadAvg" float8 not null, + "ConsoleIdle" int8 not null, + "ImageSize" int8 not null, + "KeyboardIdle" int8 not null, + "LoadAvg" float8 not null, + "MyCurrentTime" timestamp not null, + "TotalCondorLoadAvg" float8 not null, + "TotalLoadAvg" float8 not null, + "TotalTimeBackfillBusy" int8 not null, + "TotalTimeBackfillIdle" int8 not null, + "TotalTimeBackfillKilling" int8 not null, + "TotalTimeClaimedBusy" int8 not null, + "TotalTimeClaimedIdle" int8 not null, + "TotalTimeClaimedRetiring" int8 not null, + "TotalTimeClaimedSuspended" int8 not null, + "TotalTimeMatchedIdle" int8 not null, + "TotalTimeOwnerIdle" int8 not null, + "TotalTimePreemptingKilling" int8 not null, + "TotalTimePreemptingVacating" int8 not null, + "TotalTimeUnclaimedBenchmarking" int8 not null, + "TotalTimeUnclaimedIdle" int8 not null, + constraint "Slot_stats_pk" primary key ("_id") + ) + create table "Scheduler" ( + "_id" serial8 not null, + "_qmf_agent_id" text not null, + "_qmf_object_id" text not null, + "_qmf_session_id" text, + "_qmf_class_key" text not null, + "_qmf_create_time" timestamp not null, + "_qmf_update_time" timestamp not null, + "_qmf_delete_time" timestamp, + "Pool" text not null, + "System" text not null, + "JobQueueBirthdate" timestamp not null, + "MaxJobsRunning" int8 not null, + "Machine" text not null, + "MyAddress" text not null, + "Name" text not null, + "NumUsers" int8, + "TotalHeldJobs" int8, + "TotalIdleJobs" int8, + "TotalJobAds" int8, + "TotalRemovedJobs" int8, + "TotalRunningJobs" int8, + constraint "Scheduler_pk" primary key ("_id"), + constraint "Scheduler_qmf_ids_uq" unique ("_qmf_agent_id", "_qmf_object_id") + ) + create table "Scheduler_stats" ( + "_id" serial8 not null, + "_parent_id" int8 not null, + "_qmf_update_time" timestamp not null, + "NumUsers" int8 not null, + "TotalHeldJobs" int8 not null, + "TotalIdleJobs" int8 not null, + "TotalJobAds" int8 not null, + "TotalRemovedJobs" int8 not null, + "TotalRunningJobs" int8 not null, + constraint "Scheduler_stats_pk" primary key ("_id") + ) + create table "Submitter" ( + "_id" serial8 not null, + "_qmf_agent_id" text not null, + "_qmf_object_id" text not null, + "_qmf_session_id" text, + "_qmf_class_key" text not null, + "_qmf_create_time" timestamp not null, + "_qmf_update_time" timestamp not null, + "_qmf_delete_time" timestamp, + "_schedulerRef_id" int8, + "JobQueueBirthdate" timestamp not null, + "Machine" text not null, + "Name" text not null, + "ScheddName" text not null, + "HeldJobs" int8, + "IdleJobs" int8, + "RunningJobs" int8, + constraint "Submitter_pk" primary key ("_id"), + constraint "Submitter_qmf_ids_uq" unique ("_qmf_agent_id", "_qmf_object_id") + ) + create table "Submitter_stats" ( + "_id" serial8 not null, + "_parent_id" int8 not null, + "_qmf_update_time" timestamp not null, + "HeldJobs" int8 not null, + "IdleJobs" int8 not null, + "RunningJobs" int8 not null, + constraint "Submitter_stats_pk" primary key ("_id") + ) + create table "Negotiator" ( + "_id" serial8 not null, + "_qmf_agent_id" text not null, + "_qmf_object_id" text not null, + "_qmf_session_id" text, + "_qmf_class_key" text not null, + "_qmf_create_time" timestamp not null, + "_qmf_update_time" timestamp not null, + "_qmf_delete_time" timestamp, + "Pool" text not null, + "System" text not null, + "Name" text not null, + "Machine" text not null, + "MyAddress" text not null, + constraint "Negotiator_pk" primary key ("_id"), + constraint "Negotiator_qmf_ids_uq" unique ("_qmf_agent_id", "_qmf_object_id") + ) + create table "Negotiator_stats" ( + "_id" serial8 not null, + "_parent_id" int8 not null, + "_qmf_update_time" timestamp not null, + constraint "Negotiator_stats_pk" primary key ("_id") + ) + create table "Collector" ( + "_id" serial8 not null, + "_qmf_agent_id" text not null, + "_qmf_object_id" text not null, + "_qmf_session_id" text, + "_qmf_class_key" text not null, + "_qmf_create_time" timestamp not null, + "_qmf_update_time" timestamp not null, + "_qmf_delete_time" timestamp, + "Pool" text not null, + "System" text not null, + "CondorPlatform" text not null, + "CondorVersion" text not null, + "Name" text not null, + "MyAddress" text not null, + "RunningJobs" int8, + "IdleJobs" int8, + "HostsTotal" int8, + "HostsClaimed" int8, + "HostsUnclaimed" int8, + "HostsOwner" int8, + constraint "Collector_pk" primary key ("_id"), + constraint "Collector_qmf_ids_uq" unique ("_qmf_agent_id", "_qmf_object_id") + ) + create table "Collector_stats" ( + "_id" serial8 not null, + "_parent_id" int8 not null, + "_qmf_update_time" timestamp not null, + "RunningJobs" int8 not null, + "IdleJobs" int8 not null, + "HostsTotal" int8 not null, + "HostsClaimed" int8 not null, + "HostsUnclaimed" int8 not null, + "HostsOwner" int8 not null, + constraint "Collector_stats_pk" primary key ("_id") + ) + create table "Master" ( + "_id" serial8 not null, + "_qmf_agent_id" text not null, + "_qmf_object_id" text not null, + "_qmf_session_id" text, + "_qmf_class_key" text not null, + "_qmf_create_time" timestamp not null, + "_qmf_update_time" timestamp not null, + "_qmf_delete_time" timestamp, + "Pool" text not null, + "System" text not null, + "Name" text not null, + "Machine" text not null, + "MyAddress" text not null, + "RealUid" int4 not null, + constraint "Master_pk" primary key ("_id"), + constraint "Master_qmf_ids_uq" unique ("_qmf_agent_id", "_qmf_object_id") + ) + create table "Master_stats" ( + "_id" serial8 not null, + "_parent_id" int8 not null, + "_qmf_update_time" timestamp not null, + constraint "Master_stats_pk" primary key ("_id") + ) + create table "Grid" ( + "_id" serial8 not null, + "_qmf_agent_id" text not null, + "_qmf_object_id" text not null, + "_qmf_session_id" text, + "_qmf_class_key" text not null, + "_qmf_create_time" timestamp not null, + "_qmf_update_time" timestamp not null, + "_qmf_delete_time" timestamp, + "Pool" text not null, + "Name" text not null, + "ScheddName" text not null, + "Owner" text not null, + "JobLimit" int8 not null, + "SubmitLimit" int8 not null, + "GridResourceUnavailableTime" timestamp, + "NumJobs" int8, + "SubmitsInProgress" int8, + "SubmitsQueued" int8, + "SubmitsAllowed" int8, + "SubmitsWanted" int8, + "RunningJobs" int8, + "IdleJobs" int8, + constraint "Grid_pk" primary key ("_id"), + constraint "Grid_qmf_ids_uq" unique ("_qmf_agent_id", "_qmf_object_id") + ) + create table "Grid_stats" ( + "_id" serial8 not null, + "_parent_id" int8 not null, + "_qmf_update_time" timestamp not null, + "NumJobs" int8 not null, + "SubmitsInProgress" int8 not null, + "SubmitsQueued" int8 not null, + "SubmitsAllowed" int8 not null, + "SubmitsWanted" int8 not null, + "RunningJobs" int8 not null, + "IdleJobs" int8 not null, + constraint "Grid_stats_pk" primary key ("_id") + ) + create table "Submission" ( + "_id" serial8 not null, + "_qmf_agent_id" text not null, + "_qmf_object_id" text not null, + "_qmf_session_id" text, + "_qmf_class_key" text not null, + "_qmf_create_time" timestamp not null, + "_qmf_update_time" timestamp not null, + "_qmf_delete_time" timestamp, + "_schedulerRef_id" int8, + "Name" text not null, + "Owner" text not null, + "Idle" int8, + "Running" int8, + "Removed" int8, + "Completed" int8, + "Held" int8, + constraint "Submission_pk" primary key ("_id"), + constraint "Submission_qmf_ids_uq" unique ("_qmf_agent_id", "_qmf_object_id") + ) + create table "Submission_stats" ( + "_id" serial8 not null, + "_parent_id" int8 not null, + "_qmf_update_time" timestamp not null, + "Idle" int8 not null, + "Running" int8 not null, + "Removed" int8 not null, + "Completed" int8 not null, + "Held" int8 not null, + constraint "Submission_stats_pk" primary key ("_id") + ) + ; +alter table "org.apache.qpid.cluster"."Cluster" + add constraint "_brokerRef_id_fk" foreign key ("_brokerRef_id") references "org.apache.qpid.broker"."Broker" ("_id") on update cascade on delete set null + ; +alter table "org.apache.qpid.cluster"."Cluster_stats" + add constraint "_parent_id_fk" foreign key ("_parent_id") references "org.apache.qpid.cluster"."Cluster" ("_id") on update cascade on delete cascade + ; +alter table "org.apache.qpid.broker"."System_stats" + add constraint "_parent_id_fk" foreign key ("_parent_id") references "org.apache.qpid.broker"."System" ("_id") on update cascade on delete cascade + ; +alter table "org.apache.qpid.broker"."Broker" + add constraint "_systemRef_id_fk" foreign key ("_systemRef_id") references "org.apache.qpid.broker"."System" ("_id") on update cascade on delete set null + ; +alter table "org.apache.qpid.broker"."Broker_stats" + add constraint "_parent_id_fk" foreign key ("_parent_id") references "org.apache.qpid.broker"."Broker" ("_id") on update cascade on delete cascade + ; +alter table "org.apache.qpid.broker"."Agent" + add constraint "_connectionRef_id_fk" foreign key ("_connectionRef_id") references "org.apache.qpid.broker"."Connection" ("_id") on update cascade on delete set null, + add constraint "_registeredTo_id_fk" foreign key ("_registeredTo_id") references "org.apache.qpid.broker"."Broker" ("_id") on update cascade on delete set null + ; +alter table "org.apache.qpid.broker"."Agent_stats" + add constraint "_parent_id_fk" foreign key ("_parent_id") references "org.apache.qpid.broker"."Agent" ("_id") on update cascade on delete cascade + ; +alter table "org.apache.qpid.broker"."Vhost" + add constraint "_brokerRef_id_fk" foreign key ("_brokerRef_id") references "org.apache.qpid.broker"."Broker" ("_id") on update cascade on delete set null + ; +alter table "org.apache.qpid.broker"."Vhost_stats" + add constraint "_parent_id_fk" foreign key ("_parent_id") references "org.apache.qpid.broker"."Vhost" ("_id") on update cascade on delete cascade + ; +alter table "org.apache.qpid.broker"."Queue" + add constraint "_vhostRef_id_fk" foreign key ("_vhostRef_id") references "org.apache.qpid.broker"."Vhost" ("_id") on update cascade on delete set null, + add constraint "_altExchange_id_fk" foreign key ("_altExchange_id") references "org.apache.qpid.broker"."Exchange" ("_id") on update cascade on delete set null + ; +alter table "org.apache.qpid.broker"."Queue_stats" + add constraint "_parent_id_fk" foreign key ("_parent_id") references "org.apache.qpid.broker"."Queue" ("_id") on update cascade on delete cascade + ; +alter table "org.apache.qpid.broker"."Exchange" + add constraint "_vhostRef_id_fk" foreign key ("_vhostRef_id") references "org.apache.qpid.broker"."Vhost" ("_id") on update cascade on delete set null, + add constraint "_altExchange_id_fk" foreign key ("_altExchange_id") references "org.apache.qpid.broker"."Exchange" ("_id") on update cascade on delete set null + ; +alter table "org.apache.qpid.broker"."Exchange_stats" + add constraint "_parent_id_fk" foreign key ("_parent_id") references "org.apache.qpid.broker"."Exchange" ("_id") on update cascade on delete cascade + ; +alter table "org.apache.qpid.broker"."Binding" + add constraint "_exchangeRef_id_fk" foreign key ("_exchangeRef_id") references "org.apache.qpid.broker"."Exchange" ("_id") on update cascade on delete set null, + add constraint "_queueRef_id_fk" foreign key ("_queueRef_id") references "org.apache.qpid.broker"."Queue" ("_id") on update cascade on delete set null + ; +alter table "org.apache.qpid.broker"."Binding_stats" + add constraint "_parent_id_fk" foreign key ("_parent_id") references "org.apache.qpid.broker"."Binding" ("_id") on update cascade on delete cascade + ; +alter table "org.apache.qpid.broker"."Subscription" + add constraint "_sessionRef_id_fk" foreign key ("_sessionRef_id") references "org.apache.qpid.broker"."Session" ("_id") on update cascade on delete set null, + add constraint "_queueRef_id_fk" foreign key ("_queueRef_id") references "org.apache.qpid.broker"."Queue" ("_id") on update cascade on delete set null + ; +alter table "org.apache.qpid.broker"."Subscription_stats" + add constraint "_parent_id_fk" foreign key ("_parent_id") references "org.apache.qpid.broker"."Subscription" ("_id") on update cascade on delete cascade + ; +alter table "org.apache.qpid.broker"."Connection" + add constraint "_vhostRef_id_fk" foreign key ("_vhostRef_id") references "org.apache.qpid.broker"."Vhost" ("_id") on update cascade on delete set null + ; +alter table "org.apache.qpid.broker"."Connection_stats" + add constraint "_parent_id_fk" foreign key ("_parent_id") references "org.apache.qpid.broker"."Connection" ("_id") on update cascade on delete cascade + ; +alter table "org.apache.qpid.broker"."Link" + add constraint "_vhostRef_id_fk" foreign key ("_vhostRef_id") references "org.apache.qpid.broker"."Vhost" ("_id") on update cascade on delete set null + ; +alter table "org.apache.qpid.broker"."Link_stats" + add constraint "_parent_id_fk" foreign key ("_parent_id") references "org.apache.qpid.broker"."Link" ("_id") on update cascade on delete cascade + ; +alter table "org.apache.qpid.broker"."Bridge" + add constraint "_linkRef_id_fk" foreign key ("_linkRef_id") references "org.apache.qpid.broker"."Link" ("_id") on update cascade on delete set null + ; +alter table "org.apache.qpid.broker"."Bridge_stats" + add constraint "_parent_id_fk" foreign key ("_parent_id") references "org.apache.qpid.broker"."Bridge" ("_id") on update cascade on delete cascade + ; +alter table "org.apache.qpid.broker"."Session" + add constraint "_vhostRef_id_fk" foreign key ("_vhostRef_id") references "org.apache.qpid.broker"."Vhost" ("_id") on update cascade on delete set null, + add constraint "_connectionRef_id_fk" foreign key ("_connectionRef_id") references "org.apache.qpid.broker"."Connection" ("_id") on update cascade on delete set null + ; +alter table "org.apache.qpid.broker"."Session_stats" + add constraint "_parent_id_fk" foreign key ("_parent_id") references "org.apache.qpid.broker"."Session" ("_id") on update cascade on delete cascade + ; +alter table "org.apache.qpid.broker"."ManagementSetupState_stats" + add constraint "_parent_id_fk" foreign key ("_parent_id") references "org.apache.qpid.broker"."ManagementSetupState" ("_id") on update cascade on delete cascade + ; +alter table "com.redhat.sesame"."Sysimage_stats" + add constraint "_parent_id_fk" foreign key ("_parent_id") references "com.redhat.sesame"."Sysimage" ("_id") on update cascade on delete cascade + ; +alter table "org.apache.qpid.acl"."Acl" + add constraint "_brokerRef_id_fk" foreign key ("_brokerRef_id") references "org.apache.qpid.broker"."Broker" ("_id") on update cascade on delete set null + ; +alter table "org.apache.qpid.acl"."Acl_stats" + add constraint "_parent_id_fk" foreign key ("_parent_id") references "org.apache.qpid.acl"."Acl" ("_id") on update cascade on delete cascade + ; +alter table "com.redhat.cumin"."BrokerGroup_stats" + add constraint "_parent_id_fk" foreign key ("_parent_id") references "com.redhat.cumin"."BrokerGroup" ("_id") on update cascade on delete cascade + ; +alter table "com.redhat.cumin"."BrokerGroupMapping" + add constraint "_broker_id_fk" foreign key ("_broker_id") references "org.apache.qpid.broker"."Broker" ("_id") on update cascade on delete set null, + add constraint "_group_id_fk" foreign key ("_group_id") references "com.redhat.cumin"."BrokerGroup" ("_id") on update cascade on delete set null + ; +alter table "com.redhat.cumin"."BrokerGroupMapping_stats" + add constraint "_parent_id_fk" foreign key ("_parent_id") references "com.redhat.cumin"."BrokerGroupMapping" ("_id") on update cascade on delete cascade + ; +alter table "com.redhat.rhm.store"."Store" + add constraint "_brokerRef_id_fk" foreign key ("_brokerRef_id") references "org.apache.qpid.broker"."Broker" ("_id") on update cascade on delete set null + ; +alter table "com.redhat.rhm.store"."Store_stats" + add constraint "_parent_id_fk" foreign key ("_parent_id") references "com.redhat.rhm.store"."Store" ("_id") on update cascade on delete cascade + ; +alter table "com.redhat.rhm.store"."Journal" + add constraint "_queueRef_id_fk" foreign key ("_queueRef_id") references "org.apache.qpid.broker"."Queue" ("_id") on update cascade on delete set null + ; +alter table "com.redhat.rhm.store"."Journal_stats" + add constraint "_parent_id_fk" foreign key ("_parent_id") references "com.redhat.rhm.store"."Journal" ("_id") on update cascade on delete cascade + ; +alter table "mrg.grid"."Slot_stats" + add constraint "_parent_id_fk" foreign key ("_parent_id") references "mrg.grid"."Slot" ("_id") on update cascade on delete cascade + ; +alter table "mrg.grid"."Scheduler_stats" + add constraint "_parent_id_fk" foreign key ("_parent_id") references "mrg.grid"."Scheduler" ("_id") on update cascade on delete cascade + ; +alter table "mrg.grid"."Submitter" + add constraint "_schedulerRef_id_fk" foreign key ("_schedulerRef_id") references "mrg.grid"."Scheduler" ("_id") on update cascade on delete set null + ; +alter table "mrg.grid"."Submitter_stats" + add constraint "_parent_id_fk" foreign key ("_parent_id") references "mrg.grid"."Submitter" ("_id") on update cascade on delete cascade + ; +alter table "mrg.grid"."Negotiator_stats" + add constraint "_parent_id_fk" foreign key ("_parent_id") references "mrg.grid"."Negotiator" ("_id") on update cascade on delete cascade + ; +alter table "mrg.grid"."Collector_stats" + add constraint "_parent_id_fk" foreign key ("_parent_id") references "mrg.grid"."Collector" ("_id") on update cascade on delete cascade + ; +alter table "mrg.grid"."Master_stats" + add constraint "_parent_id_fk" foreign key ("_parent_id") references "mrg.grid"."Master" ("_id") on update cascade on delete cascade + ; +alter table "mrg.grid"."Grid_stats" + add constraint "_parent_id_fk" foreign key ("_parent_id") references "mrg.grid"."Grid" ("_id") on update cascade on delete cascade + ; +alter table "mrg.grid"."Submission" + add constraint "_schedulerRef_id_fk" foreign key ("_schedulerRef_id") references "mrg.grid"."Scheduler" ("_id") on update cascade on delete set null + ; +alter table "mrg.grid"."Submission_stats" + add constraint "_parent_id_fk" foreign key ("_parent_id") references "mrg.grid"."Submission" ("_id") on update cascade on delete cascade + ; Modified: mgmt/newdata/rosemary/bin/rosemary-test =================================================================== --- mgmt/trunk/rosemary/bin/rosemary-test 2010-03-22 14:00:07 UTC (rev 3870) +++ mgmt/newdata/rosemary/bin/rosemary-test 2010-03-22 14:58:08 UTC (rev 3871) @@ -4,22 +4,25 @@ from rosemary.sqloperation import * def do_model(args): - for package in model.packages: - print "package %s" % package.name + for pkg in model._packages: + print "package %s" % pkg._name - for cls in package.classes: - print " class %s" % cls.name + for cls in pkg._classes: + print " class %s" % cls._name - for ref in cls.references: + for hdr in cls._headers: + print " hdr %s %s" % (hdr.name, hdr.title or "") + + for ref in cls._references: print " ref %s %s" % (ref.name, ref.title or "") - for prop in cls.properties: + for prop in cls._properties: print " prop %s %s" % (prop.name, prop.title or "") - for stat in cls.statistics: + for stat in cls._statistics: print " stat %s %s" % (stat.name, stat.title or "") - for meth in cls.methods: + for meth in cls._methods: print " meth %s" % meth.name for arg in meth.arguments: Modified: mgmt/newdata/rosemary/python/rosemary/model.py =================================================================== --- mgmt/trunk/rosemary/python/rosemary/model.py 2010-03-22 14:00:07 UTC (rev 3870) +++ mgmt/newdata/rosemary/python/rosemary/model.py 2010-03-22 14:58:08 UTC (rev 3871) @@ -1,5 +1,6 @@ from sqloperation import * from sqlmodel import * +from sqlquery import * from sqltype import * from util import * @@ -7,11 +8,13 @@ class RosemaryModel(object): def __init__(self): - self.packages = list() - self.packages_by_name = dict() + self._packages = list() + self._packages_by_name = dict() - self.sql_model = SqlModel() + self.sql_model = SqlModel(self) + self.sql_logging_enabled = False + def load_xml_dir(self, path): assert os.path.isdir(path) @@ -52,37 +55,40 @@ finally: file.close() + # XXX Change to load_elem, load_extended_elem def load(self, elem): pkg = RosemaryPackage(self, elem.get("package")) pkg.load(elem) def extend(self, elem): for child in elem.findall("package"): - pkg = self.packages_by_name[child.get("name")] + pkg = self._packages_by_name[child.get("name")] pkg.extend(child) def init(self): - for pkg in self.packages: + for pkg in self._packages: pkg.init() class RosemaryPackage(object): def __init__(self, model, name): - self.model = model - self.name = name + self._model = model + self._name = name - self.model.packages.append(self) - self.model.packages_by_name[self.name] = self + self._model._packages.append(self) + self._model._packages_by_name[self._name] = self - mangled = self.name.replace(".", "_") + mangled = self._name.replace(".", "_") - if not hasattr(self.model, mangled): - setattr(self.model, mangled, self) + if hasattr(self._model, mangled): + raise Exception("Collision") - self.classes = list() - self.classes_by_name = dict() + setattr(self._model, mangled, self) - self.sql_schema = SqlSchema(self.model.sql_model, self.name) + self._classes = list() + self._classes_by_name = dict() + self.sql_schema = SqlSchema(self._model.sql_model, self._name) + def load(self, elem): for child in elem.findall("class"): cls = RosemaryClass(self, child.get("name")) @@ -90,63 +96,139 @@ def extend(self, elem): for child in elem.findall("class"): - cls = self.classes_by_name[child.get("name")] + cls = self._classes_by_name[child.get("name")] cls.extend(child) def init(self): - for cls in self.classes: + for cls in self._classes: cls.init() def __repr__(self): - args = (self.__class__.__name__, self.name) + args = (self.__class__.__name__, self._name) return "%s(%s)" % args class RosemaryClass(object): def __init__(self, package, name): - self.package = package - self.name = name + self._package = package + self._name = name - self.package.classes.append(self) - self.package.classes_by_name[self.name] = self + self._package._classes.append(self) + self._package._classes_by_name[self._name] = self - if not hasattr(self.package, self.name): - setattr(self.package, self.name, self) + assert not hasattr(self._package, self._name), self.name - self.references = list() - self.references_by_name = dict() + setattr(self._package, self._name, self) - self.inbound_references = list() + self._title = None + self._object_title = None - self.properties = list() - self.properties_by_name = dict() + self._headers = list() + self._headers_by_name = dict() - self.statistics = list() - self.statistics_by_name = dict() + self._references = list() + self._references_by_name = dict() - self.methods = list() - self.methods_by_name = dict() + self._inbound_references = list() - self.sql_table = SqlTable(self.package.sql_schema, self.name) + self._properties = list() + self._properties_by_name = dict() - name = "%sStats" % self.name + self._statistics = list() + self._statistics_by_name = dict() - self.sql_stats_table = SqlTable(self.package.sql_schema, name) + self._methods = list() + self._methods_by_name = dict() - self.add_qmf_columns() - self.add_id_columns() + self.add_sql() - self.id = RosemaryAttribute(self, "id") - self.id.sql_column = self.sql_table.key_column + self._id = RosemaryAttribute(self, "_id") + self._id.sql_column = self.sql_table.key_column - self.sql_qmf_columns = None + self.add_headers() - self.sql_select = SqlSelectItem(self.sql_table) + def add_sql(self): + # Main table + + self.sql_table = SqlTable(self._package.sql_schema, self._name) + + id_col = SqlColumn(self.sql_table, "_id", sql_serial8) + self.sql_table.key_column = id_col + + name = "%s_pk" % self._name + SqlPrimaryKeyConstraint(self.sql_table, name, (id_col,)) + + self.sql_select = SqlQuery(self.sql_table) + self.sql_select_by_id = SqlSelectItem(self.sql_table) + self.sql_select_by_qmf_id = SqlSelectItemByQmfId(self.sql_table) + self.sql_insert = SqlInsertItem(self.sql_table) self.sql_update = SqlUpdateItem(self.sql_table) self.sql_delete = SqlDeleteItem(self.sql_table) - self.sql_select_by_object_id = SqlSelectItemByObjectId(self.sql_table) + # Stats table + name = "%s_stats" % self._name + self.sql_stats_table = SqlTable(self._package.sql_schema, name) + + stats_id_col = SqlColumn(self.sql_stats_table, "_id", sql_serial8) + self.sql_stats_table.key_column = stats_id_col + + name = "%s_pk" % self.sql_stats_table._name + SqlPrimaryKeyConstraint(self.sql_stats_table, name, (stats_id_col,)) + + name = "_parent_id" + parent_col = SqlColumn(self.sql_stats_table, name, sql_int8) + parent_col.foreign_key_column = id_col + + table = self.sql_stats_table + name = "%s_fk" % parent_col.name + constraint = SqlForeignKeyConstraint(table, name, parent_col, id_col) + constraint.on_delete = "cascade" + + name = "_qmf_update_time" + SqlColumn(self.sql_stats_table, name, sql_timestamp) + + self.sql_stats_insert = SqlInsertItemStats(self.sql_stats_table) + self.sql_stats_delete = SqlDeleteItemStats(self.sql_stats_table) + + def add_headers(self): + name = "_qmf_agent_id" + self._qmf_agent_id = RosemaryHeader(self, name, sql_text) + self._qmf_agent_id.title = "Agent ID" + + name = "_qmf_object_id" + self._qmf_object_id = RosemaryHeader(self, name, sql_text) + self._qmf_object_id.title = "Object ID" + + name = "_qmf_session_id" + self._qmf_session_id = RosemaryHeader(self, name, sql_text) + self._qmf_session_id.title = "Session ID" + + name = "_qmf_class_key" + self._qmf_class_key = RosemaryHeader(self, name, sql_text) + self._qmf_class_key.title = "Class Key" + + name = "_qmf_create_time" + self._qmf_create_time = RosemaryHeader(self, name, sql_timestamp) + self._qmf_create_time.title = "Create Time" + + name = "_qmf_update_time" + self._qmf_update_time = RosemaryHeader(self, name, sql_timestamp) + self._qmf_update_time.title = "Update Time" + + name = "_qmf_delete_time" + self._qmf_delete_time = RosemaryHeader(self, name, sql_timestamp) + self._qmf_delete_time.title = "Delete Time" + + self._qmf_session_id.optional = True + self._qmf_delete_time.optional = True + + def add_constraints(self): + name = "%s_qmf_ids_uq" % self._name + cols = (self._qmf_agent_id.sql_column, self._qmf_object_id.sql_column) + + SqlUniqueConstraint(self.sql_table, name, cols) + def load(self, elem): log.debug("Loading %s", self) @@ -171,93 +253,155 @@ def extend(self, elem): log.debug("Extending %s", self) + self._title = elem.find("title") + self._object_title = elem.findtext("object/title") + for child in elem.findall("property"): - prop = self.properties_by_name[child.get("name")] + prop = self._properties_by_name[child.get("name")] prop.extend(child) for child in elem.findall("statistic"): - stat = self.statistics_by_name[child.get("name")] + stat = self._statistics_by_name[child.get("name")] stat.extend(child) for child in elem.findall("method"): - meth = self.methods_by_name[child.get("name")] + meth = self._methods_by_name[child.get("name")] meth.extend(child) def init(self): log.debug("Initializing %s", self) - for ref in self.references: + if not self._title: + self._title = self._name + + for hdr in self._headers: + hdr.init() + + for ref in self._references: ref.init() - for prop in self.properties: + for prop in self._properties: prop.init() - for stat in self.statistics: + for stat in self._statistics: stat.init() - for meth in self.methods: + for meth in self._methods: meth.init() - def add_id_columns(self): - id_col = SqlColumn(self.sql_table, "_id", sql_serial8) - self.sql_table.key_column = id_col + self.add_constraints() + +# def add_id_columns(self): + # id_col = SqlColumn(self.sql_table, "_id", sql_serial8) + # self.sql_table.key_column = id_col - name = "%s_pk" % self.name - SqlPrimaryKeyConstraint(self.sql_table, name, (id_col,)) +# name = "%s_pk" % self._name +# SqlPrimaryKeyConstraint(self.sql_table, name, (id_col,)) - stats_id_col = SqlColumn(self.sql_stats_table, "_id", sql_serial8) - self.sql_stats_table.key_column = stats_id_col - name = "%s_pk" % self.sql_stats_table.name - SqlPrimaryKeyConstraint(self.sql_stats_table, name, (stats_id_col,)) +# def add_qmf_columns(self): +# agent = SqlColumn(self.sql_table, "_qmf_agent_id", sql_text) +# object = SqlColumn(self.sql_table, "_qmf_object_id", sql_text) - parent_col = SqlColumn(self.sql_stats_table, "_parent_id", sql_int8) - parent_col.foreign_key_column = id_col +# name = "%s_qmf_ids_uq" % self._name - name = "%s_fk" % parent_col.name - SqlForeignKeyConstraint(self.sql_stats_table, name, parent_col, id_col) + #SqlUniqueConstraint(self.sql_table, name, (agent, object)) - def add_qmf_columns(self): - agent = SqlColumn(self.sql_table, "_qmf_agent_id", sql_text) - object = SqlColumn(self.sql_table, "_qmf_object_id", sql_text) + #col = SqlColumn(self.sql_table, "_qmf_session_id", sql_text) + #col.nullable = True - name = "%s_qmf_ids_uq" % self.name + #SqlColumn(self.sql_table, "_qmf_class_key", sql_text) - SqlUniqueConstraint(self.sql_table, name, (agent, object)) + #SqlColumn(self.sql_table, "_qmf_update_time", sql_timestamp) + #SqlColumn(self.sql_table, "_qmf_create_time", sql_timestamp) - session = SqlColumn(self.sql_table, "_qmf_session_id", sql_text) - session.nullable = True + #col = SqlColumn(self.sql_table, "_qmf_delete_time", sql_timestamp) + #col.nullable = True - update = SqlColumn(self.sql_table, "_qmf_update_time", sql_timestamp) - create = SqlColumn(self.sql_table, "_qmf_create_time", sql_timestamp) + #SqlColumn(self.sql_stats_table, "_qmf_update_time", sql_timestamp) - delete = SqlColumn(self.sql_table, "_qmf_delete_time", sql_timestamp) - delete.nullable = True + def select_objects(self, cursor, **kwargs): + objects = list() - self.sql_qmf_columns = (agent, object, session, update, create, delete) + columns = self.sql_table._columns - def load_object(self, cursor, id): - self.sql_select.execute(cursor, self.sql_table.columns, {"id": id}) + options = SqlQueryOptions() - return object # XXX + for name, value in kwargs.items(): + column = self.sql_table._columns_by_name[name] + filter = SqlComparisonFilter(None, column, value) + options.filters.append(filter) - def save_object(self, cursor, object): - assert isinstance(object, RosemaryObject) + self.sql_select.execute(cursor, columns, kwargs, options) - values = object.__dict__ + for record in cursor.fetchall(): + obj = RosemaryObject(self, None) - try: - self.sql_update.execute(cursor, self.sql_table.columns, values) - except: # XXX need better exception - self.sql_insert.execute(cursor, self.sql_table.columns, values) + self.set_object_attributes(obj, columns, record) - def delete_object(self, cursor, object): - assert isinstance(object, RosemaryObject) + objects.append(obj) - self.sql_delete.execute(cursor, (), {"id": object.id}) + return objects + def get_object(self, cursor, id): + assert id + + object = RosemaryObject(self, id) + + self.load_object(cursor, object) + + return object + + def create_object(self): + return RosemaryObject(self, None) + + def load_object(self, cursor, obj): + assert isinstance(obj, RosemaryObject) + + columns = self.sql_table._columns + + if obj._id: + self.sql_select_by_id.execute(cursor, columns, obj.__dict__) + elif obj._qmf_agent_id and obj._qmf_object_id: + self.sql_select_by_qmf_id.execute(cursor, columns, obj.__dict__) + else: + raise Exception("No id attributes are set") + + values = cursor.fetchone() + + if not values: + raise RosemaryNotFound() + + self.set_object_attributes(obj, columns, values) + + def set_object_attributes(self, obj, columns, values): + assert isinstance(obj, RosemaryObject) + + for column, value in zip(columns, values): + setattr(obj, column.name, value) + + def save_object(self, cursor, obj, columns=None): + assert isinstance(obj, RosemaryObject) + + if not columns: + columns = list(self.sql_table._columns) + columns.remove(self.sql_table._id) + + if obj._id is None: + self.sql_insert.execute(cursor, columns, obj.__dict__) + + obj._id = cursor.fetchone()[0] + else: + self.sql_update.execute(cursor, columns, obj.__dict__) + + def delete_object(self, cursor, obj): + assert isinstance(obj, RosemaryObject) + assert obj._id + + self.sql_delete.execute(cursor, (), obj.__dict__) + def __repr__(self): - args = (self.__class__.__name__, self.package.name, self.name) + args = (self.__class__.__name__, self._package._name, self._name) return "%s(%s,%s)" % args class RosemaryAttribute(object): @@ -265,15 +409,16 @@ self.cls = cls self.name = name - if not hasattr(self.cls, self.name): - setattr(self.cls, self.name, self) + assert not hasattr(self.cls, self.name), self.name + setattr(self.cls, self.name, self) + self.type = None self.references = None self.access = None self.unit = None - self.is_index = None - self.is_optional = None + self.index = None + self.optional = None self.title = None self.description = None @@ -285,41 +430,64 @@ self.references = elem.get("references") self.access = elem.get("access") self.unit = elem.get("unit") - self.is_index = elem.get("index", "n") == "y" and True - self.is_optional = elem.get("optional", "n") == "y" and True + self.index = elem.get("index", "n") == "y" and True + self.optional = elem.get("optional", "n") == "y" and True self.description = elem.get("desc") def extend(self, elem): self.title = elem.findtext("title") + def init(self): + if not self.title: + self.title = self.name + def __repr__(self): - args = (self.__class__.__name__, self.cls.name, self.name) + args = (self.__class__.__name__, self.cls._name, self.name) return "%s(%s,%s)" % args +class RosemaryHeader(RosemaryAttribute): + def __init__(self, cls, name, type): + super(RosemaryHeader, self).__init__(cls, name) + + self.type = type + + self.cls._headers.append(self) + self.cls._headers_by_name[self.name] = self + + def init(self): + super(RosemaryHeader, self).init() + + assert not self.references + + self.sql_column = SqlColumn(self.cls.sql_table, self.name, self.type) + self.sql_column.nullable = self.optional + class RosemaryReference(RosemaryAttribute): def __init__(self, cls, name): super(RosemaryReference, self).__init__(cls, name) - self.cls.references.append(self) - self.cls.references_by_name[self.name] = self + self.cls._references.append(self) + self.cls._references_by_name[self.name] = self self.that_cls = None def init(self): + super(RosemaryReference, self).init() + assert self.references tokens = self.references.split(":", 1) if len(tokens) == 2: - pkg = self.cls.package.model.packages_by_name[tokens[0]] + pkg = self.cls._package._model._packages_by_name[tokens[0]] cls = tokens[1] else: - pkg = self.cls.package + pkg = self.cls._package cls = tokens[0] try: - self.that_cls = pkg.classes_by_name[cls] - self.that_cls.inbound_references.append(self) + self.that_cls = pkg._classes_by_name[cls] + self.that_cls._inbound_references.append(self) except KeyError: log.error("Reference to '%s' invalid", self.references) @@ -327,11 +495,11 @@ name = "_%s_id" % self.name - col = SqlColumn(self.cls.sql_table, name, sql_int4) + col = SqlColumn(self.cls.sql_table, name, sql_int8) col.foreign_key_column = self.that_cls.sql_table.key_column + col.nullable = True self.sql_column = col - self.sql_column.nullable = self.is_optional name = "%s_fk" % col.name @@ -341,38 +509,46 @@ def __init__(self, cls, name): super(RosemaryProperty, self).__init__(cls, name) - self.cls.properties.append(self) - self.cls.properties_by_name[self.name] = self + self.cls._properties.append(self) + self.cls._properties_by_name[self.name] = self def init(self): + super(RosemaryProperty, self).init() + assert not self.references type = sql_types_by_qmf_type_string[self.type] self.sql_column = SqlColumn(self.cls.sql_table, self.name, type) - self.sql_column.nullable = self.is_optional + self.sql_column.nullable = self.optional class RosemaryStatistic(RosemaryAttribute): def __init__(self, cls, name): super(RosemaryStatistic, self).__init__(cls, name) - self.cls.statistics.append(self) - self.cls.statistics_by_name[self.name] = self + self.cls._statistics.append(self) + self.cls._statistics_by_name[self.name] = self def init(self): + super(RosemaryStatistic, self).init() + assert not self.references type = sql_types_by_qmf_type_string[self.type] - self.sql_column = SqlColumn(self.cls.sql_stats_table, self.name, type) + self.sql_column = SqlColumn(self.cls.sql_table, self.name, type) + self.sql_column.nullable = True + col = SqlColumn(self.cls.sql_stats_table, self.name, type) + col.nullable = self.optional + class RosemaryMethod(object): def __init__(self, cls, name): self.cls = cls self.name = name - self.cls.methods.append(self) - self.cls.methods_by_name[self.name] = self + self.cls._methods.append(self) + self.cls._methods_by_name[self.name] = self self.description = None @@ -393,9 +569,6 @@ for arg in self.arguments: arg.init() - def call(self, console, object, callback, **kwargs): - pass - class RosemaryArgument(object): def __init__(self, meth, name): self.meth = meth @@ -420,20 +593,30 @@ pass class RosemaryObject(object): - def __init__(self, cls): - self.cls = cls + def __init__(self, cls, id): + for column in cls.sql_table._columns: + setattr(self, column.name, None) - self.id = None - self.qmf_agent_id = None - self.qmf_object_id = None + self._class = cls + self._id = id - for name in self.cls.properties: - setattr(name, None) + # XXX prefix these with _ + def load(self, cursor): + self._class.load_object(cursor, self) - self.sql_insert = SqlInsert(self.cls.sql_table) + def save(self, cursor, columns=None): + self._class.save_object(cursor, self, columns) - def load(self, cursor, id): - pass # XXX self.__select.execute(cursor, {"id": id}) + def delete(self, cursor): + self._class.delete_object(cursor, self) - def save(self, cursor): - assert self.id is not None + def get_title(self): + if self._class._object_title: + return self._class._object_title % self.__dict__ + + for attr in ("name", "Name"): + if hasattr(self, attr): + return getattr(self, attr) + +class RosemaryNotFound(Exception): + pass Modified: mgmt/newdata/rosemary/python/rosemary/sqlmodel.py =================================================================== --- mgmt/trunk/rosemary/python/rosemary/sqlmodel.py 2010-03-22 14:00:07 UTC (rev 3870) +++ mgmt/newdata/rosemary/python/rosemary/sqlmodel.py 2010-03-22 14:58:08 UTC (rev 3871) @@ -1,93 +1,106 @@ from util import * class SqlModel(object): - def __init__(self): - self.schemas = list() - self.schemas_by_name = dict() + def __init__(self, model): + self._model = model - self.relations = list() - self.relations_by_name = dict() + self._schemas = list() + self._schemas_by_name = dict() def write_create_ddl(self, out): - for schema in self.schemas: + for schema in self._schemas: schema.write_create_ddl(out) - for schema in self.schemas: - for table in schema.tables: + for schema in self._schemas: + for table in schema._tables: table.write_alter_dll(out) def write_drop_ddl(self, out): - for schema in self.schemas: + for schema in self._schemas: schema.write_drop_ddl(out) class SqlSchema(object): def __init__(self, model, name): - self.model = model - self.name = name + self._model = model + self._name = name - self.model.schemas.append(self) - self.model.schemas_by_name[self.name] = self + self._model._schemas.append(self) + self._model._schemas_by_name[self._name] = self - mangled = self.name.replace(".", "_") + mangled = self._name.replace(".", "_") - if not hasattr(self.model, mangled): - setattr(self.model, mangled, self) + if hasattr(self._model, mangled): + raise Exception("Collision") - self.identifier = "\"%s\"" % self.name + setattr(self._model, mangled, self) - self.tables = list() - self.tables_by_name = dict() + # XXX _ this one too + self.identifier = "\"%s\"" % self._name - self.indexes = list() - self.indexes_by_name = dict() + self._tables = list() + self._tables_by_name = dict() + self._indexes = list() + self._indexes_by_name = dict() + + self._views = list() + self._views_by_name = dict() + def write_create_ddl(self, out): out.write("create schema %s\n" % self.identifier) - for table in self.tables: + for table in self._tables: table.write_create_ddl(out) - for index in self.indexes: + for index in self._indexes: index.write_create_ddl(out) + for view in self._views: + view.write_create_ddl(out) + out.write(" ;\n") def write_drop_ddl(self, out): out.write("drop schema %s cascade;\n" % self.identifier) def __repr__(self): - args = (self.__class__.__name__, self.name) + args = (self.__class__.__name__, self._name) return "%s(%s)" % args class SqlTable(object): def __init__(self, schema, name): - self.schema = schema - self.name = name + assert isinstance(schema, SqlSchema) - self.schema.tables.append(self) - self.schema.tables_by_name[self.name] = self + self._schema = schema + self._name = name - if not hasattr(self.schema, self.name): - setattr(self.schema, self.name, self) + self._schema._tables.append(self) + self._schema._tables_by_name[self._name] = self - self.identifier = "%s.\"%s\"" % (self.schema.identifier, self.name) + if hasattr(self._schema, self._name): + raise Exception("Collision") + + setattr(self._schema, self._name, self) + + # XXX _ these as well + self.identifier = "%s.\"%s\"" % (self._schema.identifier, self._name) self.key_column = None - self.columns = list() - self.columns_by_name = dict() + self._columns = list() + self._columns_by_name = dict() - self.constraints = list() - self.deferred_constraints = list() + self._constraints = list() + self._deferred_constraints = list() def write_create_ddl(self, out): - out.write(" create table \"%s\" (" % self.name) + out.write(" create table \"%s\" (" % self._name) exprs = list() - for col in self.columns: + for col in self._columns: exprs.append(col.get_ddl()) - for constraint in self.constraints: + for constraint in self._constraints: exprs.append(constraint.get_ddl()) exprs = ["\n %s" % x.strip() for x in exprs] @@ -97,19 +110,19 @@ out.write("\n )\n") def write_alter_dll(self, out): - if not self.deferred_constraints: + if not self._deferred_constraints: return out.write("alter table %s\n " % self.identifier) - constraints = [x.get_ddl() for x in self.deferred_constraints] + constraints = [x.get_ddl() for x in self._deferred_constraints] out.write(",\n ".join(constraints)) out.write("\n ;\n") def __repr__(self): - args = (self.__class__.__name__, self.schema.name, self.name) + args = (self.__class__.__name__, self._schema._name, self._name) return "%s(%s,%s)" % args class SqlColumn(object): @@ -118,14 +131,16 @@ self.name = name self.type = type - self.table.columns.append(self) - self.table.columns_by_name[self.name] = self + self.table._columns.append(self) + self.table._columns_by_name[self.name] = self - if not hasattr(self.table, self.name): - setattr(self.table, self.name, self) + if hasattr(self.table, self.name): + raise Exception("%s already has %s" % (self.table, self.name)) - self.identifier = "\"%s\".\"%s\"" % (self.table.name, self.name) + setattr(self.table, self.name, self) + self.identifier = "\"%s\".\"%s\"" % (self.table._name, self.name) + self.nullable = False self.foreign_key_column = None @@ -141,7 +156,7 @@ return " ".join(tokens) def __repr__(self): - args = (self.__class__.__name__, self.table.name, self.name) + args = (self.__class__.__name__, self.table._name, self.name) return "%s(%s,%s)" % args class SqlTableConstraint(object): @@ -150,11 +165,11 @@ self.name = name self.columns = columns - self.table.constraints.append(self) + self.table._constraints.append(self) class SqlPrimaryKeyConstraint(SqlTableConstraint): def get_ddl(self): - cols = "\"%s\"" % "\", \"".join([x.name for x in self.columns]) + cols = ", ".join(["\"%s\"" % x.name for x in self.columns]) return "constraint \"%s\" primary key (%s)" % (self.name, cols) @@ -171,8 +186,11 @@ self.this_column = this_column self.that_column = that_column - self.table.deferred_constraints.append(self) + self.table._deferred_constraints.append(self) + self.on_update = "cascade" + self.on_delete = "set null" + def get_ddl(self): tokens = list() @@ -180,8 +198,8 @@ tokens.append("foreign key (\"%s\")" % self.this_column.name) tokens.append("references %s" % self.that_column.table.identifier) tokens.append("(\"%s\")" % self.that_column.name) - - # XXX tokens.append("on delete set null;\n") + tokens.append("on update %s" % self.on_update) + tokens.append("on delete %s" % self.on_delete) return " ".join(tokens) @@ -193,11 +211,27 @@ self.name = name self.columns = columns - self.schema.indexes.append(self) - self.schema.indexes_by_name[self.name] = self + self.schema._indexes.append(self) + self.schema._indexes_by_name[self.name] = self def write_create_ddl(self, out): - cols = "\"%s\"" % "\", \"".join([x.name for x in self.columns]) + cols = ", ".join(["\"%s\"" % x.name for x in self.columns]) args = (self.name, self.columns[0].table.name, cols) out.write(" create index \"%s\" on \"%s\"(%s)\n" % args) + +class SqlView(object): + def __init__(self, schema, name, query): + self.schema = schema + self.name = name + self.query = query + + self.schema._views.append(self) + self.schema._views_by_name[self.name] = self + + self.identifier = "%s.\"%s\"" % (self.schema.identifier, self.name) + + def write_create_ddl(self, out): + query = self.query.emit(("*",)) + + out.write(" create view \"%s\" as %s" % (self.name, query)) Modified: mgmt/newdata/rosemary/python/rosemary/sqloperation.py =================================================================== --- mgmt/trunk/rosemary/python/rosemary/sqloperation.py 2010-03-22 14:00:07 UTC (rev 3870) +++ mgmt/newdata/rosemary/python/rosemary/sqloperation.py 2010-03-22 14:58:08 UTC (rev 3871) @@ -7,137 +7,100 @@ def __init__(self, table): self.table = table - def execute(self, cursor, columns, values, options=None): + def execute(self, cursor, columns, values=None, options=None): text = self.emit(columns, options) - log.debug("Sql text:\n%s", text) - log.debug("Sql values: %s", values) + if values is None: + values = {} - cursor.execute(text, values) + if self.table._schema._model._model.sql_logging_enabled: + self.log_sql(cursor, text, values) + try: + cursor.execute(text, values) + except: + log.exception("%s failed", self) + + self.log_sql(cursor, text, values) + + raise + + def log_sql(self, cursor, text, values): + log.info("Sql text: %s", text) + log.info("Sql values:") + + for item in sorted(values.items()): + log.info(" %-34s %r", *item) + + # XXX log.info("Sql row count: %i", cursor.rowcount) + + def __repr__(self): + return "%s(%s)" % (self.__class__.__name__, self.table) + class SqlSelectItem(SqlOperation): def emit(self, columns, options=None): cols = ", ".join([x.identifier for x in columns]) - args = (cols, self.table.identifier) + table = getattr(self.table, "identifier", self.table) - return "select %s from %s where _id = %%(id)s" % args + return "select %s from %s where _id = %%(_id)s" % (cols, table) -class SqlSelectItemByObjectId(SqlOperation): +class SqlSelectItemByQmfId(SqlOperation): def emit(self, columns, options=None): cols = ", ".join([x.identifier for x in columns]) - args = (cols, self.table.identifier) + table = getattr(self.table, "identifier", self.table) - return "select %s from %s where _qmf_object_id = %%(_qmf_object_id)s" \ - % args + exprs = list() + exprs.append("_qmf_agent_id = %(_qmf_agent_id)s") + exprs.append("_qmf_object_id = %(_qmf_object_id)s") + exprs = " and ".join(exprs) + return "select %s from %s where %s" % (cols, table, exprs) + class SqlInsertItem(SqlOperation): def emit(self, columns, options=None): + table = getattr(self.table, "identifier", self.table) names = [x.name for x in columns] cols = ", ".join(["\"%s\"" % x for x in names]) vals = ", ".join(["%%(%s)s" % x for x in names]) - args = (self.table.identifier, cols, vals) - return "insert into %s (%s) values (%s)" % args + args = (table, cols, vals) -class SqlUpdateItem(SqlOperation): - def emit(self, columns, options=None): - exprs = ["\"%s\" = %%(%s)s" % (x.name, x.name) for x in columns] - exprs = ", ".join(exprs) - args = (self.table.identifier, exprs) + return "insert into %s (%s) values (%s) returning _id" % args - return "update %s set %s where _id = %%(id)s" % args - -class SqlDeleteItem(SqlOperation): +class SqlInsertItemStats(SqlOperation): def emit(self, columns, options=None): - return "delete from %s where _id = %%(id)s" % self.table.identifier + table = getattr(self.table, "identifier", self.table) + names = [x.name for x in columns] -class SqlQuery(SqlOperation): - def __init__(self, table): - super(SqlQuery, self).__init__(table) + cols = ["\"%s\"" % x for x in names] + vals = ["%%(%s)s" % x for x in names] - self.order_by = self.OrderBy() - self.limit = self.Limit() + cols.append("\"_parent_id\"") + vals.append("%(_id)s") - self.joins = list() + cols = ", ".join(cols) + vals = ", ".join(vals) - def emit(self, columns, options): - tokens = list() - - cols = list() - - for column in columns: - if isinstance(column, SqlColumn): - cols.append(column.identifier) - else: - cols.append(str(column)) - - tokens.append("select %s" % ", ".join(cols)) - - tokens.append("from %s" % self.table.identifier) - - for join in self.joins: - tokens.append(join.emit()) - - if options: - if options.sort_column: - tokens.append(self.order_by.emit(options.sort_column, - options.sort_ascending)) - - tokens.append(self.limit.emit(options.limit, options.offset)) - - return "%s\n" % "\n".join(tokens) - - class OrderBy(object): - def emit(self, column, ascending): - if ascending: - direction = "asc" - else: - direction = "desc" - - return "order by %s %s" % (column.identifier, direction) - - class Limit(object): - def emit(self, limit, offset): - if limit is None: - limit = "all" - - return "limit %s offset %i" % (str(limit), offset) - -class SqlQueryOptions(object): - def __init__(self): - self.sort_column = None - self.sort_ascending = True - self.limit = None - self.offset = 0 + return "insert into %s (%s) values (%s)" % (table, cols, vals) -class SqlQueryJoin(object): - def __init__(self, query, this_column, that_column): - assert query - assert this_column - assert that_column +class SqlUpdateItem(SqlOperation): + def emit(self, columns, options=None): + table = getattr(self.table, "identifier", self.table) + exprs = ["\"%s\" = %%(%s)s" % (x.name, x.name) for x in columns] + exprs = ", ".join(exprs) - self.query = query - self.this_column = this_column - self.that_column = that_column + return "update %s set %s where _id = %%(_id)s" % (table, exprs) - assert self not in self.query.joins +class SqlDeleteItem(SqlOperation): + def emit(self, columns, options=None): + table = getattr(self.table, "identifier", self.table) - self.query.joins.append(self) + return "delete from %s where _id = %%(_id)s" % table -class SqlInnerJoin(SqlQueryJoin): - def emit(self): - table = self.that_column.table.identifier - this = self.this_column.identifier - that = self.that_column.identifier - args = (table, this, that) +class SqlDeleteItemStats(SqlOperation): + def emit(self, columns, options=None): + table = getattr(self.table, "identifier", self.table) - return "inner join %s on %s = %s" % args + expr = "_qmf_update_time < now() - interval '%(seconds)s seconds'" -class SqlOuterJoin(SqlQueryJoin): - def emit(self): - table = self.that_column.table.identifier - this = self.this_column.identifier - that = self.that_column.identifier - args = (table, this, that) - - return "left outer join %s on %s = %s" % args + return "delete from %s where %s" % (table, expr) Added: mgmt/newdata/rosemary/python/rosemary/sqlquery.py =================================================================== --- mgmt/newdata/rosemary/python/rosemary/sqlquery.py (rev 0) +++ mgmt/newdata/rosemary/python/rosemary/sqlquery.py 2010-03-22 14:58:08 UTC (rev 3871) @@ -0,0 +1,139 @@ +from sqlmodel import * +from sqloperation import * +from util import * + +log = logging.getLogger("rosemary.sqlquery") + +class SqlQuery(SqlOperation): + def __init__(self, table): + super(SqlQuery, self).__init__(table) + + self.order_by = self.OrderBy() + self.limit = self.Limit() + + self.joins = list() + self.filters = list() + + def emit(self, columns, options=None): + tokens = list() + + cols = list() + + for column in columns: + cols.append(getattr(column, "identifier", column)) + + tokens.append("select %s" % ", ".join(cols)) + + table = getattr(self.table, "identifier", self.table) + + tokens.append("from %s" % table) + + for join in self.joins: + tokens.append(join.emit()) + + filters = list() + + if self.filters: + filters.extend([x.emit() for x in self.filters]) + + if options and options.filters: + filters.extend([x.emit() for x in options.filters]) + + if filters: + tokens.append("where %s" % " and ".join(filters)) + + if options: + if options.sort_column: + tokens.append(self.order_by.emit(options.sort_column, + options.sort_ascending)) + + tokens.append(self.limit.emit(options.limit, options.offset)) + + return " ".join(tokens) + + class OrderBy(object): + def emit(self, column, ascending): + if ascending: + direction = "asc" + else: + direction = "desc" + + column = getattr(column, "identifier", column) + + return "order by %s %s" % (column, direction) + + class Limit(object): + def emit(self, limit, offset): + if limit is None: + limit = "all" + + return "limit %s offset %i" % (str(limit), offset) + +class SqlQueryOptions(object): + def __init__(self): + self.sort_column = None + self.sort_ascending = True + self.limit = None + self.offset = 0 + self.filters = list() + +class SqlQueryJoin(object): + def __init__(self, query, table, this, that): + assert query + assert table + assert this + assert that + + self.query = query + self.table = getattr(table, "identifier", table) + self.this = getattr(this, "identifier", this) + self.that = getattr(that, "identifier", that) + + assert self not in self.query.joins + self.query.joins.append(self) + +class SqlInnerJoin(SqlQueryJoin): + def emit(self): + args = (self.table, self.this, self.that) + + return "inner join %s on %s = %s" % args + +class SqlOuterJoin(SqlQueryJoin): + def emit(self): + args = (self.table, self.this, self.that) + + return "left outer join %s on %s = %s" % args + +class SqlQueryFilter(object): + def __init__(self, query): + if query: + assert isinstance(query, SqlQuery), query + + self.query = query + + if self.query: + assert self not in self.query.filters + self.query.filters.append(self) + +class SqlComparisonFilter(SqlQueryFilter): + def __init__(self, query, this, that, operator="="): + super(SqlComparisonFilter, self).__init__(query) + + assert isinstance(operator, str) + + self.this = getattr(this, "identifier", this) + self.that = getattr(that, "identifier", that) + self.operator = operator + + def emit(self): + return "%s %s %s" % (self.this, self.operator, self.that) + +class SqlExistenceFilter(SqlQueryFilter): + def __init__(self, query, subquery, operator="exists"): + super(SqlExistenceFilter, self).__init__(query) + + self.subquery = subquery + self.operator = operator + + def emit(self): + return "%s (%s)" % (self.operator, self.subquery) Modified: mgmt/newdata/rosemary/xml/condor.xml =================================================================== --- mgmt/trunk/rosemary/xml/condor.xml 2010-03-22 14:00:07 UTC (rev 3870) +++ mgmt/newdata/rosemary/xml/condor.xml 2010-03-22 14:58:08 UTC (rev 3871) @@ -198,17 +198,19 @@ <property name="LastFetchWorkCompleted" type="absTime" unit="nanosecond" desc="Number of nanoseconds since epoch when the - FetchWork Hook returned"/> - + FetchWork Hook returned" + optional="y"/> <property name="LastFetchWorkSpawned" type="absTime" unit="nanosecond" desc="Number of nanoseconds since epoch when the - FetchWork Hook was invoked"/> + FetchWork Hook was invoked" + optional="y"/> <property name="LastPeriodicCheckpoint" type="absTime" unit="nanosecond" desc="The number of nanoseconds since epoch when the job last performed a periodic checkpoint, only - present when a job is executing"/> + present when a job is executing" + optional="y"/>  </property> <property name="remoteParentPid"> <title>Parent PID</title> </property> </class> + + <class name="Exchange"> + <property name="name"> + <title>Name</title> + </property> + + <statistic name="producerCount"> + <title>Producers</title> + </statistic> + + <statistic name="bindingCount"> + <title>Bindings</title> + </statistic> + + <statistic name="msgRoutes"> + <title>Messages Routed</title> + </statistic> + + <statistic name="byteRoutes"> + <title>Bytes Routed</title> + </statistic> + </class> + + <class name="Queue"> + <property name="name"> + <title>Name</title> + </property> + + <statistic name="consumerCount"> + <title>Consumers</title> + </statistic> + + <statistic name="bindingCount"> + <title>Bindings</title> + </statistic> + + <statistic name="msgDepth"> + <title>Messages</title> + </statistic> + + <statistic name="byteDepth"> + <title>Bytes</title> + </statistic> + </class> + + <class name="System"> + <property name="nodeName"> + <title>Host</title> + </property> + </class> </package> + + <package name="org.apache.qpid.cluster"> + <class name="Cluster"> + <property name="clusterName"> + <title>Cluster</title> + </property> + </class> + </package> + + <package name="com.redhat.cumin"> + <class name="BrokerGroup"> + <title>Broker Group</title> + + <property name="name"> + <title>Name</title> + </property> + + <property name="description"> + <title>Description</title> + </property> + </class> + </package> + + <package name="com.redhat.sesame"> + </package> </model> Modified: mgmt/newdata/wooly/python/wooly/__init__.py =================================================================== --- mgmt/trunk/wooly/python/wooly/__init__.py 2010-03-22 14:00:07 UTC (rev 3870) +++ mgmt/newdata/wooly/python/wooly/__init__.py 2010-03-22 14:58:08 UTC (rev 3871) @@ -32,8 +32,8 @@ else: self.path = self.name - def check_me_merrily(self): - log.debug("Checking %s", self) + def seal(self): + log.debug("Sealing %s", self) def validate(self, session): value = self.get(session) @@ -144,9 +144,6 @@ for child in self.children: child.init() - assert not self.sealed - self.sealed = True - def init_computed_values(self): ancestors = list() widget = self.parent @@ -168,29 +165,71 @@ self.frame = widget break - def check_me_merrily(self): - assert self.sealed - assert self.path is not None - assert isinstance(self.page, Page) + if not self.html_class: + self.init_html_class() + def init_html_class(self): + tokens = list() + + if self.page.page_html_class: + tokens.append(self.page.page_html_class) + + for cls in self.__class__.__mro__: + tokens.append(cls.__name__) + + if cls is Widget: + break + + if not tokens: + tokens.append("_") + + self.html_class = " ".join(tokens) + + def seal(self): + assert not self.sealed + self.sealed = True + + assert self.path is not None, self + assert isinstance(self.page, Page), self.page + for attr in self.attributes: - attr.check_me_merrily() + attr.seal() for param in self.attributes: - param.check_me_merrily() + param.seal() for child in self.children: - child.check_me_merrily() + child.seal() def add_child(self, child): - assert not self.sealed - assert isinstance(child, Widget) - assert child is not self + assert not self.sealed, self + assert isinstance(child, Widget), "%s %s" % (self, child) + assert child is not self, self + assert child not in self.children, self + # XXX assert child.name not in self.children_by_name + if child.name in self.children_by_name: + log.error("%s is already in %s", child.name, self) + self.children.append(child) self.children_by_name[child.name] = child child.parent = self + def remove_child(self, child): + assert not self.sealed + assert isinstance(child, Widget) + assert child is not self + + self.children.remove(child) + del self.children_by_name[child.name] + child.parent = None + + def replace_child(self, child): + existing = self.children_by_name[child.name] + + self.remove_child(existing) + self.add_child(child) + def add_attribute(self, attribute): assert not self.sealed assert isinstance(attribute, Attribute) @@ -251,14 +290,11 @@ for child in self.children: child.save_parameters(session, params) - def get_args(self, session): - return () - - def process(self, session): + def process(self, session, *args): if self.app.devel_enabled: profile = self.page.profile.get(session) - call = ProcessCall(profile, self) + call = ProcessCall(profile, self, args) call.do(session) else: # XXX these should move into do_process @@ -269,21 +305,19 @@ if self.defer_enabled: self.page.enable_defer(session, self) - args = self.get_args(session) self.do_process(session, *args) def do_process(self, session, *args): for child in self.children: child.process(session) - def render(self, session): + def render(self, session, *args): if self.app.devel_enabled: profile = self.page.profile.get(session) - call = RenderCall(profile, self) + call = RenderCall(profile, self, args) string = call.do(session) else: - args = self.get_args(session) string = self.do_render(session, *args) if string is None: @@ -305,7 +339,7 @@ return self.path def render_class(self, session, *args): - return self.html_class or "_" + return self.html_class def render_href(self, session, *args): return session.marshal() @@ -357,6 +391,8 @@ def __init__(self, app, name): super(Page, self).__init__(app, name) + self.page_html_class = None + self.page_widgets = list() self.page_widgets_by_path = dict() @@ -375,6 +411,9 @@ self.page = self self.frame = self + if not self.html_class: + self.init_html_class() + def init_widget(self, widget): assert not self.sealed assert isinstance(widget, Widget) @@ -445,7 +484,7 @@ def do_init(self): for page in self.pages: page.init() - page.check_me_merrily() + page.seal() def add_page(self, page): if page.parent: Added: mgmt/newdata/wooly/python/wooly/datatable.py =================================================================== --- mgmt/newdata/wooly/python/wooly/datatable.py (rev 0) +++ mgmt/newdata/wooly/python/wooly/datatable.py 2010-03-22 14:58:08 UTC (rev 3871) @@ -0,0 +1,253 @@ +from wooly import * +from wooly.parameters import * +from wooly.table import * +from wooly.widgets import * +from util import * + +strings = StringCatalog(__file__) + +class DataAdapter(object): + def __init__(self): + self.fields = list() + self.fields_by_name = dict() + + def init(self): + for field in self.fields: + field.init() + + def get_count(self): + pass + + def get_data(self, values, options): + return () + +class DataAdapterField(object): + def __init__(self, adapter, name, type): + self.adapter = adapter + self.name = name + self.type = type + + self.index = len(self.adapter.fields) + self.adapter.fields.append(self) + self.adapter.fields_by_name[self.name] = self + + self.visible = True + + def init(self): + pass + + def get_title(self, session): + pass + + def get_content(self, session, record): + return record[self.index] + +class DataAdapterOptions(object): + def __init__(self): + self.sort_field = None + self.sort_ascending = True + self.limit = None + self.offset = None + + self.attributes = dict() + +class DataTable(Table): + def __init__(self, app, name, adapter): + super(DataTable, self).__init__(app, name) + + self.adapter = adapter + + self.data = Attribute(app, "data") + self.add_attribute(self.data) + + self.summary = Attribute(app, "summary") + self.add_attribute(self.summary) + + self.count = Attribute(app, "count") + self.add_attribute(self.count) + + self.header = DataTableHeader(app, "header") + self.replace_child(self.header) + + self.footer = DataTableFooter(app, "footer") + self.replace_child(self.footer) + + def init(self): + assert self.adapter + + self.adapter.init() + + super(DataTable, self).init() + + def get_data(self, session): + values = self.get_data_values(session) + options = self.get_data_options(session) + + return self.adapter.get_data(values, options) + + def get_data_values(self, session): + return {} + + def get_data_options(self, session): + options = DataAdapterOptions() + + name = self.sort.get(session) + + if name: + column = self.children_by_name[name] + + if hasattr(column, "field"): + options.sort_field = column.field + + options.sort_ascending = self.ascending.get(session) + options.limit = self.header.limit.get(session) + options.offset = self.header.offset.get(session) + + return options + + def get_count(self, session): + values = self.get_data_values(session) + return self.adapter.get_count(values) + + def do_process(self, session): + super(DataTable, self).do_process(session) + + start = time.time() + + data = self.get_data(session) + + seconds = time.time() - start + + self.data.set(session, data) + self.summary.set(session, (len(data), seconds)) + self.count.set(session, self.get_count(session)) + + def render_font_size(self, session): + return "%.1fem" % self.header.font.get(session) + + def render_css(self, session): + writer = Writer() + + font = self.header.font.get(session) + writer.write("table.DataTable { font-size: %.1fem; }" % font) + + for column in self.get_visible_columns(session): + writer.write(column.css.render(session)) + + return writer.to_string() + + def render_rows(self, session): + data = self.data.get(session) + + writer = Writer() + + for record in data: + writer.write(self.row.render(session, record)) + + return writer.to_string() + +class DataTableColumn(TableColumn): + def __init__(self, app, name, field): + super(DataTableColumn, self).__init__(app, name) + + self.field = field + + def render_text_align(self, session): + if self.field.type in (long, int, float, complex): + return "right" + + return "left" + + def render_header_content(self, session): + return self.field.get_title(session) + + def render_cell_content(self, session, record): + return self.field.get_content(session, record) + +class DataTableHeader(TableHeader): + def __init__(self, app, name): + super(DataTableHeader, self).__init__(app, name) + + self.font = FloatParameter(app, "font") + self.font.default = 0.9 + self.add_parameter(self.font) + + self.limit = IntegerParameter(app, "limit") + self.limit.default = 25 + self.add_parameter(self.limit) + + self.offset = IntegerParameter(app, "offset") + self.offset.default = 0 + self.add_parameter(self.offset) + + self.font_selector = DataTableFontSelector(app, "font", self.font) + self.add_child(self.font_selector) + + self.limit_selector = DataTableLimitSelector(app, "limit", self.limit) + self.add_child(self.limit_selector) + + self.page_selector = DataTablePageSelector(app, "page", self.offset) + self.add_child(self.page_selector) + +class DataTableFooter(TableFooter): + def render_summary(self, session): + results, seconds = self.table.summary.get(session) + count = self.table.count.get(session) + + args = (results, count, seconds * 1000) + return "%i of %i, %.02f millis" % args + +class DataTableSelector(TableChild): + def __init__(self, app, name, selection): + super(DataTableSelector, self).__init__(app, name) + + self.selection = selection + + self.option = self.Option(app, "option") + self.add_child(self.option) + + def get_options(self, session): + return () + + def render_options(self, session): + options = list() + + for option in self.get_options(session): + options.append(self.option.render(session, option)) + + return ", ".join(options) + + class Option(Link): + def render_class(self, session, option): + if self.parent.selection.get(session) == option[0]: + return "selected" + + def edit_session(self, session, option): + self.parent.selection.set(session, option[0]) + + def render_content(self, session, option): + return option[1] + +class DataTableFontSelector(DataTableSelector): + def get_options(self, session): + return ((0.8, "S"), (0.9, "M"), (1.0, "L")) + + def render_title(self, session): + return "Font" + +class DataTablePageSelector(DataTableSelector): + def get_options(self, session): + count = self.table.count.get(session) + limit = self.table.header.limit.get(session) + + return [(x[1], x[0]) for x in enumerate(range(0, count, limit), 1)] + + def render_title(self, session): + return "Page" + +class DataTableLimitSelector(DataTableSelector): + def get_options(self, session): + return ((25, 25), (50, 50), (100, 100)) + + def render_title(self, session): + return "Limit" Added: mgmt/newdata/wooly/python/wooly/datatable.strings =================================================================== --- mgmt/newdata/wooly/python/wooly/datatable.strings (rev 0) +++ mgmt/newdata/wooly/python/wooly/datatable.strings 2010-03-22 14:58:08 UTC (rev 3871) @@ -0,0 +1,35 @@ +[DataTable.css] +table.DataTable th.controls { + text-align: left; +} + +table.DataTable th.controls > div.right { + float: right; + text-align: right; + margin: 0 0 0 2em; +} + +[DataTableHeader.html] +<thead> + <tr> + <th colspan="{colspan}" class="controls"> + <div class="right">{limit}</div> + <div class="right">{font}</div> + {page} + </th> + </tr> + <tr>{headers}</tr> +</thead> + +[DataTableFooter.html] +<tfoot><tr><td colspan="{colspan}">{summary}</td></tr></tfoot> + +[DataTableSelector.css] +ul.DataTableSelector { + display: inline; + padding: 0; +} + +[DataTableSelector.html] +<span>{title}</span> +<span>{options}</span> Modified: mgmt/newdata/wooly/python/wooly/forms.py =================================================================== --- mgmt/trunk/wooly/python/wooly/forms.py 2010-03-22 14:00:07 UTC (rev 3870) +++ mgmt/newdata/wooly/python/wooly/forms.py 2010-03-22 14:58:08 UTC (rev 3871) @@ -66,7 +66,7 @@ if isinstance(anc, Form): self.form = anc - assert self.form # Not inside a form + assert self.form, "Not inside a form" def get_items(self, session, *args): return self.form.errors.get(session) @@ -193,11 +193,12 @@ self.size = 15 class CheckboxInput(FormInput): - def __init__(self, app, name): - super(CheckboxInput, self).__init__(app, name, None) + def __init__(self, app, name, param=None): + super(CheckboxInput, self).__init__(app, name, param) - self.param = VoidBooleanParameter(app, "param") - self.add_parameter(self.param) + if not self.param: + self.param = VoidBooleanParameter(app, "param") + self.add_parameter(self.param) def render_checked_attr(self, session, *args): if self.get(session): @@ -335,8 +336,8 @@ if isinstance(anc, Form): self.form = anc - def check_me_merrily(self): - super(FormField, self).check_me_merrily() + def seal(self): + super(FormField, self).seal() assert self.form # Not inside a form Modified: mgmt/newdata/wooly/python/wooly/parameters.py =================================================================== --- mgmt/trunk/wooly/python/wooly/parameters.py 2010-03-22 14:00:07 UTC (rev 3870) +++ mgmt/newdata/wooly/python/wooly/parameters.py 2010-03-22 14:58:08 UTC (rev 3871) @@ -87,6 +87,13 @@ except: return string +class FloatParameter(Parameter): + def do_unmarshal(self, string): + try: + return float(string) + except: + return string + class BooleanParameter(Parameter): def __init__(self, app, name): Parameter.__init__(self, app, name) Modified: mgmt/newdata/wooly/python/wooly/profile.py =================================================================== --- mgmt/trunk/wooly/python/wooly/profile.py 2010-03-22 14:00:07 UTC (rev 3870) +++ mgmt/newdata/wooly/python/wooly/profile.py 2010-03-22 14:58:08 UTC (rev 3871) @@ -88,9 +88,10 @@ visit(root, 0) class WidgetCall(object): - def __init__(self, profile, widget): + def __init__(self, profile, widget, args): self.profile = profile self.widget = widget + self.args = args self.profile @@ -131,7 +132,7 @@ self.self_time = self.time def __repr__(self): - return "%s(%s)" % (self.__class__.__name__, self.widget) + return "%s(%s,%s)" % (self.__class__.__name__, self.widget, self.args) class ProcessCall(WidgetCall): def do(self, session): @@ -145,8 +146,7 @@ if self.widget.defer_enabled: self.widget.page.enable_defer(session, self.widget) - args = self.widget.get_args(session) - self.widget.do_process(session, *args) + self.widget.do_process(session, *self.args) self.end = time.time() @@ -159,8 +159,7 @@ self.start = time.time() - args = self.widget.get_args(session) - result = self.widget.do_render(session, *args) + result = self.widget.do_render(session, *self.args) if result is None: result = "" Modified: mgmt/newdata/wooly/python/wooly/server.py =================================================================== --- mgmt/trunk/wooly/python/wooly/server.py 2010-03-22 14:00:07 UTC (rev 3870) +++ mgmt/newdata/wooly/python/wooly/server.py 2010-03-22 14:58:08 UTC (rev 3871) @@ -27,6 +27,7 @@ self.server = CherryPyWSGIServer \ ((self.addr, self.port), self.service_request) self.server.environ["wsgi.version"] = (1, 1) + self.server._interrupt = True self.client_sessions_by_id = dict() self.client_session_expire_thread = ClientSessionExpireThread(self) @@ -38,6 +39,8 @@ self.server.ssl_private_key = path def do_init(self): + return # XXX urgh + s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) try: Added: mgmt/newdata/wooly/python/wooly/table.py =================================================================== --- mgmt/newdata/wooly/python/wooly/table.py (rev 0) +++ mgmt/newdata/wooly/python/wooly/table.py 2010-03-22 14:58:08 UTC (rev 3871) @@ -0,0 +1,238 @@ +from forms import * +from parameters import * +from util import * +from wooly import * + +strings = StringCatalog(__file__) + +class Table(Widget): + def __init__(self, app, name): + super(Table, self).__init__(app, name) + + self.header = TableHeader(app, "header") + self.add_child(self.header) + + self.footer = TableFooter(app, "footer") + self.add_child(self.footer) + + self.columns = list() + + self.row = TableRow(app, "row") + self.add_child(self.row) + + self.sort = SymbolParameter(app, "sort") + self.add_parameter(self.sort) + + self.ascending = BooleanParameter(app, "ascending") + self.add_parameter(self.ascending) + + def add_column(self, column): + self.add_child(column) + + self.columns.append(column) + + def get_data(self, session): + return () + + def get_visible_columns(self, session): + return [x for x in self.columns if x.visible] + + def render_css(self, session): + writer = Writer() + + for column in self.get_visible_columns(session): + writer.write(column.css.render(session)) + + return writer.to_string() + + def render_columns(self, session): + writer = Writer() + + for column in self.get_visible_columns(session): + writer.write(column.render(session)) + + return writer.to_string() + + def render_colspan(self, session): + return len(self.get_visible_columns(session)) + + def render_rows(self, session): + data = self.get_data(session) + + writer = Writer() + + for record in data: + writer.write(self.row.render(session, record)) + + return writer.to_string() + +class TableChild(Widget): + def init(self): + super(TableChild, self).init() + + for anc in self.ancestors: + if isinstance(anc, Table): + self.table = anc + + assert self.table, "Not inside a table" + +class TableColumn(TableChild): + def __init__(self, app, name): + super(TableColumn, self).__init__(app, name) + + self.css = TableColumnCss(app, "css") + self.add_child(self.css) + + self.header = TableColumnHeader(app, "header") + self.add_child(self.header) + + self.cell = TableColumnCell(app, "cell") + self.add_child(self.cell) + + self.visible = True + self.width = None + + def render_class(self, session): + tokens = list() + tokens.append(self.name) + + if self.name == self.table.sort.get(session): + tokens.append("selected") + + return " ".join(tokens) + + def render_width(self, session): + width = self.width + + if not width: + width = "auto" + + return width + + def render_text_align(self, session): + return "left" + + def render_header_href(self, session): + sort = self.table.sort.get(session) + ascending = self.table.ascending.get(session) + + branch = session.branch() + + self.table.sort.set(branch, self.name) + + if sort == self.name: + self.table.ascending.set(branch, not ascending) + + return branch.marshal() + + def render_header_content(self, session): + pass + + def render_cell_content(self, session, record): + pass + +class TableColumnCss(TableChild): + def render_class(self, session): + return self.parent.name + + def render_text_align(self, session): + return self.parent.render_text_align(session) + + def render_width(self, session): + return self.parent.render_width(session) + +class TableColumnHeader(TableChild): + def render_class(self, session): + return self.parent.render_class(session) + + def render_href(self, session): + return self.parent.render_header_href(session) + + def render_content(self, session): + return self.parent.render_header_content(session) + +class TableColumnCell(TableChild): + def render_class(self, session, record): + return self.parent.render_class(session) + + def render_content(self, session, record): + return self.parent.render_cell_content(session, record) + +class TableHeader(TableChild): + def render_colspan(self, session): + return self.table.render_colspan(session) + + def render_headers(self, session): + writer = Writer() + + for column in self.table.get_visible_columns(session): + writer.write(column.header.render(session)) + + return writer.to_string() + +class TableFooter(TableChild): + def render_colspan(self, session): + return self.table.render_colspan(session) + +class TableRow(TableChild): + def render_cells(self, session, record): + writer = Writer() + + for column in self.table.get_visible_columns(session): + writer.write(column.cell.render(session, record)) + + return writer.to_string() + +class LinkColumn(TableColumn): + def __init__(self, app, name): + super(LinkColumn, self).__init__(app, name) + + self.cell = LinkColumnCell(app, "cell") + self.replace_child(self.cell) + + def render_cell_href(self, session, record): + pass + +class LinkColumnCell(TableColumnCell): + def render_href(self, session, record): + return self.parent.render_cell_href(session, record) + +class NewCheckboxColumn(TableColumn): + def __init__(self, app, name): + super(NewCheckboxColumn, self).__init__(app, name) + + self.selection = selection + + self.header = CheckboxColumnHeader(app, "header") + self.replace_child(self.header) + + self.cell = CheckboxColumnCell(app, "cell", selection) + self.replace_child(self.cell) + + self.width = "1%" + + def init(self): + super(NewCheckboxColumn, self).init() + + assert self.selection, self + + def render_cell_value(self, session, record): + pass + +class CheckboxColumnHeader(TableColumnHeader): + def render_name(self, session): + return self.parent.selection.path + +class CheckboxColumnCell(TableColumnCell): + def __init__(self, app, name, selection): + super(CheckboxColumnCell, self).__init__(app, name) + + self.input = CheckboxColumnInput(app, "input", selection) + self.add_child(self.input) + + def render_input(self, session, record): + return self.input.render(session, record) + +class CheckboxColumnInput(CheckboxInput): + def render_value(self, session, record): + return self.parent.parent.render_cell_value(session, record) Added: mgmt/newdata/wooly/python/wooly/table.strings =================================================================== --- mgmt/newdata/wooly/python/wooly/table.strings (rev 0) +++ mgmt/newdata/wooly/python/wooly/table.strings 2010-03-22 14:58:08 UTC (rev 3871) @@ -0,0 +1,106 @@ +[Table.css] +table.Table { + table-layout: auto; + width: 100%; + border-collapse: collapse; +} + +table.Table tr { + vertical-align: top; +} + +table.Table td, table.Table th { + white-space: nowrap; + overflow: hidden; +} + +table.Table th.controls { + text-align: left; +} + +table.Table th.controls > div.right { + float: right; + text-align: right; + margin: 0 0 0 2em; +} + +table.Table input { + margin: 0; + vertical-align: -10%; +} + +[Table.html] +<table id="{id}" class="{class}"> + <style type="text/css"> + {css} + </style> + {header} + {footer} + <tbody>{rows}</tbody> +</table> + +[TableHeader.html] +<thead><tr>{headers}</tr></thead> + +[TableColumn.html] +<col class="{class}" width="{width}"/> + +[TableColumnCss.html] +table.Table td.{class}, +table.Table th.{class} { + text-align: {text_align}; + width: {width}; +} + +table.Table th.{class}.selected { + background-color: #f0f0f0; +} + +table.Table td.{class}.selected { + background-color: #f7f7f7; +} + +[TableColumnHeader.html] +<th class="{class}"><a href="{href}">{content}</a></th> + +[TableColumnCell.html] +<td class="{class}">{content}</td> + +[TableRow.html] +<tr>{cells}</tr> + +[TableSelector.css] +ul.TableSelector { + display: inline; + padding: 0; +} + +[TableSelector.html] +<span>{title}</span> +<span>{options}</span> + +[LinkColumnCell.html] +<td class="{class}"><a href="{href}">{content}</a></td> + +[CheckboxColumnHeader.javascript] +(function() { + wooly.clickTableCheckboxes = function(control, inputName) { + var elems = $$("input[name=" + inputName + "]"); + + for (var i = 0; i < elems.length; i++) { + var elem = elems[i]; + + if (elem.checked != control.checked) { + elem.click(); + } + } + }; +}()) + +[CheckboxColumnHeader.html] +<th class="{class}"><input id="{id}" type="checkbox" + onclick="wooly.clickTableCheckboxes(this, '{name}')" +/></th> + +[CheckboxColumnCell.html] +<td class="{class}">{input}</td> Modified: mgmt/newdata/wooly/python/wooly/tables.py =================================================================== --- mgmt/trunk/wooly/python/wooly/tables.py 2010-03-22 14:00:07 UTC (rev 3870) +++ mgmt/newdata/wooly/python/wooly/tables.py 2010-03-22 14:58:08 UTC (rev 3871) @@ -29,7 +29,7 @@ def get_request_visible_columns(self, session, vlist): return [col for col in self.columns if col.visible or col.name in vlist] - def render_headers(self, session, *args): + def render_headers(self, session): writer = Writer() for column in self.get_visible_columns(session): @@ -38,7 +38,7 @@ return writer.to_string() - def render_column_count(self, session, *args): + def render_column_count(self, session): vlist = self.get_visible_columns(session) return len(vlist) @@ -46,8 +46,7 @@ writer = Writer() for col in self.get_visible_columns(session): - col.set_item(session, item) - writer.write(col.render(session)) + writer.write(col.render(session, item)) return writer.to_string() @@ -62,7 +61,7 @@ if self.scolumn.default is None: self.scolumn.default = column.name - def render_columns(self, session, *args): + def render_columns(self, session): writer = Writer() for column in self.get_visible_columns(session): @@ -91,16 +90,16 @@ def is_reversed(self, session): return self.reversed.get(session) - def do_get_items(self, session, *args): + def do_get_items(self, session): """Gets the rows""" return None - def render_count(self, session, *args): - count = self.get_item_count(session, *args) + def render_count(self, session): + count = self.get_item_count(session) return "%i %s" % (count, count == 1 and "item" or "items") - def render_none(self, session, *args): + def render_none(self, session): """For producing a message when the table is empty""" return None @@ -116,15 +115,6 @@ self.align = None self.width = None - self.__item = Attribute(app, "item") - self.add_attribute(self.__item) - - def set_item(self, session, item): - return self.__item.set(session, item) - - def get_args(self, session): - return (self.__item.get(session),) - def get_column_key(self, session): return self.name @@ -170,10 +160,10 @@ self.column = column - def render_attrs(self, session, *args): + def render_attrs(self, session): return self.column.render_attrs(session) - def render_href(self, session, *args): + def render_href(self, session): branch = session.branch() sel = self.parent.get_selected_column(session) @@ -186,11 +176,10 @@ return branch.marshal() - def render_content(self, session, *args): - cargs = self.column.get_args(session) - return self.column.render_title(session, *cargs) + def render_content(self, session): + return self.column.render_title(session) - def render_sorted_dir(self, session, *args): + def render_sorted_dir(self, session): sel = self.parent.get_selected_column(session) if sel is self.column: @@ -211,77 +200,77 @@ self.__count_sql_tmpl = WidgetTemplate(self, "count_sql") self.__find_sql_tmpl = WidgetTemplate(self, "find_sql") - def render_sql(self, session, *args): + def render_sql(self, session): writer = Writer() - self.__sql_tmpl.render(writer, session, *args) + self.__sql_tmpl.render(writer, session) return writer.to_string() - def render_sql_where(self, session, *args): + def render_sql_where(self, session): constraints = self.get_sql_where_constraints(session) if constraints: return "where %s" % " and ".join(constraints) - def render_find_sql_where(self, session, *args): + def render_find_sql_where(self, session): pass - def render_sql_order_by(self, session, *args): + def render_sql_order_by(self, session): scol = self.get_selected_column(session) if scol: return scol.get_order_by_sql(session) - def render_sql_orderby(self, session, *args): - return self.render_sql_order_by(session, *args) + def render_sql_orderby(self, session): + return self.render_sql_order_by(session) - def render_sql_limit(self, session, *args): + def render_sql_limit(self, session): return None - def render_count_sql(self, session, *args): + def render_count_sql(self, session): writer = Writer() - self.__count_sql_tmpl.render(writer, session, *args) + self.__count_sql_tmpl.render(writer, session) return writer.to_string() - def render_find_sql(self, session, *args): + def render_find_sql(self, session): writer = Writer() - self.__find_sql_tmpl.render(writer, session, *args) + self.__find_sql_tmpl.render(writer, session) return writer.to_string() - def get_sql_where_constraints(self, session, *args): + def get_sql_where_constraints(self, session): return list() - def get_sql_values(self, session, *args): + def get_sql_values(self, session): return None - def get_find_sql_values(self, session, *args): + def get_find_sql_values(self, session): return None def get_connection(self, session): pass - def get_item_count(self, session, *args): + def get_item_count(self, session): conn = self.get_connection(session) if not conn: raise Exception("Database error") cursor = conn.cursor() - sql = self.render_count_sql(session, *args) - sql_values = self.get_sql_values(session, *args) + sql = self.render_count_sql(session) + sql_values = self.get_sql_values(session) cursor.execute(sql, sql_values) data = cursor.fetchone() return data[0] - def do_get_items(self, session, *args): + def do_get_items(self, session): conn = self.get_connection(session) if not conn: raise Exception("Database error") cursor = conn.cursor() - sql = self.render_sql(session, *args) - sql_values = self.get_sql_values(session, *args) + sql = self.render_sql(session) + sql_values = self.get_sql_values(session) #print "SQL TEXT", sql #print "SQL VALS", sql_values @@ -290,8 +279,8 @@ return cursor - def render_items(self, session, *args): - cursor = self.get_items(session, *args) + def render_items(self, session): + cursor = self.get_items(session) cols = [spec[0] for spec in cursor.description] data = dict() @@ -305,7 +294,7 @@ return writer.to_string() - def find_item(self, session, *args): + def find_item(self, session): """ Find items in the current ItemSet To use this an SqlTable derived object needs to have a @@ -316,12 +305,12 @@ conn = self.get_connection(session) if conn: cursor = conn.cursor() - select = self.render_find_sql(session, *args) - where = self.render_sql_where(session, *args) - sql_values = self.get_sql_values(session, *args) + select = self.render_find_sql(session) + where = self.render_sql_where(session) + sql_values = self.get_sql_values(session) - find_where = self.render_find_sql_where(session, *args) - find_values = self.get_find_sql_values(session, *args) + find_where = self.render_find_sql_where(session) + find_values = self.get_find_sql_values(session) sql = " and ".join(["%s %s" % (select, where), find_where]) if sql_values: for sql_val in sql_values: @@ -355,5 +344,5 @@ return "order by %s %s" % (key, dir) class SqlTableFilter(Widget): - def get_sql_constraint(self, session, *args): + def get_sql_constraint(self, session): pass Modified: mgmt/newdata/wooly/python/wooly/tables.strings =================================================================== --- mgmt/trunk/wooly/python/wooly/tables.strings 2010-03-22 14:00:07 UTC (rev 3870) +++ mgmt/newdata/wooly/python/wooly/tables.strings 2010-03-22 14:58:08 UTC (rev 3871) @@ -3,8 +3,7 @@ table-layout: fixed; } -table.ItemTable td -table.ItemTable th { +table.ItemTable td, table.ItemTable th { white-space: nowrap; overflow: hidden; } Modified: mgmt/newdata/wooly/python/wooly/template.py =================================================================== --- mgmt/trunk/wooly/python/wooly/template.py 2010-03-22 14:00:07 UTC (rev 3870) +++ mgmt/newdata/wooly/python/wooly/template.py 2010-03-22 14:58:08 UTC (rev 3871) @@ -3,11 +3,11 @@ class ObjectTemplate(object): def __init__(self, obj, text): self.__object = obj - self.__text = text + self.text = text self.__fragments = None def compile(self): - return self.resolve(self.parse(self.__text)) + return self.resolve(self.parse(self.text)) def parse(self, text): strings = list() Modified: mgmt/newdata/wooly/python/wooly/widgets.py =================================================================== --- mgmt/trunk/wooly/python/wooly/widgets.py 2010-03-22 14:00:07 UTC (rev 3870) +++ mgmt/newdata/wooly/python/wooly/widgets.py 2010-03-22 14:58:08 UTC (rev 3871) @@ -167,43 +167,40 @@ def __init__(self, app, name): super(ItemSet, self).__init__(app, name) - self.html_class = ItemSet.__name__ - self.items = Attribute(app, "items") self.add_attribute(self.items) self.item_tmpl = WidgetTemplate(self, "item_html") - def get_item_count(self, session, *args): - return len(self.get_items(session, *args)) + def get_item_count(self, session): + return len(self.get_items(session)) - def get_items(self, session, *args): + def get_items(self, session): items = self.items.get(session) if items is None: - items = self.do_get_items(session, *args) + items = self.do_get_items(session) if items is None: items = () return items - def do_get_items(self, session, *args): + def do_get_items(self, session): return () - def render_items(self, session, *args): - items = self.get_items(session, *args) + def render_items(self, session): writer = Writer() - for item in items: + for item in self.get_items(session): self.item_tmpl.render(writer, session, item) return writer.to_string() def render_item_content(self, session, item): - return None + return item - def render_none(self, session, *args): + def render_none(self, session): """For producing a message when the set is empty""" return None @@ -225,6 +222,13 @@ else: return "_" + def render_item_href(self, session, item): + branch = session.branch() + + self.selection.set(branch, item) + + return branch.marshal() + class RenderingItemSet(Widget): def __init__(self, app, name, item_renderer): super(RenderingItemSet, self).__init__(app, name) @@ -234,27 +238,27 @@ self.items = Attribute(app, "items") self.add_attribute(self.items) - def get_item_count(self, session, *args): - return len(self.get_items(session, *args)) + def get_item_count(self, session): + return len(self.get_items(session)) - def get_items(self, session, *args): + def get_items(self, session): items = self.items.get(session) if items is None: - items = self.do_get_items(session, *args) + items = self.do_get_items(session) + if items is None: items = () return items - def do_get_items(self, session, *args): + def do_get_items(self, session): pass - def render_items(self, session, *args): - items = self.get_items(session, *args) + def render_items(self, session): writer = Writer() - for item in items: + for item in self.get_items(session): self.item_renderer.render(writer, session, item) return writer.to_string() @@ -280,17 +284,17 @@ self.__tmpl.render(writer, session, item) class ItemTree(ItemSet): - def get_items(self, session, *args): + def get_items(self, session): """Get the root items""" pass - def get_child_items(self, session, *args): + def get_child_items(self, session): pass - def render_child_items(self, session, *args): + def render_child_items(self, session): writer = Writer() - for child in self.get_child_items(session, *args): + for child in self.get_child_items(session): self.item_renderer.render(writer, session, child) return writer.to_string() Modified: mgmt/newdata/wooly/python/wooly/widgets.strings =================================================================== --- mgmt/trunk/wooly/python/wooly/widgets.strings 2010-03-22 14:00:07 UTC (rev 3870) +++ mgmt/newdata/wooly/python/wooly/widgets.strings 2010-03-22 14:58:08 UTC (rev 3871) @@ -78,7 +78,7 @@ <a href="{href}" class="Toggle {state}">{content}</a> [ItemSet.css] -ul.ItemSet li.selected { +ul.ItemSet li.selected, ul.ItemSet li.selected a { color: black; } @@ -88,6 +88,9 @@ [ItemSet.item_html] <li class="{item_class}">{item_content}</li> +[SelectionItemSet.item_html] +<li class="{item_class}"><a href="{item_href}">{item_content}</a></li> + [ItemTree.html] <ul class="ItemTree">{items}</ul> Modified: mgmt/newdata/wooly/python/wooly/wsgiserver/__init__.py =================================================================== --- mgmt/trunk/wooly/python/wooly/wsgiserver/__init__.py 2010-03-22 14:00:07 UTC (rev 3870) +++ mgmt/newdata/wooly/python/wooly/wsgiserver/__init__.py 2010-03-22 14:58:08 UTC (rev 3871) @@ -130,6 +130,9 @@ 'WWW-AUTHENTICATE'] +# XXX JR +socket.setdefaulttimeout(1.0) + class WSGIPathInfoDispatcher(object): """A WSGI dispatcher for dispatch based on the PATH_INFO. @@ -1679,6 +1682,7 @@ def bind(self, family, type, proto=0): """Create (or recreate) the actual socket object.""" self.socket = socket.socket(family, type, proto) + prevent_socket_inheritance(self.socket) self.socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) if self.nodelay and not isinstance(self.bind_addr, str): @@ -1699,7 +1703,7 @@ pass self.socket.bind(self.bind_addr) - + def tick(self): """Accept a new connection and put it on the Queue.""" try:

16 years, 1 month

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

rhmessaging-commits March 2010