ADDED .fossil-settings/crnl-glob Index: .fossil-settings/crnl-glob ================================================================== --- /dev/null +++ .fossil-settings/crnl-glob @@ -0,0 +1,1 @@ +docs/manual/megatest_manual.html Index: .mtutil.scm ================================================================== --- .mtutil.scm +++ .mtutil.scm @@ -1,5 +1,21 @@ +;; Copyright 2006-2017, Matthew Welland. +;; +;; This file is part of Megatest. +;; +;; Megatest is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. +;; +;; Megatest is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. +;; +;; You should have received a copy of the GNU General Public License +;; along with Megatest. If not, see . (use json) (use ducttape-lib) (define (get-last-runname area-path target) @@ -23,45 +39,46 @@ (define (str-first-char->number str) (char->integer (string-ref str 0))) ;; example of how to set up and write target mappers ;; -(hash-table-set! *target-mappers* - 'prefix-contour - (lambda (target run-name area area-path reason contour mode-patt) - (conc contour "/" target))) -(hash-table-set! *target-mappers* - 'prefix-area-contour - (lambda (target run-name area area-path reason contour mode-patt) - (conc area "/" contour "/" target))) - -(hash-table-set! *runname-mappers* - 'corporate-ww - (lambda (target run-name area area-path reason contour mode-patt) - (print "corporate-ww called with: target=" target " run-name=" run-name " area=" area " area-path=" area-path " reason=" reason " contour=" contour " mode-patt=" mode-patt) - (let* ((last-name (get-last-runname area-path target)) - (last-letter (let* ((ch (if (string? last-name) - (let ((len (string-length last-name))) - (substring last-name (- len 1) len)) - "a")) - (chnum (str-first-char->number ch)) - (a (str-first-char->number "a")) - (z (str-first-char->number "z"))) - (if (and (>= chnum a)(<= chnum z)) - chnum - #f))) - (next-letter (if last-letter - (list->string - (list - (integer->char - (+ last-letter 1)))) ;; surely there is an easier way? - "a"))) - ;; (print "last-name: " last-name " last-letter: " last-letter " next-letter: " next-letter) - (conc (seconds->wwdate (current-seconds)) next-letter)))) - -(hash-table-set! *runname-mappers* - 'auto - (lambda (target run-name area area-path reason contour mode-patt) - "auto-eh")) - -;; (print "Got here!") +(add-target-mapper 'prefix-contour + (lambda (target run-name area area-path reason contour mode-patt) + (conc contour "/" target))) +(add-target-mapper 'prefix-area-contour + (lambda (target run-name area area-path reason contour mode-patt) + (conc area "/" contour "/" target))) + +(add-runname-mapper 'corporate-ww + (lambda (target run-name area area-path reason contour mode-patt) + (print "corporate-ww called with: target=" target " run-name=" run-name " area=" area " area-path=" area-path " reason=" reason " contour=" contour " mode-patt=" mode-patt) + (let* ((last-name (get-last-runname area-path target)) + (last-letter (let* ((ch (if (string? last-name) + (let ((len (string-length last-name))) + (substring last-name (- len 1) len)) + "a")) + (chnum (str-first-char->number ch)) + (a (str-first-char->number "a")) + (z (str-first-char->number "z"))) + (if (and (>= chnum a)(<= chnum z)) + chnum + #f))) + (next-letter (if last-letter + (list->string + (list + (integer->char + (+ last-letter 1)))) ;; surely there is an easier way? + "a"))) + ;; (print "last-name: " last-name " last-letter: " last-letter " next-letter: " next-letter) + (conc (seconds->wwdate (current-seconds)) next-letter)))) + +(add-runname-mapper 'auto + (lambda (target run-name area area-path reason contour mode-patt) + "auto-eh")) + +;; run only areas where first letter of area name is "a" +;; +(add-area-checker 'first-letter-a + (lambda (area target contour) + (string-match "^a.*$" area))) + Index: COPYING ================================================================== --- COPYING +++ COPYING @@ -1,724 +1,675 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 + GNU GENERAL PUBLIC LICENSE - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to your programs, too. When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. The precise terms and conditions for copying, distribution and modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of this License. - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least +state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. Copyright (C) - This program is free software; you can redistribute it and/or modify + This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or + the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - + along with this program. If not, see . Also add information on how to contact you by electronic and paper mail. -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. - - -GNU Free Documentation License -****************************** - - Version 1.1, March 2000 - Copyright (C) 2000 Free Software Foundation, Inc. - 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - 0. PREAMBLE - - The purpose of this License is to make a manual, textbook, or other - written document "free" in the sense of freedom: to assure everyone - the effective freedom to copy and redistribute it, with or without - modifying it, either commercially or noncommercially. Secondarily, - this License preserves for the author and publisher a way to get - credit for their work, while not being considered responsible for - modifications made by others. - - This License is a kind of "copyleft", which means that derivative - works of the document must themselves be free in the same sense. - It complements the GNU General Public License, which is a copyleft - license designed for free software. - - We have designed this License in order to use it for manuals for - free software, because free software needs free documentation: a - free program should come with manuals providing the same freedoms - that the software does. But this License is not limited to - software manuals; it can be used for any textual work, regardless - of subject matter or whether it is published as a printed book. - We recommend this License principally for works whose purpose is - instruction or reference. - - 1. APPLICABILITY AND DEFINITIONS - - This License applies to any manual or other work that contains a - notice placed by the copyright holder saying it can be distributed - under the terms of this License. The "Document", below, refers to - any such manual or work. Any member of the public is a licensee, - and is addressed as "you". - - A "Modified Version" of the Document means any work containing the - Document or a portion of it, either copied verbatim, or with - modifications and/or translated into another language. - - A "Secondary Section" is a named appendix or a front-matter - section of the Document that deals exclusively with the - relationship of the publishers or authors of the Document to the - Document's overall subject (or to related matters) and contains - nothing that could fall directly within that overall subject. - (For example, if the Document is in part a textbook of - mathematics, a Secondary Section may not explain any mathematics.) - The relationship could be a matter of historical connection with - the subject or with related matters, or of legal, commercial, - philosophical, ethical or political position regarding them. - - The "Invariant Sections" are certain Secondary Sections whose - titles are designated, as being those of Invariant Sections, in - the notice that says that the Document is released under this - License. - - The "Cover Texts" are certain short passages of text that are - listed, as Front-Cover Texts or Back-Cover Texts, in the notice - that says that the Document is released under this License. - - A "Transparent" copy of the Document means a machine-readable copy, - represented in a format whose specification is available to the - general public, whose contents can be viewed and edited directly - and straightforwardly with generic text editors or (for images - composed of pixels) generic paint programs or (for drawings) some - widely available drawing editor, and that is suitable for input to - text formatters or for automatic translation to a variety of - formats suitable for input to text formatters. A copy made in an - otherwise Transparent file format whose markup has been designed - to thwart or discourage subsequent modification by readers is not - Transparent. A copy that is not "Transparent" is called "Opaque". - - Examples of suitable formats for Transparent copies include plain - ASCII without markup, Texinfo input format, LaTeX input format, - SGML or XML using a publicly available DTD, and - standard-conforming simple HTML designed for human modification. - Opaque formats include PostScript, PDF, proprietary formats that - can be read and edited only by proprietary word processors, SGML - or XML for which the DTD and/or processing tools are not generally - available, and the machine-generated HTML produced by some word - processors for output purposes only. - - The "Title Page" means, for a printed book, the title page itself, - plus such following pages as are needed to hold, legibly, the - material this License requires to appear in the title page. For - works in formats which do not have any title page as such, "Title - Page" means the text near the most prominent appearance of the - work's title, preceding the beginning of the body of the text. - - 2. VERBATIM COPYING - - You may copy and distribute the Document in any medium, either - commercially or noncommercially, provided that this License, the - copyright notices, and the license notice saying this License - applies to the Document are reproduced in all copies, and that you - add no other conditions whatsoever to those of this License. You - may not use technical measures to obstruct or control the reading - or further copying of the copies you make or distribute. However, - you may accept compensation in exchange for copies. If you - distribute a large enough number of copies you must also follow - the conditions in section 3. - - You may also lend copies, under the same conditions stated above, - and you may publicly display copies. - - 3. COPYING IN QUANTITY - - If you publish printed copies of the Document numbering more than - 100, and the Document's license notice requires Cover Texts, you - must enclose the copies in covers that carry, clearly and legibly, - all these Cover Texts: Front-Cover Texts on the front cover, and - Back-Cover Texts on the back cover. Both covers must also clearly - and legibly identify you as the publisher of these copies. The - front cover must present the full title with all words of the - title equally prominent and visible. You may add other material - on the covers in addition. Copying with changes limited to the - covers, as long as they preserve the title of the Document and - satisfy these conditions, can be treated as verbatim copying in - other respects. - - If the required texts for either cover are too voluminous to fit - legibly, you should put the first ones listed (as many as fit - reasonably) on the actual cover, and continue the rest onto - adjacent pages. - - If you publish or distribute Opaque copies of the Document - numbering more than 100, you must either include a - machine-readable Transparent copy along with each Opaque copy, or - state in or with each Opaque copy a publicly-accessible - computer-network location containing a complete Transparent copy - of the Document, free of added material, which the general - network-using public has access to download anonymously at no - charge using public-standard network protocols. If you use the - latter option, you must take reasonably prudent steps, when you - begin distribution of Opaque copies in quantity, to ensure that - this Transparent copy will remain thus accessible at the stated - location until at least one year after the last time you - distribute an Opaque copy (directly or through your agents or - retailers) of that edition to the public. - - It is requested, but not required, that you contact the authors of - the Document well before redistributing any large number of - copies, to give them a chance to provide you with an updated - version of the Document. - - 4. MODIFICATIONS - - You may copy and distribute a Modified Version of the Document - under the conditions of sections 2 and 3 above, provided that you - release the Modified Version under precisely this License, with - the Modified Version filling the role of the Document, thus - licensing distribution and modification of the Modified Version to - whoever possesses a copy of it. In addition, you must do these - things in the Modified Version: - - A. Use in the Title Page (and on the covers, if any) a title - distinct from that of the Document, and from those of - previous versions (which should, if there were any, be listed - in the History section of the Document). You may use the - same title as a previous version if the original publisher of - that version gives permission. - - B. List on the Title Page, as authors, one or more persons or - entities responsible for authorship of the modifications in - the Modified Version, together with at least five of the - principal authors of the Document (all of its principal - authors, if it has less than five). - - C. State on the Title page the name of the publisher of the - Modified Version, as the publisher. - - D. Preserve all the copyright notices of the Document. - - E. Add an appropriate copyright notice for your modifications - adjacent to the other copyright notices. - - F. Include, immediately after the copyright notices, a license - notice giving the public permission to use the Modified - Version under the terms of this License, in the form shown in - the Addendum below. - - G. Preserve in that license notice the full lists of Invariant - Sections and required Cover Texts given in the Document's - license notice. - - H. Include an unaltered copy of this License. - - I. Preserve the section entitled "History", and its title, and - add to it an item stating at least the title, year, new - authors, and publisher of the Modified Version as given on - the Title Page. If there is no section entitled "History" in - the Document, create one stating the title, year, authors, - and publisher of the Document as given on its Title Page, - then add an item describing the Modified Version as stated in - the previous sentence. - - J. Preserve the network location, if any, given in the Document - for public access to a Transparent copy of the Document, and - likewise the network locations given in the Document for - previous versions it was based on. These may be placed in - the "History" section. You may omit a network location for a - work that was published at least four years before the - Document itself, or if the original publisher of the version - it refers to gives permission. - - K. In any section entitled "Acknowledgments" or "Dedications", - preserve the section's title, and preserve in the section all - the substance and tone of each of the contributor - acknowledgments and/or dedications given therein. - - L. Preserve all the Invariant Sections of the Document, - unaltered in their text and in their titles. Section numbers - or the equivalent are not considered part of the section - titles. - - M. Delete any section entitled "Endorsements". Such a section - may not be included in the Modified Version. - - N. Do not retitle any existing section as "Endorsements" or to - conflict in title with any Invariant Section. - - If the Modified Version includes new front-matter sections or - appendices that qualify as Secondary Sections and contain no - material copied from the Document, you may at your option - designate some or all of these sections as invariant. To do this, - add their titles to the list of Invariant Sections in the Modified - Version's license notice. These titles must be distinct from any - other section titles. - - You may add a section entitled "Endorsements", provided it contains - nothing but endorsements of your Modified Version by various - parties--for example, statements of peer review or that the text - has been approved by an organization as the authoritative - definition of a standard. - - You may add a passage of up to five words as a Front-Cover Text, - and a passage of up to 25 words as a Back-Cover Text, to the end - of the list of Cover Texts in the Modified Version. Only one - passage of Front-Cover Text and one of Back-Cover Text may be - added by (or through arrangements made by) any one entity. If the - Document already includes a cover text for the same cover, - previously added by you or by arrangement made by the same entity - you are acting on behalf of, you may not add another; but you may - replace the old one, on explicit permission from the previous - publisher that added the old one. - - The author(s) and publisher(s) of the Document do not by this - License give permission to use their names for publicity for or to - assert or imply endorsement of any Modified Version. - - 5. COMBINING DOCUMENTS - - You may combine the Document with other documents released under - this License, under the terms defined in section 4 above for - modified versions, provided that you include in the combination - all of the Invariant Sections of all of the original documents, - unmodified, and list them all as Invariant Sections of your - combined work in its license notice. - - The combined work need only contain one copy of this License, and - multiple identical Invariant Sections may be replaced with a single - copy. If there are multiple Invariant Sections with the same name - but different contents, make the title of each such section unique - by adding at the end of it, in parentheses, the name of the - original author or publisher of that section if known, or else a - unique number. Make the same adjustment to the section titles in - the list of Invariant Sections in the license notice of the - combined work. - - In the combination, you must combine any sections entitled - "History" in the various original documents, forming one section - entitled "History"; likewise combine any sections entitled - "Acknowledgments", and any sections entitled "Dedications". You - must delete all sections entitled "Endorsements." - - 6. COLLECTIONS OF DOCUMENTS - - You may make a collection consisting of the Document and other - documents released under this License, and replace the individual - copies of this License in the various documents with a single copy - that is included in the collection, provided that you follow the - rules of this License for verbatim copying of each of the - documents in all other respects. - - You may extract a single document from such a collection, and - distribute it individually under this License, provided you insert - a copy of this License into the extracted document, and follow - this License in all other respects regarding verbatim copying of - that document. - - 7. AGGREGATION WITH INDEPENDENT WORKS - - A compilation of the Document or its derivatives with other - separate and independent documents or works, in or on a volume of - a storage or distribution medium, does not as a whole count as a - Modified Version of the Document, provided no compilation - copyright is claimed for the compilation. Such a compilation is - called an "aggregate", and this License does not apply to the - other self-contained works thus compiled with the Document, on - account of their being thus compiled, if they are not themselves - derivative works of the Document. - - If the Cover Text requirement of section 3 is applicable to these - copies of the Document, then if the Document is less than one - quarter of the entire aggregate, the Document's Cover Texts may be - placed on covers that surround only the Document within the - aggregate. Otherwise they must appear on covers around the whole - aggregate. - - 8. TRANSLATION - - Translation is considered a kind of modification, so you may - distribute translations of the Document under the terms of section - 4. Replacing Invariant Sections with translations requires special - permission from their copyright holders, but you may include - translations of some or all Invariant Sections in addition to the - original versions of these Invariant Sections. You may include a - translation of this License provided that you also include the - original English version of this License. In case of a - disagreement between the translation and the original English - version of this License, the original English version will prevail. - - 9. TERMINATION - - You may not copy, modify, sublicense, or distribute the Document - except as expressly provided for under this License. Any other - attempt to copy, modify, sublicense or distribute the Document is - void, and will automatically terminate your rights under this - License. However, parties who have received copies, or rights, - from you under this License will not have their licenses - terminated so long as such parties remain in full compliance. - - 10. FUTURE REVISIONS OF THIS LICENSE - - The Free Software Foundation may publish new, revised versions of - the GNU Free Documentation License from time to time. Such new - versions will be similar in spirit to the present version, but may - differ in detail to address new problems or concerns. See - `http://www.gnu.org/copyleft/'. - - Each version of the License is given a distinguishing version - number. If the Document specifies that a particular numbered - version of this License "or any later version" applies to it, you - have the option of following the terms and conditions either of - that specified version or of any later version that has been - published (not as a draft) by the Free Software Foundation. If - the Document does not specify a version number of this License, - you may choose any version ever published (not as a draft) by the - Free Software Foundation. - -ADDENDUM: How to use this License for your documents ----------------------------------------------------- - - To use this License in a document you have written, include a copy of -the License in the document and put the following copyright and license -notices just after the title page: - - Copyright (C) YEAR YOUR NAME. - Permission is granted to copy, distribute and/or modify this document - under the terms of the GNU Free Documentation License, Version 1.1 - or any later version published by the Free Software Foundation; - with the Invariant Sections being LIST THEIR TITLES, with the - Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST. - A copy of the license is included in the section entitled ``GNU - Free Documentation License''. - - If you have no Invariant Sections, write "with no Invariant Sections" -instead of saying which ones are invariant. If you have no Front-Cover -Texts, write "no Front-Cover Texts" instead of "Front-Cover Texts being -LIST"; likewise for Back-Cover Texts. - - If your document contains nontrivial examples of program code, we -recommend releasing these examples in parallel under your choice of -free software license, such as the GNU General Public License, to -permit their use in free software. - +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. ADDED DONE Index: DONE ================================================================== --- /dev/null +++ DONE @@ -0,0 +1,36 @@ +# Copyright 2006-2017, Matthew Welland. +# +# This file is part of Megatest. +# +# Megatest is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Megatest is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Megatest. If not, see . + +NOTE: This file gets copied occasionally into the wiki as "Roadmap DONE". + Do not make changes in the wiki, they will be lost! + +DONE +==== + +WW14 +. Streamline compilation - DONE, all non-official egg modules are now bundled. + +WW15 +. syscheck; touch file in home, tmp, runs, links and start xterm [DONE] + +WW16 +. archiving improvements/extentions [DONE] +.. -get-data, -put-data [DONE] +.. use MT_ vars if defined and no switch present [DONE] +.. fix archive "first run" bug [DONE] +.. areas path1 path2 ... -> search path for archives [NOT NEEDED - use -start-dir] +.. -propagate -> move archive data forward when it is found in older bundles [NOT NEEDED - simply repost the data] Index: Makefile ================================================================== --- Makefile +++ Makefile @@ -1,103 +1,215 @@ +# Copyright 2006-2017, Matthew Welland. +# +# This file is part of Megatest. +# +# Megatest is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Megatest is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Megatest. If not, see . + # make install CSCOPTS='-accumulate-profile -profile-name $(PWD)/profile-ww$(shell date +%V.%u)' # rm .o ; make install CSCOPTS='-profile' ; ... ; chicken-profile | less - +SHELL=/bin/bash PREFIX=$(PWD) CSCOPTS= INSTALL=install -SRCFILES = common.scm items.scm launch.scm \ - ods.scm runconfig.scm server.scm configf.scm \ - db.scm keys.scm margs.scm megatest-version.scm \ - process.scm runs.scm tasks.scm tests.scm genexample.scm \ - http-transport.scm filedb.scm \ - client.scm synchash.scm daemon.scm mt.scm \ - ezsteps.scm lock-queue.scm sdb.scm \ - rmt.scm api.scm tdb.scm rpc-transport.scm \ - portlogger.scm archive.scm env.scm diff-report.scm cgisetup/models/pgdb.scm - -# Eggs to install (straightforward ones) -EGGS=matchable readline apropos base64 regex-literals format regex-case test coops trace csv \ -dot-locking posix-utils posix-extras directory-utils hostinfo tcp-server rpc csv-xml fmt \ -json md5 awful http-client spiffy uri-common intarweb spiffy-request-vars \ -spiffy-directory-listing ssax sxml-serializer sxml-modifications iup canvas-draw sqlite3 - -GUISRCF = dashboard-tests.scm dashboard-guimonitor.scm gutils.scm dcommon.scm tree.scm vg.scm +SRCFILES = common.scm items.scm launch.scm ods.scm runconfig.scm \ + server.scm configf.scm db.scm keys.scm margs.scm \ + process.scm runs.scm tasks.scm tests.scm genexample.scm \ + http-transport.scm filedb.scm tdb.scm client.scm mt.scm \ + ezsteps.scm lock-queue.scm sdb.scm rmt.scm api.scm \ + subrun.scm portlogger.scm archive.scm env.scm \ + diff-report.scm cgisetup/models/pgdb.scm + +# module source files +MSRCFILES = mutils.scm +# ftail.scm rmtmod.scm commonmod.scm removed +# MSRCFILES = ducttape-lib.scm pkts.scm stml2.scm cookie.scm mutils.scm \ +# mtargs.scm commonmod.scm dbmod.scm adjutant.scm ulex.scm \ +# rmtmod.scm apimod.scm + +GUISRCF = dashboard-context-menu.scm dashboard-tests.scm \ + dashboard-guimonitor.scm gutils.scm dcommon.scm tree.scm \ + vg.scm OFILES = $(SRCFILES:%.scm=%.o) GOFILES = $(GUISRCF:%.scm=%.o) + +MOFILES = $(addprefix mofiles/,$(MSRCFILES:%.scm=%.o)) +# compiled import files +MOIMPFILES = $(MSRCFILES:%.scm=%.import.o) + +%.import.o : %.import.scm + csc $(CSCOPTS) -unit $*.import -c $*.import.scm -o $*.import.o + +# I'm not sure the cp is a good idea, changed a lot of things and it may not have been necessary... +# mofiles/%.o %.import.scm : %.scm megatest-fossil-hash.scm +# @[ -e mofiles ] || mkdir -p mofiles +# csc $(CSCOPTS) -I mofiles -I $* -J -c $< -o $*.o +# cp $*.o mofiles/$*.o +# @touch $*.import.scm # ensure it is touched after the .o is made + +mofiles/%.o : %.scm + mkdir -p mofiles + csc $(CSCOPTS) -J -c $< -o mofiles/$*.o ADTLSCR=mt_laststep mt_runstep mt_ezstep HELPERS=$(addprefix $(PREFIX)/bin/,$(ADTLSCR)) DEPLOYHELPERS=$(addprefix deploytarg/,$(ADTLSCR)) MTESTHASH=$(shell fossil info|grep checkout:| awk '{print $$2}') -CSIPATH=$(shell which csi) -CKPATH=$(shell dirname $(shell dirname $(CSIPATH))) +ifeq ($(MTESTHASH),) +$(error MTESTHASH is broken!) +endif + +# CSIPATH=$(shell which csi) +# CKPATH=$(shell dirname $(shell dirname $(CSIPATH))) # ARCHSTR=$(shell uname -m)_$(shell uname -r) # BASH_MACHTYPE=$(shell bash -c "echo \$$MACHTYPE") # ARCHSTR=$(BASH_MACHTYPE)_$(shell lsb_release -sr) -ARCHSTR=$(shell lsb_release -sr) +ARCHSTR=$(shell if [[ -e /usr/bin/sw_vers ]]; then /usr/bin/sw_vers -productVersion; else lsb_release -sr; fi) # ARCHSTR=$(shell bash -c "echo \$$MACHTYPE") PNGFILES = $(shell cd docs/manual;ls *png) -all : $(PREFIX)/bin/.$(ARCHSTR) mtest dboard mtut ndboard - -mtest: $(OFILES) readline-fix.scm megatest.o - csc $(CSCOPTS) $(OFILES) megatest.o -o mtest - -dboard : $(OFILES) $(GOFILES) dashboard.scm - csc $(CSCOPTS) $(OFILES) dashboard.scm $(GOFILES) -o dboard - -ndboard : newdashboard.scm $(OFILES) $(GOFILES) - csc $(CSCOPTS) $(OFILES) $(GOFILES) newdashboard.scm -o ndboard - -mtut: $(OFILES) mtut.scm - csc $(CSCOPTS) $(OFILES) mtut.scm -o mtut +# all : $(PREFIX)/bin/.$(ARCHSTR) mtest dboard mtut ndboard +all : $(PREFIX)/bin/.$(ARCHSTR) mtest dboard mtut tcmt + +mtest: $(OFILES) readline-fix.scm megatest.o $(MOFILES) $(MOIMPFILES) megatest-version.scm + csc $(CSCOPTS) $(OFILES) $(MOFILES) $(MOIMPFILES) megatest.o -o mtest + +showmtesthash: + @echo $(MTESTHASH) + +dboard : $(OFILES) $(GOFILES) dashboard.scm $(MOFILES) $(MOIMPFILES) megatest-version.scm megatest-fossil-hash.scm + csc $(CSCOPTS) $(OFILES) dashboard.scm $(GOFILES) $(MOFILES) $(MOIMPFILES) -o dboard + +mtut: $(OFILES) $(MOFILES) megatest-fossil-hash.scm mtut.scm megatest-version.scm + csc $(CSCOPTS) $(OFILES) $(MOFILES) mtut.scm -o mtut + +include makefile.inc +include chicken.makefile + +TCMTOBJS = \ + api.o \ + archive.o \ + cgisetup/models/pgdb.o \ + client.o \ + common.o \ + configf.o \ + db.o \ + env.o \ + http-transport.o \ + items.o \ + keys.o \ + launch.o \ + lock-queue.o \ + margs.o \ + mt.o \ + ods.o \ + portlogger.o \ + process.o \ + rmt.o \ + runconfig.o \ + runs.o \ + server.o \ + tasks.o \ + tdb.o \ + tests.o \ + subrun.o \ + ezsteps.o + +# mofiles/rmtmod.o \ +# mofiles/commonmod.o \ + +tcmt : $(TCMTOBJS) tcmt.scm megatest-version.scm + csc $(CSCOPTS) $(TCMTOBJS) $(MOFILES) $(MOIMPFILES) tcmt.scm -o tcmt # install documentation to $(PREFIX)/docs # DOES NOT REBUILD DOCS # $(PREFIX)/share/docs/megatest_manual.html : docs/manual/megatest_manual.html mkdir -p $(PREFIX)/share/docs $(INSTALL) docs/manual/megatest_manual.html $(PREFIX)/share/docs/megatest_manual.html for png in $(PNGFILES);do $(INSTALL) docs/manual/$$png $(PREFIX)/share/docs/$$png;done +# add a fake dependency so this doens't copy everytime +$(PREFIX)/share/js/jquery-3.1.0.slim.min.js : # .fslckout + mkdir -p $(PREFIX)/share/js + fossil wiki export java-script-lib > $(PREFIX)/share/js/jquery-3.1.0.slim.min.js + $(PREFIX)/share/db/mt-pg.sql : mt-pg.sql mkdir -p $(PREFIX)/share/db $(INSTALL) mt-pg.sql $(PREFIX)/share/db/mt-pg.sql -#multi-dboard : multi-dboard.scm $(OFILES) $(GOFILES) -# csc $(CSCOPTS) $(OFILES) $(GOFILES) multi-dboard.scm -o multi-dboard - -# -# $(PREFIX)/bin/revtagfsl : utils/revtagfsl.scm -# csc utils/revtagfsl.scm -o $(PREFIX)/bin/revtagfsl - # Special dependencies for the includes -tests.o db.o launch.o runs.o dashboard-tests.o dashboard-guimonitor.o dashboard-main.o monitor.o dashboard.o \ -archive.o megatest.o : db_records.scm -tests.o runs.o dashboard.o dashboard-tests.o dashboard-main.o : run_records.scm +$(MOFILE) $(MOIMPFILES) : megatest-fossil-hash.scm + +# common.o : mofiles/commonmod.o megatest-fossil-hash.scm + +# commonmod.o dashboard.o megatest.o tcmt.o apimod.o : megatest-fossil-hash.scm + +tests.o db.o launch.o runs.o dashboard-tests.o \ +dashboard-context-menu.o dashboard-guimonitor.o dashboard-main.o \ +monitor.o dashboard.o archive.o megatest.o : db_records.scm megatest-fossil-hash.scm + +tests.o runs.o dashboard.o dashboard-tests.o dashboard-context-menu.o dashboard-main.o : run_records.scm + db.o ezsteps.o keys.o launch.o megatest.o monitor.o runs-for-ref.o runs.o tests.o : key_records.scm + tests.o tasks.o dashboard-tasks.o : task_records.scm + runs.o : test_records.scm -megatest.o : megatest-fossil-hash.scm -rmt.scm client.scm common.scm configf.scm dashboard-guimonitor.scm dashboard-tests.scm dashboard.scm db.scm dcommon.scm ezsteps.scm fs-transport.scm http-transport.scm index-tree.scm items.scm keys.scm launch.scm megatest.scm monitor.scm mt.scm newdashboard.scm runconfig.scm runs.scm server.scm tdb.scm tests.scm tree.scm : common_records.scm rpc-transport.scm + +megatest.o : megatest-fossil-hash.scm megatest-version.scm + +rmt.scm client.scm common.scm configf.scm dashboard-guimonitor.scm dashboard-tests.scm dashboard.scm db.scm dcommon.scm ezsteps.scm fs-transport.scm http-transport.scm index-tree.scm items.scm keys.scm launch.scm megatest.scm monitor.scm mt.scm newdashboard.scm runconfig.scm runs.scm server.scm tdb.scm tests.scm tree.scm : common_records.scm megatest-version.scm + common_records.scm : altdb.scm -vg.o dashboard.o : vg_records.scm + +# mofiles/stml2.o : mofiles/cookie.o +# configf.o : mofiles/commonmod.o + +vg.o dashboard.o : vg_records.scm megatest-version.scm + dcommon.o : run_records.scm + +mofiles/stml2.o : mofiles/cookie.o + +# # special include based modules +# mofiles/pkts.o : pkts/pkts.scm +# mofiles/stml2.o : cookie.o +# # mofiles/mtargs.o : mtargs/mtargs.scm +# # mofiles/mtconfigf.o : mtconfigf/mtconfigf.scm +# mofiles/ulex.o : ulex/ulex.scm +# mofiles/mutils.o : mutils/mutils.scm +# mofiles/cookie.o : stml2/cookie.scm +# mofiles/stml2.o : stml2/stml2.scm + # Temporary while transitioning to new routine # runs.o : run-tests-queue-classic.scm run-tests-queue-new.scm +# for the modularized stuff +mofiles/rmtmod.o : mofiles/commonmod.o + megatest-fossil-hash.scm : $(SRCFILES) megatest.scm *_records.scm echo "(define megatest-fossil-hash \"$(MTESTHASH)\")" > megatest-fossil-hash.new if ! diff -q megatest-fossil-hash.new megatest-fossil-hash.scm ; then echo copying .new to .scm;cp -f megatest-fossil-hash.new megatest-fossil-hash.scm;fi $(OFILES) $(GOFILES) : common_records.scm -%.o : %.scm - csc $(CSCOPTS) -c $< +%.o : %.scm $(MOFILES) + csc $(CSCOPTS) -c $< $(MOFILES) $(PREFIX)/bin/.$(ARCHSTR)/mtest : mtest utils/mk_wrapper @echo Installing to PREFIX=$(PREFIX) $(INSTALL) mtest $(PREFIX)/bin/.$(ARCHSTR)/mtest utils/mk_wrapper $(PREFIX) mtest $(PREFIX)/bin/megatest @@ -107,36 +219,55 @@ $(INSTALL) ndboard $(PREFIX)/bin/.$(ARCHSTR)/ndboard $(PREFIX)/bin/newdashboard : $(PREFIX)/bin/.$(ARCHSTR)/ndboard utils/mk_wrapper utils/mk_wrapper $(PREFIX) ndboard $(PREFIX)/bin/newdashboard chmod a+x $(PREFIX)/bin/newdashboard + +# mtutil $(PREFIX)/bin/.$(ARCHSTR)/mtut : mtut $(INSTALL) mtut $(PREFIX)/bin/.$(ARCHSTR)/mtut +install-mtut : mtut + $(INSTALL) mtut $(PREFIX)/bin/mtut + $(PREFIX)/bin/mtutil : $(PREFIX)/bin/.$(ARCHSTR)/mtut utils/mk_wrapper utils/mk_wrapper $(PREFIX) mtut $(PREFIX)/bin/mtutil chmod a+x $(PREFIX)/bin/mtutil -# $(PREFIX)/bin/.$(ARCHSTR)/mdboard : multi-dboard -# $(INSTALL) multi-dboard $(PREFIX)/bin/.$(ARCHSTR)/mdboard - -# $(PREFIX)/bin/mdboard : $(PREFIX)/bin/.$(ARCHSTR)/mdboard utils/mk_wrapper -# utils/mk_wrapper $(PREFIX) mdboard $(PREFIX)/bin/mdboard -# chmod a+x $(PREFIX)/bin/mdboard - -# $(HELPERS) : utils/% -# $(INSTALL) $< $@ -# chmod a+x $@ +# mtexec + +mtexec: $(OFILES) $(MOFILES) megatest-fossil-hash.scm mtexec.scm + csc $(CSCOPTS) $(OFILES) $(MOFILES) mtexec.scm -o mtexec + +$(PREFIX)/bin/.$(ARCHSTR)/mtexec : mtexec + $(INSTALL) mtexec $(PREFIX)/bin/.$(ARCHSTR)/mtexec + +$(PREFIX)/bin/mtexec : $(PREFIX)/bin/.$(ARCHSTR)/mtexec utils/mk_wrapper + utils/mk_wrapper $(PREFIX) mtexec $(PREFIX)/bin/mtexec + chmod a+x $(PREFIX)/bin/mtexec + +# tcmt + +$(PREFIX)/bin/.$(ARCHSTR)/tcmt : tcmt + $(INSTALL) tcmt $(PREFIX)/bin/.$(ARCHSTR)/tcmt + +$(PREFIX)/bin/tcmt : $(PREFIX)/bin/.$(ARCHSTR)/tcmt utils/mk_wrapper + utils/mk_wrapper $(PREFIX) tcmt $(PREFIX)/bin/tcmt + chmod a+x $(PREFIX)/bin/tcmt $(PREFIX)/bin/mt_laststep : utils/mt_laststep $(INSTALL) $< $@ chmod a+x $@ $(PREFIX)/bin/mt_runstep : utils/mt_runstep $(INSTALL) $< $@ chmod a+x $@ + +$(PREFIX)/bin/serialize-env: serialize-env.scm + csc serialize-env.scm + $(INSTALL) serialize-env $@ $(PREFIX)/bin/mt_ezstep : utils/mt_ezstep $(INSTALL) $< $@ chmod a+x $@ @@ -158,18 +289,14 @@ $(PREFIX)/bin/nbfind : utils/nbfind $(INSTALL) $< $@ chmod a+x $@ -$(PREFIX)/bin/loadrunner : utils/loadrunner +$(PREFIX)/bin/mtrunner : utils/mtrunner $(INSTALL) $< $@ chmod a+x $@ -# $(PREFIX)/bin/refdb : refdb -# $(INSTALL) $< $@ -# chmod a+x $@ - deploytarg/nbfake : utils/nbfake $(INSTALL) $< $@ chmod a+x $@ deploytarg/viewscreen : utils/viewscreen @@ -191,13 +318,19 @@ chmod a+x $(PREFIX)/bin/dashboard $(INSTALL) dboard $(PREFIX)/bin/.$(ARCHSTR)/dboard install : $(PREFIX)/bin/.$(ARCHSTR) $(PREFIX)/bin/.$(ARCHSTR)/mtest $(PREFIX)/bin/megatest \ $(PREFIX)/bin/.$(ARCHSTR)/dboard $(PREFIX)/bin/dashboard $(HELPERS) $(PREFIX)/bin/nbfake \ - $(PREFIX)/bin/nbfind $(PREFIX)/bin/loadrunner $(PREFIX)/bin/viewscreen $(PREFIX)/bin/mt_xterm \ + $(PREFIX)/bin/.$(ARCHSTR)/mtexec $(PREFIX)/bin/mtexec $(PREFIX)/bin/serialize-env \ + $(PREFIX)/bin/nbfind $(PREFIX)/bin/mtrunner $(PREFIX)/bin/viewscreen $(PREFIX)/bin/mt_xterm \ + $(PREFIX)/share/docs/megatest_manual.html $(PREFIX)/bin/remrun \ $(PREFIX)/share/docs/megatest_manual.html $(PREFIX)/bin/remrun $(PREFIX)/bin/mtutil \ - $(PREFIX)/share/db/mt-pg.sql $(PREFIX)/bin/.$(ARCHSTR)/ndboard $(PREFIX)/bin/newdashboard + $(PREFIX)/bin/tcmt $(PREFIX)/share/db/mt-pg.sql \ + $(PREFIX)/share/js/jquery-3.1.0.slim.min.js +# $(PREFIX)/bin/.$(ARCHSTR)/ndboard + +# $(PREFIX)/bin/newdashboard $(PREFIX)/bin/.$(ARCHSTR) : mkdir -p $(PREFIX)/bin/.$(ARCHSTR) mkdir -p $(PREFIX)/bin/.$(ARCHSTR)/lib @@ -210,11 +343,23 @@ $(MTQA_FOSSIL) : fossil clone https://www.kiatoa.com/fossils/megatest_qa $(MTQA_FOSSIL) clean : - rm -f $(OFILES) $(GOFILES) megatest dboard dboard.o megatest.o dashboard.o megatest-fossil-hash.* altdb.scm + rm -f $(OFILES) $(GOFILES) $(MOFILES) $(TCMTOBJS) \ + $(PREFIX)/megatest $(PREFIX)/dashboard mtest mtutil mtut \ + tcmt readline-fix.scm serialize-env dboard *.o \ + megatest-fossil-hash.* altdb.scm mofiles/*.o \ + mofiles/*.o vg.o cookie.o dashboard-main.o \ + ducttape-lib.o ftail.o mutils.o pkts.o rmtmod.o stml2.o \ + tcmt.o *.import.scm *.import.o + rm -f $(OFILES) $(GOFILES) $(MOFILES) $(TCMTOBJS) \ + $(PREFIX)/megatest $(PREFIX)/dashboard mtest mtutil mtut \ + tcmt ftail.import.scm readline-fix.scm serialize-env \ + dboard dboard.o megatest.o dashboard.o \ + megatest-fossil-hash.* altdb.scm mofiles/*.o vg.o + rm -rf share #====================================================================== # Make the records files #====================================================================== @@ -230,35 +375,21 @@ chmod a+X $@ deploytarg/apropos.so : Makefile chicken-install -p deploytarg -deploy -keep-installed $(EGGS) -# for i in apropos base64 canvas-draw csv-xml directory-utils dot-locking extras fmt format hostinfo http-client intarweb json md5 message-digest posix posix-extras readline regex regex-case s11n spiffy spiffy-request-vars sqlite3 srfi-1 srfi-18 srfi-69 tcp test uri-common check-errors synch matchable sql-null tcp-server rpc blob-utils string-utils variable-item defstruct uri-generic sendfile opensll openssl lookup-table list-utils stack; do \ -# chicken-install -prefix deploytarg -deploy $$i;done - -# deploytarg/libsqlite3.so : -# CSC_OPTIONS="-Ideploytarg -Ldeploytarg" $CHICKEN_INSTALL -prefix deploytarg -deploy sqlite3 - deploy : deploytarg/mtest deploytarg/dboard $(DEPLOYHELPERS) deploytarg/nbfake deploytarg/remrun deploytarg/viewsceen deploytarg/nbfind deploytarg/apropos.so -# deploytarg/libiupcd.so : $(CKPATH)/lib/libiupcd.so -# for i in iup im cd av call sqlite; do \ -# cp $(CKPATH)/lib/lib$$i* deploytarg/ ; \ -# done -# cp $(CKPATH)/include/*.h deploytarg - # puts deployed megatest in directory "megatest" deploytarg/mtest : $(OFILES) megatest.o deploytarg/apropos.so csc -deploy $(CSCOPTS) $(OFILES) megatest.scm -o deploytarg mv deploytarg/deploytarg deploytarg/mtest deploytarg/dboard : $(OFILES) $(GOFILES) dashboard.scm deploytarg/apropos.so csc -deploy $(OFILES) $(GOFILES) dashboard.scm -o deploytarg mv deploytarg/deploytarg deploytarg/dboard -# DATASHAREO=configf.o common.o process.o tree.o dcommon.o margs.o launch.o gutils.o db.o synchash.o server.o \ -# megatest-version.o tdb.o ods.o mt.o keys.o datashare-testing/sd : datashare.scm $(OFILES) csc $(CSCOPTS) datashare.scm $(OFILES) -o datashare-testing/sd datashare-testing/sdat: sharedat.scm $(OFILES) csc $(CSCOPTS) sharedat.scm $(OFILES) -o datashare-testing/sdat @@ -267,26 +398,27 @@ mkdir -p /tmp/$(USER)/datashare/disk1 /tmp/$(USER)/basepath xterm : sd (export BASEPATH=/tmp/$(USER)/basepath ; export PATH="$(PWD)/datashare-testing:$(PATH)" ; xterm &) -datashare-testing/spublish : spublish.scm $(OFILES) - csc $(CSCOPTS) spublish.scm $(OFILES) -o datashare-testing/spublish - -datashare-testing/sretrieve : sretrieve.scm megatest-version.o margs.o configf.o process.o - csc $(CSCOPTS) sretrieve.scm megatest-version.o margs.o configf.o process.o -o datashare-testing/sretrieve - -sretrieve/sretrieve : datashare-testing/sretrieve - csc $(CSCOPTS) -deploy -deployed sretrieve.scm megatest-version.o margs.o configf.o process.o - chicken-install -keep-installed $(PROXY) -deploy -prefix sretrieve defstruct srfi-18 format sql-de-lite \ - srfi-1 posix regex regex-case srfi-69 - -# base64 dot-locking \ -# csv-xml z3 - -# "(define (toplevel-command . a) #f)" -# if egrep 'version.*3.0' $(shell dirname $(shell dirname $(shell which csi)))/lib/chicken/7/readline.setup-info;then \ +datashare-testing/spublish : spublish.scm $(OFILES) megatest-version.scm + csc $(CSCOPTS) spublish.scm margs.o process.o common.o -o datashare-testing/spublish + +datashare-testing/sretrieve : sretrieve.scm $(OFILES) megatest-version.scm + csc $(CSCOPTS) sretrieve.scm margs.o process.o common.o -o datashare-testing/sretrieve + + +datashare-testing/sauthorize : sauthorize.scm $(OFILES) megatest-version.scm + csc $(CSCOPTS) sauthorize.scm margs.o process.o common.o -o datashare-testing/sauthorize + +sauth-init: + mkdir -p datashare-testing + rm datashare-testing/sauthorize + rm datashare-testing/sretrieve + rm datashare-testing/spublish + +sauth : sauth-init datashare-testing/sauthorize datashare-testing/sretrieve datashare-testing/spublish readline-fix.scm : if [[ $(shell chicken-status | grep readline | awk '{print $4}' | cut -d. -f1) -gt 3 ]];then \ echo "(define *use-new-readline* #f)" > readline-fix.scm; \ else \ @@ -301,8 +433,28 @@ fi if csi -ne '(use postgresql)';then \ echo "(use postgresql)(hash-table-set! *available-db* 'postgresql #t)" >> altdb.scm;\ fi -portlogger-example : portlogger-example.scm api.o archive.o client.o common.o configf.o daemon.o dashboard-tests.o db.o dcommon.o ezsteps.o filedb.o genexample.o gutils.o http-transport.o items.o keys.o launch.o lock-queue.o margs.o megatest-version.o mt.o ods.o portlogger.o process.o rmt.o rpc-transport.o runconfig.o runs.o sdb.o server.o synchash.o tasks.o tdb.o tests.o tree.o - csc $(CSCOPTS) portlogger-example.scm api.o archive.o client.o common.o configf.o daemon.o dashboard-tests.o db.o dcommon.o ezsteps.o filedb.o genexample.o gutils.o http-transport.o items.o keys.o launch.o lock-queue.o margs.o megatest-version.o mt.o ods.o portlogger.o process.o rmt.o rpc-transport.o runconfig.o runs.o sdb.o server.o synchash.o tasks.o tdb.o tests.o tree.o +portlogger-example : portlogger-example.scm api.o archive.o client.o common.o configf.o dashboard-tests.o dashboard-context-menu.o db.o dcommon.o ezsteps.o filedb.o genexample.o gutils.o http-transport.o items.o keys.o launch.o lock-queue.o margs.o mt.o ods.o portlogger.o process.o rmt.o runconfig.o runs.o sdb.o server.o synchash.o tasks.o tdb.o tests.o tree.o + csc $(CSCOPTS) portlogger-example.scm api.o archive.o client.o common.o configf.o dashboard-tests.o dashboard-context-menu.o db.o dcommon.o ezsteps.o filedb.o genexample.o gutils.o http-transport.o items.o keys.o launch.o lock-queue.o margs.o mt.o ods.o portlogger.o process.o rmt.o runconfig.o runs.o sdb.o server.o synchash.o tasks.o tdb.o tests.o tree.o + +# create a pdf dot graphviz diagram from notations in rmt.scm +rmt.pdf : rmt.scm + grep ';;DOT' rmt.scm | sed -e 's/.*;;DOT //' > rmt.dot;dot -Tpdf rmt.dot -o rmt.pdf + +buildmanual: + cd docs/manual && make + +wikipage=plan +editwiki: + cd docs/manual && ../../utils/editwiki $(wikipage) + +viewmanual: + arora docs/manual/megatest_manual.html + +targets: + @grep : Makefile | perl -ne '/^([A-Za-z0-9_-]+):/ && print "$$1\n"' + +unit : + cd tests;make unit Index: Makefile.deploy ================================================================== --- Makefile.deploy +++ Makefile.deploy @@ -1,29 +1,60 @@ # make install CSCOPTS='-accumulate-profile -profile-name $(PWD)/profile-ww$(shell date +%V.%u)' + +# Copyright 2006-2017, Matthew Welland. +# +# This file is part of Megatest. +# +# Megatest is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Megatest is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Megatest. If not, see . +# + PREFIX=$(PWD) CSCOPTS= -deploy INSTALL=install +CHICKEN=$(shell which csc) +CHICKEN_BIN_DIR=$(shell dirname ${CHICKEN}/) +CHICKEN_DIR=${CHICKEN_BIN_DIR}/.. SRCFILES = common.scm items.scm launch.scm \ ods.scm runconfig.scm server.scm configf.scm \ db.scm keys.scm margs.scm megatest-version.scm \ process.scm runs.scm tasks.scm tests.scm genexample.scm \ - http-transport.scm filedb.scm \ - client.scm synchash.scm daemon.scm mt.scm \ + http-transport.scm filedb.scm tdb.scm \ + client.scm daemon.scm mt.scm \ ezsteps.scm lock-queue.scm sdb.scm \ - rmt.scm api.scm tdb.scm rpc-transport.scm \ - portlogger.scm archive.scm env.scm + rmt.scm api.scm subrun.scm \ + portlogger.scm archive.scm env.scm diff-report.scm cgisetup/models/pgdb.scm + +# module source files +MSRCFILES = ftail.scm # Eggs to install (straightforward ones) -EGGS=crypt matchable readline apropos base64 regex-literals format regex-case test coops trace csv \ +EGGS=matchable readline apropos base64 regex-literals format regex-case test coops trace csv \ dot-locking posix-utils posix-extras directory-utils hostinfo tcp-server rpc csv-xml fmt \ json md5 awful http-client spiffy uri-common intarweb spiffy-request-vars \ spiffy-directory-listing ssax sxml-serializer sxml-modifications iup canvas-draw sqlite3 GUISRCF = dashboard-tests.scm dashboard-guimonitor.scm gutils.scm dcommon.scm tree.scm vg.scm OFILES = $(SRCFILES:%.scm=%.o) GOFILES = $(GUISRCF:%.scm=%.o) + +MOFILES = $(addprefix mofiles/,$(MSRCFILES:%.scm=%.o)) + +mofiles/%.o : %.scm + mkdir -p mofiles + csc $(CSCOPTS) -J -c $< -o mofiles/$*.o ADTLSCR=mt_laststep mt_runstep mt_ezstep HELPERS=$(addprefix $(PREFIX)/bin/,$(ADTLSCR)) DEPLOYHELPERS=$(addprefix deploytarg/,$(ADTLSCR)) MTESTHASH=$(shell fossil info|grep checkout:| awk '{print $$2}') @@ -42,31 +73,46 @@ IMVER=3.11 IUPVER=3.17 KTYPE=26g4 CDVER=5.10 -all : $(PREFIX)/bin/.$(ARCHSTR) mtest dboard eggs sqlite matt iup +all : $(PREFIX)/bin/.$(ARCHSTR) postgres nanomsg mtest dboard mtut eggs sqlite matt iup wrappers -mtest: $(OFILES) readline-fix.scm megatest.o +mtest: $(OFILES) readline-fix.scm megatest.o $(MOFILES) mofiles/ftail.o mkdir -p $(PREFIX)/deploy - csc $(CSCOPTS) $(OFILES) megatest.o -o $(PREFIX)/deploy/mtest + csc $(CSCOPTS) $(OFILES) $(MOFILES) megatest.o -o $(PREFIX)/deploy/mtest + cp $(CKPATH)/lib/chicken/7/chicken.import.so $(PREFIX)/deploy/mtest + cp $(CKPATH)/lib/chicken/7/foreign.import.so $(PREFIX)/deploy/mtest + cp $(CKPATH)/lib/chicken/7/ports.import.so $(PREFIX)/deploy/mtest + cp $(CKPATH)/lib/chicken/7/data-structures.import.so $(PREFIX)/deploy/mtest + cp $(CKPATH)/lib/chicken/7/posix.import.so $(PREFIX)/deploy/mtest + cp $(CKPATH)/lib/chicken/7/irregex.import.so $(PREFIX)/deploy/mtest eggs: $(PREFIX)/deploy/mtest/fmt.so $(PREFIX)/deploy/mtest/fmt.so: - chicken-install -deploy -p $(PREFIX)/deploy/mtest base64 format regex-case simple-exceptions typed-records apropos directory-utils md5 spiffy http-client spiffy-request-vars spiffy-directory-listing posix-extras call-with-environment-variables csv typed-records pathname-expand json crypt dot-locking csv-xml z3 sql-de-lite hostinfo rpc directory-utils md5 spiffy http-client spiffy-request-vars spiffy-directory-listing posix-extras call-with-environment-variables rpc fmt + chicken-install -deploy -p $(PREFIX)/deploy/mtest base64 format regex-case simple-exceptions typed-records apropos directory-utils spiffy http-client spiffy-request-vars spiffy-directory-listing posix-extras call-with-environment-variables csv typed-records pathname-expand json crypt dot-locking csv-xml:0.10.2 z3 sql-de-lite hostinfo rpc directory-utils spiffy http-client spiffy-request-vars spiffy-directory-listing posix-extras call-with-environment-variables rpc fmt md5:3.1.0 check-errors:1.13.0 string-utils:1.2.4 message-digest:3.1.1 csv-xml:0.10.2 sha1 ansi-escape-sequences test slice rfc3339 uuid-lib filepath srfi-19:3.3.6 readline trace lolevel + cd utils/opensrc/mutils && chicken-install -deploy -p $(PREFIX)/deploy/mtest + cd ducttape && chicken-install -deploy -p $(PREFIX)/deploy/mtest + cp $(CHICKEN_DIR)/lib/chicken/7/chicken.import.so $(PREFIX)/deploy/mtest/ + cp $(CHICKEN_DIR)/lib/chicken/7/foreign* $(PREFIX)/deploy/mtest/ + cp $(CHICKEN_DIR)/lib/chicken/7/ports.import.so $(PREFIX)/deploy/mtest/ + cp $(CHICKEN_DIR)/lib/chicken/7/data-structures.import.so $(PREFIX)/deploy/mtest/ + cp $(CHICKEN_DIR)/lib/chicken/7/posix.import.so $(PREFIX)/deploy/mtest/ + cp $(CHICKEN_DIR)/lib/chicken/7/irregex.import.so $(PREFIX)/deploy/mtest/ + sqlite: $(PREFIX)/deploy/mtest/sqlite3.so $(PREFIX)/deploy/mtest/sqlite3.so: wget http://www.sqlite.org/2015/sqlite-autoconf-3090200.tar.gz tar xfz sqlite-autoconf-3090200.tar.gz cd sqlite-autoconf-3090200 - cd sqlite-autoconf-3090200 && ./configure --prefix=`realpath $(PREFIX)/deploy/mtest` + cd sqlite-autoconf-3090200 && ./configure --prefix=$(PREFIX)/deploy/mtest cd sqlite-autoconf-3090200 && make cd sqlite-autoconf-3090200 && make install - CSC_OPTIONS='-I$(PREFIX)/deploy/mtest/include -L$(PREFIX)/deploy/mtest/' chicken-install -deploy -p $(PREFIX)/deploy/mtest sqlite3 + CSC_OPTIONS='-I$(PREFIX)/deploy/mtest/include -L$(PREFIX)/deploy/mtest/' chicken-install -deploy -p $(PREFIX)/deploy/mtest sqlite3 check-errors:1.13.0 matt: $(PREFIX)/deploy/mtest/stml.so $(PREFIX)/deploy/mtest/stml.so: wget -c -O stml.tar.gz 'http://www.kiatoa.com/fossils/stml/tarball?name=stml&uuid=trunk' @@ -82,10 +128,39 @@ wget -c -O opensrc.tar.gz 'http://www.kiatoa.com/fossils/opensrc/tarball?name=opensrc&uuid=trunk' tar -xzf opensrc.tar.gz cd opensrc/mutils && chicken-install -deploy -p $(PREFIX)/deploy/mtest cd opensrc/dbi && chicken-install -deploy -p $(PREFIX)/deploy/mtest cd opensrc/margs && chicken-install -deploy -p $(PREFIX)/deploy/mtest + cd opensrc/pkts && chicken-install -deploy -p $(PREFIX)/deploy/mtest + +nanomsg: $(PREFIX)/deploy/mtest/libnanomsg.so.1.0.0 + +$(PREFIX)/deploy/mtest/libnanomsg.so.1.0.0: + wget --no-check-certificate https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz + mv 1.0.0 1.0.0.tar.gz + tar xf 1.0.0.tar.gz + cd nanomsg-1.0.0 && ./configure --prefix=$(PREFIX)/deploy/mtest + cd nanomsg-1.0.0 && make + cd nanomsg-1.0.0 && make install + CSC_OPTIONS="-I$(PREFIX)/deploy/mtest/include -L$(PREFIX)/deploy/mtest/lib -L$(PREFIX)/deploy/mtest/lib64/" chicken-install -deploy -p $(PREFIX)/deploy/mtest nanomsg + +$(PREFIX)/deploy/mtest/bin/pg_config: + wget -c https://ftp.postgresql.org/pub/source/v9.6.4/postgresql-9.6.4.tar.gz + tar xfz postgresql-9.6.4.tar.gz + cd postgresql-9.6.4 && ./configure --prefix=$(PREFIX)/deploy/mtest/ --with-openssl; + cd postgresql-9.6.4 && make + cd postgresql-9.6.4 && make install + +$(PREFIX)/deploy/mtest/postgresql.so: + CSC_OPTIONS="-I$(PREFIX)/deploy/mtest/include -L$(PREFIX)/deploy/mtest/lib -L$(PREFIX)/deploy/mtest/lib64/" chicken-install -deploy -p $(PREFIX)/deploy/mtest postgresql + +postgres: $(PREFIX)/deploy/mtest/bin/pg_config $(PREFIX)/deploy/mtest/postgresql.so + +ducttape: $(PREFIX)/deploy/mtest/ducttape.so + +$(PREFIX)/deploy/mtest/ducttape.so: + cd ducttape && chicken-install -p $(PREFIX)/deploy/mtest -deploy iup: $(PREFIX)/deploy/mtest/iup.so $(PREFIX)/deploy/mtest/iup.so: wget -c http://www.kiatoa.com/matt/chicken-build/cd/cd-${CDVER}_Linux${KTYPE}_${ARCHSIZE}lib.tar.gz @@ -95,31 +170,42 @@ tar -xzvf im-${IMVER}_Linux${KTYPE}_${ARCHSIZE}lib.tar.gz -C $(PREFIX)/deploy/mtest/ tar -xzvf iup-${IUPVER}_Linux${KTYPE}_${ARCHSIZE}lib.tar.gz -C $(PREFIX)/deploy/mtest/ cp $(PREFIX)/deploy/mtest/ftgl/lib/*/* $(PREFIX)/deploy/mtest/ wget -c -O ffcall.tar.gz 'http://www.kiatoa.com/fossils/ffcall/tarball?name=ffcall&uuid=trunk' tar -xzf ffcall.tar.gz - cd ffcall && ./configure --prefix=`realpath $(PREFIX)/deploy/mtest/` --enable-shared + cd ffcall && ./configure --prefix=$(PREFIX)/deploy/mtest/ --enable-shared cd ffcall && make CC="gcc -fPIC" cd ffcall && make install - CSC_OPTIONS="-I$(PREFIX)/deploy/mtest/include -L$(PREFIX)/deploy/mtest" chicken-install -deploy -p $(PREFIX)/deploy/mtest -D no-library-checks -feature disable-iup-web iup - CSC_OPTIONS="-I$(PREFIX)/deploy/mtest/include -L$(PREFIX)/deploy/mtest" chicken-install -deploy -p $(PREFIX)/deploy/mtest -D no-library-checks canvas-draw + CSC_OPTIONS="-I$(PREFIX)/include -I$(PREFIX)/deploy/mtest/include -L$(PREFIX)/deploy/mtest" chicken-install -deploy -p $(PREFIX)/deploy/mtest -D no-library-checks -feature disable-iup-web iup + CSC_OPTIONS="-I$(PREFIX)/include -I$(PREFIX)/deploy/mtest//include -L$(PREFIX)/deploy/mtest" chicken-install -deploy -p $(PREFIX)/deploy/mtest -D no-library-checks canvas-draw -dboard: $(OFILES) $(GOFILES) dashboard.scm - csc $(CSCOPTS) $(OFILES) dashboard.scm $(GOFILES) -o $(PREFIX)/deploy/mtest/dboard2 +dboard: $(OFILES) $(GOFILES) dashboard.scm $(MOFILES) + csc $(CSCOPTS) $(OFILES) dashboard.scm $(GOFILES) $(MOFILES) -o $(PREFIX)/deploy/mtest/dboard2 cp $(PREFIX)/deploy/mtest/dboard2/dboard2 $(PREFIX)/deploy/mtest/dboard ndboard : newdashboard.scm $(OFILES) $(GOFILES) csc $(CSCOPTS) $(OFILES) $(GOFILES) newdashboard.scm -o $(PREFIX)/deploy/mtest/newdboard +mtut : $(OFILES) megatest-fossil-hash.scm mtut.scm + csc $(CSCOPTS) $(OFILES) mtut.scm -o $(PREFIX)/deploy/mtest/mtut + # install documentation to $(PREFIX)/docs # DOES NOT REBUILD DOCS # $(PREFIX)/share/docs/megatest_manual.html : docs/manual/megatest_manual.html mkdir -p $(PREFIX)/share/docs $(INSTALL) docs/manual/megatest_manual.html $(PREFIX)/share/docs/megatest_manual.html for png in $(PNGFILES);do $(INSTALL) docs/manual/$$png $(PREFIX)/share/docs/$$png;done +js : java-script-lib/jquery-3.1.0.slim.min.js + mkdir -p $(PREFIX)/share/js + cp java-script-lib/jquery-3.1.0.slim.min.js $(PREFIX)/share/js/jquery-3.1.0.slim.min.js + +$(PREFIX)/share/db/mt-pg.sql : mt-pg.sql + mkdir -p $(PREFIX)/share/db + $(INSTALL) mt-pg.sql $(PREFIX)/share/db/mt-pg.sql + #multi-dboard : multi-dboard.scm $(OFILES) $(GOFILES) # csc $(CSCOPTS) $(OFILES) $(GOFILES) multi-dboard.scm -o multi-dboard # # $(PREFIX)/bin/revtagfsl : utils/revtagfsl.scm @@ -155,10 +241,23 @@ utils/mk_wrapper $(PREFIX) mtest $(PREFIX)/bin/megatest chmod a+x $(PREFIX)/bin/megatest $(PREFIX)/bin/.$(ARCHSTR)/ndboard : ndboard $(INSTALL) ndboard $(PREFIX)/bin/.$(ARCHSTR)/ndboard + +$(PREFIX)/bin/.$(ARCHSTR)/mtut : mtut + $(INSTALL) mtut $(PREFIX)/bin/.$(ARCHSTR)/mtut + +install-mtut : mtut + echo $(INSTALL) + #$(INSTALL) mtut $(PREFIX)/bin/mtut + +$(PREFIX)/bin/mtutil : $(PREFIX)/bin/.$(ARCHSTR)/mtut utils/mk_wrapper + utils/mk_wrapper $(PREFIX) mtut $(PREFIX)/bin/mtutil + chmod a+x $(PREFIX)/bin/mtutil + +mtutil: $(PREFIX)/bin/mtutil $(PREFIX)/bin/newdashboard : $(PREFIX)/bin/.$(ARCHSTR)/ndboard utils/mk_wrapper utils/mk_wrapper $(PREFIX) ndboard $(PREFIX)/bin/newdashboard chmod a+x $(PREFIX)/bin/newdashboard @@ -203,10 +302,15 @@ $(PREFIX)/bin/loadrunner : utils/loadrunner $(INSTALL) $< $@ chmod a+x $@ +$(PREFIX)/bin/mtest-reaper: helpers/mtest-reaper.scm helpers/ducttape-lib.scm helpers/inteldate.scm helpers/mimetypes.scm + make -C helpers $@ PREFIX=$(PREFIX) INSTALL=$(INSTALL) ARCHSTR=$(ARCHSTR) + +mtest-reaper: $(PREFIX)/bin/mtest-reaper + # $(PREFIX)/bin/refdb : refdb # $(INSTALL) $< $@ # chmod a+x $@ deploytarg/nbfake : utils/nbfake @@ -226,16 +330,21 @@ utils/mk_wrapper $(PREFIX) dboard $(PREFIX)/bin/dashboard chmod a+x $(PREFIX)/bin/dashboard $(INSTALL) dboard $(PREFIX)/bin/.$(ARCHSTR)/dboard install : $(PREFIX)/bin/.$(ARCHSTR) $(PREFIX)/bin/.$(ARCHSTR)/mtest $(PREFIX)/bin/megatest \ - $(PREFIX)/bin/.$(ARCHSTR)/dboard $(PREFIX)/bin/dashboard $(HELPERS) $(PREFIX)/bin/nbfake \ - $(PREFIX)/bin/nbfind $(PREFIX)/bin/loadrunner $(PREFIX)/bin/viewscreen $(PREFIX)/bin/mt_xterm \ - $(PREFIX)/share/docs/megatest_manual.html + $(PREFIX)/bin/.$(ARCHSTR)/dboard $(PREFIX)/bin/dashboard $(HELPERS) $(PREFIX)/bin/nbfake \ + $(PREFIX)/bin/nbfind $(PREFIX)/bin/loadrunner $(PREFIX)/bin/viewscreen $(PREFIX)/bin/mt_xterm \ + $(PREFIX)/share/docs/megatest_manual.html $(PREFIX)/bin/remrun \ + $(PREFIX)/share/docs/megatest_manual.html $(PREFIX)/bin/remrun $(PREFIX)/bin/mtutil \ + $(PREFIX)/bin/tcmt $(PREFIX)/share/db/mt-pg.sql \ + js + $(PREFIX)/bin/.$(ARCHSTR) : mkdir -p $(PREFIX)/bin/.$(ARCHSTR) + mkdir -p $(PREFIX)/bin/.$(ARCHSTR)/lib test: tests/tests.scm cd tests;csi -I .. -b -n tests.scm ext-tests/.fslckout : $(MTQA_FOSSIL) @@ -262,19 +371,21 @@ $(DEPLOYHELPERS) : utils/mt_* $(INSTALL) $< $@ chmod a+X $@ deploytarg/apropos.so : Makefile - chicken-install -p deploytarg -deploy -keep-installed $(EGGS) - + for egg in $(EGGS); do \ + echo "chicken-install -p deploytarg -deploy -keep-installed $$egg "; \ + chicken-install -p deploytarg -deploy -keep-installed $$egg ; \ + done # for i in apropos base64 canvas-draw csv-xml directory-utils dot-locking extras fmt format hostinfo http-client intarweb json md5 message-digest posix posix-extras readline regex regex-case s11n spiffy spiffy-request-vars sqlite3 srfi-1 srfi-18 srfi-69 tcp test uri-common check-errors synch matchable sql-null tcp-server rpc blob-utils string-utils variable-item defstruct uri-generic sendfile opensll openssl lookup-table list-utils stack; do \ # chicken-install -prefix deploytarg -deploy $$i;done # deploytarg/libsqlite3.so : # CSC_OPTIONS="-Ideploytarg -Ldeploytarg" $CHICKEN_INSTALL -prefix deploytarg -deploy sqlite3 -deploy : deploytarg/mtest deploytarg/dboard $(DEPLOYHELPERS) deploytarg/nbfake deploytarg/viewsceen deploytarg/nbfind deploytarg/apropos.so +deploy : deploytarg/mtest deploytarg/dboard $(DEPLOYHELPERS) deploytarg/nbfake deploytarg/remrun deploytarg/viewsceen deploytarg/nbfind deploytarg/apropos.so # deploytarg/libiupcd.so : $(CKPATH)/lib/libiupcd.so # for i in iup im cd av call sqlite; do \ # cp $(CKPATH)/lib/lib$$i* deploytarg/ ; \ # done @@ -331,11 +442,24 @@ echo ";; optional alternate db setup" > altdb.scm echo "(define *available-db* (make-hash-table))" >> altdb.scm if csi -ne '(use mysql-client)';then \ echo "(use mysql-client)(hash-table-set! *available-db* 'mysql #t)" >> altdb.scm; \ fi - if csi -ne '(use postgresql)';then \ - echo "(use postgresql)(hash-table-set! *available-db* 'postgresql #t)" >> altdb.scm;\ - fi +# if csi -ne '(use postgresql)';then \ +# echo "(use postgresql)(hash-table-set! *available-db* 'postgresql #t)" >> altdb.scm;\ +# fi portlogger-example : portlogger-example.scm api.o archive.o client.o common.o configf.o daemon.o dashboard-tests.o db.o dcommon.o ezsteps.o filedb.o genexample.o gutils.o http-transport.o items.o keys.o launch.o lock-queue.o margs.o megatest-version.o mt.o ods.o portlogger.o process.o rmt.o rpc-transport.o runconfig.o runs.o sdb.o server.o synchash.o tasks.o tdb.o tests.o tree.o csc $(CSCOPTS) portlogger-example.scm api.o archive.o client.o common.o configf.o daemon.o dashboard-tests.o db.o dcommon.o ezsteps.o filedb.o genexample.o gutils.o http-transport.o items.o keys.o launch.o lock-queue.o margs.o megatest-version.o mt.o ods.o portlogger.o process.o rmt.o rpc-transport.o runconfig.o runs.o sdb.o server.o synchash.o tasks.o tdb.o tests.o tree.o + +# create a pdf dot graphviz diagram from notations in rmt.scm +rmt.pdf : rmt.scm + grep ';;DOT' rmt.scm | sed -e 's/.*;;DOT //' > rmt.dot;dot -Tpdf rmt.dot -o rmt.pdf + +wrappers: wrappers/cfg.sh wrappers/megatest wrappers/dashboard + mkdir $(PREFIX)/deploy/mtest/.$(ARCHSTR) -p + cat wrappers/cfg.sh | sed 's#PREFIX#$(PREFIX)\/deploy\/mtest#g' > $(PREFIX)/deploy/mtest/.$(ARCHSTR)/cfg.sh + cat wrappers/megatest | sed 's#PREFIX#$(PREFIX)\/deploy\/mtest#g' | sed 's#ARCHSTR#.$(ARCHSTR)#g' > $(PREFIX)/deploy/mtest/megatest + cat wrappers/dashboard | sed 's#PREFIX#$(PREFIX)\/deploy\/mtest#g'| sed 's#ARCHSTR#.$(ARCHSTR)#g' > $(PREFIX)/deploy/mtest/dashboard + chmod +x $(PREFIX)/deploy/mtest/megatest + chmod +x $(PREFIX)/deploy/mtest/dashboard + Index: NOTES ================================================================== --- NOTES +++ NOTES @@ -1,5 +1,27 @@ +# Copyright 2006-2017, Matthew Welland. +# +# This file is part of Megatest. +# +# Megatest is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Megatest is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Megatest. If not, see . + +(server:writable-watchdog-bruteforce dbstruct) + +(server:writable-watchdog-deltasync dbstruct) + + ===================================================================== NOTES from looking at branch v1.62-rpc ===================================================================== *last-db-access* or *db-last-access* ==> which is it to be? @@ -141,5 +163,9 @@ INFO: (0) Server shutdown complete. Exiting Start: 0 at Sun Apr 28 22:18:25 MST 2013 Max: 52 at Sun Apr 28 23:06:59 MST 2013 End: 6 at Sun Apr 28 23:47:51 MST 2013 + +======================================================================== + + Index: README ================================================================== --- README +++ README @@ -1,9 +1,26 @@ +# Copyright 2006-2017, Matthew Welland. +# +# This file is part of Megatest. +# +# Megatest is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Megatest is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Megatest. If not, see . + Megatest To build: -1. Install chicken scheme. See utils/Makefile.installall +1. Install chicken scheme. See opensrc repo utils/installall.sh http://www.kiatoa.com/fossils/opensrc 2. Compile with "make -j install PREFIX=/some/path" 3. To test .... Index: TODO ================================================================== --- TODO +++ TODO @@ -1,16 +1,65 @@ +# Copyright 2006-2020, Matthew Welland. +# +# This file is part of Megatest. +# +# Megatest is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Megatest is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Megatest. If not, see . TODO ==== -. Dashboard should resist running from non-homehost +WW38 +. Add test_rundat to no-sync ==> correction, put in /.meta/test-run.dat +. Add STATE/STATUS transitions to .meta/test-run.dat or similar +. Swizzle update-test-rundat to operate on no-sync +. Swizzle update-run-duration, -uname-host and cpuload-diskfree to no-sync +. On state/status change update tests table with duration + +WW15 +. fill newview matrix with data, filter pipeline gui elements +. improve [script], especially indent handling + +WW16 +. split db into megatest.db (runs etc.) db/.db +. release basic newview implementation + +WW18 +. release split db implementation +. mtutil calls from dashboard (for remote control) +. logs browser (esp. for surfacing mtutil related activities) + +WW19 +. break command line into sections; all, run control, queries, utilities etc. +. pull in ftfplan (not integrated, just code pulled in) + +WW20 +. ./configure => ubuntu, sles11, sles12, rh7 +. Jenkins junit XML support +. Add output flushing in teamcity support +. Switch to using simple runs query everywhere +. Add end_time to runs and add a rollup call that sets state, status and end_time - +Future +. Switch to scsh-process pipeline management for job execution/control +. Use call-with-environment-variables more. Migration to inmem db plus per run db ------------------------------------- . Re-work the dbstruct data structure? .. Move main.db to global? .. [ run-id.db inmemdb last-mod last-read last-sync inuse ] . Re-work all queries to use run-id to dereference server . Open main.db directly in calls to -runtests etc. No need to talk remote? +. remove common:faux-lock + ADDED adjutant.scm Index: adjutant.scm ================================================================== --- /dev/null +++ adjutant.scm @@ -0,0 +1,33 @@ +;;====================================================================== +;; Copyright 2017, Matthew Welland. +;; +;; This file is part of Megatest. +;; +;; Megatest is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. +;; +;; Megatest is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. +;; +;; You should have received a copy of the GNU General Public License +;; along with Megatest. If not, see . + +;;====================================================================== + +(declare (unit adjutant)) + +(module adjutant * + +(import scheme chicken data-structures extras files) +(import (prefix sqlite3 sqlite3:) posix typed-records srfi-18 srfi-69 + md5 message-digest + regex srfi-1) + +(define (adjutant-run) + (print "Running the adjutant!")) + +) Index: api.scm ================================================================== --- api.scm +++ api.scm @@ -1,14 +1,23 @@ ;;====================================================================== ;; Copyright 2006-2013, Matthew Welland. ;; -;; This program is made available under the GNU GPL version 2.0 or -;; greater. See the accompanying file COPYING for details. +;; This file is part of Megatest. +;; +;; Megatest is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. +;; +;; Megatest is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. ;; -;; This program is distributed WITHOUT ANY WARRANTY; without even the -;; implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -;; PURPOSE. +;; You should have received a copy of the GNU General Public License +;; along with Megatest. If not, see . +;; ;;====================================================================== (use srfi-69 posix) (declare (unit api)) @@ -23,10 +32,12 @@ get-var get-keys get-key-vals test-toplevel-num-items get-test-info-by-id + get-steps-info-by-id + get-data-info-by-id test-get-rundir-from-test-id get-count-tests-running-for-testname get-count-tests-running get-count-tests-running-in-jobgroup get-previous-test-run-record @@ -38,34 +49,44 @@ test-get-paths-matching-keynames-target-new get-prereqs-not-met get-count-tests-running-for-run-id get-run-info get-run-status + get-run-state get-run-stats + get-run-times get-targets get-target ;; register-run get-tests-tags + get-test-times get-tests-for-run + get-tests-for-run-state-status get-test-id get-tests-for-runs-mindata + get-tests-for-run-mindata get-run-name-from-id get-runs + simple-get-runs get-num-runs + get-runs-cnt-by-patt get-all-run-ids get-prev-run-ids get-run-ids-matching-target get-runs-by-patt get-steps-data get-steps-for-test read-test-data + read-test-data* login tasks-get-last testmeta-get-record have-incompletes? - synchash-get - )) + ;; synchash-get + get-changed-record-ids + get-run-record-ids + get-not-completed-cnt)) (define api:write-queries '( get-keys-write ;; dummy "write" query to force server start @@ -78,10 +99,11 @@ delete-test-records delete-old-deleted-test-records test-set-state-status test-set-top-process-pid set-state-status-and-roll-up-items + update-pass-fail-counts top-test-set-per-pf-counts ;; (db:top-test-set-per-pf-counts (db:get-db *db* 5) 5 "runfirst") ;; RUNS register-run @@ -88,20 +110,23 @@ set-tests-state-status delete-run lock/unlock-run update-run-event_time mark-incomplete - + set-state-status-and-roll-up-run ;; STEPS teststep-set-status! - + delete-steps-for-test ;; TEST DATA test-data-rollup csv->test-data ;; MISC sync-inmem->db + drop-all-triggers + create-all-triggers + update-tesdata-on-repilcate-db ;; TESTMETA testmeta-add-record testmeta-update-field @@ -117,51 +142,75 @@ ;; (define (api:execute-requests dbstruct dat) (handle-exceptions exn (let ((call-chain (get-call-chain))) - (debug:print 0 *default-log-port* "WARNING: api:execute-requests received an exception from peer, dat=" dat) + (debug:print 0 *default-log-port* "WARNING: api:execute-requests received an exception from peer, dat=" dat ", exn=" exn) (print-call-chain (current-error-port)) (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn)) (vector #f (vector exn call-chain dat))) ;; return some stuff for debug if an exception happens (cond ((not (vector? dat)) ;; it is an error to not receive a vector (vector #f (vector #f "remote must be called with a vector"))) ((> *api-process-request-count* 20) ;; 20) (debug:print 0 *default-log-port* "WARNING: api:execute-requests received an overloaded message.") + (set! *server-overloaded* #t) (vector #f (vector #f 'overloaded))) ;; the inner vector is what gets returned. nope, don't know why. please refactor! (else - (let* ((cmd-in (vector-ref dat 0)) + (let* ((cmd-in (common:safe-vector-ref dat 0 'nocmd)) (cmd (if (symbol? cmd-in) cmd-in (string->symbol cmd-in))) - (params (vector-ref dat 1)) + (params (common:safe-vector-ref dat 1 '())) (start-t (current-milliseconds)) (readonly-mode (dbr:dbstruct-read-only dbstruct)) (readonly-command (member cmd api:read-only-queries)) (writecmd-in-readonly-mode (and readonly-mode (not readonly-command))) + (foo (begin + #;(common:telemetry-log (conc "api-in:"(->string cmd)) + payload: `((params . ,params))) + + #t)) (res (if writecmd-in-readonly-mode (conc "attempt to run write command "cmd" on a read-only database") (case cmd ;;=============================================== ;; READ/WRITE QUERIES ;;=============================================== + + ((nocmd) '(#f "All broken!")) ((get-keys-write) (db:get-keys dbstruct)) ;; force a dummy "write" query to force server; for debug in -repl ;; SERVERS ((start-server) (apply server:kind-run params)) ((kill-server) (set! *server-run* #f)) ;; TESTS - ((test-set-state-status-by-id) (apply mt:test-set-state-status-by-id dbstruct params)) + + ;;((test-set-state-status-by-id) (apply mt:test-set-state-status-by-id dbstruct params)) + ;;BB - commented out above because it was calling below, eventually, incorrectly (dbstruct passed to mt:test-set-state-status-by-id, which previosly did more, but now only passes thru to db:set-state-status-and-roll-up-items. + ((test-set-state-status-by-id) + + ;; (define (db:set-state-status-and-roll-up-items dbstruct run-id test-name item-path state status comment) + (db:set-state-status-and-roll-up-items + dbstruct + (list-ref params 0) ; run-id + (list-ref params 1) ; test-name + #f ; item-path + (list-ref params 2) ; state + (list-ref params 3) ; status + (list-ref params 4) ; comment + )) + ((delete-test-records) (apply db:delete-test-records dbstruct params)) ((delete-old-deleted-test-records) (apply db:delete-old-deleted-test-records dbstruct params)) ((test-set-state-status) (apply db:test-set-state-status dbstruct params)) ((test-set-top-process-pid) (apply db:test-set-top-process-pid dbstruct params)) ((set-state-status-and-roll-up-items) (apply db:set-state-status-and-roll-up-items dbstruct params)) + ((set-state-status-and-roll-up-run) (apply db:set-state-status-and-roll-up-run dbstruct params)) ((top-test-set-per-pf-counts) (apply db:top-test-set-per-pf-counts dbstruct params)) ((test-set-archive-block-id) (apply db:test-set-archive-block-id dbstruct params)) ;; RUNS ((register-run) (apply db:register-run dbstruct params)) @@ -169,23 +218,29 @@ ((delete-run) (apply db:delete-run dbstruct params)) ((lock/unlock-run) (apply db:lock/unlock-run dbstruct params)) ((update-run-event_time) (apply db:update-run-event_time dbstruct params)) ((update-run-stats) (apply db:update-run-stats dbstruct params)) ((set-var) (apply db:set-var dbstruct params)) + ((inc-var) (apply db:inc-var dbstruct params)) + ((dec-var) (apply db:dec-var dbstruct params)) ((del-var) (apply db:del-var dbstruct params)) + ((add-var) (apply db:add-var dbstruct params)) ;; STEPS ((teststep-set-status!) (apply db:teststep-set-status! dbstruct params)) - + ((delete-steps-for-test!) (apply db:delete-steps-for-test! dbstruct params)) + ;; TEST DATA ((test-data-rollup) (apply db:test-data-rollup dbstruct params)) ((csv->test-data) (apply db:csv->test-data dbstruct params)) ;; MISC ((sync-inmem->db) (let ((run-id (car params))) (db:sync-touched dbstruct run-id force-sync: #t))) ((mark-incomplete) (apply db:find-and-mark-incomplete dbstruct params)) + ((create-all-triggers) (db:create-all-triggers dbstruct)) + ((drop-all-triggers) (db:drop-all-triggers dbstruct)) ;; TESTMETA ((testmeta-add-record) (apply db:testmeta-add-record dbstruct params)) ((testmeta-update-field) (apply db:testmeta-update-field dbstruct params)) ((get-tests-tags) (db:get-tests-tags dbstruct)) @@ -193,15 +248,21 @@ ;; TASKS ((tasks-add) (apply tasks:add dbstruct params)) ((tasks-set-state-given-param-key) (apply tasks:set-state-given-param-key dbstruct params)) ((tasks-get-last) (apply tasks:get-last dbstruct params)) + ;; NO SYNC DB + ((no-sync-set) (apply db:no-sync-set *no-sync-db* params)) + ((no-sync-get/default) (apply db:no-sync-get/default *no-sync-db* params)) + ((no-sync-del!) (apply db:no-sync-del! *no-sync-db* params)) + ((no-sync-get-lock) (apply db:no-sync-get-lock *no-sync-db* params)) + ;; ARCHIVES ;; ((archive-get-allocations) ((archive-register-disk) (apply db:archive-register-disk dbstruct params)) ((archive-register-block-name)(apply db:archive-register-block-name dbstruct params)) - ((archive-allocate-testsuite/area-to-block)(apply db:archive-allocate-testsuite/area-to-block dbstruct block-id testsuite-name areakey)) + ;; ((archive-allocate-testsuite/area-to-block)(apply db:archive-allocate-testsuite/area-to-block dbstruct block-id testsuite-name areakey)) ;;====================================================================== ;; READ ONLY QUERIES ;;====================================================================== @@ -221,46 +282,59 @@ ((test-get-rundir-from-test-id) (apply db:test-get-rundir-from-test-id dbstruct params)) ((get-count-tests-running-for-testname) (apply db:get-count-tests-running-for-testname dbstruct params)) ((get-count-tests-running) (apply db:get-count-tests-running dbstruct params)) ((get-count-tests-running-in-jobgroup) (apply db:get-count-tests-running-in-jobgroup dbstruct params)) ;; ((delete-test-step-records) (apply db:delete-test-step-records dbstruct params)) - ((get-previous-test-run-record) (apply db:get-previous-test-run-record dbstruct params)) + ;; ((get-previous-test-run-record) (apply db:get-previous-test-run-record dbstruct params)) ((get-matching-previous-test-run-records)(apply db:get-matching-previous-test-run-records dbstruct params)) ((test-get-logfile-info) (apply db:test-get-logfile-info dbstruct params)) ((test-get-records-for-index-file) (apply db:test-get-records-for-index-file dbstruct params)) ((get-testinfo-state-status) (apply db:get-testinfo-state-status dbstruct params)) ((test-get-top-process-pid) (apply db:test-get-top-process-pid dbstruct params)) ((test-get-paths-matching-keynames-target-new) (apply db:test-get-paths-matching-keynames-target-new dbstruct params)) ((get-prereqs-not-met) (apply db:get-prereqs-not-met dbstruct params)) ((get-count-tests-running-for-run-id) (apply db:get-count-tests-running-for-run-id dbstruct params)) - ((synchash-get) (apply synchash:server-get dbstruct params)) + ((get-not-completed-cnt) (apply db:get-not-completed-cnt dbstruct params)) + ;; ((synchash-get) (apply synchash:server-get dbstruct params)) ((get-raw-run-stats) (apply db:get-raw-run-stats dbstruct params)) + ((get-test-times) (apply db:get-test-times dbstruct params)) ;; RUNS ((get-run-info) (apply db:get-run-info dbstruct params)) ((get-run-status) (apply db:get-run-status dbstruct params)) + ((get-run-state) (apply db:get-run-state dbstruct params)) ((set-run-status) (apply db:set-run-status dbstruct params)) + ((set-run-state-status) (apply db:set-run-state-status dbstruct params)) + ((update-tesdata-on-repilcate-db) (apply db:update-tesdata-on-repilcate-db dbstruct params)) ((get-tests-for-run) (apply db:get-tests-for-run dbstruct params)) + ((get-tests-for-run-state-status) (apply db:get-tests-for-run-state-status dbstruct params)) ((get-test-id) (apply db:get-test-id dbstruct params)) ((get-tests-for-run-mindata) (apply db:get-tests-for-run-mindata dbstruct params)) + ;; ((get-tests-for-runs-mindata) (apply db:get-tests-for-runs-mindata dbstruct params)) ((get-runs) (apply db:get-runs dbstruct params)) + ((simple-get-runs) (apply db:simple-get-runs dbstruct params)) ((get-num-runs) (apply db:get-num-runs dbstruct params)) + ((get-runs-cnt-by-patt) (apply db:get-runs-cnt-by-patt dbstruct params)) ((get-all-run-ids) (db:get-all-run-ids dbstruct)) ((get-prev-run-ids) (apply db:get-prev-run-ids dbstruct params)) ((get-run-ids-matching-target) (apply db:get-run-ids-matching-target dbstruct params)) ((get-runs-by-patt) (apply db:get-runs-by-patt dbstruct params)) ((get-run-name-from-id) (apply db:get-run-name-from-id dbstruct params)) ((get-main-run-stats) (apply db:get-main-run-stats dbstruct params)) ((get-var) (apply db:get-var dbstruct params)) ((get-run-stats) (apply db:get-run-stats dbstruct params)) + ((get-run-times) (apply db:get-run-times dbstruct params)) ;; STEPS ((get-steps-data) (apply db:get-steps-data dbstruct params)) ((get-steps-for-test) (apply db:get-steps-for-test dbstruct params)) + ((get-steps-info-by-id) (apply db:get-steps-info-by-id dbstruct params)) ;; TEST DATA ((read-test-data) (apply db:read-test-data dbstruct params)) + ((read-test-data*) (apply db:read-test-data* dbstruct params)) + ((get-data-info-by-id) (apply db:get-data-info-by-id dbstruct params)) ;; MISC ((get-latest-host-load) (apply db:get-latest-host-load dbstruct params)) ((have-incompletes?) (apply db:have-incompletes? dbstruct params)) ((login) (apply db:login dbstruct params)) @@ -269,28 +343,37 @@ (realparams (cddr params))) (db:general-call dbstruct stmtname realparams))) ((sdb-qry) (apply sdb:qry params)) ((ping) (current-process-id)) ((get-changed-record-ids) (apply db:get-changed-record-ids dbstruct params)) - + ((get-run-record-ids) (apply db:get-run-record-ids dbstruct params)) ;; TESTMETA ((testmeta-get-record) (apply db:testmeta-get-record dbstruct params)) ;; TASKS ((find-task-queue-records) (apply tasks:find-task-queue-records dbstruct params)) (else (debug:print 0 *default-log-port* "ERROR: bad api call " cmd) (conc "ERROR: BAD api call " cmd)))))) + ;; save all stats (let ((delta-t (- (current-milliseconds) start-t))) (hash-table-set! *db-api-call-time* cmd (cons delta-t (hash-table-ref/default *db-api-call-time* cmd '())))) (if writecmd-in-readonly-mode - (vector #f res) - (vector #t res))))))) + (begin + #;(common:telemetry-log (conc "api-out:"(->string cmd)) + payload: `((params . ,params) + (ok-res . #t))) + (vector #f res)) + (begin + #;(common:telemetry-log (conc "api-out:"(->string cmd)) + payload: `((params . ,params) + (ok-res . #f))) + (vector #t res)))))))) ;; http-server send-response ;; api:process-request ;; db:* ;; @@ -300,12 +383,12 @@ (set! *api-process-request-count* (+ *api-process-request-count* 1)) (let* ((cmd ($ 'cmd)) (paramsj ($ 'params)) (params (db:string->obj paramsj transport: 'http)) ;; incoming data from the POST (or is it a GET?) (resdat (api:execute-requests dbstruct (vector cmd params))) ;; process the request, resdat = #( flag result ) - (success (vector-ref resdat 0)) - (res (vector-ref resdat 1))) ;; (vector flag payload), get the payload, ignore the flag (why?) + (success (common:safe-vector-ref resdat 0 #f)) + (res (common:safe-vector-ref resdat 1 #f))) ;; (vector flag payload), get the payload, ignore the flag (why?) (if (not success) (debug:print 0 *default-log-port* "ERROR: success flag is #f for " cmd " with params " params)) (if (> *api-process-request-count* *max-api-process-requests*) (set! *max-api-process-requests* *api-process-request-count*)) (set! *api-process-request-count* (- *api-process-request-count* 1)) ADDED apimod.scm Index: apimod.scm ================================================================== --- /dev/null +++ apimod.scm @@ -0,0 +1,37 @@ +;;====================================================================== +;; Copyright 2017, Matthew Welland. +;; +;; This file is part of Megatest. +;; +;; Megatest is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. +;; +;; Megatest is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. +;; +;; You should have received a copy of the GNU General Public License +;; along with Megatest. If not, see . + +;;====================================================================== + +(declare (unit apimod)) +(declare (uses commonmod)) +(declare (uses ulex)) + +(module apimod + * + +(import scheme chicken data-structures extras) +(import (prefix sqlite3 sqlite3:) posix typed-records srfi-18) +(import commonmod) +(import (prefix ulex ulex:)) + + +(define (api:execute-requests params) + #f) + +) Index: archive.scm ================================================================== --- archive.scm +++ archive.scm @@ -1,18 +1,26 @@ ;; Copyright 2006-2014, Matthew Welland. ;; -;; This program is made available under the GNU GPL version 2.0 or -;; greater. See the accompanying file COPYING for details. +;; This file is part of Megatest. +;; +;; Megatest is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. +;; +;; Megatest is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. ;; -;; This program is distributed WITHOUT ANY WARRANTY; without even the -;; implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -;; PURPOSE. +;; You should have received a copy of the GNU General Public License +;; along with Megatest. If not, see . +;; ;; strftime('%m/%d/%Y %H:%M:%S','now','localtime') -(use sqlite3 srfi-1 posix regex regex-case srfi-69 dot-locking format md5 message-digest srfi-18) -(import (prefix sqlite3 sqlite3:)) +(use (prefix sqlite3 sqlite3:) srfi-1 posix regex regex-case srfi-69 format md5 message-digest srfi-18) (declare (unit archive)) (declare (uses db)) (declare (uses common)) @@ -30,11 +38,11 @@ (flavor 'plain) ;; type of machine to run jobs on (maxload 1.5) ;; max allowed load for this work (adisks (archive:get-archive-disks))) ;; get testdir size ;; - hand off du to job mgr - (if (and (file-exists? testdir) + (if (and (common:file-exists? testdir) (file-is-writable? testdir)) (let* ((dused (jobrunner:run-job flavor ;; machine type maxload ;; max allowed load '() ;; prevars - environment vars to set for the job @@ -72,29 +80,52 @@ (or (common:get-disk-with-most-free-space candidate-disks dused) (archive:allocate-new-archive-block #f #f #f)))) ;; BROKEN. testname itempath)))) ;; allocate a new archive area ;; -(define (archive:allocate-new-archive-block run-area-home testsuite-name dneeded) - (let* ((adisks (archive:get-archive-disks)) - (best-disk (common:get-disk-with-most-free-space adisks dneeded))) - (if best-disk - (let* ((bdisk-name (car best-disk)) - (bdisk-path (cdr best-disk)) - (area-key (substring (message-digest-string (md5-primitive) run-area-home) 0 5)) - (bdisk-id (rmt:archive-register-disk bdisk-name bdisk-path (get-df bdisk-path))) - (archive-name (let ((sec (current-seconds))) - (conc (time->string (seconds->local-time sec) "%Y") - "_q" (seconds->quarter sec) "/" - testsuite-name "_" area-key))) - (archive-path (conc bdisk-path "/" archive-name)) - (block-id (rmt:archive-register-block-name bdisk-id archive-path))) - ;; (allocation-id (rmt:archive-allocate-testsuite/area-to-block block-id testsuite-name area-key))) - (if block-id ;; (and block-id allocation-id) - (cons block-id archive-path) - #f)) - #f))) +(define (archive:allocate-new-archive-block blockid-cache run-area-home testsuite-name dneeded target run-name test-name) + (let ((key (conc testsuite-name "/" target "/" run-name "/" test-name))) + (if (hash-table-exists? blockid-cache key) + (hash-table-ref blockid-cache key) + (let* ((pscript (configf:lookup *configdat* "archive" "pathscript")) + (pscript-cmd (conc pscript " " testsuite-name " " target " " run-name " " test-name)) + (apath (if pscript + (handle-exceptions + exn + (begin + (debug:print 0 *default-log-port* "ERROR: script \"" pscript-cmd "\" failed to run properly. exn=" exn) + (exit 1)) + (with-input-from-pipe + pscript-cmd + read-line)) + #f)) ;; this is the user-calculated archive path + (adisks (archive:get-archive-disks)) + (best-disk (common:get-disk-with-most-free-space adisks dneeded))) + (if best-disk + (let* ((bdisk-name (car best-disk)) + (bdisk-path (cdr best-disk)) + (area-key (substring (message-digest-string (md5-primitive) run-area-home) 0 5)) + (bdisk-id (rmt:archive-register-disk bdisk-name bdisk-path (get-df bdisk-path))) + (archive-name (if apath + apath + (let ((sec (current-seconds))) + (conc (time->string (seconds->local-time sec) "%Y") + "_q" (seconds->quarter sec) "/" + testsuite-name "_" area-key)))) + (archive-path (conc bdisk-path "/" archive-name)) + (block-id (rmt:archive-register-block-name bdisk-id archive-path))) + ;; (allocation-id (rmt:archive-allocate-testsuite/area-to-block block-id testsuite-name area-key))) + (if block-id ;; (and block-id allocation-id) + (let ((res (cons block-id archive-path))) + (hash-table-set! blockid-cache key res) + res) + (begin + (debug:print 0 *default-log-port* "WARNING: no disk found for " target ", " run-name ", " test-name ", archive-path=" archive-path) + #f))) + (begin + (debug:print 0 *default-log-port* "WARNING: no disk found for " target ", " run-name ", " test-name ", block-id=" block-id) + #f)))))) ;; no best disk found ;; archive - run bup ;; ;; 1. create the bup dir if not exists ;; 2. start the du of each directory @@ -103,113 +134,309 @@ ;; (define (archive:run-bup archive-command run-id run-name tests rp-mutex bup-mutex) ;; move the getting of archive space down into the below block so that a single run can ;; allocate as needed should a disk fill up ;; - (let* ((min-space (string->number (or (configf:lookup *configdat* "archive" "minspace") "1000"))) - (archive-info (archive:allocate-new-archive-block *toppath* (common:get-testsuite-name) min-space)) - (archive-dir (if archive-info (cdr archive-info) #f)) - (archive-id (if archive-info (car archive-info) -1)) - (disk-groups (make-hash-table)) - (test-groups (make-hash-table)) ;; these two (disk and test groups) could be combined nicely - (bup-exe (or (configf:lookup *configdat* "archive" "bup") "bup")) - (compress (or (configf:lookup *configdat* "archive" "compress") "9")) - (linktree (common:get-linktree))) ;; (configf:lookup *configdat* "setup" "linktree"))) - - (if (not archive-dir) ;; no archive disk found, this is fatal - (begin - (debug:print 0 *default-log-port* "FATAL: No archive disks found. Please add disks with at least " min-space " MB space to the [archive-disks] section of megatest.config") - (debug:print 0 *default-log-port* " use [archive] minspace to specify minimum available space") - (debug:print 0 *default-log-port* " disks: " (string-intersperse (map cadr (archive:get-archive-disks)) "\n ")) - (exit 1)) - (debug:print-info 0 *default-log-port* "Using path " archive-dir " for archiving")) - + (let* ((blockid-cache (make-hash-table)) + (tsname (common:get-testsuite-name)) + (target (string-intersperse (map cadr (rmt:get-key-val-pairs run-id)) "/")) + (min-space (string->number (or (configf:lookup *configdat* "archive" "minspace") "1000"))) + (arch-groups (make-hash-table)) ;; archive groups, each corrosponds to a bup area + (disk-groups (make-hash-table)) ;; + (test-groups (make-hash-table)) ;; these two (disk and test groups) could be combined nicely + (test-dirs (make-hash-table)) + (bup-exe (or (configf:lookup *configdat* "archive" "bup") "bup")) + (compress (or (configf:lookup *configdat* "archive" "compress") "9")) + (linktree (common:get-linktree)) ;; (configf:lookup *configdat* "setup" "linktree"))) + (archiver (let ((s (configf:lookup *configdat* "archive" "archiver"))) + (if s (string->symbol s) 'bup))) + (archiver-cmd (case archiver + ((tar) "tar cfj ARCHIVE_NAME.tar.bz2 ") + ((7z) " 7z u -t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on ARCHIVE_NAME.7z ") + (else #f))) + (src-archive-linktree (rmt:get-var "src-archive-linktree")) + (print-prefix "Running: ") ;; change to #f to turn off printing + (preclean-spec (configf:get-section *configdat* "archive-preclean"))) + + (if (or (not src-archive-linktree) (not (equal? src-archive-linktree linktree))) + (rmt:set-var "src-archive-linktree" linktree)) + ;; (tests:match patt testname itempath) + ;; from the test info bin the path to the test by stem ;; (for-each (lambda (test-dat) (let* ((item-path (db:test-get-item-path test-dat)) (test-name (db:test-get-testname test-dat)) (test-id (db:test-get-id test-dat)) (run-id (db:test-get-run_id test-dat)) - (target (string-intersperse (map cadr (rmt:get-key-val-pairs run-id)) "/")) - + (toplevel/children (and (db:test-get-is-toplevel test-dat) (> (rmt:test-toplevel-num-items run-id test-name) 0))) (test-partial-path (conc target "/" run-name "/" (db:test-make-full-name test-name item-path))) ;; note the trailing slash to get the dir inspite of it being a link (test-path (conc linktree "/" test-partial-path)) (mutex-lock! rp-mutex) - (test-physical-path (if (file-exists? test-path) + (test-physical-path (if (common:file-exists? test-path) (common:real-path test-path) #f)) (mutex-unlock! rp-mutex) (partial-path-index (if test-physical-path (substring-index test-partial-path test-physical-path) #f)) (test-base (if (and partial-path-index test-physical-path ) (substring test-physical-path 0 partial-path-index) - #f))) + #f)) + ;; we need our archive dir checked for every test to enable folks who want to store other ways. + (archive-info (archive:allocate-new-archive-block blockid-cache *toppath* tsname min-space target run-name test-name)) + (archive-dir (if archive-info (cdr archive-info) #f)) + (archive-id (if archive-info (car archive-info) -1))) - (cond + (if (not archive-dir) ;; no archive disk found, this is fatal + (begin + (debug:print 0 *default-log-port* "FATAL: No archive disks found. Please add disks with at least " + min-space " MB space to the [archive-disks] section of megatest.config") + (debug:print 0 *default-log-port* " use [archive] minspace to specify minimum available space") + (debug:print 0 *default-log-port* " disks: " + (string-intersperse (map cadr (archive:get-archive-disks)) "\n ")) + (exit 1)) + (debug:print-info 0 *default-log-port* "Using path " archive-dir " for archiving test " test-path)) + + ;; preclean the test directory per the spec if provided + (if (not (null? preclean-spec)) ;; we've been asked to preclean before archiving + (let loop ((spec (car preclean-spec)) + (tail (cdr preclean-spec))) + (if (> (length spec) 1) + (let ((testspec (car spec)) + (rules (cadr spec))) + (if (tests:match testspec test-name item-path) + (begin + (debug:print 0 *default-log-port* "INFO: cleanup requested for " test-physical-path) + (common:dir-clean-up test-physical-path rules remove-empty: #t)) + (if (not (null? tail)) + (loop (car tail)(cdr tail))))) + (begin + (debug:print 0 *default-log-port* "ERROR: bad spec line in [archive-preclean] section. \"" spec "\"") + (if (not (null? tail))(loop (car tail)(cdr tail))))))) + (cond (toplevel/children - (debug:print 0 *default-log-port* "WARNING: cannot archive " test-name " with id " test-id " as it is a toplevel test with children")) - ((not (file-exists? test-path)) - (debug:print 0 *default-log-port* "WARNING: Cannot archive " test-name "/" item-path " as path " test-path " does not exist")) + (debug:print 0 *default-log-port* "WARNING: cannot archive " test-name " with id " test-id + " as it is a toplevel test with children")) + ((not (common:file-exists? test-path)) + (debug:print 0 *default-log-port* "WARNING: Cannot archive " test-name "/" item-path + " as path " test-path " does not exist")) (else (debug:print 0 *default-log-port* "From test-dat=" test-dat " derived the following:\n" "test-partial-path = " test-partial-path "\n" "test-path = " test-path "\n" "test-physical-path = " test-physical-path "\n" "partial-path-index = " partial-path-index "\n" "test-base = " test-base) - (hash-table-set! disk-groups test-base (cons test-physical-path (hash-table-ref/default disk-groups test-base '()))) - (hash-table-set! test-groups test-base (cons test-dat (hash-table-ref/default test-groups test-base '()))) - test-path)))) - tests) - ;; for each disk-group - (for-each - (lambda (disk-group) - (debug:print 0 *default-log-port* "Processing disk-group " disk-group) - (let* ((test-paths (hash-table-ref disk-groups disk-group)) - ;; ((string-intersperse (map cadr (rmt:get-key-val-pairs 1)) "-") - (bup-init-params (list "-d" archive-dir "init")) - (bup-index-params (append (list "-d" archive-dir "index") test-paths)) - (bup-save-params (append (list "-d" archive-dir "save" ;; (conc "--strip-path=" linktree) - (conc "-" compress) ;; or (conc "--compress=" compress) - "-n" (conc (common:get-testsuite-name) "-" run-id) - (conc "--strip-path=" disk-group)) - test-paths)) - (print-prefix #f)) ;; "Running: ")) ;; change to #f to turn off printing - (if (not (file-exists? archive-dir)) - (create-directory archive-dir #t)) - (if (not (file-exists? (conc archive-dir "/HEAD"))) - (begin - ;; replace this with jobrunner stuff enventually - (debug:print-info 0 *default-log-port* "Init bup in " archive-dir) - ;; (mutex-lock! bup-mutex) - (run-n-wait bup-exe params: bup-init-params print-cmd: print-prefix) - ;; (mutex-unlock! bup-mutex) - )) - (debug:print-info 0 *default-log-port* "Indexing data to be archived") - ;; (mutex-lock! bup-mutex) - (run-n-wait bup-exe params: bup-index-params print-cmd: print-prefix) - (debug:print-info 0 *default-log-port* "Archiving data with bup") - (run-n-wait bup-exe params: bup-save-params print-cmd: print-prefix) - ;; (mutex-unlock! bup-mutex) - (for-each - (lambda (test-dat) - (let ((test-id (db:test-get-id test-dat)) - (run-id (db:test-get-run_id test-dat))) - (rmt:test-set-archive-block-id run-id test-id archive-id) - (if (member archive-command '("save-remove")) - (runs:remove-test-directory test-dat 'archive-remove)))) - (hash-table-ref test-groups disk-group)))) - (hash-table-keys disk-groups)) - #t)) + (hash-table-set! disk-groups test-base + (cons test-physical-path (hash-table-ref/default disk-groups test-base '()))) + (hash-table-set! test-groups test-base + (cons test-dat (hash-table-ref/default test-groups test-base '()))) + (hash-table-set! arch-groups test-base + (cons archive-info (hash-table-ref/default arch-groups test-base '()))) + (hash-table-set! test-dirs test-id test-path))))) + ;; test-path)))) + tests) + (debug:print 0 *default-log-port* "INFO: DISK GROUPS=" (hash-table->alist disk-groups)) + ;; for each disk-group, initialize the bup area if needed + (for-each + (lambda (test-base) + (let* ((disk-group (hash-table-ref disk-groups test-base)) + (arch-group (hash-table-ref arch-groups test-base)) + (arch-info (car arch-group)) ;; don't know yet how this will work, can I get more than one possibility? + (archive-id (car arch-info)) + (archive-dir (cdr arch-info))) + (debug:print 0 *default-log-port* "Processing disk-group " test-base) + (let* ((test-paths-in (hash-table-ref disk-groups test-base)) + (test-paths (if (args:get-arg "-include") + (let ((subpaths (string-split (args:get-arg "-include") ","))) + (apply append + (map (lambda (p) + (map (lambda (subp) + (conc p "/" subp)) + subpaths)) + test-paths-in))) + test-paths-in))) + (if (not (common:file-exists? archive-dir)) + (create-directory archive-dir #t)) + (case archiver + ((bup) ;; Archive using bup + (let* ((bup-init-params (list "-d" archive-dir "init")) + (bup-index-params (append (list "-d" archive-dir "index") test-paths)) + (bup-save-params (append (list "-d" archive-dir "save" ;; (conc "--strip-path=" linktree) + (conc "-" compress) ;; or (conc "--compress=" compress) + "-n" (conc (common:get-testsuite-name) "-" run-id) + (conc "--strip-path=" test-base) ;; if we push to the directory do we need this? + ) + test-paths))) + (if (not (common:file-exists? (conc archive-dir "/HEAD"))) + (begin + ;; replace this with jobrunner stuff enventually + (debug:print-info 0 *default-log-port* "Init bup in " archive-dir) + ;; (mutex-lock! bup-mutex) + (run-n-wait bup-exe params: bup-init-params print-cmd: print-prefix) + ;; (mutex-unlock! bup-mutex) + )) + (debug:print-info 0 *default-log-port* "Indexing data to be archived") + ;; (mutex-lock! bup-mutex) + (run-n-wait bup-exe params: bup-index-params print-cmd: print-prefix) + (debug:print-info 0 *default-log-port* "Archiving data with bup") + (run-n-wait bup-exe params: bup-save-params print-cmd: print-prefix))) + ((7z tar) + (for-each + (lambda (test-dat) + (let* ((test-id (db:test-get-id test-dat)) + (test-name (db:test-get-testname test-dat)) + (item-path (db:test-get-item-path test-dat)) + (test-full-name (db:test-make-full-name test-name item-path)) + (run-id (db:test-get-run_id test-dat)) + (target (string-intersperse (map cadr (rmt:get-key-val-pairs run-id)) "/")) + (run-name (rmt:get-run-name-from-id run-id)) + (source-dir (hash-table-ref test-dirs test-id)) ;; (conc test-base "/" test-name "/" item-path)) + (target-dir (string-substitute "/$" "" (conc archive-dir "/" target "/" run-name "/" test-full-name)))) + ;; create the test and item-path levels under archive-dir + (create-directory (pathname-directory target-dir) #t) + (run-n-wait + (conc + (string-substitute "ARCHIVE_NAME" target-dir archiver-cmd) " " + "." + ) + print-cmd: print-prefix + run-dir: source-dir))) + (hash-table-ref test-groups test-base)))) + ;; (mutex-unlock! bup-mutex) + (for-each + (lambda (test-dat) + (let ((test-id (db:test-get-id test-dat)) + (run-id (db:test-get-run_id test-dat))) + (rmt:test-set-archive-block-id run-id test-id archive-id) + (if (member (symbol->string archive-command) '("save-remove")) + (begin + (debug:print-info 0 *default-log-port* "remove testdat") + (runs:remove-test-directory test-dat 'archive-remove))))) + (hash-table-ref test-groups test-base))))) + (hash-table-keys disk-groups)) + #t)) + +(define (archive:megatest-db target-patt run-patt) + (let* ((blockid-cache (make-hash-table)) + (tsname (common:get-testsuite-name)) + (min-space (string->number (or (configf:lookup *configdat* "archive" "minspace") "1000"))) + (bup-exe (or (configf:lookup *configdat* "archive" "bup") "bup")) + (compress (or (configf:lookup *configdat* "archive" "compress") "9")) + (archiver (let ((s (configf:lookup *configdat* "archive" "archiver"))) + (if s (string->symbol s) 'bup))) + (rsync-exe (or (configf:lookup *configdat* "archive" "rsync") "rsync")) + (print-prefix "Running: ") + (archive-info (archive:allocate-new-archive-block blockid-cache *toppath* tsname min-space target-patt run-patt "megatest-db")) + (archive-dir (if archive-info (cdr archive-info) #f)) + (archive-id (if archive-info (car archive-info) -1)) + (home-host (common:get-homehost)) + (archive-time (seconds->std-time-str (current-seconds))) + (archive-staging-db (conc *toppath* "/logs/archive_" archive-time)) + (tmp-db-path (conc (common:get-db-tmp-area) "/megatest.db")) + (dbfile (conc archive-staging-db "/megatest.db"))) + (create-directory archive-staging-db #t) + (let-values (((pid-val exit-status exit-code) (run-n-wait rsync-exe params: (list "-v" (conc (car home-host) ":"tmp-db-path) archive-staging-db) print-cmd: print-prefix))) + (if (eq? exit-code 0) + (case archiver + ((bup) ;; Archive using bup + (let* ((bup-init-params (list "-d" archive-dir "init")) + (bup-index-params (list "-d" archive-dir "index" archive-staging-db)) + (bup-save-params (list "-d" archive-dir "save" ;; (conc "--strip-path=" linktree) + (conc "-" compress) ;; or (conc "--compress=" compress) + "-n" (conc tsname "-megatest-db" ) + (conc "--strip-path=" archive-staging-db ) ;; if we push to the directory do we need this? + dbfile))) + (if (not (common:file-exists? (conc archive-dir "/HEAD"))) + (begin + ;; replace this with jobrunner stuff enventually + (debug:print-info 0 *default-log-port* "Init bup in " archive-dir) + (run-n-wait bup-exe params: bup-init-params print-cmd: print-prefix))) + (debug:print-info 0 *default-log-port* "Indexing data to be archived") + (run-n-wait bup-exe params: bup-index-params print-cmd: print-prefix) + (debug:print-info 0 *default-log-port* "Archiving data with bup") + (run-n-wait bup-exe params: bup-save-params print-cmd: print-prefix))) + (else + (debug:print-info 0 *default-log-port* "No support for databse archiving with " archiver))) + (debug:print-error 0 *default-log-port* "There was an error rsyncing tmp database"))))) + +(define (archive:restore-db archive-path ts) + (let* ((bup-exe (or (configf:lookup *configdat* "archive" "bup") "bup")) + (archive-internal-path (conc (common:get-testsuite-name) "-megatest-db/" ts "/megatest.db" )) + (bup-restore-params (list "-d" archive-path "restore" "-C" *toppath* archive-internal-path))) + (debug:print-info 0 *default-log-port* "Restoring archived data to " *toppath* " from archive in " archive-path " ... " archive-internal-path) + (run-n-wait bup-exe params: bup-restore-params print-cmd: #f)) + (db:multi-db-sync + (db:setup #f) + 'killservers + ;'dejunk + ;'adj-testids + 'old2new + ) + (debug:print-info 1 *default-log-port* "dropping trigerrs to update linktree") + (rmt:drop-all-triggers) + + (let* ((linktree (common:get-linktree)) ;; (configf:lookup *configdat* "setup" "linktree"))) + (src-archive-linktree (rmt:get-var "src-archive-linktree"))) + (if (not (equal? src-archive-linktree linktree)) + (rmt:update-tesdata-on-repilcate-db src-archive-linktree linktree)) + (debug:print-info 1 *default-log-port* "creating triggers after updating linktree") + (rmt:create-all-triggers) +)) + +(define (archive:ls->list bup-exe archive-dir internal-path) + (let ((cmd (conc bup-exe " -d " archive-dir " ls -l " internal-path "| awk '{print $6}' | sort")) + (res '())) + (handle-exceptions + exn + #f ;; anything goes wrong - assume the process in NOT running. + (with-input-from-pipe + cmd + (lambda () + (let* ((inl (read-lines))) + (reverse inl))))))) + +(define (time-string->seconds tstr ds-flag) + (let* ((atime (string->time tstr "%Y-%m-%d-%H%M%S"))) + (vector-set! atime 8 ds-flag) + (local-time->seconds atime))) + +(define (seconds->std-time-str sec) + (time->string + (seconds->local-time sec) + "%Y-%m-%d-%H%M%S")) + + +(define (archive:get-timestamp-dir bup-exe archive-dir testsuite-name run-id test-partial-path test-last-update) + (print (seconds->std-time-str test-last-update)) + (let* ((internal-path (conc testsuite-name "-" run-id)) + (ts-list (archive:ls->list bup-exe archive-dir internal-path)) + (ds-flag (vector-ref (seconds->local-time) 8))) + (let loop ((hed (car ts-list)) + (tail (cdr ts-list))) + (if (and (null? tail) (equal? hed "latest")) + #f + (if (and (not (null? tail)) (equal? hed "latest")) + (loop (car tail) (cdr tail)) + (let* ((archive-seconds (time-string->seconds hed ds-flag))) + (if (< (abs (- archive-seconds test-last-update)) 120) + (let* ((test-list (archive:ls->list bup-exe archive-dir (conc internal-path "/" hed "/" test-partial-path)))) + (if (> (length test-list) 0) + hed + (if (not (null? tail)) + (loop (car tail) (cdr tail)) + #f))) + (if (null? tail) + #f + (loop (car tail) (cdr tail)))))))))) (define (archive:bup-restore archive-command run-id run-name tests rp-mutex bup-mutex) ;; move the getting of archive space down into the below block so that a single run can ;; allocate as needed should a disk fill up ;; (let* ((bup-exe (or (configf:lookup *configdat* "archive" "bup") "bup")) @@ -233,28 +460,34 @@ (test-partial-path (conc target "/" run-name "/" (db:test-make-full-name test-name item-path))) ;; note the trailing slash to get the dir inspite of it being a link (test-path (conc linktree "/" test-partial-path)) ;; if the old path was not deleted then prev-test-physical-path will end up pointing to a real directory (mutex-lock! rp-mutex) - (prev-test-physical-path (if (file-exists? test-path) + (prev-test-physical-path (if (common:file-exists? test-path) ;; (read-symbolic-link test-path #t) (common:real-path test-path) #f)) (mutex-unlock! rp-mutex) (new-test-physical-path (conc best-disk "/" test-partial-path)) (archive-block-id (db:test-get-archived test-dat)) + (test-last-update (db:test-get-last_update test-dat)) (archive-block-info (rmt:test-get-archive-block-info archive-block-id)) (archive-path (if (vector? archive-block-info) (vector-ref archive-block-info 2) ;; look in db.scm for test-get-archive-block-info for the vector record info #f)) ;; no archive found? - (archive-internal-path (conc (common:get-testsuite-name) "-" run-id "/latest/" test-partial-path))) - + (archive-timestamp-dir (if archive-path (archive:get-timestamp-dir bup-exe archive-path (common:get-testsuite-name) run-id test-partial-path test-last-update) #f)) + (archive-internal-path (conc (common:get-testsuite-name) "-" run-id "/" archive-timestamp-dir "/" test-partial-path)) + (include-paths (args:get-arg "-include")) + (exclude-pattern (args:get-arg "-exclude-rx")) + (exclude-file (args:get-arg "-exclude-rx-from"))) + (if (not archive-timestamp-dir) + (debug:print-error 0 *default-log-port* "Archive not found for testsuite" (common:get-testsuite-name) " run/test/itempath" test-partial-path) + (begin ;; some sanity checks, move an existing path out of the way - iif it is not a toplevel with children - ;; (if (and (not toplevel/children) ;; special handling needed for toplevel with children prev-test-physical-path - (file-exists? prev-test-physical-path)) ;; what to do? abort or clean up or link it in? + (common:file-exists? prev-test-physical-path)) ;; what to do? abort or clean up or link it in? (let* ((base (pathname-directory prev-test-physical-path)) (dirn (pathname-file prev-test-physical-path)) (newn (conc base "/." dirn))) (debug:print-error 0 *default-log-port* "the old directory " prev-test-physical-path ", still exists! Moving it to " newn) (rename-file prev-test-physical-path newn))) @@ -264,17 +497,14 @@ (begin ;; CREATE WORK AREA ;; test-src-path == #f ==> don't copy in data from tests directory ;; itemdat == string ==> use directly (create-work-area run-id run-name keyvals test-id #f best-disk test-name item-path) ;; #!key (remtries 2)) - ;; 1. Get the block id from the test info ;; 2. Get the block data given the block id ;; 3. Construct the paths etc. for the following command: - ;; ;; bup -d /tmp/matt/adisk1/2015_q1/fullrun_e1a40/ restore -C /tmp/seeme fullrun-30/latest/ubuntu/nfs/none/w02.1.20.54_b/ - ;; DO BUP RESTORE (let* ((new-test-dat (rmt:get-test-info-by-id run-id test-id)) (new-test-path (if (vector? new-test-dat ) (db:test-get-rundir new-test-dat) (begin @@ -281,12 +511,97 @@ (debug:print-error 0 *default-log-port* "unable to get data for run-id=" run-id ", test-id=" test-id) (exit 1)))) ;; new-test-path won't work - must use best-disk instead? Nope, new-test-path but tack on /.. (bup-restore-params (list "-d" archive-path "restore" "-C" (conc new-test-path "/..") archive-internal-path))) (debug:print-info 0 *default-log-port* "Restoring archived data to " new-test-physical-path " from archive in " archive-path " ... " archive-internal-path) + (debug:print-info 0 *default-log-port* bup-exe " " (string-join bup-restore-params " ")) ;; (mutex-lock! bup-mutex) (run-n-wait bup-exe params: bup-restore-params print-cmd: #f) ;; (mutex-unlock! bup-mutex) (mt:test-set-state-status-by-id run-id test-id "COMPLETED" #f #f))) - (debug:print-error 0 *default-log-port* "No archive path in the record for run-id=" run-id " test-id=" test-id)))) + (debug:print-error 0 *default-log-port* "No archive path in the record for run-id=" run-id " test-id=" test-id)))))) (filter vector? tests)))) - + +(define (common:get-youngest-test tests) + (if (null? tests) + #f + (let ((res #f)) + (for-each + (lambda (test-dat) + (let ((event-time (db:test-get-event_time test-dat))) + (if (or (not res) + (> event-time (db:test-get-event_time res))) + (set! res test-dat)))) + tests) + res))) + +;; from an archive get a specific path - works ONLY with bup for now +;; +(define (archive:bup-get-data archive-command run-id-in run-name-in tests rp-mutex bup-mutex) + (if (null? tests) + (debug:print-info 0 *default-log-port* "get-data called with no matching tests to operate on.") + + (let* ((bup-exe (or (configf:lookup *configdat* "archive" "bup") "bup")) + (linktree (common:get-linktree)) ;; (configf:lookup *configdat* "setup" "linktree"))) + ;; (test-dat (common:get-youngest-test tests)) + (destpath (args:get-arg "-dest"))) + (cond + ((null? tests) + (debug:print-error 0 *default-log-port* + "No test matching provided target, runname pattern and test pattern found.")) + ((file-exists? destpath) + (debug:print-error 0 *default-log-port* + "Destination path alread exists! Please remove it before running get.")) + (else + (let loop ((rem-tests tests)) + (let* ((test-dat (common:get-youngest-test rem-tests)) + (item-path (db:test-get-item-path test-dat)) + (test-name (db:test-get-testname test-dat)) + (test-id (db:test-get-id test-dat)) + (run-id (db:test-get-run_id test-dat)) + (run-name (rmt:get-run-name-from-id run-id)) + (keyvals (rmt:get-key-val-pairs run-id)) + (target (string-intersperse (map cadr keyvals) "/")) + + (toplevel/children (and (db:test-get-is-toplevel test-dat) + (> (rmt:test-toplevel-num-items run-id test-name) 0))) + (test-partial-path (conc target "/" run-name "/" + (db:test-make-full-name test-name item-path))) + ;; note the trailing slash to get the dir inspite of it being a link + (test-path (conc linktree "/" test-partial-path)) + (archive-block-id (db:test-get-archived test-dat)) + (archive-block-info (rmt:test-get-archive-block-info archive-block-id)) + (archive-path (if (vector? archive-block-info) + (vector-ref archive-block-info 2) + #f)) + (archive-internal-path (conc (common:get-testsuite-name) "-" run-id + "/latest/" test-partial-path)) + (include-paths (args:get-arg "-include")) + (exclude-pattern (args:get-arg "-exclude-rx")) + (exclude-file (args:get-arg "-exclude-rx-from"))) + + (if (and archive-path ;; no point in proceeding if there is no actual archive + (not toplevel/children)) + (begin + (let* ((bup-restore-params (append (list "-d" archive-path "restore" "-C" (or destpath "data")) + ;; " " ;; What is the empty string for? + (if include-paths + (map (lambda (p) + (conc archive-internal-path "/" p)) + (string-split include-paths ",")) + (list archive-internal-path))))) + (debug:print-info 0 *default-log-port* "Restoring archived data to " (or destpath "data") + " from archive in " archive-path " ... " archive-internal-path) + (run-n-wait bup-exe params: bup-restore-params print-cmd: #t))) + (let ((new-rem-tests (filter (lambda (tdat) + (or (not (eq? (db:test-get-id tdat) test-id)) + (not (eq? (db:test-get-run_id tdat) run-id)))) + rem-tests) )) + (debug:print-info 0 *default-log-port* + "No archive path in the record for run-id=" run-id + " test-id=" test-id ", skipping.") + (if (null? new-rem-tests) + (begin + (debug:print-info 0 *default-log-port* "No archives found for " target "/" run-name "...") + #f) + (loop new-rem-tests))))))))))) + ADDED autostuff/.mtutil.scm Index: autostuff/.mtutil.scm ================================================================== --- /dev/null +++ autostuff/.mtutil.scm @@ -0,0 +1,88 @@ +;; Copyright 2006-2017, Matthew Welland. +;; +;; This file is part of Megatest. +;; +;; Megatest is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. +;; +;; Megatest is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. +;; +;; You should have received a copy of the GNU General Public License +;; along with Megatest. If not, see . + +(use json) +(use ducttape-lib) + +(define (get-last-runname area-path target) + (let* ((run-data (with-input-from-pipe (conc "megatest -list-runs % -target " target " -fields runs:runname,event_time -dumpmode sexpr -start-dir " area-path) + read))) + (if (or (not run-data) + (null? run-data)) + #f + (let* ((name-time (let ((dat (map cdadr (alist-ref target run-data equal?)))) ;; (("runname" . "2017w07.0-0047") ("event_time" . "1487490424")) + ;; (print "dat=" dat) + (map (lambda (item) + (cons (alist-ref "runname" item equal?) + (string->number (alist-ref "event_time" item equal?)))) + dat))) + (sorted (sort name-time (lambda (a b)(> (cdr a)(cdr b))))) + (last-name (if (null? sorted) + #f + (caar sorted)))) + last-name)))) + +(define (str-first-char->number str) + (char->integer (string-ref str 0))) + +;; example of how to set up and write target mappers +;; NOTE: maps a *list* of targets! +;; +;; (? target run-name area area-path reason contour mode-patt) +;; +(add-target-mapper 'prefix-contour + (lambda (runkey area contour) + (print "target: " runkey) + (list (conc contour "/" runkey)))) +#;(add-target-mapper 'prefix-area-contour + (lambda (target run-name area area-path reason contour mode-patt) + (conc area "/" contour "/" target))) + +(add-runname-mapper 'corporate-ww + (lambda (target run-name area area-path reason contour mode-patt) + (print "corporate-ww called with: target=" target " run-name=" run-name " area=" area " area-path=" area-path " reason=" reason " contour=" contour " mode-patt=" mode-patt) + (let* ((last-name (get-last-runname area-path target)) + (last-letter (let* ((ch (if (string? last-name) + (let ((len (string-length last-name))) + (substring last-name (- len 1) len)) + "a")) + (chnum (str-first-char->number ch)) + (a (str-first-char->number "a")) + (z (str-first-char->number "z"))) + (if (and (>= chnum a)(<= chnum z)) + chnum + #f))) + (next-letter (if last-letter + (list->string + (list + (integer->char + (+ last-letter 1)))) ;; surely there is an easier way? + "a"))) + ;; (print "last-name: " last-name " last-letter: " last-letter " next-letter: " next-letter) + (conc (seconds->wwdate (current-seconds)) next-letter)))) + +(add-runname-mapper 'auto + (lambda (target run-name area area-path reason contour mode-patt) + "auto-eh")) + +;; run only areas where first letter of area name is "a" +;; +(add-area-checker 'first-letter-a + (lambda (area target contour) + (string-match "^a.*$" area))) + + ADDED autostuff/megatest.config Index: autostuff/megatest.config ================================================================== --- /dev/null +++ autostuff/megatest.config @@ -0,0 +1,85 @@ +# Copyright 2006-2017, Matthew Welland. +# +# This file is part of Megatest. +# +# Megatest is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Megatest is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Megatest. If not, see . + +## commented out due to a bug in v1.6501 in mtutil +[fields] +a text +b text +c text + +[default] +# usercode .mtutil.scm +# areafilter area-to-run +# targtrans generic-target-translator +# runtrans generic-runname-translator +usercode .mtutil.scm +# areafilter area-to-run +targtrans prefix-contour-broken +# runtrans generic-runname-translator + +[setup] +pktsdirs /mfs/home/matt/orion_automation/pkts + +[areas] + +# path-to-area map-target-script(future, optional) +# someqa path=../megatestqa/someqa; targtrans=somefunc; areafilter=area-to-run +# targtrans is name of scheme proc stored in .mtutil.scm, which lives in PWD where mtutil is run +# the target translator can return: a/target OR (list/of targets/to apply/run) +# OR #f i.e. run nothing + +# ext-tests path=ext-tests; targtrans=prefix-contour; + + +ext path=/mfs/home/matt/automation_areas/megatest/ext-tests; targtrans=prefix-contour + +[contours] +# selector=tag-expr/mode-patt +quick areas=ext; selector=/QUICKPATT +# quick2 areafn=check-area; selector=/QUICKPATT +full areas=ext +# quick areas=fullrun,ext-tests; selector=QUICKPATT/quick +# full areas=fullrun,ext-tests; selector=MAXPATT/ +# short areas=fullrun,ext-tests; selector=MAXPATT/ +# all areas=fullrun,ext-tests +# snazy selector=QUICKPATT/ + +[nopurpose] + +[access] +ext matt:admin mattw:owner + +[accesstypes] +admin run rerun resume remove set-ss rerun-clean +owner run rerun resume remove rerun-all +badguy set-ss + +[setup] +maxload 1.2 + +[listeners] +localhost:12345 contact=matt@kiatoa.com +localhost:54321 contact=matt@kiatoa.com + +[listener] +script nbfake echo + + +[server] +timeout 1 + +[include local.config] ADDED autostuff/runconfigs.config Index: autostuff/runconfigs.config ================================================================== --- /dev/null +++ autostuff/runconfigs.config @@ -0,0 +1,112 @@ +# Copyright 2006-2017, Matthew Welland. +# +# This file is part of Megatest. +# +# Megatest is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Megatest is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Megatest. If not, see . + +# To get emacs font highlighing in the various megatest configs do this: +# +# Install emacs-goodies-el: +# sudo apt install emacs-goodies-el +# Add to your ~/.emacs file: +# (add-to-list 'auto-mode-alist '("config\\'" . conf-space-mode)) +# + +# example of a cron entry to run sync using db spec pgdb, with pgdb setting in file local.config +# +[a/b/c] +# all:scheduled:sync cron= 0/5 * * * *;dbdest=pgdb;appendconf=/nfs/phoebe/disk1/home/mfs/matt/.sysmaint/local.config +# quick:scheduled:sync cron= 0/5 * * * *;dbdest=pgdb;appendconf=/nfs/phoebe/disk1/home/mfs/matt/.sysmaint/local.config +# fast:scheduled:sync-prepend cron= 0/1 * * * *;dbdest=pgdb;appendconf=/mfs/matt/.sysmaint/local.config + +# [scriptinc ./gentargets.sh #{getenv USER}] +# [v1.23/45/67] + +# tip will be replaced with hashkey? + +# [%/%/%] doesn't work + +[/.*/] + +[v1.65/tip/dev] +# file: files changes since last run trigger new run +# script: script is called with unix seconds as last parameter (other parameters are preserved) +# +# contour:sensetype:action params data +# commented out for debug + +quick:file:run runtrans=auto; glob=/nfs/orion/disk1/mfs_home/home/matt/automation_areas/megatest/*.scm foo.touchme +# snazy:file:run runtrans=corporate-ww; glob=/home/matt/data/megatest/*.scm +# short:file:run runtrans=short; glob=/home/matt/data/megatest/*.scm + +# script returns change-time (unix epoch), new-target-name, run-name +# +# quick:script:run checkfossil = http://www.kiatoa.com/fossils/megatest v1.63;\ +# checkfossil = http://www.kiatoa.com/fossils/megatest_qa trunk + +# # fossil based trigger +# # +quick:fossil:run http://www.kiatoa.com/fossils/megatest=v1.65;\ + http://www.kiatoa.com/fossils/megatest_qa=trunk + +# field allowed values +# ----- -------------- +# minute 0-59 +# hour 0-23 +# day of month 1-31 +# month 1-12 (or names, future development) +# day of week 0-7 (0 or 7 is Sun, or, future development, use names) + +# actions: +# run - run a testsuite +# clean - clear out runs +# archive - archive runs + +# quick:scheduled:run cron=47 * * * * ;run-name=auto +# quick:scheduled:archive cron=15 20 * * * ;run-name=%;target=%/%/% + +# [%] +# # every friday at midnight clean "all" tests over 7d +# all:scheduled:clean cron= 0 0 0 0 5;run-name=%;age=7d + +[v1.65/tip/dev] +# # file: files changes since last run trigger new run +# # script: script is called with unix seconds as last parameter (other parameters are preserved) +# # +# # contour:sensetype:action params data +# quick:file:run run-name=auto;glob=*.scm +# quick:file:clean run-name=auto; +# quick:script:run run-name=auto;script=checkfossil.sh v1.63 +# +# # field allowed values +# # ----- -------------- +# # minute 0-59 +# # hour 0-23 +# # day of month 1-31 +# # month 1-12 (or names, future development) +# # day of week 0-7 (0 or 7 is Sun, or, future development, use names) +# +# # actions: +# # run - run a testsuite +# # clean - clear out runs +# # archive - archive runs +# +quick:scheduled:run cron=47 * * * * ;run-name=auto +# quick:scheduled:archive cron=15 20 * * * ;run-name=% ; +# + +[%/%/%] +# # every friday at midnight clean "all" tests over 7d +all:scheduled:clean cron= 0 0 0 0 5;run-name=%;age=7d +# ADDED autostuff/setup.sh Index: autostuff/setup.sh ================================================================== --- /dev/null +++ autostuff/setup.sh @@ -0,0 +1,2 @@ +source /opt/chicken/4.13.0_18.04_WW45/setup-chicken4x.sh +export PATH=/mfs/home/matt/orion_automation/bin:$PATH DELETED batchsim/Makefile Index: batchsim/Makefile ================================================================== --- batchsim/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -RUN=default.scm - -all : batchsim - ./batchsim $(RUN) - -batchsim : batchsim.scm - csc batchsim.scm - DELETED batchsim/batchsim.scm Index: batchsim/batchsim.scm ================================================================== --- batchsim/batchsim.scm +++ /dev/null @@ -1,417 +0,0 @@ -(use ezxdisp srfi-18) - -(define *ezx* (ezx-init 650 650 "Batch simulator")) -(require-library ezxgui) -(define *green* (make-ezx-color 0 1 0)) -(define *black* (make-ezx-color 0 0 0)) -(define *grey* (make-ezx-color 0.1 0.1 0.1)) -(define *blue* (make-ezx-color 0 0 1)) -(define *cyan* (make-ezx-color 0 1 1)) -(define *green* (make-ezx-color 0 1 0)) -(define *purple* (make-ezx-color 1 0 1)) -(define *red* (make-ezx-color 1 0 0)) -(define *white* (make-ezx-color 1 1 1)) -(define *yellow* (make-ezx-color 1 1 0)) - -(define *user-colors-palette* - (list - *green* - *blue* - *cyan* - *purple* - *red* - *yellow* - *black*)) - -(define *dark-green* (get-color "dark-green")) -(define *brown* (get-color "brown")) - -(ezx-select-layer *ezx* 1) -(ezx-wipe-layer *ezx* 1) - -;; (ezx-str-2d *ezx* 30 30 "Hello" *white*) -;; (ezx-fillrect-2d *ezx* 100 100 120 120 *brown*) -(ezx-redraw *ezx*) - -(define *last-draw* (current-milliseconds)) -(define *draw-delta* 40) ;; milliseconds between drawing - -(define (wait-for-next-draw-time) - (let* ((cm (current-milliseconds)) - (delta (- *draw-delta* (- cm *last-draw*)))) - (if (> delta 0) - (thread-sleep! (/ delta 1000))) - (set! *last-draw* (current-milliseconds)))) - -(include "events.scm") - -;; System spec (to be moved into loaded file) -;; -;; x y w gap x-min x-max -(define *cpu-grid* (vector 500 50 15 2 500 600)) -(define (make-cpu:grid)(make-vector 6)) -(define *queues* (make-hash-table)) ;; name -> (list (list user duration num-cpus num-gigs) ... ) -(define *cpus* (make-hash-table)) ;; cpu-name => (vector user job-len num-cpu mem x-loc y-loc) -(define *obj-locations* (make-hash-table)) ;; name -> (x y layer) -(define *queue-spec* - (vector - 80 ;; start-x - 300 ;; start-y - 300 ;; delta-y how far to next queue - 15 ;; height - 400 ;; length - )) -(define *use-log* #f) -(define *job-log-scale* 10) - -;;====================================================================== -;; CPU -;;====================================================================== - -(define-record cpu name num-cores mem job x y) - -;;====================================================================== -;; CPU Pool -;;====================================================================== - -(define-record pool name x y w h gap boxw cpus delta nrows ncols cpunum) - -(define (new-pool name x y nrows ncols gap boxw) - (let* ((delta (+ gap boxw)) - ;; (nrows (quotient h (+ gap delta))) - ;; (ncols (quotient w (+ gap delta))) - (w (+ gap (* nrows delta))) - (h (+ gap (* ncols delta))) - (cpus (make-vector (* nrows ncols) #f)) - (npool (make-pool name x y w h gap boxw cpus delta nrows ncols 0))) - npool)) - -(define (pool:add-cpu pool name num-cores mem) - (let* ((cpu (make-cpu name num-cores mem #f #f #f))) - (vector-set! (pool-cpus pool)(pool-cpunum pool) cpu) - (pool-cpunum-set! pool (+ 1 (pool-cpunum pool))) - cpu)) - -(define (pool:draw ezx pool) - (let ((nrows (pool-nrows pool)) - (ncols (pool-ncols pool)) - (x (pool-x pool)) - (y (pool-y pool)) - (w (pool-w pool)) - (h (pool-h pool)) - (gap (pool-gap pool)) - (boxw (pool-boxw pool)) - (delta (pool-delta pool)) - (cpus (pool-cpus pool))) - (ezx-select-layer ezx 1) - ;(ezx-wipe-layer ezx 1) - ;; draw time at upper right - (ezx-str-2d ezx x y (pool-name pool) *black*) - (ezx-rect-2d ezx x y (+ x w)(+ y h) *black* 1) - (let loop ((row 0) - (col 0) - (cpunum 0)) - (let* ((cpu (vector-ref cpus cpunum)) - (xval (+ x gap (* row delta))) - (yval (+ y gap (* col delta)))) - (if cpu - (begin - (cpu-x-set! cpu xval) - (cpu-y-set! cpu yval)) - (vector-set! cpus cpunum (make-cpu (conc cpunum) 1 1 #f xval yval))) - ;; (print "box at " xval ", " yval) - (ezx-rect-2d ezx xval yval (+ xval boxw) (+ yval boxw) *grey* 1) - (if (< col (- ncols 1)) - (loop row (+ col 1)(+ cpunum 1)) - (if (< row (- nrows 1)) - (loop (+ row 1) 0 (+ cpunum 1)))))) - (ezx-redraw ezx))) - - -;;====================================================================== -;; Users -;;====================================================================== - -(define *user-colors* (make-hash-table)) - -(define (get-user-color user) - (let ((color (hash-table-ref/default *user-colors* user #f))) - (if color - color - (let* ((color-num (+ (length (hash-table-keys *user-colors*)) 1)) - (color (list-ref *user-colors-palette* color-num))) - (hash-table-set! *user-colors* user color) - color)))) - -;;====================================================================== -;; Job Queues -;;====================================================================== - -;; jobs - -(define (make-queue:job)(make-vector 4)) -(define-inline (queue:job-get-user vec) (vector-ref vec 0)) -(define-inline (queue:job-get-duration vec) (vector-ref vec 1)) -(define-inline (queue:job-get-num-cpu vec) (vector-ref vec 2)) -(define-inline (queue:job-get-num-gigs vec) (vector-ref vec 3)) -(define-inline (queue:job-set-user! vec val)(vector-set! vec 0 val)) -(define-inline (queue:job-set-duration! vec val)(vector-set! vec 1 val)) -(define-inline (queue:job-set-num-cpu! vec val)(vector-set! vec 2 val)) -(define-inline (queue:job-set-num-gigs! vec val)(vector-set! vec 3 val)) - -;; add a job to the queue -;; -(define (add-job queue-name user duration num-cpu num-gigs) - (let* ((queue-dat (hash-table-ref/default *queues* queue-name '())) - (new-queue (append - queue-dat - (list (vector user duration num-cpu num-gigs))))) - (hash-table-set! *queues* queue-name new-queue) - (draw-queue-jobs queue-name))) - -;; peek for jobs to do in queue -;; -(define (peek-job queue-name) - (let ((queue (hash-table-ref/default *queues* queue-name '()))) - (if (null? queue) - #f - (car queue)))) - -;; take job from queue -;; -(define (take-job queue-name) - (let ((queue (hash-table-ref/default *queues* queue-name '()))) - (if (null? queue) - #f - (begin - (hash-table-set! *queues* queue-name (cdr queue)) - (draw-queue-jobs queue-name) - (car queue))))) - -;;====================================================================== -;; CPUs -;;====================================================================== - -(define (make-cpu:dat)(make-vector 6 #f)) -(define-inline (cpu:dat-get-user vec) (vector-ref vec 0)) -(define-inline (cpu:dat-get-job-len vec) (vector-ref vec 1)) -(define-inline (cpu:dat-get-num-cpu vec) (vector-ref vec 2)) -(define-inline (cpu:dat-get-mem vec) (vector-ref vec 3)) -(define-inline (cpu:dat-get-x vec) (vector-ref vec 4)) -(define-inline (cpu:dat-get-y vec) (vector-ref vec 5)) -(define-inline (cpu:dat-set-user! vec val)(vector-set! vec 0 val)) -(define-inline (cpu:dat-set-job-len! vec val)(vector-set! vec 1 val)) -(define-inline (cpu:dat-set-num-cpu! vec val)(vector-set! vec 2 val)) -(define-inline (cpu:dat-set-mem! vec val)(vector-set! vec 3 val)) -(define-inline (cpu:dat-set-x! vec val)(vector-set! vec 4 val)) -(define-inline (cpu:dat-set-y! vec val)(vector-set! vec 5 val)) - -(define-inline (cpu:grid-get-x vec) (vector-ref vec 0)) -(define-inline (cpu:grid-get-y vec) (vector-ref vec 1)) -(define-inline (cpu:grid-get-w vec) (vector-ref vec 2)) -(define-inline (cpu:grid-get-gap vec) (vector-ref vec 3)) -(define-inline (cpu:grid-get-x-min vec) (vector-ref vec 4)) -(define-inline (cpu:grid-get-x-max vec) (vector-ref vec 5)) -(define-inline (cpu:grid-set-x! vec val)(vector-set! vec 0 val)) -(define-inline (cpu:grid-set-y! vec val)(vector-set! vec 1 val)) -(define-inline (cpu:grid-set-w! vec val)(vector-set! vec 2 val)) -(define-inline (cpu:grid-set-gap! vec val)(vector-set! vec 3 val)) -(define-inline (cpu:grid-set-x-min! vec val)(vector-set! vec 4 val)) -(define-inline (cpu:grid-set-x-max! vec val)(vector-set! vec 5 val)) - -(define (add-cpu name num-cores mem) - (let ((x (cpu:grid-get-x *cpu-grid*)) - (y (cpu:grid-get-y *cpu-grid*)) - (delta (+ (cpu:grid-get-w *cpu-grid*)(cpu:grid-get-gap *cpu-grid*))) - (x-max (cpu:grid-get-x-max *cpu-grid*))) - (hash-table-set! *cpus* name (vector #f #f num-cores mem x y)) - (if (> x x-max) - (begin - (cpu:grid-set-x! *cpu-grid* (cpu:grid-get-x-min *cpu-grid*)) - (cpu:grid-set-y! *cpu-grid* (+ y delta))) - (cpu:grid-set-x! *cpu-grid* (+ x delta))))) - -;; draw grey box for each cpu on layer 2 -;; jobs are drawn on layer 1 -;; -(define (draw-cpus) ;; call once after init'ing all cpus - (ezx-select-layer *ezx* 1) - (ezx-wipe-layer *ezx* 1) - ;; draw time at upper right - (ezx-str-2d *ezx* 20 20 (seconds->h:m:s *now*) *black*) - (for-each - (lambda (cpu) - (let ((x (cpu:dat-get-x cpu)) - (y (cpu:dat-get-y cpu)) - (w (cpu:grid-get-w *cpu-grid*))) - (ezx-rect-2d *ezx* x y (+ x w) (+ y w) *grey* 1))) - (hash-table-values *cpus*)) - (ezx-redraw *ezx*)) - -(define (draw-jobs) - ;; (draw-cpus) - (ezx-select-layer *ezx* 2) - (ezx-wipe-layer *ezx* 2) - (for-each - (lambda (cpu) - (let* ((x (cpu:dat-get-x cpu)) - (y (cpu:dat-get-y cpu)) - (w (cpu:grid-get-w *cpu-grid*)) - (u (cpu:dat-get-user cpu))) - (if u ;; job running if not #f - (let ((color (get-user-color u))) - (ezx-fillrect-2d *ezx* (+ x 2)(+ 2 y)(+ x 9) (+ y 9) color))))) - (hash-table-values *cpus*)) - (ezx-redraw *ezx*)) - -(define (end-job cpu-name user) - (let ((cpu (hash-table-ref/default *cpus* cpu-name #f))) - (if cpu - (let ((curr-user (cpu:dat-get-user cpu))) ;; if it is a user name then job is not done - error - (if (or (not curr-user) - (not (equal? curr-user user))) - (print "ERROR: cpu " cpu-name " not running job for " user "!") - (begin - (cpu:dat-set-user! cpu #f) - (cpu:dat-set-job-len! cpu #f) - (draw-jobs)))) ;; hash-table-set! *cpus* cpu-name (make-cpu:dat)))) - (print "ERROR: no cpu " cpu-name " found. Ensure it is registered before addressing it.")))) - -(define (run-job cpu-name job) - (let* ((user (queue:job-get-user job)) - (job-len (queue:job-get-duration job)) - (cpu (hash-table-ref/default *cpus* cpu-name #f))) - (if cpu - (let ((curr-user (cpu:dat-get-user cpu))) ;; if it is a user name then job is not done - error - (if curr-user - (begin - (print "ERROR: cpu already busy! Adding more jobs not supported yet. " cpu-name) - #f) - (begin - (cpu:dat-set-user! cpu user) - (cpu:dat-set-job-len! cpu job-len) - (draw-jobs) - (hash-table-set! *cpus* cpu-name cpu) - (event (+ *now* job-len) (lambda ()(end-job cpu-name user))) - #t))) - #f))) - -(define (get-cpu) - (let ((all-cpus (hash-table-keys *cpus*))) - (if (null? all-cpus) - #f - (let loop ((hed (car all-cpus)) - (tal (cdr all-cpus))) - (if (cpu:dat-get-user (hash-table-ref/default *cpus* hed '(#f #f))) ;; if user is #f then cpu is available - (if (null? tal) - #f - (loop (car tal)(cdr tal))) - hed))))) - -;;====================================================================== -;; Animation -;;====================================================================== - -;; make-vector-record queue spec x y delta-y height length -(define (make-queue:spec)(make-vector 5)) -(define-inline (queue:spec-get-x vec) (vector-ref vec 0)) -(define-inline (queue:spec-get-y vec) (vector-ref vec 1)) -(define-inline (queue:spec-get-delta-y vec) (vector-ref vec 2)) -(define-inline (queue:spec-get-height vec) (vector-ref vec 3)) -(define-inline (queue:spec-get-length vec) (vector-ref vec 4)) -(define-inline (queue:spec-set-x! vec val)(vector-set! vec 0 val)) -(define-inline (queue:spec-set-y! vec val)(vector-set! vec 1 val)) -(define-inline (queue:spec-set-delta-y! vec val)(vector-set! vec 2 val)) -(define-inline (queue:spec-set-height! vec val)(vector-set! vec 3 val)) -(define-inline (queue:spec-set-length! vec val)(vector-set! vec 4 val)) - -;; queues are drawn on layer 3 but boxes (jobs) are drawn on the numbered layer -;; -(define (draw-queues) - (let* ((text-offset 3) - (queue-names (sort (hash-table-keys *queues*) string>=?)) - (start-x (vector-ref *queue-spec* 0)) - (text-x (+ start-x text-offset)) - (delta-y (vector-ref *queue-spec* 1)) - (delta-x (vector-ref *queue-spec* 2)) - (height (vector-ref *queue-spec* 3)) - (length (vector-ref *queue-spec* 4)) - (end-x (+ start-x length))) - (ezx-select-layer *ezx* 3) - (ezx-wipe-layer *ezx* 3) - (let loop ((y (vector-ref *queue-spec* 1)) - (qname (car queue-names)) - (tail (cdr queue-names)) - (layer 4)) - (print "Drawing queue at x=" start-x ", y=" y) - (ezx-fillrect-2d *ezx* start-x y end-x (+ y height) *brown*) - (ezx-str-2d *ezx* text-x (- (+ y height) text-offset) qname *white*) - (hash-table-set! *obj-locations* qname (list start-x y layer)) - (if (not (null? tail)) - (loop (+ y height delta-y) - (car tail) - (cdr tail) - (+ layer 1)))) - (ezx-redraw *ezx*))) - -;; compress queue data to (vector user count) list -;; -(define (draw-queue-compress-queue-data queue-dat) - (let loop ((hed (car queue-dat)) - (tal (cdr queue-dat)) - (curr #f) ;; (vector name count) - (res '())) - (let ((user (queue:job-get-user hed))) - (cond - ((not curr) ;; first time through only? - (if (null? tal) - (append res (list (vector user 1))) - (loop (car tal)(cdr tal)(vector user 1) res))) - ((equal? (vector-ref curr 0) user) - (vector-set! curr 1 (+ (vector-ref curr 1) 1)) - (if (null? tal) - (append res (list curr)) - (loop (car tal)(cdr tal) curr res))) - (else ;; names are different, add curr to queue and create new curr - (let ((newcurr (vector user 1))) - (if (null? tal) - (append res (list newcurr)) - (loop (car tal)(cdr tal) newcurr (append res (list curr)))))))))) - -;; draw jobs for a given queue -;; -(define (draw-queue-jobs queue-name) - (let* ((queue-dat (hash-table-ref/default *queues* queue-name #f)) ;; list of jobs in the queue - (obj-spec (hash-table-ref/default *obj-locations* queue-name #f))) ;; x, y etc. of the drawn queue - (if obj-spec - (let ((origin-x (list-ref obj-spec 0)) - (origin-y (list-ref obj-spec 1)) - (bar-width 10) - (queue-len (queue:spec-get-length *queue-spec*)) - (layer (list-ref obj-spec 2))) - (ezx-select-layer *ezx* layer) - (ezx-wipe-layer *ezx* layer) - (if (not (null? queue-dat)) - (let ((res (draw-queue-compress-queue-data queue-dat))) - (if (not (null? res)) - (let loop ((hed (car res)) - (tal (cdr res)) - (x2 (+ origin-x queue-len))) - (let* ((user (vector-ref hed 0)) - (h (let ((numjobs (vector-ref hed 1))) - (if *use-log* - (inexact->exact (round (log (+ 1 (* *job-log-scale* numjobs))))) - numjobs))) - (x1 (- x2 bar-width)) - (y2 (- origin-y h))) - ;; (print "x1 " x1 ", origin-y " origin-y ", x2 " x2 ", y2 " y2) - (ezx-fillrect-2d *ezx* x1 y2 x2 origin-y (get-user-color user)) - (if (not (null? tal)) - (loop (car tal)(cdr tal) x1))))) - (ezx-redraw *ezx*))))))) - -(let* ((args (argv)) - (fname (if (> (length args) 1) - (cadr args) - "default.scm"))) - (load (if (file-exists? fname) fname "default.scm"))) DELETED batchsim/default.scm Index: batchsim/default.scm ================================================================== --- batchsim/default.scm +++ /dev/null @@ -1,133 +0,0 @@ -;; run sim for four hours -;; -(define *end-time* (* 60 50)) - -;; create the cpus -;; -(let loop ((count 200)) - (add-cpu (conc "cpu_" count) 1 1) - (if (>= count 0)(loop (- count 1)))) - -(draw-cpus) - -(define *pool1* (new-pool "generic" 100 100 100 100 2 10)) -(let loop ((count 10)) - (pool:add-cpu *pool1* (conc count) 1 1) - (if (> count 0) - (loop (- count 1)))) - -(pool:draw *ezx* *pool1*) - -;; init the queues -;; -(hash-table-set! *queues* "normal" '()) -(hash-table-set! *queues* "quick" '()) -(draw-queues) - -;; user k adds 200 jobs at time zero -;; -(event *start-time* - (lambda () - (let loop ((count 300)) ;; add 500 jobs - (add-job "normal" "k" 600 1 1) - (if (>= count 0)(loop (- count 1)))))) - -;; one minute in user m runs ten jobs -;; -(event (+ 600 *start-time*) - (lambda () - (let loop ((count 300)) ;; add 100 jobs - (add-job "normal" "m" 600 1 1) - (if (> count 0)(loop (- count 1)))))) - -;; every minute user j runs ten jobs -;; -(define *user-j-jobs* 300) -(event (+ 600 *start-time*) - (lambda () - (let f () - (schedule 60) - (if (> *user-j-jobs* 0) - (begin - (let loop ((count 5)) ;; add 100 jobs - (add-job "quick" "j" 600 1 1) - (if (> count 0)(loop (- count 1)))) - (set! *user-j-jobs* (- *user-j-jobs* 5)))) - (if (and (not *done*) - (> *user-j-jobs* 0)) - (f))))) ;; Megatest user running 200 jobs - -;; every minute user j runs ten jobs -;; -(define *user-j-jobs* 300) -(event (+ 630 *start-time*) - (lambda () - (let f () - (schedule 60) - (if (> *user-j-jobs* 0) - (begin - (let loop ((count 5)) ;; add 100 jobs - (add-job "quick" "n" 600 1 1) - (if (> count 0)(loop (- count 1)))) - (set! *user-j-jobs* (- *user-j-jobs* 5)))) - (if (and (not *done*) - (> *user-j-jobs* 0)) - (f))))) ;; Megatest user running 200 jobs - -;; ;; -;; (event *start-time* -;; (lambda () -;; (let f ((count 200)) -;; (schedule 10) -;; (add-job "normal" "t" 60 1 1) -;; (if (and (not *done*) -;; (>= count 0)) -;; (f (- count 1)))))) - -;; every 3 seconds check for available machines and launch a job -;; -(event *start-time* - (lambda () - (let f () - (schedule 3) - (let ((queue-names (random-sort (hash-table-keys *queues*)))) - (let loop ((cpu (get-cpu)) - (count (+ (length queue-names) 4)) - (qname (car queue-names)) - (remq (cdr queue-names))) - (if (and cpu - (> count 0)) - (begin - (if (peek-job qname) ;; any jobs to do in normal queue - (let ((job (take-job qname))) - (run-job cpu job))) - (loop (get-cpu) - (- count 1) - (if (null? remq) - (car queue-names) - (car remq)) - (if (null? remq) - (cdr queue-names) - (cdr remq))))))) - (if (not *done*)(f))))) - -;; screen updates -;; -(event *start-time* (lambda () - (let f () - (schedule 60) ;; update the screen every 60 seconds of sim time - (draw-cpus) ;; (print "Now: " *now* " queue: " (hash-table->alist *queues*)) - (wait-for-next-draw-time) - (if (not *done*) (f))))) - - -;; end the simulation -;; -(event *end-time* - (lambda () - (set! *event-list* '()) - (set! *done* #t))) - -(start) -;; (exit 0) - DELETED batchsim/events.scm Index: batchsim/events.scm ================================================================== --- batchsim/events.scm +++ /dev/null @@ -1,79 +0,0 @@ - -;;====================================================================== -;; Event Processing and Simulator -;;====================================================================== - -;; The global event list -(define *event-list* '()) -(define *start-time* 0) -(define *end-time* (* 60 60 4)) ;; four hours -(define *now* *start-time*) -(define *done* #f) - -(define (random-sort l) - (sort l - (lambda (x y) - (equal? 0 (random 2))))) - -;; Each item in the event list is a list of a scheduled time and the thunk -;; (time thunk). Sort the list so that the next event is the earliest. -;; -(define event-sort - (lambda (@a @b) - (< (car @a)(car @b)))) - -(define event - (lambda ($time $thunk) ;; add a sort based on scheduled time here -- improve later - ;; to use an insert algorythm. - (set! *event-list* (sort (cons (list $time $thunk) *event-list*) event-sort)))) - -(define start - (lambda () - (let ((next (car *event-list*))) - (set! *event-list* (cdr *event-list*)) - (set! *now* (car next)) - (if (not *done*) ;; note that the second item in the list is the thunk - ((car (cdr next))))))) - -(define pause - (lambda () - (call/cc - (lambda (k) - (event (lambda () (k #f))) - (start))))) - -(define schedule - (lambda ($time) - (call/cc - (lambda (k) - (event (+ *now* $time) (lambda () (k #f))) - (start))))) - -;; (event (lambda () (let f () (pause) (display "h") (f)))) - -(define years->seconds - (lambda ($yrs) - (* $yrs 365 24 3600))) - -(define weeks->seconds - (lambda ($wks) - (* $wks 7 24 3600))) - -(define days->seconds - (lambda ($days) - (* $days 24 3600))) - -(define months->seconds - (lambda ($months) - (* $months (/ 365 12) 24 3600))) - -(define seconds->date - (lambda ($seconds) - (posix-strftime "%D" (posix-localtime (inexact->exact $seconds))))) - -(define (seconds->h:m:s seconds) - (let* ((hours (quotient seconds 3600)) - (rem1 (- seconds (* hours 3600))) - (minutes (quotient rem1 60)) - (rem-sec (- rem1 (* minutes 60)))) - (conc hours "h " minutes "m " rem-sec "s"))) DELETED batchsim/testing.scm Index: batchsim/testing.scm ================================================================== --- batchsim/testing.scm +++ /dev/null @@ -1,135 +0,0 @@ -;; run sim for four hours -;; -(define *end-time* (* 60 50)) - -;; create the cpus -;; -(let loop ((count 200)) - (add-cpu (conc "cpu_" count) 1 1) - (if (>= count 0)(loop (- count 1)))) - -;; (draw-cpus) - -(define *pool1* (new-pool "generic" 20 20 12 80 2 4)) -(let loop ((count 10)) - (pool:add-cpu *pool1* (conc count) 1 1) - (if (> count 0) - (loop (- count 1)))) - -(pool:draw *ezx* *pool1*) - -;; ;; init the queues -;; ;; -;; (hash-table-set! *queues* "normal" '()) -;; (hash-table-set! *queues* "quick" '()) -;; (draw-queues) -;; -;; ;; user k adds 200 jobs at time zero -;; ;; -;; (event *start-time* -;; (lambda () -;; (let loop ((count 300)) ;; add 500 jobs -;; (add-job "normal" "k" 600 1 1) -;; (if (>= count 0)(loop (- count 1)))))) -;; -;; ;; one minute in user m runs ten jobs -;; ;; -;; (event (+ 600 *start-time*) -;; (lambda () -;; (let loop ((count 300)) ;; add 100 jobs -;; (add-job "normal" "m" 600 1 1) -;; (if (> count 0)(loop (- count 1)))))) -;; -;; ;; every minute user j runs ten jobs -;; ;; -;; (define *user-j-jobs* 300) -;; (event (+ 600 *start-time*) -;; (lambda () -;; (let f () -;; (schedule 60) -;; (if (> *user-j-jobs* 0) -;; (begin -;; (let loop ((count 5)) ;; add 100 jobs -;; (add-job "quick" "j" 600 1 1) -;; (if (> count 0)(loop (- count 1)))) -;; (set! *user-j-jobs* (- *user-j-jobs* 5)))) -;; (if (and (not *done*) -;; (> *user-j-jobs* 0)) -;; (f))))) ;; Megatest user running 200 jobs -;; -;; ;; every minute user j runs ten jobs -;; ;; -;; (define *user-j-jobs* 300) -;; (event (+ 630 *start-time*) -;; (lambda () -;; (let f () -;; (schedule 60) -;; (if (> *user-j-jobs* 0) -;; (begin -;; (let loop ((count 5)) ;; add 100 jobs -;; (add-job "quick" "n" 600 1 1) -;; (if (> count 0)(loop (- count 1)))) -;; (set! *user-j-jobs* (- *user-j-jobs* 5)))) -;; (if (and (not *done*) -;; (> *user-j-jobs* 0)) -;; (f))))) ;; Megatest user running 200 jobs -;; -;; ;; ;; -;; ;; (event *start-time* -;; ;; (lambda () -;; ;; (let f ((count 200)) -;; ;; (schedule 10) -;; ;; (add-job "normal" "t" 60 1 1) -;; ;; (if (and (not *done*) -;; ;; (>= count 0)) -;; ;; (f (- count 1)))))) -;; -;; ;; every 3 seconds check for available machines and launch a job -;; ;; -;; (event *start-time* -;; (lambda () -;; (let f () -;; (schedule 3) -;; (let ((queue-names (random-sort (hash-table-keys *queues*)))) -;; (let loop ((cpu (get-cpu)) -;; (count (+ (length queue-names) 4)) -;; (qname (car queue-names)) -;; (remq (cdr queue-names))) -;; (if (and cpu -;; (> count 0)) -;; (begin -;; (if (peek-job qname) ;; any jobs to do in normal queue -;; (let ((job (take-job qname))) -;; (run-job cpu job))) -;; (loop (get-cpu) -;; (- count 1) -;; (if (null? remq) -;; (car queue-names) -;; (car remq)) -;; (if (null? remq) -;; (cdr queue-names) -;; (cdr remq))))))) -;; (if (not *done*)(f))))) -;; -;; ;; screen updates -;; ;; -(event *start-time* (lambda () - (let f () - (schedule 60) ;; update the screen every 60 seconds of sim time - ;; (draw-cpus) ;; (print "Now: " *now* " queue: " (hash-table->alist *queues*)) - (pool:draw *ezx* *pool1*) - - (wait-for-next-draw-time) - (if (not *done*) (f))))) -;; -;; -;; ;; end the simulation -;; ;; -(event *end-time* - (lambda () - (set! *event-list* '()) - (set! *done* #t))) -;; -(start) -;; ;; (exit 0) -;; DELETED bin/sleeprunner Index: bin/sleeprunner ================================================================== --- bin/sleeprunner +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -if [[ $SLEEPRUNNER == "" ]];then -SLEEPRUNNER=0 -fi - -echo "nbfake $@ &> /dev/null" | at now + $SLEEPRUNNER minutes &> /dev/null DELETED cgisetup/README Index: cgisetup/README ================================================================== --- cgisetup/README +++ /dev/null @@ -1,10 +0,0 @@ -1. copy megatest.config to cgi-bin/.megatest.config -2. edit cgi-bin/.megatest.config, change appropriate settings - i. sroot => points to your models and pages - ii. logs, twikidir (legacy, will be removed in future) must be - writeable. - iii. domain is used to construct the return URLs (to be fixed). - iv. debug mode give a useful stack dump on hitting errors. -3. compile mtutil and copy the mtut binary (look in the bin dir) - to cgi-bin/megatest -4. use mtutil to populate your database schema DELETED cgisetup/cgi-bin/models Index: cgisetup/cgi-bin/models ================================================================== --- cgisetup/cgi-bin/models +++ /dev/null @@ -1,1 +0,0 @@ -../models DELETED cgisetup/cgi-bin/pages Index: cgisetup/cgi-bin/pages ================================================================== --- cgisetup/cgi-bin/pages +++ /dev/null @@ -1,1 +0,0 @@ -../pages DELETED cgisetup/css/pjhatwal-modal.css Index: cgisetup/css/pjhatwal-modal.css ================================================================== --- cgisetup/css/pjhatwal-modal.css +++ /dev/null @@ -1,43 +0,0 @@ -.modal { - display: none; /* Hidden by default */ - position: fixed; /* Stay in place */ - z-index: 1; /* Sit on top */ - padding-top: 100px; /* Location of the box */ - left: 0; - top: 0; - width: 100%; /* Full width */ - height: 100%; /* Full height */ - overflow: auto; /* Enable scroll if needed */ - background-color: rgb(0,0,0); /* Fallback color */ - background-color: rgba(0,0,0,0.4); /* Black w/ opacity */ -} - -/* Modal Content */ -.modal-content { - background-color: #fefefe; - margin: auto; - padding: 20px; - border: 1px solid #888; - width: 80%; - top: 50% -} - -/* The Close Button */ -.close { - color: #aaaaaa; - float: right; - font-size: 28px; - font-weight: bold; -} - -.close:hover, -.close:focus { - color: #000; - text-decoration: none; - cursor: pointer; -} - -.vote { - color: #faaaaa; -} - DELETED cgisetup/js/pjhatwal-modal.js Index: cgisetup/js/pjhatwal-modal.js ================================================================== --- cgisetup/js/pjhatwal-modal.js +++ /dev/null @@ -1,15 +0,0 @@ -$(document).ready(function(){ - $(".viewmodal").click(function(){ - var modal = document.getElementById("myModal" + this.id); - // alert(this.id); - modal.style.display = "block"; - - }); - $(".close").click(function(){ - var modal = document.getElementById("myModal" + this.id); - // alert(this.id); - modal.style.display = "none"; - - }); -}); - DELETED cgisetup/megatest.config Index: cgisetup/megatest.config ================================================================== --- cgisetup/megatest.config +++ /dev/null @@ -1,12 +0,0 @@ -'(sroot "/path/to/models" - logfile "/path/to/logs/megatest.log" ;; this is now required! - twikidir "/path/to/writable/work/area" - dbtype pg ;; 'sqlite3 ;; or 'pg - dbinit '((dbname . "megatest_db") - (user . "username") - (password . "secretpassword") - (host . "localhost")) - domain "yourdomain.com" - page-dir-style flat - debugmode #t) - Index: cgisetup/models/pgdb.scm ================================================================== --- cgisetup/models/pgdb.scm +++ cgisetup/models/pgdb.scm @@ -1,14 +1,23 @@ ;;====================================================================== ;; Copyright 2017, Matthew Welland. ;; -;; This program is made available under the GNU GPL version 2.0 or -;; greater. See the accompanying file COPYING for details. +;; This file is part of Megatest. +;; +;; Megatest is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. +;; +;; Megatest is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. ;; -;; This program is distributed WITHOUT ANY WARRANTY; without even the -;; implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -;; PURPOSE. +;; You should have received a copy of the GNU General Public License +;; along with Megatest. If not, see . + ;;====================================================================== (declare (unit pgdb)) (declare (uses configf)) @@ -90,48 +99,171 @@ (print-call-chain) (debug:print 0 *default-log-port* "ERROR: cannot create ttype entry, " ((condition-property-accessor 'exn 'message) exn)) #f) (dbi:exec dbh "INSERT INTO ttype (target_spec) VALUES (?);" target-spec)) (pgdb:get-ttype dbh target-spec))))) + +;;====================================================================== +;; T A G S +;;====================================================================== + + +(define (pgdb:get-tag-info-by-name dbh tag) + (dbi:get-one-row dbh "SELECT id,tag_name FROM tags where tag_name=?;" tag)) + +(define (pgdb:insert-tag dbh name ) + (dbi:exec dbh "INSERT INTO tags (tag_name) VALUES (?)" name )) + +(define (pgdb:insert-area-tag dbh tag-id area-id ) + (dbi:exec dbh "INSERT INTO area_tags (tag_id, area_id) VALUES (?,?)" tag-id area-id )) + +(define (pgdb:insert-run-tag dbh tag-id run-id ) + (dbi:exec dbh "INSERT INTO run_tags (tag_id, run_id) VALUES (?,?)" tag-id run-id )) + + +(define (pgdb:is-area-taged dbh area-id) + (let ((area-tag-id (dbi:get-one dbh "SELECT id FROM area_tags WHERE area_id=?;" area-id))) + (if area-tag-id + #t + #f))) + +(define (pgdb:is-area-taged-with-a-tag dbh tag-id area-id) + (let ((area-tag-id (dbi:get-one dbh "SELECT id FROM area_tags WHERE area_id=? and tag_id=?;" area-id tag-id))) + (if area-tag-id + #t + #f))) + +(define (pgdb:is-run-taged-with-a-tag dbh tag-id run-id) + (let ((run-tag-id (dbi:get-one dbh "SELECT id FROM run_tags WHERE run_id=? and tag_id=?;" run-id tag-id))) + (if run-tag-id + #t + #f))) + + ;;====================================================================== ;; R U N S ;;====================================================================== ;; given a target spec id, target and run-name return the run-id ;; if no run found return #f ;; -(define (pgdb:get-run-id dbh spec-id target run-name) - (dbi:get-one dbh "SELECT id FROM runs WHERE ttype_id=? AND target=? AND run_name=?;" - spec-id target run-name)) +(define (pgdb:get-run-id dbh spec-id target run-name area-id) + (dbi:get-one dbh "SELECT id FROM runs WHERE ttype_id=? AND target=? AND run_name=? and area_id=?;" + spec-id target run-name area-id)) + +;; given a target spec id, target and run-name return the run-id +;; if no run found return #f +;; +(define (pgdb:get-run-last-update dbh id ) + (dbi:get-one dbh "SELECT last_update FROM runs WHERE id=?;" + id)) ;; given a run-id return all the run info ;; -(define (pgdb:get-run-info dbh run-id) ;; to join ttype or not? +(define (pgdb:get-run-info dbh run-id ) ;; to join ttype or not? (dbi:get-one-row dbh ;; 0 1 2 3 4 5 6 7 8 9 10 11 12 "SELECT id,target,ttype_id,run_name,state,status,owner,event_time,comment,fail_count,pass_count,last_update,area_id - FROM runs WHERE id=?;" run-id)) + FROM runs WHERE id=? ;" run-id )) ;; refresh the data in a run record ;; -(define (pgdb:refresh-run-info dbh run-id state status owner event-time comment fail-count pass-count) ;; area-id) +(define (pgdb:refresh-run-info dbh run-id state status owner event-time comment fail-count pass-count area-id last_update publish-time) ;; area-id) (dbi:exec dbh "UPDATE runs SET - state=?,status=?,owner=?,event_time=?,comment=?,fail_count=?,pass_count=? - WHERE id=?;" - state status owner event-time comment fail-count pass-count run-id)) + state=?,status=?,owner=?,event_time=?,comment=?,fail_count=?,pass_count=?,last_update=?,publish_time=? + WHERE id=? and area_id=?;" + state status owner event-time comment fail-count pass-count last_update publish-time run-id area-id )) ;; given all needed info create run record ;; -(define (pgdb:insert-run dbh ttype-id target run-name state status owner event-time comment fail-count pass-count) +(define (pgdb:insert-run dbh ttype-id target run-name state status owner event-time comment fail-count pass-count area-id last-update publish-time) + (dbi:exec + dbh + "INSERT INTO runs (ttype_id,target,run_name,state,status,owner,event_time,comment,fail_count,pass_count,area_id,last_update,publish_time) + VALUES (?,?,?,?,?,?,?,?,?,?,?,?, ?);" + ttype-id target run-name state status owner event-time comment fail-count pass-count area-id last-update publish-time)) + +;;====================================================================== +;; T E S T - S T E P S +;;====================================================================== + +(define (pgdb:get-test-step-id dbh test-id stepname state) + (dbi:get-one + dbh + "SELECT id FROM test_steps WHERE test_id=? AND stepname=? and state = ? ;" + test-id stepname state)) + +(define (pgdb:get-test-step-last-update dbh id ) + (dbi:get-one + dbh + "SELECT last_update FROM test_steps WHERE id=? ;" + id)) + +(define (pgdb:insert-test-step dbh test-id stepname state status event_time comment logfile last-update ) + (dbi:exec + dbh + "INSERT INTO test_steps (test_id,stepname,state,status,event_time,logfile,comment,last_update) + VALUES (?,?,?,?,?,?,?,? );" + test-id stepname state status event_time logfile comment last-update)) + +(define (pgdb:update-test-step dbh step-id test-id stepname state status event_time comment logfile last-update) + (dbi:exec + dbh + "UPDATE test_steps SET + test_id=?,stepname=?,state=?,status=?,event_time=?,logfile=?,comment=?,last_update=? + WHERE id=?;" + test-id stepname state status event_time logfile comment last-update step-id)) + + +;;====================================================================== +;; T E S T - D A T A +;;====================================================================== + +(define (pgdb:get-test-data-id dbh test-id category variable) + (dbi:get-one + dbh + "SELECT id FROM test_data WHERE test_id=? AND category=? and variable = ? ;" + test-id category variable)) + +(define (pgdb:get-test-data-last-update dbh test-data-id ) + (dbi:get-one + dbh + "SELECT last_update FROM test_data WHERE id=? ;" + test-data-id)) + +(define (pgdb:insert-test-data dbh test-id category variable value expected tol units comment status type last-update) + ; (print "INSERT INTO test_data (test_id, category, variable, value, expected, tol, units, comment, status, type) + ; VALUES (?,?,?,?,?,?,?,?,?,?) " test-id " " category " " variable " " value " " expected " " tol " " units " " comment " " status " " type) + (if (not (string? units)) + (set! units "" )) + (if (not (string? variable)) + (set! variable "" )) + (if (not (real? value)) + (set! value 0 )) + (if (not (real? expected)) + (set! expected 0 )) +(if (not (real? tol)) + (set! tol 0 )) + + (dbi:exec + dbh + "INSERT INTO test_data (test_id, category, variable, value, expected, tol, units, comment, status, type, last_update) + VALUES (?,?,?,?,?,?,?,?,?,?, ?);" + test-id category variable value expected tol units comment status type last-update)) + +(define (pgdb:update-test-data dbh data-id test-id category variable value expected tol units comment status type last-update) (dbi:exec - dbh - "INSERT INTO runs (ttype_id,target,run_name,state,status,owner,event_time,comment,fail_count,pass_count) - VALUES (?,?,?,?,?,?,?,?,?,?);" - ttype-id target run-name state status owner event-time comment fail-count pass-count)) + dbh + "UPDATE test_data SET + test_id=?, category=?, variable=?, value=?, expected=?, tol=?, units=?, comment=?, status=?, type=?, last_update=? + WHERE id=?;" + test-id category variable value expected tol units comment status type last-update data-id )) + + ;;====================================================================== ;; T E S T S ;;====================================================================== @@ -140,33 +272,40 @@ (define (pgdb:get-test-id dbh run-id test-name item-path) (dbi:get-one dbh "SELECT id FROM tests WHERE run_id=? AND test_name=? AND item_path=?;" run-id test-name item-path)) + +(define (pgdb:get-test-last-update dbh id) + (dbi:get-one + dbh + "SELECT last_update FROM tests WHERE id=? ;" + id )) + ;; create new test record ;; -(define (pgdb:insert-test dbh run-id test-name item-path state status host cpuload diskfree uname run-dir log-file run-duration comment event-time archived) +(define (pgdb:insert-test dbh run-id test-name item-path state status host cpuload diskfree uname run-dir log-file run-duration comment event-time archived last-update pid) (dbi:exec dbh - "INSERT INTO tests (run_id,test_name,item_path,state,status,host,cpuload,diskfree,uname,rundir,final_logf,run_duration,comment,event_time,archived) - VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?);" + "INSERT INTO tests (run_id,test_name,item_path,state,status,host,cpuload,diskfree,uname,rundir,final_logf,run_duration,comment,event_time,archived,last_update,attemptnum) + VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?);" run-id test-name item-path state status host cpuload diskfree uname - run-dir log-file run-duration comment event-time archived)) + run-dir log-file run-duration comment event-time archived last-update pid)) ;; update existing test record ;; -(define (pgdb:update-test dbh test-id run-id test-name item-path state status host cpuload diskfree uname run-dir log-file run-duration comment event-time archived) +(define (pgdb:update-test dbh test-id run-id test-name item-path state status host cpuload diskfree uname run-dir log-file run-duration comment event-time archived last-update pid) (dbi:exec dbh "UPDATE tests SET - run_id=?,test_name=?,item_path=?,state=?,status=?,host=?,cpuload=?,diskfree=?,uname=?,rundir=?,final_logf=?,run_duration=?,comment=?,event_time=?,archived=? + run_id=?,test_name=?,item_path=?,state=?,status=?,host=?,cpuload=?,diskfree=?,uname=?,rundir=?,final_logf=?,run_duration=?,comment=?,event_time=?,archived=?,last_update=?,attemptnum=? WHERE id=?;" run-id test-name item-path state status host cpuload diskfree uname - run-dir log-file run-duration comment event-time archived test-id)) + run-dir log-file run-duration comment event-time archived last-update pid test-id)) (define (pgdb:get-tests dbh target-patt) (dbi:get-rows dbh "SELECT t.id,t.run_id,t.test_name,t.item_path,t.state,t.status,t.host,t.cpuload,t.diskfree,t.uname,t.rundir,t.final_logf,t.run_duration,t.comment,t.event_time,t.archived, DELETED cgisetup/pages/filter-defs-template.scm Index: cgisetup/pages/filter-defs-template.scm ================================================================== --- cgisetup/pages/filter-defs-template.scm +++ /dev/null @@ -1,3 +0,0 @@ -(define *p* '("a" "b" "c")) -(define *k* '("all" "a")) -(define *d* '("all" 1 2 3 6 5 8 11 12)) DELETED cgisetup/pages/home.scm Index: cgisetup/pages/home.scm ================================================================== --- cgisetup/pages/home.scm +++ /dev/null @@ -1,17 +0,0 @@ -;;====================================================================== -;; Copyright 2017, Matthew Welland. -;; -;; This program is made available under the GNU GPL version 2.0 or -;; greater. See the accompanying file COPYING for details. -;; -;; This program is distributed WITHOUT ANY WARRANTY; without even the -;; implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -;; PURPOSE. -;;====================================================================== - -(use regex) -(load "models/pgdb.scm") -(include "pages/filter-defs.scm") -(include "pages/home_ctrl.scm") -(include "pages/home_view.scm") - DELETED cgisetup/pages/home_ctrl.scm Index: cgisetup/pages/home_ctrl.scm ================================================================== --- cgisetup/pages/home_ctrl.scm +++ /dev/null @@ -1,30 +0,0 @@ -;;====================================================================== -;; Copyright 2017, Matthew Welland. -;; -;; This program is made available under the GNU GPL version 2.0 or -;; greater. See the accompanying file COPYING for details. -;; -;; This program is distributed WITHOUT ANY WARRANTY; without even the -;; implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -;; PURPOSE. -;;====================================================================== - -;; a function -action is called on POST - -(define (home-action action) - (case (string->symbol action) - ((filter) - (let ((dot (s:get-input 'dot)) - (type (s:get-input 'kit-type)) - (rel (s:get-input 'rel-num)) - (bp (s:get-input 'bp))) - ;; - ;; s:set! is a page local var. Better than s:session-var-set! but still not a good idea. - ;; - - (s:set! "dot" dot) - (s:set! "type" type) - (s:set! "bp" bp) - - (s:set! "rel" rel))))) - DELETED cgisetup/pages/home_view.scm Index: cgisetup/pages/home_view.scm ================================================================== --- cgisetup/pages/home_view.scm +++ /dev/null @@ -1,159 +0,0 @@ -;;====================================================================== -;; Copyright 2017, Matthew Welland. -;; -;; This program is made available under the GNU GPL version 2.0 or -;; greater. See the accompanying file COPYING for details. -;; -;; This program is distributed WITHOUT ANY WARRANTY; without even the -;; implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -;; PURPOSE. -;;====================================================================== - -(define (pages:home session db shared) - - (let* ((dbh (s:db)) - (limit 50) - (curr-page (if (or (equal? (s:get-param "pg") "") (equal? (s:get-param "pg") #f)) - 1 - (string->number (s:get-param "pg")))) - - (offset (- (* limit curr-page) limit)) - (dot (if (s:get-param "dot") - (string->number (s:get-param "dot")) - (if (and (s:get "dot") (not (equal? (s:get "dot") "all"))) - (string->number (s:get "dot")) - "all"))) - (type (if (s:get-param "type") - (s:get-param "type") - (if (and (s:get "type") (not (equal? (s:get "type") "all"))) - (s:get "type") - "all"))) - (bp (if (s:get-param "bp") - (s:get-param "bp") - (if (s:get "bp") - (s:get "bp") - "p1273"))) - (rel (if (s:get-param "rel") - (s:get-param "rel") - (if (and (s:get "rel") (not (equal? (s:get "rel") "all"))) - (s:get "rel") - ""))) - (pattern (pgdb:mk-pattern dot type bp rel)) - ; (targets (pgdb:get-targets-of-type dbh selected tfilter)) - - (all-data (pgdb:get-latest-run-stats-given-pattern dbh pattern limit offset)) - ;'() ) - ; (pgdb:get-stats-given-type-target dbh selected tfilter) - ; (pgdb:get-stats-given-target dbh tfilter) - - (cnt (pgdb:get-latest-run-cnt-by-pattern dbh pattern)) - (total-pages (ceiling (/ cnt limit))) - (page-lst (pgdb:get-pg-lst total-pages)) - (ordered-data (pgdb:coalesce-runs1 all-data)) - (rel-val (if (equal? rel "") - "%" - rel))) - (s:div 'class "col_12" - (s:ul 'class "tabs left" - - (map (lambda (x) - (s:li (s:a 'href (conc "#" x) x))) - *process*)) - (map (lambda (x) - - (s:div 'id x 'class "tab-content" - (s:div 'class "col_11" - (s:fieldset "Area type and target filter" - (s:form - 'action (conc "home.filter#" x) 'method "post" - (s:div 'class "col_12" - (s:div 'class "col_3" - (s:label "Release Type") (s:select (map (lambda (x) - (if (equal? x type) - (list x x x #t) - (list x x x #f)) ) - *kit-types*) - 'name "kit-type")) - (s:div 'class "col_3" - (s:label "Dot") (s:select (map (lambda (x) - (if (equal? x dot) - (list x x x #t) - (list x x x #f))) - *dots*) - 'name "dot")) - - (s:div 'class "col_3" - (s:input 'type "hidden" 'value x 'name "bp") - (s:label "Release #") (s:input 'type "text" 'name "rel-num" 'value rel-val)) - (s:div 'class "col_2" - (s:input 'type "submit" 'name "set-filter-vals" 'value "Submit"))))) - (s:br) - ;(s:p (conc dot(string? dot) )) - (s:p (map - (lambda (i) - (s:span (s:a 'href (s:link-to "home" 'pg i ) "PAGE " i )" | ")) - page-lst)) - (s:p "  Result Format:   total / pass / fail / other") - (if (equal? x bp) - (begin - (s:fieldset (conc "Runs data for " pattern) - (let* ((a-keys (pgdb:ordered-data->a-keys ordered-data)) - (b-keys (pgdb:ordered-data->b-keys ordered-data a-keys))) - (s:table 'class "striped" - (s:tr (s:th 'class "heading" ) - (map - (lambda (th-key) - (s:th 'class "heading" th-key )) - a-keys)) - (map - (lambda (row-key) - (s:tr (s:td row-key) - (map - (lambda (col-key) - (let ((val (let* ((ht (hash-table-ref/default ordered-data col-key #f))) - (if ht (hash-table-ref/default ht row-key #f))))) - (if val - (let* ((total (vector-ref val 2)) - (event-time (vector-ref val 1)) - (pass (vector-ref val 3)) - (fail (vector-ref val 4)) - (other (vector-ref val 5)) - (id (vector-ref val 6)) - (passper (round (* (/ pass total) 100))) - (failper (- 100 passper)) - (history (pgdb:get-run-stats-history-given-target dbh 1 (conc col-key "/" row-key))) - (history-hash (pgdb:get-history-hash history)) - (history-keys (sort (hash-table-keys history-hash) string>=?)) - (run-key (string-substitute "[/]" "_x_" (conc col-key "/" row-key) 'all))) - (s:td 'style (conc "background: -webkit-linear-gradient(left, green " passper "%, red); background: -o-linear-gradient(right, green " passper "%, red); background: -moz-linear-gradient(right, green " passper "%, red); background: linear-gradient(to right, green " passper "%, red);") - (s:a 'class "white" 'href (s:link-to "run" 'target run-key) - (conc "Latest:" total "/" pass "/" fail "/" other)) (s:span " | ") (s:a 'id id 'class "viewmodal" 'title "Click to see description" "History") (s:br) - (s:div 'id (conc "myModal" id) 'class "modal" - (s:div 'class "modal-content" - (s:span 'id id 'class "close" "×") - ;(s:p (conc "Modal " id "..")) - (s:div - (s:table - (s:tr - (s:th "Runame") - (s:th "Result") - ) - (map - (lambda (history-key) - (let* ((history-row (hash-table-ref/default history-hash history-key #f)) - (htotal (vector-ref history-row 1)) - (hpass (vector-ref history-row 2)) - (hfail (vector-ref history-row 3)) - (hother (vector-ref history-row 4)) - (passper (round (* (/ hpass htotal) 100)))) - (s:tr (s:td history-key) - (s:td 'style (conc "background: -webkit-linear-gradient(left, green " passper "%, red); background: -o-linear-gradient(right, green " passper "%, red); background: -moz-linear-gradient(right, green " passper "%, red); background: linear-gradient(to right, green " passper "%, red);") -(conc htotal "/" hpass "/" hfail "/" hother ))))) - history-keys))))))) - (s:td "")))) - a-keys))) - b-keys)))) -) -(begin -(s:p "")))))) - *process*)))) DELETED cgisetup/pages/index.scm Index: cgisetup/pages/index.scm ================================================================== --- cgisetup/pages/index.scm +++ /dev/null @@ -1,17 +0,0 @@ -;;====================================================================== -;; Copyright 2017, Matthew Welland. -;; -;; This program is made available under the GNU GPL version 2.0 or -;; greater. See the accompanying file COPYING for details. -;; -;; This program is distributed WITHOUT ANY WARRANTY; without even the -;; implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -;; PURPOSE. -;;====================================================================== - -(use regex) - -;; (load "models/pgdb.scm") -(include "pages/index_ctrl.scm") -(include "pages/index_view.scm") - DELETED cgisetup/pages/index_ctrl.scm Index: cgisetup/pages/index_ctrl.scm ================================================================== --- cgisetup/pages/index_ctrl.scm +++ /dev/null @@ -1,72 +0,0 @@ -;;====================================================================== -;; Copyright 2017, Matthew Welland. -;; -;; This program is made available under the GNU GPL version 2.0 or -;; greater. See the accompanying file COPYING for details. -;; -;; This program is distributed WITHOUT ANY WARRANTY; without even the -;; implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -;; PURPOSE. -;;====================================================================== - -;; a function -action is called on POST - -(define (index-action action) - (case (string->symbol action) - (else #f))) - -;;====================================================================== -;; Below are the raw chunks of html, css and jquery stuff needed to make -;; html kickstart and other useful things work -;;====================================================================== - -(define index:kickstart-junk -#< - - - - - - - - - -EOF -) - -(define index:jquery - (if #t - -#< - -EOF - -#< - -EOF -)) - -(define index:javascript -#< PRETTIFY --> - - -EOF -) - DELETED cgisetup/pages/index_view.scm Index: cgisetup/pages/index_view.scm ================================================================== --- cgisetup/pages/index_view.scm +++ /dev/null @@ -1,39 +0,0 @@ -;;====================================================================== -;; Copyright 2017, Matthew Welland. -;; -;; This program is made available under the GNU GPL version 2.0 or -;; greater. See the accompanying file COPYING for details. -;; -;; This program is distributed WITHOUT ANY WARRANTY; without even the -;; implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -;; PURPOSE. -;;====================================================================== - -(define (pages:index session db shared) - (let* ((dbh (s:db)) - (page-name (sdat-get-page s:session))) - (if (equal? page-name "api") - (s:call page-name) ;; go straight to the api - (list - "" - (s:html - (s:title (conc "Megatest")) - (s:head - index:kickstart-junk - ) - (s:body - (s:div 'class "grid flex" 'id "top_of_page" - ;; add visible to columns to help visualize them e.g. "col_12 visible" - (s:ul 'class "menu" -(s:li (s:a 'href "" (s:i 'class "fa fa-inbox") "QA Summary") - (s:ul - (s:li (s:a 'href "/cgi-bin/megatest.sh/home" "Component Snapshot")) - (s:li (s:a 'href "/cgi-bin/megatest.sh/kitprogress" "Kit/Contour progress")) - ))) -;(s:li (s:a 'href (s:link-to "run" ) "Runs"))) - (case (string->symbol page-name) - ((index) (s:call "home")) - (else (s:call page-name)))) - index:jquery - index:javascript - )))))) DELETED cgisetup/pages/log.scm Index: cgisetup/pages/log.scm ================================================================== --- cgisetup/pages/log.scm +++ /dev/null @@ -1,15 +0,0 @@ -;;====================================================================== -;; Copyright 2017, Matthew Welland. -;; -;; This program is made available under the GNU GPL version 2.0 or -;; greater. See the accompanying file COPYING for details. -;; -;; This program is distributed WITHOUT ANY WARRANTY; without even the -;; implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -;; PURPOSE. -;;====================================================================== - -(load "models/pgdb.scm") -(include "pages/log_ctrl.scm") -(include "pages/log_view.scm") - DELETED cgisetup/pages/log_ctrl.scm Index: cgisetup/pages/log_ctrl.scm ================================================================== --- cgisetup/pages/log_ctrl.scm +++ /dev/null @@ -1,19 +0,0 @@ -;;====================================================================== -;; Copyright 2017, Matthew Welland. -;; -;; This program is made available under the GNU GPL version 2.0 or -;; greater. See the accompanying file COPYING for details. -;; -;; This program is distributed WITHOUT ANY WARRANTY; without even the -;; implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -;; PURPOSE. -;;====================================================================== - -;; a function -action is called on POST - -(define (log-action action) - (case (string->symbol action) - ((dosomething) - (dosomething)))) - - DELETED cgisetup/pages/log_view.scm Index: cgisetup/pages/log_view.scm ================================================================== --- cgisetup/pages/log_view.scm +++ /dev/null @@ -1,38 +0,0 @@ -;;====================================================================== -;; Copyright 2017, Matthew Welland. -;; -;; This program is made available under the GNU GPL version 2.0 or -;; greater. See the accompanying file COPYING for details. -;; -;; This program is distributed WITHOUT ANY WARRANTY; without even the -;; implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -;; PURPOSE. -;;====================================================================== -(define (readlines filename) - (call-with-input-file filename - (lambda (p) - (let loop ((line (read-line p)) - (result '())) - (if (eof-object? line) - (reverse result) - (loop (read-line p) (cons line result))))))) - -(define (pages:log session db shared) - (let* ((dbh (s:db)) - (id (s:get-param 'testid)) - (tests (pgdb:get-test-by-id dbh id))) - - (if (eq? (length tests) 1) - (begin - (s:div 'class "col_12" - (s:fieldset - (conc "Show a runs for Target: " ) - (let* ((test (car tests)) - (html-path (conc (vector-ref test 2) "/" (vector-ref test 3))) - (html-data (readlines html-path))) - (s:p html-data))))) - (begin - (s:div 'class "col_12" - "Log not found"))) -)) - DELETED cgisetup/pages/run.scm Index: cgisetup/pages/run.scm ================================================================== --- cgisetup/pages/run.scm +++ /dev/null @@ -1,15 +0,0 @@ -;;====================================================================== -;; Copyright 2017, Matthew Welland. -;; -;; This program is made available under the GNU GPL version 2.0 or -;; greater. See the accompanying file COPYING for details. -;; -;; This program is distributed WITHOUT ANY WARRANTY; without even the -;; implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -;; PURPOSE. -;;====================================================================== - -(load "models/pgdb.scm") -(include "pages/run_ctrl.scm") -(include "pages/run_view.scm") - DELETED cgisetup/pages/run_ctrl.scm Index: cgisetup/pages/run_ctrl.scm ================================================================== --- cgisetup/pages/run_ctrl.scm +++ /dev/null @@ -1,22 +0,0 @@ -;;====================================================================== -;; Copyright 2017, Matthew Welland. -;; -;; This program is made available under the GNU GPL version 2.0 or -;; greater. See the accompanying file COPYING for details. -;; -;; This program is distributed WITHOUT ANY WARRANTY; without even the -;; implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -;; PURPOSE. -;;====================================================================== - -;; a function -action is called on POST - -(define (run-action action) - (case (string->symbol action) - ((filter) - (let ((run-name-filter (s:get-input 'run-name-filter)) - (target (s:get-input 'target))) - (s:set! "run-name-filter" run-name-filter) - (s:set! "target" target))))) - - DELETED cgisetup/pages/run_view.scm Index: cgisetup/pages/run_view.scm ================================================================== --- cgisetup/pages/run_view.scm +++ /dev/null @@ -1,75 +0,0 @@ -;;====================================================================== -;; Copyright 2017, Matthew Welland. -;; -;; This program is made available under the GNU GPL version 2.0 or -;; greater. See the accompanying file COPYING for details. -;; -;; This program is distributed WITHOUT ANY WARRANTY; without even the -;; implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -;; PURPOSE. -;;====================================================================== -(define (pages:run session db shared) - (let* ((dbh (s:db)) - (target-param (s:get-param 'target)) - (target1 (if (s:get "target") - (s:get "target") - (s:get-param 'target))) - (target (if (equal? target1 #f) - "%" - (string-substitute "_x_" "/" target1 'all) - )) - - (run-filter (or (or (s:get "run-name-filter") (s:get-param 'run)) "%")) - (runs (pgdb:get-runs-by-target dbh target run-filter)) - (ordered-runs (pgdb:runs-to-hash runs))) - - (s:div 'class "col_12" - (s:fieldset - "Run filter" - (s:form - 'action "run.filter" 'method "post" - (s:div 'class "col_12" - (s:div 'class "col_6" - ;(s:p (conc "param" (s:get-param 'target)) ) - ; (s:p (conc "get" (s:get "target")) ) - ;(s:p target1) - (s:input-preserve 'name "run-name-filter" 'placeholder "Filter by run names") - (s:input 'type "hidden" 'value target 'name "target" )) - - (s:div 'class "col_6" - (s:input 'type "submit" 'name "set-filter-vals" 'value "Submit"))) - )) - - (s:fieldset - (conc "Show a runs for Target: " target) - (let* ((a-keys (sort (hash-table-keys ordered-runs) string>=?)) - (b-keys (delete-duplicates(sort (apply - append - (map (lambda (sub-key) - (let ((subdat (hash-table-ref ordered-runs sub-key))) - (hash-table-keys subdat))) - a-keys)) - string>=?)))) - - (s:table - (s:tr (s:th "") (map s:th a-keys)) - (map - (lambda (row-key) - (s:tr (s:td row-key) - (map - (lambda (col-key) - (let ((val (let* ((ht (hash-table-ref/default ordered-runs col-key #f))) - (if ht (hash-table-ref/default ht row-key #f))))) - (if val - (let* ((result (vector-ref val 2)) - (test-id (vector-ref val 4)) - (bg (if (equal? result "PASS") - "green" - "red"))) - (s:td 'style (conc "background: " bg ) - (s:a 'class "white" 'href (s:link-to "log" 'testid test-id) - result))) - (s:td "")))) - a-keys))) - b-keys))))))) - DELETED cgisetup/www/README.md Index: cgisetup/www/README.md ================================================================== --- cgisetup/www/README.md +++ /dev/null @@ -1,37 +0,0 @@ -# HTML KickStart # -by Joshua Gatcke -http://www.99lime.com -Version: 0.94 - -## What is HTML KickStart? ## - -HTML KickStart is an ultra–lean set of HTML5, CSS, and jQuery (javascript) files, layouts, and elements designed to give you a headstart and save you 10's of hours on your next web project. - -HTML KickStart includes everything you need to rapidly create website layouts – things like slideshows, menus, flexible grids, image placeholders, buttons, and more – saving you a ton of time so you can produce faster and make more money. - -Bonus! All HTML KickStart Elements are fully Browser tested, they even gracefully degrade ;) - -## Perfect for Wireframing in HTML ## - -HTML KickStart has everything you need to rapidly create HTML Page Layouts, perfect for Wireframing in HTML. -Layouts that used to take hours now take minutes. - -## Getting Started ## - -1. Download HTML KickStart -2. Open blank.html in your favorite text editor -3. Start adding KickStart Elements to blank.html: (http://www.99lime.com/elements/) -4. Save blank.html and open in your favorite Web Browser -5. Have fun! - - -## HTML KickStart is FREE and Open Source. ## -### Release Under the MIT Open Source License. ### - -Copyright © 2011-2012 Joshua Gatcke http://www.99lime.com | HTML KickStart - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. DELETED cgisetup/www/blank.html Index: cgisetup/www/blank.html ================================================================== --- cgisetup/www/blank.html +++ /dev/null @@ -1,28 +0,0 @@ - - - - - HTML KickStart Elements - - - - - - - - - - - - - -
-
-

-

- This example is blank

-

Add some HTML KickStart Elements to see the magic happen

-
-
- - DELETED cgisetup/www/composer.json Index: cgisetup/www/composer.json ================================================================== --- cgisetup/www/composer.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "name": "99lime/html-kickstart", - "license": "MIT", - "description": "Ultra–Lean HTML Building Blocks for Rapid Website Production", - "minimum-stability": "dev", - "authors": [ - { - "name": "Joshua Gatcke", - "email": "joshua@99lime.com" - } - ] -} DELETED cgisetup/www/css/fonts/font-awesome-4.2.0/css/font-awesome.css Index: cgisetup/www/css/fonts/font-awesome-4.2.0/css/font-awesome.css ================================================================== --- cgisetup/www/css/fonts/font-awesome-4.2.0/css/font-awesome.css +++ /dev/null @@ -1,1672 +0,0 @@ -/*! - * Font Awesome 4.2.0 by @davegandy - http://fontawesome.io - @fontawesome - * License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License) - */ -/* FONT PATH - * -------------------------- */ -@font-face { - font-family: 'FontAwesome'; - src: url('../fonts/fontawesome-webfont.eot?v=4.2.0'); - src: url('../fonts/fontawesome-webfont.eot?#iefix&v=4.2.0') format('embedded-opentype'), url('../fonts/fontawesome-webfont.woff?v=4.2.0') format('woff'), url('../fonts/fontawesome-webfont.ttf?v=4.2.0') format('truetype'), url('../fonts/fontawesome-webfont.svg?v=4.2.0#fontawesomeregular') format('svg'); - font-weight: normal; - font-style: normal; -} -.fa { - display: inline-block; - font: normal normal normal 14px/1 FontAwesome; - font-size: inherit; - text-rendering: auto; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; -} -/* makes the font 33% larger relative to the icon container */ -.fa-lg { - font-size: 1.33333333em; - line-height: 0.75em; - vertical-align: -15%; -} -.fa-2x { - font-size: 2em; -} -.fa-3x { - font-size: 3em; -} -.fa-4x { - font-size: 4em; -} -.fa-5x { - font-size: 5em; -} -.fa-fw { - width: 1.28571429em; - text-align: center; -} -.fa-ul { - padding-left: 0; - margin-left: 2.14285714em; - list-style-type: none; -} -.fa-ul > li { - position: relative; -} -.fa-li { - position: absolute; - left: -2.14285714em; - width: 2.14285714em; - top: 0.14285714em; - text-align: center; -} -.fa-li.fa-lg { - left: -1.85714286em; -} -.fa-border { - padding: .2em .25em .15em; - border: solid 0.08em #eeeeee; - border-radius: .1em; -} -.pull-right { - float: right; -} -.pull-left { - float: left; -} -.fa.pull-left { - margin-right: .3em; -} -.fa.pull-right { - margin-left: .3em; -} -.fa-spin { - -webkit-animation: fa-spin 2s infinite linear; - animation: fa-spin 2s infinite linear; -} -@-webkit-keyframes fa-spin { - 0% { - -webkit-transform: rotate(0deg); - transform: rotate(0deg); - } - 100% { - -webkit-transform: rotate(359deg); - transform: rotate(359deg); - } -} -@keyframes fa-spin { - 0% { - -webkit-transform: rotate(0deg); - transform: rotate(0deg); - } - 100% { - -webkit-transform: rotate(359deg); - transform: rotate(359deg); - } -} -.fa-rotate-90 { - filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1); - -webkit-transform: rotate(90deg); - -ms-transform: rotate(90deg); - transform: rotate(90deg); -} -.fa-rotate-180 { - filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2); - -webkit-transform: rotate(180deg); - -ms-transform: rotate(180deg); - transform: rotate(180deg); -} -.fa-rotate-270 { - filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3); - -webkit-transform: rotate(270deg); - -ms-transform: rotate(270deg); - transform: rotate(270deg); -} -.fa-flip-horizontal { - filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1); - -webkit-transform: scale(-1, 1); - -ms-transform: scale(-1, 1); - transform: scale(-1, 1); -} -.fa-flip-vertical { - filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1); - -webkit-transform: scale(1, -1); - -ms-transform: scale(1, -1); - transform: scale(1, -1); -} -:root .fa-rotate-90, -:root .fa-rotate-180, -:root .fa-rotate-270, -:root .fa-flip-horizontal, -:root .fa-flip-vertical { - filter: none; -} -.fa-stack { - position: relative; - display: inline-block; - width: 2em; - height: 2em; - line-height: 2em; - vertical-align: middle; -} -.fa-stack-1x, -.fa-stack-2x { - position: absolute; - left: 0; - width: 100%; - text-align: center; -} -.fa-stack-1x { - line-height: inherit; -} -.fa-stack-2x { - font-size: 2em; -} -.fa-inverse { - color: #ffffff; -} -/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen - readers do not read off random characters that represent icons */ -.fa-glass:before { - content: "\f000"; -} -.fa-music:before { - content: "\f001"; -} -.fa-search:before { - content: "\f002"; -} -.fa-envelope-o:before { - content: "\f003"; -} -.fa-heart:before { - content: "\f004"; -} -.fa-star:before { - content: "\f005"; -} -.fa-star-o:before { - content: "\f006"; -} -.fa-user:before { - content: "\f007"; -} -.fa-film:before { - content: "\f008"; -} -.fa-th-large:before { - content: "\f009"; -} -.fa-th:before { - content: "\f00a"; -} -.fa-th-list:before { - content: "\f00b"; -} -.fa-check:before { - content: "\f00c"; -} -.fa-remove:before, -.fa-close:before, -.fa-times:before { - content: "\f00d"; -} -.fa-search-plus:before { - content: "\f00e"; -} -.fa-search-minus:before { - content: "\f010"; -} -.fa-power-off:before { - content: "\f011"; -} -.fa-signal:before { - content: "\f012"; -} -.fa-gear:before, -.fa-cog:before { - content: "\f013"; -} -.fa-trash-o:before { - content: "\f014"; -} -.fa-home:before { - content: "\f015"; -} -.fa-file-o:before { - content: "\f016"; -} -.fa-clock-o:before { - content: "\f017"; -} -.fa-road:before { - content: "\f018"; -} -.fa-download:before { - content: "\f019"; -} -.fa-arrow-circle-o-down:before { - content: "\f01a"; -} -.fa-arrow-circle-o-up:before { - content: "\f01b"; -} -.fa-inbox:before { - content: "\f01c"; -} -.fa-play-circle-o:before { - content: "\f01d"; -} -.fa-rotate-right:before, -.fa-repeat:before { - content: "\f01e"; -} -.fa-refresh:before { - content: "\f021"; -} -.fa-list-alt:before { - content: "\f022"; -} -.fa-lock:before { - content: "\f023"; -} -.fa-flag:before { - content: "\f024"; -} -.fa-headphones:before { - content: "\f025"; -} -.fa-volume-off:before { - content: "\f026"; -} -.fa-volume-down:before { - content: "\f027"; -} -.fa-volume-up:before { - content: "\f028"; -} -.fa-qrcode:before { - content: "\f029"; -} -.fa-barcode:before { - content: "\f02a"; -} -.fa-tag:before { - content: "\f02b"; -} -.fa-tags:before { - content: "\f02c"; -} -.fa-book:before { - content: "\f02d"; -} -.fa-bookmark:before { - content: "\f02e"; -} -.fa-print:before { - content: "\f02f"; -} -.fa-camera:before { - content: "\f030"; -} -.fa-font:before { - content: "\f031"; -} -.fa-bold:before { - content: "\f032"; -} -.fa-italic:before { - content: "\f033"; -} -.fa-text-height:before { - content: "\f034"; -} -.fa-text-width:before { - content: "\f035"; -} -.fa-align-left:before { - content: "\f036"; -} -.fa-align-center:before { - content: "\f037"; -} -.fa-align-right:before { - content: "\f038"; -} -.fa-align-justify:before { - content: "\f039"; -} -.fa-list:before { - content: "\f03a"; -} -.fa-dedent:before, -.fa-outdent:before { - content: "\f03b"; -} -.fa-indent:before { - content: "\f03c"; -} -.fa-video-camera:before { - content: "\f03d"; -} -.fa-photo:before, -.fa-image:before, -.fa-picture-o:before { - content: "\f03e"; -} -.fa-pencil:before { - content: "\f040"; -} -.fa-map-marker:before { - content: "\f041"; -} -.fa-adjust:before { - content: "\f042"; -} -.fa-tint:before { - content: "\f043"; -} -.fa-edit:before, -.fa-pencil-square-o:before { - content: "\f044"; -} -.fa-share-square-o:before { - content: "\f045"; -} -.fa-check-square-o:before { - content: "\f046"; -} -.fa-arrows:before { - content: "\f047"; -} -.fa-step-backward:before { - content: "\f048"; -} -.fa-fast-backward:before { - content: "\f049"; -} -.fa-backward:before { - content: "\f04a"; -} -.fa-play:before { - content: "\f04b"; -} -.fa-pause:before { - content: "\f04c"; -} -.fa-stop:before { - content: "\f04d"; -} -.fa-forward:before { - content: "\f04e"; -} -.fa-fast-forward:before { - content: "\f050"; -} -.fa-step-forward:before { - content: "\f051"; -} -.fa-eject:before { - content: "\f052"; -} -.fa-chevron-left:before { - content: "\f053"; -} -.fa-chevron-right:before { - content: "\f054"; -} -.fa-plus-circle:before { - content: "\f055"; -} -.fa-minus-circle:before { - content: "\f056"; -} -.fa-times-circle:before { - content: "\f057"; -} -.fa-check-circle:before { - content: "\f058"; -} -.fa-question-circle:before { - content: "\f059"; -} -.fa-info-circle:before { - content: "\f05a"; -} -.fa-crosshairs:before { - content: "\f05b"; -} -.fa-times-circle-o:before { - content: "\f05c"; -} -.fa-check-circle-o:before { - content: "\f05d"; -} -.fa-ban:before { - content: "\f05e"; -} -.fa-arrow-left:before { - content: "\f060"; -} -.fa-arrow-right:before { - content: "\f061"; -} -.fa-arrow-up:before { - content: "\f062"; -} -.fa-arrow-down:before { - content: "\f063"; -} -.fa-mail-forward:before, -.fa-share:before { - content: "\f064"; -} -.fa-expand:before { - content: "\f065"; -} -.fa-compress:before { - content: "\f066"; -} -.fa-plus:before { - content: "\f067"; -} -.fa-minus:before { - content: "\f068"; -} -.fa-asterisk:before { - content: "\f069"; -} -.fa-exclamation-circle:before { - content: "\f06a"; -} -.fa-gift:before { - content: "\f06b"; -} -.fa-leaf:before { - content: "\f06c"; -} -.fa-fire:before { - content: "\f06d"; -} -.fa-eye:before { - content: "\f06e"; -} -.fa-eye-slash:before { - content: "\f070"; -} -.fa-warning:before, -.fa-exclamation-triangle:before { - content: "\f071"; -} -.fa-plane:before { - content: "\f072"; -} -.fa-calendar:before { - content: "\f073"; -} -.fa-random:before { - content: "\f074"; -} -.fa-comment:before { - content: "\f075"; -} -.fa-magnet:before { - content: "\f076"; -} -.fa-chevron-up:before { - content: "\f077"; -} -.fa-chevron-down:before { - content: "\f078"; -} -.fa-retweet:before { - content: "\f079"; -} -.fa-shopping-cart:before { - content: "\f07a"; -} -.fa-folder:before { - content: "\f07b"; -} -.fa-folder-open:before { - content: "\f07c"; -} -.fa-arrows-v:before { - content: "\f07d"; -} -.fa-arrows-h:before { - content: "\f07e"; -} -.fa-bar-chart-o:before, -.fa-bar-chart:before { - content: "\f080"; -} -.fa-twitter-square:before { - content: "\f081"; -} -.fa-facebook-square:before { - content: "\f082"; -} -.fa-camera-retro:before { - content: "\f083"; -} -.fa-key:before { - content: "\f084"; -} -.fa-gears:before, -.fa-cogs:before { - content: "\f085"; -} -.fa-comments:before { - content: "\f086"; -} -.fa-thumbs-o-up:before { - content: "\f087"; -} -.fa-thumbs-o-down:before { - content: "\f088"; -} -.fa-star-half:before { - content: "\f089"; -} -.fa-heart-o:before { - content: "\f08a"; -} -.fa-sign-out:before { - content: "\f08b"; -} -.fa-linkedin-square:before { - content: "\f08c"; -} -.fa-thumb-tack:before { - content: "\f08d"; -} -.fa-external-link:before { - content: "\f08e"; -} -.fa-sign-in:before { - content: "\f090"; -} -.fa-trophy:before { - content: "\f091"; -} -.fa-github-square:before { - content: "\f092"; -} -.fa-upload:before { - content: "\f093"; -} -.fa-lemon-o:before { - content: "\f094"; -} -.fa-phone:before { - content: "\f095"; -} -.fa-square-o:before { - content: "\f096"; -} -.fa-bookmark-o:before { - content: "\f097"; -} -.fa-phone-square:before { - content: "\f098"; -} -.fa-twitter:before { - content: "\f099"; -} -.fa-facebook:before { - content: "\f09a"; -} -.fa-github:before { - content: "\f09b"; -} -.fa-unlock:before { - content: "\f09c"; -} -.fa-credit-card:before { - content: "\f09d"; -} -.fa-rss:before { - content: "\f09e"; -} -.fa-hdd-o:before { - content: "\f0a0"; -} -.fa-bullhorn:before { - content: "\f0a1"; -} -.fa-bell:before { - content: "\f0f3"; -} -.fa-certificate:before { - content: "\f0a3"; -} -.fa-hand-o-right:before { - content: "\f0a4"; -} -.fa-hand-o-left:before { - content: "\f0a5"; -} -.fa-hand-o-up:before { - content: "\f0a6"; -} -.fa-hand-o-down:before { - content: "\f0a7"; -} -.fa-arrow-circle-left:before { - content: "\f0a8"; -} -.fa-arrow-circle-right:before { - content: "\f0a9"; -} -.fa-arrow-circle-up:before { - content: "\f0aa"; -} -.fa-arrow-circle-down:before { - content: "\f0ab"; -} -.fa-globe:before { - content: "\f0ac"; -} -.fa-wrench:before { - content: "\f0ad"; -} -.fa-tasks:before { - content: "\f0ae"; -} -.fa-filter:before { - content: "\f0b0"; -} -.fa-briefcase:before { - content: "\f0b1"; -} -.fa-arrows-alt:before { - content: "\f0b2"; -} -.fa-group:before, -.fa-users:before { - content: "\f0c0"; -} -.fa-chain:before, -.fa-link:before { - content: "\f0c1"; -} -.fa-cloud:before { - content: "\f0c2"; -} -.fa-flask:before { - content: "\f0c3"; -} -.fa-cut:before, -.fa-scissors:before { - content: "\f0c4"; -} -.fa-copy:before, -.fa-files-o:before { - content: "\f0c5"; -} -.fa-paperclip:before { - content: "\f0c6"; -} -.fa-save:before, -.fa-floppy-o:before { - content: "\f0c7"; -} -.fa-square:before { - content: "\f0c8"; -} -.fa-navicon:before, -.fa-reorder:before, -.fa-bars:before { - content: "\f0c9"; -} -.fa-list-ul:before { - content: "\f0ca"; -} -.fa-list-ol:before { - content: "\f0cb"; -} -.fa-strikethrough:before { - content: "\f0cc"; -} -.fa-underline:before { - content: "\f0cd"; -} -.fa-table:before { - content: "\f0ce"; -} -.fa-magic:before { - content: "\f0d0"; -} -.fa-truck:before { - content: "\f0d1"; -} -.fa-pinterest:before { - content: "\f0d2"; -} -.fa-pinterest-square:before { - content: "\f0d3"; -} -.fa-google-plus-square:before { - content: "\f0d4"; -} -.fa-google-plus:before { - content: "\f0d5"; -} -.fa-money:before { - content: "\f0d6"; -} -.fa-caret-down:before { - content: "\f0d7"; -} -.fa-caret-up:before { - content: "\f0d8"; -} -.fa-caret-left:before { - content: "\f0d9"; -} -.fa-caret-right:before { - content: "\f0da"; -} -.fa-columns:before { - content: "\f0db"; -} -.fa-unsorted:before, -.fa-sort:before { - content: "\f0dc"; -} -.fa-sort-down:before, -.fa-sort-desc:before { - content: "\f0dd"; -} -.fa-sort-up:before, -.fa-sort-asc:before { - content: "\f0de"; -} -.fa-envelope:before { - content: "\f0e0"; -} -.fa-linkedin:before { - content: "\f0e1"; -} -.fa-rotate-left:before, -.fa-undo:before { - content: "\f0e2"; -} -.fa-legal:before, -.fa-gavel:before { - content: "\f0e3"; -} -.fa-dashboard:before, -.fa-tachometer:before { - content: "\f0e4"; -} -.fa-comment-o:before { - content: "\f0e5"; -} -.fa-comments-o:before { - content: "\f0e6"; -} -.fa-flash:before, -.fa-bolt:before { - content: "\f0e7"; -} -.fa-sitemap:before { - content: "\f0e8"; -} -.fa-umbrella:before { - content: "\f0e9"; -} -.fa-paste:before, -.fa-clipboard:before { - content: "\f0ea"; -} -.fa-lightbulb-o:before { - content: "\f0eb"; -} -.fa-exchange:before { - content: "\f0ec"; -} -.fa-cloud-download:before { - content: "\f0ed"; -} -.fa-cloud-upload:before { - content: "\f0ee"; -} -.fa-user-md:before { - content: "\f0f0"; -} -.fa-stethoscope:before { - content: "\f0f1"; -} -.fa-suitcase:before { - content: "\f0f2"; -} -.fa-bell-o:before { - content: "\f0a2"; -} -.fa-coffee:before { - content: "\f0f4"; -} -.fa-cutlery:before { - content: "\f0f5"; -} -.fa-file-text-o:before { - content: "\f0f6"; -} -.fa-building-o:before { - content: "\f0f7"; -} -.fa-hospital-o:before { - content: "\f0f8"; -} -.fa-ambulance:before { - content: "\f0f9"; -} -.fa-medkit:before { - content: "\f0fa"; -} -.fa-fighter-jet:before { - content: "\f0fb"; -} -.fa-beer:before { - content: "\f0fc"; -} -.fa-h-square:before { - content: "\f0fd"; -} -.fa-plus-square:before { - content: "\f0fe"; -} -.fa-angle-double-left:before { - content: "\f100"; -} -.fa-angle-double-right:before { - content: "\f101"; -} -.fa-angle-double-up:before { - content: "\f102"; -} -.fa-angle-double-down:before { - content: "\f103"; -} -.fa-angle-left:before { - content: "\f104"; -} -.fa-angle-right:before { - content: "\f105"; -} -.fa-angle-up:before { - content: "\f106"; -} -.fa-angle-down:before { - content: "\f107"; -} -.fa-desktop:before { - content: "\f108"; -} -.fa-laptop:before { - content: "\f109"; -} -.fa-tablet:before { - content: "\f10a"; -} -.fa-mobile-phone:before, -.fa-mobile:before { - content: "\f10b"; -} -.fa-circle-o:before { - content: "\f10c"; -} -.fa-quote-left:before { - content: "\f10d"; -} -.fa-quote-right:before { - content: "\f10e"; -} -.fa-spinner:before { - content: "\f110"; -} -.fa-circle:before { - content: "\f111"; -} -.fa-mail-reply:before, -.fa-reply:before { - content: "\f112"; -} -.fa-github-alt:before { - content: "\f113"; -} -.fa-folder-o:before { - content: "\f114"; -} -.fa-folder-open-o:before { - content: "\f115"; -} -.fa-smile-o:before { - content: "\f118"; -} -.fa-frown-o:before { - content: "\f119"; -} -.fa-meh-o:before { - content: "\f11a"; -} -.fa-gamepad:before { - content: "\f11b"; -} -.fa-keyboard-o:before { - content: "\f11c"; -} -.fa-flag-o:before { - content: "\f11d"; -} -.fa-flag-checkered:before { - content: "\f11e"; -} -.fa-terminal:before { - content: "\f120"; -} -.fa-code:before { - content: "\f121"; -} -.fa-mail-reply-all:before, -.fa-reply-all:before { - content: "\f122"; -} -.fa-star-half-empty:before, -.fa-star-half-full:before, -.fa-star-half-o:before { - content: "\f123"; -} -.fa-location-arrow:before { - content: "\f124"; -} -.fa-crop:before { - content: "\f125"; -} -.fa-code-fork:before { - content: "\f126"; -} -.fa-unlink:before, -.fa-chain-broken:before { - content: "\f127"; -} -.fa-question:before { - content: "\f128"; -} -.fa-info:before { - content: "\f129"; -} -.fa-exclamation:before { - content: "\f12a"; -} -.fa-superscript:before { - content: "\f12b"; -} -.fa-subscript:before { - content: "\f12c"; -} -.fa-eraser:before { - content: "\f12d"; -} -.fa-puzzle-piece:before { - content: "\f12e"; -} -.fa-microphone:before { - content: "\f130"; -} -.fa-microphone-slash:before { - content: "\f131"; -} -.fa-shield:before { - content: "\f132"; -} -.fa-calendar-o:before { - content: "\f133"; -} -.fa-fire-extinguisher:before { - content: "\f134"; -} -.fa-rocket:before { - content: "\f135"; -} -.fa-maxcdn:before { - content: "\f136"; -} -.fa-chevron-circle-left:before { - content: "\f137"; -} -.fa-chevron-circle-right:before { - content: "\f138"; -} -.fa-chevron-circle-up:before { - content: "\f139"; -} -.fa-chevron-circle-down:before { - content: "\f13a"; -} -.fa-html5:before { - content: "\f13b"; -} -.fa-css3:before { - content: "\f13c"; -} -.fa-anchor:before { - content: "\f13d"; -} -.fa-unlock-alt:before { - content: "\f13e"; -} -.fa-bullseye:before { - content: "\f140"; -} -.fa-ellipsis-h:before { - content: "\f141"; -} -.fa-ellipsis-v:before { - content: "\f142"; -} -.fa-rss-square:before { - content: "\f143"; -} -.fa-play-circle:before { - content: "\f144"; -} -.fa-ticket:before { - content: "\f145"; -} -.fa-minus-square:before { - content: "\f146"; -} -.fa-minus-square-o:before { - content: "\f147"; -} -.fa-level-up:before { - content: "\f148"; -} -.fa-level-down:before { - content: "\f149"; -} -.fa-check-square:before { - content: "\f14a"; -} -.fa-pencil-square:before { - content: "\f14b"; -} -.fa-external-link-square:before { - content: "\f14c"; -} -.fa-share-square:before { - content: "\f14d"; -} -.fa-compass:before { - content: "\f14e"; -} -.fa-toggle-down:before, -.fa-caret-square-o-down:before { - content: "\f150"; -} -.fa-toggle-up:before, -.fa-caret-square-o-up:before { - content: "\f151"; -} -.fa-toggle-right:before, -.fa-caret-square-o-right:before { - content: "\f152"; -} -.fa-euro:before, -.fa-eur:before { - content: "\f153"; -} -.fa-gbp:before { - content: "\f154"; -} -.fa-dollar:before, -.fa-usd:before { - content: "\f155"; -} -.fa-rupee:before, -.fa-inr:before { - content: "\f156"; -} -.fa-cny:before, -.fa-rmb:before, -.fa-yen:before, -.fa-jpy:before { - content: "\f157"; -} -.fa-ruble:before, -.fa-rouble:before, -.fa-rub:before { - content: "\f158"; -} -.fa-won:before, -.fa-krw:before { - content: "\f159"; -} -.fa-bitcoin:before, -.fa-btc:before { - content: "\f15a"; -} -.fa-file:before { - content: "\f15b"; -} -.fa-file-text:before { - content: "\f15c"; -} -.fa-sort-alpha-asc:before { - content: "\f15d"; -} -.fa-sort-alpha-desc:before { - content: "\f15e"; -} -.fa-sort-amount-asc:before { - content: "\f160"; -} -.fa-sort-amount-desc:before { - content: "\f161"; -} -.fa-sort-numeric-asc:before { - content: "\f162"; -} -.fa-sort-numeric-desc:before { - content: "\f163"; -} -.fa-thumbs-up:before { - content: "\f164"; -} -.fa-thumbs-down:before { - content: "\f165"; -} -.fa-youtube-square:before { - content: "\f166"; -} -.fa-youtube:before { - content: "\f167"; -} -.fa-xing:before { - content: "\f168"; -} -.fa-xing-square:before { - content: "\f169"; -} -.fa-youtube-play:before { - content: "\f16a"; -} -.fa-dropbox:before { - content: "\f16b"; -} -.fa-stack-overflow:before { - content: "\f16c"; -} -.fa-instagram:before { - content: "\f16d"; -} -.fa-flickr:before { - content: "\f16e"; -} -.fa-adn:before { - content: "\f170"; -} -.fa-bitbucket:before { - content: "\f171"; -} -.fa-bitbucket-square:before { - content: "\f172"; -} -.fa-tumblr:before { - content: "\f173"; -} -.fa-tumblr-square:before { - content: "\f174"; -} -.fa-long-arrow-down:before { - content: "\f175"; -} -.fa-long-arrow-up:before { - content: "\f176"; -} -.fa-long-arrow-left:before { - content: "\f177"; -} -.fa-long-arrow-right:before { - content: "\f178"; -} -.fa-apple:before { - content: "\f179"; -} -.fa-windows:before { - content: "\f17a"; -} -.fa-android:before { - content: "\f17b"; -} -.fa-linux:before { - content: "\f17c"; -} -.fa-dribbble:before { - content: "\f17d"; -} -.fa-skype:before { - content: "\f17e"; -} -.fa-foursquare:before { - content: "\f180"; -} -.fa-trello:before { - content: "\f181"; -} -.fa-female:before { - content: "\f182"; -} -.fa-male:before { - content: "\f183"; -} -.fa-gittip:before { - content: "\f184"; -} -.fa-sun-o:before { - content: "\f185"; -} -.fa-moon-o:before { - content: "\f186"; -} -.fa-archive:before { - content: "\f187"; -} -.fa-bug:before { - content: "\f188"; -} -.fa-vk:before { - content: "\f189"; -} -.fa-weibo:before { - content: "\f18a"; -} -.fa-renren:before { - content: "\f18b"; -} -.fa-pagelines:before { - content: "\f18c"; -} -.fa-stack-exchange:before { - content: "\f18d"; -} -.fa-arrow-circle-o-right:before { - content: "\f18e"; -} -.fa-arrow-circle-o-left:before { - content: "\f190"; -} -.fa-toggle-left:before, -.fa-caret-square-o-left:before { - content: "\f191"; -} -.fa-dot-circle-o:before { - content: "\f192"; -} -.fa-wheelchair:before { - content: "\f193"; -} -.fa-vimeo-square:before { - content: "\f194"; -} -.fa-turkish-lira:before, -.fa-try:before { - content: "\f195"; -} -.fa-plus-square-o:before { - content: "\f196"; -} -.fa-space-shuttle:before { - content: "\f197"; -} -.fa-slack:before { - content: "\f198"; -} -.fa-envelope-square:before { - content: "\f199"; -} -.fa-wordpress:before { - content: "\f19a"; -} -.fa-openid:before { - content: "\f19b"; -} -.fa-institution:before, -.fa-bank:before, -.fa-university:before { - content: "\f19c"; -} -.fa-mortar-board:before, -.fa-graduation-cap:before { - content: "\f19d"; -} -.fa-yahoo:before { - content: "\f19e"; -} -.fa-google:before { - content: "\f1a0"; -} -.fa-reddit:before { - content: "\f1a1"; -} -.fa-reddit-square:before { - content: "\f1a2"; -} -.fa-stumbleupon-circle:before { - content: "\f1a3"; -} -.fa-stumbleupon:before { - content: "\f1a4"; -} -.fa-delicious:before { - content: "\f1a5"; -} -.fa-digg:before { - content: "\f1a6"; -} -.fa-pied-piper:before { - content: "\f1a7"; -} -.fa-pied-piper-alt:before { - content: "\f1a8"; -} -.fa-drupal:before { - content: "\f1a9"; -} -.fa-joomla:before { - content: "\f1aa"; -} -.fa-language:before { - content: "\f1ab"; -} -.fa-fax:before { - content: "\f1ac"; -} -.fa-building:before { - content: "\f1ad"; -} -.fa-child:before { - content: "\f1ae"; -} -.fa-paw:before { - content: "\f1b0"; -} -.fa-spoon:before { - content: "\f1b1"; -} -.fa-cube:before { - content: "\f1b2"; -} -.fa-cubes:before { - content: "\f1b3"; -} -.fa-behance:before { - content: "\f1b4"; -} -.fa-behance-square:before { - content: "\f1b5"; -} -.fa-steam:before { - content: "\f1b6"; -} -.fa-steam-square:before { - content: "\f1b7"; -} -.fa-recycle:before { - content: "\f1b8"; -} -.fa-automobile:before, -.fa-car:before { - content: "\f1b9"; -} -.fa-cab:before, -.fa-taxi:before { - content: "\f1ba"; -} -.fa-tree:before { - content: "\f1bb"; -} -.fa-spotify:before { - content: "\f1bc"; -} -.fa-deviantart:before { - content: "\f1bd"; -} -.fa-soundcloud:before { - content: "\f1be"; -} -.fa-database:before { - content: "\f1c0"; -} -.fa-file-pdf-o:before { - content: "\f1c1"; -} -.fa-file-word-o:before { - content: "\f1c2"; -} -.fa-file-excel-o:before { - content: "\f1c3"; -} -.fa-file-powerpoint-o:before { - content: "\f1c4"; -} -.fa-file-photo-o:before, -.fa-file-picture-o:before, -.fa-file-image-o:before { - content: "\f1c5"; -} -.fa-file-zip-o:before, -.fa-file-archive-o:before { - content: "\f1c6"; -} -.fa-file-sound-o:before, -.fa-file-audio-o:before { - content: "\f1c7"; -} -.fa-file-movie-o:before, -.fa-file-video-o:before { - content: "\f1c8"; -} -.fa-file-code-o:before { - content: "\f1c9"; -} -.fa-vine:before { - content: "\f1ca"; -} -.fa-codepen:before { - content: "\f1cb"; -} -.fa-jsfiddle:before { - content: "\f1cc"; -} -.fa-life-bouy:before, -.fa-life-buoy:before, -.fa-life-saver:before, -.fa-support:before, -.fa-life-ring:before { - content: "\f1cd"; -} -.fa-circle-o-notch:before { - content: "\f1ce"; -} -.fa-ra:before, -.fa-rebel:before { - content: "\f1d0"; -} -.fa-ge:before, -.fa-empire:before { - content: "\f1d1"; -} -.fa-git-square:before { - content: "\f1d2"; -} -.fa-git:before { - content: "\f1d3"; -} -.fa-hacker-news:before { - content: "\f1d4"; -} -.fa-tencent-weibo:before { - content: "\f1d5"; -} -.fa-qq:before { - content: "\f1d6"; -} -.fa-wechat:before, -.fa-weixin:before { - content: "\f1d7"; -} -.fa-send:before, -.fa-paper-plane:before { - content: "\f1d8"; -} -.fa-send-o:before, -.fa-paper-plane-o:before { - content: "\f1d9"; -} -.fa-history:before { - content: "\f1da"; -} -.fa-circle-thin:before { - content: "\f1db"; -} -.fa-header:before { - content: "\f1dc"; -} -.fa-paragraph:before { - content: "\f1dd"; -} -.fa-sliders:before { - content: "\f1de"; -} -.fa-share-alt:before { - content: "\f1e0"; -} -.fa-share-alt-square:before { - content: "\f1e1"; -} -.fa-bomb:before { - content: "\f1e2"; -} -.fa-soccer-ball-o:before, -.fa-futbol-o:before { - content: "\f1e3"; -} -.fa-tty:before { - content: "\f1e4"; -} -.fa-binoculars:before { - content: "\f1e5"; -} -.fa-plug:before { - content: "\f1e6"; -} -.fa-slideshare:before { - content: "\f1e7"; -} -.fa-twitch:before { - content: "\f1e8"; -} -.fa-yelp:before { - content: "\f1e9"; -} -.fa-newspaper-o:before { - content: "\f1ea"; -} -.fa-wifi:before { - content: "\f1eb"; -} -.fa-calculator:before { - content: "\f1ec"; -} -.fa-paypal:before { - content: "\f1ed"; -} -.fa-google-wallet:before { - content: "\f1ee"; -} -.fa-cc-visa:before { - content: "\f1f0"; -} -.fa-cc-mastercard:before { - content: "\f1f1"; -} -.fa-cc-discover:before { - content: "\f1f2"; -} -.fa-cc-amex:before { - content: "\f1f3"; -} -.fa-cc-paypal:before { - content: "\f1f4"; -} -.fa-cc-stripe:before { - content: "\f1f5"; -} -.fa-bell-slash:before { - content: "\f1f6"; -} -.fa-bell-slash-o:before { - content: "\f1f7"; -} -.fa-trash:before { - content: "\f1f8"; -} -.fa-copyright:before { - content: "\f1f9"; -} -.fa-at:before { - content: "\f1fa"; -} -.fa-eyedropper:before { - content: "\f1fb"; -} -.fa-paint-brush:before { - content: "\f1fc"; -} -.fa-birthday-cake:before { - content: "\f1fd"; -} -.fa-area-chart:before { - content: "\f1fe"; -} -.fa-pie-chart:before { - content: "\f200"; -} -.fa-line-chart:before { - content: "\f201"; -} -.fa-lastfm:before { - content: "\f202"; -} -.fa-lastfm-square:before { - content: "\f203"; -} -.fa-toggle-off:before { - content: "\f204"; -} -.fa-toggle-on:before { - content: "\f205"; -} -.fa-bicycle:before { - content: "\f206"; -} -.fa-bus:before { - content: "\f207"; -} -.fa-ioxhost:before { - content: "\f208"; -} -.fa-angellist:before { - content: "\f209"; -} -.fa-cc:before { - content: "\f20a"; -} -.fa-shekel:before, -.fa-sheqel:before, -.fa-ils:before { - content: "\f20b"; -} -.fa-meanpath:before { - content: "\f20c"; -} DELETED cgisetup/www/css/fonts/font-awesome-4.2.0/css/font-awesome.min.css Index: cgisetup/www/css/fonts/font-awesome-4.2.0/css/font-awesome.min.css ================================================================== --- cgisetup/www/css/fonts/font-awesome-4.2.0/css/font-awesome.min.css +++ /dev/null @@ -1,4 +0,0 @@ -/*! - * Font Awesome 4.2.0 by @davegandy - http://fontawesome.io - @fontawesome - * License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License) - */@font-face{font-family:'FontAwesome';src:url('../fonts/fontawesome-webfont.eot?v=4.2.0');src:url('../fonts/fontawesome-webfont.eot?#iefix&v=4.2.0') format('embedded-opentype'),url('../fonts/fontawesome-webfont.woff?v=4.2.0') format('woff'),url('../fonts/fontawesome-webfont.ttf?v=4.2.0') format('truetype'),url('../fonts/fontawesome-webfont.svg?v=4.2.0#fontawesomeregular') format('svg');font-weight:normal;font-style:normal}.fa{display:inline-block;font:normal normal normal 14px/1 FontAwesome;font-size:inherit;text-rendering:auto;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.fa-lg{font-size:1.33333333em;line-height:.75em;vertical-align:-15%}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-fw{width:1.28571429em;text-align:center}.fa-ul{padding-left:0;margin-left:2.14285714em;list-style-type:none}.fa-ul>li{position:relative}.fa-li{position:absolute;left:-2.14285714em;width:2.14285714em;top:.14285714em;text-align:center}.fa-li.fa-lg{left:-1.85714286em}.fa-border{padding:.2em .25em .15em;border:solid .08em #eee;border-radius:.1em}.pull-right{float:right}.pull-left{float:left}.fa.pull-left{margin-right:.3em}.fa.pull-right{margin-left:.3em}.fa-spin{-webkit-animation:fa-spin 2s infinite linear;animation:fa-spin 2s infinite linear}@-webkit-keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}.fa-rotate-90{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=1);-webkit-transform:rotate(90deg);-ms-transform:rotate(90deg);transform:rotate(90deg)}.fa-rotate-180{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2);-webkit-transform:rotate(180deg);-ms-transform:rotate(180deg);transform:rotate(180deg)}.fa-rotate-270{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=3);-webkit-transform:rotate(270deg);-ms-transform:rotate(270deg);transform:rotate(270deg)}.fa-flip-horizontal{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1);-webkit-transform:scale(-1, 1);-ms-transform:scale(-1, 1);transform:scale(-1, 1)}.fa-flip-vertical{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1);-webkit-transform:scale(1, -1);-ms-transform:scale(1, -1);transform:scale(1, -1)}:root .fa-rotate-90,:root .fa-rotate-180,:root .fa-rotate-270,:root .fa-flip-horizontal,:root .fa-flip-vertical{filter:none}.fa-stack{position:relative;display:inline-block;width:2em;height:2em;line-height:2em;vertical-align:middle}.fa-stack-1x,.fa-stack-2x{position:absolute;left:0;width:100%;text-align:center}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-inverse{color:#fff}.fa-glass:before{content:"\f000"}.fa-music:before{content:"\f001"}.fa-search:before{content:"\f002"}.fa-envelope-o:before{content:"\f003"}.fa-heart:before{content:"\f004"}.fa-star:before{content:"\f005"}.fa-star-o:before{content:"\f006"}.fa-user:before{content:"\f007"}.fa-film:before{content:"\f008"}.fa-th-large:before{content:"\f009"}.fa-th:before{content:"\f00a"}.fa-th-list:before{content:"\f00b"}.fa-check:before{content:"\f00c"}.fa-remove:before,.fa-close:before,.fa-times:before{content:"\f00d"}.fa-search-plus:before{content:"\f00e"}.fa-search-minus:before{content:"\f010"}.fa-power-off:before{content:"\f011"}.fa-signal:before{content:"\f012"}.fa-gear:before,.fa-cog:before{content:"\f013"}.fa-trash-o:before{content:"\f014"}.fa-home:before{content:"\f015"}.fa-file-o:before{content:"\f016"}.fa-clock-o:before{content:"\f017"}.fa-road:before{content:"\f018"}.fa-download:before{content:"\f019"}.fa-arrow-circle-o-down:before{content:"\f01a"}.fa-arrow-circle-o-up:before{content:"\f01b"}.fa-inbox:before{content:"\f01c"}.fa-play-circle-o:before{content:"\f01d"}.fa-rotate-right:before,.fa-repeat:before{content:"\f01e"}.fa-refresh:before{content:"\f021"}.fa-list-alt:before{content:"\f022"}.fa-lock:before{content:"\f023"}.fa-flag:before{content:"\f024"}.fa-headphones:before{content:"\f025"}.fa-volume-off:before{content:"\f026"}.fa-volume-down:before{content:"\f027"}.fa-volume-up:before{content:"\f028"}.fa-qrcode:before{content:"\f029"}.fa-barcode:before{content:"\f02a"}.fa-tag:before{content:"\f02b"}.fa-tags:before{content:"\f02c"}.fa-book:before{content:"\f02d"}.fa-bookmark:before{content:"\f02e"}.fa-print:before{content:"\f02f"}.fa-camera:before{content:"\f030"}.fa-font:before{content:"\f031"}.fa-bold:before{content:"\f032"}.fa-italic:before{content:"\f033"}.fa-text-height:before{content:"\f034"}.fa-text-width:before{content:"\f035"}.fa-align-left:before{content:"\f036"}.fa-align-center:before{content:"\f037"}.fa-align-right:before{content:"\f038"}.fa-align-justify:before{content:"\f039"}.fa-list:before{content:"\f03a"}.fa-dedent:before,.fa-outdent:before{content:"\f03b"}.fa-indent:before{content:"\f03c"}.fa-video-camera:before{content:"\f03d"}.fa-photo:before,.fa-image:before,.fa-picture-o:before{content:"\f03e"}.fa-pencil:before{content:"\f040"}.fa-map-marker:before{content:"\f041"}.fa-adjust:before{content:"\f042"}.fa-tint:before{content:"\f043"}.fa-edit:before,.fa-pencil-square-o:before{content:"\f044"}.fa-share-square-o:before{content:"\f045"}.fa-check-square-o:before{content:"\f046"}.fa-arrows:before{content:"\f047"}.fa-step-backward:before{content:"\f048"}.fa-fast-backward:before{content:"\f049"}.fa-backward:before{content:"\f04a"}.fa-play:before{content:"\f04b"}.fa-pause:before{content:"\f04c"}.fa-stop:before{content:"\f04d"}.fa-forward:before{content:"\f04e"}.fa-fast-forward:before{content:"\f050"}.fa-step-forward:before{content:"\f051"}.fa-eject:before{content:"\f052"}.fa-chevron-left:before{content:"\f053"}.fa-chevron-right:before{content:"\f054"}.fa-plus-circle:before{content:"\f055"}.fa-minus-circle:before{content:"\f056"}.fa-times-circle:before{content:"\f057"}.fa-check-circle:before{content:"\f058"}.fa-question-circle:before{content:"\f059"}.fa-info-circle:before{content:"\f05a"}.fa-crosshairs:before{content:"\f05b"}.fa-times-circle-o:before{content:"\f05c"}.fa-check-circle-o:before{content:"\f05d"}.fa-ban:before{content:"\f05e"}.fa-arrow-left:before{content:"\f060"}.fa-arrow-right:before{content:"\f061"}.fa-arrow-up:before{content:"\f062"}.fa-arrow-down:before{content:"\f063"}.fa-mail-forward:before,.fa-share:before{content:"\f064"}.fa-expand:before{content:"\f065"}.fa-compress:before{content:"\f066"}.fa-plus:before{content:"\f067"}.fa-minus:before{content:"\f068"}.fa-asterisk:before{content:"\f069"}.fa-exclamation-circle:before{content:"\f06a"}.fa-gift:before{content:"\f06b"}.fa-leaf:before{content:"\f06c"}.fa-fire:before{content:"\f06d"}.fa-eye:before{content:"\f06e"}.fa-eye-slash:before{content:"\f070"}.fa-warning:before,.fa-exclamation-triangle:before{content:"\f071"}.fa-plane:before{content:"\f072"}.fa-calendar:before{content:"\f073"}.fa-random:before{content:"\f074"}.fa-comment:before{content:"\f075"}.fa-magnet:before{content:"\f076"}.fa-chevron-up:before{content:"\f077"}.fa-chevron-down:before{content:"\f078"}.fa-retweet:before{content:"\f079"}.fa-shopping-cart:before{content:"\f07a"}.fa-folder:before{content:"\f07b"}.fa-folder-open:before{content:"\f07c"}.fa-arrows-v:before{content:"\f07d"}.fa-arrows-h:before{content:"\f07e"}.fa-bar-chart-o:before,.fa-bar-chart:before{content:"\f080"}.fa-twitter-square:before{content:"\f081"}.fa-facebook-square:before{content:"\f082"}.fa-camera-retro:before{content:"\f083"}.fa-key:before{content:"\f084"}.fa-gears:before,.fa-cogs:before{content:"\f085"}.fa-comments:before{content:"\f086"}.fa-thumbs-o-up:before{content:"\f087"}.fa-thumbs-o-down:before{content:"\f088"}.fa-star-half:before{content:"\f089"}.fa-heart-o:before{content:"\f08a"}.fa-sign-out:before{content:"\f08b"}.fa-linkedin-square:before{content:"\f08c"}.fa-thumb-tack:before{content:"\f08d"}.fa-external-link:before{content:"\f08e"}.fa-sign-in:before{content:"\f090"}.fa-trophy:before{content:"\f091"}.fa-github-square:before{content:"\f092"}.fa-upload:before{content:"\f093"}.fa-lemon-o:before{content:"\f094"}.fa-phone:before{content:"\f095"}.fa-square-o:before{content:"\f096"}.fa-bookmark-o:before{content:"\f097"}.fa-phone-square:before{content:"\f098"}.fa-twitter:before{content:"\f099"}.fa-facebook:before{content:"\f09a"}.fa-github:before{content:"\f09b"}.fa-unlock:before{content:"\f09c"}.fa-credit-card:before{content:"\f09d"}.fa-rss:before{content:"\f09e"}.fa-hdd-o:before{content:"\f0a0"}.fa-bullhorn:before{content:"\f0a1"}.fa-bell:before{content:"\f0f3"}.fa-certificate:before{content:"\f0a3"}.fa-hand-o-right:before{content:"\f0a4"}.fa-hand-o-left:before{content:"\f0a5"}.fa-hand-o-up:before{content:"\f0a6"}.fa-hand-o-down:before{content:"\f0a7"}.fa-arrow-circle-left:before{content:"\f0a8"}.fa-arrow-circle-right:before{content:"\f0a9"}.fa-arrow-circle-up:before{content:"\f0aa"}.fa-arrow-circle-down:before{content:"\f0ab"}.fa-globe:before{content:"\f0ac"}.fa-wrench:before{content:"\f0ad"}.fa-tasks:before{content:"\f0ae"}.fa-filter:before{content:"\f0b0"}.fa-briefcase:before{content:"\f0b1"}.fa-arrows-alt:before{content:"\f0b2"}.fa-group:before,.fa-users:before{content:"\f0c0"}.fa-chain:before,.fa-link:before{content:"\f0c1"}.fa-cloud:before{content:"\f0c2"}.fa-flask:before{content:"\f0c3"}.fa-cut:before,.fa-scissors:before{content:"\f0c4"}.fa-copy:before,.fa-files-o:before{content:"\f0c5"}.fa-paperclip:before{content:"\f0c6"}.fa-save:before,.fa-floppy-o:before{content:"\f0c7"}.fa-square:before{content:"\f0c8"}.fa-navicon:before,.fa-reorder:before,.fa-bars:before{content:"\f0c9"}.fa-list-ul:before{content:"\f0ca"}.fa-list-ol:before{content:"\f0cb"}.fa-strikethrough:before{content:"\f0cc"}.fa-underline:before{content:"\f0cd"}.fa-table:before{content:"\f0ce"}.fa-magic:before{content:"\f0d0"}.fa-truck:before{content:"\f0d1"}.fa-pinterest:before{content:"\f0d2"}.fa-pinterest-square:before{content:"\f0d3"}.fa-google-plus-square:before{content:"\f0d4"}.fa-google-plus:before{content:"\f0d5"}.fa-money:before{content:"\f0d6"}.fa-caret-down:before{content:"\f0d7"}.fa-caret-up:before{content:"\f0d8"}.fa-caret-left:before{content:"\f0d9"}.fa-caret-right:before{content:"\f0da"}.fa-columns:before{content:"\f0db"}.fa-unsorted:before,.fa-sort:before{content:"\f0dc"}.fa-sort-down:before,.fa-sort-desc:before{content:"\f0dd"}.fa-sort-up:before,.fa-sort-asc:before{content:"\f0de"}.fa-envelope:before{content:"\f0e0"}.fa-linkedin:before{content:"\f0e1"}.fa-rotate-left:before,.fa-undo:before{content:"\f0e2"}.fa-legal:before,.fa-gavel:before{content:"\f0e3"}.fa-dashboard:before,.fa-tachometer:before{content:"\f0e4"}.fa-comment-o:before{content:"\f0e5"}.fa-comments-o:before{content:"\f0e6"}.fa-flash:before,.fa-bolt:before{content:"\f0e7"}.fa-sitemap:before{content:"\f0e8"}.fa-umbrella:before{content:"\f0e9"}.fa-paste:before,.fa-clipboard:before{content:"\f0ea"}.fa-lightbulb-o:before{content:"\f0eb"}.fa-exchange:before{content:"\f0ec"}.fa-cloud-download:before{content:"\f0ed"}.fa-cloud-upload:before{content:"\f0ee"}.fa-user-md:before{content:"\f0f0"}.fa-stethoscope:before{content:"\f0f1"}.fa-suitcase:before{content:"\f0f2"}.fa-bell-o:before{content:"\f0a2"}.fa-coffee:before{content:"\f0f4"}.fa-cutlery:before{content:"\f0f5"}.fa-file-text-o:before{content:"\f0f6"}.fa-building-o:before{content:"\f0f7"}.fa-hospital-o:before{content:"\f0f8"}.fa-ambulance:before{content:"\f0f9"}.fa-medkit:before{content:"\f0fa"}.fa-fighter-jet:before{content:"\f0fb"}.fa-beer:before{content:"\f0fc"}.fa-h-square:before{content:"\f0fd"}.fa-plus-square:before{content:"\f0fe"}.fa-angle-double-left:before{content:"\f100"}.fa-angle-double-right:before{content:"\f101"}.fa-angle-double-up:before{content:"\f102"}.fa-angle-double-down:before{content:"\f103"}.fa-angle-left:before{content:"\f104"}.fa-angle-right:before{content:"\f105"}.fa-angle-up:before{content:"\f106"}.fa-angle-down:before{content:"\f107"}.fa-desktop:before{content:"\f108"}.fa-laptop:before{content:"\f109"}.fa-tablet:before{content:"\f10a"}.fa-mobile-phone:before,.fa-mobile:before{content:"\f10b"}.fa-circle-o:before{content:"\f10c"}.fa-quote-left:before{content:"\f10d"}.fa-quote-right:before{content:"\f10e"}.fa-spinner:before{content:"\f110"}.fa-circle:before{content:"\f111"}.fa-mail-reply:before,.fa-reply:before{content:"\f112"}.fa-github-alt:before{content:"\f113"}.fa-folder-o:before{content:"\f114"}.fa-folder-open-o:before{content:"\f115"}.fa-smile-o:before{content:"\f118"}.fa-frown-o:before{content:"\f119"}.fa-meh-o:before{content:"\f11a"}.fa-gamepad:before{content:"\f11b"}.fa-keyboard-o:before{content:"\f11c"}.fa-flag-o:before{content:"\f11d"}.fa-flag-checkered:before{content:"\f11e"}.fa-terminal:before{content:"\f120"}.fa-code:before{content:"\f121"}.fa-mail-reply-all:before,.fa-reply-all:before{content:"\f122"}.fa-star-half-empty:before,.fa-star-half-full:before,.fa-star-half-o:before{content:"\f123"}.fa-location-arrow:before{content:"\f124"}.fa-crop:before{content:"\f125"}.fa-code-fork:before{content:"\f126"}.fa-unlink:before,.fa-chain-broken:before{content:"\f127"}.fa-question:before{content:"\f128"}.fa-info:before{content:"\f129"}.fa-exclamation:before{content:"\f12a"}.fa-superscript:before{content:"\f12b"}.fa-subscript:before{content:"\f12c"}.fa-eraser:before{content:"\f12d"}.fa-puzzle-piece:before{content:"\f12e"}.fa-microphone:before{content:"\f130"}.fa-microphone-slash:before{content:"\f131"}.fa-shield:before{content:"\f132"}.fa-calendar-o:before{content:"\f133"}.fa-fire-extinguisher:before{content:"\f134"}.fa-rocket:before{content:"\f135"}.fa-maxcdn:before{content:"\f136"}.fa-chevron-circle-left:before{content:"\f137"}.fa-chevron-circle-right:before{content:"\f138"}.fa-chevron-circle-up:before{content:"\f139"}.fa-chevron-circle-down:before{content:"\f13a"}.fa-html5:before{content:"\f13b"}.fa-css3:before{content:"\f13c"}.fa-anchor:before{content:"\f13d"}.fa-unlock-alt:before{content:"\f13e"}.fa-bullseye:before{content:"\f140"}.fa-ellipsis-h:before{content:"\f141"}.fa-ellipsis-v:before{content:"\f142"}.fa-rss-square:before{content:"\f143"}.fa-play-circle:before{content:"\f144"}.fa-ticket:before{content:"\f145"}.fa-minus-square:before{content:"\f146"}.fa-minus-square-o:before{content:"\f147"}.fa-level-up:before{content:"\f148"}.fa-level-down:before{content:"\f149"}.fa-check-square:before{content:"\f14a"}.fa-pencil-square:before{content:"\f14b"}.fa-external-link-square:before{content:"\f14c"}.fa-share-square:before{content:"\f14d"}.fa-compass:before{content:"\f14e"}.fa-toggle-down:before,.fa-caret-square-o-down:before{content:"\f150"}.fa-toggle-up:before,.fa-caret-square-o-up:before{content:"\f151"}.fa-toggle-right:before,.fa-caret-square-o-right:before{content:"\f152"}.fa-euro:before,.fa-eur:before{content:"\f153"}.fa-gbp:before{content:"\f154"}.fa-dollar:before,.fa-usd:before{content:"\f155"}.fa-rupee:before,.fa-inr:before{content:"\f156"}.fa-cny:before,.fa-rmb:before,.fa-yen:before,.fa-jpy:before{content:"\f157"}.fa-ruble:before,.fa-rouble:before,.fa-rub:before{content:"\f158"}.fa-won:before,.fa-krw:before{content:"\f159"}.fa-bitcoin:before,.fa-btc:before{content:"\f15a"}.fa-file:before{content:"\f15b"}.fa-file-text:before{content:"\f15c"}.fa-sort-alpha-asc:before{content:"\f15d"}.fa-sort-alpha-desc:before{content:"\f15e"}.fa-sort-amount-asc:before{content:"\f160"}.fa-sort-amount-desc:before{content:"\f161"}.fa-sort-numeric-asc:before{content:"\f162"}.fa-sort-numeric-desc:before{content:"\f163"}.fa-thumbs-up:before{content:"\f164"}.fa-thumbs-down:before{content:"\f165"}.fa-youtube-square:before{content:"\f166"}.fa-youtube:before{content:"\f167"}.fa-xing:before{content:"\f168"}.fa-xing-square:before{content:"\f169"}.fa-youtube-play:before{content:"\f16a"}.fa-dropbox:before{content:"\f16b"}.fa-stack-overflow:before{content:"\f16c"}.fa-instagram:before{content:"\f16d"}.fa-flickr:before{content:"\f16e"}.fa-adn:before{content:"\f170"}.fa-bitbucket:before{content:"\f171"}.fa-bitbucket-square:before{content:"\f172"}.fa-tumblr:before{content:"\f173"}.fa-tumblr-square:before{content:"\f174"}.fa-long-arrow-down:before{content:"\f175"}.fa-long-arrow-up:before{content:"\f176"}.fa-long-arrow-left:before{content:"\f177"}.fa-long-arrow-right:before{content:"\f178"}.fa-apple:before{content:"\f179"}.fa-windows:before{content:"\f17a"}.fa-android:before{content:"\f17b"}.fa-linux:before{content:"\f17c"}.fa-dribbble:before{content:"\f17d"}.fa-skype:before{content:"\f17e"}.fa-foursquare:before{content:"\f180"}.fa-trello:before{content:"\f181"}.fa-female:before{content:"\f182"}.fa-male:before{content:"\f183"}.fa-gittip:before{content:"\f184"}.fa-sun-o:before{content:"\f185"}.fa-moon-o:before{content:"\f186"}.fa-archive:before{content:"\f187"}.fa-bug:before{content:"\f188"}.fa-vk:before{content:"\f189"}.fa-weibo:before{content:"\f18a"}.fa-renren:before{content:"\f18b"}.fa-pagelines:before{content:"\f18c"}.fa-stack-exchange:before{content:"\f18d"}.fa-arrow-circle-o-right:before{content:"\f18e"}.fa-arrow-circle-o-left:before{content:"\f190"}.fa-toggle-left:before,.fa-caret-square-o-left:before{content:"\f191"}.fa-dot-circle-o:before{content:"\f192"}.fa-wheelchair:before{content:"\f193"}.fa-vimeo-square:before{content:"\f194"}.fa-turkish-lira:before,.fa-try:before{content:"\f195"}.fa-plus-square-o:before{content:"\f196"}.fa-space-shuttle:before{content:"\f197"}.fa-slack:before{content:"\f198"}.fa-envelope-square:before{content:"\f199"}.fa-wordpress:before{content:"\f19a"}.fa-openid:before{content:"\f19b"}.fa-institution:before,.fa-bank:before,.fa-university:before{content:"\f19c"}.fa-mortar-board:before,.fa-graduation-cap:before{content:"\f19d"}.fa-yahoo:before{content:"\f19e"}.fa-google:before{content:"\f1a0"}.fa-reddit:before{content:"\f1a1"}.fa-reddit-square:before{content:"\f1a2"}.fa-stumbleupon-circle:before{content:"\f1a3"}.fa-stumbleupon:before{content:"\f1a4"}.fa-delicious:before{content:"\f1a5"}.fa-digg:before{content:"\f1a6"}.fa-pied-piper:before{content:"\f1a7"}.fa-pied-piper-alt:before{content:"\f1a8"}.fa-drupal:before{content:"\f1a9"}.fa-joomla:before{content:"\f1aa"}.fa-language:before{content:"\f1ab"}.fa-fax:before{content:"\f1ac"}.fa-building:before{content:"\f1ad"}.fa-child:before{content:"\f1ae"}.fa-paw:before{content:"\f1b0"}.fa-spoon:before{content:"\f1b1"}.fa-cube:before{content:"\f1b2"}.fa-cubes:before{content:"\f1b3"}.fa-behance:before{content:"\f1b4"}.fa-behance-square:before{content:"\f1b5"}.fa-steam:before{content:"\f1b6"}.fa-steam-square:before{content:"\f1b7"}.fa-recycle:before{content:"\f1b8"}.fa-automobile:before,.fa-car:before{content:"\f1b9"}.fa-cab:before,.fa-taxi:before{content:"\f1ba"}.fa-tree:before{content:"\f1bb"}.fa-spotify:before{content:"\f1bc"}.fa-deviantart:before{content:"\f1bd"}.fa-soundcloud:before{content:"\f1be"}.fa-database:before{content:"\f1c0"}.fa-file-pdf-o:before{content:"\f1c1"}.fa-file-word-o:before{content:"\f1c2"}.fa-file-excel-o:before{content:"\f1c3"}.fa-file-powerpoint-o:before{content:"\f1c4"}.fa-file-photo-o:before,.fa-file-picture-o:before,.fa-file-image-o:before{content:"\f1c5"}.fa-file-zip-o:before,.fa-file-archive-o:before{content:"\f1c6"}.fa-file-sound-o:before,.fa-file-audio-o:before{content:"\f1c7"}.fa-file-movie-o:before,.fa-file-video-o:before{content:"\f1c8"}.fa-file-code-o:before{content:"\f1c9"}.fa-vine:before{content:"\f1ca"}.fa-codepen:before{content:"\f1cb"}.fa-jsfiddle:before{content:"\f1cc"}.fa-life-bouy:before,.fa-life-buoy:before,.fa-life-saver:before,.fa-support:before,.fa-life-ring:before{content:"\f1cd"}.fa-circle-o-notch:before{content:"\f1ce"}.fa-ra:before,.fa-rebel:before{content:"\f1d0"}.fa-ge:before,.fa-empire:before{content:"\f1d1"}.fa-git-square:before{content:"\f1d2"}.fa-git:before{content:"\f1d3"}.fa-hacker-news:before{content:"\f1d4"}.fa-tencent-weibo:before{content:"\f1d5"}.fa-qq:before{content:"\f1d6"}.fa-wechat:before,.fa-weixin:before{content:"\f1d7"}.fa-send:before,.fa-paper-plane:before{content:"\f1d8"}.fa-send-o:before,.fa-paper-plane-o:before{content:"\f1d9"}.fa-history:before{content:"\f1da"}.fa-circle-thin:before{content:"\f1db"}.fa-header:before{content:"\f1dc"}.fa-paragraph:before{content:"\f1dd"}.fa-sliders:before{content:"\f1de"}.fa-share-alt:before{content:"\f1e0"}.fa-share-alt-square:before{content:"\f1e1"}.fa-bomb:before{content:"\f1e2"}.fa-soccer-ball-o:before,.fa-futbol-o:before{content:"\f1e3"}.fa-tty:before{content:"\f1e4"}.fa-binoculars:before{content:"\f1e5"}.fa-plug:before{content:"\f1e6"}.fa-slideshare:before{content:"\f1e7"}.fa-twitch:before{content:"\f1e8"}.fa-yelp:before{content:"\f1e9"}.fa-newspaper-o:before{content:"\f1ea"}.fa-wifi:before{content:"\f1eb"}.fa-calculator:before{content:"\f1ec"}.fa-paypal:before{content:"\f1ed"}.fa-google-wallet:before{content:"\f1ee"}.fa-cc-visa:before{content:"\f1f0"}.fa-cc-mastercard:before{content:"\f1f1"}.fa-cc-discover:before{content:"\f1f2"}.fa-cc-amex:before{content:"\f1f3"}.fa-cc-paypal:before{content:"\f1f4"}.fa-cc-stripe:before{content:"\f1f5"}.fa-bell-slash:before{content:"\f1f6"}.fa-bell-slash-o:before{content:"\f1f7"}.fa-trash:before{content:"\f1f8"}.fa-copyright:before{content:"\f1f9"}.fa-at:before{content:"\f1fa"}.fa-eyedropper:before{content:"\f1fb"}.fa-paint-brush:before{content:"\f1fc"}.fa-birthday-cake:before{content:"\f1fd"}.fa-area-chart:before{content:"\f1fe"}.fa-pie-chart:before{content:"\f200"}.fa-line-chart:before{content:"\f201"}.fa-lastfm:before{content:"\f202"}.fa-lastfm-square:before{content:"\f203"}.fa-toggle-off:before{content:"\f204"}.fa-toggle-on:before{content:"\f205"}.fa-bicycle:before{content:"\f206"}.fa-bus:before{content:"\f207"}.fa-ioxhost:before{content:"\f208"}.fa-angellist:before{content:"\f209"}.fa-cc:before{content:"\f20a"}.fa-shekel:before,.fa-sheqel:before,.fa-ils:before{content:"\f20b"}.fa-meanpath:before{content:"\f20c"} DELETED cgisetup/www/css/fonts/font-awesome-4.2.0/fonts/FontAwesome.otf Index: cgisetup/www/css/fonts/font-awesome-4.2.0/fonts/FontAwesome.otf ================================================================== --- cgisetup/www/css/fonts/font-awesome-4.2.0/fonts/FontAwesome.otf +++ /dev/null cannot compute difference between binary files DELETED cgisetup/www/css/fonts/font-awesome-4.2.0/fonts/fontawesome-webfont.eot Index: cgisetup/www/css/fonts/font-awesome-4.2.0/fonts/fontawesome-webfont.eot ================================================================== --- cgisetup/www/css/fonts/font-awesome-4.2.0/fonts/fontawesome-webfont.eot +++ /dev/null cannot compute difference between binary files DELETED cgisetup/www/css/fonts/font-awesome-4.2.0/fonts/fontawesome-webfont.svg Index: cgisetup/www/css/fonts/font-awesome-4.2.0/fonts/fontawesome-webfont.svg ================================================================== --- cgisetup/www/css/fonts/font-awesome-4.2.0/fonts/fontawesome-webfont.svg +++ /dev/null @@ -1,520 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - DELETED cgisetup/www/css/fonts/font-awesome-4.2.0/fonts/fontawesome-webfont.ttf Index: cgisetup/www/css/fonts/font-awesome-4.2.0/fonts/fontawesome-webfont.ttf ================================================================== --- cgisetup/www/css/fonts/font-awesome-4.2.0/fonts/fontawesome-webfont.ttf +++ /dev/null cannot compute difference between binary files DELETED cgisetup/www/css/fonts/font-awesome-4.2.0/fonts/fontawesome-webfont.woff Index: cgisetup/www/css/fonts/font-awesome-4.2.0/fonts/fontawesome-webfont.woff ================================================================== --- cgisetup/www/css/fonts/font-awesome-4.2.0/fonts/fontawesome-webfont.woff +++ /dev/null cannot compute difference between binary files DELETED cgisetup/www/css/fonts/font-awesome-4.2.0/less/bordered-pulled.less Index: cgisetup/www/css/fonts/font-awesome-4.2.0/less/bordered-pulled.less ================================================================== --- cgisetup/www/css/fonts/font-awesome-4.2.0/less/bordered-pulled.less +++ /dev/null @@ -1,16 +0,0 @@ -// Bordered & Pulled -// ------------------------- - -.@{fa-css-prefix}-border { - padding: .2em .25em .15em; - border: solid .08em @fa-border-color; - border-radius: .1em; -} - -.pull-right { float: right; } -.pull-left { float: left; } - -.@{fa-css-prefix} { - &.pull-left { margin-right: .3em; } - &.pull-right { margin-left: .3em; } -} DELETED cgisetup/www/css/fonts/font-awesome-4.2.0/less/core.less Index: cgisetup/www/css/fonts/font-awesome-4.2.0/less/core.less ================================================================== --- cgisetup/www/css/fonts/font-awesome-4.2.0/less/core.less +++ /dev/null @@ -1,11 +0,0 @@ -// Base Class Definition -// ------------------------- - -.@{fa-css-prefix} { - display: inline-block; - font: normal normal normal 14px/1 FontAwesome; // shortening font declaration - font-size: inherit; // can't have font-size inherit on line above, so need to override - text-rendering: auto; // optimizelegibility throws things off #1094 - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; -} DELETED cgisetup/www/css/fonts/font-awesome-4.2.0/less/fixed-width.less Index: cgisetup/www/css/fonts/font-awesome-4.2.0/less/fixed-width.less ================================================================== --- cgisetup/www/css/fonts/font-awesome-4.2.0/less/fixed-width.less +++ /dev/null @@ -1,6 +0,0 @@ -// Fixed Width Icons -// ------------------------- -.@{fa-css-prefix}-fw { - width: (18em / 14); - text-align: center; -} DELETED cgisetup/www/css/fonts/font-awesome-4.2.0/less/font-awesome.less Index: cgisetup/www/css/fonts/font-awesome-4.2.0/less/font-awesome.less ================================================================== --- cgisetup/www/css/fonts/font-awesome-4.2.0/less/font-awesome.less +++ /dev/null @@ -1,17 +0,0 @@ -/*! - * Font Awesome 4.2.0 by @davegandy - http://fontawesome.io - @fontawesome - * License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License) - */ - -@import "variables.less"; -@import "mixins.less"; -@import "path.less"; -@import "core.less"; -@import "larger.less"; -@import "fixed-width.less"; -@import "list.less"; -@import "bordered-pulled.less"; -@import "spinning.less"; -@import "rotated-flipped.less"; -@import "stacked.less"; -@import "icons.less"; DELETED cgisetup/www/css/fonts/font-awesome-4.2.0/less/icons.less Index: cgisetup/www/css/fonts/font-awesome-4.2.0/less/icons.less ================================================================== --- cgisetup/www/css/fonts/font-awesome-4.2.0/less/icons.less +++ /dev/null @@ -1,552 +0,0 @@ -/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen - readers do not read off random characters that represent icons */ - -.@{fa-css-prefix}-glass:before { content: @fa-var-glass; } -.@{fa-css-prefix}-music:before { content: @fa-var-music; } -.@{fa-css-prefix}-search:before { content: @fa-var-search; } -.@{fa-css-prefix}-envelope-o:before { content: @fa-var-envelope-o; } -.@{fa-css-prefix}-heart:before { content: @fa-var-heart; } -.@{fa-css-prefix}-star:before { content: @fa-var-star; } -.@{fa-css-prefix}-star-o:before { content: @fa-var-star-o; } -.@{fa-css-prefix}-user:before { content: @fa-var-user; } -.@{fa-css-prefix}-film:before { content: @fa-var-film; } -.@{fa-css-prefix}-th-large:before { content: @fa-var-th-large; } -.@{fa-css-prefix}-th:before { content: @fa-var-th; } -.@{fa-css-prefix}-th-list:before { content: @fa-var-th-list; } -.@{fa-css-prefix}-check:before { content: @fa-var-check; } -.@{fa-css-prefix}-remove:before, -.@{fa-css-prefix}-close:before, -.@{fa-css-prefix}-times:before { content: @fa-var-times; } -.@{fa-css-prefix}-search-plus:before { content: @fa-var-search-plus; } -.@{fa-css-prefix}-search-minus:before { content: @fa-var-search-minus; } -.@{fa-css-prefix}-power-off:before { content: @fa-var-power-off; } -.@{fa-css-prefix}-signal:before { content: @fa-var-signal; } -.@{fa-css-prefix}-gear:before, -.@{fa-css-prefix}-cog:before { content: @fa-var-cog; } -.@{fa-css-prefix}-trash-o:before { content: @fa-var-trash-o; } -.@{fa-css-prefix}-home:before { content: @fa-var-home; } -.@{fa-css-prefix}-file-o:before { content: @fa-var-file-o; } -.@{fa-css-prefix}-clock-o:before { content: @fa-var-clock-o; } -.@{fa-css-prefix}-road:before { content: @fa-var-road; } -.@{fa-css-prefix}-download:before { content: @fa-var-download; } -.@{fa-css-prefix}-arrow-circle-o-down:before { content: @fa-var-arrow-circle-o-down; } -.@{fa-css-prefix}-arrow-circle-o-up:before { content: @fa-var-arrow-circle-o-up; } -.@{fa-css-prefix}-inbox:before { content: @fa-var-inbox; } -.@{fa-css-prefix}-play-circle-o:before { content: @fa-var-play-circle-o; } -.@{fa-css-prefix}-rotate-right:before, -.@{fa-css-prefix}-repeat:before { content: @fa-var-repeat; } -.@{fa-css-prefix}-refresh:before { content: @fa-var-refresh; } -.@{fa-css-prefix}-list-alt:before { content: @fa-var-list-alt; } -.@{fa-css-prefix}-lock:before { content: @fa-var-lock; } -.@{fa-css-prefix}-flag:before { content: @fa-var-flag; } -.@{fa-css-prefix}-headphones:before { content: @fa-var-headphones; } -.@{fa-css-prefix}-volume-off:before { content: @fa-var-volume-off; } -.@{fa-css-prefix}-volume-down:before { content: @fa-var-volume-down; } -.@{fa-css-prefix}-volume-up:before { content: @fa-var-volume-up; } -.@{fa-css-prefix}-qrcode:before { content: @fa-var-qrcode; } -.@{fa-css-prefix}-barcode:before { content: @fa-var-barcode; } -.@{fa-css-prefix}-tag:before { content: @fa-var-tag; } -.@{fa-css-prefix}-tags:before { content: @fa-var-tags; } -.@{fa-css-prefix}-book:before { content: @fa-var-book; } -.@{fa-css-prefix}-bookmark:before { content: @fa-var-bookmark; } -.@{fa-css-prefix}-print:before { content: @fa-var-print; } -.@{fa-css-prefix}-camera:before { content: @fa-var-camera; } -.@{fa-css-prefix}-font:before { content: @fa-var-font; } -.@{fa-css-prefix}-bold:before { content: @fa-var-bold; } -.@{fa-css-prefix}-italic:before { content: @fa-var-italic; } -.@{fa-css-prefix}-text-height:before { content: @fa-var-text-height; } -.@{fa-css-prefix}-text-width:before { content: @fa-var-text-width; } -.@{fa-css-prefix}-align-left:before { content: @fa-var-align-left; } -.@{fa-css-prefix}-align-center:before { content: @fa-var-align-center; } -.@{fa-css-prefix}-align-right:before { content: @fa-var-align-right; } -.@{fa-css-prefix}-align-justify:before { content: @fa-var-align-justify; } -.@{fa-css-prefix}-list:before { content: @fa-var-list; } -.@{fa-css-prefix}-dedent:before, -.@{fa-css-prefix}-outdent:before { content: @fa-var-outdent; } -.@{fa-css-prefix}-indent:before { content: @fa-var-indent; } -.@{fa-css-prefix}-video-camera:before { content: @fa-var-video-camera; } -.@{fa-css-prefix}-photo:before, -.@{fa-css-prefix}-image:before, -.@{fa-css-prefix}-picture-o:before { content: @fa-var-picture-o; } -.@{fa-css-prefix}-pencil:before { content: @fa-var-pencil; } -.@{fa-css-prefix}-map-marker:before { content: @fa-var-map-marker; } -.@{fa-css-prefix}-adjust:before { content: @fa-var-adjust; } -.@{fa-css-prefix}-tint:before { content: @fa-var-tint; } -.@{fa-css-prefix}-edit:before, -.@{fa-css-prefix}-pencil-square-o:before { content: @fa-var-pencil-square-o; } -.@{fa-css-prefix}-share-square-o:before { content: @fa-var-share-square-o; } -.@{fa-css-prefix}-check-square-o:before { content: @fa-var-check-square-o; } -.@{fa-css-prefix}-arrows:before { content: @fa-var-arrows; } -.@{fa-css-prefix}-step-backward:before { content: @fa-var-step-backward; } -.@{fa-css-prefix}-fast-backward:before { content: @fa-var-fast-backward; } -.@{fa-css-prefix}-backward:before { content: @fa-var-backward; } -.@{fa-css-prefix}-play:before { content: @fa-var-play; } -.@{fa-css-prefix}-pause:before { content: @fa-var-pause; } -.@{fa-css-prefix}-stop:before { content: @fa-var-stop; } -.@{fa-css-prefix}-forward:before { content: @fa-var-forward; } -.@{fa-css-prefix}-fast-forward:before { content: @fa-var-fast-forward; } -.@{fa-css-prefix}-step-forward:before { content: @fa-var-step-forward; } -.@{fa-css-prefix}-eject:before { content: @fa-var-eject; } -.@{fa-css-prefix}-chevron-left:before { content: @fa-var-chevron-left; } -.@{fa-css-prefix}-chevron-right:before { content: @fa-var-chevron-right; } -.@{fa-css-prefix}-plus-circle:before { content: @fa-var-plus-circle; } -.@{fa-css-prefix}-minus-circle:before { content: @fa-var-minus-circle; } -.@{fa-css-prefix}-times-circle:before { content: @fa-var-times-circle; } -.@{fa-css-prefix}-check-circle:before { content: @fa-var-check-circle; } -.@{fa-css-prefix}-question-circle:before { content: @fa-var-question-circle; } -.@{fa-css-prefix}-info-circle:before { content: @fa-var-info-circle; } -.@{fa-css-prefix}-crosshairs:before { content: @fa-var-crosshairs; } -.@{fa-css-prefix}-times-circle-o:before { content: @fa-var-times-circle-o; } -.@{fa-css-prefix}-check-circle-o:before { content: @fa-var-check-circle-o; } -.@{fa-css-prefix}-ban:before { content: @fa-var-ban; } -.@{fa-css-prefix}-arrow-left:before { content: @fa-var-arrow-left; } -.@{fa-css-prefix}-arrow-right:before { content: @fa-var-arrow-right; } -.@{fa-css-prefix}-arrow-up:before { content: @fa-var-arrow-up; } -.@{fa-css-prefix}-arrow-down:before { content: @fa-var-arrow-down; } -.@{fa-css-prefix}-mail-forward:before, -.@{fa-css-prefix}-share:before { content: @fa-var-share; } -.@{fa-css-prefix}-expand:before { content: @fa-var-expand; } -.@{fa-css-prefix}-compress:before { content: @fa-var-compress; } -.@{fa-css-prefix}-plus:before { content: @fa-var-plus; } -.@{fa-css-prefix}-minus:before { content: @fa-var-minus; } -.@{fa-css-prefix}-asterisk:before { content: @fa-var-asterisk; } -.@{fa-css-prefix}-exclamation-circle:before { content: @fa-var-exclamation-circle; } -.@{fa-css-prefix}-gift:before { content: @fa-var-gift; } -.@{fa-css-prefix}-leaf:before { content: @fa-var-leaf; } -.@{fa-css-prefix}-fire:before { content: @fa-var-fire; } -.@{fa-css-prefix}-eye:before { content: @fa-var-eye; } -.@{fa-css-prefix}-eye-slash:before { content: @fa-var-eye-slash; } -.@{fa-css-prefix}-warning:before, -.@{fa-css-prefix}-exclamation-triangle:before { content: @fa-var-exclamation-triangle; } -.@{fa-css-prefix}-plane:before { content: @fa-var-plane; } -.@{fa-css-prefix}-calendar:before { content: @fa-var-calendar; } -.@{fa-css-prefix}-random:before { content: @fa-var-random; } -.@{fa-css-prefix}-comment:before { content: @fa-var-comment; } -.@{fa-css-prefix}-magnet:before { content: @fa-var-magnet; } -.@{fa-css-prefix}-chevron-up:before { content: @fa-var-chevron-up; } -.@{fa-css-prefix}-chevron-down:before { content: @fa-var-chevron-down; } -.@{fa-css-prefix}-retweet:before { content: @fa-var-retweet; } -.@{fa-css-prefix}-shopping-cart:before { content: @fa-var-shopping-cart; } -.@{fa-css-prefix}-folder:before { content: @fa-var-folder; } -.@{fa-css-prefix}-folder-open:before { content: @fa-var-folder-open; } -.@{fa-css-prefix}-arrows-v:before { content: @fa-var-arrows-v; } -.@{fa-css-prefix}-arrows-h:before { content: @fa-var-arrows-h; } -.@{fa-css-prefix}-bar-chart-o:before, -.@{fa-css-prefix}-bar-chart:before { content: @fa-var-bar-chart; } -.@{fa-css-prefix}-twitter-square:before { content: @fa-var-twitter-square; } -.@{fa-css-prefix}-facebook-square:before { content: @fa-var-facebook-square; } -.@{fa-css-prefix}-camera-retro:before { content: @fa-var-camera-retro; } -.@{fa-css-prefix}-key:before { content: @fa-var-key; } -.@{fa-css-prefix}-gears:before, -.@{fa-css-prefix}-cogs:before { content: @fa-var-cogs; } -.@{fa-css-prefix}-comments:before { content: @fa-var-comments; } -.@{fa-css-prefix}-thumbs-o-up:before { content: @fa-var-thumbs-o-up; } -.@{fa-css-prefix}-thumbs-o-down:before { content: @fa-var-thumbs-o-down; } -.@{fa-css-prefix}-star-half:before { content: @fa-var-star-half; } -.@{fa-css-prefix}-heart-o:before { content: @fa-var-heart-o; } -.@{fa-css-prefix}-sign-out:before { content: @fa-var-sign-out; } -.@{fa-css-prefix}-linkedin-square:before { content: @fa-var-linkedin-square; } -.@{fa-css-prefix}-thumb-tack:before { content: @fa-var-thumb-tack; } -.@{fa-css-prefix}-external-link:before { content: @fa-var-external-link; } -.@{fa-css-prefix}-sign-in:before { content: @fa-var-sign-in; } -.@{fa-css-prefix}-trophy:before { content: @fa-var-trophy; } -.@{fa-css-prefix}-github-square:before { content: @fa-var-github-square; } -.@{fa-css-prefix}-upload:before { content: @fa-var-upload; } -.@{fa-css-prefix}-lemon-o:before { content: @fa-var-lemon-o; } -.@{fa-css-prefix}-phone:before { content: @fa-var-phone; } -.@{fa-css-prefix}-square-o:before { content: @fa-var-square-o; } -.@{fa-css-prefix}-bookmark-o:before { content: @fa-var-bookmark-o; } -.@{fa-css-prefix}-phone-square:before { content: @fa-var-phone-square; } -.@{fa-css-prefix}-twitter:before { content: @fa-var-twitter; } -.@{fa-css-prefix}-facebook:before { content: @fa-var-facebook; } -.@{fa-css-prefix}-github:before { content: @fa-var-github; } -.@{fa-css-prefix}-unlock:before { content: @fa-var-unlock; } -.@{fa-css-prefix}-credit-card:before { content: @fa-var-credit-card; } -.@{fa-css-prefix}-rss:before { content: @fa-var-rss; } -.@{fa-css-prefix}-hdd-o:before { content: @fa-var-hdd-o; } -.@{fa-css-prefix}-bullhorn:before { content: @fa-var-bullhorn; } -.@{fa-css-prefix}-bell:before { content: @fa-var-bell; } -.@{fa-css-prefix}-certificate:before { content: @fa-var-certificate; } -.@{fa-css-prefix}-hand-o-right:before { content: @fa-var-hand-o-right; } -.@{fa-css-prefix}-hand-o-left:before { content: @fa-var-hand-o-left; } -.@{fa-css-prefix}-hand-o-up:before { content: @fa-var-hand-o-up; } -.@{fa-css-prefix}-hand-o-down:before { content: @fa-var-hand-o-down; } -.@{fa-css-prefix}-arrow-circle-left:before { content: @fa-var-arrow-circle-left; } -.@{fa-css-prefix}-arrow-circle-right:before { content: @fa-var-arrow-circle-right; } -.@{fa-css-prefix}-arrow-circle-up:before { content: @fa-var-arrow-circle-up; } -.@{fa-css-prefix}-arrow-circle-down:before { content: @fa-var-arrow-circle-down; } -.@{fa-css-prefix}-globe:before { content: @fa-var-globe; } -.@{fa-css-prefix}-wrench:before { content: @fa-var-wrench; } -.@{fa-css-prefix}-tasks:before { content: @fa-var-tasks; } -.@{fa-css-prefix}-filter:before { content: @fa-var-filter; } -.@{fa-css-prefix}-briefcase:before { content: @fa-var-briefcase; } -.@{fa-css-prefix}-arrows-alt:before { content: @fa-var-arrows-alt; } -.@{fa-css-prefix}-group:before, -.@{fa-css-prefix}-users:before { content: @fa-var-users; } -.@{fa-css-prefix}-chain:before, -.@{fa-css-prefix}-link:before { content: @fa-var-link; } -.@{fa-css-prefix}-cloud:before { content: @fa-var-cloud; } -.@{fa-css-prefix}-flask:before { content: @fa-var-flask; } -.@{fa-css-prefix}-cut:before, -.@{fa-css-prefix}-scissors:before { content: @fa-var-scissors; } -.@{fa-css-prefix}-copy:before, -.@{fa-css-prefix}-files-o:before { content: @fa-var-files-o; } -.@{fa-css-prefix}-paperclip:before { content: @fa-var-paperclip; } -.@{fa-css-prefix}-save:before, -.@{fa-css-prefix}-floppy-o:before { content: @fa-var-floppy-o; } -.@{fa-css-prefix}-square:before { content: @fa-var-square; } -.@{fa-css-prefix}-navicon:before, -.@{fa-css-prefix}-reorder:before, -.@{fa-css-prefix}-bars:before { content: @fa-var-bars; } -.@{fa-css-prefix}-list-ul:before { content: @fa-var-list-ul; } -.@{fa-css-prefix}-list-ol:before { content: @fa-var-list-ol; } -.@{fa-css-prefix}-strikethrough:before { content: @fa-var-strikethrough; } -.@{fa-css-prefix}-underline:before { content: @fa-var-underline; } -.@{fa-css-prefix}-table:before { content: @fa-var-table; } -.@{fa-css-prefix}-magic:before { content: @fa-var-magic; } -.@{fa-css-prefix}-truck:before { content: @fa-var-truck; } -.@{fa-css-prefix}-pinterest:before { content: @fa-var-pinterest; } -.@{fa-css-prefix}-pinterest-square:before { content: @fa-var-pinterest-square; } -.@{fa-css-prefix}-google-plus-square:before { content: @fa-var-google-plus-square; } -.@{fa-css-prefix}-google-plus:before { content: @fa-var-google-plus; } -.@{fa-css-prefix}-money:before { content: @fa-var-money; } -.@{fa-css-prefix}-caret-down:before { content: @fa-var-caret-down; } -.@{fa-css-prefix}-caret-up:before { content: @fa-var-caret-up; } -.@{fa-css-prefix}-caret-left:before { content: @fa-var-caret-left; } -.@{fa-css-prefix}-caret-right:before { content: @fa-var-caret-right; } -.@{fa-css-prefix}-columns:before { content: @fa-var-columns; } -.@{fa-css-prefix}-unsorted:before, -.@{fa-css-prefix}-sort:before { content: @fa-var-sort; } -.@{fa-css-prefix}-sort-down:before, -.@{fa-css-prefix}-sort-desc:before { content: @fa-var-sort-desc; } -.@{fa-css-prefix}-sort-up:before, -.@{fa-css-prefix}-sort-asc:before { content: @fa-var-sort-asc; } -.@{fa-css-prefix}-envelope:before { content: @fa-var-envelope; } -.@{fa-css-prefix}-linkedin:before { content: @fa-var-linkedin; } -.@{fa-css-prefix}-rotate-left:before, -.@{fa-css-prefix}-undo:before { content: @fa-var-undo; } -.@{fa-css-prefix}-legal:before, -.@{fa-css-prefix}-gavel:before { content: @fa-var-gavel; } -.@{fa-css-prefix}-dashboard:before, -.@{fa-css-prefix}-tachometer:before { content: @fa-var-tachometer; } -.@{fa-css-prefix}-comment-o:before { content: @fa-var-comment-o; } -.@{fa-css-prefix}-comments-o:before { content: @fa-var-comments-o; } -.@{fa-css-prefix}-flash:before, -.@{fa-css-prefix}-bolt:before { content: @fa-var-bolt; } -.@{fa-css-prefix}-sitemap:before { content: @fa-var-sitemap; } -.@{fa-css-prefix}-umbrella:before { content: @fa-var-umbrella; } -.@{fa-css-prefix}-paste:before, -.@{fa-css-prefix}-clipboard:before { content: @fa-var-clipboard; } -.@{fa-css-prefix}-lightbulb-o:before { content: @fa-var-lightbulb-o; } -.@{fa-css-prefix}-exchange:before { content: @fa-var-exchange; } -.@{fa-css-prefix}-cloud-download:before { content: @fa-var-cloud-download; } -.@{fa-css-prefix}-cloud-upload:before { content: @fa-var-cloud-upload; } -.@{fa-css-prefix}-user-md:before { content: @fa-var-user-md; } -.@{fa-css-prefix}-stethoscope:before { content: @fa-var-stethoscope; } -.@{fa-css-prefix}-suitcase:before { content: @fa-var-suitcase; } -.@{fa-css-prefix}-bell-o:before { content: @fa-var-bell-o; } -.@{fa-css-prefix}-coffee:before { content: @fa-var-coffee; } -.@{fa-css-prefix}-cutlery:before { content: @fa-var-cutlery; } -.@{fa-css-prefix}-file-text-o:before { content: @fa-var-file-text-o; } -.@{fa-css-prefix}-building-o:before { content: @fa-var-building-o; } -.@{fa-css-prefix}-hospital-o:before { content: @fa-var-hospital-o; } -.@{fa-css-prefix}-ambulance:before { content: @fa-var-ambulance; } -.@{fa-css-prefix}-medkit:before { content: @fa-var-medkit; } -.@{fa-css-prefix}-fighter-jet:before { content: @fa-var-fighter-jet; } -.@{fa-css-prefix}-beer:before { content: @fa-var-beer; } -.@{fa-css-prefix}-h-square:before { content: @fa-var-h-square; } -.@{fa-css-prefix}-plus-square:before { content: @fa-var-plus-square; } -.@{fa-css-prefix}-angle-double-left:before { content: @fa-var-angle-double-left; } -.@{fa-css-prefix}-angle-double-right:before { content: @fa-var-angle-double-right; } -.@{fa-css-prefix}-angle-double-up:before { content: @fa-var-angle-double-up; } -.@{fa-css-prefix}-angle-double-down:before { content: @fa-var-angle-double-down; } -.@{fa-css-prefix}-angle-left:before { content: @fa-var-angle-left; } -.@{fa-css-prefix}-angle-right:before { content: @fa-var-angle-right; } -.@{fa-css-prefix}-angle-up:before { content: @fa-var-angle-up; } -.@{fa-css-prefix}-angle-down:before { content: @fa-var-angle-down; } -.@{fa-css-prefix}-desktop:before { content: @fa-var-desktop; } -.@{fa-css-prefix}-laptop:before { content: @fa-var-laptop; } -.@{fa-css-prefix}-tablet:before { content: @fa-var-tablet; } -.@{fa-css-prefix}-mobile-phone:before, -.@{fa-css-prefix}-mobile:before { content: @fa-var-mobile; } -.@{fa-css-prefix}-circle-o:before { content: @fa-var-circle-o; } -.@{fa-css-prefix}-quote-left:before { content: @fa-var-quote-left; } -.@{fa-css-prefix}-quote-right:before { content: @fa-var-quote-right; } -.@{fa-css-prefix}-spinner:before { content: @fa-var-spinner; } -.@{fa-css-prefix}-circle:before { content: @fa-var-circle; } -.@{fa-css-prefix}-mail-reply:before, -.@{fa-css-prefix}-reply:before { content: @fa-var-reply; } -.@{fa-css-prefix}-github-alt:before { content: @fa-var-github-alt; } -.@{fa-css-prefix}-folder-o:before { content: @fa-var-folder-o; } -.@{fa-css-prefix}-folder-open-o:before { content: @fa-var-folder-open-o; } -.@{fa-css-prefix}-smile-o:before { content: @fa-var-smile-o; } -.@{fa-css-prefix}-frown-o:before { content: @fa-var-frown-o; } -.@{fa-css-prefix}-meh-o:before { content: @fa-var-meh-o; } -.@{fa-css-prefix}-gamepad:before { content: @fa-var-gamepad; } -.@{fa-css-prefix}-keyboard-o:before { content: @fa-var-keyboard-o; } -.@{fa-css-prefix}-flag-o:before { content: @fa-var-flag-o; } -.@{fa-css-prefix}-flag-checkered:before { content: @fa-var-flag-checkered; } -.@{fa-css-prefix}-terminal:before { content: @fa-var-terminal; } -.@{fa-css-prefix}-code:before { content: @fa-var-code; } -.@{fa-css-prefix}-mail-reply-all:before, -.@{fa-css-prefix}-reply-all:before { content: @fa-var-reply-all; } -.@{fa-css-prefix}-star-half-empty:before, -.@{fa-css-prefix}-star-half-full:before, -.@{fa-css-prefix}-star-half-o:before { content: @fa-var-star-half-o; } -.@{fa-css-prefix}-location-arrow:before { content: @fa-var-location-arrow; } -.@{fa-css-prefix}-crop:before { content: @fa-var-crop; } -.@{fa-css-prefix}-code-fork:before { content: @fa-var-code-fork; } -.@{fa-css-prefix}-unlink:before, -.@{fa-css-prefix}-chain-broken:before { content: @fa-var-chain-broken; } -.@{fa-css-prefix}-question:before { content: @fa-var-question; } -.@{fa-css-prefix}-info:before { content: @fa-var-info; } -.@{fa-css-prefix}-exclamation:before { content: @fa-var-exclamation; } -.@{fa-css-prefix}-superscript:before { content: @fa-var-superscript; } -.@{fa-css-prefix}-subscript:before { content: @fa-var-subscript; } -.@{fa-css-prefix}-eraser:before { content: @fa-var-eraser; } -.@{fa-css-prefix}-puzzle-piece:before { content: @fa-var-puzzle-piece; } -.@{fa-css-prefix}-microphone:before { content: @fa-var-microphone; } -.@{fa-css-prefix}-microphone-slash:before { content: @fa-var-microphone-slash; } -.@{fa-css-prefix}-shield:before { content: @fa-var-shield; } -.@{fa-css-prefix}-calendar-o:before { content: @fa-var-calendar-o; } -.@{fa-css-prefix}-fire-extinguisher:before { content: @fa-var-fire-extinguisher; } -.@{fa-css-prefix}-rocket:before { content: @fa-var-rocket; } -.@{fa-css-prefix}-maxcdn:before { content: @fa-var-maxcdn; } -.@{fa-css-prefix}-chevron-circle-left:before { content: @fa-var-chevron-circle-left; } -.@{fa-css-prefix}-chevron-circle-right:before { content: @fa-var-chevron-circle-right; } -.@{fa-css-prefix}-chevron-circle-up:before { content: @fa-var-chevron-circle-up; } -.@{fa-css-prefix}-chevron-circle-down:before { content: @fa-var-chevron-circle-down; } -.@{fa-css-prefix}-html5:before { content: @fa-var-html5; } -.@{fa-css-prefix}-css3:before { content: @fa-var-css3; } -.@{fa-css-prefix}-anchor:before { content: @fa-var-anchor; } -.@{fa-css-prefix}-unlock-alt:before { content: @fa-var-unlock-alt; } -.@{fa-css-prefix}-bullseye:before { content: @fa-var-bullseye; } -.@{fa-css-prefix}-ellipsis-h:before { content: @fa-var-ellipsis-h; } -.@{fa-css-prefix}-ellipsis-v:before { content: @fa-var-ellipsis-v; } -.@{fa-css-prefix}-rss-square:before { content: @fa-var-rss-square; } -.@{fa-css-prefix}-play-circle:before { content: @fa-var-play-circle; } -.@{fa-css-prefix}-ticket:before { content: @fa-var-ticket; } -.@{fa-css-prefix}-minus-square:before { content: @fa-var-minus-square; } -.@{fa-css-prefix}-minus-square-o:before { content: @fa-var-minus-square-o; } -.@{fa-css-prefix}-level-up:before { content: @fa-var-level-up; } -.@{fa-css-prefix}-level-down:before { content: @fa-var-level-down; } -.@{fa-css-prefix}-check-square:before { content: @fa-var-check-square; } -.@{fa-css-prefix}-pencil-square:before { content: @fa-var-pencil-square; } -.@{fa-css-prefix}-external-link-square:before { content: @fa-var-external-link-square; } -.@{fa-css-prefix}-share-square:before { content: @fa-var-share-square; } -.@{fa-css-prefix}-compass:before { content: @fa-var-compass; } -.@{fa-css-prefix}-toggle-down:before, -.@{fa-css-prefix}-caret-square-o-down:before { content: @fa-var-caret-square-o-down; } -.@{fa-css-prefix}-toggle-up:before, -.@{fa-css-prefix}-caret-square-o-up:before { content: @fa-var-caret-square-o-up; } -.@{fa-css-prefix}-toggle-right:before, -.@{fa-css-prefix}-caret-square-o-right:before { content: @fa-var-caret-square-o-right; } -.@{fa-css-prefix}-euro:before, -.@{fa-css-prefix}-eur:before { content: @fa-var-eur; } -.@{fa-css-prefix}-gbp:before { content: @fa-var-gbp; } -.@{fa-css-prefix}-dollar:before, -.@{fa-css-prefix}-usd:before { content: @fa-var-usd; } -.@{fa-css-prefix}-rupee:before, -.@{fa-css-prefix}-inr:before { content: @fa-var-inr; } -.@{fa-css-prefix}-cny:before, -.@{fa-css-prefix}-rmb:before, -.@{fa-css-prefix}-yen:before, -.@{fa-css-prefix}-jpy:before { content: @fa-var-jpy; } -.@{fa-css-prefix}-ruble:before, -.@{fa-css-prefix}-rouble:before, -.@{fa-css-prefix}-rub:before { content: @fa-var-rub; } -.@{fa-css-prefix}-won:before, -.@{fa-css-prefix}-krw:before { content: @fa-var-krw; } -.@{fa-css-prefix}-bitcoin:before, -.@{fa-css-prefix}-btc:before { content: @fa-var-btc; } -.@{fa-css-prefix}-file:before { content: @fa-var-file; } -.@{fa-css-prefix}-file-text:before { content: @fa-var-file-text; } -.@{fa-css-prefix}-sort-alpha-asc:before { content: @fa-var-sort-alpha-asc; } -.@{fa-css-prefix}-sort-alpha-desc:before { content: @fa-var-sort-alpha-desc; } -.@{fa-css-prefix}-sort-amount-asc:before { content: @fa-var-sort-amount-asc; } -.@{fa-css-prefix}-sort-amount-desc:before { content: @fa-var-sort-amount-desc; } -.@{fa-css-prefix}-sort-numeric-asc:before { content: @fa-var-sort-numeric-asc; } -.@{fa-css-prefix}-sort-numeric-desc:before { content: @fa-var-sort-numeric-desc; } -.@{fa-css-prefix}-thumbs-up:before { content: @fa-var-thumbs-up; } -.@{fa-css-prefix}-thumbs-down:before { content: @fa-var-thumbs-down; } -.@{fa-css-prefix}-youtube-square:before { content: @fa-var-youtube-square; } -.@{fa-css-prefix}-youtube:before { content: @fa-var-youtube; } -.@{fa-css-prefix}-xing:before { content: @fa-var-xing; } -.@{fa-css-prefix}-xing-square:before { content: @fa-var-xing-square; } -.@{fa-css-prefix}-youtube-play:before { content: @fa-var-youtube-play; } -.@{fa-css-prefix}-dropbox:before { content: @fa-var-dropbox; } -.@{fa-css-prefix}-stack-overflow:before { content: @fa-var-stack-overflow; } -.@{fa-css-prefix}-instagram:before { content: @fa-var-instagram; } -.@{fa-css-prefix}-flickr:before { content: @fa-var-flickr; } -.@{fa-css-prefix}-adn:before { content: @fa-var-adn; } -.@{fa-css-prefix}-bitbucket:before { content: @fa-var-bitbucket; } -.@{fa-css-prefix}-bitbucket-square:before { content: @fa-var-bitbucket-square; } -.@{fa-css-prefix}-tumblr:before { content: @fa-var-tumblr; } -.@{fa-css-prefix}-tumblr-square:before { content: @fa-var-tumblr-square; } -.@{fa-css-prefix}-long-arrow-down:before { content: @fa-var-long-arrow-down; } -.@{fa-css-prefix}-long-arrow-up:before { content: @fa-var-long-arrow-up; } -.@{fa-css-prefix}-long-arrow-left:before { content: @fa-var-long-arrow-left; } -.@{fa-css-prefix}-long-arrow-right:before { content: @fa-var-long-arrow-right; } -.@{fa-css-prefix}-apple:before { content: @fa-var-apple; } -.@{fa-css-prefix}-windows:before { content: @fa-var-windows; } -.@{fa-css-prefix}-android:before { content: @fa-var-android; } -.@{fa-css-prefix}-linux:before { content: @fa-var-linux; } -.@{fa-css-prefix}-dribbble:before { content: @fa-var-dribbble; } -.@{fa-css-prefix}-skype:before { content: @fa-var-skype; } -.@{fa-css-prefix}-foursquare:before { content: @fa-var-foursquare; } -.@{fa-css-prefix}-trello:before { content: @fa-var-trello; } -.@{fa-css-prefix}-female:before { content: @fa-var-female; } -.@{fa-css-prefix}-male:before { content: @fa-var-male; } -.@{fa-css-prefix}-gittip:before { content: @fa-var-gittip; } -.@{fa-css-prefix}-sun-o:before { content: @fa-var-sun-o; } -.@{fa-css-prefix}-moon-o:before { content: @fa-var-moon-o; } -.@{fa-css-prefix}-archive:before { content: @fa-var-archive; } -.@{fa-css-prefix}-bug:before { content: @fa-var-bug; } -.@{fa-css-prefix}-vk:before { content: @fa-var-vk; } -.@{fa-css-prefix}-weibo:before { content: @fa-var-weibo; } -.@{fa-css-prefix}-renren:before { content: @fa-var-renren; } -.@{fa-css-prefix}-pagelines:before { content: @fa-var-pagelines; } -.@{fa-css-prefix}-stack-exchange:before { content: @fa-var-stack-exchange; } -.@{fa-css-prefix}-arrow-circle-o-right:before { content: @fa-var-arrow-circle-o-right; } -.@{fa-css-prefix}-arrow-circle-o-left:before { content: @fa-var-arrow-circle-o-left; } -.@{fa-css-prefix}-toggle-left:before, -.@{fa-css-prefix}-caret-square-o-left:before { content: @fa-var-caret-square-o-left; } -.@{fa-css-prefix}-dot-circle-o:before { content: @fa-var-dot-circle-o; } -.@{fa-css-prefix}-wheelchair:before { content: @fa-var-wheelchair; } -.@{fa-css-prefix}-vimeo-square:before { content: @fa-var-vimeo-square; } -.@{fa-css-prefix}-turkish-lira:before, -.@{fa-css-prefix}-try:before { content: @fa-var-try; } -.@{fa-css-prefix}-plus-square-o:before { content: @fa-var-plus-square-o; } -.@{fa-css-prefix}-space-shuttle:before { content: @fa-var-space-shuttle; } -.@{fa-css-prefix}-slack:before { content: @fa-var-slack; } -.@{fa-css-prefix}-envelope-square:before { content: @fa-var-envelope-square; } -.@{fa-css-prefix}-wordpress:before { content: @fa-var-wordpress; } -.@{fa-css-prefix}-openid:before { content: @fa-var-openid; } -.@{fa-css-prefix}-institution:before, -.@{fa-css-prefix}-bank:before, -.@{fa-css-prefix}-university:before { content: @fa-var-university; } -.@{fa-css-prefix}-mortar-board:before, -.@{fa-css-prefix}-graduation-cap:before { content: @fa-var-graduation-cap; } -.@{fa-css-prefix}-yahoo:before { content: @fa-var-yahoo; } -.@{fa-css-prefix}-google:before { content: @fa-var-google; } -.@{fa-css-prefix}-reddit:before { content: @fa-var-reddit; } -.@{fa-css-prefix}-reddit-square:before { content: @fa-var-reddit-square; } -.@{fa-css-prefix}-stumbleupon-circle:before { content: @fa-var-stumbleupon-circle; } -.@{fa-css-prefix}-stumbleupon:before { content: @fa-var-stumbleupon; } -.@{fa-css-prefix}-delicious:before { content: @fa-var-delicious; } -.@{fa-css-prefix}-digg:before { content: @fa-var-digg; } -.@{fa-css-prefix}-pied-piper:before { content: @fa-var-pied-piper; } -.@{fa-css-prefix}-pied-piper-alt:before { content: @fa-var-pied-piper-alt; } -.@{fa-css-prefix}-drupal:before { content: @fa-var-drupal; } -.@{fa-css-prefix}-joomla:before { content: @fa-var-joomla; } -.@{fa-css-prefix}-language:before { content: @fa-var-language; } -.@{fa-css-prefix}-fax:before { content: @fa-var-fax; } -.@{fa-css-prefix}-building:before { content: @fa-var-building; } -.@{fa-css-prefix}-child:before { content: @fa-var-child; } -.@{fa-css-prefix}-paw:before { content: @fa-var-paw; } -.@{fa-css-prefix}-spoon:before { content: @fa-var-spoon; } -.@{fa-css-prefix}-cube:before { content: @fa-var-cube; } -.@{fa-css-prefix}-cubes:before { content: @fa-var-cubes; } -.@{fa-css-prefix}-behance:before { content: @fa-var-behance; } -.@{fa-css-prefix}-behance-square:before { content: @fa-var-behance-square; } -.@{fa-css-prefix}-steam:before { content: @fa-var-steam; } -.@{fa-css-prefix}-steam-square:before { content: @fa-var-steam-square; } -.@{fa-css-prefix}-recycle:before { content: @fa-var-recycle; } -.@{fa-css-prefix}-automobile:before, -.@{fa-css-prefix}-car:before { content: @fa-var-car; } -.@{fa-css-prefix}-cab:before, -.@{fa-css-prefix}-taxi:before { content: @fa-var-taxi; } -.@{fa-css-prefix}-tree:before { content: @fa-var-tree; } -.@{fa-css-prefix}-spotify:before { content: @fa-var-spotify; } -.@{fa-css-prefix}-deviantart:before { content: @fa-var-deviantart; } -.@{fa-css-prefix}-soundcloud:before { content: @fa-var-soundcloud; } -.@{fa-css-prefix}-database:before { content: @fa-var-database; } -.@{fa-css-prefix}-file-pdf-o:before { content: @fa-var-file-pdf-o; } -.@{fa-css-prefix}-file-word-o:before { content: @fa-var-file-word-o; } -.@{fa-css-prefix}-file-excel-o:before { content: @fa-var-file-excel-o; } -.@{fa-css-prefix}-file-powerpoint-o:before { content: @fa-var-file-powerpoint-o; } -.@{fa-css-prefix}-file-photo-o:before, -.@{fa-css-prefix}-file-picture-o:before, -.@{fa-css-prefix}-file-image-o:before { content: @fa-var-file-image-o; } -.@{fa-css-prefix}-file-zip-o:before, -.@{fa-css-prefix}-file-archive-o:before { content: @fa-var-file-archive-o; } -.@{fa-css-prefix}-file-sound-o:before, -.@{fa-css-prefix}-file-audio-o:before { content: @fa-var-file-audio-o; } -.@{fa-css-prefix}-file-movie-o:before, -.@{fa-css-prefix}-file-video-o:before { content: @fa-var-file-video-o; } -.@{fa-css-prefix}-file-code-o:before { content: @fa-var-file-code-o; } -.@{fa-css-prefix}-vine:before { content: @fa-var-vine; } -.@{fa-css-prefix}-codepen:before { content: @fa-var-codepen; } -.@{fa-css-prefix}-jsfiddle:before { content: @fa-var-jsfiddle; } -.@{fa-css-prefix}-life-bouy:before, -.@{fa-css-prefix}-life-buoy:before, -.@{fa-css-prefix}-life-saver:before, -.@{fa-css-prefix}-support:before, -.@{fa-css-prefix}-life-ring:before { content: @fa-var-life-ring; } -.@{fa-css-prefix}-circle-o-notch:before { content: @fa-var-circle-o-notch; } -.@{fa-css-prefix}-ra:before, -.@{fa-css-prefix}-rebel:before { content: @fa-var-rebel; } -.@{fa-css-prefix}-ge:before, -.@{fa-css-prefix}-empire:before { content: @fa-var-empire; } -.@{fa-css-prefix}-git-square:before { content: @fa-var-git-square; } -.@{fa-css-prefix}-git:before { content: @fa-var-git; } -.@{fa-css-prefix}-hacker-news:before { content: @fa-var-hacker-news; } -.@{fa-css-prefix}-tencent-weibo:before { content: @fa-var-tencent-weibo; } -.@{fa-css-prefix}-qq:before { content: @fa-var-qq; } -.@{fa-css-prefix}-wechat:before, -.@{fa-css-prefix}-weixin:before { content: @fa-var-weixin; } -.@{fa-css-prefix}-send:before, -.@{fa-css-prefix}-paper-plane:before { content: @fa-var-paper-plane; } -.@{fa-css-prefix}-send-o:before, -.@{fa-css-prefix}-paper-plane-o:before { content: @fa-var-paper-plane-o; } -.@{fa-css-prefix}-history:before { content: @fa-var-history; } -.@{fa-css-prefix}-circle-thin:before { content: @fa-var-circle-thin; } -.@{fa-css-prefix}-header:before { content: @fa-var-header; } -.@{fa-css-prefix}-paragraph:before { content: @fa-var-paragraph; } -.@{fa-css-prefix}-sliders:before { content: @fa-var-sliders; } -.@{fa-css-prefix}-share-alt:before { content: @fa-var-share-alt; } -.@{fa-css-prefix}-share-alt-square:before { content: @fa-var-share-alt-square; } -.@{fa-css-prefix}-bomb:before { content: @fa-var-bomb; } -.@{fa-css-prefix}-soccer-ball-o:before, -.@{fa-css-prefix}-futbol-o:before { content: @fa-var-futbol-o; } -.@{fa-css-prefix}-tty:before { content: @fa-var-tty; } -.@{fa-css-prefix}-binoculars:before { content: @fa-var-binoculars; } -.@{fa-css-prefix}-plug:before { content: @fa-var-plug; } -.@{fa-css-prefix}-slideshare:before { content: @fa-var-slideshare; } -.@{fa-css-prefix}-twitch:before { content: @fa-var-twitch; } -.@{fa-css-prefix}-yelp:before { content: @fa-var-yelp; } -.@{fa-css-prefix}-newspaper-o:before { content: @fa-var-newspaper-o; } -.@{fa-css-prefix}-wifi:before { content: @fa-var-wifi; } -.@{fa-css-prefix}-calculator:before { content: @fa-var-calculator; } -.@{fa-css-prefix}-paypal:before { content: @fa-var-paypal; } -.@{fa-css-prefix}-google-wallet:before { content: @fa-var-google-wallet; } -.@{fa-css-prefix}-cc-visa:before { content: @fa-var-cc-visa; } -.@{fa-css-prefix}-cc-mastercard:before { content: @fa-var-cc-mastercard; } -.@{fa-css-prefix}-cc-discover:before { content: @fa-var-cc-discover; } -.@{fa-css-prefix}-cc-amex:before { content: @fa-var-cc-amex; } -.@{fa-css-prefix}-cc-paypal:before { content: @fa-var-cc-paypal; } -.@{fa-css-prefix}-cc-stripe:before { content: @fa-var-cc-stripe; } -.@{fa-css-prefix}-bell-slash:before { content: @fa-var-bell-slash; } -.@{fa-css-prefix}-bell-slash-o:before { content: @fa-var-bell-slash-o; } -.@{fa-css-prefix}-trash:before { content: @fa-var-trash; } -.@{fa-css-prefix}-copyright:before { content: @fa-var-copyright; } -.@{fa-css-prefix}-at:before { content: @fa-var-at; } -.@{fa-css-prefix}-eyedropper:before { content: @fa-var-eyedropper; } -.@{fa-css-prefix}-paint-brush:before { content: @fa-var-paint-brush; } -.@{fa-css-prefix}-birthday-cake:before { content: @fa-var-birthday-cake; } -.@{fa-css-prefix}-area-chart:before { content: @fa-var-area-chart; } -.@{fa-css-prefix}-pie-chart:before { content: @fa-var-pie-chart; } -.@{fa-css-prefix}-line-chart:before { content: @fa-var-line-chart; } -.@{fa-css-prefix}-lastfm:before { content: @fa-var-lastfm; } -.@{fa-css-prefix}-lastfm-square:before { content: @fa-var-lastfm-square; } -.@{fa-css-prefix}-toggle-off:before { content: @fa-var-toggle-off; } -.@{fa-css-prefix}-toggle-on:before { content: @fa-var-toggle-on; } -.@{fa-css-prefix}-bicycle:before { content: @fa-var-bicycle; } -.@{fa-css-prefix}-bus:before { content: @fa-var-bus; } -.@{fa-css-prefix}-ioxhost:before { content: @fa-var-ioxhost; } -.@{fa-css-prefix}-angellist:before { content: @fa-var-angellist; } -.@{fa-css-prefix}-cc:before { content: @fa-var-cc; } -.@{fa-css-prefix}-shekel:before, -.@{fa-css-prefix}-sheqel:before, -.@{fa-css-prefix}-ils:before { content: @fa-var-ils; } -.@{fa-css-prefix}-meanpath:before { content: @fa-var-meanpath; } DELETED cgisetup/www/css/fonts/font-awesome-4.2.0/less/larger.less Index: cgisetup/www/css/fonts/font-awesome-4.2.0/less/larger.less ================================================================== --- cgisetup/www/css/fonts/font-awesome-4.2.0/less/larger.less +++ /dev/null @@ -1,13 +0,0 @@ -// Icon Sizes -// ------------------------- - -/* makes the font 33% larger relative to the icon container */ -.@{fa-css-prefix}-lg { - font-size: (4em / 3); - line-height: (3em / 4); - vertical-align: -15%; -} -.@{fa-css-prefix}-2x { font-size: 2em; } -.@{fa-css-prefix}-3x { font-size: 3em; } -.@{fa-css-prefix}-4x { font-size: 4em; } -.@{fa-css-prefix}-5x { font-size: 5em; } DELETED cgisetup/www/css/fonts/font-awesome-4.2.0/less/list.less Index: cgisetup/www/css/fonts/font-awesome-4.2.0/less/list.less ================================================================== --- cgisetup/www/css/fonts/font-awesome-4.2.0/less/list.less +++ /dev/null @@ -1,19 +0,0 @@ -// List Icons -// ------------------------- - -.@{fa-css-prefix}-ul { - padding-left: 0; - margin-left: @fa-li-width; - list-style-type: none; - > li { position: relative; } -} -.@{fa-css-prefix}-li { - position: absolute; - left: -@fa-li-width; - width: @fa-li-width; - top: (2em / 14); - text-align: center; - &.@{fa-css-prefix}-lg { - left: (-@fa-li-width + (4em / 14)); - } -} DELETED cgisetup/www/css/fonts/font-awesome-4.2.0/less/mixins.less Index: cgisetup/www/css/fonts/font-awesome-4.2.0/less/mixins.less ================================================================== --- cgisetup/www/css/fonts/font-awesome-4.2.0/less/mixins.less +++ /dev/null @@ -1,25 +0,0 @@ -// Mixins -// -------------------------- - -.fa-icon() { - display: inline-block; - font: normal normal normal 14px/1 FontAwesome; // shortening font declaration - font-size: inherit; // can't have font-size inherit on line above, so need to override - text-rendering: auto; // optimizelegibility throws things off #1094 - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; -} - -.fa-icon-rotate(@degrees, @rotation) { - filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=@rotation); - -webkit-transform: rotate(@degrees); - -ms-transform: rotate(@degrees); - transform: rotate(@degrees); -} - -.fa-icon-flip(@horiz, @vert, @rotation) { - filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=@rotation, mirror=1); - -webkit-transform: scale(@horiz, @vert); - -ms-transform: scale(@horiz, @vert); - transform: scale(@horiz, @vert); -} DELETED cgisetup/www/css/fonts/font-awesome-4.2.0/less/path.less Index: cgisetup/www/css/fonts/font-awesome-4.2.0/less/path.less ================================================================== --- cgisetup/www/css/fonts/font-awesome-4.2.0/less/path.less +++ /dev/null @@ -1,14 +0,0 @@ -/* FONT PATH - * -------------------------- */ - -@font-face { - font-family: 'FontAwesome'; - src: url('@{fa-font-path}/fontawesome-webfont.eot?v=@{fa-version}'); - src: url('@{fa-font-path}/fontawesome-webfont.eot?#iefix&v=@{fa-version}') format('embedded-opentype'), - url('@{fa-font-path}/fontawesome-webfont.woff?v=@{fa-version}') format('woff'), - url('@{fa-font-path}/fontawesome-webfont.ttf?v=@{fa-version}') format('truetype'), - url('@{fa-font-path}/fontawesome-webfont.svg?v=@{fa-version}#fontawesomeregular') format('svg'); -// src: url('@{fa-font-path}/FontAwesome.otf') format('opentype'); // used when developing fonts - font-weight: normal; - font-style: normal; -} DELETED cgisetup/www/css/fonts/font-awesome-4.2.0/less/rotated-flipped.less Index: cgisetup/www/css/fonts/font-awesome-4.2.0/less/rotated-flipped.less ================================================================== --- cgisetup/www/css/fonts/font-awesome-4.2.0/less/rotated-flipped.less +++ /dev/null @@ -1,20 +0,0 @@ -// Rotated & Flipped Icons -// ------------------------- - -.@{fa-css-prefix}-rotate-90 { .fa-icon-rotate(90deg, 1); } -.@{fa-css-prefix}-rotate-180 { .fa-icon-rotate(180deg, 2); } -.@{fa-css-prefix}-rotate-270 { .fa-icon-rotate(270deg, 3); } - -.@{fa-css-prefix}-flip-horizontal { .fa-icon-flip(-1, 1, 0); } -.@{fa-css-prefix}-flip-vertical { .fa-icon-flip(1, -1, 2); } - -// Hook for IE8-9 -// ------------------------- - -:root .@{fa-css-prefix}-rotate-90, -:root .@{fa-css-prefix}-rotate-180, -:root .@{fa-css-prefix}-rotate-270, -:root .@{fa-css-prefix}-flip-horizontal, -:root .@{fa-css-prefix}-flip-vertical { - filter: none; -} DELETED cgisetup/www/css/fonts/font-awesome-4.2.0/less/spinning.less Index: cgisetup/www/css/fonts/font-awesome-4.2.0/less/spinning.less ================================================================== --- cgisetup/www/css/fonts/font-awesome-4.2.0/less/spinning.less +++ /dev/null @@ -1,29 +0,0 @@ -// Spinning Icons -// -------------------------- - -.@{fa-css-prefix}-spin { - -webkit-animation: fa-spin 2s infinite linear; - animation: fa-spin 2s infinite linear; -} - -@-webkit-keyframes fa-spin { - 0% { - -webkit-transform: rotate(0deg); - transform: rotate(0deg); - } - 100% { - -webkit-transform: rotate(359deg); - transform: rotate(359deg); - } -} - -@keyframes fa-spin { - 0% { - -webkit-transform: rotate(0deg); - transform: rotate(0deg); - } - 100% { - -webkit-transform: rotate(359deg); - transform: rotate(359deg); - } -} DELETED cgisetup/www/css/fonts/font-awesome-4.2.0/less/stacked.less Index: cgisetup/www/css/fonts/font-awesome-4.2.0/less/stacked.less ================================================================== --- cgisetup/www/css/fonts/font-awesome-4.2.0/less/stacked.less +++ /dev/null @@ -1,20 +0,0 @@ -// Stacked Icons -// ------------------------- - -.@{fa-css-prefix}-stack { - position: relative; - display: inline-block; - width: 2em; - height: 2em; - line-height: 2em; - vertical-align: middle; -} -.@{fa-css-prefix}-stack-1x, .@{fa-css-prefix}-stack-2x { - position: absolute; - left: 0; - width: 100%; - text-align: center; -} -.@{fa-css-prefix}-stack-1x { line-height: inherit; } -.@{fa-css-prefix}-stack-2x { font-size: 2em; } -.@{fa-css-prefix}-inverse { color: @fa-inverse; } DELETED cgisetup/www/css/fonts/font-awesome-4.2.0/less/variables.less Index: cgisetup/www/css/fonts/font-awesome-4.2.0/less/variables.less ================================================================== --- cgisetup/www/css/fonts/font-awesome-4.2.0/less/variables.less +++ /dev/null @@ -1,561 +0,0 @@ -// Variables -// -------------------------- - -@fa-font-path: "../fonts"; -//@fa-font-path: "//netdna.bootstrapcdn.com/font-awesome/4.2.0/fonts"; // for referencing Bootstrap CDN font files directly -@fa-css-prefix: fa; -@fa-version: "4.2.0"; -@fa-border-color: #eee; -@fa-inverse: #fff; -@fa-li-width: (30em / 14); - -@fa-var-adjust: "\f042"; -@fa-var-adn: "\f170"; -@fa-var-align-center: "\f037"; -@fa-var-align-justify: "\f039"; -@fa-var-align-left: "\f036"; -@fa-var-align-right: "\f038"; -@fa-var-ambulance: "\f0f9"; -@fa-var-anchor: "\f13d"; -@fa-var-android: "\f17b"; -@fa-var-angellist: "\f209"; -@fa-var-angle-double-down: "\f103"; -@fa-var-angle-double-left: "\f100"; -@fa-var-angle-double-right: "\f101"; -@fa-var-angle-double-up: "\f102"; -@fa-var-angle-down: "\f107"; -@fa-var-angle-left: "\f104"; -@fa-var-angle-right: "\f105"; -@fa-var-angle-up: "\f106"; -@fa-var-apple: "\f179"; -@fa-var-archive: "\f187"; -@fa-var-area-chart: "\f1fe"; -@fa-var-arrow-circle-down: "\f0ab"; -@fa-var-arrow-circle-left: "\f0a8"; -@fa-var-arrow-circle-o-down: "\f01a"; -@fa-var-arrow-circle-o-left: "\f190"; -@fa-var-arrow-circle-o-right: "\f18e"; -@fa-var-arrow-circle-o-up: "\f01b"; -@fa-var-arrow-circle-right: "\f0a9"; -@fa-var-arrow-circle-up: "\f0aa"; -@fa-var-arrow-down: "\f063"; -@fa-var-arrow-left: "\f060"; -@fa-var-arrow-right: "\f061"; -@fa-var-arrow-up: "\f062"; -@fa-var-arrows: "\f047"; -@fa-var-arrows-alt: "\f0b2"; -@fa-var-arrows-h: "\f07e"; -@fa-var-arrows-v: "\f07d"; -@fa-var-asterisk: "\f069"; -@fa-var-at: "\f1fa"; -@fa-var-automobile: "\f1b9"; -@fa-var-backward: "\f04a"; -@fa-var-ban: "\f05e"; -@fa-var-bank: "\f19c"; -@fa-var-bar-chart: "\f080"; -@fa-var-bar-chart-o: "\f080"; -@fa-var-barcode: "\f02a"; -@fa-var-bars: "\f0c9"; -@fa-var-beer: "\f0fc"; -@fa-var-behance: "\f1b4"; -@fa-var-behance-square: "\f1b5"; -@fa-var-bell: "\f0f3"; -@fa-var-bell-o: "\f0a2"; -@fa-var-bell-slash: "\f1f6"; -@fa-var-bell-slash-o: "\f1f7"; -@fa-var-bicycle: "\f206"; -@fa-var-binoculars: "\f1e5"; -@fa-var-birthday-cake: "\f1fd"; -@fa-var-bitbucket: "\f171"; -@fa-var-bitbucket-square: "\f172"; -@fa-var-bitcoin: "\f15a"; -@fa-var-bold: "\f032"; -@fa-var-bolt: "\f0e7"; -@fa-var-bomb: "\f1e2"; -@fa-var-book: "\f02d"; -@fa-var-bookmark: "\f02e"; -@fa-var-bookmark-o: "\f097"; -@fa-var-briefcase: "\f0b1"; -@fa-var-btc: "\f15a"; -@fa-var-bug: "\f188"; -@fa-var-building: "\f1ad"; -@fa-var-building-o: "\f0f7"; -@fa-var-bullhorn: "\f0a1"; -@fa-var-bullseye: "\f140"; -@fa-var-bus: "\f207"; -@fa-var-cab: "\f1ba"; -@fa-var-calculator: "\f1ec"; -@fa-var-calendar: "\f073"; -@fa-var-calendar-o: "\f133"; -@fa-var-camera: "\f030"; -@fa-var-camera-retro: "\f083"; -@fa-var-car: "\f1b9"; -@fa-var-caret-down: "\f0d7"; -@fa-var-caret-left: "\f0d9"; -@fa-var-caret-right: "\f0da"; -@fa-var-caret-square-o-down: "\f150"; -@fa-var-caret-square-o-left: "\f191"; -@fa-var-caret-square-o-right: "\f152"; -@fa-var-caret-square-o-up: "\f151"; -@fa-var-caret-up: "\f0d8"; -@fa-var-cc: "\f20a"; -@fa-var-cc-amex: "\f1f3"; -@fa-var-cc-discover: "\f1f2"; -@fa-var-cc-mastercard: "\f1f1"; -@fa-var-cc-paypal: "\f1f4"; -@fa-var-cc-stripe: "\f1f5"; -@fa-var-cc-visa: "\f1f0"; -@fa-var-certificate: "\f0a3"; -@fa-var-chain: "\f0c1"; -@fa-var-chain-broken: "\f127"; -@fa-var-check: "\f00c"; -@fa-var-check-circle: "\f058"; -@fa-var-check-circle-o: "\f05d"; -@fa-var-check-square: "\f14a"; -@fa-var-check-square-o: "\f046"; -@fa-var-chevron-circle-down: "\f13a"; -@fa-var-chevron-circle-left: "\f137"; -@fa-var-chevron-circle-right: "\f138"; -@fa-var-chevron-circle-up: "\f139"; -@fa-var-chevron-down: "\f078"; -@fa-var-chevron-left: "\f053"; -@fa-var-chevron-right: "\f054"; -@fa-var-chevron-up: "\f077"; -@fa-var-child: "\f1ae"; -@fa-var-circle: "\f111"; -@fa-var-circle-o: "\f10c"; -@fa-var-circle-o-notch: "\f1ce"; -@fa-var-circle-thin: "\f1db"; -@fa-var-clipboard: "\f0ea"; -@fa-var-clock-o: "\f017"; -@fa-var-close: "\f00d"; -@fa-var-cloud: "\f0c2"; -@fa-var-cloud-download: "\f0ed"; -@fa-var-cloud-upload: "\f0ee"; -@fa-var-cny: "\f157"; -@fa-var-code: "\f121"; -@fa-var-code-fork: "\f126"; -@fa-var-codepen: "\f1cb"; -@fa-var-coffee: "\f0f4"; -@fa-var-cog: "\f013"; -@fa-var-cogs: "\f085"; -@fa-var-columns: "\f0db"; -@fa-var-comment: "\f075"; -@fa-var-comment-o: "\f0e5"; -@fa-var-comments: "\f086"; -@fa-var-comments-o: "\f0e6"; -@fa-var-compass: "\f14e"; -@fa-var-compress: "\f066"; -@fa-var-copy: "\f0c5"; -@fa-var-copyright: "\f1f9"; -@fa-var-credit-card: "\f09d"; -@fa-var-crop: "\f125"; -@fa-var-crosshairs: "\f05b"; -@fa-var-css3: "\f13c"; -@fa-var-cube: "\f1b2"; -@fa-var-cubes: "\f1b3"; -@fa-var-cut: "\f0c4"; -@fa-var-cutlery: "\f0f5"; -@fa-var-dashboard: "\f0e4"; -@fa-var-database: "\f1c0"; -@fa-var-dedent: "\f03b"; -@fa-var-delicious: "\f1a5"; -@fa-var-desktop: "\f108"; -@fa-var-deviantart: "\f1bd"; -@fa-var-digg: "\f1a6"; -@fa-var-dollar: "\f155"; -@fa-var-dot-circle-o: "\f192"; -@fa-var-download: "\f019"; -@fa-var-dribbble: "\f17d"; -@fa-var-dropbox: "\f16b"; -@fa-var-drupal: "\f1a9"; -@fa-var-edit: "\f044"; -@fa-var-eject: "\f052"; -@fa-var-ellipsis-h: "\f141"; -@fa-var-ellipsis-v: "\f142"; -@fa-var-empire: "\f1d1"; -@fa-var-envelope: "\f0e0"; -@fa-var-envelope-o: "\f003"; -@fa-var-envelope-square: "\f199"; -@fa-var-eraser: "\f12d"; -@fa-var-eur: "\f153"; -@fa-var-euro: "\f153"; -@fa-var-exchange: "\f0ec"; -@fa-var-exclamation: "\f12a"; -@fa-var-exclamation-circle: "\f06a"; -@fa-var-exclamation-triangle: "\f071"; -@fa-var-expand: "\f065"; -@fa-var-external-link: "\f08e"; -@fa-var-external-link-square: "\f14c"; -@fa-var-eye: "\f06e"; -@fa-var-eye-slash: "\f070"; -@fa-var-eyedropper: "\f1fb"; -@fa-var-facebook: "\f09a"; -@fa-var-facebook-square: "\f082"; -@fa-var-fast-backward: "\f049"; -@fa-var-fast-forward: "\f050"; -@fa-var-fax: "\f1ac"; -@fa-var-female: "\f182"; -@fa-var-fighter-jet: "\f0fb"; -@fa-var-file: "\f15b"; -@fa-var-file-archive-o: "\f1c6"; -@fa-var-file-audio-o: "\f1c7"; -@fa-var-file-code-o: "\f1c9"; -@fa-var-file-excel-o: "\f1c3"; -@fa-var-file-image-o: "\f1c5"; -@fa-var-file-movie-o: "\f1c8"; -@fa-var-file-o: "\f016"; -@fa-var-file-pdf-o: "\f1c1"; -@fa-var-file-photo-o: "\f1c5"; -@fa-var-file-picture-o: "\f1c5"; -@fa-var-file-powerpoint-o: "\f1c4"; -@fa-var-file-sound-o: "\f1c7"; -@fa-var-file-text: "\f15c"; -@fa-var-file-text-o: "\f0f6"; -@fa-var-file-video-o: "\f1c8"; -@fa-var-file-word-o: "\f1c2"; -@fa-var-file-zip-o: "\f1c6"; -@fa-var-files-o: "\f0c5"; -@fa-var-film: "\f008"; -@fa-var-filter: "\f0b0"; -@fa-var-fire: "\f06d"; -@fa-var-fire-extinguisher: "\f134"; -@fa-var-flag: "\f024"; -@fa-var-flag-checkered: "\f11e"; -@fa-var-flag-o: "\f11d"; -@fa-var-flash: "\f0e7"; -@fa-var-flask: "\f0c3"; -@fa-var-flickr: "\f16e"; -@fa-var-floppy-o: "\f0c7"; -@fa-var-folder: "\f07b"; -@fa-var-folder-o: "\f114"; -@fa-var-folder-open: "\f07c"; -@fa-var-folder-open-o: "\f115"; -@fa-var-font: "\f031"; -@fa-var-forward: "\f04e"; -@fa-var-foursquare: "\f180"; -@fa-var-frown-o: "\f119"; -@fa-var-futbol-o: "\f1e3"; -@fa-var-gamepad: "\f11b"; -@fa-var-gavel: "\f0e3"; -@fa-var-gbp: "\f154"; -@fa-var-ge: "\f1d1"; -@fa-var-gear: "\f013"; -@fa-var-gears: "\f085"; -@fa-var-gift: "\f06b"; -@fa-var-git: "\f1d3"; -@fa-var-git-square: "\f1d2"; -@fa-var-github: "\f09b"; -@fa-var-github-alt: "\f113"; -@fa-var-github-square: "\f092"; -@fa-var-gittip: "\f184"; -@fa-var-glass: "\f000"; -@fa-var-globe: "\f0ac"; -@fa-var-google: "\f1a0"; -@fa-var-google-plus: "\f0d5"; -@fa-var-google-plus-square: "\f0d4"; -@fa-var-google-wallet: "\f1ee"; -@fa-var-graduation-cap: "\f19d"; -@fa-var-group: "\f0c0"; -@fa-var-h-square: "\f0fd"; -@fa-var-hacker-news: "\f1d4"; -@fa-var-hand-o-down: "\f0a7"; -@fa-var-hand-o-left: "\f0a5"; -@fa-var-hand-o-right: "\f0a4"; -@fa-var-hand-o-up: "\f0a6"; -@fa-var-hdd-o: "\f0a0"; -@fa-var-header: "\f1dc"; -@fa-var-headphones: "\f025"; -@fa-var-heart: "\f004"; -@fa-var-heart-o: "\f08a"; -@fa-var-history: "\f1da"; -@fa-var-home: "\f015"; -@fa-var-hospital-o: "\f0f8"; -@fa-var-html5: "\f13b"; -@fa-var-ils: "\f20b"; -@fa-var-image: "\f03e"; -@fa-var-inbox: "\f01c"; -@fa-var-indent: "\f03c"; -@fa-var-info: "\f129"; -@fa-var-info-circle: "\f05a"; -@fa-var-inr: "\f156"; -@fa-var-instagram: "\f16d"; -@fa-var-institution: "\f19c"; -@fa-var-ioxhost: "\f208"; -@fa-var-italic: "\f033"; -@fa-var-joomla: "\f1aa"; -@fa-var-jpy: "\f157"; -@fa-var-jsfiddle: "\f1cc"; -@fa-var-key: "\f084"; -@fa-var-keyboard-o: "\f11c"; -@fa-var-krw: "\f159"; -@fa-var-language: "\f1ab"; -@fa-var-laptop: "\f109"; -@fa-var-lastfm: "\f202"; -@fa-var-lastfm-square: "\f203"; -@fa-var-leaf: "\f06c"; -@fa-var-legal: "\f0e3"; -@fa-var-lemon-o: "\f094"; -@fa-var-level-down: "\f149"; -@fa-var-level-up: "\f148"; -@fa-var-life-bouy: "\f1cd"; -@fa-var-life-buoy: "\f1cd"; -@fa-var-life-ring: "\f1cd"; -@fa-var-life-saver: "\f1cd"; -@fa-var-lightbulb-o: "\f0eb"; -@fa-var-line-chart: "\f201"; -@fa-var-link: "\f0c1"; -@fa-var-linkedin: "\f0e1"; -@fa-var-linkedin-square: "\f08c"; -@fa-var-linux: "\f17c"; -@fa-var-list: "\f03a"; -@fa-var-list-alt: "\f022"; -@fa-var-list-ol: "\f0cb"; -@fa-var-list-ul: "\f0ca"; -@fa-var-location-arrow: "\f124"; -@fa-var-lock: "\f023"; -@fa-var-long-arrow-down: "\f175"; -@fa-var-long-arrow-left: "\f177"; -@fa-var-long-arrow-right: "\f178"; -@fa-var-long-arrow-up: "\f176"; -@fa-var-magic: "\f0d0"; -@fa-var-magnet: "\f076"; -@fa-var-mail-forward: "\f064"; -@fa-var-mail-reply: "\f112"; -@fa-var-mail-reply-all: "\f122"; -@fa-var-male: "\f183"; -@fa-var-map-marker: "\f041"; -@fa-var-maxcdn: "\f136"; -@fa-var-meanpath: "\f20c"; -@fa-var-medkit: "\f0fa"; -@fa-var-meh-o: "\f11a"; -@fa-var-microphone: "\f130"; -@fa-var-microphone-slash: "\f131"; -@fa-var-minus: "\f068"; -@fa-var-minus-circle: "\f056"; -@fa-var-minus-square: "\f146"; -@fa-var-minus-square-o: "\f147"; -@fa-var-mobile: "\f10b"; -@fa-var-mobile-phone: "\f10b"; -@fa-var-money: "\f0d6"; -@fa-var-moon-o: "\f186"; -@fa-var-mortar-board: "\f19d"; -@fa-var-music: "\f001"; -@fa-var-navicon: "\f0c9"; -@fa-var-newspaper-o: "\f1ea"; -@fa-var-openid: "\f19b"; -@fa-var-outdent: "\f03b"; -@fa-var-pagelines: "\f18c"; -@fa-var-paint-brush: "\f1fc"; -@fa-var-paper-plane: "\f1d8"; -@fa-var-paper-plane-o: "\f1d9"; -@fa-var-paperclip: "\f0c6"; -@fa-var-paragraph: "\f1dd"; -@fa-var-paste: "\f0ea"; -@fa-var-pause: "\f04c"; -@fa-var-paw: "\f1b0"; -@fa-var-paypal: "\f1ed"; -@fa-var-pencil: "\f040"; -@fa-var-pencil-square: "\f14b"; -@fa-var-pencil-square-o: "\f044"; -@fa-var-phone: "\f095"; -@fa-var-phone-square: "\f098"; -@fa-var-photo: "\f03e"; -@fa-var-picture-o: "\f03e"; -@fa-var-pie-chart: "\f200"; -@fa-var-pied-piper: "\f1a7"; -@fa-var-pied-piper-alt: "\f1a8"; -@fa-var-pinterest: "\f0d2"; -@fa-var-pinterest-square: "\f0d3"; -@fa-var-plane: "\f072"; -@fa-var-play: "\f04b"; -@fa-var-play-circle: "\f144"; -@fa-var-play-circle-o: "\f01d"; -@fa-var-plug: "\f1e6"; -@fa-var-plus: "\f067"; -@fa-var-plus-circle: "\f055"; -@fa-var-plus-square: "\f0fe"; -@fa-var-plus-square-o: "\f196"; -@fa-var-power-off: "\f011"; -@fa-var-print: "\f02f"; -@fa-var-puzzle-piece: "\f12e"; -@fa-var-qq: "\f1d6"; -@fa-var-qrcode: "\f029"; -@fa-var-question: "\f128"; -@fa-var-question-circle: "\f059"; -@fa-var-quote-left: "\f10d"; -@fa-var-quote-right: "\f10e"; -@fa-var-ra: "\f1d0"; -@fa-var-random: "\f074"; -@fa-var-rebel: "\f1d0"; -@fa-var-recycle: "\f1b8"; -@fa-var-reddit: "\f1a1"; -@fa-var-reddit-square: "\f1a2"; -@fa-var-refresh: "\f021"; -@fa-var-remove: "\f00d"; -@fa-var-renren: "\f18b"; -@fa-var-reorder: "\f0c9"; -@fa-var-repeat: "\f01e"; -@fa-var-reply: "\f112"; -@fa-var-reply-all: "\f122"; -@fa-var-retweet: "\f079"; -@fa-var-rmb: "\f157"; -@fa-var-road: "\f018"; -@fa-var-rocket: "\f135"; -@fa-var-rotate-left: "\f0e2"; -@fa-var-rotate-right: "\f01e"; -@fa-var-rouble: "\f158"; -@fa-var-rss: "\f09e"; -@fa-var-rss-square: "\f143"; -@fa-var-rub: "\f158"; -@fa-var-ruble: "\f158"; -@fa-var-rupee: "\f156"; -@fa-var-save: "\f0c7"; -@fa-var-scissors: "\f0c4"; -@fa-var-search: "\f002"; -@fa-var-search-minus: "\f010"; -@fa-var-search-plus: "\f00e"; -@fa-var-send: "\f1d8"; -@fa-var-send-o: "\f1d9"; -@fa-var-share: "\f064"; -@fa-var-share-alt: "\f1e0"; -@fa-var-share-alt-square: "\f1e1"; -@fa-var-share-square: "\f14d"; -@fa-var-share-square-o: "\f045"; -@fa-var-shekel: "\f20b"; -@fa-var-sheqel: "\f20b"; -@fa-var-shield: "\f132"; -@fa-var-shopping-cart: "\f07a"; -@fa-var-sign-in: "\f090"; -@fa-var-sign-out: "\f08b"; -@fa-var-signal: "\f012"; -@fa-var-sitemap: "\f0e8"; -@fa-var-skype: "\f17e"; -@fa-var-slack: "\f198"; -@fa-var-sliders: "\f1de"; -@fa-var-slideshare: "\f1e7"; -@fa-var-smile-o: "\f118"; -@fa-var-soccer-ball-o: "\f1e3"; -@fa-var-sort: "\f0dc"; -@fa-var-sort-alpha-asc: "\f15d"; -@fa-var-sort-alpha-desc: "\f15e"; -@fa-var-sort-amount-asc: "\f160"; -@fa-var-sort-amount-desc: "\f161"; -@fa-var-sort-asc: "\f0de"; -@fa-var-sort-desc: "\f0dd"; -@fa-var-sort-down: "\f0dd"; -@fa-var-sort-numeric-asc: "\f162"; -@fa-var-sort-numeric-desc: "\f163"; -@fa-var-sort-up: "\f0de"; -@fa-var-soundcloud: "\f1be"; -@fa-var-space-shuttle: "\f197"; -@fa-var-spinner: "\f110"; -@fa-var-spoon: "\f1b1"; -@fa-var-spotify: "\f1bc"; -@fa-var-square: "\f0c8"; -@fa-var-square-o: "\f096"; -@fa-var-stack-exchange: "\f18d"; -@fa-var-stack-overflow: "\f16c"; -@fa-var-star: "\f005"; -@fa-var-star-half: "\f089"; -@fa-var-star-half-empty: "\f123"; -@fa-var-star-half-full: "\f123"; -@fa-var-star-half-o: "\f123"; -@fa-var-star-o: "\f006"; -@fa-var-steam: "\f1b6"; -@fa-var-steam-square: "\f1b7"; -@fa-var-step-backward: "\f048"; -@fa-var-step-forward: "\f051"; -@fa-var-stethoscope: "\f0f1"; -@fa-var-stop: "\f04d"; -@fa-var-strikethrough: "\f0cc"; -@fa-var-stumbleupon: "\f1a4"; -@fa-var-stumbleupon-circle: "\f1a3"; -@fa-var-subscript: "\f12c"; -@fa-var-suitcase: "\f0f2"; -@fa-var-sun-o: "\f185"; -@fa-var-superscript: "\f12b"; -@fa-var-support: "\f1cd"; -@fa-var-table: "\f0ce"; -@fa-var-tablet: "\f10a"; -@fa-var-tachometer: "\f0e4"; -@fa-var-tag: "\f02b"; -@fa-var-tags: "\f02c"; -@fa-var-tasks: "\f0ae"; -@fa-var-taxi: "\f1ba"; -@fa-var-tencent-weibo: "\f1d5"; -@fa-var-terminal: "\f120"; -@fa-var-text-height: "\f034"; -@fa-var-text-width: "\f035"; -@fa-var-th: "\f00a"; -@fa-var-th-large: "\f009"; -@fa-var-th-list: "\f00b"; -@fa-var-thumb-tack: "\f08d"; -@fa-var-thumbs-down: "\f165"; -@fa-var-thumbs-o-down: "\f088"; -@fa-var-thumbs-o-up: "\f087"; -@fa-var-thumbs-up: "\f164"; -@fa-var-ticket: "\f145"; -@fa-var-times: "\f00d"; -@fa-var-times-circle: "\f057"; -@fa-var-times-circle-o: "\f05c"; -@fa-var-tint: "\f043"; -@fa-var-toggle-down: "\f150"; -@fa-var-toggle-left: "\f191"; -@fa-var-toggle-off: "\f204"; -@fa-var-toggle-on: "\f205"; -@fa-var-toggle-right: "\f152"; -@fa-var-toggle-up: "\f151"; -@fa-var-trash: "\f1f8"; -@fa-var-trash-o: "\f014"; -@fa-var-tree: "\f1bb"; -@fa-var-trello: "\f181"; -@fa-var-trophy: "\f091"; -@fa-var-truck: "\f0d1"; -@fa-var-try: "\f195"; -@fa-var-tty: "\f1e4"; -@fa-var-tumblr: "\f173"; -@fa-var-tumblr-square: "\f174"; -@fa-var-turkish-lira: "\f195"; -@fa-var-twitch: "\f1e8"; -@fa-var-twitter: "\f099"; -@fa-var-twitter-square: "\f081"; -@fa-var-umbrella: "\f0e9"; -@fa-var-underline: "\f0cd"; -@fa-var-undo: "\f0e2"; -@fa-var-university: "\f19c"; -@fa-var-unlink: "\f127"; -@fa-var-unlock: "\f09c"; -@fa-var-unlock-alt: "\f13e"; -@fa-var-unsorted: "\f0dc"; -@fa-var-upload: "\f093"; -@fa-var-usd: "\f155"; -@fa-var-user: "\f007"; -@fa-var-user-md: "\f0f0"; -@fa-var-users: "\f0c0"; -@fa-var-video-camera: "\f03d"; -@fa-var-vimeo-square: "\f194"; -@fa-var-vine: "\f1ca"; -@fa-var-vk: "\f189"; -@fa-var-volume-down: "\f027"; -@fa-var-volume-off: "\f026"; -@fa-var-volume-up: "\f028"; -@fa-var-warning: "\f071"; -@fa-var-wechat: "\f1d7"; -@fa-var-weibo: "\f18a"; -@fa-var-weixin: "\f1d7"; -@fa-var-wheelchair: "\f193"; -@fa-var-wifi: "\f1eb"; -@fa-var-windows: "\f17a"; -@fa-var-won: "\f159"; -@fa-var-wordpress: "\f19a"; -@fa-var-wrench: "\f0ad"; -@fa-var-xing: "\f168"; -@fa-var-xing-square: "\f169"; -@fa-var-yahoo: "\f19e"; -@fa-var-yelp: "\f1e9"; -@fa-var-yen: "\f157"; -@fa-var-youtube: "\f167"; -@fa-var-youtube-play: "\f16a"; -@fa-var-youtube-square: "\f166"; - DELETED cgisetup/www/css/fonts/font-awesome-4.2.0/scss/_bordered-pulled.scss Index: cgisetup/www/css/fonts/font-awesome-4.2.0/scss/_bordered-pulled.scss ================================================================== --- cgisetup/www/css/fonts/font-awesome-4.2.0/scss/_bordered-pulled.scss +++ /dev/null @@ -1,16 +0,0 @@ -// Bordered & Pulled -// ------------------------- - -.#{$fa-css-prefix}-border { - padding: .2em .25em .15em; - border: solid .08em $fa-border-color; - border-radius: .1em; -} - -.pull-right { float: right; } -.pull-left { float: left; } - -.#{$fa-css-prefix} { - &.pull-left { margin-right: .3em; } - &.pull-right { margin-left: .3em; } -} DELETED cgisetup/www/css/fonts/font-awesome-4.2.0/scss/_core.scss Index: cgisetup/www/css/fonts/font-awesome-4.2.0/scss/_core.scss ================================================================== --- cgisetup/www/css/fonts/font-awesome-4.2.0/scss/_core.scss +++ /dev/null @@ -1,11 +0,0 @@ -// Base Class Definition -// ------------------------- - -.#{$fa-css-prefix} { - display: inline-block; - font: normal normal normal 14px/1 FontAwesome; // shortening font declaration - font-size: inherit; // can't have font-size inherit on line above, so need to override - text-rendering: auto; // optimizelegibility throws things off #1094 - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; -} DELETED cgisetup/www/css/fonts/font-awesome-4.2.0/scss/_fixed-width.scss Index: cgisetup/www/css/fonts/font-awesome-4.2.0/scss/_fixed-width.scss ================================================================== --- cgisetup/www/css/fonts/font-awesome-4.2.0/scss/_fixed-width.scss +++ /dev/null @@ -1,6 +0,0 @@ -// Fixed Width Icons -// ------------------------- -.#{$fa-css-prefix}-fw { - width: (18em / 14); - text-align: center; -} DELETED cgisetup/www/css/fonts/font-awesome-4.2.0/scss/_icons.scss Index: cgisetup/www/css/fonts/font-awesome-4.2.0/scss/_icons.scss ================================================================== --- cgisetup/www/css/fonts/font-awesome-4.2.0/scss/_icons.scss +++ /dev/null @@ -1,552 +0,0 @@ -/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen - readers do not read off random characters that represent icons */ - -.#{$fa-css-prefix}-glass:before { content: $fa-var-glass; } -.#{$fa-css-prefix}-music:before { content: $fa-var-music; } -.#{$fa-css-prefix}-search:before { content: $fa-var-search; } -.#{$fa-css-prefix}-envelope-o:before { content: $fa-var-envelope-o; } -.#{$fa-css-prefix}-heart:before { content: $fa-var-heart; } -.#{$fa-css-prefix}-star:before { content: $fa-var-star; } -.#{$fa-css-prefix}-star-o:before { content: $fa-var-star-o; } -.#{$fa-css-prefix}-user:before { content: $fa-var-user; } -.#{$fa-css-prefix}-film:before { content: $fa-var-film; } -.#{$fa-css-prefix}-th-large:before { content: $fa-var-th-large; } -.#{$fa-css-prefix}-th:before { content: $fa-var-th; } -.#{$fa-css-prefix}-th-list:before { content: $fa-var-th-list; } -.#{$fa-css-prefix}-check:before { content: $fa-var-check; } -.#{$fa-css-prefix}-remove:before, -.#{$fa-css-prefix}-close:before, -.#{$fa-css-prefix}-times:before { content: $fa-var-times; } -.#{$fa-css-prefix}-search-plus:before { content: $fa-var-search-plus; } -.#{$fa-css-prefix}-search-minus:before { content: $fa-var-search-minus; } -.#{$fa-css-prefix}-power-off:before { content: $fa-var-power-off; } -.#{$fa-css-prefix}-signal:before { content: $fa-var-signal; } -.#{$fa-css-prefix}-gear:before, -.#{$fa-css-prefix}-cog:before { content: $fa-var-cog; } -.#{$fa-css-prefix}-trash-o:before { content: $fa-var-trash-o; } -.#{$fa-css-prefix}-home:before { content: $fa-var-home; } -.#{$fa-css-prefix}-file-o:before { content: $fa-var-file-o; } -.#{$fa-css-prefix}-clock-o:before { content: $fa-var-clock-o; } -.#{$fa-css-prefix}-road:before { content: $fa-var-road; } -.#{$fa-css-prefix}-download:before { content: $fa-var-download; } -.#{$fa-css-prefix}-arrow-circle-o-down:before { content: $fa-var-arrow-circle-o-down; } -.#{$fa-css-prefix}-arrow-circle-o-up:before { content: $fa-var-arrow-circle-o-up; } -.#{$fa-css-prefix}-inbox:before { content: $fa-var-inbox; } -.#{$fa-css-prefix}-play-circle-o:before { content: $fa-var-play-circle-o; } -.#{$fa-css-prefix}-rotate-right:before, -.#{$fa-css-prefix}-repeat:before { content: $fa-var-repeat; } -.#{$fa-css-prefix}-refresh:before { content: $fa-var-refresh; } -.#{$fa-css-prefix}-list-alt:before { content: $fa-var-list-alt; } -.#{$fa-css-prefix}-lock:before { content: $fa-var-lock; } -.#{$fa-css-prefix}-flag:before { content: $fa-var-flag; } -.#{$fa-css-prefix}-headphones:before { content: $fa-var-headphones; } -.#{$fa-css-prefix}-volume-off:before { content: $fa-var-volume-off; } -.#{$fa-css-prefix}-volume-down:before { content: $fa-var-volume-down; } -.#{$fa-css-prefix}-volume-up:before { content: $fa-var-volume-up; } -.#{$fa-css-prefix}-qrcode:before { content: $fa-var-qrcode; } -.#{$fa-css-prefix}-barcode:before { content: $fa-var-barcode; } -.#{$fa-css-prefix}-tag:before { content: $fa-var-tag; } -.#{$fa-css-prefix}-tags:before { content: $fa-var-tags; } -.#{$fa-css-prefix}-book:before { content: $fa-var-book; } -.#{$fa-css-prefix}-bookmark:before { content: $fa-var-bookmark; } -.#{$fa-css-prefix}-print:before { content: $fa-var-print; } -.#{$fa-css-prefix}-camera:before { content: $fa-var-camera; } -.#{$fa-css-prefix}-font:before { content: $fa-var-font; } -.#{$fa-css-prefix}-bold:before { content: $fa-var-bold; } -.#{$fa-css-prefix}-italic:before { content: $fa-var-italic; } -.#{$fa-css-prefix}-text-height:before { content: $fa-var-text-height; } -.#{$fa-css-prefix}-text-width:before { content: $fa-var-text-width; } -.#{$fa-css-prefix}-align-left:before { content: $fa-var-align-left; } -.#{$fa-css-prefix}-align-center:before { content: $fa-var-align-center; } -.#{$fa-css-prefix}-align-right:before { content: $fa-var-align-right; } -.#{$fa-css-prefix}-align-justify:before { content: $fa-var-align-justify; } -.#{$fa-css-prefix}-list:before { content: $fa-var-list; } -.#{$fa-css-prefix}-dedent:before, -.#{$fa-css-prefix}-outdent:before { content: $fa-var-outdent; } -.#{$fa-css-prefix}-indent:before { content: $fa-var-indent; } -.#{$fa-css-prefix}-video-camera:before { content: $fa-var-video-camera; } -.#{$fa-css-prefix}-photo:before, -.#{$fa-css-prefix}-image:before, -.#{$fa-css-prefix}-picture-o:before { content: $fa-var-picture-o; } -.#{$fa-css-prefix}-pencil:before { content: $fa-var-pencil; } -.#{$fa-css-prefix}-map-marker:before { content: $fa-var-map-marker; } -.#{$fa-css-prefix}-adjust:before { content: $fa-var-adjust; } -.#{$fa-css-prefix}-tint:before { content: $fa-var-tint; } -.#{$fa-css-prefix}-edit:before, -.#{$fa-css-prefix}-pencil-square-o:before { content: $fa-var-pencil-square-o; } -.#{$fa-css-prefix}-share-square-o:before { content: $fa-var-share-square-o; } -.#{$fa-css-prefix}-check-square-o:before { content: $fa-var-check-square-o; } -.#{$fa-css-prefix}-arrows:before { content: $fa-var-arrows; } -.#{$fa-css-prefix}-step-backward:before { content: $fa-var-step-backward; } -.#{$fa-css-prefix}-fast-backward:before { content: $fa-var-fast-backward; } -.#{$fa-css-prefix}-backward:before { content: $fa-var-backward; } -.#{$fa-css-prefix}-play:before { content: $fa-var-play; } -.#{$fa-css-prefix}-pause:before { content: $fa-var-pause; } -.#{$fa-css-prefix}-stop:before { content: $fa-var-stop; } -.#{$fa-css-prefix}-forward:before { content: $fa-var-forward; } -.#{$fa-css-prefix}-fast-forward:before { content: $fa-var-fast-forward; } -.#{$fa-css-prefix}-step-forward:before { content: $fa-var-step-forward; } -.#{$fa-css-prefix}-eject:before { content: $fa-var-eject; } -.#{$fa-css-prefix}-chevron-left:before { content: $fa-var-chevron-left; } -.#{$fa-css-prefix}-chevron-right:before { content: $fa-var-chevron-right; } -.#{$fa-css-prefix}-plus-circle:before { content: $fa-var-plus-circle; } -.#{$fa-css-prefix}-minus-circle:before { content: $fa-var-minus-circle; } -.#{$fa-css-prefix}-times-circle:before { content: $fa-var-times-circle; } -.#{$fa-css-prefix}-check-circle:before { content: $fa-var-check-circle; } -.#{$fa-css-prefix}-question-circle:before { content: $fa-var-question-circle; } -.#{$fa-css-prefix}-info-circle:before { content: $fa-var-info-circle; } -.#{$fa-css-prefix}-crosshairs:before { content: $fa-var-crosshairs; } -.#{$fa-css-prefix}-times-circle-o:before { content: $fa-var-times-circle-o; } -.#{$fa-css-prefix}-check-circle-o:before { content: $fa-var-check-circle-o; } -.#{$fa-css-prefix}-ban:before { content: $fa-var-ban; } -.#{$fa-css-prefix}-arrow-left:before { content: $fa-var-arrow-left; } -.#{$fa-css-prefix}-arrow-right:before { content: $fa-var-arrow-right; } -.#{$fa-css-prefix}-arrow-up:before { content: $fa-var-arrow-up; } -.#{$fa-css-prefix}-arrow-down:before { content: $fa-var-arrow-down; } -.#{$fa-css-prefix}-mail-forward:before, -.#{$fa-css-prefix}-share:before { content: $fa-var-share; } -.#{$fa-css-prefix}-expand:before { content: $fa-var-expand; } -.#{$fa-css-prefix}-compress:before { content: $fa-var-compress; } -.#{$fa-css-prefix}-plus:before { content: $fa-var-plus; } -.#{$fa-css-prefix}-minus:before { content: $fa-var-minus; } -.#{$fa-css-prefix}-asterisk:before { content: $fa-var-asterisk; } -.#{$fa-css-prefix}-exclamation-circle:before { content: $fa-var-exclamation-circle; } -.#{$fa-css-prefix}-gift:before { content: $fa-var-gift; } -.#{$fa-css-prefix}-leaf:before { content: $fa-var-leaf; } -.#{$fa-css-prefix}-fire:before { content: $fa-var-fire; } -.#{$fa-css-prefix}-eye:before { content: $fa-var-eye; } -.#{$fa-css-prefix}-eye-slash:before { content: $fa-var-eye-slash; } -.#{$fa-css-prefix}-warning:before, -.#{$fa-css-prefix}-exclamation-triangle:before { content: $fa-var-exclamation-triangle; } -.#{$fa-css-prefix}-plane:before { content: $fa-var-plane; } -.#{$fa-css-prefix}-calendar:before { content: $fa-var-calendar; } -.#{$fa-css-prefix}-random:before { content: $fa-var-random; } -.#{$fa-css-prefix}-comment:before { content: $fa-var-comment; } -.#{$fa-css-prefix}-magnet:before { content: $fa-var-magnet; } -.#{$fa-css-prefix}-chevron-up:before { content: $fa-var-chevron-up; } -.#{$fa-css-prefix}-chevron-down:before { content: $fa-var-chevron-down; } -.#{$fa-css-prefix}-retweet:before { content: $fa-var-retweet; } -.#{$fa-css-prefix}-shopping-cart:before { content: $fa-var-shopping-cart; } -.#{$fa-css-prefix}-folder:before { content: $fa-var-folder; } -.#{$fa-css-prefix}-folder-open:before { content: $fa-var-folder-open; } -.#{$fa-css-prefix}-arrows-v:before { content: $fa-var-arrows-v; } -.#{$fa-css-prefix}-arrows-h:before { content: $fa-var-arrows-h; } -.#{$fa-css-prefix}-bar-chart-o:before, -.#{$fa-css-prefix}-bar-chart:before { content: $fa-var-bar-chart; } -.#{$fa-css-prefix}-twitter-square:before { content: $fa-var-twitter-square; } -.#{$fa-css-prefix}-facebook-square:before { content: $fa-var-facebook-square; } -.#{$fa-css-prefix}-camera-retro:before { content: $fa-var-camera-retro; } -.#{$fa-css-prefix}-key:before { content: $fa-var-key; } -.#{$fa-css-prefix}-gears:before, -.#{$fa-css-prefix}-cogs:before { content: $fa-var-cogs; } -.#{$fa-css-prefix}-comments:before { content: $fa-var-comments; } -.#{$fa-css-prefix}-thumbs-o-up:before { content: $fa-var-thumbs-o-up; } -.#{$fa-css-prefix}-thumbs-o-down:before { content: $fa-var-thumbs-o-down; } -.#{$fa-css-prefix}-star-half:before { content: $fa-var-star-half; } -.#{$fa-css-prefix}-heart-o:before { content: $fa-var-heart-o; } -.#{$fa-css-prefix}-sign-out:before { content: $fa-var-sign-out; } -.#{$fa-css-prefix}-linkedin-square:before { content: $fa-var-linkedin-square; } -.#{$fa-css-prefix}-thumb-tack:before { content: $fa-var-thumb-tack; } -.#{$fa-css-prefix}-external-link:before { content: $fa-var-external-link; } -.#{$fa-css-prefix}-sign-in:before { content: $fa-var-sign-in; } -.#{$fa-css-prefix}-trophy:before { content: $fa-var-trophy; } -.#{$fa-css-prefix}-github-square:before { content: $fa-var-github-square; } -.#{$fa-css-prefix}-upload:before { content: $fa-var-upload; } -.#{$fa-css-prefix}-lemon-o:before { content: $fa-var-lemon-o; } -.#{$fa-css-prefix}-phone:before { content: $fa-var-phone; } -.#{$fa-css-prefix}-square-o:before { content: $fa-var-square-o; } -.#{$fa-css-prefix}-bookmark-o:before { content: $fa-var-bookmark-o; } -.#{$fa-css-prefix}-phone-square:before { content: $fa-var-phone-square; } -.#{$fa-css-prefix}-twitter:before { content: $fa-var-twitter; } -.#{$fa-css-prefix}-facebook:before { content: $fa-var-facebook; } -.#{$fa-css-prefix}-github:before { content: $fa-var-github; } -.#{$fa-css-prefix}-unlock:before { content: $fa-var-unlock; } -.#{$fa-css-prefix}-credit-card:before { content: $fa-var-credit-card; } -.#{$fa-css-prefix}-rss:before { content: $fa-var-rss; } -.#{$fa-css-prefix}-hdd-o:before { content: $fa-var-hdd-o; } -.#{$fa-css-prefix}-bullhorn:before { content: $fa-var-bullhorn; } -.#{$fa-css-prefix}-bell:before { content: $fa-var-bell; } -.#{$fa-css-prefix}-certificate:before { content: $fa-var-certificate; } -.#{$fa-css-prefix}-hand-o-right:before { content: $fa-var-hand-o-right; } -.#{$fa-css-prefix}-hand-o-left:before { content: $fa-var-hand-o-left; } -.#{$fa-css-prefix}-hand-o-up:before { content: $fa-var-hand-o-up; } -.#{$fa-css-prefix}-hand-o-down:before { content: $fa-var-hand-o-down; } -.#{$fa-css-prefix}-arrow-circle-left:before { content: $fa-var-arrow-circle-left; } -.#{$fa-css-prefix}-arrow-circle-right:before { content: $fa-var-arrow-circle-right; } -.#{$fa-css-prefix}-arrow-circle-up:before { content: $fa-var-arrow-circle-up; } -.#{$fa-css-prefix}-arrow-circle-down:before { content: $fa-var-arrow-circle-down; } -.#{$fa-css-prefix}-globe:before { content: $fa-var-globe; } -.#{$fa-css-prefix}-wrench:before { content: $fa-var-wrench; } -.#{$fa-css-prefix}-tasks:before { content: $fa-var-tasks; } -.#{$fa-css-prefix}-filter:before { content: $fa-var-filter; } -.#{$fa-css-prefix}-briefcase:before { content: $fa-var-briefcase; } -.#{$fa-css-prefix}-arrows-alt:before { content: $fa-var-arrows-alt; } -.#{$fa-css-prefix}-group:before, -.#{$fa-css-prefix}-users:before { content: $fa-var-users; } -.#{$fa-css-prefix}-chain:before, -.#{$fa-css-prefix}-link:before { content: $fa-var-link; } -.#{$fa-css-prefix}-cloud:before { content: $fa-var-cloud; } -.#{$fa-css-prefix}-flask:before { content: $fa-var-flask; } -.#{$fa-css-prefix}-cut:before, -.#{$fa-css-prefix}-scissors:before { content: $fa-var-scissors; } -.#{$fa-css-prefix}-copy:before, -.#{$fa-css-prefix}-files-o:before { content: $fa-var-files-o; } -.#{$fa-css-prefix}-paperclip:before { content: $fa-var-paperclip; } -.#{$fa-css-prefix}-save:before, -.#{$fa-css-prefix}-floppy-o:before { content: $fa-var-floppy-o; } -.#{$fa-css-prefix}-square:before { content: $fa-var-square; } -.#{$fa-css-prefix}-navicon:before, -.#{$fa-css-prefix}-reorder:before, -.#{$fa-css-prefix}-bars:before { content: $fa-var-bars; } -.#{$fa-css-prefix}-list-ul:before { content: $fa-var-list-ul; } -.#{$fa-css-prefix}-list-ol:before { content: $fa-var-list-ol; } -.#{$fa-css-prefix}-strikethrough:before { content: $fa-var-strikethrough; } -.#{$fa-css-prefix}-underline:before { content: $fa-var-underline; } -.#{$fa-css-prefix}-table:before { content: $fa-var-table; } -.#{$fa-css-prefix}-magic:before { content: $fa-var-magic; } -.#{$fa-css-prefix}-truck:before { content: $fa-var-truck; } -.#{$fa-css-prefix}-pinterest:before { content: $fa-var-pinterest; } -.#{$fa-css-prefix}-pinterest-square:before { content: $fa-var-pinterest-square; } -.#{$fa-css-prefix}-google-plus-square:before { content: $fa-var-google-plus-square; } -.#{$fa-css-prefix}-google-plus:before { content: $fa-var-google-plus; } -.#{$fa-css-prefix}-money:before { content: $fa-var-money; } -.#{$fa-css-prefix}-caret-down:before { content: $fa-var-caret-down; } -.#{$fa-css-prefix}-caret-up:before { content: $fa-var-caret-up; } -.#{$fa-css-prefix}-caret-left:before { content: $fa-var-caret-left; } -.#{$fa-css-prefix}-caret-right:before { content: $fa-var-caret-right; } -.#{$fa-css-prefix}-columns:before { content: $fa-var-columns; } -.#{$fa-css-prefix}-unsorted:before, -.#{$fa-css-prefix}-sort:before { content: $fa-var-sort; } -.#{$fa-css-prefix}-sort-down:before, -.#{$fa-css-prefix}-sort-desc:before { content: $fa-var-sort-desc; } -.#{$fa-css-prefix}-sort-up:before, -.#{$fa-css-prefix}-sort-asc:before { content: $fa-var-sort-asc; } -.#{$fa-css-prefix}-envelope:before { content: $fa-var-envelope; } -.#{$fa-css-prefix}-linkedin:before { content: $fa-var-linkedin; } -.#{$fa-css-prefix}-rotate-left:before, -.#{$fa-css-prefix}-undo:before { content: $fa-var-undo; } -.#{$fa-css-prefix}-legal:before, -.#{$fa-css-prefix}-gavel:before { content: $fa-var-gavel; } -.#{$fa-css-prefix}-dashboard:before, -.#{$fa-css-prefix}-tachometer:before { content: $fa-var-tachometer; } -.#{$fa-css-prefix}-comment-o:before { content: $fa-var-comment-o; } -.#{$fa-css-prefix}-comments-o:before { content: $fa-var-comments-o; } -.#{$fa-css-prefix}-flash:before, -.#{$fa-css-prefix}-bolt:before { content: $fa-var-bolt; } -.#{$fa-css-prefix}-sitemap:before { content: $fa-var-sitemap; } -.#{$fa-css-prefix}-umbrella:before { content: $fa-var-umbrella; } -.#{$fa-css-prefix}-paste:before, -.#{$fa-css-prefix}-clipboard:before { content: $fa-var-clipboard; } -.#{$fa-css-prefix}-lightbulb-o:before { content: $fa-var-lightbulb-o; } -.#{$fa-css-prefix}-exchange:before { content: $fa-var-exchange; } -.#{$fa-css-prefix}-cloud-download:before { content: $fa-var-cloud-download; } -.#{$fa-css-prefix}-cloud-upload:before { content: $fa-var-cloud-upload; } -.#{$fa-css-prefix}-user-md:before { content: $fa-var-user-md; } -.#{$fa-css-prefix}-stethoscope:before { content: $fa-var-stethoscope; } -.#{$fa-css-prefix}-suitcase:before { content: $fa-var-suitcase; } -.#{$fa-css-prefix}-bell-o:before { content: $fa-var-bell-o; } -.#{$fa-css-prefix}-coffee:before { content: $fa-var-coffee; } -.#{$fa-css-prefix}-cutlery:before { content: $fa-var-cutlery; } -.#{$fa-css-prefix}-file-text-o:before { content: $fa-var-file-text-o; } -.#{$fa-css-prefix}-building-o:before { content: $fa-var-building-o; } -.#{$fa-css-prefix}-hospital-o:before { content: $fa-var-hospital-o; } -.#{$fa-css-prefix}-ambulance:before { content: $fa-var-ambulance; } -.#{$fa-css-prefix}-medkit:before { content: $fa-var-medkit; } -.#{$fa-css-prefix}-fighter-jet:before { content: $fa-var-fighter-jet; } -.#{$fa-css-prefix}-beer:before { content: $fa-var-beer; } -.#{$fa-css-prefix}-h-square:before { content: $fa-var-h-square; } -.#{$fa-css-prefix}-plus-square:before { content: $fa-var-plus-square; } -.#{$fa-css-prefix}-angle-double-left:before { content: $fa-var-angle-double-left; } -.#{$fa-css-prefix}-angle-double-right:before { content: $fa-var-angle-double-right; } -.#{$fa-css-prefix}-angle-double-up:before { content: $fa-var-angle-double-up; } -.#{$fa-css-prefix}-angle-double-down:before { content: $fa-var-angle-double-down; } -.#{$fa-css-prefix}-angle-left:before { content: $fa-var-angle-left; } -.#{$fa-css-prefix}-angle-right:before { content: $fa-var-angle-right; } -.#{$fa-css-prefix}-angle-up:before { content: $fa-var-angle-up; } -.#{$fa-css-prefix}-angle-down:before { content: $fa-var-angle-down; } -.#{$fa-css-prefix}-desktop:before { content: $fa-var-desktop; } -.#{$fa-css-prefix}-laptop:before { content: $fa-var-laptop; } -.#{$fa-css-prefix}-tablet:before { content: $fa-var-tablet; } -.#{$fa-css-prefix}-mobile-phone:before, -.#{$fa-css-prefix}-mobile:before { content: $fa-var-mobile; } -.#{$fa-css-prefix}-circle-o:before { content: $fa-var-circle-o; } -.#{$fa-css-prefix}-quote-left:before { content: $fa-var-quote-left; } -.#{$fa-css-prefix}-quote-right:before { content: $fa-var-quote-right; } -.#{$fa-css-prefix}-spinner:before { content: $fa-var-spinner; } -.#{$fa-css-prefix}-circle:before { content: $fa-var-circle; } -.#{$fa-css-prefix}-mail-reply:before, -.#{$fa-css-prefix}-reply:before { content: $fa-var-reply; } -.#{$fa-css-prefix}-github-alt:before { content: $fa-var-github-alt; } -.#{$fa-css-prefix}-folder-o:before { content: $fa-var-folder-o; } -.#{$fa-css-prefix}-folder-open-o:before { content: $fa-var-folder-open-o; } -.#{$fa-css-prefix}-smile-o:before { content: $fa-var-smile-o; } -.#{$fa-css-prefix}-frown-o:before { content: $fa-var-frown-o; } -.#{$fa-css-prefix}-meh-o:before { content: $fa-var-meh-o; } -.#{$fa-css-prefix}-gamepad:before { content: $fa-var-gamepad; } -.#{$fa-css-prefix}-keyboard-o:before { content: $fa-var-keyboard-o; } -.#{$fa-css-prefix}-flag-o:before { content: $fa-var-flag-o; } -.#{$fa-css-prefix}-flag-checkered:before { content: $fa-var-flag-checkered; } -.#{$fa-css-prefix}-terminal:before { content: $fa-var-terminal; } -.#{$fa-css-prefix}-code:before { content: $fa-var-code; } -.#{$fa-css-prefix}-mail-reply-all:before, -.#{$fa-css-prefix}-reply-all:before { content: $fa-var-reply-all; } -.#{$fa-css-prefix}-star-half-empty:before, -.#{$fa-css-prefix}-star-half-full:before, -.#{$fa-css-prefix}-star-half-o:before { content: $fa-var-star-half-o; } -.#{$fa-css-prefix}-location-arrow:before { content: $fa-var-location-arrow; } -.#{$fa-css-prefix}-crop:before { content: $fa-var-crop; } -.#{$fa-css-prefix}-code-fork:before { content: $fa-var-code-fork; } -.#{$fa-css-prefix}-unlink:before, -.#{$fa-css-prefix}-chain-broken:before { content: $fa-var-chain-broken; } -.#{$fa-css-prefix}-question:before { content: $fa-var-question; } -.#{$fa-css-prefix}-info:before { content: $fa-var-info; } -.#{$fa-css-prefix}-exclamation:before { content: $fa-var-exclamation; } -.#{$fa-css-prefix}-superscript:before { content: $fa-var-superscript; } -.#{$fa-css-prefix}-subscript:before { content: $fa-var-subscript; } -.#{$fa-css-prefix}-eraser:before { content: $fa-var-eraser; } -.#{$fa-css-prefix}-puzzle-piece:before { content: $fa-var-puzzle-piece; } -.#{$fa-css-prefix}-microphone:before { content: $fa-var-microphone; } -.#{$fa-css-prefix}-microphone-slash:before { content: $fa-var-microphone-slash; } -.#{$fa-css-prefix}-shield:before { content: $fa-var-shield; } -.#{$fa-css-prefix}-calendar-o:before { content: $fa-var-calendar-o; } -.#{$fa-css-prefix}-fire-extinguisher:before { content: $fa-var-fire-extinguisher; } -.#{$fa-css-prefix}-rocket:before { content: $fa-var-rocket; } -.#{$fa-css-prefix}-maxcdn:before { content: $fa-var-maxcdn; } -.#{$fa-css-prefix}-chevron-circle-left:before { content: $fa-var-chevron-circle-left; } -.#{$fa-css-prefix}-chevron-circle-right:before { content: $fa-var-chevron-circle-right; } -.#{$fa-css-prefix}-chevron-circle-up:before { content: $fa-var-chevron-circle-up; } -.#{$fa-css-prefix}-chevron-circle-down:before { content: $fa-var-chevron-circle-down; } -.#{$fa-css-prefix}-html5:before { content: $fa-var-html5; } -.#{$fa-css-prefix}-css3:before { content: $fa-var-css3; } -.#{$fa-css-prefix}-anchor:before { content: $fa-var-anchor; } -.#{$fa-css-prefix}-unlock-alt:before { content: $fa-var-unlock-alt; } -.#{$fa-css-prefix}-bullseye:before { content: $fa-var-bullseye; } -.#{$fa-css-prefix}-ellipsis-h:before { content: $fa-var-ellipsis-h; } -.#{$fa-css-prefix}-ellipsis-v:before { content: $fa-var-ellipsis-v; } -.#{$fa-css-prefix}-rss-square:before { content: $fa-var-rss-square; } -.#{$fa-css-prefix}-play-circle:before { content: $fa-var-play-circle; } -.#{$fa-css-prefix}-ticket:before { content: $fa-var-ticket; } -.#{$fa-css-prefix}-minus-square:before { content: $fa-var-minus-square; } -.#{$fa-css-prefix}-minus-square-o:before { content: $fa-var-minus-square-o; } -.#{$fa-css-prefix}-level-up:before { content: $fa-var-level-up; } -.#{$fa-css-prefix}-level-down:before { content: $fa-var-level-down; } -.#{$fa-css-prefix}-check-square:before { content: $fa-var-check-square; } -.#{$fa-css-prefix}-pencil-square:before { content: $fa-var-pencil-square; } -.#{$fa-css-prefix}-external-link-square:before { content: $fa-var-external-link-square; } -.#{$fa-css-prefix}-share-square:before { content: $fa-var-share-square; } -.#{$fa-css-prefix}-compass:before { content: $fa-var-compass; } -.#{$fa-css-prefix}-toggle-down:before, -.#{$fa-css-prefix}-caret-square-o-down:before { content: $fa-var-caret-square-o-down; } -.#{$fa-css-prefix}-toggle-up:before, -.#{$fa-css-prefix}-caret-square-o-up:before { content: $fa-var-caret-square-o-up; } -.#{$fa-css-prefix}-toggle-right:before, -.#{$fa-css-prefix}-caret-square-o-right:before { content: $fa-var-caret-square-o-right; } -.#{$fa-css-prefix}-euro:before, -.#{$fa-css-prefix}-eur:before { content: $fa-var-eur; } -.#{$fa-css-prefix}-gbp:before { content: $fa-var-gbp; } -.#{$fa-css-prefix}-dollar:before, -.#{$fa-css-prefix}-usd:before { content: $fa-var-usd; } -.#{$fa-css-prefix}-rupee:before, -.#{$fa-css-prefix}-inr:before { content: $fa-var-inr; } -.#{$fa-css-prefix}-cny:before, -.#{$fa-css-prefix}-rmb:before, -.#{$fa-css-prefix}-yen:before, -.#{$fa-css-prefix}-jpy:before { content: $fa-var-jpy; } -.#{$fa-css-prefix}-ruble:before, -.#{$fa-css-prefix}-rouble:before, -.#{$fa-css-prefix}-rub:before { content: $fa-var-rub; } -.#{$fa-css-prefix}-won:before, -.#{$fa-css-prefix}-krw:before { content: $fa-var-krw; } -.#{$fa-css-prefix}-bitcoin:before, -.#{$fa-css-prefix}-btc:before { content: $fa-var-btc; } -.#{$fa-css-prefix}-file:before { content: $fa-var-file; } -.#{$fa-css-prefix}-file-text:before { content: $fa-var-file-text; } -.#{$fa-css-prefix}-sort-alpha-asc:before { content: $fa-var-sort-alpha-asc; } -.#{$fa-css-prefix}-sort-alpha-desc:before { content: $fa-var-sort-alpha-desc; } -.#{$fa-css-prefix}-sort-amount-asc:before { content: $fa-var-sort-amount-asc; } -.#{$fa-css-prefix}-sort-amount-desc:before { content: $fa-var-sort-amount-desc; } -.#{$fa-css-prefix}-sort-numeric-asc:before { content: $fa-var-sort-numeric-asc; } -.#{$fa-css-prefix}-sort-numeric-desc:before { content: $fa-var-sort-numeric-desc; } -.#{$fa-css-prefix}-thumbs-up:before { content: $fa-var-thumbs-up; } -.#{$fa-css-prefix}-thumbs-down:before { content: $fa-var-thumbs-down; } -.#{$fa-css-prefix}-youtube-square:before { content: $fa-var-youtube-square; } -.#{$fa-css-prefix}-youtube:before { content: $fa-var-youtube; } -.#{$fa-css-prefix}-xing:before { content: $fa-var-xing; } -.#{$fa-css-prefix}-xing-square:before { content: $fa-var-xing-square; } -.#{$fa-css-prefix}-youtube-play:before { content: $fa-var-youtube-play; } -.#{$fa-css-prefix}-dropbox:before { content: $fa-var-dropbox; } -.#{$fa-css-prefix}-stack-overflow:before { content: $fa-var-stack-overflow; } -.#{$fa-css-prefix}-instagram:before { content: $fa-var-instagram; } -.#{$fa-css-prefix}-flickr:before { content: $fa-var-flickr; } -.#{$fa-css-prefix}-adn:before { content: $fa-var-adn; } -.#{$fa-css-prefix}-bitbucket:before { content: $fa-var-bitbucket; } -.#{$fa-css-prefix}-bitbucket-square:before { content: $fa-var-bitbucket-square; } -.#{$fa-css-prefix}-tumblr:before { content: $fa-var-tumblr; } -.#{$fa-css-prefix}-tumblr-square:before { content: $fa-var-tumblr-square; } -.#{$fa-css-prefix}-long-arrow-down:before { content: $fa-var-long-arrow-down; } -.#{$fa-css-prefix}-long-arrow-up:before { content: $fa-var-long-arrow-up; } -.#{$fa-css-prefix}-long-arrow-left:before { content: $fa-var-long-arrow-left; } -.#{$fa-css-prefix}-long-arrow-right:before { content: $fa-var-long-arrow-right; } -.#{$fa-css-prefix}-apple:before { content: $fa-var-apple; } -.#{$fa-css-prefix}-windows:before { content: $fa-var-windows; } -.#{$fa-css-prefix}-android:before { content: $fa-var-android; } -.#{$fa-css-prefix}-linux:before { content: $fa-var-linux; } -.#{$fa-css-prefix}-dribbble:before { content: $fa-var-dribbble; } -.#{$fa-css-prefix}-skype:before { content: $fa-var-skype; } -.#{$fa-css-prefix}-foursquare:before { content: $fa-var-foursquare; } -.#{$fa-css-prefix}-trello:before { content: $fa-var-trello; } -.#{$fa-css-prefix}-female:before { content: $fa-var-female; } -.#{$fa-css-prefix}-male:before { content: $fa-var-male; } -.#{$fa-css-prefix}-gittip:before { content: $fa-var-gittip; } -.#{$fa-css-prefix}-sun-o:before { content: $fa-var-sun-o; } -.#{$fa-css-prefix}-moon-o:before { content: $fa-var-moon-o; } -.#{$fa-css-prefix}-archive:before { content: $fa-var-archive; } -.#{$fa-css-prefix}-bug:before { content: $fa-var-bug; } -.#{$fa-css-prefix}-vk:before { content: $fa-var-vk; } -.#{$fa-css-prefix}-weibo:before { content: $fa-var-weibo; } -.#{$fa-css-prefix}-renren:before { content: $fa-var-renren; } -.#{$fa-css-prefix}-pagelines:before { content: $fa-var-pagelines; } -.#{$fa-css-prefix}-stack-exchange:before { content: $fa-var-stack-exchange; } -.#{$fa-css-prefix}-arrow-circle-o-right:before { content: $fa-var-arrow-circle-o-right; } -.#{$fa-css-prefix}-arrow-circle-o-left:before { content: $fa-var-arrow-circle-o-left; } -.#{$fa-css-prefix}-toggle-left:before, -.#{$fa-css-prefix}-caret-square-o-left:before { content: $fa-var-caret-square-o-left; } -.#{$fa-css-prefix}-dot-circle-o:before { content: $fa-var-dot-circle-o; } -.#{$fa-css-prefix}-wheelchair:before { content: $fa-var-wheelchair; } -.#{$fa-css-prefix}-vimeo-square:before { content: $fa-var-vimeo-square; } -.#{$fa-css-prefix}-turkish-lira:before, -.#{$fa-css-prefix}-try:before { content: $fa-var-try; } -.#{$fa-css-prefix}-plus-square-o:before { content: $fa-var-plus-square-o; } -.#{$fa-css-prefix}-space-shuttle:before { content: $fa-var-space-shuttle; } -.#{$fa-css-prefix}-slack:before { content: $fa-var-slack; } -.#{$fa-css-prefix}-envelope-square:before { content: $fa-var-envelope-square; } -.#{$fa-css-prefix}-wordpress:before { content: $fa-var-wordpress; } -.#{$fa-css-prefix}-openid:before { content: $fa-var-openid; } -.#{$fa-css-prefix}-institution:before, -.#{$fa-css-prefix}-bank:before, -.#{$fa-css-prefix}-university:before { content: $fa-var-university; } -.#{$fa-css-prefix}-mortar-board:before, -.#{$fa-css-prefix}-graduation-cap:before { content: $fa-var-graduation-cap; } -.#{$fa-css-prefix}-yahoo:before { content: $fa-var-yahoo; } -.#{$fa-css-prefix}-google:before { content: $fa-var-google; } -.#{$fa-css-prefix}-reddit:before { content: $fa-var-reddit; } -.#{$fa-css-prefix}-reddit-square:before { content: $fa-var-reddit-square; } -.#{$fa-css-prefix}-stumbleupon-circle:before { content: $fa-var-stumbleupon-circle; } -.#{$fa-css-prefix}-stumbleupon:before { content: $fa-var-stumbleupon; } -.#{$fa-css-prefix}-delicious:before { content: $fa-var-delicious; } -.#{$fa-css-prefix}-digg:before { content: $fa-var-digg; } -.#{$fa-css-prefix}-pied-piper:before { content: $fa-var-pied-piper; } -.#{$fa-css-prefix}-pied-piper-alt:before { content: $fa-var-pied-piper-alt; } -.#{$fa-css-prefix}-drupal:before { content: $fa-var-drupal; } -.#{$fa-css-prefix}-joomla:before { content: $fa-var-joomla; } -.#{$fa-css-prefix}-language:before { content: $fa-var-language; } -.#{$fa-css-prefix}-fax:before { content: $fa-var-fax; } -.#{$fa-css-prefix}-building:before { content: $fa-var-building; } -.#{$fa-css-prefix}-child:before { content: $fa-var-child; } -.#{$fa-css-prefix}-paw:before { content: $fa-var-paw; } -.#{$fa-css-prefix}-spoon:before { content: $fa-var-spoon; } -.#{$fa-css-prefix}-cube:before { content: $fa-var-cube; } -.#{$fa-css-prefix}-cubes:before { content: $fa-var-cubes; } -.#{$fa-css-prefix}-behance:before { content: $fa-var-behance; } -.#{$fa-css-prefix}-behance-square:before { content: $fa-var-behance-square; } -.#{$fa-css-prefix}-steam:before { content: $fa-var-steam; } -.#{$fa-css-prefix}-steam-square:before { content: $fa-var-steam-square; } -.#{$fa-css-prefix}-recycle:before { content: $fa-var-recycle; } -.#{$fa-css-prefix}-automobile:before, -.#{$fa-css-prefix}-car:before { content: $fa-var-car; } -.#{$fa-css-prefix}-cab:before, -.#{$fa-css-prefix}-taxi:before { content: $fa-var-taxi; } -.#{$fa-css-prefix}-tree:before { content: $fa-var-tree; } -.#{$fa-css-prefix}-spotify:before { content: $fa-var-spotify; } -.#{$fa-css-prefix}-deviantart:before { content: $fa-var-deviantart; } -.#{$fa-css-prefix}-soundcloud:before { content: $fa-var-soundcloud; } -.#{$fa-css-prefix}-database:before { content: $fa-var-database; } -.#{$fa-css-prefix}-file-pdf-o:before { content: $fa-var-file-pdf-o; } -.#{$fa-css-prefix}-file-word-o:before { content: $fa-var-file-word-o; } -.#{$fa-css-prefix}-file-excel-o:before { content: $fa-var-file-excel-o; } -.#{$fa-css-prefix}-file-powerpoint-o:before { content: $fa-var-file-powerpoint-o; } -.#{$fa-css-prefix}-file-photo-o:before, -.#{$fa-css-prefix}-file-picture-o:before, -.#{$fa-css-prefix}-file-image-o:before { content: $fa-var-file-image-o; } -.#{$fa-css-prefix}-file-zip-o:before, -.#{$fa-css-prefix}-file-archive-o:before { content: $fa-var-file-archive-o; } -.#{$fa-css-prefix}-file-sound-o:before, -.#{$fa-css-prefix}-file-audio-o:before { content: $fa-var-file-audio-o; } -.#{$fa-css-prefix}-file-movie-o:before, -.#{$fa-css-prefix}-file-video-o:before { content: $fa-var-file-video-o; } -.#{$fa-css-prefix}-file-code-o:before { content: $fa-var-file-code-o; } -.#{$fa-css-prefix}-vine:before { content: $fa-var-vine; } -.#{$fa-css-prefix}-codepen:before { content: $fa-var-codepen; } -.#{$fa-css-prefix}-jsfiddle:before { content: $fa-var-jsfiddle; } -.#{$fa-css-prefix}-life-bouy:before, -.#{$fa-css-prefix}-life-buoy:before, -.#{$fa-css-prefix}-life-saver:before, -.#{$fa-css-prefix}-support:before, -.#{$fa-css-prefix}-life-ring:before { content: $fa-var-life-ring; } -.#{$fa-css-prefix}-circle-o-notch:before { content: $fa-var-circle-o-notch; } -.#{$fa-css-prefix}-ra:before, -.#{$fa-css-prefix}-rebel:before { content: $fa-var-rebel; } -.#{$fa-css-prefix}-ge:before, -.#{$fa-css-prefix}-empire:before { content: $fa-var-empire; } -.#{$fa-css-prefix}-git-square:before { content: $fa-var-git-square; } -.#{$fa-css-prefix}-git:before { content: $fa-var-git; } -.#{$fa-css-prefix}-hacker-news:before { content: $fa-var-hacker-news; } -.#{$fa-css-prefix}-tencent-weibo:before { content: $fa-var-tencent-weibo; } -.#{$fa-css-prefix}-qq:before { content: $fa-var-qq; } -.#{$fa-css-prefix}-wechat:before, -.#{$fa-css-prefix}-weixin:before { content: $fa-var-weixin; } -.#{$fa-css-prefix}-send:before, -.#{$fa-css-prefix}-paper-plane:before { content: $fa-var-paper-plane; } -.#{$fa-css-prefix}-send-o:before, -.#{$fa-css-prefix}-paper-plane-o:before { content: $fa-var-paper-plane-o; } -.#{$fa-css-prefix}-history:before { content: $fa-var-history; } -.#{$fa-css-prefix}-circle-thin:before { content: $fa-var-circle-thin; } -.#{$fa-css-prefix}-header:before { content: $fa-var-header; } -.#{$fa-css-prefix}-paragraph:before { content: $fa-var-paragraph; } -.#{$fa-css-prefix}-sliders:before { content: $fa-var-sliders; } -.#{$fa-css-prefix}-share-alt:before { content: $fa-var-share-alt; } -.#{$fa-css-prefix}-share-alt-square:before { content: $fa-var-share-alt-square; } -.#{$fa-css-prefix}-bomb:before { content: $fa-var-bomb; } -.#{$fa-css-prefix}-soccer-ball-o:before, -.#{$fa-css-prefix}-futbol-o:before { content: $fa-var-futbol-o; } -.#{$fa-css-prefix}-tty:before { content: $fa-var-tty; } -.#{$fa-css-prefix}-binoculars:before { content: $fa-var-binoculars; } -.#{$fa-css-prefix}-plug:before { content: $fa-var-plug; } -.#{$fa-css-prefix}-slideshare:before { content: $fa-var-slideshare; } -.#{$fa-css-prefix}-twitch:before { content: $fa-var-twitch; } -.#{$fa-css-prefix}-yelp:before { content: $fa-var-yelp; } -.#{$fa-css-prefix}-newspaper-o:before { content: $fa-var-newspaper-o; } -.#{$fa-css-prefix}-wifi:before { content: $fa-var-wifi; } -.#{$fa-css-prefix}-calculator:before { content: $fa-var-calculator; } -.#{$fa-css-prefix}-paypal:before { content: $fa-var-paypal; } -.#{$fa-css-prefix}-google-wallet:before { content: $fa-var-google-wallet; } -.#{$fa-css-prefix}-cc-visa:before { content: $fa-var-cc-visa; } -.#{$fa-css-prefix}-cc-mastercard:before { content: $fa-var-cc-mastercard; } -.#{$fa-css-prefix}-cc-discover:before { content: $fa-var-cc-discover; } -.#{$fa-css-prefix}-cc-amex:before { content: $fa-var-cc-amex; } -.#{$fa-css-prefix}-cc-paypal:before { content: $fa-var-cc-paypal; } -.#{$fa-css-prefix}-cc-stripe:before { content: $fa-var-cc-stripe; } -.#{$fa-css-prefix}-bell-slash:before { content: $fa-var-bell-slash; } -.#{$fa-css-prefix}-bell-slash-o:before { content: $fa-var-bell-slash-o; } -.#{$fa-css-prefix}-trash:before { content: $fa-var-trash; } -.#{$fa-css-prefix}-copyright:before { content: $fa-var-copyright; } -.#{$fa-css-prefix}-at:before { content: $fa-var-at; } -.#{$fa-css-prefix}-eyedropper:before { content: $fa-var-eyedropper; } -.#{$fa-css-prefix}-paint-brush:before { content: $fa-var-paint-brush; } -.#{$fa-css-prefix}-birthday-cake:before { content: $fa-var-birthday-cake; } -.#{$fa-css-prefix}-area-chart:before { content: $fa-var-area-chart; } -.#{$fa-css-prefix}-pie-chart:before { content: $fa-var-pie-chart; } -.#{$fa-css-prefix}-line-chart:before { content: $fa-var-line-chart; } -.#{$fa-css-prefix}-lastfm:before { content: $fa-var-lastfm; } -.#{$fa-css-prefix}-lastfm-square:before { content: $fa-var-lastfm-square; } -.#{$fa-css-prefix}-toggle-off:before { content: $fa-var-toggle-off; } -.#{$fa-css-prefix}-toggle-on:before { content: $fa-var-toggle-on; } -.#{$fa-css-prefix}-bicycle:before { content: $fa-var-bicycle; } -.#{$fa-css-prefix}-bus:before { content: $fa-var-bus; } -.#{$fa-css-prefix}-ioxhost:before { content: $fa-var-ioxhost; } -.#{$fa-css-prefix}-angellist:before { content: $fa-var-angellist; } -.#{$fa-css-prefix}-cc:before { content: $fa-var-cc; } -.#{$fa-css-prefix}-shekel:before, -.#{$fa-css-prefix}-sheqel:before, -.#{$fa-css-prefix}-ils:before { content: $fa-var-ils; } -.#{$fa-css-prefix}-meanpath:before { content: $fa-var-meanpath; } DELETED cgisetup/www/css/fonts/font-awesome-4.2.0/scss/_larger.scss Index: cgisetup/www/css/fonts/font-awesome-4.2.0/scss/_larger.scss ================================================================== --- cgisetup/www/css/fonts/font-awesome-4.2.0/scss/_larger.scss +++ /dev/null @@ -1,13 +0,0 @@ -// Icon Sizes -// ------------------------- - -/* makes the font 33% larger relative to the icon container */ -.#{$fa-css-prefix}-lg { - font-size: (4em / 3); - line-height: (3em / 4); - vertical-align: -15%; -} -.#{$fa-css-prefix}-2x { font-size: 2em; } -.#{$fa-css-prefix}-3x { font-size: 3em; } -.#{$fa-css-prefix}-4x { font-size: 4em; } -.#{$fa-css-prefix}-5x { font-size: 5em; } DELETED cgisetup/www/css/fonts/font-awesome-4.2.0/scss/_list.scss Index: cgisetup/www/css/fonts/font-awesome-4.2.0/scss/_list.scss ================================================================== --- cgisetup/www/css/fonts/font-awesome-4.2.0/scss/_list.scss +++ /dev/null @@ -1,19 +0,0 @@ -// List Icons -// ------------------------- - -.#{$fa-css-prefix}-ul { - padding-left: 0; - margin-left: $fa-li-width; - list-style-type: none; - > li { position: relative; } -} -.#{$fa-css-prefix}-li { - position: absolute; - left: -$fa-li-width; - width: $fa-li-width; - top: (2em / 14); - text-align: center; - &.#{$fa-css-prefix}-lg { - left: -$fa-li-width + (4em / 14); - } -} DELETED cgisetup/www/css/fonts/font-awesome-4.2.0/scss/_mixins.scss Index: cgisetup/www/css/fonts/font-awesome-4.2.0/scss/_mixins.scss ================================================================== --- cgisetup/www/css/fonts/font-awesome-4.2.0/scss/_mixins.scss +++ /dev/null @@ -1,25 +0,0 @@ -// Mixins -// -------------------------- - -@mixin fa-icon() { - display: inline-block; - font: normal normal normal 14px/1 FontAwesome; // shortening font declaration - font-size: inherit; // can't have font-size inherit on line above, so need to override - text-rendering: auto; // optimizelegibility throws things off #1094 - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; -} - -@mixin fa-icon-rotate($degrees, $rotation) { - filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=#{$rotation}); - -webkit-transform: rotate($degrees); - -ms-transform: rotate($degrees); - transform: rotate($degrees); -} - -@mixin fa-icon-flip($horiz, $vert, $rotation) { - filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=#{$rotation}); - -webkit-transform: scale($horiz, $vert); - -ms-transform: scale($horiz, $vert); - transform: scale($horiz, $vert); -} DELETED cgisetup/www/css/fonts/font-awesome-4.2.0/scss/_path.scss Index: cgisetup/www/css/fonts/font-awesome-4.2.0/scss/_path.scss ================================================================== --- cgisetup/www/css/fonts/font-awesome-4.2.0/scss/_path.scss +++ /dev/null @@ -1,14 +0,0 @@ -/* FONT PATH - * -------------------------- */ - -@font-face { - font-family: 'FontAwesome'; - src: url('#{$fa-font-path}/fontawesome-webfont.eot?v=#{$fa-version}'); - src: url('#{$fa-font-path}/fontawesome-webfont.eot?#iefix&v=#{$fa-version}') format('embedded-opentype'), - url('#{$fa-font-path}/fontawesome-webfont.woff?v=#{$fa-version}') format('woff'), - url('#{$fa-font-path}/fontawesome-webfont.ttf?v=#{$fa-version}') format('truetype'), - url('#{$fa-font-path}/fontawesome-webfont.svg?v=#{$fa-version}#fontawesomeregular') format('svg'); - //src: url('#{$fa-font-path}/FontAwesome.otf') format('opentype'); // used when developing fonts - font-weight: normal; - font-style: normal; -} DELETED cgisetup/www/css/fonts/font-awesome-4.2.0/scss/_rotated-flipped.scss Index: cgisetup/www/css/fonts/font-awesome-4.2.0/scss/_rotated-flipped.scss ================================================================== --- cgisetup/www/css/fonts/font-awesome-4.2.0/scss/_rotated-flipped.scss +++ /dev/null @@ -1,20 +0,0 @@ -// Rotated & Flipped Icons -// ------------------------- - -.#{$fa-css-prefix}-rotate-90 { @include fa-icon-rotate(90deg, 1); } -.#{$fa-css-prefix}-rotate-180 { @include fa-icon-rotate(180deg, 2); } -.#{$fa-css-prefix}-rotate-270 { @include fa-icon-rotate(270deg, 3); } - -.#{$fa-css-prefix}-flip-horizontal { @include fa-icon-flip(-1, 1, 0); } -.#{$fa-css-prefix}-flip-vertical { @include fa-icon-flip(1, -1, 2); } - -// Hook for IE8-9 -// ------------------------- - -:root .#{$fa-css-prefix}-rotate-90, -:root .#{$fa-css-prefix}-rotate-180, -:root .#{$fa-css-prefix}-rotate-270, -:root .#{$fa-css-prefix}-flip-horizontal, -:root .#{$fa-css-prefix}-flip-vertical { - filter: none; -} DELETED cgisetup/www/css/fonts/font-awesome-4.2.0/scss/_spinning.scss Index: cgisetup/www/css/fonts/font-awesome-4.2.0/scss/_spinning.scss ================================================================== --- cgisetup/www/css/fonts/font-awesome-4.2.0/scss/_spinning.scss +++ /dev/null @@ -1,29 +0,0 @@ -// Spinning Icons -// -------------------------- - -.#{$fa-css-prefix}-spin { - -webkit-animation: fa-spin 2s infinite linear; - animation: fa-spin 2s infinite linear; -} - -@-webkit-keyframes fa-spin { - 0% { - -webkit-transform: rotate(0deg); - transform: rotate(0deg); - } - 100% { - -webkit-transform: rotate(359deg); - transform: rotate(359deg); - } -} - -@keyframes fa-spin { - 0% { - -webkit-transform: rotate(0deg); - transform: rotate(0deg); - } - 100% { - -webkit-transform: rotate(359deg); - transform: rotate(359deg); - } -} DELETED cgisetup/www/css/fonts/font-awesome-4.2.0/scss/_stacked.scss Index: cgisetup/www/css/fonts/font-awesome-4.2.0/scss/_stacked.scss ================================================================== --- cgisetup/www/css/fonts/font-awesome-4.2.0/scss/_stacked.scss +++ /dev/null @@ -1,20 +0,0 @@ -// Stacked Icons -// ------------------------- - -.#{$fa-css-prefix}-stack { - position: relative; - display: inline-block; - width: 2em; - height: 2em; - line-height: 2em; - vertical-align: middle; -} -.#{$fa-css-prefix}-stack-1x, .#{$fa-css-prefix}-stack-2x { - position: absolute; - left: 0; - width: 100%; - text-align: center; -} -.#{$fa-css-prefix}-stack-1x { line-height: inherit; } -.#{$fa-css-prefix}-stack-2x { font-size: 2em; } -.#{$fa-css-prefix}-inverse { color: $fa-inverse; } DELETED cgisetup/www/css/fonts/font-awesome-4.2.0/scss/_variables.scss Index: cgisetup/www/css/fonts/font-awesome-4.2.0/scss/_variables.scss ================================================================== --- cgisetup/www/css/fonts/font-awesome-4.2.0/scss/_variables.scss +++ /dev/null @@ -1,561 +0,0 @@ -// Variables -// -------------------------- - -$fa-font-path: "../fonts" !default; -//$fa-font-path: "//netdna.bootstrapcdn.com/font-awesome/4.2.0/fonts" !default; // for referencing Bootstrap CDN font files directly -$fa-css-prefix: fa !default; -$fa-version: "4.2.0" !default; -$fa-border-color: #eee !default; -$fa-inverse: #fff !default; -$fa-li-width: (30em / 14) !default; - -$fa-var-adjust: "\f042"; -$fa-var-adn: "\f170"; -$fa-var-align-center: "\f037"; -$fa-var-align-justify: "\f039"; -$fa-var-align-left: "\f036"; -$fa-var-align-right: "\f038"; -$fa-var-ambulance: "\f0f9"; -$fa-var-anchor: "\f13d"; -$fa-var-android: "\f17b"; -$fa-var-angellist: "\f209"; -$fa-var-angle-double-down: "\f103"; -$fa-var-angle-double-left: "\f100"; -$fa-var-angle-double-right: "\f101"; -$fa-var-angle-double-up: "\f102"; -$fa-var-angle-down: "\f107"; -$fa-var-angle-left: "\f104"; -$fa-var-angle-right: "\f105"; -$fa-var-angle-up: "\f106"; -$fa-var-apple: "\f179"; -$fa-var-archive: "\f187"; -$fa-var-area-chart: "\f1fe"; -$fa-var-arrow-circle-down: "\f0ab"; -$fa-var-arrow-circle-left: "\f0a8"; -$fa-var-arrow-circle-o-down: "\f01a"; -$fa-var-arrow-circle-o-left: "\f190"; -$fa-var-arrow-circle-o-right: "\f18e"; -$fa-var-arrow-circle-o-up: "\f01b"; -$fa-var-arrow-circle-right: "\f0a9"; -$fa-var-arrow-circle-up: "\f0aa"; -$fa-var-arrow-down: "\f063"; -$fa-var-arrow-left: "\f060"; -$fa-var-arrow-right: "\f061"; -$fa-var-arrow-up: "\f062"; -$fa-var-arrows: "\f047"; -$fa-var-arrows-alt: "\f0b2"; -$fa-var-arrows-h: "\f07e"; -$fa-var-arrows-v: "\f07d"; -$fa-var-asterisk: "\f069"; -$fa-var-at: "\f1fa"; -$fa-var-automobile: "\f1b9"; -$fa-var-backward: "\f04a"; -$fa-var-ban: "\f05e"; -$fa-var-bank: "\f19c"; -$fa-var-bar-chart: "\f080"; -$fa-var-bar-chart-o: "\f080"; -$fa-var-barcode: "\f02a"; -$fa-var-bars: "\f0c9"; -$fa-var-beer: "\f0fc"; -$fa-var-behance: "\f1b4"; -$fa-var-behance-square: "\f1b5"; -$fa-var-bell: "\f0f3"; -$fa-var-bell-o: "\f0a2"; -$fa-var-bell-slash: "\f1f6"; -$fa-var-bell-slash-o: "\f1f7"; -$fa-var-bicycle: "\f206"; -$fa-var-binoculars: "\f1e5"; -$fa-var-birthday-cake: "\f1fd"; -$fa-var-bitbucket: "\f171"; -$fa-var-bitbucket-square: "\f172"; -$fa-var-bitcoin: "\f15a"; -$fa-var-bold: "\f032"; -$fa-var-bolt: "\f0e7"; -$fa-var-bomb: "\f1e2"; -$fa-var-book: "\f02d"; -$fa-var-bookmark: "\f02e"; -$fa-var-bookmark-o: "\f097"; -$fa-var-briefcase: "\f0b1"; -$fa-var-btc: "\f15a"; -$fa-var-bug: "\f188"; -$fa-var-building: "\f1ad"; -$fa-var-building-o: "\f0f7"; -$fa-var-bullhorn: "\f0a1"; -$fa-var-bullseye: "\f140"; -$fa-var-bus: "\f207"; -$fa-var-cab: "\f1ba"; -$fa-var-calculator: "\f1ec"; -$fa-var-calendar: "\f073"; -$fa-var-calendar-o: "\f133"; -$fa-var-camera: "\f030"; -$fa-var-camera-retro: "\f083"; -$fa-var-car: "\f1b9"; -$fa-var-caret-down: "\f0d7"; -$fa-var-caret-left: "\f0d9"; -$fa-var-caret-right: "\f0da"; -$fa-var-caret-square-o-down: "\f150"; -$fa-var-caret-square-o-left: "\f191"; -$fa-var-caret-square-o-right: "\f152"; -$fa-var-caret-square-o-up: "\f151"; -$fa-var-caret-up: "\f0d8"; -$fa-var-cc: "\f20a"; -$fa-var-cc-amex: "\f1f3"; -$fa-var-cc-discover: "\f1f2"; -$fa-var-cc-mastercard: "\f1f1"; -$fa-var-cc-paypal: "\f1f4"; -$fa-var-cc-stripe: "\f1f5"; -$fa-var-cc-visa: "\f1f0"; -$fa-var-certificate: "\f0a3"; -$fa-var-chain: "\f0c1"; -$fa-var-chain-broken: "\f127"; -$fa-var-check: "\f00c"; -$fa-var-check-circle: "\f058"; -$fa-var-check-circle-o: "\f05d"; -$fa-var-check-square: "\f14a"; -$fa-var-check-square-o: "\f046"; -$fa-var-chevron-circle-down: "\f13a"; -$fa-var-chevron-circle-left: "\f137"; -$fa-var-chevron-circle-right: "\f138"; -$fa-var-chevron-circle-up: "\f139"; -$fa-var-chevron-down: "\f078"; -$fa-var-chevron-left: "\f053"; -$fa-var-chevron-right: "\f054"; -$fa-var-chevron-up: "\f077"; -$fa-var-child: "\f1ae"; -$fa-var-circle: "\f111"; -$fa-var-circle-o: "\f10c"; -$fa-var-circle-o-notch: "\f1ce"; -$fa-var-circle-thin: "\f1db"; -$fa-var-clipboard: "\f0ea"; -$fa-var-clock-o: "\f017"; -$fa-var-close: "\f00d"; -$fa-var-cloud: "\f0c2"; -$fa-var-cloud-download: "\f0ed"; -$fa-var-cloud-upload: "\f0ee"; -$fa-var-cny: "\f157"; -$fa-var-code: "\f121"; -$fa-var-code-fork: "\f126"; -$fa-var-codepen: "\f1cb"; -$fa-var-coffee: "\f0f4"; -$fa-var-cog: "\f013"; -$fa-var-cogs: "\f085"; -$fa-var-columns: "\f0db"; -$fa-var-comment: "\f075"; -$fa-var-comment-o: "\f0e5"; -$fa-var-comments: "\f086"; -$fa-var-comments-o: "\f0e6"; -$fa-var-compass: "\f14e"; -$fa-var-compress: "\f066"; -$fa-var-copy: "\f0c5"; -$fa-var-copyright: "\f1f9"; -$fa-var-credit-card: "\f09d"; -$fa-var-crop: "\f125"; -$fa-var-crosshairs: "\f05b"; -$fa-var-css3: "\f13c"; -$fa-var-cube: "\f1b2"; -$fa-var-cubes: "\f1b3"; -$fa-var-cut: "\f0c4"; -$fa-var-cutlery: "\f0f5"; -$fa-var-dashboard: "\f0e4"; -$fa-var-database: "\f1c0"; -$fa-var-dedent: "\f03b"; -$fa-var-delicious: "\f1a5"; -$fa-var-desktop: "\f108"; -$fa-var-deviantart: "\f1bd"; -$fa-var-digg: "\f1a6"; -$fa-var-dollar: "\f155"; -$fa-var-dot-circle-o: "\f192"; -$fa-var-download: "\f019"; -$fa-var-dribbble: "\f17d"; -$fa-var-dropbox: "\f16b"; -$fa-var-drupal: "\f1a9"; -$fa-var-edit: "\f044"; -$fa-var-eject: "\f052"; -$fa-var-ellipsis-h: "\f141"; -$fa-var-ellipsis-v: "\f142"; -$fa-var-empire: "\f1d1"; -$fa-var-envelope: "\f0e0"; -$fa-var-envelope-o: "\f003"; -$fa-var-envelope-square: "\f199"; -$fa-var-eraser: "\f12d"; -$fa-var-eur: "\f153"; -$fa-var-euro: "\f153"; -$fa-var-exchange: "\f0ec"; -$fa-var-exclamation: "\f12a"; -$fa-var-exclamation-circle: "\f06a"; -$fa-var-exclamation-triangle: "\f071"; -$fa-var-expand: "\f065"; -$fa-var-external-link: "\f08e"; -$fa-var-external-link-square: "\f14c"; -$fa-var-eye: "\f06e"; -$fa-var-eye-slash: "\f070"; -$fa-var-eyedropper: "\f1fb"; -$fa-var-facebook: "\f09a"; -$fa-var-facebook-square: "\f082"; -$fa-var-fast-backward: "\f049"; -$fa-var-fast-forward: "\f050"; -$fa-var-fax: "\f1ac"; -$fa-var-female: "\f182"; -$fa-var-fighter-jet: "\f0fb"; -$fa-var-file: "\f15b"; -$fa-var-file-archive-o: "\f1c6"; -$fa-var-file-audio-o: "\f1c7"; -$fa-var-file-code-o: "\f1c9"; -$fa-var-file-excel-o: "\f1c3"; -$fa-var-file-image-o: "\f1c5"; -$fa-var-file-movie-o: "\f1c8"; -$fa-var-file-o: "\f016"; -$fa-var-file-pdf-o: "\f1c1"; -$fa-var-file-photo-o: "\f1c5"; -$fa-var-file-picture-o: "\f1c5"; -$fa-var-file-powerpoint-o: "\f1c4"; -$fa-var-file-sound-o: "\f1c7"; -$fa-var-file-text: "\f15c"; -$fa-var-file-text-o: "\f0f6"; -$fa-var-file-video-o: "\f1c8"; -$fa-var-file-word-o: "\f1c2"; -$fa-var-file-zip-o: "\f1c6"; -$fa-var-files-o: "\f0c5"; -$fa-var-film: "\f008"; -$fa-var-filter: "\f0b0"; -$fa-var-fire: "\f06d"; -$fa-var-fire-extinguisher: "\f134"; -$fa-var-flag: "\f024"; -$fa-var-flag-checkered: "\f11e"; -$fa-var-flag-o: "\f11d"; -$fa-var-flash: "\f0e7"; -$fa-var-flask: "\f0c3"; -$fa-var-flickr: "\f16e"; -$fa-var-floppy-o: "\f0c7"; -$fa-var-folder: "\f07b"; -$fa-var-folder-o: "\f114"; -$fa-var-folder-open: "\f07c"; -$fa-var-folder-open-o: "\f115"; -$fa-var-font: "\f031"; -$fa-var-forward: "\f04e"; -$fa-var-foursquare: "\f180"; -$fa-var-frown-o: "\f119"; -$fa-var-futbol-o: "\f1e3"; -$fa-var-gamepad: "\f11b"; -$fa-var-gavel: "\f0e3"; -$fa-var-gbp: "\f154"; -$fa-var-ge: "\f1d1"; -$fa-var-gear: "\f013"; -$fa-var-gears: "\f085"; -$fa-var-gift: "\f06b"; -$fa-var-git: "\f1d3"; -$fa-var-git-square: "\f1d2"; -$fa-var-github: "\f09b"; -$fa-var-github-alt: "\f113"; -$fa-var-github-square: "\f092"; -$fa-var-gittip: "\f184"; -$fa-var-glass: "\f000"; -$fa-var-globe: "\f0ac"; -$fa-var-google: "\f1a0"; -$fa-var-google-plus: "\f0d5"; -$fa-var-google-plus-square: "\f0d4"; -$fa-var-google-wallet: "\f1ee"; -$fa-var-graduation-cap: "\f19d"; -$fa-var-group: "\f0c0"; -$fa-var-h-square: "\f0fd"; -$fa-var-hacker-news: "\f1d4"; -$fa-var-hand-o-down: "\f0a7"; -$fa-var-hand-o-left: "\f0a5"; -$fa-var-hand-o-right: "\f0a4"; -$fa-var-hand-o-up: "\f0a6"; -$fa-var-hdd-o: "\f0a0"; -$fa-var-header: "\f1dc"; -$fa-var-headphones: "\f025"; -$fa-var-heart: "\f004"; -$fa-var-heart-o: "\f08a"; -$fa-var-history: "\f1da"; -$fa-var-home: "\f015"; -$fa-var-hospital-o: "\f0f8"; -$fa-var-html5: "\f13b"; -$fa-var-ils: "\f20b"; -$fa-var-image: "\f03e"; -$fa-var-inbox: "\f01c"; -$fa-var-indent: "\f03c"; -$fa-var-info: "\f129"; -$fa-var-info-circle: "\f05a"; -$fa-var-inr: "\f156"; -$fa-var-instagram: "\f16d"; -$fa-var-institution: "\f19c"; -$fa-var-ioxhost: "\f208"; -$fa-var-italic: "\f033"; -$fa-var-joomla: "\f1aa"; -$fa-var-jpy: "\f157"; -$fa-var-jsfiddle: "\f1cc"; -$fa-var-key: "\f084"; -$fa-var-keyboard-o: "\f11c"; -$fa-var-krw: "\f159"; -$fa-var-language: "\f1ab"; -$fa-var-laptop: "\f109"; -$fa-var-lastfm: "\f202"; -$fa-var-lastfm-square: "\f203"; -$fa-var-leaf: "\f06c"; -$fa-var-legal: "\f0e3"; -$fa-var-lemon-o: "\f094"; -$fa-var-level-down: "\f149"; -$fa-var-level-up: "\f148"; -$fa-var-life-bouy: "\f1cd"; -$fa-var-life-buoy: "\f1cd"; -$fa-var-life-ring: "\f1cd"; -$fa-var-life-saver: "\f1cd"; -$fa-var-lightbulb-o: "\f0eb"; -$fa-var-line-chart: "\f201"; -$fa-var-link: "\f0c1"; -$fa-var-linkedin: "\f0e1"; -$fa-var-linkedin-square: "\f08c"; -$fa-var-linux: "\f17c"; -$fa-var-list: "\f03a"; -$fa-var-list-alt: "\f022"; -$fa-var-list-ol: "\f0cb"; -$fa-var-list-ul: "\f0ca"; -$fa-var-location-arrow: "\f124"; -$fa-var-lock: "\f023"; -$fa-var-long-arrow-down: "\f175"; -$fa-var-long-arrow-left: "\f177"; -$fa-var-long-arrow-right: "\f178"; -$fa-var-long-arrow-up: "\f176"; -$fa-var-magic: "\f0d0"; -$fa-var-magnet: "\f076"; -$fa-var-mail-forward: "\f064"; -$fa-var-mail-reply: "\f112"; -$fa-var-mail-reply-all: "\f122"; -$fa-var-male: "\f183"; -$fa-var-map-marker: "\f041"; -$fa-var-maxcdn: "\f136"; -$fa-var-meanpath: "\f20c"; -$fa-var-medkit: "\f0fa"; -$fa-var-meh-o: "\f11a"; -$fa-var-microphone: "\f130"; -$fa-var-microphone-slash: "\f131"; -$fa-var-minus: "\f068"; -$fa-var-minus-circle: "\f056"; -$fa-var-minus-square: "\f146"; -$fa-var-minus-square-o: "\f147"; -$fa-var-mobile: "\f10b"; -$fa-var-mobile-phone: "\f10b"; -$fa-var-money: "\f0d6"; -$fa-var-moon-o: "\f186"; -$fa-var-mortar-board: "\f19d"; -$fa-var-music: "\f001"; -$fa-var-navicon: "\f0c9"; -$fa-var-newspaper-o: "\f1ea"; -$fa-var-openid: "\f19b"; -$fa-var-outdent: "\f03b"; -$fa-var-pagelines: "\f18c"; -$fa-var-paint-brush: "\f1fc"; -$fa-var-paper-plane: "\f1d8"; -$fa-var-paper-plane-o: "\f1d9"; -$fa-var-paperclip: "\f0c6"; -$fa-var-paragraph: "\f1dd"; -$fa-var-paste: "\f0ea"; -$fa-var-pause: "\f04c"; -$fa-var-paw: "\f1b0"; -$fa-var-paypal: "\f1ed"; -$fa-var-pencil: "\f040"; -$fa-var-pencil-square: "\f14b"; -$fa-var-pencil-square-o: "\f044"; -$fa-var-phone: "\f095"; -$fa-var-phone-square: "\f098"; -$fa-var-photo: "\f03e"; -$fa-var-picture-o: "\f03e"; -$fa-var-pie-chart: "\f200"; -$fa-var-pied-piper: "\f1a7"; -$fa-var-pied-piper-alt: "\f1a8"; -$fa-var-pinterest: "\f0d2"; -$fa-var-pinterest-square: "\f0d3"; -$fa-var-plane: "\f072"; -$fa-var-play: "\f04b"; -$fa-var-play-circle: "\f144"; -$fa-var-play-circle-o: "\f01d"; -$fa-var-plug: "\f1e6"; -$fa-var-plus: "\f067"; -$fa-var-plus-circle: "\f055"; -$fa-var-plus-square: "\f0fe"; -$fa-var-plus-square-o: "\f196"; -$fa-var-power-off: "\f011"; -$fa-var-print: "\f02f"; -$fa-var-puzzle-piece: "\f12e"; -$fa-var-qq: "\f1d6"; -$fa-var-qrcode: "\f029"; -$fa-var-question: "\f128"; -$fa-var-question-circle: "\f059"; -$fa-var-quote-left: "\f10d"; -$fa-var-quote-right: "\f10e"; -$fa-var-ra: "\f1d0"; -$fa-var-random: "\f074"; -$fa-var-rebel: "\f1d0"; -$fa-var-recycle: "\f1b8"; -$fa-var-reddit: "\f1a1"; -$fa-var-reddit-square: "\f1a2"; -$fa-var-refresh: "\f021"; -$fa-var-remove: "\f00d"; -$fa-var-renren: "\f18b"; -$fa-var-reorder: "\f0c9"; -$fa-var-repeat: "\f01e"; -$fa-var-reply: "\f112"; -$fa-var-reply-all: "\f122"; -$fa-var-retweet: "\f079"; -$fa-var-rmb: "\f157"; -$fa-var-road: "\f018"; -$fa-var-rocket: "\f135"; -$fa-var-rotate-left: "\f0e2"; -$fa-var-rotate-right: "\f01e"; -$fa-var-rouble: "\f158"; -$fa-var-rss: "\f09e"; -$fa-var-rss-square: "\f143"; -$fa-var-rub: "\f158"; -$fa-var-ruble: "\f158"; -$fa-var-rupee: "\f156"; -$fa-var-save: "\f0c7"; -$fa-var-scissors: "\f0c4"; -$fa-var-search: "\f002"; -$fa-var-search-minus: "\f010"; -$fa-var-search-plus: "\f00e"; -$fa-var-send: "\f1d8"; -$fa-var-send-o: "\f1d9"; -$fa-var-share: "\f064"; -$fa-var-share-alt: "\f1e0"; -$fa-var-share-alt-square: "\f1e1"; -$fa-var-share-square: "\f14d"; -$fa-var-share-square-o: "\f045"; -$fa-var-shekel: "\f20b"; -$fa-var-sheqel: "\f20b"; -$fa-var-shield: "\f132"; -$fa-var-shopping-cart: "\f07a"; -$fa-var-sign-in: "\f090"; -$fa-var-sign-out: "\f08b"; -$fa-var-signal: "\f012"; -$fa-var-sitemap: "\f0e8"; -$fa-var-skype: "\f17e"; -$fa-var-slack: "\f198"; -$fa-var-sliders: "\f1de"; -$fa-var-slideshare: "\f1e7"; -$fa-var-smile-o: "\f118"; -$fa-var-soccer-ball-o: "\f1e3"; -$fa-var-sort: "\f0dc"; -$fa-var-sort-alpha-asc: "\f15d"; -$fa-var-sort-alpha-desc: "\f15e"; -$fa-var-sort-amount-asc: "\f160"; -$fa-var-sort-amount-desc: "\f161"; -$fa-var-sort-asc: "\f0de"; -$fa-var-sort-desc: "\f0dd"; -$fa-var-sort-down: "\f0dd"; -$fa-var-sort-numeric-asc: "\f162"; -$fa-var-sort-numeric-desc: "\f163"; -$fa-var-sort-up: "\f0de"; -$fa-var-soundcloud: "\f1be"; -$fa-var-space-shuttle: "\f197"; -$fa-var-spinner: "\f110"; -$fa-var-spoon: "\f1b1"; -$fa-var-spotify: "\f1bc"; -$fa-var-square: "\f0c8"; -$fa-var-square-o: "\f096"; -$fa-var-stack-exchange: "\f18d"; -$fa-var-stack-overflow: "\f16c"; -$fa-var-star: "\f005"; -$fa-var-star-half: "\f089"; -$fa-var-star-half-empty: "\f123"; -$fa-var-star-half-full: "\f123"; -$fa-var-star-half-o: "\f123"; -$fa-var-star-o: "\f006"; -$fa-var-steam: "\f1b6"; -$fa-var-steam-square: "\f1b7"; -$fa-var-step-backward: "\f048"; -$fa-var-step-forward: "\f051"; -$fa-var-stethoscope: "\f0f1"; -$fa-var-stop: "\f04d"; -$fa-var-strikethrough: "\f0cc"; -$fa-var-stumbleupon: "\f1a4"; -$fa-var-stumbleupon-circle: "\f1a3"; -$fa-var-subscript: "\f12c"; -$fa-var-suitcase: "\f0f2"; -$fa-var-sun-o: "\f185"; -$fa-var-superscript: "\f12b"; -$fa-var-support: "\f1cd"; -$fa-var-table: "\f0ce"; -$fa-var-tablet: "\f10a"; -$fa-var-tachometer: "\f0e4"; -$fa-var-tag: "\f02b"; -$fa-var-tags: "\f02c"; -$fa-var-tasks: "\f0ae"; -$fa-var-taxi: "\f1ba"; -$fa-var-tencent-weibo: "\f1d5"; -$fa-var-terminal: "\f120"; -$fa-var-text-height: "\f034"; -$fa-var-text-width: "\f035"; -$fa-var-th: "\f00a"; -$fa-var-th-large: "\f009"; -$fa-var-th-list: "\f00b"; -$fa-var-thumb-tack: "\f08d"; -$fa-var-thumbs-down: "\f165"; -$fa-var-thumbs-o-down: "\f088"; -$fa-var-thumbs-o-up: "\f087"; -$fa-var-thumbs-up: "\f164"; -$fa-var-ticket: "\f145"; -$fa-var-times: "\f00d"; -$fa-var-times-circle: "\f057"; -$fa-var-times-circle-o: "\f05c"; -$fa-var-tint: "\f043"; -$fa-var-toggle-down: "\f150"; -$fa-var-toggle-left: "\f191"; -$fa-var-toggle-off: "\f204"; -$fa-var-toggle-on: "\f205"; -$fa-var-toggle-right: "\f152"; -$fa-var-toggle-up: "\f151"; -$fa-var-trash: "\f1f8"; -$fa-var-trash-o: "\f014"; -$fa-var-tree: "\f1bb"; -$fa-var-trello: "\f181"; -$fa-var-trophy: "\f091"; -$fa-var-truck: "\f0d1"; -$fa-var-try: "\f195"; -$fa-var-tty: "\f1e4"; -$fa-var-tumblr: "\f173"; -$fa-var-tumblr-square: "\f174"; -$fa-var-turkish-lira: "\f195"; -$fa-var-twitch: "\f1e8"; -$fa-var-twitter: "\f099"; -$fa-var-twitter-square: "\f081"; -$fa-var-umbrella: "\f0e9"; -$fa-var-underline: "\f0cd"; -$fa-var-undo: "\f0e2"; -$fa-var-university: "\f19c"; -$fa-var-unlink: "\f127"; -$fa-var-unlock: "\f09c"; -$fa-var-unlock-alt: "\f13e"; -$fa-var-unsorted: "\f0dc"; -$fa-var-upload: "\f093"; -$fa-var-usd: "\f155"; -$fa-var-user: "\f007"; -$fa-var-user-md: "\f0f0"; -$fa-var-users: "\f0c0"; -$fa-var-video-camera: "\f03d"; -$fa-var-vimeo-square: "\f194"; -$fa-var-vine: "\f1ca"; -$fa-var-vk: "\f189"; -$fa-var-volume-down: "\f027"; -$fa-var-volume-off: "\f026"; -$fa-var-volume-up: "\f028"; -$fa-var-warning: "\f071"; -$fa-var-wechat: "\f1d7"; -$fa-var-weibo: "\f18a"; -$fa-var-weixin: "\f1d7"; -$fa-var-wheelchair: "\f193"; -$fa-var-wifi: "\f1eb"; -$fa-var-windows: "\f17a"; -$fa-var-won: "\f159"; -$fa-var-wordpress: "\f19a"; -$fa-var-wrench: "\f0ad"; -$fa-var-xing: "\f168"; -$fa-var-xing-square: "\f169"; -$fa-var-yahoo: "\f19e"; -$fa-var-yelp: "\f1e9"; -$fa-var-yen: "\f157"; -$fa-var-youtube: "\f167"; -$fa-var-youtube-play: "\f16a"; -$fa-var-youtube-square: "\f166"; - DELETED cgisetup/www/css/fonts/font-awesome-4.2.0/scss/font-awesome.scss Index: cgisetup/www/css/fonts/font-awesome-4.2.0/scss/font-awesome.scss ================================================================== --- cgisetup/www/css/fonts/font-awesome-4.2.0/scss/font-awesome.scss +++ /dev/null @@ -1,17 +0,0 @@ -/*! - * Font Awesome 4.2.0 by @davegandy - http://fontawesome.io - @fontawesome - * License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License) - */ - -@import "variables"; -@import "mixins"; -@import "path"; -@import "core"; -@import "larger"; -@import "fixed-width"; -@import "list"; -@import "bordered-pulled"; -@import "spinning"; -@import "rotated-flipped"; -@import "stacked"; -@import "icons"; DELETED cgisetup/www/css/img/breadcrumbs-bg.gif Index: cgisetup/www/css/img/breadcrumbs-bg.gif ================================================================== --- cgisetup/www/css/img/breadcrumbs-bg.gif +++ /dev/null cannot compute difference between binary files DELETED cgisetup/www/css/img/bx_loader.gif Index: cgisetup/www/css/img/bx_loader.gif ================================================================== --- cgisetup/www/css/img/bx_loader.gif +++ /dev/null cannot compute difference between binary files DELETED cgisetup/www/css/img/controls.png Index: cgisetup/www/css/img/controls.png ================================================================== --- cgisetup/www/css/img/controls.png +++ /dev/null cannot compute difference between binary files DELETED cgisetup/www/css/img/fancybox/blank.gif Index: cgisetup/www/css/img/fancybox/blank.gif ================================================================== --- cgisetup/www/css/img/fancybox/blank.gif +++ /dev/null cannot compute difference between binary files DELETED cgisetup/www/css/img/fancybox/fancy_close.png Index: cgisetup/www/css/img/fancybox/fancy_close.png ================================================================== --- cgisetup/www/css/img/fancybox/fancy_close.png +++ /dev/null cannot compute difference between binary files DELETED cgisetup/www/css/img/fancybox/fancy_loading.png Index: cgisetup/www/css/img/fancybox/fancy_loading.png ================================================================== --- cgisetup/www/css/img/fancybox/fancy_loading.png +++ /dev/null cannot compute difference between binary files DELETED cgisetup/www/css/img/fancybox/fancy_nav_left.png Index: cgisetup/www/css/img/fancybox/fancy_nav_left.png ================================================================== --- cgisetup/www/css/img/fancybox/fancy_nav_left.png +++ /dev/null cannot compute difference between binary files DELETED cgisetup/www/css/img/fancybox/fancy_nav_right.png Index: cgisetup/www/css/img/fancybox/fancy_nav_right.png ================================================================== --- cgisetup/www/css/img/fancybox/fancy_nav_right.png +++ /dev/null cannot compute difference between binary files DELETED cgisetup/www/css/img/fancybox/fancy_shadow_e.png Index: cgisetup/www/css/img/fancybox/fancy_shadow_e.png ================================================================== --- cgisetup/www/css/img/fancybox/fancy_shadow_e.png +++ /dev/null cannot compute difference between binary files DELETED cgisetup/www/css/img/fancybox/fancy_shadow_n.png Index: cgisetup/www/css/img/fancybox/fancy_shadow_n.png ================================================================== --- cgisetup/www/css/img/fancybox/fancy_shadow_n.png +++ /dev/null cannot compute difference between binary files DELETED cgisetup/www/css/img/fancybox/fancy_shadow_ne.png Index: cgisetup/www/css/img/fancybox/fancy_shadow_ne.png ================================================================== --- cgisetup/www/css/img/fancybox/fancy_shadow_ne.png +++ /dev/null cannot compute difference between binary files DELETED cgisetup/www/css/img/fancybox/fancy_shadow_nw.png Index: cgisetup/www/css/img/fancybox/fancy_shadow_nw.png ================================================================== --- cgisetup/www/css/img/fancybox/fancy_shadow_nw.png +++ /dev/null cannot compute difference between binary files DELETED cgisetup/www/css/img/fancybox/fancy_shadow_s.png Index: cgisetup/www/css/img/fancybox/fancy_shadow_s.png ================================================================== --- cgisetup/www/css/img/fancybox/fancy_shadow_s.png +++ /dev/null cannot compute difference between binary files DELETED cgisetup/www/css/img/fancybox/fancy_shadow_se.png Index: cgisetup/www/css/img/fancybox/fancy_shadow_se.png ================================================================== --- cgisetup/www/css/img/fancybox/fancy_shadow_se.png +++ /dev/null cannot compute difference between binary files DELETED cgisetup/www/css/img/fancybox/fancy_shadow_sw.png Index: cgisetup/www/css/img/fancybox/fancy_shadow_sw.png ================================================================== --- cgisetup/www/css/img/fancybox/fancy_shadow_sw.png +++ /dev/null cannot compute difference between binary files DELETED cgisetup/www/css/img/fancybox/fancy_shadow_w.png Index: cgisetup/www/css/img/fancybox/fancy_shadow_w.png ================================================================== --- cgisetup/www/css/img/fancybox/fancy_shadow_w.png +++ /dev/null cannot compute difference between binary files DELETED cgisetup/www/css/img/fancybox/fancy_title_left.png Index: cgisetup/www/css/img/fancybox/fancy_title_left.png ================================================================== --- cgisetup/www/css/img/fancybox/fancy_title_left.png +++ /dev/null cannot compute difference between binary files DELETED cgisetup/www/css/img/fancybox/fancy_title_main.png Index: cgisetup/www/css/img/fancybox/fancy_title_main.png ================================================================== --- cgisetup/www/css/img/fancybox/fancy_title_main.png +++ /dev/null cannot compute difference between binary files DELETED cgisetup/www/css/img/fancybox/fancy_title_over.png Index: cgisetup/www/css/img/fancybox/fancy_title_over.png ================================================================== --- cgisetup/www/css/img/fancybox/fancy_title_over.png +++ /dev/null cannot compute difference between binary files DELETED cgisetup/www/css/img/fancybox/fancy_title_right.png Index: cgisetup/www/css/img/fancybox/fancy_title_right.png ================================================================== --- cgisetup/www/css/img/fancybox/fancy_title_right.png +++ /dev/null cannot compute difference between binary files DELETED cgisetup/www/css/img/fancybox/fancybox-x.png Index: cgisetup/www/css/img/fancybox/fancybox-x.png ================================================================== --- cgisetup/www/css/img/fancybox/fancybox-x.png +++ /dev/null cannot compute difference between binary files DELETED cgisetup/www/css/img/fancybox/fancybox-y.png Index: cgisetup/www/css/img/fancybox/fancybox-y.png ================================================================== --- cgisetup/www/css/img/fancybox/fancybox-y.png +++ /dev/null cannot compute difference between binary files DELETED cgisetup/www/css/img/fancybox/fancybox.png Index: cgisetup/www/css/img/fancybox/fancybox.png ================================================================== --- cgisetup/www/css/img/fancybox/fancybox.png +++ /dev/null cannot compute difference between binary files DELETED cgisetup/www/css/img/fancybox/jquery.easing-1.3.pack.js Index: cgisetup/www/css/img/fancybox/jquery.easing-1.3.pack.js ================================================================== --- cgisetup/www/css/img/fancybox/jquery.easing-1.3.pack.js +++ /dev/null @@ -1,72 +0,0 @@ -/* - * jQuery Easing v1.3 - http://gsgd.co.uk/sandbox/jquery/easing/ - * - * Uses the built in easing capabilities added In jQuery 1.1 - * to offer multiple easing options - * - * TERMS OF USE - jQuery Easing - * - * Open source under the BSD License. - * - * Copyright © 2008 George McGinley Smith - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, this list of - * conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, this list - * of conditions and the following disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * Neither the name of the author nor the names of contributors may be used to endorse - * or promote products derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE - * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - * -*/ - -// t: current time, b: begInnIng value, c: change In value, d: duration -eval(function(p,a,c,k,e,r){e=function(c){return(c35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)r[e(c)]=k[c]||e(c);k=[function(e){return r[e]}];e=function(){return'\\w+'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}('h.i[\'1a\']=h.i[\'z\'];h.O(h.i,{y:\'D\',z:9(x,t,b,c,d){6 h.i[h.i.y](x,t,b,c,d)},17:9(x,t,b,c,d){6 c*(t/=d)*t+b},D:9(x,t,b,c,d){6-c*(t/=d)*(t-2)+b},13:9(x,t,b,c,d){e((t/=d/2)<1)6 c/2*t*t+b;6-c/2*((--t)*(t-2)-1)+b},X:9(x,t,b,c,d){6 c*(t/=d)*t*t+b},U:9(x,t,b,c,d){6 c*((t=t/d-1)*t*t+1)+b},R:9(x,t,b,c,d){e((t/=d/2)<1)6 c/2*t*t*t+b;6 c/2*((t-=2)*t*t+2)+b},N:9(x,t,b,c,d){6 c*(t/=d)*t*t*t+b},M:9(x,t,b,c,d){6-c*((t=t/d-1)*t*t*t-1)+b},L:9(x,t,b,c,d){e((t/=d/2)<1)6 c/2*t*t*t*t+b;6-c/2*((t-=2)*t*t*t-2)+b},K:9(x,t,b,c,d){6 c*(t/=d)*t*t*t*t+b},J:9(x,t,b,c,d){6 c*((t=t/d-1)*t*t*t*t+1)+b},I:9(x,t,b,c,d){e((t/=d/2)<1)6 c/2*t*t*t*t*t+b;6 c/2*((t-=2)*t*t*t*t+2)+b},G:9(x,t,b,c,d){6-c*8.C(t/d*(8.g/2))+c+b},15:9(x,t,b,c,d){6 c*8.n(t/d*(8.g/2))+b},12:9(x,t,b,c,d){6-c/2*(8.C(8.g*t/d)-1)+b},Z:9(x,t,b,c,d){6(t==0)?b:c*8.j(2,10*(t/d-1))+b},Y:9(x,t,b,c,d){6(t==d)?b+c:c*(-8.j(2,-10*t/d)+1)+b},W:9(x,t,b,c,d){e(t==0)6 b;e(t==d)6 b+c;e((t/=d/2)<1)6 c/2*8.j(2,10*(t-1))+b;6 c/2*(-8.j(2,-10*--t)+2)+b},V:9(x,t,b,c,d){6-c*(8.o(1-(t/=d)*t)-1)+b},S:9(x,t,b,c,d){6 c*8.o(1-(t=t/d-1)*t)+b},Q:9(x,t,b,c,d){e((t/=d/2)<1)6-c/2*(8.o(1-t*t)-1)+b;6 c/2*(8.o(1-(t-=2)*t)+1)+b},P:9(x,t,b,c,d){f s=1.l;f p=0;f a=c;e(t==0)6 b;e((t/=d)==1)6 b+c;e(!p)p=d*.3;e(a<8.w(c)){a=c;f s=p/4}m f s=p/(2*8.g)*8.r(c/a);6-(a*8.j(2,10*(t-=1))*8.n((t*d-s)*(2*8.g)/p))+b},H:9(x,t,b,c,d){f s=1.l;f p=0;f a=c;e(t==0)6 b;e((t/=d)==1)6 b+c;e(!p)p=d*.3;e(a<8.w(c)){a=c;f s=p/4}m f s=p/(2*8.g)*8.r(c/a);6 a*8.j(2,-10*t)*8.n((t*d-s)*(2*8.g)/p)+c+b},T:9(x,t,b,c,d){f s=1.l;f p=0;f a=c;e(t==0)6 b;e((t/=d/2)==2)6 b+c;e(!p)p=d*(.3*1.5);e(a<8.w(c)){a=c;f s=p/4}m f s=p/(2*8.g)*8.r(c/a);e(t<1)6-.5*(a*8.j(2,10*(t-=1))*8.n((t*d-s)*(2*8.g)/p))+b;6 a*8.j(2,-10*(t-=1))*8.n((t*d-s)*(2*8.g)/p)*.5+c+b},F:9(x,t,b,c,d,s){e(s==u)s=1.l;6 c*(t/=d)*t*((s+1)*t-s)+b},E:9(x,t,b,c,d,s){e(s==u)s=1.l;6 c*((t=t/d-1)*t*((s+1)*t+s)+1)+b},16:9(x,t,b,c,d,s){e(s==u)s=1.l;e((t/=d/2)<1)6 c/2*(t*t*(((s*=(1.B))+1)*t-s))+b;6 c/2*((t-=2)*t*(((s*=(1.B))+1)*t+s)+2)+b},A:9(x,t,b,c,d){6 c-h.i.v(x,d-t,0,c,d)+b},v:9(x,t,b,c,d){e((t/=d)<(1/2.k)){6 c*(7.q*t*t)+b}m e(t<(2/2.k)){6 c*(7.q*(t-=(1.5/2.k))*t+.k)+b}m e(t<(2.5/2.k)){6 c*(7.q*(t-=(2.14/2.k))*t+.11)+b}m{6 c*(7.q*(t-=(2.18/2.k))*t+.19)+b}},1b:9(x,t,b,c,d){e(t')[0], { prop: 0 }), - - isIE6 = $.browser.msie && $.browser.version < 7 && !window.XMLHttpRequest, - - /* - * Private methods - */ - - _abort = function() { - loading.hide(); - - imgPreloader.onerror = imgPreloader.onload = null; - - if (ajaxLoader) { - ajaxLoader.abort(); - } - - tmp.empty(); - }, - - _error = function() { - if (false === selectedOpts.onError(selectedArray, selectedIndex, selectedOpts)) { - loading.hide(); - busy = false; - return; - } - - selectedOpts.titleShow = false; - - selectedOpts.width = 'auto'; - selectedOpts.height = 'auto'; - - tmp.html( '

The requested content cannot be loaded.
Please try again later.

' ); - - _process_inline(); - }, - - _start = function() { - var obj = selectedArray[ selectedIndex ], - href, - type, - title, - str, - emb, - ret; - - _abort(); - - selectedOpts = $.extend({}, $.fn.fancybox.defaults, (typeof $(obj).data('fancybox') == 'undefined' ? selectedOpts : $(obj).data('fancybox'))); - - ret = selectedOpts.onStart(selectedArray, selectedIndex, selectedOpts); - - if (ret === false) { - busy = false; - return; - } else if (typeof ret == 'object') { - selectedOpts = $.extend(selectedOpts, ret); - } - - title = selectedOpts.title || (obj.nodeName ? $(obj).attr('title') : obj.title) || ''; - - if (obj.nodeName && !selectedOpts.orig) { - selectedOpts.orig = $(obj).children("img:first").length ? $(obj).children("img:first") : $(obj); - } - - if (title === '' && selectedOpts.orig && selectedOpts.titleFromAlt) { - title = selectedOpts.orig.attr('alt'); - } - - href = selectedOpts.href || (obj.nodeName ? $(obj).attr('href') : obj.href) || null; - - if ((/^(?:javascript)/i).test(href) || href == '#') { - href = null; - } - - if (selectedOpts.type) { - type = selectedOpts.type; - - if (!href) { - href = selectedOpts.content; - } - - } else if (selectedOpts.content) { - type = 'html'; - - } else if (href) { - if (href.match(imgRegExp)) { - type = 'image'; - - } else if (href.match(swfRegExp)) { - type = 'swf'; - - } else if ($(obj).hasClass("iframe")) { - type = 'iframe'; - - } else if (href.indexOf("#") === 0) { - type = 'inline'; - - } else { - type = 'ajax'; - } - } - - if (!type) { - _error(); - return; - } - - if (type == 'inline') { - obj = href.substr(href.indexOf("#")); - type = $(obj).length > 0 ? 'inline' : 'ajax'; - } - - selectedOpts.type = type; - selectedOpts.href = href; - selectedOpts.title = title; - - if (selectedOpts.autoDimensions) { - if (selectedOpts.type == 'html' || selectedOpts.type == 'inline' || selectedOpts.type == 'ajax') { - selectedOpts.width = 'auto'; - selectedOpts.height = 'auto'; - } else { - selectedOpts.autoDimensions = false; - } - } - - if (selectedOpts.modal) { - selectedOpts.overlayShow = true; - selectedOpts.hideOnOverlayClick = false; - selectedOpts.hideOnContentClick = false; - selectedOpts.enableEscapeButton = false; - selectedOpts.showCloseButton = false; - } - - selectedOpts.padding = parseInt(selectedOpts.padding, 10); - selectedOpts.margin = parseInt(selectedOpts.margin, 10); - - tmp.css('padding', (selectedOpts.padding + selectedOpts.margin)); - - $('.fancybox-inline-tmp').unbind('fancybox-cancel').bind('fancybox-change', function() { - $(this).replaceWith(content.children()); - }); - - switch (type) { - case 'html' : - tmp.html( selectedOpts.content ); - _process_inline(); - break; - - case 'inline' : - if ( $(obj).parent().is('#fancybox-content') === true) { - busy = false; - return; - } - - $('
') - .hide() - .insertBefore( $(obj) ) - .bind('fancybox-cleanup', function() { - $(this).replaceWith(content.children()); - }).bind('fancybox-cancel', function() { - $(this).replaceWith(tmp.children()); - }); - - $(obj).appendTo(tmp); - - _process_inline(); - break; - - case 'image': - busy = false; - - $.fancybox.showActivity(); - - imgPreloader = new Image(); - - imgPreloader.onerror = function() { - _error(); - }; - - imgPreloader.onload = function() { - busy = true; - - imgPreloader.onerror = imgPreloader.onload = null; - - _process_image(); - }; - - imgPreloader.src = href; - break; - - case 'swf': - selectedOpts.scrolling = 'no'; - - str = ''; - emb = ''; - - $.each(selectedOpts.swf, function(name, val) { - str += ''; - emb += ' ' + name + '="' + val + '"'; - }); - - str += ''; - - tmp.html(str); - - _process_inline(); - break; - - case 'ajax': - busy = false; - - $.fancybox.showActivity(); - - selectedOpts.ajax.win = selectedOpts.ajax.success; - - ajaxLoader = $.ajax($.extend({}, selectedOpts.ajax, { - url : href, - data : selectedOpts.ajax.data || {}, - error : function(XMLHttpRequest, textStatus, errorThrown) { - if ( XMLHttpRequest.status > 0 ) { - _error(); - } - }, - success : function(data, textStatus, XMLHttpRequest) { - var o = typeof XMLHttpRequest == 'object' ? XMLHttpRequest : ajaxLoader; - if (o.status == 200) { - if ( typeof selectedOpts.ajax.win == 'function' ) { - ret = selectedOpts.ajax.win(href, data, textStatus, XMLHttpRequest); - - if (ret === false) { - loading.hide(); - return; - } else if (typeof ret == 'string' || typeof ret == 'object') { - data = ret; - } - } - - tmp.html( data ); - _process_inline(); - } - } - })); - - break; - - case 'iframe': - _show(); - break; - } - }, - - _process_inline = function() { - var - w = selectedOpts.width, - h = selectedOpts.height; - - if (w.toString().indexOf('%') > -1) { - w = parseInt( ($(window).width() - (selectedOpts.margin * 2)) * parseFloat(w) / 100, 10) + 'px'; - - } else { - w = w == 'auto' ? 'auto' : w + 'px'; - } - - if (h.toString().indexOf('%') > -1) { - h = parseInt( ($(window).height() - (selectedOpts.margin * 2)) * parseFloat(h) / 100, 10) + 'px'; - - } else { - h = h == 'auto' ? 'auto' : h + 'px'; - } - - tmp.wrapInner('
'); - - selectedOpts.width = tmp.width(); - selectedOpts.height = tmp.height(); - - _show(); - }, - - _process_image = function() { - selectedOpts.width = imgPreloader.width; - selectedOpts.height = imgPreloader.height; - - $("").attr({ - 'id' : 'fancybox-img', - 'src' : imgPreloader.src, - 'alt' : selectedOpts.title - }).appendTo( tmp ); - - _show(); - }, - - _show = function() { - var pos, equal; - - loading.hide(); - - if (wrap.is(":visible") && false === currentOpts.onCleanup(currentArray, currentIndex, currentOpts)) { - $.event.trigger('fancybox-cancel'); - - busy = false; - return; - } - - busy = true; - - $(content.add( overlay )).unbind(); - - $(window).unbind("resize.fb scroll.fb"); - $(document).unbind('keydown.fb'); - - if (wrap.is(":visible") && currentOpts.titlePosition !== 'outside') { - wrap.css('height', wrap.height()); - } - - currentArray = selectedArray; - currentIndex = selectedIndex; - currentOpts = selectedOpts; - - if (currentOpts.overlayShow) { - overlay.css({ - 'background-color' : currentOpts.overlayColor, - 'opacity' : currentOpts.overlayOpacity, - 'cursor' : currentOpts.hideOnOverlayClick ? 'pointer' : 'auto', - 'height' : $(document).height() - }); - - if (!overlay.is(':visible')) { - if (isIE6) { - $('select:not(#fancybox-tmp select)').filter(function() { - return this.style.visibility !== 'hidden'; - }).css({'visibility' : 'hidden'}).one('fancybox-cleanup', function() { - this.style.visibility = 'inherit'; - }); - } - - overlay.show(); - } - } else { - overlay.hide(); - } - - final_pos = _get_zoom_to(); - - _process_title(); - - if (wrap.is(":visible")) { - $( close.add( nav_left ).add( nav_right ) ).hide(); - - pos = wrap.position(), - - start_pos = { - top : pos.top, - left : pos.left, - width : wrap.width(), - height : wrap.height() - }; - - equal = (start_pos.width == final_pos.width && start_pos.height == final_pos.height); - - content.fadeTo(currentOpts.changeFade, 0.3, function() { - var finish_resizing = function() { - content.html( tmp.contents() ).fadeTo(currentOpts.changeFade, 1, _finish); - }; - - $.event.trigger('fancybox-change'); - - content - .empty() - .removeAttr('filter') - .css({ - 'border-width' : currentOpts.padding, - 'width' : final_pos.width - currentOpts.padding * 2, - 'height' : selectedOpts.autoDimensions ? 'auto' : final_pos.height - titleHeight - currentOpts.padding * 2 - }); - - if (equal) { - finish_resizing(); - - } else { - fx.prop = 0; - - $(fx).animate({prop: 1}, { - duration : currentOpts.changeSpeed, - easing : currentOpts.easingChange, - step : _draw, - complete : finish_resizing - }); - } - }); - - return; - } - - wrap.removeAttr("style"); - - content.css('border-width', currentOpts.padding); - - if (currentOpts.transitionIn == 'elastic') { - start_pos = _get_zoom_from(); - - content.html( tmp.contents() ); - - wrap.show(); - - if (currentOpts.opacity) { - final_pos.opacity = 0; - } - - fx.prop = 0; - - $(fx).animate({prop: 1}, { - duration : currentOpts.speedIn, - easing : currentOpts.easingIn, - step : _draw, - complete : _finish - }); - - return; - } - - if (currentOpts.titlePosition == 'inside' && titleHeight > 0) { - title.show(); - } - - content - .css({ - 'width' : final_pos.width - currentOpts.padding * 2, - 'height' : selectedOpts.autoDimensions ? 'auto' : final_pos.height - titleHeight - currentOpts.padding * 2 - }) - .html( tmp.contents() ); - - wrap - .css(final_pos) - .fadeIn( currentOpts.transitionIn == 'none' ? 0 : currentOpts.speedIn, _finish ); - }, - - _format_title = function(title) { - if (title && title.length) { - if (currentOpts.titlePosition == 'float') { - return '
' + title + '
'; - } - - return '
' + title + '
'; - } - - return false; - }, - - _process_title = function() { - titleStr = currentOpts.title || ''; - titleHeight = 0; - - title - .empty() - .removeAttr('style') - .removeClass(); - - if (currentOpts.titleShow === false) { - title.hide(); - return; - } - - titleStr = $.isFunction(currentOpts.titleFormat) ? currentOpts.titleFormat(titleStr, currentArray, currentIndex, currentOpts) : _format_title(titleStr); - - if (!titleStr || titleStr === '') { - title.hide(); - return; - } - - title - .addClass('fancybox-title-' + currentOpts.titlePosition) - .html( titleStr ) - .appendTo( 'body' ) - .show(); - - switch (currentOpts.titlePosition) { - case 'inside': - title - .css({ - 'width' : final_pos.width - (currentOpts.padding * 2), - 'marginLeft' : currentOpts.padding, - 'marginRight' : currentOpts.padding - }); - - titleHeight = title.outerHeight(true); - - title.appendTo( outer ); - - final_pos.height += titleHeight; - break; - - case 'over': - title - .css({ - 'marginLeft' : currentOpts.padding, - 'width' : final_pos.width - (currentOpts.padding * 2), - 'bottom' : currentOpts.padding - }) - .appendTo( outer ); - break; - - case 'float': - title - .css('left', parseInt((title.width() - final_pos.width - 40)/ 2, 10) * -1) - .appendTo( wrap ); - break; - - default: - title - .css({ - 'width' : final_pos.width - (currentOpts.padding * 2), - 'paddingLeft' : currentOpts.padding, - 'paddingRight' : currentOpts.padding - }) - .appendTo( wrap ); - break; - } - - title.hide(); - }, - - _set_navigation = function() { - if (currentOpts.enableEscapeButton || currentOpts.enableKeyboardNav) { - $(document).bind('keydown.fb', function(e) { - if (e.keyCode == 27 && currentOpts.enableEscapeButton) { - e.preventDefault(); - $.fancybox.close(); - - } else if ((e.keyCode == 37 || e.keyCode == 39) && currentOpts.enableKeyboardNav && e.target.tagName !== 'INPUT' && e.target.tagName !== 'TEXTAREA' && e.target.tagName !== 'SELECT') { - e.preventDefault(); - $.fancybox[ e.keyCode == 37 ? 'prev' : 'next'](); - } - }); - } - - if (!currentOpts.showNavArrows) { - nav_left.hide(); - nav_right.hide(); - return; - } - - if ((currentOpts.cyclic && currentArray.length > 1) || currentIndex !== 0) { - nav_left.show(); - } - - if ((currentOpts.cyclic && currentArray.length > 1) || currentIndex != (currentArray.length -1)) { - nav_right.show(); - } - }, - - _finish = function () { - if (!$.support.opacity) { - content.get(0).style.removeAttribute('filter'); - wrap.get(0).style.removeAttribute('filter'); - } - - if (selectedOpts.autoDimensions) { - content.css('height', 'auto'); - } - - wrap.css('height', 'auto'); - - if (titleStr && titleStr.length) { - title.show(); - } - - if (currentOpts.showCloseButton) { - close.show(); - } - - _set_navigation(); - - if (currentOpts.hideOnContentClick) { - content.bind('click', $.fancybox.close); - } - - if (currentOpts.hideOnOverlayClick) { - overlay.bind('click', $.fancybox.close); - } - - $(window).bind("resize.fb", $.fancybox.resize); - - if (currentOpts.centerOnScroll) { - $(window).bind("scroll.fb", $.fancybox.center); - } - - if (currentOpts.type == 'iframe') { - $('').appendTo(content); - } - - wrap.show(); - - busy = false; - - $.fancybox.center(); - - currentOpts.onComplete(currentArray, currentIndex, currentOpts); - - _preload_images(); - }, - - _preload_images = function() { - var href, - objNext; - - if ((currentArray.length -1) > currentIndex) { - href = currentArray[ currentIndex + 1 ].href; - - if (typeof href !== 'undefined' && href.match(imgRegExp)) { - objNext = new Image(); - objNext.src = href; - } - } - - if (currentIndex > 0) { - href = currentArray[ currentIndex - 1 ].href; - - if (typeof href !== 'undefined' && href.match(imgRegExp)) { - objNext = new Image(); - objNext.src = href; - } - } - }, - - _draw = function(pos) { - var dim = { - width : parseInt(start_pos.width + (final_pos.width - start_pos.width) * pos, 10), - height : parseInt(start_pos.height + (final_pos.height - start_pos.height) * pos, 10), - - top : parseInt(start_pos.top + (final_pos.top - start_pos.top) * pos, 10), - left : parseInt(start_pos.left + (final_pos.left - start_pos.left) * pos, 10) - }; - - if (typeof final_pos.opacity !== 'undefined') { - dim.opacity = pos < 0.5 ? 0.5 : pos; - } - - wrap.css(dim); - - content.css({ - 'width' : dim.width - currentOpts.padding * 2, - 'height' : dim.height - (titleHeight * pos) - currentOpts.padding * 2 - }); - }, - - _get_viewport = function() { - return [ - $(window).width() - (currentOpts.margin * 2), - $(window).height() - (currentOpts.margin * 2), - $(document).scrollLeft() + currentOpts.margin, - $(document).scrollTop() + currentOpts.margin - ]; - }, - - _get_zoom_to = function () { - var view = _get_viewport(), - to = {}, - resize = currentOpts.autoScale, - double_padding = currentOpts.padding * 2, - ratio; - - if (currentOpts.width.toString().indexOf('%') > -1) { - to.width = parseInt((view[0] * parseFloat(currentOpts.width)) / 100, 10); - } else { - to.width = currentOpts.width + double_padding; - } - - if (currentOpts.height.toString().indexOf('%') > -1) { - to.height = parseInt((view[1] * parseFloat(currentOpts.height)) / 100, 10); - } else { - to.height = currentOpts.height + double_padding; - } - - if (resize && (to.width > view[0] || to.height > view[1])) { - if (selectedOpts.type == 'image' || selectedOpts.type == 'swf') { - ratio = (currentOpts.width ) / (currentOpts.height ); - - if ((to.width ) > view[0]) { - to.width = view[0]; - to.height = parseInt(((to.width - double_padding) / ratio) + double_padding, 10); - } - - if ((to.height) > view[1]) { - to.height = view[1]; - to.width = parseInt(((to.height - double_padding) * ratio) + double_padding, 10); - } - - } else { - to.width = Math.min(to.width, view[0]); - to.height = Math.min(to.height, view[1]); - } - } - - to.top = parseInt(Math.max(view[3] - 20, view[3] + ((view[1] - to.height - 40) * 0.5)), 10); - to.left = parseInt(Math.max(view[2] - 20, view[2] + ((view[0] - to.width - 40) * 0.5)), 10); - - return to; - }, - - _get_obj_pos = function(obj) { - var pos = obj.offset(); - - pos.top += parseInt( obj.css('paddingTop'), 10 ) || 0; - pos.left += parseInt( obj.css('paddingLeft'), 10 ) || 0; - - pos.top += parseInt( obj.css('border-top-width'), 10 ) || 0; - pos.left += parseInt( obj.css('border-left-width'), 10 ) || 0; - - pos.width = obj.width(); - pos.height = obj.height(); - - return pos; - }, - - _get_zoom_from = function() { - var orig = selectedOpts.orig ? $(selectedOpts.orig) : false, - from = {}, - pos, - view; - - if (orig && orig.length) { - pos = _get_obj_pos(orig); - - from = { - width : pos.width + (currentOpts.padding * 2), - height : pos.height + (currentOpts.padding * 2), - top : pos.top - currentOpts.padding - 20, - left : pos.left - currentOpts.padding - 20 - }; - - } else { - view = _get_viewport(); - - from = { - width : currentOpts.padding * 2, - height : currentOpts.padding * 2, - top : parseInt(view[3] + view[1] * 0.5, 10), - left : parseInt(view[2] + view[0] * 0.5, 10) - }; - } - - return from; - }, - - _animate_loading = function() { - if (!loading.is(':visible')){ - clearInterval(loadingTimer); - return; - } - - $('div', loading).css('top', (loadingFrame * -40) + 'px'); - - loadingFrame = (loadingFrame + 1) % 12; - }; - - /* - * Public methods - */ - - $.fn.fancybox = function(options) { - if (!$(this).length) { - return this; - } - - $(this) - .data('fancybox', $.extend({}, options, ($.metadata ? $(this).metadata() : {}))) - .unbind('click.fb') - .bind('click.fb', function(e) { - e.preventDefault(); - - if (busy) { - return; - } - - busy = true; - - $(this).blur(); - - selectedArray = []; - selectedIndex = 0; - - var rel = $(this).attr('rel') || ''; - - if (!rel || rel == '' || rel === 'nofollow') { - selectedArray.push(this); - - } else { - selectedArray = $("a[rel=" + rel + "], area[rel=" + rel + "]"); - selectedIndex = selectedArray.index( this ); - } - - _start(); - - return; - }); - - return this; - }; - - $.fancybox = function(obj) { - var opts; - - if (busy) { - return; - } - - busy = true; - opts = typeof arguments[1] !== 'undefined' ? arguments[1] : {}; - - selectedArray = []; - selectedIndex = parseInt(opts.index, 10) || 0; - - if ($.isArray(obj)) { - for (var i = 0, j = obj.length; i < j; i++) { - if (typeof obj[i] == 'object') { - $(obj[i]).data('fancybox', $.extend({}, opts, obj[i])); - } else { - obj[i] = $({}).data('fancybox', $.extend({content : obj[i]}, opts)); - } - } - - selectedArray = jQuery.merge(selectedArray, obj); - - } else { - if (typeof obj == 'object') { - $(obj).data('fancybox', $.extend({}, opts, obj)); - } else { - obj = $({}).data('fancybox', $.extend({content : obj}, opts)); - } - - selectedArray.push(obj); - } - - if (selectedIndex > selectedArray.length || selectedIndex < 0) { - selectedIndex = 0; - } - - _start(); - }; - - $.fancybox.showActivity = function() { - clearInterval(loadingTimer); - - loading.show(); - loadingTimer = setInterval(_animate_loading, 66); - }; - - $.fancybox.hideActivity = function() { - loading.hide(); - }; - - $.fancybox.next = function() { - return $.fancybox.pos( currentIndex + 1); - }; - - $.fancybox.prev = function() { - return $.fancybox.pos( currentIndex - 1); - }; - - $.fancybox.pos = function(pos) { - if (busy) { - return; - } - - pos = parseInt(pos); - - selectedArray = currentArray; - - if (pos > -1 && pos < currentArray.length) { - selectedIndex = pos; - _start(); - - } else if (currentOpts.cyclic && currentArray.length > 1) { - selectedIndex = pos >= currentArray.length ? 0 : currentArray.length - 1; - _start(); - } - - return; - }; - - $.fancybox.cancel = function() { - if (busy) { - return; - } - - busy = true; - - $.event.trigger('fancybox-cancel'); - - _abort(); - - selectedOpts.onCancel(selectedArray, selectedIndex, selectedOpts); - - busy = false; - }; - - // Note: within an iframe use - parent.$.fancybox.close(); - $.fancybox.close = function() { - if (busy || wrap.is(':hidden')) { - return; - } - - busy = true; - - if (currentOpts && false === currentOpts.onCleanup(currentArray, currentIndex, currentOpts)) { - busy = false; - return; - } - - _abort(); - - $(close.add( nav_left ).add( nav_right )).hide(); - - $(content.add( overlay )).unbind(); - - $(window).unbind("resize.fb scroll.fb"); - $(document).unbind('keydown.fb'); - - content.find('iframe').attr('src', isIE6 && /^https/i.test(window.location.href || '') ? 'javascript:void(false)' : 'about:blank'); - - if (currentOpts.titlePosition !== 'inside') { - title.empty(); - } - - wrap.stop(); - - function _cleanup() { - overlay.fadeOut('fast'); - - title.empty().hide(); - wrap.hide(); - - $.event.trigger('fancybox-cleanup'); - - content.empty(); - - currentOpts.onClosed(currentArray, currentIndex, currentOpts); - - currentArray = selectedOpts = []; - currentIndex = selectedIndex = 0; - currentOpts = selectedOpts = {}; - - busy = false; - } - - if (currentOpts.transitionOut == 'elastic') { - start_pos = _get_zoom_from(); - - var pos = wrap.position(); - - final_pos = { - top : pos.top , - left : pos.left, - width : wrap.width(), - height : wrap.height() - }; - - if (currentOpts.opacity) { - final_pos.opacity = 1; - } - - title.empty().hide(); - - fx.prop = 1; - - $(fx).animate({ prop: 0 }, { - duration : currentOpts.speedOut, - easing : currentOpts.easingOut, - step : _draw, - complete : _cleanup - }); - - } else { - wrap.fadeOut( currentOpts.transitionOut == 'none' ? 0 : currentOpts.speedOut, _cleanup); - } - }; - - $.fancybox.resize = function() { - if (overlay.is(':visible')) { - overlay.css('height', $(document).height()); - } - - $.fancybox.center(true); - }; - - $.fancybox.center = function() { - var view, align; - - if (busy) { - return; - } - - align = arguments[0] === true ? 1 : 0; - view = _get_viewport(); - - if (!align && (wrap.width() > view[0] || wrap.height() > view[1])) { - return; - } - - wrap - .stop() - .animate({ - 'top' : parseInt(Math.max(view[3] - 20, view[3] + ((view[1] - content.height() - 40) * 0.5) - currentOpts.padding)), - 'left' : parseInt(Math.max(view[2] - 20, view[2] + ((view[0] - content.width() - 40) * 0.5) - currentOpts.padding)) - }, typeof arguments[0] == 'number' ? arguments[0] : 200); - }; - - $.fancybox.init = function() { - if ($("#fancybox-wrap").length) { - return; - } - - $('body').append( - tmp = $('
'), - loading = $('
'), - overlay = $('
'), - wrap = $('
') - ); - - outer = $('
') - .append('
') - .appendTo( wrap ); - - outer.append( - content = $('
'), - close = $(''), - title = $('
'), - - nav_left = $(''), - nav_right = $('') - ); - - close.click($.fancybox.close); - loading.click($.fancybox.cancel); - - nav_left.click(function(e) { - e.preventDefault(); - $.fancybox.prev(); - }); - - nav_right.click(function(e) { - e.preventDefault(); - $.fancybox.next(); - }); - - if ($.fn.mousewheel) { - wrap.bind('mousewheel.fb', function(e, delta) { - if (busy) { - e.preventDefault(); - - } else if ($(e.target).get(0).clientHeight == 0 || $(e.target).get(0).scrollHeight === $(e.target).get(0).clientHeight) { - e.preventDefault(); - $.fancybox[ delta > 0 ? 'prev' : 'next'](); - } - }); - } - - if (!$.support.opacity) { - wrap.addClass('fancybox-ie'); - } - - if (isIE6) { - loading.addClass('fancybox-ie6'); - wrap.addClass('fancybox-ie6'); - - $('').prependTo(outer); - } - }; - - $.fn.fancybox.defaults = { - padding : 10, - margin : 40, - opacity : false, - modal : false, - cyclic : false, - scrolling : 'auto', // 'auto', 'yes' or 'no' - - width : 560, - height : 340, - - autoScale : true, - autoDimensions : true, - centerOnScroll : false, - - ajax : {}, - swf : { wmode: 'transparent' }, - - hideOnOverlayClick : true, - hideOnContentClick : false, - - overlayShow : true, - overlayOpacity : 0.7, - overlayColor : '#777', - - titleShow : true, - titlePosition : 'float', // 'float', 'outside', 'inside' or 'over' - titleFormat : null, - titleFromAlt : false, - - transitionIn : 'fade', // 'elastic', 'fade' or 'none' - transitionOut : 'fade', // 'elastic', 'fade' or 'none' - - speedIn : 300, - speedOut : 300, - - changeSpeed : 300, - changeFade : 'fast', - - easingIn : 'swing', - easingOut : 'swing', - - showCloseButton : true, - showNavArrows : true, - enableEscapeButton : true, - enableKeyboardNav : true, - - onStart : function(){}, - onCancel : function(){}, - onComplete : function(){}, - onCleanup : function(){}, - onClosed : function(){}, - onError : function(){} - }; - - $(document).ready(function() { - $.fancybox.init(); - }); - -})(jQuery); DELETED cgisetup/www/css/img/fancybox/jquery.fancybox-1.3.4.pack.js Index: cgisetup/www/css/img/fancybox/jquery.fancybox-1.3.4.pack.js ================================================================== --- cgisetup/www/css/img/fancybox/jquery.fancybox-1.3.4.pack.js +++ /dev/null @@ -1,46 +0,0 @@ -/* - * FancyBox - jQuery Plugin - * Simple and fancy lightbox alternative - * - * Examples and documentation at: http://fancybox.net - * - * Copyright (c) 2008 - 2010 Janis Skarnelis - * That said, it is hardly a one-person project. Many people have submitted bugs, code, and offered their advice freely. Their support is greatly appreciated. - * - * Version: 1.3.4 (11/11/2010) - * Requires: jQuery v1.3+ - * - * Dual licensed under the MIT and GPL licenses: - * http://www.opensource.org/licenses/mit-license.php - * http://www.gnu.org/licenses/gpl.html - */ - -;(function(b){var m,t,u,f,D,j,E,n,z,A,q=0,e={},o=[],p=0,d={},l=[],G=null,v=new Image,J=/\.(jpg|gif|png|bmp|jpeg)(.*)?$/i,W=/[^\.]\.(swf)\s*$/i,K,L=1,y=0,s="",r,i,h=false,B=b.extend(b("
")[0],{prop:0}),M=b.browser.msie&&b.browser.version<7&&!window.XMLHttpRequest,N=function(){t.hide();v.onerror=v.onload=null;G&&G.abort();m.empty()},O=function(){if(false===e.onError(o,q,e)){t.hide();h=false}else{e.titleShow=false;e.width="auto";e.height="auto";m.html('

The requested content cannot be loaded.
Please try again later.

'); -F()}},I=function(){var a=o[q],c,g,k,C,P,w;N();e=b.extend({},b.fn.fancybox.defaults,typeof b(a).data("fancybox")=="undefined"?e:b(a).data("fancybox"));w=e.onStart(o,q,e);if(w===false)h=false;else{if(typeof w=="object")e=b.extend(e,w);k=e.title||(a.nodeName?b(a).attr("title"):a.title)||"";if(a.nodeName&&!e.orig)e.orig=b(a).children("img:first").length?b(a).children("img:first"):b(a);if(k===""&&e.orig&&e.titleFromAlt)k=e.orig.attr("alt");c=e.href||(a.nodeName?b(a).attr("href"):a.href)||null;if(/^(?:javascript)/i.test(c)|| -c=="#")c=null;if(e.type){g=e.type;if(!c)c=e.content}else if(e.content)g="html";else if(c)g=c.match(J)?"image":c.match(W)?"swf":b(a).hasClass("iframe")?"iframe":c.indexOf("#")===0?"inline":"ajax";if(g){if(g=="inline"){a=c.substr(c.indexOf("#"));g=b(a).length>0?"inline":"ajax"}e.type=g;e.href=c;e.title=k;if(e.autoDimensions)if(e.type=="html"||e.type=="inline"||e.type=="ajax"){e.width="auto";e.height="auto"}else e.autoDimensions=false;if(e.modal){e.overlayShow=true;e.hideOnOverlayClick=false;e.hideOnContentClick= -false;e.enableEscapeButton=false;e.showCloseButton=false}e.padding=parseInt(e.padding,10);e.margin=parseInt(e.margin,10);m.css("padding",e.padding+e.margin);b(".fancybox-inline-tmp").unbind("fancybox-cancel").bind("fancybox-change",function(){b(this).replaceWith(j.children())});switch(g){case "html":m.html(e.content);F();break;case "inline":if(b(a).parent().is("#fancybox-content")===true){h=false;break}b('
').hide().insertBefore(b(a)).bind("fancybox-cleanup",function(){b(this).replaceWith(j.children())}).bind("fancybox-cancel", -function(){b(this).replaceWith(m.children())});b(a).appendTo(m);F();break;case "image":h=false;b.fancybox.showActivity();v=new Image;v.onerror=function(){O()};v.onload=function(){h=true;v.onerror=v.onload=null;e.width=v.width;e.height=v.height;b("").attr({id:"fancybox-img",src:v.src,alt:e.title}).appendTo(m);Q()};v.src=c;break;case "swf":e.scrolling="no";C='';P="";b.each(e.swf,function(x,H){C+='';P+=" "+x+'="'+H+'"'});C+='";m.html(C);F();break;case "ajax":h=false;b.fancybox.showActivity();e.ajax.win=e.ajax.success;G=b.ajax(b.extend({},e.ajax,{url:c,data:e.ajax.data||{},error:function(x){x.status>0&&O()},success:function(x,H,R){if((typeof R=="object"?R:G).status==200){if(typeof e.ajax.win== -"function"){w=e.ajax.win(c,x,H,R);if(w===false){t.hide();return}else if(typeof w=="string"||typeof w=="object")x=w}m.html(x);F()}}}));break;case "iframe":Q()}}else O()}},F=function(){var a=e.width,c=e.height;a=a.toString().indexOf("%")>-1?parseInt((b(window).width()-e.margin*2)*parseFloat(a)/100,10)+"px":a=="auto"?"auto":a+"px";c=c.toString().indexOf("%")>-1?parseInt((b(window).height()-e.margin*2)*parseFloat(c)/100,10)+"px":c=="auto"?"auto":c+"px";m.wrapInner('
');e.width=m.width();e.height=m.height();Q()},Q=function(){var a,c;t.hide();if(f.is(":visible")&&false===d.onCleanup(l,p,d)){b.event.trigger("fancybox-cancel");h=false}else{h=true;b(j.add(u)).unbind();b(window).unbind("resize.fb scroll.fb");b(document).unbind("keydown.fb");f.is(":visible")&&d.titlePosition!=="outside"&&f.css("height",f.height());l=o;p=q;d=e;if(d.overlayShow){u.css({"background-color":d.overlayColor, -opacity:d.overlayOpacity,cursor:d.hideOnOverlayClick?"pointer":"auto",height:b(document).height()});if(!u.is(":visible")){M&&b("select:not(#fancybox-tmp select)").filter(function(){return this.style.visibility!=="hidden"}).css({visibility:"hidden"}).one("fancybox-cleanup",function(){this.style.visibility="inherit"});u.show()}}else u.hide();i=X();s=d.title||"";y=0;n.empty().removeAttr("style").removeClass();if(d.titleShow!==false){if(b.isFunction(d.titleFormat))a=d.titleFormat(s,l,p,d);else a=s&&s.length? -d.titlePosition=="float"?'
'+s+'
':'
'+s+"
":false;s=a;if(!(!s||s==="")){n.addClass("fancybox-title-"+d.titlePosition).html(s).appendTo("body").show();switch(d.titlePosition){case "inside":n.css({width:i.width-d.padding*2,marginLeft:d.padding,marginRight:d.padding}); -y=n.outerHeight(true);n.appendTo(D);i.height+=y;break;case "over":n.css({marginLeft:d.padding,width:i.width-d.padding*2,bottom:d.padding}).appendTo(D);break;case "float":n.css("left",parseInt((n.width()-i.width-40)/2,10)*-1).appendTo(f);break;default:n.css({width:i.width-d.padding*2,paddingLeft:d.padding,paddingRight:d.padding}).appendTo(f)}}}n.hide();if(f.is(":visible")){b(E.add(z).add(A)).hide();a=f.position();r={top:a.top,left:a.left,width:f.width(),height:f.height()};c=r.width==i.width&&r.height== -i.height;j.fadeTo(d.changeFade,0.3,function(){var g=function(){j.html(m.contents()).fadeTo(d.changeFade,1,S)};b.event.trigger("fancybox-change");j.empty().removeAttr("filter").css({"border-width":d.padding,width:i.width-d.padding*2,height:e.autoDimensions?"auto":i.height-y-d.padding*2});if(c)g();else{B.prop=0;b(B).animate({prop:1},{duration:d.changeSpeed,easing:d.easingChange,step:T,complete:g})}})}else{f.removeAttr("style");j.css("border-width",d.padding);if(d.transitionIn=="elastic"){r=V();j.html(m.contents()); -f.show();if(d.opacity)i.opacity=0;B.prop=0;b(B).animate({prop:1},{duration:d.speedIn,easing:d.easingIn,step:T,complete:S})}else{d.titlePosition=="inside"&&y>0&&n.show();j.css({width:i.width-d.padding*2,height:e.autoDimensions?"auto":i.height-y-d.padding*2}).html(m.contents());f.css(i).fadeIn(d.transitionIn=="none"?0:d.speedIn,S)}}}},Y=function(){if(d.enableEscapeButton||d.enableKeyboardNav)b(document).bind("keydown.fb",function(a){if(a.keyCode==27&&d.enableEscapeButton){a.preventDefault();b.fancybox.close()}else if((a.keyCode== -37||a.keyCode==39)&&d.enableKeyboardNav&&a.target.tagName!=="INPUT"&&a.target.tagName!=="TEXTAREA"&&a.target.tagName!=="SELECT"){a.preventDefault();b.fancybox[a.keyCode==37?"prev":"next"]()}});if(d.showNavArrows){if(d.cyclic&&l.length>1||p!==0)z.show();if(d.cyclic&&l.length>1||p!=l.length-1)A.show()}else{z.hide();A.hide()}},S=function(){if(!b.support.opacity){j.get(0).style.removeAttribute("filter");f.get(0).style.removeAttribute("filter")}e.autoDimensions&&j.css("height","auto");f.css("height","auto"); -s&&s.length&&n.show();d.showCloseButton&&E.show();Y();d.hideOnContentClick&&j.bind("click",b.fancybox.close);d.hideOnOverlayClick&&u.bind("click",b.fancybox.close);b(window).bind("resize.fb",b.fancybox.resize);d.centerOnScroll&&b(window).bind("scroll.fb",b.fancybox.center);if(d.type=="iframe")b('').appendTo(j); -f.show();h=false;b.fancybox.center();d.onComplete(l,p,d);var a,c;if(l.length-1>p){a=l[p+1].href;if(typeof a!=="undefined"&&a.match(J)){c=new Image;c.src=a}}if(p>0){a=l[p-1].href;if(typeof a!=="undefined"&&a.match(J)){c=new Image;c.src=a}}},T=function(a){var c={width:parseInt(r.width+(i.width-r.width)*a,10),height:parseInt(r.height+(i.height-r.height)*a,10),top:parseInt(r.top+(i.top-r.top)*a,10),left:parseInt(r.left+(i.left-r.left)*a,10)};if(typeof i.opacity!=="undefined")c.opacity=a<0.5?0.5:a;f.css(c); -j.css({width:c.width-d.padding*2,height:c.height-y*a-d.padding*2})},U=function(){return[b(window).width()-d.margin*2,b(window).height()-d.margin*2,b(document).scrollLeft()+d.margin,b(document).scrollTop()+d.margin]},X=function(){var a=U(),c={},g=d.autoScale,k=d.padding*2;c.width=d.width.toString().indexOf("%")>-1?parseInt(a[0]*parseFloat(d.width)/100,10):d.width+k;c.height=d.height.toString().indexOf("%")>-1?parseInt(a[1]*parseFloat(d.height)/100,10):d.height+k;if(g&&(c.width>a[0]||c.height>a[1]))if(e.type== -"image"||e.type=="swf"){g=d.width/d.height;if(c.width>a[0]){c.width=a[0];c.height=parseInt((c.width-k)/g+k,10)}if(c.height>a[1]){c.height=a[1];c.width=parseInt((c.height-k)*g+k,10)}}else{c.width=Math.min(c.width,a[0]);c.height=Math.min(c.height,a[1])}c.top=parseInt(Math.max(a[3]-20,a[3]+(a[1]-c.height-40)*0.5),10);c.left=parseInt(Math.max(a[2]-20,a[2]+(a[0]-c.width-40)*0.5),10);return c},V=function(){var a=e.orig?b(e.orig):false,c={};if(a&&a.length){c=a.offset();c.top+=parseInt(a.css("paddingTop"), -10)||0;c.left+=parseInt(a.css("paddingLeft"),10)||0;c.top+=parseInt(a.css("border-top-width"),10)||0;c.left+=parseInt(a.css("border-left-width"),10)||0;c.width=a.width();c.height=a.height();c={width:c.width+d.padding*2,height:c.height+d.padding*2,top:c.top-d.padding-20,left:c.left-d.padding-20}}else{a=U();c={width:d.padding*2,height:d.padding*2,top:parseInt(a[3]+a[1]*0.5,10),left:parseInt(a[2]+a[0]*0.5,10)}}return c},Z=function(){if(t.is(":visible")){b("div",t).css("top",L*-40+"px");L=(L+1)%12}else clearInterval(K)}; -b.fn.fancybox=function(a){if(!b(this).length)return this;b(this).data("fancybox",b.extend({},a,b.metadata?b(this).metadata():{})).unbind("click.fb").bind("click.fb",function(c){c.preventDefault();if(!h){h=true;b(this).blur();o=[];q=0;c=b(this).attr("rel")||"";if(!c||c==""||c==="nofollow")o.push(this);else{o=b("a[rel="+c+"], area[rel="+c+"]");q=o.index(this)}I()}});return this};b.fancybox=function(a,c){var g;if(!h){h=true;g=typeof c!=="undefined"?c:{};o=[];q=parseInt(g.index,10)||0;if(b.isArray(a)){for(var k= -0,C=a.length;ko.length||q<0)q=0;I()}};b.fancybox.showActivity=function(){clearInterval(K);t.show();K=setInterval(Z,66)};b.fancybox.hideActivity=function(){t.hide()};b.fancybox.next=function(){return b.fancybox.pos(p+ -1)};b.fancybox.prev=function(){return b.fancybox.pos(p-1)};b.fancybox.pos=function(a){if(!h){a=parseInt(a);o=l;if(a>-1&&a1){q=a>=l.length?0:l.length-1;I()}}};b.fancybox.cancel=function(){if(!h){h=true;b.event.trigger("fancybox-cancel");N();e.onCancel(o,q,e);h=false}};b.fancybox.close=function(){function a(){u.fadeOut("fast");n.empty().hide();f.hide();b.event.trigger("fancybox-cleanup");j.empty();d.onClosed(l,p,d);l=e=[];p=q=0;d=e={};h=false}if(!(h||f.is(":hidden"))){h= -true;if(d&&false===d.onCleanup(l,p,d))h=false;else{N();b(E.add(z).add(A)).hide();b(j.add(u)).unbind();b(window).unbind("resize.fb scroll.fb");b(document).unbind("keydown.fb");j.find("iframe").attr("src",M&&/^https/i.test(window.location.href||"")?"javascript:void(false)":"about:blank");d.titlePosition!=="inside"&&n.empty();f.stop();if(d.transitionOut=="elastic"){r=V();var c=f.position();i={top:c.top,left:c.left,width:f.width(),height:f.height()};if(d.opacity)i.opacity=1;n.empty().hide();B.prop=1; -b(B).animate({prop:0},{duration:d.speedOut,easing:d.easingOut,step:T,complete:a})}else f.fadeOut(d.transitionOut=="none"?0:d.speedOut,a)}}};b.fancybox.resize=function(){u.is(":visible")&&u.css("height",b(document).height());b.fancybox.center(true)};b.fancybox.center=function(a){var c,g;if(!h){g=a===true?1:0;c=U();!g&&(f.width()>c[0]||f.height()>c[1])||f.stop().animate({top:parseInt(Math.max(c[3]-20,c[3]+(c[1]-j.height()-40)*0.5-d.padding)),left:parseInt(Math.max(c[2]-20,c[2]+(c[0]-j.width()-40)*0.5- -d.padding))},typeof a=="number"?a:200)}};b.fancybox.init=function(){if(!b("#fancybox-wrap").length){b("body").append(m=b('
'),t=b('
'),u=b('
'),f=b('
'));D=b('
').append('
').appendTo(f); -D.append(j=b('
'),E=b(''),n=b('
'),z=b(''),A=b(''));E.click(b.fancybox.close);t.click(b.fancybox.cancel);z.click(function(a){a.preventDefault();b.fancybox.prev()});A.click(function(a){a.preventDefault();b.fancybox.next()}); -b.fn.mousewheel&&f.bind("mousewheel.fb",function(a,c){if(h)a.preventDefault();else if(b(a.target).get(0).clientHeight==0||b(a.target).get(0).scrollHeight===b(a.target).get(0).clientHeight){a.preventDefault();b.fancybox[c>0?"prev":"next"]()}});b.support.opacity||f.addClass("fancybox-ie");if(M){t.addClass("fancybox-ie6");f.addClass("fancybox-ie6");b('').prependTo(D)}}}; -b.fn.fancybox.defaults={padding:10,margin:40,opacity:false,modal:false,cyclic:false,scrolling:"auto",width:560,height:340,autoScale:true,autoDimensions:true,centerOnScroll:false,ajax:{},swf:{wmode:"transparent"},hideOnOverlayClick:true,hideOnContentClick:false,overlayShow:true,overlayOpacity:0.7,overlayColor:"#777",titleShow:true,titlePosition:"float",titleFormat:null,titleFromAlt:false,transitionIn:"fade",transitionOut:"fade",speedIn:300,speedOut:300,changeSpeed:300,changeFade:"fast",easingIn:"swing", -easingOut:"swing",showCloseButton:true,showNavArrows:true,enableEscapeButton:true,enableKeyboardNav:true,onStart:function(){},onCancel:function(){},onComplete:function(){},onCleanup:function(){},onClosed:function(){},onError:function(){}};b(document).ready(function(){b.fancybox.init()})})(jQuery); DELETED cgisetup/www/css/img/fancybox/jquery.mousewheel-3.0.4.pack.js Index: cgisetup/www/css/img/fancybox/jquery.mousewheel-3.0.4.pack.js ================================================================== --- cgisetup/www/css/img/fancybox/jquery.mousewheel-3.0.4.pack.js +++ /dev/null @@ -1,14 +0,0 @@ -/*! Copyright (c) 2010 Brandon Aaron (http://brandonaaron.net) -* Licensed under the MIT License (LICENSE.txt). -* -* Thanks to: http://adomas.org/javascript-mouse-wheel/ for some pointers. -* Thanks to: Mathias Bank(http://www.mathias-bank.de) for a scope bug fix. -* Thanks to: Seamus Leahy for adding deltaX and deltaY -* -* Version: 3.0.4 -* -* Requires: 1.2.2+ -*/ - -(function(d){function g(a){var b=a||window.event,i=[].slice.call(arguments,1),c=0,h=0,e=0;a=d.event.fix(b);a.type="mousewheel";if(a.wheelDelta)c=a.wheelDelta/120;if(a.detail)c=-a.detail/3;e=c;if(b.axis!==undefined&&b.axis===b.HORIZONTAL_AXIS){e=0;h=-1*c}if(b.wheelDeltaY!==undefined)e=b.wheelDeltaY/120;if(b.wheelDeltaX!==undefined)h=-1*b.wheelDeltaX/120;i.unshift(a,c,h,e);return d.event.handle.apply(this,i)}var f=["DOMMouseScroll","mousewheel"];d.event.special.mousewheel={setup:function(){if(this.addEventListener)for(var a= -f.length;a;)this.addEventListener(f[--a],g,false);else this.onmousewheel=g},teardown:function(){if(this.removeEventListener)for(var a=f.length;a;)this.removeEventListener(f[--a],g,false);else this.onmousewheel=null}};d.fn.extend({mousewheel:function(a){return a?this.bind("mousewheel",a):this.trigger("mousewheel")},unmousewheel:function(a){return this.unbind("mousewheel",a)}})})(jQuery); DELETED cgisetup/www/css/img/gray_jean.png Index: cgisetup/www/css/img/gray_jean.png ================================================================== --- cgisetup/www/css/img/gray_jean.png +++ /dev/null cannot compute difference between binary files DELETED cgisetup/www/css/img/icon-arrow-right.png Index: cgisetup/www/css/img/icon-arrow-right.png ================================================================== --- cgisetup/www/css/img/icon-arrow-right.png +++ /dev/null cannot compute difference between binary files DELETED cgisetup/www/css/jquery.fancybox-1.3.4.css Index: cgisetup/www/css/jquery.fancybox-1.3.4.css ================================================================== --- cgisetup/www/css/jquery.fancybox-1.3.4.css +++ /dev/null @@ -1,366 +0,0 @@ -/* - * FancyBox - jQuery Plugin - * Simple and fancy lightbox alternative - * - * Examples and documentation at: http://fancybox.net - * - * Copyright (c) 2008 - 2010 Janis Skarnelis - * That said, it is hardly a one-person project. Many people have submitted bugs, code, and offered their advice freely. Their support is greatly appreciated. - * - * Version: 1.3.4 (11/11/2010) - * Requires: jQuery v1.3+ - * - * Dual licensed under the MIT and GPL licenses: - * http://www.opensource.org/licenses/mit-license.php - * http://www.gnu.org/licenses/gpl.html - */ - -#fancybox-loading { - position: fixed; - top: 50%; - left: 50%; - width: 40px; - height: 40px; - margin-top: -20px; - margin-left: -20px; - cursor: pointer; - overflow: hidden; - z-index: 1104; - display: none; -} - -#fancybox-loading div { - position: absolute; - top: 0; - left: 0; - width: 40px; - height: 480px; - background-image: url('img/fancybox/fancybox.png'); -} - -#fancybox-overlay { - position: absolute; - top: 0; - left: 0; - width: 100%; - z-index: 1100; - display: none; -} - -#fancybox-tmp { - padding: 0; - margin: 0; - border: 0; - overflow: auto; - display: none; -} - -#fancybox-wrap { - position: absolute; - top: 0; - left: 0; - padding: 20px; - z-index: 1101; - outline: none; - display: none; -} - -#fancybox-outer { - position: relative; - width: 100%; - height: 100%; - background: #fff; -} - -#fancybox-wrap, -#fancybox-wrap *{ --webkit-box-sizing: content-box; /* Safari/Chrome, other WebKit */ --moz-box-sizing: content-box; /* Firefox, other Gecko */ -box-sizing: content-box; /* Opera/IE 8+ */ -} - -#fancybox-content { - width: 0; - height: 0; - padding: 0; - outline: none; - position: relative; - overflow: hidden; - z-index: 1102; - border: 0 solid #fff; -} - -#fancybox-hide-sel-frame { - position: absolute; - top: 0; - left: 0; - width: 100%; - height: 100%; - background: transparent; - z-index: 1101; -} - -#fancybox-close { - position: absolute; - top: -15px; - right: -15px; - width: 30px; - height: 30px; - background: transparent url('img/fancybox/fancybox.png') -40px 0; - cursor: pointer; - z-index: 1103; - display: none; -} - -#fancybox-error { - color: #444; - font: normal 12px/20px Arial; - padding: 14px; - margin: 0; -} - -#fancybox-img { - width: 100%; - height: 100%; - padding: 0; - margin: 0; - border: none; - outline: none; - line-height: 0; - vertical-align: top; -} - -#fancybox-frame { - width: 100%; - height: 100%; - border: none; - display: block; -} - -#fancybox-left, #fancybox-right { - position: absolute; - bottom: 0; - height: 100%; - width: 35%; - cursor: pointer; - outline: none; - background: transparent url('img/fancybox/blank.gif'); - z-index: 1102; - display: none; -} - -#fancybox-left { - left: 0; -} - -#fancybox-right { - right: 0; -} - -#fancybox-left-ico, #fancybox-right-ico { - position: absolute; - top: 50%; - left: -9999px; - width: 30px; - height: 30px; - margin-top: -15px; - cursor: pointer; - z-index: 1102; - display: block; -} - -#fancybox-left-ico { - background-image: url('img/fancybox/fancybox.png'); - background-position: -40px -30px; -} - -#fancybox-right-ico { - background-image: url('img/fancybox/fancybox.png'); - background-position: -40px -60px; -} - -#fancybox-left:hover, #fancybox-right:hover { - visibility: visible; /* IE6 */ -} - -#fancybox-left:hover span { - left: 20px; -} - -#fancybox-right:hover span { - left: auto; - right: 20px; -} - -.fancybox-bg { - position: absolute; - padding: 0; - margin: 0; - border: 0; - width: 20px; - height: 20px; - z-index: 1001; -} - -#fancybox-bg-n { - top: -20px; - left: 0; - width: 100%; - background-image: url('img/fancybox/fancybox-x.png'); -} - -#fancybox-bg-ne { - top: -20px; - right: -20px; - background-image: url('img/fancybox/fancybox.png'); - background-position: -40px -162px; -} - -#fancybox-bg-e { - top: 0; - right: -20px; - height: 100%; - background-image: url('img/fancybox/fancybox-y.png'); - background-position: -20px 0; -} - -#fancybox-bg-se { - bottom: -20px; - right: -20px; - background-image: url('img/fancybox/fancybox.png'); - background-position: -40px -182px; -} - -#fancybox-bg-s { - bottom: -20px; - left: 0; - width: 100%; - background-image: url('img/fancybox/fancybox-x.png'); - background-position: 0 -20px; -} - -#fancybox-bg-sw { - bottom: -20px; - left: -20px; - background-image: url('img/fancybox/fancybox.png'); - background-position: -40px -142px; -} - -#fancybox-bg-w { - top: 0; - left: -20px; - height: 100%; - background-image: url('img/fancybox/fancybox-y.png'); -} - -#fancybox-bg-nw { - top: -20px; - left: -20px; - background-image: url('img/fancybox/fancybox.png'); - background-position: -40px -122px; -} - -#fancybox-title { - font-family: Helvetica; - font-size: 12px; - z-index: 1102; -} - -.fancybox-title-inside { - padding-bottom: 10px; - text-align: center; - color: #333; - background: #fff; - position: relative; -} - -.fancybox-title-outside { - padding-top: 10px; - color: #fff; -} - -.fancybox-title-over { - position: absolute; - bottom: 0; - left: 0; - color: #FFF; - text-align: left; -} - -#fancybox-title-over { - padding: 10px; - background-image: url('img/fancybox/fancy_title_over.png'); - display: block; -} - -.fancybox-title-float { - position: absolute; - left: 0; - bottom: -20px; - height: 32px; -} - -#fancybox-title-float-wrap { - border: none; - border-collapse: collapse; - width: auto; -} - -#fancybox-title-float-wrap td { - border: none; - white-space: nowrap; -} - -#fancybox-title-float-left { - padding: 0 0 0 15px; - background: url('img/fancybox/fancybox.png') -40px -90px no-repeat; -} - -#fancybox-title-float-main { - color: #FFF; - line-height: 29px; - font-weight: bold; - padding: 0 0 3px 0; - background: url('img/fancybox/fancybox-x.png') 0 -40px; -} - -#fancybox-title-float-right { - padding: 0 0 0 15px; - background: url('img/fancybox/fancybox.png') -55px -90px no-repeat; -} - -/* IE6 */ - -.fancybox-ie6 #fancybox-close { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='img/fancybox/fancy_close.png', sizingMethod='scale'); } - -.fancybox-ie6 #fancybox-left-ico { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='img/fancybox/fancy_nav_left.png', sizingMethod='scale'); } -.fancybox-ie6 #fancybox-right-ico { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='img/fancybox/fancy_nav_right.png', sizingMethod='scale'); } - -.fancybox-ie6 #fancybox-title-over { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='img/fancybox/fancy_title_over.png', sizingMethod='scale'); zoom: 1; } -.fancybox-ie6 #fancybox-title-float-left { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='img/fancybox/fancy_title_left.png', sizingMethod='scale'); } -.fancybox-ie6 #fancybox-title-float-main { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='img/fancybox/fancy_title_main.png', sizingMethod='scale'); } -.fancybox-ie6 #fancybox-title-float-right { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='img/fancybox/fancy_title_right.png', sizingMethod='scale'); } - -.fancybox-ie6 #fancybox-bg-w, .fancybox-ie6 #fancybox-bg-e, .fancybox-ie6 #fancybox-left, .fancybox-ie6 #fancybox-right, #fancybox-hide-sel-frame { - height: expression(this.parentNode.clientHeight + "px"); -} - -#fancybox-loading.fancybox-ie6 { - position: absolute; margin-top: 0; - top: expression( (-20 + (document.documentElement.clientHeight ? document.documentElement.clientHeight/2 : document.body.clientHeight/2 ) + ( ignoreMe = document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop )) + 'px'); -} - -#fancybox-loading.fancybox-ie6 div { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='img/fancybox/fancy_loading.png', sizingMethod='scale'); } - -/* IE6, IE7, IE8 */ - -.fancybox-ie .fancybox-bg { background: transparent !important; } - -.fancybox-ie #fancybox-bg-n { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='img/fancybox/fancy_shadow_n.png', sizingMethod='scale'); } -.fancybox-ie #fancybox-bg-ne { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='img/fancybox/fancy_shadow_ne.png', sizingMethod='scale'); } -.fancybox-ie #fancybox-bg-e { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='img/fancybox/fancy_shadow_e.png', sizingMethod='scale'); } -.fancybox-ie #fancybox-bg-se { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='img/fancybox/fancy_shadow_se.png', sizingMethod='scale'); } -.fancybox-ie #fancybox-bg-s { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='img/fancybox/fancy_shadow_s.png', sizingMethod='scale'); } -.fancybox-ie #fancybox-bg-sw { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='img/fancybox/fancy_shadow_sw.png', sizingMethod='scale'); } -.fancybox-ie #fancybox-bg-w { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='img/fancybox/fancy_shadow_w.png', sizingMethod='scale'); } -.fancybox-ie #fancybox-bg-nw { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='img/fancybox/fancy_shadow_nw.png', sizingMethod='scale'); } DELETED cgisetup/www/css/kickstart-buttons.css Index: cgisetup/www/css/kickstart-buttons.css ================================================================== --- cgisetup/www/css/kickstart-buttons.css +++ /dev/null @@ -1,369 +0,0 @@ -/* - 99Lime.com HTML KickStart by Joshua Gatcke - kickstart-buttons.css - - Super Easy Cross Browser CSS3 Gradients - http://www.colorzilla.com/gradient-editor/ -*/ - -/*--------------------------------- - BUTTONS ------------------------------------*/ -button, -a.btn, -a.btn:visited, -a.button, -a.button:visited, -input[type="submit"], -input[type="reset"], -input[type="button"]{ -position:relative; -top:0; -left:0; -vertical-align: middle; -margin:0; -padding:10px 15px; -line-height:100%; --moz-border-radius:5px; --webkit-border-radius:5px; -border-radius:5px; -cursor: pointer; -width:auto; -overflow:visible; -font-weight:normal; -font-size:14px; /*Pixels for consistancy*/ -text-shadow:0 1px 0 #fff; -color:#666; -text-decoration:none; -vertical-align: middle; --webkit-box-sizing: border-box; --moz-box-sizing: border-box; -box-sizing: border-box; -display:inline-block; -*display:inline;/*IE ONLY*/ -zoom:1; -border:1px solid #ccc; -background: rgb(252,252,252); /* Old browsers */ -background: -moz-linear-gradient(top, rgba(252,252,252,1) 0%, rgba(224,224,224,1) 100%); /* FF3.6+ */ -background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(252,252,252,1)), color-stop(100%,rgba(224,224,224,1))); /* Chrome,Safari4+ */ -background: -webkit-linear-gradient(top, rgba(252,252,252,1) 0%,rgba(224,224,224,1) 100%); /* Chrome10+,Safari5.1+ */ -background: -o-linear-gradient(top, rgba(252,252,252,1) 0%,rgba(224,224,224,1) 100%); /* Opera11.10+ */ -filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#fcfcfc', endColorstr='#e0e0e0',GradientType=0 ); /* IE6-9 */ -background: linear-gradient(top, rgba(252,252,252,1) 0%,rgba(224,224,224,1) 100%); /* W3C */ -} - -button:active, -a.btn:active, -a.btn:visited:active, -a.button:active, -a.button:visited:active, -input[type="submit"]:active, -input[type="reset"]:active, -input[type="button"]:active{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,0.2),inset 0 -10px 20px rgba(0,0,0,0.07);-moz-box-shadow:inset 0 3px 5px rgba(0,0,0,0.2),inset 0 -10px 20px rgba(0,0,0,0.07);box-shadow:inset 0 3px 5px rgba(0,0,0,0.2),inset 0 -10px 20px rgba(0,0,0,0.07);} -button[disabled],.disabled:active{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} - -button, -input[type="submit"], -input[type="reset"], -input[type="button"]{*padding:7px 15px;}/*IE 7 ONLY*/ - - a.btn,a.button{}/*overrides*/ - button.small, a.btn.small, a.button.small{font-size:0.8em;padding:5px 10px;} - button.medium, a.btn.medium, a.button.medium{}/*default*/ - button.large, a.btn.large, a.button.large{font-size:1.3em;padding:10px 20px;} - button.disabled, a.btn.disabled, a.button.disabled{color:#ccc;cursor:default;background:#efefef;} - button.disabled:hover, a.btn.disabled:hover, a.button.disabled:hover{border:1px solid #ccc;background:#efefef;} - - button:hover, - a.btn:hover, - a.button:hover, - input[type="submit"]:hover, - input[type="reset"]:hover, - input[type="button"]:hover{ - border:1px solid #bbb; - background: rgb(252,252,252); /* Old browsers */ - background: -moz-linear-gradient(top, rgba(252,252,252,1) 0%, rgba(237,237,237,1) 100%); /* FF3.6+ */ - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(252,252,252,1)), color-stop(100%,rgba(237,237,237,1))); /* Chrome,Safari4+ */ - background: -webkit-linear-gradient(top, rgba(252,252,252,1) 0%,rgba(237,237,237,1) 100%); /* Chrome10+,Safari5.1+ */ - background: -o-linear-gradient(top, rgba(252,252,252,1) 0%,rgba(237,237,237,1) 100%); /* Opera11.10+ */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#fcfcfc', endColorstr='#ededed',GradientType=0 ); /* IE6-9 */ - background: linear-gradient(top, rgba(252,252,252,1) 0%,rgba(237,237,237,1) 100%); /* W3C */ - } - - -/*--------------------------------- - BUTTON BAR ------------------------------------*/ -ul.button-bar{ -display:inline-block; -*display:inline; -margin:0; -padding:0; -font-size:0; -position:relative; -top:0; -left:0; -zoom:1; -border:0; -background:0; -} - - ul.button-bar li{ - display:inline-block; - *display:inline; - position:relative; - top:0; - left:0; - zoom:1; - margin:0 -1px 0 0; - padding:0; - line-height:100%; - font-size:0px; - border:1px solid #ccc; - background: rgb(252,252,252); /* Old browsers */ - background: -moz-linear-gradient(top, rgba(252,252,252,1) 0%, rgba(224,224,224,1) 100%); /* FF3.6+ */ - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(252,252,252,1)), color-stop(100%,rgba(224,224,224,1))); /* Chrome,Safari4+ */ - background: -webkit-linear-gradient(top, rgba(252,252,252,1) 0%,rgba(224,224,224,1) 100%); /* Chrome10+,Safari5.1+ */ - background: -o-linear-gradient(top, rgba(252,252,252,1) 0%,rgba(224,224,224,1) 100%); /* Opera11.10+ */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#fcfcfc', endColorstr='#e0e0e0',GradientType=0 ); /* IE6-9 */ - background: linear-gradient(top, rgba(252,252,252,1) 0%,rgba(224,224,224,1) 100%); /* W3C */ - } - - ul.button-bar li a{ - margin:0; - display:inline-block; - *display:inline; - padding:7px 10px; - position:relative; - top:0; - left:0; - zoom:1; - font-weight:normal; - font-size:14px; /*Pixels for consistancy*/ - text-shadow:0 1px 0 #fff; - color:#666; - text-decoration:none; - vertical-align: middle; - line-height:100%; - border-left:1px solid #fff; - } - - ul.button-bar li.first, - ul.button-bar li.first a{ - -moz-border-radius-bottomleft: 5px; - -moz-border-radius-topleft: 5px; - -webkit-border-bottom-left-radius: 5px; - -webkit-border-top-left-radius: 5px; - border-top-left-radius: 5px; - border-bottom-left-radius: 5px; - -moz-background-clip:content-box; - -webkit-background-clip: border; - background-clip: content-box; - } - - ul.button-bar li.last, - ul.button-bar li.last a{ - -moz-border-radius-bottomright: 5px; - -moz-border-radius-topright: 5px; - -webkit-border-bottom-right-radius: 5px; - -webkit-border-top-right-radius: 5px; - border-top-right-radius: 5px; - border-bottom-right-radius: 5px; - -moz-background-clip:content-box; - -webkit-background-clip: border; - } - - ul.button-bar li a:hover{ - background: rgb(252,252,252); /* Old browsers */ - background: -moz-linear-gradient(top, rgba(252,252,252,1) 0%, rgba(237,237,237,1) 100%); /* FF3.6+ */ - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(252,252,252,1)), color-stop(100%,rgba(237,237,237,1))); /* Chrome,Safari4+ */ - background: -webkit-linear-gradient(top, rgba(252,252,252,1) 0%,rgba(237,237,237,1) 100%); /* Chrome10+,Safari5.1+ */ - background: -o-linear-gradient(top, rgba(252,252,252,1) 0%,rgba(237,237,237,1) 100%); /* Opera11.10+ */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#fcfcfc', endColorstr='#ededed',GradientType=0 ); /* IE6-9 */ - background: linear-gradient(top, rgba(252,252,252,1) 0%,rgba(237,237,237,1) 100%); /* W3C */ - } - - ul.button-bar li a:active{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,0.2),inset 0 -10px 20px rgba(0,0,0,0.07);-moz-box-shadow:inset 0 3px 5px rgba(0,0,0,0.2),inset 0 -10px 20px rgba(0,0,0,0.07);box-shadow:inset 0 3px 5px rgba(0,0,0,0.2),inset 0 -10px 20px rgba(0,0,0,0.07);border-left:1px solid #ccc;} - -/*--------------------------------- - STYLES ------------------------------------*/ -.pill{-webkit-border-radius:200em;-moz-border-radius:200em;border-radius:200em;} -.pop{-webkit-box-shadow:0px 1px 5px rgba(0,0,0,0.2);-moz-box-shadow:0px 1px 5px rgba(0,0,0,0.2);box-shadow:0px 1px 5px rgba(0,0,0,0.2);} -.inset{-webkit-box-shadow:inset 0 1px 3px rgba(0,0,0,0.3);-moz-box-shadow:inset 0 1px 3px rgba(0,0,0,0.3);box-shadow:inset 0 1px 3px rgba(0,0,0,0.3);} -.square{-moz-border-radius:0;-webkit-border-radius:0;border-radius:0;} - -/*--------------------------------- - ORANGE ------------------------------------*/ -button.orange, -a.btn.orange, -a.button.orange, -input[type=submit].orange, -input[type=reset].orange, -input[type=button].orange{ -text-shadow:0 -1px 0 #FC730A; -color:#fff; -border:1px solid #FC730A; -background: rgb(255,168,76); /* Old browsers */ -background: -moz-linear-gradient(top, rgba(255,168,76,1) 0%, rgba(255,123,13,1) 100%); /* FF3.6+ */ -background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(255,168,76,1)), color-stop(100%,rgba(255,123,13,1))); /* Chrome,Safari4+ */ -background: -webkit-linear-gradient(top, rgba(255,168,76,1) 0%,rgba(255,123,13,1) 100%); /* Chrome10+,Safari5.1+ */ -background: -o-linear-gradient(top, rgba(255,168,76,1) 0%,rgba(255,123,13,1) 100%); /* Opera 11.10+ */ -background: linear-gradient(top, rgba(255,168,76,1) 0%,rgba(255,123,13,1) 100%); /* W3C */ -filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffa84c', endColorstr='#ff7b0d',GradientType=0 ); /* IE6-9 */ -} - - button.orange:hover, - a.btn.orange:hover, - a.button.orange:hover{ - text-shadow:0 1px 0 #FC730A; - border:1px solid #FC730A; - background: rgb(249,191,74); /* Old browsers */ - background: -moz-linear-gradient(top, rgba(249,191,74,1) 0%, rgba(249,181,9,1) 100%); /* FF3.6+ */ - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(249,191,74,1)), color-stop(100%,rgba(249,181,9,1))); /* Chrome,Safari4+ */ - background: -webkit-linear-gradient(top, rgba(249,191,74,1) 0%,rgba(249,181,9,1) 100%); /* Chrome10+,Safari5.1+ */ - background: -o-linear-gradient(top, rgba(249,191,74,1) 0%,rgba(249,181,9,1) 100%); /* Opera 11.10+ */ - background: linear-gradient(top, rgba(249,191,74,1) 0%,rgba(249,181,9,1) 100%); /* W3C */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f9bf4a', endColorstr='#f9b509',GradientType=0 ); /* IE6-9 */ - } - -/*--------------------------------- - BLUE ------------------------------------*/ -button.blue, -a.btn.blue, -a.button.blue, -input[type=submit].blue, -input[type=reset].blue, -input[type=button].blue{ -text-shadow:0 -1px 0 #1D6DC1; -color:#fff; -border:1px solid #1D6DC1; -background: rgb(122,188,255); /* Old browsers */ -background: -moz-linear-gradient(top, rgba(122,188,255,1) 0%, rgba(96,171,248,1) 44%, rgba(64,150,238,1) 100%); /* FF3.6+ */ -background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(122,188,255,1)), color-stop(44%,rgba(96,171,248,1)), color-stop(100%,rgba(64,150,238,1))); /* Chrome,Safari4+ */ -background: -webkit-linear-gradient(top, rgba(122,188,255,1) 0%,rgba(96,171,248,1) 44%,rgba(64,150,238,1) 100%); /* Chrome10+,Safari5.1+ */ -background: -o-linear-gradient(top, rgba(122,188,255,1) 0%,rgba(96,171,248,1) 44%,rgba(64,150,238,1) 100%); /* Opera11.10+ */ -filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#7abcff', endColorstr='#4096ee',GradientType=0 ); /* IE6-9 */ -background: linear-gradient(top, rgba(122,188,255,1) 0%,rgba(96,171,248,1) 44%,rgba(64,150,238,1) 100%); /* W3C */ -} - - button.blue:hover, - a.btn.blue:hover, - a.button.blue:hover{ - text-shadow:0 1px 0 #1D6DC1; - border:1px solid #1D6DC1; - background: rgb(155,205,255); /* Old browsers */ - background: -moz-linear-gradient(top, rgba(155,205,255,1) 0%, rgba(134,192,250,1) 44%, rgba(110,176,242,1) 100%); /* FF3.6+ */ - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(155,205,255,1)), color-stop(44%,rgba(134,192,250,1)), color-stop(100%,rgba(110,176,242,1))); /* Chrome,Safari4+ */ - background: -webkit-linear-gradient(top, rgba(155,205,255,1) 0%,rgba(134,192,250,1) 44%,rgba(110,176,242,1) 100%); /* Chrome10+,Safari5.1+ */ - background: -o-linear-gradient(top, rgba(155,205,255,1) 0%,rgba(134,192,250,1) 44%,rgba(110,176,242,1) 100%); /* Opera 11.10+ */ - background: linear-gradient(top, rgba(155,205,255,1) 0%,rgba(134,192,250,1) 44%,rgba(110,176,242,1) 100%); /* W3C */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#9bcdff', endColorstr='#6eb0f2',GradientType=0 ); /* IE6-9 */ - } - -/*--------------------------------- - PINK ------------------------------------*/ -button.pink, -a.btn.pink, -a.button.pink, -input[type=submit].pink, -input[type=reset].pink, -input[type=button].pink{ -text-shadow:0 -1px 0 #EF0251; -color:#fff; -border:1px solid #EF0251; -background: rgb(255,93,177); /* Old browsers */ -background: -moz-linear-gradient(top, rgba(255,93,177,1) 0%, rgba(239,1,124,1) 100%); /* FF3.6+ */ -background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(255,93,177,1)), color-stop(100%,rgba(239,1,124,1))); /* Chrome,Safari4+ */ -background: -webkit-linear-gradient(top, rgba(255,93,177,1) 0%,rgba(239,1,124,1) 100%); /* Chrome10+,Safari5.1+ */ -background: -o-linear-gradient(top, rgba(255,93,177,1) 0%,rgba(239,1,124,1) 100%); /* Opera 11.10+ */ -background: linear-gradient(top, rgba(255,93,177,1) 0%,rgba(239,1,124,1) 100%); /* W3C */ -filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ff5db1', endColorstr='#ef017c',GradientType=0 ); /* IE6-9 */ -} - - button.pink:hover, - a.btn.pink:hover, - a.button.pink:hover{ - text-shadow:0 1px 0 #EF0251; - border:1px solid #EF0251; - background: rgb(255,169,213); /* Old browsers */ - background: -moz-linear-gradient(top, rgba(255,169,213,1) 0%, rgba(254,112,185,1) 100%); /* FF3.6+ */ - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(255,169,213,1)), color-stop(100%,rgba(254,112,185,1))); /* Chrome,Safari4+ */ - background: -webkit-linear-gradient(top, rgba(255,169,213,1) 0%,rgba(254,112,185,1) 100%); /* Chrome10+,Safari5.1+ */ - background: -o-linear-gradient(top, rgba(255,169,213,1) 0%,rgba(254,112,185,1) 100%); /* Opera 11.10+ */ - background: linear-gradient(top, rgba(255,169,213,1) 0%,rgba(254,112,185,1) 100%); /* W3C */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffa9d5', endColorstr='#fe70b9',GradientType=0 ); /* IE6-9 */ - } - -/*--------------------------------- - GREEN ------------------------------------*/ -button.green, -a.btn.green, -a.button.green, -input[type=submit].green, -input[type=reset].green, -input[type=button].green{ -text-shadow:0 -1px 0 #669E00; -color:#fff; -border:1px solid #669E00; -background: rgb(143,196,0); /* Old browsers */ -background: -moz-linear-gradient(top, rgba(143,196,0,1) 0%, rgba(107,165,0,1) 100%); /* FF3.6+ */ -background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(143,196,0,1)), color-stop(100%,rgba(107,165,0,1))); /* Chrome,Safari4+ */ -background: -webkit-linear-gradient(top, rgba(143,196,0,1) 0%,rgba(107,165,0,1) 100%); /* Chrome10+,Safari5.1+ */ -background: -o-linear-gradient(top, rgba(143,196,0,1) 0%,rgba(107,165,0,1) 100%); /* Opera 11.10+ */ -background: linear-gradient(top, rgba(143,196,0,1) 0%,rgba(107,165,0,1) 100%); /* W3C */ -filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#8fc400', endColorstr='#6ba500',GradientType=0 ); /* IE6-9 */ -} - - button.green:hover, - a.btn.green:hover, - a.button.green:hover{ - text-shadow:0 1px 0 #669E00; - border:1px solid #669E00; - background: rgb(198,226,120); /* Old browsers */ - background: -moz-linear-gradient(top, rgba(198,226,120,1) 0%, rgba(167,211,44,1) 100%); /* FF3.6+ */ - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(198,226,120,1)), color-stop(100%,rgba(167,211,44,1))); /* Chrome,Safari4+ */ - background: -webkit-linear-gradient(top, rgba(198,226,120,1) 0%,rgba(167,211,44,1) 100%); /* Chrome10+,Safari5.1+ */ - background: -o-linear-gradient(top, rgba(198,226,120,1) 0%,rgba(167,211,44,1) 100%); /* Opera 11.10+ */ - background: linear-gradient(top, rgba(198,226,120,1) 0%,rgba(167,211,44,1) 100%); /* W3C */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#c6e278', endColorstr='#a7d32c',GradientType=0 ); /* IE6-9 */ - } - -/*--------------------------------- - RED ------------------------------------*/ -button.red, -a.btn.red, -a.button.red, -input[type=submit].red, -input[type=reset].red, -input[type=button].red{ -text-shadow:0 -1px 0 #B21203; -color:#fff; -border:1px solid #B21203; -background: rgb(229,60,22); /* Old browsers */ -background: -moz-linear-gradient(top, rgba(229,60,22,1) 0%, rgba(207,4,4,1) 100%); /* FF3.6+ */ -background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(229,60,22,1)), color-stop(100%,rgba(207,4,4,1))); /* Chrome,Safari4+ */ -background: -webkit-linear-gradient(top, rgba(229,60,22,1) 0%,rgba(207,4,4,1) 100%); /* Chrome10+,Safari5.1+ */ -background: -o-linear-gradient(top, rgba(229,60,22,1) 0%,rgba(207,4,4,1) 100%); /* Opera 11.10+ */ -background: linear-gradient(top, rgba(229,60,22,1) 0%,rgba(207,4,4,1) 100%); /* W3C */ -filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#e53c16', endColorstr='#cf0404',GradientType=0 ); /* IE6-9 */ -} - - button.red:hover, - a.btn.red:hover, - a.button.red:hover{ - text-shadow:0 1px 0 #B21203; - border:1px solid #B21203; - background: rgb(238,106,76); /* Old browsers */ - background: -moz-linear-gradient(top, rgba(238,106,76,1) 0%, rgba(251,33,33,1) 100%); /* FF3.6+ */ - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(238,106,76,1)), color-stop(100%,rgba(251,33,33,1))); /* Chrome,Safari4+ */ - background: -webkit-linear-gradient(top, rgba(238,106,76,1) 0%,rgba(251,33,33,1) 100%); /* Chrome10+,Safari5.1+ */ - background: -o-linear-gradient(top, rgba(238,106,76,1) 0%,rgba(251,33,33,1) 100%); /* Opera 11.10+ */ - background: linear-gradient(top, rgba(238,106,76,1) 0%,rgba(251,33,33,1) 100%); /* W3C */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ee6a4c', endColorstr='#fb2121',GradientType=0 ); /* IE6-9 */ - } DELETED cgisetup/www/css/kickstart-forms.css Index: cgisetup/www/css/kickstart-forms.css ================================================================== --- cgisetup/www/css/kickstart-forms.css +++ /dev/null @@ -1,290 +0,0 @@ -/*--------------------------------- - FORMS ------------------------------------*/ -form{ -padding:0; -margin:0; -} - -fieldset{ -margin:30px 0 20px 0; -padding:5px 15px 15px 15px; -border:1px solid #ccc; -background:#f5f5f5; --moz-border-radius:5px; --webkit-border-radius:5px; -border-radius:5px; -position: relative; -top:0; -left:0; -} - - legend{ - -moz-border-radius:5px; - -webkit-border-radius:5px; - border-radius:5px; - border:1px solid #ccc; - background:#f5f5f5; - padding:2px 10px; - margin:0 0 0 0; - display:block; - position: relative; - top:0; - left:0; - } - - /*IE ONLY - I know, this is a stop gap*/ - .msie fieldset{padding-top:25px;} - .msie legend{position:absolute;top:-0.7em;left:10px;} - -label{ -display:inline-block; -*display:inline; -vertical-align: middle; -margin:0; -padding:0; -position:relative; -top:0; -left:0; -zoom:1; --moz-box-sizing: border-box; --webkit-box-sizing: border-box; -box-sizing: border-box; -} - - label.inline{ - display:inline; - margin:0; - } - - label span{ - color:#999; - font-size:0.9em; - } - - label span.right{ - position:absolute; - bottom:0; - right:0; - text-align:right; - display:inline-block; - *display:inline; - } - - label.disabled{ - color:#ccc; - } - -input{ -display:inline-block; -*display:inline; -vertical-align: middle; -width:auto; -zoom:1; -margin:0; -border:1px solid #ccc; -font-size:1em; -padding:5px 0; -text-indent: 5px; --moz-border-radius:5px; --webkit-border-radius:5px; -border-radius:5px; -background:#fff; --moz-box-shadow:inset 0 0 6px #ccc; --webkit-box-shadow:inset 0 1px 6px #ccc; -box-shadow:inset 0 1px 6px #ccc; --moz-box-sizing: border-box; --webkit-box-sizing: border-box; -box-sizing: border-box; -} - - input::-webkit-input-placeholder, - input:-moz-placeholder, - .placeholder{ - color:#bbb; - } - - input::-moz-focus-inner {border:0;} - - input[disabled="disabled"], input.disabled{ - color:#999; - background:#f5f5f5; - -moz-box-shadow:inset 0 0 2px #ddd; - -webkit-box-shadow:inset 0 1px 2px #ddd; - box-shadow:inset 0 1px 2px #ddd; - } - - /* FOCUS STATES */ - input[type="text"]:focus, - textarea:focus, - button:focus, - a.button:focus, - select:focus, - input[type="file"]:focus, - input[type="password"]:focus{ - -webkit-box-shadow: 0 0 7px #6DB9FF; - -moz-box-shadow : 0 0 7px #6DB9FF; - box-shadow : 0 0 7px #6DB9FF; - border: 1px solid #50B1FE; - outline: none; - } - - /* TRANSITION */ - input[type="text"], - textarea, - button, - a.button, - a, - input[type="file"]{ - -moz-transition: -moz-box-shadow 0.5s, border 0.5s, background 0.5s; - -webkit-transition: -webkit-box-shadow 0.5s, border 0.5s, background 0.5s; - -o-transition: box-shadow 0.5s, border 0.5s, background 0.5s; - transition: box-shadow 0.5s, border 0.5s, background 0.5s; - } - -input.checkbox, -input[type="checkbox"]{ -display:inline; -width:auto; -margin:0; -padding:0; -border:0; -background:none; -vertical-align:center; -*vertical-align: top; -} - -input.radio, -input[type="radio"]{ -display:inline; -width:auto; -margin:0; -padding:0; -border:0; -background:none; -vertical-align:center; -*vertical-align: top; -} - - input[type="radio"]:focus, - input[ type="checkbox"]:focus{ - -webkit-box-shadow: 0 0 5px #6DB9FF; - -moz-box-shadow : 0 0 5px #6DB9FF; - box-shadow : 0 0 5px #6DB9FF; - outline-color: #6DB9FF; - } - -input.file, -input[type="file"]{ -/*font-size:0.8em;*/ --moz-box-shadow:none; --webkit-box-shadow:none; -box-shadow:none; -border:none; -} - -select{ -display:inline; -width:auto; -margin:0; -border:1px solid #ccc; -line-height:100%; -padding:3px; -vertical-align: middle; -} - - select[disabled="disabled"], select.disabled{ - color:#999; - background:#f5f5f5; - -moz-box-shadow:inset 0 0 2px #ddd; - -webkit-box-shadow:inset 0 1px 2px #ddd; - box-shadow:inset 0 1px 2px #ddd; - } - -textarea{ -width:auto; -height:200px; -margin:0; -border:1px solid #ccc; -padding:5px; -vertical-align: middle; -font-family:inherit; -font-size:0.9em; --moz-border-radius:5px; --webkit-border-radius:5px; -border-radius:5px; --moz-box-shadow:inset 0 0 6px #ccc; --webkit-box-shadow:inset 0 1px 6px #ccc; -box-shadow:inset 0 1px 6px #ccc; --moz-box-sizing: border-box; --webkit-box-sizing: border-box; -box-sizing: border-box; -} - -/*--------------------------------- - COLUMN SIZES ------------------------------------*/ - -/* sizes */ -input[class*="col_"], -select[class*="col_"], -label[class*="col_"]{ -float:none;display:inline-block;*display:inline;margin-bottom:0; -*margin-left: 0.5%;*margin-right: 0.5%;/* this is for IE 7 Only and is not a good fix - work needed here */ -} - -/*--------------------------------- - FORMS VERTICAL ------------------------------------*/ -form.vertical{ - -} - - form.vertical label{display:block;} - form.vertical input, - form.vertical select, - form.vertical textarea{width:100%;display:block;margin-bottom:10px;} - form.vertical .chzn-container{display:block;margin-bottom:10px;} - form.vertical .chzn-choices{display:block;margin-bottom:10px;} - - /* radios & checks */ - form.vertical input.checkbox, - form.vertical input[type="checkbox"], - form.vertical input.radio, - form.vertical input[type="radio"], - form.vertical label.inline{display:inline;width:auto;margin:0;} -/*--------------------------------- - FORM VALIDATION ------------------------------------*/ -label.error{color:red;} -input.error{border:1px solid red;} -select.error{border:1px solid red;} - -/*--------------------------------- - NOTICES ------------------------------------*/ -.notice{ -border:1px solid gold; -background:lightyellow; -padding:10px 20px 10px 40px; -margin:10px 0; --moz-border-radius:5px; --webkit-border-radius:5px; -border-radius:5px; -color:#DEAE00; -line-height:120%; -vertical-align: center; -text-shadow:0px 1px rgba(255,255,255,0.5); -position:relative; -top:0; -left:0; -clear:both; -} - - .notice.warning{}/*default*/ - .notice.error{border:1px solid red;background:pink;color:red;} - .notice.success{border:1px solid green;background:lightgreen;color:green;} - .notice i[class*='fa-']{position:absolute;top:50%;left:0.8em;margin-top:-0.6em;} - .notice a[class*='fa-remove'], - .notice a[class*='fa-remove']:active, - .notice a[class*='fa-remove']:visited{text-decoration:none;font-size:12px;position:absolute;top:5px;right:5px;left:auto;color:inherit;margin-top:0;left:auto;} DELETED cgisetup/www/css/kickstart-grid.css Index: cgisetup/www/css/kickstart-grid.css ================================================================== --- cgisetup/www/css/kickstart-grid.css +++ /dev/null @@ -1,167 +0,0 @@ -/* - 99Lime.com HTML KickStart by Joshua Gatcke - kickstart-grids.css - - DO NOT EDIT THIS FILE unless you know what you are doing. -*/ -/*--------------------------------- - GRID/COLUMNS ------------------------------------ - tinyfluidgrid.com - & girlfriendnyc.com - with changes by 99Lime ------------------------------------*/ - /* - & Columns : 12 - & Gutter %: 20% - & MaxWidth: 1280px - */ - -.grid{ -max-width:1220px; -margin:0 auto; -padding:0 2em; -} - -.grid.flex{ -width:100%; -max-width:100%; -padding:0 2%; -padding:2em; -} - -.row{ -display:block; -overflow:hidden; -clear:both; -} - -*[class*="col_"].alpha{margin-left:0;} -*[class*="col_"].omega{margin-right:0;} - -.col_1 { width: 6.6666666666667%; } -.col_2 { width: 15%; } -.col_3 { width: 23.333333333333%; } -.col_4 { width: 31.666666666667%; } -.col_5 { width: 40%; } -.col_6 { width: 48.333333333333%; } -.col_7 { width: 56.666666666667%; } -.col_8 { width: 65%; } -.col_9 { width: 73.333333333333%; } -.col_10 { width: 81.666666666667%; } -.col_11 { width: 90%; } -.col_12 { width: 98.333333333333%; } - -*[class*="col_"]{ -margin-left: 0.83333333333333%; -margin-right: 0.83333333333333%; -margin-top:0.5em; -margin-bottom:0.5em; -float: left; -display: block; -} - -.grid img{ -max-width: 100%; -height:auto; -} - -.clear{clear:both;display:block;overflow:hidden;visibility:hidden;width:0;height:0} -.clearfix:after{clear:both;content:' ';display:block;font-size:0;line-height:0;visibility:hidden;width:0;height:0} -* html .clearfix, *:first-child+html .clearfix{zoom:1} - -/* Viewable Grids - To view your grids, add the class .visible to any grid container. - This will add a background color so you can see the layout of your grids. -*/ -*[class*="col_"].visible{ -background:#eee; -border:1px dotted #ccc; -} - - -/*--------------------------------- - Responsive Grid Media Queries - 1280, 1024, 768, 480 - 1280-1024 - desktop (default grid) - 1024-768 - tablet landscape - 768-480 - tablet - 480-less - phone landscape & smaller ------------------------------------*/ -@media all and (min-width: 1024px) and (max-width: 1280px) { - - .grid *[class*="col_"]{} - .grid{max-width: 1024px;} - .show-desktop {display:block;} - .hide-desktop {display:none;} - .show-tablet {display:none;} - .hide-tablet {display:block;} - .show-phone {display:none;} - .hide-phone {display:block;} - -} - -@media all and (min-width: 768px) and (max-width: 1024px) { - - .grid *[class*="col_"]{} - .grid{max-width: 768px;} - .show-desktop {display:none;} - .hide-desktop {display:block;} - .show-tablet {display:block;} - .hide-tablet {display:none;} - .show-phone {display:none;} - .hide-phone {display:block;} - -} - - -@media all and (min-width: 480px) and (max-width: 768px) { - - .grid *[class*="col_"]{ - float:none; - width:auto; - clear:both; - display:block; - } - - /* columns inside of columns */ - .grid *[class*="col_"] [class*="col_"]{ - margin-left:0; - margin-right:0; - width:100%; - } - - .grid{max-width: 480px;} - .show-desktop {display:none;} - .hide-desktop {display:block;} - .show-tablet {display:block;} - .hide-tablet {display:none;} - .show-phone {display:none;} - .hide-phone {display:block;} - -} - -@media all and (max-width: 480px) { - - .grid *[class*="col_"]{ - float:none; - width:auto; - clear:both; - display:block; - } - - /* columns inside of columns */ - .grid *[class*="col_"] [class*="col_"]{ - margin-left:0; - margin-right:0; - width:100%; - } - - .grid{max-width: 100%;/*320*/} - .show-desktop {display:none;} - .hide-desktop {display:block;} - .show-tablet {display:none;} - .hide-tablet {display:block;} - .show-phone {display:block;} - .hide-phone {display:none;} - -} DELETED cgisetup/www/css/kickstart-menus.css Index: cgisetup/www/css/kickstart-menus.css ================================================================== --- cgisetup/www/css/kickstart-menus.css +++ /dev/null @@ -1,180 +0,0 @@ -/* - 99Lime.com HTML KickStart by Joshua Gatcke - kickstart-menus.css -*/ - -/*--------------------------------- - MENU LAYOUT - DO NOT EDIT This Section (unless you know what you are doing) ------------------------------------*/ -.menu{margin:0;padding:0;line-height:100%; -font-size:0; /* Kill white space gap between LI elements */ -position:relative;z-index:1000;} - - .menu:after{clear:both;content:' ';display:block;font-size:0;line-height:0;visibility:hidden;width:0;height:0} - .menu li{margin:0;padding:0;list-style-type:none;display:inline-block;*display:inline;position:relative;zoom:1;line-height:inherit; - top:0;left:0;font-size:16px; /* fixed font-size to replace font-size:0 in parent .menu 1em/16px default */} - .menu li a{margin:0;padding:0;display:block;display:inline;display:inline-block;position:relative;zoom:1;line-height:100%;top:0;left:0;} - - -/*--------------Sub Menus-------------------*/ - /*.menu li:hover > ul{display:block;}*/ - .menu ul{margin:0;padding:0;position: absolute;top:100%;left:0;display:none;min-width:150px;max-width:150%;*width:150px;} - .menu ul li{display:block;width:100%;} - .menu ul li a{display:block;} - .menu ul ul{top:0;left:100%;} - -/*--------------Dividers-------------------*/ - .menu ul li.divider{border-top:1px solid #ccc;} - .menu ul li.divider a{border-top:1px solid #fff;} - - -/*--------------Right---------------------*/ - .menu li.right{float:right;} - - -/*--------------Arrows-------------------*/ - .menu li.has-menu a{padding-right:25px;} - .menu li.has-menu span.arrow{border-style:solid;border-width:5px; - display:block;position:absolute;top:50%;right:5px;font-size:0;line-height:0;height:0;width:0;} - .menu li li.has-menu span.arrow{margin-top:-4px;} - -/*--------------Vertical Menu Layout-------------------*/ -.menu.vertical{} - .menu.vertical li{display:block;} - .menu.vertical li a{display:block;} - .menu.vertical ul{top:0;left:100%;} - .menu.vertical li.has-menu span.arrow{margin-top:-4px;} - -/*--------------Vertical Right Menu Layout-------------------*/ -.menu.vertical.right{text-align:left;} - .menu.vertical.right ul{top:0;right:100%;left:auto;} - .menu.vertical.right li a{padding-left:25px;padding-right:20px;} - .menu.vertical.right li.has-menu span.arrow{right:auto;left:5px;margin-top:-4px;} - - -/*--------------------------------- - MENU STYLES - EDIT BELOW THIS LINE TO CUSTOMIZE ------------------------------------*/ -.menu{ -border:1px solid #ccc; -background: #eee; /* Old browsers */ -background: -moz-linear-gradient(top, rgba(252,252,252,1) 0%, rgba(224,224,224,1) 100%); /* FF3.6+ */ -background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(252,252,252,1)), color-stop(100%,rgba(224,224,224,1))); /* Chrome,Safari4+ */ -background: -webkit-linear-gradient(top, rgba(252,252,252,1) 0%,rgba(224,224,224,1) 100%); /* Chrome10+,Safari5.1+ */ -background: -o-linear-gradient(top, rgba(252,252,252,1) 0%,rgba(224,224,224,1) 100%); /* Opera11.10+ */ -background: linear-gradient(top, rgba(252,252,252,1) 0%,rgba(224,224,224,1) 100%); /* W3C */ -z-index:600; -} - - .menu li{} - - .menu li a{ - text-shadow:0px 1px 1px #fff; - padding:15px 20px; - text-decoration:none; - font-size:0.9em; - color: #777; - } - - .menu li.current>a, - .menu li.current>a:hover, - .menu li.current.hover>a{ - background: rgb(122,188,255); /* Old browsers */ - background: -moz-linear-gradient(top, rgba(122,188,255,1) 0%, rgba(96,171,248,1) 44%, rgba(64,150,238,1) 100%); /* FF3.6+ */ - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(122,188,255,1)), color-stop(44%,rgba(96,171,248,1)), color-stop(100%,rgba(64,150,238,1))); /* Chrome,Safari4+ */ - background: -webkit-linear-gradient(top, rgba(122,188,255,1) 0%,rgba(96,171,248,1) 44%,rgba(64,150,238,1) 100%); /* Chrome10+,Safari5.1+ */ - background: -o-linear-gradient(top, rgba(122,188,255,1) 0%,rgba(96,171,248,1) 44%,rgba(64,150,238,1) 100%); /* Opera11.10+ */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#7abcff', endColorstr='#4096ee',GradientType=0 ); /* IE6-9 */ - background: linear-gradient(top, rgba(122,188,255,1) 0%,rgba(96,171,248,1) 44%,rgba(64,150,238,1) 100%); /* W3C */ - color:#fff; - text-shadow:0px -1px 0 rgba(0,0,0,0.2); - cursor: default; - } - - .menu li a:hover, - .menu li.hover>a{ - background:#f5f5f5; - } - - /* sub menus */ - .menu ul{ - background: #efefef; - border:1px solid #ccc; - } - - .menu ul li{} - .menu ul li a{} - - /* sub-sub menus */ - .menu ul ul{} - .menu ul ul li{} - .menu ul ul li a{} - - /* arrows */ - /* arrow down */ .menu li.has-menu span.arrow{border-color-top:#ccc;border-color:#ccc transparent transparent transparent;} - /* arrow left */ .menu li li.has-menu span.arrow, .menu.vertical li.has-menu span.arrow - {border-color-left:#ccc;border-color:transparent transparent transparent #ccc;} - /* arrow right */ .menu.vertical.right li.has-menu span.arrow{border-color-right:#ccc;border-color:transparent #ccc transparent transparent;} - - /* dividers */ .menu ul li.divider{border-top:1px solid #ccc;} - .menu ul li.divider a{border-top:1px solid #fff;} - - - -/*--------------------------------- - RESPONSIVE MENU STYLES - DO NOT EDIT unless you know what you are doing ------------------------------------*/ - -.menu li.menu-toggle{display:none;} - - -@media all and (max-width: 768px) { - - .grid .menu li, - .grid .menu.vertical li, - .grid .menu.vertical.right li{ - display:block; - display:none; - } - - .grid .menu li.menu-toggle, - .grid .menu.vertical li.menu-toggle, - .grid .menu.vertical.right li.menu-toggle{ - display:block; - } - - .grid .menu:hover li, - .grid .menu.vertical:hover li, - .grid .menu.vertical.right:hover li{ - display:block; - } - - /* arrows */ - .grid .menu li.has-menu span.arrow, - .grid .menu.vertical li.has-menu span.arrow, - .grid .menu.vertical.right li.has-menu span.arrow, - .grid .menu li li.has-menu span.arrow, .menu.vertical li.has-menu span.arrow - {border-color-top:#ccc;border-color:#ccc transparent transparent transparent;} - - .grid .menu.vertical.right li.has-menu span.arrow{ - right:5px;left:auto; - } - - .grid .menu li a{ - display:block; - } - - .grid .menu ul, - .grid .menu ul ul, - .grid .menu.vertical ul, - .grid .menu.vertical.right ul{ - position:relative; - top:0; - left:0; - margin:10px; - } - -} DELETED cgisetup/www/css/kickstart-slideshow.css Index: cgisetup/www/css/kickstart-slideshow.css ================================================================== --- cgisetup/www/css/kickstart-slideshow.css +++ /dev/null @@ -1,223 +0,0 @@ -/*--------------------------------- - SLIDESHOW2 - Slight Fixes for the slideshow layout *needs work ------------------------------------*/ - - .slideshow{ - clear:both; - margin:0; - padding:0; - width:auto; - height:auto; - overflow:hidden; - } - - .slideshow li{ - list-style-type:none; - margin:0; - padding:0; - float:left; - display:block; - } - -/** - * BxSlider v4.0 - Fully loaded, responsive content slider - * http://bxslider.com - * - * Written by: Steven Wanderski, 2012 - * http://stevenwanderski.com - * (while drinking Belgian ales and listening to jazz) - * - * CEO and founder of bxCreative, LTD - * http://bxcreative.com - */ - - -/** RESET AND LAYOUT -===================================*/ -.bx-wrapper, .bx-wrapper *{ - -webkit-box-sizing: content-box; /* Safari/Chrome, other WebKit */ - -moz-box-sizing: content-box; /* Firefox, other Gecko */ - box-sizing: content-box; /* Opera/IE 8+ */ -} - -.bx-wrapper { - position: relative; - margin: 0 0 60px; - padding: 0; - *zoom: 1; -} - -.bx-wrapper img { - width: 100%; - display: block; -} - -/** THEME -===================================*/ - -.bx-wrapper .bx-viewport { - -moz-box-shadow: 0 0 5px #ccc; - -webkit-box-shadow: 0 0 5px #ccc; - box-shadow: 0 0 5px #ccc; - border: solid #fff 5px; - left: 0; - background: #fff; -} - -.bx-wrapper .bx-pager, -.bx-wrapper .bx-controls-auto { - position: absolute; - bottom: -30px; - width: 100%; -} - -/* LOADER */ - -.bx-wrapper .bx-loading { - min-height: 50px; - background: url(img/bx_loader.gif) center center no-repeat #fff; - height: 100%; - width: 100%; - position: absolute; - top: 0; - left: 0; - z-index: 2000; -} - -/* PAGER */ - -.bx-wrapper .bx-pager { - text-align: center; - font-size: .85em; - font-family: Arial; - font-weight: bold; - color: #666; - padding-top: 20px; -} - -.bx-wrapper .bx-pager .bx-pager-item, -.bx-wrapper .bx-controls-auto .bx-controls-auto-item { - display: inline-block; - *zoom: 1; - *display: inline; -} - -.bx-wrapper .bx-pager.bx-default-pager a { - background: #666; - text-indent: -9999px; - display: block; - width: 10px; - height: 10px; - margin: 0 5px; - outline: 0; - -moz-border-radius: 5px; - -webkit-border-radius: 5px; - border-radius: 5px; -} - -.bx-wrapper .bx-pager.bx-default-pager a:hover, -.bx-wrapper .bx-pager.bx-default-pager a.active { - background: #000; -} - -/* DIRECTION CONTROLS (NEXT / PREV) */ - -.bx-wrapper .bx-prev { - left: 10px; - background: url(img/controls.png) no-repeat 0 -32px; -} - -.bx-wrapper .bx-next { - right: 10px; - background: url(img/controls.png) no-repeat -43px -32px; -} - -.bx-wrapper .bx-prev:hover { - background-position: 0 0; -} - -.bx-wrapper .bx-next:hover { - background-position: -43px 0; -} - -.bx-wrapper .bx-controls-direction a { - position: absolute; - top: 50%; - margin-top: -16px; - outline: 0; - width: 32px; - height: 32px; - text-indent: -9999px; - z-index: 9999; -} - -.bx-wrapper .bx-controls-direction a.disabled { - display: none; -} - -/* AUTO CONTROLS (START / STOP) */ - -.bx-wrapper .bx-controls-auto { - text-align: center; -} - -.bx-wrapper .bx-controls-auto .bx-start { - display: block; - text-indent: -9999px; - width: 10px; - height: 11px; - outline: 0; - background: url(img/controls.png) -86px -11px no-repeat; - margin: 0 3px; -} - -.bx-wrapper .bx-controls-auto .bx-start:hover, -.bx-wrapper .bx-controls-auto .bx-start.active { - background-position: -86px 0; -} - -.bx-wrapper .bx-controls-auto .bx-stop { - display: block; - text-indent: -9999px; - width: 9px; - height: 11px; - outline: 0; - background: url(img/controls.png) -86px -44px no-repeat; - margin: 0 3px; -} - -.bx-wrapper .bx-controls-auto .bx-stop:hover, -.bx-wrapper .bx-controls-auto .bx-stop.active { - background-position: -86px -33px; -} - -/* PAGER WITH AUTO-CONTROLS HYBRID LAYOUT */ - -.bx-wrapper .bx-controls.bx-has-controls-auto.bx-has-pager .bx-pager { - text-align: left; - width: 80%; -} - -.bx-wrapper .bx-controls.bx-has-controls-auto.bx-has-pager .bx-controls-auto { - right: 0; - width: 35px; -} - -/* IMAGE CAPTIONS */ - -.bx-wrapper .bx-caption { - position: absolute; - bottom: 0; - left: 0; - background: #666\9; - background: rgba(80, 80, 80, 0.75); - width: 100%; -} - -.bx-wrapper .bx-caption span { - color: #fff; - font-family: Arial; - display: block; - font-size: .85em; - padding: 10px; -} DELETED cgisetup/www/css/kickstart.css Index: cgisetup/www/css/kickstart.css ================================================================== --- cgisetup/www/css/kickstart.css +++ /dev/null @@ -1,519 +0,0 @@ -/* - 99Lime.com HTML KickStart by Joshua Gatcke - kickstart.css - - Don't edit the file if you want HTML KickStart to be upgradeable. - Instead, copy any CSS selectors you want to modify to your style.css file. - - // Colors - blue: #4D99E0; -*/ -/*--------------------------------- - IMPORTS ------------------------------------*/ -@import url(kickstart-buttons.css); -@import url(kickstart-forms.css); -@import url(kickstart-menus.css); -@import url(kickstart-grid.css); -@import url(jquery.fancybox-1.3.4.css); -@import url(kickstart-slideshow.css); -@import url(prettify.css); -@import url(tiptip.css); -@import url(fonts/font-awesome-4.2.0/css/font-awesome.min.css); - -/*--------------------------------- - HTML ELEMENTS ------------------------------------*/ -*{ --webkit-box-sizing: border-box; /* Safari/Chrome, other WebKit */ --moz-box-sizing: border-box; /* Firefox, other Gecko */ -box-sizing: border-box; /* Opera/IE 8+ */ -} -a{color:#4D99E0;outline:0;} -a:active{color:inherit;} -a:visited{} -a:hover{} -a img{border:0;} -a [class^="icon-"]{color:inherit;text-decoration:none;} -strong,b{color:#000;font-weight:bold;} -strike{} -em,i{} -.hide{display:none;} -.show{display:block;} - -/*--------------------------------- - UTILITY ------------------------------------*/ -.center{text-align:center;} -.left{text-align:left;} -.right{text-align:right;} - -/*--------------------------------- - HR ------------------------------------*/ -hr{clear:both;border-bottom:0;border-top:1px dotted #ccc;border-right:0;border-left:0;margin:30px 0;min-height: 0;height:1px;} -hr.alt1{border-style: solid;} -hr.alt2{border-style: dashed;} - -/*--------------------------------- - HTML5 ELEMENTS (shim) ------------------------------------*/ -article,aside,details,figcaption,figure, -footer,header,hgroup,menu,nav,section { -display:block; -} - -/*--------------------------------- - HEADINGS ------------------------------------*/ -h1,h2,h3,h4,h5,h6{ -font-weight:bold; -line-height:140%; -} - -h1{ -font-size:3.5em; -margin:10px 0 10px 0; -} - -h2{ -font-size:3em; -margin:10px 0 10px 0; -} - -h3{ -font-size:2.5em; -margin:10px 0 10px 0; -line-height:130%; -} - -h4{ -font-size:2em; -margin:10px 0 10px 0; -} - -h5{ -font-size:1.5em; -margin:10px 0 10px 0; -} - -h6{ -font-size:1.2em; -margin:10px 0 5px 0; -} - -/*--------------------------------- - PARAGRAPHS ------------------------------------*/ -p{ -margin:10px 0; -} - -/*--------------------------------- - BLOCKQUOTES ------------------------------------*/ -blockquote{ -font-size:1.5em; -line-height:1.5em; -font-style: italic; -margin:30px 30px 30px 0; -padding:0 0 0 20px; -border-left:1px solid #ccc; -} - - blockquote span{font-size:0.7em;display:block;} - blockquote.small{font-size:1.2em;} - -/*--------------------------------- - LISTS ------------------------------------*/ -ul, ol{ -padding:0; -margin:0 0 20px 25px; -} - -li{ -padding:5px 0; -margin:0; -} - -ul.list-unstyled{ -padding:0; -margin:0 0 20px 0; -} - -ul.list-unstyled li{ -padding:5px 0; -margin:0; -list-style-type:none; - -} - -ul.alt{ -padding:0; -margin:0 0 20px 0; -} - -ul.alt li{ -list-style-type:none; -border-top:1px dotted #ccc; -border-bottom:1px dotted #ccc; -margin:0 0 -1px 0; -background:url(img/icon-arrow-right.png) no-repeat 5px 0.7em; -padding-left:20px; -} - -ul.icons{ -margin:0 0 20px 0; -padding:0; -} - -ul.icons li{ -list-style-type:none; -margin:0; -padding:5px 0; -} - -/*--------------------------------- - PRE & CODE ------------------------------------*/ -code{ -font-family: Consolas, "Andale Mono WT", "Andale Mono", "Lucida Console", "Lucida Sans Typewriter", "DejaVu Sans Mono", "Bitstream Vera Sans Mono", "Liberation Mono", "Nimbus Mono L", Monaco, "Courier New", Courier, monospace; -font-size:0.9em; -border:1px solid lightblue; -padding:3px; --moz-border-radius:3px; --webkit-border-radius:3px; -border-radius:3px; -color:#518BAB; -} - -pre{ -white-space: pre-wrap; /* css-3 */ -white-space: -moz-pre-wrap !important; /* Mozilla, since 1999 */ -white-space: -pre-wrap; /* Opera 4-6 */ -white-space: -o-pre-wrap; /* Opera 7 */ -word-wrap: break-word; /* Internet Explorer 5.5+ */ -margin: 0 0 0 0; -padding:5px 5px 3px 5px; -background:#fff; --moz-border-radius:5px; --webkit-border-radius:5px; -border-radius:5px; --webkit-box-shadow:inset 0 0 7px rgba(0,0,0,0.2); --moz-box-shadow:inset 0 0 7px rgba(0,0,0,0.2); -box-shadow:inset 0 0 7px rgba(0,0,0,0.2); -padding:10px; -margin:0 0; -border:1px solid #ddd; -font-family: Consolas, "Andale Mono WT", "Andale Mono", "Lucida Console", "Lucida Sans Typewriter", "DejaVu Sans Mono", "Bitstream Vera Sans Mono", "Liberation Mono", "Nimbus Mono L", Monaco, "Courier New", Courier, monospace; -font-size:0.9em; -} - -/*--------------------------------- - TABLES ------------------------------------*/ -table{width:100%;margin:0 0 10px 0;text-align:left;border-collapse: collapse;} - thead, tbody{margin:0;padding:0;} - th, td{padding:7px 10px;font-size:0.9em;border-bottom:1px dotted #ddd;text-align:left;} - thead th{font-size:0.9em;padding:3px 10px;border-bottom:1px solid #ddd;} - tbody tr.last th, - tbody tr.last td{border-bottom:0;} - -/* striped */ -table.striped{} - table.striped tr.alt{background:#f5f5f5;} - table.striped thead th{background:#fff;} - table.striped tbody th{background:#f5f5f5;text-align:right;padding-right:15px;border-right:1px dotted #e5e5e5;} - table.striped tbody tr.alt th{background:#efefef;} - -/* tight */ -table.tight{} - table.tight th, .tight td{padding:2px 10px;} - -/* sortable */ -table.sortable{border:1px solid #ddd;} - table.sortable thead th{cursor: pointer;position:relative;top:0;left:0;border-right:1px solid #ddd;} - table.sortable thead th:hover{background:#efefef;} - table.sortable span.arrow{border-style:solid;border-width:5px; - display:block;position:absolute;top:50%;right:5px;font-size:0; - border-color:#ccc transparent transparent transparent; - line-height:0;height:0;width:0;margin-top:-2px;} - table.sortable span.arrow.up{border-color:transparent transparent #ccc transparent;margin-top:-7px;} - -/*--------------------------------- - TABS ------------------------------------*/ -ul.tabs{ -margin:10px 0 -1px 0; -padding:0; -width:100%; -border-bottom:1px solid #e5e5e5; -float:left; -font-size:0; -} - - ul.tabs.left{text-align:left;} - ul.tabs.center{text-align:center;} - ul.tabs.right{text-align:right;} - ul.tabs.right li{margin:0 0 0 -2px;} - - ul.tabs li{ - font-size:14px; - list-style-type:none; - margin:0 -2px 0 0; - padding:0; - display:inline-block; - *display:inline;/*IE ONLY*/ - position:relative; - top:0; - left:0; - *top:1px;/*IE 7 ONLY*/ - zoom:1; - } - - ul.tabs li a{ - text-decoration:none; - color:#666; - display:inline-block; - padding:9px 15px; - position: relative; - top:0; - left:0; - line-height:100%; - background:#f5f5f5; - -webkit-box-shadow: inset 0 -3px 3px rgba(0,0,0,0.03); - -moz-box-shadow: inset 0 -3px 3px rgba(0,0,0,0.03); - box-shadow: inset 0 -3px 3px rgba(0,0,0,0.03); - border:1px solid #e5e5e5; - border-bottom:0; - font-size:0.9em; - zoom:1; - } - - ul.tabs li a:hover{ - background:#fff; - } - - ul.tabs li.current a{ - position:relative; - top:1px; - left:0; - background:#fff; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; - color:#222; - } - - .tab-content{ - border:1px solid #efefef; - border:1px solid #e5e5e5; - background:#fff; - clear:both; - padding:20px; - margin:0 0 40px 0; - } - - -/*--------------------------------- - BREADCRUMBS ------------------------------------*/ -ul.breadcrumbs{ -margin:10px 0; -padding:0; -line-height:0%; -font-size:0; -} - - ul.breadcrumbs li{ - list-style-type:none; - margin:0; - padding:0; - display:inline-block; - *display:inline; /* IE ONLY*/ - position:relative; - zoom:1; - line-height:100%; - font-size:14px; /* 0.8em default to override font-size:0; on parent*/ - } - - ul.breadcrumbs li a{ - display:inline-block; - *display:inline; /* IE ONLY*/ - position:relative; - padding:5px 15px 5px 5px; - font-size:0.9em; - zoom:1; - margin:0; - background:url(img/icon-arrow-right.png) no-repeat right center; - } - - ul.breadcrumbs li.last a{ - color:#333; - cursor: default; - text-decoration:none; - background:none; - } - - ul.breadcrumbs li.last a:hover{ - text-decoration:none; - } - - /* Alternative Style */ - ul.breadcrumbs.alt1{ - border:1px solid transparent; - font-size:0; - } - - ul.breadcrumbs.alt1 li a{ - padding:10px 25px 10px 15px; - background:url(img/breadcrumbs-bg.gif) no-repeat right center; - text-decoration:none; - border-top:1px solid #efefef; - border-bottom:1px solid #efefef; - font-size:12px; - } - - ul.breadcrumbs.alt1 a:hover{ - text-decoration:underline; - } - - ul.breadcrumbs.alt1 li.first a{ - border-left:1px solid #efefef; - } - - ul.breadcrumbs.alt1 li.last a{ - background:none; - border-right:1px solid #efefef; - } - -/*--------------------------------- - IMAGES ------------------------------------*/ -/* - for img .style1, .style2, .style3 - view js/kickstart.js Image Style Helpers -*/ -img{ -margin:0; -padding:0; -display:inline-block; -position:relative; -zoom:1; -vertical-align: bottom; -} - - img.align-left, .img-wrap.align-left{float:left;margin:0 10px 5px 0;} - img.align-right, .img-wrap.align-right{float:right;margin:0 0 5px 10px;} - img.full-width{clear:both;display:block;width:100%;height:auto;margin:0 0 10px 0;} - - div.caption{ - background:#f5f5f5; - border:1px solid #ddd; - padding:3px; - max-width:100%; - display:inline-block; - height:auto; - } - - div.caption img{ - display:block; - padding:0; - margin:0; - width:100%; - height:auto; - } - - div.caption span{ - display:block; - margin-top:3px; - font-size:0.8em; - color:#666; - padding:0px 5px; - } - - .gallery{} - - .gallery a{ - display:inline-block; - position:relative; - border:1px solid #ddd; - background:#fff; - padding:3px; - margin:5px; - -moz-border-radius:5px; - -webkit-border-radius:5px; - border-radius:5px; - } - - .gallery a img{ - display: block; - position: relative; - margin:0; - padding:0; - } - -/*--------------------------------- - SLIDESHOW2 ------------------------------------*/ -.slideshow-wrap{ -clear:both; -margin:0; -padding:0; -position:relative; -top:0; -left:0; -overflow:hidden; -clear:both; -} - - .slideshow-inner{ - overflow:hidden; - clear:both; - position:relative; - top:0; - left:0; - border:1px solid #efefef; - } - - .slideshow{ - clear:both; - margin:0; - padding:0; - width:auto; - height:auto; - overflow:hidden; - } - - .slideshow li{ - list-style-type:none; - margin:0; - padding:0; - float:left; - display:block; - } - - .slideshow img{vertical-align: bottom;} - - .slideshow-buttons{ - text-align:right; - margin:3px 0 0 0; - padding:0; - } - - .slideshow-buttons li{display:inline;position:relative;top:0;left:0;line-height:100%;margin:0;padding:0;} - .slideshow-buttons li.current a{background:#ddd;} - - .slideshow-buttons a{ - display:inline; - position:relative; - top:0; - left:0; - padding:1px 3px; - margin:0 1px; - line-height:100%; - border:1px solid #efefef; - text-decoration:none; - font-size:0.8em; - } DELETED cgisetup/www/css/prettify.css Index: cgisetup/www/css/prettify.css ================================================================== --- cgisetup/www/css/prettify.css +++ /dev/null @@ -1,1 +0,0 @@ -.pln{color:#000}@media screen{.str{color:#080}.kwd{color:#008}.com{color:#800}.typ{color:#606}.lit{color:#066}.pun,.opn,.clo{color:#660}.tag{color:#008}.atn{color:#606}.atv{color:#080}.dec,.var{color:#606}.fun{color:red}}@media print,projection{.str{color:#060}.kwd{color:#006;font-weight:bold}.com{color:#600;font-style:italic}.typ{color:#404;font-weight:bold}.lit{color:#044}.pun,.opn,.clo{color:#440}.tag{color:#006;font-weight:bold}.atn{color:#404}.atv{color:#060}}pre.prettyprint{}ol.linenums{margin-top:0;margin-bottom:0}li.L0,li.L1,li.L2,li.L3,li.L5,li.L6,li.L7,li.L8{list-style-type:none}li.L1,li.L3,li.L5,li.L7,li.L9{background:#eee} DELETED cgisetup/www/css/tiptip.css Index: cgisetup/www/css/tiptip.css ================================================================== --- cgisetup/www/css/tiptip.css +++ /dev/null @@ -1,99 +0,0 @@ -/* - TipTip CSS - Version 1.2 - http://code.drewwilson.com/entry/tiptip-jquery-plugin -*/ - -#tiptip_holder { display: none; position: absolute; top: 0; left: 0; z-index: 99999; } -#tiptip_holder.tip_top { padding-bottom: 5px; } -#tiptip_holder.tip_bottom { padding-top: 5px; } -#tiptip_holder.tip_right { padding-left: 5px; } -#tiptip_holder.tip_left { padding-right: 5px; } - -#tiptip_content { -font-size: 11px; -color: #fff; -text-shadow: 0 0 2px #000; -padding: 4px 8px; -border: 1px solid rgba(255,255,255,0.25); -background:#212121; -background-color: rgba(25,25,25,0.92); -background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(transparent), to(#000)); --webkit-border-radius: 3px; --moz-border-radius: 3px; -border-radius: 3px; --webkit-box-shadow: 0 0 3px #555; --moz-box-shadow: 0 0 3px #555; -box-shadow: 0 0 3px #555; -*background:#212121; -} - -#tiptip_arrow, #tiptip_arrow_inner { -position: absolute; -border-color: transparent; -border-style: solid; -border-width: 6px; -height: 0; -width: 0; -} - -#tiptip_holder.tip_top #tiptip_arrow { -border-top-color: #fff; -border-top-color: rgba(255,255,255,0.35); -} - -#tiptip_holder.tip_bottom #tiptip_arrow { -border-bottom-color: #fff; -border-bottom-color: rgba(255,255,255,0.35); -} - -#tiptip_holder.tip_right #tiptip_arrow { -border-right-color: #fff; -border-right-color: rgba(255,255,255,0.35); -} - -#tiptip_holder.tip_left #tiptip_arrow { -border-left-color: #fff; -border-left-color: rgba(255,255,255,0.35); -} - -#tiptip_holder.tip_top #tiptip_arrow_inner { -margin-top: -7px; -margin-left: -6px; -border-top-color: rgb(25,25,25); -border-top-color: rgba(25,25,25,0.92); -} - -#tiptip_holder.tip_bottom #tiptip_arrow_inner { -margin-top: -5px; -margin-left: -6px; -border-bottom-color: rgb(25,25,25); -border-bottom-color: rgba(25,25,25,0.92); -} - -#tiptip_holder.tip_right #tiptip_arrow_inner { -margin-top: -6px; -margin-left: -5px; -border-right-color: rgb(25,25,25); -border-right-color: rgba(25,25,25,0.92); -} - -#tiptip_holder.tip_left #tiptip_arrow_inner { -margin-top: -6px; -margin-left: -7px; -border-left-color: rgb(25,25,25); -border-left-color: rgba(25,25,25,0.92); -} - -/* Webkit Hacks */ -@media screen and (-webkit-min-device-pixel-ratio:0) { - #tiptip_content { - padding: 4px 8px 5px 8px; - background-color: rgba(45,45,45,0.88); - } - #tiptip_holder.tip_bottom #tiptip_arrow_inner { - border-bottom-color: rgba(45,45,45,0.88); - } - #tiptip_holder.tip_top #tiptip_arrow_inner { - border-top-color: rgba(20,20,20,0.92); - } -} DELETED cgisetup/www/elements.html Index: cgisetup/www/elements.html ================================================================== --- cgisetup/www/elements.html +++ /dev/null @@ -1,1816 +0,0 @@ - - -HTML KickStart Elements - - - - - - - - - - - -
-
-

HTML KickStart

-

Ultra–Lean HTML5, CSS, & JS Building Blocks
for Rapid Website Production

-
-
- Responsive -
- -
-
- MIT Open Source -
- -
-
- 479 Icons
-
- -
-
- Designer Friendly - -
-

- Download (Github) - - -
-

Downloaded over 91036 Times :)

-
-
- -
- - -

Getting Started

- - -
-
-

Setup

-
    -
  1. Download HTML KickStart
    2. -
  2. Include jQuery and HTML KickStart -
    -<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
-<script src="js/kickstart.js"></script> <!-- KICKSTART -->
-<link rel="stylesheet" href="css/kickstart.css" media="all" /> <!-- KICKSTART -->
-
    -
    3. -
  3. Copy Elements into your HTML
    4. -
-
-
-
-

Browsers

- HTML KickStart Tested and working in IE 8+, Safari, Chrome, Firefox, Opera, Safari IOS, Browser and Chrome Android. -

Notes

- Don't forget to use an HTML5 Doctype - <!DOCTYPE html> -
-
- - - - -

Buttons

- - - - -
-
-

Buttons

-
- A.button
-
-
-
- -
- - -
-

With Icons

-
-
-
-
- - -
-

Colors

-
- .orange
-
-
- -
- - -
-

Styles

-
-
- .pop
-
- -
- -
-

Button Bar

-    - -
    -
    • -
    • -
    • -
    • -
   - -    - -
    -
    • -
    • -
-
-
- -
-
-<!-- Button Sizes -->
-<button>Button</button>
-<a class="button" href="">A.button</a>
-<button class="small">Small</button>
-<button class="small" disabled="disabled">Small (disabled)</button>
-<button class="medium">Medium</button>
-<button class="large">Large</button>
-
- -
-
-<!-- Buttons w/Icons -->
-<button class="small"><i class="fa fa-picture-o"></i> Small</button>
-<button class="medium"><i class="fa fa-coffee"></i> Medium</button>
-<button class="large"><i class="fa fa-leaf"></i> Large</button>
-
- -
-
-<!-- Buttons w/Colors -->
-<button class="blue"><i class="fa fa-star"></i> .blue</button>
-<a class="button orange" href=""><i class="fa fa-music"></i> .orange</a>
-<button class="small pink"><i class="fa fa-plus-square"></i> .pink</button>
-<button class="medium green"><i class="fa fa-play-circle"></i> .green</button>
-<button class="large red"><i class="fa fa-minus-square"></i> .red</button>
-
- -
-
-<!-- Default (no style) -->
-<button>default</button>
-
-<!-- Pill -->
-<button class="pill"><i class="fa fa-star"></i> .pill</button>
-
-<!-- Pop -->
-<a class="button pop" href=""><i class="fa fa-music"></i> .pop</a>
-
-<!-- Inset -->
-<button class="inset"><i class="fa fa-plus-square"></i> .inset</button>
-
-<!-- Square -->
-<button class="square"><i class="icon-minus-square"></i> .square</button>
-
-
- -
-
-<!-- Button Bar w/icons -->
-<ul class="button-bar">
-<li><a href=""><i class="fa fa-pencil"></i> Edit</a></li>
-<li><a href=""><i class="fa fa-tag"></i> Tag</a></li>
-<li><a href=""><i class="fa fa-upload"></i> Upload</a></li>
-<li><a href=""><i class="fa fa-plus-sign"></i></a></li>
-</ul>
-
-
- - -

Lists

- - -
-
-

Unordered List

-
    -
  • Apple
    • -
  • Banana
    • -
  • Orange
    • -
  • Pear
    • -
-
- -
-

Ordered List

-
    -
  1. Apple
    2. -
  2. Banana
    3. -
  3. Orange
    4. -
  4. Pear
    5. -
-
- -
-

UL.icons

-
    -
  • Apple
    • -
  • Banana
    • -
  • Orange
    • -
  • Pear
    • -
-
- -
-

UL.alt

-
    -
  • Apple
    • -
  • Banana
    • -
  • Orange
    • -
  • Pear
    • -
-
-
- -
-
-<!-- Unordered List -->
-<ul>
-<li>Apple</li>
-<li>Banana</li>
-<li>Orange</li>
-<li>Pear</li>
-</ul>
-
- -
-
-<!-- Ordered List -->
-<ol>
-<li>Apple</li>
-<li>Banana</li>
-<li>Orange</li>
-<li>Pear</li>
-</ol>
-
- -
-
-<!-- List Icons -->
-<ul class="icons">
-<li><i class="fa fa-check"></i>Apple</li>
-<li><i class="fa fa-check"></i>Banana</li>
-<li><i class="fa fa-check"></i>Orange</li>
-<li><i class="fa fa-remove"></i>Pear</li>
-</ul>
-
- -
-
-<!-- List Alternative Style -->
-<ul class="alt">
-<li>Apple</li>
-<li>Banana</li>
-<li>Orange</li>
-<li>Pear</li>
-</ul>
-
- - - - - -
-

These Menus are optionally responsive when using a responsive grid: .grid or .grid.flex

- -
-

Vertical Left

- -
- - -
-

Horizontal

- -
- - -
-

Vertical Right

- -
-
- -
-
-<!-- Menu Vertical Left -->
-<ul class="menu vertical">
-<li class="current"><a href="">Item 1</a></li>
-<li><a href="">Item 2</a></li>
-<li><a href="">Item 3</a>
-	<ul>
-	<li><a href="">Sub Item that is super long and we don't want it to break the menu</a></li>
-	<li><a href="">Sub Item</a>
-		<ul>
-		<li><a href="">Sub Item</a></li>
-		<li><a href="">Sub Item</a></li>
-		<li><a href="">Sub Item</a></li>
-		<li><a href="">Sub Item</a></li>
-		</ul>
-	</li>
-	<li><a href="">Sub Item</a></li>
-	</ul>
-</li>
-<li><a href="">Item 4</a></li>
-</ul>
-
- -
-
-<!-- Menu Horizontal -->
-<ul class="menu">
-<li class="current"><a href="">Item 1</a></li>
-<li><a href="">Item 2</a></li>
-<li><a href=""><i class="fa fa-inbox"></i> Item 3</a>
-	<ul>
-	<li><a href=""><i class="fa fa-cog"></i> Sub Item</a></li>
-	<li><a href=""><i class="fa fa-envelope"></i> Sub Item</a>
-		<ul>
-		<li><a href=""><i class="fa fa-wrench"></i> Sub Item</a></li>
-		<li><a href=""><i class="fa fa-camera-retro"></i> Sub Item</a></li>
-		<li><a href=""><i class="fa fa-coffee"></i> Sub Item</a></li>
-		<li><a href=""><i class="fa fa-twitter"></i> Sub Item</a></li>
-		</ul>
-	</li>
-	<li class="divider"><a href=""><i class="fa fa-trash"></i> li.divider</a></li>
-	</ul>
-</li>
-<li><a href="">Item 4</a></li>
-</ul>
-
- -
-
-<!-- Menu Vertical Right -->
-<ul class="menu vertical right">
-<li><a href="">Item 1</a></li>
-<li><a href="">Item 2</a></li>
-<li><a href="">Item 3</a>
-	<ul>
-	<li><a href="">Sub Item</a></li>
-	<li class="current"><a href="">Sub Item</a>
-		<ul>
-		<li><a href="">Sub Item</a></li>
-		<li><a href="">Sub Item</a></li>
-		<li><a href="">Sub Item</a></li>
-		<li><a href="">Sub Item</a></li>
-		</ul>
-	</li>
-	<li><a href="">Sub Item</a></li>
-	</ul>
-</li>
-<li><a href="">Item 4</a></li>
-</ul></pre>
-
- - -

Tables

- - -
-
-

Table (default)

- - - - - - - - - - - - - - - - - - - - - - - -
Item1Item2Item3
Item1Item2Item3
Item1Item2Item3
Item1Item2Item3
Item1Item2Item3
-
- -
-

Table.striped

- - - - - - - - - - - - - - - - - - - - - - - -
 Item2Item3
Item1Item2Item3
Item1Item2Item3
Item1Item2Item3
Item1Item2Item3
-
- -
-

Table.tight

- - - - - - - - - - - - - - - - - - - - - - - -
Item1Item2Item3
Item1Item2Item3
Item1Item2Item3
Item1Item2Item3
Item1Item2Item3
-
- -
-

Table.sortable

- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameNumberColorActions
Joshua555-4325Blue -
Peter555-5698Gold -
Mary666-7654Red -
Gretty555-6732Pink -
-
-
- -
-
-<!-- Table -->
-<table cellspacing="0" cellpadding="0">
-<thead><tr>
-	<th>Item1</th>
-	<th>Item2</th>
-	<th>Item3</th>
-</tr></thead>
-<tbody><tr>
-	<td>Item1</td>
-	<td>Item2</td>
-	<td>Item3</td>
-</tr><tr>
-	<td>Item1</td>
-	<td>Item2</td>
-	<td>Item3</td>
-</tr><tr>
-	<td>Item1</td>
-	<td>Item2</td>
-	<td>Item3</td>
-</tr><tr>
-	<td>Item1</td>
-	<td>Item2</td>
-	<td>Item3</td>
-</tr></tbody>
-</table>
-
- -
-
-<!-- Table w/Side -->
-<table cellspacing="0" cellpadding="0">
-<thead><tr>
-	<th> </th>
-	<th>Item2</th>
-	<th>Item3</th>
-</tr></thead>
-<tbody><tr>
-	<th>Item1</th>
-	<td>Item2</td>
-	<td>Item3</td>
-</tr><tr>
-	<th>Item1</th>
-	<td>Item2</td>
-	<td>Item3</td>
-</tr><tr>
-	<th>Item1</th>
-	<td>Item2</td>
-	<td>Item3</td>
-</tr><tr>
-	<th>Item1</th>
-	<td>Item2</td>
-	<td>Item3</td>
-</tr></tbody>
-</table>
-
- -
-
-<!-- Table striped -->
-<table class="striped">
-...
-</table>
-
-<!-- Table tight -->
-<table class="tight">
-...
-</table>
-
-<!-- Table sortable -->
-<table class="sortable">
-...
-</table>
-
-<!-- Table combined Styles -->
-<table class="striped tight sortable">
-...
-</table>
-
-
- - -

ToolTips

- - -
-
-

Tooltips

-

Tooltips are awesome. These tooltips are designed to mimic the default browser tooltips - smart, aware of the edge of the browser window. Simple.

-

Hover over the examples on the right to preview.

-

Use:
- class="tooltip" +
- title="my tooltip content"

-
- -
-

Tooltip Positions

-
    -
  • .tooltip (default)
    • -
  • .tooltip-top
    • -
  • .tooltip-right
    • -
  • .tooltip-left
    • -
  • .tooltip-bottom
    • -
-
- -
-

Tooltips with HTML Content

- .tooltip + data-content="#ID" -
-   - -
HTML Content
- -

This is more HTML content. You can place any HTML in this tooltip.

-
-
- -
-
-<!-- Tooltip Default (top) -->
-<span class="tooltip" title="This is a default (top) tooltip">.tooltip</span>
-
-<!-- Tooltip Top -->
-<span class="tooltip-top" title="This is a Top tooltip">.tooltip-top</span>
-
-<!-- Tooltip Right -->
-<span class="tooltip-right" title="This is a Right tooltip">.tooltip-right</span>
-
-<!-- Tooltip Left -->
-<span class="tooltip-left" title="This is a Left tooltip">.tooltip-left</span>
-
-<!-- Tooltip Bottom -->
-<span class="tooltip-bottom" title="This is a Bottom tooltip">.tooltip-bottom</span>
-
-
- -
-
-<!-- Hover Action -->
-<button class="tooltip medium orange pill" data-content="#tooltipcontentID">Hover Over Me</button>
-
-<!-- Click Action -->
-<button class="tooltip medium blue pill" data-content="#tooltipcontentID" data-action="click">Click Me</button>
-
-<!-- Tooltip Content -->
-<div class="tooltip-content" id="tooltipcontentID"><h5>HTML Content</h5>
-<img src="http://placehold.it/180x150/4D99E0/ffffff.png&text=180x150" width="180" height="150" />
-<p>This is more HTML content. You can place any HTML in this tooltip.</p></div>
-
-
- - - -

Typography

- - -
-
-

Paragraphs

-

Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore - magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper - suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in - hendrerit in vulputate velit esse molestie consequat

-

El illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim - qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Nam - liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim - placerat facer possim assum.

- - -

Blockquote

-

lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit - in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan - et iusto odio - Someone Important

- - -

Blockquote Small

-

lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit - in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan - et iusto odio - Someone Important

-
- - -
-

Inline Styles

-
    -
  • Strong
    • -
  • Emphasis
    • -
  • Inline Link
    • -
  • Strike
    • -
  • Inline Icons
    • -
  • <h1>Sample Code</h1>
    • -
-
- -

Heading 1

-

Heading 2

-

Heading 3

-

Heading 4

-
Heading 5
-
Heading 6
-
- -

Address

-

- 1234 South Creek Lane
- Calgary, Alberta, Canada
- T4B–1S6 -

-
-
-
- -
-
-<!-- Headings 1–6 -->
-<h1>Heading 1</h1>
-<h2>Heading 2</h2>
-<h3>Heading 3</h3>
-<h4>Heading 4</h4>
-<h5>Heading 5</h5>
-<h6>Heading 6</h6>
-
- -
-
-<!-- Paragraph -->
-<p>Consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt...</p>
-<p>El illum dolore eu feugiat nulla facilisis at vero eros et accumsan...</p>
-
- -
-
-<!-- Blockquote -->
-<blockquote>
-<p>
-lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit 
-in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan 
-et iusto odio
-<span>Someone Important</span>
-</p>
-</blockquote>
-
- -
-
-<!-- Blockquote Small -->
-<blockquote class="small">
-<p>
-lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit 
-in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan 
-et iusto odio
-<span>Someone Important</span>
-</p>
-</blockquote>
-
- -
-
<!-- Strong -->
-<strong>Strong</strong>
-
-<!-- Emphasis -->
-<em>Emphasis</em>
-
-<!-- Inline Link -->
-<a href="">Inline Link</a>
-
-<!-- Strike -->
-<strike>Strike</strike>
-
-<!--Inline Icons -->
-Inline <i class="icon-film"></i> Icons
-
-<!--Sample Code (encoded entities) -->
-<code>&lt;h1&gt;Sample Code&lt;/h1&gt;</code>
-
- -
-
-<!-- Address -->
-<address><p>
-1234 South Creek Lane<br />
-Calgary, Alberta, Canada<br />
-T4B–1S6
-</p>
-</address>
-
- - -

Horizontal Rules

- - -
-
-

HR

-
-
- -
-

HR.alt1

-
-
- -
-

HR.alt2

-
-
-
- -
-
-<!-- HR -->
-<hr />
-
-<!-- HR.alt1 -->
-<hr class="alt1" />
-
-<!-- HR.alt2 -->
-<hr class="alt2" />
-
- - - - -

Icons/Glyphs

-
-
-

HTML KickStart now using
Font Awesome 4.2.0 Icons!

- How to use icons: <i class="fa fa-globe"></i>. -
Replace fa-globe with the icon you would like to use from the Cheatsheet.
-
- - - - -
- To increase the size of icons relative to its container, use fa-large, fa-2x, fa-3x, or fa-4x.
-
- .pull-left Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam. Fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. -
-
- .pull-right Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam. Fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. -
-
- .fa-border Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam. Fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. -
-
-
- - -

Code/Pre

- - -
-
-

PRE HTML

- 
-<html>
-<head><title>This is a title</title></head>
-<body class="subpage">
-	<!-- Content Here -->
-</body>
-</html>
-
- - -
-

PRE CSS

- 
-body{
-font-weight:bold;
-color:#000;
-line-height:150%;
-}
-
- - -
-

PRE JS

- 
-$(document).ready(function(){
-	alert('jQuery');
-});
-
-
- -
-
-<!-- Code HTML -->
-<pre>
-…code goes here… 
-</pre>
-
- -
-
-<!-- Code CSS -->
-<pre>
-…code goes here… 
-</pre>
-
- -
-
-<!-- Code Javascript -->
-<pre>
-…code goes here… 
-</pre>
-
- -
-
-<!-- Code PHP -->
-<pre>
-…code goes here… 
-</pre>
-
- - -

Tabs

- - -
-
-

Tabs.left

- - -
Tab1
-
Tab2
-
Tab3
-
- - -
-

Tabs.center

- - -
Tab1
-
Tab2 has an icon.
-
Tab3
-
- - -
-

Tabs.right

- - -
Tab1
-
Tab2
-
Tab3
-
-
- -
-
-<!-- Tabs Left -->
-<ul class="tabs left">
-<li><a href="#tabr1">Tab1</a></li>
-<li><a href="#tabr2">Tab2</a></li>
-<li><a href="#tabr3">Tab3</a></li>
-</ul>
-
-<div id="tabr1" class="tab-content">Tab1</div>
-<div id="tabr2" class="tab-content">Tab2</div>
-<div id="tabr3" class="tab-content">Tab3</div>
-
- -
-
-<!-- Tabs Center -->
-<ul class="tabs center">
-<li><a href="#tabc1">Tab1</a></li>
-<li><a href="#tabc2"><i class="fa fa-folder-open"></i> Tab2</a></li>
-<li><a href="#tabc3">Tab3</a></li>
-</ul>
-
-<div id="tabc1" class="tab-content">Tab1</div>
-<div id="tabc2" class="tab-content">Tab2 has an icon.</div>
-<div id="tabc3" class="tab-content">Tab3</div>
-
- -
-
-<!-- Tabs Right -->
-<ul class="tabs right">
-<li><a href="#tabr1">Tab1</a></li>
-<li><a href="#tabr2">Tab2</a></li>
-<li><a href="#tabr3">Tab3</a></li>
-</ul>
-
-<div id="tabr1" class="tab-content">Tab1</div>
-<div id="tabr2" class="tab-content">Tab2</div>
-<div id="tabr3" class="tab-content">Tab3</div>
-
- - - - - -
-
-

Breadcrumbs

- -
- -
-

Breadcrumbs.alt1

- -
-
- -
-
-<!-- Breadcrumbs -->
-<ul class="breadcrumbs">
-<li><a href="">Home</a></li>
-<li><a href="">Category</a></li>
-<li><a href="">Sub Category</a></li>
-<li><a href="">Page Title</a></li>
-</ul>
-
- -
-
-<!-- Alternative Style -->
-<ul class="breadcrumbs alt1">
-<li><a href="">Home</a></li>
-<li><a href="">Category</a></li>
-<li><a href="">Sub Category</a></li>
-<li><a href="">Page Title</a></li>
-</ul>
-
- - - - -

Grids/Columns

- - -
-

Responsive & Flexible Grid

-

Responsive functionality is optional. Only use .grid & .grid.flex if you - want a responsive grid. Resize your browser to see it in action.

-

Responsive Grid:
<div class="grid">

-

Flexible Responsive Grid:
<div class="grid flex">

-

Grid Helper Classes:
- .show-desktop - .hide-desktop - .show-tablet - .hide-tablet - .show-phone - .hide-phone -

-
All columns automatically have the class .column. Apply padding and borders directly to columns -
.column{border:1px solid red;padding:10px;}
-
- -
col_12
-
col_1
col_11
-
col_2
col_10
-
col_3
col_9
-
col_4
col_8
-
col_5
col_7
-
col_6
col_6
-
col_7
col_5
-
col_8
col_4
-
col_9
col_3
-
col_10
col_2
-
col_11
col_1
-
col_12
- - -
Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy - nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam.
-
Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy - nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam.
-
Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy - nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam.
-
Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy - nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam.
- - -
Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy - nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam.
-
Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy - nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam.
-
Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy - nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam.
- - -
Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy - nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam.
-
Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy - nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam.
-
- -
-
-<!-- Columns/Grid -->
-<div class="col_12">col_12</div>
-<div class="col_1">col_1</div><div class="col_11">col_11</div>
-<div class="col_2">col_2</div><div class="col_10">col_10</div>
-<div class="col_3">col_3</div><div class="col_9">col_9</div>
-<div class="col_4">col_4</div><div class="col_8">col_8</div>
-<div class="col_5">col_5</div><div class="col_7">col_7</div>
-<div class="col_6">col_6</div><div class="col_6">col_6</div>
-<div class="col_7">col_7</div><div class="col_5">col_5</div>
-<div class="col_8">col_8</div><div class="col_4">col_4</div>
-<div class="col_9">col_9</div><div class="col_3">col_3</div>
-<div class="col_10">col_10</div><div class="col_2">col_2</div>
-<div class="col_11">col_11</div><div class="col_1">col_1</div>
-<div class="col_12">col_12</div>
-
-<!-- FOURTHS -->
-<div class="col_3">Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy 
-nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam.</div>
-<div class="col_3">Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy 
-nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam.</div>
-<div class="col_3">Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy 
-nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam.</div>
-<div class="col_3">Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy 
-nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam.</div>
-
-<!-- THIRDS -->
-<div class="col_4">Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy 
-nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam.</div>
-<div class="col_4">Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy 
-nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam.</div>
-<div class="col_4">Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy 
-nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam.</div>
-
-<!-- HALF & HALF -->
-<div class="col_6">Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy 
-nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam.</div>
-<div class="col_6">Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy 
-nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam.</div>
-
- - -

Images

- - -
-
-

IMG.caption

- -
- -
-

DIV.gallery

- - - - - - - - -
- -
 
- -
-

IMG.align-left

- -

Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt - ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation - ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor - in hendrerit in vulputate velit esse molestie consequat.

-
- -
-

IMG.align-right

- -

Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt - ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation - ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor - in hendrerit in vulputate velit esse molestie consequat.

-
- -
-

IMG.full-width

- -
-
- -
-
-<!-- Caption -->
-<img class="caption" title="This is the image caption" src="http://placehold.it/400x350/4D99E0/ffffff.png&text=400x350" width="400" height="350" />
-
- -
-
-<!-- Align Left -->
-<img class="align-left" src="http://placehold.it/100x100/4D99E0/ffffff.png&text=100x100" width="100" height="100" />
-<p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt 
-ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation 
-ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor 
-in hendrerit in vulputate velit esse molestie consequat.</p>
-
- -
-
-<!-- Align Right -->
-<img class="align-right" src="http://placehold.it/100x100/4D99E0/ffffff.png&text=100x100" width="100" height="100" />
-<p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt 
-ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation 
-ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor 
-in hendrerit in vulputate velit esse molestie consequat.</p>
-
- -
-
-<!-- Full Width -->
-<img class="full-width" src="http://placehold.it/260x200/4D99E0/ffffff.png&text=full+width" />
-
- -
-
-<!-- Gallery -->
-<div class="gallery">
-<a href="http://placehold.it/600x450/4D99E0/ffffff.png&text=600x450"><img src="http://placehold.it/100x100/4D99E0/ffffff.png&text=100x100" width="100" height="100" /></a>
-<a href="http://placehold.it/600x450/75CC00/ffffff.png&text=600x450"><img src="http://placehold.it/100x100/75CC00/ffffff.png&text=100x100" width="100" height="100" /></a>
-<a href="http://placehold.it/600x450/E49800/ffffff.png&text=600x450"><img src="http://placehold.it/100x100/E49800/ffffff.png&text=100x100" width="100" height="100" /></a>
-<a href="http://placehold.it/600x450/E4247E/ffffff.png&text=600x450"><img src="http://placehold.it/100x100/E4247E/ffffff.png&text=100x100" width="100" height="100" /></a>
-<a href="http://placehold.it/600x450/00C6E4/ffffff.png&text=600x450"><img src="http://placehold.it/100x100/00C6E4/ffffff.png&text=100x100" width="100" height="100" /></a>
-<a href="http://placehold.it/600x450/E4DB0F/ffffff.png&text=600x450"><img src="http://placehold.it/100x100/E4DB0F/ffffff.png&text=100x100" width="100" height="100" /></a>
-<a href="http://placehold.it/600x450/7400E4/ffffff.png&text=600x450"><img src="http://placehold.it/100x100/7400E4/ffffff.png&text=100x100" width="100" height="100" /></a>
-<a href="http://placehold.it/600x450/C50000/ffffff.png&text=600x450"><img src="http://placehold.it/100x100/C50000/ffffff.png&text=100x100" width="100" height="100" /></a>
-</div>
-
- - -

Slideshow

- - -
-

Fully responsive slideshow. Touch enabled. Uses the awesome & highly configurable BXSlider.

-
-
    -
    • -
    • -
    • -
-
- -
-

Features

-
    -
  • Slide Any HTML Content
    • -
  • Responsive
    • -
  • Touch Enabled
    • -
  • Iframes
    • -
  • Videos
    • -
  • Images
    • -
  • Lightweight
    • -
  • Multiple Slideshows
    • -
  • Zero Setup Required
    • -
  • Unordered List (default)
    • -
-
-
- -
-
-<!-- Slideshow -->
-<ul class="slideshow">
-<li><img src="http://placehold.it/550x350/4D99E0/ffffff.png&text=550x350" width="550" height="350" /></li>
-<li><img src="http://placehold.it/550x350/75CC00/ffffff.png&text=550x350" width="550" height="350" /></li>
-<li><img src="http://placehold.it/550x350/E49800/ffffff.png&text=550x350" width="550" height="350" /></li>
-<li><h3>Slide Anything</h3><p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit, 
-sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.</p></li>
-</ul>
-
- - - -

Forms

- - -
-

Form.vertical

-
- - - - - - - - - - - - - - - - - -
- -
- - - - - - -
- Checkboxes -
-
- -
- -
- Radios -
-
- -
- - - -
- -
-
This is an Error Notice -
-
This is a Warning Notice -
-
This is a Success Notice -
- - - - - -
-
-
- -
-

Inline Form Fields (default)

-
- - - -   - - - -
-
-
- - - -
-

Input/Label Sizes

- - - - - - - - - - - - - -
-
- -
-
-<!-- Text Field -->
-<label for="text1">Text Field</label>
-<input id="text1" type="text" />
-
-<!-- Placeholder Text -->
-<label for="text2">Placeholder</label>
-<input id="text2" type="text" placeholder="Placeholder Text" />
-
-<!-- Disabled Field -->
-<label for="text3" class="disabled">Disabled Field</label>
-<input id="text3" type="text" disabled="disabled" />
-
-<!-- Label with Right Hint -->
-<label for="text4">Label with Right Hint <span class="right">A-Z, 0-9</span></label>
-<input id="text4" type="text" />
-
-<!-- Label with Hint -->
-<label for="text5">Label with Hint <span>A-Z, 0-9</span></label>
-<input id="text5" type="text" />
-
-<!-- Text Field Error -->
-<label for="text6" class="error">Text Field (Error)</label>
-<input id="text6" class="error" type="text" />
-
- -
-
-<!-- Select -->
-<label for="select1">Select Field</label>
-<select id="select1">
-<option value="0">-- Choose --</option>
-<option value="1">Option 1</option>
-<option value="2">Option 2</option>
-<option value="3">Option 3</option>
-</select>
-
- -
-
-<!-- Checkbox -->
-<input type="checkbox" id="check1" />
-<label for="check1" class="inline">Checkbox Field</label>
-
- -
-
-<!-- Radio -->
-<input type="radio" name="radio" id="radio1" />
-<label for="radio1" class="inline">Option1</label>
-
- -
-
-<!-- Fieldset -->
-<fieldset>
-<legend>Checkboxes</legend>
-	<!-- Form Fields Here -->
-</fieldset>
-
- -
-
-<!-- Textarea -->
-<textarea id="textarea1" placeholder="Placeholder Text"></textarea>
-
- -
-
-<!-- Error -->
-<div class="notice error"><i class="icon-remove-sign icon-large"></i> This is an Error Notice 
-<a href="#close" class="icon-remove"></a></div>
-
-<!-- Warning -->
-<div class="notice warning"><i class="icon-warning-sign icon-large"></i> This is a Warning Notice 
-<a href="#close" class="icon-remove"></a></div>
-
-<!-- Success -->
-<div class="notice success"><i class="icon-ok icon-large"></i> This is a Success Notice 
-<a href="#close" class="icon-remove"></a></div>
-
- - -

Extras/Helpers

- - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
ItemDescription
.left .center .rightAlign Text
a.lightboxOpen Link in lightbox. Auto Detects, iframe, inline content, etc.
.clearAdd this class to a div or other element to clear floats.
.clearfixAdd this class to containers that have floating children inside to clear inner floats.
li.first li.lastFirst and Last <li></li> items automatically get classes .first and .last respectively.
.columnAll columns have the class .column added to them automatically for easy global styling.
.visibleAdd this to columns to view during production. Adds light grey background color to columns.
.hide .show.hide to hide content (display:none). .show to show content (display:block).
tr.first tr.lastFirst and Last <tr></tr> items automatically get classes .first and .last respectively.
tr.altEvery second table row automatically gets class .alt.
-
- - -
- -
-
- Download (Github) - - -
-

Downloaded over 91036 Times :)

-
-
- - -
-
- -
-

99Lime Announcements and Releases.

- - - -
- -
- - -
-
-
- - - - -
- - - - - DELETED cgisetup/www/example.html Index: cgisetup/www/example.html ================================================================== --- cgisetup/www/example.html +++ /dev/null @@ -1,116 +0,0 @@ - - -HTML KickStart Elements - - - - - - - - - - - - - -
- - - -
-
-

Paragraphs

-

- Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod - tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis - nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. - Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat

- -

El illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio - dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Nam - liber tempor cum soluta nobis eleifend <h1>Sample Code</h1> option - congue nihil imperdiet doming id quod mazim placerat facer possim assum.

- -

- Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore - magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis - nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse - molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim - qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Nam liber tempor cum - soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum.

-
- -
-
Icon List
-
    -
  • Apple
    • -
  • Banana
    • -
  • Orange
    • -
  • Pear
    • -
- -
Sample Icons
- - - - - -
Button w/Icon
- RSS -
- -
- -
-

Column

-

Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore - magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis

-
- -
-

Column

-

Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore - magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis

-
- -
-

Column

-

Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore - magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis

-
- -
-

Column

-

Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore - magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis

-
-
- -
- - -
- - - DELETED cgisetup/www/index.html Index: cgisetup/www/index.html ================================================================== --- cgisetup/www/index.html +++ /dev/null @@ -1,6 +0,0 @@ - -blah - -Hello - - DELETED cgisetup/www/js/kickstart.js Index: cgisetup/www/js/kickstart.js ================================================================== --- cgisetup/www/js/kickstart.js +++ /dev/null @@ -1,424 +0,0 @@ -/* - 99Lime.com HTML KickStart by Joshua Gatcke - kickstart.js -*/ - -jQuery(document).ready(function($){ - - /*--------------------------------- - MENU Dropdowns - -----------------------------------*/ - $('ul.menu').each(function(){ - // add the menu toggle - $(this).prepend('
  • Menu
    • '); - - // find menu items with children. - $(this).find('li').has('ul').addClass('has-menu') - .find('a:first').append(' '); - }); - - $('ul.menu li').hover(function(){ - $(this).find('ul:first').stop(true, true).fadeIn('fast'); - $(this).addClass('hover'); - }, - function(){ - $(this).find('ul').stop(true, true).fadeOut('slow'); - $(this).removeClass('hover'); - }); - - /*--------------------------------- - Slideshow - -----------------------------------*/ - $('.slideshow').bxSlider({ - mode: 'horizontal', // 'horizontal', 'vertical', 'fade' - video: true, - useCSS: true, - pager: true, - speed: 500, // transition time - startSlide: 0, - infiniteLoop: true, - captions: true, - adaptiveHeight: false, - touchEnabled: true, - pause: 4000, - autoControls: false, - controls: false, - autoStart: true, - auto: true - }); - - /*--------------------------------- - Fancybox Lightbox - -----------------------------------*/ - $('.gallery').each(function(i){ - $(this).find('a').attr('rel', 'gallery'+i) - .fancybox({ - overlayOpacity: 0.2, - overlayColor: '#000' - }); - }); - - // lightbox links - $('a.lightbox').fancybox({ - overlayOpacity: 0.2, - overlayColor: '#000' - }); - - /*--------------------------------- - Tabs - -----------------------------------*/ - // tab setup - $('.tab-content').addClass('clearfix').not(':first').hide(); - $('ul.tabs').each(function(){ - var current = $(this).find('li.current'); - if(current.length < 1) { $(this).find('li:first').addClass('current'); } - current = $(this).find('li.current a').attr('href'); - $(current).show(); - }); - - // tab click - $(document).on('click', 'ul.tabs a[href^="#"]', function(e){ - e.preventDefault(); - var tabs = $(this).parents('ul.tabs').find('li'); - var tab_next = $(this).attr('href'); - var tab_current = tabs.filter('.current').find('a').attr('href'); - $(tab_current).hide(); - tabs.removeClass('current'); - $(this).parent().addClass('current'); - $(tab_next).show(); - history.pushState( null, null, window.location.search + $(this).attr('href') ); - return false; - }); - - // tab hashtag identification and auto-focus - var wantedTag = window.location.hash; - if (wantedTag != "") - { - // This code can and does fail, hard, killing the entire app. - // Esp. when used with the jQuery.Address project. - try { - var allTabs = $("ul.tabs a[href^=" + wantedTag + "]").parents('ul.tabs').find('li'); - var defaultTab = allTabs.filter('.current').find('a').attr('href'); - $(defaultTab).hide(); - allTabs.removeClass('current'); - $("ul.tabs a[href^=" + wantedTag + "]").parent().addClass('current'); - $("#" + wantedTag.replace('#','')).show(); - } catch(e) { - // I have no idea what to do here, so I'm leaving this for the maintainer. - } - } - - /*--------------------------------- - Image Caption - -----------------------------------*/ - $('img.caption').each(function(){ - $(this).wrap('
    '); - $(this).parents('div.caption') - .attr('class', 'img-wrap '+$(this).attr('class')); - if($(this).attr('title')){ - $(this).parents('div.caption') - .append(''+$(this).attr('title')+''); - } - }); - - /*--------------------------------- - Notice - -----------------------------------*/ - $(document).on('click', '.notice a[class^="icon-remove"]', function(e){ - e.preventDefault(); - var notice = $(this).parents('.notice'); - $(this).hide(); - notice.fadeOut('slow'); - }); - - /*--------------------------------- - ToolTip - TipTip - -----------------------------------*/ - - // Standard tooltip - $('.tooltip, .tooltip-top, .tooltip-bottom, .tooltip-right, .tooltip-left').each(function(){ - // variables - var tpos = 'top'; - var content = $(this).attr('title'); - var dataContent = $(this).attr('data-content'); - var keepAlive = false; - var action = 'hover'; - var delay = $(this).attr('data-delay'); - if (delay === undefined) {delay = 1000;} - - // position - if($(this).hasClass('tooltip-top')) { tpos = 'top'; } - if($(this).hasClass('tooltip-right')) { tpos = 'right'; } - if($(this).hasClass('tooltip-bottom')) { tpos = 'bottom'; } - if($(this).hasClass('tooltip-left')) { tpos = 'left'; } - - // content - $('.tooltip-content').removeClass('hide').wrap('
    '); - if(dataContent) { content = $(dataContent).html(); keepAlive = true; } - - // action (hover or click) defaults to hover - if($(this).attr('data-action') == 'click') { action = 'click'; } - - // tooltip - $(this).attr('title','') - .tipTip({defaultPosition: tpos, content: content, keepAlive: keepAlive, activation: action, delay: delay}); - }); - - /*--------------------------------- - Table Sort - -----------------------------------*/ - // init - var aAsc = []; - $('table.sortable').each(function(){ - $(this).find('thead th').each(function(index){$(this).attr('rel', index);}); - $(this).find('th,td').each(function(){$(this).attr('value', $(this).text());}); - }); - - // table click - $(document).on('click', 'table.sortable thead th', function(e){ - // update arrow icon - $(this).parents('table.sortable').find('span.arrow').remove(); - $(this).append(''); - - // sort direction - var nr = $(this).attr('rel'); - aAsc[nr] = aAsc[nr]=='asc'?'desc':'asc'; - if(aAsc[nr] == 'desc'){ $(this).find('span.arrow').addClass('up'); } - - // sort rows - var rows = $(this).parents('table.sortable').find('tbody tr'); - rows.tsort('td:eq('+nr+')',{order:aAsc[nr],attr:'value'}); - - // fix row classes - rows.removeClass('alt first last'); - var table = $(this).parents('table.sortable'); - table.find('tr:even').addClass('alt'); - table.find('tr:first').addClass('first'); - table.find('tr:last').addClass('last'); - }); - - /*--------------------------------- - CSS Helpers - -----------------------------------*/ - $('input[type=checkbox]').addClass('checkbox'); - $('input[type=radio]').addClass('radio'); - $('input[type=file]').addClass('file'); - $('[disabled=disabled]').addClass('disabled'); - $('table').find('tr:even').addClass('alt'); - $('table').find('tr:first-child').addClass('first'); - $('table').find('tr:last-child').addClass('last'); - $('ul').find('li:first-child').addClass('first'); - $('ul').find('li:last-child').addClass('last'); - $('hr').before('
     
    '); - $('[class*="col_"]').addClass('column'); - $('pre').addClass('prettyprint');prettyPrint(); - -}); - -/* - * FancyBox - jQuery Plugin - * Simple and fancy lightbox alternative - * - * Examples and documentation at: http://fancybox.net - * - * Copyright (c) 2008 - 2010 Janis Skarnelis - * That said, it is hardly a one-person project. Many people have submitted bugs, code, and offered their advice freely. Their support is greatly appreciated. - * - * Version: 1.3.4 (11/11/2010) - * Requires: jQuery v1.3+ - * - * Dual licensed under the MIT and GPL licenses: - * http://www.opensource.org/licenses/mit-license.php - * http://www.gnu.org/licenses/gpl.html - */ -(function(a){var p,u,v,e,B,m,C,j,y,z,s=0,d={},q=[],r=0,c={},k=[],E=null,n=new Image,H=/\.(jpg|gif|png|bmp|jpeg)(.*)?$/i,S=/[^\.]\.(swf)\s*$/i,I,J=1,x=0,w="",t,g,l=!1,A=a.extend(a("
    ")[0],{prop:0}),K=navigator.userAgent.match(/msie [6]/i)&&!window.XMLHttpRequest,L=function(){u.hide();n.onerror=n.onload=null;E&&E.abort();p.empty()},M=function(){!1===d.onError(q,s,d)?(u.hide(),l=!1):(d.titleShow=!1,d.width="auto",d.height="auto",p.html('

    The requested content cannot be loaded.
    Please try again later.

    '), -D())},G=function(){var b=q[s],c,f,e,g,k,j;L();d=a.extend({},a.fn.fancybox.defaults,"undefined"==typeof a(b).data("fancybox")?d:a(b).data("fancybox"));j=d.onStart(q,s,d);if(!1===j)l=!1;else{"object"==typeof j&&(d=a.extend(d,j));e=d.title||(b.nodeName?a(b).attr("title"):b.title)||"";b.nodeName&&!d.orig&&(d.orig=a(b).children("img:first").length?a(b).children("img:first"):a(b));""===e&&(d.orig&&d.titleFromAlt)&&(e=d.orig.attr("alt"));c=d.href||(b.nodeName?a(b).attr("href"):b.href)||null;if(/^(?:javascript)/i.test(c)|| -"#"==c)c=null;d.type?(f=d.type,c||(c=d.content)):d.content?f="html":c&&(f=c.match(H)?"image":c.match(S)?"swf":a(b).hasClass("iframe")?"iframe":0===c.indexOf("#")?"inline":"ajax");if(f)switch("inline"==f&&(b=c.substr(c.indexOf("#")),f=0').hide().insertBefore(a(b)).bind("fancybox-cleanup",function(){a(this).replaceWith(m.children())}).bind("fancybox-cancel", -function(){a(this).replaceWith(p.children())});a(b).appendTo(p);D();break;case "image":l=!1;a.fancybox.showActivity();n=new Image;n.onerror=function(){M()};n.onload=function(){l=!0;n.onerror=n.onload=null;d.width=n.width;d.height=n.height;a("").attr({id:"fancybox-img",src:n.src,alt:d.title}).appendTo(p);N()};n.src=c;break;case "swf":d.scrolling="no";g=''; -k="";a.each(d.swf,function(a,b){g+='';k+=" "+a+'="'+b+'"'});g+='";p.html(g);D();break;case "ajax":l=!1;a.fancybox.showActivity();d.ajax.win=d.ajax.success;E=a.ajax(a.extend({},d.ajax,{url:c,data:d.ajax.data||{},error:function(a){0
    ');d.width=p.width();d.height=p.height();N()},N=function(){var b,h;u.hide();if(e.is(":visible")&&!1===c.onCleanup(k,r,c))a.event.trigger("fancybox-cancel"),l=!1;else{l=!0;a(m.add(v)).unbind();a(window).unbind("resize.fb scroll.fb");a(document).unbind("keydown.fb");e.is(":visible")&&"outside"!==c.titlePosition&&e.css("height",e.height());k=q;r=s;c=d;if(c.overlayShow){if(v.css({"background-color":c.overlayColor,opacity:c.overlayOpacity, -cursor:c.hideOnOverlayClick?"pointer":"auto",height:a(document).height()}),!v.is(":visible")){if(K)a("select:not(#fancybox-tmp select)").filter(function(){return"hidden"!==this.style.visibility}).css({visibility:"hidden"}).one("fancybox-cleanup",function(){this.style.visibility="inherit"});v.show()}}else v.hide();b=O();var f={},F=c.autoScale,n=2*c.padding;f.width=-1b[0]||f.height>b[1]))"image"==d.type||"swf"==d.type?(F=c.width/c.height,f.width>b[0]&&(f.width=b[0],f.height=parseInt((f.width-n)/F+n,10)),f.height>b[1]&&(f.height=b[1],f.width=parseInt((f.height-n)*F+n,10))):(f.width=Math.min(f.width,b[0]),f.height=Math.min(f.height,b[1]));f.top=parseInt(Math.max(b[3]-20,b[3]+0.5*(b[1]-f.height-40)),10);f.left=parseInt(Math.max(b[2]-20,b[2]+0.5*(b[0]-f.width-40)),10);g=f;w=c.title||"";x=0;j.empty().removeAttr("style").removeClass(); -if(!1!==c.titleShow&&(w=a.isFunction(c.titleFormat)?c.titleFormat(w,k,r,c):w&&w.length?"float"==c.titlePosition?'
    '+w+'
    ':'
    '+w+"
    ":!1)&&""!==w)switch(j.addClass("fancybox-title-"+c.titlePosition).html(w).appendTo("body").show(),c.titlePosition){case "inside":j.css({width:g.width- -2*c.padding,marginLeft:c.padding,marginRight:c.padding});x=j.outerHeight(!0);j.appendTo(B);g.height+=x;break;case "over":j.css({marginLeft:c.padding,width:g.width-2*c.padding,bottom:c.padding}).appendTo(B);break;case "float":j.css("left",-1*parseInt((j.width()-g.width-40)/2,10)).appendTo(e);break;default:j.css({width:g.width-2*c.padding,paddingLeft:c.padding,paddingRight:c.padding}).appendTo(e)}j.hide();e.is(":visible")?(a(C.add(y).add(z)).hide(),b=e.position(),t={top:b.top,left:b.left,width:e.width(), -height:e.height()},h=t.width==g.width&&t.height==g.height,m.fadeTo(c.changeFade,0.3,function(){var b=function(){m.html(p.contents()).fadeTo(c.changeFade,1,P)};a.event.trigger("fancybox-change");m.empty().removeAttr("filter").css({"border-width":c.padding,width:g.width-2*c.padding,height:d.autoDimensions?"auto":g.height-x-2*c.padding});h?b():(A.prop=0,a(A).animate({prop:1},{duration:c.changeSpeed,easing:c.easingChange,step:Q,complete:b}))})):(e.removeAttr("style"),m.css("border-width",c.padding),"elastic"== -c.transitionIn?(t=R(),m.html(p.contents()),e.show(),c.opacity&&(g.opacity=0),A.prop=0,a(A).animate({prop:1},{duration:c.speedIn,easing:c.easingIn,step:Q,complete:P})):("inside"==c.titlePosition&&0').appendTo(m);e.show();l=!1;a.fancybox.center();c.onComplete(k,r,c);var b,h;k.length-1>r&&(b=k[r+1].href,"undefined"!==typeof b&&b.match(H)&&(h=new Image,h.src=b));0b?0.5:b);e.css(a);m.css({width:a.width-2*c.padding,height:a.height-x*b-2*c.padding})},O=function(){return[a(window).width()-2*c.margin,a(window).height()-2*c.margin,a(document).scrollLeft()+c.margin,a(document).scrollTop()+c.margin]},R=function(){var b=d.orig?a(d.orig):!1,h={};b&&b.length?(h=b.offset(),h.top+=parseInt(b.css("paddingTop"),10)||0,h.left+=parseInt(b.css("paddingLeft"),10)||0,h.top+=parseInt(b.css("border-top-width"),10)||0,h.left+= -parseInt(b.css("border-left-width"),10)||0,h.width=b.width(),h.height=b.height(),h={width:h.width+2*c.padding,height:h.height+2*c.padding,top:h.top-c.padding-20,left:h.left-c.padding-20}):(b=O(),h={width:2*c.padding,height:2*c.padding,top:parseInt(b[3]+0.5*b[1],10),left:parseInt(b[2]+0.5*b[0],10)});return h},T=function(){u.is(":visible")?(a("div",u).css("top",-40*J+"px"),J=(J+1)%12):clearInterval(I)};a.fn.fancybox=function(b){if(!a(this).length)return this;a(this).data("fancybox",a.extend({},b,a.metadata? -a(this).metadata():{})).unbind("click.fb").bind("click.fb",function(b){b.preventDefault();l||(l=!0,a(this).blur(),q=[],s=0,b=a(this).attr("rel")||"",!b||""==b||"nofollow"===b?q.push(this):(q=a("a[rel="+b+"], area[rel="+b+"], img[rel="+b+"]"),s=q.index(this)),G())});return this};a.fancybox=function(b,c){var d;if(!l){l=!0;d="undefined"!==typeof c?c:{};q=[];s=parseInt(d.index,10)||0;if(a.isArray(b)){for(var e=0,g=b.length;eq.length||0>s)s=0;G()}};a.fancybox.showActivity=function(){clearInterval(I);u.show();I=setInterval(T,66)};a.fancybox.hideActivity=function(){u.hide()};a.fancybox.next=function(){return a.fancybox.pos(r+1)};a.fancybox.prev=function(){return a.fancybox.pos(r-1)};a.fancybox.pos=function(b){l||(b=parseInt(b), -q=k,-1=k.length?0:k.length-1,G()))};a.fancybox.cancel=function(){l||(l=!0,a.event.trigger("fancybox-cancel"),L(),d.onCancel(q,s,d),l=!1)};a.fancybox.close=function(){function b(){v.fadeOut("fast");j.empty().hide();e.hide();a.event.trigger("fancybox-cleanup");m.empty();c.onClosed(k,r,c);k=d=[];r=s=0;c=d={};l=!1}if(!l&&!e.is(":hidden"))if(l=!0,c&&!1===c.onCleanup(k,r,c))l=!1;else if(L(),a(C.add(y).add(z)).hide(),a(m.add(v)).unbind(),a(window).unbind("resize.fb scroll.fb"), -a(document).unbind("keydown.fb"),m.find("iframe").attr("src",K&&/^https/i.test(window.location.href||"")?"javascript:void(false)":"about:blank"),"inside"!==c.titlePosition&&j.empty(),e.stop(),"elastic"==c.transitionOut){t=R();var h=e.position();g={top:h.top,left:h.left,width:e.width(),height:e.height()};c.opacity&&(g.opacity=1);j.empty().hide();A.prop=1;a(A).animate({prop:0},{duration:c.speedOut,easing:c.easingOut,step:Q,complete:b})}else e.fadeOut("none"==c.transitionOut?0:c.speedOut,b)};a.fancybox.resize= -function(){v.is(":visible")&&v.css("height",a(document).height());a.fancybox.center(!0)};a.fancybox.center=function(b){var a,d;if(!l&&(d=!0===b?1:0,a=O(),d||!(e.width()>a[0]||e.height()>a[1])))e.stop().animate({top:parseInt(Math.max(a[3]-20,a[3]+0.5*(a[1]-m.height()-40)-c.padding)),left:parseInt(Math.max(a[2]-20,a[2]+0.5*(a[0]-m.width()-40)-c.padding))},"number"==typeof b?b:200)};a.fancybox.init=function(){a("#fancybox-wrap").length||(a("body").append(p=a('
    '),u=a('
    '), -v=a('
    '),e=a('
    ')),B=a('
    ').append('
    ').appendTo(e), -B.append(m=a('
    '),C=a(''),j=a('
    '),y=a(''),z=a('')),C.click(a.fancybox.close),u.click(a.fancybox.cancel),y.click(function(b){b.preventDefault();a.fancybox.prev()}),z.click(function(b){b.preventDefault();a.fancybox.next()}), -a.fn.mousewheel&&e.bind("mousewheel.fb",function(b,c){if(l)b.preventDefault();else if(0==a(b.target).get(0).clientHeight||a(b.target).get(0).scrollHeight===a(b.target).get(0).clientHeight)b.preventDefault(),a.fancybox[0').prependTo(B)))}; -a.fn.fancybox.defaults={padding:10,margin:40,opacity:!1,modal:!1,cyclic:!1,scrolling:"auto",width:560,height:340,autoScale:!0,autoDimensions:!0,centerOnScroll:!1,ajax:{},swf:{wmode:"transparent"},hideOnOverlayClick:!0,hideOnContentClick:!1,overlayShow:!0,overlayOpacity:0.7,overlayColor:"#777",titleShow:!0,titlePosition:"float",titleFormat:null,titleFromAlt:!1,transitionIn:"fade",transitionOut:"fade",speedIn:300,speedOut:300,changeSpeed:300,changeFade:"fast",easingIn:"swing",easingOut:"swing",showCloseButton:!0, -showNavArrows:!0,enableEscapeButton:!0,enableKeyboardNav:!0,onStart:function(){},onCancel:function(){},onComplete:function(){},onCleanup:function(){},onClosed:function(){},onError:function(){}};a(document).ready(function(){a.fancybox.init()})})(jQuery); - - - /* - * TipTip - * Copyright 2010 Drew Wilson - * www.drewwilson.com - * code.drewwilson.com/entry/tiptip-jquery-plugin - * - * Version 1.3 - Updated: Mar. 23, 2010 - * - * This Plug-In will create a custom tooltip to replace the default - * browser tooltip. It is extremely lightweight and very smart in - * that it detects the edges of the browser window and will make sure - * the tooltip stays within the current window size. As a result the - * tooltip will adjust itself to be displayed above, below, to the left - * or to the right depending on what is necessary to stay within the - * browser window. It is completely customizable as well via CSS. - * - * This TipTip jQuery plug-in is dual licensed under the MIT and GPL licenses: - * http://www.opensource.org/licenses/mit-license.php - * http://www.gnu.org/licenses/gpl.html - */ -(function($){$.fn.tipTip=function(options){var defaults={activation:"hover",keepAlive:false,maxWidth:"200px",edgeOffset:3,defaultPosition:"bottom",delay:400,fadeIn:200,fadeOut:200,attribute:"title",content:false,enter:function(){},exit:function(){}};var opts=$.extend(defaults,options);if($("#tiptip_holder").length<=0){var tiptip_holder=$('
    ');var tiptip_content=$('
    ');var tiptip_arrow=$('
    ');$("body").append(tiptip_holder.html(tiptip_content).prepend(tiptip_arrow.html('
    ')))}else{var tiptip_holder=$("#tiptip_holder");var tiptip_content=$("#tiptip_content");var tiptip_arrow=$("#tiptip_arrow")}return this.each(function(){var org_elem=$(this);if(opts.content){var org_title=opts.content}else{var org_title=org_elem.attr(opts.attribute)}if(org_title!=""){if(!opts.content){org_elem.removeAttr(opts.attribute)}var timeout=false;if(opts.activation=="hover"){org_elem.hover(function(){active_tiptip()},function(){if(!opts.keepAlive){deactive_tiptip()}});if(opts.keepAlive){tiptip_holder.hover(function(){},function(){deactive_tiptip()})}}else if(opts.activation=="focus"){org_elem.focus(function(){active_tiptip()}).blur(function(){deactive_tiptip()})}else if(opts.activation=="click"){org_elem.click(function(){active_tiptip();return false}).hover(function(){},function(){if(!opts.keepAlive){deactive_tiptip()}});if(opts.keepAlive){tiptip_holder.hover(function(){},function(){deactive_tiptip()})}}function active_tiptip(){opts.enter.call(this);tiptip_content.html(org_title);tiptip_holder.hide().removeAttr("class").css("margin","0");tiptip_arrow.removeAttr("style");var top=parseInt(org_elem.offset()['top']);var left=parseInt(org_elem.offset()['left']);var org_width=parseInt(org_elem.outerWidth());var org_height=parseInt(org_elem.outerHeight());var tip_w=tiptip_holder.outerWidth();var tip_h=tiptip_holder.outerHeight();var w_compare=Math.round((org_width-tip_w)/2);var h_compare=Math.round((org_height-tip_h)/2);var marg_left=Math.round(left+w_compare);var marg_top=Math.round(top+org_height+opts.edgeOffset);var t_class="";var arrow_top="";var arrow_left=Math.round(tip_w-12)/2;if(opts.defaultPosition=="bottom"){t_class="_bottom"}else if(opts.defaultPosition=="top"){t_class="_top"}else if(opts.defaultPosition=="left"){t_class="_left"}else if(opts.defaultPosition=="right"){t_class="_right"}var right_compare=(w_compare+left)parseInt($(window).width());if((right_compare&&w_compare<0)||(t_class=="_right"&&!left_compare)||(t_class=="_left"&&left<(tip_w+opts.edgeOffset+5))){t_class="_right";arrow_top=Math.round(tip_h-13)/2;arrow_left=-12;marg_left=Math.round(left+org_width+opts.edgeOffset);marg_top=Math.round(top+h_compare)}else if((left_compare&&w_compare<0)||(t_class=="_left"&&!right_compare)){t_class="_left";arrow_top=Math.round(tip_h-13)/2;arrow_left=Math.round(tip_w);marg_left=Math.round(left-(tip_w+opts.edgeOffset+5));marg_top=Math.round(top+h_compare)}var top_compare=(top+org_height+opts.edgeOffset+tip_h+8)>parseInt($(window).height()+$(window).scrollTop());var bottom_compare=((top+org_height)-(opts.edgeOffset+tip_h+8))<0;if(top_compare||(t_class=="_bottom"&&top_compare)||(t_class=="_top"&&!bottom_compare)){if(t_class=="_top"||t_class=="_bottom"){t_class="_top"}else{t_class=t_class+"_top"}arrow_top=tip_h;marg_top=Math.round(top-(tip_h+5+opts.edgeOffset))}else if(bottom_compare|(t_class=="_top"&&bottom_compare)||(t_class=="_bottom"&&!top_compare)){if(t_class=="_top"||t_class=="_bottom"){t_class="_bottom"}else{t_class=t_class+"_bottom"}arrow_top=-12;marg_top=Math.round(top+org_height+opts.edgeOffset)}if(t_class=="_right_top"||t_class=="_left_top"){marg_top=marg_top+5}else if(t_class=="_right_bottom"||t_class=="_left_bottom"){marg_top=marg_top-5}if(t_class=="_left_top"||t_class=="_left_bottom"){marg_left=marg_left+5}tiptip_arrow.css({"margin-left":arrow_left+"px","margin-top":arrow_top+"px"});tiptip_holder.css({"margin-left":marg_left+"px","margin-top":marg_top+"px"}).attr("class","tip"+t_class);if(timeout){clearTimeout(timeout)}timeout=setTimeout(function(){tiptip_holder.stop(true,true).fadeIn(opts.fadeIn)},opts.delay)}function deactive_tiptip(){opts.exit.call(this);if(timeout){clearTimeout(timeout)}tiptip_holder.fadeOut(opts.fadeOut)}}})}})(jQuery); - -/* TINY SORT */ -(function(e){var a=false,g=null,f=parseFloat,b=/(\d+\.?\d*)$/g;e.tinysort={id:"TinySort",version:"1.2.18",copyright:"Copyright (c) 2008-2012 Ron Valstar",uri:"http://tinysort.sjeiti.com/",licenced:{MIT:"http://www.opensource.org/licenses/mit-license.php",GPL:"http://www.gnu.org/licenses/gpl.html"},defaults:{order:"asc",attr:g,data:g,useVal:a,place:"start",returns:a,cases:a,forceStrings:a,sortFunction:g}};e.fn.extend({tinysort:function(m,h){if(m&&typeof(m)!="string"){h=m;m=g}var n=e.extend({},e.tinysort.defaults,h),s,B=this,x=e(this).length,C={},p=!(!m||m==""),q=!(n.attr===g||n.attr==""),w=n.data!==g,j=p&&m[0]==":",k=j?B.filter(m):B,r=n.sortFunction,v=n.order=="asc"?1:-1,l=[];if(!r){r=n.order=="rand"?function(){return Math.random()<0.5?1:-1}:function(F,E){var i=!n.cases?d(F.s):F.s,K=!n.cases?d(E.s):E.s;if(!n.forceStrings){var H=i.match(b),G=K.match(b);if(H&&G){var J=i.substr(0,i.length-H[0].length),I=K.substr(0,K.length-G[0].length);if(J==I){i=f(H[0]);K=f(G[0])}}}return v*(iK?1:0))}}B.each(function(G,H){var I=e(H),E=p?(j?k.filter(H):I.find(m)):I,J=w?E.data(n.data):(q?E.attr(n.attr):(n.useVal?E.val():E.text())),F=I.parent();if(!C[F]){C[F]={s:[],n:[]}}if(E.length>0){C[F].s.push({s:J,e:I,n:G})}else{C[F].n.push({e:I,n:G})}});for(s in C){C[s].s.sort(r)}for(s in C){var y=C[s],A=[],D=x,u=[0,0],z;switch(n.place){case"first":e.each(y.s,function(E,F){D=Math.min(D,F.n)});break;case"org":e.each(y.s,function(E,F){A.push(F.n)});break;case"end":D=y.n.length;break;default:D=0}for(z=0;z=D&&z
    ').parent('.fluid-width-video-wrapper').css('padding-top', (aspectRatio * 100)+"%"); - $this.removeAttr('height').removeAttr('width'); - }); - }); - }; -})( jQuery ); - - -/** - * BxSlider v4.0 - Fully loaded, responsive content slider - * http://bxslider.com - * - * Copyright 2012, Steven Wanderski - http://stevenwanderski.com - http://bxcreative.com - * Written while drinking Belgian ales and listening to jazz - * - * Released under the WTFPL license - http://sam.zoy.org/wtfpl/ - */ -(function(t){var e={},n={mode:"horizontal",slideSelector:"",infiniteLoop:!0,hideControlOnEnd:!1,speed:500,easing:null,slideMargin:0,startSlide:0,randomStart:!1,captions:!1,ticker:!1,tickerHover:!1,adaptiveHeight:!1,adaptiveHeightSpeed:500,touchEnabled:!0,swipeThreshold:50,video:!1,useCSS:!0,pager:!0,pagerType:"full",pagerShortSeparator:" / ",pagerSelector:null,buildPager:null,pagerCustom:null,controls:!0,nextText:"Next",prevText:"Prev",nextSelector:null,prevSelector:null,autoControls:!1,startText:"Start",stopText:"Stop",autoControlsCombine:!1,autoControlsSelector:null,auto:!1,pause:4e3,autoStart:!0,autoDirection:"next",autoHover:!1,autoDelay:0,minSlides:1,maxSlides:1,moveSlides:0,slideWidth:0,onSliderLoad:function(){},onSlideBefore:function(){},onSlideAfter:function(){},onSlideNext:function(){},onSlidePrev:function(){}};t.fn.bxSlider=function(s){if(0!=this.length){if(this.length>1)return this.each(function(){t(this).bxSlider(s)}),this;var o={},r=this;e.el=this;var a=t(window).width(),l=t(window).height(),d=function(){o.settings=t.extend({},n,s),o.children=r.children(o.settings.slideSelector),o.children.length1||o.settings.maxSlides>1,o.minThreshold=o.settings.minSlides*o.settings.slideWidth+(o.settings.minSlides-1)*o.settings.slideMargin,o.maxThreshold=o.settings.maxSlides*o.settings.slideWidth+(o.settings.maxSlides-1)*o.settings.slideMargin,o.working=!1,o.controls={},o.interval=null,o.animProp="vertical"==o.settings.mode?"top":"left",o.usingCSS=o.settings.useCSS&&"fade"!=o.settings.mode&&function(){var t=document.createElement("div"),e=["WebkitPerspective","MozPerspective","OPerspective","msPerspective"];for(var i in e)if(void 0!==t.style[e[i]])return o.cssPrefix=e[i].replace("Perspective","").toLowerCase(),o.animProp="-"+o.cssPrefix+"-transform",!0;return!1}(),"vertical"==o.settings.mode&&(o.settings.maxSlides=o.settings.minSlides),c()},c=function(){if(r.wrap('
    '),o.viewport=r.parent(),o.loader=t('
    '),o.viewport.prepend(o.loader),r.css({width:"horizontal"==o.settings.mode?215*o.children.length+"%":"auto",position:"relative"}),o.usingCSS&&o.settings.easing?r.css("-"+o.cssPrefix+"-transition-timing-function",o.settings.easing):o.settings.easing||(o.settings.easing="swing"),o.viewport.css({width:"100%",overflow:"hidden",position:"relative"}),o.children.css({"float":"horizontal"==o.settings.mode?"left":"none",listStyle:"none",position:"relative"}),o.children.width(h()),"horizontal"==o.settings.mode&&o.settings.slideMargin>0&&o.children.css("marginRight",o.settings.slideMargin),"vertical"==o.settings.mode&&o.settings.slideMargin>0&&o.children.css("marginBottom",o.settings.slideMargin),"fade"==o.settings.mode&&(o.children.css({position:"absolute",zIndex:0,display:"none"}),o.children.eq(o.settings.startSlide).css({zIndex:50,display:"block"})),o.controls.el=t('
    '),o.settings.captions&&T(),o.settings.infiniteLoop&&"fade"!=o.settings.mode&&!o.settings.ticker){var e="vertical"==o.settings.mode?o.settings.minSlides:o.settings.maxSlides,i=o.children.slice(0,e).clone().addClass("bx-clone"),n=o.children.slice(-e).clone().addClass("bx-clone");r.append(i).prepend(n)}o.active.last=o.settings.startSlide==v()-1,o.settings.video&&r.fitVids(),o.settings.ticker||(o.settings.pager&&S(),o.settings.controls&&b(),o.settings.auto&&o.settings.autoControls&&w(),(o.settings.controls||o.settings.autoControls||o.settings.pager)&&o.viewport.after(o.controls.el)),r.children().imagesLoaded(function(){o.loader.remove(),f(),"vertical"==o.settings.mode&&(o.settings.adaptiveHeight=!0),o.viewport.height(g()),o.settings.onSliderLoad(o.active.index),o.initialized=!0,t(window).bind("resize",O),o.settings.auto&&o.settings.autoStart&&L(),o.settings.ticker&&D(),o.settings.pager&&y(o.settings.startSlide),o.settings.controls&&q(),o.settings.touchEnabled&&!o.settings.ticker&&H()})},g=function(){var e=0,n=t();if("vertical"==o.settings.mode||o.settings.adaptiveHeight)if(o.carousel){var s=1==o.settings.moveSlides?o.active.index:o.active.index*p();for(n=o.children.eq(s),i=1;o.settings.maxSlides-1>=i;i++)n=s+i>=o.children.length?n.add(o.children.eq(i-1)):n.add(o.children.eq(s+i))}else n=o.children.eq(o.active.index);else n=o.children;return"vertical"==o.settings.mode?(n.each(function(){e+=t(this).outerHeight()}),o.settings.slideMargin>0&&(e+=o.settings.slideMargin*(o.settings.minSlides-1))):e=Math.max.apply(Math,n.map(function(){return t(this).outerHeight(!1)}).get()),e},h=function(){var t=o.settings.slideWidth,e=o.viewport.width();return 0==o.settings.slideWidth?t=e:e>o.maxThreshold?t=(e-o.settings.slideMargin*(o.settings.maxSlides-1))/o.settings.maxSlides:o.minThreshold>e&&(t=(e-o.settings.slideMargin*(o.settings.minSlides-1))/o.settings.minSlides),t},u=function(){var t=1;if("horizontal"==o.settings.mode)if(o.viewport.width()o.maxThreshold)t=o.settings.maxSlides;else{var e=o.children.first().width();t=Math.floor(o.viewport.width()/e)}else"vertical"==o.settings.mode&&(t=o.settings.minSlides);return t},v=function(){var t=0;if(o.settings.moveSlides>0)if(o.settings.infiniteLoop)t=o.children.length/p();else for(var e=0,i=0;o.children.length>e;)++t,e=i+u(),i+=o.settings.moveSlides<=u()?o.settings.moveSlides:u();else t=Math.ceil(o.children.length/u());return t},p=function(){return o.settings.moveSlides>0&&o.settings.moveSlides<=u()?o.settings.moveSlides:u()},f=function(){if(o.active.last&&!o.settings.infiniteLoop){if("horizontal"==o.settings.mode){var t=o.children.last(),e=t.position();x(-(e.left-(o.viewport.width()-t.width())),"reset",0)}else if("vertical"==o.settings.mode){var i=o.children.length-o.settings.minSlides,e=o.children.eq(i).position();x(-e.top,"reset",0)}}else{var e=o.children.eq(o.active.index*p()).position();o.active.index==v()-1&&(o.active.last=!0),void 0!=e&&("horizontal"==o.settings.mode?x(-e.left,"reset",0):"vertical"==o.settings.mode&&x(-e.top,"reset",0))}},x=function(t,e,i,n){if(o.usingCSS){var s="vertical"==o.settings.mode?"translate3d(0, "+t+"px, 0)":"translate3d("+t+"px, 0, 0)";r.css("-"+o.cssPrefix+"-transition-duration",i/1e3+"s"),"slide"==e?(r.css(o.animProp,s),r.bind("transitionend webkitTransitionEnd oTransitionEnd MSTransitionEnd",function(){r.unbind("transitionend webkitTransitionEnd oTransitionEnd MSTransitionEnd"),z()})):"reset"==e?r.css(o.animProp,s):"ticker"==e&&(r.css("-"+o.cssPrefix+"-transition-timing-function","linear"),r.css(o.animProp,s),r.bind("transitionend webkitTransitionEnd oTransitionEnd MSTransitionEnd",function(){r.unbind("transitionend webkitTransitionEnd oTransitionEnd MSTransitionEnd"),x(n.resetValue,"reset",0),I()}))}else{var a={};a[o.animProp]=t,"slide"==e?r.animate(a,i,o.settings.easing,function(){z()}):"reset"==e?r.css(o.animProp,t):"ticker"==e&&r.animate(a,speed,"linear",function(){x(n.resetValue,"reset",0),I()})}},m=function(){var e="";pagerQty=v();for(var i=0;pagerQty>i;i++){var n="";o.settings.buildPager&&t.isFunction(o.settings.buildPager)?(n=o.settings.buildPager(i),o.pagerEl.addClass("bx-custom-pager")):(n=i+1,o.pagerEl.addClass("bx-default-pager")),e+='
    '+n+"
    "}o.pagerEl.html(e)},S=function(){o.settings.pagerCustom?o.pagerEl=t(o.settings.pagerCustom):(o.pagerEl=t('
    '),o.settings.pagerSelector?t(o.settings.pagerSelector).html(o.pagerEl):o.controls.el.addClass("bx-has-pager").append(o.pagerEl),m()),o.pagerEl.delegate("a","click",k)},b=function(){o.controls.next=t(''+o.settings.nextText+""),o.controls.prev=t(''+o.settings.prevText+""),o.controls.next.bind("click",C),o.controls.prev.bind("click",E),o.settings.nextSelector&&t(o.settings.nextSelector).append(o.controls.next),o.settings.prevSelector&&t(o.settings.prevSelector).append(o.controls.prev),o.settings.nextSelector||o.settings.prevSelector||(o.controls.directionEl=t('
    '),o.controls.directionEl.append(o.controls.prev).append(o.controls.next),o.controls.el.addClass("bx-has-controls-direction").append(o.controls.directionEl))},w=function(){o.controls.start=t('
    '+o.settings.startText+"
    "),o.controls.stop=t('
    '+o.settings.stopText+"
    "),o.controls.autoEl=t('
    '),o.controls.autoEl.delegate(".bx-start","click",A),o.controls.autoEl.delegate(".bx-stop","click",P),o.settings.autoControlsCombine?o.controls.autoEl.append(o.controls.start):o.controls.autoEl.append(o.controls.start).append(o.controls.stop),o.settings.autoControlsSelector?t(o.settings.autoControlsSelector).html(o.controls.autoEl):o.controls.el.addClass("bx-has-controls-auto").append(o.controls.autoEl),M(o.settings.autoStart?"stop":"start")},T=function(){o.children.each(function(){var e=t(this).find("img:first").attr("title");void 0!=e&&t(this).append('
    '+e+"
    ")})},C=function(t){o.settings.auto&&r.stopAuto(),r.goToNextSlide(),t.preventDefault()},E=function(t){o.settings.auto&&r.stopAuto(),r.goToPrevSlide(),t.preventDefault()},A=function(t){r.startAuto(),t.preventDefault()},P=function(t){r.stopAuto(),t.preventDefault()},k=function(e){o.settings.auto&&r.stopAuto();var i=t(e.currentTarget),n=parseInt(i.attr("data-slide-index"));n!=o.active.index&&r.goToSlide(n),e.preventDefault()},y=function(e){return"short"==o.settings.pagerType?(o.pagerEl.html(e+1+o.settings.pagerShortSeparator+o.children.length),void 0):(o.pagerEl.find("a").removeClass("active"),o.pagerEl.each(function(i,n){t(n).find("a").eq(e).addClass("active")}),void 0)},z=function(){if(o.settings.infiniteLoop){var t="";0==o.active.index?t=o.children.eq(0).position():o.active.index==v()-1&&o.carousel?t=o.children.eq((v()-1)*p()).position():o.active.index==o.children.length-1&&(t=o.children.eq(o.children.length-1).position()),"horizontal"==o.settings.mode?x(-t.left,"reset",0):"vertical"==o.settings.mode&&x(-t.top,"reset",0)}o.working=!1,o.settings.onSlideAfter(o.children.eq(o.active.index),o.oldIndex,o.active.index)},M=function(t){o.settings.autoControlsCombine?o.controls.autoEl.html(o.controls[t]):(o.controls.autoEl.find("a").removeClass("active"),o.controls.autoEl.find("a:not(.bx-"+t+")").addClass("active"))},q=function(){!o.settings.infiniteLoop&&o.settings.hideControlOnEnd&&(0==o.active.index?(o.controls.prev.addClass("disabled"),o.controls.next.removeClass("disabled")):o.active.index==v()-1?(o.controls.next.addClass("disabled"),o.controls.prev.removeClass("disabled")):(o.controls.prev.removeClass("disabled"),o.controls.next.removeClass("disabled")))},L=function(){o.settings.autoDelay>0?setTimeout(r.startAuto,o.settings.autoDelay):r.startAuto(),o.settings.autoHover&&r.hover(function(){o.interval&&(r.stopAuto(!0),o.autoPaused=!0)},function(){o.autoPaused&&(r.startAuto(!0),o.autoPaused=null)})},D=function(){var e=0;if("next"==o.settings.autoDirection)r.append(o.children.clone().addClass("bx-clone"));else{r.prepend(o.children.clone().addClass("bx-clone"));var i=o.children.first().position();e="horizontal"==o.settings.mode?-i.left:-i.top}x(e,"reset",0),o.settings.pager=!1,o.settings.controls=!1,o.settings.autoControls=!1,o.settings.tickerHover&&!o.usingCSS&&o.viewport.hover(function(){r.stop()},function(){var e=0;o.children.each(function(){e+="horizontal"==o.settings.mode?t(this).outerWidth(!0):t(this).outerHeight(!0)});var i=o.settings.speed/e,n="horizontal"==o.settings.mode?"left":"top",s=i*(e-Math.abs(parseInt(r.css(n))));I(s)}),I()},I=function(t){speed=t?t:o.settings.speed;var e={left:0,top:0},i={left:0,top:0};"next"==o.settings.autoDirection?e=r.find(".bx-clone").first().position():i=o.children.first().position();var n="horizontal"==o.settings.mode?-e.left:-e.top,s="horizontal"==o.settings.mode?-i.left:-i.top,a={resetValue:s};x(n,"ticker",speed,a)},H=function(){o.touch={start:{x:0,y:0},end:{x:0,y:0}},o.viewport.bind("touchstart",W)},W=function(t){if(o.working)t.preventDefault();else{o.touch.originalPos=r.position();var e=t.originalEvent;o.touch.start.x=e.changedTouches[0].pageX,o.touch.start.y=e.changedTouches[0].pageY,o.viewport.bind("touchmove",N),o.viewport.bind("touchend",B)}},N=function(t){if(t.preventDefault(),"fade"!=o.settings.mode){var e=t.originalEvent,i=0;if("horizontal"==o.settings.mode){var n=e.changedTouches[0].pageX-o.touch.start.x;i=o.touch.originalPos.left+n}else{var n=e.changedTouches[0].pageY-o.touch.start.y;i=o.touch.originalPos.top+n}x(i,"reset",0)}},B=function(t){o.viewport.unbind("touchmove",N);var e=t.originalEvent,i=0;if(o.touch.end.x=e.changedTouches[0].pageX,o.touch.end.y=e.changedTouches[0].pageY,"fade"==o.settings.mode){var n=Math.abs(o.touch.start.x-o.touch.end.x);n>=o.settings.swipeThreshold&&(o.touch.start.x>o.touch.end.x?r.goToNextSlide():r.goToPrevSlide(),r.stopAuto())}else{var n=0;"horizontal"==o.settings.mode?(n=o.touch.end.x-o.touch.start.x,i=o.touch.originalPos.left):(n=o.touch.end.y-o.touch.start.y,i=o.touch.originalPos.top),!o.settings.infiniteLoop&&(0==o.active.index&&n>0||o.active.last&&0>n)?x(i,"reset",200):Math.abs(n)>=o.settings.swipeThreshold?(0>n?r.goToNextSlide():r.goToPrevSlide(),r.stopAuto()):x(i,"reset",200)}o.viewport.unbind("touchend",B)},O=function(){var e=t(window).width(),i=t(window).height();(a!=e||l!=i)&&(a=e,l=i,o.children.add(r.find(".bx-clone")).width(h()),o.viewport.css("height",g()),o.active.last&&(o.active.index=v()-1),o.active.index>=v()&&(o.active.last=!0),o.settings.pager&&!o.settings.pagerCustom&&(m(),y(o.active.index)),o.settings.ticker||f())};return r.goToSlide=function(e,i){if(!o.working&&o.active.index!=e)if(o.working=!0,o.oldIndex=o.active.index,o.active.index=0>e?v()-1:e>=v()?0:e,o.settings.onSlideBefore(o.children.eq(o.active.index),o.oldIndex,o.active.index),"next"==i?o.settings.onSlideNext(o.children.eq(o.active.index),o.oldIndex,o.active.index):"prev"==i&&o.settings.onSlidePrev(o.children.eq(o.active.index),o.oldIndex,o.active.index),o.active.last=o.active.index>=v()-1,o.settings.pager&&y(o.active.index),o.settings.controls&&q(),"fade"==o.settings.mode)o.settings.adaptiveHeight&&o.viewport.height()!=g()&&o.viewport.animate({height:g()},o.settings.adaptiveHeightSpeed),o.children.filter(":visible").fadeOut(o.settings.speed).css({zIndex:0}),o.children.eq(o.active.index).css("zIndex",51).fadeIn(o.settings.speed,function(){t(this).css("zIndex",50),z()});else{o.settings.adaptiveHeight&&o.viewport.height()!=g()&&o.viewport.animate({height:g()},o.settings.adaptiveHeightSpeed);var n=0,s={left:0,top:0};if(!o.settings.infiniteLoop&&o.carousel&&o.active.last)if("horizontal"==o.settings.mode){var a=o.children.eq(o.children.length-1);s=a.position(),n=o.viewport.width()-a.width()}else{var l=o.children.length-o.settings.minSlides;s=o.children.eq(l).position()}else if(o.carousel&&o.active.last&&"prev"==i){var d=1==o.settings.moveSlides?o.settings.maxSlides-p():(v()-1)*p()-(o.children.length-o.settings.maxSlides),a=r.children(".bx-clone").eq(d);s=a.position()}else if("next"==i&&0==o.active.index)s=r.find(".bx-clone").eq(o.settings.maxSlides).position(),o.active.last=!1;else if(e>=0){var c=e*p();s=o.children.eq(c).position()}var h="horizontal"==o.settings.mode?-(s.left-n):-s.top;x(h,"slide",o.settings.speed)}},r.goToNextSlide=function(){if(o.settings.infiniteLoop||!o.active.last){var t=o.active.index+1;r.goToSlide(t,"next")}},r.goToPrevSlide=function(){if(o.settings.infiniteLoop||0!=o.active.index){var t=o.active.index-1;r.goToSlide(t,"prev")}},r.startAuto=function(t){o.interval||(o.interval=setInterval(function(){"next"==o.settings.autoDirection?r.goToNextSlide():r.goToPrevSlide()},o.settings.pause),o.settings.autoControls&&1!=t&&M("stop"))},r.stopAuto=function(t){o.interval&&(clearInterval(o.interval),o.interval=null,o.settings.autoControls&&1!=t&&M("start"))},r.getCurrentSlide=function(){return o.active.index},r.getSlideCount=function(){return o.children.length},r.destroySlider=function(){o.initialized&&(o.initialized=!1,t(".bx-clone",this).remove(),o.children.removeAttr("style"),this.removeAttr("style").unwrap().unwrap(),o.controls.el&&o.controls.el.remove(),o.controls.next&&o.controls.next.remove(),o.controls.prev&&o.controls.prev.remove(),o.pagerEl&&o.pagerEl.remove(),t(".bx-caption",this).remove(),o.controls.autoEl&&o.controls.autoEl.remove(),clearInterval(o.interval),t(window).unbind("resize",O))},r.reloadSlider=function(t){void 0!=t&&(s=t),r.destroySlider(),d()},d(),this}}})(jQuery),function(t,e){var i="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///ywAAAAAAQABAAACAUwAOw==";t.fn.imagesLoaded=function(n){function s(){var e=t(g),i=t(h);a&&(h.length?a.reject(d,e,i):a.resolve(d)),t.isFunction(n)&&n.call(r,d,e,i)}function o(e,n){e.src===i||-1!==t.inArray(e,c)||(c.push(e),n?h.push(e):g.push(e),t.data(e,"imagesLoaded",{isBroken:n,src:e.src}),l&&a.notifyWith(t(e),[n,d,t(g),t(h)]),d.length===c.length&&(setTimeout(s),d.unbind(".imagesLoaded")))}var r=this,a=t.isFunction(t.Deferred)?t.Deferred():0,l=t.isFunction(a.notify),d=r.find("img").add(r.filter("img")),c=[],g=[],h=[];return t.isPlainObject(n)&&t.each(n,function(t,e){"callback"===t?n=e:a&&a[t](e)}),d.length?d.bind("load.imagesLoaded error.imagesLoaded",function(t){o(t.target,"error"===t.type)}).each(function(n,s){var r=s.src,a=t.data(s,"imagesLoaded");a&&a.src===r?o(s,a.isBroken):s.complete&&s.naturalWidth!==e?o(s,0===s.naturalWidth||0===s.naturalHeight):(s.readyState||s.complete)&&(s.src=i,s.src=r)}):s(),a?a.promise(r):r}}(jQuery); - - -/* - Prettify JS -*/ -var q=null;window.PR_SHOULD_USE_CONTINUATION=!0; -(function(){function L(a){function m(a){var f=a.charCodeAt(0);if(f!==92)return f;var b=a.charAt(1);return(f=r[b])?f:"0"<=b&&b<="7"?parseInt(a.substring(1),8):b==="u"||b==="x"?parseInt(a.substring(2),16):a.charCodeAt(1)}function e(a){if(a<32)return(a<16?"\\x0":"\\x")+a.toString(16);a=String.fromCharCode(a);if(a==="\\"||a==="-"||a==="["||a==="]")a="\\"+a;return a}function h(a){for(var f=a.substring(1,a.length-1).match(/\\u[\dA-Fa-f]{4}|\\x[\dA-Fa-f]{2}|\\[0-3][0-7]{0,2}|\\[0-7]{1,2}|\\[\S\s]|[^\\]/g),a= -[],b=[],o=f[0]==="^",c=o?1:0,i=f.length;c122||(d<65||j>90||b.push([Math.max(65,j)|32,Math.min(d,90)|32]),d<97||j>122||b.push([Math.max(97,j)&-33,Math.min(d,122)&-33]))}}b.sort(function(a,f){return a[0]-f[0]||f[1]-a[1]});f=[];j=[NaN,NaN];for(c=0;ci[0]&&(i[1]+1>i[0]&&b.push("-"),b.push(e(i[1])));b.push("]");return b.join("")}function y(a){for(var f=a.source.match(/\[(?:[^\\\]]|\\[\S\s])*]|\\u[\dA-Fa-f]{4}|\\x[\dA-Fa-f]{2}|\\\d+|\\[^\dux]|\(\?[!:=]|[()^]|[^()[\\^]+/g),b=f.length,d=[],c=0,i=0;c=2&&a==="["?f[c]=h(j):a!=="\\"&&(f[c]=j.replace(/[A-Za-z]/g,function(a){a=a.charCodeAt(0);return"["+String.fromCharCode(a&-33,a|32)+"]"}));return f.join("")}for(var t=0,s=!1,l=!1,p=0,d=a.length;p=5&&"lang-"===b.substring(0,5))&&!(o&&typeof o[1]==="string"))c=!1,b="src";c||(r[f]=b)}i=d;d+=f.length;if(c){c=o[1];var j=f.indexOf(c),k=j+c.length;o[2]&&(k=f.length-o[2].length,j=k-c.length);b=b.substring(5);B(l+i,f.substring(0,j),e,p);B(l+i+j,c,C(b,c),p);B(l+i+k,f.substring(k),e,p)}else p.push(l+i,b)}a.e=p}var h={},y;(function(){for(var e=a.concat(m), -l=[],p={},d=0,g=e.length;d=0;)h[n.charAt(k)]=r;r=r[1];n=""+r;p.hasOwnProperty(n)||(l.push(r),p[n]=q)}l.push(/[\S\s]/);y=L(l)})();var t=m.length;return e}function u(a){var m=[],e=[];a.tripleQuotedStrings?m.push(["str",/^(?:'''(?:[^'\\]|\\[\S\s]|''?(?=[^']))*(?:'''|$)|"""(?:[^"\\]|\\[\S\s]|""?(?=[^"]))*(?:"""|$)|'(?:[^'\\]|\\[\S\s])*(?:'|$)|"(?:[^"\\]|\\[\S\s])*(?:"|$))/,q,"'\""]):a.multiLineStrings?m.push(["str",/^(?:'(?:[^'\\]|\\[\S\s])*(?:'|$)|"(?:[^"\\]|\\[\S\s])*(?:"|$)|`(?:[^\\`]|\\[\S\s])*(?:`|$))/, -q,"'\"`"]):m.push(["str",/^(?:'(?:[^\n\r'\\]|\\.)*(?:'|$)|"(?:[^\n\r"\\]|\\.)*(?:"|$))/,q,"\"'"]);a.verbatimStrings&&e.push(["str",/^@"(?:[^"]|"")*(?:"|$)/,q]);var h=a.hashComments;h&&(a.cStyleComments?(h>1?m.push(["com",/^#(?:##(?:[^#]|#(?!##))*(?:###|$)|.*)/,q,"#"]):m.push(["com",/^#(?:(?:define|elif|else|endif|error|ifdef|include|ifndef|line|pragma|undef|warning)\b|[^\n\r]*)/,q,"#"]),e.push(["str",/^<(?:(?:(?:\.\.\/)*|\/?)(?:[\w-]+(?:\/[\w-]+)+)?[\w-]+\.h|[a-z]\w*)>/,q])):m.push(["com",/^#[^\n\r]*/, -q,"#"]));a.cStyleComments&&(e.push(["com",/^\/\/[^\n\r]*/,q]),e.push(["com",/^\/\*[\S\s]*?(?:\*\/|$)/,q]));a.regexLiterals&&e.push(["lang-regex",/^(?:^^\.?|[!+-]|!=|!==|#|%|%=|&|&&|&&=|&=|\(|\*|\*=|\+=|,|-=|->|\/|\/=|:|::|;|<|<<|<<=|<=|=|==|===|>|>=|>>|>>=|>>>|>>>=|[?@[^]|\^=|\^\^|\^\^=|{|\||\|=|\|\||\|\|=|~|break|case|continue|delete|do|else|finally|instanceof|return|throw|try|typeof)\s*(\/(?=[^*/])(?:[^/[\\]|\\[\S\s]|\[(?:[^\\\]]|\\[\S\s])*(?:]|$))+\/)/]);(h=a.types)&&e.push(["typ",h]);a=(""+a.keywords).replace(/^ | $/g, -"");a.length&&e.push(["kwd",RegExp("^(?:"+a.replace(/[\s,]+/g,"|")+")\\b"),q]);m.push(["pln",/^\s+/,q," \r\n\t\xa0"]);e.push(["lit",/^@[$_a-z][\w$@]*/i,q],["typ",/^(?:[@_]?[A-Z]+[a-z][\w$@]*|\w+_t\b)/,q],["pln",/^[$_a-z][\w$@]*/i,q],["lit",/^(?:0x[\da-f]+|(?:\d(?:_\d+)*\d*(?:\.\d*)?|\.\d\+)(?:e[+-]?\d+)?)[a-z]*/i,q,"0123456789"],["pln",/^\\[\S\s]?/,q],["pun",/^.[^\s\w"-$'./@\\`]*/,q]);return x(m,e)}function D(a,m){function e(a){switch(a.nodeType){case 1:if(k.test(a.className))break;if("BR"===a.nodeName)h(a), -a.parentNode&&a.parentNode.removeChild(a);else for(a=a.firstChild;a;a=a.nextSibling)e(a);break;case 3:case 4:if(p){var b=a.nodeValue,d=b.match(t);if(d){var c=b.substring(0,d.index);a.nodeValue=c;(b=b.substring(d.index+d[0].length))&&a.parentNode.insertBefore(s.createTextNode(b),a.nextSibling);h(a);c||a.parentNode.removeChild(a)}}}}function h(a){function b(a,d){var e=d?a.cloneNode(!1):a,f=a.parentNode;if(f){var f=b(f,1),g=a.nextSibling;f.appendChild(e);for(var h=g;h;h=g)g=h.nextSibling,f.appendChild(h)}return e} -for(;!a.nextSibling;)if(a=a.parentNode,!a)return;for(var a=b(a.nextSibling,0),e;(e=a.parentNode)&&e.nodeType===1;)a=e;d.push(a)}var k=/(?:^|\s)nocode(?:\s|$)/,t=/\r\n?|\n/,s=a.ownerDocument,l;a.currentStyle?l=a.currentStyle.whiteSpace:window.getComputedStyle&&(l=s.defaultView.getComputedStyle(a,q).getPropertyValue("white-space"));var p=l&&"pre"===l.substring(0,3);for(l=s.createElement("LI");a.firstChild;)l.appendChild(a.firstChild);for(var d=[l],g=0;g=0;){var h=m[e];A.hasOwnProperty(h)?window.console&&console.warn("cannot override language handler %s",h):A[h]=a}}function C(a,m){if(!a||!A.hasOwnProperty(a))a=/^\s*=o&&(h+=2);e>=c&&(a+=2)}}catch(w){"console"in window&&console.log(w&&w.stack?w.stack:w)}}var v=["break,continue,do,else,for,if,return,while"],w=[[v,"auto,case,char,const,default,double,enum,extern,float,goto,int,long,register,short,signed,sizeof,static,struct,switch,typedef,union,unsigned,void,volatile"], -"catch,class,delete,false,import,new,operator,private,protected,public,this,throw,true,try,typeof"],F=[w,"alignof,align_union,asm,axiom,bool,concept,concept_map,const_cast,constexpr,decltype,dynamic_cast,explicit,export,friend,inline,late_check,mutable,namespace,nullptr,reinterpret_cast,static_assert,static_cast,template,typeid,typename,using,virtual,where"],G=[w,"abstract,boolean,byte,extends,final,finally,implements,import,instanceof,null,native,package,strictfp,super,synchronized,throws,transient"], -H=[G,"as,base,by,checked,decimal,delegate,descending,dynamic,event,fixed,foreach,from,group,implicit,in,interface,internal,into,is,lock,object,out,override,orderby,params,partial,readonly,ref,sbyte,sealed,stackalloc,string,select,uint,ulong,unchecked,unsafe,ushort,var"],w=[w,"debugger,eval,export,function,get,null,set,undefined,var,with,Infinity,NaN"],I=[v,"and,as,assert,class,def,del,elif,except,exec,finally,from,global,import,in,is,lambda,nonlocal,not,or,pass,print,raise,try,with,yield,False,True,None"], -J=[v,"alias,and,begin,case,class,def,defined,elsif,end,ensure,false,in,module,next,nil,not,or,redo,rescue,retry,self,super,then,true,undef,unless,until,when,yield,BEGIN,END"],v=[v,"case,done,elif,esac,eval,fi,function,in,local,set,then,until"],K=/^(DIR|FILE|vector|(de|priority_)?queue|list|stack|(const_)?iterator|(multi)?(set|map)|bitset|u?(int|float)\d*)/,N=/\S/,O=u({keywords:[F,H,w,"caller,delete,die,do,dump,elsif,eval,exit,foreach,for,goto,if,import,last,local,my,next,no,our,print,package,redo,require,sub,undef,unless,until,use,wantarray,while,BEGIN,END"+ -I,J,v],hashComments:!0,cStyleComments:!0,multiLineStrings:!0,regexLiterals:!0}),A={};k(O,["default-code"]);k(x([],[["pln",/^[^]*(?:>|$)/],["com",/^<\!--[\S\s]*?(?:--\>|$)/],["lang-",/^<\?([\S\s]+?)(?:\?>|$)/],["lang-",/^<%([\S\s]+?)(?:%>|$)/],["pun",/^(?:<[%?]|[%?]>)/],["lang-",/^]*>([\S\s]+?)<\/xmp\b[^>]*>/i],["lang-js",/^]*>([\S\s]*?)(<\/script\b[^>]*>)/i],["lang-css",/^]*>([\S\s]*?)(<\/style\b[^>]*>)/i],["lang-in.tag",/^(<\/?[a-z][^<>]*>)/i]]), -["default-markup","htm","html","mxml","xhtml","xml","xsl"]);k(x([["pln",/^\s+/,q," \t\r\n"],["atv",/^(?:"[^"]*"?|'[^']*'?)/,q,"\"'"]],[["tag",/^^<\/?[a-z](?:[\w-.:]*\w)?|\/?>$/i],["atn",/^(?!style[\s=]|on)[a-z](?:[\w:-]*\w)?/i],["lang-uq.val",/^=\s*([^\s"'>]*(?:[^\s"'/>]|\/(?=\s)))/],["pun",/^[/<->]+/],["lang-js",/^on\w+\s*=\s*"([^"]+)"/i],["lang-js",/^on\w+\s*=\s*'([^']+)'/i],["lang-js",/^on\w+\s*=\s*([^\s"'>]+)/i],["lang-css",/^style\s*=\s*"([^"]+)"/i],["lang-css",/^style\s*=\s*'([^']+)'/i],["lang-css", -/^style\s*=\s*([^\s"'>]+)/i]]),["in.tag"]);k(x([],[["atv",/^[\S\s]+/]]),["uq.val"]);k(u({keywords:F,hashComments:!0,cStyleComments:!0,types:K}),["c","cc","cpp","cxx","cyc","m"]);k(u({keywords:"null,true,false"}),["json"]);k(u({keywords:H,hashComments:!0,cStyleComments:!0,verbatimStrings:!0,types:K}),["cs"]);k(u({keywords:G,cStyleComments:!0}),["java"]);k(u({keywords:v,hashComments:!0,multiLineStrings:!0}),["bsh","csh","sh"]);k(u({keywords:I,hashComments:!0,multiLineStrings:!0,tripleQuotedStrings:!0}), -["cv","py"]);k(u({keywords:"caller,delete,die,do,dump,elsif,eval,exit,foreach,for,goto,if,import,last,local,my,next,no,our,print,package,redo,require,sub,undef,unless,until,use,wantarray,while,BEGIN,END",hashComments:!0,multiLineStrings:!0,regexLiterals:!0}),["perl","pl","pm"]);k(u({keywords:J,hashComments:!0,multiLineStrings:!0,regexLiterals:!0}),["rb"]);k(u({keywords:w,cStyleComments:!0,regexLiterals:!0}),["js"]);k(u({keywords:"all,and,by,catch,class,else,extends,false,finally,for,if,in,is,isnt,loop,new,no,not,null,of,off,on,or,return,super,then,true,try,unless,until,when,while,yes", -hashComments:3,cStyleComments:!0,multilineStrings:!0,tripleQuotedStrings:!0,regexLiterals:!0}),["coffee"]);k(x([],[["str",/^[\S\s]+/]]),["regex"]);window.prettyPrintOne=function(a,m,e){var h=document.createElement("PRE");h.innerHTML=a;e&&D(h,e);E({g:m,i:e,h:h});return h.innerHTML};window.prettyPrint=function(a){function m(){for(var e=window.PR_SHOULD_USE_CONTINUATION?l.now()+250:Infinity;p=0){var k=k.match(g),f,b;if(b= -!k){b=n;for(var o=void 0,c=b.firstChild;c;c=c.nextSibling)var i=c.nodeType,o=i===1?o?b:c:i===3?N.test(c.nodeValue)?b:o:o;b=(f=o===b?void 0:o)&&"CODE"===f.tagName}b&&(k=f.className.match(g));k&&(k=k[1]);b=!1;for(o=n.parentNode;o;o=o.parentNode)if((o.tagName==="pre"||o.tagName==="code"||o.tagName==="xmp")&&o.className&&o.className.indexOf("prettyprint")>=0){b=!0;break}b||((b=(b=n.className.match(/\blinenums\b(?::(\d+))?/))?b[1]&&b[1].length?+b[1]:!0:!1)&&D(n,b),d={g:k,h:n,i:b},E(d))}}particle,aside,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}mark{background:#FF0;color:#000}"; -c=d.insertBefore(c.lastChild,d.firstChild);b.hasCSS=!!c}g||t(a,b);return a}var k=l.html5||{},s=/^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i,r=/^(?:a|b|code|div|fieldset|h1|h2|h3|h4|h5|h6|i|label|li|ol|p|q|span|strong|style|table|tbody|td|th|tr|ul)$/i,j,o="_html5shiv",h=0,n={},g;(function(){try{var a=f.createElement("a");a.innerHTML="";j="hidden"in a;var b;if(!(b=1==a.childNodes.length)){f.createElement("a");var c=f.createDocumentFragment();b="undefined"==typeof c.cloneNode|| -"undefined"==typeof c.createDocumentFragment||"undefined"==typeof c.createElement}g=b}catch(d){g=j=!0}})();var e={elements:k.elements||"abbr article aside audio bdi canvas data datalist details figcaption figure footer header hgroup main mark meter nav output progress section summary time video",version:"3.6.2pre",shivCSS:!1!==k.shivCSS,supportsUnknownElements:g,shivMethods:!1!==k.shivMethods,type:"default",shivDocument:q,createElement:p,createDocumentFragment:function(a,b){a||(a=f);if(g)return a.createDocumentFragment(); -for(var b=b||i(a),c=b.frag.cloneNode(),d=0,e=m(),h=e.length;d. + + +#====================================================================== +# Chicken build +#====================================================================== + +# CHICKEN_BIN_DIR=$(shell dirname $(shell which csi)) +# if have csi on path use that, else use default +# CSIPATH=$(shell which csi) +# CKPATH=$(shell dirname $(shell dirname $(CSIPATH))) +CHICKEN_PREFIX=$(or $(CKPATH),$(PREFIX)/bin/.$(ARCHSTR)) + +whatever : + @echo "CHICKEN_PREFIX=$(CHICKEN_PREFIX)" + +tgz-$(USER)/postgresql-9.6.4.tar.gz : + mkdir -p tgz-$(USER) + wget -c https://ftp.postgresql.org/pub/source/v9.6.4/postgresql-9.6.4.tar.gz + mv postgresql-9.6.4.tar.gz tgz-$(USER)/ + +tgz-$(USER)/sqlite-autoconf-3090200.tar.gz : + mkdir -p tgz-$(USER) + curl http://www.sqlite.org/2015/sqlite-autoconf-3090200.tar.gz > tgz-$(USER)/sqlite-autoconf-3090200.tar.gz + +tgz-$(USER)/nanomsg-1.0.0.tar.gz : + wget --no-check-certificate https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz + mv 1.0.0.tar.gz tgz-$(USER)/nanomsg-1.0.0.tar.gz + +tgz-$(USER)/chicken-4.13.0.tar.gz : + mkdir -p tgz-$(USER) + curl https://code.call-cc.org/releases/4.13.0/chicken-4.13.0.tar.gz > tgz-$(USER)/chicken-4.13.0.tar.gz + +tgz-$(USER)/ffcall.tar.gz : + wget -c -O tgz-$(USER)/ffcall.tar.gz 'http://www.kiatoa.com/fossils/ffcall/tarball?name=ffcall&uuid=trunk' + +$(CHICKEN_PREFIX)/bin/pg_config : tgz-$(USER)/postgresql-9.6.4.tar.gz + mkdir -p build-$(USER)/ + tar xfz tgz-$(USER)/postgresql-9.6.4.tar.gz -C build-$(USER) + cd build-$(USER)/postgresql-9.6.4; ./configure --prefix=$(CHICKEN_PREFIX) --with-openssl; make; make install + +build-$(USER)/sqlite-autoconf-3090200/configure : tgz-$(USER)/sqlite-autoconf-3090200.tar.gz + mkdir -p build-$(USER); + cd build-$(USER); tar xf ../tgz-$(USER)/sqlite-autoconf-3090200.tar.gz + +$(CHICKEN_PREFIX)/lib/libnanomsg.so : tgz-$(USER)/nanomsg-1.0.0.tar.gz + cd tgz-$(USER); tar -xzvf nanomsg-1.0.0.tar.gz + cd tgz-$(USER)/nanomsg-1.0.0; mkdir build-$(USER); cd build-$(USER); + cd tgz-$(USER)/nanomsg-1.0.0/build-$(USER); cmake ../ -DCMAKE_INSTALL_PREFIX=$(CHICKEN_PREFIX) + cd tgz-$(USER)/nanomsg-1.0.0/build-$(USER); make; make install + +$(CHICKEN_PREFIX)/chicken-4.13.0/LICENSE : tgz-$(USER)/chicken-4.13.0.tar.gz + mkdir -p build-$(USER)/eggs-installed + cd build-$(USER);tar xf ../tgz-$(USER)/chicken-4.13.0.tar.gz + if [[ -e $(CHICKEN_PREFIX)/chicken-4.13.0/LICENSE ]];then touch $(CHICKEN_PREFIX)/chicken-4.13.0/LICENSE;fi + +tgz-$(USER)/opensrc.fossil : + cd tgz-$(USER); fossil clone http://www.kiatoa.com/fossils/opensrc opensrc.fossil + mkdir tgz-$(USER)/opensrc + cd tgz-$(USER)/opensrc; fossil open --nested ../opensrc.fossil; fossil up; fossil uv sync + +$(CHICKEN_PREFIX)/lib/libiupweb.so : tgz-$(USER)/opensrc.fossil + cd tgz-$(USER)/opensrc; fossil unversioned cat libs/cd/cd-5.10_Linux26g4_64_lib.tar.gz > ../cd.tgz + cd tgz-$(USER)/opensrc; fossil unversioned cat libs/im/im-3.11_Linux26g4_64_lib.tar.gz > ../im.tgz + cd tgz-$(USER)/opensrc; fossil unversioned cat libs/iup/iup-3.19.1_Linux26g4_64_lib.tar.gz > ../iup.tgz + cd tgz-$(USER); tar -xzf cd.tgz; + cd tgz-$(USER); tar -xzf im.tgz; + cd tgz-$(USER); tar -xzf iup.tgz; + cp tgz-$(USER)/include/* $(CHICKEN_PREFIX)/include/ + cp tgz-$(USER)/*.so $(CHICKEN_PREFIX)/lib/ + cp tgz-$(USER)/*.a $(CHICKEN_PREFIX)/lib/ + cp tgz-$(USER)/ftgl/lib/*/* $(CHICKEN_PREFIX)/lib/ + +EGGS=srfi-69 srfi-42 sqlite3 iup canvas-draw typed-records md5 regex-case base64 \ +format dot-locking csv-xml z3 udp hostinfo directory-utils stack dbi crypt sha1 \ +posix-extras pathname-expand csv call-with-environment-variables s11n spiffy \ +uri-common intarweb http-client spiffy-request-vars spiffy-directory-listing \ +ansi-escape-sequences test slice rfc3339 uuid-lib filepath srfi-19 sparse-vectors \ +sql-de-lite fmt readline apropos json simple-exceptions rpc trace logpro refdb postgresql nanomsg +EGGSTARG=$(addsuffix .done,$(addprefix build-$(USER)/eggs-installed/,$(EGGS))) +EGGSTARG2=$(addsuffix .done, $(EGGS)) + +$(CHICKEN_PREFIX)/lib/libcallback.a : tgz-$(USER)/ffcall.tar.gz + cd tgz-$(USER); tar -xzvf ffcall.tar.gz + cd tgz-$(USER)/ffcall; ./configure --prefix=$(CHICKEN_PREFIX) --enable-shared + cd tgz-$(USER)/ffcall; make CC="gcc -fPIC"; make install + +$(CHICKEN_PREFIX)/bin/sqlite3 : build-$(USER)/sqlite-autoconf-3090200/configure + cd build-$(USER)/sqlite-autoconf-3090200; ./configure --prefix=$(CHICKEN_PREFIX); make; make install + +$(CHICKEN_PREFIX)/bin/csi : $(CHICKEN_PREFIX)/bin/sqlite3 $(CHICKEN_PREFIX)/lib/libiupweb.so $(CHICKEN_PREFIX)/chicken-4.13.0/LICENSE + cd build-$(USER)/chicken-4.13.0;make PLATFORM=linux PREFIX=$(CHICKEN_PREFIX) + cd build-$(USER)/chicken-4.13.0;make PLATFORM=linux PREFIX=$(CHICKEN_PREFIX) install + +ALL_CKBIN=chicken chicken-bind chicken-bug chicken-dump \ +chicken-install chicken-profile chicken-sqlite3 chicken-status \ +chicken-uninstall csc csi feathers nanocat sqlite3 vacuumdb logpro \ +refdb + +CKBIN_WRAPPERS=$(addprefix $(PREFIX)/bin/,$(ALL_CKBIN)) + +$(PREFIX)/bin/% : $(CHICKEN_PREFIX)/bin/% $(CHICKEN_PREFIX)/bin/csi + utils/mk_wrapper_tool $(PREFIX) $* $(PREFIX)/bin/$* + chmod a+x $(PREFIX)/bin/$* + +$(PREFIX)/bin : + mkdir -p $(PREFIX)/bin $(CHICKEN_PREFIX)/bin + +# For the future - binwrappers +chicken : $(PREFIX)/bin $(CHICKEN_PREFIX)/bin/csi postgresql.done nanomsg.done iup.done canvas-draw.done sqlite3.done sql-de-lite.done dbi.done $(EGGSTARG2) + @echo "Fake target to build prefix chicken" + +binwrappers : $(CKBIN_WRAPPERS) + +# make the dep a dummy if not requiring our own build of postgres +ifeq ($(BUILD_POSTGRES),yes) +PG_DEP=$(CHICKEN_PREFIX)/bin/pg_config +else +PG_DEP=$(CHICKEN_PREFIX)/bin/csi +endif + +postgresql.done : $(PG_DEP) + CSC_OPTIONS="-I$(CHICKEN_PREFIX)/include -L$(CHICKEN_PREFIX)/lib -L$(CHICKEN_PREFIX)/lib64" $(CHICKEN_PREFIX)/bin/chicken-install postgresql > postgresql.done + +ifeq ($(BUILD_NANOMSG),yes) +NMSG_DEP=$(CHICKEN_PREFIX)/lib/libnanomsg.so +else +NMSG_DEP=$(CHICKEN_PREFIX)/bin/csi +endif + +nanomsg.done : $(NMSG_DEP) + CSC_OPTIONS="-I$(CHICKEN_PREFIX)/include -L$(CHICKEN_PREFIX)/lib -L$(CHICKEN_PREFIX)/lib64" $(CHICKEN_PREFIX)/bin/chicken-install nanomsg > nanomsg.done + +iup.done : $(CHICKEN_PREFIX)/lib/libcallback.a + CSC_OPTIONS="-I$(CHICKEN_PREFIX)/include -L$(CHICKEN_PREFIX)/lib" $(CHICKEN_PREFIX)/bin/chicken-install -D no-library-checks -feature disable-iup-web -feature disable-iup-pplot -feature disable-iup-matrixex iup > iup.done + +canvas-draw.done : + CSC_OPTIONS="-I$(CHICKEN_PREFIX)/include -L$(CHICKEN_PREFIX)/lib" $(CHICKEN_PREFIX)/bin/chicken-install -D no-library-checks canvas-draw > canvas-draw.done + +sqlite3.done : + CSC_OPTIONS="-I$(CHICKEN_PREFIX)/include -L$(CHICKEN_PREFIX)/lib" $(CHICKEN_PREFIX)/bin/chicken-install sqlite3 > sqlite3.done + +sql-de-lite.done : + CSC_OPTIONS="-I$(CHICKEN_PREFIX)/include -L$(CHICKEN_PREFIX)/lib" $(CHICKEN_PREFIX)/bin/chicken-install sql-de-lite > sql-de-lite.done + +dbi.done : postgresql.done sqlite3.done sql-de-lite.done + CSC_OPTIONS="-I$(CHICKEN_PREFIX)/include -L$(CHICKEN_PREFIX)/lib" $(CHICKEN_PREFIX)/bin/chicken-install dbi > dbi.done + +%.done : + $(CHICKEN_PREFIX)/bin/chicken-install $* > $*.done + +build-$(USER)/eggs-installed/%.done : $(CHICKEN_PREFIX)/bin/csi $(EGGS) + $(CHICKEN_PREFIX)/bin/chicken-install $* > build-$(USER)/eggs-installed/$*.done + +build-clean : + rm -rf build-$(USER) bin Index: client.scm ================================================================== --- client.scm +++ client.scm @@ -1,27 +1,30 @@ ;; Copyright 2006-2012, Matthew Welland. ;; -;; This program is made available under the GNU GPL version 2.0 or -;; greater. See the accompanying file COPYING for details. +;; This file is part of Megatest. +;; +;; Megatest is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. +;; +;; Megatest is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. ;; -;; This program is distributed WITHOUT ANY WARRANTY; without even the -;; implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -;; PURPOSE. +;; You should have received a copy of the GNU General Public License +;; along with Megatest. If not, see . ;;====================================================================== ;; C L I E N T S ;;====================================================================== -(require-extension (srfi 18) extras tcp s11n) - -(use srfi-1 posix regex regex-case srfi-69 hostinfo md5 message-digest matchable) -;; (use zmq) - -(use (prefix sqlite3 sqlite3:)) - -(use spiffy uri-common intarweb http-client spiffy-request-vars uri-common intarweb directory-utils) +(use srfi-18 extras tcp s11n srfi-1 posix regex srfi-69 hostinfo md5 + message-digest matchable spiffy uri-common intarweb http-client + spiffy-request-vars uri-common intarweb directory-utils) (declare (unit client)) (declare (uses common)) (declare (uses db)) @@ -36,24 +39,26 @@ (let ((sig (conc (get-host-name) " " (current-process-id)))) (set! *my-client-signature* sig) *my-client-signature*))) ;; Not currently used! But, I think it *should* be used!!! -(define (client:logout serverdat) +#;(define (client:logout serverdat) (let ((ok (and (socket? serverdat) (cdb:logout serverdat *toppath* (client:get-signature))))) ok)) -(define (client:connect iface port) - (case (server:get-transport) +#;(define (client:connect iface port) + (http-transport:client-connect iface port) + #;(case (server:get-transport) ((rpc) (rpc:client-connect iface port)) ((http) (http:client-connect iface port)) ((zmq) (zmq:client-connect iface port)) (else (rpc:client-connect iface port)))) (define (client:setup areapath #!key (remaining-tries 100) (failed-connects 0)) - (case (server:get-transport) + (client:setup-http areapath remaining-tries: remaining-tries failed-connects: failed-connects) + #;(case (server:get-transport) ((rpc) (rpc-transport:client-setup remaining-tries: remaining-tries failed-connects: failed-connects)) ;;(client:setup-rpc run-id)) ((http)(client:setup-http areapath remaining-tries: remaining-tries failed-connects: failed-connects)) (else (rpc-transport:client-setup remaining-tries: remaining-tries failed-connects: failed-connects)))) ;; (client:setup-rpc run-id)))) ;; Do all the connection work, look up the transport type and set up the @@ -100,11 +105,11 @@ (let ((runremote (or area-dat *runremote*))) ;; it might have been generated only a few statements ago (remote-conndat-set! runremote start-res) ;; (hash-table-set! runremote run-id start-res) (debug:print-info 2 *default-log-port* "connected to " (http-transport:server-dat-make-url start-res)) start-res) (begin ;; login failed but have a server record, clean out the record and try again - (debug:print-info 0 *default-log-port* "client:setup, login failed, will attempt to start server ... start-res=" start-res ", server-dat=" server-dat) ;; had runid. Fixes part of Randy;s ticket 1405717332 + (debug:print-info 0 *default-log-port* "client:setup, login unsuccessful, will attempt to start server ... start-res=" start-res ", server-dat=" server-dat) ;; had runid. Fixes part of Randy;s ticket 1405717332 (case *transport-type* ((http)(http-transport:close-connections))) (remote-conndat-set! runremote #f) ;; (hash-table-delete! runremote run-id) (thread-sleep! 1) (client:setup-http areapath remaining-tries: (- remaining-tries 1)) ADDED codescanlib.scm Index: codescanlib.scm ================================================================== --- /dev/null +++ codescanlib.scm @@ -0,0 +1,144 @@ +;; Copyright 2006-2017, Matthew Welland. +;; +;; This file is part of Megatest. +;; +;; Megatest is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. +;; +;; Megatest is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. +;; +;; You should have received a copy of the GNU General Public License +;; along with Megatest. If not, see . +;; + +;; gotta compile with csc, doesn't work with csi -s for whatever reason + +(use srfi-69) +(use matchable) +(use utils) +(use ports) +(use extras) +(use srfi-1) +(use posix) +(use srfi-12) + +;; turn scheme file to a list of sexps, sexps of interest will be in the form of (define ( ) ) +(define (load-scm-file scm-file) + ;;(print "load "scm-file) + (handle-exceptions + exn + '() + (with-input-from-string + (conc "(" + (with-input-from-file scm-file read-all) + ")" ) + read))) + +;; extract a list of procname, filename, args and body of procedures defined in filename, input from load-scm-file +;; -- be advised: +;; * this may be fooled by macros, since this code does not take them into account. +;; * this code does only checks for form (define ( ... ) ) +;; so it excludes from reckoning +;; - generated functions, as in things like foo-set! from defstructs, +;; - define-inline, ( +;; - define procname (lambda .. +;; - etc... +(define (get-toplevel-procs+file+args+body filename) + (let* ((scm-tree (load-scm-file filename)) + (procs + (filter identity + (map + (match-lambda + [('define ('uses args ...) body ...) #f] ;; filter out (define (uses ... + [('define ('unit args ...) body ...) #f] ;; filter out (define (unit ... + [('define ('prefix args ...) body ...) #f] ;; filter out (define (prefix ... + [('define (defname args ...) body ...) ;; match (define (procname ) ) + (if (atom? defname) ;; filter out things we dont understand (procname is a list, what??) + (list defname filename args body) + #f)] + [else #f] ) scm-tree)))) + procs)) + + +;; given a sexp, return a flat list of atoms in that sexp +(define (get-atoms-in-body body) + (cond + ((null? body) '()) + ((atom? body) (list body)) + (else + (apply append (map get-atoms-in-body body))))) + +;; given a file, return a list of procname, file, list of atoms in said procname +(define (get-procs+file+atoms file) + (let* ((toplevel-proc-items (get-toplevel-procs+file+args+body file)) + (res + (map + (lambda (item) + (let* ((proc (car item)) + (file (cadr item)) + (args (caddr item)) + (body (cadddr item)) + (atoms (append (get-atoms-in-body args) (get-atoms-in-body body)))) + (list proc file atoms))) + toplevel-proc-items))) + res)) + +;; uniquify a list of atoms +(define (unique-atoms lst) + (let loop ((lst (flatten lst)) (res '())) + (if (null? lst) + (reverse res) + (let ((c (car lst))) + (loop (cdr lst) (if (member c res) res (cons c res))))))) + +;; given a list of procname, filename, list of procs called from procname, cross reference and reverse +;; returning alist mapping procname to procname that calls said procname +(define (get-callers-alist all-procs+file+calls) + (let* ((all-procs (map car all-procs+file+calls)) + (caller-ht (make-hash-table))) + ;; let's cross reference with a hash table + (for-each (lambda (proc) (hash-table-set! caller-ht proc '())) all-procs) + (for-each (lambda (item) + (let* ((proc (car item)) + (file (cadr item)) + (calls (caddr item))) + (for-each (lambda (callee) + (hash-table-set! caller-ht callee + (cons proc + (hash-table-ref caller-ht callee)))) + calls))) + all-procs+file+calls) + (map (lambda (x) + (let ((k (car x)) + (r (unique-atoms (cdr x)))) + (cons k r))) + (hash-table->alist caller-ht)))) + +;; create a handy cross-reference of callees to callers in the form of an alist. +(define (get-xref all-scm-files) + (let* ((all-procs+file+atoms + (apply append (map get-procs+file+atoms all-scm-files))) + (all-procs (map car all-procs+file+atoms)) + (all-procs+file+calls ; proc calls things in calls list + (map (lambda (item) + (let* ((proc (car item)) + (file (cadr item)) + (atoms (caddr item)) + (calls + (filter identity + (map + (lambda (x) + (if (and ;; (not (equal? x proc)) ;; uncomment to prevent listing self + (member x all-procs)) + x + #f)) + atoms)))) + (list proc file calls))) + all-procs+file+atoms)) + (callers (get-callers-alist all-procs+file+calls))) + callers)) Index: common.scm ================================================================== --- common.scm +++ common.scm @@ -1,29 +1,40 @@ ;;====================================================================== ;; Copyright 2006-2012, Matthew Welland. ;; -;; This program is made available under the GNU GPL version 2.0 or -;; greater. See the accompanying file COPYING for details. +;; This file is part of Megatest. +;; +;; Megatest is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. +;; +;; Megatest is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. ;; -;; This program is distributed WITHOUT ANY WARRANTY; without even the -;; implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -;; PURPOSE. +;; You should have received a copy of the GNU General Public License +;; along with Megatest. If not, see . + ;;====================================================================== -(use srfi-1 posix regex-case base64 format dot-locking csv-xml z3 sql-de-lite hostinfo md5 message-digest typed-records directory-utils stack - matchable) -(require-extension regex posix) - -(require-extension (srfi 18) extras tcp rpc) - -(import (prefix sqlite3 sqlite3:)) -(import (prefix base64 base64:)) +(use srfi-1 data-structures posix regex-case (prefix base64 base64:) + format dot-locking csv-xml z3 udp ;; sql-de-lite + hostinfo md5 message-digest typed-records directory-utils stack + matchable regex posix (srfi 18) extras ;; tcp + (prefix nanomsg nmsg:) + (prefix sqlite3 sqlite3:) + pkts (prefix dbi dbi:) + ) (declare (unit common)) -(declare (uses keys)) +;; (declare (uses commonmod)) +;; (import commonmod) (include "common_records.scm") + ;; (require-library margs) ;; (include "margs.scm") ;; (define old-exit exit) @@ -31,26 +42,56 @@ ;; (define (exit . code) ;; (if (null? code) ;; (old-exit) ;; (old-exit code))) + +;; execute thunk, return value. If exception thrown, trap exception, return #f, and emit nonfatal condition note to *default-log-port* . +;; arguments - thunk, message +(define (common:fail-safe thunk warning-message-on-exception) + (handle-exceptions + exn + (begin + (debug:print-info 0 *default-log-port* "notable but nonfatal condition - "warning-message-on-exception", exn=" exn) + (debug:print-info 0 *default-log-port* + (string-substitute "\n?Error:" "nonfatal condition:" + (with-output-to-string + (lambda () + (print-error-message exn) )))) + (debug:print-info 0 *default-log-port* " -- continuing after nonfatal condition...") + #f) + (thunk))) + (define getenv get-environment-variable) (define (safe-setenv key val) - (if (substring-index ":" key) ;; variables containing : are for internal use and cannot be environment variables. - (debug:print-error 4 *default-log-port* "skip setting internal use only variables containing \":\"") + (if (or (substring-index "!" key) + (substring-index ":" key) ;; variables containing : are for internal use and cannot be environment variables. + (substring-index "." key)) ;; periods are not allowed in environment variables + (debug:print-error 4 *default-log-port* "skip setting internal use only variables containing \":\" or starting with \"!\"") (if (and (string? val) (string? key)) (handle-exceptions exn - (debug:print-error 0 *default-log-port* "bad value for setenv, key=" key ", value=" val) + (debug:print-error 0 *default-log-port* "bad value for setenv, key=" key ", value=" val ", exn=" exn) (setenv key val)) (debug:print-error 0 *default-log-port* "bad value for setenv, key=" key ", value=" val)))) (define home (getenv "HOME")) (define user (getenv "USER")) -;; GLOBAL GLETCHES + +;; returns list of fd count, socket count +(define (get-file-descriptor-count #!key (pid (current-process-id ))) + (list + (length (glob (conc "/proc/" pid "/fd/*"))) + (length (filter identity (map socket? (glob (conc "/proc/" pid "/fd/*"))))) + ) +) + + + +;; GLOBALS ;; CONTEXTS (defstruct cxt (taskdb #f) (cmutex (make-mutex))) @@ -76,10 +117,11 @@ ;; (define *user-hash-data* (make-hash-table)) (define *db-keys* #f) +(define *pkts-info* (make-hash-table)) ;; store stuff like the last parent here (define *configinfo* #f) ;; raw results from setup, includes toppath and table from megatest.config (define *runconfigdat* #f) ;; run configs data (define *configdat* #f) ;; megatest.config data (define *configstatus* #f) ;; status of data; 'fulldata : all processing done, #f : no data yet, 'partialdata : partial read done (define *toppath* #f) @@ -90,10 +132,11 @@ (define *passnum* 0) ;; when running track calls to run-tests or similar ;; (define *alt-log-file* #f) ;; used by -log (define *common:denoise* (make-hash-table)) ;; for low noise printing (define *default-log-port* (current-error-port)) (define *time-zero* (current-seconds)) ;; for the watchdog +(define *default-area-tag* "local") ;; DATABASE (define *dbstruct-db* #f) ;; used to cache the dbstruct in db:setup. Goal is to remove this. ;; db stats (define *db-stats* (make-hash-table)) ;; hash of vectors < count duration-total > @@ -111,18 +154,20 @@ (define *db-access-mutex* (make-mutex)) (define *db-transaction-mutex* (make-mutex)) (define *db-cache-path* #f) (define *db-with-db-mutex* (make-mutex)) (define *db-api-call-time* (make-hash-table)) ;; hash of command => (list of times) +;; no sync db +(define *no-sync-db* #f) ;; SERVER (define *my-client-signature* #f) (define *transport-type* 'http) ;; override with [server] transport http|rpc|nmsg (define *runremote* #f) ;; if set up for server communication this will hold ;; (define *max-cache-size* 0) (define *logged-in-clients* (make-hash-table)) -;; (define *server-id* #f) +(define *server-id* #f) (define *server-info* #f) ;; good candidate for easily convert to non-global (define *time-to-exit* #f) (define *server-run* #t) (define *run-id* #f) (define *server-kind-run* (make-hash-table)) @@ -129,10 +174,11 @@ (define *home-host* #f) ;; (define *total-non-write-delay* 0) (define *heartbeat-mutex* (make-mutex)) (define *api-process-request-count* 0) (define *max-api-process-requests* 0) +(define *server-overloaded* #f) ;; client (define *rmt-mutex* (make-mutex)) ;; remote access calls mutex ;; RPC transport @@ -149,17 +195,116 @@ (define *run-info-cache* (make-hash-table)) ;; run info is stable, no need to reget (define *launch-setup-mutex* (make-mutex)) ;; need to be able to call launch:setup often so mutex it and re-call the real deal only if *toppath* not set (define *homehost-mutex* (make-mutex)) +;; Miscellaneous +(define *triggers-mutex* (make-mutex)) ;; block overlapping processing of triggers + +(use posix-extras pathname-expand files) + +;; this plugs a hole in posix-extras in recent chicken versions > 4.9) +(let-values (( (chicken-release-number chicken-major-version) + (apply values + (map string->number + (take + (string-split (chicken-version) ".") + 2))))) + (let ((resolve-pathname-broken? + (or (> chicken-release-number 4) + (and (eq? 4 chicken-release-number) (> chicken-major-version 9))))) + (if resolve-pathname-broken? + (define ##sys#expand-home-path pathname-expand)))) + +(define (realpath x) (resolve-pathname (pathname-expand (or x "/dev/null")) )) + +(define (common:get-this-exe-fullpath #!key (argv (argv))) + (let* ((this-script + (cond + ((and (> (length argv) 2) + (string-match "^(.*/csi|csi)$" (car argv)) + (string-match "^-(s|ss|sx|script)$" (cadr argv))) + (caddr argv)) + (else (car argv)))) + (fullpath (realpath this-script))) + fullpath)) +(define *common:this-exe-fullpath* (common:get-this-exe-fullpath)) +(define *common:this-exe-dir* (pathname-directory *common:this-exe-fullpath*)) +(define *common:this-exe-name* (pathname-strip-directory *common:this-exe-fullpath*)) + +;; when called from a wrapper I need sometimes to find the calling +;; wrapper, this is for dashboard to find the correct megatest. +;; +(define (common:find-local-megatest #!optional (progname "megatest")) + (let ((res (filter file-exists? + (map (lambda (updir) + (let* ((lm (car (argv))) + (dir (pathname-directory lm)) + (exe (pathname-strip-directory lm))) + (conc (if dir (conc dir "/") "") + (case (string->symbol exe) + ((dboard) (conc updir progname)) + ((mtest) (conc updir progname)) + ((dashboard) progname) + (else exe))))) + '("../../" "../"))))) + (if (null? res) + (begin + (debug:print 0 *current-log-port* "Failed to find this executable! Using what can be found on the path") + progname) + (car res)))) + +(define *common:logpro-exit-code->status-sym-alist* + '( ( 0 . pass ) + ( 1 . fail ) + ( 2 . warn ) + ( 3 . check ) + ( 4 . waived ) + ( 5 . abort ) + ( 6 . skip ))) + +(define (common:logpro-exit-code->status-sym exit-code) + (or (alist-ref exit-code *common:logpro-exit-code->status-sym-alist*) 'fail)) + +(define (common:worse-status-sym ss1 ss2) + (let loop ((status-syms-remaining '(abort fail check skip warn waived pass))) + (cond + ((null? status-syms-remaining) + 'fail) + ((eq? (car status-syms-remaining) ss1) + ss1) + ((eq? (car status-syms-remaining) ss2) + ss2) + (else + (loop (cdr status-syms-remaining)))))) + +(define (common:steps-can-proceed-given-status-sym status-sym) + (if (member status-sym '(warn waived pass)) + #t + #f)) + +(define (status-sym->string status-sym) + (case status-sym + ((pass) "PASS") + ((fail) "FAIL") + ((warn) "WARN") + ((check) "CHECK") + ((waived) "WAIVED") + ((abort) "ABORT") + ((skip) "SKIP") + (else "FAIL"))) + +(define (common:logpro-exit-code->test-status exit-code) + (status-sym->string (common:logpro-exit-code->status-sym exit-code))) + (defstruct remote (hh-dat (common:get-homehost)) ;; homehost record ( addr . hhflag ) (server-url (if *toppath* (server:check-if-running *toppath*))) ;; (server:check-if-running *toppath*) #f)) (last-server-check 0) ;; last time we checked to see if the server was alive (conndat #f) (transport *transport-type*) - (server-timeout (server:get-timeout)) ;; default from server:get-timeout + (server-timeout (server:expiration-timeout)) (force-server #f) (ro-mode #f) (ro-mode-checked #f)) ;; flag that indicates we have checked for ro-mode ;; launching and hosts @@ -225,96 +370,255 @@ (substring (common:get-last-run-version) 0 6))) (define (common:set-last-run-version) (rmt:set-var "MEGATEST_VERSION" (common:version-signature))) +;; postive number if megatest version > db version +;; negative number if megatest version < db version +(define (common:version-db-delta) + (- megatest-version (common:get-last-run-version-number))) + (define (common:version-changed?) (not (equal? (common:get-last-run-version) - (common:version-signature)))) + (common:version-signature)))) +(define (common:api-changed?) + (not (equal? (substring (->string megatest-version) 0 4) + (substring (conc (common:get-last-run-version)) 0 4)))) + + +(define (common:get-sync-lock-filepath) + (let* ((tmp-area (common:get-db-tmp-area)) + (lockfile (conc tmp-area "/megatest.db.sync-lock"))) + lockfile)) + ;; Move me elsewhere ... ;; RADT => Why do we meed the version check here, this is called only if version misma ;; -(define (common:cleanup-db dbstruct) - (db:multi-db-sync +(define (common:cleanup-db dbstruct #!key (full #f)) + (apply db:multi-db-sync dbstruct + 'schema ;; 'new2old 'killservers - 'dejunk - ;; 'adj-testids + 'adj-target ;; 'old2new 'new2old - 'schema) - (if (common:version-changed?) + ;; (if full + '(dejunk) + ;; '()) + ) + (if (common:api-changed?) (common:set-last-run-version))) +(define (common:snapshot-file filepath #!key (subdir ".") ) + (if (file-exists? filepath) + (let* ((age-sec (lambda (file) + (if (file-exists? file) + (- (current-seconds) (file-modification-time file)) + 1000000000))) ;; return really old value if file doesn't exist. we want to clobber it if old or not exist. + (ok-flag #t) + (age-mins (lambda (file) (/ (age-sec file) 60))) + (age-hrs (lambda (file) (/ (age-mins file) 60))) + (age-days (lambda (file) (/ (age-hrs file) 24))) + (age-wks (lambda (file) (/ (age-days file) 7))) + (docmd (lambda (cmd) + (cond + (ok-flag + (let ((res (system cmd))) + (cond + ((eq? 0 res) + #t) + (else + (set! ok-flag #f) + (debug:print 0 *default-log-port* "ERROR: ["(common:human-time)"] Command failed with exit code " + (if (< res 0) + res + (/ res 8)) " ["cmd"]" ) + #f)))) + (else + (debug:print 0 *default-log-port* "ERROR: ["(common:human-time)"] Not runnining command due to prior error. ["cmd"]") + #f)))) + (copy (lambda (src dest) (docmd (conc "/bin/cp '"src"' '"dest"'")))) + (copy+zip (lambda (src dest) (docmd (conc "gzip -c - < '"src"' > '"dest"'")))) + (fullpath (realpath filepath)) + (basedir (pathname-directory fullpath)) + (basefile (pathname-strip-directory fullpath)) + ;;(prevfile (conc filepath ".prev.gz")) + (minsfile (conc basedir "/" subdir "/" basefile ".mins.gz")) + (hrsfile (conc basedir "/" subdir "/" basefile ".hrs.gz")) + (daysfile (conc basedir "/" subdir "/" basefile ".days.gz")) + (wksfile (conc basedir "/" subdir "/" basefile ".weeks.gz"))) + + ;; create subdir it not exists + (if (not (directory-exists? (conc basedir "/" subdir))) + (docmd (conc "/bin/mkdir -p '"(conc basedir "/" subdir)"'"))) + + ;; copy&zip to .mins if not exists + (if (not (file-exists? minsfile)) + (copy+zip filepath minsfile)) + ;; copy .mins to .hrs if not exists + (if (not (file-exists? hrsfile)) + (copy minsfile hrsfile)) + ;; copy .hrs to .days if not exists + (if (not (file-exists? daysfile)) + (copy hrsfile daysfile)) + ;; copy .days to .weeks if not exists + (if (not (file-exists? wksfile)) + (copy daysfile wksfile)) + + + ;; if age(.mins.gz) >= 1h: + ;; copy .mins.gz .hrs.gz + ;; copy .mins.gz + (when (>= (age-mins minsfile) 1) + (copy minsfile hrsfile) + (copy+zip filepath minsfile)) + + ;; if age(.hrs.gz) >= 1d: + ;; copy .hrs.gz .days.gz + ;; copy .mins.gz .hrs.gz + (when (>= (age-days hrsfile) 1) + (copy hrsfile daysfile) + (copy minsfile hrsfile)) + + ;; if age(.days.gz) >= 1w: + ;; copy .days.gz .weeks.gz + ;; copy .hrs.gz .days.gz + (when (>= (age-wks daysfile) 1) + (copy daysfile wksfile) + (copy hrsfile daysfile)) + #t) + #f)) + +(define (common:safe-vector-ref vec indx default) + (if (vector? vec) + (handle-exceptions + exn + (begin + (debug:print-info 0 *default-log-port* "remote data issue: exn=" exn) + default) + (vector-ref vec indx)) + default)) + + ;; Rotate logs, logic: ;; if > 500k and older than 1 week: ;; remove previous compressed log and compress this log ;; WARNING: This proc operates assuming that it is in the directory above the ;; logs directory you wish to log-rotate. ;; (define (common:rotate-logs) - (if (not (directory-exists? "logs"))(create-directory "logs")) - (directory-fold - (lambda (file rem) - (handle-exceptions - exn - (debug:print-info 0 *default-log-port* "failed to rotate log " file ", probably handled by another process.") - (let* ((fullname (conc "logs/" file)) - (file-age (- (current-seconds)(file-modification-time fullname)))) - (if (or (and (string-match "^.*.log" file) - (> (file-size fullname) 200000)) - (and (string-match "^server-.*.log" file) - (> (- (current-seconds) (file-modification-time fullname)) - (* 8 60 60)))) - (let ((gzfile (conc fullname ".gz"))) - (if (file-exists? gzfile) - (begin - (debug:print-info 0 *default-log-port* "removing " gzfile) - (delete-file gzfile))) - (debug:print-info 0 *default-log-port* "compressing " file) - (system (conc "gzip " fullname))) - (if (> file-age (* (string->number (or (configf:lookup *configdat* "setup" "log-expire-days") "30")) 24 3600)) - (handle-exceptions - exn - #f - (delete-file fullname))))))) - '() - "logs")) - + (let* ((all-files (make-hash-table)) + (stats (make-hash-table)) + (inc-stat (lambda (key) + (hash-table-set! stats key (+ (hash-table-ref/default stats key 0) 1)))) + (max-allowed (string->number (or (configf:lookup *configdat* "setup" "max-logfiles") "300")))) ;; name -> age + (if (not (directory-exists? "logs"))(create-directory "logs")) + (directory-fold + (lambda (file rem) + (handle-exceptions + exn + (begin + (debug:print-info 2 *default-log-port* "unable to rotate log " file ", probably handled by another process, this is safe to ignore. exn=" exn) + (debug:print 2 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn)) + ;; (print-call-chain (current-error-port)) ;; + ) + (let* ((fullname (conc "logs/" file)) + (mod-time (file-modification-time fullname)) + (file-age (- (current-seconds) mod-time)) + (file-old (> file-age (* 48 60 60))) + (file-big (> (file-size fullname) 200000))) + (hash-table-set! all-files file mod-time) + (if (or (and (string-match "^.*.log" file) + file-old + file-big) + (and (string-match "^server-.*.log" file) + file-old)) + (let ((gzfile (conc fullname ".gz"))) + (if (common:file-exists? gzfile) + (begin + (debug:print-info 0 *default-log-port* "removing " gzfile) + (delete-file* gzfile) + (hash-table-delete! all-files gzfile) ;; needed? + )) + (debug:print-info 0 *default-log-port* "compressing " file) + (system (conc "gzip " fullname)) + (inc-stat "gzipped") + (hash-table-set! all-files (conc file ".gz") file-age) ;; add the .gz file and remove the base file + (hash-table-delete! all-files file) + ) + (if (and (> file-age (* (string->number (or (configf:lookup *configdat* "setup" "log-expire-days") "30")) 24 3600)) + (file-exists? fullname)) ;; just in case it was gzipped - will get it next time + (handle-exceptions + exn + #f + (if (directory? fullname) + (begin + (debug:print-info 0 *default-log-port* fullname " in logs directory is a directory! Cannot rotate it, it is best to not put subdirectories in the logs dir.") + (inc-stat "directories")) + (begin + (delete-file* fullname) + (inc-stat "deleted"))) + (hash-table-delete! all-files file))))))) + '() + "logs") + (for-each + (lambda (category) + (let ((quant (hash-table-ref/default stats category 0))) + (if (> quant 0) + (debug:print-info 0 *default-log-port* category " log files: " quant)))) + `("deleted" "gzipped" "directories")) + (let ((num-logs (hash-table-size all-files))) + (if (> num-logs max-allowed) ;; because NFS => don't let number of logs exceed 300 + (let ((files (take (sort (hash-table-keys all-files) + (lambda (a b) + (< (hash-table-ref all-files a)(hash-table-ref all-files b)))) + (- num-logs max-allowed)))) + (for-each + (lambda (file) + (let* ((fullname (conc "logs/" file))) + (if (directory? fullname) + (debug:print-info 0 *default-log-port* fullname " in logs directory is a directory! Cannot rotate it, it is best to not put subdirectories in the logs dir.") + (handle-exceptions + exn + (debug:print-error 0 *default-log-port* "failed to remove " fullname ", exn=" exn) + (delete-file* fullname))))) + files) + (debug:print-info 0 *default-log-port* "Deleted " (length files) " files from logs, keeping " max-allowed " files.")))))) + ;; Force a megatest cleanup-db if version is changed and skip-version-check not specified ;; Do NOT check if not on homehost! ;; (define (common:exit-on-version-changed) (if (common:on-homehost?) - (if (common:version-changed?) + (if (common:api-changed?) (let* ((mtconf (conc (get-environment-variable "MT_RUN_AREA_HOME") "/megatest.config")) - (dbfile (conc (get-environment-variable "MT_RUN_AREA_HOME") "/megatest.db")) + (dbfile (conc (get-environment-variable "MT_RUN_AREA_HOME") "/megatest.db")) (read-only (not (file-write-access? dbfile))) - (dbstruct (db:setup))) + (dbstruct (db:setup #t))) (debug:print 0 *default-log-port* "WARNING: Version mismatch!\n" " expected: " (common:version-signature) "\n" " got: " (common:get-last-run-version)) (cond ((get-environment-variable "MT_SKIP_DB_MIGRATE") #t) - ((and (file-exists? mtconf) (file-exists? dbfile) (not read-only) + ((and (common:file-exists? mtconf) (common:file-exists? dbfile) (not read-only) (eq? (current-user-id)(file-owner mtconf))) ;; safe to run -cleanup-db (debug:print 0 *default-log-port* " I see you are the owner of megatest.config, attempting to cleanup and reset to new version") (handle-exceptions exn (begin - (debug:print 0 *default-log-port* "Failed to switch versions.") + (debug:print 0 *default-log-port* "Failed to switch versions. exn=" exn) (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn)) (print-call-chain (current-error-port)) (exit 1)) (common:cleanup-db dbstruct))) - ((not (file-exists? mtconf)) + ((not (common:file-exists? mtconf)) (debug:print 0 *default-log-port* " megatest.config does not exist in this area. Cannot proceed with megatest version migration.") (exit 1)) - ((not (file-exists? dbfile)) + ((not (common:file-exists? dbfile)) (debug:print 0 *default-log-port* " megatest.db does not exist in this area. Cannot proceed with megatest version migration.") (exit 1)) ((not (eq? (current-user-id)(file-owner mtconf))) (debug:print 0 *default-log-port* " You do not own megatest.db in this area. Cannot proceed with megatest version migration.") (exit 1)) @@ -321,14 +625,14 @@ (read-only (debug:print 0 *default-log-port* " You have read-only access to this area. Cannot proceed with megatest version migration.") (exit 1)) (else (debug:print 0 *default-log-port* " to switch versions you can run: \"megatest -cleanup-db\"") - (exit 1))))) - (begin - (debug:print 0 *default-log-port* "ERROR: cannot migrate version unless on homehost. Exiting.") - (exit 1)))) + (exit 1))))))) +;; (begin +;; (debug:print 0 *default-log-port* "ERROR: cannot migrate version unless on homehost. Exiting.") +;; (exit 1)))) ;;====================================================================== ;; S P A R S E A R R A Y S ;;====================================================================== @@ -390,10 +694,13 @@ (map common:to-alist (hash-table->alist dat))) (else (if dat dat "")))) + +(define (common:alist-ref/default key alist default) + (or (alist-ref key alist) default)) (define (common:low-noise-print waitval . keys) (let* ((key (string-intersperse (map conc keys) "-" )) (lasttime (hash-table-ref/default *common:denoise* key 0)) (currtime (current-seconds))) @@ -410,11 +717,11 @@ (handle-exceptions exn (handle-exceptions exn (begin - (debug:print-error 0 *default-log-port* "received bad encoded string \"" instr "\", message: " ((condition-property-accessor 'exn 'message) exn)) + (debug:print-error 0 *default-log-port* "received bad encoded string \"" instr "\", message: " ((condition-property-accessor 'exn 'message) exn) ", exn=" exn) (print-call-chain (current-error-port)) #f) (read (open-input-string (base64:base64-decode instr)))) (read (open-input-string (z3:decode-buffer (base64:base64-decode instr)))))) @@ -421,28 +728,31 @@ ;; dot-locking egg seems not to work, using this for now ;; if lock is older than expire-time then remove it and try again ;; to get the lock ;; (define (common:simple-file-lock fname #!key (expire-time 300)) - (handle-exceptions - exn - #f ;; don't really care what went wrong right now. NOTE: I have not seen this one actually fail. - (if (file-exists? fname) - (if (> (- (current-seconds)(file-modification-time fname)) expire-time) + (let ((fmod-time (handle-exceptions + ext + (current-seconds) + (file-modification-time fname)))) + (if (common:file-exists? fname) + (if (> (- (current-seconds) fmod-time) expire-time) (begin - (delete-file* fname) + (handle-exceptions exn #f (delete-file* fname)) (common:simple-file-lock fname expire-time: expire-time)) #f) (let ((key-string (conc (get-host-name) "-" (current-process-id)))) (with-output-to-file fname (lambda () (print key-string))) (thread-sleep! 0.25) - (if (file-exists? fname) - (with-input-from-file fname - (lambda () - (equal? key-string (read-line)))) + (if (common:file-exists? fname) + (handle-exceptions exn + #f + (with-input-from-file fname + (lambda () + (equal? key-string (read-line))))) #f))))) (define (common:simple-file-lock-and-wait fname #!key (expire-time 300)) (let ((end-time (+ expire-time (current-seconds)))) (let loop ((got-lock (common:simple-file-lock fname expire-time: expire-time))) @@ -462,12 +772,14 @@ ;;====================================================================== ;; S T A T E S A N D S T A T U S E S ;;====================================================================== -(define *common:std-states* - '((0 "ARCHIVED") +;; BBnote: *common:std-states* - dashboard filter control and test control state buttons defined here; used in set-fields-panel and dboard:make-controls +(define *common:std-states* ;; for toggle buttons in dashboard + '( + (0 "ARCHIVED") (1 "STUCK") (2 "KILLREQ") (3 "KILLED") (4 "NOT_STARTED") (5 "COMPLETED") @@ -474,36 +786,59 @@ (6 "LAUNCHED") (7 "REMOTEHOSTSTART") (8 "RUNNING") )) +(define *common:dont-roll-up-states* + '("DELETED" + "REMOVING" + "CLEANING" + "ARCHIVE_REMOVING" + )) + +;; BBnote: *common:std-statuses* dashboard filter control and test control status buttons defined here; used in set-fields-panel and dboard:make-controls +;; note these statuses are sorted from better to worse. +;; This sort order is important to dcommon:status-compare3 and db:set-state-status-and-roll-up-items (define *common:std-statuses* - '(;; (0 "DELETED") + '(;; (0 "DELETED") (1 "n/a") (2 "PASS") - (3 "CHECK") - (4 "SKIP") - (5 "WARN") - (6 "WAIVED") + (3 "SKIP") + (4 "WARN") + (5 "WAIVED") + (6 "CHECK") (7 "STUCK/DEAD") - (8 "FAIL") - (9 "ABORT"))) + (8 "DEAD") + (9 "FAIL") + (10 "PREQ_FAIL") + (11 "PREQ_DISCARDED") + (12 "ABORT"))) (define *common:ended-states* ;; states which indicate the test is stopped and will not proceed - '("COMPLETED" "ARCHIVED" "KILLED" "KILLREQ" "STUCK" "INCOMPLETE")) + '("COMPLETED" "ARCHIVED" "KILLED" "KILLREQ" "STUCK" "INCOMPLETE" )) (define *common:badly-ended-states* ;; these roll up as CHECK, i.e. results need to be checked '("KILLED" "KILLREQ" "STUCK" "INCOMPLETE" "DEAD")) +(define *common:well-ended-states* ;; an item's prereq in this state allows item to proceed + '("PASS" "WARN" "CHECK" "WAIVED" "SKIP")) + +;; BBnote: *common:running-states* used from db:set-state-status-and-roll-up-items (define *common:running-states* ;; test is either running or can be run - '("RUNNING" "REMOTEHOSTSTART" "LAUNCHED")) + '("RUNNING" "REMOTEHOSTSTART" "LAUNCHED" "STARTED")) (define *common:cant-run-states* ;; These are stopping conditions that prevent a test from being run '("COMPLETED" "KILLED" "UNKNOWN" "INCOMPLETE" "ARCHIVED")) (define *common:not-started-ok-statuses* ;; if not one of these statuses when in not_started state treat as dead '("n/a" "na" "PASS" "FAIL" "WARN" "CHECK" "WAIVED" "DEAD" "SKIP")) + +;; group tests into buckets corresponding to rollup +;;; Running, completed-pass, completed-non-pass + worst status, not started. +;; filter out +;(define (common:categorize-items-for-rollup in-tests) +; ( (define (common:special-sort items order comp) (let ((items-order (map reverse order)) (acomp (or comp >))) (sort items @@ -582,26 +917,65 @@ (define (common:get-testsuite-name) (or (configf:lookup *configdat* "setup" "area-name") ;; megatest is a flexible tool, testsuite is too limiting a description. (configf:lookup *configdat* "setup" "testsuite" ) (getenv "MT_TESTSUITE_NAME") - (if (string? *toppath* ) - (pathname-file *toppath*) - #f))) ;; (pathname-file (current-directory))))) + (pathname-file (or (if (string? *toppath* ) + (pathname-file *toppath*) + #f) + (common:get-topath #f))) + "please-set-setup-area-name")) ;; (pathname-file (current-directory))))) + +;; safe getting of toppath +(define (common:get-toppath areapath) + (or *toppath* + (if areapath + (begin + (set! *toppath* areapath) + (setenv "MT_RUN_AREA_HOME" areapath) + areapath) + #f) + (if (getenv "MT_RUN_AREA_HOME") + (begin + (set! *toppath* (getenv "MT_RUN_AREA_HOME")) + *toppath*) + #f) + ;; last resort, look for megatest.config + (let loop ((thepath (realpath "."))) + (if (file-exists? (conc thepath "/megatest.config")) + thepath + (if (equal? thepath "/") + (begin + (debug:print-error 0 *default-log-port* "Unable to find megatest home directory.") + #f) + (loop (pathname-directory thepath))))) + )) (define common:get-area-name common:get-testsuite-name) -(define (common:get-db-tmp-area) +(define (common:get-db-tmp-area . junk) (if *db-cache-path* *db-cache-path* - (if *toppath* - (let ((dbpath (create-directory (conc "/tmp/" (current-user-name) - "/megatest_localdb/" - (common:get-testsuite-name) "/" - (string-translate *toppath* "/" ".")) #t))) - (set! *db-cache-path* dbpath) - dbpath) + (if *toppath* ;; common:get-create-writeable-dir + (handle-exceptions + exn + (begin + (debug:print-error 0 *default-log-port* "Couldn't create path to " *db-cache-path* ", exn=" exn) + (exit 1)) + (let* ((tsname (common:get-testsuite-name)) + (dbpath (common:get-create-writeable-dir + (list (conc "/tmp/" (current-user-name) + "/megatest_localdb/" + tsname "/" + (string-translate *toppath* "/" ".")) + (conc "/tmp/" (current-process-id) ;; just in case we have an issue with the dir by own user name + "/megatest_localdb/" + tsname + (string-translate *toppath* "/" ".")) + )))) + (set! *db-cache-path* dbpath) + dbpath)) #f))) (define (common:get-area-path-signature) (message-digest-string (md5-primitive) *toppath*)) @@ -618,33 +992,24 @@ ;; (let ((ohh (common:on-homehost?)) ;; (srv (args:get-arg "-server"))) ;; (and ohh srv))) ;; (debug:print-info 0 *default-log-port* "common:run-sync? ohh=" ohh ", srv=" srv) - -;;;; run-ids -;; if #f use *db-local-sync* : or 'local-sync-flags -;; if #t use timestamps : or 'timestamps -(define (common:sync-to-megatest.db dbstruct) - (let ((start-time (current-seconds)) - (res (db:multi-db-sync dbstruct 'new2old))) - (let ((sync-time (- (current-seconds) start-time))) - (debug:print-info 3 *default-log-port* "Sync of newdb to olddb completed in " sync-time " seconds pid="(current-process-id)) - (if (common:low-noise-print 30 "sync new to old") - (debug:print-info 0 *default-log-port* "Sync of newdb to olddb completed in " sync-time " seconds pid="(current-process-id)))) - res)) - (define *wdnum* 0) (define *wdnum*mutex (make-mutex)) + + +(define (common:human-time) + (time->string (seconds->local-time (current-seconds)) "%Y-%m-%d %H:%M:%S")) + + ;; currently the primary job of the watchdog is to run the sync back to megatest.db from the db in /tmp ;; if we are on the homehost and we are a server (by definition we are on the homehost if we are a server) ;; - - (define (common:readonly-watchdog dbstruct) (thread-sleep! 0.05) ;; delay for startup (debug:print-info 13 *default-log-port* "common:readonly-watchdog entered.") ;; sync megatest.db to /tmp/.../megatst.db (let* ((sync-cool-off-duration 3) @@ -661,105 +1026,48 @@ (< duration-since-last-sync sync-cool-off-duration)) (thread-sleep! (- sync-cool-off-duration duration-since-last-sync))) (if (not *time-to-exit*) (let ((golden-mtdb-mtime (file-modification-time golden-mtpath)) (tmp-mtdb-mtime (file-modification-time tmp-mtpath))) - (if (> golden-mtdb-mtime tmp-mtdb-mtime) - (let ((res (db:multi-db-sync dbstruct 'old2new))) - (debug:print-info 13 *default-log-port* "rosync called, " res " records transferred."))) + (if (> golden-mtdb-mtime tmp-mtdb-mtime) + (if (< golden-mtdb-mtime (- (current-seconds) 3)) ;; file has NOT been touched in past three seconds, this way multiple servers won't fight to sync back + (let ((res (db:multi-db-sync dbstruct 'old2new))) + (debug:print-info 13 *default-log-port* "rosync called, " res " records transferred.")))) (loop (current-seconds))) #t))) (debug:print-info 0 *default-log-port* "Exiting readonly-watchdog timer, *time-to-exit* = " *time-to-exit*" pid="(current-process-id)" mtpath="golden-mtpath))) - - -(define (common:writable-watchdog dbstruct) - (thread-sleep! 0.05) ;; delay for startup - (let ((legacy-sync (common:run-sync?)) - (debug-mode (debug:debug-mode 1)) - (last-time (current-seconds)) - (this-wd-num (begin (mutex-lock! *wdnum*mutex) (let ((x *wdnum*)) (set! *wdnum* (add1 *wdnum*)) (mutex-unlock! *wdnum*mutex) x)))) - (debug:print-info 2 *default-log-port* "Periodic sync thread started.") - (debug:print-info 3 *default-log-port* "watchdog starting. legacy-sync is " legacy-sync" pid="(current-process-id)" this-wd-num="this-wd-num) - (if (and legacy-sync (not *time-to-exit*)) - (let* (;;(dbstruct (db:setup)) - (mtdb (dbr:dbstruct-mtdb dbstruct)) - (mtpath (db:dbdat-get-path mtdb))) - (debug:print-info 0 *default-log-port* "Server running, periodic sync started.") - (let loop () - ;; sync for filesystem local db writes - ;; - (mutex-lock! *db-multi-sync-mutex*) - (let* ((need-sync (>= *db-last-access* *db-last-sync*)) ;; no sync since last write - (sync-in-progress *db-sync-in-progress*) - (should-sync (and (not *time-to-exit*) - (> (- (current-seconds) *db-last-sync*) 5))) ;; sync every five seconds minimum - (start-time (current-seconds)) - (mt-mod-time (file-modification-time mtpath)) - (recently-synced (< (- start-time mt-mod-time) 4)) - (will-sync (and (or need-sync should-sync) - (not sync-in-progress) - (not recently-synced)))) - (debug:print-info 13 *default-log-port* "WD writable-watchdog top of loop. need-sync="need-sync" sync-in-progress="sync-in-progress" should-sync="should-sync" start-time="start-time" mt-mod-time="mt-mod-time" recently-synced="recently-synced" will-sync="will-sync) - ;; (if recently-synced (debug:print-info 0 *default-log-port* "Skipping sync due to recently-synced flag=" recently-synced)) - ;; (debug:print-info 0 *default-log-port* "need-sync: " need-sync " sync-in-progress: " sync-in-progress " should-sync: " should-sync " will-sync: " will-sync) - (if will-sync (set! *db-sync-in-progress* #t)) - (mutex-unlock! *db-multi-sync-mutex*) - (if will-sync - (let ((res (common:sync-to-megatest.db dbstruct))) ;; did we sync any data? If so need to set the db touched flag to keep the server alive - (if (> res 0) ;; some records were transferred, keep the db alive - (begin - (mutex-lock! *heartbeat-mutex*) - (set! *db-last-access* (current-seconds)) - (mutex-unlock! *heartbeat-mutex*) - (debug:print-info 0 *default-log-port* "sync called, " res " records transferred.")) - (debug:print-info 2 *default-log-port* "sync called but zero records transferred")))) - (if will-sync - (begin - (mutex-lock! *db-multi-sync-mutex*) - (set! *db-sync-in-progress* #f) - (set! *db-last-sync* start-time) - (mutex-unlock! *db-multi-sync-mutex*))) - (if (and debug-mode - (> (- start-time last-time) 60)) - (begin - (set! last-time start-time) - (debug:print-info 4 *default-log-port* "timestamp -> " (seconds->time-string (current-seconds)) ", time since start -> " (seconds->hr-min-sec (- (current-seconds) *time-zero*)))))) - - ;; keep going unless time to exit - ;; - (if (not *time-to-exit*) - (let delay-loop ((count 0)) - ;;(debug:print-info 13 *default-log-port* "delay-loop top; count="count" pid="(current-process-id)" this-wd-num="this-wd-num" *time-to-exit*="*time-to-exit*) - - (if (and (not *time-to-exit*) - (< count 4)) ;; was 11, changing to 4. - (begin - (thread-sleep! 1) - (delay-loop (+ count 1)))) - (if (not *time-to-exit*) (loop)))) - (if (common:low-noise-print 30) - (debug:print-info 0 *default-log-port* "Exiting watchdog timer, *time-to-exit* = " *time-to-exit*" pid="(current-process-id)" this-wd-num="this-wd-num))))))) - ;; TODO: for multiple areas, we will have multiple watchdogs; and multiple threads to manage (define (common:watchdog) (debug:print-info 13 *default-log-port* "common:watchdog entered.") - (if (common:on-homehost?) - (let ((dbstruct (db:setup))) - (debug:print-info 13 *default-log-port* "after db:setup with dbstruct="dbstruct) - (cond - ((dbr:dbstruct-read-only dbstruct) - (debug:print-info 13 *default-log-port* "loading read-only watchdog") - (common:readonly-watchdog dbstruct)) - (else - (debug:print-info 13 *default-log-port* "loading writable-watchdog.") - (common:writable-watchdog dbstruct))) - (debug:print-info 13 *default-log-port* "watchdog done.")) - (debug:print-info 13 *default-log-port* "no need for watchdog on non-homehost"))) + (if (launch:setup) + (if (common:on-homehost?) + (let ((dbstruct (db:setup #t))) + (debug:print-info 13 *default-log-port* "after db:setup with dbstruct=" dbstruct) + (cond + ((dbr:dbstruct-read-only dbstruct) + (debug:print-info 13 *default-log-port* "loading read-only watchdog") + (common:readonly-watchdog dbstruct)) + (else + (debug:print-info 13 *default-log-port* "loading writable-watchdog.") + (let* ((syncer (or (configf:lookup *configdat* "server" "sync-method") "delta-sync"))) ;; "brute-force-sync"))) + (cond + ((equal? syncer "brute-force-sync") + (server:writable-watchdog-bruteforce dbstruct)) + ((equal? syncer "delta-sync") + (server:writable-watchdog-deltasync dbstruct)) + (else + (debug:print-error 0 *default-log-port* "Unknown server/sync-method specified ("syncer") - valid values are brute-force-sync and delta-sync.") + (exit 1))) + ;;(debug:print 1 *default-log-port* "INFO: ["(common:human-time)"] Syncer started (method="syncer")") + ))) + (debug:print-info 13 *default-log-port* "watchdog done.")) + (debug:print-info 13 *default-log-port* "no need for watchdog on non-homehost")))) (define (std-exit-procedure) + ;;(common:telemetry-log-close) (on-exit (lambda () 0)) ;;(debug:print-info 13 *default-log-port* "std-exit-procedure called; *time-to-exit*="*time-to-exit*) (let ((no-hurry (if *time-to-exit* ;; hurry up #f (begin @@ -776,14 +1084,15 @@ (begin (sqlite3:interrupt! db) (sqlite3:finalize! db #t) ;; (vector-set! *task-db* 0 #f) (set! *task-db* #f))))) - (if (and *runremote* - (remote-conndat *runremote*)) - (begin - (http-client#close-all-connections!))) ;; for http-client + (http-client#close-all-connections!) + ;; (if (and *runremote* + ;; (remote-conndat *runremote*)) + ;; (begin + ;; (http-client#close-all-connections!))) ;; for http-client (if (not (eq? *default-log-port* (current-error-port))) (close-output-port *default-log-port*)) (set! *default-log-port* (current-error-port))) "Cleanup db exit thread")) (th2 (make-thread (lambda () (debug:print 4 *default-log-port* "Attempting clean exit. Please be patient and wait a few seconds...") @@ -803,18 +1112,29 @@ 0) (define (std-signal-handler signum) ;; (signal-mask! signum) + (set! *time-to-exit* #t) + ;;(debug:print-info 13 *default-log-port* "got signal "signum) + (debug:print-error 0 *default-log-port* "Received signal " signum " aaa exiting promptly") + ;; (std-exit-procedure) ;; shouldn't need this since we are exiting and it will be called anyway + (exit)) + +(define (special-signal-handler signum) + ;; (signal-mask! signum) (set! *time-to-exit* #t) ;;(debug:print-info 13 *default-log-port* "got signal "signum) - (debug:print-error 0 *default-log-port* "Received signal " signum " exiting promptly") + (debug:print-error 0 *default-log-port* "Received signal " signum " sending email befor exiting!!") + ;;TODO send email to notify admin contact listed in the config that the lisner got killed ;; (std-exit-procedure) ;; shouldn't need this since we are exiting and it will be called anyway (exit)) + (set-signal-handler! signal/int std-signal-handler) ;; ^C (set-signal-handler! signal/term std-signal-handler) + ;; (set-signal-handler! signal/stop std-signal-handler) ;; ^Z NO, do NOT handle ^Z! ;;====================================================================== ;; M I S C U T I L S ;;====================================================================== @@ -858,19 +1178,19 @@ #f (let loop ((hed (car cmds)) (tal (cdr cmds))) (let ((res (with-input-from-pipe (conc "which " hed) read-line))) (if (and (string? res) - (file-exists? res)) + (common:file-exists? res)) res (if (null? tal) #f (loop (car tal)(cdr tal)))))))) (define (common:get-install-area) (let ((exe-path (car (argv)))) - (if (file-exists? exe-path) + (if (common:file-exists? exe-path) (handle-exceptions exn #f (pathname-directory (pathname-directory @@ -886,12 +1206,15 @@ (tal (cdr dirs))) (let ((res (or (and (directory? hed) (file-write-access? hed) hed) (handle-exceptions - exn - #f + exn + (begin + (debug:print-info 0 *default-log-port* "could not create " hed + ", this might cause problems down the road. exn=" exn) + #f) (create-directory hed #t))))) (if (and (string? res) (directory? res)) res (if (null? tal) @@ -924,11 +1247,23 @@ ;; (define (common:bash-glob instr) (string-split (with-input-from-pipe (conc "/bin/bash -c \"echo " instr "\"") - read-line))) + read-line))) + +;;====================================================================== +;; Some safety net stuff +;;====================================================================== + +;; return input if it is a list or return null +(define (common:list-or-null inlst #!key (ovrd #f)(message #f)) + (if (list? inlst) + inlst + (begin + (if message (debug:print-error 0 *default-log-port* message)) + (or ovrd '())))) ;;====================================================================== ;; T A R G E T S , S T A T E , S T A T U S , ;; R U N N A M E A N D T E S T P A T T ;;====================================================================== @@ -965,21 +1300,31 @@ (or (args:get-arg "-status")(args:get-arg ":status"))) (define (common:args-get-testpatt rconf) (let* (;; (tagexpr (args:get-arg "-tagexpr")) ;; (tags-testpatt (if tagexpr (string-join (runs:get-tests-matching-tags tagexpr) ",") #f)) - (testpatt-key (if (args:get-arg "--modepatt") (args:get-arg "--modepatt") "TESTPATT")) + (testpatt-key (or (args:get-arg "-modepatt") (args:get-arg "--modepatt") "TESTPATT")) (args-testpatt (or (args:get-arg "-testpatt") (args:get-arg "-runtests") "%")) (rtestpatt (if rconf (runconfigs-get rconf testpatt-key) #f))) (cond + ((or (args:get-arg "--modepatt") (args:get-arg "-modepatt")) ;; modepatt is a forced setting, when set it MUST refer to an existing PATT in the runconfig + (if rconf + (let* ((patts-from-mode-patt (runconfigs-get rconf testpatt-key))) + (debug:print-info 0 *default-log-port* "modepatt defined is: "testpatt-key" runconfigs values for " testpatt-key " " patts-from-mode-patt) + patts-from-mode-patt) + (begin + (debug:print-info 0 *default-log-port* " modepatt defined is: "testpatt-key" runconfigs values for " testpatt-key) ;; " " patts-from-mode-patt) + #f))) ;; We do NOT fall back to "%" ;; (tags-testpatt ;; (debug:print-info 0 *default-log-port* "-tagexpr "tagexpr" selects testpatt "tags-testpatt) ;; tags-testpatt) ((and (equal? args-testpatt "%") rtestpatt) (debug:print-info 0 *default-log-port* "testpatt defined in "testpatt-key" from runconfigs: " rtestpatt) rtestpatt) - (else args-testpatt)))) + (else + (debug:print-info 0 *default-log-port* "using testpatt " args-testpatt " rtestpatt:" rtestpatt) + args-testpatt)))) (define (common:false-on-exception thunk #!key (message #f)) (handle-exceptions exn @@ -986,44 +1331,67 @@ (begin (if message (debug:print-info 0 *default-log-port* message)) #f) (thunk) )) -(define (common:file-exists? path-string) +(define (common:file-exists? path-string #!key (silent #f)) ;; this avoids stack dumps in the case where ;;;; TODO: catch permission denied exceptions and emit appropriate warnings, eg: system error while trying to access file: "/nfs/pdx/disks/icf_env_disk001/bjbarcla/gwa/issues/mtdev/randy-slow/reproduce/q... (common:false-on-exception (lambda () (file-exists? path-string)) - message: (conc "Unable to access path: " path-string) + message: (if (not silent) + (conc "Unable to access path: " path-string) + #f) )) (define (common:directory-exists? path-string) ;;;; TODO: catch permission denied exceptions and emit appropriate warnings, eg: system error while trying to access file: "/nfs/pdx/disks/icf_env_disk001/bjbarcla/gwa/issues/mtdev/randy-slow/reproduce/q... (common:false-on-exception (lambda () (directory-exists? path-string)) message: (conc "Unable to access path: " path-string) )) +;; does the directory exist and do we have write access? +;; +;; returns the directory or #f +;; +(define (common:directory-writable? path-string) + (handle-exceptions + exn + (begin + (debug:print 0 *default-log-port* "Failed to identify access to " path-string ", exn=" exn) + #f) + (if (and (directory-exists? path-string) + (file-write-access? path-string)) + path-string + #f))) (define (common:get-linktree) (or (getenv "MT_LINKTREE") - (or (and *configdat* - (configf:lookup *configdat* "setup" "linktree")) - (if *toppath* - (conc *toppath* "/lt") - (if (file-exists? "megatest.config") ;; we are in the toppath (new area, mtutils compatible) - (conc (current-directory) "/lt") - #f))))) + (if *configdat* + (configf:lookup *configdat* "setup" "linktree") + #f) + (if (or *toppath* (getenv "MT_RUN_AREA_HOME")) + (conc (or *toppath* (getenv "MT_RUN_AREA_HOME")) "/lt") + #f) + (let* ((tp (common:get-toppath #f)) + (lt (conc tp "/lt"))) + (if (not tp)(debug:print 0 *default-log-port* "WARNING: cannot calculate best path for linktree, using " lt)) + lt))) (define (common:args-get-runname) (let ((res (or (args:get-arg "-runname") (args:get-arg ":runname") (getenv "MT_RUNNAME")))) ;; (if res (set-environment-variable "MT_RUNNAME" res)) ;; not sure if this is a good idea. side effect and all ... res)) + +(define (common:get-fields cfgdat) + (let ((fields (hash-table-ref/default cfgdat "fields" '()))) + (map car fields))) (define (common:args-get-target #!key (split #f)(exit-if-bad #f)) - (let* ((keys (if (hash-table? *configdat*) (keys:config-get-fields *configdat*) '())) + (let* ((keys (if (hash-table? *configdat*) (common:get-fields *configdat*) '())) (numkeys (length keys)) (target (or (args:get-arg "-reqtarg") (args:get-arg "-target") (getenv "MT_TARGET"))) (tlist (if target (string-split target "/" #t) '())) @@ -1041,10 +1409,20 @@ (begin (debug:print-error 0 *default-log-port* "Invalid target, spaces or blanks not allowed \"" target "\", target should be: " (string-intersperse keys "/") ", have " tlist " for elements") (if exit-if-bad (exit 1)) #f) #f)))) + +;; looking only (at least for now) at the MT_ variables craft the full testname +;; +(define (common:get-full-test-name) + (if (getenv "MT_TEST_NAME") + (if (and (getenv "MT_ITEMPATH") + (not (equal? (getenv "MT_ITEMPATH") ""))) + (getenv "MT_TEST_NAME") + (conc (getenv "MT_TEST_NAME") "/" (getenv "MT_ITEMPATH"))) + #f)) ;; logic for getting homehost. Returns (host . at-home) ;; IF *toppath* is not set, wait up to five seconds trying every two seconds ;; (this is to accomodate the watchdog) ;; @@ -1071,19 +1449,23 @@ (handle-exceptions exn (if (> trynum 0) (let ((delay-time (* (- 5 trynum) 5))) (mutex-unlock! *homehost-mutex*) - (debug:print 0 *default-log-port* "ERROR: Failed to read .homehost file, delaying " delay-time " seconds and trying again, message: " ((condition-property-accessor 'exn 'message) exn)) + (debug:print 0 *default-log-port* "ERROR: ["(common:human-time)"] Failed to read .homehost file, delaying " + delay-time " seconds and trying again, message: " ((condition-property-accessor 'exn 'message) exn) + ", exn=" exn) (thread-sleep! delay-time) (common:get-homehost trynum: (- trynum 1))) (begin (mutex-unlock! *homehost-mutex*) - (debug:print 0 *default-log-port* "ERROR: Failed to read .homehost file after trying five times. Giving up and exiting, message: " ((condition-property-accessor 'exn 'message) exn)) + (debug:print 0 *default-log-port* "ERROR: ["(common:human-time) + "] Failed to read .homehost file after trying five times. Giving up and exiting, message: " + ((condition-property-accessor 'exn 'message) exn)) (exit 1))) (let ((hhf (conc *toppath* "/.homehost"))) - (if (file-exists? hhf) + (if (common:file-exists? hhf) (with-input-from-file hhf read-line) (if (file-write-access? *toppath*) (begin (with-output-to-file hhf (lambda () @@ -1107,14 +1489,24 @@ #f))) ;; do we honor the caches of the config files? ;; (define (common:use-cache?) - (not (or (args:get-arg "-no-cache") - (and *configdat* - (equal? (configf:lookup *configdat* "setup" "use-cache") "no"))))) - + (let ((res #t)) ;; priority by order of evaluation + (if *configdat* ;; sillyness here. can't use setup/use-cache to know if we can use the cached files! + (if (equal? (configf:lookup *configdat* "setup" "use-cache") "no") + (set! res #f) + (if (equal? (configf:lookup *configdat* "setup" "use-cache") "yes") + (set! res #t)))) + (if (args:get-arg "-no-cache")(set! res #f)) ;; overrides setting in "setup" + (if (getenv "MT_USE_CACHE") + (if (equal? (getenv "MT_USE_CACHE") "yes") + (set! res #t) + (if (equal? (getenv "MT_USE_CACHE") "no") + (set! res #f)))) ;; overrides -no-cache switch + res)) + ;; force use of server? ;; (define (common:force-server?) (let* ((force-setting (configf:lookup *configdat* "server" "force")) (force-type (if force-setting (string->symbol force-setting) #f)) @@ -1131,17 +1523,10 @@ (begin (debug:print-info 0 *default-log-port* "forcing use of server, force setting is \"" force-setting "\".") #t) #f))) -;; do we honor the caches of the config files? -;; -(define (common:use-cache?) - (not (or (args:get-arg "-no-cache") - (and *configdat* - (equal? (configf:lookup *configdat* "setup" "use-cache") "no"))))) - ;;====================================================================== ;; M I S C L I S T S ;;====================================================================== ;; items in lista are matched value and position in listb @@ -1295,10 +1680,33 @@ new-rownames new-colnames (if (> curr-rownum rownum) curr-rownum rownum) (if (> curr-colnum colnum) curr-colnum colnum) )))))) + +;; if it looks like a number -> convert it to a number, else return it +;; +(define (common:lazy-convert inval) + (let* ((as-num (if (string? inval)(string->number inval) #f))) + (or as-num inval))) + +;; convert string a=1; b=2; c=a silly thing; d= +;; to '((a . 1)(b . 2)(c . "a silly thing")(d . "")) +;; +(define (common:val->alist val #!key (convert #f)) + (let ((val-list (string-split-fields ";\\s*" val #:infix))) + (if val-list + (map (lambda (x) + (let ((f (string-split-fields "\\s*=\\s*" x #:infix))) + (case (length f) + ((0) `(,#f)) ;; null string case + ((1) `(,(string->symbol (car f)))) + ((2) `(,(string->symbol (car f)) . ,(let ((inval (cadr f))) + (if convert (common:lazy-convert inval) inval)))) + (else f)))) + val-list) + '()))) ;;====================================================================== ;; S Y S T E M S T U F F ;;====================================================================== @@ -1305,26 +1713,32 @@ ;; lazy-safe get file mod time. on any error (file not existing etc.) return 0 ;; (define (common:lazy-modification-time fpath) (handle-exceptions exn - 0 - (file-modification-time fpath))) + (begin + (debug:print 0 *default-log-port* "Failed to get modifcation time for " fpath ", treating it as zero. exn=" exn) + 0) + (if (file-exists? fpath) + (file-modification-time fpath) + 0))) ;; find timestamp of newest file associated with a sqlite db file (define (common:lazy-sqlite-db-modification-time fpath) (let* ((glob-list (handle-exceptions exn - `(,(conc "/no/such/file, message: " ((condition-property-accessor 'exn 'message) exn))) + (begin + (debug:print 0 *default-log-port* "Failed to glob " fpath "*, exn=" exn) + `(,(conc "/no/such/file, message: " ((condition-property-accessor 'exn 'message) exn)))) (glob (conc fpath "*")))) (file-list (if (eq? 0 (length glob-list)) '("/no/such/file") glob-list))) (apply max - (map - common:lazy-modification-time - file-list)))) + (map + common:lazy-modification-time + file-list)))) ;; return a nice clean pathname made absolute (define (common:nice-path dir) (let ((match (string-match "^(~[^\\/]*)(\\/.*|)$" dir))) (if match ;; using ~ for home? @@ -1338,16 +1752,60 @@ (define (common:read-link-f path) (handle-exceptions exn (begin - (debug:print-error 0 *default-log-port* "command \"/bin/readlink -f " path "\" failed.") + (debug:print-error 0 *default-log-port* "command \"/bin/readlink -f " path "\" failed. exn=" exn) path) ;; just give up (with-input-from-pipe (conc "/bin/readlink -f " path) (lambda () (read-line))))) + +;; returns *effective load* (not normalized) +;; +(define (common:get-intercept onemin fivemin) + (if (< onemin fivemin) ;; load is decreasing, just use the onemin load + onemin + (let* ((load-change (- onemin fivemin)) + (tchange (- 300 60))) + (max (+ onemin (* 60 (/ load-change tchange))) 0)))) + +;; calculate a delay number based on a droop curve +;; inputs are: +;; - load-in, load as from uptime, NOT normalized +;; - numcpus, number of cpus, ideally use the real cpus, not threads +;; +(define (common:get-delay load-in numcpus) + (let* ((ratio (/ load-in numcpus)) + (new-option (configf:lookup *configdat* "load" "new-load-method")) + (paramstr (or (configf:lookup *configdat* "load" "exp-params") + "15 12 1281453987.9543 0.75")) ;; 5 4 10 1")) + (paramlst (map string->number (string-split paramstr)))) + (if new-option + (begin + (cond ((and (>= ratio 0) (< ratio .5)) + 0) + ((and (>= ratio 0.5) (<= ratio .9)) + (* ratio (/ 5 .9))) + ((and (> ratio .9) (<= ratio 1.1)) + (+ 5 (* (- ratio .9) (/ 55 .2)))) + ((> ratio 1.1) + 60))) + (match paramlst + ((r1 r2 s1 s2) + (debug:print 3 *default-log-port* "Using params r1=" r1 " r2=" r2 " s1=" s1 " s2=" s2) + (min (max (/ (expt r1 (* r2 s2 ratio)) s1) 0) 30)) + (else + (debug:print 0 *default-log-port* "BAD exp-params, should be \"r1 r2 s1 s2\" but got " paramstr) + 30))))) + +(define (common:print-delay-table) + (let loop ((x 0)) + (print x "," (common:get-delay x 1)) + (if (< x 2) + (loop (+ x 0.1))))) (define (get-cpu-load #!key (remote-host #f)) (car (common:get-cpu-load remote-host))) ;; (let* ((load-res (process:cmd-run->list "uptime")) ;; (load-rx (regexp "load average:\\s+(\\d+)")) @@ -1358,77 +1816,187 @@ ;; (let ((newval (string->number (cadr match)))) ;; (if (number? newval) ;; (set! cpu-load newval)))))) ;; (car load-res)) ;; cpu-load)) + +;; get values from cached info from dropping file in logs dir +;; e.g. key is host and dtype is normalized-load +;; +(define (common:get-cached-info key dtype #!key (age 10)) + (if *toppath* + (let* ((fullpath (conc *toppath* "/.sysdata/" key "-" dtype ".log")) + (delfile (lambda () + (debug:print-info 1 *default-log-port* " removing bad file " fullpath ", exn=" exn) + (delete-file* fullpath) + #f))) + (if (and (file-exists? fullpath) + (file-read-access? fullpath)) + (handle-exceptions + exn + (begin + (debug:print 0 *default-log-port* "failed to get cached info from " fullpath ", exn=" exn) + #f) + (debug:print 2 *default-log-port* "reading file " fullpath) + (let ((real-age (- (current-seconds) + (handle-exceptions + exn + (begin + (debug:print 1 *default-log-port* "Failed to read mod time on file " + fullpath ", using 0, exn=" exn) + 0) + (file-change-time fullpath))))) + (if (< real-age age) + (handle-exceptions + exn + (delfile) + (let* ((res (with-input-from-file fullpath read))) + (if (eof-object? res) + (begin + (delfile) + #f) + res))) + (begin + (debug:print-info 2 *default-log-port* "file " fullpath + " is too old (" real-age" seconds) to trust, skipping reading it") + #f)))) + (begin + (debug:print 2 *default-log-port* "not reading file " fullpath) + #f))) + #f)) + +(define (common:write-cached-info key dtype dat) + (if *toppath* + (let* ((fulldir (conc *toppath* "/.sysdata")) + (fullpath (conc fulldir "/" key "-" dtype ".log"))) + (if (not (file-exists? fulldir))(create-directory fulldir #t)) + (handle-exceptions + exn + (begin + (debug:print 0 *default-log-path* "failed to write file " fullpath ", exn=" exn) + #f) + (with-output-to-file fullpath (lambda ()(pp dat))))) + #f)) + +(define (common:raw-get-remote-host-load remote-host) + (handle-exceptions + exn + (begin + (debug:print 0 *default-log-port* "failed to ssh to " remote-host " and get loadavg. exn=" exn) + #f) ;; more specific handling of errors needed + (with-input-from-pipe + (conc "ssh " remote-host " cat /proc/loadavg") + (lambda ()(list (read)(read)(read)))))) ;; get cpu load by reading from /proc/loadavg, return all three values ;; (define (common:get-cpu-load remote-host) - (if remote-host - (map (lambda (res) - (if (eof-object? res) 9e99 res)) - (with-input-from-pipe - (conc "ssh " remote-host " cat /proc/loadavg") - (lambda ()(list (read)(read)(read))))) - (with-input-from-file "/proc/loadavg" - (lambda ()(list (read)(read)(read)))))) + (handle-exceptions + exn + (begin + (debug:print 0 *default-log-port* "failed to ssh or read loadavg from host " remote-host ", exn=" exn) + '(-99 -99 -99)) + (let* ((actual-hostname (or remote-host (get-host-name) "localhost"))) + (or (common:get-cached-info actual-hostname "cpu-load") + (let ((result (if remote-host + (map (lambda (res) + (if (eof-object? res) 9e99 res)) + (with-input-from-pipe + (conc "ssh " remote-host " cat /proc/loadavg") + (lambda ()(list (read)(read)(read))))) + (with-input-from-file "/proc/loadavg" + (lambda ()(list (read)(read)(read))))))) + (match + result + ((l1 l2 l3) + (if (and (number? l1) + (number? l2) + (number? l3)) + (begin + (common:write-cached-info actual-hostname "cpu-load" result) + result) + '(-1 -1 -1))) ;; -1 is bad result + (else '(-2 -2 -2)))))))) ;; get normalized cpu load by reading from /proc/loadavg and /proc/cpuinfo return all three values and the number of real cpus and the number of threads ;; returns alist '((adj-cpu-load . normalized-proc-load) ... etc. ;; keys: adj-proc-load, adj-core-load, 1m-load, 5m-load, 15m-load ;; (define (common:get-normalized-cpu-load remote-host) - (let ((data (if remote-host - (with-input-from-pipe - (conc "ssh " remote-host " cat /proc/loadavg;cat /proc/cpuinfo;echo end") - read-lines) - (append - (with-input-from-file "/proc/loadavg" - read-lines) - (with-input-from-file "/proc/cpuinfo" - read-lines) - (list "end")))) - (load-rx (regexp "^([\\d\\.]+)\\s+([\\d\\.]+)\\s+([\\d\\.]+)\\s+.*$")) - (proc-rx (regexp "^processor\\s+:\\s+(\\d+)\\s*$")) - (core-rx (regexp "^core id\\s+:\\s+(\\d+)\\s*$")) - (phys-rx (regexp "^physical id\\s+:\\s+(\\d+)\\s*$")) - (max-num (lambda (p n)(max (string->number p) n)))) - ;; (print "data=" data) - (if (null? data) ;; something went wrong - #f - (let loop ((hed (car data)) - (tal (cdr data)) - (loads #f) - (proc-num 0) ;; processor includes threads - (phys-num 0) ;; physical chip on motherboard - (core-num 0)) ;; core - ;; (print hed ", " loads ", " proc-num ", " phys-num ", " core-num) - (if (null? tal) ;; have all our data, calculate normalized load and return result - (let* ((act-proc (+ proc-num 1)) - (act-phys (+ phys-num 1)) - (act-core (+ core-num 1)) - (adj-proc-load (/ (car loads) act-proc)) - (adj-core-load (/ (car loads) act-core))) - (append (list (cons 'adj-proc-load adj-proc-load) - (cons 'adj-core-load adj-core-load)) - (list (cons '1m-load (car loads)) - (cons '5m-load (cadr loads)) - (cons '15m-load (caddr loads))) - (list (cons 'proc act-proc) - (cons 'core act-core) - (cons 'phys act-phys)))) - (regex-case - hed - (load-rx ( x l1 l5 l15 ) (loop (car tal)(cdr tal)(map string->number (list l1 l5 l15)) proc-num phys-num core-num)) - (proc-rx ( x p ) (loop (car tal)(cdr tal) loads (max-num p proc-num) phys-num core-num)) - (phys-rx ( x p ) (loop (car tal)(cdr tal) loads proc-num (max-num p phys-num) core-num)) - (core-rx ( x c ) (loop (car tal)(cdr tal) loads proc-num phys-num (max-num c core-num))) - (else - (begin - ;; (print "NO MATCH: " hed) - (loop (car tal)(cdr tal) loads proc-num phys-num core-num))))))))) + (let ((res (common:get-normalized-cpu-load-raw remote-host)) + (default `((adj-proc-load . 2) ;; there is no right answer + (adj-core-load . 2) + (1m-load . 2) + (5m-load . 0) ;; causes a large delta - thus causing default of throttling if stuff goes wrong + (15m-load . 0) + (proc . 1) + (core . 1) + (phys . 1) + (error . #t)))) + (cond + ((and (list? res) + (> (length res) 2)) + res) + ((eq? res #f) default) ;; add messages? + ((eq? res #f) default) ;; this would be the #eof + (else default)))) + +(define (common:get-normalized-cpu-load-raw remote-host) + (let* ((actual-host (or remote-host (get-host-name)))) ;; #f is localhost + (or (common:get-cached-info actual-host "normalized-load") + (let ((data (if remote-host + (with-input-from-pipe + (conc "ssh " remote-host " \"cat /proc/loadavg;cat /proc/cpuinfo;echo end\"") + read-lines) + (append + (with-input-from-file "/proc/loadavg" + read-lines) + (with-input-from-file "/proc/cpuinfo" + read-lines) + (list "end")))) + (load-rx (regexp "^([\\d\\.]+)\\s+([\\d\\.]+)\\s+([\\d\\.]+)\\s+.*$")) + (proc-rx (regexp "^processor\\s+:\\s+(\\d+)\\s*$")) + (core-rx (regexp "^core id\\s+:\\s+(\\d+)\\s*$")) + (phys-rx (regexp "^physical id\\s+:\\s+(\\d+)\\s*$")) + (max-num (lambda (p n)(max (string->number p) n)))) + ;; (print "data=" data) + (if (null? data) ;; something went wrong + #f + (let loop ((hed (car data)) + (tal (cdr data)) + (loads #f) + (proc-num 0) ;; processor includes threads + (phys-num 0) ;; physical chip on motherboard + (core-num 0)) ;; core + ;;; (print hed ", " loads ", " proc-num ", " phys-num ", " core-num) + (if (null? tal) ;; have all our data, calculate normalized load and return result + (let* ((act-proc (+ proc-num 1)) + (act-phys (+ phys-num 1)) + (act-core (+ core-num 1)) + (adj-proc-load (/ (car loads) act-proc)) + (adj-core-load (/ (car loads) act-core)) + (result + (append (list (cons 'adj-proc-load adj-proc-load) + (cons 'adj-core-load adj-core-load)) + (list (cons '1m-load (car loads)) + (cons '5m-load (cadr loads)) + (cons '15m-load (caddr loads))) + (list (cons 'proc act-proc) + (cons 'core act-core) + (cons 'phys act-phys))))) + (common:write-cached-info actual-host "normalized-load" result) + result) + (regex-case + hed + (load-rx ( x l1 l5 l15 ) (loop (car tal)(cdr tal)(map string->number (list l1 l5 l15)) proc-num phys-num core-num)) + (proc-rx ( x p ) (loop (car tal)(cdr tal) loads (max-num p proc-num) phys-num core-num)) + (phys-rx ( x p ) (loop (car tal)(cdr tal) loads proc-num (max-num p phys-num) core-num)) + (core-rx ( x c ) (loop (car tal)(cdr tal) loads proc-num phys-num (max-num c core-num))) + (else + (begin + ;; (print "NO MATCH: " hed) + (loop (car tal)(cdr tal) loads proc-num phys-num core-num))))))))))) (define (common:unix-ping hostname) (let ((res (system (conc "ping -c 1 " hostname " > /dev/null")))) (eq? res 0))) @@ -1435,16 +2003,16 @@ ;; ideally put all this info into the db, no need to preserve it across moving homehost ;; ;; return list of ;; ( reachable? cpuload update-time ) (define (common:get-host-info hostname) - (let* ((loadinfo (rmt:get-latest-host-load hostname)) - (load (car loadinfo)) - (load-sample-time (cdr loadinfo)) - (load-sample-age (- (current-seconds) load-sample-time)) - (loadinfo-timeout-seconds 20) - (host-last-update-timeout-seconds 10) + (let* ((loadinfo (rmt:get-latest-host-load hostname)) ;; if this host happens to have been recently used by a test reuse the load data + (load (car loadinfo)) + (load-sample-time (cdr loadinfo)) + (load-sample-age (- (current-seconds) load-sample-time)) + (loadinfo-timeout-seconds 6) ;; this was 20 seconds, seems way too lax. Switch to 6 seconds + (host-last-update-timeout-seconds 4) (host-rec (hash-table-ref/default *host-loads* hostname #f)) ) (cond ((< load-sample-age loadinfo-timeout-seconds) (list #t @@ -1456,14 +2024,18 @@ (host-last-update host-rec) (host-last-cpuload host-rec ))) ((common:unix-ping hostname) (list #t (current-seconds) - (alist-ref 'adj-core-load (common:get-normalized-cpu-load hostname)))) + (alist-ref 'adj-core-load (common:get-normalized-cpu-load hostname)))) ;; this is cheaper than you might think. get-normalized-cpu-load is cached for up to 5 seconds (else - (list #f 0 -1))))) - + (list #f 0 -1) ;; bad host, don't use! + )))) + +;; see defstruct host at top of file. +;; host: reachable last-update last-used last-cpuload +;; (define (common:update-host-loads-table hosts-raw) (let* ((hosts (filter (lambda (x) (string-match (regexp "^\\S+$") x)) hosts-raw))) (for-each @@ -1481,81 +2053,283 @@ (host-reachable-set! rec is-reachable) (host-last-update-set! rec last-reached-time) (host-last-cpuload-set! rec load))) hosts))) -(define (common:get-least-loaded-host hosts-raw) - (let* ((hosts (filter (lambda (x) - (string-match (regexp "^\\S+$") x)) - hosts-raw)) - (best-host #f) +;; go through the hosts from least recently used to most recently used, pick the first that meets the load criteral from the +;; [host-rules] section. +;; +(define (common:get-least-loaded-host hosts-raw host-type configdat) + (let* ((rdat (configf:lookup configdat "host-rules" host-type)) + (rules (common:val->alist (or rdat "") convert: #t)) ;; maxnload, maxnjobs, maxjobrate + (maxnload (common:alist-ref/default 'maxnload rules 1.5)) ;; max normalized load + (maxnjobs (common:alist-ref/default 'maxnjobs rules 1.5)) ;; max normalized number of jobs + (maxjobrate (common:alist-ref/default 'maxjobrate rules (/ 1 6))) ;; max rate of submitting jobs to a given host in jobs/second + (hosts (filter (lambda (x) + (string-match (regexp "^\\S+$") x)) + hosts-raw)) + ;; (best-host #f) + (get-rec (lambda (hostname) + ;; (print "get-rec hostname=" hostname) + (let ((h (hash-table-ref/default *host-loads* hostname #f))) + (if h + h + (let ((h (make-host))) + (hash-table-set! *host-loads* hostname h) + h))))) (best-load 99999) - (curr-time (current-seconds))) - (common:update-host-loads-table hosts) - (for-each - (lambda (hostname) - (let* ((rec - (let ((h (hash-table-ref/default *host-loads* hostname #f))) - (if h - h - (let ((h (make-host))) - (hash-table-set! *host-loads* hostname h) - h)))) - (reachable (host-reachable rec)) - (load (host-last-cpuload rec))) - (cond - ((not reachable) #f) - ((< (+ load (/ (random 250) 1000)) ;; add a random factor to keep from getting in a rut - (+ best-load (/ (random 250) 1000)) ) - (set! best-load load) - (set! best-host hostname))))) - hosts) - best-host)) - - - - -(define (common:wait-for-cpuload maxload numcpus waitdelay #!key (count 1000) (msg #f)(remote-host #f)) - (let* ((loadavg (common:get-cpu-load remote-host)) - (first (car loadavg)) - (next (cadr loadavg)) - (adjload (* maxload numcpus)) - (loadjmp (- first next))) - (cond - ((and (> first adjload) - (> count 0)) - (debug:print-info 0 *default-log-port* "waiting " waitdelay " seconds due to load " first " exceeding max of " adjload (if msg msg "")) - (thread-sleep! waitdelay) - (common:wait-for-cpuload maxload numcpus waitdelay count: (- count 1))) - ((and (> loadjmp numcpus) - (> count 0)) - (debug:print-info 0 *default-log-port* "waiting " waitdelay " seconds due to load jump " loadjmp " > numcpus " numcpus (if msg msg "")) - (thread-sleep! waitdelay) - (common:wait-for-cpuload maxload numcpus waitdelay count: (- count 1)))))) - + (curr-time (current-seconds)) + (get-hosts-sorted (lambda (hosts) + (sort hosts (lambda (a b) + (let ((a-rec (get-rec a)) + (b-rec (get-rec b))) + ;; (print "a=" a " a-rec=" a-rec " host-last-used=" (host-last-used a-rec)) + ;; (print "b=" b " b-rec=" b-rec " host-last-used=" (host-last-used b-rec)) + (< (host-last-used a-rec) + (host-last-used b-rec)))))))) + (debug:print 0 *default-log-port* "INFO: hosts-sorted=" (get-hosts-sorted hosts)) + (if (null? hosts) + #f ;; no hosts to select from. All done and giving up now. + (let ((hosts-sorted (get-hosts-sorted hosts))) + (common:update-host-loads-table hosts) + (let loop ((hostname (car hosts-sorted)) + (tal (cdr hosts-sorted)) + (best-host #f)) + (let* ((rec (get-rec hostname)) + (reachable (host-reachable rec)) + (load (host-last-cpuload rec)) + (last-used (host-last-used rec)) + (delta (- curr-time last-used)) + (job-rate (if (> delta 0) + (/ 1 delta) + 999)) ;; jobs per second + (new-best + (cond + ((not reachable) + (debug:print 0 *default-log-port* "Skipping host " hostname " as it cannot be reached.") + best-host) + ((and (< load maxnload) ;; load is acceptable + (< job-rate maxjobrate)) ;; job rate is acceptable + (set! best-load load) + hostname) + (else best-host)))) + (debug:print 0 *default-log-port* "INFO: Trying host " hostname " with load " load ", last used " delta " seconds ago, with job-rate " job-rate " for running a test." ) + (if new-best + (begin ;; found a host, return it + (debug:print 0 *default-log-port* "INFO: Found host: " new-best " load: " load " last-used: " delta " seconds ago, with job-rate: " job-rate) + (host-last-used-set! rec curr-time) + new-best) + (if (null? tal) #f (loop (car tal)(cdr tal) best-host))))))))) + +(define (common:wait-for-homehost-load maxnormload msg) + (let* ((hh-dat (if (common:on-homehost?) ;; if we are on the homehost then pass in #f so the calls are local. + #f + (common:get-homehost))) + (hh (if hh-dat (car hh-dat) #f))) + (common:wait-for-normalized-load maxnormload msg hh))) + +(define *numcpus-cache* (make-hash-table)) (define (common:get-num-cpus remote-host) - (let ((proc (lambda () - (let loop ((numcpu 0) - (inl (read-line))) - (if (eof-object? inl) - numcpu - (loop (if (string-match "^processor\\s+:\\s+\\d+$" inl) - (+ numcpu 1) - numcpu) - (read-line))))))) - (if remote-host - (with-input-from-pipe - (conc "ssh " remote-host " cat /proc/cpuinfo") - proc) - (with-input-from-file "/proc/cpuinfo" proc)))) + (let* ((actual-host (or remote-host (get-host-name)))) + ;; hosts had better not be changing the number of cpus too often! + (or (hash-table-ref/default *numcpus-cache* actual-host #f) + (let* ((numcpus (or (common:get-cached-info actual-host "num-cpus" age: (+ 2592000 (random 3600))) + (let* ((proc (lambda () + (let loop ((numcpu 0) + (inl (read-line))) + (if (eof-object? inl) + (if (> numcpu 0) + numcpu + #f) ;; if zero return #f so caller knows that things are not working + (loop (if (string-match "^processor\\s+:\\s+\\d+$" inl) + (+ numcpu 1) + numcpu) + (read-line)))))) + (result (if remote-host + (with-input-from-pipe + (conc "ssh " remote-host " cat /proc/cpuinfo") + proc) + (with-input-from-file "/proc/cpuinfo" proc)))) + (if (and (number? result) + (> result 0)) + (common:write-cached-info actual-host "num-cpus" result)) + result)))) + (hash-table-set! *numcpus-cache* actual-host numcpus) + numcpus)))) ;; wait for normalized cpu load to drop below maxload ;; -(define (common:wait-for-normalized-load maxload #!key (msg #f)(remote-host #f)) +(define (common:wait-for-normalized-load maxnormload msg remote-host #!optional (rem-tries 5)) (let ((num-cpus (common:get-num-cpus remote-host))) - (common:wait-for-cpuload maxload num-cpus 15 msg: msg))) + (if num-cpus + (common:wait-for-cpuload maxnormload num-cpus 15 msg: msg remote-host: remote-host) + (begin + (thread-sleep! (random 60)) ;; we failed to get num cpus. wait a bit and try again + (if (> rem-tries 0) + (common:wait-for-normalized-load maxnormload msg remote-host (- rem-tries 1)) + #f))))) +;; DO NOT CALL THIS DIRECTLY. It is called from common:wait-for-normalized-load +;; count - count down to zero, at some point we'd give up if the load never drops +;; num-tries - count down to zero number tries to get numcpus +;; +(define (common:wait-for-cpuload maxnormload numcpus-in + #!key (count 1000) + (msg #f)(remote-host #f)(num-tries 5)) + (let* ((loadavg (common:get-cpu-load remote-host)) + ;; not possible to have zero. If we get 1, it's possible that we got the previous default, and we should check again + (numcpus (if (<= 1 numcpus-in) + (common:get-num-cpus remote-host) + numcpus-in)) + (first (car loadavg)) + (next (cadr loadavg)) + (adjmaxload (* maxnormload (max 1 numcpus))) ;; possible bug + ;; where numcpus + ;; (or could be + ;; maxload) is + ;; zero, crude + ;; fallback is to + ;; at least use 1 + ;; effective load accounts for load jumps, this should elminate all the first-next-avg, adjwait, load-jump-limit + ;; etc. + (effective-load (common:get-intercept first next)) + (recommended-delay (common:get-delay effective-load numcpus)) + (effective-host (or remote-host "localhost")) + (normalized-effective-load (/ effective-load numcpus)) + (will-wait (> normalized-effective-load maxnormload))) + (if (> recommended-delay 0) + (let* ((actual-delay (min recommended-delay 30))) + (if (common:low-noise-print 30 (conc (round actual-delay) "-safe-load")) + (debug:print-info 0 *default-log-port* "Load control, delaying " + actual-delay " seconds to maintain safe load. current normalized effective load is " + normalized-effective-load".")) + (thread-sleep! actual-delay))) + + (cond + ;; bad data, try again to get the data + ((not will-wait) + (if (common:low-noise-print 30 (conc (round normalized-effective-load) "-load-acceptable-" effective-host)) + (debug:print 0 *default-log-port* "Effective load on " effective-host " is acceptable at " effective-load " continuing."))) + ((and (< first 0) ;; this indicates the loadavg data is bad - machine may not be reachable + (> num-tries 0)) + (debug:print 0 *default-log-port* "WARNING: received bad data from get-cpu-load " + first ", we'll sleep 10s and try " num-tries " more times.") + (thread-sleep! 10) + (common:wait-for-cpuload maxnormload numcpus-in + count: count remote-host: remote-host num-tries: (- num-tries 1))) + ;; need to wait for load to drop + ((and will-wait ;; (> first adjmaxload) + (> count 0)) + (debug:print-info 0 *default-log-port* + "Delaying 15" ;; adjwait + " seconds due to normalized effective load " normalized-effective-load ;; first + " exceeding max of " adjmaxload + " on server " (or remote-host (get-host-name)) + " (normalized load-limit: " maxnormload ") " (if msg msg "")) + (thread-sleep! 15) ;; adjwait) + (common:wait-for-cpuload maxnormload numcpus count: (- count 1) msg: msg remote-host: remote-host) + ;; put the message here to indicate came out of waiting + (debug:print-info 1 *default-log-port* + "On host: " effective-host + ", effective load: " effective-load + ", numcpus: " numcpus + ", normalized effective load: " normalized-effective-load + )) + ;; overloaded and count expired (i.e. went to zero) + (else + (if (> num-tries 0) ;; should be "num-tries-left". + (if (common:low-noise-print 30 (conc (round effective-load) "-load-acceptable-" effective-host)) + (debug:print 0 *default-log-port* "Load on " effective-host " is acceptable at effective normalized load of " + effective-normalized-load " continuing.")) + (debug:print 0 *default-log-port* "Load on " effective-host ", " + first" could not be retrieved. Giving up and continuing.")))))) + +;; DO NOT CALL THIS DIRECTLY. It is called from common:wait-for-normalized-load +;; +;; (define (common:wait-for-cpuload maxload-in numcpus-in waitdelay #!key (count 1000) (msg #f)(remote-host #f)(force-maxload #f)(num-tries 5)) +;; (let* ((loadavg (common:get-cpu-load remote-host)) +;; (numcpus (if (<= 1 numcpus-in) ;; not possible to have zero. If we get 1, it's possible that we got the previous default, and we should check again +;; (common:get-num-cpus remote-host) +;; numcpus-in)) +;; (maxload (if force-maxload +;; maxload-in +;; (if (number? maxload-in) +;; (max maxload-in 0.5) +;; 0.5))) ;; so maxload must be greater than 0.5 for now BUG - FIXME? +;; (first (car loadavg)) +;; (next (cadr loadavg)) +;; (adjmaxload (* maxload (max 1 numcpus))) ;; possible bug where +;; ;; numcpus (or could be +;; ;; maxload) is zero, +;; ;; crude fallback is to +;; ;; at least use 1 +;; (loadjmp (- first (if (> next (* numcpus 0.7)) ;; could do something with average of first and next? +;; 0 +;; next))) ;; we will force a conservative calculation any time next is large. +;; (first-next-avg (/ (+ first next) 2)) +;; ;; add some randomness to the time to break any alignment +;; ;; where netbatch dumps many jobs to machines simultaneously +;; (adjwait (min (+ 300 (random 10)) (abs (* (+ (random 10) +;; (/ (- 1000 count) 10) +;; waitdelay) +;; (- first adjmaxload) )))) +;; (load-jump-limit (configf:lookup-number *configdat* "setup" "load-jump-limit")) +;; ;; effective load accounts for load jumps, this should elminate all the first-next-avg, adjwait, load-jump-limit +;; ;; etc. +;; (effective-load (common:get-intercept first next)) +;; (effective-host (or remote-host "localhost")) +;; (normalized-effective-load (/ effective-load numcpus)) +;; (will-wait (> normalized-effective-load maxload))) +;; +;; ;; let's let the user know once in a long while that load checking +;; ;; is happening but not constantly report it +;; #;(if (common:low-noise-print 30 (conc "cpuload" (or remote-host "localhost"))) ;; (> (random 100) 75) ;; about 25% of the time +;; (debug:print-info 1 *default-log-port* "Checking cpuload on " (or remote-host "localhost") ", maxload: " maxload +;; ", load: " first ", adjmaxload: " adjmaxload ", loadjmp: " loadjmp)) +;; +;; (debug:print-info 1 *default-log-port* +;; "On host: " effective-host +;; ", effective load: " effective-load +;; ", numcpus: " numcpus +;; ", normalized effective load: " normalized-effective-load +;; ) +;; +;; (cond +;; ;; bad data, try again to get the data +;; ((and (< first 0) ;; this indicates the loadavg data is bad - machine may not be reachable +;; (> num-tries 0)) +;; (debug:print 0 *default-log-port* "WARNING: received bad data from get-cpu-load " first ", we'll sleep 10s and try " num-tries " more times.") +;; (thread-sleep! 10) +;; (common:wait-for-cpuload maxload-in numcpus-in waitdelay +;; count: count remote-host: remote-host force-maxload: force-maxload num-tries: (- num-tries 1))) +;; ;; need to wait for load to drop +;; ((and will-wait ;; (> first adjmaxload) +;; (> count 0)) +;; (debug:print-info 0 *default-log-port* +;; "Delaying " 15 ;; adjwait +;; " seconds due to normalized effective load " normalized-effective-load ;; first +;; " exceeding max of " adjmaxload +;; " on server " (or remote-host (get-host-name)) +;; " (normalized load-limit: " maxload ") " (if msg msg "")) +;; (thread-sleep! 15) ;; adjwait) +;; (common:wait-for-cpuload maxload numcpus waitdelay count: (- count 1) msg: msg remote-host: remote-host)) +;; ((and (> loadjmp (cond +;; (load-jump-limit load-jump-limit) +;; ((> numcpus 8)(/ numcpus 2)) +;; ((> numcpus 4)(/ numcpus 1.2)) +;; (else 0.5))) +;; (> count 0)) +;; (debug:print-info 0 *default-log-port* "waiting " adjwait " seconds due to possible load jump " loadjmp ". " +;; (if msg msg "")) +;; (thread-sleep! adjwait) +;; (common:wait-for-cpuload maxload numcpus waitdelay count: (- count 1) msg: msg remote-host: remote-host)) +;; (else +;; (if (> num-tries 0) +;; (if (common:low-noise-print 30 (conc (round first) "-load-acceptable-" (or remote-host "localhost"))) +;; (debug:print 0 *default-log-port* "Load on " (or remote-host "localhost") " is acceptable at " first " continuing.")) +;; (debug:print 0 *default-log-port* "Load on " (or remote-host "localhost") ", "first" could not be retrieved. Giving up and continuing.")))))) +;; (define (get-uname . params) (let* ((uname-res (process:cmd-run->list (conc "uname " (if (null? params) "-a" (car params))))) (uname #f)) (if (null? (car uname-res)) "unknown" @@ -1599,10 +2373,20 @@ (let ((res (read-line))) (if (string? res) (string->number res))))) (get-unix-df path))) +(define (get-free-inodes path) + (if (configf:lookup *configdat* "setup" "free-inodes-script") + (with-input-from-pipe + (conc (configf:lookup *configdat* "setup" "free-inodes-script") " " path) + (lambda () + (let ((res (read-line))) + (if (string? res) + (string->number res))))) + (get-unix-inodes path))) + (define (get-unix-df path) (let* ((df-results (process:cmd-run->list (conc "df " path))) (space-rx (regexp "([0-9]+)\\s+([0-9]+)%")) (freespc #f)) ;; (write df-results) @@ -1612,10 +2396,24 @@ (let ((newval (string->number (cadr match)))) (if (number? newval) (set! freespc newval)))))) (car df-results)) freespc)) + +(define (get-unix-inodes path) + (let* ((df-results (process:cmd-run->list (conc "df -i " path))) + (space-rx (regexp "([0-9]+)\\s+([0-9]+)%")) + (freenodes 0)) ;; 0 is a better failsafe than #f here. + ;; (write df-results) + (for-each (lambda (l) + (let ((match (string-search space-rx l))) + (if match + (let ((newval (string->number (cadr match)))) + (if (number? newval) + (set! freenodes newval)))))) + (car df-results)) + freenodes)) (define (common:check-space-in-dir dirpath required) (let* ((dbspace (if (directory? dirpath) (get-df dirpath) 0))) @@ -1627,12 +2425,13 @@ ;; check space in dbdir and in megatest dir ;; returns: ok/not dbspace required-space ;; (define (common:check-db-dir-space) (let* ((required (string->number + ;; default is 1GB (or actually a billion bytes) This is the number of 1 kB blocks. (or (configf:lookup *configdat* "setup" "dbdir-space-required") - "100000"))) + "1000000"))) (dbdir (common:get-db-tmp-area)) ;; (db:get-dbdir)) (tdbspace (common:check-space-in-dir dbdir required)) (mdbspace (common:check-space-in-dir *toppath* required))) (sort (list tdbspace mdbspace) (lambda (a b) (< (cadr a)(cadr b)))))) @@ -1651,12 +2450,16 @@ (exit 1))))) ;; paths is list of lists ((name path) ... ) ;; (define (common:get-disk-with-most-free-space disks minsize) - (let ((best #f) - (bestsize 0)) + (let* ((best #f) + (bestsize 0) + (default-min-inodes-string "1000000") + (default-min-inodes (string->number default-min-inodes-string)) + (min-inodes (or (string->number (if (configf:lookup *configdat* "setup" "min_inodes") (configf:lookup *configdat* "setup" "min_inodes") default-min-inodes-string)) default-min-inodes))) + (for-each (lambda (disk-num) (let* ((dirpath (cadr (assoc disk-num disks))) (freespc (cond ((not (directory? dirpath)) @@ -1670,19 +2473,115 @@ ((not (eq? (string-ref dirpath 0) #\/)) (if (common:low-noise-print 300 "disks not a proper path " disk-num) (debug:print 0 *default-log-port* "WARNING: disk " disk-num " at path \"" dirpath "\" is not a fully qualified path - ignoring it.")) -1) (else - (get-df dirpath))))) - (if (> freespc bestsize) + (get-df dirpath)))) + (free-inodes (cond + ((not (directory? dirpath)) + (if (common:low-noise-print 300 "disks not a dir " disk-num) + (debug:print 0 *default-log-port* "WARNING: disk " disk-num " at path \"" dirpath "\" is not a directory - ignoring it.")) + -1) + ((not (file-write-access? dirpath)) + (if (common:low-noise-print 300 "disks not writeable " disk-num) + (debug:print 0 *default-log-port* "WARNING: disk " disk-num " at path \"" dirpath "\" is not writeable - ignoring it.")) + -1) + ((not (eq? (string-ref dirpath 0) #\/)) + (if (common:low-noise-print 300 "disks not a proper path " disk-num) + (debug:print 0 *default-log-port* "WARNING: disk " disk-num " at path \"" dirpath "\" is not a fully qualified path - ignoring it.")) + -1) + (else + (get-free-inodes dirpath)))) + ;;(free-inodes (get-free-inodes dirpath)) + ) + (debug:print 2 *default-log-port* "INFO: disk " disk-num " path " dirpath " free space " freespc " free inodes " free-inodes) + (if (and (> freespc bestsize)(> free-inodes min-inodes )) (begin (set! best (cons disk-num dirpath)) - (set! bestsize freespc))))) + (set! bestsize freespc))) + ;;(print "Processing: " disk-num " bestsize: " bestsize " best: " best " freespc: " freespc " min-inodes: " min-inodes " free-inodes: " free-inodes) + )) (map car disks)) (if (and best (> bestsize minsize)) best #f))) ;; #f means no disk candidate found + +;; convert a spec string to a list of vectors #( rx action rx-string ) +(define (common:spec-string->list-of-specs spec-string actions) + (let ((spec-strings (string-split-fields "\\s*;\\s*" spec-string #:infix)) + (actions-regex (regexp (conc "^(.*)\\s+(" (string-intersperse (map conc actions) "|") ")")))) + (filter + (lambda (x) x) + (map (lambda (s) + (let ((m (string-match actions-regex s))) + (if m + (vector (regexp (cadr m))(string->symbol (caddr m))(cadr m)) + (begin + (debug:print 0 *default-log-port* "WARNING: Unrecognised rule \"" s "\" in clean-up specification.") + #f)))) + spec-strings)))) + +;; given a list of specs rx . rule and a file return the first matching rule +;; +(define (common:file-find-rule fname rules) ;; rule is vector #( rx action rx-string) + (let loop ((rule (car rules)) + (tail (cdr rules))) + (let ((rx (vector-ref rule 0)) + (rn (vector-ref rule 1))) ;; rule name + (if (string-match rx fname) + rule ;; return the whole rule so regex can be printed etc. + (if (null? tail) + #f + (loop (car tail)(cdr tail))))))) + +;; given a spec apply some rules to a directory +;; +;; WARNING: This function will REMOVE files - be sure your spec and path is correct! +;; +;; spec format: +;; file-regex1 action; file-regex2 action; ... +;; e.g. +;; .*\.log$ keep; .* remove +;; --> keep all .log files, remove everything else +;; limitations: +;; cannot have a rule with ; as part of the spec +;; not very flexible, would be nice to return binned file names? +;; supported rules: +;; keep - keep this file +;; remove - remove this file +;; compress - compress this file +;; +(define (common:dir-clean-up path spec-string #!key (compress "gzip")(actions '(keep remove compress))(remove-empty #f)) + (let* ((specs (common:spec-string->list-of-specs spec-string actions)) + (keepers (make-hash-table)) + (directories (make-hash-table))) + (find-files + path + action: (lambda (p res) + (let ((rule (common:file-find-rule p specs))) + (cond + ((directory? p)(hash-table-set! directories p #t)) + (else + (case (vector-ref rule 1) + ((keep)(hash-table-set! keepers p rule)) + ((remove) + (print "Removing file " p) + (delete-file p)) + ((compress) + (print "Compressing file " p) + (system (conc compress " " p))) + (else + (print "No match for file " p)))))))) + (if remove-empty + (for-each + (lambda (d) + (if (null? (glob (conc d "/.*")(conc d "/*"))) + (begin + (print "Removing empty directory " d) + (delete-directory d)))) + (sort (hash-table-keys directories) (lambda (a b)(> (string-length a)(string-length b)))))) + )) ;;====================================================================== ;; E N V I R O N M E N T V A R S ;;====================================================================== (define (bb-check-path #!key (msg "check-path: ")) @@ -1694,11 +2593,11 @@ (define (save-environment-as-files fname #!key (ignorevars (list "USER" "HOME" "DISPLAY" "LS_COLORS" "XKEYSYMDB" "EDITOR" "MAKEFLAGS" "MAKEF" "MAKEOVERRIDES"))) ;;(bb-check-path msg: "save-environment-as-files entry") (let ((envvars (get-environment-variables)) - (whitesp (regexp "[^a-zA-Z0-9_\\-:,.\\/%$]")) + (whitesp (regexp "[^a-zA-Z0-9_\\-:,\\.\\/%$]")) (mungeval (lambda (val) (cond ((eq? val #t) "") ;; convert #t to empty string ((eq? val #f) #f) ;; convert #f to itself (still thinking about this one (else val))))) @@ -1708,11 +2607,12 @@ (let* ((key (car keyval)) (val (cdr keyval)) (delim (if (string-search whitesp val) "\"" ""))) - (print (if (member key ignorevars) + (print (if (or (member key ignorevars) + (string-search whitesp key)) "# setenv " "setenv ") key " " delim (mungeval val) delim))) envvars))) (with-output-to-file (conc fname ".sh") @@ -1722,37 +2622,83 @@ (val (cdr keyval)) (delim (if (string-search whitesp val) "\"" ""))) (print (if (or (member key ignorevars) + (string-search whitesp key) (string-search ":" key)) ;; internal only values to be skipped. "# export " "export ") key "=" delim (mungeval val) delim))) envvars))))) + +(define (common:get-param-mapping #!key (flavor #f)) + "returns alist mapping string keys in testconfig/subrun to megatest command line switches; if flavor is switch-symbol, maps tcmt symbolic switches to megatest switches" + (let ((default '(("tag-expr" . "-tagexpr") + ("mode-patt" . "-modepatt") + ("run-name" . "-runname") + ("contour" . "-contour") + ("target" . "-target") + ("test-patt" . "-testpatt") + ("msg" . "-m") + ("log" . "-log") + ("start-dir" . "-start-dir") + ("new" . "-set-state-status")))) + (if (eq? flavor 'switch-symbol) + (map (lambda (x) + (cons (string->symbol (conc "-" (car x))) (cdr x))) + default) + default))) + ;; set some env vars from an alist, return an alist with original values ;; (("VAR" "value") ...) +;; a value of #f means "unset this var" +;; (define (alist->env-vars lst) (if (list? lst) (let ((res '())) (for-each (lambda (p) (let* ((var (car p)) (val (cadr p)) (prv (get-environment-variable var))) (set! res (cons (list var prv) res)) (if val - (setenv var (->string val)) + (safe-setenv var (->string val)) (unsetenv var)))) lst) res) '())) + ;; clear vars matching pattern, run proc, set vars back ;; if proc is a string run that string as a command with ;; system. ;; +(define *common:orig-env* + (let ((envvars (get-environment-variables))) + (if (get-environment-variable "MT_ORIG_ENV") + (with-input-from-string + (z3:decode-buffer (base64:base64-decode (get-environment-variable "MT_ORIG_ENV"))) + read) + (filter-map (lambda (x) + (if (string-match "^MT_.*" (car x)) + #f + x)) + envvars)))) + +(define (common:with-orig-env proc) + (let ((current-env (get-environment-variables))) + (for-each (lambda (x) (unsetenv (car x))) current-env) + (for-each (lambda (x) (setenv (car x) (cdr x))) *common:orig-env*) + (let ((rv (cond + ((string? proc)(system proc)) + (proc (proc))))) + (for-each (lambda (x) (unsetenv (car x))) *common:orig-env*) + (for-each (lambda (x) (setenv (car x) (cdr x))) current-env) + rv))) + (define (common:without-vars proc . var-patts) (let ((vars (make-hash-table))) (for-each (lambda (vardat) ;; each env var (for-each @@ -1771,44 +2717,78 @@ vars (lambda (var val) (setenv var val))) vars)) -(define (common:run-a-command cmd #!key (with-vars #f)) +(define (common:propogate-mt-vars-to-subrun proc propogate-vars) + (let ((vars (make-hash-table)) + (var-patt "^MT_.*")) + (for-each + (lambda (vardat) ;; each env var + ;(for-each + ;(lambda (var-patt) + (if (string-match var-patt (car vardat)) + (let ((var (car vardat)) + (val (cdr vardat))) + (hash-table-set! vars var val) + (if (member var propogate-vars) + (begin + (print var " " (string-substitute "MT_" "PARENT_" var)) + (setenv (string-substitute "MT_" "PARENT_" var) val))) + (unsetenv var)))) +; var-patts)) + (get-environment-variables)) + (cond + ((string? proc)(system proc)) + (proc (proc))) + (hash-table-for-each + vars + (lambda (var val) + (if (member var propogate-vars) + (unsetenv (string-substitute "MT_" "PARENT_" var))) + (setenv var val))) + vars)) + + +(define (common:run-a-command cmd #!key (with-vars #f) (with-orig-env #f)) (let* ((pre-cmd (dtests:get-pre-command)) (post-cmd (dtests:get-post-command)) (fullcmd (if (or pre-cmd post-cmd) (conc pre-cmd cmd post-cmd) (conc "viewscreen " cmd)))) (debug:print-info 02 *default-log-port* "Running command: " fullcmd) - (if with-vars - (common:without-vars cmd) - (common:without-vars fullcmd "MT_.*")))) + (cond + (with-vars (common:without-vars fullcmd)) + (with-orig-env (common:with-orig-env fullcmd)) + (else (common:without-vars fullcmd "MT_.*"))))) ;;====================================================================== ;; T I M E A N D D A T E ;;====================================================================== ;; Convert strings like "5s 2h 3m" => 60x60x2 + 3x60 + 5 (define (common:hms-string->seconds tstr) - (let ((parts (string-split tstr)) + (let ((parts (string-split-fields "\\w+" tstr)) (time-secs 0) - ;; s=seconds, m=minutes, h=hours, d=days - (trx (regexp "(\\d+)([smhd])"))) + ;; s=seconds, m=minutes, h=hours, d=days, M=months, y=years, w=weeks + (trx (regexp "(\\d+)([smhdMyw])"))) (for-each (lambda (part) (let ((match (string-match trx part))) (if match (let ((val (string->number (cadr match))) (unt (caddr match))) (if val (set! time-secs (+ time-secs (* val (case (string->symbol unt) ((s) 1) - ((m) 60) - ((h) (* 60 60)) - ((d) (* 24 60 60)) - (else 0)))))))))) + ((m) 60) ;; minutes + ((h) 3600) + ((d) 86400) + ((w) 604800) + ((M) 2628000) ;; aproximately one month + ((y) 31536000) + (else #f)))))))))) parts) time-secs)) (define (seconds->hr-min-sec secs) (let* ((hrs (quotient secs 3600)) @@ -2091,25 +3071,51 @@ (number->string x 16)) (map string->number (string-split instr))) "/")) -(define (common:faux-lock keyname) - (if (rmt:get-var keyname) - #f +;;====================================================================== +;; L O C K I N G M E C H A N I S M S +;;====================================================================== + +;; faux-lock is deprecated. Please use simple-lock below +;; +(define (common:faux-lock keyname #!key (wait-time 8)(allow-lock-steal #t)) + (if (rmt:no-sync-get/default keyname #f) ;; do not be tempted to compare to pid. locking is a one-shot action, if already locked for this pid it doesn't actually count + (if (> wait-time 0) + (begin + (thread-sleep! 1) + (if (eq? wait-time 1) ;; only one second left, steal the lock + (begin + (debug:print-info 0 *default-log-port* "stealing lock for " keyname) + (common:faux-unlock keyname force: #t))) + (common:faux-lock keyname wait-time: (- wait-time 1))) + #f) (begin - (rmt:set-var keyname (conc (current-process-id))) - (equal? (conc (current-process-id)) (conc (rmt:get-var keyname)))))) + (rmt:no-sync-set keyname (conc (current-process-id))) + (equal? (conc (current-process-id)) (conc (rmt:no-sync-get/default keyname #f)))))) (define (common:faux-unlock keyname #!key (force #f)) - (if (or force (equal? (conc (current-process-id)) (conc (rmt:get-var keyname)))) + (if (or force (equal? (conc (current-process-id)) (conc (rmt:no-sync-get/default keyname #f)))) (begin - (if (rmt:get-var keyname) (rmt:del-var keyname)) + (if (rmt:no-sync-get/default keyname #f) (rmt:no-sync-del! keyname)) #t) #f)) - +;; simple lock. improve and converge on this one. +;; +(define (common:simple-lock keyname) + (rmt:no-sync-get-lock keyname)) + +(define (common:simple-unlock keyname #!key (force #f)) + (rmt:no-sync-del! keyname)) + + +;;====================================================================== +;; +;;====================================================================== + (define (common:in-running-test?) (and (args:get-arg "-execute") (get-environment-variable "MT_CMDINFO"))) (define (common:get-color-from-status status) (cond @@ -2120,93 +3126,81 @@ ((equal? status "KILLREQ") "purple") ((equal? status "RUNNING") "blue") ((equal? status "ABORT") "brown") (else "black"))) -;;====================================================================== -;; N A N O M S G C L I E N T -;;====================================================================== - -(define (server:get-best-guess-address hostname) - (let ((res #f)) - (for-each - (lambda (adr) - (if (not (eq? (u8vector-ref adr 0) 127)) - (set! res adr))) - ;; NOTE: This can fail when there is no mention of the host in /etc/hosts. FIXME - (vector->list (hostinfo-addresses (hostname->hostinfo hostname)))) - (string-intersperse - (map number->string - (u8vector->list - (if res res (hostname->ip hostname)))) "."))) - - -(define (common:send-dboard-main-changed) - (let* ((dashboard-ips (mddb:get-dashboards))) - (for-each - (lambda (ipadr) - (let* ((soc (common:open-nm-req (conc "tcp://" ipadr))) - (msg (conc "main " *toppath*)) - (res (common:nm-send-receive-timeout soc msg))) - (if (not res) ;; couldn't reach that dashboard - remove it from db - (print "ERROR: couldn't reach dashboard " ipadr)) - res)) - dashboard-ips))) - - -;;====================================================================== -;; D A S H B O A R D D B -;;====================================================================== - -(define (mddb:open-db) - (let* ((db (open-database (conc (get-environment-variable "HOME") "/.dashboard.db")))) - (set-busy-handler! db (busy-timeout 10000)) - (for-each - (lambda (qry) - (exec (sql db qry))) - (list - "CREATE TABLE IF NOT EXISTS vars (id INTEGER PRIMARY KEY,key TEXT, val TEXT, CONSTRAINT varsconstraint UNIQUE (key));" - "CREATE TABLE IF NOT EXISTS dashboards ( - id INTEGER PRIMARY KEY, - pid INTEGER, - username TEXT, - hostname TEXT, - ipaddr TEXT, - portnum INTEGER, - start_time TIMESTAMP DEFAULT (strftime('%s','now')), - CONSTRAINT hostport UNIQUE (hostname,portnum) - );" - )) - db)) - -;; register a dashboard -;; -(define (mddb:register-dashboard port) - (let* ((pid (current-process-id)) - (hostname (get-host-name)) - (ipaddr (server:get-best-guess-address hostname)) - (username (current-user-name)) ;; (car userinfo))) - (db (mddb:open-db))) - (print "Register monitor, pid: " pid ", hostname: " hostname ", port: " port ", username: " username) - (exec (sql db "INSERT OR REPLACE INTO dashboards (pid,username,hostname,ipaddr,portnum) VALUES (?,?,?,?,?);") - pid username hostname ipaddr port) - (close-database db))) - -;; unregister a monitor -;; -(define (mddb:unregister-dashboard host port) - (let* ((db (mddb:open-db))) - (print "Register unregister monitor, host:port=" host ":" port) - (exec (sql db "DELETE FROM dashboards WHERE hostname=? AND portnum=?;") host port) - (close-database db))) - -;; get registered dashboards -;; -(define (mddb:get-dashboards) - (let ((db (mddb:open-db))) - (query fetch-column - (sql db "SELECT ipaddr || ':' || portnum FROM dashboards;")))) +;; ;;====================================================================== +;; ;; N A N O M S G C L I E N T +;; ;;====================================================================== +;; +;; +;; +;; (define (common:send-dboard-main-changed) +;; (let* ((dashboard-ips (mddb:get-dashboards))) +;; (for-each +;; (lambda (ipadr) +;; (let* ((soc (common:open-nm-req (conc "tcp://" ipadr))) +;; (msg (conc "main " *toppath*)) +;; (res (common:nm-send-receive-timeout soc msg))) +;; (if (not res) ;; couldn't reach that dashboard - remove it from db +;; (print "ERROR: couldn't reach dashboard " ipadr)) +;; res)) +;; dashboard-ips))) +;; +;; +;; ;;====================================================================== +;; ;; D A S H B O A R D D B +;; ;;====================================================================== +;; +;; (define (mddb:open-db) +;; (let* ((db (open-database (conc (get-environment-variable "HOME") "/.dashboard.db")))) +;; (set-busy-handler! db (busy-timeout 10000)) +;; (for-each +;; (lambda (qry) +;; (exec (sql db qry))) +;; (list +;; "CREATE TABLE IF NOT EXISTS vars (id INTEGER PRIMARY KEY,key TEXT, val TEXT, CONSTRAINT varsconstraint UNIQUE (key));" +;; "CREATE TABLE IF NOT EXISTS dashboards ( +;; id INTEGER PRIMARY KEY, +;; pid INTEGER, +;; username TEXT, +;; hostname TEXT, +;; ipaddr TEXT, +;; portnum INTEGER, +;; start_time TIMESTAMP DEFAULT (strftime('%s','now')), +;; CONSTRAINT hostport UNIQUE (hostname,portnum) +;; );" +;; )) +;; db)) +;; +;; ;; register a dashboard +;; ;; +;; (define (mddb:register-dashboard port) +;; (let* ((pid (current-process-id)) +;; (hostname (get-host-name)) +;; (ipaddr (server:get-best-guess-address hostname)) +;; (username (current-user-name)) ;; (car userinfo))) +;; (db (mddb:open-db))) +;; (print "Register monitor, pid: " pid ", hostname: " hostname ", port: " port ", username: " username) +;; (exec (sql db "INSERT OR REPLACE INTO dashboards (pid,username,hostname,ipaddr,portnum) VALUES (?,?,?,?,?);") +;; pid username hostname ipaddr port) +;; (close-database db))) +;; +;; ;; unregister a monitor +;; ;; +;; (define (mddb:unregister-dashboard host port) +;; (let* ((db (mddb:open-db))) +;; (print "Register unregister monitor, host:port=" host ":" port) +;; (exec (sql db "DELETE FROM dashboards WHERE hostname=? AND portnum=?;") host port) +;; (close-database db))) +;; +;; ;; get registered dashboards +;; ;; +;; (define (mddb:get-dashboards) +;; (let ((db (mddb:open-db))) +;; (query fetch-column +;; (sql db "SELECT ipaddr || ':' || portnum FROM dashboards;")))) ;;====================================================================== ;; T E S T L A U N C H I N G P E R I T E M W I T H H O S T T Y P E S ;;====================================================================== ;; @@ -2217,10 +3211,16 @@ ;; ;; [host-types] ;; general #MTLOWESTLOAD #{g hosts allhosts} ;; arm #MTLOWESTLOAD #{g hosts arm} ;; nbgeneral nbjob run JOBCOMMAND -log $MT_LINKTREE/$MT_TARGET/$MT_RUNNAME.$MT_TESTNAME-$MT_ITEM_PATH.lgo +;; +;; [host-rules] +;; # maxnload => max normalized load +;; # maxnjobs => max jobs per cpu +;; # maxjobrate => max jobs per second +;; general maxnload=1.1; maxnjobs=1.2; maxjobrate=0.1 ;; ;; [launchers] ;; envsetup general ;; xor/%/n 4C16G ;; % nbgeneral @@ -2247,12 +3247,23 @@ (let ((launcher (configf:lookup configdat "host-types" host-type))) (if launcher (let* ((launcher-parts (string-split launcher)) (launcher-exe (car launcher-parts))) (if (equal? launcher-exe "#MTLOWESTLOAD") ;; this is our special case, we will find the lowest load and craft a nbfake commandline - (let ((targ-host (common:get-least-loaded-host (cdr launcher-parts)))) - (conc "remrun " targ-host)) + (let host-loop ((targ-host (common:get-least-loaded-host (cdr launcher-parts) host-type configdat)) + (count 100)) + (if targ-host + (conc "remrun " targ-host) + (if (> count 0) + (begin + (debug:print 0 *default-log-port* "INFO: Waiting for a host for host-type " host-type) + (thread-sleep! (- 101 count)) + (host-loop (common:get-least-loaded-host (cdr launcher-parts) host-type configdat) + (- count 1))) + (begin + (debug:print 0 *default-log-port* "FATAL: Failed to find a host from #MTLOWESTLOAD for host-type " host-type) + (exit))))) launcher)) (begin (debug:print-info 0 *default-log-port* "WARNING: no launcher found for host-type " host-type) (if (null? tal) fallback-launcher @@ -2260,11 +3271,49 @@ ;; no match, try again (if (null? tal) fallback-launcher (loop (car tal)(cdr tal)))))))) fallback-launcher))) - + +;;====================================================================== +;; NMSG AND NEW API +;;====================================================================== + +;; nm based server experiment, keep around for now. +;; +(define (nm:start-server dbconn #!key (given-host-name #f)) + (let* ((srvdat (start-raw-server given-host-name: given-host-name)) + (host-name (srvdat-host srvdat)) + (soc (srvdat-soc srvdat))) + + ;; start the queue processor (save for second round of development) + ;; + (thread-start! (make-thread! (lambda ()(queue-processor dbconn) "Queue processor"))) + ;; msg is an alist + ;; 'r host:port <== where to return the data + ;; 'p params <== data to apply the command to + ;; 'e j|s|l <== encoding of the params. default is s (sexp), if not specified is assumed to be default + ;; 'c command <== look up the function to call using this key + ;; + (let loop ((msg-in (nn-recv soc))) + (if (not (equal? msg-in "quit")) + (let* ((dat (decode msg-in)) + (host-port (alist-ref 'r dat)) ;; this is for the reverse req rep where the server is a client of the original client + (params (alist-ref 'p dat)) + (command (let ((c (alist-ref 'c dat)))(if c (string->symbol c) #f))) + (all-good (and host-port params command (hash-table-exists? *commands* command)))) + (if all-good + (let ((cmddat (make-qitem + command: command + host-port: host-port + params: params))) + (queue-push cmddat) ;; put request into the queue + (nn-send soc "queued")) ;; reply with "queued" + (print "ERROR: ["(common:human-time)"] BAD request " dat)) + (loop (nn-recv soc))))) + (nn-close soc))) + ;;====================================================================== ;; D A S H B O A R D U S E R V I E W S ;;====================================================================== ;; first read ~/views.config if it exists, then read $MTRAH/views.config if it exists @@ -2271,12 +3320,332 @@ ;; (define (common:load-views-config) (let* ((view-cfgdat (make-hash-table)) (home-cfgfile (conc (get-environment-variable "HOME") "/.mtviews.config")) (mthome-cfgfile (conc *toppath* "/.mtviews.config"))) - (if (file-exists? mthome-cfgfile) + (if (common:file-exists? mthome-cfgfile) (read-config mthome-cfgfile view-cfgdat #t)) ;; we load the home dir file AFTER the MTRAH file so the user can clobber settings when running the dashboard in read-only areas - (if (file-exists? home-cfgfile) + (if (common:file-exists? home-cfgfile) (read-config home-cfgfile view-cfgdat #t)) view-cfgdat)) + +;;====================================================================== +;; H I E R A R C H I C A L H A S H T A B L E S +;;====================================================================== + +;; Every element including top element is a vector: +;; + +(define (hh:make-hh #!key (ht #f)(value #f)) + (vector (or ht (make-hash-table)) value)) + +;; used internally +(define-inline (hh:set-ht! hh ht) (vector-set! hh 0 ht)) +(define-inline (hh:get-ht hh) (vector-ref hh 0)) +(define-inline (hh:set-value! hh value) (vector-set! hh 1 value)) +(define-inline (hh:get-value hh value) (vector-ref hh 1)) + +;; given a hierarchial hash and some keys look up the value ... +;; +(define (hh:get hh . keys) + (if (null? keys) + (vector-ref hh 1) ;; we have reached the end of the line, return the value sought + (let ((sub-ht (hh:get-ht hh))) + (if sub-ht ;; yes, there is more hierarchy + (let ((sub-hh (hash-table-ref/default sub-ht (car keys) #f))) + (if sub-hh + (apply hh:get sub-hh (cdr keys)) + #f)) + #f)))) + +;; given a hierarchial hash, a value and some keys, add needed hierarcy and insert the value +;; +(define (hh:set! hh value . keys) + (if (null? keys) + (hh:set-value! hh value) ;; we have reached the end of the line, store the value + (let ((sub-ht (hh:get-ht hh))) + (if sub-ht ;; yes, there is more hierarchy + (let ((sub-hh (hash-table-ref/default sub-ht (car keys) #f))) + (if (not sub-hh) ;; we'll need to add the next level of hierarchy + (let ((new-sub-hh (hh:make-hh))) + (hash-table-set! sub-ht (car keys) new-sub-hh) + (apply hh:set! new-sub-hh value (cdr keys))) + (apply hh:set! sub-hh value (cdr keys)))) ;; call the sub-hierhash with remaining keys + (begin + (hh:set-ht! hh (make-hash-table)) + (apply hh:set! hh value keys)))))) + +;; Manage pkts, used in servers, tests and likely other contexts so put +;; in common +;;====================================================================== + +(define common:pkts-spec + '((default . ((parent . P) + (action . a) + (filename . f))) + (configf . ((parent . P) + (action . a) + (filename . f))) + (server . ((action . a) + (pid . d) + (ipaddr . i) + (port . p) + (parent . P))) + + (test . ((cpuuse . c) + (diskuse . d) + (item-path . i) + (runname . r) + (state . s) + (target . t) + (status . u) + (parent . P))))) + +(define (common:get-pkts-dirs mtconf use-lt) + (let* ((pktsdirs-str (or (configf:lookup mtconf "setup" "pktsdirs") + (and use-lt + (conc (or *toppath* + (current-directory)) + "/lt/.pkts")))) + (pktsdirs (if pktsdirs-str + (string-split pktsdirs-str " ") + #f))) + pktsdirs)) + +;; use-lt is use linktree "lt" link to find pkts dir +(define (common:save-pkt pktalist-in mtconf use-lt #!key (add-only #f)) ;; add-only saves the pkt only if there is a parent already + (if (or add-only + (hash-table-exists? *pkts-info* 'last-parent)) + (let* ((parent (hash-table-ref/default *pkts-info* 'last-parent #f)) + (pktalist (if parent + (cons `(parent . ,parent) + pktalist-in) + pktalist-in))) + (let-values (((uuid pkt) + (alist->pkt pktalist common:pkts-spec))) + (hash-table-set! *pkts-info* 'last-parent uuid) + (let ((pktsdir (or (hash-table-ref/default *pkts-info* 'pkts-dir #f) + (let* ((pktsdirs (common:get-pkts-dirs mtconf use-lt)) + (pktsdir (car pktsdirs))) ;; assume it is there + (hash-table-set! *pkts-info* 'pkts-dir pktsdir) + pktsdir)))) + (handle-exceptions + exn + (debug:print-info 0 "failed to write out packet to " pktsdir ", exn=" exn) ;; don't care if this failed for now but MUST FIX - BUG!! + (if (not (file-exists? pktsdir)) + (create-directory pktsdir #t)) + (with-output-to-file + (conc pktsdir "/" uuid ".pkt") + (lambda () + (print pkt))))))))) + +(define (common:with-queue-db mtconf proc #!key (use-lt #f)(toppath-in #f)) + (let* ((pktsdirs (common:get-pkts-dirs mtconf use-lt)) + (pktsdir (if pktsdirs (car pktsdirs) #f)) + (toppath (or (configf:lookup mtconf "scratchdat" "toppath") + toppath-in)) + (pdbpath (or (configf:lookup mtconf "setup" "pdbpath") pktsdir))) + (cond + ((not (and pktsdir toppath pdbpath)) + (debug:print 0 *default-log-port* "ERROR: settings are missing in your megatest.config for area management.") + (debug:print 0 *default-log-port* " you need to have pktsdirs in the [setup] section.")) + ((not (common:file-exists? pktsdir)) + (debug:print 0 *default-log-port* "ERROR: pkts directory not found " pktsdir)) + ((not (equal? (file-owner pktsdir)(current-effective-user-id))) + (debug:print 0 *default-log-port* "ERROR: directory " pktsdir " is not owned by " (current-effective-user-name))) + (else + (let* ((pdb (open-queue-db pdbpath "pkts.db" + schema: '("CREATE TABLE groups (id INTEGER PRIMARY KEY,groupname TEXT, CONSTRAINT group_constraint UNIQUE (groupname));")))) + (proc pktsdirs pktsdir pdb) + (dbi:close pdb)))))) + +(define (common:load-pkts-to-db mtconf #!key (use-lt #f)) + (common:with-queue-db + mtconf + (lambda (pktsdirs pktsdir pdb) + (for-each + (lambda (pktsdir) ;; look at all + (cond + ((not (common:file-exists? pktsdir)) + (debug:print 0 *default-log-port* "ERROR: packets directory " pktsdir " does not exist.")) + ((not (directory? pktsdir)) + (debug:print 0 *default-log-port* "ERROR: packets directory path " pktsdir " is not a directory.")) + ((not (file-read-access? pktsdir)) + (debug:print 0 *default-log-port* "ERROR: packets directory path " pktsdir " is not readable.")) + (else + (debug:print-info 0 *default-log-port* "Loading packets found in " pktsdir) + (let ((pkts (glob (conc pktsdir "/*.pkt")))) + (for-each + (lambda (pkt) + (let* ((uuid (cadr (string-match ".*/([0-9a-f]+).pkt" pkt))) + (exists (lookup-by-uuid pdb uuid #f))) + (if (not exists) + (let* ((pktdat (string-intersperse + (with-input-from-file pkt read-lines) + "\n")) + (apkt (pkt->alist pktdat)) + (ptype (alist-ref 'T apkt))) + (add-to-queue pdb pktdat uuid (or ptype 'cmd) #f 0) + (debug:print 4 *default-log-port* "Added " uuid " of type " ptype " to queue")) + (debug:print 4 *default-log-port* "pkt: " uuid " exists, skipping...") + ))) + pkts))))) + pktsdirs)) + use-lt: use-lt)) + +(define (common:get-pkt-alists pkts) + (map (lambda (x) + (alist-ref 'apkt x)) ;; 'pkta pulls out the alist from the read pkt + pkts)) + +;; given list of pkts (alist mode) return list of D cards as Unix epoch, sorted descending +;; also delete duplicates by target i.e. (car pkt) +;; +(define (common:get-pkt-times pkts) + (delete-duplicates + (sort + (map (lambda (x) + `(,(alist-ref 't x) . ,(string->number (alist-ref 'D x)))) + pkts) + (lambda (a b)(> (cdr a)(cdr b)))) ;; sort descending + (lambda (a b)(equal? (car a)(car b))))) ;; remove duplicates by target + + + +;; accept an alist or hash table containing envvar/env value pairs (value of #f causes unset) +;; execute thunk in context of environment modified as per this list +;; restore env to prior state then return value of eval'd thunk. +;; ** this is not thread safe ** +(define (common:with-env-vars delta-env-alist-or-hash-table thunk) + (let* ((delta-env-alist (if (hash-table? delta-env-alist-or-hash-table) + (hash-table->alist delta-env-alist-or-hash-table) + delta-env-alist-or-hash-table)) + (restore-thunks + (filter + identity + (map (lambda (env-pair) + (let* ((env-var (car env-pair)) + (new-val (let ((tmp (cdr env-pair))) + (if (list? tmp) (car tmp) tmp))) + (current-val (get-environment-variable env-var)) + (restore-thunk + (cond + ((not current-val) (lambda () (unsetenv env-var))) + ((not (string? new-val)) #f) + ((eq? current-val new-val) #f) + (else + (lambda () (setenv env-var current-val)))))) + ;;(when (not (string? new-val)) + ;; (debug:print 0 *default-log-port* " PROBLEM: not a string: "new-val"\n from env-alist:\n"delta-env-alist) + ;; (pp delta-env-alist) + ;; (exit 1)) + + + (cond + ((not new-val) ;; modify env here + (unsetenv env-var)) + ((string? new-val) + (setenv env-var new-val))) + restore-thunk)) + delta-env-alist)))) + (let ((rv (thunk))) + (for-each (lambda (x) (x)) restore-thunks) ;; restore env to original state + rv))) + +(define *common:thread-punchlist* (make-hash-table)) +(define (common:send-thunk-to-background-thread thunk #!key (name #f)) + ;;(BB> "launched thread " name) + + ;; we need a unique name for the thread. + (let* ((realname (if name + (if (not (hash-table-ref/default *common:thread-punchlist* name #f)) + name + (conc name"-" (symbol->string (gensym)))) + (conc "anonymous-"(symbol->string (gensym))))) + (realthunk (lambda () + (let ((res (thunk))) + (hash-table-delete! *common:thread-punchlist* realname) + res))) + (thread (make-thread realthunk realname))) + (hash-table-set! *common:thread-punchlist* realname thread) + (thread-start! thread) + )) + +(define (common:join-backgrounded-threads) + ;; may need to trap and ignore exceptions -- dunno how atomic threads are... + (for-each + (lambda (thread-name) + (let* ((thread (hash-table-ref/default *common:thread-punchlist* thread-name #f))) + (if thread + (handle-exceptions + exn + (begin + (debug:print 0 *default-log-port* "joining threads failed. exn=" exn) + #t) ;; just ignore it, it might have died in the meantime so joining it will throw an exception + (thread-join! thread)) + ))) + (hash-table-keys *common:thread-punchlist*))) + +(define *common:telemetry-log-state* 'startup) +(define *common:telemetry-log-socket* #f) + +(define (common:telemetry-log-open) + (if (eq? *common:telemetry-log-state* 'startup) + (let* ((serverhost (configf:lookup *configdat* "telemetry" "host")) + (serverport (configf:lookup-number *configdat* "telemetry" "port")) + (user (or (get-environment-variable "USER") "unknown")) + (host (or (get-environment-variable "HOST") "unknown"))) + (set! *common:telemetry-log-state* + (handle-exceptions + exn + (begin + (debug:print-info 0 *default-log-port* "common-telemetry-log open udp port failure") + 'broken) + (if (and serverhost serverport user host) + (let* ((s (udp-open-socket))) + ;;(udp-bind! s #f 0) + (udp-connect! s serverhost serverport) + (set! *common:telemetry-log-socket* s) + 'open) + 'not-needed)))))) + +(define (common:telemetry-log event #!key (payload '())) + (if (eq? *common:telemetry-log-state* 'startup) + (common:telemetry-log-open)) + + (if (eq? 'open *common:telemetry-log-state*) + (handle-exceptions + exn + (begin + (debug:print-info 0 *default-log-port* "common-telemetry-log comms failure ; disabled (no server?)") + ;;(define *common:telemetry-log-state* 'broken-or-no-server-preclose) + ;;(common:telemetry-log-close) + (define *common:telemetry-log-state* 'broken-or-no-server) + (set! *common:telemetry-log-socket* #f) + ) + (if (and *common:telemetry-log-socket* event) ;; TODO - filter on event against telemetry.want-events + (let* ((user (or (get-environment-variable "USER") "unknown")) + (host (or (get-environment-variable "HOST") "unknown")) + (start (conc "[megatest "event"]")) + (toppath (or *toppath* "/dev/null")) + (payload-serialized + (base64:base64-encode + (z3:encode-buffer + (with-output-to-string (lambda () (pp payload)))))) + (msg (conc user":"host":"start":"(current-process-id)":"(car (argv))":" + toppath":"payload-serialized))) + (udp-send *common:telemetry-log-socket* msg)))))) + +(define (common:telemetry-log-close) + (when (or (member *common:telemetry-log-state* '(broken-or-no-server-preclose open)) *common:telemetry-log-socket*) + (handle-exceptions + exn + (begin + (define *common:telemetry-log-state* 'closed-fail) + (debug:print-info 0 *default-log-port* "common-telemetry-log closure failure") + ) + (begin + (define *common:telemetry-log-state* 'closed) + (udp-close-socket *common:telemetry-log-socket*) + (set! *common:telemetry-log-socket* #f))))) Index: common_records.scm ================================================================== --- common_records.scm +++ common_records.scm @@ -1,14 +1,23 @@ ;;====================================================================== ;; Copyright 2006-2012, Matthew Welland. ;; -;; This program is made available under the GNU GPL version 2.0 or -;; greater. See the accompanying file COPYING for details. +;; This file is part of Megatest. +;; +;; Megatest is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. +;; +;; Megatest is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. ;; -;; This program is distributed WITHOUT ANY WARRANTY; without even the -;; implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -;; PURPOSE. +;; You should have received a copy of the GNU General Public License +;; along with Megatest. If not, see . +;; ;;====================================================================== ;; (use trace) (include "altdb.scm") @@ -30,10 +39,11 @@ ;; (define-syntax common:handle-exceptions ;; (syntax-rules () ;; ((_ exn-in errstmt ...)(handle-exceptions exn-in errstmt ...)))) +;; this works, why didn't I use it more? (define-syntax common:debug-handle-exceptions (syntax-rules () ((_ debug exn errstmt body ...) (if debug (begin body ...) @@ -114,17 +124,19 @@ (list? n)) (member *verbosity* n)))) (define (debug:setup) (let ((debugstr (or (args:get-arg "-debug") + (args:get-arg "-debug-noprop") (getenv "MT_DEBUG_MODE")))) (set! *verbosity* (debug:calc-verbosity debugstr)) (debug:check-verbosity *verbosity* debugstr) ;; if we were handed a bad verbosity rule then we will override it with 1 and continue (if (not *verbosity*)(set! *verbosity* 1)) - (if (or (args:get-arg "-debug") - (not (getenv "MT_DEBUG_MODE"))) + (if (and (not (args:get-arg "-debug-noprop")) + (or (args:get-arg "-debug") + (not (getenv "MT_DEBUG_MODE")))) (setenv "MT_DEBUG_MODE" (if (list? *verbosity*) (string-intersperse (map conc *verbosity*) ",") (conc *verbosity*)))))) (define (debug:print n e . params) @@ -147,15 +159,17 @@ (temp (string-split (->string this-loc) " ")) (this-func (if (and (list? temp) (> (length temp) 1)) (cadr temp) "???"))) (if (equal? this-func "BB>") (set! location this-loc)))) stack) - (let ((dp-args - (append - (list 0 *default-log-port* - (conc location "@"(/ (- (current-milliseconds) *BB-process-starttime*) 1000)" ") ) - in-args))) + (let* ((color-on "\x1b[1m") + (color-off "\x1b[0m") + (dp-args + (append + (list 0 *default-log-port* + (conc color-on location "@"(/ (- (current-milliseconds) *BB-process-starttime*) 1000) color-off " ") ) + in-args))) (apply debug:print dp-args)))) (define *BBpp_custom_expanders_list* (make-hash-table)) ADDED commonmod.scm Index: commonmod.scm ================================================================== --- /dev/null +++ commonmod.scm @@ -0,0 +1,162 @@ +;;====================================================================== +;; Copyright 2017, Matthew Welland. +;; +;; This file is part of Megatest. +;; +;; Megatest is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. +;; +;; Megatest is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. +;; +;; You should have received a copy of the GNU General Public License +;; along with Megatest. If not, see . + +;;====================================================================== + +(declare (unit commonmod)) + +(module commonmod + * + +(import scheme chicken data-structures extras files) +(import (prefix sqlite3 sqlite3:) posix typed-records srfi-18 srfi-69 + md5 message-digest + regex srfi-1) + +;;====================================================================== +;; CONTENTS +;; +;; config file utils +;; misc conversion, data manipulation functions +;; testsuite and area utilites +;; +;;====================================================================== + +(include "megatest-version.scm") +(include "megatest-fossil-hash.scm") + +(define (get-full-version) + (conc megatest-version "-" megatest-fossil-hash)) + +(define (version-signature) + (conc megatest-version "-" (substring megatest-fossil-hash 0 4))) + + +;;====================================================================== +;; config file utils +;;====================================================================== + +(define (lookup cfgdat section var) + (if (hash-table? cfgdat) + (let ((sectdat (hash-table-ref/default cfgdat section '()))) + (if (null? sectdat) + #f + (let ((match (assoc var sectdat))) + (if match ;; (and match (list? match)(> (length match) 1)) + (cadr match) + #f)) + )) + #f)) + +;; returns var key1=val1; key2=val2 ... as alist +(define (get-key-list cfgdat section var) + ;; convert string a=1; b=2; c=a silly thing; d= + (let ((valstr (lookup cfgdat section var))) + (if valstr + (val->alist valstr) + '()))) ;; should it return empty list or #f to indicate not set? + + +(define (get-section cfgdat section) + (hash-table-ref/default cfgdat section '())) + +;;====================================================================== +;; misc conversion, data manipulation functions +;;====================================================================== + +;; if it looks like a number -> convert it to a number, else return it +;; +(define (lazy-convert inval) + (let* ((as-num (if (string? inval)(string->number inval) #f))) + (or as-num inval))) + +;; to '((a . 1)(b . 2)(c . "a silly thing")(d . "")) +;; +(define (val->alist val #!key (convert #f)) + (let ((val-list (string-split-fields ";\\s*" val #:infix))) + (if val-list + (map (lambda (x) + (let ((f (string-split-fields "\\s*=\\s*" x #:infix))) + (case (length f) + ((0) `(,#f)) ;; null string case + ((1) `(,(string->symbol (car f)))) + ((2) `(,(string->symbol (car f)) . + ,(let ((inval (cadr f))) + (if convert (lazy-convert inval) inval)))) + (else f)))) + (filter (lambda (x) + (not (string-match "^\\s*" x))) + val-list)) + '()))) + +;;====================================================================== +;; testsuite and area utilites +;;====================================================================== + +(define (get-testsuite-name toppath configdat) + (or (lookup configdat "setup" "area-name") + (lookup configdat "setup" "testsuite") + (get-environment-variable "MT_TESTSUITE_NAME") + (if (string? toppath) + (pathname-file toppath) + #f))) + +(define (get-area-path-signature toppath #!optional (short #f)) + (let ((res (message-digest-string (md5-primitive) toppath))) + (if short + (substring res 0 4) + res))) + +(define (get-area-name configdat toppath #!optional (short #f)) + ;; look up my area name in areas table (future) + ;; generate auto name + (conc (get-area-path-signature toppath short) + "-" + (get-testsuite-name toppath configdat))) + +;; need generic find-record-with-var-nmatching-val +;; +(define (path->area-record cfgdat path) + (let* ((areadat (get-cfg-areas cfgdat)) + (all (filter (lambda (x) + (let* ((keyvals (cdr x)) + (pth (alist-ref 'path keyvals))) + (equal? path pth))) + areadat))) + (if (null? all) + #f + (car all)))) ;; return first match + +;; given a config return an alist of alists +;; area-name => data +;; +(define (get-cfg-areas cfgdat) + (let ((adat (get-section cfgdat "areas"))) + (map (lambda (entry) + `(,(car entry) . + ,(val->alist (cadr entry)))) + adat))) + +;; (define (debug:print . params) #f) +;; (define (debug:print-info . params) #f) +;; +;; (define (set-functions dbgp dbgpinfo) +;; (set! debug:print dbgp) +;; (set! debug:print-info dbgpinfo)) + +) Index: commonstructs ================================================================== --- commonstructs +++ commonstructs @@ -1,5 +1,21 @@ +# Copyright 2006-2017, Matthew Welland. +# +# This file is part of Megatest. +# +# Megatest is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Megatest is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Megatest. If not, see . The database keys, runs are indexed on this keys: (db:get-keys #f) => (#("OS" "TEXT") Index: configf.scm ================================================================== --- configf.scm +++ configf.scm @@ -1,21 +1,30 @@ ;;====================================================================== ;; Copyright 2006-2012, Matthew Welland. ;; -;; This program is made available under the GNU GPL version 2.0 or -;; greater. See the accompanying file COPYING for details. +;; This file is part of Megatest. +;; +;; Megatest is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. +;; +;; Megatest is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. ;; -;; This program is distributed WITHOUT ANY WARRANTY; without even the -;; implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -;; PURPOSE. +;; You should have received a copy of the GNU General Public License +;; along with Megatest. If not, see . + ;;====================================================================== ;;====================================================================== ;; Config file handling ;;====================================================================== -(use regex regex-case) ;; directory-utils) +(use regex regex-case matchable) ;; directory-utils) (declare (unit configf)) (declare (uses process)) (declare (uses env)) (declare (uses keys)) @@ -23,18 +32,18 @@ ;; return list (path fullpath configname) (define (find-config configname #!key (toppath #f)) (if toppath (let ((cfname (conc toppath "/" configname))) - (if (file-exists? cfname) + (if (common:file-exists? cfname) (list toppath cfname configname) (list #f #f #f))) (let* ((cwd (string-split (current-directory) "/"))) (let loop ((dir cwd)) (let* ((path (conc "/" (string-intersperse dir "/"))) (fullpath (conc path "/" configname))) - (if (file-exists? fullpath) + (if (common:file-exists? fullpath) (list path fullpath configname) (let ((remcwd (take dir (- (length dir) 1)))) (if (null? remcwd) (list #f #f #f) ;; #f #f) (loop remcwd))))))))) @@ -50,18 +59,21 @@ (config:assoc-safe-add (hash-table-ref/default cfgdat section-name '()) var value metadata: metadata))) (define (config:eval-string-in-environment str) - (handle-exceptions - exn - (begin - (debug:print-error 0 *default-log-port* "problem evaluating \"" str "\" in the shell environment") - #f) - (let ((cmdres (process:cmd-run->list (conc "echo " str)))) - (if (null? cmdres) "" - (caar cmdres))))) + ;; (if (or (string-null? str) + ;; (equal? "!" (substring str 0 1))) ;; null string or starts with ! are preserved but NOT set in the environment + str + (handle-exceptions + exn + (begin + (debug:print-error 0 *default-log-port* "problem evaluating \"" str "\" in the shell environment, exn=" exn) + #f) + (let ((cmdres (process:cmd-run->list (conc "echo " str)))) + (if (null? cmdres) "" + (caar cmdres))))) ;; ) ;;====================================================================== ;; Make the regexp's needed globally available ;;====================================================================== @@ -77,10 +89,14 @@ (define configf:settings (regexp "^\\[configf:settings\\s+(\\S+)\\s+(\\S+)]\\s*$")) ;; read a line and process any #{ ... } constructs (define configf:var-expand-regex (regexp "^(.*)#\\{(scheme|system|shell|getenv|get|runconfigs-get|rget|scm|sh|rp|gv|g|mtrah)\\s+([^\\}\\{]*)\\}(.*)")) + +(define (configf:system ht cmd) + (system cmd) + ) (define (configf:process-line l ht allow-system #!key (linenum #f)) (let loop ((res l)) (if (string? res) (let ((matchdat (string-search configf:var-expand-regex res))) @@ -92,32 +108,33 @@ (result #f) (start-time (current-seconds)) (cmdsym (string->symbol cmdtype)) (fullcmd (case cmdsym ((scheme scm) (conc "(lambda (ht)" cmd ")")) - ((system) (conc "(lambda (ht)(system \"" cmd "\"))")) + ((system) (conc "(lambda (ht)(configf:system ht \"" cmd "\"))")) ((shell sh) (conc "(lambda (ht)(string-translate (shell \"" cmd "\") \"\n\" \" \"))")) ((realpath rp)(conc "(lambda (ht)(common:nice-path \"" cmd "\"))")) ((getenv gv) (conc "(lambda (ht)(get-environment-variable \"" cmd "\"))")) ((mtrah) (conc "(lambda (ht)" " (let ((extra \"" cmd "\"))" " (conc (or *toppath* (get-environment-variable \"MT_RUN_AREA_HOME\"))" " (if (string-null? extra) \"\" \"/\")" " extra)))")) ((get g) - (let* ((parts (string-split cmd)) - (sect (car parts)) - (var (cadr parts))) - (conc "(lambda (ht)(config-lookup ht \"" sect "\" \"" var "\"))"))) + (match (string-split cmd) + ((sect var)(conc "(lambda (ht)(configf:lookup ht \"" sect "\" \"" var "\"))")) + (else + (debug:print-error 0 *default-log-port* "#{get ...} used with only one parameter, \"" cmd "\", two needed.") + "(lambda (ht) #f)"))) ((runconfigs-get rget) (conc "(lambda (ht)(runconfigs-get ht \"" cmd "\"))")) ;; ((rget) (conc "(lambda (ht)(runconfigs-get ht \"" cmd "\"))")) (else "(lambda (ht)(print \"ERROR\") \"ERROR\")")))) ;; (print "fullcmd=" fullcmd) (handle-exceptions exn (begin - (debug:print 0 *default-log-port* "WARNING: failed to process config input \"" l "\"") + (debug:print 0 *default-log-port* "WARNING: failed to process config input \"" l "\", exn=" exn) (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn)) ;; (print "exn=" (condition->list exn)) (set! result (conc "#{( " cmdtype ") " cmd "}, full expansion: " fullcmd))) (if (or allow-system (not (member cmdtype '("system" "shell" "sh")))) @@ -172,15 +189,31 @@ (configf:process-line inl ht allow-processing)) ((return-string) inl) (else (configf:process-line inl ht allow-processing))))) - (if (and (string? res) - (not (equal? (hash-table-ref/default settings "trim-trailing-spaces" "no") "no"))) + (if (and (string? res) ;; must set to "no" to force NOT trimming trailing spaces + (not (equal? (hash-table-ref/default settings "trim-trailing-spaces" "yes") "no"))) (string-substitute "\\s+$" "" res) res)))))) - + +(define (configf:cfgdat->env-alist section cfgdat-ht allow-system) + (filter + (lambda (pair) + (let* ((var (car pair)) + (val (cdr pair))) + (cons var + (cond + ((and allow-system (procedure? val)) ;; if we decided to use something other than #t or #f for allow-system ('return-procs or 'return-string) , this may become problematic + (val)) + ((procedure? val) #f) + ((string? val) val) + (else "#f"))))) + (append + (hash-table-ref/default cfgdat-ht "default" '()) + (if (equal? section "default") '() (hash-table-ref/default cfgdat-ht section '()))))) + (define (calc-allow-system allow-system section sections) (if sections (and (or (equal? "default" section) (member section sections)) allow-system) ;; account for sections and return allow-system as it might be a symbol such as return-strings @@ -217,22 +250,34 @@ ;; read a config file, returns hash table of alists ;; read a config file, returns hash table of alists ;; adds to ht if given (must be #f otherwise) +;; allow-system: +;; #f - do not evaluate [system +;; #t - immediately evaluate [system and store result as string +;; 'return-procs -- return a proc taking ht as an argument that may be evaulated at some future time +;; 'return-string -- return a string representing a proc taking ht as an argument that may be evaulated at some future time ;; envion-patt is a regex spec that identifies sections that will be eval'd ;; in the environment on the fly ;; sections: #f => get all, else list of sections to gather ;; post-section-procs alist of section-pattern => proc, where: (proc section-name next-section-name ht curr-path) ;; apply-wildcards: #t/#f - apply vars from targets with % wildcards to all matching sections ;; -(define (read-config path ht allow-system #!key (environ-patt #f) (curr-section #f) +(define (read-config path ht allow-system #!key (environ-patt #f) (curr-section #f) (sections #f) (settings (make-hash-table)) (keep-filenames #f) - (post-section-procs '()) (apply-wildcards #t)) + (post-section-procs '()) (apply-wildcards #t) ) (debug:print 9 *default-log-port* "START: " path) +;; (if *configdat* +;; (common:save-pkt `((action . read-config) +;; (f . ,(cond ((string? path) path) +;; ((port? path) "port") +;; (else (conc path)))) +;; (T . configf)) +;; *configdat* #t add-only: #t)) (if (and (not (port? path)) - (not (file-exists? path))) ;; for case where we are handed a port + (not (common:file-exists? path))) ;; for case where we are handed a port (begin (debug:print-info 1 *default-log-port* "read-config - file not found " path " current path: " (current-directory)) ;; WARNING: This is a risky change but really, we should not return an empty hash table if no file read? #f) ;; (if (not ht)(make-hash-table) ht)) (let ((inp (if (string? path) @@ -265,146 +310,193 @@ (lambda (section) (if (not (member section sections)) (hash-table-delete! res section))) ;; we are using "" as a dumping ground and must remove it before returning the ht (hash-table-keys res))) (debug:print 9 *default-log-port* "END: " path) - res) + res + ) ;; retval (regex-case inl - (configf:comment-rx _ (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings) curr-section-name #f #f)) - (configf:blank-l-rx _ (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings) curr-section-name #f #f)) - (configf:settings ( x setting val ) (begin - (hash-table-set! settings setting val) - (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings) curr-section-name #f #f))) - (configf:include-rx ( x include-file ) (let* ((curr-conf-dir (pathname-directory path)) - (full-conf (if (absolute-pathname? include-file) - include-file - (common:nice-path - (conc (if curr-conf-dir - curr-conf-dir - ".") - "/" include-file))))) - (if (file-exists? full-conf) - (begin - ;; (push-directory conf-dir) - (debug:print 9 *default-log-port* "Including: " full-conf) - (read-config full-conf res allow-system environ-patt: environ-patt curr-section: curr-section-name sections: sections settings: settings keep-filenames: keep-filenames) - ;; (pop-directory) - (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings) curr-section-name #f #f)) - (begin - (debug:print '(2 9) #f "INFO: include file " include-file " not found (called from " path ")") - (debug:print 2 *default-log-port* " " full-conf) - (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings) curr-section-name #f #f))))) + (configf:comment-rx _ (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings) + curr-section-name #f #f)) + + (configf:blank-l-rx _ (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings) + curr-section-name #f #f)) + (configf:settings ( x setting val ) + (begin + (hash-table-set! settings setting val) + (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings) + curr-section-name #f #f))) + + (configf:include-rx ( x include-file ) + (let* ((curr-conf-dir (pathname-directory path)) + (full-conf (if (and (absolute-pathname? include-file) (file-exists? include-file)) + include-file + (common:nice-path + (conc (if curr-conf-dir + curr-conf-dir + ".") + "/" include-file))))) + (let ((all-matches (sort (handle-exceptions exn + (begin + (debug:print '(2 9) *default-log-port* "glob of " full-conf " gave no match. , exn=" exn) + (list)) + (glob full-conf)) string<=?))) + (if (null? all-matches) + (begin + (debug:print '(2 9) #f "INFO: include file(s) matching " include-file " not found (called from " path ")") + (debug:print 2 *default-log-port* " " full-conf)) + (for-each + (lambda (fpath) + ;; (push-directory conf-dir) + (debug:print 9 *default-log-port* "Including: " full-conf) + (read-config fpath res allow-system environ-patt: environ-patt + curr-section: curr-section-name sections: sections settings: settings + keep-filenames: keep-filenames)) + all-matches)) + (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings) + curr-section-name #f #f)))) (configf:script-rx ( x include-script params);; handle-exceptions ;; exn ;; (begin ;; (debug:print '(0 2 9) #f "INFO: include from script " include-script " failed.") ;; (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings) curr-section-name #f #f)) - (if (and (file-exists? include-script)(file-execute-access? include-script)) - (let* ((new-inp-port (open-input-pipe (conc include-script " " params)))) - (debug:print '(2 9) *default-log-port* "Including from script output: " include-script) - ;; (print "We got here, calling read-config next. Port is: " new-inp-port) - (read-config new-inp-port res allow-system environ-patt: environ-patt curr-section: curr-section-name sections: sections settings: settings keep-filenames: keep-filenames) - (close-input-port new-inp-port) - (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings) curr-section-name #f #f)) - (begin - (debug:print 0 *default-log-port* "Script not found or not exectutable: " include-script) - (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings) curr-section-name #f #f))) - ) ;; ) - (configf:section-rx ( x section-name ) (begin - ;; call post-section-procs - (for-each - (lambda (dat) - (let ((patt (car dat)) - (proc (cdr dat))) - (if (string-match patt curr-section-name) - (proc curr-section-name section-name res path)))) - post-section-procs) - ;; after gathering the vars for a section and if apply-wildcards is true and if there is a wildcard in the section name process wildcards - ;; NOTE: we are processing the curr-section-name, NOT section-name. - (process-wildcards res curr-section-name) - (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings) - ;; if we have the sections list then force all settings into "" and delete it later? - ;; (if (or (not sections) - ;; (member section-name sections)) - ;; section-name "") ;; stick everything into "". NOPE: We need new strategy. Put stuff in correct sections and then delete all sections later. - section-name - #f #f))) - (configf:key-sys-pr ( x key cmd ) (if (calc-allow-system allow-system curr-section-name sections) - (let ((alist (hash-table-ref/default res curr-section-name '())) - (val-proc (lambda () - (let* ((start-time (current-seconds)) - (cmdres (process:cmd-run->list cmd)) - (delta (- (current-seconds) start-time)) - (status (cadr cmdres)) - (res (car cmdres))) - (debug:print-info 4 *default-log-port* "" inl "\n => " (string-intersperse res "\n")) - (if (not (eq? status 0)) - (begin - (debug:print-error 0 *default-log-port* "problem with " inl ", return code " status - " output: " cmdres))) - (if (> delta 2) - (debug:print-info 0 *default-log-port* "for line \"" inl "\"\n command: " cmd " took " delta " seconds to run with output:\n " res) - (debug:print-info 9 *default-log-port* "for line \"" inl "\"\n command: " cmd " took " delta " seconds to run with output:\n " res)) - (if (null? res) - "" - (string-intersperse res " ")))))) - (hash-table-set! res curr-section-name - (config:assoc-safe-add alist - key - (case (calc-allow-system allow-system curr-section-name sections) - ((return-procs) val-proc) - ((return-string) cmd) - (else (val-proc))) - metadata: metapath)) - (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings) curr-section-name #f #f)) - (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings) curr-section-name #f #f))) - (configf:key-no-val ( x key val) (let* ((alist (hash-table-ref/default res curr-section-name '())) - (fval (or (if (string? val) val #f) ""))) ;; fval should be either "" or " " (one or more spaces) - (debug:print 10 *default-log-port* " setting: [" curr-section-name "] " key " = #t") - (safe-setenv key fval) - (hash-table-set! res curr-section-name - (config:assoc-safe-add alist key fval metadata: metapath)) - (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings) curr-section-name key #f))) - (configf:key-val-pr ( x key unk1 val unk2 ) (let* ((alist (hash-table-ref/default res curr-section-name '())) - (envar (and environ-patt (string-search (regexp environ-patt) curr-section-name))) - (realval (if envar - (config:eval-string-in-environment val) - val))) - (debug:print-info 6 *default-log-port* "read-config env setting, envar: " envar " realval: " realval " val: " val " key: " key " curr-section-name: " curr-section-name) - (if envar (safe-setenv key realval)) - (debug:print 10 *default-log-port* " setting: [" curr-section-name "] " key " = " val) - (hash-table-set! res curr-section-name - (config:assoc-safe-add alist key realval metadata: metapath)) - (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings) curr-section-name key #f))) + (if (and (common:file-exists? include-script)(file-execute-access? include-script)) + (let* ((local-allow-system (calc-allow-system allow-system curr-section-name sections)) + (env-delta (configf:cfgdat->env-alist curr-section-name res local-allow-system)) + (new-inp-port + (common:with-env-vars + env-delta + (lambda () + (open-input-pipe (conc include-script " " params)))))) + (debug:print '(2 9) *default-log-port* "Including from script output: " include-script) + ;; (print "We got here, calling read-config next. Port is: " new-inp-port) + (read-config new-inp-port res allow-system environ-patt: environ-patt curr-section: curr-section-name sections: sections settings: settings keep-filenames: keep-filenames) + (close-input-port new-inp-port) + (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings) curr-section-name #f #f)) + (begin + (debug:print 0 *default-log-port* "Script not found or not exectutable: " include-script) + (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings) curr-section-name #f #f))) + ) ;; ) + (configf:section-rx ( x section-name ) + (begin + ;; call post-section-procs + (for-each + (lambda (dat) + (let ((patt (car dat)) + (proc (cdr dat))) + (if (string-match patt curr-section-name) + (proc curr-section-name section-name res path)))) + post-section-procs) + ;; after gathering the vars for a section and if apply-wildcards is true and if there is a wildcard in the section name process wildcards + ;; NOTE: we are processing the curr-section-name, NOT section-name. + (process-wildcards res curr-section-name) + (if (not (hash-table-ref/default res section-name #f))(hash-table-set! res section-name '())) ;; ensure that mere mention of a section is not lost + (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings) + ;; if we have the sections list then force all settings into "" and delete it later? + ;; (if (or (not sections) + ;; (member section-name sections)) + ;; section-name "") ;; stick everything into "". NOPE: We need new strategy. Put stuff in correct sections and then delete all sections later. + section-name + #f #f))) + (configf:key-sys-pr ( x key cmd ) + (if (calc-allow-system allow-system curr-section-name sections) + (let ((alist (hash-table-ref/default res curr-section-name '())) + (val-proc (lambda () + (let* ((start-time (current-seconds)) + (local-allow-system (calc-allow-system allow-system curr-section-name sections)) + (env-delta (configf:cfgdat->env-alist curr-section-name res local-allow-system)) + (cmdres (process:cmd-run->list cmd delta-env-alist-or-hash-table: env-delta)) ;; BB: here is where [system is exec'd. needs to have env from other vars! + (delta (- (current-seconds) start-time)) + (status (cadr cmdres)) + (res (car cmdres))) + (debug:print-info 4 *default-log-port* "" inl "\n => " (string-intersperse res "\n")) + (if (not (eq? status 0)) + (begin + (debug:print-error 0 *default-log-port* "problem with " inl ", return code " status + " output: " cmdres))) + (if (> delta 2) + (debug:print-info 0 *default-log-port* "for line \"" inl "\"\n command: " cmd " took " delta " seconds to run with output:\n " res) + (debug:print-info 9 *default-log-port* "for line \"" inl "\"\n command: " cmd " took " delta " seconds to run with output:\n " res)) + (if (null? res) + "" + (string-intersperse res " ")))))) + (hash-table-set! res curr-section-name + (config:assoc-safe-add alist + key + (case (calc-allow-system allow-system curr-section-name sections) + ((return-procs) val-proc) + ((return-string) cmd) + (else (val-proc))) + metadata: metapath)) + (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings) curr-section-name #f #f)) + (loop (configf:read-line inp res + (calc-allow-system allow-system curr-section-name sections) + settings) + curr-section-name #f #f))) + + (configf:key-no-val ( x key val) + (let* ((alist (hash-table-ref/default res curr-section-name '())) + (fval (or (if (string? val) val #f) ""))) ;; fval should be either "" or " " (one or more spaces) + (debug:print 10 *default-log-port* " setting: [" curr-section-name "] " key " = #t") + (safe-setenv key fval) + (hash-table-set! res curr-section-name + (config:assoc-safe-add alist key fval metadata: metapath)) + (loop (configf:read-line inp res + (calc-allow-system allow-system curr-section-name sections) + settings) + curr-section-name key #f))) + + (configf:key-val-pr ( x key unk1 val unk2 ) + (let* ((alist (hash-table-ref/default res curr-section-name '())) + (envar (and environ-patt + (string-search (regexp environ-patt) curr-section-name) ;; does the section match the envionpatt? + (and (not (string-null? key)) + (not (equal? "!" (substring key 0 1)))) ;; ! as leading character is a signature to NOT export to the environment + ;; (string-match "^.*:.*:.*$" key) ;; ;; something:something:something reserved for triggers in runconfigs + )) + (realval (if envar + (config:eval-string-in-environment val) + val))) + (debug:print-info 6 *default-log-port* "read-config env setting, envar: " envar " realval: " realval " val: " val " key: " key " curr-section-name: " curr-section-name) + (if envar (safe-setenv key realval)) + (debug:print 10 *default-log-port* " setting: [" curr-section-name "] " key " = " val) + (hash-table-set! res curr-section-name + (config:assoc-safe-add alist key realval metadata: metapath)) + (loop (configf:read-line inp res + (calc-allow-system allow-system curr-section-name sections) settings) + curr-section-name key #f))) ;; if a continued line - (configf:cont-ln-rx ( x whsp val ) (let ((alist (hash-table-ref/default res curr-section-name '()))) - (if var-flag ;; if set to a string then we have a continued var - (let ((newval (conc - (config-lookup res curr-section-name var-flag) "\n" - ;; trim lead from the incoming whsp to support some indenting. - (if lead - (string-substitute (regexp lead) "" whsp) - "") - val))) - ;; (print "val: " val "\nnewval: \"" newval "\"\nvarflag: " var-flag) - (hash-table-set! res curr-section-name - (config:assoc-safe-add alist var-flag newval metadata: metapath)) - (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings) curr-section-name var-flag (if lead lead whsp))) - (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings) curr-section-name #f #f)))) + (configf:cont-ln-rx ( x whsp val ) + (let ((alist (hash-table-ref/default res curr-section-name '()))) + (if var-flag ;; if set to a string then we have a continued var + (let ((newval (conc + (configf:lookup res curr-section-name var-flag) "\n" + ;; trim lead from the incoming whsp to support some indenting. + (if lead + (string-substitute (regexp lead) "" whsp) + "") + val))) + ;; (print "val: " val "\nnewval: \"" newval "\"\nvarflag: " var-flag) + (hash-table-set! res curr-section-name + (config:assoc-safe-add alist var-flag newval metadata: metapath)) + (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings) curr-section-name var-flag (if lead lead whsp))) + (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings) curr-section-name #f #f)))) (else (debug:print-error 0 *default-log-port* "problem parsing " path ",\n \"" inl "\"") (set! var-flag #f) - (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings) curr-section-name #f #f)))))))) + (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings) curr-section-name #f #f)))) + ) ;; end loop + ))) ;; pathenvvar will set the named var to the path of the config (define (find-and-read-config fname #!key (environ-patt #f)(given-toppath #f)(pathenvvar #f)) (let* ((curr-dir (current-directory)) (configinfo (find-config fname toppath: given-toppath)) (toppath (car configinfo)) (configfile (cadr configinfo)) (set-fields (lambda (curr-section next-section ht path) - (let ((field-names (if ht (keys:config-get-fields ht) '())) + (let ((field-names (if ht (common:get-fields ht) '())) (target (or (getenv "MT_TARGET")(args:get-arg "-reqtarg")(args:get-arg "-target")))) (debug:print-info 9 *default-log-port* "set-fields with field-names=" field-names " target=" target " curr-section=" curr-section " next-section=" next-section " path=" path " ht=" ht) (if (not (null? field-names))(keys:target-set-args field-names target #f)))))) (if toppath (change-directory toppath)) (if (and toppath pathenvvar)(setenv pathenvvar toppath)) @@ -411,11 +503,11 @@ (let ((configdat (if configfile (read-config configfile #f #t environ-patt: environ-patt post-section-procs: (list (cons "^fields$" set-fields)) #f)))) (if toppath (change-directory curr-dir)) (list configdat toppath configfile fname)))) -(define (config-lookup cfgdat section var) +(define (configf:lookup cfgdat section var) (if (hash-table? cfgdat) (let ((sectdat (hash-table-ref/default cfgdat section '()))) (if (null? sectdat) #f (let ((match (assoc var sectdat))) @@ -423,21 +515,51 @@ (cadr match) #f)) )) #f)) -(define configf:lookup config-lookup) +;; use to have definitive setting: +;; [foo] +;; var yes +;; +;; (configf:var-is? cfgdat "foo" "var" "yes") => #t +;; +(define (configf:var-is? cfgdat section var expected-val) + (equal? (configf:lookup cfgdat section var) expected-val)) + +(define config-lookup configf:lookup) (define configf:read-file read-config) + +;; safely look up a value that is expected to be a number, return +;; a default (#f unless provided) +;; +(define (configf:lookup-number cfdat section varname #!key (default #f)) + (let* ((val (configf:lookup *configdat* section varname)) + (res (if val + (string->number (string-substitute "\\s+" "" val #t)) + #f))) + (cond + (res res) + (val (debug:print 0 *default-log-port* "ERROR: no number found for [" section "], " varname ", got: " val)) + (else default)))) (define (configf:section-vars cfgdat section) (let ((sectdat (hash-table-ref/default cfgdat section '()))) (if (null? sectdat) '() (map car sectdat)))) (define (configf:get-section cfgdat section) (hash-table-ref/default cfgdat section '())) + +(define (configf:set-section-var cfgdat section var val) + (let ((sectdat (configf:get-section cfgdat section))) + (hash-table-set! cfgdat section + (config:assoc-safe-add sectdat var val)))) + + ;;(append (filter (lambda (x)(not (assoc var sectdat))) sectdat) + ;; (list var val)))) (define (setup) (let* ((configf (find-config "megatest.config")) (config (if configf (read-config configf #f #t) #f))) (if config @@ -487,11 +609,11 @@ (if (null? tal) newres (loop (car tal)(cdr tal) newres)))))) (define (configf:file->list fname) - (if (file-exists? fname) + (if (common:file-exists? fname) (let ((inp (open-input-file fname))) (let loop ((inl (read-line inp)) (res '())) (if (eof-object? inl) (begin @@ -517,11 +639,11 @@ (sechash (make-hash-table)) ;; current section hash, init with hash for "default" section (new #f) ;; put the line to be used in new, if it is to be deleted the set new to #f (secname #f)) ;; step 2: Flatten multiline entries - (if (not (null? fdat))(set! fdat (configf:compress-multi-line fdat))) + (if (not (null? fdat))(set! fdat (configf:compress-multi-lines fdat))) ;; step 3: Modify values per contents of "indat" and remove absent values (if (not (null? fdat)) (let loop ((hed (car fdat)) (tal (cadr fdat)) @@ -532,19 +654,19 @@ (configf:comment-rx _ (set! res (append res (list hed)))) ;; (loop (read-line inp) curr-section-name #f #f)) (configf:blank-l-rx _ (set! res (append res (list hed)))) ;; (loop (read-line inp) curr-section-name #f #f)) (configf:section-rx ( x section-name ) (let ((section-hash (hash-table-ref/default refdat section-name #f))) (if (not section-hash) (let ((newhash (make-hash-table))) - (hash-table-set! refhash section-name newhash) + (hash-table-set! refdat section-name newhash) ;; was refhash - not sure that refdat is correct here (set! sechash newhash)) (set! sechash section-hash)) (set! new hed) ;; will append this at the bottom of the loop (set! secname section-name) )) ;; No need to process key cmd, let it fall though to key val (configf:key-val-pr ( x key val ) - (let ((newval (config-lookup indat sec key))) + (let ((newval (configf:lookup indat secname key))) ;; was sec, bug or correct? ;; can handle newval == #f here => that means key is removed (cond ((equal? newval val) (set! res (append res (list hed)))) ((not newval) ;; key has been removed @@ -566,18 +688,18 @@ (lambda (section) (let ((sdat '()) ;; append needed bits here (svars (configf:section-vars indat section))) (for-each (lambda (var) - (let ((val (config-lookup refdat section var))) + (let ((val (configf:lookup refdat section var))) (if (not val) ;; this one is new (begin (if (null? sdat)(set! sdat (list (conc "[" section "]")))) (set! sdat (append sdat (list (conc var " " val)))))))) svars) (set! fdat (append fdat sdat)))) - (delete-duplicates (append require-sections (hash-table-keys indat)))) + (delete-duplicates (append required-sections (hash-table-keys indat)))) ;; step 5: Write out new file (with-output-to-file fname (lambda () (for-each @@ -591,11 +713,11 @@ ;; reads a refdb into an assoc array of assoc arrays ;; returns (list dat msg) (define (configf:read-refdb refdb-path) (let ((sheets-file (conc refdb-path "/sheet-names.cfg"))) - (if (not (file-exists? sheets-file)) + (if (not (common:file-exists? sheets-file)) (list #f (conc "ERROR: no refdb found at " refdb-path)) (if (not (file-read-access? sheets-file)) (list #f (conc "ERROR: refdb file not readable at " refdb-path)) (let* ((sheets (with-input-from-file sheets-file (lambda () @@ -658,41 +780,42 @@ ;; if (define (configf:read-alist fname) (handle-exceptions exn - #f + (begin + (debug:print-info 0 *default-log-port* "unable to read alist " fname ". exn=" exn) + #f) (configf:alist->config (with-input-from-file fname read)))) (define (configf:write-alist cdat fname) - (if (common:faux-lock fname) - (let* ((dat (configf:config->alist cdat)) - (res - (begin - (with-output-to-file fname ;; first write out the file - (lambda () - (pp dat))) - - (if (common:file-exists? fname) ;; now verify it is readable - (if (configf:read-alist fname) - #t ;; data is good. - (begin - (handle-exceptions - exn - #f - (debug:print 0 *default-log-port* "WARNING: content " dat " for cache " fname " is not readable. Deleting generated file.") - (delete-file fname)) - #f)) - #f)))) - - (common:faux-unlock fname) - res) - (begin - (debug:print 0 *default-log-port* "WARNING: could not get faux-lock on " fname) - #f))) - + (if (not (common:faux-lock fname)) + (debug:print 0 *default-log-port* "INFO: Could not get lock on " fname)) + (let* ((dat (configf:config->alist cdat)) + (res + (begin + (with-output-to-file fname ;; first write out the file + (lambda () + (pp dat))) + + (if (common:file-exists? fname) ;; now verify it is readable + (if (configf:read-alist fname) + #t ;; data is good. + (begin + (handle-exceptions + exn + (begin + (debug:print 0 *default-log-port* "deleting " fname " failed, exn=" exn) + #f) + (debug:print 0 *default-log-port* "WARNING: content " dat " for cache " fname " is not readable. Deleting generated file.") + (delete-file fname)) + #f)) + #f)))) + (common:faux-unlock fname) + res)) + ;; convert hierarchial list to ini format ;; (define (configf:config->ini data) (map (lambda (section) ADDED configure Index: configure ================================================================== --- /dev/null +++ configure @@ -0,0 +1,101 @@ +#!/bin/bash + +# Copyright 2006-2017, Matthew Welland. +# +# This file is part of Megatest. +# +# Megatest is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Megatest is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Megatest. If not, see . + +# Configure the build + +if [[ "$1"x == "x" ]];then + PREFIX=$PWD +else + PREFIX=$1 +fi + + +#====================================================================== +# Configure stuff needed for eggs +#====================================================================== + +function configure_dependencies () { + + #====================================================================== + # libnanomsg + #====================================================================== + + if [[ ! $(ls /usr/lib/*/libnanomsg*) ]];then + echo "libnanomsg build needed." + echo "BUILD_NANOMSG=yes" >> makefile.inc + fi + + #====================================================================== + # postgresql libraries + #====================================================================== + + if [[ ! $(ls /usr/lib/*/libpq.*) ]];then + echo "Postgresql build needed." + echo "BUILD_POSTGRES=yes" >> makefile.inc + fi + + if [[ ! $(ls /usr/lib/*/libsqlite3.*) ]];then + echo "Sqlite3 build needed." + echo "BUILD_SQLITE3=yes" >> makefile.inc + fi + +} + +#====================================================================== +# Initialize makefile.inc +#====================================================================== + +echo "" > makefile.inc + +#====================================================================== +# Do we need Chicken? +#====================================================================== + +if [[ -e /usr/bin/sw_vers ]]; then + ARCHSTR=$(/usr/bin/sw_vers -productVersion) +else + ARCHSTR=$(lsb_release -sr) +fi + +echo "CHICKEN_PREFIX=$PREFIX/.$ARCHSTR" >> makefile.inc +CHICKEN_PREFIX=$PREFIX/bin/.$ARCHSTR + +if [[ ! $(type csi) ]];then + echo "Chicken build needed." + echo "BUILD_CHICKEN=yes" >> makefile.inc + configure_dependencies + echo "include chicken.makefile" >> makefile.inc +else + echo "CSIPATH=$(which csi)" >> makefile.inc + CSIPATH=$(which csi) + echo "CKPATH=$(dirname $(dirname $CSIPATH))" >> makefile.inc +fi + +# Make setup scripts +echo "#!/bin/bash" > setup.sh +echo "export PATH=$CHICKEN_PREFIX/bin:\$PATH" >> setup.sh +echo "export LD_LIBRARY_PATH=$CHICKEN_PREFIX/lib" >> setup.sh +echo 'exec "$@"' >> setup.sh +chmod a+x setup.sh + +echo "setenv PATH $CHICKEN_PREFIX/bin:\$PATH" > setup.csh +echo "setenv LD_LIBRARY_PATH $CHICKEN_PREFIX/lib" >> setup.csh + +echo "All done creating makefile.inc, feel free to edit it!" +echo "run \"setup.sh bash\" or source setup.csh to get PATH and LD_LIBRARY_PATH adjusted" ADDED cookie.scm Index: cookie.scm ================================================================== --- /dev/null +++ cookie.scm @@ -0,0 +1,23 @@ +;;====================================================================== +;; Copyright 2019, Matthew Welland. +;; +;; This file is part of Megatest. +;; +;; Megatest is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. +;; +;; Megatest is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. +;; +;; You should have received a copy of the GNU General Public License +;; along with Megatest. If not, see . + +;;====================================================================== + +(declare (unit cookie)) + +(include "stml2/cookie.scm") DELETED daemon.scm Index: daemon.scm ================================================================== --- daemon.scm +++ /dev/null @@ -1,45 +0,0 @@ -;; Taken from the chicken 3.x daemon egg -;; -;; Copyright (c) 2007 Hans Bulfone -;; All rights reserved. -;; -;; Redistribution and use in source and binary forms, with or without -;; modification, are permitted provided that the following conditions are met: -;; -;; * Redistributions of source code must retain the above copyright notice, -;; this list of conditions and the following disclaimer. -;; * Redistributions in binary form must reproduce the above copyright -;; notice, this list of conditions and the following disclaimer in the -;; documentation and/or other materials provided with the distribution. -;; * Neither the name of the author nor the names of his contributors may -;; be used to endorse or promote products derived from this software -;; without specific prior written permission. -;; -;; THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -;; AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, -;; THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -;; PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR -;; CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -;; EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -;; PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -;; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -;; WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -;; OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -;; ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -(declare (unit daemon)) - -(define (daemon:ize) - (change-directory "/") - (let ((fd-r (file-open "/dev/null" open/rdonly)) - (fd-w (file-open "/dev/null" open/wronly))) - (duplicate-fileno fd-r 0) - (duplicate-fileno fd-w 1) - (file-close fd-r) - (file-close fd-w)) - (let ((child-pid (process-fork))) - (if (not (zero? child-pid)) - (exit 0))) - (create-session) - (duplicate-fileno 1 2) - (void)) ADDED dashboard-context-menu.scm Index: dashboard-context-menu.scm ================================================================== --- /dev/null +++ dashboard-context-menu.scm @@ -0,0 +1,350 @@ +;;====================================================================== +;; Copyright 2006-2012, Matthew Welland. +;; +;; This file is part of Megatest. +;; +;; Megatest is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. +;; +;; Megatest is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. +;; +;; You should have received a copy of the GNU General Public License +;; along with Megatest. If not, see . + +;;====================================================================== + +;;====================================================================== +;; implementation of context menu that pops up on +;; right click on test cell in Runs & Runs Summary Tabs +;;====================================================================== + +(use format fmt) +(require-library iup) +(import (prefix iup iup:)) + +(use canvas-draw) + +(use srfi-1 posix regex regex-case srfi-69) +(use (prefix sqlite3 sqlite3:)) + +(declare (unit dashboard-context-menu)) +(declare (uses common)) +(declare (uses db)) +(declare (uses gutils)) +(declare (uses rmt)) +(declare (uses ezsteps)) +;; (declare (uses sdb)) +;; (declare (uses filedb)) +(declare (uses subrun)) + +(include "common_records.scm") +(include "db_records.scm") +(include "run_records.scm") + +(define (dboard:launch-testpanel run-id test-id) + (let* ((dboardexe (common:find-local-megatest "dashboard")) + (cmd (conc dboardexe + " -test " run-id "," test-id + " &"))) + (system cmd))) + + +(define (dashboard:run-menu-items run-id test-id target runname test-name testpatt item-test-path test-info) + (list + (iup:menu-item + (conc "Rerun " testpatt) + #:action + (lambda (obj) + ;; (print " run-id: " run-id " test-id: " test-id " target: " target " runname: " runname " test-name: " test-name " testpatt: " testpatt "item-path : " item-path) + (common:run-a-command + (conc "megatest -run -target " target + " -runname " runname + " -testpatt " testpatt + " -preclean -clean-cache") + ))) + (iup:menu-item + "Rerun Complete Run" + #:action + (lambda (obj) + (common:run-a-command + (conc "megatest -set-state-status NOT_STARTED,n/a -run -target " target + " -runname " runname + " -testpatt % " + " -preclean -clean-cache")))) + (iup:menu-item + "Clean Complete Run" + #:action + (lambda (obj) + (common:run-a-command + (conc "megatest -remove-runs -target " target + " -runname " runname + " -testpatt % ")))) + (iup:menu-item + "Kill Complete Run" + #:action + (lambda (obj) + (common:run-a-command + (conc "megatest -set-state-status KILLREQ,n/a -target " target + " -runname " runname + " -testpatt % " + " -state RUNNING,REMOTEHOSTSTART,LAUNCHED,NOT_STARTED")))) + (iup:menu-item + "Delete Run Data" + #:action + (lambda (obj) + (common:run-a-command + (conc "megatest -remove-runs -target " target + " -runname " runname + " -testpatt % " + " -keep-records")))))) + +(define (dashboard:test-menu-items run-id test-id target runname test-name testpatt item-test-path test-info) + (list + (iup:menu-item + (conc "Rerun " item-test-path) + #:action + (lambda (obj) + (common:run-a-command + (conc "megatest -set-state-status NOT_STARTED,n/a -run -target " target + " -runname " runname + " -testpatt " item-test-path + " -preclean -clean-cache")))) + (iup:menu-item + (conc "Kill " item-test-path) + #:action + (lambda (obj) + ;; (rmt:test-set-state-status-by-id run-id test-id "KILLREQ" #f #f) + (common:run-a-command + (conc "megatest -set-state-status KILLREQ,n/a -target " target + " -runname " runname + " -testpatt " item-test-path + " -state RUNNING,REMOTEHOSTSTART,LAUNCHED")))) + (iup:menu-item + (conc "Delete data : " item-test-path) + #:action + (lambda (obj) + (common:run-a-command + (conc "megatest -remove-runs -target " target + " -runname " runname + " -testpatt " item-test-path + " -keep-records")))) + (iup:menu-item + (conc "Clean "item-test-path) + #:action + (lambda (obj) + (common:run-a-command + (conc "megatest -remove-runs -target " target + " -runname " runname + " -testpatt " item-test-path)))) + (iup:menu-item + "Start xterm" + #:action + (lambda (obj) + (dcommon:examine-xterm run-id test-id))) + ;;(let* ((cmd (conc (car (argv)) " -xterm " run-id "," test-id "&"))) + ;; (system cmd)))) + (iup:menu-item + "Edit testconfig" + #:action + (lambda (obj) + (let* ((all-tests (tests:get-all)) + (editor-rx (or (configf:lookup *configdat* "setup" "editor-regex") + "\\b(vim?|nano|pico)\\b")) + (editor (or (configf:lookup *configdat* "setup" "editor") + (get-environment-variable "VISUAL") + (get-environment-variable "EDITOR") "vi")) + (tconfig (conc (hash-table-ref all-tests test-name) "/testconfig")) + (cmd (conc (if (string-search editor-rx editor) + (conc "xterm -e " editor) + editor) + " " tconfig " &"))) + (system cmd)))))) + +(define (dashboard:step-logs-menu-item run-id test-id target runname test-name testpatt item-test-path test-info) + (let* ((steps (tests:get-compressed-steps run-id test-id)) ;; # + (rundir (db:test-get-rundir test-info))) + + (iup:menu-item + "Step logs" + (apply iup:menu + (map (lambda (step) + (let ((stepname (vector-ref step 0)) + (logfile (vector-ref step 5)) + (status (vector-ref step 3))) + (iup:menu-item + (conc stepname "/" (if (string=? logfile "") "no log!" logfile) " (" status ")") + #:action (lambda (obj) + (let ((fullfile (conc rundir "/" logfile))) + (if (common:file-exists? fullfile) + (dcommon:run-html-viewer fullfile) + (message-window (conc "file " fullfile " not found")))))))) + steps))))) + +(define (dashboard:toplevel-menu-items run-id test-id target runname test-name testpatt item-test-path test-info) + (list + + (iup:menu-item + "Test Control Panel" + #:action + (lambda (obj) + (dboard:launch-testpanel run-id test-id))) + + (dashboard:step-logs-menu-item run-id test-id target runname test-name testpatt item-test-path test-info) + + (iup:menu-item + (conc "Rerun " item-test-path) + #:action + (lambda (obj) + (common:run-a-command + (conc "megatest -set-state-status NOT_STARTED,n/a -run -target " target + " -runname " runname + " -testpatt " item-test-path + " -preclean -clean-cache")))) + + (iup:menu-item + "Start xterm" + #:action + (lambda (obj) + (dcommon:examine-xterm run-id test-id))) + + (iup:menu-item + (conc "Kill " item-test-path) + #:action + (lambda (obj) + ;; (rmt:test-set-state-status-by-id run-id test-id "KILLREQ" #f #f) + (common:run-a-command + (conc "megatest -set-state-status KILLREQ,n/a -target " target + " -runname " runname + " -testpatt " item-test-path + " -state RUNNING,REMOTEHOSTSTART,LAUNCHED,NOT_STARTED")))) + + (let* ((rundir (db:test-get-rundir test-info)) + (has-subrun (subrun:subrun-test-initialized? rundir))) + (if has-subrun + (iup:menu-item + "Launch subrun dashboard" + #:action + (lambda (obj) + (subrun:launch-dashboard rundir))) + (iup:vbox))) + + (iup:menu-item + (conc "View Log " item-test-path) + #:action + (lambda (obj) + (let* ((rundir (db:test-get-rundir test-info)) + (logf (db:test-get-final_logf test-info)) + (fullfile (conc rundir "/" logf))) + (if (common:file-exists? fullfile) + (dcommon:run-html-viewer fullfile) + (message-window (conc "file " fullfile " not found."))))) + ) + )) +;; example section for megatest.config: +;; +;; +;; [custom-context-menu-items] +;; # : +;; item1 custom show run-id (%run-id%):echo "%run-id%" +;; item2 custom show test-id (%test-id%):echo "%test-id%" +;; item3 custom show target (%target%):echo "%target%" +;; item4 custom show test-name (%test-name%):echo "%test-name%" +;; item5 custom show test-patt (%test-patt%):echo "%test-patt%" +;; item6 custom show test-run-dir (%test-run-dir%):echo "%test-run-dir%" +;; item7 custom show run-area-home (%run-area-home%):echo "%run-area-home%" +;; item8 custom show megatest root (%mt-root%):echo "%mt-root%" +;; item9 custom ls : ls -lrt +;; item10 custom see $MT_RUN_AREA_HOME (not yet implemented) : echo $MT_RUN_AREA_HOME + +(define (dashboard:custom-menu-items run-id test-id target run-name test-name testpatt item-test-path test-info) + (let* ((vars (configf:section-vars *configdat* "custom-context-menu-items")) + (item-path (db:test-get-item-path test-info)) + (mt-root (pathname-directory (pathname-directory *common:this-exe-dir* )))) + (filter-map + (lambda (var) + (let* ((val (configf:lookup *configdat* "custom-context-menu-items" var)) + (m (string-match "^\\s*([^:]+?)\\s*:\\s*(.*?)\\s*$" val))) + (if m + (let* ((menu-item-text-raw (list-ref m 1)) + (command-line-raw (list-ref m 2)) + (subst-alist ;; template vars + `(( "%run-id%" . ,run-id ) + ( "%test-id%" . ,test-id ) + ( "%target%" . ,target ) + ( "%test-name%" . ,test-name) + ( "%test-patt%" . ,testpatt) + ( "%test-run-dir%" . ,(db:test-get-rundir test-info)) + ( "%mt-root%" . ,mt-root) + ( "%run-name%" . ,run-name) + ( "%run-area-home%" . ,*toppath*) + ( "%item-path%" . ,item-path) + ( "%item-test-patt%" . ,item-test-path ))) + (command-line ;; replace template vars + (foldr + (lambda (x i) + (string-substitute + (car x) + (->string (cdr x)) + i + #t)) + command-line-raw + subst-alist)) + (menu-item-text ;; replace template vars + (foldr + (lambda (x i) + (string-substitute + (car x) + (->string (cdr x)) + i + #t)) + menu-item-text-raw + subst-alist))) + (iup:menu-item + (conc "*"menu-item-text) + #:action + (lambda (obj) + + (let* ((scheme-match (string-match "^#(\\(.*)" command-line))) + ;;(BB> "cmdline is >"command-line"<") + (common:with-env-vars + ;; TODO: with-env-vars + ;; TODO: with-env-vars MT_* + (runs:get-mt-env-alist run-id run-name target test-name item-path) + + (lambda () + (if scheme-match + (begin + (handle-exceptions + exn + (print "error with custom menu scheme, exn=" exn) + (begin + ;;(BB> "gonna eval it!") + (eval (with-input-from-string (cadr scheme-match) read))))) + (common:run-a-command command-line with-vars: #t)))))))) + #f))) + vars))) + +(define (dashboard:context-menu run-id test-id target runname test-name testpatt item-test-path test-info) + (let* ((run-menu-items + (dashboard:run-menu-items run-id test-id target runname test-name testpatt item-test-path test-info)) + (test-menu-items + (dashboard:test-menu-items run-id test-id target runname test-name testpatt item-test-path test-info)) + (custom-menu-items + (dashboard:custom-menu-items run-id test-id target runname test-name testpatt item-test-path test-info)) + (toplevel-menu-items + (dashboard:toplevel-menu-items run-id test-id target runname test-name testpatt item-test-path test-info)) + ) + (apply iup:menu + `(,@toplevel-menu-items + ,(iup:menu-item + "Run" + (apply iup:menu run-menu-items)) + ,(iup:menu-item + "Test" + (apply iup:menu test-menu-items)) + ,@custom-menu-items)))) Index: dashboard-guimonitor.scm ================================================================== --- dashboard-guimonitor.scm +++ dashboard-guimonitor.scm @@ -1,14 +1,23 @@ ;;====================================================================== ;; Copyright 2006-2012, Matthew Welland. ;; -;; This program is made available under the GNU GPL version 2.0 or -;; greater. See the accompanying file COPYING for details. +;; This file is part of Megatest. +;; +;; Megatest is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. +;; +;; Megatest is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. ;; -;; This program is distributed WITHOUT ANY WARRANTY; without even the -;; implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -;; PURPOSE. +;; You should have received a copy of the GNU General Public License +;; along with Megatest. If not, see . +;; ;;====================================================================== ;;====================================================================== ;; Test info panel ;;====================================================================== Index: dashboard-tests.scm ================================================================== --- dashboard-tests.scm +++ dashboard-tests.scm @@ -1,14 +1,23 @@ ;;====================================================================== ;; Copyright 2006-2012, Matthew Welland. ;; -;; This program is made available under the GNU GPL version 2.0 or -;; greater. See the accompanying file COPYING for details. +;; This file is part of Megatest. +;; +;; Megatest is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. +;; +;; Megatest is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. ;; -;; This program is distributed WITHOUT ANY WARRANTY; without even the -;; implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -;; PURPOSE. +;; You should have received a copy of the GNU General Public License +;; along with Megatest. If not, see . + ;;====================================================================== ;;====================================================================== ;; Test info panel ;;====================================================================== @@ -28,10 +37,11 @@ (declare (uses gutils)) (declare (uses rmt)) (declare (uses ezsteps)) ;; (declare (uses sdb)) ;; (declare (uses filedb)) +(declare (uses subrun)) (include "common_records.scm") (include "db_records.scm") (include "run_records.scm") @@ -39,17 +49,33 @@ ;; C O M M O N ;;====================================================================== (define *dashboard-comment-share-slot* #f) +(define (message-window msg) + (iup:show + (iup:dialog + (iup:vbox + (iup:label msg #:margin "40x40"))))) + (define (dtests:get-pre-command #!key (default-override #f)) - (let ((cfg-ovrd (configf:lookup *configdat* "dashboard" "pre-command"))) - (or cfg-ovrd default-override "viewscreen "))) ;; "xterm -geometry 180x20 -e \""))) + (let* ((orig-pre-command "export CMD='") + (viewscreen-pre-command "viewscreen ") + (use-viewscreen (configf:lookup *configdat* "dashboard" "use-viewscreen")) + (default-pre-command (if use-viewscreen viewscreen-pre-command orig-pre-command)) + (cfg-ovrd (configf:lookup *configdat* "dashboard" "pre-command"))) + (or cfg-ovrd default-override default-pre-command))) ;; "xterm -geometry 180x20 -e \"")) + (define (dtests:get-post-command #!key (default-override #f)) - (let ((cfg-ovrd (configf:lookup *configdat* "dashboard" "post-command"))) - (or cfg-ovrd default-override " &"))) ;; ";echo Press any key to continue;bash -c 'read -n 1 -s'\" &"))) + (let* ((orig-post-command (conc "';xterm -geometry 180x20 -e \"(echo; echo -n START:;date +ww%U.%w-$H:%M:%S;echo;echo $CMD;echo;$CMD)|&" + "tee -a runlog-`date +ww%U.%w-%H:%M`.log;echo Press any key to continue;bash -c 'read -n 1 -s'\" &")) + (viewscreen-post-command "") + (use-viewscreen (configf:lookup *configdat* "dashboard" "use-viewscreen")) + (default-post-command (if use-viewscreen viewscreen-post-command orig-post-command)) + (cfg-ovrd (configf:lookup *configdat* "dashboard" "post-command"))) + (or cfg-ovrd default-override default-post-command))) ;; ";echo Press any key to continue;bash -c 'read -n 1 -s'\" &"))) (define (test-info-panel testdat store-label widgets) (iup:frame #:title "Test Info" ; #:expand "YES" @@ -233,20 +259,20 @@ ))))) ;; if there is a submegatest create a button to launch dashboard in that area ;; (define (submegatest-panel dbstruct keydat testdat runname testconfig) - (let* ((subarea (configf:lookup testconfig "setup" "submegatest")) - (area-exists (and subarea (file-exists? subarea)))) - ;; (debug:print-info 0 *default-log-port* "Megatest subarea=" subarea ", area-exists=" area-exists) + (let* ((test-run-dir (db:test-get-rundir testdat)) + (subarea (subrun:get-runarea test-run-dir)) + (area-exists (and subarea (common:file-exists? subarea silent: #t)))) (if subarea (iup:frame #:title "Megatest Run Info" ; #:expand "YES" (iup:button "Launch Dashboard" #:action (lambda (obj) - (system (conc "cd " subarea ";env -i PATH=$PATH DISPLAY=$DISPLAY HOME=$HOME USER=$USER dashboard &"))))) + (subrun:launch-dashboard test-run-dir)))) (iup:vbox)))) ;; use a global for setting the buttons colors ;; state status teststeps (define *state-status* (vector #f #f #f)) @@ -340,34 +366,53 @@ btns)))))) (define (dashboard-tests:run-a-step info) #t) -(define (dashboard-tests:step-run-control testdat stepname testconfig) - (iup:dialog ;; #:close_cb (lambda (a)(exit)) ; #:expand "YES" - #:title stepname - (iup:vbox ; #:expand "YES" - (iup:label (conc "Step: " stepname "\nNB// These buttons only run the test step\nfor the purpose of debugging.\nNot all database updates are done.")) - (iup:button "Re-run" - #:expand "HORIZONTAL" - #:action (lambda (obj) - (thread-start! - (make-thread (lambda () - (ezsteps:run-from testdat stepname #t)) - (conc "ezstep run single step " stepname))))) - (iup:button "Re-run and continue" - #:expand "HORIZONTAL" - #:action (lambda (obj) - (thread-start! - (make-thread (lambda () - (ezsteps:run-from testdat stepname #f)) - (conc "ezstep run from step " stepname))))) - ;; (iup:button "Refresh test data" - ;; #:expand "HORIZONTAL" - ;; #:action (lambda (obj) - ;; (print "Refresh test data " stepname)) - ))) +;; (define (dashboard-tests:step-run-control testdat stepname testconfig) +;; (let* ((mutex (make-mutex))) +;; (letrec ((dlg +;; (iup:dialog ;; #:close_cb (lambda (a)(exit)) ; #:expand "YES" +;; #:title stepname +;; (iup:vbox ; #:expand "YES" +;; (iup:label (conc "Step: " stepname "\nNB// These buttons only run the test step\nfor the purpose of debugging.\nNot all database updates are done.")) +;; (iup:button "Re-run" +;; #:expand "HORIZONTAL" +;; #:action (lambda (obj) +;; (debug:catch-and-dump (lambda () +;; (thread-start! +;; (make-thread +;; (lambda () +;; (print "BB> started ezsteps:run-from") +;; (debug:catch-and-dump +;; (lambda () +;; (ezsteps:run-from testdat stepname #t)) +;; "dashboard-tests:step-run-control -> ezstep:run-from (1)") +;; (print "BB> done ezsteps:run-from") +;; 'foo) +;; (conc "ezstep run single step " stepname))) +;; ) +;; "step-run-control action"))) +;; (iup:button "Re-run and continue" +;; #:expand "HORIZONTAL" +;; #:action (lambda (obj) +;; (debug:catch-and-dump +;; (lambda () +;; (thread-start! +;; (make-thread (lambda () +;; (ezsteps:run-from testdat stepname #f)) +;; (conc "ezstep run from step " stepname)))) +;; "dashboard-tests:step-run-control -> ezstep:run-from (2)"))) +;; (iup:button "Close" +;; #:action (lambda (obj) +;; (iup:destroy! dlg))) +;; ;; (iup:button "Refresh test data" +;; ;; #:expand "HORIZONTAL" +;; ;; #:action (lambda (obj) +;; ;; (print "Refresh test data " stepname)) +;; )))) +;; dlg))) (define (dashboard-tests:waiver run-id testdat ovrdval cmtcmd) (let* ((wpatt (configf:lookup *configdat* "setup" "waivercommentpatt")) (wregx (if (string? wpatt)(regexp wpatt) #f)) (wmesg (iup:label (if wpatt (conc "Comment must match pattern " wpatt) ""))) @@ -439,11 +484,19 @@ (logfile "/this/dir/better/not/exist") (rundir (if testdat (db:test-get-rundir testdat) logfile)) ;; (testdat-path (conc rundir "/testdat.db")) ;; this gets recalculated until found - (teststeps (if testdat (tests:get-compressed-steps run-id test-id) '())) + (augment-teststeps (lambda (inlov) + (map + (lambda (invec) + (list->vector + `( + ,@(reverse (cdr (reverse (vector->list invec)))) + "rerun this step" "restart from here" ))) + inlov))) + (teststeps (if testdat (augment-teststeps (tests:get-compressed-steps run-id test-id)) '())) (testfullname (if testdat (db:test-get-fullname testdat) "Gathering data ...")) (testname (if testdat (db:test-get-testname testdat) "n/a")) ;; (tests:get-testconfig testdat testname 'return-procs)) (testmeta (if testdat (let ((tm (rmt:testmeta-get-record testname))) @@ -458,32 +511,36 @@ "/")) (item-path (db:test-get-item-path testdat)) ;; this next block was added to fix a bug where variables were ;; needed. Revisit this. (runconfig (let ((runconfigf (conc *toppath* "/runconfigs.config"))) ;; no rush but it would be good to convert this call to use runconfig:read - (if (file-exists? runconfigf) + (if (common:file-exists? runconfigf) (handle-exceptions - exn - #f ;; do nothing, just keep on trucking .... + exn + (begin + (debug:print 0 *default-log-port* "failed to set up environment for " runconfigf ", exn=" exn) + #f) ;; do nothing, just keep on trucking .... (setup-env-defaults runconfigf run-id (make-hash-table) keydat environ-patt: keystring)) (make-hash-table)))) (testconfig (begin ;; (runs:set-megatest-env-vars run-id inrunname: runname testname: test-name itempath: item-path) (runs:set-megatest-env-vars run-id inkeyvals: keydat inrunname: runname intarget: keystring testname: testname itempath: item-path) ;; these may be needed by the launching process (handle-exceptions - exn ;; NOTE: I've no idea why this was written this way. Research, study and fix needed! - (tests:get-testconfig (db:test-get-testname testdat) (db:test-get-item-path testdat) test-registry #f) - (tests:get-testconfig (db:test-get-testname testdat) item-path test-registry #t)))) + exn ;; NOTE: I've no idea why this was written this way. Research, study and fix needed! + (begin + (debug:print 0 *default-log-port* "testconfig load using " item-path " failed, trying " (db:test-get-item-path testdat) ", exn=" exn) + (tests:get-testconfig (db:test-get-testname testdat) (db:test-get-item-path testdat) test-registry #f allow-write-cache: #f)) + (tests:get-testconfig (db:test-get-testname testdat) item-path test-registry #t allow-write-cache: #f)))) (viewlog (lambda (x) - (if (file-exists? logfile) + (if (common:file-exists? logfile) ;(system (conc "firefox " logfile "&")) (dcommon:run-html-viewer logfile) (message-window (conc "File " logfile " not found"))))) (view-a-log (lambda (lfile) (let ((lfilename (conc rundir "/" lfile))) ;; (print "lfilename: " lfilename) - (if (file-exists? lfilename) + (if (common:file-exists? lfilename) ;(system (conc "firefox " logfile "&")) (dcommon:run-html-viewer lfilename) (message-window (conc "File " lfilename " not found")))))) (xterm (lambda (x) (if (directory-exists? rundir) @@ -496,11 +553,11 @@ "MT_.*")) (message-window (conc "Directory " rundir " not found"))))) (widgets (make-hash-table)) (refreshdat (lambda () (let* ((curr-mod-time (file-modification-time db-path)) - ;; (max ..... (if (file-exists? testdat-path) + ;; (max ..... (if (common:file-exists? testdat-path) ;; (file-modification-time testdat-path) ;; (begin ;; (set! testdat-path (conc rundir "/testdat.db")) ;; 0)))) (need-update (or (and (>= curr-mod-time db-mod-time) @@ -508,18 +565,21 @@ (> (current-milliseconds)(+ last-update 10000)) ;; force update even 10 seconds request-update)) (newtestdat (if need-update ;; NOTE: BUG HIDER, try to eliminate this exception handler (handle-exceptions - exn - (debug:print-info 0 *default-log-port* "test db access issue in examine test for run-id " run-id ", test-id " test-id ": " ((condition-property-accessor 'exn 'message) exn)) - (rmt:get-test-info-by-id run-id test-id ))))) + exn + (begin + (debug:print-info 0 *default-log-port* "test db access issue in examine test for run-id " run-id + ", test-id " test-id ": " ((condition-property-accessor 'exn 'message) exn) ", exn=" exn) + #f) + (rmt:get-test-info-by-id run-id test-id))))) ;; (print "INFO: need-update= " need-update " curr-mod-time = " curr-mod-time) (cond ((and need-update newtestdat) (set! testdat newtestdat) - (set! teststeps (tests:get-compressed-steps run-id test-id)) + (set! teststeps (augment-teststeps (tests:get-compressed-steps run-id test-id))) (set! logfile (conc (db:test-get-rundir testdat) "/" (db:test-get-final_logf testdat))) (set! rundir ;; (filedb:get-path *fdb* (db:test-get-rundir testdat)) ;; ) (set! testfullname (db:test-get-fullname testdat)) ;; (debug:print 0 *default-log-port* "INFO: teststeps=" (intersperse teststeps "\n ")) @@ -574,18 +634,18 @@ ))))) lbl)) (store-button store-label) (command-proc (lambda (command-text-box) (let* ((cmd (iup:attribute command-text-box "VALUE"))) - (common:run-a-command cmd)))) + (common:run-a-command cmd with-orig-env: #t)))) (command-text-box (iup:textbox #:expand "HORIZONTAL" #:font "Courier New, -10" #:action (lambda (obj cnum val) ;; (print "cnum=" cnum) (if (eq? cnum 13) - (command-prox obj))) + (command-proc obj))) )) (command-launch-button (iup:button "Execute!" #:action (lambda (x) (command-proc command-text-box)))) ;; (lambda (x) ;; (let* ((cmd (iup:attribute command-text-box "VALUE")) @@ -616,15 +676,16 @@ " -testpatt " (conc testname "/" (if (equal? item-path "") "%" item-path)) " -v")))) (clean-run-execute (lambda (x) - (let ((cmd (conc "megatest -remove-runs -target " keystring " -runname " runname + (let ((cmd (conc ;; "megatest -remove-runs -target " keystring " -runname " runname + "megatest -set-state-status NOT_STARTED,n/a -target " keystring " -runname " runname " -testpatt " (conc testname "/" (if (equal? item-path "") "%" item-path)) - ";megatest -target " keystring " -runname " runname + ";megatest -target " keystring " -runname " runname " -run -preclean -testpatt " (conc testname "/" (if (equal? item-path "") "%" item-path)) " -clean-cache" ))) @@ -685,25 +746,25 @@ ;; Replace here with matrix (let ((steps-matrix (iup:matrix #:font "Courier New, -8" #:expand "YES" #:scrollbar "YES" - #:numcol 7 + #:numcol 9 #:numlin 100 - #:numcol-visible 7 + #:numcol-visible 9 #:numlin-visible 5 #:click-cb (lambda (obj lin col status) ;; (if (equal? col 6) - (let* ((mtrx-rc (conc lin ":" 6)) - (fname (iup:attribute obj mtrx-rc))) ;; col)))) - (if (eq? col 6) - (view-a-log fname) - (iup:show - (dashboard-tests:step-run-control - testdat - (iup:attribute obj (conc lin ":" 1)) - teststeps)))))))) + (let* ((mtrx-rc (conc lin ":" 6)) + (fname (iup:attribute obj mtrx-rc)) + (stepname (iup:attribute obj (conc lin ":" 1))) (comment (iup:attribute obj (conc lin ":" 7)))) + (case col + + ((7) (print "Comment from step "stepname": "comment)) + ((8) (ezsteps:spawn-run-from testdat stepname #t)) + ((9) (ezsteps:spawn-run-from testdat stepname #f)) + (else (view-a-log fname)))))))) ;; (let loop ((count 0)) ;; (iup:attribute-set! steps-matrix "FITTOTEXT" (conc "L" count)) ;; (if (< count 30) ;; (loop (+ count 1)))) (iup:attribute-set! steps-matrix "0:1" "Step Name") @@ -713,16 +774,21 @@ (iup:attribute-set! steps-matrix "0:4" "Status") (iup:attribute-set! steps-matrix "WIDTH4" "50") (iup:attribute-set! steps-matrix "0:5" "Duration") (iup:attribute-set! steps-matrix "0:6" "Log File") (iup:attribute-set! steps-matrix "0:7" "Comment") + (iup:attribute-set! steps-matrix "0:8" "rerun only") + (iup:attribute-set! steps-matrix "BGCOLOR0:9" "149 208 252") + (iup:attribute-set! steps-matrix "BGCOLOR0:8" "149 208 252") + (iup:attribute-set! steps-matrix "BGCOLOR0:7" "149 208 252") + (iup:attribute-set! steps-matrix "0:9" "rerun & continue") (iup:attribute-set! steps-matrix "ALIGNMENT1" "ALEFT") ;; (iup:attribute-set! steps-matrix "FIXTOTEXT" "C1") (iup:attribute-set! steps-matrix "RESIZEMATRIX" "YES") (let ((proc (lambda (testdat) - (dcommon:populate-steps teststeps steps-matrix)))) + (dcommon:populate-steps teststeps steps-matrix run-id test-id)))) (hash-table-set! widgets "StepsMatrix" proc) (proc testdat)) steps-matrix) ;; populate the Test Data panel (iup:frame @@ -770,6 +836,112 @@ ;; Now start keeping the gui updated from the db (refreshdat) ;; update from the db here ;(thread-suspend! other-thread) (if *exit-started* (set! *exit-started* 'ok)))))))))) + +(define (colors-similar? color1 color2) + (let* ((c1 (map string->number (string-split color1))) + (c2 (map string->number (string-split color2))) + (delta (map (lambda (a b)(abs (- a b))) c1 c2))) + (null? (filter (lambda (x)(> x 3)) delta)))) + +;; Display the tests as rows of boxes on the test/task pane +;; +(define (dashboard:draw-tests cnv xadj yadj tests-draw-state sorted-testnames test-records) + (canvas-clear! cnv) + (canvas-font-set! cnv "Helvetica, -10") + (let-values (((sizex sizey sizexmm sizeymm) (canvas-size cnv)) + ((originx originy) (canvas-origin cnv))) + ;; (print "originx: " originx " originy: " originy) + ;; (canvas-origin-set! cnv 0 (- (/ sizey 2))) + (if (hash-table-ref/default tests-draw-state 'first-time #t) + (begin + (hash-table-set! tests-draw-state 'first-time #f) + (hash-table-set! tests-draw-state 'scalef 1) + (hash-table-set! tests-draw-state 'tests-info (make-hash-table)) + (hash-table-set! tests-draw-state 'selected-tests (make-hash-table)) + ;; set these + (dcommon:initial-draw-tests cnv xadj yadj sizex sizey sizexmm sizeymm originx originy tests-draw-state sorted-testnames test-records)) + (dcommon:redraw-tests cnv xadj yadj sizex sizey sizexmm sizeymm originx originy tests-draw-state sorted-testnames test-records)) + )) + +(define (dboard:tabdat-test-patts-use vec) + (let ((val (dboard:tabdat-test-patts vec)))(if val val ""))) ;;RADT => What is the if for? + +;; additional setters for dboard:data +(define (dboard:tabdat-test-patts-set!-use vec val) + (dboard:tabdat-test-patts-set! vec (if (equal? val "") #f val))) + +;; Extract the various bits of data from tabdat and create the command line equivalent that will be displayed +;; +(define (dashboard:update-run-command tabdat) + (let* ((cmd-tb (dboard:tabdat-command-tb tabdat)) + (cmd (dboard:tabdat-command tabdat)) + (test-patt (let ((tp (dboard:tabdat-test-patts tabdat))) + (if (or (not tp) + (equal? tp "")) + "%" + tp))) + (states (dboard:tabdat-states tabdat)) + (statuses (dboard:tabdat-statuses tabdat)) + (target (let ((targ-list (dboard:tabdat-target tabdat))) + (if targ-list (string-intersperse targ-list "/") "no-target-selected"))) + (run-name (dboard:tabdat-run-name tabdat)) + (states-str (if (or (not states) + (null? states)) + "" + (conc " -state " (string-intersperse states ",")))) + (statuses-str (if (or (not statuses) + (null? statuses)) + "" + (conc " -status " (string-intersperse statuses ",")))) + (full-cmd "megatest")) + (case (string->symbol cmd) + ((run) + (set! full-cmd (conc full-cmd + " -run" + " -testpatt " + test-patt + " -target " + target + " -runname " + run-name + " -clean-cache" + ))) + ((remove-runs) + (set! full-cmd (conc full-cmd + " -remove-runs -runname " + run-name + " -target " + target + " -testpatt " + test-patt + states-str + statuses-str + ))) + (else (set! full-cmd " no valid command "))) + (iup:attribute-set! cmd-tb "VALUE" full-cmd))) + +(define (iuplistbox-fill-list lb items #!key (selected-item #f)) + (let ((i 1)) + (for-each (lambda (item) + (iup:attribute-set! lb (number->string i) item) + (if selected-item + (if (equal? selected-item item) + (iup:attribute-set! lb "VALUE" i))) ;; (number->string i)))) + (set! i (+ i 1))) + items) + ;; (iup:attribute-set! lb "VALUE" (if selected-item selected-item "")) + i)) + +;; if tab-num passed in then use it, otherwise look in commondat at curr-tab-num +;; adds the updater passed in the updaters list at that hashkey +;; +(define (dboard:commondat-add-updater commondat updater #!key (tab-num #f)) + (let* ((tnum (or tab-num + (dboard:commondat-curr-tab-num commondat))) + (curr-updaters (hash-table-ref/default (dboard:commondat-updaters commondat) tnum '()))) + (hash-table-set! (dboard:commondat-updaters commondat) + tnum + (cons updater curr-updaters)))) Index: dashboard.scm ================================================================== --- dashboard.scm +++ dashboard.scm @@ -1,24 +1,33 @@ ;;====================================================================== ;; Copyright 2006-2016, Matthew Welland. ;; -;; This program is made available under the GNU GPL version 2.0 or -;; greater. See the accompanying file COPYING for details. +;; This file is part of Megatest. +;; +;; Megatest is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. +;; +;; Megatest is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. ;; -;; This program is distributed WITHOUT ANY WARRANTY; without even the -;; implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -;; PURPOSE. +;; You should have received a copy of the GNU General Public License +;; along with Megatest. If not, see . +;; ;;====================================================================== (use format) (require-library iup) (import (prefix iup iup:)) (use canvas-draw) (import canvas-draw-iup) - +(use ducttape-lib) (use sqlite3 srfi-1 posix regex regex-case srfi-69 typed-records sparse-vectors) ;; defstruct (import (prefix sqlite3 sqlite3:)) (declare (uses common)) (declare (uses margs)) @@ -31,27 +40,28 @@ (declare (uses runs)) (declare (uses dashboard-tests)) (declare (uses dashboard-guimonitor)) (declare (uses tree)) (declare (uses dcommon)) +(declare (uses dashboard-context-menu)) (declare (uses vg)) - +(declare (uses subrun)) ;; (declare (uses dashboard-main)) -(declare (uses megatest-version)) (declare (uses mt)) (include "common_records.scm") (include "db_records.scm") (include "run_records.scm") (include "task_records.scm") +(include "megatest-version.scm") (include "megatest-fossil-hash.scm") (include "vg_records.scm") (define help (conc "Megatest Dashboard, documentation at http://www.kiatoa.com/fossils/megatest version " megatest-version " - license GPL, Copyright (C) Matt Welland 2012-2016 + license GPL, Copyright (C) Matt Welland 2012-2017 Usage: dashboard [options] -h : this help -test run-id,test-id : control test identified by testid -skip-version-check : skip the version check @@ -75,10 +85,11 @@ "-test" "-xterm" "-debug" "-host" "-transport" + "-start-dir" ) (list "-h" "-use-server" "-guimonitor" "-main" @@ -85,13 +96,28 @@ "-v" "-q" "-use-db-cache" "-skip-version-check" "-repl" + "-rh5.11" ;; fix to allow running on rh5.11 + "-:p" ;; ignore the built in chicken profiling switch ) args:arg-hash 0)) + +;; check for MT_* environment variables and exit if found +(if (not (args:get-arg "-test")) + (begin + (display "Checking for MT_ vars: ") + (for-each (lambda (var) + (display " ")(display var) + (if (get-environment-variable var) + (begin + (print "ERROR: environment variable " var " is set in this terminal, this will cause you problems. Exiting now.") + (exit 1)))) + '("MT_RUN_AREA_HOME" "MT_MEGATEST" "MT_CMDINFO" "MT_TEST_RUN_DIR" "MT_LINKTREE" "MT_TESTSUITENAME")) + (print ". Done. All ok."))) (if (not (null? remargs)) (begin (print "Unrecognised arguments: " (string-intersperse remargs " ")) (exit))) @@ -98,17 +124,34 @@ (if (args:get-arg "-h") (begin (print help) (exit))) + +(if (args:get-arg "-start-dir") + (if (directory-exists? (args:get-arg "-start-dir")) + (let ((fullpath (common:real-path (args:get-arg "-start-dir")))) + (setenv "PWD" fullpath) + (change-directory fullpath)) + (begin + (debug:print-error 0 *default-log-port* "non-existant start dir " (args:get-arg "-start-dir") " specified, exiting.") + (exit 1)))) ;; TODO: Move this inside (main) ;; (if (not (launch:setup)) (begin (print "Failed to find megatest.config, exiting") (exit 1))) + +;; deal with RH 5.11 gtk lib or iup lib missing detachbox feature +;; first check for the switch +;; +(if (or (args:get-arg "-rh5.11") + (configf:lookup *configdat* "dashboard" "no-detachbox") + (not (file-exists? "/etc/os-release"))) + (set! iup:detachbox iup:vbox)) (if (not (common:on-homehost?)) (begin (debug:print 0 *default-log-port* "WARNING: Current policy requires running dashboard on homehost: " (common:get-homehost)))) @@ -115,10 +158,11 @@ ;; RA => Might require revert for filters ;; create a watch dog to move changes from lt/.db/*.db to megatest.db ;; ;;;(if (file-write-access? (conc *toppath* "/megatest.db")) ;;(debug:print-info 13 *default-log-port* "Before common:watchdog spawn") + (thread-start! (make-thread common:watchdog "Watchdog thread")) ;;(debug:print-info 13 *default-log-port* "After common:watchdog spawn") ;; (if (not (args:get-arg "-use-db-cache")) ;; (begin ;; (debug:print-info 0 *default-log-port* "Forcing db-cache mode due to read-only access to megatest.db") @@ -204,11 +248,13 @@ ((allruns-by-id (make-hash-table)) : hash-table) ;; hash of run-id -> dboard:rundat records ((done-runs '()) : list) ;; list of runs already drawn ((not-done-runs '()) : list) ;; list of runs not yet drawn (header #f) ;; header for decoding the run records (keys #f) ;; keys for this run (i.e. target components) - ((numruns (string->number (or (args:get-arg "-cols") "10"))) : number) ;; + ((numruns (string->number (or (args:get-arg "-cols") + (configf:lookup *configdat* "dashboard" "cols") + "8"))) : number) ;; ((tot-runs 0) : number) ((last-data-update 0) : number) ;; last time the data in allruns was updated ((last-runs-update 0) : number) ;; last time we pulled the runs info to update the tree (runs-mutex (make-mutex)) ;; use to prevent parallel access to draw objects ((run-update-times (make-hash-table)) : hash-table) ;; update times indexed by run-id @@ -222,11 +268,11 @@ (runs-matrix #f) ;; used in newdashboard ((start-run-offset 0) : number) ;; left-right slider value ((start-test-offset 0) : number) ;; up-down slider value ((runs-btn-height (or (configf:lookup *configdat* "dashboard" "btn-height") "x16")) : string) ;; was 12 ((runs-btn-fontsz (or (configf:lookup *configdat* "dashboard" "btn-fontsz") "10")) : string) ;; was 8 - ((runs-cell-width (or (configf:lookup *configdat* "dashboard" "cell-width") "60")) : string) ;; was 50 + ((runs-cell-width (or (configf:lookup *configdat* "dashboard" "cell-width") "50")) : string) ;; was 50 ((all-test-names '()) : list) ;; Canvas and drawing data (cnv #f) (cnv-obj #f) @@ -313,10 +359,12 @@ (filter (lambda (alist-entry) (member (car alist-entry) '(allruns-by-id allruns))) ;; FIELDS OF INTEREST (dboard:tabdat->alist tabdat-item))))) + + (define (dboard:tabdat-target-string vec) (let ((targ (dboard:tabdat-target vec))) (if (list? targ)(string-intersperse targ "/") "no-target-specified"))) @@ -339,11 +387,11 @@ (dboard:tabdat-monitor-db-path-set! tabdat (conc (dboard:tabdat-dbdir tabdat) "/monitor.db")) ;; HACK ALERT: this is a hack, please fix. (dboard:tabdat-ro-set! tabdat (not (file-read-access? (dboard:tabdat-dbfpath tabdat)))) - (dboard:tabdat-keys-set! tabdat (db:dispatch-query (db:get-access-mode) rmt:get-keys db:get-keys)) + (dboard:tabdat-keys-set! tabdat (rmt:get-keys)) (dboard:tabdat-dbkeys-set! tabdat (append (dboard:tabdat-keys tabdat) (list "runname"))) (dboard:tabdat-tot-runs-set! tabdat (rmt:get-num-runs "%")) ) ;; RADT => Matrix defstruct addition @@ -384,10 +432,76 @@ ((last-update 0) : number) ;; last query to db got records from before last-update ((last-db-time 0) : number) ;; last timestamp on megatest.db ((data-changed #f) : boolean) ((run-data-offset 0) : number) ;; get only 100 items per call, set back to zero when received less than 100 items (db-path #f)) + +;; for the new runs view lets build up a few new record types and then consolidate later +;; +;; this is a two level deep pipeline for the incoming data: +;; sql query data ==> filters ==> data for display +;; +(defstruct dboard:rdat + ;; view related items + (runnum 0) ;; which column we are processing, index into runsbynum, we sweep across all these runs then start over + (leftcol 0) ;; number of the leftmost visible column + (toprow 0) ;; topmost visible row + (numcols 24) ;; number of columns visible + (numrows 20) ;; number of rows visible + + ;; data from sql db + (keys (rmt:get-keys)) ;; to be removed when targets handling is refactored + (runs (make-sparse-vector)) ;; id => runrec + (runsbynum (make-vector 100 #f)) ;; vector num => runrec + (targ-runid (make-hash-table)) ;; area/target/runname => run-id ;; not sure this will be needed + (tests (make-hash-table)) ;; test[/itempath] => list of test rec + + ;; run sql filters + (targ-sql-filt "%") + (runname-sql-filt "%") + (run-state-sql-filt "%") + (run-status-sql-filt "%") + + ;; test sql filter + (testname-sql-filt "%") + (itempath-sql-filt "%") + (test-state-sql-filt "%") + (test-status-sql-filt "%") + + ;; other sql related fields + (last-updates (make-sparse-vector 0)) ;; run-id -> timestamp of the last update from sql db, set to zero on any field changes + + ;; filtered data + (cols (make-sparse-vector)) ;; columnnum => run-id + (tests (make-hash-table)) ;; test[/itempath] => (vector columnnum => test rec) + + ;; various + (prev-run-ids '()) ;; push previously looked at runs on this + (view-changed #f) + + ;; widgets + (runs-tree #f) ;; + ) + +(define (dboard:rdat-push-run-id rdat run-id) + (dboard:rdat-prev-run-ids-set! rdat (cons run-id (dboard:rdat-prev-run-ids rdat)))) + +(defstruct dboard:runrec + id + target ;; a/b/c... + tdef ;; for future use + ) + +(defstruct dboard:testrec + id + runid + testname ;; test[/itempath] + state + status + start-time + duration + ) ;; register dboard:rundat with BBpp ;; this is used by BBpp (Brandon's pretty printer) to convert dboard:rundat into a composition of lists that pp will handle (hash-table-set! *BBpp_custom_expanders_list* RUNDAT: (cons dboard:rundat? @@ -567,12 +681,11 @@ (db-modified (>= db-mod-time last-db-time)) (multi-get (> (dboard:rundat-run-data-offset run-dat) 0)) ;; multi-get in progress (tmptests (if (or do-not-use-db-file-timestamps (dboard:tabdat-filters-changed tabdat) db-modified) - (db:dispatch-query access-mode rmt:get-tests-for-run db:get-tests-for-run - run-id testnamepatt states statuses ;; run-id testpatt states statuses + (rmt:get-tests-for-run run-id testnamepatt states statuses ;; run-id testpatt states statuses (dboard:rundat-run-data-offset run-dat) ;; query offset num-to-get (dboard:tabdat-hide-not-hide tabdat) ;; no-in sort-by ;; sort-by sort-order ;; sort-order @@ -642,17 +755,15 @@ ;; create a virtual table of all the tests ;; keypatts: ( (KEY1 "abc%def")(KEY2 "%") ) ;; (define (update-rundat tabdat runnamepatt numruns testnamepatt keypatts) (let* ((access-mode (dboard:tabdat-access-mode tabdat)) - (keys (db:dispatch-query access-mode rmt:get-keys db:get-keys)) + (keys (rmt:get-keys)) (last-runs-update (- (dboard:tabdat-last-runs-update tabdat) 2)) - (allruns (db:dispatch-query access-mode rmt:get-runs db:get-runs - runnamepatt numruns (dboard:tabdat-start-run-offset tabdat) keypatts)) + (allruns (rmt:get-runs runnamepatt numruns (dboard:tabdat-start-run-offset tabdat) keypatts)) ;;(allruns-tree (rmt:get-runs-by-patt (dboard:tabdat-keys tabdat) "%" #f #f #f #f)) - (allruns-tree (db:dispatch-query access-mode rmt:get-runs-by-patt db:get-runs-by-patt - keys "%" #f #f #f #f last-runs-update));;'("id" "runname") + (allruns-tree (rmt:get-runs-by-patt keys "%" #f #f #f #f last-runs-update)) ;;'("id" "runname") (header (db:get-header allruns)) (runs (db:get-rows allruns)) ;; RA => Filtered as per runpatt selected (runs-tree (db:get-rows allruns-tree)) ;; RA => Returns complete list of runs (start-time (current-seconds)) (runs-hash (let ((ht (make-hash-table))) @@ -725,15 +836,13 @@ ;; (define (dboard:update-rundat tabdat runnamepatt numruns testnamepatt keypatts) (let* ((access-mode (dboard:tabdat-access-mode tabdat)) (keys (dboard:tabdat-keys tabdat)) ;; (db:dispatch-query access-mode rmt:get-keys db:get-keys))) (last-runs-update (- (dboard:tabdat-last-runs-update tabdat) 2)) - (allruns (db:dispatch-query access-mode rmt:get-runs db:get-runs - runnamepatt numruns (dboard:tabdat-start-run-offset tabdat) keypatts)) + (allruns (rmt:get-runs runnamepatt numruns (dboard:tabdat-start-run-offset tabdat) keypatts)) ;;(allruns-tree (rmt:get-runs-by-patt (dboard:tabdat-keys tabdat) "%" #f #f #f #f)) - (allruns-tree (db:dispatch-query access-mode rmt:get-runs-by-patt db:get-runs-by-patt - keys "%" #f #f #f #f 0)) ;; last-runs-update));;'("id" "runname") + (allruns-tree (rmt:get-runs-by-patt keys "%" #f #f #f #f 0)) ;; last-runs-update));;'("id" "runname") (header (db:get-header allruns)) (runs (db:get-rows allruns)) ;; RA => Filtered as per runpatt selected (runs-tree (db:get-rows allruns-tree)) ;; RA => Returns complete list of runs (start-time (current-seconds)) (runs-hash (let ((ht (make-hash-table))) @@ -792,11 +901,20 @@ (hash-table-delete! (dboard:tabdat-allruns-by-id tabdat) run-id) (hash-table-set! (dboard:tabdat-allruns-by-id tabdat) run-id run-struct)) (if (or (null? tal) (> elapsed-time 2)) ;; stop loading data after 5 seconds, on the next call more data *should* be loaded since get-tests-for-run uses last update (begin - (if (> elapsed-time 2)(print "NOTE: updates are taking a long time, " elapsed-time "s elapsed.")) + (when (> elapsed-time 2) + (debug:print 0 *default-log-port* "NOTE: updates are taking a long time, " elapsed-time "s elapsed.") + (let* ((old-val (iup:attribute *tim* "TIME")) + (new-val (number->string (inexact->exact (floor (* 2 (string->number old-val))))))) + (if (< (string->number new-val) 5000) + ((debug:print 0 *default-log-port* "NOTE: increasing poll interval from "old-val" to "new-val) + (iup:attribute-set! *tim* "TIME" new-val)))) + + + ) (dboard:tabdat-allruns-set! tabdat new-res) maxtests) (if (> (dboard:rundat-run-data-offset run-struct) 0) (loop run tal new-res newmaxtests) ;; not done getting data for this run (loop (car tal)(cdr tal) new-res newmaxtests))))))) @@ -811,11 +929,11 @@ (parts (string-split fulltestname "(")) (basetestname (if (null? parts) "" (car parts)))) ;(print "Toggling " basetestname " currently " (hash-table-ref/default *collapsed* basetestname #f)) (if (hash-table-ref/default *collapsed* basetestname #f) (begin - ;(iup:attribute-set! btn "FGCOLOR" "0 0 0") + ;(iup:attribute-set! btn "FGCOLOR" "0 0 0")s (hash-table-delete! *collapsed* basetestname)) (begin ;(iup:attribute-set! btn "FGCOLOR" "0 192 192") (hash-table-set! *collapsed* basetestname #t))))) @@ -1001,11 +1119,11 @@ (testsdat-by-name (dboard:rundat-tests-by-name rundat)) (key-val-dat (dboard:rundat-key-vals rundat)) (run-id (db:get-value-by-header run (dboard:tabdat-header tabdat) "id")) (key-vals (append key-val-dat (list (let ((x (db:get-value-by-header run (dboard:tabdat-header tabdat) "runname"))) - (if x x ""))))) + (if (string? x) x ""))))) (run-key (string-intersperse key-vals "\n"))) ;; fill in the run header key values ;; (let ((rown 0) @@ -1085,10 +1203,11 @@ (dboard:tabdat-filters-changed-set! tabdat #t))) (define (update-search commondat tabdat x val) (hash-table-set! (dboard:tabdat-searchpatts tabdat) x val) (dboard:tabdat-filters-changed-set! tabdat #t) + (mark-for-update tabdat) (set-bg-on-filter commondat tabdat)) ;; force ALL updates to zero (effectively) ;; (define (mark-for-update tabdat) @@ -1373,16 +1492,19 @@ ;; (iup:split ;; #:value 300 ;; Target, testpatt, state and status input boxes ;; - (iup:vbox - ;; Command to run, placed over the top of the canvas - (dcommon:command-action-selector commondat tabdat tab-num: tab-num) - (dboard:runs-tree-browser commondat tabdat) - (dcommon:command-runname-selector commondat tabdat tab-num: tab-num) - (dcommon:command-testname-selector commondat tabdat update-keyvals)) + (iup:split + #:orientation "HORIZONTAL" + (iup:vbox + ;; Command to run, placed over the top of the canvas + (dcommon:command-action-selector commondat tabdat tab-num: tab-num) + (dboard:runs-tree-browser commondat tabdat)) + (iup:vbox + (dcommon:command-runname-selector commondat tabdat tab-num: tab-num) + (dcommon:command-testname-selector commondat tabdat update-keyvals))) ;; key-listboxes)) (dcommon:command-tests-tasks-canvas tabdat test-records sorted-testnames tests-draw-state)))) (tb (dboard:tabdat-runs-tree tabdat))) (dboard:commondat-add-updater commondat @@ -1397,38 +1519,57 @@ ;; (let ((logs-tb (iup:textbox #:expand "YES" ;; #:multiline "YES"))) ;; (dboard:tabdat-logs-textbox-set! tabdat logs-tb) ;; logs-tb)) +;; browse runs as a tree. Used in both "Runs" tab and +;; in the runs control panel. +;; (define (dboard:runs-tree-browser commondat tabdat) - (let* ((txtbox (iup:textbox #:action (lambda (val a b) - (debug:catch-and-dump - (lambda () - (if b (dboard:tabdat-target-set! tabdat (string-split b "/"))) - (dashboard:update-run-command tabdat)) - "command-testname-selector tb action")) - #:value (dboard:test-patt->lines - (dboard:tabdat-test-patts-use tabdat)) - #:expand "HORIZONTAL" - ;; #:size "10x30" - )) + (let* ((txtbox (iup:textbox + #:action (lambda (val a b) + (debug:catch-and-dump + (lambda () + ;; for the Runs view we put the list + ;; of keyvals into tabdat target for + ;; the Run Controls we put then update + ;; the run-command + (if b (dboard:tabdat-target-set! tabdat + (string-split b "/"))) + (dashboard:update-run-command tabdat)) + "command-testname-selector tb action")) + #:value (dboard:test-patt->lines + (dboard:tabdat-test-patts-use tabdat)) + #:expand "HORIZONTAL" + ;; #:size "10x30" + )) (tb (iup:treebox #:value 0 - #:name "Runs" + #:title "Runs" ;; was #:name -- iup 3.19 changed + ;; this... "Changed: [DEPRECATED + ;; REMOVED] removed the old attribute + ;; NAMEid from IupTree to avoid + ;; conflict with the common attribute + ;; NAME. Use the TITLEid attribute." #:expand "YES" - #:addexpanded "NO" + #:addexpanded "YES" #:size "10x" #:selection-cb (lambda (obj id state) (debug:catch-and-dump (lambda () (let* ((run-path (tree:node->path obj id)) (run-id (tree-path->run-id tabdat (cdr run-path)))) - ;; (dboard:tabdat-view-changed-set! tabdat #t) ;; ?? done below when run-id is a number - (dboard:tabdat-target-set! tabdat (cdr run-path)) ;; (print "run-path: " run-path) - (iup:attribute-set! txtbox "VALUE" (string-intersperse (cdr run-path) "/")) + ;; (dboard:tabdat-view-changed-set! tabdat #t) ;; ?? + ;; done below when run-id is a number + (dboard:tabdat-target-set! tabdat (cdr run-path)) ;; (print + ;; "run-path: + ;; " + ;; run-path) + (iup:attribute-set! txtbox "VALUE" + (string-intersperse (cdr run-path) "/")) (dashboard:update-run-command tabdat) (dboard:tabdat-layout-update-ok-set! tabdat #f) (if (number? run-id) (begin ;; capture last two in tabdat. @@ -1440,11 +1581,82 @@ (debug:print-error 5 *default-log-port* "tree-path->run-id returned non-number " run-id)))) "treebox")) ;; (print "path: " (tree:node->path obj id) " run-id: " run-id) ))) (dboard:tabdat-runs-tree-set! tabdat tb) - (iup:vbox tb txtbox))) + (iup:detachbox + (iup:vbox + txtbox + tb + )))) + +;; browse runs as a tree. Used in both "Runs" tab and +;; in the runs control panel. +;; +;; THIS IS THE NEW ONE +;; +(define (dboard:runs-tree-new-browser commondat rdat) + (let* ((txtbox (iup:textbox + #:action (lambda (val a b) + (debug:catch-and-dump + (lambda () + ;; for the Runs view we put the list + ;; of keyvals into tabdat target for + ;; the Run Controls we put then update + ;; the run-command + (if b (dboard:rdat-targ-sql-filt-set! rdat + (string-split b "/"))) + #;(dashboard:update-run-command tabdat)) + "command-testname-selector tb action")) + ;; #:value (dboard:test-patt->lines ;; This seems like it was wrong, BUG in code where it was copied from? + ;; (dboard:tabdat-test-patts-use tabdat)) + #:expand "HORIZONTAL" + ;; #:size "10x30" + )) + (tb + (iup:treebox + #:value 0 + #:title "Runs" ;; was #:name -- iup 3.19 changed + ;; this... "Changed: [DEPRECATED + ;; REMOVED] removed the old attribute + ;; NAMEid from IupTree to avoid + ;; conflict with the common attribute + ;; NAME. Use the TITLEid attribute." + #:expand "YES" + #:addexpanded "YES" + #:size "10x" + #:selection-cb + (lambda (obj id state) + (debug:catch-and-dump + (lambda () + (let* ((run-path (tree:node->path obj id)) + (run-id (new-tree-path->run-id rdat (cdr run-path)))) + ;; (dboard:tabdat-view-changed-set! tabdat #t) ;; ?? + ;; done below when run-id is a number + (dboard:rdat-targ-sql-filt-set! rdat (cdr run-path)) ;; (print + ;; "run-path: + ;; " + ;; run-path) + (iup:attribute-set! txtbox "VALUE" + (string-intersperse (cdr run-path) "/")) + #;(dashboard:update-run-command tabdat) + #;(dboard:tabdat-layout-update-ok-set! tabdat #f) + (if (number? run-id) + (begin + ;; capture last two in tabdat. + (dboard:rdat-push-run-id rdat run-id) + (dboard:rdat-view-changed-set! rdat #t)) + (debug:print-error 5 *default-log-port* "tree-path->run-id returned non-number " run-id)))) + "treebox")) + ;; (print "path: " (tree:node->path obj id) " run-id: " run-id) + ))) + (dboard:rdat-runs-tree-set! rdat tb) + (iup:detachbox + (iup:vbox + txtbox + tb + )))) ;;====================================================================== ;; R U N C O N T R O L S ;;====================================================================== ;; @@ -1509,11 +1721,11 @@ (iup:vbox (iup:split #:orientation "HORIZONTAL" #:value 800 (let* ((cnv-obj (iup:canvas - ;; #:size "500x400" + ;; #:size "250x250" ;; "500x400" #:expand "YES" #:scrollbar "YES" #:posx "0.5" #:posy "0.5" #:action (make-canvas-action @@ -1554,15 +1766,15 @@ (let* ((hb1 (iup:hbox)) (graph-cell-table (dboard:tabdat-graph-cell-table tabdat)) (changed #f) (graph-matrix (iup:matrix #:alignment1 "ALEFT" - #:expand "YES" ;; "HORIZONTAL" + ;; #:expand "YES" ;; "HORIZONTAL" #:scrollbar "YES" #:numcol 10 #:numlin 20 - #:numcol-visible (min 8) + #:numcol-visible 5 ;; (min 8) #:numlin-visible 1 #:click-cb (lambda (obj row col status) (let* ((graph-cell (conc row ":" col)) @@ -1611,35 +1823,40 @@ (define (tree-path->run-id tabdat path) (if (not (null? path)) (hash-table-ref/default (dboard:tabdat-path-run-ids tabdat) path #f) #f)) -(define (dboard:get-tests-dat tabdat run-id last-update) - (let* ((access-mode (dboard:tabdat-access-mode tabdat)) - (tdat (if run-id (db:dispatch-query access-mode rmt:get-tests-for-run db:get-tests-for-run - run-id - (hash-table-ref/default (dboard:tabdat-searchpatts tabdat) "test-name" "%/%") - (hash-table-keys (dboard:tabdat-state-ignore-hash tabdat)) ;; '() - (hash-table-keys (dboard:tabdat-status-ignore-hash tabdat)) ;; '() - #f #f ;; offset limit - (dboard:tabdat-hide-not-hide tabdat) ;; not-in - #f #f ;; sort-by sort-order - #f ;; get all? "id,testname,item_path,state,status,event_time,run_duration" ;; qryval - (if (dboard:tabdat-filters-changed tabdat) - 0 - last-update) - *dashboard-mode*) - '()))) ;; get 'em all - ;; (debug:print 0 *default-log-port* "dboard:get-tests-dat: got " (length tdat) " test records for run " run-id) - (sort tdat (lambda (a b) - (let* ((aval (vector-ref a 2)) - (bval (vector-ref b 2)) - (anum (string->number aval)) - (bnum (string->number bval))) - (if (and anum bnum) - (< anum bnum) - (string<= aval bval))))))) +(define (new-tree-path->run-id rdat path) + (if (not (null? path)) + (hash-table-ref/default (dboard:rdat-path-run-ids tabdat) path #f) + #f)) + +;; (define (dboard:get-tests-dat tabdat run-id last-update) +;; (let* ((access-mode (dboard:tabdat-access-mode tabdat)) +;; (tdat (if run-id (db:dispatch-query access-mode rmt:get-tests-for-run db:get-tests-for-run +;; run-id +;; (hash-table-ref/default (dboard:tabdat-searchpatts tabdat) "test-name" "%/%") +;; (hash-table-keys (dboard:tabdat-state-ignore-hash tabdat)) ;; '() +;; (hash-table-keys (dboard:tabdat-status-ignore-hash tabdat)) ;; '() +;; #f #f ;; offset limit +;; (dboard:tabdat-hide-not-hide tabdat) ;; not-in +;; #f #f ;; sort-by sort-order +;; #f ;; get all? "id,testname,item_path,state,status,event_time,run_duration" ;; qryval +;; (if (dboard:tabdat-filters-changed tabdat) +;; 0 +;; last-update) +;; *dashboard-mode*) +;; '()))) ;; get 'em all +;; ;; (debug:print 0 *default-log-port* "dboard:get-tests-dat: got " (length tdat) " test records for run " run-id) +;; (sort tdat (lambda (a b) +;; (let* ((aval (vector-ref a 2)) +;; (bval (vector-ref b 2)) +;; (anum (string->number aval)) +;; (bnum (string->number bval))) +;; (if (and anum bnum) +;; (< anum bnum) +;; (string<= aval bval))))))) (define (dashboard:safe-cadr-assoc name lst) (let ((res (assoc name lst))) (if (and res (> (length res) 1)) @@ -1655,16 +1872,17 @@ (time-a (db:get-value-by-header record-a runs-header "event_time")) (time-b (db:get-value-by-header record-b runs-header "event_time"))) (< time-a time-b))))) (changed #f) (last-runs-update (dboard:tabdat-last-runs-update tabdat)) - (runs-dat (db:dispatch-query access-mode rmt:get-runs-by-patt db:get-runs-by-patt - (dboard:tabdat-keys tabdat) "%" #f #f #f #f last-runs-update))) + (runs-dat (rmt:get-runs-by-patt (dboard:tabdat-keys tabdat) "%" #f #f #f #f last-runs-update))) (dboard:tabdat-last-runs-update-set! tabdat (- (current-seconds) 2)) (for-each (lambda (run-id) (let* ((run-record (hash-table-ref/default runs-hash run-id #f)) - (key-vals (map (lambda (key)(db:get-value-by-header run-record runs-header key)) + (key-vals (map (lambda (key) + (let ((val (db:get-value-by-header run-record runs-header key))) + (if (string? val) val ""))) (dboard:tabdat-keys tabdat))) (run-name (db:get-value-by-header run-record runs-header "runname")) (col-name (conc (string-intersperse key-vals "\n") "\n" run-name)) (run-path (append key-vals (list run-name)))) (if (not (hash-table-ref/default (dboard:tabdat-path-run-ids tabdat) run-path #f)) @@ -1682,23 +1900,42 @@ ;; (set! colnum (+ colnum 1)) )))) run-ids))) (define (dashboard:tests-ht->tests-dat tests-ht) - (reverse - (sort - (hash-table-values tests-ht) - (lambda (a b) - (let ((a-test-name (db:test-get-testname a)) - (a-item-path (db:test-get-item-path a)) - (b-test-name (db:test-get-testname b)) - (b-item-path (db:test-get-item-path b))) - (cond - ((< 0 (string-compare3 a-test-name b-test-name)) #t) - ((> 0 (string-compare3 a-test-name b-test-name)) #f) - ((< 0 (string-compare3 a-item-path b-item-path)) #t) - (else #f))))))) + (let ((oldest-item (make-hash-table))) ;; + ;; populate the oldest-item table + (for-each + (lambda (tdat) + (let ((tname (db:test-get-testname tdat)) + (etime (db:test-get-event_time tdat))) + (if (hash-table-exists? oldest-item tname) + (if (< (hash-table-ref oldest-item tname) etime) + (hash-table-set! oldest-item tname etime)) + (hash-table-set! oldest-item tname etime)))) + (hash-table-values tests-ht)) + (reverse + (sort + (hash-table-values tests-ht) + (lambda (a b) + (let ((a-test-name (db:test-get-testname a)) + (a-item-path (db:test-get-item-path a)) + (b-test-name (db:test-get-testname b)) + (b-item-path (db:test-get-item-path b)) + (a-event-time (db:test-get-event_time a)) + (b-event-time (db:test-get-event_time b))) + (if (equal? a-test-name b-test-name) + (> a-event-time b-event-time) + (> (hash-table-ref oldest-item a-test-name) + (hash-table-ref oldest-item b-test-name))))))))) +;; (if (not (equal? a-test-name b-test-name)) +;; (> a-event-time b-event-time) +;; (cond +;; ((< 0 (string-compare3 a-test-name b-test-name)) #t) +;; ((> 0 (string-compare3 a-test-name b-test-name)) #f) +;; ((< 0 (string-compare3 a-item-path b-item-path)) #t) +;; (else #f))))))))) (define (dashboard:run-id->tests-mindat run-id tabdat runs-hash) (let* ((run (hash-table-ref/default runs-hash run-id #f)) (key-vals (rmt:get-key-vals run-id)) @@ -1727,12 +1964,11 @@ (define (dashboard:get-runs-hash tabdat) (let* ((access-mode (dboard:tabdat-access-mode tabdat)) (last-runs-update 0);;(dboard:tabdat-last-runs-update tabdat)) - (runs-dat (db:dispatch-query access-mode rmt:get-runs-by-patt db:get-runs-by-patt - (dboard:tabdat-keys tabdat) "%" #f #f #f #f last-runs-update)) + (runs-dat (rmt:get-runs-by-patt (dboard:tabdat-keys tabdat) "%" #f #f #f #f last-runs-update)) (runs-header (vector-ref runs-dat 0)) ;; 0 is header, 1 is list of records (runs (vector-ref runs-dat 1)) (run-id (dboard:tabdat-curr-run-id tabdat)) (runs-hash (let ((ht (make-hash-table))) (for-each (lambda (run) @@ -1744,13 +1980,11 @@ (define (dashboard:runs-summary-updater commondat tabdat tb cell-lookup run-matrix) ;; (if (dashboard:database-changed? commondat tabdat context-key: 'runs-summary-rundat) (dashboard:do-update-rundat tabdat) ;; ) (dboard:runs-summary-control-panel-updater tabdat) (let* ((last-runs-update (dboard:tabdat-last-runs-update tabdat)) - (runs-dat (db:dispatch-query (dboard:tabdat-access-mode tabdat) - rmt:get-runs-by-patt db:get-runs-by-patt - (dboard:tabdat-keys tabdat) "%" #f #f #f #f last-runs-update)) + (runs-dat (rmt:get-runs-by-patt (dboard:tabdat-keys tabdat) "%" #f #f #f #f last-runs-update)) (runs-header (vector-ref runs-dat 0)) ;; 0 is header, 1 is list of records (runs (vector-ref runs-dat 1)) (run-id (dboard:tabdat-curr-run-id tabdat)) (runs-hash (dashboard:get-runs-hash tabdat)) ;; (runs-hash (let ((ht (make-hash-table))) @@ -1796,10 +2030,12 @@ (iup:attribute-set! run-matrix "NUMCOL" max-col )) (let ((effective-max-row (if (< max-row max-visible) max-visible max-row))) (if (> effective-max-row (string->number (iup:attribute run-matrix "NUMLIN"))) (iup:attribute-set! run-matrix "NUMLIN" effective-max-row ))) + + (iup:attribute-set! run-matrix "WIDTHDEF" 16) ;; Row labels (for-each (lambda (ind) (let* ((name (car ind)) (num (cadr ind)) @@ -1835,20 +2071,20 @@ (iup:attribute-set! run-matrix key (cadr value)) (iup:attribute-set! run-matrix (conc "BGCOLOR" key) (car value)))))) matrix-content) ;; Col labels - do after setting Cell contents so they are accounted for in the size calc. - + (for-each (lambda (ind) (let* ((name (car ind)) (num (cadr ind)) (key (conc "0:" num))) (if (not (equal? (iup:attribute run-matrix key) name)) (begin (set! changed #t) - (iup:attribute-set! run-matrix key name) - (if (<= num max-col) + (iup:attribute-set! run-matrix key name) ;; (list->string (intersperse (string->list name) #\newline))) ;; name) + #;(if (<= num max-col) (iup:attribute-set! run-matrix "FITTOTEXT" (conc "C" num))))))) col-indices) (if (and (eq? pass-num 0) changed) (loop 1 #t)) ;; force second pass due to column labels changing @@ -1865,11 +2101,11 @@ (define (dashboard:summary commondat tabdat #!key (tab-num #f)) (let* ((rawconfig (read-config (conc *toppath* "/megatest.config") #f #f)) ;; changed to #f since I want #{} to be expanded by [system ...] to NOT be expanded. WAS: 'return-string))) (changed #f)) (iup:vbox (iup:split - #:value 500 + #:value 300 (iup:frame #:title "General Info" (iup:vbox (iup:hbox (iup:label "Area Path") @@ -1902,17 +2138,17 @@ (let* ((success #t) ;; at any stage of the process set this flag to #f to skip downstream steps. Intention here is to recover gracefully if user provided tabs fail to load. (source (configf:lookup views-cfgdat view-name "source")) (viewgen (configf:lookup views-cfgdat view-name "viewgen")) (updater (configf:lookup views-cfgdat view-name "updater")) (result-child #f)) - (if (and (file-exists? source) + (if (and (common:file-exists? source) (file-read-access? source)) (handle-exceptions exn (begin (print-call-chain) - (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn)) + (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn) ", exn=" exn) (debug:print 0 *default-log-port* "ERROR: failed to load " source ", try loading in the repl: megatest -repl") (set! success #f)) (load source)) (begin (debug:print 0 *default-log-port* "ERROR: cannot find file to load: \"" source "\" for user view " view-name))) @@ -1920,11 +2156,11 @@ (if success (handle-exceptions exn (begin (print-call-chain) - (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn)) + (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn) ", exn=" exn) (debug:print 0 *default-log-port* "ERROR: failed call procedure " viewgen ", with; tab-num=" tab-num ", view-name=" view-name ", and views-cfgdat and megatest configdat as parameters. To debug try loading in the repl: megatest -repl") (set! success #f)) (print "Adding tab " view-name " with proc " viewgen) @@ -1937,11 +2173,11 @@ (lambda () (handle-exceptions exn (begin (print-call-chain) - (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn)) + (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn) ", exn=" exn) (debug:print 0 *default-log-port* "ERROR: failed call procedure \"" updater "\", with; tabnum=" tab-num ", view-name=" view-name ", and views-cfgdat and megatest configdat as parameters. To debug try loading in the repl: megatest -repl") (set! success #f)) (debug:print 4 *default-log-port* "Running updater for tab " view-name " with proc " updater " and tab-num: " tab-num) @@ -2046,13 +2282,14 @@ ;; (define (dashboard:runs-summary commondat tabdat #!key (tab-num #f)) (let* ((update-mutex (dboard:commondat-update-mutex commondat)) (tb (iup:treebox #:value 0 - #:name "Runs" + ;;#:name "Runs" + #:title "Runs" ;; was #:name -- iup 3.19 changed this... "Changed: [DEPRECATED REMOVED] removed the old attribute NAMEid from IupTree to avoid conflict with the common attribute NAME. Use the TITLEid attribute." #:expand "YES" - #:addexpanded "NO" + #:addexpanded "YES" #:selection-cb (lambda (obj id state) (debug:catch-and-dump (lambda () ;; (print "obj: " obj ", id: " id ", state: " state) @@ -2108,27 +2345,27 @@ (item-path (db:test-get-item-path (rmt:get-test-info-by-id run-id test-id))) (item-test-path (conc test-name "/" (if (equal? item-path "") "%" item-path))) (status-chars (char-set->list (string->char-set status))) - (testpanel-cmd (conc toolpath " -test " (dboard:tabdat-curr-run-id tabdat) "," test-id " &"))) + (run-id (dboard:tabdat-curr-run-id tabdat))) (debug:print-info 13 *default-log-port* "status-chars=["status-chars"] status=["status"]") (cond ((member #\1 status-chars) ;; 1 is left mouse button - (system testpanel-cmd)) + (dboard:launch-testpanel run-id test-id)) ((member #\2 status-chars) ;; 2 is middle mouse button (debug:print-info 13 *default-log-port* "mmb- test-name="test-name" testpatt="testpatt) - (iup:show (dashboard:popup-menu run-id test-id target runname test-name testpatt item-test-path test-info) ;; popup-menu + (iup:show (dashboard:context-menu run-id test-id target runname test-name testpatt item-test-path test-info) ;; popup-menu #:x 'mouse #:y 'mouse #:modal? "NO") ) (else (debug:print-info 13 *default-log-port* "unhandled status in run-summary-click-cb. Doing right click action. (status is corrupted on Brandon's ubuntu host - bad/buggy iup install??" ) - (iup:show (dashboard:popup-menu run-id test-id target runname test-name testpatt item-test-path test-info) ;; popup-menu + (iup:show (dashboard:context-menu run-id test-id target runname test-name testpatt item-test-path test-info) ;; popup-menu #:x 'mouse #:y 'mouse #:modal? "NO") ) ) @@ -2159,10 +2396,28 @@ ;;====================================================================== ;; R U N S ;;====================================================================== +(define (dboard:squarify toggles size) + (let loop ((hed (car toggles)) + (tal (cdr toggles)) + (cur '()) + (res '())) + (let* ((ovrflo (>= (length cur) size)) + (newcur (if ovrflo + (list hed) + (cons hed cur))) + (newres (if ovrflo + (cons cur res) + res))) + (if (null? tal) + (if ovrflo + newres + (cons newcur res)) + (loop (car tal)(cdr tal) newcur newres))))) + (define (dboard:make-controls commondat tabdat #!key (extra-widget #f) ) (let ((btn-fontsz (dboard:tabdat-runs-btn-fontsz tabdat))) (iup:hbox (iup:vbox (iup:frame @@ -2181,10 +2436,20 @@ (iup:hbox (iup:button "Quit" #:action (lambda (obj) (exit)) #:expand "NO" #:size "40x15") (iup:button "Refresh" #:action (lambda (obj) + (dboard:tabdat-last-data-update-set! tabdat 0) + (dboard:tabdat-last-runs-update-set! tabdat 0) + (dboard:tabdat-run-update-times-set! tabdat (make-hash-table)) + (dboard:tabdat-last-test-dat-set! tabdat (make-hash-table)) + (dboard:tabdat-allruns-set! tabdat '()) + (dboard:tabdat-allruns-by-id-set! tabdat (make-hash-table)) + (dboard:tabdat-done-runs-set! tabdat '()) + (dboard:tabdat-not-done-runs-set! tabdat '()) + (dboard:tabdat-view-changed-set! tabdat #t) + (dboard:commondat-please-update-set! commondat #t) (mark-for-update tabdat)) #:expand "NO" #:size "40x15") (iup:button "Collapse" #:action (lambda (obj) (debug:catch-and-dump (lambda () @@ -2223,17 +2488,17 @@ (mark-for-update tabdat)))) (default-cmd (car (list-ref *tests-sort-type-index* *tests-sort-reverse*)))) (iuplistbox-fill-list sort-lb cmds-list selected-item: default-cmd) - (set! hide-empty (iup:button "HideEmpty" - ;; #:expand HORIZONTAL" - #:expand "NO" #:size "80x15" - #:action (lambda (obj) - (dboard:tabdat-hide-empty-runs-set! tabdat (not (dboard:tabdat-hide-empty-runs tabdat))) - (iup:attribute-set! obj "TITLE" (if (dboard:tabdat-hide-empty-runs tabdat) "+HideE" "-HideE")) - (mark-for-update tabdat)))) + ;; (set! hide-empty (iup:button "HideEmpty" + ;; ;; #:expand HORIZONTAL" + ;; #:expand "NO" #:size "80x15" + ;; #:action (lambda (obj) + ;; (dboard:tabdat-hide-empty-runs-set! tabdat (not (dboard:tabdat-hide-empty-runs tabdat))) + ;; (iup:attribute-set! obj "TITLE" (if (dboard:tabdat-hide-empty-runs tabdat) "+HideE" "-HideE")) + ;; (mark-for-update tabdat)))) (set! hide (iup:button "Hide" #:expand "NO" #:size "40x15" ;; #:expand "HORIZONTAL" #:action (lambda (obj) (dboard:tabdat-hide-not-hide-set! tabdat #t) ;; (not (dboard:tabdat-hide-not-hide tabdat))) ;; (iup:attribute-set! obj "TITLE" (if (dboard:tabdat-hide-not-hide tabdat) "HideTests" "NotHide")) @@ -2263,221 +2528,235 @@ ))) - (iup:frame - #:title "state/status filter" - (iup:vbox - (apply - iup:hbox - (map (lambda (status) - (iup:toggle (conc status " ") - #:fontsize btn-fontsz ;; "10" - #:expand "HORIZONTAL" - #:action (lambda (obj val) - (mark-for-update tabdat) - (if (eq? val 1) - (hash-table-set! (dboard:tabdat-status-ignore-hash tabdat) status #t) - (hash-table-delete! (dboard:tabdat-status-ignore-hash tabdat) status)) - (set-bg-on-filter commondat tabdat)))) - (map cadr *common:std-statuses*))) ;; '("PASS" "FAIL" "WARN" "CHECK" "WAIVED" "STUCK/DEAD" "n/a" "SKIP"))) - (apply - iup:hbox - (map (lambda (state) - (iup:toggle (conc state " ") - #:fontsize btn-fontsz - #:expand "HORIZONTAL" - #:action (lambda (obj val) - (mark-for-update tabdat) - (if (eq? val 1) - (hash-table-set! (dboard:tabdat-state-ignore-hash tabdat) state #t) - (hash-table-delete! (dboard:tabdat-state-ignore-hash tabdat) state)) - (set-bg-on-filter commondat tabdat)))) - (map cadr *common:std-states*))) ;; '("RUNNING" "COMPLETED" "INCOMPLETE" "LAUNCHED" "NOT_STARTED" "KILLED" "DELETED"))) - (iup:valuator #:valuechanged_cb (lambda (obj) - (let ((val (inexact->exact (round (/ (string->number (iup:attribute obj "VALUE")) 10)))) - (oldmax (string->number (iup:attribute obj "MAX"))) - (maxruns (dboard:tabdat-tot-runs tabdat))) - (dboard:tabdat-start-run-offset-set! tabdat val) - (mark-for-update tabdat) - (debug:print 6 *default-log-port* "(dboard:tabdat-start-run-offset tabdat) " (dboard:tabdat-start-run-offset tabdat) " maxruns: " maxruns ", val: " val " oldmax: " oldmax) - (iup:attribute-set! obj "MAX" (* maxruns 10)))) - #:expand "HORIZONTAL" - #:max (* 10 (max (hash-table-size (dboard:tabdat-allruns-by-id tabdat)) 10)) - #:min 0 - #:step 0.01))) - ;;(iup:button "inc rows" #:action (lambda (obj)(dboard:tabdat-num-tests-set! tabdat (+ (dboard:tabdat-num-tests tabdat) 1)))) - ;(iup:button "dec rows" #:action (lambda (obj)(dboard:tabdat-num-tests-set! tabdat (if (> (dboard:tabdat-num-tests tabdat) 0)(- (dboard:tabdat-num-tests tabdat) 1) 0)))) - ))) - -(define (dashboard:popup-menu run-id test-id target runname test-name testpatt item-test-path test-info) - (iup:menu - (iup:menu-item - "Test Control Panel" - #:action - (lambda (obj) - (let* ((toolpath (car (argv))) - (testpanel-cmd - (conc toolpath " -test " run-id "," test-id " &"))) - (system testpanel-cmd) - ))) - - (iup:menu-item - (conc "View Log " item-test-path) - #:action - (lambda (obj) - (let* ((rundir (db:test-get-rundir test-info)) - (logf (db:test-get-final_logf test-info)) - (fullfile (conc rundir "/" logf))) - (if (common:file-exists? fullfile) - (dcommon:run-html-viewer fullfile) - (message-window (conc "file " fullfile " not found."))))) - ) - (let* ((steps (tests:get-compressed-steps run-id test-id)) ;; # - (rundir (db:test-get-rundir test-info))) - (iup:menu-item - "Step logs" - (apply iup:menu - (map (lambda (step) - (let ((stepname (vector-ref step 0)) - (logfile (vector-ref step 5)) - (status (vector-ref step 3))) - (iup:menu-item - (conc stepname "/" (if (string=? logfile "") "no log!" logfile) " (" status ")") - #:action (lambda (obj) - (let ((fullfile (conc rundir "/" logfile))) - (if (common:file-exists? fullfile) - (dcommon:run-html-viewer fullfile) - (message-window (conc "file " fullfile " not found")))))))) - steps)))) - (iup:menu-item - (conc "Rerun " item-test-path) - #:action - (lambda (obj) - (common:run-a-command - (conc "megatest -set-state-status NOT_STARTED,n/a -run -target " target - " -runname " runname - " -testpatt " item-test-path - " -preclean -clean-cache")))) - - (iup:menu-item - "Start xterm" - #:action - (lambda (obj) - (dcommon:examine-xterm run-id test-id))) - - (iup:menu-item - (conc "Kill " item-test-path) - #:action - (lambda (obj) - ;; (rmt:test-set-state-status-by-id run-id test-id "KILLREQ" #f #f) - (common:run-a-command - (conc "megatest -set-state-status KILLREQ,n/a -target " target - " -runname " runname - " -testpatt " item-test-path - " -state RUNNING,REMOTEHOSTSTART,LAUNCHED")))) - - - (iup:menu-item - "Run" - (iup:menu - (iup:menu-item - (conc "Rerun " testpatt) - #:action - (lambda (obj) - ;; (print " run-id: " run-id " test-id: " test-id " target: " target " runname: " runname " test-name: " test-name " testpatt: " testpatt "item-path : " item-path) - (common:run-a-command - (conc "megatest -run -target " target - " -runname " runname - " -testpatt " testpatt - " -preclean -clean-cache") - ))) - (iup:menu-item - "Rerun Complete Run" - #:action - (lambda (obj) - (common:run-a-command - (conc "megatest -set-state-status NOT_STARTED,n/a -run -target " target - " -runname " runname - " -testpatt % " - " -preclean -clean-cache")))) - (iup:menu-item - "Clean Complete Run" - #:action - (lambda (obj) - (common:run-a-command - (conc "megatest -remove-runs -target " target - " -runname " runname - " -testpatt % ")))) - (iup:menu-item - "Kill Complete Run" - #:action - (lambda (obj) - (common:run-a-command - (conc "megatest -set-state-status KILLREQ,n/a -target " target - " -runname " runname - " -testpatt % " - " -state RUNNING,REMOTEHOSTSTART,LAUNCHED")))))) - (iup:menu-item - "Test" - (iup:menu - (iup:menu-item - (conc "Rerun " item-test-path) - #:action - (lambda (obj) - (common:run-a-command - (conc "megatest -set-state-status NOT_STARTED,n/a -run -target " target - " -runname " runname - " -testpatt " item-test-path - " -preclean -clean-cache")))) - (iup:menu-item - (conc "Kill " item-test-path) - #:action - (lambda (obj) - ;; (rmt:test-set-state-status-by-id run-id test-id "KILLREQ" #f #f) - (common:run-a-command - (conc "megatest -set-state-status KILLREQ,n/a -target " target - " -runname " runname - " -testpatt " item-test-path - " -state RUNNING,REMOTEHOSTSTART,LAUNCHED")))) - (iup:menu-item - (conc "Clean "item-test-path) - #:action - (lambda (obj) - (common:run-a-command - (conc "megatest -remove-runs -target " target - " -runname " runname - " -testpatt " item-test-path)))) - (iup:menu-item - "Start xterm" - #:action - (lambda (obj) - (dcommon:examine-xterm run-id test-id))) - ;;(let* ((cmd (conc (car (argv)) " -xterm " run-id "," test-id "&"))) - ;; (system cmd)))) - (iup:menu-item - "Edit testconfig" - #:action - (lambda (obj) - (let* ((all-tests (tests:get-all)) - (editor-rx (or (configf:lookup *configdat* "setup" "editor-regex") - "\\b(vim?|nano|pico)\\b")) - (editor (or (configf:lookup *configdat* "setup" "editor") - (get-environment-variable "VISUAL") - (get-environment-variable "EDITOR") "vi")) - (tconfig (conc (hash-table-ref all-tests test-name) "/testconfig")) - (cmd (conc (if (string-search editor-rx editor) - (conc "xterm -e " editor) - editor) - " " tconfig " &"))) - (system cmd)))) - )))) + (let* ((status-toggles (map (lambda (status) + (iup:toggle (conc status) + #:fontsize 8 ;; btn-fontsz ;; "10" + ;; #:expand "HORIZONTAL" + #:action (lambda (obj val) + (mark-for-update tabdat) + (if (eq? val 1) + (hash-table-set! (dboard:tabdat-status-ignore-hash tabdat) status #t) + (hash-table-delete! (dboard:tabdat-status-ignore-hash tabdat) status)) + (set-bg-on-filter commondat tabdat)))) + (map cadr *common:std-statuses*))) ;; '("PASS" "FAIL" "WARN" "CHECK" "WAIVED" "STUCK/DEAD" "n/a" "SKIP"))) + (state-toggles (map (lambda (state) + (iup:toggle (conc state) + #:fontsize 8 ;; btn-fontsz + ;; #:expand "HORIZONTAL" + #:action (lambda (obj val) + (mark-for-update tabdat) + (if (eq? val 1) + (hash-table-set! (dboard:tabdat-state-ignore-hash tabdat) state #t) + (hash-table-delete! (dboard:tabdat-state-ignore-hash tabdat) state)) + (set-bg-on-filter commondat tabdat)))) + (map cadr *common:std-states*))) ;; '("RUNNING" "COMPLETED" "INCOMPLETE" "LAUNCHED" "NOT_STARTED" "KILLED" "DELETED"))) + (num-toggle-cols (inexact->exact (round (/ (max (length status-toggles)(length state-toggles)) 3))))) + (iup:vbox + (iup:hbox + (iup:frame + #:title "states" + (apply + iup:hbox + (map (lambda (colgrp) + (apply iup:vbox colgrp)) + (dboard:squarify state-toggles 3)))) + (iup:frame + #:title "statuses" + (apply + iup:hbox + (map (lambda (colgrp) + (apply iup:vbox colgrp)) + (dboard:squarify status-toggles 3))))) + ;; + ;; (iup:frame + ;; #:title "state/status filter" + ;; (iup:vbox + ;; (apply + ;; iup:hbox + ;; (map + ;; (lambda (status-toggle state-toggle) + ;; (iup:vbox + ;; status-toggle + ;; state-toggle)) + ;; status-toggles state-toggles)) + + ;; horizontal slider was here + + ))))) + +(define (dashboard:runs-horizontal-slider tabdat ) + (iup:valuator #:valuechanged_cb (lambda (obj) + (let ((val (inexact->exact (round (/ (string->number (iup:attribute obj "VALUE")) 10)))) + (oldmax (string->number (iup:attribute obj "MAX"))) + (maxruns (dboard:tabdat-tot-runs tabdat))) + (dboard:tabdat-start-run-offset-set! tabdat val) + (mark-for-update tabdat) + (debug:print 6 *default-log-port* "(dboard:tabdat-start-run-offset tabdat) " (dboard:tabdat-start-run-offset tabdat) " maxruns: " maxruns ", val: " val " oldmax: " oldmax) + (iup:attribute-set! obj "MAX" (* maxruns 10)))) + #:expand "HORIZONTAL" + #:max (* 10 (max (hash-table-size (dboard:tabdat-allruns-by-id tabdat)) 10)) + #:min 0 + #:step 0.01)) + +;; make-simple-run procedure (target3772 id3773 runname3774 state3775 status3776 owner3777 event_time3778) +;; rmt:simple-get-runs procedure (runpatt1001 count1002 offset1003 target1004) +;; simple-run-event_time procedure (x3834) +;; simple-run-event_time-set! procedure (x3830 val3831) +;; simple-run-id procedure (x3794) +;; simple-run-id-set! procedure (x3790 val3791) +;; simple-run-owner procedure (x3826) +;; simple-run-owner-set! procedure (x3822 val3823) +;; simple-run-runname procedure (x3802) +;; simple-run-runname-set! procedure (x3798 val3799) +;; simple-run-state procedure (x3810) +;; simple-run-state-set! procedure (x3806 val3807) +;; simple-run-status procedure (x3818) +;; simple-run-status-set! procedure (x3814 val3815) +;; simple-run-target procedure (x3786) +;; simple-run-target-set! procedure (x3782 val3783) +;; simple-run? procedure (x3780) + + +;;====================================================================== +;; Extracting the data to display for runs +;; +;; This needs to be re-entrant such that it does one column per call +;; on the zeroeth call update runs data +;; on each subsequent call update one run (configurable - could do two, three ... or update until tdelta exceeded +;; on last run reset to zeroeth +;; +;; 1. select with run filters; area, target, runname, runstate, runstatus, starttime, duration +;; - put this information into two data structures: +;; a. hash of area/target/runname => runstruct #< ordernun, id, area, target, runname, state, +;; status, starttime, duration, non-deleted testcount> +;; ordernum reflects order as received from sql query +;; b. sparsevec of id => runstruct +;; 2. for each run in runshash ordered by ordernum do: +;; retrieve data since last update for that run +;; if there is a deleted test - retrieve full data +;; if there are non-deleted tests register this run in the columns sparsevec +;; if this is the zeroeth column regenerate the rows sparsevec +;; if this column is in the visible zone update visible cells +;; +;; Other factors: +;; 1. left index handling: +;; - add test/itempaths to left index as discovered, re-order and +;; update row -> test/itempath mapping on each read run +;;====================================================================== + +;; runs is +;; get ALL runs info +;; update rdat-targ-run-id +;; update rdat-runs +;; +(define (dashboard:update-runs-data rdat) + (let* ((tb (dboard:rdat-runs-tree rdat)) + (targ-sql-filt (dboard:rdat-targ-sql-filt rdat)) + (runname-sql-filt (dboard:rdat-runname-sql-filt rdat)) + (state-sql-filt (dboard:rdat-run-state-sql-filt rdat)) + (status-sql-filt (dboard:rdat-run-status-sql-filt rdat)) + ;; Use (db:get-value-by-header (db:get-header runinfo)(db:get-rows runinfo)) + (data (rmt:simple-get-runs runname-sql-filt #f #f targ-sql-filt #f)) + (numruns (length data))) + ;; store in the runsbynum vector + (dboard:rdat-runsbynum-set! rdat (list->vector data)) + ;; update runs id => runrec + ;; update targ-runid target/runname => run-id + (for-each + (lambda (runrec) + (let* ((run-id (simple-run-id runrec)) + (full-targ-runname (conc (simple-run-target runrec) "/" + (simple-run-runname runrec)))) + (debug:print 0 *default-log-port* "Update run " run-id) + (sparse-vector-set! (dboard:rdat-runs rdat) run-id runrec) + (hash-table-set! (dboard:rdat-targ-runid rdat) full-targ-runname run-id) + )) + data) + numruns)) + +;; NOTE: runnum is NOT the run-id, it is a pointer into the runsbynum vector +;; +(define (dashboard:update-run-data runnum rdat) + (let* ((curr-time (current-seconds)) + (runrec (vector-ref (dboard:rdat-runsbynum rdat) runnum)) + (run-id (simple-run-id runrec)) + (last-update (sparse-vector-ref (dboard:rdat-last-updates rdat) run-id)) + ;; filters + (testname-sql-filt (dboard:rdat-testname-sql-filt rdat)) + ;; (itempath-sql-filt (dboard:rdat-itempath-sql-filt rdat)) + (test-state-sql-filt (dboard:rdat-test-state-sql-filt rdat)) ;; not used yet + (test-status-sql-filt (dboard:rdat-test-status-sql-filt rdat)) ;; not used yet + (tests (rmt:get-tests-for-run-state-status run-id + testname-sql-filt + last-update ;; last-update + ))) + (sparse-vector-set! (dboard:rdat-last-updates rdat) run-id (- curr-time 1)) + (debug:print 0 *default-log-port* "Got " (length tests) " tests for run-id " + run-id " testname-sql-filt " testname-sql-filt " and last-update " last-update) + (length tests))) + +(define (new-runs-updater commondat rdat) + (let* ((runnum (dboard:rdat-runnum rdat)) + (start-time (current-milliseconds)) + (tot-runs #f)) + (if (eq? runnum 0)(dashboard:update-runs-data rdat)) + (set! tot-runs (vector-length (dboard:rdat-runsbynum rdat))) + (let loop ((rn runnum)) + (if (and (< (- (current-milliseconds) start-time) 250) + (< rn tot-runs)) + (let* ((newrn (if (>= runnum (vector-length (dboard:rdat-runsbynum rdat))) + 0 ;; start over + (+ rn 1)))) ;; (+ runnum 1))) + (dashboard:update-run-data rn rdat) + (dboard:rdat-runnum-set! rdat newrn) + (if (> newrn 0) + (loop newrn))))) + (if (>= (dboard:rdat-runnum rdat) tot-runs) + (dboard:rdat-runnum-set! rdat 0)) + ;; (dboard:rdat-runnum-set! rdat rn))) ;; not needed as it is set above + ;; (dboard:rdat-last-update-set! rdat (- (current-seconds) 10)) + ;; (tree:add-node tb "Runs" (string-split full-targ-runname "/")) + '())) + +(define (dboard:runs-new-matrix commondat rdat) + (iup:matrix + #:alignment1 "ALEFT" + ;; #:expand "YES" ;; "HORIZONTAL" + #:scrollbar "YES" + #:numcol 10 + #:numlin 20 + #:numcol-visible 5 ;; (min 8) + #:numlin-visible 1 + #:click-cb + (lambda (obj row col status) + (let* ((cell (conc row ":" col))) + #f)) + )) + +(define (make-runs-view commondat rdat tab-num) + ;; register an updater + (dboard:commondat-add-updater + commondat + (lambda () + (new-runs-updater commondat rdat)) + tab-num: tab-num) + + (iup:vbox + (iup:split + #:orientation "VERTICAL" ;; "HORIZONTAL" + #:value 100 + (dboard:runs-tree-new-browser commondat rdat) + (dboard:runs-new-matrix commondat rdat) + ))) (define (make-dashboard-buttons commondat) ;; runs-sum-dat new-view-dat) (let* ((stats-dat (dboard:tabdat-make-data)) (runs-dat (dboard:tabdat-make-data)) + (runs2-dat (make-dboard:rdat)) ;; (dboard:tabdat-make-data)) (onerun-dat (dboard:tabdat-make-data)) ;; name for run-summary structure (runcontrols-dat (dboard:tabdat-make-data)) (runtimes-dat (dboard:tabdat-make-data)) (nruns (dboard:tabdat-numruns runs-dat)) (ntests (dboard:tabdat-num-tests runs-dat)) @@ -2498,56 +2777,83 @@ (cell-width (dboard:tabdat-runs-cell-width runs-dat))) ;; controls (along bottom) ;; (set! controls (dboard:make-controls commondat runs-dat)) ;; create the left most column for the run key names and the test names - (set! lftlst (list (iup:hbox - (iup:label) ;; (iup:valuator) - (apply iup:vbox - (map (lambda (x) - (let ((res (iup:hbox #:expand "HORIZONTAL" - (iup:label x #:size (conc 40 btn-height) #:fontsize btn-fontsz #:expand "NO") ;; "HORIZONTAL") - (iup:textbox #:size (conc 35 btn-height) #:fontsize btn-fontsz #:value "%" #:expand "NO" ;; "HORIZONTAL" - #:action (lambda (obj unk val) - (mark-for-update runs-dat) - (update-search commondat runs-dat x val)))))) - (set! i (+ i 1)) - res)) - keynames))))) + (set! lftlst + (list (iup:hbox + (iup:label) ;; (iup:valuator) + (apply iup:vbox + (map (lambda (x) + (let ((res (iup:hbox + #:expand "HORIZONTAL" + (iup:label x + #:size (conc 40 btn-height) + #:fontsize btn-fontsz + #:expand "NO") ;; "HORIZONTAL") + (iup:textbox + #:size (conc 35 btn-height) + #:fontsize btn-fontsz + #:value "%" + #:expand "NO" ;; "HORIZONTAL" + #:action (lambda (obj unk val) + ;; each field + ;; (field name is "x" var) live updates + ;; the search filter as it is typed + (dboard:tabdat-target-set! runs-dat #f) + ;; ensure fields text boxes are used + ;; and not the info from the tree + (mark-for-update runs-dat) + (update-search commondat runs-dat x val)))))) + (set! i (+ i 1)) + res)) + keynames))))) (let loop ((testnum 0) (res '())) (cond ((>= testnum ntests) ;; now lftlst will be an hbox with the test keys and the test name labels - (set! lftlst (append lftlst (list (iup:hbox #:expand "HORIZONTAL" - (iup:valuator #:valuechanged_cb (lambda (obj) - (let ((val (string->number (iup:attribute obj "VALUE"))) - (oldmax (string->number (iup:attribute obj "MAX"))) - (newmax (* 10 (length (dboard:tabdat-all-test-names runs-dat))))) - (dboard:commondat-please-update-set! commondat #t) - (dboard:tabdat-start-test-offset-set! runs-dat (inexact->exact (round (/ val 10)))) - (debug:print 6 *default-log-port* "(dboard:tabdat-start-test-offset runs-dat) " (dboard:tabdat-start-test-offset runs-dat) " val: " val " newmax: " newmax " oldmax: " oldmax) - (if (< val 10) - (iup:attribute-set! obj "MAX" newmax)) - )) - #:expand "VERTICAL" - #:orientation "VERTICAL" - #:min 0 - #:step 0.01) - (apply iup:vbox (reverse res))))))) + (set! lftlst + (append + lftlst + (list + (iup:hbox + #:expand "HORIZONTAL" + (iup:valuator + #:valuechanged_cb + (lambda (obj) + (let ((val (string->number (iup:attribute obj "VALUE"))) + (oldmax (string->number (iup:attribute obj "MAX"))) + (newmax (* 10 (length (dboard:tabdat-all-test-names runs-dat))))) + (dboard:commondat-please-update-set! commondat #t) + (dboard:tabdat-start-test-offset-set! runs-dat + (inexact->exact (round (/ val 10)))) + (debug:print 6 *default-log-port* + "(dboard:tabdat-start-test-offset runs-dat) " + (dboard:tabdat-start-test-offset runs-dat) " val: " val + " newmax: " newmax " oldmax: " oldmax) + (if (< val 10) + (iup:attribute-set! obj "MAX" newmax)) + )) + #:expand "VERTICAL" + #:orientation "VERTICAL" + #:min 0 + #:step 0.01) + (apply iup:vbox (reverse res))))))) (else - (let ((labl (iup:button "" ;; the testname labels - #:flat "YES" - #:alignment "ALEFT" + (let ((labl (iup:button + "" ;; the testname labels + #:flat "YES" + #:alignment "ALEFT" ; #:image img1 ; #:impress img2 - #:size (conc cell-width btn-height) - #:expand "HORIZONTAL" - #:fontsize btn-fontsz - #:action (lambda (obj) - (mark-for-update runs-dat) - (toggle-hide testnum (dboard:commondat-uidat commondat)))))) ;; (iup:attribute obj "TITLE")))) + #:size (conc cell-width btn-height) + #:expand "HORIZONTAL" + #:fontsize btn-fontsz + #:action (lambda (obj) + (mark-for-update runs-dat) + (toggle-hide testnum (dboard:commondat-uidat commondat)))))) (vector-set! lftcol testnum labl) (loop (+ testnum 1)(cons labl res)))))) ;; These are the headers for each row (let loop ((runnum 0) (keynum 0) @@ -2605,24 +2911,22 @@ "%"))) (item-path (db:test-get-item-path (rmt:get-test-info-by-id run-id test-id))) (item-test-path (conc test-name "/" (if (equal? item-path "") "%" item-path)))) - (iup:show (dashboard:popup-menu run-id test-id target runname test-name testpatt item-test-path test-info) ;; popup-menu + (iup:show (dashboard:context-menu run-id test-id target runname test-name testpatt item-test-path test-info) ;; popup-menu #:x 'mouse #:y 'mouse #:modal? "NO") ;; (print "got here") )) (if (eq? pressed 0) (let* ((toolpath (car (argv))) (buttndat (hash-table-ref (dboard:tabdat-buttondat runs-dat) button-key)) (test-id (db:test-get-id (vector-ref buttndat 3))) - (run-id (db:test-get-run_id (vector-ref buttndat 3))) - (cmd (conc toolpath " -test " run-id "," test-id "&"))) - (system cmd))) - ))))) + (run-id (db:test-get-run_id (vector-ref buttndat 3)))) + (dboard:launch-testpanel run-id test-id)))))))) (hash-table-set! (dboard:tabdat-buttondat runs-dat) button-key (vector 0 "100 100 100" button-key #f #f)) (vector-set! testvec testnum butn) (loop runnum (+ testnum 1) testvec (cons butn res)))))) ;; now assemble the hdrlst and bdylst and kick off the dialog (iup:show @@ -2630,20 +2934,23 @@ #:title (conc "Megatest dashboard " (current-user-name) ":" *toppath*) #:menu (dcommon:main-menu) (let* ((runs-view (iup:vbox (iup:split #:orientation "VERTICAL" ;; "HORIZONTAL" - #:value 150 + #:value 100 (dboard:runs-tree-browser commondat runs-dat) (iup:split + #:value 100 ;; left most block, including row names (apply iup:vbox lftlst) ;; right hand block, including cells (iup:vbox + #:expand "YES" ;; the header (apply iup:hbox (reverse hdrlst)) - (apply iup:hbox (reverse bdylst))))) + (apply iup:hbox (reverse bdylst)) + (dashboard:runs-horizontal-slider runs-dat)))) controls )) (views-cfgdat (common:load-views-config)) (additional-tabnames '()) (tab-start-num 5) ;; DON'T FORGET TO UPDATE THIS WHEN CHANGING THE STANDARD TABS BELOW @@ -2655,23 +2962,26 @@ (lambda (view-name) (debug:print 0 *default-log-port* "Adding view " view-name) (let* ((cfgtype (configf:lookup views-cfgdat view-name "type"))) ;; what type of view? (if (not (string? cfgtype)) (debug:print-info 0 *default-log-port* "WARNING: view \"" view-name - "\" is missing needed sections. Please consult the documenation and update ~/.mtviews.config or " *toppath* "/.mtviews.config") + "\" is missing needed sections. " + "Please consult the documenation and update ~/.mtviews.config or " + *toppath* "/.mtviews.config") (case (string->symbol cfgtype) ;; user supplied source for a tab ;; - ((external) - (let ((tab-content (dboard:add-external-tab commondat view-name views-cfgdat #f tab-num))) ;; was tabs + ((external) ;; was tabs + (let ((tab-content (dboard:add-external-tab commondat view-name views-cfgdat #f tab-num))) (set! additional-tabnames (cons (cons tab-num view-name) additional-tabnames)) (set! tab-num (+ tab-num 1)) (set! result (append result (list tab-content))))))))) - (sort (hash-table-keys views-cfgdat) (lambda (a b) - (let ((order-a (or (any->number (configf:lookup views-cfgdat a "order")) 999)) - (order-b (or (any->number (configf:lookup views-cfgdat b "order")) 999))) - (> order-a order-b))))) + (sort (hash-table-keys views-cfgdat) + (lambda (a b) + (let ((order-a (or (any->number (configf:lookup views-cfgdat a "order")) 999)) + (order-b (or (any->number (configf:lookup views-cfgdat b "order")) 999))) + (> order-a order-b))))) result)) (tabs (apply iup:tabs #:tabchangepos-cb (lambda (obj curr prev) (debug:catch-and-dump (lambda () @@ -2684,18 +2994,19 @@ (dboard:commondat-please-update-set! commondat #t) (dboard:tabdat-layout-update-ok-set! tabdat #t))) "tabchangepos")) (dashboard:summary commondat stats-dat tab-num: 0) runs-view + ;; (make-runs-view commondat runs2-dat 2) (dashboard:runs-summary commondat onerun-dat tab-num: 2) - ;; (dashboard:new-view db data new-view-dat tab-num: 3) (dashboard:run-controls commondat runcontrols-dat tab-num: 3) (dashboard:run-times commondat runtimes-dat tab-num: 4) additional-views))) ;; (set! (iup:callback tabs tabchange-cb:) (lambda (a b c)(print "SWITCHED TO TAB: " a " " b " " c))) (iup:attribute-set! tabs "TABTITLE0" "Summary") (iup:attribute-set! tabs "TABTITLE1" "Runs") + ;; (iup:attribute-set! tabs "TABTITLE2" "Runs2") (iup:attribute-set! tabs "TABTITLE2" "Run Summary") (iup:attribute-set! tabs "TABTITLE3" "Run Control") (iup:attribute-set! tabs "TABTITLE4" "Run Times") ;; (iup:attribute-set! tabs "TABTITLE3" "New View") ;; (iup:attribute-set! tabs "TABTITLE4" "Run Control") @@ -2710,10 +3021,11 @@ ;; make the iup tabs object available (for changing color for example) (dboard:commondat-hide-not-hide-tabs-set! commondat tabs) ;; now set up the tabdat lookup (dboard:common-set-tabdat! commondat 0 stats-dat) (dboard:common-set-tabdat! commondat 1 runs-dat) + ;;(dboard:common-set-tabdat! commondat 2 runs2-dat) (dboard:common-set-tabdat! commondat 2 onerun-dat) (dboard:common-set-tabdat! commondat 3 runcontrols-dat) (dboard:common-set-tabdat! commondat 4 runtimes-dat) (iup:vbox @@ -2749,20 +3061,21 @@ (define (dashboard:get-youngest-run-db-mod-time dbdir) (handle-exceptions exn (begin - (debug:print 2 *default-log-port* "WARNING: error in accessing databases in get-youngest-run-db-mod-time: " ((condition-property-accessor 'exn 'message) exn) " db-dir="dbdir) + (debug:print 2 *default-log-port* "WARNING: error in accessing databases in get-youngest-run-db-mod-time: " + ((condition-property-accessor 'exn 'message) exn) " db-dir="dbdir ", exn=" exn) (current-seconds)) ;; something went wrong - just print an error and return current-seconds (common:max (map (lambda (filen) (file-modification-time filen)) (glob (conc dbdir "/*.db*")))))) (define (dashboard:monitor-changed? commondat tabdat) (let* ((run-update-time (current-seconds)) (monitor-db-path (dboard:tabdat-monitor-db-path tabdat)) - (monitor-modtime (if (and monitor-db-path (file-exists? monitor-db-path)) + (monitor-modtime (if (and monitor-db-path (common:file-exists? monitor-db-path)) (file-modification-time monitor-db-path) -1))) (if (and (eq? (dboard:commondat-curr-tab-num commondat) 0) (or (> monitor-modtime *last-monitor-update-time*) (> (- run-update-time *last-monitor-update-time*) 5))) ;; update every 1/2 minute just in case @@ -2887,13 +3200,11 @@ ;; run times tab data updater ;; (define (dashboard:run-times-tab-run-data-updater commondat tabdat tab-num) (let* ((access-mode (dboard:tabdat-access-mode tabdat)) (last-runs-update (dboard:tabdat-last-runs-update tabdat)) - (runs-dat (db:dispatch-query access-mode - rmt:get-runs-by-patt db:get-runs-by-patt - (dboard:tabdat-keys tabdat) "%" #f #f #f #f last-runs-update)) + (runs-dat (rmt:get-runs-by-patt (dboard:tabdat-keys tabdat) "%" #f #f #f #f last-runs-update)) (runs-header (vector-ref runs-dat 0)) ;; 0 is header, 1 is list of records (runs-hash (let ((ht (make-hash-table))) (for-each (lambda (run) (hash-table-set! ht (db:get-value-by-header run runs-header "id") run)) (vector-ref runs-dat 1)) @@ -3455,20 +3766,12 @@ (define (dashboard:runs-tab-updater commondat tab-num) (debug:catch-and-dump (lambda () (let* ((tabdat (dboard:common-get-tabdat commondat tab-num: tab-num)) (dbkeys (dboard:tabdat-dbkeys tabdat))) - ;;(print "RA => calling runs-tab-updater with commondat " commondat " tab-num " tab-num) - ;;(tabdat-values tabdat) ;;RA added - ;; (pp (dboard:tabdat->alist tabdat)) - ;; (if (dashboard:database-changed? commondat tabdat context-key: 'runs-rundat) (dashboard:do-update-rundat tabdat) - ;;(debug:print-info 13 *default-log-port* "dashboard:runs-tab-updater") - ;;(inspect tabdat) - (let ((uidat (dboard:commondat-uidat commondat))) - ;;(print "RA => Calling update-buttons with tabdat : " tabdat " uidat " uidat) (update-buttons tabdat uidat (dboard:tabdat-numruns tabdat) (dboard:tabdat-num-tests tabdat))) )) "dashboard:runs-tab-updater")) ;;====================================================================== @@ -3475,19 +3778,19 @@ ;; The heavy lifting starts here ;;====================================================================== (define (main) (let ((mtdb-path (conc *toppath* "/megatest.db"))) ;; - (if (and (file-exists? mtdb-path) + (if (and (common:file-exists? mtdb-path) (file-write-access? mtdb-path)) (if (not (args:get-arg "-skip-version-check")) (common:exit-on-version-changed))) (let* ((commondat (dboard:commondat-make))) ;; Move this stuff to db.scm? I'm not sure that is the right thing to do... (cond ((args:get-arg "-test") ;; run-id,test-id - (let* ((dat (let ((d (map string->number (string-split (args:get-arg "-test") ",")))) + (let* ((dat (let ((d (map string->number (string-split (args:get-arg "-test") ",")))) (if (> (length d) 1) d (list #f #f)))) (run-id (car dat)) (test-id (cadr dat))) @@ -3506,25 +3809,31 @@ (dboard:commondat-add-updater commondat (lambda () (dashboard:runs-tab-updater commondat 1)) tab-num: 1) + ;; may not want this alive (manually merged it from v1.66) + (dboard:commondat-add-updater + commondat + (lambda () + (dashboard:runs-tab-updater commondat 1)) + tab-num: 2) (iup:callback-set! *tim* "ACTION_CB" (lambda (time-obj) (let ((update-is-running #f)) - (mutex-lock! (dboard:commondat-update-mutex commondat)) - (set! update-is-running (dboard:commondat-updating commondat)) - (if (not update-is-running) - (dboard:commondat-updating-set! commondat #t)) - (mutex-unlock! (dboard:commondat-update-mutex commondat)) - (if (not update-is-running) ;; we know that the update was not running and we now have a lock on doing an update - (begin - (dboard:common-run-curr-updaters commondat) ;; (dashboard:run-update commondat) - (mutex-lock! (dboard:commondat-update-mutex commondat)) - (dboard:commondat-updating-set! commondat #f) - (mutex-unlock! (dboard:commondat-update-mutex commondat))) + (mutex-lock! (dboard:commondat-update-mutex commondat)) + (set! update-is-running (dboard:commondat-updating commondat)) + (if (not update-is-running) + (dboard:commondat-updating-set! commondat #t)) + (mutex-unlock! (dboard:commondat-update-mutex commondat)) + (if (not update-is-running) ;; we know that the update was not running and we now have a lock on doing an update + (begin + (dboard:common-run-curr-updaters commondat) ;; (dashboard:run-update commondat) + (mutex-lock! (dboard:commondat-update-mutex commondat)) + (dboard:commondat-updating-set! commondat #f) + (mutex-unlock! (dboard:commondat-update-mutex commondat))) )) 1)))) (let ((th1 (make-thread (lambda () (thread-sleep! 1) @@ -3534,12 +3843,12 @@ (thread-start! th2) (thread-join! th2))))) ;; ease debugging by loading ~/.dashboardrc (let ((debugcontrolf (conc (get-environment-variable "HOME") "/.dashboardrc"))) - (if (file-exists? debugcontrolf) + (if (common:file-exists? debugcontrolf) (load debugcontrolf))) (if (args:get-arg "-repl") (repl) (main)) Index: datashare-testing/.sd.config ================================================================== --- datashare-testing/.sd.config +++ datashare-testing/.sd.config @@ -1,5 +1,22 @@ +# Copyright 2006-2017, Matthew Welland. +# +# This file is part of Megatest. +# +# Megatest is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Megatest is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Megatest. If not, see . +# # Read in the users vars first (so the offical data cannot be overridden [include ~/.datashare.config] # Read in local overrides [include datashare.config] Index: datashare-testing/.spublish.config ================================================================== --- datashare-testing/.spublish.config +++ datashare-testing/.spublish.config @@ -1,5 +1,22 @@ +# Copyright 2006-2017, Matthew Welland. +# +# This file is part of Megatest. +# +# Megatest is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Megatest is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Megatest. If not, see . +# [settings] target-dir #{scheme (create-directory "/tmp/#{getenv USER}/target" #t)} allowed-users matt mrwellan pjhatwal allowed-chars [0-9a-zA-Z\-\.]+ admins matt Index: datashare-testing/.sretrieve.config ================================================================== --- datashare-testing/.sretrieve.config +++ datashare-testing/.sretrieve.config @@ -1,8 +1,25 @@ +# Copyright 2006-2017, Matthew Welland. +# +# This file is part of Megatest. +# +# Megatest is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Megatest is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Megatest. If not, see . +# [settings] base-dir /tmp/delme_data -allowed-users matt +allowed-users matt allowed-chars [0-9a-zA-Z\-\.]+ allowed-sub-paths [0-9a-zA-Z\-\.]+ [database] location #{scheme (create-directory "/tmp/#{getenv USER}" #t)} Index: datashare-testing/NOTES ================================================================== --- datashare-testing/NOTES +++ datashare-testing/NOTES @@ -1,3 +1,20 @@ +# Copyright 2006-2017, Matthew Welland. +# +# This file is part of Megatest. +# +# Megatest is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Megatest is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Megatest. If not, see . + To test sretrieve first publish megatest as v1.60 at least twice to get iterations 0 and 1 Index: datashare-testing/megatest.config ================================================================== --- datashare-testing/megatest.config +++ datashare-testing/megatest.config @@ -1,4 +1,21 @@ +# Copyright 2006-2017, Matthew Welland. +# +# This file is part of Megatest. +# +# Megatest is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Megatest is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Megatest. If not, see . +# [v1.60] status released iteration 1 Index: datashare-testing/packages.config ================================================================== --- datashare-testing/packages.config +++ datashare-testing/packages.config @@ -1,4 +1,21 @@ +# Copyright 2006-2017, Matthew Welland. +# +# This file is part of Megatest. +# +# Megatest is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Megatest is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Megatest. If not, see . +# [v1.60] status released iteration 1 Index: datashare.scm ================================================================== --- datashare.scm +++ datashare.scm @@ -1,14 +1,22 @@ ;; Copyright 2006-2013, Matthew Welland. ;; -;; This program is made available under the GNU GPL version 2.0 or -;; greater. See the accompanying file COPYING for details. +;; This file is part of Megatest. +;; +;; Megatest is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. +;; +;; Megatest is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. ;; -;; This program is distributed WITHOUT ANY WARRANTY; without even the -;; implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -;; PURPOSE. +;; You should have received a copy of the GNU General Public License +;; along with Megatest. If not, see . (use ssax) (use sxml-serializer) (use sxml-modifications) (use regex) @@ -226,11 +234,11 @@ (if (and path (directory? path) (file-read-access? path)) (let* ((dbpath (conc path "/datashare.db")) (writeable (file-write-access? dbpath)) - (dbexists (file-exists? dbpath)) + (dbexists (common:file-exists? dbpath)) (handler (make-busy-timeout 136000))) (handle-exceptions exn (begin (debug:print 2 *default-log-port* "ERROR: problem accessing db " dbpath @@ -413,11 +421,11 @@ paths)) ;; remove existing link and if possible ... ;; create path to next of tip of target, create link back to source (define (datashare:build-dir-make-link source target) - (if (file-exists? target)(datashare:backup-move target)) + (if (common:file-exists? target)(datashare:backup-move target)) (create-directory (pathname-directory target) #t) (create-symbolic-link source target)) (define (datashare:backup-move path) (let* ((trashdir (conc (pathname-directory path) "/.trash")) @@ -518,11 +526,11 @@ (define (datashare:path->lst path) (string-split path "/")) (define (datashare:pathdat-apply-heuristics configdat path) (cond - ((file-exists? path) "found") + ((common:file-exists? path) "found") (else (conc path " not installed")))) (define (datashare:get-view configdat) (iup:vbox (iup:hbox @@ -692,11 +700,11 @@ (define (datashare:find name paths) (if (null? paths) #f (let loop ((hed (car paths)) (tal (cdr paths))) - (if (file-exists? (conc hed "/" name)) + (if (common:file-exists? (conc hed "/" name)) hed (if (null? tal) #f (loop (car tal)(cdr tal))))))) @@ -706,11 +714,11 @@ (define (datashare:load-config exe-dir exe-name) (let* ((fname (conc exe-dir "/." exe-name ".config"))) (ini:property-separator-patt " * *") (ini:property-separator #\space) - (if (file-exists? fname) + (if (common:file-exists? fname) ;; (ini:read-ini fname) (read-config fname #f #t) (make-hash-table)))) (define (datashare:process-action configdat action . args) @@ -785,11 +793,11 @@ versions) (sqlite3:finalize! db))))) ;; ease debugging by loading ~/.dashboardrc - REMOVE FROM PRODUCTION! (let ((debugcontrolf (conc (get-environment-variable "HOME") "/.datasharerc"))) - (if (file-exists? debugcontrolf) + (if (common:file-exists? debugcontrolf) (load debugcontrolf))) (define (main) (let* ((args (argv)) (prog (car args)) Index: db.scm ================================================================== --- db.scm +++ db.scm @@ -1,14 +1,23 @@ ;;====================================================================== ;; Copyright 2006-2016, Matthew Welland. ;; -;; This program is made available under the GNU GPL version 2.0 or -;; greater. See the accompanying file COPYING for details. +;; This file is part of Megatest. +;; +;; Megatest is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. +;; +;; Megatest is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. ;; -;; This program is distributed WITHOUT ANY WARRANTY; without even the -;; implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -;; PURPOSE. +;; You should have received a copy of the GNU General Public License +;; along with Megatest. If not, see . +;; ;;====================================================================== ;;====================================================================== ;; Database access ;;====================================================================== @@ -30,11 +39,10 @@ (include "common_records.scm") (include "db_records.scm") (include "key_records.scm") (include "run_records.scm") -(define *rundb-mutex* (make-mutex)) ;; prevent problems opening/closing rundb's (define *number-of-writes* 0) (define *number-non-write-queries* 0) ;;====================================================================== ;; R E C O R D S @@ -49,10 +57,11 @@ (mtdb #f) (refndb #f) (homehost #f) ;; not used yet (on-homehost #f) ;; not used yet (read-only #f) + (stmt-cache (make-hash-table)) ) ;; goal is to converge on one struct for an area but for now it is too confusing ;; record for keeping state,status and count for doing roll-ups in ;; iterated tests @@ -59,10 +68,43 @@ ;; (defstruct dbr:counts (state #f) (status #f) (count 0)) + +;;====================================================================== +;; alist-of-alists +;;====================================================================== +;; +;; (define (db:aa-set! dat key1 key2 val) +;; (let loop (( + +;;====================================================================== +;; hash of hashs +;;====================================================================== + + +(define (db:hoh-set! dat key1 key2 val) + (let* ((subhash (hash-table-ref/default dat key1 #f))) + (if subhash + (hash-table-set! subhash key2 val) + (begin + (hash-table-set! dat key1 (make-hash-table)) + (db:hoh-set! dat key1 key2 val))))) + +(define (db:hoh-get dat key1 key2) + (let* ((subhash (hash-table-ref/default dat key1 #f))) + (and subhash + (hash-table-ref/default subhash key2 #f)))) + +(define (db:get-cache-stmth dbstruct db stmt) + (let* ((stmt-cache (dbr:dbstruct-stmt-cache dbstruct)) + (stmth (db:hoh-get stmt-cache db stmt))) + (or stmth + (let* ((newstmth (sqlite3:prepare db stmt))) + (db:hoh-set! stmt-cache db stmt newstmth) + newstmth)))) ;;====================================================================== ;; SQLITE3 HELPERS ;;====================================================================== @@ -81,11 +123,11 @@ (let ((err-status ((condition-property-accessor 'sqlite3 'status #f) exn))) ;; check for (exn sqlite3) ((condition-property-accessor 'exn 'message) exn) (if (eq? err-status 'done) default (begin - (debug:print-error 0 *default-log-port* " query " stmt " failed, params: " params ", error: " ((condition-property-accessor 'exn 'message) exn)) + (debug:print-error 0 *default-log-port* " query " stmt " failed, params: " params ", error: " ((condition-property-accessor 'exn 'message) exn) ", exn=" exn) (print-call-chain (current-error-port)) default))) (apply sqlite3:first-result db stmt params))) ;; Get/open a database @@ -113,56 +155,57 @@ (define (db:dbdat-get-path dbdat) (if (pair? dbdat) (cdr dbdat) #f)) -;; mod-read: -;; 'mod modified data -;; 'read read data -;; Locks the mutex and depending on 'mod or 'read passed, sets the last timestamp in dbstruct -;; -;; (define (db:done-with dbstruct run-id mod-read) -;; (if (not (sqlite3:database? dbstruct)) -;; (begin -;; (mutex-lock! *rundb-mutex*) -;; (if (eq? mod-read 'mod) -;; (dbr:dbstruct-mtime-set! dbstruct (current-milliseconds)) -;; (dbr:dbstruct-rtime-set! dbstruct (current-milliseconds))) -;; (dbr:dbstruct-inuse-set! dbstruct #f) -;; (mutex-unlock! *rundb-mutex*)))) +(define-inline (db:generic-error-printout exn . message) + (print-call-chain (current-error-port)) + (apply debug:print-error 0 *default-log-port* message) + (debug:print-error 0 *default-log-port* " params: " params + ", error: " ((condition-property-accessor 'exn 'message) exn) + ", arguments: " ((condition-property-accessor 'exn 'arguments) exn) + ", location: " ((condition-property-accessor 'exn 'location) exn) + )) ;; (db:with-db dbstruct run-id sqlite3:exec "select blah fgrom blaz;") ;; r/w is a flag to indicate if the db is modified by this query #t = yes, #f = no ;; (define (db:with-db dbstruct run-id r/w proc . params) (let* ((have-struct (dbr:dbstruct? dbstruct)) - (dbdat (if have-struct - (db:get-db dbstruct) - #f)) - (db (if have-struct - (db:dbdat-get-db dbdat) - dbstruct)) - (use-mutex (> *api-process-request-count* 25))) + (dbdat (if have-struct + (db:get-db dbstruct) + #f)) + (db (if have-struct + (db:dbdat-get-db dbdat) + dbstruct)) + (fname (db:dbdat-get-path dbdat)) + (use-mutex (> *api-process-request-count* 25))) ;; was 25 (if (and use-mutex (common:low-noise-print 120 "over-50-parallel-api-requests")) (debug:print-info 0 *default-log-port* *api-process-request-count* " parallel api requests being processed in process " (current-process-id) ", throttling access")) (if (common:low-noise-print 600 (conc "parallel-api-requests" *max-api-process-requests*)) (debug:print-info 2 *default-log-port* "Parallel api request count: " *api-process-request-count* " max parallel requests: " *max-api-process-requests*)) - (handle-exceptions - exn + (condition-case (begin - (print-call-chain (current-error-port)) - (debug:print-error 0 *default-log-port* "sqlite3 issue in db:with-db, dbstruct=" dbstruct ", run-id=" run-id ", proc=" proc ", params=" params " error: " ((condition-property-accessor 'exn 'message) exn)) - ;; there is no recovering at this time. exit - (exit 50)) - (if use-mutex (mutex-lock! *db-with-db-mutex*)) - (let ((res (apply proc db params))) - (if use-mutex (mutex-unlock! *db-with-db-mutex*)) - ;; (if (vector? dbstruct)(db:done-with dbstruct run-id r/w)) - (if dbdat (stack-push! (dbr:dbstruct-dbstack dbstruct) dbdat)) - res)))) - + (if use-mutex (mutex-lock! *db-with-db-mutex*)) + (let ((res (apply proc db params))) + (if use-mutex (mutex-unlock! *db-with-db-mutex*)) + ;; (if (vector? dbstruct)(db:done-with dbstruct run-id r/w)) + (if dbdat (stack-push! (dbr:dbstruct-dbstack dbstruct) dbdat)) + res)) + (exn (io-error) + (db:generic-error-printout exn "ERROR: i/o error with " fname ". Check permissions, disk space etc. and try again.")) + (exn (corrupt) + (db:generic-error-printout exn "ERROR: database " fname " is corrupt. Repair it to proceed.")) + (exn (busy) + (db:generic-error-printout exn "ERROR: database " fname + " is locked. Try copying to another location, remove original and copy back.")) + (exn (permission)(db:generic-error-printout exn "ERROR: database " fname " has some permissions problem.")) + (exn () + (db:generic-error-printout exn "ERROR: Unknown error with database " fname " message: " + ((condition-property-accessor 'exn 'message) exn)))))) + ;;====================================================================== ;; K E E P F I L E D B I N dbstruct ;;====================================================================== ;; (define (db:get-filedb dbstruct run-id) @@ -188,56 +231,60 @@ ;; NB// #f => return dbdir only ;; (was planned to be; zeroth db with name=main.db) ;; ;; If run-id is #f return to create and retrieve the path where the db will live. ;; -(define (db:dbfile-path . junk) ;; run-id) - (let* ((dbdir (common:get-db-tmp-area))) - (handle-exceptions - exn - (begin - (debug:print-error 0 *default-log-port* "Couldn't create path to " dbdir) - (exit 1)) - (if (not (directory? dbdir))(create-directory dbdir #t))) - dbdir)) +(define db:dbfile-path common:get-db-tmp-area) (define (db:set-sync db) (let ((syncprag (configf:lookup *configdat* "setup" "sychronous"))) (sqlite3:execute db (conc "PRAGMA synchronous = " (or syncprag 0) ";")))) ;; open an sql database inside a file lock ;; returns: db existed-prior-to-opening ;; RA => Returns a db handler; sets the lock if opened in writable mode ;; -;;(define *db-open-mutex* (make-mutex)) +;; (define *db-open-mutex* (make-mutex)) (define (db:lock-create-open fname initproc) (let* ((parent-dir (or (pathname-directory fname)(current-directory))) ;; no parent? go local (raw-fname (pathname-file fname)) (dir-writable (file-write-access? parent-dir)) - (file-exists (file-exists? fname)) + (file-exists (common:file-exists? fname)) (file-write (if file-exists (file-write-access? fname) dir-writable ))) - ;;(mutex-lock! *db-open-mutex*) ;; tried this mutex, not clear it helped. + ;; (mutex-lock! *db-open-mutex*) ;; tried this mutex, not clear it helped. (if file-write ;; dir-writable (condition-case (let* ((lockfname (conc fname ".lock")) (readyfname (conc parent-dir "/.ready-" raw-fname)) - (readyexists (file-exists? readyfname))) + (readyexists (common:file-exists? readyfname))) (if (not readyexists) (common:simple-file-lock-and-wait lockfname)) (let ((db (sqlite3:open-database fname))) - (sqlite3:set-busy-handler! db (make-busy-timeout 136000)) + (sqlite3:set-busy-handler! db (sqlite3:make-busy-timeout 136000)) (sqlite3:execute db "PRAGMA synchronous = 0;") + (if (and (configf:lookup *configdat* "setup" "tmp_mode") (string-match "^/tmp/.*" fname)) + (begin + ;;(print "DEBUG: Setting tmp_mode for " fname) + (sqlite3:execute db (configf:lookup *configdat* "setup" "tmp_mode")) + ) + ) + (if (and (configf:lookup *configdat* "setup" "nfs_mode") (not (string-match "^/tmp/.*" fname))) + (begin + ;;(print "DEBUG: Setting nfs_mode for " fname) + (sqlite3:execute db (configf:lookup *configdat* "setup" "nfs_mode")) + ) + ) + (if (and (not (or (configf:lookup *configdat* "setup" "tmp_mode") (configf:lookup *configdat* "setup" "nfs_mode"))) + (configf:lookup *configdat* "setup" "use-wal") + (string-match "^/tmp/.*" fname)) ;; this is a file in /tmp + (sqlite3:execute db "PRAGMA journal_mode=WAL;") + (debug:print 2 *default-log-port* "Creating " fname " in NON-WAL mode.")) (if (not file-exists) - (begin - (if (and (configf:lookup *configdat* "setup" "use-wal") - (string-match "^/tmp/.*" fname)) ;; this is a file in /tmp - (sqlite3:execute db "PRAGMA journal_mode=WAL;") - (print "Creating " fname " in NON-WAL mode.")) - (initproc db))) + (initproc db)) (if (not readyexists) (begin (common:simple-file-release-lock lockfname) (with-output-to-file readyfname @@ -254,122 +301,109 @@ (condition-case (begin (debug:print 2 *default-log-port* "WARNING: opening db in non-writable dir " fname) (let ((db (sqlite3:open-database fname))) - ;;(mutex-unlock! *db-open-mutex*) + (sqlite3:set-busy-handler! db (sqlite3:make-busy-timeout 136000)) + (sqlite3:execute db "PRAGMA synchronous = 0;") + ;; (mutex-unlock! *db-open-mutex*) db)) (exn (io-error) (debug:print 0 *default-log-port* "ERROR: i/o error with " fname ". Check permissions, disk space etc. and try again.")) (exn (corrupt) (debug:print 0 *default-log-port* "ERROR: database " fname " is corrupt. Repair it to proceed.")) (exn (busy) (debug:print 0 *default-log-port* "ERROR: database " fname " is locked. Try copying to another location, remove original and copy back.")) (exn (permission)(debug:print 0 *default-log-port* "ERROR: database " fname " has some permissions problem.")) (exn () (debug:print 0 *default-log-port* "ERROR: Unknown error with database " fname " message: " ((condition-property-accessor 'exn 'message) exn)))) ))) - - - - -;; ;; This routine creates the db. It is only called if the db is not already opened -;; ;; -;; (define (db:open-rundb dbstruct run-id #!key (attemptnum 0)(do-not-open #f)) ;; (conc *toppath* "/megatest.db") (car *configinfo*))) -;; (let* ((dbfile (db:dbfile-path run-id)) ;; (conc toppath "/db/" run-id ".db")) -;; (dbexists (file-exists? dbfile)) -;; (db (db:lock-create-open dbfile (lambda (db) -;; (handle-exceptions -;; exn -;; (begin -;; ;; (release-dot-lock dbpath) -;; (if (> attemptnum 2) -;; (debug:print-error 0 *default-log-port* "tried twice, cannot create/initialize db for run-id " run-id ", at path " dbpath) -;; (db:open-rundb dbstruct run-id attemptnum (+ attemptnum 1)))) -;; (db:initialize-run-id-db db) -;; (sqlite3:execute -;; db -;; "INSERT OR IGNORE INTO tests (id,run_id,testname,event_time,item_path,state,status) VALUES (?,?,'bogustest',strftime('%s','now'),'nowherepath','DELETED','n/a');" -;; (* run-id 30000) ;; allow for up to 30k tests per run -;; run-id) -;; ;; do a dummy query to test that the table exists and the db is truly readable -;; (sqlite3:execute db "SELECT * FROM tests WHERE id=?;" (* run-id 30000)) -;; )))) ;; add strings db to rundb, not in use yet -;; (olddb (if *megatest-db* -;; *megatest-db* -;; (let ((db (db:open-megatest-db))) -;; (set! *megatest-db* db) -;; db))) -;; (write-access (file-write-access? dbfile))) -;; (if (and dbexists (not write-access)) -;; (set! *db-write-access* #f)) ;; only unset so other db's also can use this control -;; (dbr:dbstruct-rundb-set! dbstruct (cons db dbfile)) -;; (dbr:dbstruct-inuse-set! dbstruct #t) -;; (dbr:dbstruct-olddb-set! dbstruct olddb) -;; ;;; (mutex-unlock! *rundb-mutex*) ;;; why did we need a mutex on opening db's? -;; (db:sync-tables db:sync-tests-only *megatest-db* db) -;; db)) - ;; This routine creates the db if not already present. It is only called if the db is not already opened ;; -(define (db:open-db dbstruct #!key (areapath #f)) ;; TODO: actually use areapath +(define (db:open-db dbstruct #!key (areapath #f)(do-sync #t)) ;; TODO: actually use areapath (let ((tmpdb-stack (dbr:dbstruct-dbstack dbstruct))) ;; RA => Returns the first reference in dbstruct (if (stack? tmpdb-stack) (db:get-db tmpdb-stack) ;; get previously opened db (will create new db handle if all in the stack are already used - (let* ((dbpath (db:dbfile-path )) ;; path to tmp db area - (dbexists (file-exists? dbpath)) + (let* ((max-stale-tmp (configf:lookup-number *configdat* "server" "filling-db-max-stale-seconds" default: 10)) + (dbpath (db:dbfile-path )) ;; path to tmp db area + (dbexists (common:file-exists? dbpath)) (tmpdbfname (conc dbpath "/megatest.db")) - (dbfexists (file-exists? tmpdbfname)) ;; (conc dbpath "/megatest.db"))) - (mtdbexists (file-exists? (conc *toppath* "/megatest.db"))) - + (dbfexists (common:file-exists? tmpdbfname)) ;; (conc dbpath "/megatest.db"))) + (mtdbexists (common:file-exists? (conc *toppath* "/megatest.db"))) + + (mtdbmodtime (if mtdbexists (common:lazy-sqlite-db-modification-time (conc *toppath* "/megatest.db")) #f)) + (tmpdbmodtime (if dbfexists (common:lazy-sqlite-db-modification-time tmpdbfname) #f)) (mtdb (db:open-megatest-db)) (mtdbpath (db:dbdat-get-path mtdb)) (tmpdb (db:open-megatest-db path: dbpath)) ;; lock-create-open dbpath db:initialize-main-db)) (refndb (db:open-megatest-db path: dbpath name: "megatest_ref.db")) (write-access (file-write-access? mtdbpath)) - (mtdbmodtime (if mtdbexists (common:lazy-sqlite-db-modification-time mtdbpath) #f)) - (tmpdbmodtime (if dbfexists (common:lazy-sqlite-db-modification-time tmpdbfname) #f)) + ;(mtdbmodtime (if mtdbexists (common:lazy-sqlite-db-modification-time mtdbpath) #f)) ; moving this before db:open-megatest-db is called. if wal mode is on -WAL and -shm file get created with causing the tmpdbmodtime timestamp always greater than mtdbmodtime + ;(tmpdbmodtime (if dbfexists (common:lazy-sqlite-db-modification-time tmpdbfname) #f)) + ;if wal mode is on -WAL and -shm file get created when db:open-megatest-db is called. modtimedelta will always be < 10 so db in tmp not get synced + ;(tmpdbmodtime (if dbfexists (db:get-last-update-time (car tmpdb)) #f)) + ;(fmt (file-modification-time tmpdbfname)) (modtimedelta (and mtdbmodtime tmpdbmodtime (- mtdbmodtime tmpdbmodtime)))) - - ;;(debug:print-info 13 *default-log-port* "db:open-db>> mtdbpath="mtdbpath" mtdbexists="mtdbexists" and write-access="write-access) + + (when write-access + (sqlite3:execute (car mtdb) "drop trigger if exists update_tests_trigger") + (sqlite3:execute (car mtdb) "drop trigger if exists update_runs_trigger")) + + ;(print "mtdbmodtime " mtdbmodtime " tmpdbmodtime " tmpdbmodtime " mtdbpath " mtdbpath " " (conc *toppath* "/megatest.db")) + ;;(debug:print-info 13 *default-log-port* "db:open-db>> mtdbpath="mtdbpath" mtdbexists="mtdbexists" and write-access="write-access) (if (and dbexists (not write-access)) (begin (set! *db-write-access* #f) (dbr:dbstruct-read-only-set! dbstruct #t))) (dbr:dbstruct-mtdb-set! dbstruct mtdb) (dbr:dbstruct-tmpdb-set! dbstruct tmpdb) (dbr:dbstruct-dbstack-set! dbstruct (make-stack)) ;; BB: why a stack? Why would the number of db's be indeterminate? Is this a legacy of 1.db 2.db .. ? (stack-push! (dbr:dbstruct-dbstack dbstruct) tmpdb) ;; olddb is already a (cons db path) (dbr:dbstruct-refndb-set! dbstruct refndb) - ;; (mutex-unlock! *rundb-mutex*) - (if (or (not dbfexists) - (and modtimedelta - (> modtimedelta 10))) ;; if db in tmp is over ten seconds older than the file in MTRA then do a sync back + (if (and (or (not dbfexists) + (and modtimedelta + (> modtimedelta max-stale-tmp))) ;; if db in tmp is over ten seconds older than the file in MTRA then do a sync back + do-sync) (begin - (debug:print 4 *default-log-port* "filling db " (db:dbdat-get-path tmpdb) " with data \n from " (db:dbdat-get-path mtdb) " mod time delta: " modtimedelta) + (debug:print 1 *default-log-port* "filling db " (db:dbdat-get-path tmpdb) " with data \n from " (db:dbdat-get-path mtdb) " mod time delta: " modtimedelta) (db:sync-tables (db:sync-all-tables-list dbstruct) #f mtdb refndb tmpdb) + ;touch tmp db to avoid wal mode wierdness + (set! (file-modification-time tmpdbfname) (current-seconds)) (debug:print-info 13 *default-log-port* "db:sync-all-tables-list done.") ) (debug:print 4 *default-log-port* " db, " (db:dbdat-get-path tmpdb) " already exists or fresh enough, not propogating data from\n " (db:dbdat-get-path mtdb) " mod time delta: " modtimedelta) ) ;; (db:multi-db-sync dbstruct 'old2new)) ;; migrate data from megatest.db automatically tmpdb)))) + +(define (db:get-last-update-time db) +; (db:with-db +; dbstruct #f #f +; (lambda (db) + (let ((last-update-time #f)) + (sqlite3:for-each-row + (lambda (lup) + (set! last-update-time lup)) + db + "select max(lup) from ( select max(last_update) as lup from tests union select max(last_update) as lup from runs);") + last-update-time)) +;)) + ;; Make the dbstruct, setup up auxillary db's and call for main db at least once ;; ;; called in http-transport and replicated in rmt.scm for *local* access. ;; -(define (db:setup #!key (areapath #f)) +(define (db:setup do-sync #!key (areapath #f)) ;; - (cond (*dbstruct-db* *dbstruct-db*);; TODO: when multiple areas are supported, this optimization will be a hazard (else ;;(common:on-homehost?) (debug:print-info 13 *default-log-port* "db:setup entered (first time, not cached.)") (let* ((dbstruct (make-dbr:dbstruct))) (when (not *toppath*) (debug:print-info 13 *default-log-port* "in db:setup, *toppath* not set; calling launch:setup") (launch:setup areapath: areapath)) (debug:print-info 13 *default-log-port* "Begin db:open-db") - (db:open-db dbstruct areapath: areapath) + (db:open-db dbstruct areapath: areapath do-sync: do-sync) (debug:print-info 13 *default-log-port* "Done db:open-db") (set! *dbstruct-db* dbstruct) ;;(debug:print-info 13 *default-log-port* "new dbstruct = "(dbr:dbstruct->alist dbstruct)) dbstruct)))) ;; (else @@ -378,14 +412,17 @@ ;; Open the classic megatest.db file (defaults to open in toppath) ;; ;; NOTE: returns a dbdat not a dbstruct! ;; + +;;(define (db:reopen-megatest-db + (define (db:open-megatest-db #!key (path #f)(name #f)) (let* ((dbdir (or path *toppath*)) (dbpath (conc dbdir "/" (or name "megatest.db"))) - (dbexists (file-exists? dbpath)) + (dbexists (common:file-exists? dbpath)) (db (db:lock-create-open dbpath (lambda (db) (db:initialize-main-db db) ;;(db:initialize-run-id-db db) ))) @@ -410,30 +447,47 @@ (mutex-lock! *db-multi-sync-mutex*) (set! *db-last-sync* start-t) (set! *db-last-access* start-t) (mutex-unlock! *db-multi-sync-mutex*) (stack-push! (dbr:dbstruct-dbstack dbstruct) tmpdb))) + +(define (db:safely-close-sqlite3-db db stmt-cache #!key (try-num 3)) + (if (<= try-num 0) + #f + (handle-exceptions + exn + (begin + (print "Attempt to safely close sqlite3 db failed. Trying again. exn=" exn) + (thread-sleep! 3) + (sqlite3:interrupt! db) + (db:safely-close-sqlite3-db db stmtcache try-num: (- try-num 1))) + (if (sqlite3:database? db) + (let* ((stmts (and stmt-cache (hash-table-ref/default stmt-cache db #f)))) + (if stmts (map sqlite3:finalize! (hash-table-values stmts))) + (sqlite3:finalize! db) + #t) + #f)))) ;; close all opened run-id dbs (define (db:close-all dbstruct) (if (dbr:dbstruct? dbstruct) (handle-exceptions exn (begin - (debug:print 0 *default-log-port* "WARNING: Finalizing failed, " ((condition-property-accessor 'exn 'message) exn)) + (debug:print 0 *default-log-port* "WARNING: Finalizing failed, " ((condition-property-accessor 'exn 'message) exn) ", note - exn=" exn) (print-call-chain *default-log-port*)) ;; (db:sync-touched dbstruct 0 force-sync: #t) ;; NO. Do not do this here. Instead we rely on a server to be started when there are writes, even if the server itself is not going to be used as a server. - (let ((tdbs (map db:dbdat-get-db - (stack->list (dbr:dbstruct-dbstack dbstruct)))) - (mdb (db:dbdat-get-db (dbr:dbstruct-mtdb dbstruct))) - (rdb (db:dbdat-get-db (dbr:dbstruct-refndb dbstruct)))) + (let ((tdbs (map db:dbdat-get-db + (stack->list (dbr:dbstruct-dbstack dbstruct)))) + (mdb (db:dbdat-get-db (dbr:dbstruct-mtdb dbstruct))) + (rdb (db:dbdat-get-db (dbr:dbstruct-refndb dbstruct))) + (stmt-cache (dbr:dbstruct-stmt-cache dbstruct))) (map (lambda (db) - (if (sqlite3:database? db) - (sqlite3:finalize! db))) + (db:safely-close-sqlite3-db db stmt-cache)) tdbs) - (if (sqlite3:database? mdb) (sqlite3:finalize! mdb)) - (if (sqlite3:database? rdb) (sqlite3:finalize! rdb)))))) + (db:safely-close-sqlite3-db mdb stmt-cache) ;; (if (sqlite3:database? mdb) (sqlite3:finalize! mdb)) + (db:safely-close-sqlite3-db rdb stmt-cache))))) ;; (if (sqlite3:database? rdb) (sqlite3:finalize! rdb)))))) ;; (let ((locdbs (dbr:dbstruct-locdbs dbstruct))) ;; (if (hash-table? locdbs) ;; (for-each (lambda (run-id) ;; (db:close-run-db dbstruct run-id)) @@ -471,20 +525,22 @@ '("run_duration" #f) '("comment" #f) '("event_time" #f) '("fail_count" #f) '("pass_count" #f) - '("archived" #f)) + '("archived" #f) + '("last_update" #f)) (list "test_steps" '("id" #f) '("test_id" #f) '("stepname" #f) '("state" #f) '("status" #f) '("event_time" #f) '("comment" #f) - '("logfile" #f)) + '("logfile" #f) + '("last_update" #f)) (list "test_data" '("id" #f) '("test_id" #f) '("category" #f) '("variable" #f) @@ -492,11 +548,12 @@ '("expected" #f) '("tol" #f) '("units" #f) '("comment" #f) '("status" #f) - '("type" #f)))) + '("type" #f) + '("last_update" #f)))) ;; needs db to get keys, this is for syncing all tables ;; (define (db:sync-main-list dbstruct) (let ((keys (db:get-keys dbstruct))) @@ -508,11 +565,27 @@ (list "metadat" '("var" #f) '("val" #f)) (append (list "runs" '("id" #f)) (map (lambda (k)(list k #f)) (append keys - (list "runname" "state" "status" "owner" "event_time" "comment" "fail_count" "pass_count" "contour")))) + (list "runname" "state" "status" "owner" "event_time" "comment" "fail_count" "pass_count" "contour" "last_update")))) + (list "archive_disks" + '("id" #f) + '("archive_area_name" #f) + '("disk_path" #f) + '("last_df" #f) + '("last_df_time" #f) + '("creation_time" #f)) + + (list "archive_blocks" + '("id" #f) + '("archive_disk_id" #f) + '("disk_path" #f) + '("last_du" #f) + '("last_du_time" #f) + '("creation_time" #f)) + (list "test_meta" '("id" #f) '("testname" #f) '("owner" #f) '("description" #f) @@ -537,11 +610,11 @@ (tmpname (conc fname "." (current-process-id))) (tmpjnl (conc fnamejnl "." (current-process-id)))) (debug:print-error 0 *default-log-port* "" fname " appears corrupted. Making backup \"old/" fname "\"") (system (conc "cd " dbdir ";mkdir -p old;cat " fname " > old/" tmpname)) (system (conc "rm -f " dbpath)) - (if (file-exists? fnamejnl) + (if (common:file-exists? fnamejnl) (begin (debug:print-error 0 *default-log-port* "" fnamejnl " found, moving it to old dir as " tmpjnl) (system (conc "cd " dbdir ";mkdir -p old;cat " fnamejnl " > old/" tmpjnl)) (system (conc "rm -f " dbdir "/" fnamejnl)))) ;; attempt to recreate database @@ -566,10 +639,11 @@ ;; (else ;; ((equal? fname "megatest.db") ;; this file can be regenerated if needed (handle-exceptions exn (begin + (print "Problems trying to repair the db, exn=" exn) ;; (db:move-and-recreate-db dbdat) (if (> numtries 0) (db:repair-db dbdat numtries: (- numtries 1)) #f) (debug:print 0 *default-log-port* "FATAL: file " dbpath " was found corrupted, an attempt to fix has been made but you must start over.") @@ -584,10 +658,12 @@ "\"\n") (exit) ;; we can not safely continue when a db was corrupted - even if fixed. ) ;; test read/write access to the database (let ((db (sqlite3:open-database dbpath))) + (sqlite3:set-busy-handler! db (sqlite3:make-busy-timeout 136000)) + (sqlite3:execute db "PRAGMA synchronous = 0;") (cond ((equal? fname "megatest.db") (sqlite3:execute db "DELETE FROM tests WHERE state='DELETED';")) ((equal? fname "main.db") (sqlite3:execute db "DELETE FROM runs WHERE state='deleted';")) @@ -596,11 +672,11 @@ ((equal? fname "monitor.db") (sqlite3:execute "DELETE FROM servers WHERE state LIKE 'defunct%';")) (else (sqlite3:execute db "vacuum;"))) - (finalize! db) + (sqlite3:finalize! db) #t)))))) ;; tbls is ( ("tablename" ( "field1" [#f|proc1] ) ( "field2" [#f|proc2] ) .... ) ) ;; db's are dbdat's ;; @@ -613,11 +689,11 @@ exn (begin (debug:print 0 *default-log-port* "EXCEPTION: database probably overloaded or unreadable in db:sync-tables.") (print-call-chain (current-error-port)) (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn)) - (print "exn=" (condition->list exn)) + (debug:print 5 *default-log-port* "exn=" (condition->list exn)) (debug:print 0 *default-log-port* " status: " ((condition-property-accessor 'sqlite3 'status) exn)) (debug:print 0 *default-log-port* " src db: " (db:dbdat-get-path fromdb)) (for-each (lambda (dbdat) (let ((dbpath (db:dbdat-get-path dbdat))) (debug:print 0 *default-log-port* " dbpath: " dbpath) @@ -661,36 +737,56 @@ (numrecs (make-hash-table)) (start-time (current-milliseconds)) (tot-count 0)) (for-each ;; table (lambda (tabledat) - (let* ((tablename (car tabledat)) - (fields (cdr tabledat)) - (use-last-update (if last-update - (if (pair? last-update) - (member (car last-update) ;; last-update field name - (map car fields)) - (begin - (debug:print 0 *default-log-port* "ERROR: parameter last-update for db:sync-tables must be a pair, received: " last-update) ;; found in fields - #f)) - #f)) + (let* ((tablename (car tabledat)) + (fields (cdr tabledat)) + (has-last-update (member "last_update" fields)) + (use-last-update (cond + ((and has-last-update + (member "last_update" fields)) + #t) ;; if given a number, just use it for all fields + ((number? last-update) #f) ;; if not matched first entry then ignore last-update for this table + ((and (pair? last-update) + (member (car last-update) ;; last-update field name + (map car fields))) + #t) + (last-update + (debug:print 0 *default-log-port* "ERROR: parameter last-update for db:sync-tables must be a pair or a number, received: " last-update);; found in fields + #f) + (else + #f))) + (last-update-value (if use-last-update ;; no need to check for has-last-update - it is already accounted for + (if (number? last-update) + last-update + (cdr last-update)) + #f)) + (last-update-field (if use-last-update + (if (number? last-update) + "last_update" + (car last-update)) + #f)) (num-fields (length fields)) (field->num (make-hash-table)) - (num->field (apply vector (map car fields))) + (num->field (apply vector (map car fields))) ;; BBHERE (full-sel (conc "SELECT " (string-intersperse (map car fields) ",") " FROM " tablename (if use-last-update ;; apply last-update criteria - (conc " " (car last-update) ">=" (cdr last-update)) + (conc " WHERE " last-update-field " >= " last-update-value) "") ";")) (full-ins (conc "INSERT OR REPLACE INTO " tablename " ( " (string-intersperse (map car fields) ",") " ) " " VALUES ( " (string-intersperse (make-list num-fields "?") ",") " );")) (fromdat '()) (fromdats '()) (totrecords 0) (batch-len (string->number (or (configf:lookup *configdat* "sync" "batchsize") "100"))) (todat (make-hash-table)) - (count 0)) + (count 0) + (field-names (map car fields)) + (delay-handicap (string->number (or (configf:lookup *configdat* "sync" "delay-handicap") "0"))) + ) ;; set up the field->num table (for-each (lambda (field) (hash-table-set! field->num field count) @@ -714,23 +810,37 @@ (set! fromdats (cons fromdat fromdats))) (if (common:low-noise-print 120 "sync-records") (debug:print-info 4 *default-log-port* "found " totrecords " records to sync")) - ;; read the target table + ;; read the target table; BBHERE (sqlite3:for-each-row (lambda (a . b) (hash-table-set! todat a (apply vector a b))) (db:dbdat-get-db todb) full-sel) + (when (and delay-handicap (> delay-handicap 0)) + (debug:print-info 0 *default-log-port* "imposing synthetic sync delay of "delay-handicap" seconds since sync/delay-handicap is configured") + (thread-sleep! delay-handicap) + (debug:print-info 0 *default-log-port* "synthetic sync delay of "delay-handicap" seconds completed") + ) + ;; first pass implementation, just insert all changed rows (for-each (lambda (targdb) - (let* ((db (db:dbdat-get-db targdb)) + (let* ((db (db:dbdat-get-db targdb)) + (drp-trigger (if (member "last_update" field-names) + (db:drop-trigger db tablename) + #f)) + (is-trigger-dropped (if (member "last_update" field-names) + (db:is-trigger-dropped db tablename) + #f)) (stmth (sqlite3:prepare db full-ins))) - (db:delay-if-busy targdb) ;; NO WAITING + ;; (db:delay-if-busy targdb) ;; NO WAITING + (if (member "last_update" field-names) + (debug:print-info 3 *default-log-port* "is-trigger-dropped: " is-trigger-dropped)) (for-each (lambda (fromdat-lst) (sqlite3:with-transaction db (lambda () @@ -748,14 +858,15 @@ (loop (+ i 1)))) (if (not same) (begin (apply sqlite3:execute stmth (vector->list fromrow)) (hash-table-set! numrecs tablename (+ 1 (hash-table-ref/default numrecs tablename 0))))))) - fromdat-lst)) - )) + fromdat-lst)))) fromdats) - (sqlite3:finalize! stmth))) + (sqlite3:finalize! stmth) + (if (member "last_update" field-names) + (db:create-trigger db tablename)))) (append (list todb) slave-dbs)))) tbls) (let* ((runtime (- (current-milliseconds) start-time)) (should-print (or (debug:debug-mode 12) (common:low-noise-print 120 "db sync" (> runtime 500))))) ;; low and high sync times treated as separate. @@ -834,12 +945,50 @@ (sqlite3:execute maindb "CREATE TRIGGER IF NOT EXISTS update_run_stats_trigger AFTER UPDATE ON run_stats FOR EACH ROW BEGIN UPDATE run_stats SET last_update=(strftime('%s','now')) WHERE id=old.id; - END;")) + END;") + (sqlite3:execute maindb "CREATE TABLE IF NOT EXISTS test_rundat ( + id INTEGER PRIMARY KEY, + test_id INTEGER, + update_time TIMESTAMP, + cpuload INTEGER DEFAULT -1, + diskfree INTEGER DEFAULT -1, + diskusage INTGER DEFAULT -1, + run_duration INTEGER DEFAULT 0);")) +(define (db:adj-target db) + (let ((fields (configf:get-section *configdat* "fields")) + (field-num 0)) + ;; because we will be refreshing the keys table it is best to clear it here + (sqlite3:execute db "DELETE FROM keys;") + (for-each + (lambda (field) + (let ((column (car field)) + (spec (cadr field))) + (handle-exceptions + exn + (if (string-match ".*duplicate.*" ((condition-property-accessor 'exn 'message) exn)) + (debug:print 0 *default-log-port* "Target field " column " already exists in the runs table") + (db:general-sqlite-error-dump exn "alter table runs ..." #f "none")) + ;; Add the column if needed + (sqlite3:execute + db + (conc "ALTER TABLE runs ADD COLUMN " column " " spec))) + ;; correct the entry in the keys column + (sqlite3:execute + db + "INSERT INTO keys (id,fieldname,fieldtype) VALUES (?,?,?);" + field-num column spec) + ;; fill in blanks (not allowed as it would be part of the path + (sqlite3:execute + db + (conc "UPDATE runs SET " column "='x' WHERE " column "='';")) + (set! field-num (+ field-num 1)))) + fields))) + (define *global-db-store* (make-hash-table)) (define (db:get-access-mode) (if (args:get-arg "-use-db-cache") 'cached 'rmt)) @@ -857,11 +1006,11 @@ (define (db:cache-for-read-only source target #!key (use-last-update #f)) (if (and (hash-table-ref/default *global-db-store* target #f) (>= (file-modification-time target)(file-modification-time source))) (hash-table-ref *global-db-store* target) (let* ((toppath (launch:setup)) - (targ-db-last-mod (if (file-exists? target) + (targ-db-last-mod (if (common:file-exists? target) (file-modification-time target) 0)) (cache-db (or (hash-table-ref/default *global-db-store* target #f) (db:open-megatest-db path: target))) (source-db (db:open-megatest-db path: source)) @@ -871,41 +1020,41 @@ (db:sync-tables (db:sync-main-list source-db) last-update source-db cache-db) (db:sync-tables db:sync-tests-only last-update source-db cache-db) (hash-table-set! *global-db-store* target cache-db) cache-db))) -;; call a proc with a cached db -;; -(define (db:call-with-cached-db proc . params) - ;; first cache the db in /tmp - (let* ((cname-part (conc "megatest_cache/" (common:get-testsuite-name))) - (fname (conc (common:get-area-path-signature) ".db")) - (cache-dir (common:get-create-writeable-dir - (list (conc "/tmp/" (current-user-name) "/" cname-part) - (conc "/tmp/" (current-user-name) "-" cname-part) - (conc "/tmp/" (current-user-name) "_" cname-part)))) - (megatest-db (conc *toppath* "/megatest.db"))) - ;; (debug:print-info 0 *default-log-port* "Using cache dir " cache-dir) - (if (not cache-dir) - (begin - (debug:print 0 *default-log-port* "ERROR: Failed to find an area to write the cache db") - (exit 1)) - (let* ((th1 (make-thread - (lambda () - (if (and (file-exists? megatest-db) - (file-write-access? megatest-db)) - (begin - (common:sync-to-megatest.db 'timestamps) ;; internally mutexes on *db-local-sync* - (debug:print-info 2 *default-log-port* "Done syncing to megatest.db")))) - "call-with-cached-db sync-to-megatest.db")) - (cache-db (db:cache-for-read-only - megatest-db - (conc cache-dir "/" fname) - use-last-update: #t))) - (thread-start! th1) - (apply proc cache-db params) - )))) +;; ;; call a proc with a cached db +;; ;; +;; (define (db:call-with-cached-db proc . params) +;; ;; first cache the db in /tmp +;; (let* ((cname-part (conc "megatest_cache/" (common:get-testsuite-name))) +;; (fname (conc (common:get-area-path-signature) ".db")) +;; (cache-dir (common:get-create-writeable-dir +;; (list (conc "/tmp/" (current-user-name) "/" cname-part) +;; (conc "/tmp/" (current-user-name) "-" cname-part) +;; (conc "/tmp/" (current-user-name) "_" cname-part)))) +;; (megatest-db (conc *toppath* "/megatest.db"))) +;; ;; (debug:print-info 0 *default-log-port* "Using cache dir " cache-dir) +;; (if (not cache-dir) +;; (begin +;; (debug:print 0 *default-log-port* "ERROR: Failed to find an area to write the cache db") +;; (exit 1)) +;; (let* ((th1 (make-thread +;; (lambda () +;; (if (and (common:file-exists? megatest-db) +;; (file-write-access? megatest-db)) +;; (begin +;; (db:sync-to-megatest.db dbstruct 'timestamps) ;; internally mutexes on *db-local-sync* +;; (debug:print-info 2 *default-log-port* "Done syncing to megatest.db")))) +;; "call-with-cached-db sync-to-megatest.db")) +;; (cache-db (db:cache-for-read-only +;; megatest-db +;; (conc cache-dir "/" fname) +;; use-last-update: #t))) +;; (thread-start! th1) +;; (apply proc cache-db params) +;; )))) ;; options: ;; ;; 'killservers - kills all servers ;; 'dejunk - removes junk records @@ -915,150 +1064,121 @@ ;; 'closeall - close all opened dbs ;; 'schema - attempt to apply schema changes ;; run-ids: '(1 2 3 ...) or #f (for all) ;; (define (db:multi-db-sync dbstruct . options) - (if (not (launch:setup)) - (debug:print 0 *default-log-port* "ERROR: not able to setup up for megatest.") - (let* ((mtdb (dbr:dbstruct-mtdb dbstruct)) - (tmpdb (db:get-db dbstruct)) - (refndb (dbr:dbstruct-refndb dbstruct)) - (allow-cleanup #t) ;; (if run-ids #f #t)) - (servers (server:get-list *toppath*)) ;; (tasks:get-all-servers (db:delay-if-busy tdbdat))) - (data-synced 0)) ;; count of changed records (I hope) - - ;; kill servers - (if (member 'killservers options) - (for-each - (lambda (server) - (match-let (((mod-time host port start-time pid) server)) - (if (and host pid) - (tasks:kill-server host pid)))) - servers)) - - ;; clear out junk records - ;; - (if (member 'dejunk options) - (begin - (db:delay-if-busy mtdb) ;; ok to delay on mtdb - (db:clean-up mtdb) - (db:clean-up tmpdb) - (db:clean-up refndb))) - - ;; adjust test-ids to fit into proper range - ;; - ;; (if (member 'adj-testids options) - ;; (begin - ;; (db:delay-if-busy mtdb) - ;; (db:prep-megatest.db-for-migration mtdb))) - - ;; sync runs, test_meta etc. - ;; - (if (member 'old2new options) - ;; (begin - (set! data-synced - (+ (db:sync-tables (db:sync-all-tables-list dbstruct) #f mtdb tmpdb refndb) - data-synced))) - ;; (db:sync-main-list mtdb) mtdb (db:get-db dbstruct #f)) -;; (for-each -;; (lambda (run-id) -;; (db:delay-if-busy mtdb) -;; (let ((testrecs (db:get-all-tests-info-by-run-id mtdb run-id))) -;; ;; (dbstruct (if toppath (make-dbr:dbstruct path: toppath local: #t) #f))) -;; (debug:print 0 *default-log-port* "INFO: Propagating " (length testrecs) " records for run-id=" run-id " to run specific db") -;; (db:replace-test-records dbstruct run-id testrecs) -;; (sqlite3:finalize! (db:dbdat-get-db (dbr:dbstruct-rundb dbstruct))))) -;; run-ids))) - - ;; now ensure all newdb data are synced to megatest.db - ;; do not use the run-ids list passed in to the function - ;; - (if (member 'new2old options) - (set! data-synced - (+ (db:sync-tables (db:sync-all-tables-list dbstruct) #f tmpdb refndb mtdb) - data-synced))) - - - - (if (member 'schema options) - (begin - (db:patch-schema-maindb (db:dbdat-get-db mtdb)) - (db:patch-schema-maindb (db:dbdat-get-db tmpdb)) - (db:patch-schema-maindb (db:dbdat-get-db refndb)) - (db:patch-schema-rundb (db:dbdat-get-db mtdb)) - (db:patch-schema-rundb (db:dbdat-get-db tmpdb)) - (db:patch-schema-rundb (db:dbdat-get-db refndb)))) - - ;; (let* ((maindb (make-dbr:dbstruct path: toppath local: #t)) - ;; (src-run-ids (if run-ids run-ids (db:get-all-run-ids (db:dbdat-get-db (db:get-db maindb 0))))) - ;; (all-run-ids (sort (delete-duplicates (cons 0 src-run-ids)) <)) - ;; (count 1) - ;; (total (length all-run-ids)) - ;; (dead-runs '())) - ;; ;; first fix schema if needed - ;; (map - ;; (lambda (th) - ;; (thread-join! th)) - ;; (map - ;; (lambda (run-id) - ;; (thread-start! - ;; (make-thread - ;; (lambda () - ;; (let* ((fromdb (if toppath (make-dbr:dbstruct path: toppath local: #t) #f)) -;; (if (member 'schema options) - ;; (if (eq? run-id 0) - ;; (let ((maindb (db:dbdat-get-db (db:get-db fromdb #f)))) - ;; (db:patch-schema-maindb run-id maindb)) - ;; (db:patch-schema-rundb run-id frundb))) - ;; (set! count (+ count 1)) - ;; (debug:print 0 *default-log-port* "Finished patching schema for " (if (eq? run-id 0) " main.db " (conc run-id ".db")) ", " count " of " total))))) - ;; all-run-ids)) - ;; ;; Then sync and fix db's - ;; (set! count 0) - ;; (process-fork - ;; (lambda () - ;; (map - ;; (lambda (th) - ;; (thread-join! th)) - ;; (map - ;; (lambda (run-id) - ;; (thread-start! - ;; (make-thread - ;; (lambda () - ;; (let* ((fromdb (if toppath (make-dbr:dbstruct path: toppath local: #t) #f)) - ;; (frundb (db:dbdat-get-db (db:get-db fromdb run-id)))) - ;; (if (eq? run-id 0) - ;; (let ((maindb (db:dbdat-get-db (db:get-db fromdb #f)))) -;; (db:sync-tables (db:sync-main-list dbstruct) #f (db:get-db fromdb #f) mtdb) - ;; (set! dead-runs (db:clean-up-maindb (db:get-db fromdb #f)))) - ;; (begin - ;; ;; NB// must sync first to ensure deleted tests get marked as such in megatest.db -;; (db:sync-tables db:sync-tests-only #f (db:get-db fromdb run-id) mtdb) - ;; (db:clean-up-rundb (db:get-db fromdb run-id))))) - ;; (set! count (+ count 1)) - ;; (debug:print 0 *default-log-port* "Finished clean up of " - ;; (if (eq? run-id 0) - ;; " main.db " (conc run-id ".db")) ", " count " of " total))))) - ;; all-run-ids)))) - - ;; removed deleted runs -;; (let ((dbdir (tasks:get-task-db-path))) -;; (for-each (lambda (run-id) -;; (let ((fullname (conc dbdir "/" run-id ".db"))) -;; (if (file-exists? fullname) -;; (begin -;; (debug:print 0 *default-log-port* "Removing database file for deleted run " fullname) -;; (delete-file fullname))))) -;; dead-runs)))) -;; - ;; (db:close-all dbstruct) - ;; (sqlite3:finalize! mdb) - (stack-push! (dbr:dbstruct-dbstack dbstruct) tmpdb) - data-synced))) + ;; (if (not (launch:setup)) + ;; (debug:print 0 *default-log-port* "ERROR: not able to setup up for megatest.") + (let* ((mtdb (dbr:dbstruct-mtdb dbstruct)) + (tmpdb (db:get-db dbstruct)) + (refndb (dbr:dbstruct-refndb dbstruct)) + (allow-cleanup #t) ;; (if run-ids #f #t)) + (servers (server:get-list *toppath*)) ;; (tasks:get-all-servers (db:delay-if-busy tdbdat))) + (data-synced 0)) ;; count of changed records (I hope) + + (for-each + (lambda (option) + + (case option + ;; kill servers + ((killservers) + (for-each + (lambda (server) + (match-let (((mod-time host port start-time pid) server)) + (if (and host pid) + (tasks:kill-server host pid)))) + servers) + + ;; /tmp/bjbarcla/megatest_localdb/fullrun/.nfs.pdx.disks.icf_env_disk001.bjbarcla.gwa.issues.mtdev.matt-bisect.megatest.ext-tests.runs.all.v1.65.1.6524.dev.bb-24-justrollup-f8.rollup.fullrun/megatest.db.lock + (delete-file* (common:get-sync-lock-filepath)) + ) + + ;; clear out junk records + ;; + ((dejunk) + ;; (db:delay-if-busy mtdb) ;; ok to delay on mtdb + (when (file-write-access? (db:dbdat-get-path mtdb)) (db:clean-up mtdb)) + (db:clean-up tmpdb) + (db:clean-up refndb)) + + ;; sync runs, test_meta etc. + ;; + ((old2new) + (set! data-synced + (+ (db:sync-tables (db:sync-all-tables-list dbstruct) #f mtdb tmpdb refndb) + data-synced))) + + ;; now ensure all newdb data are synced to megatest.db + ;; do not use the run-ids list passed in to the function + ;; + ((new2old) + (set! data-synced + (+ (db:sync-tables (db:sync-all-tables-list dbstruct) #f tmpdb refndb mtdb) + data-synced))) + + ((adj-target) + (db:adj-target (db:dbdat-get-db mtdb)) + (db:adj-target (db:dbdat-get-db tmpdb)) + (db:adj-target (db:dbdat-get-db refndb))) + + ((schema) + (db:patch-schema-maindb (db:dbdat-get-db mtdb)) + (db:patch-schema-maindb (db:dbdat-get-db tmpdb)) + (db:patch-schema-maindb (db:dbdat-get-db refndb)) + (db:patch-schema-rundb (db:dbdat-get-db mtdb)) + (db:patch-schema-rundb (db:dbdat-get-db tmpdb)) + (db:patch-schema-rundb (db:dbdat-get-db refndb)))) + + (stack-push! (dbr:dbstruct-dbstack dbstruct) tmpdb)) + options) + data-synced)) + +(define (db:tmp->megatest.db-sync dbstruct last-update) + (let* ((mtdb (dbr:dbstruct-mtdb dbstruct)) + (tmpdb (db:get-db dbstruct)) + (refndb (dbr:dbstruct-refndb dbstruct)) + (res (db:sync-tables (db:sync-all-tables-list dbstruct) last-update tmpdb refndb mtdb))) + (stack-push! (dbr:dbstruct-dbstack dbstruct) tmpdb) + res)) + +;;;; run-ids +;; if #f use *db-local-sync* : or 'local-sync-flags +;; if #t use timestamps : or 'timestamps +;; +;; NB// no-sync-db is the db handle, not a flag! +;; +(define (db:sync-to-megatest.db dbstruct #!key (no-sync-db #f)) + (let* ((start-time (current-seconds)) + (last-full-update (if no-sync-db + (db:no-sync-get/default no-sync-db "LAST_FULL_UPDATE" 0) + 0)) + (full-sync-needed (> (- start-time last-full-update) 3600)) ;; every hour do a full sync + (last-update (if full-sync-needed + 0 + (if no-sync-db + (db:no-sync-get/default no-sync-db "LAST_UPDATE" 0) + 0))) ;; (or (db:get-var dbstruct "LAST_UPDATE") 0)) + (sync-needed (> (- start-time last-update) 6)) + (res (if (or sync-needed ;; don't sync if a sync already occurred in the past 6 seconds + full-sync-needed) + (begin + (if no-sync-db + (begin + (if full-sync-needed (db:no-sync-set no-sync-db "LAST_FULL_UPDATE" start-time)) + (db:no-sync-set no-sync-db "LAST_UPDATE" start-time))) + (db:tmp->megatest.db-sync dbstruct last-update)) + 0)) + (sync-time (- (current-seconds) start-time))) + (debug:print-info 3 *default-log-port* "Sync of newdb to olddb completed in " sync-time " seconds pid="(current-process-id)) + (if (common:low-noise-print 30 "sync new to old") + (if sync-needed + (debug:print-info 0 *default-log-port* "Sync of " res " records from newdb to olddb completed in " sync-time " seconds pid="(current-process-id)) + (debug:print-info 0 *default-log-port* "No sync needed, last updated " (- start-time last-update) " seconds ago"))) + res)) ;; keeping it around for debugging purposes only -(define (open-run-close-no-exception-handling proc idb . params) +#;(define (open-run-close-no-exception-handling proc idb . params) (debug:print-info 11 *default-log-port* "open-run-close-no-exception-handling START given a db=" (if idb "yes " "no ") ", params=" params) (print "I don't work anymore. open-run-close-no-exception-handling needs fixing or removing...") (exit) (if (or *db-write-access* (not #t)) ;; was: (member proc * db:all-write-procs *))) @@ -1073,11 +1193,11 @@ (if (not idb)(sqlite3:finalize! dbstruct)) (debug:print-info 11 *default-log-port* "open-run-close-no-exception-handling END" ) res) #f)) -(define (open-run-close-exception-handling proc idb . params) +#;(define (open-run-close-exception-handling proc idb . params) (handle-exceptions exn (let ((sleep-time (random 30)) (err-status ((condition-property-accessor 'sqlite3 'status #f) exn))) (case err-status @@ -1084,52 +1204,145 @@ ((busy) (thread-sleep! sleep-time)) (else (debug:print 0 *default-log-port* "EXCEPTION: database probably overloaded or unreadable.") (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn)) - (print "exn=" (condition->list exn)) + (debug:print 5 *default-log-port* "exn=" (condition->list exn)) (debug:print 0 *default-log-port* " status: " ((condition-property-accessor 'sqlite3 'status) exn)) (print-call-chain (current-error-port)) (thread-sleep! sleep-time) (debug:print-info 0 *default-log-port* "trying db call one more time....this may never recover, if necessary kill process " (current-process-id) " on host " (get-host-name) " to clean up"))) (apply open-run-close-exception-handling proc idb params)) (apply open-run-close-no-exception-handling proc idb params))) ;; (define open-run-close -(define open-run-close open-run-close-exception-handling) +#;(define open-run-close open-run-close-exception-handling) ;; open-run-close-no-exception-handling ;; open-run-close-exception-handling) ;;) + +(define db:trigger-list + (list (list "update_runs_trigger" "CREATE TRIGGER IF NOT EXISTS update_runs_trigger AFTER UPDATE ON runs + FOR EACH ROW + BEGIN + UPDATE runs SET last_update=(strftime('%s','now')) + WHERE id=old.id; + END;" ) + (list "update_run_stats_trigger" "CREATE TRIGGER IF NOT EXISTS update_run_stats_trigger AFTER UPDATE ON run_stats + FOR EACH ROW + BEGIN + UPDATE run_stats SET last_update=(strftime('%s','now')) + WHERE id=old.id; + END;" ) + (list "update_tests_trigger" "CREATE TRIGGER IF NOT EXISTS update_tests_trigger AFTER UPDATE ON tests + FOR EACH ROW + BEGIN + UPDATE tests SET last_update=(strftime('%s','now')) + WHERE id=old.id; + END;" ) + (list "update_teststeps_trigger" "CREATE TRIGGER IF NOT EXISTS update_teststeps_trigger AFTER UPDATE ON test_steps + FOR EACH ROW + BEGIN + UPDATE test_steps SET last_update=(strftime('%s','now')) + WHERE id=old.id; + END;" ) + (list "update_test_data_trigger" "CREATE TRIGGER IF NOT EXISTS update_test_data_trigger AFTER UPDATE ON test_data + FOR EACH ROW + BEGIN + UPDATE test_data SET last_update=(strftime('%s','now')) + WHERE id=old.id; + END;" ))) + +(define (db:create-all-triggers dbstruct) +(db:with-db + dbstruct #f #f + (lambda (db) +(db:create-triggers db)))) + +(define (db:create-triggers db) + (for-each (lambda (key) + (sqlite3:execute db (cadr key))) + db:trigger-list)) + +(define (db:drop-all-triggers dbstruct) + (db:with-db + dbstruct #f #f + (lambda (db) + (db:drop-triggers db)))) + +(define (db:is-trigger-dropped db tbl-name) + (let* ((trigger-name (if (equal? tbl-name "test_steps") + "update_teststeps_trigger" + (conc "update_" tbl-name "_trigger"))) + (res #f)) + (sqlite3:for-each-row + (lambda (name) + (if (equal? name trigger-name) + (set! res #t))) + db + "SELECT name FROM sqlite_master WHERE type = 'trigger' ;" + ))) + +(define (db:drop-triggers db) + (for-each + (lambda (key) + (sqlite3:execute db (conc "drop trigger if exists " (car key)))) + db:trigger-list)) + +(define (db:drop-trigger db tbl-name) + (let* ((trigger-name (if (equal? tbl-name "test_steps") + "update_teststeps_trigger" + (conc "update_" tbl-name "_trigger")))) + (for-each + (lambda (key) + (if (equal? (car key) trigger-name) + (sqlite3:execute db (conc "drop trigger if exists " trigger-name)))) + db:trigger-list))) + +(define (db:create-trigger db tbl-name) + (let* ((trigger-name (if (equal? tbl-name "test_steps") + "update_teststeps_trigger" + (conc "update_" tbl-name "_trigger")))) + (for-each (lambda (key) + (if (equal? (car key) trigger-name) + (sqlite3:execute db (cadr key)))) + db:trigger-list))) + (define (db:initialize-main-db dbdat) (when (not *configinfo*) (launch:setup)) ;; added because Elena was getting stack dump because *configinfo* below was #f. (let* ((configdat (car *configinfo*)) ;; tut tut, global warning... (keys (keys:config-get-fields configdat)) (havekeys (> (length keys) 0)) (keystr (keys->keystr keys)) - (fieldstr (keys->key/field keys)) + (fieldstr (keys:make-key/field-string configdat)) (db (db:dbdat-get-db dbdat))) (for-each (lambda (key) (let ((keyn key)) (if (member (string-downcase keyn) (list "runname" "state" "status" "owner" "event_time" "comment" "fail_count" - "pass_count")) + "pass_count" "contour")) (begin (print "ERROR: your key cannot be named " keyn " as this conflicts with the same named field in the runs table, you must remove your megatest.db and /.db before trying again.") (exit 1))))) keys) (sqlite3:with-transaction db (lambda () - (sqlite3:execute db "CREATE TABLE IF NOT EXISTS keys (id INTEGER PRIMARY KEY, fieldname TEXT, fieldtype TEXT, CONSTRAINT keyconstraint UNIQUE (fieldname));") - (for-each (lambda (key) - (sqlite3:execute db "INSERT OR REPLACE INTO keys (fieldname,fieldtype) VALUES (?,?);" key "TEXT")) - keys) - (sqlite3:execute db (conc - "CREATE TABLE IF NOT EXISTS runs (id INTEGER PRIMARY KEY, \n " - fieldstr (if havekeys "," "") " + ;; handle-exceptions + ;; exn + ;; (begin + ;; (debug:print 0 "ERROR: Failed to create tables. Look at your [fields] section, should be: fieldname TEXT DEFAULT 'yourdefault'") + ;; (exit)) + (sqlite3:execute db "CREATE TABLE IF NOT EXISTS keys (id INTEGER PRIMARY KEY, fieldname TEXT, fieldtype TEXT, CONSTRAINT keyconstraint UNIQUE (fieldname));") + (for-each (lambda (key) + (sqlite3:execute db "INSERT OR REPLACE INTO keys (fieldname,fieldtype) VALUES (?,?);" key "TEXT")) + keys) + (sqlite3:execute db (conc + "CREATE TABLE IF NOT EXISTS runs (id INTEGER PRIMARY KEY, \n " + fieldstr (if havekeys "," "") " runname TEXT DEFAULT 'norun', contour TEXT DEFAULT '', state TEXT DEFAULT '', status TEXT DEFAULT '', owner TEXT DEFAULT '', @@ -1137,30 +1350,32 @@ comment TEXT DEFAULT '', fail_count INTEGER DEFAULT 0, pass_count INTEGER DEFAULT 0, last_update INTEGER DEFAULT (strftime('%s','now')), CONSTRAINT runsconstraint UNIQUE (runname" (if havekeys "," "") keystr "));")) - (sqlite3:execute db "CREATE TRIGGER IF NOT EXISTS update_runs_trigger AFTER UPDATE ON runs - FOR EACH ROW - BEGIN - UPDATE runs SET last_update=(strftime('%s','now')) - WHERE id=old.id; - END;") - (sqlite3:execute db "CREATE TABLE IF NOT EXISTS run_stats ( + ;; All triggers created at once in end + ;;(sqlite3:execute db "CREATE TRIGGER IF NOT EXISTS update_runs_trigger AFTER UPDATE ON runs + ;; FOR EACH ROW + ;; BEGIN + ;; UPDATE runs SET last_update=(strftime('%s','now')) + ;; WHERE id=old.id; + ;; END;") + (sqlite3:execute db "CREATE TABLE IF NOT EXISTS run_stats ( id INTEGER PRIMARY KEY, run_id INTEGER, state TEXT, status TEXT, count INTEGER, last_update INTEGER DEFAULT (strftime('%s','now')))") - (sqlite3:execute db "CREATE TRIGGER IF NOT EXISTS update_run_stats_trigger AFTER UPDATE ON run_stats - FOR EACH ROW - BEGIN - UPDATE run_stats SET last_update=(strftime('%s','now')) - WHERE id=old.id; - END;") - (sqlite3:execute db "CREATE TABLE IF NOT EXISTS test_meta ( + ;; All triggers created at once in end + ;; (sqlite3:execute db "CREATE TRIGGER IF NOT EXISTS update_run_stats_trigger AFTER UPDATE ON run_stats + ;; FOR EACH ROW + ;; BEGIN + ;; UPDATE run_stats SET last_update=(strftime('%s','now')) + ;; WHERE id=old.id; + ;; END;") + (sqlite3:execute db "CREATE TABLE IF NOT EXISTS test_meta ( id INTEGER PRIMARY KEY, testname TEXT DEFAULT '', author TEXT DEFAULT '', owner TEXT DEFAULT '', description TEXT DEFAULT '', @@ -1169,11 +1384,11 @@ avg_runtime REAL, avg_disk REAL, tags TEXT DEFAULT '', jobgroup TEXT DEFAULT 'default', CONSTRAINT test_meta_constraint UNIQUE (testname));") - (sqlite3:execute db "CREATE TABLE IF NOT EXISTS tasks_queue (id INTEGER PRIMARY KEY, + (sqlite3:execute db "CREATE TABLE IF NOT EXISTS tasks_queue (id INTEGER PRIMARY KEY, action TEXT DEFAULT '', owner TEXT, state TEXT DEFAULT 'new', target TEXT DEFAULT '', name TEXT DEFAULT '', @@ -1180,57 +1395,57 @@ testpatt TEXT DEFAULT '', keylock TEXT, params TEXT, creation_time TIMESTAMP DEFAULT (strftime('%s','now')), execution_time TIMESTAMP);") - ;; archive disk areas, cached info from [archive-disks] - (sqlite3:execute db "CREATE TABLE IF NOT EXISTS archive_disks ( + ;; archive disk areas, cached info from [archive-disks] + (sqlite3:execute db "CREATE TABLE IF NOT EXISTS archive_disks ( id INTEGER PRIMARY KEY, archive_area_name TEXT, disk_path TEXT, last_df INTEGER DEFAULT -1, last_df_time TIMESTAMP DEFAULT (strftime('%s','now')), - creation_time TIMESTAMP DEFAULT (strftime('%','now')));") - ;; individual bup (or tar) data chunks - (sqlite3:execute db "CREATE TABLE IF NOT EXISTS archive_blocks ( + creation_time TIMESTAMP DEFAULT (strftime('%s','now')));") + ;; individual bup (or tar) data chunks + (sqlite3:execute db "CREATE TABLE IF NOT EXISTS archive_blocks ( id INTEGER PRIMARY KEY, archive_disk_id INTEGER, disk_path TEXT, last_du INTEGER DEFAULT -1, last_du_time TIMESTAMP DEFAULT (strftime('%s','now')), - creation_time TIMESTAMP DEFAULT (strftime('%','now')));") - ;; tests allocated to what chunks. reusing a chunk for a test/item_path is very efficient - ;; NB// the per run/test recording of where the archive is stored is done in the test - ;; record. - (sqlite3:execute db "CREATE TABLE IF NOT EXISTS archive_allocations ( + creation_time TIMESTAMP DEFAULT (strftime('%s','now')));") + ;; tests allocated to what chunks. reusing a chunk for a test/item_path is very efficient + ;; NB// the per run/test recording of where the archive is stored is done in the test + ;; record. + (sqlite3:execute db "CREATE TABLE IF NOT EXISTS archive_allocations ( id INTEGER PRIMARY KEY, archive_block_id INTEGER, testname TEXT, item_path TEXT, - creation_time TIMESTAMP DEFAULT (strftime('%','now')));") - ;; move this clean up call somewhere else - (sqlite3:execute db "DELETE FROM tasks_queue WHERE state='done' AND creation_time < ?;" (- (current-seconds)(* 24 60 60))) ;; remove older than 24 hrs - (sqlite3:execute db (conc "CREATE INDEX IF NOT EXISTS runs_index ON runs (runname" (if havekeys "," "") keystr ");")) - ;; (sqlite3:execute db "CREATE VIEW runs_tests AS SELECT * FROM runs INNER JOIN tests ON runs.id=tests.run_id;") - (sqlite3:execute db "CREATE TABLE IF NOT EXISTS extradat (id INTEGER PRIMARY KEY, run_id INTEGER, key TEXT, val TEXT);") - (sqlite3:execute db "CREATE TABLE IF NOT EXISTS metadat (id INTEGER PRIMARY KEY, var TEXT, val TEXT, + creation_time TIMESTAMP DEFAULT (strftime('%s','now')));") + ;; move this clean up call somewhere else + (sqlite3:execute db "DELETE FROM tasks_queue WHERE state='done' AND creation_time < ?;" (- (current-seconds)(* 24 60 60))) ;; remove older than 24 hrs + (sqlite3:execute db (conc "CREATE INDEX IF NOT EXISTS runs_index ON runs (runname" (if havekeys "," "") keystr ");")) + ;; (sqlite3:execute db "CREATE VIEW runs_tests AS SELECT * FROM runs INNER JOIN tests ON runs.id=tests.run_id;") + (sqlite3:execute db "CREATE TABLE IF NOT EXISTS extradat (id INTEGER PRIMARY KEY, run_id INTEGER, key TEXT, val TEXT);") + (sqlite3:execute db "CREATE TABLE IF NOT EXISTS metadat (id INTEGER PRIMARY KEY, var TEXT, val TEXT, CONSTRAINT metadat_constraint UNIQUE (var));") - (sqlite3:execute db "CREATE TABLE IF NOT EXISTS access_log (id INTEGER PRIMARY KEY, user TEXT, accessed TIMESTAMP, args TEXT);") - ;; Must do this *after* running patch db !! No more. - ;; cannot use db:set-var since it will deadlock, hardwire the code here - (sqlite3:execute db "INSERT OR REPLACE INTO metadat (var,val) VALUES (?,?);" "MEGATEST_VERSION" (common:version-signature)) - (debug:print-info 11 *default-log-port* "db:initialize END") ;; )))) - - ;;====================================================================== - ;; R U N S P E C I F I C D B - ;;====================================================================== - - ;; (define (db:initialize-run-id-db db) - ;; (sqlite3:with-transaction - ;; db - ;; (lambda () - (sqlite3:execute db "CREATE TABLE IF NOT EXISTS tests + (sqlite3:execute db "CREATE TABLE IF NOT EXISTS access_log (id INTEGER PRIMARY KEY, user TEXT, accessed TIMESTAMP, args TEXT);") + ;; Must do this *after* running patch db !! No more. + ;; cannot use db:set-var since it will deadlock, hardwire the code here + (sqlite3:execute db "INSERT OR REPLACE INTO metadat (var,val) VALUES (?,?);" "MEGATEST_VERSION" (common:version-signature)) + (debug:print-info 11 *default-log-port* "db:initialize END") ;; )))) + + ;;====================================================================== + ;; R U N S P E C I F I C D B + ;;====================================================================== + + ;; (define (db:initialize-run-id-db db) + ;; (sqlite3:with-transaction + ;; db + ;; (lambda () + (sqlite3:execute db "CREATE TABLE IF NOT EXISTS tests (id INTEGER PRIMARY KEY, run_id INTEGER DEFAULT -1, testname TEXT DEFAULT 'noname', host TEXT DEFAULT 'n/a', cpuload REAL DEFAULT -1, @@ -1250,18 +1465,24 @@ fail_count INTEGER DEFAULT 0, pass_count INTEGER DEFAULT 0, archived INTEGER DEFAULT 0, -- 0=no, > 1=archive block id where test data can be found last_update INTEGER DEFAULT (strftime('%s','now')), CONSTRAINT testsconstraint UNIQUE (run_id, testname, item_path));") - (sqlite3:execute db "CREATE INDEX IF NOT EXISTS tests_index ON tests (run_id, testname, item_path, uname);") - (sqlite3:execute db "CREATE TRIGGER IF NOT EXISTS update_tests_trigger AFTER UPDATE ON tests - FOR EACH ROW - BEGIN - UPDATE tests SET last_update=(strftime('%s','now')) - WHERE id=old.id; - END;") - (sqlite3:execute db "CREATE TABLE IF NOT EXISTS test_steps + ;; deprecated -- (sqlite3:execute db "CREATE INDEX IF NOT EXISTS tests_index ON tests (run_id, testname, item_path, uname);") + + (sqlite3:execute db "CREATE INDEX IF NOT EXISTS tests_run_id_index ON tests (run_id);") ;; new + (sqlite3:execute db "CREATE INDEX IF NOT EXISTS tests_testname_index ON tests (testname,item_path);") ;; new + (sqlite3:execute db "CREATE INDEX IF NOT EXISTS tests_state_status_index ON tests (state, status); ") ;; new + + ;; All triggers created at once in end + ;;(sqlite3:execute db "CREATE TRIGGER IF NOT EXISTS update_tests_trigger AFTER UPDATE ON tests + ;; FOR EACH ROW + ;; BEGIN + ;; UPDATE tests SET last_update=(strftime('%s','now')) + ;; WHERE id=old.id; + ;; END;") + (sqlite3:execute db "CREATE TABLE IF NOT EXISTS test_steps (id INTEGER PRIMARY KEY, test_id INTEGER, stepname TEXT, state TEXT DEFAULT 'NOT_STARTED', status TEXT DEFAULT 'n/a', @@ -1268,18 +1489,19 @@ event_time TIMESTAMP, comment TEXT DEFAULT '', logfile TEXT DEFAULT '', last_update INTEGER DEFAULT (strftime('%s','now')), CONSTRAINT test_steps_constraint UNIQUE (test_id,stepname,state));") - (sqlite3:execute db "CREATE INDEX IF NOT EXISTS teststeps_index ON tests (run_id, testname, item_path);") - (sqlite3:execute db "CREATE TRIGGER IF NOT EXISTS update_teststeps_trigger AFTER UPDATE ON test_steps - FOR EACH ROW - BEGIN - UPDATE test_steps SET last_update=(strftime('%s','now')) - WHERE id=old.id; - END;") - (sqlite3:execute db "CREATE TABLE IF NOT EXISTS test_data (id INTEGER PRIMARY KEY, + (sqlite3:execute db "CREATE INDEX IF NOT EXISTS teststeps_index ON tests (run_id, testname, item_path);") + ;; All triggers created at once in end + ;;(sqlite3:execute db "CREATE TRIGGER IF NOT EXISTS update_teststeps_trigger AFTER UPDATE ON test_steps + ;; FOR EACH ROW + ;; BEGIN + ;; UPDATE test_steps SET last_update=(strftime('%s','now')) + ;; WHERE id=old.id; + ;; END;") + (sqlite3:execute db "CREATE TABLE IF NOT EXISTS test_data (id INTEGER PRIMARY KEY, test_id INTEGER, category TEXT DEFAULT '', variable TEXT, value REAL, expected REAL, @@ -1288,34 +1510,37 @@ comment TEXT DEFAULT '', status TEXT DEFAULT 'n/a', type TEXT DEFAULT '', last_update INTEGER DEFAULT (strftime('%s','now')), CONSTRAINT test_data_constraint UNIQUE (test_id,category,variable));") - (sqlite3:execute db "CREATE INDEX IF NOT EXISTS test_data_index ON test_data (test_id);") - (sqlite3:execute db "CREATE TRIGGER IF NOT EXISTS update_test_data_trigger AFTER UPDATE ON test_data - FOR EACH ROW - BEGIN - UPDATE test_data SET last_update=(strftime('%s','now')) - WHERE id=old.id; - END;") - (sqlite3:execute db "CREATE TABLE IF NOT EXISTS test_rundat ( + (sqlite3:execute db "CREATE INDEX IF NOT EXISTS test_data_index ON test_data (test_id);") + ;; All triggers created at once in end + ;;(sqlite3:execute db "CREATE TRIGGER IF NOT EXISTS update_test_data_trigger AFTER UPDATE ON test_data + ;; FOR EACH ROW + ;; BEGIN + ;; UPDATE test_data SET last_update=(strftime('%s','now')) + ;; WHERE id=old.id; + ;; END;") + (sqlite3:execute db "CREATE TABLE IF NOT EXISTS test_rundat ( id INTEGER PRIMARY KEY, test_id INTEGER, update_time TIMESTAMP, cpuload INTEGER DEFAULT -1, diskfree INTEGER DEFAULT -1, diskusage INTGER DEFAULT -1, run_duration INTEGER DEFAULT 0);") - (sqlite3:execute db "CREATE TABLE IF NOT EXISTS archives ( + (sqlite3:execute db "CREATE TABLE IF NOT EXISTS archives ( id INTEGER PRIMARY KEY, test_id INTEGER, state TEXT DEFAULT 'new', status TEXT DEFAULT 'n/a', archive_type TEXT DEFAULT 'bup', du INTEGER, archive_path TEXT);"))) - db)) + ;; (print "creating trigges from init") + (db:create-triggers db) + db)) ;; ) ;;====================================================================== ;; A R C H I V E S ;;====================================================================== @@ -1347,10 +1572,11 @@ "SELECT d.id,d.archive_area_name,disk_path,last_df,last_df_time FROM archive_disks AS d INNER JOIN archive_blocks AS b ON d.id=b.archive_disk_id WHERE b.id IN (" (string-intersperse (map conc res) ",") ") AND last_df > ?;") dneeded)) + (stack-push! (dbr:dbstruct-dbstack dbstruct) dbdat) blocks)) ;; returns id of the record, register a disk allocated to archiving and record it's last known ;; available space ;; @@ -1394,20 +1620,20 @@ (set! res id)) db "SELECT id FROM archive_blocks WHERE archive_disk_id=? AND disk_path=?;" bdisk-id archive-path) (if res ;; record exists, update du if applicable and return res - (begin - (if du (sqlite3:exectute db "UPDATE archive_blocks SET last_du=?,last_du_time=(strftime('%s','now')) + (if du (sqlite3:execute db "UPDATE archive_blocks SET last_du=?,last_du_time=(strftime('%s','now')) WHERE archive_disk_id=? AND disk_path=?;" - bdisk-id archive-path du)) - res) + bdisk-id archive-path du)) (begin (sqlite3:execute db "INSERT OR REPLACE INTO archive_blocks (archive_disk_id,disk_path,last_du) VALUES (?,?,?);" bdisk-id archive-path (or du 0)) - (db:archive-register-block-name dbstruct bdisk-id archive-path du: du))))) + (set! res (db:archive-register-block-name dbstruct bdisk-id archive-path du: du)))) + (stack-push! (dbr:dbstruct-dbstack dbstruct) dbdat) + res)) ;; The "archived" field in tests is overloaded; 0 = not archived, > 0 archived in block with given id ;; (define (db:test-set-archive-block-id dbstruct run-id test-id archive-block-id) @@ -1448,13 +1674,13 @@ ;; L O G G I N G D B ;;====================================================================== (define (open-logging-db) (let* ((dbpath (conc (if *toppath* (conc *toppath* "/") "") "logging.db")) ;; fname) - (dbexists (file-exists? dbpath)) + (dbexists (common:file-exists? dbpath)) (db (sqlite3:open-database dbpath)) - (handler (make-busy-timeout (if (args:get-arg "-override-timeout") + (handler (sqlite3:make-busy-timeout (if (args:get-arg "-override-timeout") (string->number (args:get-arg "-override-timeout")) 136000)))) ;; 136000))) (sqlite3:set-busy-handler! db handler) (if (not dbexists) (begin @@ -1491,11 +1717,11 @@ (toplevels '()) (deadtime-str (configf:lookup *configdat* "setup" "deadtime")) (deadtime (if (and deadtime-str (string->number deadtime-str)) (string->number deadtime-str) - 7200))) ;; two hours + 72000))) ;; twenty hours (db:with-db dbstruct #f #f (lambda (db) (if (number? ovr-deadtime)(set! deadtime ovr-deadtime)) @@ -1538,108 +1764,190 @@ (null? oldlaunched) (null? toplevels)) #f #t))))) -;; given a launch delay (minimum time from last launch) return amount of time to wait +(define (db:get-status-from-final-status-file run-dir) + (let ((infile (conc run-dir "/.final-status"))) + ;; first verify we are able to write the output file + (if (not (file-read-access? infile)) + (begin + (debug:print 0 *default-log-port* "ERROR: cannot read " infile) + (debug:print 0 *default-log-port* "ERROR: run-dir is " run-dir) + #f + ) + (with-input-from-file infile read-lines) + ))) + +;; check duration against test-run.dat file if it exists and update the value in +;; the db if necessary ;; -;; (define (db:launch-delay-left dbstruct run-id launch-delay) - - +(define (db:adjust-run-duration dbstruct test-id run-dir event-time run-duration) + (let* ((datf (conc run-dir ".mt_data/test-run.dat")) + (modt (if (and (file-exists? datf) + (file-read-access? datf)) + (file-modification-time datf) + #f)) ;; (+ event-time run-duration)))) + (alt-run-duration (if modt + (- modt event-time) + #f))) + (if (and alt-run-duration + (> alt-run-duration run-duration)) + (begin + (debug:print 0 *default-log-port* "Test " test-id " run duration mismatch. Setting to " alt-run-duration) + (db:with-db + dbstruct #f #f + (lambda (db) + (sqlite3:execute db "UPDATE tests SET run_duration=? WHERE id=?;" alt-run-duration test-id) + #t))) + #f))) ;; #f = we did NOT adjust the time + ;; select end_time-now from ;; (select testname,item_path,event_time+run_duration as ;; end_time,strftime('%s','now') as now from tests where state in -;; ('RUNNING','REMOTEHOSTSTART','LAUNCED')); +;; ('RUNNING','REMOTEHOSTSTART','LAUNCHED')); (define (db:find-and-mark-incomplete dbstruct run-id ovr-deadtime) (let* ((incompleted '()) (oldlaunched '()) (toplevels '()) - (deadtime-str (configf:lookup *configdat* "setup" "deadtime")) - (deadtime (if (and deadtime-str - (string->number deadtime-str)) - (string->number deadtime-str) - 7200))) ;; two hours + ;; The default running-deadtime is 720 seconds = 12 minutes. + ;; "(running-deadtime-default (+ server-start-allowance (* 2 launch-monitor-period)))" = 200 + (2 * (200 + 30 + 30)) + (deadtime-trim (or ovr-deadtime (configf:lookup-number *configdat* "setup" "deadtime"))) + (server-start-allowance 200) + (server-overloaded-budget 200) + (launch-monitor-off-time (or (configf:lookup-number *configdat* "setup" "test-stats-update-period") 30)) + (launch-monitor-on-time-budget 30) + (launch-monitor-period (+ launch-monitor-off-time launch-monitor-on-time-budget server-overloaded-budget)) + (remotehoststart-deadtime-default (+ server-start-allowance server-overloaded-budget 30)) + (remotehoststart-deadtime (or deadtime-trim remotehoststart-deadtime-default)) + (running-deadtime-default (+ server-start-allowance (* 2 launch-monitor-period))) + (running-deadtime (or deadtime-trim running-deadtime-default)) ;; two minutes (30 seconds between updates, this leaves 3x grace period) + ) + (debug:print-info 4 *default-log-port* "running-deadtime = " running-deadtime) + (debug:print-info 4 *default-log-port* "deadtime-trim = " deadtime-trim) + (db:with-db dbstruct #f #f (lambda (db) - (if (number? ovr-deadtime)(set! deadtime ovr-deadtime)) - - ;; in RUNNING or REMOTEHOSTSTART for more than 10 minutes - ;; - ;; HOWEVER: this code in run:test seems to work fine - ;; (> (- (current-seconds)(+ (db:test-get-event_time testdat) - ;; (db:test-get-run_duration testdat))) - ;; 600) - ;; (db:delay-if-busy dbdat) - (sqlite3:for-each-row - (lambda (test-id run-dir uname testname item-path) - (if (and (equal? uname "n/a") - (equal? item-path "")) ;; this is a toplevel test - ;; what to do with toplevel? call rollup? - (begin - (set! toplevels (cons (list test-id run-dir uname testname item-path run-id) toplevels)) - (debug:print-info 0 *default-log-port* "Found old toplevel test in RUNNING state, test-id=" test-id)) - (set! incompleted (cons (list test-id run-dir uname testname item-path run-id) incompleted)))) - db - "SELECT id,rundir,uname,testname,item_path FROM tests WHERE run_id=? AND (strftime('%s','now') - event_time) > (run_duration + ?) AND state IN ('RUNNING','REMOTEHOSTSTART');" - run-id deadtime) - - ;; in LAUNCHED for more than one day. Could be long due to job queues TODO/BUG: Need override for this in config - ;; - ;; (db:delay-if-busy dbdat) - (sqlite3:for-each-row - (lambda (test-id run-dir uname testname item-path) - (if (and (equal? uname "n/a") - (equal? item-path "")) ;; this is a toplevel test - ;; what to do with toplevel? call rollup? - (set! toplevels (cons (list test-id run-dir uname testname item-path run-id) toplevels)) - (set! oldlaunched (cons (list test-id run-dir uname testname item-path run-id) oldlaunched)))) - db - "SELECT id,rundir,uname,testname,item_path FROM tests WHERE run_id=? AND (strftime('%s','now') - event_time) > 86400 AND state IN ('LAUNCHED');" - run-id) - - (debug:print-info 18 *default-log-port* "Found " (length oldlaunched) " old LAUNCHED items, " (length toplevels) " old LAUNCHED toplevel tests and " (length incompleted) " tests marked RUNNING but apparently dead.") - - ;; These are defunct tests, do not do all the overhead of set-state-status. Force them to INCOMPLETE. - ;; - ;; (db:delay-if-busy dbdat) - (let* (;; (min-incompleted (filter (lambda (x) - ;; (let* ((testpath (cadr x)) - ;; (tdatpath (conc testpath "/testdat.db")) - ;; (dbexists (file-exists? tdatpath))) - ;; (or (not dbexists) ;; if no file then something wrong - mark as incomplete - ;; (> (- (current-seconds)(file-modification-time tdatpath)) 600)))) ;; no change in 10 minutes to testdat.db - she's dead Jim - ;; incompleted)) - (min-incompleted-ids (map car incompleted)) ;; do 'em all - (all-ids (append min-incompleted-ids (map car oldlaunched)))) - (if (> (length all-ids) 0) - (begin - (debug:print 0 *default-log-port* "WARNING: Marking test(s); " (string-intersperse (map conc all-ids) ", ") " as INCOMPLETE") - (for-each - (lambda (test-id) - (db:test-set-state-status dbstruct run-id test-id "COMPLETED" "DEAD" "Test failed to complete")) ;; fix for one aspect of Randy's ticket 1405717332 - all-ids)))))))) - -;; ALL REPLACED BY THE BLOCK ABOVE -;; -;; (sqlite3:execute -;; db -;; (conc "UPDATE tests SET state='INCOMPLETE' WHERE run_id=? AND id IN (" -;; (string-intersperse (map conc all-ids) ",") -;; ");") -;; run-id)))) -;; -;; ;; Now do rollups for the toplevel tests -;; ;; -;; ;; (db:delay-if-busy dbdat) -;; (for-each -;; (lambda (toptest) -;; (let ((test-name (list-ref toptest 3))) -;; ;; (run-id (list-ref toptest 5))) -;; (db:top-test-set-per-pf-counts dbstruct run-id test-name))) -;; toplevels))) + (let* ((stmth1 (db:get-cache-stmth + dbstruct db + "SELECT id,rundir,uname,testname,item_path,event_time,run_duration FROM tests + WHERE run_id=? AND (strftime('%s','now') - event_time) > (run_duration + ?) + AND state IN ('RUNNING');")) + (stmth2 (db:get-cache-stmth + dbstruct db + "SELECT id,rundir,uname,testname,item_path,event_time,run_duration FROM tests + WHERE run_id=? AND (strftime('%s','now') - event_time) > (run_duration + ?) + AND state IN ('REMOTEHOSTSTART');")) + (stmth3 (db:get-cache-stmth + dbstruct db + "SELECT id,rundir,uname,testname,item_path FROM tests + WHERE run_id=? AND (strftime('%s','now') - event_time) > 86400 + AND state IN ('LAUNCHED');"))) + ;; in RUNNING or REMOTEHOSTSTART for more than 10 minutes + ;; + ;; HOWEVER: this code in run:test seems to work fine + ;; (> (- (current-seconds)(+ (db:test-get-event_time testdat) + ;; (db:test-get-run_duration testdat))) + ;; 600) + ;; (db:delay-if-busy dbdat) + (sqlite3:for-each-row + (lambda (test-id run-dir uname testname item-path event-time run-duration) + (if (not (db:adjust-run-duration dbstruct test-id run-dir event-time run-duration)) + (if (and (equal? uname "n/a") + (equal? item-path "")) ;; this is a toplevel test + ;; what to do with toplevel? call rollup? + (begin + (set! toplevels (cons (list test-id run-dir uname testname item-path run-id) toplevels)) + (debug:print-info 0 *default-log-port* "Found old toplevel test in RUNNING state, test-id=" test-id)) + (begin + (set! incompleted (cons (list test-id run-dir uname testname item-path run-id) incompleted)) + (debug:print-info 0 *default-log-port* "Found old test in RUNNING state, test-id=" + test-id" exceeded running-deadtime "running-deadtime" now="(current-seconds) + " event-time="event-time" run-duration="run-duration))))) + stmth1 + run-id running-deadtime) ;; default time 720 seconds + + (sqlite3:for-each-row + (lambda (test-id run-dir uname testname item-path event-time run-duration) + (if (not (db:adjust-run-duration dbstruct test-id run-dir event-time run-duration)) + (if (and (equal? uname "n/a") + (equal? item-path "")) ;; this is a toplevel test + ;; what to do with toplevel? call rollup? + (begin + (set! toplevels (cons (list test-id run-dir uname testname item-path run-id) toplevels)) + (debug:print-info 0 *default-log-port* "Found old toplevel test in RUNNING state, test-id=" test-id)) + (begin + (debug:print-info 0 *default-log-port* "Found old test in REMOTEHOSTSTART state, test-id=" test-id + " exceeded running-deadtime "running-deadtime" now="(current-seconds)" event-time="event-time + " run-duration="run-duration) + (set! incompleted (cons (list test-id run-dir uname testname item-path run-id) incompleted)))))) + stmth2 + run-id remotehoststart-deadtime) ;; default time 230 seconds + + ;; in LAUNCHED for more than one day. Could be long due to job queues TODO/BUG: Need override for this in config + ;; + ;; (db:delay-if-busy dbdat) + (sqlite3:for-each-row + (lambda (test-id run-dir uname testname item-path) + (if (and (equal? uname "n/a") + (equal? item-path "")) ;; this is a toplevel test + ;; what to do with toplevel? call rollup? + (set! toplevels (cons (list test-id run-dir uname testname item-path run-id) toplevels)) + (begin + (debug:print-info 0 *default-log-port* "Found old test in LAUNCHED state, test-id=" test-id + " 1 day since event_time marked") + (set! oldlaunched (cons (list test-id run-dir uname testname item-path run-id) oldlaunched))))) + stmth3 + run-id) + + (debug:print-info 18 *default-log-port* "Found " (length oldlaunched) " old LAUNCHED items, " + (length toplevels) " old LAUNCHED toplevel tests and " + (length incompleted) " tests marked RUNNING but apparently dead.")) + + ;; These are defunct tests, do not do all the overhead of set-state-status. Force them to INCOMPLETE. + ;; + ;; (db:delay-if-busy dbdat) + (let* ((min-incompleted-ids (map car incompleted)) ;; do 'em all + (all-ids (append min-incompleted-ids (map car oldlaunched)))) + (if (> (length all-ids) 0) + (begin + ;; (launch:is-test-alive "localhost" 435) + (debug:print 0 *default-log-port* "WARNING: Marking test(s); " (string-intersperse (map conc all-ids) ", ") + " as DEAD") + (for-each + (lambda (test-id) + (let* (;; (run-dir (db:test-get-rundir-from-test-id dbstruct run-id test-id)) + (tinfo (db:get-test-info-by-id dbstruct run-id test-id)) + (run-dir (db:test-get-rundir tinfo)) + (host (db:test-get-host tinfo)) + (pid (db:test-get-process_id tinfo)) + (result (db:get-status-from-final-status-file run-dir))) + (if (and (list? result) (> (length result) 1) (equal? "PASS" (cadr result)) (equal? "COMPLETED" (car result))) + (begin + (debug:print 0 *default-log-port* "INFO: test " test-id " actually passed, so marking PASS not DEAD") + (db:set-state-status-and-roll-up-items + dbstruct run-id test-id 'foo "COMPLETED" "PASS" + "Test stopped responding but it has PASSED; marking it PASS in the DB.")) + (let ((is-alive (and (not (eq? pid 0)) ;; 0 is default in re-used field "attemptnum" where pid stored. + (launch:is-test-alive host pid)))) + (if is-alive + (debug:print 0 *default-log-port* "INFO: test " test-id " on host " host + " has a process on pid " pid ", NOT setting to DEAD.") + (begin + (debug:print 0 *default-log-port* "INFO: test " test-id + " final state/status is not COMPLETED/PASS. It is " result) + (db:set-state-status-and-roll-up-items + dbstruct run-id test-id 'foo "COMPLETED" "DEAD" + "Test stopped responding while in RUNNING or REMOTEHOSTSTART; presumed dead."))))))) + ;; call end of eud of run detection for posthook - from merge, is it needed? + ;; (launch:end-of-run-check run-id) + all-ids) + ;;call end of eud of run detection for posthook + (launch:end-of-run-check run-id) + ))))))) ;; BUG: Probably broken - does not explicitly use run-id in the query ;; (define (db:top-test-set-per-pf-counts dbstruct run-id test-name) (db:general-call dbstruct 'top-test-set-per-pf-counts (list test-name test-name test-name test-name test-name test-name test-name test-name test-name test-name test-name test-name test-name test-name test-name test-name test-name))) @@ -1655,28 +1963,37 @@ ;; a. If have tests that are not deleted, set state='unknown' ;; b. .... ;; (define (db:clean-up dbdat) ;; (debug:print 0 *default-log-port* "WARNING: db clean up not fully ported to v1.60, cleanup action will be on megatest.db") - (let* ((db (db:dbdat-get-db dbdat)) + (let* ((keep-record-age ( - (current-seconds) (common:hms-string->seconds (or (configf:lookup *configdat* "setup" "delete-record-age") "30d")))) + (db (db:dbdat-get-db dbdat)) (count-stmt (sqlite3:prepare db "SELECT (SELECT count(id) FROM tests)+(SELECT count(id) FROM runs);")) (statements (map (lambda (stmt) (sqlite3:prepare db stmt)) (list ;; delete all tests that belong to runs that are 'deleted' - "DELETE FROM tests WHERE run_id in (SELECT id FROM runs WHERE state='deleted');" + (conc "DELETE FROM tests WHERE run_id in (SELECT id FROM runs WHERE state='deleted') and last_update < " keep-record-age ";") ;; delete all tests that are 'DELETED' - "DELETE FROM tests WHERE state='DELETED';" + (conc "DELETE FROM tests WHERE state='DELETED' and last_update < " keep-record-age " ;") ;; delete all tests that have no run - "DELETE FROM tests WHERE run_id NOT IN (SELECT DISTINCT id FROM runs);" + (conc "DELETE FROM tests WHERE run_id NOT IN (SELECT DISTINCT id FROM runs) and last_update < " keep-record-age "; ") ;; delete all runs that are state='deleted' - "DELETE FROM runs WHERE state='deleted';" + (conc "DELETE FROM runs WHERE state='deleted' and last_update < " keep-record-age ";") ;; delete empty runs - "DELETE FROM runs WHERE id NOT IN (SELECT DISTINCT r.id FROM runs AS r INNER JOIN tests AS t ON t.run_id=r.id);" + (conc "DELETE FROM runs WHERE id NOT IN (SELECT DISTINCT r.id FROM runs AS r INNER JOIN tests AS t ON t.run_id=r.id) and last_update < " keep-record-age ";") + ;; remove orphaned test_rundat entries + (conc "DELETE FROM test_rundat where test_id NOT IN (SELECT id FROM tests);") + ;; remove orphaned test_steps entries + (conc "DELETE FROM test_steps WHERE test_id NOT IN (SELECT id FROM tests);") + ;; remove orphaned test_dat entries + (conc "DELETE FROM test_data WHERE test_id NOT IN (SELECT id FROM tests);") + )))) ;; (db:delay-if-busy dbdat) + ;(debug:print-info 0 *default-log-port* statements) (sqlite3:with-transaction db (lambda () (sqlite3:for-each-row (lambda (tot) (debug:print-info 0 *default-log-port* "Records count before clean: " tot)) @@ -1801,10 +2118,20 @@ (if (string? res) (let ((valnum (string->number res))) (if valnum (set! res valnum)))) res)))) +(define (db:inc-var dbstruct var) + (db:with-db dbstruct #f #t + (lambda (db) + (sqlite3:execute db "UPDATE metadat SET val=val+1 WHERE var=?;" var)))) + +(define (db:dec-var dbstruct var) + (db:with-db dbstruct #f #t + (lambda (db) + (sqlite3:execute db "UPDATE metadat SET val=val-1 WHERE var=?;" var)))) + ;; This was part of db:get-var. It was used to estimate the load on ;; the database files. ;; ;; scale by 10, average with current value. ;; (set! *global-delta* (/ (+ *global-delta* (* (- (current-milliseconds) start-ms) @@ -1818,14 +2145,97 @@ (define (db:set-var dbstruct var val) (db:with-db dbstruct #f #t (lambda (db) (sqlite3:execute db "INSERT OR REPLACE INTO metadat (var,val) VALUES (?,?);" var val)))) +(define (db:add-var dbstruct var val) + (db:with-db dbstruct #f #t + (lambda (db) + (sqlite3:execute db "UPDATE metadat SET val=val+? WHERE var=?;" val var)))) + (define (db:del-var dbstruct var) (db:with-db dbstruct #f #t (lambda (db) (sqlite3:execute db "DELETE FROM metadat WHERE var=?;" var)))) + +;;====================================================================== +;; no-sync.db - small bits of data to be shared between servers +;;====================================================================== + +(define (db:open-no-sync-db) + (let* ((dbpath (db:dbfile-path)) + (dbname (conc dbpath "/no-sync.db")) + (db-exists (common:file-exists? dbname)) + (db (sqlite3:open-database dbname))) + (sqlite3:set-busy-handler! db (sqlite3:make-busy-timeout 136000)) + (if (not db-exists) + (begin + (sqlite3:execute db "PRAGMA synchronous = 0;") + (sqlite3:execute db "CREATE TABLE IF NOT EXISTS no_sync_metadat (var TEXT,val TEXT, CONSTRAINT no_sync_metadat_constraint UNIQUE (var));") + (sqlite3:execute db "PRAGMA journal_mode=WAL;"))) + db)) + +;; if we are not a server create a db handle. this is not finalized +;; so watch for problems. I'm still not clear if it is needed to manually +;; finalize sqlite3 dbs with the sqlite3 egg. +;; +(define (db:no-sync-db db-in) + (mutex-lock! *db-access-mutex*) + (let ((res (if db-in + db-in + (let ((db (db:open-no-sync-db))) + (set! *no-sync-db* db) + db)))) + (mutex-unlock! *db-access-mutex*) + res)) + +(define (db:no-sync-set db var val) + (sqlite3:execute (db:no-sync-db db) "INSERT OR REPLACE INTO no_sync_metadat (var,val) VALUES (?,?);" var val)) + +(define (db:no-sync-del! db var) + (sqlite3:execute (db:no-sync-db db) "DELETE FROM no_sync_metadat WHERE var=?;" var)) + +(define (db:no-sync-get/default db var default) + (let ((res default)) + (sqlite3:for-each-row + (lambda (val) + (set! res val)) + (db:no-sync-db db) + "SELECT val FROM no_sync_metadat WHERE var=?;" + var) + (if res + (let ((newres (if (string? res) + (string->number res) + #f))) + (if newres + newres + res)) + res))) + +(define (db:no-sync-close-db db stmt-cache) + (db:safely-close-sqlite3-db db stmt-cache)) + +;; transaction protected lock aquisition +;; either: +;; fails returns (#f . lock-creation-time) +;; succeeds (returns (#t . lock-creation-time) +;; use (db:no-sync-del! db keyname) to release the lock +;; +(define (db:no-sync-get-lock db-in keyname) + (let ((db (db:no-sync-db db-in))) + (sqlite3:with-transaction + db + (lambda () + (handle-exceptions + exn + (let ((lock-time (current-seconds))) + (debug:print-info 2 *default-log-port* "db:no-sync-get-lock keyname=" keyname ", lock-time=" lock-time ", exn=" exn) + (sqlite3:execute db "INSERT INTO no_sync_metadat (var,val) VALUES(?,?);" keyname lock-time) + `(#t . ,lock-time)) + `(#f . ,(sqlite3:first-result db "SELECT val FROM no_sync_metadat WHERE var=?;" keyname))))))) + + ;; use a global for some primitive caching, it is just silly to ;; re-read the db over and over again for the keys since they never ;; change @@ -1843,19 +2253,29 @@ db "SELECT fieldname FROM keys ORDER BY id DESC;"))) (set! *db-keys* res) res))) +;; extract index number given a header/data structure +(define (db:get-index-by-header header field) + (list-index (lambda (x)(equal? x field)) header)) + ;; look up values in a header/data structure (define (db:get-value-by-header row header field) (if (or (null? header) (not row)) #f (let loop ((hed (car header)) - (tal (cdr header)) - (n 0)) - (if (equal? hed field) - (vector-ref row n) + (tal (cdr header)) + (n 0)) + (if (equal? hed field) + (handle-exceptions + exn + (begin + (debug:print 0 *default-log-port* "WARNING: attempt to read non-existant field, row=" + row " header=" header " field=" field ", exn=" exn) + #f) + (vector-ref row n)) (if (null? tal) #f (loop (car tal)(cdr tal)(+ n 1))))))) ;; Accessors for the header/data structure ;; get rows and header from (define (db:get-header vec)(vector-ref vec 0)) @@ -1862,10 +2282,34 @@ (define (db:get-rows vec)(vector-ref vec 1)) ;;====================================================================== ;; R U N S ;;====================================================================== + + + + + +(define (db:get-run-times dbstruct run-patt target-patt) +(let ((res `()) + (qry (conc "select runname, (max(end_time)-min(event_time))/60 as runtime, target from (select runname, run_id,tests.event_time,tests.event_time+run_duration AS end_time, " (string-join (db:get-keys dbstruct) " || '/' || ") " as target from tests inner join runs on tests.run_id = runs.id where runs.runname like ? and target like ?) group by run_id ;"))) +;(print qry) +(db:with-db + dbstruct + #f ;; this is for the main runs db + #f ;; does not modify db + (lambda (db) + (sqlite3:for-each-row + (lambda (runname runtime target ) + (set! res (cons (vector runname runtime target) res))) + db + qry + run-patt target-patt) + + res)))) + + (define (db:get-run-name-from-id dbstruct run-id) (db:with-db dbstruct #f ;; this is for the main runs db @@ -1992,10 +2436,53 @@ qrystr ))) (debug:print-info 11 *default-log-port* "db:get-runs END qrystr: " qrystr " keypatts: " keypatts " offset: " offset " limit: " count) (vector header res))) + +(define-record simple-run target id runname state status owner event_time) +(define-record-printer (simple-run x out) + (fprintf out "#,(simple-run ~S ~S ~S ~S)" + (simple-run-target x) (simple-run-id x) (simple-run-runname x) (time->string (seconds->local-time (simple-run-event_time x) )))) + +;; simple get-runs +;; +(define (db:simple-get-runs dbstruct runpatt count offset target last-update) + (let* ((res '()) + (keys (db:get-keys dbstruct)) + (runpattstr (db:patt->like "runname" runpatt)) + (remfields (list "id" "runname" "state" "status" "owner" "event_time")) + (targstr (string-intersperse keys "||'/'||")) + (keystr (conc targstr " AS target," + (string-intersperse remfields ","))) + (qrystr (conc "SELECT " keystr " FROM runs WHERE (" runpattstr ") " ;; runname LIKE ? " + ;; Generate: " AND x LIKE 'keypatt' ..." + " AND target LIKE '" target "'" + " AND state != 'deleted' " + (if (number? last-update) + (conc " AND last_update >= " last-update) + "") + " ORDER BY event_time DESC " + (if (number? count) + (conc " LIMIT " count) + "") + (if (number? offset) + (conc " OFFSET " offset) + ""))) + ) + (debug:print-info 11 *default-log-port* "db:get-runs START qrystr: " qrystr " target: " target " offset: " offset " limit: " count) + (db:with-db dbstruct #f #f + (lambda (db) + (sqlite3:for-each-row + (lambda (target id runname state status owner event_time) + (set! res (cons (make-simple-run target id runname state status owner event_time) res))) + db + qrystr + ))) + (debug:print-info 11 *default-log-port* "db:get-runs END qrystr: " qrystr " target: " target " offset: " offset " limit: " count) + res)) + ;; TODO: Switch this to use max(update_time) from each run db? Then if using a server there is no disk traffic (using inmem db) ;; (define (db:get-changed-run-ids since-time) (let* ((dbdir (db:dbfile-path)) ;; (configf:lookup *configdat* "setup" "dbdir")) (alldbs (glob (conc dbdir "/[0-9]*.db"))) @@ -2052,10 +2539,47 @@ (set! numruns count)) db "SELECT COUNT(id) FROM runs WHERE runname LIKE ? AND state != 'deleted';" runpatt) (debug:print-info 11 *default-log-port* "db:get-num-runs END " runpatt) numruns)))) + +;; just get count of runs +(define (db:get-runs-cnt-by-patt dbstruct runpatt targetpatt keys) + (db:with-db + dbstruct + #f + #f + (lambda (db) + (let ((numruns 0) + (qry-str #f) + (key-patt "") + (keyvals (if targetpatt (keys:target->keyval keys targetpatt) '()))) + + (for-each (lambda (keyval) + (let* ((key (car keyval)) + (patt (cadr keyval)) + (fulkey (conc ":" key)) + (wildtype (if (substring-index "%" patt) "like" "glob"))) + + (if patt + (set! key-patt (conc key-patt " AND " key " " wildtype " '" patt "'")) + (begin + (debug:print-error 0 *default-log-port* "searching for runs with no pattern set for " fulkey) + (exit 6))))) + keyvals) + ;(print runpatt " -- " key-patt) + (set! qry-str (conc "SELECT COUNT(id) FROM runs WHERE state != 'deleted' AND runname like '" runpatt "'" key-patt)) + ;(print qry-str ) + + (sqlite3:for-each-row + (lambda (count) + (set! numruns count)) + db + qry-str) + (debug:print-info 11 *default-log-port* "db:get-num-runs END " runpatt) + numruns)))) + ;; (sqlite3#fold-row proc3670 init3671 db-or-stmt3672 . params3673)> ;; (define (db:get-raw-run-stats dbstruct run-id) (db:with-db @@ -2205,11 +2729,11 @@ ;; register a test run with the db ;; ;; Use: (db:get-value-by-header (db:get-header runinfo)(db:get-rows runinfo)) ;; to extract info from the structure returned ;; -(define (db:get-runs-by-patt dbstruct keys runnamepatt targpatt offset limit fields last-update) ;; test-name) +(define (db:get-runs-by-patt dbstruct keys runnamepatt targpatt offset limit fields last-update sort-order ) ;; test-name) (let* ((tmp (runs:get-std-run-fields keys (or fields '("id" "runname" "state" "status" "owner" "event_time")))) (keystr (car tmp)) (header (cadr tmp)) (key-patt "") (runwildtype (if (substring-index "%" runnamepatt) "like" "glob")) @@ -2228,15 +2752,17 @@ keyvals) (set! qry-str (conc "SELECT " keystr " FROM runs WHERE state != 'deleted' AND runname " runwildtype " ? " key-patt (if last-update (conc " AND last_update >= " last-update " ") " ") - " ORDER BY event_time " + " ORDER BY event_time " sort-order " " (if limit (conc " LIMIT " limit) "") (if offset (conc " OFFSET " offset) "") ";")) (debug:print-info 4 *default-log-port* "runs:get-runs-by-patt qry=" qry-str " " runnamepatt) + ;(print "runs:get-runs-by-patt qry=" qry-str " " runnamepatt) + (vector header (reverse (db:with-db dbstruct #f #f ;; reads db, does not write to it. (lambda (db) (sqlite3:fold-row @@ -2254,23 +2780,24 @@ (define (db:get-run-info dbstruct run-id) ;;(if (hash-table-ref/default *run-info-cache* run-id #f) ;; (hash-table-ref *run-info-cache* run-id) (let* ((res (vector #f #f #f #f)) (keys (db:get-keys dbstruct)) - (remfields (list "id" "runname" "state" "status" "owner" "event_time" "comment" "fail_count" "pass_count" "contour")) ;; "area_id")) + (remfields (list "id" "runname" "state" "status" "owner" "event_time" "comment" "fail_count" "pass_count" "contour" "last_update")) ;; "area_id")) (header (append keys remfields)) (keystr (conc (keys->keystr keys) "," (string-intersperse remfields ",")))) (debug:print-info 11 *default-log-port* "db:get-run-info run-id: " run-id " header: " header " keystr: " keystr) + (db:with-db dbstruct #f #f (lambda (db) (sqlite3:for-each-row (lambda (a . x) (set! res (apply vector a x))) db - (conc "SELECT " keystr " FROM runs WHERE id=? AND state != 'deleted';") + (conc "SELECT " keystr " FROM runs WHERE id=?;") run-id))) (debug:print-info 11 *default-log-port* "db:get-run-info run-id: " run-id " header: " header " keystr: " keystr) (let ((finalres (vector header res))) ;; (hash-table-set! *run-info-cache* run-id finalres) finalres))) @@ -2317,13 +2844,21 @@ (define (db:set-run-status dbstruct run-id status msg) (db:with-db dbstruct #f #f (lambda (db) - (if msg + (if msg (sqlite3:execute db "UPDATE runs SET status=?,comment=? WHERE id=?;" status msg run-id) (sqlite3:execute db "UPDATE runs SET status=? WHERE id=?;" status run-id))))) + +(define (db:set-run-state-status dbstruct run-id state status ) + (db:with-db + dbstruct #f #f + (lambda (db) + (sqlite3:execute db "UPDATE runs SET status=?,state=? WHERE id=?;" status state run-id)))) + + (define (db:get-run-status dbstruct run-id) (let ((res "n/a")) (db:with-db dbstruct #f #f @@ -2333,10 +2868,24 @@ (set! res status)) db "SELECT status FROM runs WHERE id=?;" run-id) res)))) + +(define (db:get-run-state dbstruct run-id) + (let ((res "n/a")) + (db:with-db + dbstruct #f #f + (lambda (db) + (sqlite3:for-each-row + (lambda (status) + (set! res status)) + db + "SELECT state FROM runs WHERE id=?;" + run-id) + res)))) + ;;====================================================================== ;; K E Y S ;;====================================================================== @@ -2351,11 +2900,11 @@ (for-each (lambda (key) (let ((qry (conc "SELECT " key " FROM runs WHERE id=?;"))) (sqlite3:for-each-row (lambda (key-val) - (set! res (cons (list key key-val) res))) + (set! res (cons (list key (if (string? key-val) key-val "")) res))) ;; replace non-string bad values with empty string to prevent crashes. This scenario can happen when Megatest is killed on updating the db db qry run-id))) keys))) (reverse res))) ;; get key vals for a given run-id @@ -2369,11 +2918,11 @@ (lambda (key) (let ((qry (conc "SELECT " key " FROM runs WHERE id=?;"))) ;; (db:delay-if-busy dbdat) (sqlite3:for-each-row (lambda (key-val) - (set! res (cons key-val res))) + (set! res (cons (if (string? key-val) key-val "") res))) ;; check that the key-val is a string for cases where a crash injected bad data in the megatest.db db qry run-id))) keys))) (let ((final-res (reverse res))) (hash-table-set! *keyvals* run-id final-res) final-res))) @@ -2385,11 +2934,11 @@ thekey)) ;; Get run-ids for runs with same target but different runnames and NOT run-id ;; (define (db:get-prev-run-ids dbstruct run-id) - (let* ((keyvals (rmt:get-key-val-pairs run-id)) + (let* ((keyvals (db:get-key-val-pairs dbstruct run-id)) (kvalues (map cadr keyvals)) (keys (rmt:get-keys)) (qrystr (string-intersperse (map (lambda (x)(conc x "=?")) keys) " AND "))) (let ((prev-run-ids '())) (if (null? keyvals) @@ -2488,23 +3037,27 @@ (if limit (conc " LIMIT " limit) " ") (if offset (conc " OFFSET " offset) " ") ";" ))) (debug:print-info 8 *default-log-port* "db:get-tests-for-run run-id=" run-id ", qry=" qry) - (db:with-db dbstruct run-id #f - (lambda (db) - (sqlite3:for-each-row - (lambda (a . b) ;; id run-id testname state status event-time host cpuload diskfree uname rundir item-path run-duration final-logf comment) - (set! res (cons (apply vector a b) res))) ;; id run-id testname state status event-time host cpuload diskfree uname rundir item-path run-duration final-logf comment) res))) - db - qry - (or run-id 1) ;; 1 > 0 , for the case where we are seeking tests matching criteral for all runs - ))) - (case qryvals - ((shortlist)(map db:test-short-record->norm res)) - ((#f) res) - (else res)))) + (let* ((res (db:with-db dbstruct run-id #f + (lambda (db) + ;; (let* ((stmth (db:get-cache-stmth dbstruct db qry))) ;; due to use of last-update we can't efficiently cache this query + (reverse + (sqlite3:fold-row + (lambda (res . row) + ;; id run-id testname state status event-time host cpuload + ;; diskfree uname rundir item-path run-duration final-logf comment) + (cons (list->vector row) res)) + '() + db qry ;; stmth + (or run-id 1) ;; 1 > 0 , for the case where we are seeking tests matching criteral for all runs + )))))) + (case qryvals + ((shortlist)(map db:test-short-record->norm res)) + ((#f) res) + (else res))))) (define (db:test-short-record->norm inrec) ;; "id,run_id,testname,item_path,state,status" ;; "id,run_id,testname,state,status,event_time,host,cpuload,diskfree,uname,rundir,item_path,run_duration,final_logf,comment (vector (vector-ref inrec 0) ;; id @@ -2514,26 +3067,58 @@ (vector-ref inrec 5) ;; status -1 "" -1 -1 "" "-" (vector-ref inrec 3) ;; item-path -1 "-" "-")) +;; +;; 1. cache tests-match-qry +;; 2. compile qry and store in hash +;; 3. convert for-each-row to fold +;; (define (db:get-tests-for-run-state-status dbstruct run-id testpatt) + (db:with-db + dbstruct run-id #f + (lambda (db) + (let* ((res '()) + (stmt-cache (dbr:dbstruct-stmt-cache dbstruct)) + (stmth (let* ((sh (db:hoh-get stmt-cache db testpatt))) + (or sh + (let* ((tests-match-qry (tests:match->sqlqry testpatt)) + (qry (conc "SELECT id,testname,item_path,state,status FROM tests WHERE run_id=? " + (if tests-match-qry (conc " AND (" tests-match-qry ") ") ""))) + (newsh (sqlite3:prepare db qry))) + (debug:print-info 8 *default-log-port* "db:get-tests-for-run qry=" qry) + (db:hoh-set! stmt-cache db testpatt newsh) + newsh))))) + (reverse + (sqlite3:fold-row + (lambda (res id testname item-path state status) + ;; id,run_id,testname,state,status,event_time,host,cpuload,diskfree,uname,rundir,item_path,run_duration,final_logf,comment + (cons (vector id run-id testname state status -1 "" -1 -1 "" "-" item-path -1 "-" "-") res)) + '() + stmth + run-id)))))) + +(define (db:get-tests-for-run-state-status dbstruct run-id testpatt #!optional (last-update 0)) (let* ((res '()) (tests-match-qry (tests:match->sqlqry testpatt)) - (qry (conc "SELECT id,testname,item_path,state,status FROM tests WHERE run_id=? " - (if tests-match-qry (conc " AND (" tests-match-qry ") ") "")))) + (qry (conc "SELECT id,testname,item_path,state,status,event_time,run_duration FROM tests WHERE run_id=? " + " AND last_update > ? " + (if tests-match-qry (conc " AND (" tests-match-qry ") ") "") + ))) (debug:print-info 8 *default-log-port* "db:get-tests-for-run qry=" qry) (db:with-db dbstruct run-id #f (lambda (db) - (sqlite3:for-each-row - (lambda (id testname item-path state status) - ;; id,run_id,testname,state,status,event_time,host,cpuload,diskfree,uname,rundir,item_path,run_duration,final_logf,comment - (set! res (cons (vector id run-id testname state status -1 "" -1 -1 "" "-" item-path -1 "-" "-") res))) + (sqlite3:fold-row + (lambda (res id testname item-path state status event-time run-duration) + ;; id,run_id,testname,state,status,event_time,host,cpuload,diskfree,uname,rundir,item_path,run_duration,final_logf,comment + (cons (vector id run-id testname state status event-time "" -1 -1 "" "-" item-path run-duration "-" "-") res)) + '() db qry - run-id))) - res)) + run-id + (or last-update 0)))))) (define (db:get-testinfo-state-status dbstruct run-id test-id) (let ((res #f)) (db:with-db dbstruct run-id #f (lambda (db) @@ -2578,12 +3163,13 @@ (lambda (db) (sqlite3:execute db "UPDATE tests SET state='DELETED',status='n/a',comment='' WHERE id=?;" test-id)))) ;; (define (db:delete-old-deleted-test-records dbstruct) - (let (;; (run-ids (db:get-all-run-ids dbstruct)) - (targtime (- (current-seconds)(* 30 24 60 60)))) ;; one month in the past + (let ((targtime (- (current-seconds) + (or (configf:lookup-number *configdat* "setup" "keep-deleted-records") + (* 30 24 60 60))))) ;; one month in the past (db:with-db dbstruct 0 #t (lambda (db) @@ -2655,22 +3241,18 @@ (mt:process-triggers dbstruct run-id test-id newstate newstatus)) ;; NEW BEHAVIOR: Count tests running in all runs! ;; (define (db:get-count-tests-running dbstruct run-id) - (db:with-db - dbstruct - run-id - #f - (lambda (db) - (sqlite3:first-result - db - ;; WARNING BUG EDIT ME - merged from v1.55 - not sure what is right here ... - ;; AND run_id NOT IN (SELECT id FROM runs WHERE state='deleted') - "SELECT count(id) FROM tests WHERE state in ('RUNNING','LAUNCHED','REMOTEHOSTSTART') AND NOT (uname = 'n/a' AND item_path = '');" - ;; "SELECT count(id) FROM tests WHERE state in ('RUNNING','LAUNCHED','REMOTEHOSTSTART') AND run_id=?;" - )))) + (let* ((qry "SELECT count(id) FROM tests WHERE state in ('RUNNING','LAUNCHED','REMOTEHOSTSTART') AND NOT (uname = 'n/a' AND item_path = '');")) + (db:with-db + dbstruct + run-id + #f + (lambda (db) + (let* ((stmth (db:get-cache-stmth dbstruct db qry))) + (sqlite3:first-result stmth)))))) ;; NEW BEHAVIOR: Count tests running in only one run! ;; (define (db:get-count-tests-actually-running dbstruct run-id) (db:with-db @@ -2680,38 +3262,54 @@ (lambda (db) (sqlite3:first-result db ;; WARNING BUG EDIT ME - merged from v1.55 - not sure what is right here ... ;; "SELECT count(id) FROM tests WHERE state in ('RUNNING','LAUNCHED','REMOTEHOSTSTART') AND run_id NOT IN (SELECT id FROM runs WHERE state='deleted') AND NOT (uname = 'n/a' AND item_path = '');") - "SELECT count(id) FROM tests WHERE state in ('RUNNING','REMOTEHOSTSTART') AND run_id=?;" + "SELECT count(id) FROM tests WHERE state in ('RUNNING','REMOTEHOSTSTART','LAUNCHED') AND run_id=?;" run-id)))) ;; NOT IN (SELECT id FROM runs WHERE state='deleted');") ;; NEW BEHAVIOR: Look only at single run with run-id ;; ;; (define (db:get-running-stats dbstruct run-id) (define (db:get-count-tests-running-for-run-id dbstruct run-id) - (db:with-db - dbstruct - run-id - #f - (lambda (db) - (sqlite3:first-result - db - "SELECT count(id) FROM tests WHERE state in ('RUNNING','LAUNCHED','REMOTEHOSTSTART') AND run_id=? AND NOT (uname = 'n/a' AND item_path = '');" run-id)))) + (let* ((qry "SELECT count(id) FROM tests WHERE state in ('RUNNING','LAUNCHED','REMOTEHOSTSTART') AND run_id=?;")) + (db:with-db + dbstruct + run-id + #f + (lambda (db) + (let* ((stmth (db:get-cache-stmth dbstruct db qry))) + (sqlite3:fold-row + (lambda (res val) val) + 0 stmth run-id)))))) + +;; (sqlite3:first-result stmth run-id)))))) ;; For a given testname how many items are running? Used to determine ;; probability for regenerating html -;; +;; (define (db:get-count-tests-running-for-testname dbstruct run-id testname) (db:with-db dbstruct run-id #f (lambda (db) - (sqlite3:first-result - db - "SELECT count(id) FROM tests WHERE state in ('RUNNING','LAUNCHED','REMOTEHOSTSTART') AND run_id=? AND NOT (uname = 'n/a' AND item_path = '') AND testname=?;" run-id testname)))) + (let* ((stmt "SELECT count(id) FROM tests WHERE state in ('RUNNING','LAUNCHED','REMOTEHOSTSTART') AND run_id=? AND NOT (uname = 'n/a' AND item_path = '') AND testname=?;") + (stmth (db:get-cache-stmth dbstruct db stmt))) + (sqlite3:fold-row + (lambda (res val) val) 0 stmth run-id testname))))) + +(define (db:get-not-completed-cnt dbstruct run-id) + (db:with-db + dbstruct + run-id + #f + (lambda (db) + (let* ((stmt "SELECT count(id) FROM tests WHERE state not in ('COMPLETED', 'DELETED') AND run_id=?;")) + (sqlite3:fold-row + (lambda (res val) val) + 0 (db:get-cache-stmth dbstruct db stmt) run-id))))) (define (db:get-count-tests-running-in-jobgroup dbstruct run-id jobgroup) (if (not jobgroup) 0 ;; (let ((testnames '())) @@ -2793,11 +3391,11 @@ #f test-id)))) (define db:test-record-fields '("id" "run_id" "testname" "state" "status" "event_time" "host" "cpuload" "diskfree" "uname" "rundir" "item_path" - "run_duration" "final_logf" "comment" "shortdir" "attemptnum" "archived")) + "run_duration" "final_logf" "comment" "shortdir" "attemptnum" "archived" "last_update")) ;; fields *must* be a non-empty list ;; (define (db:field->number fieldname fields) (if (null? fields) @@ -2811,10 +3409,16 @@ #f (loop (car tal)(cdr tal)(+ indx 1))))))) (define db:test-record-qry-selector (string-intersperse db:test-record-fields ",")) +(define (db:update-tesdata-on-repilcate-db dbstruct old-lt new-lt) + (db:with-db + dbstruct #f #f + (lambda (db) + (sqlite3:execute db "UPDATE tests SET rundir= replace(rundir,?,?), shortdir=replace(shortdir,?,?);" + old-lt new-lt old-lt new-lt)))) ;; NOTE: Use db:test-get* to access records ;; NOTE: This needs rundir decoding? Decide, decode here or where used? For the moment decode where used. (define (db:get-all-tests-info-by-run-id dbstruct run-id) (let* ((res '())) @@ -2888,23 +3492,23 @@ (lambda (run-id) (let ((testrecs (db:get-all-tests-info-by-run-id mtdb run-id))) (db:prep-megatest.db-adj-test-ids (db:dbdat-get-db mtdb) run-id testrecs))) run-ids))) -;; Get test data using test_id, run-id is not used +;; Get test data using test_id, run-id is not used - but it will be! ;; (define (db:get-test-info-by-id dbstruct run-id test-id) (db:with-db dbstruct #f ;; run-id #f (lambda (db) (let ((res #f)) (sqlite3:for-each-row ;; attemptnum added to hold pid of top process (not Megatest) controlling a test - (lambda (id run-id testname state status event-time host cpuload diskfree uname rundir-id item-path run_duration final-logf-id comment short-dir-id attemptnum archived) + (lambda (id run-id testname state status event-time host cpuload diskfree uname rundir-id item-path run_duration final-logf-id comment short-dir-id attemptnum archived last-update) ;; 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 - (set! res (vector id run-id testname state status event-time host cpuload diskfree uname rundir-id item-path run_duration final-logf-id comment short-dir-id attemptnum archived))) + (set! res (vector id run-id testname state status event-time host cpuload diskfree uname rundir-id item-path run_duration final-logf-id comment short-dir-id attemptnum archived last-update))) db (conc "SELECT " db:test-record-qry-selector " FROM tests WHERE id=?;") test-id) res)))) @@ -2951,10 +3555,44 @@ (db:first-result-default db "SELECT rundir FROM tests WHERE id=?;" #f ;; default result test-id)))) + +(define (db:get-test-times dbstruct run-name target) + (let ((res `()) + (qry (conc "select testname, item_path, run_duration, " (string-join (db:get-keys dbstruct) " || '/' || ") " as target from tests inner join runs on tests.run_id = runs.id where runs.runname = ? and target = ? ;"))) + + (db:with-db + dbstruct + #f ;; this is for the main runs db + #f ;; does not modify db + (lambda (db) + (sqlite3:for-each-row + (lambda (test-name item-path test-time target ) + (set! res (cons (vector test-name item-path test-time) res))) + db + qry + run-name target) + res)))) + +(define (db:get-test-times dbstruct run-name target) + (let ((res `()) + (qry (conc "select testname, item_path, run_duration, " (string-join (db:get-keys dbstruct) " || '/' || ") " as target from tests inner join runs on tests.run_id = runs.id where runs.runname = ? and target = ? ;"))) + + (db:with-db + dbstruct + #f ;; this is for the main runs db + #f ;; does not modify db + (lambda (db) + (sqlite3:for-each-row + (lambda (test-name item-path test-time target ) + (set! res (cons (vector test-name item-path test-time) res))) + db + qry + run-name target) + res)))) ;;====================================================================== ;; S T E P S ;;====================================================================== @@ -2968,11 +3606,26 @@ db "INSERT OR REPLACE into test_steps (test_id,stepname,state,status,event_time,comment,logfile) VALUES(?,?,?,?,?,?,?);" test-id teststep-name state-in status-in (current-seconds) (if comment comment "") (if logfile logfile ""))))) - + + + +(define (db:delete-steps-for-test! dbstruct run-id test-id) + ;; TODO: figure out why status is the key field rather than state (note: CONSTRAINT test_steps_constraint UNIQUE (test_id,stepname,state) ) + (db:with-db + dbstruct + run-id + #t + (lambda (db) + (sqlite3:execute + db + "UPDATE test_steps set status='DELETED' where test_id=?" ;; and run_id=? !! - run_id not in table (bummer) TODO: get run_id into schema for test_steps + test-id)))) + + ;; db-get-test-steps-for-run (define (db:get-steps-for-test dbstruct run-id test-id) (db:with-db dbstruct run-id @@ -2984,10 +3637,25 @@ (set! res (cons (vector id test-id stepname state status event-time (if (string? logfile) logfile "") comment) res))) db "SELECT id,test_id,stepname,state,status,event_time,logfile,comment FROM test_steps WHERE status != 'DELETED' AND test_id=? ORDER BY id ASC;" ;; event_time DESC,id ASC; test-id) (reverse res))))) + + (define (db:get-steps-info-by-id dbstruct test-step-id) + (db:with-db + dbstruct + #f + #f + (lambda (db) + (let* ((res (vector #f #f #f #f #f #f #f #f #f))) + (sqlite3:for-each-row + (lambda (id test-id stepname state status event-time logfile comment last-update) + (set! res (vector id test-id stepname state status event-time (if (string? logfile) logfile "") comment last-update))) + db + "SELECT id,test_id,stepname,state,status,event_time,logfile,comment,last_update FROM test_steps WHERE id=? ORDER BY id ASC;" ;; event_time DESC,id ASC; + test-step-id) + res)))) (define (db:get-steps-data dbstruct run-id test-id) (db:with-db dbstruct run-id @@ -3003,10 +3671,26 @@ (reverse res))))) ;;====================================================================== ;; T E S T D A T A ;;====================================================================== + +(define (db:get-data-info-by-id dbstruct test-data-id) + (let* ((stmt "SELECT id,test_id, category, variable, value, expected, tol, units, comment, status, type, last_update FROM test_data WHERE id=? ORDER BY id ASC;")) ;; event_time DESC,id ASC; + (db:with-db + dbstruct + #f + #f + (lambda (db) + (let* ((stmth (db:get-cache-stmth dbstruct db stmt)) + (res (sqlite3:fold-row + (lambda (res id test-id category variable value expected tol units comment status type last-update) + (vector id test-id category variable value expected tol units comment status type last-update)) + (vector #f #f #f #f #f #f #f #f #f #f #f #f) + stmth + test-data-id))) + res))))) ;; WARNING: Do NOT call this for the parent test on an iterated test ;; Roll up test_data pass/fail results ;; look at the test_data status field, ;; if all are pass (any case) and the test status is PASS or NULL or '' then set test status to PASS. @@ -3077,12 +3761,12 @@ (configf:lookup dat entry-name "message") ;; 4 ;; Comment (configf:lookup dat entry-name "exit-status") ;; 5 ;; Status "logpro" ;; 6 ;; Type )))) (let* ((value (or (configf:lookup dat entry-name "measured") "n/a")) - (expected (or (configf:lookup dat entry-name "expected") "n/a")) - (tolerance (or (configf:lookup dat entry-name "tolerance") "n/a")) + (expected (or (configf:lookup dat entry-name "expected") 0.0)) + (tolerance (or (configf:lookup dat entry-name "tolerance") 0.0)) (comment (or (configf:lookup dat entry-name "comment") (configf:lookup dat entry-name "desc") "n/a")) (status (or (configf:lookup dat entry-name "status") "n/a")) (type (or (configf:lookup dat entry-name "expected") "n/a"))) (set! res (append @@ -3183,10 +3867,25 @@ (lambda (id test_id category variable value expected tol units comment status type) (set! res (cons (vector id test_id category variable value expected tol units comment status type) res))) db "SELECT id,test_id,category,variable,value,expected,tol,units,comment,status,type FROM test_data WHERE test_id=? AND category LIKE ? ORDER BY category,variable;" test-id categorypatt) (reverse res))))) + +;; This routine moved from tdb.scm, :read-test-data +;; +(define (db:read-test-data* dbstruct run-id test-id categorypatt varpatt) + (let* ((res '())) + (db:with-db + dbstruct #f #f + (lambda (db) + (sqlite3:for-each-row + (lambda (id test_id category variable value expected tol units comment status type) + (set! res (cons (vector id test_id category variable value expected tol units comment status type) res))) + db + "SELECT id,test_id,category,variable,value,expected,tol,units,comment,status,type FROM test_data WHERE test_id=? AND category LIKE ? AND variable LIKE ? ORDER BY category,variable;" test-id categorypatt varpatt) + (reverse res))))) + ;;====================================================================== ;; Misc. test related queries ;;====================================================================== @@ -3302,21 +4001,24 @@ ;; ;; if test-name is an integer work off that instead of test-name test-path ;; (define (db:set-state-status-and-roll-up-items dbstruct run-id test-name item-path state status comment) ;; establish info on incoming test followed by info on top level test + ;; BBnote - for mode itemwait, linkage between upstream test & matching item status is propagated to run queue in db:prereqs-not-met (let* ((testdat (if (number? test-name) (db:get-test-info-by-id dbstruct run-id test-name) ;; test-name is actually a test-id (db:get-test-info dbstruct run-id test-name item-path))) (test-id (db:test-get-id testdat)) (test-name (if (number? test-name) (db:test-get-testname testdat) test-name)) (item-path (db:test-get-item-path testdat)) (tl-testdat (db:get-test-info dbstruct run-id test-name "")) - (tl-test-id (db:test-get-id tl-testdat))) - (if (member state '("LAUNCHED" "REMOTEHOSTSTART")) + (tl-test-id (if tl-testdat + (db:test-get-id tl-testdat) + #f))) + (if (member state '("LAUNCHED" "REMOTEHOSTSTART")) (db:general-call dbstruct 'set-test-start-time (list test-id))) (mutex-lock! *db-transaction-mutex*) (db:with-db dbstruct #f #f (lambda (db) @@ -3325,65 +4027,156 @@ db (lambda () ;; NB// Pass the db so it is part fo the transaction (db:test-set-state-status db run-id test-id state status comment) ;; this call sets the item state/status (if (not (equal? item-path "")) ;; only roll up IF incoming test is an item - (let* ((state-status-counts (db:get-all-state-status-counts-for-test dbstruct run-id test-name item-path)) ;; item-path is used to exclude current state/status of THIS test - (running (length (filter (lambda (x) - (member (dbr:counts-state x) *common:running-states*)) - state-status-counts))) - (bad-not-started (length (filter (lambda (x) - (and (equal? (dbr:counts-state x) "NOT_STARTED") - (not (member (dbr:counts-status x) - *common:not-started-ok-statuses*)))) - state-status-counts))) - ;; (non-completes (filter (lambda (x) - ;; (not (equal? (dbr:counts-state x) "COMPLETED"))) - ;; state-status-counts)) - (all-curr-states (common:special-sort ;; worst -> best (sort of) - (delete-duplicates - (cons state (map dbr:counts-state state-status-counts))) - *common:std-states* >)) - (all-curr-statuses (common:special-sort ;; worst -> best - (delete-duplicates - (cons status (map dbr:counts-status state-status-counts))) - *common:std-statuses* >)) - (non-completes (filter (lambda (x) - (not (equal? x "COMPLETED"))) - all-curr-states)) - (newstate (cond - ((> (length non-completes) 0) ;; - (car non-completes)) ;; (remove (lambda (x)(equal? "COMPLETED" x)) all-curr-states))) - (else - (car all-curr-states)))) - ;; (if (> running 0) - ;; "RUNNING" - ;; (if (> bad-not-started 0) - ;; "COMPLETED" - ;; (car all-curr-states)))) - (newstatus (if (> bad-not-started 0) - "CHECK" - (car all-curr-statuses)))) - ;; (print "bad-not-supported: " bad-not-support " all-curr-states: " all-curr-states " all-curr-statuses: " all-curr-states) - ;; " newstate: " newstate " newstatus: " newstatus) - ;; NB// Pass the db so it is part of the transaction - (db:test-set-state-status db run-id tl-test-id newstate newstatus #f))))))) + (let* ((state-status-counts (db:get-all-state-status-counts-for-test dbstruct run-id test-name item-path state status)) ;; item-path is used to exclude current state/status of THIS test + (state-stauses (db:roll-up-rules state-status-counts state status)) + (newstate (car state-stauses)) + (newstatus (cadr state-stauses))) + (debug:print 4 *default-log-port* "BB> tl-test-id="tl-test-id" ; "test-name":"item-path" newstate="newstate" newstatus="newstatus" len(sscs)="(length state-status-counts) " state-status-counts: " + (apply conc + (map (lambda (x) + (conc + (with-output-to-string (lambda () (pp (dbr:counts->alist x)))) " | ")) + state-status-counts))); end debug:print + + (if tl-test-id + (db:test-set-state-status db run-id tl-test-id newstate newstatus #f)) ;; we are still in the transaction - must access the db and not the dbstruct + )))))) (mutex-unlock! *db-transaction-mutex*) (if (and test-id state status (equal? status "AUTO")) (db:test-data-rollup dbstruct run-id test-id status)) tr-res))))) -(define (db:get-all-state-status-counts-for-test dbstruct run-id test-name item-path) - (db:with-db - dbstruct #f #f - (lambda (db) - (sqlite3:map-row - (lambda (state status count) - (make-dbr:counts state: state status: status count: count)) - db - "SELECT state,status,count(id) FROM tests WHERE run_id=? AND testname=? AND item_path != '' AND item_path !=? GROUP BY state,status;" - run-id test-name item-path)))) +(define (db:roll-up-rules state-status-counts state status) + (let* ((running (length (filter (lambda (x) + (member (dbr:counts-state x) *common:running-states*)) + state-status-counts))) + (bad-not-started (length (filter (lambda (x) + (and (equal? (dbr:counts-state x) "NOT_STARTED") + (not (member (dbr:counts-status x) *common:not-started-ok-statuses*)))) + state-status-counts))) + (all-curr-states (common:special-sort ;; worst -> best (sort of) + (delete-duplicates + (if (and state (not (member state *common:dont-roll-up-states*))) + (cons state (map dbr:counts-state state-status-counts)) + (map dbr:counts-state state-status-counts))) + *common:std-states* >)) + (all-curr-statuses (common:special-sort ;; worst -> best + (delete-duplicates + (if (and state status (not (member state *common:dont-roll-up-states*))) + (cons status (map dbr:counts-status state-status-counts)) + (map dbr:counts-status state-status-counts))) + *common:std-statuses* >)) + (non-completes (filter (lambda (x) + (not (member x (cons "COMPLETED" *common:dont-roll-up-states*)))) + all-curr-states)) + (preq-fails (filter (lambda (x) + (equal? x "PREQ_FAIL")) + all-curr-statuses)) + (num-non-completes (length non-completes)) + (newstate (cond + ((> running 0) "RUNNING") ;; anything running, call the situation running + ((> (length preq-fails) 0) "NOT_STARTED") + ((> bad-not-started 0) "COMPLETED") ;; we have an ugly situation, it is completed in the sense we cannot do more. + ((> num-non-completes 0) (car non-completes)) ;; (remove (lambda (x)(equal? "COMPLETED" x)) all-curr-states))) ;; only rollup DELETED if all DELETED + (else (car all-curr-states)))) + (newstatus (cond + ((> (length preq-fails) 0) "PREQ_FAIL") + ((or (> bad-not-started 0) + (and (equal? newstate "NOT_STARTED") + (> num-non-completes 0))) + "STARTED") + (else (car all-curr-statuses))))) + (debug:print-info 2 *default-log-port* + "\n--> probe db:set-state-status-and-roll-up-items: " + "\n--> state-status-counts: "(map dbr:counts->alist state-status-counts) + "\n--> running: "running + "\n--> bad-not-started: "bad-not-started + "\n--> non-non-completes: "num-non-completes + "\n--> non-completes: "non-completes + "\n--> all-curr-states: "all-curr-states + "\n--> all-curr-statuses: "all-curr-statuses + "\n--> newstate "newstate + "\n--> newstatus "newstatus + "\n\n") + + ;; NB// Pass the db so it is part of the transaction + (list newstate newstatus))) + +(define (db:set-state-status-and-roll-up-run dbstruct run-id curr-state curr-status) + (mutex-lock! *db-transaction-mutex*) + (db:with-db + dbstruct #f #f + (lambda (db) + (let ((tr-res + (sqlite3:with-transaction + db + (lambda () + (let* ((state-status-counts (db:get-all-state-status-counts-for-run dbstruct run-id)) + (state-stauses (db:roll-up-rules state-status-counts #f #f )) + (newstate (car state-stauses)) + (newstatus (cadr state-stauses))) + (if (or (not (eq? newstate curr-state)) (not (eq? newstatus curr-status))) + (db:set-run-state-status dbstruct run-id newstate newstatus ))))))) + (mutex-unlock! *db-transaction-mutex*) + tr-res)))) + + +(define (db:get-all-state-status-counts-for-run dbstruct run-id) + (let* ((test-count-recs (db:with-db + dbstruct #f #f + (lambda (db) + (sqlite3:map-row + (lambda (state status count) + (make-dbr:counts state: state status: status count: count)) + db + "SELECT state,status,count(id) FROM tests WHERE run_id=? GROUP BY state,status;" + run-id ))))) + test-count-recs)) + + +;; BBnote: db:get-all-state-status-counts-for-test returns dbr:counts object aggregating state and status of items of a given test, *not including rollup state/status* +;; +;; NOTE: This is called within a transaction +;; +(define (db:get-all-state-status-counts-for-test dbstruct run-id test-name item-path item-state-in item-status-in) + (let* ((test-info (db:get-test-info dbstruct run-id test-name item-path)) + (item-state (or item-state-in (db:test-get-state test-info))) + (item-status (or item-status-in (db:test-get-status test-info))) + (other-items-count-recs (db:with-db + dbstruct #f #f + (lambda (db) + (sqlite3:map-row + (lambda (state status count) + (make-dbr:counts state: state status: status count: count)) + db + ;; ignore current item because we have changed its value in the current transation so this select will see the old value. + "SELECT state,status,count(id) FROM tests WHERE run_id=? AND testname=? AND item_path != '' AND item_path !=? GROUP BY state,status;" + run-id test-name item-path)))) + + ;; add current item to tally outside of sql query + (match-countrec-lambda (lambda (countrec) + (and (equal? (dbr:counts-state countrec) item-state) + (equal? (dbr:counts-status countrec) item-status)))) + + (already-have-count-rec-list + (filter match-countrec-lambda other-items-count-recs)) ;; will have either 0 or 1 count recs depending if another item shares this item's state/status + + (updated-count-rec (if (null? already-have-count-rec-list) + (make-dbr:counts state: item-state status: item-status count: 1) + (let* ((our-count-rec (car already-have-count-rec-list)) + (new-count (add1 (dbr:counts-count our-count-rec)))) + (make-dbr:counts state: item-state status: item-status count: new-count)))) + + (nonmatch-countrec-lambda (lambda (countrec) (not (match-countrec-lambda countrec)))) + + (unrelated-rec-list + (filter nonmatch-countrec-lambda other-items-count-recs))) + + (cons updated-count-rec unrelated-rec-list))) ;; (define (db:get-all-item-states db run-id test-name) ;; (sqlite3:map-row ;; (lambda (a) a) ;; db @@ -3428,11 +4221,11 @@ ;; TESTS '(register-test "INSERT OR IGNORE INTO tests (run_id,testname,event_time,item_path,state,status) VALUES (?,?,strftime('%s','now'),?,'NOT_STARTED','n/a');") ;; Test state and status '(set-test-state "UPDATE tests SET state=? WHERE id=?;") '(set-test-status "UPDATE tests SET state=? WHERE id=?;") - '(state-status "UPDATE tests SET state=?,status=? WHERE id=?;") ;; DONE + '(state-status "UPDATE tests SET state=?,status=? WHERE id=?;") ;; D/ONE '(state-status-msg "UPDATE tests SET state=?,status=?,comment=? WHERE id=?;") ;; DONE ;; Test comment '(set-test-comment "UPDATE tests SET comment=? WHERE id=?;") '(set-test-start-time "UPDATE tests SET event_time=strftime('%s','now') WHERE id=?;") ;; DONE '(pass-fail-counts "UPDATE tests SET pass_count=?,fail_count=? WHERE id=?;") @@ -3580,11 +4373,11 @@ ((not (equal? calling-path *toppath*)) (list #f "Login failed due to mismatch paths: " calling-path ", " *toppath*)) ;; ((not (equal? *run-id* run-id)) ;; (list #f "Login failed due to mismatch run-id: " run-id ", " *run-id*)) ((not (equal? megatest-version calling-version)) - (list #f "Login failed due to mismatch megatest version: " calling-version ", " megatest-version)) + (list #t (conc "Login warning due to mismatch megatest version: " calling-version ", " megatest-version))) (else (hash-table-set! *logged-in-clients* client-signature (current-seconds)) '(#t "successful login")))) (define (db:general-call dbstruct stmtname params) @@ -3603,17 +4396,18 @@ ;; (define (db:get-state-status-summary dbstruct run-id testname) (let ((res '())) (db:with-db dbstruct #f #f - (sqlite3:for-each-row - (lambda (state status count) - (set! res (cons (vector state status count) res))) - db - "SELECT state,status,count(state) FROM tests WHERE run_id=? AND testname=? AND item_path='' GROUP BY state,status;" - run-id testname) - res))) + (lambda (db) + (sqlite3:for-each-row + (lambda (state status count) + (set! res (cons (vector state status count) res))) + db + "SELECT state,status,count(state) FROM tests WHERE run_id=? AND testname=? AND item_path='' GROUP BY state,status;" + run-id testname) + res)))) (define (db:get-latest-host-load dbstruct raw-hostname) (let* ((hostname (string-substitute "\\..*$" "" raw-hostname)) (res (cons -1 0))) (db:with-db @@ -3716,14 +4510,14 @@ (db (db:dbdat-get-db dbdat)) ;; we'll return this so (db:delay--if-busy can be called inline (dbfj (conc dbpath "-journal"))) (if (handle-exceptions exn (begin - (debug:print-info 0 *default-log-port* "WARNING: failed to test for existance of " dbfj) + (debug:print-info 0 *default-log-port* "WARNING: failed to test for existance of " dbfj ", exn=" exn) (thread-sleep! 1) (db:delay-if-busy count (- count 1))) - (file-exists? dbfj)) + (common:file-exists? dbfj)) (case count ((6) (thread-sleep! 0.2) (db:delay-if-busy count: 5)) ((5) @@ -3783,11 +4577,11 @@ (delete-duplicates (cons testname (hash-table-ref/default res tag '()))))) tags))) db "SELECT testname,tags FROM test_meta") - res)))) + (hash-table->alist res))))) ;; read the record given a testname (define (db:testmeta-get-record dbstruct testname) (let ((res #f)) (db:with-db @@ -3872,19 +4666,35 @@ (let loop ((hed (car all-patts)) (tal (cdr all-patts)) (res item-path)) (let* ((parts (string-split hed)) (patt (car parts)) + (repl (if (> (length parts) 1)(cadr parts) "")) + (newr (if (and patt repl) - (string-substitute patt repl res) + (begin + (handle-exceptions + exn + (begin + (debug:print 0 *default-log-port* + "WARNING: itemmap has problem \"" itemmap "\", patt: " patt ", repl: " repl ", exn=" exn) + res) + (string-substitute patt repl res)) + + + ) (begin - (debug:print 0 *default-log-port* "WARNING: itemmap has problem \"" itemmap "\", patt: " patt ", repl: " repl) + (debug:print 0 *default-log-port* + "WARNING: itemmap has problem \"" itemmap "\", patt: " patt ", repl: " repl) res)))) (if (null? tal) newr (loop (car tal)(cdr tal) newr))))))) + + + ;; the new prereqs calculation, looks also at itempath if specified ;; all prereqs must be met ;; if prereq test with itempath='' is COMPLETED and PASS, WARN, CHECK, or WAIVED then prereq is met ;; if prereq test with itempath=ref-item-path and COMPLETED with PASS, WARN, CHECK, or WAIVED then prereq is met @@ -3891,13 +4701,18 @@ ;; ;; Note: mode 'normal means that tests must be COMPLETED and ok (i.e. PASS, WARN, CHECK, SKIP or WAIVED) ;; mode 'toplevel means that tests must be COMPLETED only ;; mode 'itemmatch or 'itemwait means that tests items must be COMPLETED and (PASS|WARN|WAIVED|CHECK) [[ NB// NOT IMPLEMENTED YET ]] ;; mode 'exclusive means this test/item cannot run if the same test/item is LAUNCHED,REMOTEHOSTSTART or RUNNING +;; +;; IDEA for consideration: +;; 1. collect all tests "upstream" +;; 2. any NOT completed and good? if yes => return those as prereqs not met, if no => return null list ;; ;; (define (db:get-prereqs-not-met dbstruct run-id waitons ref-item-path mode) (define (db:get-prereqs-not-met dbstruct run-id waitons ref-test-name ref-item-path mode itemmaps) ;; #!key (mode '(normal))(itemmap #f)) + ;; BBnote - rollup of an itemized test's overall state/status done in db:set-state-status-and-roll-up-items (append (if (member 'exclusive mode) (let ((running-tests (db:get-tests-for-run dbstruct #f ;; run-id of #f means for all runs. (if (string=? ref-item-path "") ;; testpatt @@ -3920,74 +4735,156 @@ ;; (conc (db:test-get-testname testdat) ;; "/" ;; (db:test-get-item-path testdat)))) running-tests) ;; calling functions want the entire data '()) + + ;; collection of: for each waiton - + ;; if this ref-test-name is an item in an itemized test and mode is itemwait/itemmatch: + ;; if waiton is not itemized - if waiton is not both completed and in ok status, add as unmet prerequisite + ;; if waiton is itemized: + ;; and waiton's items are not expanded, add as unmet prerequisite + ;; else if matching waiton item is not both completed and in an ok status, add as unmet prerequisite + ;; else + ;; if waiton toplevel is not in both completed and ok status, add as unmet prerequisite + (if (or (not waitons) (null? waitons)) '() - (let* ((unmet-pre-reqs '()) - (result '())) - (for-each + (let* ((ref-test-itemized-mode (not (null? (lset-intersection eq? mode '(itemmatch itemwait))))) ;; how is this different from using member? + (ref-test-toplevel-mode (not (null? (lset-intersection eq? mode '(toplevel))))) + (ref-test-is-toplevel (equal? ref-item-path "")) + (ref-test-is-item (not ref-test-is-toplevel)) + (unmet-pre-reqs '()) + (result '()) + (unmet-prereq-items '()) + ) + (for-each ; waitons (lambda (waitontest-name) ;; by getting the tests with matching name we are looking only at the matching test ;; and related sub items ;; next should be using mt:get-tests-for-run? - (let ((tests (db:get-tests-for-run-state-status dbstruct run-id waitontest-name)) + + (let (;(waiton-is-itemized ...) + ;(waiton-items-are-expanded ...) + (waiton-tests (db:get-tests-for-run-state-status dbstruct run-id waitontest-name)) (ever-seen #f) (parent-waiton-met #f) - (item-waiton-met #f)) - (for-each - (lambda (test) - ;; (if (equal? waitontest-name (db:test-get-testname test)) ;; by defintion this had better be true ... - (let* ((state (db:test-get-state test)) - (status (db:test-get-status test)) - (item-path (db:test-get-item-path test)) - (is-completed (equal? state "COMPLETED")) - (is-running (equal? state "RUNNING")) - (is-killed (equal? state "KILLED")) - (is-ok (member status '("PASS" "WARN" "CHECK" "WAIVED" "SKIP"))) - ;; testname-b path-a path-b - (same-itempath (db:compare-itempaths ref-test-name item-path ref-item-path itemmaps))) ;; (equal? ref-item-path item-path))) + (item-waiton-met #f) + + ) + (for-each ; test expanded from waiton + (lambda (waiton-test) + (let* ((waiton-state (db:test-get-state waiton-test)) + (waiton-status (db:test-get-status waiton-test)) + (waiton-item-path (db:test-get-item-path waiton-test)) ;; BB- this is the upstream itempath + (waiton-test-name (db:test-get-testname waiton-test)) + (waiton-is-toplevel (equal? waiton-item-path "")) + (waiton-is-item (not waiton-is-toplevel)) + (waiton-is-completed (member waiton-state *common:ended-states*)) + (waiton-is-running (member waiton-state *common:running-states*)) + (waiton-is-killed (member waiton-state *common:badly-ended-states*)) + (waiton-is-ok (member waiton-status *common:well-ended-states*)) + ;; testname-b path-a path-b + (same-itempath (db:compare-itempaths ref-test-name waiton-item-path ref-item-path itemmaps)) ;; (equal? ref-item-path waiton-item-path))) + (real-ref-test-name (car (string-split ref-test-name "/"))) ;; I THINK ref-test-name SHOULD NEVER HAVE THE ITEM_PATH! + (test-and-ref-are-same (equal? real-ref-test-name waiton-test-name))) + (debug:print 4 *default-log-port* "waiton-test-name " waiton-test-name " ref-test-name: " ref-test-name " test-and-ref-are-same: " test-and-ref-are-same) (set! ever-seen #t) - (cond - ;; case 1, non-item (parent test) is - ((and (equal? item-path "") ;; this is the parent test of the waiton being examined - is-completed - (or is-ok (not (null? (lset-intersection eq? mode '(toplevel)))))) ;; itemmatch itemwait)))))) + ;;(BB> "***consider waiton "waiton-test"/"waiton-item-path"***") + (cond + ;; case 0 - toplevel of an itemized test, at least one item in prereq has completed + ((and waiton-is-item ref-test-is-toplevel ref-test-itemized-mode waiton-is-completed) + (set! parent-waiton-met #t)) + + ;; case 1, non-item (parent test) is + ((and waiton-is-toplevel ;; this is the parent test of the waiton being examined + waiton-is-completed + ;;(BB> "cond1") + (or waiton-is-ok ref-test-toplevel-mode)) ;; itemmatch itemwait)))))) (set! parent-waiton-met #t)) ;; Special case for toplevel and KILLED - ((and (equal? item-path "") ;; this is the parent test - is-killed + ((and waiton-is-toplevel ;; this is the parent test + waiton-is-killed (member 'toplevel mode)) + ;;(BB> "cond2") (set! parent-waiton-met #t)) ;; For itemwait mode IFF the previous matching item is good the set parent-waiton-met - ((and (not (null? (lset-intersection eq? mode '(itemmatch itemwait)))) ;; how is that different from (member mode '(itemmatch itemwait)) ????? - ;; (not (equal? item-path "")) ;; this applies to both top level (to allow launching of next batch) and items - same-itempath) - (if (and is-completed is-ok) - (set! item-waiton-met #t)) - (if (and (equal? item-path "") - (or is-completed is-running));; this is the parent, set it to run if completed or running + ((and ref-test-itemized-mode ref-test-is-item same-itempath) + ;;(BB> "cond3") + (if (and waiton-is-completed (or waiton-is-ok ref-test-toplevel-mode)) + (set! item-waiton-met #t) + (set! unmet-prereq-items (cons waiton-test unmet-prereq-items))) + (if (and waiton-is-toplevel ;; if upstream rollup test is completed, parent-waiton-met is set + (or waiton-is-completed waiton-is-running)) (set! parent-waiton-met #t))) ;; normal checking of parent items, any parent or parent item not ok blocks running - ((and is-completed - (or is-ok + ((and waiton-is-completed + (or waiton-is-ok (member 'toplevel mode)) ;; toplevel does not block on FAIL - (and is-ok (member 'itemmatch mode))) ;; itemmatch blocks on not ok - (set! item-waiton-met #t))))) - tests) + (and waiton-is-ok (member 'itemmatch mode) ;; itemmatch blocks on not ok ;; TODO: THIS IS PROBABLY A BUG. ITEMMATCH AND ITEMWAIT ARE SYNONYMS!! WHAT HAPPENED OT ITEMWAIT??? + )) + ;;(BB> "cond4") + (set! item-waiton-met #t)) + ((and waiton-is-completed waiton-is-ok same-itempath) + ;;(BB> "cond5") + (set! item-waiton-met #t)) + ((and waiton-is-completed waiton-is-ok test-and-ref-are-same) ;; probably from [waitons] table + (set! item-waiton-met #t)) + (else + #t + ;;(BB> "condelse") + )))) + waiton-tests) ;; both requirements, parent and item-waiton must be met to NOT add item to ;; prereq's not met list - (if (not (or parent-waiton-met item-waiton-met)) - (set! result (append (if (null? tests) (list waitontest-name) tests) result))) ;; appends the string if the full record is not available + ;; (BB> + ;; "\n* waiton-tests "waiton-tests + ;; "\n* parent-waiton-met "parent-waiton-met + ;; "\n* item-waiton-met "item-waiton-met + ;; "\n* ever-seen "ever-seen + ;; "\n* ref-test-itemized-mode "ref-test-itemized-mode + ;; "\n* unmet-prereq-items "unmet-prereq-items + ;; "\n* result (pre) "result + ;; "\n* ever-seen "ever-seen + ;; "\n") + + (cond + ((and ref-test-itemized-mode ref-test-is-item (not (null? unmet-prereq-items))) + (set! result (append unmet-prereq-items result))) + ((not (or parent-waiton-met item-waiton-met)) + (set! result (append (if (null? waiton-tests) (list waitontest-name) waiton-tests) result))) ;; appends the string if the full record is not available ;; if the test is not found then clearly the waiton is not met... ;; (if (not ever-seen)(set! result (cons waitontest-name result))))) - (if (not ever-seen) - (set! result (append (if (null? tests)(list waitontest-name) tests) result))))) + ((not ever-seen) + (set! result (append (if (null? waiton-tests)(list waitontest-name) waiton-tests) result)))))) waitons) (delete-duplicates result))))) + +;;====================================================================== +;; To sync individual run +;;====================================================================== +(define (db:get-run-record-ids dbstruct target run keynames test-patt) +(let ((backcons (lambda (lst item)(cons item lst)))) + (db:with-db + dbstruct #f #f + (lambda (db) + (let* ((keystr (string-intersperse + (map (lambda (key val) + (conc key " like '" val "'")) + keynames + (string-split target "/")) + " AND ")) + (run-qry (conc "SELECT id FROM runs WHERE " keystr " and runname='" run"'")) + (test-qry (conc "SELECT id FROM tests WHERE run_id in (" run-qry ") and testname like '" test-patt "'"))) + (print run-qry) + (print test-qry) + `((runs . ,(sqlite3:fold-row backcons '() db run-qry)) + (tests . ,(sqlite3:fold-row backcons '() db test-qry)) + (test_steps . ,(sqlite3:fold-row backcons '() db (conc "SELECT id FROM test_steps WHERE test_id in (" test-qry ")"))) + (test_data . ,(sqlite3:fold-row backcons '() db (conc "SELECT id FROM test_data WHERE test_id in (" test-qry ")" ))) + )))))) ;;====================================================================== ;; Just for sync, procedures to make sync easy ;;====================================================================== @@ -3998,16 +4895,16 @@ ;; no transaction, allow the db to be accessed between the big queries (let ((backcons (lambda (lst item)(cons item lst)))) (db:with-db dbstruct #f #f (lambda (db) - `((runs . ,(fold-row backcons '() db "SELECT id FROM runs WHERE last_update>?" since-time)) - (tests . ,(fold-row backcons '() db "SELECT id FROM tests WHERE last_update>?" since-time)) - (test_steps . ,(fold-row backcons '() db "SELECT id FROM test_steps WHERE last_update>?" since-time)) - (test_data . ,(fold-row backcons '() db "SELECT id FROM test_data WHERE last_update>?" since-time)) + `((runs . ,(sqlite3:fold-row backcons '() db "SELECT id FROM runs WHERE last_update>=?" since-time)) + (tests . ,(sqlite3:fold-row backcons '() db "SELECT id FROM tests WHERE last_update>=?" since-time)) + (test_steps . ,(sqlite3:fold-row backcons '() db "SELECT id FROM test_steps WHERE last_update>=?" since-time)) + (test_data . ,(sqlite3:fold-row backcons '() db "SELECT id FROM test_data WHERE last_update>=?" since-time)) ;; (test_meta . ,(fold-row backcons '() db "SELECT id FROM test_meta WHERE last_update>?" since-time)) - (run_stats . ,(fold-row backcons '() db "SELECT id FROM run_stats WHERE last_update>?" since-time)) + (run_stats . ,(sqlite3:fold-row backcons '() db "SELECT id FROM run_stats WHERE last_update>=?" since-time)) ))))) ;;====================================================================== ;; Extract ods file from the db ;;====================================================================== @@ -4083,12 +4980,12 @@ (testname (vector-ref vb (+ 2 numkeys))) (item-path (vector-ref vb (+ 3 numkeys))) (final-log (vector-ref vb (+ 7 numkeys))) (run-dir (vector-ref vb (+ 18 numkeys))) (log-fpath (conc run-dir "/" final-log))) ;; (string-intersperse keyvals "/") "/" testname "/" item-path "/" - (debug:print 4 *default-log-port* "log: " log-fpath " exists: " (file-exists? log-fpath)) - (vector-set! vb (+ 7 numkeys) (if (file-exists? log-fpath) + (debug:print 4 *default-log-port* "log: " log-fpath " exists: " (common:file-exists? log-fpath)) + (vector-set! vb (+ 7 numkeys) (if (common:file-exists? log-fpath) (let ((newpath (conc pathmod "/" (string-intersperse keyvals "/") "/" runname "/" testname "/" (if (string=? item-path "") "" (conc "/" item-path)) final-log))) @@ -4131,10 +5028,11 @@ (begin (debug:print 0 *default-log-port* "WARNING: path given, " outputfile " is relative, prefixing with current directory") (conc (current-directory) "/" outputfile))) results) ;; brutal clean up + (stack-push! (dbr:dbstruct-dbstack dbstruct) dbdat) (system "rm -rf tempdir"))) ;; (db:extract-ods-file db "outputfile.ods" '(("sysname" "%")("fsname" "%")("datapath" "%")) "%") Index: db_records.scm ================================================================== --- db_records.scm +++ db_records.scm @@ -1,5 +1,22 @@ +;; Copyright 2006-2017, Matthew Welland. +;; +;; This file is part of Megatest. +;; +;; Megatest is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. +;; +;; Megatest is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. +;; +;; You should have received a copy of the GNU General Public License +;; along with Megatest. If not, see . + ;;====================================================================== ;; dbstruct ;;====================================================================== ;; @@ -85,10 +102,11 @@ (define-inline (db:test-get-run_duration vec) (vector-ref vec 12)) (define-inline (db:test-get-final_logf vec) (vector-ref vec 13)) (define-inline (db:test-get-comment vec) (vector-ref vec 14)) (define-inline (db:test-get-process_id vec) (vector-ref vec 16)) (define-inline (db:test-get-archived vec) (vector-ref vec 17)) +(define-inline (db:test-get-last_update vec) (vector-ref vec 18)) ;; (define-inline (db:test-get-pass_count vec) (vector-ref vec 15)) ;; (define-inline (db:test-get-fail_count vec) (vector-ref vec 16)) (define-inline (db:test-get-fullname vec) (conc (db:test-get-testname vec) "/" (db:test-get-item-path vec))) @@ -147,10 +165,16 @@ (define-inline (db:testmeta-set-description! vec val)(vector-set! vec 4 val)) (define-inline (db:testmeta-set-reviewed! vec val)(vector-set! vec 5 val)) (define-inline (db:testmeta-set-iterated! vec val)(vector-set! vec 6 val)) (define-inline (db:testmeta-set-avg_runtime! vec val)(vector-set! vec 7 val)) (define-inline (db:testmeta-set-avg_disk! vec val)(vector-set! vec 8 val)) + +;;====================================================================== +;; S I M P L E R U N +;;====================================================================== + +;; (defstruct id "runname" "state" "status" "owner" "event_time" ;;====================================================================== ;; T E S T D A T A ;;====================================================================== (define (make-db:test-data)(make-vector 10)) @@ -163,10 +187,11 @@ (define-inline (db:test-data-get-tol vec) (vector-ref vec 6)) (define-inline (db:test-data-get-units vec) (vector-ref vec 7)) (define-inline (db:test-data-get-comment vec) (vector-ref vec 8)) (define-inline (db:test-data-get-status vec) (vector-ref vec 9)) (define-inline (db:test-data-get-type vec) (vector-ref vec 10)) +(define-inline (db:test-data-get-last_update vec) (vector-ref vec 11)) (define-inline (db:test-data-set-id! vec val)(vector-set! vec 0 val)) (define-inline (db:test-data-set-test_id! vec val)(vector-set! vec 1 val)) (define-inline (db:test-data-set-category! vec val)(vector-set! vec 2 val)) (define-inline (db:test-data-set-variable! vec val)(vector-set! vec 3 val)) @@ -181,27 +206,28 @@ ;;====================================================================== ;; S T E P S ;;====================================================================== ;; Run steps ;; make-vector-record "Run steps" db step id test_id stepname step_complete step_pass event_time -(define (make-db:step)(make-vector 7)) +(define (make-db:step)(make-vector 9)) (define-inline (tdb:step-get-id vec) (vector-ref vec 0)) (define-inline (tdb:step-get-test_id vec) (vector-ref vec 1)) (define-inline (tdb:step-get-stepname vec) (vector-ref vec 2)) (define-inline (tdb:step-get-state vec) (vector-ref vec 3)) (define-inline (tdb:step-get-status vec) (vector-ref vec 4)) (define-inline (tdb:step-get-event_time vec) (vector-ref vec 5)) (define-inline (tdb:step-get-logfile vec) (vector-ref vec 6)) (define-inline (tdb:step-get-comment vec) (vector-ref vec 7)) +(define-inline (tdb:step-get-last_update vec) (vector-ref vec 8)) (define-inline (tdb:step-set-id! vec val)(vector-set! vec 0 val)) (define-inline (tdb:step-set-test_id! vec val)(vector-set! vec 1 val)) (define-inline (tdb:step-set-stepname! vec val)(vector-set! vec 2 val)) (define-inline (tdb:step-set-state! vec val)(vector-set! vec 3 val)) (define-inline (tdb:step-set-status! vec val)(vector-set! vec 4 val)) (define-inline (tdb:step-set-event_time! vec val)(vector-set! vec 5 val)) (define-inline (tdb:step-set-logfile! vec val)(vector-set! vec 6 val)) -(define-inline (tdb:step-set-comment! vec vak)(vector-set! vec 7 val)) +(define-inline (tdb:step-set-comment! vec val)(vector-set! vec 7 val)) ;; The steps table (define (make-db:steps-table)(make-vector 5)) (define-inline (tdb:steps-table-get-stepname vec) (vector-ref vec 0)) ADDED dbmod.scm Index: dbmod.scm ================================================================== --- /dev/null +++ dbmod.scm @@ -0,0 +1,39 @@ +;;====================================================================== +;; Copyright 2017, Matthew Welland. +;; +;; This file is part of Megatest. +;; +;; Megatest is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. +;; +;; Megatest is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. +;; +;; You should have received a copy of the GNU General Public License +;; along with Megatest. If not, see . + +;;====================================================================== + +(declare (unit dbmod)) + +(module dbmod + * + +(import scheme chicken data-structures extras) +(import (prefix sqlite3 sqlite3:) posix typed-records srfi-18) + +(define (just-testing) + (print "JUST TESTING")) + +;; (define (debug:print . params) #f) +;; (define (debug:print-info . params) #f) +;; +;; (define (set-functions dbgp dbgpinfo) +;; (set! debug:print dbgp) +;; (set! debug:print-info dbgpinfo)) + +) DELETED dbwars/NOTES Index: dbwars/NOTES ================================================================== --- dbwars/NOTES +++ /dev/null @@ -1,31 +0,0 @@ -Before using prepare: - -matt@xena:/tmp/megatest/dbwars$ ./sqlite3-test insert -Adding 1047 test3 item/39 host0-0.3-200000-240-this one sucks eh? (added 51886 records so far) -Adding 1122 test5 item/52 host2-0.2-200000-120-this is a good one eh? (added 78889 records so far) -Adding 1050 test7 item/31 host1-0.1-100000-120-this is a good one eh? (added 110641 records so far) -create-tests ran register-test 144000 times in 41.0 seconds - -After using prepare: - -matt@xena:/tmp/megatest/dbwars$ csc sqlite3-test.scm && ./sqlite3-test insert -Adding 1082 test4 item/74 host1-0.3-100000-120-this is a good one eh? (added 61281 records so far) -Adding 1138 test7 item/43 host2-0.3-200000-120-this is a good one eh? (added 109001 records so far) -Adding 1023 test9 item/00 host0-0.2-100000-240-this one sucks eh? (added 143878 records so far) -create-tests ran register-test 144000 times in 38.0 seconds - -After moving the prepare outside the call (so it isn't done each time): - -matt@xena:/tmp/megatest/dbwars$ ./sqlite3-test insert -Adding 1042 test4 item/59 host0-0.3-200000-120-this is a good one eh? (added 63401 records so far) -Adding 1011 test6 item/40 host0-0.1-200000-120-this one sucks eh? (added 94906 records so far) -Adding 1076 test9 item/34 host1-0.2-200000-120-just eh, eh? (added 139035 records so far) -create-tests ran register-test 144000 times in 33.0 seconds - -Using sql-de-lite with very similar code: - -matt@xena:/tmp/megatest/dbwars$ ./sql-de-lite-test insert -Adding 1029 test4 item/53 host0-0.2-200000-240- (added 64252 records so far) -Adding 1134 test7 item/64 host2-0.3-100000-240-this is a good one eh? (added 105973 records so far) -create-tests ran register-test 144000 times in 31.0 seconds - DELETED dbwars/sql-de-lite-test.scm Index: dbwars/sql-de-lite-test.scm ================================================================== --- dbwars/sql-de-lite-test.scm +++ /dev/null @@ -1,19 +0,0 @@ - -(use sql-de-lite) -(include "test-common.scm") - -(define db (open-database "test.db")) - -(exec (sql db test-table-defn)) -(exec (sql db syncsetup)) - -(define (register-test stmth run-id testname host cpuload diskfree uname rundir shortdir item-path state status final-logf run-duration comment event-time) - (exec - stmth ;; (sql db test-insert) - run-id - testname host cpuload diskfree uname rundir shortdir item-path state status final-logf run-duration comment event-time)) - -(let ((stmth (sql db test-insert))) - (create-tests stmth)) - -(close-database db) DELETED dbwars/sqlite3-test.scm Index: dbwars/sqlite3-test.scm ================================================================== --- dbwars/sqlite3-test.scm +++ /dev/null @@ -1,20 +0,0 @@ - -(use sqlite3) -(include "test-common.scm") - -(define db (open-database "test.db")) - -(execute db test-table-defn) -(execute db syncsetup) - - -(define (register-test stmth run-id testname host cpuload diskfree uname rundir shortdir item-path state status final-logf run-duration comment event-time) - (execute stmth - run-id - testname host cpuload diskfree uname rundir shortdir item-path state status final-logf run-duration comment event-time)) - -(let ((stmth (prepare db test-insert))) - (create-tests stmth) - (finalize! stmth)) - -(finalize! db) DELETED dbwars/test-common.scm Index: dbwars/test-common.scm ================================================================== --- dbwars/test-common.scm +++ /dev/null @@ -1,129 +0,0 @@ -(use srfi-18 srfi-69 apropos) - -(define args (argv)) - -(if (not (eq? (length args) 2)) - (begin - (print "Usage: sqlitecompare [insert|update]") - (exit 0))) - -(define action (string->symbol (cadr args))) - -(system "rm -f test.db") - -(define test-table-defn - "CREATE TABLE IF NOT EXISTS tests - (id INTEGER PRIMARY KEY, - run_id INTEGER, - testname TEXT, - host TEXT DEFAULT 'n/a', - cpuload REAL DEFAULT -1, - diskfree INTEGER DEFAULT -1, - uname TEXT DEFAULT 'n/a', - rundir TEXT DEFAULT 'n/a', - shortdir TEXT DEFAULT '', - item_path TEXT DEFAULT '', - state TEXT DEFAULT 'NOT_STARTED', - status TEXT DEFAULT 'FAIL', - attemptnum INTEGER DEFAULT 0, - final_logf TEXT DEFAULT 'logs/final.log', - logdat BLOB, - run_duration INTEGER DEFAULT 0, - comment TEXT DEFAULT '', - event_time TIMESTAMP, - fail_count INTEGER DEFAULT 0, - pass_count INTEGER DEFAULT 0, - archived INTEGER DEFAULT 0, -- 0=no, 1=in progress, 2=yes - CONSTRAINT testsconstraint UNIQUE (run_id, testname, item_path) - );") - -(define test-insert "INSERT INTO tests (run_id,testname,host,cpuload,diskfree,uname,rundir,shortdir,item_path,state,status,final_logf,run_duration,comment,event_time) - values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ? );") -(define syncsetup "PRAGMA synchronous = OFF;") - -(define tests '("test0" "test1" "test2" "test3" "test4" "test5" "test6" "test7" "test8" "test9")) -(define items '()) -(for-each - (lambda (n) - (for-each - (lambda (m) - (set! items (cons (conc "item/" n m) items))) - '(0 1 2 3 4 5 6 7 8 9))) - '(0 1 2 3 4 5 6 7 8 9)) -(define hosts '("host0" "host1" "host2")) ;; "host3" "host4" "host5" "host6" "host7" "host8" "host9")) -(define cpuloads '(0.1 0.2 0.3)) ;; 0.4 0.5 0.6 0.7 0.8 0.9)) -(define diskfrees '(100000 200000)) ;; 300000 400000 500000 600000 700000 800000 900000)) -(define uname "Linux xena 3.5.0-40-generic #62~precise1-Ubuntu SMP Fri Aug 23 17:59:10 UTC 2013 i686 i686 i386 GNU/Linux") -(define basedir "/mfs/matt/data/megatest/runs/testing") -(define final-logf "finallog.html") -(define run-durations (list 120 240)) ;; 260)) -(define comments '("" "this is a good one eh?" "this one sucks eh?" "just eh, eh?")) - -(define run-ids (make-hash-table)) -(define max-run-id 1000) - -(define (test-factors->run-id host cpuload diskfree run-duration comment) - (let* ((factor (conc host "-" cpuload "-" diskfree "-" run-duration "-" comment)) - (run-id (hash-table-ref/default run-ids factor #f))) - (if run-id - (list run-id factor) - (let ((new-id (+ max-run-id 1))) - (set! max-run-id new-id) - (hash-table-set! run-ids factor new-id) - (list new-id factor))))) - - -(define (create-tests stmth) - (let ((num-created 0) - (last-print (current-seconds)) - (start-time (current-seconds))) - (for-each - (lambda (test) - (for-each - (lambda (item) - (for-each - (lambda (host) - (for-each - (lambda (cpuload) - (for-each - (lambda (diskfree) - (for-each - (lambda (run-duration) - (for-each - (lambda (comment) - (let* ((run-id-dat (test-factors->run-id host cpuload diskfree run-duration comment)) - (run-id (car run-id-dat)) - (factor (cadr run-id-dat)) - (curr-time (current-seconds))) - (if (> (- curr-time last-print) 10) - (begin - (print "Adding " run-id " " test " " item " " factor " (added " num-created " records so far)") - (set! last-print curr-time))) - (set! num-created (+ num-created 1)) - (register-test stmth ;; db - run-id - test ;; testname - host - cpuload - diskfree - uname - (conc basedir "/" test "/" item) ;; rundir - (conc test "/" item) ;; shortdir - item ;; item-path - "NOT_STARTED" ;; state - "NA" ;; status - final-logf - run-duration - comment - (current-seconds)))) - comments)) - run-durations)) - diskfrees)) - cpuloads)) - hosts)) - items)) - tests) - (print "create-tests ran register-test " num-created " times in " (- (current-seconds) start-time) " seconds"))) - - - Index: dcommon.scm ================================================================== --- dcommon.scm +++ dcommon.scm @@ -1,14 +1,23 @@ ;;====================================================================== ;; Copyright 2006-2013, Matthew Welland. ;; -;; This program is made available under the GNU GPL version 2.0 or -;; greater. See the accompanying file COPYING for details. +;; This file is part of Megatest. +;; +;; Megatest is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. +;; +;; Megatest is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. ;; -;; This program is distributed WITHOUT ANY WARRANTY; without even the -;; implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -;; PURPOSE. +;; You should have received a copy of the GNU General Public License +;; along with Megatest. If not, see . +;; ;;====================================================================== (use format) (require-library iup) (import (prefix iup iup:)) @@ -16,15 +25,15 @@ (import canvas-draw-iup) (use regex typed-records matchable) (declare (unit dcommon)) -(declare (uses megatest-version)) (declare (uses gutils)) (declare (uses db)) -(declare (uses synchash)) +;; (declare (uses synchash)) +(include "megatest-version.scm") (include "common_records.scm") (include "db_records.scm") (include "key_records.scm") (include "run_records.scm") @@ -34,10 +43,75 @@ ;;====================================================================== ;; C O M M O N D A T A S T R U C T U R E ;;====================================================================== ;; +;; data common to all tabs goes here +;; +(defstruct dboard:commondat + ((curr-tab-num 0) : number) + please-update + tabdats + update-mutex + updaters + updating + uidat ;; needs to move to tabdat at some time + hide-not-hide-tabs + ) + +(define (dboard:commondat-make) + (make-dboard:commondat + curr-tab-num: 0 + tabdats: (make-hash-table) + please-update: #t + update-mutex: (make-mutex) + updaters: (make-hash-table) + updating: #f + hide-not-hide-tabs: #f + )) + +;; RADT => Matrix defstruct addition +(defstruct dboard:graph-dat + ((id #f) : string) + ((color #f) : vector) + ((flag #t) : boolean) + ((cell #f) : number) + ) + +;; data for runs, tests etc. was used in run summary? +;; +(defstruct dboard:runsdat + ;; new system + runs-index ;; target/runname => colnum + tests-index ;; testname/itempath => rownum + matrix-dat ;; vector of vectors rows/cols + ) + +(define (dboard:runsdat-make-init) + (make-dboard:runsdat + runs-index: (make-hash-table) + tests-index: (make-hash-table) + matrix-dat: (make-sparse-array))) + +;; used to keep the rundata from rmt:get-tests-for-run +;; in sync. +;; +(defstruct dboard:rundat + run + tests-drawn ;; list of id's already drawn on screen + tests-notdrawn ;; list of id's NOT already drawn + rowsused ;; hash of lists covering what areas used - replace with quadtree + hierdat ;; put hierarchial sorted list here + tests ;; hash of id => testdat + ((tests-by-name (make-hash-table)) : hash-table) ;; hash of testfullname => testdat + key-vals + ((last-update 0) : number) ;; last query to db got records from before last-update + ((last-db-time 0) : number) ;; last timestamp on megatest.db + ((data-changed #f) : boolean) + ((run-data-offset 0) : number) ;; get only 100 items per call, set back to zero when received less than 100 items + (db-path #f)) + ;;====================================================================== ;; D O T F I L E ;;====================================================================== @@ -72,11 +146,11 @@ ;; (define (dcommon:modifiy-if-different mtrx cell-name new-val prev-changed) (let ((curr-val (iup:attribute mtrx cell-name))) (if (not (equal? curr-val new-val)) (begin - (iup:attribute-set! mtrx cell-name col-name) + (iup:attribute-set! mtrx cell-name new-val) ;; was col-name #t) ;; need a re-draw prev-changed))) ;; TO-DO @@ -85,187 +159,187 @@ ;; 3. Add extraction of filters to synchash calls ;; ;; NOTE: Used in newdashboard ;; ;; Mode is 'full or 'incremental for full refresh or incremental refresh -(define (dcommon:run-update keys data runname keypatts testpatt states statuses mode window-id) - (let* (;; count and offset => #f so not used - ;; the synchash calls modify the "data" hash - (changed #f) - (get-runs-sig (conc (client:get-signature) " get-runs")) - (get-tests-sig (conc (client:get-signature) " get-tests")) - (get-details-sig (conc (client:get-signature) " get-test-details")) - - ;; test-ids to get and display are indexed on window-id in curr-test-ids hash - (test-ids (hash-table-values (dboard:tabdat-curr-test-ids data))) - ;; run-id is #f in next line to send the query to server 0 - (run-changes (synchash:client-get 'db:get-runs get-runs-sig (length keypatts) data #f runname #f #f keypatts)) - (tests-detail-changes (if (not (null? test-ids)) - (synchash:client-get 'db:get-test-info-by-ids get-details-sig 0 data #f test-ids) - '())) - - ;; Now can calculate the run-ids - (run-hash (hash-table-ref/default data get-runs-sig #f)) - (run-ids (if run-hash (filter number? (hash-table-keys run-hash)) '())) - - (all-test-changes (let ((res (make-hash-table))) - (for-each (lambda (run-id) - (if (> run-id 0) - (hash-table-set! res run-id (synchash:client-get 'db:get-tests-for-run-mindata get-tests-sig 0 data run-id 1 testpatt states statuses #f)))) - run-ids) - res)) - (runs-hash (hash-table-ref/default data get-runs-sig #f)) - (header (hash-table-ref/default runs-hash "header" #f)) - (run-ids (sort (filter number? (hash-table-keys runs-hash)) - (lambda (a b) - (let* ((record-a (hash-table-ref runs-hash a)) - (record-b (hash-table-ref runs-hash b)) - (time-a (db:get-value-by-header record-a header "event_time")) - (time-b (db:get-value-by-header record-b header "event_time"))) - (> time-a time-b))) - )) - (runid-to-col (hash-table-ref *cachedata* "runid-to-col")) - (testname-to-row (hash-table-ref *cachedata* "testname-to-row")) - (colnum 1) - (rownum 0) - (cellname (conc rownum ":" colnum))) ;; rownum = 0 is the header -;; (debug:print 0 *default-log-port* "test-ids " test-ids ", tests-detail-changes " tests-detail-changes) - - ;; tests related stuff - ;; (all-testnames (delete-duplicates (map db:test-get-testname test-changes)))) - - ;; Given a run-id and testname/item_path calculate a cell R:C - - ;; NOTE: Also build the test tree browser and look up table - ;; - ;; Each run is unique on its keys and runname or run-id, store in hash on colnum - (for-each (lambda (run-id) - (let* ((run-record (hash-table-ref/default runs-hash run-id #f)) - (key-vals (map (lambda (key)(db:get-value-by-header run-record header key)) - keys)) - (run-name (db:get-value-by-header run-record header "runname")) - (col-name (conc (string-intersperse key-vals "\n") "\n" run-name)) - (run-path (append key-vals (list run-name)))) - (hash-table-set! (dboard:tabdat-run-keys data) run-id run-path) - ;; modify cell - but only if changed - (set! changed (dcommon:modifiy-if-different (dboard:tabdat-runs-matrix data) cellname col-name changed)) - (hash-table-set! runid-to-col run-id (list colnum run-record)) - ;; Here we update the tests treebox and tree keys - (tree:add-node (dboard:tabdat-tests-tree data) "Runs" (append key-vals (list run-name)) - userdata: (conc "run-id: " run-id)) - (set! colnum (+ colnum 1)))) - run-ids) - - ;; Scan all tests to be displayed and organise all the test names, respecting what is in the hash table - ;; Do this analysis in the order of the run-ids, the most recent run wins - (for-each (lambda (run-id) - (let* ((run-path (hash-table-ref (dboard:tabdat-run-keys data) run-id)) - (test-changes (hash-table-ref all-test-changes run-id)) - (new-test-dat (car test-changes)) - (removed-tests (cadr test-changes)) - (tests (sort (map cadr (filter (lambda (testrec) - (eq? run-id (db:mintest-get-run_id (cadr testrec)))) - new-test-dat)) - (lambda (a b) - (let ((time-a (db:mintest-get-event_time a)) - (time-b (db:mintest-get-event_time b))) - (> time-a time-b))))) - ;; test-changes is a list of (( id record ) ... ) - ;; Get list of test names sorted by time, remove tests - (test-names (delete-duplicates (map (lambda (t) - (let ((i (db:mintest-get-item_path t)) - (n (db:mintest-get-testname t))) - (if (string=? i "") - (conc " " i) - n))) - tests))) - (colnum (car (hash-table-ref runid-to-col run-id)))) - ;; for each test name get the slot if it exists and fill in the cell - ;; or take the next slot and fill in the cell, deal with items in the - ;; run view panel? The run view panel can have a tree selector for - ;; browsing the tests/items - - ;; SWITCH THIS TO USING CHANGED TESTS ONLY - (for-each (lambda (test) - (let* ((test-id (db:mintest-get-id test)) - (state (db:mintest-get-state test)) - (status (db:mintest-get-status test)) - (testname (db:mintest-get-testname test)) - (itempath (db:mintest-get-item_path test)) - (fullname (conc testname "/" itempath)) - (dispname (if (string=? itempath "") testname (conc " " itempath))) - (rownum (hash-table-ref/default testname-to-row fullname #f)) - (test-path (append run-path (if (equal? itempath "") - (list testname) - (list testname itempath)))) - (tb (dboard:tabdat-tests-tree data))) - (print "INFONOTE: run-path: " run-path) - (tree:add-node (dboard:tabdat-tests-tree data) "Runs" - test-path - userdata: (conc "test-id: " test-id)) - (let ((node-num (tree:find-node tb (cons "Runs" test-path))) - (color (car (gutils:get-color-for-state-status state status)))) - (debug:print 0 *default-log-port* "node-num: " node-num ", color: " color) - - (set! changed (dcommon:modifiy-if-different - tb - (conc "COLOR" node-num) - color changed)) - - ;; (iup:attribute-set! tb (conc "COLOR" node-num) color) - ) - (hash-table-set! (dboard:tabdat-path-test-ids data) test-path test-id) - (if (not rownum) - (let ((rownums (hash-table-values testname-to-row))) - (set! rownum (if (null? rownums) - 1 - (+ 1 (common:max rownums)))) - (hash-table-set! testname-to-row fullname rownum) - ;; create the label - (set! changed (dcommon:modifiy-if-different - (dboard:tabdat-runs-matrix data) - (conc rownum ":" 0) - dispname - changed)) - ;; (iup:attribute-set! (dboard:tabdat-runs-matrix data) - ;; (conc rownum ":" 0) dispname) - )) - ;; set the cell text and color - ;; (debug:print 2 *default-log-port* "rownum:colnum=" rownum ":" colnum ", state=" status) - (set! changed (dcommon:modifiy-if-different - (dboard:tabdat-runs-matrix data) - (conc rownum ":" colnum) - (if (member state '("ARCHIVED" "COMPLETED")) - status - state) - changed)) - ;; (iup:attribute-set! (dboard:tabdat-runs-matrix data) - ;; (conc rownum ":" colnum) - ;; (if (member state '("ARCHIVED" "COMPLETED")) - ;; status - ;; state)) - (set! changed (dcommon:modifiy-if-different - (dboard:tabdat-runs-matrix data) - (conc "BGCOLOR" rownum ":" colnum) - (car (gutils:get-color-for-state-status state status)) - changed)) - ;; (iup:attribute-set! (dboard:tabdat-runs-matrix data) - ;; (conc "BGCOLOR" rownum ":" colnum) - ;; (car (gutils:get-color-for-state-status state status))) - )) - tests))) - run-ids) - - (let ((updater (hash-table-ref/default (dboard:commondat-updaters commondat) window-id #f))) - (if updater (updater (hash-table-ref/default data get-details-sig #f)))) - - (if changed (iup:attribute-set! (dboard:tabdat-runs-matrix data) "REDRAW" "ALL")) - ;; (debug:print 2 *default-log-port* "run-changes: " run-changes) - ;; (debug:print 2 *default-log-port* "test-changes: " test-changes) - (list run-changes all-test-changes))) - -(define (dcommon:runsdat-get-col-num dat target runname force-set) +;; (define (dcommon:run-update keys data runname keypatts testpatt states statuses mode window-id) +;; (let* (;; count and offset => #f so not used +;; ;; the synchash calls modify the "data" hash +;; (changed #f) +;; (get-runs-sig (conc (client:get-signature) " get-runs")) +;; (get-tests-sig (conc (client:get-signature) " get-tests")) +;; (get-details-sig (conc (client:get-signature) " get-test-details")) +;; +;; ;; test-ids to get and display are indexed on window-id in curr-test-ids hash +;; (test-ids (hash-table-values (dboard:tabdat-curr-test-ids data))) +;; ;; run-id is #f in next line to send the query to server 0 +;; (run-changes (synchash:client-get 'db:get-runs get-runs-sig (length keypatts) data #f runname #f #f keypatts)) +;; (tests-detail-changes (if (not (null? test-ids)) +;; (synchash:client-get 'db:get-test-info-by-ids get-details-sig 0 data #f test-ids) +;; '())) +;; +;; ;; Now can calculate the run-ids +;; (run-hash (hash-table-ref/default data get-runs-sig #f)) +;; (run-ids (if run-hash (filter number? (hash-table-keys run-hash)) '())) +;; +;; (all-test-changes (let ((res (make-hash-table))) +;; (for-each (lambda (run-id) +;; (if (> run-id 0) +;; (hash-table-set! res run-id (synchash:client-get 'db:get-tests-for-run-mindata get-tests-sig 0 data run-id 1 testpatt states statuses #f)))) +;; run-ids) +;; res)) +;; (runs-hash (hash-table-ref/default data get-runs-sig #f)) +;; (header (hash-table-ref/default runs-hash "header" #f)) +;; (run-ids (sort (filter number? (hash-table-keys runs-hash)) +;; (lambda (a b) +;; (let* ((record-a (hash-table-ref runs-hash a)) +;; (record-b (hash-table-ref runs-hash b)) +;; (time-a (db:get-value-by-header record-a header "event_time")) +;; (time-b (db:get-value-by-header record-b header "event_time"))) +;; (> time-a time-b))) +;; )) +;; (runid-to-col (hash-table-ref *cachedata* "runid-to-col")) +;; (testname-to-row (hash-table-ref *cachedata* "testname-to-row")) +;; (colnum 1) +;; (rownum 0) +;; (cellname (conc rownum ":" colnum))) ;; rownum = 0 is the header +;; ;; (debug:print 0 *default-log-port* "test-ids " test-ids ", tests-detail-changes " tests-detail-changes) +;; +;; ;; tests related stuff +;; ;; (all-testnames (delete-duplicates (map db:test-get-testname test-changes)))) +;; +;; ;; Given a run-id and testname/item_path calculate a cell R:C +;; +;; ;; NOTE: Also build the test tree browser and look up table +;; ;; +;; ;; Each run is unique on its keys and runname or run-id, store in hash on colnum +;; (for-each (lambda (run-id) +;; (let* ((run-record (hash-table-ref/default runs-hash run-id #f)) +;; (key-vals (map (lambda (key)(db:get-value-by-header run-record header key)) +;; keys)) +;; (run-name (db:get-value-by-header run-record header "runname")) +;; (col-name (conc (string-intersperse key-vals "\n") "\n" run-name)) +;; (run-path (append key-vals (list run-name)))) +;; (hash-table-set! (dboard:tabdat-run-keys data) run-id run-path) +;; ;; modify cell - but only if changed +;; (set! changed (dcommon:modifiy-if-different (dboard:tabdat-runs-matrix data) cellname col-name changed)) +;; (hash-table-set! runid-to-col run-id (list colnum run-record)) +;; ;; Here we update the tests treebox and tree keys +;; (tree:add-node (dboard:tabdat-tests-tree data) "Runs" (append key-vals (list run-name)) +;; userdata: (conc "run-id: " run-id)) +;; (set! colnum (+ colnum 1)))) +;; run-ids) +;; +;; ;; Scan all tests to be displayed and organise all the test names, respecting what is in the hash table +;; ;; Do this analysis in the order of the run-ids, the most recent run wins +;; (for-each (lambda (run-id) +;; (let* ((run-path (hash-table-ref (dboard:tabdat-run-keys data) run-id)) +;; (test-changes (hash-table-ref all-test-changes run-id)) +;; (new-test-dat (car test-changes)) +;; (removed-tests (cadr test-changes)) +;; (tests (sort (map cadr (filter (lambda (testrec) +;; (eq? run-id (db:mintest-get-run_id (cadr testrec)))) +;; new-test-dat)) +;; (lambda (a b) +;; (let ((time-a (db:mintest-get-event_time a)) +;; (time-b (db:mintest-get-event_time b))) +;; (> time-a time-b))))) +;; ;; test-changes is a list of (( id record ) ... ) +;; ;; Get list of test names sorted by time, remove tests +;; (test-names (delete-duplicates (map (lambda (t) +;; (let ((i (db:mintest-get-item_path t)) +;; (n (db:mintest-get-testname t))) +;; (if (string=? i "") +;; (conc " " i) +;; n))) +;; tests))) +;; (colnum (car (hash-table-ref runid-to-col run-id)))) +;; ;; for each test name get the slot if it exists and fill in the cell +;; ;; or take the next slot and fill in the cell, deal with items in the +;; ;; run view panel? The run view panel can have a tree selector for +;; ;; browsing the tests/items +;; +;; ;; SWITCH THIS TO USING CHANGED TESTS ONLY +;; (for-each (lambda (test) +;; (let* ((test-id (db:mintest-get-id test)) +;; (state (db:mintest-get-state test)) +;; (status (db:mintest-get-status test)) +;; (testname (db:mintest-get-testname test)) +;; (itempath (db:mintest-get-item_path test)) +;; (fullname (conc testname "/" itempath)) +;; (dispname (if (string=? itempath "") testname (conc " " itempath))) +;; (rownum (hash-table-ref/default testname-to-row fullname #f)) +;; (test-path (append run-path (if (equal? itempath "") +;; (list testname) +;; (list testname itempath)))) +;; (tb (dboard:tabdat-tests-tree data))) +;; (print "INFONOTE: run-path: " run-path) +;; (tree:add-node (dboard:tabdat-tests-tree data) "Runs" +;; test-path +;; userdata: (conc "test-id: " test-id)) +;; (let ((node-num (tree:find-node tb (cons "Runs" test-path))) +;; (color (car (gutils:get-color-for-state-status state status)))) +;; (debug:print 0 *default-log-port* "node-num: " node-num ", color: " color) +;; +;; (set! changed (dcommon:modifiy-if-different +;; tb +;; (conc "COLOR" node-num) +;; color changed)) +;; +;; ;; (iup:attribute-set! tb (conc "COLOR" node-num) color) +;; ) +;; (hash-table-set! (dboard:tabdat-path-test-ids data) test-path test-id) +;; (if (not rownum) +;; (let ((rownums (hash-table-values testname-to-row))) +;; (set! rownum (if (null? rownums) +;; 1 +;; (+ 1 (common:max rownums)))) +;; (hash-table-set! testname-to-row fullname rownum) +;; ;; create the label +;; (set! changed (dcommon:modifiy-if-different +;; (dboard:tabdat-runs-matrix data) +;; (conc rownum ":" 0) +;; dispname +;; changed)) +;; ;; (iup:attribute-set! (dboard:tabdat-runs-matrix data) +;; ;; (conc rownum ":" 0) dispname) +;; )) +;; ;; set the cell text and color +;; ;; (debug:print 2 *default-log-port* "rownum:colnum=" rownum ":" colnum ", state=" status) +;; (set! changed (dcommon:modifiy-if-different +;; (dboard:tabdat-runs-matrix data) +;; (conc rownum ":" colnum) +;; (if (member state '("ARCHIVED" "COMPLETED")) +;; status +;; state) +;; changed)) +;; ;; (iup:attribute-set! (dboard:tabdat-runs-matrix data) +;; ;; (conc rownum ":" colnum) +;; ;; (if (member state '("ARCHIVED" "COMPLETED")) +;; ;; status +;; ;; state)) +;; (set! changed (dcommon:modifiy-if-different +;; (dboard:tabdat-runs-matrix data) +;; (conc "BGCOLOR" rownum ":" colnum) +;; (car (gutils:get-color-for-state-status state status)) +;; changed)) +;; ;; (iup:attribute-set! (dboard:tabdat-runs-matrix data) +;; ;; (conc "BGCOLOR" rownum ":" colnum) +;; ;; (car (gutils:get-color-for-state-status state status))) +;; )) +;; tests))) +;; run-ids) +;; +;; (let ((updater (hash-table-ref/default (dboard:commondat-updaters commondat) window-id #f))) +;; (if updater (updater (hash-table-ref/default data get-details-sig #f)))) +;; +;; (if changed (iup:attribute-set! (dboard:tabdat-runs-matrix data) "REDRAW" "ALL")) +;; ;; (debug:print 2 *default-log-port* "run-changes: " run-changes) +;; ;; (debug:print 2 *default-log-port* "test-changes: " test-changes) +;; (list run-changes all-test-changes))) + +#;(define (dcommon:runsdat-get-col-num dat target runname force-set) (let* ((runs-index (dboard:runsdat-runs-index dat)) (col-name (conc target "/" runname)) (res (hash-table-ref/default runs-index col-name #f))) (if res res @@ -272,11 +346,11 @@ (if force-set (let ((max-col-num (+ 1 (common:max (cons-1 (hash-table-values runs-index)))))) (hash-table-set! runs-index col-name max-col-num) max-col-num))))) -(define (dcommon:runsdat-get-row-num dat testname itempath force-set) +#;(define (dcommon:runsdat-get-row-num dat testname itempath force-set) (let* ((tests-index (dboard:runsdat-runs-index dat)) (row-name (conc testname "/" itempath)) (res (hash-table-ref/default runs-index row-name #f))) (if res res @@ -313,11 +387,12 @@ (let* ((test-id (db:test-get-id hed)) ;; look at the tests-dat spec for locations (test-name (db:test-get-testname hed)) (item-path (db:test-get-item-path hed)) (state (db:test-get-state hed)) (status (db:test-get-status hed)) - (newitem (list test-name item-path (list test-id state status)))) + (event-time (db:test-get-event_time hed)) + (newitem (list test-name item-path (list test-id state status event-time)))) (if (null? tal) (reverse (cons newitem res)) (loop (car tal)(cdr tal)(cons newitem res))))))) (define (dcommon:tests-mindat->hash tests-mindat) @@ -333,11 +408,14 @@ ;; return 1 if status1 is better ;; return 0 if status1 and 2 are equally good ;; return -1 if status2 is better (define (dcommon:status-compare3 status1 status2) (let* - ((status-goodness-ranking (list "PASS" "WARN" "WAIVED" "SKIP" "FAIL" "ABORT" #f)) + ((status-goodness-ranking (cdr ;; cdr to drop first item -- "n/a" + (append (map cadr *common:std-statuses*) + '(#f)) ;; algorithm requres last item to be #f + ) ) (mem1 (member status1 status-goodness-ranking)) (mem2 (member status2 status-goodness-ranking)) ) (cond ((and (not mem1) (not mem2)) 0) @@ -435,11 +513,11 @@ (debug:print 2 "ERROR: No test data found for test " test-id ", exiting") (exit 1)) (let* ((rundir (if testdat (db:test-get-rundir testdat) - logfile)) + (current-directory))) ;; logfile)) (testfullname (if testdat (db:test-get-fullname testdat) "Gathering data ...")) (xterm (lambda () (if (directory-exists? rundir) (let* ((shell (if (get-environment-variable "SHELL") (conc "-e " (get-environment-variable "SHELL")) @@ -491,11 +569,11 @@ (define (dcommon:section-matrix rawconfig sectionname varcolname valcolname #!key (title #f)) (let* ((curr-row-num 1) (key-vals (configf:section-vars rawconfig sectionname)) (section-matrix (iup:matrix #:alignment1 "ALEFT" - #:expand "YES" ;; "HORIZONTAL" + ;; #:expand "YES" ;; "HORIZONTAL" #:numcol 1 #:numlin (length key-vals) #:numcol-visible 1 #:numlin-visible (min 10 (length key-vals)) #:scrollbar "YES"))) @@ -538,70 +616,74 @@ ;; Megatest version (iup:attribute-set! general-matrix "2:0" "Version") (iup:attribute-set! general-matrix "2:1" (conc megatest-version "-" (substring megatest-fossil-hash 0 4))) general-matrix)) + +(define (dcommon:stats-updater commondat tabdat stats-matrix) + (if (and (iup:ihandle? stats-matrix) + (dashboard:database-changed? commondat tabdat context-key: 'run-stats)) + (let* ((changed #f) + (run-stats (rmt:get-run-stats)) + (indices (common:sparse-list-generate-index run-stats)) ;; proc: set-cell)) + (row-indices (car indices)) + (col-indices (cadr indices)) + (max-row (if (null? row-indices) 1 (common:max (map cadr row-indices)))) + (max-col (if (null? col-indices) 1 + (common:max (map cadr col-indices)))) + (max-visible (max (- (dboard:tabdat-num-tests tabdat) 15) 3)) + (max-col-vis (if (> max-col 10) 10 max-col)) + (numrows 1) + (numcols 1)) + (iup:attribute-set! stats-matrix "CLEARVALUE" "CONTENTS") + (iup:attribute-set! stats-matrix "NUMCOL" max-col ) + (iup:attribute-set! stats-matrix "NUMLIN" (if (< max-row max-visible) max-visible max-row)) ;; min of 20 + (iup:attribute-set! stats-matrix "NUMCOL_VISIBLE" max-col-vis) + (iup:attribute-set! stats-matrix "NUMLIN_VISIBLE" (if (> max-row max-visible) max-visible max-row)) + ;;(print "row-indices: " row-indices " col-indices: " col-indices) + ;; Row labels + (for-each (lambda (ind) + (let* ((name (car ind)) + (num (cadr ind)) + (key (conc num ":0"))) + (if (not (equal? (iup:attribute stats-matrix key) name)) + (begin + (set! changed #t) + (iup:attribute-set! stats-matrix key name))))) + row-indices) + + ;; Col labels + (for-each (lambda (ind) + (let* ((name (car ind)) + (num (cadr ind)) + (key (conc "0:" num))) + (if (not (equal? (iup:attribute stats-matrix key) name)) + (begin + (set! changed #t) + (iup:attribute-set! stats-matrix key name))))) + col-indices) + + ;; Cell contents + (for-each (lambda (entry) + (let* ((row-name (car entry)) + (col-name (cadr entry)) + (value (caddr entry)) + (row-num (cadr (assoc row-name row-indices))) + (col-num (cadr (assoc col-name col-indices))) + (key (conc row-num ":" col-num))) + (if (not (equal? (iup:attribute stats-matrix key) value)) + (begin + (set! changed #t) + (iup:attribute-set! stats-matrix key value))))) + run-stats) + (if changed (iup:attribute-set! stats-matrix "REDRAW" "ALL"))))) + (define (dcommon:run-stats commondat tabdat #!key (tab-num #f)) (let* ((stats-matrix (iup:matrix expand: "YES")) - (changed #f) (stats-updater (lambda () - (if (dashboard:database-changed? commondat tabdat context-key: 'run-stats) - (let* ((run-stats (rmt:get-run-stats)) - (indices (common:sparse-list-generate-index run-stats)) ;; proc: set-cell)) - (row-indices (car indices)) - (col-indices (cadr indices)) - (max-row (if (null? row-indices) 1 (common:max (map cadr row-indices)))) - (max-col (if (null? col-indices) 1 - (common:max (map cadr col-indices)))) - (max-visible (max (- (dboard:tabdat-num-tests tabdat) 15) 3)) - (max-col-vis (if (> max-col 10) 10 max-col)) - (numrows 1) - (numcols 1)) - (iup:attribute-set! stats-matrix "CLEARVALUE" "CONTENTS") - (iup:attribute-set! stats-matrix "NUMCOL" max-col ) - (iup:attribute-set! stats-matrix "NUMLIN" (if (< max-row max-visible) max-visible max-row)) ;; min of 20 - (iup:attribute-set! stats-matrix "NUMCOL_VISIBLE" max-col-vis) - (iup:attribute-set! stats-matrix "NUMLIN_VISIBLE" (if (> max-row max-visible) max-visible max-row)) - - ;; Row labels - (for-each (lambda (ind) - (let* ((name (car ind)) - (num (cadr ind)) - (key (conc num ":0"))) - (if (not (equal? (iup:attribute stats-matrix key) name)) - (begin - (set! changed #t) - (iup:attribute-set! stats-matrix key name))))) - row-indices) - - ;; Col labels - (for-each (lambda (ind) - (let* ((name (car ind)) - (num (cadr ind)) - (key (conc "0:" num))) - (if (not (equal? (iup:attribute stats-matrix key) name)) - (begin - (set! changed #t) - (iup:attribute-set! stats-matrix key name))))) - col-indices) - - ;; Cell contents - (for-each (lambda (entry) - (let* ((row-name (car entry)) - (col-name (cadr entry)) - (value (caddr entry)) - (row-num (cadr (assoc row-name row-indices))) - (col-num (cadr (assoc col-name col-indices))) - (key (conc row-num ":" col-num))) - (if (not (equal? (iup:attribute stats-matrix key) value)) - (begin - (set! changed #t) - (iup:attribute-set! stats-matrix key value))))) - run-stats) - (if changed (iup:attribute-set! stats-matrix "REDRAW" "ALL"))) - )))) + (dcommon:stats-updater commondat tabdat stats-matrix)))) ;; (dboard:commondat-please-update-set! commondat #t) ;; force redraw on first pass ;; (mark-for-update tabdat) ;; (stats-updater) (dboard:commondat-add-updater commondat stats-updater tab-num: tab-num) ;; (set! dashboard:update-summary-tab updater) @@ -709,11 +791,11 @@ (iup:menu-item "Files" (iup:menu ;; Note that you can use either #:action or action: for options (iup:menu-item "Open" action: (lambda (obj) (let* ((area-name (iup:textbox #:expand "HORIZONTAL")) (fd (iup:file-dialog #:dialogtype "DIR")) (top (iup:show fd #:modal? "YES"))) - (iup:attribute-set! source-tb "VALUE" + (iup:attribute-set! area-name "VALUE" ;; was source-tb, no idea what is correct (iup:attribute fd "VALUE")) (iup:destroy! fd)))) ;; (lambda (obj) ;; (iup:show (iup:file-dialog)) ;; (print "File->open " obj))) @@ -871,14 +953,13 @@ (+ yoffset (* y scalef))) ;; sizex, sizey - canvas size ;; originx, originy - canvas origin ;; -(define (dcommon:initial-draw-tests cnv xadj yadj sizex sizey sizexmm sizeymm originx originy tests-draw-state sorted-testnames test-records) - (let* ((dot-data ;; (map cdr (filter - ;; (lambda (x)(equal? "node" (car x))) - (map string-split (tests:lazy-dot test-records "plain" sizex sizey))) ;; (tests:easy-dot test-records "plain"))) +(define (dcommon:initial-draw-tests cnv xadj yadj sizex sizey sizexmm sizeymm originx originy + tests-draw-state sorted-testnames test-records) + (let* ((dot-data (tests:lazy-dot test-records "plain" sizex sizey 'munged)) (xoffset (dcommon:get-xoffset tests-draw-state sizex xadj)) (yoffset (dcommon:get-yoffset tests-draw-state sizey yadj)) (no-dot (configf:lookup *configdat* "setup" "nodot")) (boxh 15) (boxw 10) @@ -933,24 +1014,28 @@ (lambda (x y) (list (+ x 0) ;; xtorig) (+ y 0))) ;; ytorig))) #f #f)) ;; process polyline edges)))) - (llx (if no-dot + (cx (if no-dot ;; this is the centerpoint! curr-x (string->number (list-ref nodedat 2)))) - (lly (if no-dot + (cy (if no-dot curr-y (string->number (list-ref nodedat 3)))) (boxw (if no-dot boxw (string->number (list-ref nodedat 4)))) (boxh (if no-dot boxh (string->number (list-ref nodedat 5)))) - (urx (+ llx boxw)) - (ury (+ lly boxh))) + (boxw/2 (/ boxw 2)) + (boxh/2 (/ boxh 2)) + (urx (+ cx boxw/2)) + (ury (+ cy boxh/2)) + (llx (- cx boxw/2)) + (lly (- cy boxh/2))) ;; if we are in no-dot mode then increment curr-x and curr-y as needed (if no-dot (begin (cond @@ -1137,28 +1222,29 @@ ;; (apply iup:hbox ;; (let* ((dat (dashboard:update-target-selector tabdat action-proc: update-keyvals)) ;; (key-lb (car dat)) ;; (combos (cadr dat))) ;; combos))) - (iup:hbox - ;; Text box for STATES - (iup:frame - #:title "States" - (dashboard:text-list-toggle-box - ;; Move these definitions to common and find the other useages and replace! - (map cadr *common:std-states*) ;; '("COMPLETED" "RUNNING" "STUCK" "INCOMPLETE" "LAUNCHED" "REMOTEHOSTSTART" "KILLED") - (lambda (all) - (dboard:tabdat-states-set! tabdat all) - (dashboard:update-run-command tabdat)))) - ;; Text box for STATES - (iup:frame - #:title "Statuses" - (dashboard:text-list-toggle-box - (map cadr *common:std-statuses*) ;; '("PASS" "FAIL" "n/a" "CHECK" "WAIVED" "SKIP" "DELETED" "STUCK/DEAD") - (lambda (all) - (dboard:tabdat-statuses-set! tabdat all) - (dashboard:update-run-command tabdat))))))) + ;; (iup:hbox + ;; ;; Text box for STATES + ;; (iup:frame + ;; #:title "States" + ;; (dashboard:text-list-toggle-box + ;; ;; Move these definitions to common and find the other useages and replace! + ;; (map cadr *common:std-states*) ;; '("COMPLETED" "RUNNING" "STUCK" "INCOMPLETE" "LAUNCHED" "REMOTEHOSTSTART" "KILLED") + ;; (lambda (all) + ;; (dboard:tabdat-states-set! tabdat all) + ;; (dashboard:update-run-command tabdat)))) + ;; ;; Text box for STATES + ;; (iup:frame + ;; #:title "Statuses" + ;; (dashboard:text-list-toggle-box + ;; (map cadr *common:std-statuses*) ;; '("PASS" "FAIL" "n/a" "CHECK" "WAIVED" "SKIP" "DELETED" "STUCK/DEAD") + ;; (lambda (all) + ;; (dboard:tabdat-statuses-set! tabdat all) + ;; (dashboard:update-run-command tabdat))))) + )) (define (dcommon:command-tests-tasks-canvas tabdat test-records sorted-testnames tests-draw-state) (iup:frame #:title "Tests and Tasks" (let* ((updater #f) @@ -1185,11 +1271,11 @@ (* scalef 0.01) (* scalef -0.01)))) (if the-cnv (dashboard:draw-tests the-cnv last-xadj last-yadj tests-draw-state sorted-testnames test-records)) )) - ;; #:size "50x50" + ;; #:size "250x250" #:expand "YES" #:scrollbar "YES" #:posx "0.5" #:posy "0.5" #:button-cb (lambda (obj btn pressed x y status) @@ -1242,27 +1328,49 @@ ;;====================================================================== ;; S T E P S ;;====================================================================== -(define (dcommon:populate-steps teststeps steps-matrix) - (let ((max-row 0) - (max-col 7)) +(define (dcommon:populate-steps teststeps steps-matrix run-id test-id) + (let* ((max-row 0) + (max-col 9) + (white "255 255 255") + + (testinfo (rmt:get-testinfo-state-status run-id test-id)) + (state (db:test-get-state testinfo)) + (status (db:test-get-status testinfo)) + (test-status-color (car (gutils:get-color-for-state-status state status))) + (running-color (car (gutils:get-color-for-state-status "RUNNING" "STARTED"))) + (failcolor (car (gutils:get-color-for-state-status "COMPLETED" "FAIL")))) (if (null? teststeps) - (iup:attribute-set! steps-matrix "CLEARVALUE" "CONTENTS") + (begin + (iup:attribute-set! steps-matrix "CLEARATTRIB" "CONTENTS") + (iup:attribute-set! steps-matrix "CLEARVALUE" "CONTENTS")) (let loop ((hed (car teststeps)) (tal (cdr teststeps)) (rownum 1) (colnum 1)) (if (> rownum max-row)(set! max-row rownum)) - (let ((val (vector-ref hed (- colnum 1))) - (mtrx-rc (conc rownum ":" colnum))) + (let* ((status (vector-ref hed 3)) + (val (vector-ref hed (- colnum 1))) + (bgcolor (cond + ((member (conc status) '("" "-" "#")) + running-color) + + ((member (conc status) '("0" 0)) + white) + (else test-status-color))) + ; (else failcolor))) + (mtrx-rc (conc rownum ":" colnum))) + ;;(print "BB> status=>"status"< bgcolor="bgcolor) (iup:attribute-set! steps-matrix mtrx-rc (if val (conc val) "")) + (if (< colnum 5) + (iup:attribute-set! steps-matrix (conc "BGCOLOR" mtrx-rc) bgcolor)) (if (< colnum max-col) (loop hed tal rownum (+ colnum 1)) (if (not (null? tal)) - (loop (car tal)(cdr tal)(+ rownum 1) 1)))))) + (loop (car tal) (cdr tal) (+ rownum 1) 1)))))) (if (> max-row 0) (begin ;; we are going to speculatively clear rows until we find a row that is already cleared (let loop ((rownum (+ max-row 1)) (colnum 0) @@ -1290,6 +1398,64 @@ (define (dcommon:run-html-viewer lfilename) (let ((htmlviewercmd (configf:lookup *configdat* "setup" "htmlviewercmd"))) (if htmlviewercmd (system (conc "(" htmlviewercmd " " lfilename " ) &")) (iup:send-url lfilename)))) + +(define (dashboard:monitor-changed? commondat tabdat) + (let* ((run-update-time (current-seconds)) + (monitor-db-path (dboard:tabdat-monitor-db-path tabdat)) + (monitor-modtime (if (and monitor-db-path (common:file-exists? monitor-db-path)) + (file-modification-time monitor-db-path) + -1))) + (if (and (eq? (dboard:commondat-curr-tab-num commondat) 0) + (or (> monitor-modtime *last-monitor-update-time*) + (> (- run-update-time *last-monitor-update-time*) 5))) ;; update every 1/2 minute just in case + (begin + (set! *last-monitor-update-time* run-update-time) ;; monitor-modtime) + #t) + #f))) + +;; DOES NOT WORK RELIABLY WITH /tmp WAL mode files. Timestamps only change when the db +;; is closed (I think). If db dir starts with /tmp always return true +;; +(define (dashboard:database-changed? commondat tabdat #!key (context-key 'default)) + (let* ((run-update-time (current-seconds)) + (dbdir (dboard:tabdat-dbdir tabdat)) + (modtime (dashboard:get-youngest-run-db-mod-time dbdir)) + (recalc (dashboard:recalc modtime + (dboard:commondat-please-update commondat) + (dboard:get-last-db-update tabdat context-key)))) + ;; (dboard:tabdat-last-db-update tabdat)))) + (if recalc + (dboard:set-last-db-update! tabdat context-key run-update-time)) + (dboard:commondat-please-update-set! commondat #f) + recalc)) + +(define (dashboard:get-youngest-run-db-mod-time dbdir) + (handle-exceptions + exn + (begin + (debug:print 2 *default-log-port* "WARNING: error in accessing databases in get-youngest-run-db-mod-time: " ((condition-property-accessor 'exn 'message) exn) + " db-dir="dbdir ", exn=" exn) + (current-seconds)) ;; something went wrong - just print an error and return current-seconds + (common:max (map (lambda (filen) + (file-modification-time filen)) + (glob (conc dbdir "/*.db*")))))) + +(define (dboard:get-last-db-update tabdat context) + (hash-table-ref/default (dboard:tabdat-last-db-update tabdat) context 0)) + +(define (dboard:set-last-db-update! tabdat context newtime) + (hash-table-set! (dboard:tabdat-last-db-update tabdat) context newtime)) + +;; point inside line +;; +(define-inline (dashboard:px-between px lx1 lx2) + (and (< lx1 px)(> lx2 px))) + +(define (dashboard:recalc modtime please-update-buttons last-db-update-time) + (or please-update-buttons + (and ;; (> (current-milliseconds)(+ *last-recalc-ended-time* 150)) ;; can't use this - it needs to be tab specific + (> modtime (- last-db-update-time 3)) ;; add three seconds of margin + (> (current-seconds)(+ last-db-update-time 1))))) DELETED defunct/multi-dboard.scm Index: defunct/multi-dboard.scm ================================================================== --- defunct/multi-dboard.scm +++ /dev/null @@ -1,801 +0,0 @@ -;;====================================================================== -;; Copyright 2006-2013, Matthew Welland. -;; -;; This program is made available under the GNU GPL version 2.0 or -;; greater. See the accompanying file COPYING for details. -;; -;; This program is distributed WITHOUT ANY WARRANTY; without even the -;; implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -;; PURPOSE. -;;====================================================================== - -(use format numbers sql-de-lite srfi-1 posix regex regex-case srfi-69 srfi-18 call-with-environment-variables) -(require-library iup) -(import (prefix iup iup:)) -(use canvas-draw) - -(declare (uses margs)) -(declare (uses megatest-version)) -(declare (uses gutils)) -(declare (uses tree)) -(declare (uses configf)) -(declare (uses portlogger)) -(declare (uses keys)) -(declare (uses common)) - -(include "common_records.scm") -;; (include "db_records.scm") -;; (include "key_records.scm") - -(define help (conc - "Megatest Dashboard, documentation at http://www.kiatoa.com/fossils/megatest - version " megatest-version " - license GPL, Copyright (C) Matt Welland 2011 - -Usage: dashboard [options] - -h : this help - -group groupname : display this group of areas - -test testid : control test identified by testid - -guimonitor : control panel for runs - -Misc - -rows N : set number of rows -")) - -;; process args -(define remargs (args:get-args - (argv) - (list "-group" ;; display this group of areas - "-debug" - ) - (list "-h" - "-v" - "-q" - ) - args:arg-hash - 0)) - -(if (args:get-arg "-h") - (begin - (print help) - (exit))) - -;; (if (args:get-arg "-host") -;; (begin -;; (set! (common:get-remote remote) (string-split (args:get-arg "-host" ":"))) -;; (client:launch)) -;; (client:launch)) - -(define *runremote* #f) -(define *windows* (make-hash-table)) -(define *changed-main* (make-hash-table)) ;; set path/... => #t -(define *changed-mutex* (make-mutex)) ;; use for all incoming change requests -(define *searchpatts* (make-hash-table)) - -(debug:setup) - -(define *tim* (iup:timer)) -(define *ord* #f) - -(iup:attribute-set! *tim* "TIME" 300) -(iup:attribute-set! *tim* "RUN" "YES") - -(define (message-window msg) - (iup:show - (iup:dialog - (iup:vbox - (iup:label msg #:margin "40x40"))))) - -(define (iuplistbox-fill-list lb items . default) - (let ((i 1) - (selected-item (if (null? default) #f (car default)))) - (iup:attribute-set! lb "VALUE" (if selected-item selected-item "")) - (for-each (lambda (item) - (iup:attribute-set! lb (number->string i) item) - (if selected-item - (if (equal? selected-item item) - (iup:attribute-set! lb "VALUE" item))) ;; (number->string i)))) - (set! i (+ i 1))) - items) - i)) - -(define (pad-list l n)(append l (make-list (- n (length l))))) - - -(define (mkstr . x) - (string-intersperse (map conc x) ",")) - -(define (update-search x val) - (hash-table-set! *searchpatts* x val)) - - -;;====================================================================== -;; R E C O R D S -;;====================================================================== - -;; NOTE: Consider switching to defstruct. - -;; data for an area (regression or testsuite) -;; -(define-record areadat - name ;; area name - path ;; mt run area home - configdat ;; megatest config - denoise ;; focal point for not putting out same messages over and over - client-signature ;; key for client-server conversation - remote ;; hash of all the client side connnections - run-keys ;; target keys for this area - runs ;; used in dashboard, hash of run-ids -> rundat - read-only ;; can I write to this area? - monitordb ;; db handle for monitor.db - maindb ;; db handle for main.db - ) - -;; rundat, basic run data -;; -(define-record rundat - id ;; the run-id - target ;; val1/val2 ... corrosponding to run-keys in areadat - runname - state ;; state of the run, symbol - status ;; status of the run, symbol - event-time ;; when the run was initiated - tests ;; hash of test-id -> testdat, QUESTION: separate by run-id? - db ;; db handle - ) - -;; testdat, basic test data -(define-record testdat - run-id ;; what run is this from - id ;; test id - testname ;; test name - itempath ;; item path - state ;; test state, symbol - status ;; test status, symbol - event-time ;; when the test started - duration ;; how long the test took - ) - -;; general data for the dboard application -;; -(define-record data - cfgdat ;; data from ~/.megatest/.dat - areas ;; hash of areaname -> area-rec - current-window-id ;; - current-tab-id ;; - update-needed ;; flag to indicate that the tab pointed to by current tab id needs refreshing immediately - tabs ;; hash of tab-id -> areaname (??) should be of type "tab" - ) - -;; all the components of an area display, all fits into a tab but -;; parts may be swapped in/out as needed -;; -(define-record tab - tree - matrix ;; the spreadsheet - areadat ;; the one-structure (one day dbstruct will be put in here) - view-path ;; //... - view-type ;; standard, etc. - controls ;; the controls - data ;; all the data kept in sync with db - filters ;; user filters, alist name -> filter record, eventually store these in ~/.megatest/.dat? - run-id ;; the current run-id - test-ids ;; the current test id hash, run-id => test-id - command ;; the command from the entry field - headers ;; hash of header -> colnum - rows ;; hash of rowname -> rownum - ) - -(define-record filter - target ;; hash of widgets for the target - runname ;; the runname widget - testpatt ;; the testpatt widget - ) - -;;====================================================================== -;; D B -;;====================================================================== - -;; These are all using sql-de-lite and independent of area so cannot use stuff -;; from db.scm - -;; NB// run-id=#f => return dbdir only -;; -(define (areadb:dbfile-path areadat run-id) - (let* ((cfgdat (areadat-configdat areadat)) - (dbdir (or (configf:lookup cfgdat "setup" "dbdir") - (conc (configf:lookup cfgdat "setup" "linktree") "/.db"))) - (fname (if run-id - (case run-id - ((-1) "monitor.db") - ((0) "main.db") - (else (conc run-id ".db"))) - #f))) - (handle-exceptions - exn - (begin - (debug:print-error 0 *default-log-port* "Couldn't create path to " dbdir) - (exit 1)) - (if (not (directory? dbdir))(create-directory dbdir #t))) - (if fname - (conc dbdir "/" fname) - dbdir))) - -;; -1 => monitor.db -;; 0 => main.db -;; >1 => .db -;; -(define (areadb:open areadat run-id) - (let* ((runs (areadat-runs areadat)) - (rundat (if (> run-id 0) ;; it is a run - (hash-table-ref/default runs run-id #f) - #f)) - (db (case run-id ;; if already opened, get the db and return it - ((-1) (areadat-monitordb areadat)) - ((0) (areadat-maindb areadat)) - (else (if rundat - (rundat-db rundat) - #f))))) - (if db - db ;; merely return the already opened db - (let* ((dbfile (areadb:dbfile-path areadat run-id)) ;; not already opened, so open it - (db (if (file-exists? dbfile) - (open-database dbfile) - (begin - (debug:print-error 0 *default-log-port* "I was asked to open " dbfile ", but file does not exist or is not readable.") - #f)))) - (case run-id - ((-1)(areadat-monitordb-set! areadat db)) - ((0) (areadat-maindb-set! areadat db)) - (else (rundat-db-set! rundat db))) - db)))) - -;; populate the areadat tests info, does NOT fill the tests data itself unless asked -;; -(define (areadb:populate-run-info areadat) - (let* ((runs (or (areadat-runs areadat) (make-hash-table))) - (keys (areadat-run-keys areadat)) - (maindb (areadb:open areadat 0))) - (if maindb - (query (for-each-row (lambda (row) - (let ((id (list-ref row 0)) - (dat (apply make-rundat (append row (list #f #f))))) ;; add placeholders for tests and db - (print row) - (hash-table-set! runs id dat)))) - (sql maindb (conc "SELECT id," - (string-intersperse keys "||'/'||") - ",runname,state,status,event_time FROM runs WHERE state != 'deleted';"))) - (debug:print-error 0 *default-log-port* "no main.db found at " (areadb:dbfile-path areadat 0))) - areadat)) - -;; given an areadat and target/runname patt fill up runs data -;; -;; ?????/ - -;; given a list of run-ids refresh/retrieve runs data into areadat -;; -(define (areadb:fill-tests areadat #!key (run-ids #f)) - (let* ((runs (or (areadat-runs areadat) (make-hash-table)))) - (for-each - (lambda (run-id) - (let* ((rundat (hash-table-ref/default runs run-id #f)) - (tests (if (and rundat - (rundat-tests rundat)) ;; re-use existing hash table? - (rundat-tests rundat) - (let ((ht (make-hash-table))) - (rundat-tests-set! rundat ht) - ht))) - (rundb (areadb:open areadat run-id))) - (query (for-each-row (lambda (row) - (let* ((id (list-ref row 0)) - (testname (list-ref row 1)) - (itempath (list-ref row 2)) - (state (list-ref row 3)) - (status (list-ref row 4)) - (eventtim (list-ref row 5)) - (duration (list-ref row 6))) - (hash-table-set! tests id - (make-testdat run-id id testname itempath state status eventtim duration))))) - (sql rundb "SELECT id,testname,item_path,state,status,event_time,run_duration FROM tests WHERE state != 'DELETED';")))) - (or run-ids (hash-table-keys runs))) - areadat)) - - -;; initialize and refresh data -;; -(define (dboard:general-updater con port) - (for-each - (lambda (window-id) - ;; (print "Processing for window-id " window-id) - (let* ((window-dat (hash-table-ref *windows* window-id)) - (areas (data-areas window-dat)) - ;; (keys (areadat-run-keys area-dat)) - (tabs (data-tabs window-dat)) - (tab-ids (hash-table-keys tabs)) - (current-tab (if (null? tab-ids) - #f - (hash-table-ref tabs (car tab-ids)))) - (current-tree (if (null? tab-ids) #f (tab-tree current-tab))) - (current-node (if (null? tab-ids) 0 (string->number (iup:attribute current-tree "VALUE")))) - (current-path (if (eq? current-node 0) - "Areas" - (string-intersperse (tree:node->path current-tree current-node) "/"))) - (current-matrix (if (null? tab-ids) #f (tab-matrix current-tab))) - (seen-nodes (make-hash-table)) - (path-changed (if current-tab - (equal? current-path (tab-view-path current-tab)) - #t))) - ;; (debug:print-info 0 *default-log-port* "Current path: " current-path) - ;; now for each area in the window gather the data - (if path-changed - (begin - (debug:print-info 0 *default-log-port* "clearing matrix - path changed") - (dboard:clear-matrix current-tab))) - (for-each - (lambda (area-name) - ;; (print "Processing for area-name " area-name) - (let* ((area-dat (hash-table-ref areas area-name)) - (area-path (areadat-path area-dat)) - (runs (areadat-runs area-dat))) - (if (hash-table-ref/default *changed-main* area-path 'processed) - (begin - (print "Processing " area-dat " for area-name " area-name) - (hash-table-set! *changed-main* area-path #f) - (areadb:populate-run-info area-dat) - (for-each - (lambda (run-id) - (let* ((run (hash-table-ref runs run-id)) - (target (rundat-target run)) - (runname (rundat-runname run))) - (if current-tree - (let* ((partial-path (append (string-split target "/")(list runname))) - (full-path (cons area-name partial-path))) - (if (not (hash-table-exists? seen-nodes full-path)) - (begin - (print "INFO: Adding node " partial-path " to section " area-name) - (tree:add-node current-tree "Areas" full-path) - (areadb:fill-tests area-dat run-ids: (list run-id)))) - (hash-table-set! seen-nodes full-path #t))))) - (hash-table-keys runs)))) - (if (or (equal? "Areas" current-path) - (string-match (conc "^Areas/" area-name "(|\\/.*)$") current-path)) - (dboard:redraw-area area-name area-dat current-tab current-matrix current-path)))) - (hash-table-keys areas)))) - (hash-table-keys *windows*))) - -;;====================================================================== -;; D A S H B O A R D D B -;;====================================================================== - -;; All moved to common.scm - -;;====================================================================== -;; T R E E -;;====================================================================== - -;; - - - - - -(define (dashboard:tree-browser data adat window-id) - ;; (iup:split - (let* ((tb (iup:treebox - #:value 0 - #:title "Areas" - #:expand "YES" - #:addexpanded "NO" - #:selection-cb - (lambda (obj id state) - ;; (print "obj: " obj ", id: " id ", state: " state) - (let* ((tree-path (tree:node->path obj id)) - (area (car tree-path)) - (areadat-path (cdr tree-path))) - #f - ;; (test-id (tree-path->test-id (cdr run-path)))) - ;; (if test-id - ;; (hash-table-set! (dboard:data-curr-test-ids *data*) - ;; window-id test-id)) - ;; (print "path: " (tree:node->path obj id) " test-id: " test-id)))))) - ))))) - ;; (iup:attribute-set! tb "VALUE" "0") - ;; (iup:attribute-set! tb "NAME" "Runs") - ;; (iup:attribute-set! tb "ADDEXPANDED" "NO") - ;; (dboard:data-tests-tree-set! *data* tb) - tb)) - -;;====================================================================== -;; M A I N M A T R I X -;;====================================================================== - -;; General displayer -;; -(define (dashboard:main-matrix data adat window-id) - (let* (;; (tab-dat (areadat- - (view-matrix (iup:matrix - ;; (runs-for-targ (db:get-runs-by-patt *dbstruct-local* *keys* "%" target #f #f #f)) - #:expand "YES" - ;; #:fittosize "YES" - #:resizematrix "YES" - #:scrollbar "YES" - #:numcol 100 - #:numlin 100 - #:numcol-visible 3 - #:numlin-visible 20 - #:click-cb (lambda (obj lin col status) - (print "obj: " obj " lin: " lin " col: " col " status: " status " value: " (iup:attribute obj "VALUE")))))) - - ;; (iup:attribute-set! view-matrix "RESIZEMATRIX" "YES") - (iup:attribute-set! view-matrix "WIDTH0" "100") - ;; (dboard:data-runs-matrix-set! *data* runs-matrix) - ;; (iup:hbox - ;; (iup:frame - ;; #:title "Runs browser" - ;; (iup:vbox - view-matrix)) - -;;====================================================================== -;; A R E A S -;;====================================================================== - -(define (dashboard:init-area data area-name apath) - (let* ((mtconf (dboard:read-mtconf apath)) - (area-dat (let ((ad (make-areadat - area-name ;; area name - apath ;; path to area - ;; 'http ;; transport - mtconf ;; megatest.config - (make-hash-table) ;; denoise hash - #f ;; client-signature - #f ;; remote connections - (keys:config-get-fields mtconf) ;; run keys - (make-hash-table) ;; run-id -> (hash of test-ids => dat) - (and (file-exists? apath)(file-write-access? apath)) ;; read-only - #f - #f - ))) - (hash-table-set! (data-areas data) area-name ad) - ad))) - area-dat)) - -;; given the keys for an area and a path from the tree browser -;; return the level: areas area runs run tests test -;; -(define (dboard:get-view-type keys current-path) - (let* ((path-parts (string-split current-path "/")) - (path-len (length path-parts))) - (cond - ((equal? current-path "Areas") 'areas) - ((eq? path-len 2) 'area) - ((<= (+ (length keys) 2) path-len) 'runs) - (else 'run)))) - -(define (dboard:clear-matrix tab) - (if tab - (begin - (iup:attribute-set! (tab-matrix tab) "CLEARVALUE" "ALL") - (tab-headers-set! tab (make-hash-table)) - (tab-rows-set! tab (make-hash-table))))) - -;; full redraw of a given area -;; -(define (dboard:redraw-area area-name area-dat tab-dat current-matrix current-path) - (let* ((keys (areadat-run-keys area-dat)) - (runs (areadat-runs area-dat)) - (headers (tab-headers tab-dat)) - (rows (tab-rows tab-dat)) - (used-cols (hash-table-values headers)) - (used-rows (hash-table-values rows)) - (touched (make-hash-table)) ;; (vector row col) ==> true, touched cell - (view-type (dboard:get-view-type keys current-path)) - (changed #f) - (state-statuses (list "PASS" "FAIL" "WARN" "CHECK" "SKIP" "RUNNING" "LAUNCHED"))) - ;; (debug:print 0 *default-log-port* "current-matrix=" current-matrix) - (case view-type - ((areas) ;; find row for this area, if not found, create new entry - (let* ((curr-rownum (hash-table-ref/default rows area-name #f)) - (next-rownum (+ (apply max (cons 0 used-rows)) 1)) - (rownum (or curr-rownum next-rownum)) - (coord (conc rownum ":0"))) - (if (not curr-rownum)(hash-table-set! rows area-name rownum)) - (if (not (equal? (iup:attribute current-matrix coord) area-name)) - (begin - (let loop ((hed (car state-statuses)) - (tal (cdr state-statuses)) - (count 1)) - (if (not (equal? (iup:attribute current-matrix (conc "0:" count)) hed)) - (iup:attribute-set! current-matrix (conc "0:" count) hed)) - (iup:attribute-set! current-matrix (conc rownum ":" count) "0") - (if (not (null? tal)) - (loop (car tal)(cdr tal)(+ count 1)))) - (debug:print-info 0 *default-log-port* "view-type=" view-type ", rownum=" rownum ", curr-rownum=" curr-rownum ", next-rownum=" next-rownum ", coord=" coord ", area-name=" area-name) - (iup:attribute-set! current-matrix coord area-name) - (set! changed #t)))))) - (if changed (iup:attribute-set! current-matrix "REDRAW" "ALL")))) - - - - ;; (dboard:clear-matrix current-matrix used-cols used-rows touched) ;; clear all - - - -;;====================================================================== -;; D A S H B O A R D -;;====================================================================== - -(define (dashboard:area-panel aname data window-id) - (let* ((apath (configf:lookup (data-cfgdat data) aname "path")) ;; (hash-table-ref (dboard:data-cfgdat data) area-name)) - ;; (hash-table-ref (dboard:data-cfgdat data) aname)) - (area-dat (dashboard:init-area data aname apath)) - (tb (dashboard:tree-browser data area-dat window-id)) ;; (dboard:areas-tree-browser data) - (ad (dashboard:main-matrix data area-dat window-id)) - (areas (data-areas data)) - (dboard-dat (make-tab - #f ;; tree - #f ;; matrix - area-dat ;; - #f ;; view path - 'default ;; view type - #f ;; controls - (make-hash-table) ;; cached data? not sure how to use this yet :) - #f ;; filters - #f ;; the run-id - (make-hash-table) ;; run-id -> test-id, for current test id - "" - (make-hash-table) ;; headername -> colnum - (make-hash-table) ;; rowname -> rownum - ))) - (hash-table-set! (data-areas data) aname area-dat) ;; dboard-dat) - (hash-table-set! (data-tabs data) window-id dboard-dat) - (tab-tree-set! dboard-dat tb) - (tab-matrix-set! dboard-dat ad) - (iup:split - #:value 200 - tb ad))) - - -;; Main Panel -;; -(define (dashboard:main-panel data window-id) - (iup:dialog - #:title "Megatest Control Panel" -;; #:menu (dcommon:main-menu data) - #:shrink "YES" - (iup:vbox - (let* ((area-names (hash-table-keys (data-cfgdat data))) - (area-panels (map (lambda (aname) - (dashboard:area-panel aname data window-id)) - area-names)) - (tabtop (apply iup:tabs - #:tabchangepos-cb (lambda (obj curr prev) - (data-current-tab-id-set! data curr) - (data-update-needed-set! data #t) - (print "Tab is: " curr ", prev was " prev)) - area-panels)) - (tabs (data-tabs data))) - (if (not (null? area-names)) - (let loop ((index 0) - (hed (car area-names)) - (tal (cdr area-names))) - ;; (hash-table-set! tabs index hed) - (debug:print 0 *default-log-port* "Adding area " hed " with index " index " to dashboard") - (iup:attribute-set! tabtop (conc "TABTITLE" index) hed) - (if (not (null? tal)) - (loop (+ index 1)(car tal)(cdr tal))))) - tabtop)))) - - -;;====================================================================== -;; N A N O M S G S E R V E R -;;====================================================================== - -(define (dboard:server-service soc port) - (print "server starting") - (let loop ((msg-in (nn-recv soc)) - (count 0)) - (if (eq? 0 (modulo count 1000)) - (print "server received: " msg-in ", count=" count)) - (cond - ;; - ;; quit - ;; - ((equal? msg-in "quit") - (nn-send soc "Ok, quitting")) - ;; - ;; ping - ;; - ((and (>= (string-length msg-in) 4) - (equal? (substring msg-in 0 4) "ping")) - (nn-send soc (conc (current-process-id))) - (loop (nn-recv soc)(+ count 1))) - ;; - ;; main changed - ;; - ((and (>= (string-length msg-in) 4) - (equal? (substring msg-in 0 4) "main")) - (let ((parts (string-split msg-in " "))) - (hash-table-set! *changed-main* (cadr parts) #t) - (nn-send soc "got it!"))) - ;; - ;; ?? - ;; - (else - (nn-send soc "hello " msg-in " you got to the else clause!"))) - (loop (nn-recv soc)(if (> count 20000000) - 0 - (+ count 1))))) - -(define (dboard:one-time-ping-receive soc port) - (let ((msg-in (nn-recv soc))) - (if (and (>= (string-length msg-in) 4) - (equal? (substring msg-in 0 4) "ping")) - (nn-send soc (conc (current-process-id)))))) - -(define (dboard:server-start given-port #!key (num-tries 200)) - (let* ((rep (nn-socket 'rep)) - (port (or given-port (portlogger:main "find"))) - (con (conc "tcp://*:" port))) - ;; register this connect here .... - (nn-bind rep con) - (thread-start! - (make-thread (lambda () - (dboard:one-time-ping-receive rep port)) - "one time receive thread")) - (if (dboard:ping-self "localhost" port) - (begin - (print "INFO: dashboard nanomsg server started on " port) - (values rep port)) - (begin - (print "WARNING: couldn't create server on port " port) - (portlogger:main "set" "failed") - (if (> num-tries 0) - (dboard:server-start #f (- num-tries 1)) - (begin - (print "ERROR: failed to start nanomsg server") - (values #f #f))))))) - -(define (dboard:server-close con port) - (nn-close con) - (portlogger:main "set" port "released")) - -(define (dboard:ping-self host port #!key (return-socket #t)) - ;; send a random number along with pid and check that we get it back - (let* ((req (nn-socket 'req)) - (key "ping") - (success #f) - (keepwaiting #t) - (ping (make-thread - (lambda () - (print "ping: sending string \"" key "\", expecting " (current-process-id)) - (nn-send req key) - (let ((result (nn-recv req))) - (if (equal? (conc (current-process-id)) result) - (begin - (print "ping, success: received \"" result "\"") - (set! success #t)) - (begin - (print "ping, failed: received key \"" result "\"") - (set! keepwaiting #f) - (set! success #f))))) - "ping")) - (timeout (make-thread (lambda () - (let loop ((count 0)) - (thread-sleep! 1) - (print "still waiting after " count " seconds...") - (if (and keepwaiting (< count 10)) - (loop (+ count 1)))) - (if keepwaiting - (begin - (print "timeout waiting for ping") - (thread-terminate! ping)))) - "timeout"))) - (nn-connect req (conc "tcp://" host ":" port)) - (handle-exceptions - exn - (begin - (print-call-chain) - (print 0 " message: " ((condition-property-accessor 'exn 'message) exn)) - (print "exn=" (condition->list exn)) - (print "ping failed to connect to " host ":" port)) - (thread-start! timeout) - (thread-start! ping) - (thread-join! ping) - (if success (thread-terminate! timeout))) - (if return-socket - (if success req #f) - (begin - (nn-close req) - success)))) - -;;====================================================================== -;; C O N F I G U R A T I O N -;;====================================================================== - -;; Get the configuration file for a group name, if the group name is "default" and it doesn't -;; exist, create it and add the current path if it contains megatest.config -;; -(define (dboard:get-config group-name) - (let* ((fname (conc (getenv "HOME") "/.megatest/" group-name ".dat"))) - (if (file-exists? fname) - (read-config fname (make-hash-table) #t) - (if (dboard:create-config fname) - (dboard:get-config group-name) - (make-hash-table))))) - -(define (dboard:create-config fname) - ;; (handle-exceptions - ;; exn - ;; - ;; #f ;; failed to create - just give up - (let* ((dirname (pathname-directory fname)) - (file-name (pathname-strip-directory fname)) - (curr-mtcfgdat (find-config "megatest.config" - toppath: (or (get-environment-variable "MT_RUN_AREA_HOME")(current-directory)))) - (curr-mtcfg (if (and curr-mtcfgdat (not (null? curr-mtcfgdat)))(cadr curr-mtcfgdat) #f)) - (curr-mtpath (if curr-mtcfg (car curr-mtcfgdat) #f))) - (if curr-mtpath - (begin - (debug:print-info 0 *default-log-port* "Creating config file " fname) - (if (not (file-exists? dirname)) - (create-directory dirname #t)) - (with-output-to-file fname - (lambda () - (let ((aname (pathname-strip-directory curr-mtpath))) - (print "[" aname "]") - (print "path " curr-mtpath)))) - #t) - (begin - (debug:print-info 0 *default-log-port* "Need to create a config but no megatest.config found: " curr-mtcfgdat) - #f)))) -;; ) - -(define (dboard:read-mtconf apath) - (let* ((mtconffile (conc apath "/megatest.config"))) - (call-with-environment-variables - (list (cons "MT_RUN_AREA_HOME" apath)) - (lambda () - (read-config mtconffile (make-hash-table) #f)) ;; megatest.config - ))) - - -;;====================================================================== -;; G U I S T U F F -;;====================================================================== - -;;; main. Theoretically could have multiple windows (each with a group of tags, thus window-id -;;; -(define (dboard:make-window window-id) - (let* (;; (window-id 0) - (groupn (or (args:get-arg "-group") "default")) - (cfgdat (dboard:get-config groupn)) - ;; (cfgdat (if (file-exists? cfname)(read-config cfname (make-hash-table) #t)(make-hash-table))) - (data (make-data - cfgdat ;; this is the data from ~/.megatest for the selected group - (make-hash-table) ;; areaname -> area-rec - 0 ;; current window id - 0 ;; current tab id - #f ;; redraw needed for current tab id - (make-hash-table) ;; tab-id -> areaname - ))) - (hash-table-set! *windows* window-id data) - (iup:show (dashboard:main-panel data window-id)) - (iup:main-loop))) - -;; ease debugging by loading ~/.dashboardrc -(let ((debugcontrolf (conc (get-environment-variable "HOME") "/.dashboardrc"))) - (if (file-exists? debugcontrolf) - (load debugcontrolf))) - -(define (main) - (let-values - (((con port)(dboard:server-start #f))) - (let ((portnum (if (string? port)(string->number port) port))) - ;; got here, monitor/dashboard was started - (mddb:register-dashboard portnum) - (thread-start! (make-thread (lambda ()(dboard:server-service con portnum)) "server service")) - (thread-start! (make-thread (lambda () - (let loop () - (dboard:general-updater con portnum) - (thread-sleep! 1) - (loop))) "general updater")) - (dboard:make-window 0) - (mddb:unregister-dashboard (get-host-name) portnum) - (dboard:server-close con port)))) - DELETED defunct/nmsg-transport.scm Index: defunct/nmsg-transport.scm ================================================================== --- defunct/nmsg-transport.scm +++ /dev/null @@ -1,358 +0,0 @@ - -;; Copyright 2006-2012, Matthew Welland. -;; -;; This program is made available under the GNU GPL version 2.0 or -;; greater. See the accompanying file COPYING for details. -;; -;; This program is distributed WITHOUT ANY WARRANTY; without even the -;; implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -;; PURPOSE. - -(require-extension (srfi 18) extras tcp s11n) - -(use sqlite3 srfi-1 posix regex regex-case srfi-69 hostinfo md5 message-digest) -(import (prefix sqlite3 sqlite3:)) - -;; (use nanomsg) - -(declare (unit nmsg-transport)) - -(declare (uses common)) -(declare (uses db)) -(declare (uses tests)) -(declare (uses tasks)) ;; tasks are where stuff is maintained about what is running. -(declare (uses server)) - -(include "common_records.scm") -(include "db_records.scm") - -;; Transition to pub --> sub with pull <-- push -;; -;; 1. client sends request to server via push to the pull port -;; 2. server puts request in queue or processes immediately as appropriate -;; 3. server puts responses from completed requests into pub port -;; -;; TODO -;; -;; Done Tested -;; [x] [ ] 1. Add columns pullport pubport to servers table -;; [x] [ ] 2. Add rm of monitor.db if older than 11/12/2012 -;; [x] [ ] 3. Add create of pullport and pubport with finding of available ports -;; [x] [ ] 4. Add client compose of request -;; [x] [ ] - name of client: testname/itempath-test_id-hostname -;; [x] [ ] - name of request: callname, params -;; [x] [ ] - request key: f(clientname, callname, params) -;; [x] [ ] 5. Add processing of subscription hits -;; [x] [ ] - done when get key -;; [x] [ ] - return results -;; [x] [ ] 6. Add timeout processing -;; [x] [ ] - after 60 seconds -;; [ ] [ ] i. check server alive, connect to new if necessary -;; [ ] [ ] ii. resend request -;; [ ] [ ] 7. Turn self ping back on - -(define (nmsg-transport:make-server-url hostport #!key (bindall #f)) - (if (not hostport) - #f - (conc "tcp://" (if bindall "*" (car hostport)) ":" (cadr hostport)))) - -(define *server-loop-heart-beat* (current-seconds)) -(define *heartbeat-mutex* (make-mutex)) - -;;====================================================================== -;; S E R V E R -;;====================================================================== - -(define (nmsg-transport:run dbstruct hostn run-id server-id #!key (retrynum 1000)) - (debug:print 2 *default-log-port* "Attempting to start the server ...") - (let* ((start-port (portlogger:open-run-close portlogger:find-port)) - (server-thread (make-thread (lambda () - (nmsg-transport:try-start-server dbstruct run-id start-port server-id)) - "server thread")) - (tdbdat (tasks:open-db))) - (thread-start! server-thread) - (thread-sleep! 0.1) - (if (nmsg-transport:ping hostn start-port timeout: 2 expected-key: (current-process-id)) - (let ((interface (if (equal? hostn "-")(get-host-name) hostn))) - (tasks:server-set-interface-port (db:delay-if-busy tdbdat) server-id interface start-port) - (tasks:server-set-state! (db:delay-if-busy tdbdat) server-id "dbprep") - (set! *server-info* (list hostn start-port)) ;; probably not needed anymore? currently used by keep-running - (thread-sleep! 3) ;; give some margin for queries to complete before switching from file based access to server based access - ;; (set! *inmemdb* dbstruct) - (tasks:server-set-state! (db:delay-if-busy tdbdat) server-id "running") - (thread-start! (make-thread - (lambda ()(nmsg-transport:keep-running server-id run-id)) - "keep running")) - (thread-join! server-thread)) - (if (> retrynum 0) - (begin - (debug:print 0 *default-log-port* "WARNING: Failed to connect to server (self) on host " hostn ":" start-port ", trying again.") - (tasks:server-delete-record (db:delay-if-busy tdbdat) server-id "failed to start, never received server alive signature") - (portlogger:open-run-close portlogger:set-failed start-port) - (nmsg-transport:run dbstruct hostn run-id server-id)) - (begin - (debug:print-error 0 *default-log-port* "could not find an open port to start server on. Giving up") - (exit 1)))))) - -(define (nmsg-transport:try-start-server dbstruct run-id portnum server-id) - (let ((repsoc (nn-socket 'rep))) - (nn-bind repsoc (conc "tcp://*:" portnum)) - (let loop ((msg-in (nn-recv repsoc))) - (let* ((dat (db:string->obj msg-in transport: 'nmsg))) - (debug:print 0 *default-log-port* "server, received: " dat) - (let ((result (api:execute-requests dbstruct dat))) - (debug:print 0 *default-log-port* "server, sending: " result) - (nn-send repsoc (db:obj->string result transport: 'nmsg))) - (loop (nn-recv repsoc)))))) - -;; all routes though here end in exit ... -;; -(define (nmsg-transport:launch run-id) - (let* ((tdbdat (tasks:open-db)) - (dbstruct (db:setup run-id)) - (hostn (or (args:get-arg "-server") "-"))) - (set! *run-id* run-id) - (set! *inmemdb* dbstruct) - ;; with nbfake daemonize isn't really needed - ;; - ;; (if (args:get-arg "-daemonize") - ;; (begin - ;; (daemon:ize) - ;; (if *alt-log-file* ;; we should re-connect to this port, I think daemon:ize disrupts it - ;; (begin - ;; (current-error-port *alt-log-file*) - ;; (current-output-port *alt-log-file*))))) - (if (server:check-if-running run-id) - (begin - (debug:print-info 0 *default-log-port* "Server for run-id " run-id " already running") - (exit 0))) - (let loop ((server-id (tasks:server-lock-slot (db:delay-if-busy tdbdat) run-id)) - (remtries 4)) - (if (not server-id) - (if (> remtries 0) - (begin - (thread-sleep! 2) - (if (not (server:check-if-running run-id)) - (loop (tasks:server-lock-slot (db:delay-if-busy tdbdat) run-id) - (- remtries 1)) - (begin - (debug:print-info 0 *default-log-port* "Another server took the slot, exiting") - (exit 0)))) - (begin - ;; since we didn't get the server lock we are going to clean up and bail out - (debug:print-info 2 *default-log-port* "INFO: server pid=" (current-process-id) ", hostname=" (get-host-name) " not starting due to other candidates ahead in start queue") - (tasks:server-delete-records-for-this-pid (db:delay-if-busy tdbdat) " http-transport:launch") - )) - ;; locked in a server id, try to start up - (nmsg-transport:run dbstruct hostn run-id server-id)) - (set! *didsomething* #t) - (exit)))) - -;;====================================================================== -;; S E R V E R U T I L I T I E S -;;====================================================================== - -(define (nmsg-transport:mk-signature) - (message-digest-string (md5-primitive) - (with-output-to-string - (lambda () - (write (list (current-directory) - (argv))))))) - -;;====================================================================== -;; C L I E N T S -;;====================================================================== - -;; ping the server at host:port -;; return the open socket if successful (return-socket == #t) -;; expect the key expected-key returned in payload -;; send our-key or #f as payload -;; -(define (nmsg-transport:ping hostn port #!key (timeout 3)(return-socket #t)(expected-key #f)(our-key #f)(socket #f)) - ;; send a random number along with pid and check that we get it back - (let* ((host (if (or (not hostn) - (equal? hostn "-")) ;; use localhost - (get-host-name) - hostn)) - (req (or socket - (let ((soc (nn-socket 'req))) - (nn-connect soc (conc "tcp://" host ":" port)) - soc))) - (success #t) - (dat (vector "ping" our-key)) - (result (condition-case - (nmsg-transport:client-api-send-receive-raw req dat timeout: timeout) - ((timeout)(set! success #f) #f))) - (key (if success - (vector-ref result 1) - #f))) - (debug:print 0 *default-log-port* "success=" success ", key=" key ", expected-key=" expected-key ", equal? " (equal? key expected-key)) - (if (and success - (or (not expected-key) ;; just getting a reply is good enough then - (equal? key expected-key))) - (if return-socket - req - (begin - (if (not socket)(nn-close req)) ;; don't want a side effect of closing socket if handed it - #t)) - (begin - (if (not socket)(nn-close req)) ;; failed to ping, close socket as side effect - #f)))) - -;; send data to server, wait max of timeout seconds for a response. -;; return #( success/fail result ) -;; -;; for effiency it is easier to do the obj->string and string->obj here. -;; -(define (nmsg-transport:client-api-send-receive-raw socreq indat #!key (enable-send #t)(timeout 25)) - (let* ((success #f) - (result #f) - (keepwaiting #t) - (dat (db:obj->string indat transport: 'nmsg)) - (send-recv (make-thread - (lambda () - (nn-send socreq dat) - (let* ((res (nn-recv socreq))) - (set! success #t) - (set! result (db:string->obj res transport: 'nmsg)))) - "send-recv")) - (timeout (make-thread - (lambda () - (let loop ((count 0)) - (thread-sleep! 1) - (debug:print-info 1 *default-log-port* "send-receive-raw, still waiting after " count " seconds...") - (if (and keepwaiting (< count timeout)) ;; yes, this is very aproximate - (loop (+ count 1)))) - (if keepwaiting - (begin - (print "timeout waiting for ping") - (thread-terminate! send-recv)))) - "timeout"))) - ;; replace with condition-case? - (handle-exceptions - exn - (set! result "timeout") - (thread-start! timeout) - (thread-start! send-recv) - (thread-join! send-recv) - (if success (thread-terminate! timeout))) - ;; raise timeout error if timed out - (if success - (if (and (vector? result) - (vector-ref result 0)) ;; did it fail at the server? - result ;; nope, all good - (begin - (debug:print-error 0 *default-log-port* "error occured at server, info=" (vector-ref result 2)) - (debug:print 0 *default-log-port* " client call chain:") - (print-call-chain (current-error-port)) - (debug:print 0 *default-log-port* " server call chain:") - (pp (vector-ref result 1) (current-error-port)) - (signal (vector-ref result 0)))) - (signal (make-composite-condition - (make-property-condition 'timeout 'message "nmsg-transport:client-api-send-receive-raw timed out talking to server")))))) - -;; run nmsg-transport:keep-running in a parallel thread to monitor that the db is being -;; used and to shutdown after sometime if it is not. -;; -(define (nmsg-transport:keep-running server-id run-id) - ;; if none running or if > 20 seconds since - ;; server last used then start shutdown - ;; This thread waits for the server to come alive - (let* ((server-info (let loop () - (let ((sdat #f)) - (mutex-lock! *heartbeat-mutex*) - (set! sdat *server-info*) - (mutex-unlock! *heartbeat-mutex*) - (if sdat - (begin - (debug:print-info 0 *default-log-port* "keep-running got sdat=" sdat) - sdat) - (begin - (thread-sleep! 0.5) - (loop)))))) - (iface (car server-info)) - (port (cadr server-info)) - (last-access 0) - (tdbdat (tasks:open-db)) - (server-timeout (let ((tmo (configf:lookup *configdat* "server" "timeout"))) - (if (and (string? tmo) - (string->number tmo)) - (* 60 60 (string->number tmo)) - ;; (* 3 24 60 60) ;; default to three days - (* 60 1) ;; default to one minute - ;; (* 60 60 25) ;; default to 25 hours - )))) - (print "Keep-running got server pid " server-id ", using iface " iface " and port " port) - (let loop ((count 0)) - (thread-sleep! 4) ;; no need to do this very often - ;; NB// sync currently does NOT return queue-length - (let () ;; (queue-len (cdb:client-call server-info 'sync #t 1))) - ;; (print "Server running, count is " count) - (if (< count 1) ;; 3x3 = 9 secs aprox - (loop (+ count 1))) - - (mutex-lock! *heartbeat-mutex*) - (set! last-access *last-db-access*) - (mutex-unlock! *heartbeat-mutex*) - (db:sync-touched *inmemdb* run-id force-sync: #t) - (if (and *server-run* - (> (+ last-access server-timeout) - (current-seconds))) - (begin - (debug:print-info 0 *default-log-port* "Server continuing, seconds since last db access: " (- (current-seconds) last-access)) - (loop 0)) - (begin - (debug:print-info 0 *default-log-port* "Starting to shutdown the server.") - (set! *time-to-exit* #t) - (db:sync-touched *inmemdb* run-id force-sync: #t) - (tasks:server-delete-record (db:delay-if-busy tdbdat) server-id " http-transport:keep-running") - (debug:print-info 0 *default-log-port* "Server shutdown complete. Exiting") - (exit) - )))))) - -;;====================================================================== -;; C L I E N T S -;;====================================================================== - -(define (nmsg-transport:client-connect iface portnum) - (let* ((reqsoc (nmsg-transport:ping iface portnum return-socket: #t))) - (vector iface portnum #f #f #f (current-seconds) reqsoc))) - -;; returns result, there is no sucess/fail flag - handled via excpections -;; -(define (nmsg-transport:client-api-send-receive run-id connection-info cmd param #!key (remtries 5)) - ;; NB// In the html version of this routine there is a call to - ;; tasks:kill-server-run-id when there is an exception - (mutex-lock! *http-mutex*) - (let* ((packet (vector cmd param)) - (reqsoc (http-transport:server-dat-get-socket connection-info)) - (res (nmsg-transport:client-api-send-receive-raw reqsoc packet))) -;; (status (vector-ref rawres 0)) -;; (result (vector-ref rawres 1))) - (mutex-unlock! *http-mutex*) - res)) ;; (vector status (if status (db:string->obj result transport: 'nmsg) result)))) - -;;====================================================================== -;; J U N K -;;====================================================================== - -;; DO NOT USE -;; -(define (nmsg-transport:client-signal-handler signum) - (handle-exceptions - exn - (debug:print 0 *default-log-port* " ... exiting ...") - (let ((th1 (make-thread (lambda () - (if (not *received-response*) - (receive-message* *runremote*))) ;; flush out last call if applicable - "eat response")) - (th2 (make-thread (lambda () - (debug:print-error 0 *default-log-port* "Received ^C, attempting clean exit. Please be patient and wait a few seconds before hitting ^C again.") - (thread-sleep! 3) ;; give the flush three seconds to do it's stuff - (debug:print 0 *default-log-port* " Done.") - (exit 4)) - "exit on ^C timer"))) - (thread-start! th2) - (thread-start! th1) - (thread-join! th2)))) - Index: diff-report.scm ================================================================== --- diff-report.scm +++ diff-report.scm @@ -1,5 +1,22 @@ +;; Copyright 2006-2017, Matthew Welland. +;; +;; This file is part of Megatest. +;; +;; Megatest is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. +;; +;; Megatest is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. +;; +;; You should have received a copy of the GNU General Public License +;; along with Megatest. If not, see . +;; (declare (unit diff-report)) (declare (uses common)) (declare (uses rmt)) Index: docs/Makefile ================================================================== --- docs/Makefile +++ docs/Makefile @@ -1,5 +1,23 @@ +# Copyright 2006-2017, Matthew Welland. +# +# This file is part of Megatest. +# +# Megatest is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Megatest is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Megatest. If not, see . +# + ASCPATH = $(shell which asciidoc) EXEPATH = $(shell readlink -f $(ASCPATH)) BINPATH = $(shell dirname $(EXEPATH)) DISPATH = $(shell dirname $(BINPATH)) @@ -13,5 +31,7 @@ fossil add html/* megatest.pdf : megatest.lyx lyx -e pdf2 megatest.lyx +pkts.pdf : pkts.dot + dot -Tpdf pkts.dot -o pkts.pdf DELETED docs/api.html Index: docs/api.html ================================================================== --- docs/api.html +++ /dev/null @@ -1,1024 +0,0 @@ - - - - - -Megatest Web App API Specificiation - - - - - -
    -
    -
    -

    Megatest Web App

    -
      -
    1. -

      -See runs -

      -
      2. -
    2. -

      -Manage jobs -

      -
      3. -
    3. -

      -Debug -

      -
      4. -
    -
    -
    -
    -

    Example Abstract

    -
    -

    The Megatest Web App aims to make as much of the power of the dashboard available to the web based user.

    -
    -
    -
    -

    1. Common

    -
    -

    This is an example endpoint. You will need to use your own cgi server to serve out your megatest runs.

    -

    Endpoint: http://kiatoa.com/cgi-bin/megatest

    -
    -

    1.1. Error format response

    -

    All API errors are returned in the following format:

    -
    -
    -

    { "error" : "Error message" }

    -
    -
    -
    -

    1.2. Get List of Runs

    -

    URL: <base>/runs

    -

    Method: GET

    -

    Filter Params: target, testpatt, offset, limit

    -

    Megatest Cmd: megatest -start-dir <path to megatest area> -list-runs % -target % -dumpmode json -fields runs:runname,id+tests:state,status:id

    -

    Response:

    -
    -
    -

    [ - { - "run_id" : "1", - "name" : "runname1", - "target" : "target1", - "tests" : - [ - "test": - [ - {"id": 1, "name":test1, "item_path": "", "shortdir": "/temp/foo/bar/target1/runname1/test1", "final_logf": "megatest-rollup-test1.html", "status": "PASS#"} - {"id": 2, "name":test2, "item_path": "", "shortdir": "/temp/foo/bar/target1/runname1/test2", "final_logf": "megatest-rollup-test2.html", "status": "PASS"} - {"id": 3, "name":test3, "item_path": "", "shortdir": "/temp/foo/bar/target1/runname1/test3", "final_logf": "megatest-rollup-test3.html", "status": "PASS"} - ] - ] - }, - { - "run_id" : "2", - "name" : "runname2", - "target" : "target2", - "tests" : - [ - "test: - [ - {"id": 4, "name":[blue]test1, "item_path": "", "shortdir": "/temp/foo/bar/target2/runname2/test1", "final_logf": "megatest-rollup-test1.html", "status": "PASS"} - {"id": 5, "name":[blue]test2, "item_path": "", "shortdir": "/temp/foo/bar/target2/runname2/test2", "final_logf": "megatest-rollup-test2.html", "status": "FAIL"} - {"id": 6, "name":test3, "item_path": "", "shortdir": "/temp/foo/bar/target2/runname2/test3", "final_logf": "megatest-rollup-test3.html", "status": "PASS"} - ] - ] - } -]

    -
    -
    -
    -

    1.3. Trigger a new Run

    -

    URL: <base>/runs

    -

    Method: POST

    -

    Megatest Cmd: megatest -runtests % -target <target> :runname <run_name> -run

    -

    Request Params:

    -
    -
    -

    {"target": "target_value", "runname" : "runname", "test_pattern": "optional test pattern"}

    -
    -

    Response:

    -

    If Error

    -
    -
    -

    { "error" : "Error message" }

    -
    -

    If Success returns the results of the run

    -
    -
    -

    [ - { - "run_id" : "2", - "name" : "runname2", - "target" : "target2", - "tests" : - [ - "test: - [ - {"id": 4, "name":[blue]test1, "item_path": "", "shortdir": "/temp/foo/bar/target2/runname2/test1", "final_logf": "megatest-rollup-test1.html", "status": "PASS"} - {"id": 5, "name":[blue]test2, "item_path": "", "shortdir": "/temp/foo/bar/target2/runname2/test2", "final_logf": "megatest-rollup-test2.html", "status": "FAIL"} - {"id": 6, "name":test3, "item_path": "", "shortdir": "/temp/foo/bar/target2/runname2/test3", "final_logf": "megatest-rollup-test3.html", "status": "PASS"} - ] - ] - } -]

    -
    -
    -
    -

    1.4. Get perticular Run

    -

    URL: <base>/runs/:id

    -

    Method: GET

    -

    Filter Params: testpatt

    -

    Megatest Cmd: megatest -start-dir <path to megatest area> -list-runs <runname> -target % -dumpmode json -fields runs:runname,id+tests:state,status:id

    -

    Response:

    -
    -
    -

    [ - { - "run_id" : "2", - "name" : "runname2", - "target" : "target2", - "tests" : - [ - "test": - [ - {"id": 4, "name":[blue]test1, "item_path": "", "shortdir": "/temp/foo/bar/target2/runname2/test1", "final_logf": "megatest-rollup-test1.html", "status": "PASS"} - {"id": 5, "name":[blue]test2, "item_path": "", "shortdir": "/temp/foo/bar/target2/runname2/test2", "final_logf": "megatest-rollup-test2.html", "status": "FAIL"} - {"id": 6, "name":test3, "item_path": "", "shortdir": "/temp/foo/bar/target2/runname2/test3", "final_logf": "megatest-rollup-test3.html", "status": "PASS"} - ] - ] - } -]

    -
    -
    -
    -

    1.5. Re-execute a run

    -

    URL: <base>/runs/:id

    -

    Method: PUT/PATCH

    -

    Request Params: {"testpatt" : "pattern"}

    -

    Response:

    -
    -
    -

    [ - { - "run_id" : "2", - "name" : "runname2", - "target" : "target2", - "tests" : - [ - "test": - [ - {"id": 4, "name":[blue]test1, "item_path": "", "shortdir": "/temp/foo/bar/target2/runname2/test1", "final_logf": "megatest-rollup-test1.html", "status": "PASS"} - {"id": 5, "name":[blue]test2, "item_path": "", "shortdir": "/temp/foo/bar/target2/runname2/test2", "final_logf": "megatest-rollup-test2.html", "status": "FAIL"} - {"id": 6, "name":test3, "item_path": "", "shortdir": "/temp/foo/bar/target2/runname2/test3", "final_logf": "megatest-rollup-test3.html", "status": "PASS"} - ] - ] - } -]

    -
    -
    -
    -

    1.6. Get List of tests within a run

    -

    URL: <base>/runs/:id/tests

    -

    Method: GET

    -

    Megatest Cmd: megatest -start-dir <path to megatest area> -list-runs <runname> -target % -dumpmode json -fields runs:runname,id+tests:state,status:id

    -

    Response:

    -
    -
    -

    [ - "tests" : - [ - {"id": 4, "name":[blue]test1, "item_path": "", "shortdir": "/temp/foo/bar/target2/runname2/test1", "final_logf": "megatest-rollup-test1.html", "status": "PASS"} - {"id": 5, "name":[blue]test2, "item_path": "", "shortdir": "/temp/foo/bar/target2/runname2/test2", "final_logf": "megatest-rollup-test2.html", "status": "FAIL"} - {"id": 6, "name":test3, "item_path": "", "shortdir": "/temp/foo/bar/target2/runname2/test3", "final_logf": "megatest-rollup-test3.html", "status": "PASS"} - ] -]

    -
    -
    -
    -

    1.7. Re-execute a test within a run

    -

    URL: <base>/runs/:id/tests/:id

    -

    Method: PUT/PATCH

    -

    Response:

    -
    -
    -

    {"id": "4", "name":"test1", "item_path": "", "shortdir": "/temp/foo/bar/target2/runname2/test1", "final_logf": "megatest-rollup-test1.html", "status": "PASS"}

    -
    -
    -
    -

    1.8. Get perticular test that belongs to a Runs

    -

    URL: <base>/runs/:id/tests/:id

    -

    Method: GET

    -

    Megatest Cmd: megatest -start-dir <path to megatest area> -list-runs <runname> -target % -testpattern <pattern> -dumpmode json -fields runs:runname,id+tests:state,status:id

    -

    Response:

    -
    -
    -

    {"id": "4", "name":"test1", "item_path": "", "shortdir": "/temp/foo/bar/target2/runname2/test1", "final_logf": "megatest-rollup-test1.html", "status": "PASS"}

    -
    -
    -
    -
    -
    -

    2. Notes

    -
    -

    Misc …

    -
      -
    1. -

      -blah -

      -
      2. -
    2. -

      -baz -

      -
      3. -
    -
    -
    -
    -
    - - - Index: docs/api.txt ================================================================== --- docs/api.txt +++ docs/api.txt @@ -15,10 +15,29 @@ ---------------- The Megatest Web App aims to make as much of the power of the dashboard available to the web based user. :numbered: + +// Copyright 2006-2017, Matthew Welland. +// +// This file is part of Megatest. +// +// Megatest is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// Megatest is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Megatest. If not, see . + + Common ------ This is an example endpoint. You will need to use your own cgi server to serve out your megatest runs. ADDED docs/architecture-brainstorming.fig Index: docs/architecture-brainstorming.fig ================================================================== --- /dev/null +++ docs/architecture-brainstorming.fig @@ -0,0 +1,118 @@ +#FIG 3.2 Produced by xfig version 3.2.5-alpha5 +Landscape +Center +Inches +Letter +100.00 +Single +-2 +# Copyright 2006-2017, Matthew Welland. +# +# This file is part of Megatest. +# +# Megatest is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Megatest is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Megatest. If not, see . +1200 2 +6 1425 2475 2925 4050 +1 2 0 1 0 7 50 -1 -1 0.000 1 0.0000 2175 2812 750 263 1425 3075 2925 2550 +1 2 0 1 0 7 50 -1 -1 0.000 1 0.0000 2175 3713 750 263 1425 3976 2925 3451 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 + 1425 2850 1425 3750 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 + 2925 2850 2925 3750 +-6 +6 8775 2625 10275 4200 +1 2 0 1 0 7 50 -1 -1 0.000 1 0.0000 9525 2962 750 263 8775 3225 10275 2700 +1 2 0 1 0 7 50 -1 -1 0.000 1 0.0000 9525 3863 750 263 8775 4126 10275 3601 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 + 8775 3000 8775 3900 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 + 10275 3000 10275 3900 +-6 +6 450 750 1950 2325 +1 2 0 1 0 7 50 -1 -1 0.000 1 0.0000 1200 1087 750 263 450 1350 1950 825 +1 2 0 1 0 7 50 -1 -1 0.000 1 0.0000 1200 1988 750 263 450 2251 1950 1726 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 + 450 1125 450 2025 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 + 1950 1125 1950 2025 +-6 +6 11775 5100 13275 6675 +1 2 0 1 0 7 50 -1 -1 0.000 1 0.0000 12525 5437 750 263 11775 5700 13275 5175 +1 2 0 1 0 7 50 -1 -1 0.000 1 0.0000 12525 6338 750 263 11775 6601 13275 6076 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 + 11775 5475 11775 6375 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 + 13275 5475 13275 6375 +-6 +6 225 4950 11250 9225 +6 4125 6300 5625 7875 +1 2 0 1 0 7 50 -1 -1 0.000 1 0.0000 4875 6637 750 263 4125 6900 5625 6375 +1 2 0 1 0 7 50 -1 -1 0.000 1 0.0000 4875 7538 750 263 4125 7801 5625 7276 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 + 4125 6675 4125 7575 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 + 5625 6675 5625 7575 +-6 +6 9000 5700 10500 7275 +1 2 0 1 0 7 50 -1 -1 0.000 1 0.0000 9750 6037 750 263 9000 6300 10500 5775 +1 2 0 1 0 7 50 -1 -1 0.000 1 0.0000 9750 6938 750 263 9000 7201 10500 6676 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 + 9000 6075 9000 6975 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 + 10500 6075 10500 6975 +-6 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 1 2 + 0 0 1.00 60.00 120.00 + 0 0 1.00 60.00 120.00 + 5850 7050 8775 6375 +2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 + 225 4950 11250 4950 11250 9225 225 9225 225 4950 +4 0 0 50 -1 0 12 0.0000 4 150 780 9300 5325 IDEA #1\001 +4 0 0 50 -1 0 12 0.0000 4 195 2160 3975 8100 megatest.db in main area\001 +4 0 0 50 -1 0 12 0.0000 4 195 2400 8625 7350 megatest.db in satellite area\001 +4 0 0 50 -1 0 12 0.0000 4 195 1740 8850 7650 (compatible targets)\001 +4 0 0 50 -1 0 12 0.0000 4 150 765 3900 8775 NEEDS:\001 +4 0 0 50 -1 0 12 0.0000 4 195 5565 3900 9030 enhancements to dashboard to make viewing mulitple areas easy\001 +-6 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 + 0 0 1.00 60.00 120.00 + 2925 3225 8700 3300 +2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 + 14700 4950 16500 4950 16500 6900 14700 6900 14700 4950 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 + 0 0 1.00 60.00 120.00 + 13275 5925 14700 5925 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 + 0 0 1.00 60.00 120.00 + 16500 6000 17625 6000 +2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 + 17625 4050 20250 4050 20250 7875 17625 7875 17625 4050 +2 4 0 1 0 7 50 -1 -1 0.000 0 0 7 0 0 5 + 14325 5850 14325 4950 13575 4950 13575 5850 14325 5850 +2 4 0 1 0 7 50 -1 -1 0.000 0 0 7 0 0 5 + 17550 5925 17550 5025 16575 5025 16575 5925 17550 5925 +2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 + 225 300 11250 300 11250 4725 225 4725 225 300 +4 0 0 50 -1 0 12 0.0000 4 195 1440 1275 4425 tmp megatest.db\001 +4 0 0 50 -1 0 12 0.0000 4 195 1065 8775 4500 megatest.db\001 +4 0 0 50 -1 0 12 0.0000 4 150 1065 750 2475 ref database\001 +4 0 0 50 -1 0 12 0.0000 4 150 510 9300 825 NOW\001 +4 0 0 50 -1 0 12 0.0000 4 150 210 12300 7050 db\001 +4 0 0 50 -1 0 12 0.0000 4 150 525 15150 7125 cache\001 +4 0 0 50 -1 0 12 0.0000 4 195 600 18225 8100 display\001 +4 0 0 50 -1 0 12 0.0000 4 150 390 13650 5250 filter\001 +4 0 0 50 -1 0 12 0.0000 4 150 255 13650 5505 via\001 +4 0 0 50 -1 0 12 0.0000 4 195 240 13650 5760 sql\001 +4 0 0 50 -1 0 12 0.0000 4 150 315 16725 5325 2nd\001 +4 0 0 50 -1 0 12 0.0000 4 150 390 16725 5580 filter\001 DELETED docs/html/dashboard-test.png Index: docs/html/dashboard-test.png ================================================================== --- docs/html/dashboard-test.png +++ /dev/null cannot compute difference between binary files DELETED docs/html/dashboard.png Index: docs/html/dashboard.png ================================================================== --- docs/html/dashboard.png +++ /dev/null cannot compute difference between binary files DELETED docs/html/megatest.html Index: docs/html/megatest.html ================================================================== --- docs/html/megatest.html +++ /dev/null @@ -1,1717 +0,0 @@ - - - - - - - - -Megatest User Manual - - -
    -
    - -
    -
    - -
    -
    - -
    -

    -Megatest User Manual -

    -

    -Matthew Welland -

    -

    -Jan. 29, 2012 -

    -
    -


    -

    -©2011 Matthew Welland. All rights reserved. -
    -
    -Megatest is free software released under the General Public License v2.0. Please see the file COPYING in the source distribution for details. -
    -
    -
    Email: matt@kiatoa.com. -
    -
    -Web: www.kiatoa.com/fossils/megatest -
    -
    -
    This document is believed to be acurate at the time of writing but as with any opensource project the source code itself is the reference. It is the responsibility of the end user to validate that the code will perform as they expect. The author assumes no responsibility for any inaccuracies that this document may contain. In no event will Matthew Welland be liable for direct, indirect, special, exemplary, incidental, or consequential damages resulting from any defect or omission in this document, even if advised of the possibility of such damages. -
    -
    -This document is a snapshot in time and Megatest software has likely changed since publication. This document and Megatest may be improved at any time, without notice or obligation. -
    -
    -


    -

    - -
    -

    -Megatest/document Revision History -

    -
    -Notable revisions of the software are occasionally documented here. -
    -
    -
    - - - - - - - - - - - - - - - - -
    -Version - -Author - -Description - -Date -
    -v1.25 - -matt - -converted to new document template - -\thedate -
    - -
    - -
    -
    -


    -

    -
    -
    -Table of Contents -
    -
    -
    -Section: Megatest/document Revision History -
    -
    -Section 1: Introduction -
    -
    -
    -Subsection 1.1: Megatest design philosophy -
    -
    -Subsection 1.2: Megatest architecture -
    -
    -
    -Section 2: Installation -
    -
    -
    -Subsection 2.1: Dependencies -
    -
    -Subsection 2.2: Build and Install -
    -
    -
    -Section 3: Setup -
    -
    -
    -Subsection 3.1: Create megatest.config -
    -
    -Subsection 3.2: Create runconfigs.config -
    -
    -Subsection 3.3: Create the tests directory and your first test -
    -
    -Subsection 3.4: Create the testconfig file for your test -
    -
    -Subsection 3.5: Create your test running script, main.sh -
    -
    -Subsection 3.6: Run megatest and watch your run progress -
    -
    -
    -Section 4: Choose Flow or Unstructured Run? -
    -
    -Section 5: How to Write Tests -
    -
    -
    -Subsection 5.1: A Simple Test with one Step -
    -
    -Subsection 5.2: Create your testconfig file -
    -
    -Subsection 5.3: Create the main.csh script -
    -
    -Subsection 5.4: Simple Test with Multiple Steps -
    -
    -
    -Section 6: Simple Test with Multiple Steps, Some in Parallel -
    -
    -
    -Subsection 6.1: The Makefile -
    -
    -Subsection 6.2: The main.csh file -
    -
    -
    -Section 7: Simple Test with Iteration -
    -
    -
    -Subsection 7.1: Update your testconfig file for iteration -
    -
    -Subsection 7.2: Rewrite your main.csh for iteration -
    -
    -Subsection 7.3: Tests with Inter-test dependencies -
    -
    -Subsection 7.4: Rolling up Miscellaneous Data -
    -
    -Subsection 7.5: Rolling up Runs -
    -
    -
    -Section 8: Dashboard -
    -
    -Section 9: Generating an OpenDocument Spreadsheet from the Database -
    -
    -Section 10: Introspection -
    -
    -
    -Subsection 10.1: Getting previous test paths -
    -
    -
    -Section 11: Flows -
    -
    -Section 12: Flow Specification and Running (Not released yet) -
    -
    -
    -Subsection 12.1: Write your flow file -
    -
    -Subsection 12.2: Run the flow -
    -
    -
    -Section 13: Monitor based running -
    -
    -
    -Subsection 13.1: Monitor logic -
    -
    -
    -Section 14: Reference -
    -
    -
    -Subsection 14.1: Configuration file Syntax -
    -
    -
    -Subsubsection 14.1.1: Sections -
    -
    -Subsubsection 14.1.2: Variables -
    -
    -Subsubsection 14.1.3: Includes -
    -
    -Subsubsection 14.1.4: Setting a variable by running a command -
    -
    -Subsubsection 14.1.5: Notes -
    -
    -
    -Subsection 14.2: Environment variables -
    -
    -Subsection 14.3: megatest.config -
    -
    -Subsection 14.4: runconfigs.config file -
    -
    -Subsection 14.5: Writing tests -
    -
    -
    -Subsubsection 14.5.1: testconfig file -
    -
    -Subsubsection 14.5.2: Command line -
    -
    -
    -
    -Appendix A: Data -
    -
    -Appendix B: References -
    -
    - -
    - -
    -
    -


    -

    - -
    -

    -1 Introduction -

    -

    -1.1 Megatest design philosophy -

    -
    -Megatest is intended to provide the minimum needed resources to make writing a suite of tests and implementing continuous build for software, design engineering or process control (via owlfs for example) without being specialized for any specific problem space. Megatest in of itself does not know what constitutes a PASS or FAIL of a test. In most cases megatest is best used in conjunction with logpro or a similar tool to parse, analyze and decide on the test outcome. -
    -

    -1.2 Megatest architecture -

    -
    -All data to specify the tests and configure the system is stored in plain text files. All system state is stored in an sqlite3 database. Tests are launched using the launching system available for the distributed compute platform in use. A template script is provided which can launch jobs on local and remote Linux hosts. Currently megatest uses the network filesystem to “call home” to your master sqlite3 database. -
    -

    -2 Installation -

    -

    -2.1 Dependencies -

    -
    -Chicken scheme and a number of “eggs” are required for building megatest. See the file utils/installall.sh for an automated way to install the dependencies on Linux. -
    -

    -2.2 Build and Install -

    -
    -Run “make test” to create the megatest executable. You may wish to copy the executable to a centrally accessible location. -
    -

    -3 Setup -

    -

    -3.1 Create megatest.config -

    -
    -Create the file megatest.config using the megatest.config template from the tests directory. At a minimum you need the following: -
    -
    -
    -
    # Fields are the keys under which your test runs are organized
-[fields]
-field1 TEXT
-field2 TEXT
-​
-[jobtools]
-# The launcher launches jobs to the local or remote hosts,
-# the job is managed on the target host by megatest,
-# comment out launcher to run local only. An example launcher
-# "nbfake" can be found in the utils directory. 
-launcher nbfake
-​
-# The disks section specifies where the tests will be run. As you
-# run out of space in a partition you can add additional disks
-# entries.
-# Format is:
-# name /path/to/area 
-[disks]
-disk1 /tmp 
-
    -
    - -
    -

    -3.2 Create runconfigs.config -

    -
    -This file is used to set environment variables that are run specific. You can simply create an empty file to start. -
    -
    -
    -
    # runconfigs.config
-
    -
    - -
    -

    -3.3 Create the tests directory and your first test -

    -
    -
    -
    mt
-|-- megatest.config
-|-- runconfigs.config
-‘-- tests
-    ‘-- mytest
-        |-- main.sh
-        ‘-- testconfig
-
    -
    - -
    -

    -3.4 Create the testconfig file for your test -

    -
    -
    -
    [setup]
-runscript main.sh
-
    -
    - -
    -

    -3.5 Create your test running script, main.sh -

    -
    -
    -
    #!/bin/bash
-​
-$MT_MEGATEST -runstep mystep1 "sleep 20;echo Done" -m "mystep1 is done"
-$MT_MEGATEST -test-status :state COMPLETED :status PASS -m "This is a comment"
-
    -
    - -
    -

    -3.6 Run megatest and watch your run progress -

    -
    -
    -
    megatest :field1 abc :field2 def :runname 2011week08.4a -runall
-​
-watch megatest -list-runs %
-​
-# OR use the dashboard
-​
-dashboard &
-
    -
    - -
    -

    -4 Choose Flow or Unstructured Run? -

    -
    -A flow is a structured and specifically sequenced set of tests. See the Flows chapter to understand the difference. -
    -

    -5 How to Write Tests -

    -

    -5.1 A Simple Test with one Step -

    -
    -
    -
    mkdir simpletest
-cd simpletest
-
    -
    - -
    -

    -5.2 Create your testconfig file -

    -
    -
    -
    # testconfig
-​
-[setup]
-runscript main.csh
-
    -
    - -
    -

    -5.3 Create the main.csh script -

    -
    -Note: Using csh is NOT recommended. Use bash, perl, ruby, zsh or anything other than csh. We use csh here because it is popular in the EDA industry for which Megatest was originally created. -
    -
    -
    -
    -
    #!/bin/tcsh -x
-​
-# run the cpu1 simulation.
-#   The step name is "run_simulation"
-#   The commandline being run for this step is "runsim cpu1"
-#   The logpro file to validate the output from the run is "runsim.logpro"
-​
-$MT_MEGATEST -runstep run_simulation -logpro runsim.logpro "runsim cpu1"
-$MT_MEGATEST -test-status :state COMPLETED :status $?
-
    -
    - -
    - -
    -
    -You can now run megatest and the created test directory will contain the new files “run_simulation.html” and “run_simulation.log”. If you are using the dashboard you can click on the run and then push the “View log” button to view the log file in firefox. -
    -

    -5.4 Simple Test with Multiple Steps -

    -
    -To run multiple steps simply add them to the main.csh file. Here we add a step to test “cpu2”. The second step that tests cpu2 will only run after the step that tested “cpu1” completes. -
    -
    -
    -
    #!/bin/tcsh -x
-​
-# run the cpu1 simulation.
-#   The step name is "run_simulation"
-#   The commandline being run for this step is "runsim cpu1"
-#   The logpro file to validate the output from the run is "runsim.logpro"
-​
-$MT_MEGATEST -runstep run_simulation_cpu1 -logpro runsim.logpro "runsim cpu1" && \
-$MT_MEGATEST -runstep run_simulation_cpu2 -logpro runsim.logpro "runsim cpu2"
-$MT_MEGATEST -test-status :state COMPLETED :status $?
-
    -
    - -
    -

    -6 Simple Test with Multiple Steps, Some in Parallel -

    -

    -6.1 The Makefile -

    -
    -A good way to run steps in parallel within a single test, especially when there are following steps, is to use the Unix Make utility. Writing Makefiles is beyond the scope of this document but here is a minimal example that will run “runsim cpu1” and “runsim cpu2” in parallel. For more information on make try “info make” at the Linux command prompt. -
    -
    -
    -
    # Example Makefile to run two steps in parallel
-​
-RTLDIR=/path/to/rtl
-CPUS = cpu1 cpu2
-​
-run_simulation_$(CPUS).html : $(RTLDIR)/$(CPUS)
-	$(MT_MEGATEST) -runstep run_simulation_$(CPUS) -logpro runsim.logpro "runsim $(CPUS)
-
    -
    - -
    -

    -6.2 The main.csh file -

    -
    -
    -
    #!/bin/tcsh -x
-​
-# run the cpu1 and cpu2 simulations in parallel. 
-# The -j parameter tells make how many jobs it may run in parallel
-​
-
    
-make -j 2 
-
    
-
-$MT_MEGATEST -test-status :state COMPLETED :status $?
-
    -
    - -
    -

    -7 Simple Test with Iteration -

    -
    -Since no jobs run after the cpu1 and cpu2 simulations in this test it is possible to use iterated mode. -
    -

    -7.1 Update your testconfig file for iteration -

    -
    -
    -
    [setup]
-runscript main.csh
-
    
-
-
    
-
-[items]
-CPU cpu1 cpu2
-
    -
    - -
    -

    -7.2 Rewrite your main.csh for iteration -

    -
    -
    -
    #!/bin/tcsh -x
-
-# run the cpu simulation but now use the environment variable $CPU
-# to select what cpu to run the simulation against
-
-$MT_MEGATEST -runstep run_simulation -logpro runsim.logpro "runsim $CPU"
-# As of version 1.07 Megatest automatically converts a status of "0"
-# to "PASS", any other number to "FAIL" and directly uses the value of
-# a string passed in.
-$MT_MEGATEST -test-status :state COMPLETED :status $?
-
    -
    - -
    -

    -7.3 Tests with Inter-test dependencies -

    -
    -Sometimes a test depends on the output from a previous test or it may not make sense to run a test is another test does not complete with status “PASS”. In either of these scenarios you can use the “waiton” keyword in your testconfig file to indicate that this test must wait on one or more tests to complete before being launched. In this example there is no point in running the “system” test if the “cpu” and “mem” tests either do not complete or complete but with status “FAIL”. -
    -
    -
    -
    # testconfig for the "system" test
-[setup]
-runscript main.csh
-waiton cpu mem
-
    -
    - -
    -

    -7.4 Rolling up Miscellaneous Data -

    -
    -Use the -load-test-data switch to roll up arbitrary data from a test into the test_data table. -
    -
    -
    -
    # Fields are:
-# category,variable,value,expected,tol,units,comment,status
-​
-$MT_MEGATEST -load-test-data << EOF
-foo,bar,1.2,1.9,>
-foo,rab,1.0e9,10e9,1e9
-foo,bla,1.2,1.9,<
-foo,bal,1.2,1.2,<,,Check for overload
-foo,alb,1.2,1.2,<=,Amps,This is the high power circuit test
-foo,abl,1.2,1.3,0.1
-foo,bra,1.2,pass,silly stuff
-faz,bar,10,8mA,,,"this is a comment"
-EOF
-
    -
    - -
    -
    -New entries are keyed on the category and variable. If a new record is inserted with a category and variable that have already been used the new record will replace the old record. -
    -
    -Where value, expected and tol are specified the behavior is as follows. -
    -
      -
    • -If value, expected and tol are numbers then status is calculated as PASS if (expected-tol) <= value <= (expected+tol) -
      • -
    • -If value and expected are numbers and tol is >, <, >= or <= then value is compared with expected using the operator given by tol -
      • -
    • -If status is specified its value overrides the above calculations. -
      • - -
    -

    -7.5 Rolling up Runs -

    -
    -To roll up a number of tests in a sequence of runs to a single run use the -rollup command. -
    -
    -
    -
    megatest -rollup :sysname ubuntu :fsname nfs :datapath none :runname rollup_ww38
-
    -
    - -
    -
    -All keys must be specified and the runname is the name of the run that will be created. All paths are kept original inside the database. When -remove-runs is used to delete runs the data is not deleted if there are rollups that refer to the data. -
    -

    -8 Dashboard -

    -
    -
    -
    > dashboard &
-
    -
    - -
    -
    -figure dashboard.png - -
    -
    -Pushing one of the buttons on the main dashboard will bring up the test specific dashboard. Values are updated in semi-real time as the test runs. -
    -
    -figure dashboard-test.png - -
    -

    -9 Generating an OpenDocument Spreadsheet from the Database -

    -
    -And OpenDocument multi-paned spreadsheet can be generated from the megatest.db file by running -extract-ods -
    -
    -
    -
    megatest -extract-ods results.ods :runname % 
-
    -
    - -
    -
    -You can optionally specify the keys for your database to limit further the runs to extract into the spreadsheet. The first sheet contains all the run data and subsequent sheets contain data rolled up for the individual tests. -
    -

    -10 Introspection -

    -

    -10.1 Getting previous test paths -

    -
    -
    -
    megatest -test-paths -target %/%/% :runname % -testpatt % -itempatt % :status PASS 
-
    -
    - -
    -

    -11 Flows -

    -
    -A flow specifies the tests to run, the order and dependencies and is managed by a running megatest process. -
    -

    -12 Flow Specification and Running (Not released yet) -

    -

    -12.1 Write your flow file -

    -
    -flows/<flowname>.config -
    -
    -
    -
    # Flow: <flowname>
-[flowconfig]
-# turn on item level dependencies
-itemdeps on
-​
-[flowsteps]
-# <testname>[,<predecessor>]
-​
-# Run the test "copydata"
-copydata
-​
-# Run the test "setup" after copydata completes with PASS, WARN or WAIVE
-setup,copydata
-​
-# once the test "setup" completes successfully run sim1, sim2 and sim3
-sim1,setup
-sim2,setup
-sim3,setup
-
    -
    - -
    -

    -12.2 Run the flow -

    -
    -
    -
    megatest -runflow <flowname> :FIELD1 val1 :FIELD2 val2 :runname wk32.4
-
    -
    - -
    -

    -13 Monitor based running -

    -

    -13.1 Monitor logic -

    -
    -Note: The monitor is usable but incomplete as of Megatest v1.31. Click on the “Monitor” button on the dashboard to start the monitor and give it a try. -
    -
    -figure monitor-state-diagram.png - -
    -

    -14 Reference -

    -

    -14.1 Configuration file Syntax -

    -
    -Note: whitespace is preserved including at the end of line. Ensure your entries only have whitespace at the end of line when needed to avoid problems. -
    -

    -14.1.1 Sections -

    -
    -
    -
    [section name]
-
    -
    - -
    -
    -This creates a section named “section name” -
    -

    -14.1.2 Variables -

    -
    -
    -
    VARX has this value
-
    -
    - -
    -
    -The variable “VARX” will have the value “has this value” -
    -

    -14.1.3 Includes -

    -
    -
    -
    [include filename]
-
    -
    - -
    -
    -The file named “filename” will be included as if part of the calling file. NOTE: This means no section can be named “include “ (with the whitespace). -
    -

    -14.1.4 Setting a variable by running a command -

    -
    -
    -
    VARNAME [system ls /tmp]
-
    -
    - -
    -
    -The variable “VARNAME” will get a value created by the Unix command “ls /tmp”. All lines of output from the command will be joined with a space. -
    -

    -14.1.5 Notes -

    -
      -
    • -Some variables are infered as lists. Each token on the line separated by whitespace will be member of the list. -
      • -
    • -Comments (lines starting with #) and blank lines are ignored. -
      • - -
    -

    -14.2 Environment variables -

    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -Variable - -Purpose -
    -MT_CMDINFO - -Conveys test variables to the megatest test runner. -
    -MT_TEST_RUN_DIR - -Directory assigned by megatest for the test to run. -
    -MT_TEST_NAME - -Name of the test, corrosponds to the directory name under tests. -
    -MT_ITEM_INFO - -Iterated tests will set this to a sequence of key/values ((KEY val) ...) -
    -MT_RUN_AREA_HOME - -Directory where megatest was launched from and where the tests code can be found -
    -MT_RUNNAME - -Name of this run as set by the :runname parameter -
    -MT_MEGATEST - -Path/Filename to megatest executable. Found either from called path or but using the “exectuable” keyword in the [setup] section. -
    -<field1> .... - -The field values as set on the megatest -runall command line (e.g. :field1 abc) -
    - -
    -

    -14.3 megatest.config -

    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -section - -variable - -value - -required - -comment -
    -[setup] - -max_concurrent_jobs - -if variable is not defined no limit on jobs - -no - - -
    - - -executable - -full path to megatest binary - -no - -Use only if necessary, megatest will extract the location from where it used to launch and add append that to the PATH for test runs. -
    - - -runsdir - -full path to where the link tree to all runs will be created - -no - -Because your runs may be spread out over several disk partitions a central link tree is created to make finding all the runs easy. -
    -[fields] - -string of letters, numbers and underscore - -string of letters, numbers and underscore - -at least one - - -
    -[jobtools] - -launcher - -command line used to launch jobs - the job command (megatest -execute) will be appended to this - -no - - -
    - - -workhosts - -list of hostnames to run jobs on NOT SUPPORTED RIGHT NOW - -n/a - - -
    -[jobgroups] - -string of letters, numbers and underscore - -number - -no - -Control number of jobs allowed to concurrently run in categories. See [jobgroup] in testconfig -
    -[env-override] - -string of letters, numbers and underscore - -any string - -no - -These are set on the test launching machine, not the test running machine. Typical usage is to control the host or run queue for launching tests. These values will not be seen by the test when it runs. -
    -[disks] - -string of letters, numbers and underscore - -a valid path writable by the test launching process and by the test process - -yes - -The disk usage balancing algorithm is to choose the disk with the least space for each test run. -
    - -
    -

    -14.4 runconfigs.config file -

    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -section - -variable - -value - -required? - -comment -
    -[default] - -string of letters, numbers and underscore - -any - -no - -variables set in this section will be available for all runs, defining the same variable in another section will override the value from the default section -
    -[field1value/field2value...] - -string of letters, numbers and underscore - -any - -no - -the values in this section will be set for any run where field1 is field1value, field2 is field2value and fieldN is fieldNvalue. -
    - -
    -
    -Example: a test suite that checks that a piece of software works correctly for different customer configurations and locations each of which is done as a separate release regression run. The fields, CUSTOMER and LOCATION were chosen. The following runconfigs.config file would set some variables specific to runs for megacorp in India and femtocorp in the Cook Islands and New Zealand: -
    -
    -
    -
    # runconfigs.config
-[default]
-ENCRYTION true
-​
-[megacorp/india]
-TESTPATH /nfs/testing/megacorp_runs
-​
-[femtocorp/cook_islands]
-ENCRYTION false
-TESTPATH /afs/kiatoa/testing/cook_islands
-​
-[femtocorp/new_zealand]
-TESTPATH /afs/kiatoa/testing/new_zealand
-​
-[megacorp/new_zealand]
-TESTPATH /nfs/testing/megacorp_runs
-
    -
    - -
    -
    -Running megatest like this: -
    -
    -megatest :CUSTOMER megacorp :LOCATION new_zealand :runname week12_2011_run1 -runall -
    -
    -Would set: -
    -
    -ENCRYPTION true -
    -
    -TESTPATH /nfs/testing/megacorp_runs -
    -

    -14.5 Writing tests -

    -

    -14.5.1 testconfig file -

    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -section - -variable - -value - -required? - -comments -
    -[setup] - -runscript - -name of script to execute for this test - -yes - -The script must be executable and either provide the full path or put a copy at the top of your test directory -
    -[requirements] - -waiton - -list of valid test names - -no - -This test will not run until the named tests are state completed and status PASS -
    - - -jobgroup - - - - - - -
    -[items] - -any valid - -list of values - -no - -The test will be repeated once for each item with the variable name set to the value. If there is more than one variable then the test will be run against all unique combinations of the values -
    -[eztests] - -any valid - -stepname command - -no - -Use in addition to or instead of runscript for easy implementation of steps. If <stepname>.logpro exists it will be applied to the <stepname>.log and resulting exit code will be used to determine PASS/FAIL/WARN -
    - -
    -

    -14.5.2 Command line -

    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -switch or param - -parameter - -purpose - -comments -
    --h - - - -brief help - - -
    --runall - - - -run all tests - - -
    --runtests - -test1,test2,... - -run one or more tests - - -
    --step - -stepname - -record a step - -requires :state and :status -
    --test-status - - - -record the test status - -requires :state and :status -
    --setlog - -logfilename - -set the logfile name for a test - -path is assumed to be relative to the test run directory -
    --set-toplog - -logfilename - -set the logfile name for the top test in an iterated test run - -each sub test can have its own logfile set -
    --m - -“comment” - -sets a comment for the step, test or run - - -
    -:runname - -[a-zA-Z0-9_-]+ - -directory in which this run will be stored in the test run area - - -
    -:state - -any value - -Set the step or test state, this is stored in the state field in the steps or tests table respectively - -For tests Megatest recognises “INCOMPLETE”, “COMPLETE” -
    -:status - -any value - -Set the step or test status, this is stored in the status field in the steps or tests table respectively - -For tests Megatest recognises “PASS”, “FAIL”, and “CHECK” -
    --list-runs - -any value, % is wildcard - -Respects -itempatt and -testpatt for filters - - -
    --testpatt - -any value, % is wildcard - - - - -
    --itempatt - -any value, % is wildcard - - - - -
    --showkeys - - - -Print the keys being used for this database - - -
    --force - - - -Test will not re-run if in the “PASS”, “CHECK” or “KILLED”, using -force will force the run to be launched. - -WARNING: The -force switch will bypass any “waiton” dependencies. -
    --xterm - - - -Launch an xterm instead of run the test. The xterm will have the environment that the test would see. - - -
    --remove-runs - - - -Remove a run, test or subtest from the database and the disk. Cannot be undone. Requires -testpatt, -itempatt, :runname and all keys be specified. - - -
    -Test helpers - - - - - - -
    --runstep - - - -Used inside a test to run a step, record the start and end of the step and optionally analyze the output using logpro. - - -
    --logpro - - - -If using logpro to acess the PASS/FAIL status of the step you specify the logpro file with this parameter. - - -
    - -
    -

    -A Data -

    -

    -B References -

    - -
    - -
    - - DELETED docs/html/monitor-state-diagram.png Index: docs/html/monitor-state-diagram.png ================================================================== --- docs/html/monitor-state-diagram.png +++ /dev/null cannot compute difference between binary files Index: docs/inprogress/graph-draw-arch.fig ================================================================== --- docs/inprogress/graph-draw-arch.fig +++ docs/inprogress/graph-draw-arch.fig @@ -5,10 +5,26 @@ Letter 100.00 Single -2 1200 2 +# Copyright 2006-2017, Matthew Welland. +# +# This file is part of Megatest. +# +# Megatest is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Megatest is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Megatest. If not, see . 6 5700 3075 8400 3675 2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 5700 3075 8400 3075 8400 3675 5700 3675 5700 3075 2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 9 5700 3525 5925 3525 5925 3225 6750 3225 6750 3450 7350 3450 Index: docs/inprogress/megatest-architecture-2.fig ================================================================== --- docs/inprogress/megatest-architecture-2.fig +++ docs/inprogress/megatest-architecture-2.fig @@ -5,10 +5,26 @@ Letter 100.00 Single -2 1200 2 +# Copyright 2006-2017, Matthew Welland. +# +# This file is part of Megatest. +# +# Megatest is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Megatest is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Megatest. If not, see . 2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 750 975 5850 975 5850 7425 750 7425 750 975 2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 6000 975 9975 975 9975 7425 6000 7425 6000 975 2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 Index: docs/inprogress/megatest-architecture-proposed-2.fig ================================================================== --- docs/inprogress/megatest-architecture-proposed-2.fig +++ docs/inprogress/megatest-architecture-proposed-2.fig @@ -5,10 +5,26 @@ Letter 100.00 Single -2 1200 2 +# Copyright 2006-2017, Matthew Welland. +# +# This file is part of Megatest. +# +# Megatest is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Megatest is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Megatest. If not, see . 6 600 1350 1575 2400 1 1 0 1 0 7 50 -1 -1 0.000 1 0.0000 1125 1500 450 150 1125 1500 1575 1650 1 1 0 1 0 7 50 -1 -1 0.000 1 0.0000 1124 2177 450 150 1124 2177 1574 2327 2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 675 1575 675 2175 Index: docs/inprogress/megatest-architecture-proposed.fig ================================================================== --- docs/inprogress/megatest-architecture-proposed.fig +++ docs/inprogress/megatest-architecture-proposed.fig @@ -5,10 +5,26 @@ Letter 100.00 Single -2 1200 2 +# Copyright 2006-2017, Matthew Welland. +# +# This file is part of Megatest. +# +# Megatest is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Megatest is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Megatest. If not, see . 6 600 1350 1575 2400 1 1 0 1 0 7 50 -1 -1 0.000 1 0.0000 1125 1500 450 150 1125 1500 1575 1650 1 1 0 1 0 7 50 -1 -1 0.000 1 0.0000 1124 2177 450 150 1124 2177 1574 2327 2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 675 1575 675 2175 Index: docs/inprogress/megatest-architecture.fig ================================================================== --- docs/inprogress/megatest-architecture.fig +++ docs/inprogress/megatest-architecture.fig @@ -5,10 +5,26 @@ Letter 100.00 Single -2 1200 2 +# Copyright 2006-2017, Matthew Welland. +# +# This file is part of Megatest. +# +# Megatest is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Megatest is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Megatest. If not, see . 6 600 1350 1575 2400 1 1 0 1 0 7 50 -1 -1 0.000 1 0.0000 1125 1500 450 150 1125 1500 1575 1650 1 1 0 1 0 7 50 -1 -1 0.000 1 0.0000 1124 2177 450 150 1124 2177 1574 2327 2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 675 1575 675 2175 Index: docs/inprogress/megatest-query-view.fig ================================================================== --- docs/inprogress/megatest-query-view.fig +++ docs/inprogress/megatest-query-view.fig @@ -5,10 +5,26 @@ Letter 100.00 Single -2 1200 2 +# Copyright 2006-2017, Matthew Welland. +# +# This file is part of Megatest. +# +# Megatest is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Megatest is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Megatest. If not, see . 2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 900 675 4350 675 4350 1650 900 1650 900 675 2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 0 0 1.00 60.00 120.00 4350 1200 6975 1725 Index: docs/inprogress/megatest_qa.fig ================================================================== --- docs/inprogress/megatest_qa.fig +++ docs/inprogress/megatest_qa.fig @@ -5,10 +5,26 @@ Letter 100.00 Single -2 1200 2 +# Copyright 2006-2017, Matthew Welland. +# +# This file is part of Megatest. +# +# Megatest is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Megatest is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Megatest. If not, see . 2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 6000 300 6000 9675 2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 525 675 4500 675 4500 2550 525 2550 525 675 2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 Index: docs/manual/Makefile ================================================================== --- docs/manual/Makefile +++ docs/manual/Makefile @@ -1,10 +1,27 @@ - +# Copyright 2006-2017, Matthew Welland. +# +# This file is part of Megatest. +# +# Megatest is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Megatest is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# ASCPATH = $(shell which asciidoc) EXEPATH = $(shell readlink -f $(ASCPATH)) BINPATH = $(shell dirname $(EXEPATH)) DISPATH = $(shell dirname $(BINPATH)) +SRCFSL = $(shell fossil info | grep repository: | awk '{print $$2}') +INPAGES = plan.in howto.in reference.in getting_started.in # broad_goals.csv needed_features.csv : tables/*.dat # ./refdb2csv tables # in a makefile recipe, $< denotes the first dependency; $@ the target @@ -11,17 +28,17 @@ # design_spec.html : $(SRCFILES) $(CSVFILES) # asciidoc -b html5 -a icons -a iconsdir=$(DISPATH)/images/icons -a toc2 design_spec.txt # -all : server.ps megatest_manual.html client.ps complex-itemmap.png +all : server.ps megatest_manual.html client.ps complex-itemmap.png megatest_manual.pdf -megatest_manual.html : megatest_manual.txt getting_started.txt writing_tests.txt reference.txt ../plan.txt howto.txt installation.txt *png +megatest_manual.html : megatest_manual.txt *.txt installation.txt *png asciidoc -b html5 -a icons -a iconsdir=$(DISPATH)/images/icons -a toc2 megatest_manual.txt # dos2unix megatest_manual.html -megatest.pdf : megatest_manual.txt getting_started.txt writing_tests.txt reference.txt ../plan.txt howto.txt *png +megatest_manual.pdf : megatest_manual.txt *.txt *png a2x -a toc -f pdf megatest_manual.txt server.ps : server.dot dot -Tps server.dot > server.ps @@ -30,7 +47,13 @@ complex-itemmap.png : complex-itemmap.dot dot -Tpng complex-itemmap.dot -o complex-itemmap.png dot -Tpdf complex-itemmap.dot -o complex-itemmap.pdf +%.in : $(SRCFSL) + fossil wiki export $* $*.in + +# %.txt : %.in +# cp $*.in $*.txt + clean: rm -f megatest_manual.html Index: docs/manual/client.dot ================================================================== --- docs/manual/client.dot +++ docs/manual/client.dot @@ -1,5 +1,22 @@ +// Copyright 2006-2017, Matthew Welland. +// +// This file is part of Megatest. +// +// Megatest is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// Megatest is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Megatest. If not, see . + digraph G { // put client after server so server_start node is visible // subgraph cluster_2 { Index: docs/manual/complex-itemmap.dot ================================================================== --- docs/manual/complex-itemmap.dot +++ docs/manual/complex-itemmap.dot @@ -1,5 +1,22 @@ +// Copyright 2006-2017, Matthew Welland. +// +// This file is part of Megatest. +// +// Megatest is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// Megatest is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Megatest. If not, see . + digraph G { // put client after server so server_start node is visible // subgraph cluster_1 { @@ -38,10 +55,10 @@ label = "Test E"; "C/1/bb" -> "E/1/res"; "C/2/bb" -> "E/2/res"; } - label = "Complex Itemmapping"; + label = "Complex Itemmapping (arrows indicate order of execution)"; color=green; } } Index: docs/manual/complex-itemmap.png ================================================================== --- docs/manual/complex-itemmap.png +++ docs/manual/complex-itemmap.png cannot compute difference between binary files ADDED docs/manual/devnotes.txt Index: docs/manual/devnotes.txt ================================================================== --- /dev/null +++ docs/manual/devnotes.txt @@ -0,0 +1,37 @@ +Developer Notes +--------------- + +Collected here are some topics that may interest the megatest developer. + +telemetry +~~~~~~~~~ + +A new feature introduced in v1.6525 allows a centralized debug messaging system. Debugging client-server issues +is greatly aided by a centralized, time coherent log of events across test execution, server, and runner. This +is provided by the telemetry feature + + +source code call example + + +[source,ini] + [telemetry] + host + port + want-events + + +Usage: +1. Add telemetry section to megatest.config +2. Start telemetry daemon telemetry-daemon -a start -l /tmp/my-telemetry.log +3. Run megatest +4. examine / parse telemetry log Index: docs/manual/getting_started.txt ================================================================== --- docs/manual/getting_started.txt +++ docs/manual/getting_started.txt @@ -1,14 +1,30 @@ +// This file is part of Megatest. +// +// Megatest is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// Megatest is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Megatest. If not, see . +// +// Copyright 2006-2012, Matthew Welland. Getting Started --------------- -[partintro] +// [partintro] .Getting started with Megatest --- +------------------- Creating a testsuite or flow and your first test or task. --- +------------------- After installing Megatest you can create a flow or testsuite and add some tests using the helpers. Here is a quickstart sequence to get you up and running your first automated testsuite. Index: docs/manual/howto.txt ================================================================== --- docs/manual/howto.txt +++ docs/manual/howto.txt @@ -1,5 +1,21 @@ +// This file is part of Megatest. +// +// Megatest is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// Megatest is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Megatest. If not, see . +// +// Copyright 2006-2012, Matthew Welland. How To Do Things ---------------- Process Runs @@ -52,10 +68,27 @@ Hint: You can browse the archive using bup commands directly. ---------------- bup -d /path/to/bup/archive ftp ---------------- + +Pass Data from Test to Test +~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +.To save the data call archive save within your test: +---------------- +megatest -archive save +---------------- + +.To retrieve the data call archive get using patterns as needed +---------------- +# Put the retrieved data into /tmp +DESTPATH=/tmp/$USER/$MT_TARGET/$MT_RUN_NAME/$MT_TESTNAME/$MT_ITEMPATH/my_data +mkdir -p $DESTPATH +megatest -archive get -runname % -dest $DESTPATH +---------------- + Submit jobs to Host Types based on Test Name ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ .In megatest.config Index: docs/manual/installation.txt ================================================================== --- docs/manual/installation.txt +++ docs/manual/installation.txt @@ -1,5 +1,22 @@ +// Copyright 2006-2017, Matthew Welland. +// +// This file is part of Megatest. +// +// Megatest is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// Megatest is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Megatest. If not, see . + Installation ------------ Dependencies ~~~~~~~~~~~~ @@ -6,5 +23,33 @@ Chicken scheme and a number of "eggs" are required for building Megatest. See the script installall.sh in the utils directory of the source distribution for an automated way to install everything needed for building Megatest on Linux. + +Megatest. In the v1.66 and beyond assistance to create the build +system is built into the Makefile. + +.Installation steps (overview) +------------------------------------- +./configure +make chicken +setup.sh make -j install +------------------------------------- + +Or install the needed build system manually: + +. Chicken scheme from http://call-cc.org +. IUP from http://webserver2.tecgraf.puc-rio.br/iup/ +. CD from http://webserver2.tecgraf.puc-rio.br/cd/ +. IM from https://webserver2.tecgraf.puc-rio.br/im/ +. ffcall from http://webserver2.tecgraf.puc-rio.br/iup/ +. Nanomsg from https://nanomsg.org/ (NOTE: Plan is to eliminate nanomsg dependency). +. Needed eggs (look at the eggs lists in the Makefile) + +Then follow these steps: + +.Installation steps (self-built chicken scheme build system) +------------------------------------- +./configure +make -j install +------------------------------------- Index: docs/manual/itemmap.fig ================================================================== --- docs/manual/itemmap.fig +++ docs/manual/itemmap.fig @@ -1,6 +1,6 @@ -#FIG 3.2 Produced by xfig version 3.2.5c +#FIG 3.2 Produced by xfig version 3.2.5-alpha5 Landscape Center Metric A4 100.00 @@ -38,10 +38,26 @@ 0 60 #000049 0 61 #797979 0 62 #303430 0 63 #414141 0 64 #c7b696 +# Copyright 2006-2017, Matthew Welland. +# +# This file is part of Megatest. +# +# Megatest is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Megatest is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Megatest. If not, see . 6 3600 2700 4455 3555 2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 3600 2700 4050 2700 4050 3150 3600 3150 3600 2700 2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 3690 3150 3690 3285 4185 3285 4185 2790 4050 2790 @@ -89,23 +105,23 @@ 5625 5085 5625 5220 6120 5220 6120 4725 5985 4725 2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 5760 5220 5760 5355 6255 5355 6255 4860 6120 4860 -6 6 6840 2790 8910 3420 -4 0 0 50 -1 0 12 0.0000 4 180 1260 6840 2970 [requirements]\001 -4 0 0 50 -1 0 12 0.0000 4 135 990 6840 3165 waiton TstE\001 -4 0 0 50 -1 0 12 0.0000 4 180 2070 6840 3360 itemap foo/(\\d+) \\1/bar\001 +4 0 0 50 -1 0 12 0.0000 4 195 1290 6840 2970 [requirements]\001 +4 0 0 50 -1 0 12 0.0000 4 150 1050 6840 3165 waiton TstE\001 +4 0 0 50 -1 0 12 0.0000 4 195 1950 6840 3360 itemap foo/(\\d+) \\1/bar\001 -6 6 6840 6345 8910 6975 -4 0 0 50 -1 0 12 0.0000 4 180 1260 6840 6525 [requirements]\001 -4 0 0 50 -1 0 12 0.0000 4 135 990 6840 6720 waiton TstE\001 -4 0 0 50 -1 0 12 0.0000 4 180 2070 6840 6915 itemap baz/(\\d+) \\1/bar\001 +4 0 0 50 -1 0 12 0.0000 4 195 1290 6840 6525 [requirements]\001 +4 0 0 50 -1 0 12 0.0000 4 150 1050 6840 6720 waiton TstE\001 +4 0 0 50 -1 0 12 0.0000 4 195 1980 6840 6915 itemap baz/(\\d+) \\1/bar\001 -6 6 3600 6570 4860 7200 -4 0 0 50 -1 0 12 0.0000 4 180 810 3600 6750 [itemmap]\001 -4 0 0 50 -1 0 12 0.0000 4 150 1260 3600 6945 TstA .*/ foo/\001 -4 0 0 50 -1 0 12 0.0000 4 165 1080 3600 7140 TstB ab/ xy/\001 +4 0 0 50 -1 0 12 0.0000 4 195 900 3600 6750 [itemmap]\001 +4 0 0 50 -1 0 12 0.0000 4 180 1140 3600 6945 TstA .*/ foo/\001 +4 0 0 50 -1 0 12 0.0000 4 195 1050 3600 7140 TstB ab/ xy/\001 -6 2 1 0 2 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 0 0 1.00 60.00 120.00 5355 4455 4500 3600 2 1 0 2 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 @@ -132,18 +148,18 @@ 2 1 0 2 23 7 50 -1 -1 0.000 0 0 -1 1 0 3 0 0 1.00 60.00 120.00 7065 6255 7065 5715 6390 5130 2 2 0 2 7 7 50 -1 -1 0.000 0 0 -1 0 0 5 900 0 9000 0 9000 7425 900 7425 900 0 -4 0 0 50 -1 0 12 0.0000 4 135 360 1935 4725 TstB\001 -4 0 0 50 -1 0 12 0.0000 4 135 360 5445 1170 TstC\001 -4 0 0 50 -1 0 12 0.0000 4 135 360 5445 4770 TstD\001 -4 0 0 50 -1 0 12 0.0000 4 135 360 3600 2970 TstE\001 -4 0 0 50 -1 0 12 0.0000 4 135 360 1845 1170 TstA\001 -4 0 0 50 -1 0 12 0.0000 4 135 720 5085 450 runthird\001 -4 0 0 50 -1 0 12 0.0000 4 135 810 3330 405 runsecond\001 -4 0 0 50 -1 0 12 0.0000 4 135 720 1575 405 runfirst\001 -4 0 0 50 -1 0 12 0.0000 4 150 1260 6750 1005 2. TstE starts\001 -4 0 0 50 -1 0 12 0.0000 4 150 1800 6750 1215 3. TstC & TstD start\001 -4 0 0 50 -1 0 12 0.0000 4 150 1800 6750 810 1. TstA & TstB start\001 -4 0 0 50 -1 0 12 0.0000 4 180 1260 3600 6165 [requirements]\001 -4 0 0 50 -1 0 12 0.0000 4 135 1440 3600 6360 waiton TstA TstB\001 +4 0 0 50 -1 0 12 0.0000 4 150 420 1935 4725 TstB\001 +4 0 0 50 -1 0 12 0.0000 4 150 435 5445 1170 TstC\001 +4 0 0 50 -1 0 12 0.0000 4 150 435 5445 4770 TstD\001 +4 0 0 50 -1 0 12 0.0000 4 150 420 3600 2970 TstE\001 +4 0 0 50 -1 0 12 0.0000 4 150 450 1845 1170 TstA\001 +4 0 0 50 -1 0 12 0.0000 4 150 675 5085 450 runthird\001 +4 0 0 50 -1 0 12 0.0000 4 150 900 3330 405 runsecond\001 +4 0 0 50 -1 0 12 0.0000 4 150 615 1575 405 runfirst\001 +4 0 0 50 -1 0 12 0.0000 4 150 1155 6750 1005 2. TstE starts\001 +4 0 0 50 -1 0 12 0.0000 4 150 1770 6750 1215 3. TstC & TstD start\001 +4 0 0 50 -1 0 12 0.0000 4 150 1770 6750 810 1. TstA & TstB start\001 +4 0 0 50 -1 0 12 0.0000 4 195 1290 3600 6165 [requirements]\001 +4 0 0 50 -1 0 12 0.0000 4 150 1545 3600 6360 waiton TstA TstB\001 ADDED docs/manual/megatest-stand-alone-area.png Index: docs/manual/megatest-stand-alone-area.png ================================================================== --- /dev/null +++ docs/manual/megatest-stand-alone-area.png cannot compute difference between binary files ADDED docs/manual/megatest-system-architecture.png Index: docs/manual/megatest-system-architecture.png ================================================================== --- /dev/null +++ docs/manual/megatest-system-architecture.png cannot compute difference between binary files ADDED docs/manual/megatest-system-architecture.svg Index: docs/manual/megatest-system-architecture.svg ================================================================== --- /dev/null +++ docs/manual/megatest-system-architecture.svg @@ -0,0 +1,5662 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + run control + + + storageallocation + + + + + + + + + area/testsuite state/status database + configs and custom automation + + + + + run control + + + storageallocation + + + + + + + + + area/testsuite state/status database + configs and custom automation + + + + + + + + + + + compute cloud storage (NFS, moosefs etc.) + + job + + + job + + + job + + + + + run control + + + storageallocation + + + + + + + + + area/testsuite state/status database + configs and custom automation + + + + + + + + + + + + + + + + + postgresql database sync + + + + + + multi-area dashboard and xterm + + + + + multi-area web direct read and control + + multi-area control:- contours- sub-runs- file/vcs sensors- events + configs and custom automation + Megatest Full System Architecture + Index: docs/manual/megatest_manual.html ================================================================== --- docs/manual/megatest_manual.html +++ docs/manual/megatest_manual.html @@ -771,12 +771,12 @@ @@ -783,203 +783,671 @@

    Preface

    This book is organised as three sub-books; getting started, writing tests and reference.

    +
    +
    License
    +
    +
        Copyright 2006-2020, Matthew Welland.
+
+    This document is part of Megatest.
+
+    Megatest is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Megatest is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
    +

    Why Megatest?

    The Megatest project was started for two reasons, the first was an immediate and pressing need for a generalized tool to manage a suite -of regression tests and the second was the fact that the author had -written or maintained several such tools at different companies over -the years and it seemed a good thing to have a single open source -tool, flexible enough to meet the needs of any team doing continuous -integrating and or running a complex suite of tests for release -qualification.

    +of regression tests and the second was the fact that I had written or +maintained several such tools at different companies over the years. I +thought a single open source tool, flexible enough to meet the needs +of any team doing continuous integration and or running a complex +suite of tests for release qualification would solve some problems for +me and for others.

    +
    +
    +
    -- Matt Welland, original author of the Megatest tool suite.
    +

    Megatest Design Philosophy

    -

    Megatest is intended to provide the minimum needed resources to make -writing a suite of tests and tasks for implementing continuous build -for software, design engineering or process control (via owlfs for -example) without being specialized for any specific problem -space. Megatest in of itself does not know what constitutes a PASS or -FAIL of a test or task. In most cases megatest is best used in -conjunction with logpro or a similar tool to parse, analyze and decide -on the test outcome.

    +

    Megatest is a distributed system intended to provide the minimum needed +resources to make writing a suite of tests and tasks for implementing +continuous build for software, design engineering or process control (via +owlfs for example) without being specialized for any specific problem +space. Megatest in of itself does not know what constitutes a PASS or FAIL +of a test or task. In most cases megatest is best used in conjunction with +logpro or a similar tool to parse, analyze and decide on the test outcome.

    • -Self-checking -Repeatable strive for directed or self-checking test - as opposed to delta based tests -

      -
      • -
    • -

      -Traceable - environment variables, host OS and other possibly influential - variables are captured and kept recorded. -

      -
      • -
    • -

      -Immutable - once this test is run it cannot be easily overwritten or - accidentally modified. -

      -
      • -
    • -

      -Repeatable - this test result can be recreated in the future -

      -
      • -
    • -

      -Relocatable - the testsuite or automation area can be checked out and the tests run anywhere -

      -
      • -
    • -

      -Encapsulated - the tests run in self-contained directories and all inputs - and outputs to the process can be found in the run areas. -

      -
      • -
    • -

      -Deployable - anyone on the team, at any site, at any time can run the flow +Self-checking - make it as easy as possible to write self-checking + tests (as opposed to using deltas, i.e. tests that compare with a + previous measurement to deterine PASS/FAIL). +

      +
      • +
    • +

      +Traceable - environment variables, host OS and other possibly + influential variables are captured and kept recorded. +

      +
      • +
    • +

      +Immutable - once a test is run it cannot be easily overwritten or + modified accidentally. +

      +
      • +
    • +

      +Repeatable - test results can be recreated in the future using all + the original variables. +

      +
      • +
    • +

      +Relocatable - the testsuite or automation area can be checked out + and the tests run anywhere in the disk hierarchy. +

      +
      • +
    • +

      +Encapsulated - the tests run in self-contained directories and all + inputs and outputs to the process can be found in the run areas. +

      +
      • +
    • +

      +Deployable - a testsuite is self-contained and can be bundled with + a software project and easily used by others with little to no + setup burden.

    Megatest Architecture

    +
    +

    Data separation

    All data to specify the tests and configure the system is stored in -plain text files. All system state is stored in an sqlite3 -database. Tests are launched using the launching system available for -the distributed compute platform in use. A template script is provided +plain text config files. All system state is stored in an sqlite3 +database.

    +
    +
    +

    Distributed Compute

    +

    Tests are launched using the launching system available for the +distributed compute platform in use. A template script is provided which can launch jobs on local and remote Linux hosts. Currently megatest uses the network filesystem to call home to your master -sqlite3 database.

    +sqlite3 database. Megatest has been used with the Intel Netbatch and +lsf (also known as openlava) batch systems and it should be +straightforward to use it with other similar systems.

    +
    +
    +
    +
    +

    Overview

    +
    +
    +

    Stand-alone Megatest Area

    +

    A single, stand-alone, Megatest based testsuite or "area" is +sufficient for most validation, automation and build problems.

    +
    +
    +Static +
    +
    +

    Megatest is designed as a distributed or decoupled system. This means +you can run the areas stand-alone with no additional +infrastructure. I.e. there are no databases, web servers or other +centralized resources needed. However as your needs grow you can +integrate multiple areas into a bigger system.

    +
    +

    Component Descriptions

    +
      +
    1. +

      +Multi-area dashboard and xterm. A gui (the dashboard) is usually the + best option for controlling and launching runs but all operations + can also be done from the commandline. Note: The not yet released + multi-area dashboard replaces the old dashboard for browsing and + controlling runs but for managing a single area the old dashboard + works very well. +

      +
      2. +
    2. +

      +Area/testsuite. This is your testsuite or automation definition and + consists of the information in megatest.config, runconfigs.config + and your testconfigs along with any custom scripting that can’t be + done with the native Megatest features. +

      +
      3. +
    3. +

      +If your testsuite or build automation is too large to run on a + single instance you can distribute your jobs into a compute server + pool. The only current requirements are password-less ssh access and + a network filesystem. +

      +
      4. +
    +
    +
    +
    +

    Full System Architecture

    +
    +
    +Static +
    +
    +

    Road Map

    -

    Note 1: This road-map is still evolving and subject to change without notice.

    -
    -

    Architecture Refactor

    -
    -

    Goals

    -
      -
    1. -

      -Reduce load on the file system. Sqlite3 files on network filesystem can be - a burden. -

      -
      2. -
    2. -

      -Reduce number of servers and frequency of start/stop. This is mostly an - issue of clutter but also a reduction in "moving parts". -

      -
      3. -
    3. -

      -Coalesce activities to a single home host where possible. Give the user - feedback that they have started the dashboard on a host other than the - home host. -

      -
      4. -
    4. -

      -Reduce number of processes involved in managing running tests. -

      -
      5. -
    -
    -
    -

    Changes Needed

    -
      -
    1. -

      -ACID compliant db will be on /tmp and synced to megatest.db with a five - second max delay. -

      -
      2. -
    2. -

      -Read/writes to db for processes on homehost will go direct to /tmp - megatest.db file. -

      -
      3. -
    3. -

      -Read/wites fron non-homehost processes will go through one server. Bulk - reads (e.g. for dashboard or list-runs) will be cached on the current host - in /tmp and synced from the home megatest.db in the testsuite area. -

      -
      4. -
    4. -

      -Db syncs rely on the target db file timestame minus some margin. -

      -
      5. -
    5. -

      -Since bulk reads do not use the server we can switch to simple RPC for the - network transport. -

      -
      6. -
    6. -

      -Test running manager process extended to manage multiple running tests. -

      -
      7. -
    -
    -
    -
    -

    Current Items

    -
    -

    ww05 - migrate to inmem-db

    -
      -
    1. -

      -Switch to inmem db with fast sync to on disk db’s [DONE] -

      -
      2. -
    2. -

      -Server polls tasks table for next action -

      -
        -
      1. -

        -Task table used for tracking runner process [DONE] -

        -
        2. -
      2. -

        -Task table used for jobs to run -

        -
        3. -
      3. -

        -Task table used for queueing runner actions (remove runs, cleanRunExecute, etc) -

        -
        4. -
      -
      3. -
    -

    shifting, note that the preceding blank line is needed.

    -
    -
    +
    +
    +
    +

    TODO / Road Map

    +
    +

    Note: This road-map is a wish list and not a formal plan. Items are in +rough priority but are subject to change. Development is driven by +user requests, developer "itch" and bug reports. Please contact +matt@kiatoa.com with requests or bug reports. Requests from inside +Intel generally take priority.

    +

    Dashboard and runs

    +
      +
    1. +

      +Multi-area dashboard view +

      +
      2. +
    +

    Tests Support

    +
      +
    1. +

      +Add variable $MT_RUNPATH = $MT_LINKTREE/$MT_TARGET/$MT_RUNNAME +

      +
      2. +
    2. +

      +Improve [script], especially indent handling +

      +
      3. +
    +

    Scalability

    +
      +
    1. +

      +Overflow database methodology - combine the best of the v1.63 + multi-db approach and the current db-in-tmp approach (currently + slowness can be seen when number of tests in a db goes over 50-100k, + with the overflow db it will be able to handle 1000’s of runs with + 50-100k tests per run). High priority - goal is to complete this by + 20Q3. +

      +
      2. +
    +

    Mtutils/CI

    +
      +
    1. +

      +Enable mtutil calls from dashboard (for remote control) +

      +
      2. +
    2. +

      +Logs browser (esp. for surfacing mtutil related activities) +

      +
      3. +
    3. +

      +Embed ftfplan for distributed automation, completed activities trigger QA runs which trigger deployment etc. +

      +
      4. +
    4. +

      +Jenkins junit XML support [DONE] +

      +
      5. +
    5. +

      +Add output flushing in teamcity support +

      +
      6. +
    +

    Build system

    +
      +
    1. +

      +./configure ⇒ ubuntu, sles11, sles12, rh7 [WIP] +

      +
      2. +
    2. +

      +Switch to using simple runs query everywhere +

      +
      3. +
    3. +

      +Add end_time to runs and add a rollup call that sets state, status and end_time +

      +
      4. +
    +

    Code refactoring/quality/performance

    +
      +
    1. +

      +Switch to scsh-process pipeline management for job execution/control +

      +
      2. +
    2. +

      +Use call-with-environment-variables where possible. +

      +
      3. +
    +

    Migration to inmem db and or overflow db

    +
      +
    1. +

      +Re-work the dbstruct data structure? +

      +
        +
      1. +

        +[ run-id.db inmemdb last-mod last-read last-sync inuse ] +

        +
        2. +
      +
      2. +
    +

    Some ideas for Megatest 2.0

    +
      +
    1. +

      +Aggressive megatest.config and runconfig.config caching. +

      +
        +
      1. +

        +Cache the configs in $MT_RUNPATH +

        +
        2. +
      2. +

        +Following invocations of –run, -rerun* will calculate the new config but only overwrite the cached file IF changed +

        +
        3. +
      +
      2. +
    2. +

      +If the cached file changes ALL existing tests go from COMPLETED → STALE, I’m not sure what to do about RUNNING tests +

      +
      3. +
    3. +

      +!VARS in runconfigs are not exported to the environment. They are accessed via rget as if the ! was not there. +

      +
      4. +
    4. +

      +Per test copy commands (example is incomplete). +

      +
      5. +
    +
    +
    +
    [testcopy]
+%/iind% unison SRC DEST
+% cp –r SRC DEST
    +
    +

    Add ability to move runs to other Areas (overlaps with overflow db system)

    +
      +
    1. +

      +allow shrinking megatest.db data by moving runs to an alternate + Megatest area with same keys. +

      +
      2. +
    2. +

      +add param -destination [area|path]. when specified runs are copied to new + area and removed from local db. +

      +
      3. +
    3. +

      +the data move would involve these steps +

      +
        +
      1. +

        +copy the run data to destination area megatest.db +

        +
        2. +
      2. +

        +mark the run records as deleted, do not remove the run data on disk +

        +
        3. +
      +
      4. +
    4. +

      +accessing the data would be by running dashboard in the satellite area +

      +
      5. +
    5. +

      +future versions of Megatest dashboard should support displaying areas in a + merged way. +

      +
      6. +
    6. +

      +some new controls would be supported in the config +

      +
        +
      1. +

        +[setup] ⇒ allow-runs [no|yes] ⇐= used to disallow runs +

        +
        2. +
      2. +

        +[setup] ⇒ auto-migrate=[areaname|path] ⇐= used to automatically + migrate data to a satellite area. +

        +
        3. +
      +
      7. +
    +

    Eliminate ties to homehost (part of overflow db system)

    +
      +
    1. +

      +Server creates captain pkt +

      +
      2. +
    2. +

      +Create a lock in the db +

      +
      3. +
    3. +

      +Relinquish db when done +

      +
      4. +
    +

    Tasks - better management of run manager processes etc.

    +
      +
    1. +

      +adjutant queries tasks table for next action [Migrate into mtutil] +

      +
        +
      1. +

        +Task table used for tracking runner process [Replaced by mtutil] +

        +
        2. +
      2. +

        +Task table used for jobs to run [Replaced by mtutil] +

        +
        3. +
      3. +

        +Task table used for queueing runner actions (remove runs, + cleanRunExecute, etc) [Replaced by mtutil] +

        +
        4. +
      +
      2. +
    2. +

      +adjutant (server/task dispatch/execution manager) +

      +
      3. +
    +

    Stale propagation

    +
      +
    1. +

      +Mark dependent tests for clean/rerun -rerun-downstream +

      +
      2. +
    2. +

      +On run start check for defunct tests in RUNNING, LAUNCHED or REMOTEHOSTSTART and correct or notify +

      +
      3. +
    3. +

      +Fix: refresh of gui sometimes fails on last item (race condition?) +

      +
      4. +
    +

    Bin list

    +
      +
    1. +

      +Rerun step and or subsequent steps from gui [DONE?] +

      +
      2. +
    2. +

      +Refresh test area files from gui +

      +
      3. +
    3. +

      +Clean and re-run button +

      +
      4. +
    4. +

      +Clean up STATE and STATUS handling. +

      +
        +
      1. +

        +Dashboard and Test control panel are reverse order - choose and fix +

        +
        2. +
      2. +

        +Move seldom used states and status to drop down selector +

        +
        3. +
      +
      5. +
    5. +

      +Access test control panel when clicking on Run Summary tests +

      +
      6. +
    6. +

      +Feature: -generate-index-tree +

      +
      7. +
    7. +

      +Change specifing of state and status to use STATE1/STATUS1,STATE2/STATUS2 +

      +
      8. +
    8. +

      +rest api available for use with Perl, Ruby etc. scripts +

      +
      9. +
    9. +

      +megatest.config setup entries for: +

      +
        +
      1. +

        +run launching (e.g. /bin/sh %CMD% > /dev/null) +

        +
        2. +
      2. +

        +browser "konqueror %FNAME% +

        +
        3. +
      +
      10. +
    10. +

      +refdb: Add export of csv, json and sexp +

      +
      11. +
    11. +

      +Convert to using call-with-environment-variables where possible. Should allow handling of parallel runs in same process. +

      +
      12. +
    12. +

      +Re-work text interface wizards. Several bugs on record. Possibly convert to gui based. +

      +
      13. +
    13. +

      +Add to testconfig requirements section; launchlimiter scriptname, calls scriptname to check if ok to launch test +

      +
      14. +
    14. +

      +Refactor Run Summary view, currently very clumsy +

      +
      15. +
    15. +

      +Add option to show steps in Run Summary view +

      +
      16. +
    16. +

      +Refactor guis for resizeablity +

      +
      17. +
    17. +

      +Add filters to Run Summary view and Run Control view +

      +
      18. +
    18. +

      +Add to megatest.config or testconfig; rerunok STATE/STATUS,STATE/STATUS… +

      +
      19. +
    19. +

      +Launch gates for diskspace; /path/one>1G,/path/two>200M,/tmp>5G,#{scheme toppath}>1G +

      +
      20. +
    20. +

      +Tool tips +

      +
      21. +
    21. +

      +Filters on Run Summary, Summary and Run Control panel +

      +
      22. +
    22. +

      +Built in log viewer (partially implemented) +

      +
      23. +
    23. +

      +Refactor the test control panel + Help and documentation +

      +
      24. +
    24. +

      +Complete the user manual (I’ve been working on this lately). +

      +
      25. +
    25. +

      +Online help in the gui + Streamlined install +

      +
      26. +
    26. +

      +Deployed or static build +

      +
      27. +
    27. +

      +Added option to compile IUP (needed for VMs) +

      +
      28. +
    28. +

      +Server side run launching +

      +
      29. +
    29. +

      +Wizards for creating tests, regression areas (current ones are text only and limited). +

      +
      30. +
    30. +

      +Fully functional built in web service (currently you can browse runs but it is very simplistic). +

      +
      31. +
    31. +

      +Gui panels for editing megatest.config and runconfigs.config +

      +
      32. +
    32. +

      +Fully isolated tests (no use of NFS to see regression area files) +

      +
      33. +
    33. +

      +Windows version +

      +
      34. +

    Installation

    @@ -987,20 +1455,74 @@

    Dependencies

    Chicken scheme and a number of "eggs" are required for building Megatest. See the script installall.sh in the utils directory of the source distribution for an automated way to install everything needed for building Megatest on Linux.

    +

    Megatest. In the v1.66 and beyond assistance to create the build +system is built into the Makefile.

    +
    +
    Installation steps (overview)
    +
    +
    ./configure
+make chicken
+setup.sh make -j install
    +
    +

    Or install the needed build system manually:

    +
      +
    1. +

      +Chicken scheme from http://call-cc.org +

      +
      2. +
    2. +

      +IUP from http://webserver2.tecgraf.puc-rio.br/iup/ +

      +
      3. +
    3. +

      +CD from http://webserver2.tecgraf.puc-rio.br/cd/ +

      +
      4. +
    4. +

      +IM from https://webserver2.tecgraf.puc-rio.br/im/ +

      +
      5. +
    5. +

      +ffcall from http://webserver2.tecgraf.puc-rio.br/iup/ +

      +
      6. +
    6. +

      +Nanomsg from https://nanomsg.org/ (NOTE: Plan is to eliminate nanomsg dependency). +

      +
      7. +
    7. +

      +Needed eggs (look at the eggs lists in the Makefile) +

      +
      8. +
    +

    Then follow these steps:

    +
    +
    Installation steps (self-built chicken scheme build system)
    +
    +
    ./configure
+make -j install
    +

    Getting Started

    -
    +
    Getting started with Megatest
    -
    -

    Creating a testsuite or flow and your first test or task.

    +
    +
    Creating a testsuite or flow and your first test or task.

    After installing Megatest you can create a flow or testsuite and add some tests using the helpers. Here is a quickstart sequence to get you up and running your first automated testsuite.

    @@ -1100,10 +1622,290 @@ 
    dashboard -rows 24
    +
    +
    +

    Study Plan

    +
    +

    Megatest is an extensive program with a lot to learn. Following are some paths through the material to smooth the learning path.

    +
    +

    Basic Concepts (suggest you pick these up on the way)

    +
      +
    • +

      +Components of automation; run, test, iteration +

      +
      • +
    • +

      +Selectors; target, runname, and testpatt +

      +
      • +
    +
    +
    +

    Running Testsuites or Automation

    +
      +
    • +

      +Using the dashboard gui (recommended) +

      +
        +
      • +

        +Using the "Runs" panel. +

        +
        • +
      • +

        +Using the "Run Control" panel. +

        +
        • +
      • +

        +Using a test control panel +

        +
        • +
      • +

        +The Right Mouse Button menu +

        +
        • +
      • +

        +Debug features +

        +
          +
        • +

          +xterm +

          +
            +
          • +

            +pstree +

            +
            • +
          • +

            +log files; mt_copy.log, mt_launch.log +

            +
            • +
          • +

            +variables; megatest.csh, megatest.sh +

            +
            • +
          • +

            +testconfig dump, *testconfig +

            +
            • +
          +
          • +
        • +

          +State/status buttons +

          +
          • +
        • +

          +Run, Clean, KillReq +

          +
          • +
        • +

          +ReRunClean +

          +
          • +
        +
        • +
      +
      • +
    • +

      +Using the command line +

      +
        +
      • +

        +Getting help; megatest -h, megatest -manual +

        +
        • +
      • +

        +Starting runs; megatest -run +

        +
          +
        • +

          +Selection controls; -target, -runname and -testpatt +

          +
          • +
        +
        • +
      +
      • +
    +
    +
    +

    Writing Tests and Flows

    +
      +
    • +

      +environment variables (table 5) +

      +
      • +
    • +

      +tests/testname/testconfig testconfig details +

      +
        +
      • +

        +ezsteps and logpro section +

        +
        • +
      • +

        +iteration (one test applied to many inputs), items, itemstable test iteration +

        +
        • +
      • +

        +dependencies, waiton, itemmatch, itemwait test requirements +

        +
        • +
      • +

        +miscellaneous; mode toplevel, runtimelim, skip on file, no file, script or on running, waiver propagation +

        +
        • +
      +
      • +
    • +

      +megatest areas +

      +
        +
      • +

        +megatest.config +

        +
        • +
      • +

        +runconfigs.config +

        +
        • +
      • +

        +config language features; include, shell, system, scheme, rp|realpath, getenv, get, rget, scriptinc config file helpers +

        +
        • +
      +
      • +
    +
    +
    +

    Advanced Topics

    +
      +
    • +

      +Removing and keeping runs selectively managing runs +

      +
      • +
    • +

      +Subruns nested runs +

      +
      • +
    • +

      +Config file features config file features +

      +
      • +
    • +

      +HTML output with -generate-html +

      +
      • +
    • +

      +Triggers, post run, state/status +

      +
      • +
    • +

      +MTLOWESTLOAD +

      +
      • +
    • +

      +flexilauncher +

      +
      • +
    • +

      +env delta and testconfig +

      +
      • +
    • +

      +capturing test data, extracting values from logpro and using them for pass/fail +

      +
      • +
    • +

      +mtutil, postgres connection, packets for cross-site/cross-user control (e.g. mcrun). +

      +
      • +
    +
    +
    +

    Maintenance and Troubleshooting

    +
      +
    • +

      +cleanup-db, database structure of Megatest 1.6x +

      +
      • +
    • +

      +archiving +

      +
      • +
    • +

      +homehost management +

      +
      • +
    • +

      +show-runconfig +

      +
      • +
    • +

      +show-config +

      +
      • +
    • +

      +show with -debug 0,9 +

      +
      • +
    • +

      +load management +

      +
      • +
    +
    +

    Writing Tests

    @@ -1190,10 +1992,26 @@ 
    bup -d /path/to/bup/archive ftp
    +
    +
    +

    Pass Data from Test to Test

    +
    +
    To save the data call archive save within your test:
    +
    +
    megatest -archive save
    +
    +
    +
    To retrieve the data call archive get using patterns as needed
    +
    +
    # Put the retrieved data into /tmp
+DESTPATH=/tmp/$USER/$MT_TARGET/$MT_RUN_NAME/$MT_TESTNAME/$MT_ITEMPATH/my_data
+mkdir -p $DESTPATH
+megatest -archive get -runname % -dest $DESTPATH
    +

    Submit jobs to Host Types based on Test Name

    In megatest.config
    @@ -1324,18 +2142,79 @@

    Reference

    +
    +

    Megatest Use Modes

    + + ++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Table 2. Base commands
    Use case Megatest command mtutil

    Start from scratch

    -rerun-all

    restart

    Rerun non-good completed

    -rerun-clean

    rerunclean

    Rerun all non-good and not completed yet

    -set-state-status KILLREQ; -rerun-

    clean

    killrerun

    Continue run

    -run

    resume

    Remove run

    -remove-runs

    clean

    Lock run

    -lock

    lock

    Unlock run

    -unlock

    unlock

    killrun

    -set-state-status KILLREQ; -kill-run

    +

    Config File Helpers

    Various helpers for more advanced config files.

    - + @@ -1415,17 +2294,38 @@ 
    [items]
 A a b c
 B d e f

    Then the config file would effectively appear to contain an items section -exactly like the output from the script. This is extremely useful when -dynamically creating items, itemstables and other config structures. You can -see the expansion of the call by looking in the cached files (look in your -linktree for megatest.config and runconfigs.config cache files and in your -test run areas for the expanded and cached testconfig).

    -
    -

    Disk Space Checks

    +exactly like the output from the script. This is useful when dynamically +creating items, itemstables and other config structures. You can see the +expansion of the call by looking in the cached files (look in your linktree +for megatest.config and runconfigs.config cache files and in your test run +areas for the expanded and cached testconfig).

    +

    Wildcards and regexes in Targets

    +
    +
    +
    [a/2/b]
+VAR1 VAL1
+
+[a/%/b]
+VAR1 VAL2
    +
    +

    Will result in:

    +
    +
    +
    [a/2/b]
+VAR1 VAL2
    +
    +

    Can use either wildcard of "%" or a regular expression:

    +
    +
    +
    [/abc.*def/]
    +
    + +
    +

    Disk Space Checks

    Some parameters you can put in the [setup] section of megatest.config:

    # minimum space required in a run disk
 minspace 10000000
@@ -1435,21 +2335,33 @@
 
 # script that takes path as parameter and returns number of bytes available:
 free-space-script check-space.sh
    -
    -

    Trim trailing spaces

    -
    -
    -
    [configf:settings trim-trailing-spaces yes]
    -
    -
    -
    -

    Job Submission Control

    -
    -
    Submit jobs to Host Types based on Test Name
    +
    +

    Trim trailing spaces

    +
    +
    Table 2. HelpersTable 3. Helpers
    + + +
    +Note +As of Megatest version v1.6548 trim-trailing-spaces defaults to yes.
    +
    +
    +
    +
    [configf:settings trim-trailing-spaces no]
+#                 |<== next line padded with spaces to here
+DEFAULT_INDENT
+[configf:settings trim-trailing-spaces no]
    +
    +

    The variable DEFAULT_INDENT would be a string of 3 spaces

    +
    +
    +

    Job Submission Control

    +
    +

    Submit jobs to Host Types based on Test Name

    In megatest.config
    [host-types]
 general   nbfake
@@ -1463,11 +2375,10 @@
 launcher bsub
 # if defined and not "no" flexi-launcher will bypass launcher unless
 # there is no host-type match.
 flexi-launcher yes
    -
    host-types

    List of host types and the commandline to run a job on that host type.

    host-type ⇒ launch command
    @@ -1490,19 +2401,43 @@
    In megatest.config
    [setup]
 reruns 5
    +

    Replace the default blacklisted environment variables with user supplied +list.

    +

    Default list: USER HOME DISPLAY LS_COLORS XKEYSYMDB EDITOR MAKEFLAGS MAKEF MAKEOVERRIDES

    +
    Add a "bad" variable "PROMPT" to the variables that will be commented out

    in the megatest.sh and megatest.csh files:

    +
    +
    +
    [setup]
+blacklistvars USER HOME DISPLAY LS_COLORS XKEYSYMDB EDITOR MAKEFLAGS PROMPT
    +
    Run time limit
    [setup]
 # this will automatically kill the test if it runs for more than 1h 2m and 3s
 runtimelim 1h 2m 3s
    +
    +
    +
    Post Run Hook
    +

    This runs script to-run.sh after all tests have been completed. It is +not necessary to use -run-wait as each test will check for other +running tests on completion and if there are none it will call the +post run hook.

    +

    Note that the output from the script call will be placed in a log file +in the logs directory with a file name derived by replacing / with _ +in post-hook-<target>-<runname>.log.

    +
    +
    +
    [runs]
+post-hook /path/to/script/to-run.sh
    +

    Tests browser view

    @@ -1524,10 +2459,43 @@ 
    [setup]
 nodot
    +
    +
    +

    Capturing Test Data

    +

    In a test you can capture arbitrary variables and roll them up in the +megatest database for viewing on the dashboard or web app.

    +
    +
    In a test as a script
    +
    +
    $MT_MEGATEST -load-test-data << EOF
+foo,bar,   1.2,  1.9, >
+foo,rab, 1.0e9, 10e9, 1e9
+foo,bla,   1.2,  1.9, <
+foo,bal,   1.2,  1.2, <   ,     ,Check for overload
+foo,alb,   1.2,  1.2, <=  , Amps,This is the high power circuit test
+foo,abl,   1.2,  1.3, 0.1
+foo,bra,   1.2, pass, silly stuff
+faz,bar,    10,  8mA,     ,     ,"this is a comment"
+EOF
    +
    +

    Alternatively you can use logpro triggers to capture values and inject them +into megatest using the -set-values mechanism:

    +
    +
    Megatest help related to -set-values
    +
    +
    Test data capture
+  -set-values             : update or set values in the testdata table
+  :category               : set the category field (optional)
+  :variable               : set the variable name (optional)
+  :value                  : value measured (required)
+  :expected               : value expected (required)
+  :tol                    : |value-expect| <= tol (required, can be <, >, >=, <= or number)
+  :units                  : name of the units for value, expected_value etc. (optional)
    +

    Dashboard settings

    Runs tab buttons, font and size
    @@ -1542,11 +2510,11 @@

    Database settings

    - + @@ -1563,16 +2531,10 @@ - - - - - - @@ -1633,29 +2595,97 @@ 
    runscript main.csh
    + +
    +

    Iteration

    +
    +
    Sections for iteration
    +
    +
    # full combinations
+[items]
+A x y
+B 1 2
+
+# Yields: x/1 x/2 y/1 y/2
+
+# tabled
+[itemstable]
+A x y
+B 1 2
+
+# Yields x/1 y/2
    +
    +
    +
    Or use files
    +
    +
    [itemopts]
+slash path/to/file/with/items
+# or
+space path/to/file/with/items
    +
    +
    +
    File format for / delimited
    +
    +
    key1/key2/key3
+val1/val2/val2
+...
    +
    +
    +
    File format for space delimited
    +
    +
    key1 key2 key3
+val1 val2 val2
+...
    +

    Requirements section

    Header
    [requirements]
    -
    -

    Wait on Other Tests

    +
    +
    +

    Wait on Other Tests

    # A normal waiton waits for the prior tests to be COMPLETED
 # and PASS, CHECK or WAIVED
 waiton test1 test2
    +
    +
    Table 3. Database config settings in [setup] section of megatest.configTable 4. Database config settings in [setup] section of megatest.config

    Prevent concurrent access issues

    yes|no or not defined

    Default=no, may help on some network file systems, may slow things down also.

    daemonize

    Daemonize the server on start

    yes|no or not defined

    Default=no

    faststart

    All direct file access to sqlite db files

    yes|no or not defined

    Default=yes, suggest no for central automated systems and yes for interactive use
    + + +
    +Note +Dynamic waiton lists must be capable of being calculated at the +beginning of a run. This is because Megatest walks the tree of waitons +to create the list of tests to execute.
    +
    +
    +
    This works
    +
    +
    waiton [system somescript.sh]
    +
    +
    +
    This does NOT work (the full context for the test is not available so #{shell …} is NOT enabled to evaluate.
    +
    +
    waiton #{shell somescript.sh}
    +
    +
    +
    This does NOT work
    +
    +
    waiton [system somescript_that_depends_on_a_prior_test.sh]
    +
    -
    -

    Mode

    +
    +

    Mode

    The default (i.e. if mode is not specified) is normal. All pre-dependent tests must be COMPLETED and PASS, CHECK or WAIVED before the test will start

    [requirements]
@@ -1675,11 +2705,10 @@
 
    
 
    [requirements]
 mode itemmatch
    -

    Overriding Enviroment Variables

    Override variables before starting the test. Can include files (perhaps generated by megatest -envdelta or similar).

    @@ -1697,95 +2726,156 @@

    Itemmap Handling

    For cases were the dependent test has a similar but not identical itempath to the downstream test an itemmap can allow for itemmatch mode

    +
    example for removing part of itemmap for waiton test (eg: item foo-x/bar depends on waiton’s item y/bar)
    [requirements]
-mode itemmatch
-itemmap .*x/ y/
-
-# ## pattern replacement notes
+mode itemwait
+# itemmap <item pattern for this test>  <item replacement pattern for waiton test>
+itemmap .*x/ y/
    +
    +
    +
    example for removing part of itemmap for waiton test (eg: item foo/bar/baz in this test depends on waiton’s item baz)
    +
    +
    # ## pattern replacement notes
 #
 # ## Example
 # ## Remove everything up to the last /
-itemmap .*/
-#
+[requirements]
+mode itemwait
+# itemmap <item pattern for this test> <nothing here indicates removal>
+itemmap .*/
    +
    +
    +
    example replacing part of itemmap for (eg: item foo/1234 will imply waiton’s item bar/1234)
    +
    +
    #
 # ## Example
 # ## Replace foo/ with bar/
-itemmap foo/ bar/
-
-# multi-line; matches are applied in the listed order
+[requirements]
+mode itemwait
+# itemmap <item pattern for this test>  <item replacement pattern for waiton test>
+itemmap foo/ bar/
    +
    +
    +
    example for backreference (eg: item foo23/thud will imply waiton’s item num-23/bar/thud
    +
    +
    #
+# ## Example
+# ## can use \{number} in replacement pattern to backreference a (capture) from matching pattern similar to sed or perl
+[requirements]
+mode itemwait
+# itemmap <item pattern for this test>  <item replacement pattern for waiton test>
+itemmap foo(\d+)/ num-\1/bar/
    +
    +
    +
    example multiple itemmaps
    +
    +
    # multi-line; matches are applied in the listed order
 # The following would map:
 #   a123b321 to b321fooa123 then to 321fooa123p
 #
+[requirements]
 itemmap (a\d+)(b\d+) \2foo\1
   b(.*) \1p
    -
    -

    Complex mappings

    -

    Complex mappings can be handled with the [itemmap] section

    +
    +
    +

    Complex mapping

    +

    Complex mappings can be handled with a separate [itemmap] section (instead if an itemmap line in the [requirements] section)

    +

    Each line in an itemmap section starts with a waiton test name followed by an itemmap expression

    +
    +
    eg: The following causes waiton test A item bar/1234 to run when our test’s foo/1234 item is requested as well as causing waiton test B’s blah item to run when our test’s stuff/blah item is requested
    +
    +
    [itemmap]
+A foo/ bar/
+B stuff/
    +
    +
    +
    +

    Complex mapping example

    complex-itemmap.png
    -

    Example:

    -
      -
    1. -

      -Request to run D/1/res -

      -
      2. -
    2. -

      -Megatest uses rule "(\d+)/res" → "\1/aa" to create item C/1/aa from D/1/res -

      -
      3. -
    3. -

      -Full list to be run is now: D/1/res, C/1/aa -

      -
      4. -
    4. -

      -Megatest uses rule "(\d+)/aa" → "aa/\1" to create item A/aa/1 -

      -
      5. -
    5. -

      -Full list to be run is now: D/1/res, C/1/aa, A/aa/1 -

      -
      6. -
    +

    We accomplish this by configuring the testconfigs of our tests C D and E as follows:

    -
    Testconfig for Test C
    +
    Testconfig for Test E has
    [requirements]
-waiton A B
-
-[itemmap]
-A (\d+)/aa aa/\1
-B (\d+)/bb
    +waiton C +itemmap (\d+)/res \1/bb
    -
    Testconfig for Test D
    +
    Testconfig for Test D has
    [requirements]
 waiton C
 itemmap (\d+)/res \1/aa
    -
    Testconfig for Test E
    +
    Testconfig for Test C has
    [requirements]
-waiton C
-itemmap (\d+)/res \1/bb
    +waiton A B + +[itemmap] +A (\d+)/aa aa/\1 +B (\d+)/bb bb/\1 +
    +
    +
    Testconfigs for Test B and Test A have no waiton or itemmap configured
    +
    +
    
 
    
+
    Walk through one item — we want the following to happen for testpatt D/1/res (see blue boxes in complex itemmaping figure above):
      
+
    1. 
+
      
+eg from command line megatest -run -testpatt D/1/res -target mytarget -runname myrunname
+
      
+
      2. 
+
    2. 
+
      
+Full list to be run is now: D/1/res
+
      
+
      3. 
+
    3. 
+
      
+Test D has a waiton - test C.  Test D’s itemmap rule itemmap (\d+)/res \1/aa →  causes C/1/aa to run before D/1/res
+
      
+
      4. 
+
    4. 
+
      
+Full list to be run is now: D/1/res, C/1/aa
+
      
+
      5. 
+
    5. 
+
      
+Test C was a waiton - test A. Test C’s rule A (\d+)/aa aa/\1 → causes A/aa/1 to run before C/1/aa
+
      
+
      6. 
+
    6. 
+
      
+Full list to be run is now: D/1/res, C/1/aa, A/aa/1
+
      
+
      7. 
+
    7. 
+
      
+Test A has no waitons.  All waitons of all tests in full list have been processed.  Full list is finalized.
+
      
+
      8. 
+
    
+
    
+
    
+
    itemstable
    
+
    An alternative to defining items is the itemstable section.  This lets you define the itempath in a table format rather than specifying components and relying on getting all permutations of those components.
    
 
    
-
    
-
    Dynamic Flow Dependency Tree
    
+
    
+
    Dynamic Flow Dependency Tree
    
 
    
 
    Autogeneration waiton list for dynamic flow dependency trees
    
 
    
 
    [requirements]
 # With a toplevel test you may wish to generate your list
@@ -1792,31 +2882,31 @@
 # of tests to run dynamically
 #
 waiton #{shell get-valid-tests-to-run.sh}
    
 
    
 
    
-
    
-
    Run time limit
    
+
    
+
    Run time limit
    
 
    
 
    
 
    [requirements]
 runtimelim 1h 2m 3s  # this will automatically kill the test if it runs for more than 1h 2m and 3s
    
 
    
 
    
-
    
-
    Skip
    
+
    
+
    Skip
    
 
    A test with a skip section will conditional skip running.
    
 
    
 
    Skip section example
    
 
    
 
    [skip]
 prevrunning x
 # rundelay 30m 15s
    
 
    
 
    
-
    
-
    Skip on Still-running Tests
    
+
    
+
    Skip on Still-running Tests
    
 
    
 
    
 
    # NB// If the prevrunning line exists with *any* value the test will
 # automatically SKIP if the same-named test is currently RUNNING. The
 # "x" can be any string. Comment out the prevrunning line to turn off
@@ -1824,38 +2914,60 @@
 
 [skip]
 prevrunning x
    
 
    
 
    
-
    
-
    Skip if a File Exists
    
+
    
+
    Skip if a File Exists
    
 
    
 
    
 
    [skip]
 fileexists /path/to/a/file # skip if /path/to/a/file exists
    
 
    
 
    
-
    
-
    Skip if test ran more recently than specified time
    
+
    
+
    Skip if a File Does not Exist
    
+
    
+
    
+
    [skip]
+filenotexists /path/to/a/file # skip if /path/to/a/file does not exist
    
+
    
+
    
+
    
+
    Skip if a script completes with 0 status
    
+
    
+
    
+
    [skip]
+script /path/to/a/script # skip if /path/to/a/script completes with 0 status
    
+
    
+
    
+
    
+
    Skip if test ran more recently than specified time
    
 
    
 
    Skip if this test has been run in the past fifteen minutes and 15 seconds.
    
 
    
 
    [skip]
 rundelay 15m 15s
    
 
    
 
    
-
    
-
    Disks
    
+
    
+
    Disks
    
 
    A disks section in testconfig will override the disks section in
 megatest.config. This can be used to allocate disks on a per-test or per item
 basis.
    
 
    
-
    
-
    Controlled waiver propagation
    
-
    If test is FAIL and previous test in run with same MT_TARGET is WAIVED then apply the following rules from the testconfig:
-If a waiver check is specified in the testconfig apply the check and if it passes then set this FAIL to WAIVED
    
-
    Waiver check has two parts, 1) a list of waiver, rulename, filepatterns and 2) the rulename script spec (note that "diff" and "logpro" are predefined)
    
+
    
+
    Controlled waiver propagation
    
+
    If test is FAIL and previous test in run with same MT_TARGET is WAIVED
+or if the test/itempath is listed under the matching target in the
+waivers roll forward file (see below for file spec) then apply the
+following rules from the testconfig: If a waiver check is specified in
+the testconfig apply the check and if it passes then set this FAIL to
+WAIVED
    
+
    Waiver check has two parts, 1) a list of waiver, rulename,
+filepatterns and 2) the rulename script spec (note that "diff" and
+"logpro" are predefined)
    
 
    
 
    
 
    ###### EXAMPLE FROM testconfig #########
 # matching file(s) will be diff'd with previous run and logpro applied
 # if PASS or WARN result from logpro then WAIVER state is set
@@ -1870,14 +2982,50 @@
 # diff   diff %file1% %file2%
 
 # This builtin rule is applied if a <waivername>.logpro file exists
 # logpro diff %file1% %file2% | logpro %waivername%.logpro %waivername%.html
    
 
    
+
    
+
    Waiver roll-forward files
    
+
    To transfer waivers from one Megatest area to another it is possible
+to dump waivers into a file and reference that file in another area.
    
+
    
+
    Dumping the waivers
    
+
    
+
    megatest -list-waivers -runname %-a > mywaivers.dat
    
+
    
+
    
+
    Referencing the saved waivers
    
+
    
+
    # In megatest.config, all files listed will be loaded - recomended to use
+# variables to select directorys to minimize what gets loaded.
+[setup]
+waivers-dirs /path/to/waiver/files /another/path/to/waiver/files
    
+
    
+
    
+
    Waiver files format
    
+
    
+
    [the/target/here]
+# comments are fine
+testname1/itempath A comment about why it was waived
+testname2          A comment for a non-itemized test
    
+
    
 
    
 
    
 
    
 
    Ezsteps
    
+
    Ezsteps is the recommended way to implement tests and automation in
+Megatest.
    
+
    
+
+
+
+
    
+Note
+Each ezstep must be a single line. Use the [scripts] mechanism
+to create multiline scripts (see example below).
    
+
    
 
    
 
    Example ezsteps with logpro rules
    
 
    
 
    [ezsteps]
 lookittmp   ls /tmp
@@ -1885,20 +3033,182 @@
 [logpro]
 lookittmp ;; Note: config file format supports multi-line entries where leading whitespace is removed from each line
   ;;     a blank line indicates the end of the block of text
   (expect:required in "LogFileBody" > 0 "A file name that should never exist!" #/This is a awfully stupid file name that should never be found in the temp dir/)
    
 
    
-
    To transfer the environment to the next step you can do the following:
    
+
    
+
    Automatic environment propagation with Ezsteps
    
+
    Turn on ezpropvars and environment variables will be propagated from
+step to step. Use this to source script files that modify the
+envionment where the modifications are needed in subsequent steps.
    
+
    
+
+
+
+
    
+Note
+aliases and variables with strange whitespace or characters will
+not propagate correctly. Put in a ticket on the
+http://www.kiatoa.com/fossils/megatest site if you need support for a
+specific strange character combination.
    
+
    
+
    
+
    Turn on auto propagate for bash
    
+
    
+
    [setup]
+ezpropvars sh
    
+
    
+
    
+
    Write your ezsteps. The loadenv.csh step will use /bin/csh as its shell, other steps will use bash.
    
+
    
+
    [ezsteps]
+loadenv.csh source $REF/ourenviron.csh
+compile make
+install make install
    
+
    
+
    Bash and csh are supported. You can override the shell binary location
+from the default /bin/bash and /bin/csh if needed.
    
+
    
+
    Turn on auto propagate for csh
    
+
    
+
    [setup]
+ezpropvars csh /bin/csh
    
+
    
+
    
+
    Example of auto propagation using extensions
    
+
    
+
    [ezsteps]
+step1.sh export SOMEVAR=$(ps -def | wc -l);ls /tmp
+# The next step will get the value of $SOMEVAR from step1.sh
+step2.sh echo $SOMEVAR
    
+
    
+
    
+
    Example of multi-line script
    
+
    
+
    [scripts]
+tarresults tar cfvz $DEST/srcdir1.tar.gz srcdir1
+  tar cfvz $DEST/srcdir2.tar.gz srcdir2
+
+[setup]
+ezpropvars sh
+
+[ezsteps]
+step1 DEST=/tmp/targz;source tarresults
    
+
    
+
    The above example will result in files; tarresults and ez_step1 being
+created in the test dir.
    
+
    
+
    
+
    
+
    Scripts
    
+
    
+
    Specifying scripts inline (best used for only simple scripts)
    
+
    
+
    [scripts]
+loaddb #!/bin/bash
+  sqlite3 $1 <<EOF
+  .mode tabs
+  .import $2 data
+  .q
+  EOF
    
+
    
+
    The above snippet results in the creation of an executable script
+called "loaddb" in the test directory. NOTE: every line in the script
+must be prefixed with the exact same number of spaces. Lines beginning
+with a # will not work as expected. Currently you cannot indent
+intermediate lines.
    
 
    
+
    Full example with ezsteps, logpro rules, scripts etc.
    
 
    
-
    $MT_MEGATEST -env2file .ezsteps/${stepname}
    
+
    # You can include a common file
+#
+[include #{getenv MT_RUN_AREA_HOME}/global-testconfig.inc]
+
+# Use "var" for a scratch pad
+#
+[var]
+dumpsql select * from data;
+sepstr .....................................
+
+# NOT IMPLEMENTED YET!
+#
+[ezsteps-addendum]
+prescript something.sh
+postscript something2.sh
+
+# Add additional steps here. Format is "stepname script"
+[ezsteps]
+importdb loaddb prod.db prod.sql
+dumpprod dumpdata prod.db "#{get var dumpsql}"
+diff (echo "prod#{get var sepstr}test";diff --side-by-side \
+     dumpprod.log reference.log ;echo DIFFDONE)
+
+[scripts]
+loaddb #!/bin/bash
+  sqlite3 $1 <<EOF
+  .mode tabs
+  .import $2 data
+  .q
+  EOF
+
+dumpdata #!/bin/bash
+  sqlite3 $1 <<EOF
+  .separator ,
+  $2
+  .q
+  EOF
+
+# Test requirements are specified here
+[requirements]
+waiton setup
+priority 0
+
+# Iteration for your test is controlled by the items section
+# The complicated if is needed to allow processing of the config for the dashboard when there are no actual runs.
+[items]
+THINGNAME [system generatethings.sh | sort -u]
+
+# Logpro rules for each step can be captured here in the testconfig
+# note: The ;; after the stepname and the leading whitespace are required
+#
+[logpro]
+inputdb ;;
+  (expect:ignore   in "LogFileBody"  < 99 "Ignore error in comments"      #/^\/\/.*error/)
+  (expect:warning  in "LogFileBody"  = 0 "Any warning"                    #/warn/)
+  (expect:required in "LogFileBody"  > 0 "Some data found"                #/^[a-z]{3,4}[0-9]+_r.*/)
+
+diff ;;
+  (expect:ignore   in "LogFileBody"  < 99 "Ignore error in comments"      #/^\/\/.*error/)
+  (expect:warning  in "LogFileBody"  = 0 "Any warning"                    #/warn/)
+  (expect:error    in "LogFileBody"  = 0 "< or > indicate missing entry"  (list #/(<|>)/   #/error/i))
+  (expect:error    in "LogFileBody"  = 0 "Difference in data"             (list #/\s+\|\s+/ #/error/i))
+  (expect:required in "LogFileBody"  > 0 "DIFFDONE Marker found"          #/DIFFDONE/)
+  (expect:required in "LogFileBody"  > 0 "Some things found"              #/^[a-z]{3,4}[0-9]+_r.*/)
+
+# NOT IMPLEMENTED YET!
+#
+## Also: enhance logpro to take list of command files: file1,file2...
+[waivers]
+createprod{target=%78/%/%/%} ;;
+  (disable:required "DIFFDONE Marker found")
+  (disable:error    "Some error")
+  (expect:waive  in "LogFileBody" < 99 "Waive if failed due to version" #/\w+3\.6.*/)
+
+# test_meta is a section for storing additional data on your test
+[test_meta]
+author matt
+owner  matt
+description Compare things
+tags tagone,tagtwo
+reviewed never
    
 
    
 
    
 
    
 
    Triggers
    
-
    In your testconfig triggers can be specified
    
+
    In your testconfig or megatest.config triggers can be specified
    
 
    
+
    Triggers spec
    
 
    
 
    [triggers]
 
 # Call script running.sh when test goes to state=RUNNING, status=PASS
 RUNNING/PASS running.sh
@@ -1907,26 +3217,95 @@
 RUNNING/ running.sh
 
 # Call script onpass.sh any time status goes to PASS
 PASS/ onpass.sh
    
 
    
-
    Scripts called will have; test-id test-rundir trigger, added to the commandline.
    
+
    Scripts called will have; test-id test-rundir trigger test-name item-path state status event-time, added to the commandline.
    
 
    HINT
    
 
    To start an xterm (useful for debugging), use a command line like the following:
    
 
    
+
    Start an xterm using a trigger for test completed.
    
 
    
 
    [triggers]
 COMPLETED/ xterm -e bash -s --
    
 
    
 
    
 
-
+
    
 
 Note
 There is a trailing space after the --There is a trailing space after the double-dash
 
    
 
    
+
    There are a number of environment variables available to the trigger script
+but since triggers can be called in various contexts not all variables are
+available at all times. The trigger script should check for the variable and
+fail gracefully if it doesn’t exist.
    
+
+
+++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    Table 5. Environment variables visible to the trigger script


     Variable             Purpose
    MT_TEST_RUN_DIR
    The directory where Megatest ran this test
    MT_CMDINFO
    Encoded command data for the test
    MT_DEBUG_MODE
    Used to pass the debug mode to nested calls to Megatest
    MT_RUN_AREA_HOME
    Megatest home area
    MT_TESTSUITENAME
    The name of this testsuite or area
    MT_TEST_NAME
    The name of this test
    MT_ITEM_INFO
    The variable and values for the test item
    MT_MEGATEST
    Which Megatest binary is being used by this area
    MT_TARGET
    The target variable values, separated by /
    MT_LINKTREE
    The base of the link tree where all run tests can be found
    MT_ITEMPATH
    The values of the item path variables, separated by /
    MT_RUNNAME
    The name of the run
    
 
    
 
    
 
    Override the Toplevel HTML File
    
 
    Megatest generates a simple html file summary for top level tests of
 iterated tests. The generation can be overridden. NOTE: the output of
@@ -1961,11 +3340,11 @@
 archive0 /mfs/myarchive-data/adisk1
 
    
 
    
 
    
 
    
-
    Handling Environment Variables
    
+
    Environment Variables
    
 
    
 
    It is often necessary to capture and or manipulate environment
 variables. Megatest has some facilities built in to help.
    
 
    
 
    Capture variables
    
@@ -1982,11 +3361,13 @@
 
 # write the diff from before to after
 megatest -envdelta before-after -dumpmode bash
 
    
 
    Dump modes include bash, csh and config. You can include config data
-into megatest.config or runconfigs.config.
    
+into megatest.config, runconfigs.config and testconfig files. This is
+useful for capturing a complex environment in a special-purpose test
+and then utilizing that environment in downstream tests.
    
 
    
 
    Example of generating and using config data
    
 
    
 
    megatest -envcap original
 # do some stuff here
@@ -1995,27 +3376,111 @@
 
    
 
    Then in runconfigs.config
    
 
    
 
    Example of using modified.config in a testconfig
    
 
    
-
    cat testconfig
-
-[pre-launch-env-vars]
+
    [pre-launch-env-vars]
 [include modified.config]
    
 
    
 
    
 
    
+
    
+
    
+
    Managing Old Runs
    
+
    
+
    It is often desired to keep some older runs around but this must be balanced with the costs of disk space.
    
+
      
+
    1. 
+
      
+Use -remove-keep
+
      
+
      2. 
+
    2. 
+
      
+Use -archive (can also be done from the -remove-keep interface)
+
      
+
      3. 
+
    3. 
+
      
+use -remove-runs with -keep-records
+
      
+
      4. 
+
    
+
    
+
    For each target, remove all runs but the most recent 3 if they are over 1 week old
    
+
    
+
    # use -precmd 'sleep 5;nbfake' to limit overloading the host computer but to allow the removes to run in parallel.
+megatest -actions print,remove-runs -remove-keep 3 -target %/%/%/% -runname % -age 1w -precmd 'sleep 5;nbfake'"
    
+
    
+
    
+
    
+
    
+
    Nested Runs
    
+
    
+
    A Megatest test can run a full Megatest run in either the same
+Megatest area or in another area. This is a powerful way of chaining
+complex suites of tests and or actions.
    
+
    If you are not using the current area you can use ezsteps to retrieve
+and setup the sub-Megatest run area.
    
+
    In the testconfig:
    
+
    
+
    
+
    [subrun]
+
+# Required: wait for the run or just launch it
+#           if no then the run will be an automatic PASS irrespective of the actual result
+run-wait yes|no
+
+# Optional: where to execute the run. Default is the current runarea
+run-area /some/path/to/megatest/area
+
+# Optional: method to use to determine pass/fail status of the run
+#   auto (default) - roll up the net state/status of the sub-run
+#   logpro         - use the provided logpro rules, happens automatically if there is a logpro section
+# passfail auto|logpro
+# Example of logpro:
+passfail logpro
+
+# Optional:
+logpro ;; if this section exists then logpro is used to determine pass/fail
+  (expect:required in "LogFileBody" >= 1 "At least one pass" #/PASS/)
+  (expect:error     in "LogFileBody"  = 0 "No FAILs allowed"  #/FAIL/)
+
+# Optional: target translator, default is to use the parent target
+target #{shell somescript.sh}
+
+# Optional: runname translator/generator, default is to use the parent runname
+run-name #{somescript.sh}
+
+# Optional: testpatt spec, default is to first look for TESTPATT spec from runconfigs unless there is a contour spec
+test-patt %/item1,test2
+
+# Optional: contour spec, use the named contour from the megatest.config contour spec
+contour contourname ### NOTE: Not implemented yet! Let us know if you need this feature.
+
+# Optional: mode-patt, use this spec for testpatt from runconfigs
+mode-patt TESTPATT
+
+# Optional: tag-expr, use this tag-expr to select tests
+tag-expr quick
+
+# Optional: (not yet implemented, remove-runs is always propagated at this time), propagate these actions from the parent
+#           test
+#   Note// default is % for all
+propagate remove-runs archive ...
    
+
    
+
    
 
    
 
    
 
    Programming API
    
 
    
 
    These routines can be called from the megatest repl.
    
 
-
+
@@ -2042,10 +3507,48 @@
 
    Table 4. API Keys Related CallsTable 6. API Keys Related Calls
 
 
 
 
 
    		
 
    
 
 
    
 
    
+
    
+
    
+
    Test Plan
    
+
    
+
    
+
    Tests
    
+
    itemwait|33
    
+
    rerun-downstream-item|20
    
+
    rerunclean|20
    
+
    fullrun|18
    
+
    goodtests|18
    
+
    kill-rerun|17
    
+
    items-runconfigvars|16
    
+
    ro_test|16
    
+
    runconfig-tests|16
    
+
    env-pollution|13
    
+
    itemmap|11
    
+
    testpatt_envvar|10
    
+
    toprun|10
    
+
    chained-waiton|8
    
+
    skip-on-fileexists|8
    
+
    killrun_preqfail|7
    
+
    subrun|6
    
+
    dependencies|5
    
+
    itemwait-simple|4
    
+
    rollup|4
    
+
    end-of-run|3
    
+
    killrun|3
    
+
    listener|3
    
+
    test2|3
    
+
    testpatt|3
    
+
    env-pollution-usecacheno|2
    
+
    set-values|2
+envvars|1
+listruns-tests|1
+subrun-usecases|1
    
+
    
+
    
 
    
 
    
 
    Megatest Internals
    
 
    
 
    
@@ -2054,19 +3557,19 @@
 
    
 
    
 
    
 
    
 
    
-
    Example Index
    
+
    Index
    
 
    
 
    
 
    
 
    
 
    
 
 
 

Index: docs/manual/megatest_manual.txt
==================================================================
--- docs/manual/megatest_manual.txt
+++ docs/manual/megatest_manual.txt
@@ -1,93 +1,140 @@
 The Megatest Users Manual
 =========================
 Matt Welland 
-v1.0, April 2012
+v1.5, June 2020
 :doctype: book
 
 
 [preface]
 Preface
 -------
 
 This book is organised as three sub-books; getting started, writing tests and reference.
 
+.License
+----------------------------
+    Copyright 2006-2020, Matthew Welland.
+
+    This document is part of Megatest.
+
+    Megatest is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Megatest is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Megatest.  If not, see .
+
+----------------------------
+
 Why Megatest?
 -------------
 
 The Megatest project was started for two reasons, the first was an
 immediate and pressing need for a generalized tool to manage a suite
-of regression tests and the second was the fact that the author had
-written or maintained several such tools at different companies over
-the years and it seemed a good thing to have a single open source
-tool, flexible enough to meet the needs of any team doing continuous
-integrating and or running a complex suite of tests for release
-qualification.
+of regression tests and the second was the fact that I had written or
+maintained several such tools at different companies over the years. I
+thought a single open source tool, flexible enough to meet the needs
+of any team doing continuous integration and or running a complex
+suite of tests for release qualification would solve some problems for
+me and for others.
+
+ -- Matt Welland, original author of the Megatest tool suite.
 
 Megatest Design Philosophy
 --------------------------
 
-Megatest is intended to provide the minimum needed resources to make
-writing a suite of tests and tasks for implementing continuous build
-for software, design engineering or process control (via owlfs for
-example) without being specialized for any specific problem
-space. Megatest in of itself does not know what constitutes a PASS or
-FAIL of a test or task. In most cases megatest is best used in
-conjunction with logpro or a similar tool to parse, analyze and decide
-on the test outcome. 
-
- * Self-checking -Repeatable strive for directed or self-checking test
-   as opposed to delta based tests
-
- * Traceable - environment variables, host OS and other possibly influential
-   variables are captured and kept recorded.
-
- * Immutable - once this test is run it cannot be easily overwritten or
-   accidentally modified.
-
- * Repeatable - this test result can be recreated in the future
-
- * Relocatable - the testsuite or automation area can be checked out and the tests run anywhere
-
- * Encapsulated - the tests run in self-contained directories and all inputs
-   and outputs to the process can be found in the run areas.
-
- * Deployable - anyone on the team, at any site, at any time can run the flow
+Megatest is a distributed system intended to provide the minimum needed
+resources to make writing a suite of tests and tasks for implementing
+continuous build for software, design engineering or process control (via
+owlfs for example) without being specialized for any specific problem
+space. Megatest in of itself does not know what constitutes a PASS or FAIL
+of a test or task. In most cases megatest is best used in conjunction with
+logpro or a similar tool to parse, analyze and decide on the test outcome.
+
+ * Self-checking - make it as easy as possible to write self-checking
+   tests (as opposed to using deltas, i.e. tests that compare with a
+   previous measurement to deterine PASS/FAIL).
+
+ * Traceable - environment variables, host OS and other possibly
+   influential variables are captured and kept recorded.
+
+ * Immutable - once a test is run it cannot be easily overwritten or
+   modified accidentally.
+
+ * Repeatable - test results can be recreated in the future using all
+   the original variables.
+
+ * Relocatable - the testsuite or automation area can be checked out
+   and the tests run anywhere in the disk hierarchy.
+
+ * Encapsulated - the tests run in self-contained directories and all
+   inputs and outputs to the process can be found in the run areas.
+
+ * Deployable - a testsuite is self-contained and can be bundled with
+   a software project and easily used by others with little to no
+   setup burden.
 
 Megatest Architecture
 ---------------------
+
+Data separation
+~~~~~~~~~~~~~~~
 
 All data to specify the tests and configure the system is stored in
-plain text files. All system state is stored in an sqlite3
-database. Tests are launched using the launching system available for
-the distributed compute platform in use. A template script is provided
+plain text config files. All system state is stored in an sqlite3
+database.
+
+Distributed Compute
+~~~~~~~~~~~~~~~~~~~
+
+Tests are launched using the launching system available for the
+distributed compute platform in use. A template script is provided
 which can launch jobs on local and remote Linux hosts. Currently
 megatest uses the network filesystem to call home to your master
-sqlite3 database.
+sqlite3 database. Megatest has been used with the Intel Netbatch and
+lsf (also known as openlava) batch systems and it should be
+straightforward to use it with other similar systems.
+
+include::overview.txt[]
 
-include::../plan.txt[]
-// to allow the getting_started.txt to be a stand-alone document use level
-shifting, note that the preceding blank line is needed.
-// :leveloffset: 2
+include::plan.txt[]
 
 include::installation.txt[]
 
 include::getting_started.txt[]
 
-:leveloffset: 0
+include::study_plan.txt[]
+
+// :leveloffset: 0
 
 include::writing_tests.txt[]
+
 include::howto.txt[]
+
 include::reference.txt[]
+
+include::testplan.txt[]
 
 Megatest Internals
 ------------------
 
 ["graphviz", "server.png"]
 ----------------------------------------------------------------------
 include::server.dot[]
 ----------------------------------------------------------------------
+
+// include::plan.txt[]
+// to allow the getting_started.txt to be a stand-alone document use level
+// shifting, note that the preceding blank line is needed.
+// :leveloffset: 2
 
 
 // [appendix]
 // Example Appendix
 // ================
@@ -132,11 +179,11 @@
 // Example Colophon
 // ================
 // Text at the end of a book describing facts about its production.
 
 [index]
-Example Index
--------------
+Index
+-----
 ////////////////////////////////////////////////////////////////
 The index is normally left completely empty, it's contents are
 generated automatically by the DocBook toolchain.
 ////////////////////////////////////////////////////////////////

ADDED   docs/manual/overview.txt
Index: docs/manual/overview.txt
==================================================================
--- /dev/null
+++ docs/manual/overview.txt
@@ -0,0 +1,43 @@
+
+Overview
+--------
+
+Stand-alone Megatest Area
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+A single, stand-alone, Megatest based testsuite or "area" is
+sufficient for most validation, automation and build problems.
+
+image::megatest-stand-alone-area.png[Static,300]
+
+Megatest is designed as a distributed or decoupled system. This means
+you can run the areas stand-alone with no additional
+infrastructure. I.e. there are no databases, web servers or other
+centralized resources needed. However as your needs grow you can
+integrate multiple areas into a bigger system.
+
+Component Descriptions
+^^^^^^^^^^^^^^^^^^^^^^
+
+. Multi-area dashboard and xterm. A gui (the dashboard) is usually the
+  best option for controlling and launching runs but all operations
+  can also be done from the commandline. Note: The not yet released
+  multi-area dashboard replaces the old dashboard for browsing and
+  controlling runs but for managing a single area the old dashboard
+  works very well.
+ 
+. Area/testsuite. This is your testsuite or automation definition and
+  consists of the information in megatest.config, runconfigs.config
+  and your testconfigs along with any custom scripting that can't be
+  done with the native Megatest features.
+
+. If your testsuite or build automation is too large to run on a
+  single instance you can distribute your jobs into a compute server
+  pool. The only current requirements are password-less ssh access and
+  a network filesystem.
+
+Full System Architecture
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+image::megatest-system-architecture.png[Static,300]
+

ADDED   docs/manual/plan.txt
Index: docs/manual/plan.txt
==================================================================
--- /dev/null
+++ docs/manual/plan.txt
@@ -0,0 +1,166 @@
+Road Map
+--------
+
+// This file is part of Megatest.
+// 
+//     Megatest is free software: you can redistribute it and/or modify
+//     it under the terms of the GNU General Public License as published by
+//     the Free Software Foundation, either version 3 of the License, or
+//     (at your option) any later version.
+// 
+//     Megatest is distributed in the hope that it will be useful,
+//     but WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//     GNU General Public License for more details.
+// 
+//     You should have received a copy of the GNU General Public License
+//     along with Megatest.  If not, see .
+
+// Copyright 2006-2020, Matthew Welland.
+
+TODO / Road Map
+---------------
+
+Note: This road-map is a wish list and not a formal plan. Items are in
+rough priority but are subject to change. Development is driven by
+user requests, developer "itch" and bug reports. Please contact
+matt@kiatoa.com with requests or bug reports. Requests from inside
+Intel generally take priority.
+
+Dashboard and runs
+
+. Multi-area dashboard view
+
+Tests Support
+
+. Add variable $MT_RUNPATH = $MT_LINKTREE/$MT_TARGET/$MT_RUNNAME
+. Improve [script], especially indent handling
+
+Scalability
+
+. Overflow database methodology - combine the best of the v1.63
+  multi-db approach and the current db-in-tmp approach (currently
+  slowness can be seen when number of tests in a db goes over 50-100k,
+  with the overflow db it will be able to handle 1000's of runs with
+  50-100k tests per run). High priority - goal is to complete this by
+  20Q3.
+
+Mtutils/CI
+
+. Enable mtutil calls from dashboard (for remote control)
+. Logs browser (esp. for surfacing mtutil related activities)
+. Embed ftfplan for distributed automation, completed activities trigger QA runs which trigger deployment etc.
+. Jenkins junit XML support [DONE]
+. Add output flushing in teamcity support
+
+Build system
+
+. ./configure => ubuntu, sles11, sles12, rh7 [WIP]
+. Switch to using simple runs query everywhere
+. Add end_time to runs and add a rollup call that sets state, status and end_time
+
+Code refactoring/quality/performance
+
+. Switch to scsh-process pipeline management for job execution/control
+. Use call-with-environment-variables where possible.
+
+Migration to inmem db and or overflow db
+
+. Re-work the dbstruct data structure?
+.. [ run-id.db inmemdb last-mod last-read last-sync inuse ]
+
+Some ideas for Megatest 2.0
+
+.   Aggressive megatest.config and runconfig.config caching.
+..  Cache the configs in $MT_RUNPATH
+..  Following invocations of –run, -rerun* will calculate the new config but only overwrite the cached file IF changed
+. If the cached file changes ALL existing tests go from COMPLETED -> STALE, I’m not sure what to do about RUNNING tests
+. !VARS in runconfigs are not exported to the environment. They are accessed via rget as if the ! was not there.
+. Per test copy commands (example is incomplete).
+----------------
+[testcopy]
+%/iind% unison SRC DEST
+% cp –r SRC DEST
+----------------
+
+Add ability to move runs to other Areas (overlaps with overflow db system)
+
+. allow shrinking megatest.db data by moving runs to an alternate
+  Megatest area with same keys.
+. add param -destination [area|path]. when specified runs are copied to new
+  area and removed from local db.
+. the data move would involve these steps
+.. copy the run data to destination area megatest.db
+.. mark the run records as deleted, do not remove the run data on disk
+. accessing the data would be by running dashboard in the satellite area
+. future versions of Megatest dashboard should support displaying areas in a
+  merged way.
+. some new controls would be supported in the config
+.. [setup] => allow-runs [no|yes]  <== used to disallow runs
+.. [setup] => auto-migrate=[areaname|path]  <== used to automatically
+   migrate data to a satellite area.
+
+Eliminate ties to homehost (part of overflow db system)
+
+. Server creates captain pkt
+. Create a lock in the db
+. Relinquish db when done
+
+Tasks - better management of run manager processes etc.
+
+. adjutant queries tasks table for next action [red]#[Migrate into mtutil]#
+.. Task table used for tracking runner process [red]#[Replaced by mtutil]#
+.. Task table used for jobs to run [red]#[Replaced by mtutil]#
+.. Task table used for queueing runner actions (remove runs,
+   cleanRunExecute, etc)  [red]#[Replaced by mtutil#]
+. adjutant (server/task dispatch/execution manager)  
+
+Stale propagation
+
+ . Mark dependent tests for clean/rerun -rerun-downstream
+ . On run start check for defunct tests in RUNNING, LAUNCHED or REMOTEHOSTSTART and correct or notify
+ . Fix: refresh of gui sometimes fails on last item (race condition?)
+ 
+Bin list
+
+ . Rerun step and or subsequent steps from gui [DONE?]
+ . Refresh test area files from gui
+ . Clean and re-run button
+ . Clean up STATE and STATUS handling.
+ .. Dashboard and Test control panel are reverse order - choose and fix
+ .. Move seldom used states and status to drop down selector
+ . Access test control panel when clicking on Run Summary tests
+ . Feature: -generate-index-tree
+ . Change specifing of state and status to use STATE1/STATUS1,STATE2/STATUS2
+ 
+ . rest api available for use with Perl, Ruby etc. scripts
+ . megatest.config setup entries for:
+ .. run launching (e.g. /bin/sh %CMD% > /dev/null)
+ .. browser "konqueror %FNAME%
+
+ . refdb: Add export of csv, json and sexp
+ . Convert to using call-with-environment-variables where possible. Should allow handling of parallel runs in same process.
+ . Re-work text interface wizards. Several bugs on record. Possibly convert to gui based.
+ . Add to testconfig requirements section; launchlimiter scriptname, calls scriptname to check if ok to launch test
+ . Refactor Run Summary view, currently very clumsy
+ . Add option to show steps in Run Summary view
+  . Refactor guis for resizeablity
+ . Add filters to Run Summary view and Run Control view
+ . Add to megatest.config or testconfig; rerunok STATE/STATUS,STATE/STATUS...
+ . Launch gates for diskspace; /path/one>1G,/path/two>200M,/tmp>5G,#{scheme *toppath*}>1G
+ . Tool tips
+ . Filters on Run Summary, Summary and Run Control panel
+ . Built in log viewer (partially implemented)
+ . Refactor the test control panel
+   Help and documentation
+ . Complete the user manual (I’ve been working on this lately).
+ . Online help in the gui
+   Streamlined install
+ . Deployed or static build
+ . Added option to compile IUP (needed for VMs)
+ . Server side run launching
+ . Wizards for creating tests, regression areas (current ones are text only and limited).
+ . Fully functional built in web service (currently you can browse runs but it is very simplistic).
+ . Gui panels for editing megatest.config and runconfigs.config
+ . Fully isolated tests (no use of NFS to see regression area files)
+ . Windows version

Index: docs/manual/reference.txt
==================================================================
--- docs/manual/reference.txt
+++ docs/manual/reference.txt
@@ -1,9 +1,40 @@
+// This file is part of Megatest.
+// 
+//     Megatest is free software: you can redistribute it and/or modify
+//     it under the terms of the GNU General Public License as published by
+//     the Free Software Foundation, either version 3 of the License, or
+//     (at your option) any later version.
+// 
+//     Megatest is distributed in the hope that it will be useful,
+//     but WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//     GNU General Public License for more details.
+// 
+//     You should have received a copy of the GNU General Public License
+//     along with Megatest.  If not, see .
 
 Reference
 ---------
 
+Megatest Use Modes
+~~~~~~~~~~~~~~~~~~
+
+.Base commands
+[width="80%",cols="^,2m,2m",frame="topbot",options="header"]
+|======================
+|Use case	         | Megatest command	|  mtutil
+|Start from scratch       |	-rerun-all	|  restart	
+|Rerun non-good completed |	-rerun-clean	|  rerunclean	
+|Rerun all non-good and not completed yet | -set-state-status KILLREQ; -rerun-|clean | killrerun	
+|Continue run             |	-run	        |  resume	
+|Remove run	         |      -remove-runs	|  clean	
+|Lock run	         |      -lock	        |  lock	
+|Unlock run	         |      -unlock	        |  unlock	
+|killrun	                 | -set-state-status KILLREQ; -kill-run	| killrun	
+|======================
+
 Config File Helpers
 ~~~~~~~~~~~~~~~~~~~
 
 Various helpers for more advanced config files.
 
@@ -67,14 +98,16 @@
 VAR1 VAL2
 -------------------------
 
 Can use either wildcard of "%" or a regular expression:
 
+-------------------------
 [/abc.*def/]
+-------------------------
 
 Disk Space Checks
-^^^^^^^^^^^^^^^^^
+~~~~~~~~~~~~~~~~~
 
 Some parameters you can put in the [setup] section of megatest.config:
 
 -------------------
 # minimum space required in a run disk 
@@ -86,21 +119,28 @@
 # script that takes path as parameter and returns number of bytes available:
 free-space-script check-space.sh
 -------------------
 
 Trim trailing spaces
-^^^^^^^^^^^^^^^^^^^^
+~~~~~~~~~~~~~~~~~~~~
 
+NOTE: As of Megatest version v1.6548 trim-trailing-spaces defaults to yes.
+
+------------------
+[configf:settings trim-trailing-spaces no]
+#                 |<== next line padded with spaces to here
+DEFAULT_INDENT
+[configf:settings trim-trailing-spaces no]
 ------------------
-[configf:settings trim-trailing-spaces yes]
-------------------
+
+The variable DEFAULT_INDENT would be a string of 3 spaces
 
 Job Submission Control
-^^^^^^^^^^^^^^^^^^^^^^
+~~~~~~~~~~~~~~~~~~~~~~
 
 Submit jobs to Host Types based on Test Name
-++++++++++++++++++++++++++++++++++++++++++++
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 .In megatest.config
 ------------------------
 [host-types]
 general   nbfake
@@ -144,19 +184,48 @@
 ------------------
 [setup]
 reruns 5
 ------------------
 
+Replace the default blacklisted environment variables with user supplied
+list.
+
+Default list: USER HOME DISPLAY LS_COLORS XKEYSYMDB EDITOR MAKEFLAGS MAKEF MAKEOVERRIDES
+
+.Add a "bad" variable "PROMPT" to the variables that will be commented out
+in the megatest.sh and megatest.csh files:
+-----------------
+[setup]
+blacklistvars USER HOME DISPLAY LS_COLORS XKEYSYMDB EDITOR MAKEFLAGS PROMPT
+-----------------
+
 Run time limit
 ++++++++++++++
 
 -----------------
 [setup]
 # this will automatically kill the test if it runs for more than 1h 2m and 3s
 runtimelim 1h 2m 3s
 -----------------
 
+Post Run Hook
++++++++++++++
+
+This runs script to-run.sh after all tests have been completed. It is
+not necessary to use -run-wait as each test will check for other
+running tests on completion and if there are none it will call the
+post run hook.
+
+Note that the output from the script call will be placed in a log file
+in the logs directory with a file name derived by replacing / with _
+in post-hook--.log.
+
+-------------------
+[runs]
+post-hook /path/to/script/to-run.sh
+-------------------
+
 Tests browser view
 ~~~~~~~~~~~~~~~~~~
 
 The tests browser (see the Run Control tab on the dashboard) has two views for displaying the tests. 
 
@@ -169,10 +238,45 @@
 -----------------
 [setup]
 nodot
 -----------------
 
+Capturing Test Data
+~~~~~~~~~~~~~~~~~~~
+
+In a test you can capture arbitrary variables and roll them up in the
+megatest database for viewing on the dashboard or web app.
+
+.In a test as a script
+------------------------
+$MT_MEGATEST -load-test-data << EOF
+foo,bar,   1.2,  1.9, >
+foo,rab, 1.0e9, 10e9, 1e9
+foo,bla,   1.2,  1.9, <
+foo,bal,   1.2,  1.2, <   ,     ,Check for overload
+foo,alb,   1.2,  1.2, <=  , Amps,This is the high power circuit test
+foo,abl,   1.2,  1.3, 0.1
+foo,bra,   1.2, pass, silly stuff
+faz,bar,    10,  8mA,     ,     ,"this is a comment"
+EOF
+------------------------
+
+Alternatively you can use logpro triggers to capture values and inject them
+into megatest using the -set-values mechanism:
+
+.Megatest help related to -set-values
+------------------------
+Test data capture
+  -set-values             : update or set values in the testdata table
+  :category               : set the category field (optional)
+  :variable               : set the variable name (optional)
+  :value                  : value measured (required)
+  :expected               : value expected (required)
+  :tol                    : |value-expect| <= tol (required, can be <, >, >=, <= or number)
+  :units                  : name of the units for value, expected_value etc. (optional)
+------------------------
+
 Dashboard settings
 ~~~~~~~~~~~~~~~~~~
 
 .Runs tab buttons, font and size
 ------------------
@@ -188,11 +292,10 @@
 .Database config settings in [setup] section of megatest.config
 [width="70%",cols="^,2m,2m,2m",frame="topbot",options="header"]
 |======================
 |Var                       | Purpose            | Valid values            | Comments
 |delay-on-busy             | Prevent concurrent access issues | yes\|no or not defined | Default=no, may help on some network file systems, may slow things down also.
-|daemonize                 | Daemonize the server on start | yes\|no or not defined | Default=no
 |faststart		   | All direct file access to sqlite db files | yes\|no or not defined | Default=yes, suggest no for central automated systems and yes for interactive use
 |homehost 		   | Start servers on this host |  | Defaults to local host
 |hostname		   | Hostname to bind to | \|-	  | On multi-homed hosts allows binding to specific hostname
 |lowport		   | Start searching for a port at this portnum| 32768 | 
 |required		   | Server required    | yes\|no or not defined  | Default=no, force start of server always
@@ -218,29 +321,90 @@
 
 -------------------
 runscript main.csh
 -------------------
 
+Iteration
+~~~~~~~~~
+
+.Sections for iteration
+------------------
+# full combinations
+[items]
+A x y
+B 1 2
+
+# Yields: x/1 x/2 y/1 y/2
+
+# tabled
+[itemstable]
+A x y
+B 1 2
+
+# Yields x/1 y/2
+------------------
+
+.Or use files
+------------------
+[itemopts]
+slash path/to/file/with/items
+# or
+space path/to/file/with/items
+------------------
+
+.File format for / delimited
+------------------
+key1/key2/key3
+val1/val2/val2
+...
+------------------
+
+.File format for space delimited
+------------------
+key1 key2 key3
+val1 val2 val2
+...
+------------------
+
 Requirements section
 ~~~~~~~~~~~~~~~~~~~~
 
 .Header
 -------------------
 [requirements]
 -------------------
 
 Wait on Other Tests
-^^^^^^^^^^^^^^^^^^^
+~~~~~~~~~~~~~~~~~~~
 
 -------------------
 # A normal waiton waits for the prior tests to be COMPLETED 
 # and PASS, CHECK or WAIVED
 waiton test1 test2
 -------------------
 
+NOTE: Dynamic waiton lists must be capable of being calculated at the
+beginning of a run. This is because Megatest walks the tree of waitons
+to create the list of tests to execute.
+
+.This works
+-------------------
+waiton [system somescript.sh]
+-------------------
+
+.This does NOT work (the full context for the test is not available so #{shell ...} is NOT enabled to evaluate.
+-------------------
+waiton #{shell somescript.sh}
+-------------------
+
+.This does NOT work
+-------------------
+waiton [system somescript_that_depends_on_a_prior_test.sh]
+-------------------
+
 Mode
-^^^^
+~~~~
 
 The default (i.e. if mode is not specified) is normal. All pre-dependent tests
 must be COMPLETED and PASS, CHECK or WAIVED before the test will start
 
 -------------------
@@ -286,75 +450,139 @@
 
 For cases were the dependent test has a similar but not identical
 itempath to the downstream test an itemmap can allow for itemmatch
 mode
 
+.example for removing part of itemmap for waiton test (eg: item +foo-x/bar+ depends on waiton's item +y/bar+)
 -------------------
 [requirements]
-mode itemmatch
+mode itemwait
+# itemmap   
 itemmap .*x/ y/
+
+-------------------
+
+.example for removing part of itemmap for waiton test (eg: item +foo/bar/baz+ in this test depends on waiton's item +baz+)
+-------------------
 
 # ## pattern replacement notes
 #
 # ## Example
 # ## Remove everything up to the last /
+[requirements]
+mode itemwait
+# itemmap  
 itemmap .*/
+-------------------
+
+.example replacing part of itemmap for (eg: item +foo/1234+ will imply waiton's item +bar/1234+)
+-------------------
+
 #
 # ## Example
 # ## Replace foo/ with bar/
+[requirements]
+mode itemwait
+# itemmap   
 itemmap foo/ bar/
+
+-------------------
+
+.example for backreference (eg: item +foo23/thud+ will imply waiton's item +num-23/bar/thud+
+-------------------
+#
+# ## Example
+# ## can use \{number} in replacement pattern to backreference a (capture) from matching pattern similar to sed or perl
+[requirements]
+mode itemwait
+# itemmap   
+itemmap foo(\d+)/ num-\1/bar/
+
+-------------------
+
+.example multiple itemmaps
+-------------------
 
 # multi-line; matches are applied in the listed order
 # The following would map:
 #   a123b321 to b321fooa123 then to 321fooa123p
 #
+[requirements]
 itemmap (a\d+)(b\d+) \2foo\1
   b(.*) \1p
 -------------------
 
-Complex mappings
-^^^^^^^^^^^^^^^^
 
-Complex mappings can be handled with the [itemmap] section
+Complex mapping
+~~~~~~~~~~~~~~~
+Complex mappings can be handled with a separate [itemmap] section (instead if an itemmap line in the [requirements] section)
+
+Each line in an itemmap section starts with a waiton test name followed by an itemmap expression
+
+.eg: The following causes waiton test A item +bar/1234+ to run when our test's +foo/1234+ item is requested as well as causing waiton test B's +blah+ item to run when our test's +stuff/blah+ item is requested
+--------------
+[itemmap]
+A foo/ bar/
+B stuff/
+--------------
+
+
+Complex mapping example
+~~~~~~~~~~~~~~~~~~~~~~~
+
 
 // image::itemmap.png[]
 image::complex-itemmap.png[]
 
-Example:
-
-. Request to run D/1/res
-. Megatest uses rule "(\d+)/res" -> "\1/aa" to create item C/1/aa from D/1/res
-. Full list to be run is now: D/1/res, C/1/aa
-. Megatest uses rule "(\d+)/aa" -> "aa/\1" to create item A/aa/1
-. Full list to be run is now: D/1/res, C/1/aa, A/aa/1
-
-.Testconfig for Test C
-----------------------
-[requirements]
-waiton A B
-
-[itemmap]
-A (\d+)/aa aa/\1
-B (\d+)/bb 
-----------------------
-
-.Testconfig for Test D
-----------------------
-[requirements]
-waiton C
-itemmap (\d+)/res \1/aa
-----------------------
-
-.Testconfig for Test E
+We accomplish this by configuring the testconfigs of our tests C D and E as follows:
+
+.Testconfig for Test E has
 ----------------------
 [requirements]
 waiton C
 itemmap (\d+)/res \1/bb
 ----------------------
 
+.Testconfig for Test D has
+----------------------
+[requirements]
+waiton C
+itemmap (\d+)/res \1/aa
+----------------------
+
+.Testconfig for Test C has
+----------------------
+[requirements]
+waiton A B
+
+[itemmap]
+A (\d+)/aa aa/\1
+B (\d+)/bb bb/\1
+----------------------
+
+.Testconfigs for Test B and Test A have no waiton or itemmap configured
+-------------------
+-------------------
+
+.Walk through one item -- we want the following to happen for testpatt +D/1/res+ (see blue boxes in complex itemmaping figure above):
+
+. eg from command line +megatest -run -testpatt D/1/res -target mytarget -runname myrunname+
+. Full list to be run is now: +D/1/res+
+. Test D has a waiton - test C.  Test D's itemmap rule +itemmap (\d+)/res \1/aa+ ->  causes +C/1/aa+ to run before +D/1/res+
+. Full list to be run is now: +D/1/res+, +C/1/aa+
+. Test C was a waiton - test A. Test C's rule +A (\d+)/aa aa/\1+ -> causes +A/aa/1+ to run before +C/1/aa+
+. Full list to be run is now: +D/1/res+, +C/1/aa+, +A/aa/1+
+. Test A has no waitons.  All waitons of all tests in full list have been processed.  Full list is finalized.
+
+
+
+itemstable
+~~~~~~~~~~
+An alternative to defining items is the itemstable section.  This lets you define the itempath in a table format rather than specifying components and relying on getting all permutations of those components.
+
 Dynamic Flow Dependency Tree
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .Autogeneration waiton list for dynamic flow dependency trees
 -------------------
 [requirements]
 # With a toplevel test you may wish to generate your list 
@@ -362,19 +590,19 @@
 #
 waiton #{shell get-valid-tests-to-run.sh}
 -------------------
 
 Run time limit
-^^^^^^^^^^^^^^
+~~~~~~~~~~~~~~
 
 -----------------
 [requirements]
 runtimelim 1h 2m 3s  # this will automatically kill the test if it runs for more than 1h 2m and 3s
 -----------------
 
 Skip
-^^^^
+~~~~
 
 A test with a skip section will conditional skip running.
 
 .Skip section example
 -----------------
@@ -382,11 +610,11 @@
 prevrunning x
 # rundelay 30m 15s
 -----------------
 
 Skip on Still-running Tests
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 -----------------
 # NB// If the prevrunning line exists with *any* value the test will
 # automatically SKIP if the same-named test is currently RUNNING. The
 # "x" can be any string. Comment out the prevrunning line to turn off
@@ -395,40 +623,62 @@
 [skip]
 prevrunning x
 -----------------
 
 Skip if a File Exists
-^^^^^^^^^^^^^^^^^^^^^
+~~~~~~~~~~~~~~~~~~~~~
 
 -----------------
 [skip]
 fileexists /path/to/a/file # skip if /path/to/a/file exists
 -----------------
+
+Skip if a File Does not Exist
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+-----------------
+[skip]
+filenotexists /path/to/a/file # skip if /path/to/a/file does not exist
+-----------------
+
+Skip if a script completes with 0 status
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+-----------------
+[skip]
+script /path/to/a/script # skip if /path/to/a/script completes with 0 status
+-----------------
 
 Skip if test ran more recently than specified time
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .Skip if this test has been run in the past fifteen minutes and 15 seconds.
 -----------------
 [skip]
 rundelay 15m 15s
 -----------------
 
 Disks
-^^^^^
+~~~~~
 
 A disks section in testconfig will override the disks section in
 megatest.config. This can be used to allocate disks on a per-test or per item
 basis.
 
 Controlled waiver propagation
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-If test is FAIL and previous test in run with same MT_TARGET is WAIVED then apply the following rules from the testconfig:
-If a waiver check is specified in the testconfig apply the check and if it passes then set this FAIL to WAIVED
+If test is FAIL and previous test in run with same MT_TARGET is WAIVED
+or if the test/itempath is listed under the matching target in the
+waivers roll forward file (see below for file spec) then apply the
+following rules from the testconfig: If a waiver check is specified in
+the testconfig apply the check and if it passes then set this FAIL to
+WAIVED
 
-Waiver check has two parts, 1) a list of waiver, rulename, filepatterns and 2) the rulename script spec (note that "diff" and "logpro" are predefined)
+Waiver check has two parts, 1) a list of waiver, rulename,
+filepatterns and 2) the rulename script spec (note that "diff" and
+"logpro" are predefined)
 
 -----------------
 ###### EXAMPLE FROM testconfig #########
 # matching file(s) will be diff'd with previous run and logpro applied
 # if PASS or WARN result from logpro then WAIVER state is set
@@ -444,12 +694,45 @@
 
 # This builtin rule is applied if a .logpro file exists
 # logpro diff %file1% %file2% | logpro %waivername%.logpro %waivername%.html
 -----------------
 
+Waiver roll-forward files
+^^^^^^^^^^^^^^^^^^^^^^^^^
+
+To transfer waivers from one Megatest area to another it is possible
+to dump waivers into a file and reference that file in another area.
+
+.Dumping the waivers
+---------------------------
+megatest -list-waivers -runname %-a > mywaivers.dat
+---------------------------
+
+.Referencing the saved waivers
+---------------------------
+# In megatest.config, all files listed will be loaded - recomended to use
+# variables to select directorys to minimize what gets loaded.
+[setup]
+waivers-dirs /path/to/waiver/files /another/path/to/waiver/files
+---------------------------
+
+.Waiver files format
+---------------------------
+[the/target/here]
+# comments are fine
+testname1/itempath A comment about why it was waived
+testname2          A comment for a non-itemized test 
+---------------------------
+
 Ezsteps
 ~~~~~~~
+
+Ezsteps is the recommended way to implement tests and automation in
+Megatest.
+
+NOTE: Each ezstep must be a single line. Use the [scripts] mechanism
+to create multiline scripts (see example below).
 
 .Example ezsteps with logpro rules
 -----------------
 [ezsteps]
 lookittmp   ls /tmp
@@ -459,21 +742,180 @@
   ;;     a blank line indicates the end of the block of text 
   (expect:required in "LogFileBody" > 0 "A file name that should never exist!" #/This is a awfully stupid file name that should never be found in the temp dir/)
 
 -----------------
 
-To transfer the environment to the next step you can do the following:
+Automatic environment propagation with Ezsteps
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+Turn on ezpropvars and environment variables will be propagated from
+step to step. Use this to source script files that modify the
+envionment where the modifications are needed in subsequent steps.
+
+NOTE: aliases and variables with strange whitespace or characters will
+not propagate correctly. Put in a ticket on the
+http://www.kiatoa.com/fossils/megatest site if you need support for a
+specific strange character combination.
+
+.Turn on auto propagate for bash
+---------------------------
+[setup]
+ezpropvars sh
+---------------------------
+
+.Write your ezsteps. The loadenv.csh step will use /bin/csh as its shell, other steps will use bash.
+---------------------------
+[ezsteps]
+loadenv.csh source $REF/ourenviron.csh
+compile make
+install make install
+---------------------------
+
+Bash and csh are supported. You can override the shell binary location
+from the default /bin/bash and /bin/csh if needed.
+
+.Turn on auto propagate for csh
+---------------------------
+[setup]
+ezpropvars csh /bin/csh
+---------------------------
+
+.Example of auto propagation using extensions
+---------------------------
+[ezsteps]
+step1.sh export SOMEVAR=$(ps -def | wc -l);ls /tmp
+# The next step will get the value of $SOMEVAR from step1.sh
+step2.sh echo $SOMEVAR
+---------------------------
+
+.Example of multi-line script
+---------------------------
+[scripts]
+tarresults tar cfvz $DEST/srcdir1.tar.gz srcdir1
+  tar cfvz $DEST/srcdir2.tar.gz srcdir2
+
+[setup]
+ezpropvars sh
+
+[ezsteps]
+step1 DEST=/tmp/targz;source tarresults
+---------------------------
+
+The above example will result in files; tarresults and ez_step1 being
+created in the test dir.
+
+Scripts
+~~~~~~~
+
+.Specifying scripts inline (best used for only simple scripts)
+----------------------------
+[scripts]
+loaddb #!/bin/bash
+  sqlite3 $1 < 0 "Some data found"                #/^[a-z]{3,4}[0-9]+_r.*/)
+
+diff ;; 
+  (expect:ignore   in "LogFileBody"  < 99 "Ignore error in comments"      #/^\/\/.*error/)
+  (expect:warning  in "LogFileBody"  = 0 "Any warning"                    #/warn/)
+  (expect:error    in "LogFileBody"  = 0 "< or > indicate missing entry"  (list #/(<|>)/   #/error/i))
+  (expect:error    in "LogFileBody"  = 0 "Difference in data"             (list #/\s+\|\s+/ #/error/i))
+  (expect:required in "LogFileBody"  > 0 "DIFFDONE Marker found"          #/DIFFDONE/)
+  (expect:required in "LogFileBody"  > 0 "Some things found"              #/^[a-z]{3,4}[0-9]+_r.*/)
+
+# NOT IMPLEMENTED YET!
+#
+## Also: enhance logpro to take list of command files: file1,file2...
+[waivers]
+createprod{target=%78/%/%/%} ;;
+  (disable:required "DIFFDONE Marker found")
+  (disable:error    "Some error")
+  (expect:waive  in "LogFileBody" < 99 "Waive if failed due to version" #/\w+3\.6.*/)
+
+# test_meta is a section for storing additional data on your test
+[test_meta]
+author matt
+owner  matt
+description Compare things
+tags tagone,tagtwo
+reviewed never
+-----------------
 
 Triggers
 ~~~~~~~~
 
-In your testconfig triggers can be specified 
+In your testconfig or megatest.config triggers can be specified 
 
+.Triggers spec
 -----------------
 [triggers]
 
 # Call script running.sh when test goes to state=RUNNING, status=PASS
 RUNNING/PASS running.sh
@@ -483,22 +925,48 @@
 
 # Call script onpass.sh any time status goes to PASS
 PASS/ onpass.sh
 -----------------
 
-Scripts called will have; test-id test-rundir trigger, added to the commandline.
+Scripts called will have; test-id test-rundir trigger test-name item-path state status event-time, added to the commandline.
 
 HINT
 
 To start an xterm (useful for debugging), use a command line like the following:
 
+.Start an xterm using a trigger for test completed.
 -----------------
 [triggers]
 COMPLETED/ xterm -e bash -s -- 
 -----------------
 
-NOTE: There is a trailing space after the --
+NOTE: There is a trailing space after the double-dash
+
+There are a number of environment variables available to the trigger script
+but since triggers can be called in various contexts not all variables are
+available at all times. The trigger script should check for the variable and
+fail gracefully if it doesn't exist.
+
+// ,cols="^,2m"
+
+.Environment variables visible to the trigger script
+[width="90%",frame="topbot",options="header"]
+|======================
+| Variable            | Purpose            
+| MT_TEST_RUN_DIR     | The directory where Megatest ran this test                   
+| MT_CMDINFO          | Encoded command data for the test                   
+| MT_DEBUG_MODE       | Used to pass the debug mode to nested calls to Megatest                   
+| MT_RUN_AREA_HOME    | Megatest home area 
+| MT_TESTSUITENAME    | The name of this testsuite or area                   
+| MT_TEST_NAME        | The name of this test
+| MT_ITEM_INFO        | The variable and values for the test item
+| MT_MEGATEST         | Which Megatest binary is being used by this area
+| MT_TARGET           | The target variable values, separated by '/'
+| MT_LINKTREE         | The base of the link tree where all run tests can be found
+| MT_ITEMPATH         | The values of the item path variables, separated by '/'
+| MT_RUNNAME          | The name of the run
+|======================
 
 
 Override the Toplevel HTML File
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -532,12 +1000,12 @@
 # Within the archive the data is structured like this:
 #  ///
 archive0 /mfs/myarchive-data/adisk1
 --------------
 
-Handling Environment Variables
-------------------------------
+Environment Variables
+---------------------
 
 It is often necessary to capture and or manipulate environment
 variables. Megatest has some facilities built in to help.
 
 Capture variables
@@ -556,11 +1024,13 @@
 # write the diff from before to after
 megatest -envdelta before-after -dumpmode bash
 ------------------------------
 
 Dump modes include bash, csh and config. You can include config data
-into megatest.config or runconfigs.config.
+into megatest.config, runconfigs.config and testconfig files. This is
+useful for capturing a complex environment in a special-purpose test
+and then utilizing that environment in downstream tests.
 
 .Example of generating and using config data
 ------------------------------
 megatest -envcap original
 # do some stuff here
@@ -570,16 +1040,86 @@
 
 Then in runconfigs.config
 
 .Example of using modified.config in a testconfig
 ------------------------------
-cat testconfig
-
 [pre-launch-env-vars]
 [include modified.config]
 ------------------------------
 
+Managing Old Runs
+-----------------
+
+It is often desired to keep some older runs around but this must be balanced with the costs of disk space.
+
+. Use -remove-keep
+. Use -archive (can also be done from the -remove-keep interface)
+. use -remove-runs with -keep-records
+
+.For each target, remove all runs but the most recent 3 if they are over 1 week old
+---------------------
+# use -precmd 'sleep 5;nbfake' to limit overloading the host computer but to allow the removes to run in parallel.
+megatest -actions print,remove-runs -remove-keep 3 -target %/%/%/% -runname % -age 1w -precmd 'sleep 5;nbfake'"
+---------------------
+
+Nested Runs
+-----------
+
+A Megatest test can run a full Megatest run in either the same
+Megatest area or in another area. This is a powerful way of chaining
+complex suites of tests and or actions.
+
+If you are not using the current area you can use ezsteps to retrieve
+and setup the sub-Megatest run area.
+
+In the testconfig:
+---------------
+[subrun]
+
+# Required: wait for the run or just launch it
+#           if no then the run will be an automatic PASS irrespective of the actual result
+run-wait yes|no
+
+# Optional: where to execute the run. Default is the current runarea
+run-area /some/path/to/megatest/area
+
+# Optional: method to use to determine pass/fail status of the run
+#   auto (default) - roll up the net state/status of the sub-run
+#   logpro         - use the provided logpro rules, happens automatically if there is a logpro section
+# passfail auto|logpro
+# Example of logpro:
+passfail logpro
+
+# Optional: 
+logpro ;; if this section exists then logpro is used to determine pass/fail
+  (expect:required in "LogFileBody" >= 1 "At least one pass" #/PASS/)
+  (expect:error     in "LogFileBody"  = 0 "No FAILs allowed"  #/FAIL/)
+
+# Optional: target translator, default is to use the parent target
+target #{shell somescript.sh}
+
+# Optional: runname translator/generator, default is to use the parent runname
+run-name #{somescript.sh}
+
+# Optional: testpatt spec, default is to first look for TESTPATT spec from runconfigs unless there is a contour spec
+test-patt %/item1,test2
+
+# Optional: contour spec, use the named contour from the megatest.config contour spec
+contour contourname ### NOTE: Not implemented yet! Let us know if you need this feature.
+
+# Optional: mode-patt, use this spec for testpatt from runconfigs
+mode-patt TESTPATT
+
+# Optional: tag-expr, use this tag-expr to select tests
+tag-expr quick
+
+# Optional: (not yet implemented, remove-runs is always propagated at this time), propagate these actions from the parent
+#           test
+#   Note// default is % for all
+propagate remove-runs archive ...
+
+---------------
 
 Programming API
 ---------------
 
 These routines can be called from the megatest repl. 
@@ -592,6 +1132,5 @@
 | (rmt:get-key-val-pairs run-id) |                    | #t=success/#f=fail      | Works only if the server is still reachable
 |======================
 
 
 :numbered!:
-

Index: docs/manual/server.dot
==================================================================
--- docs/manual/server.dot
+++ docs/manual/server.dot
@@ -1,5 +1,21 @@
+//  Copyright 2006-2017, Matthew Welland.
+// 
+// This file is part of Megatest.
+// 
+//     Megatest is free software: you can redistribute it and/or modify
+//     it under the terms of the GNU General Public License as published by
+//     the Free Software Foundation, either version 3 of the License, or
+//     (at your option) any later version.
+// 
+//     Megatest is distributed in the hope that it will be useful,
+//     but WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//     GNU General Public License for more details.
+// 
+//     You should have received a copy of the GNU General Public License
+//     along with Megatest.  If not, see .
 digraph G {
 
     subgraph cluster_1 {
         node [style=filled,shape=box];
 

ADDED   docs/manual/stand-alone-megatest-area.svg
Index: docs/manual/stand-alone-megatest-area.svg
==================================================================
--- /dev/null
+++ docs/manual/stand-alone-megatest-area.svg
cannot compute difference between binary files

ADDED   docs/manual/study_plan.txt
Index: docs/manual/study_plan.txt
==================================================================
--- /dev/null
+++ docs/manual/study_plan.txt
@@ -0,0 +1,89 @@
+// This file is part of Megatest.
+// 
+//     Megatest is free software: you can redistribute it and/or modify
+//     it under the terms of the GNU General Public License as published by
+//     the Free Software Foundation, either version 3 of the License, or
+//     (at your option) any later version.
+// 
+//     Megatest is distributed in the hope that it will be useful,
+//     but WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//     GNU General Public License for more details.
+// 
+//     You should have received a copy of the GNU General Public License
+//     along with Megatest.  If not, see .
+//
+// Copyright 2006-2012, Matthew Welland.
+
+Study Plan
+----------
+
+Megatest is an extensive program with a lot to learn. Following are some paths through the material to smooth the learning path.
+
+Basic Concepts (suggest you pick these up on the way)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+* Components of automation; run, test, iteration 
+* Selectors; target, runname, and testpatt
+
+Running Testsuites or Automation
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+* Using the dashboard gui (recommended)
+** Using the "Runs" panel.
+** Using the "Run Control" panel.
+** Using a test control panel
+** The Right Mouse Button menu
+** Debug features
+*** xterm
+**** pstree
+**** log files; mt_copy.log, mt_launch.log
+**** variables; megatest.csh, megatest.sh
+**** testconfig dump, *testconfig
+*** State/status buttons
+*** Run, Clean, KillReq
+*** ReRunClean
+* Using the command line
+** Getting help; megatest -h, megatest -manual
+** Starting runs; megatest -run
+*** Selection controls; -target, -runname and -testpatt
+
+Writing Tests and Flows
+~~~~~~~~~~~~~~~~~~~~~~~
+
+* environment variables (table 5)
+* tests/_testname_/testconfig link:megatest_manual.html#_the_testconfig_file[testconfig details]
+** ezsteps and logpro section
+** iteration (one test applied to many inputs), items, itemstable link:megatest_manual.html#_iteration[test iteration]
+** dependencies, waiton, itemmatch, itemwait link:megatest_manual.html#_requirements_section[test requirements]
+** miscellaneous; mode toplevel, runtimelim, skip on file, no file, script or on running, waiver propagation
+* megatest areas
+** megatest.config
+** runconfigs.config
+** config language features; include, shell, system, scheme, rp|realpath, getenv, get, rget, scriptinc link:megatest.html#_config_file_helpers[config file helpers]
+
+Advanced Topics
+~~~~~~~~~~~~~~~
+
+* Removing and keeping runs selectively link:megatest_manual.html#_managing_old_runs[managing runs]
+* Subruns link:megatest_manual.html#_nested_runs[nested runs]
+* Config file features link:megatest_manual.html#_config_file_helpers[config file features]
+* HTML output with -generate-html
+* Triggers, post run, state/status
+* MTLOWESTLOAD
+* flexilauncher
+* env delta and testconfig
+* capturing test data, extracting values from logpro and using them for pass/fail
+* mtutil, postgres connection, packets for cross-site/cross-user control (e.g. mcrun).
+
+Maintenance and Troubleshooting
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+* cleanup-db, database structure of Megatest 1.6x
+* archiving
+* homehost management
+* show-runconfig
+* show-config
+* show with -debug 0,9
+* load management
+

ADDED   docs/manual/subrun-opt-stuff.fig
Index: docs/manual/subrun-opt-stuff.fig
==================================================================
--- /dev/null
+++ docs/manual/subrun-opt-stuff.fig
@@ -0,0 +1,128 @@
+#FIG 3.2  Produced by xfig version 3.2.5-alpha5
+Landscape
+Center
+Inches
+Letter  
+100.00
+Single
+-2
+1200 2
+6 150 5475 1650 9675
+2 2 0 1 0 7 50 -1 -1 3.000 0 0 -1 0 0 5
+	 150 5475 1650 5475 1650 9675 150 9675 150 5475
+2 2 0 1 0 7 50 -1 -1 3.000 0 0 -1 0 0 5
+	 225 5550 1575 5550 1575 6075 225 6075 225 5550
+2 2 0 1 0 7 50 -1 -1 3.000 0 0 -1 0 0 5
+	 225 6150 1575 6150 1575 6675 225 6675 225 6150
+2 2 0 1 0 7 50 -1 -1 3.000 0 0 -1 0 0 5
+	 225 6750 1575 6750 1575 7275 225 7275 225 6750
+2 2 0 1 0 7 50 -1 -1 3.000 0 0 -1 0 0 5
+	 225 7350 1575 7350 1575 7875 225 7875 225 7350
+-6
+6 3900 5550 5400 9750
+2 2 0 1 0 7 50 -1 -1 3.000 0 0 -1 0 0 5
+	 3900 5550 5400 5550 5400 9750 3900 9750 3900 5550
+2 2 0 1 0 7 50 -1 -1 3.000 0 0 -1 0 0 5
+	 3975 5625 5325 5625 5325 6150 3975 6150 3975 5625
+2 2 0 1 0 7 50 -1 -1 3.000 0 0 -1 0 0 5
+	 3975 6225 5325 6225 5325 6750 3975 6750 3975 6225
+2 2 0 1 0 7 50 -1 -1 3.000 0 0 -1 0 0 5
+	 3975 6825 5325 6825 5325 7350 3975 7350 3975 6825
+2 2 0 1 0 7 50 -1 -1 3.000 0 0 -1 0 0 5
+	 3975 7425 5325 7425 5325 7950 3975 7950 3975 7425
+-6
+6 8325 5700 9525 9825
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 8325 6000 9525 6000 9525 6825 8325 6825 8325 6000
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 8325 6900 9525 6900 9525 7725 8325 7725 8325 6900
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 8325 7800 9525 7800 9525 8625 8325 8625 8325 7800
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 8325 8700 9525 8700 9525 9525 8325 9525 8325 8700
+4 0 0 50 -1 0 12 0.0000 4 120 405 8475 5850 tests\001
+4 0 0 50 -1 0 12 0.0000 4 165 600 8400 6375 startup\001
+4 0 0 50 -1 0 12 0.0000 4 195 375 8400 7275 opt1\001
+4 0 0 50 -1 0 12 0.0000 4 195 375 8400 8025 opt2\001
+4 0 0 50 -1 0 12 0.0000 4 195 585 8400 9075 opt1v2\001
+4 0 0 50 -1 0 12 0.0000 4 15 180 8775 9825 ...\001
+-6
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 4800 450 6000 450 6000 1275 4800 1275 4800 450
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 1050 2100 2250 2100 2250 2925 1050 2925 1050 2100
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 2925 2100 4125 2100 4125 2925 2925 2925 2925 2100
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 4950 2100 6150 2100 6150 2925 4950 2925 4950 2100
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 7200 2100 8400 2100 8400 2925 7200 2925 7200 2100
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 9375 2100 10575 2100 10575 2925 9375 2925 9375 2100
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 2025 4050 3225 4050 3225 4875 2025 4875 2025 4050
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 6525 3975 7725 3975 7725 4800 6525 4800 6525 3975
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
+	0 0 1.00 60.00 120.00
+	 5400 1275 1500 2100
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
+	0 0 1.00 60.00 120.00
+	 5325 1275 3525 2100
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
+	0 0 1.00 60.00 120.00
+	 5325 1275 5475 2100
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
+	0 0 1.00 60.00 120.00
+	 5250 1275 7800 2100
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
+	0 0 1.00 60.00 120.00
+	 5325 1275 9900 2100
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
+	0 0 1.00 60.00 120.00
+	 1650 2925 2550 4050
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
+	0 0 1.00 60.00 120.00
+	 3525 2925 2550 4050
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
+	0 0 1.00 60.00 120.00
+	 3525 2925 7050 3975
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
+	0 0 1.00 60.00 120.00
+	 5550 2925 6975 3975
+2 2 2 1 0 7 50 -1 -1 3.000 0 0 -1 0 0 5
+	 750 1650 10875 1650 10875 3450 750 3450 750 1650
+2 1 0 1 0 7 50 -1 -1 3.000 0 0 -1 1 0 3
+	0 0 1.00 60.00 120.00
+	 1050 2700 450 2700 450 5550
+2 1 0 1 0 7 50 -1 -1 3.000 0 0 -1 1 0 3
+	0 0 1.00 60.00 120.00
+	 4125 2700 4650 2700 4650 5550
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 2100 5475 3300 5475 3300 8700 2100 8700 2100 5475
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 2175 6000 3225 6000 3225 6525 2175 6525 2175 6000
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
+	0 0 1.00 60.00 120.00
+	 1500 6375 2325 6300
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
+	0 0 1.00 60.00 120.00
+	 4200 6525 3000 6225
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
+	0 0 1.00 60.00 120.00
+	 7800 2925 7050 3975
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
+	0 0 1.00 60.00 120.00
+	 9975 2925 7125 3900
+4 0 0 50 -1 0 12 0.0000 4 165 600 4875 975 startup\001
+4 0 0 50 -1 0 12 0.0000 4 15 180 5325 2550 ...\001
+4 0 0 50 -1 0 12 0.0000 4 195 2100 900 675 p1278/2/cpdk_r0.5/none\001
+4 0 0 50 -1 0 12 0.0000 4 150 675 150 2475 subruns\001
+4 0 0 50 -1 0 12 0.0000 4 195 585 2175 4500 opt1v2\001
+4 0 0 50 -1 0 12 0.0000 4 195 375 1200 2625 opt1\001
+4 0 0 50 -1 0 12 0.0000 4 195 375 3150 2550 opt2\001
+4 0 0 50 -1 0 12 0.0000 4 150 2100 3075 150 SUBRUN for Multistack\001
+4 0 0 50 -1 0 12 0.0000 4 150 225 300 6375 ftc\001
+4 0 0 50 -1 0 12 0.0000 4 150 225 4050 6450 ftc\001
+4 0 0 50 -1 0 12 0.0000 4 195 2220 600 5250 p1278/2/cpdk_r0.5/x-opt1\001
+4 0 0 50 -1 0 12 0.0000 4 195 2220 4800 5325 p1278/2/cpdk_r0.5/y-opt2\001

ADDED   docs/manual/testplan.txt
Index: docs/manual/testplan.txt
==================================================================
--- /dev/null
+++ docs/manual/testplan.txt
@@ -0,0 +1,81 @@
+// This file is part of Megatest.
+// 
+//     Megatest is free software: you can redistribute it and/or modify
+//     it under the terms of the GNU General Public License as published by
+//     the Free Software Foundation, either version 3 of the License, or
+//     (at your option) any later version.
+// 
+//     Megatest is distributed in the hope that it will be useful,
+//     but WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//     GNU General Public License for more details.
+// 
+//     You should have received a copy of the GNU General Public License
+//     along with Megatest.  If not, see .
+
+// Copyright 2006-2020, Matthew Welland.
+
+Test Plan
+---------
+
+Tests
+~~~~~
+
+itemwait|33
+
+rerun-downstream-item|20
+
+rerunclean|20
+
+fullrun|18
+
+goodtests|18
+
+kill-rerun|17
+
+items-runconfigvars|16
+
+ro_test|16
+
+runconfig-tests|16
+
+env-pollution|13
+
+itemmap|11
+
+testpatt_envvar|10
+
+toprun|10
+
+chained-waiton|8
+
+skip-on-fileexists|8
+
+killrun_preqfail|7
+
+subrun|6
+
+dependencies|5
+
+itemwait-simple|4
+
+rollup|4
+
+end-of-run|3
+
+killrun|3
+
+listener|3
+
+test2|3
+
+testpatt|3
+
+env-pollution-usecacheno|2
+
+set-values|2
+envvars|1
+listruns-tests|1
+subrun-usecases|1
+
+

Index: docs/manual/thoughts.fig
==================================================================
--- docs/manual/thoughts.fig
+++ docs/manual/thoughts.fig
@@ -1,49 +1,65 @@
-#FIG 3.2
+#FIG 3.2  Produced by xfig version 3.2.5-alpha5
 Landscape
 Center
 Inches
 Letter  
 100.00
 Single
 -2
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
 1200 2
 2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
 	 1800 3000 10800 3000 10800 4800 1800 4800 1800 3000
 2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
 	 14475 975 15975 975 15975 1500 14475 1500 14475 975
 2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
 	 15075 2550 14100 3675
 2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
 	 14175 4275 15150 5475
-4 0 0 50 -1 0 24 0.0000 4 255 990 3150 1800 -runall\001
-4 0 0 50 -1 0 24 0.0000 4 330 4665 2175 5190 (expect:ignore Test: abc FAIL/)\001
-4 0 0 50 -1 0 24 0.0000 4 330 1095 2400 6225 [group]\001
-4 0 0 50 -1 0 24 0.0000 4 330 2415 2625 8085 megatest -runall\001
-4 0 0 50 -1 0 24 0.0000 4 360 1185 5250 8025 $(TAG)\001
-4 0 0 50 -1 0 24 0.0000 4 255 3045 4650 8700 make TARGET=foo\001
-4 0 0 50 -1 0 24 0.0000 4 330 4755 2625 6825 TAG1 envsetup test1 test2 testx\001
-4 0 0 50 -1 0 24 0.0000 4 330 1440 7875 1425 testconfig\001
-4 0 0 50 -1 0 24 0.0000 4 330 2190 7875 1845 [requirements]\001
-4 0 0 50 -1 0 24 0.0000 4 255 2670 3150 2220 -runtests standard\001
-4 0 0 50 -1 0 24 0.0000 4 300 1320 14625 2325 envsetup\001
-4 0 0 50 -1 0 24 0.0000 4 255 705 13650 4125 test1\001
-4 0 0 50 -1 0 24 0.0000 4 255 1410 14550 5850 testsuite2\001
-4 0 0 50 -1 0 24 0.0000 4 255 795 10200 6300 waito\001
-4 0 0 50 -1 0 24 0.0000 4 330 3990 7875 2265 testmode normal | toplevel \001
-4 0 0 50 -1 0 24 0.0000 4 330 2610 7875 2685 waitoncompleted \001
-4 0 0 50 -1 0 24 0.0000 4 360 9255 2175 4350 megatest -list-runs $MT_RUNNAME -target $MT_TARGET\001
-4 0 0 50 -1 0 24 0.0000 4 330 1860 10050 7275 test_toplevel\001
-4 0 0 50 -1 0 24 0.0000 4 330 2190 10050 7695 [requirements]\001
-4 0 0 50 -1 0 24 0.0000 4 330 2580 10050 8115 testmode toplevel\001
-4 0 0 50 -1 0 24 0.0000 4 330 2580 10050 8535 waiton testx testy\001
-4 0 0 50 -1 0 24 0.0000 4 225 810 10050 9375 testx:\001
-4 0 0 50 -1 0 24 0.0000 4 315 1050 10050 9795 [items]\001
-4 0 0 50 -1 0 24 0.0000 4 300 780 10050 11055 testy:\001
-4 0 0 50 -1 0 24 0.0000 4 315 1050 10050 11475 [items]\001
-4 0 0 50 -1 0 24 0.0000 4 330 2190 10800 13170 [requirements]\001
-4 0 0 50 -1 0 24 0.0000 4 300 780 10050 12735 testy:\001
-4 0 0 50 -1 0 24 0.0000 4 330 3330 10800 13590 waitoncompleted testx\001
-4 0 0 50 -1 0 24 0.0000 4 255 2610 10800 14010 waitonitems testx\001
-4 0 0 50 -1 0 24 0.0000 4 255 1605 10050 10215 X A B D E\001
-4 0 0 50 -1 0 24 0.0000 4 255 1245 10050 11895 Y A B C\001
-4 0 0 50 -1 0 24 0.0000 4 330 6660 2100 3450 waiton #{shell get-valid-tests-for-dotproc.sh}\001
+4 0 0 50 -1 0 24 0.0000 4 270 1050 3150 1800 -runall\001
+4 0 0 50 -1 0 24 0.0000 4 375 5040 2175 5190 (expect:ignore Test: abc FAIL/)\001
+4 0 0 50 -1 0 24 0.0000 4 375 1200 2400 6225 [group]\001
+4 0 0 50 -1 0 24 0.0000 4 375 2610 2625 8085 megatest -runall\001
+4 0 0 50 -1 0 24 0.0000 4 405 1275 5250 8025 $(TAG)\001
+4 0 0 50 -1 0 24 0.0000 4 270 3255 4650 8700 make TARGET=foo\001
+4 0 0 50 -1 0 24 0.0000 4 375 5160 2625 6825 TAG1 envsetup test1 test2 testx\001
+4 0 0 50 -1 0 24 0.0000 4 375 1575 7875 1425 testconfig\001
+4 0 0 50 -1 0 24 0.0000 4 375 2400 7875 1845 [requirements]\001
+4 0 0 50 -1 0 24 0.0000 4 270 2910 3150 2220 -runtests standard\001
+4 0 0 50 -1 0 24 0.0000 4 345 1440 14625 2325 envsetup\001
+4 0 0 50 -1 0 24 0.0000 4 270 780 13650 4125 test1\001
+4 0 0 50 -1 0 24 0.0000 4 270 1545 14550 5850 testsuite2\001
+4 0 0 50 -1 0 24 0.0000 4 270 855 10200 6300 waito\001
+4 0 0 50 -1 0 24 0.0000 4 375 4290 7875 2265 testmode normal | toplevel \001
+4 0 0 50 -1 0 24 0.0000 4 375 2820 7875 2685 waitoncompleted \001
+4 0 0 50 -1 0 24 0.0000 4 420 9900 2175 4350 megatest -list-runs $MT_RUNNAME -target $MT_TARGET\001
+4 0 0 50 -1 0 24 0.0000 4 375 2010 10050 7275 test_toplevel\001
+4 0 0 50 -1 0 24 0.0000 4 375 2400 10050 7695 [requirements]\001
+4 0 0 50 -1 0 24 0.0000 4 375 2805 10050 8115 testmode toplevel\001
+4 0 0 50 -1 0 24 0.0000 4 375 2805 10050 8535 waiton testx testy\001
+4 0 0 50 -1 0 24 0.0000 4 240 885 10050 9375 testx:\001
+4 0 0 50 -1 0 24 0.0000 4 345 1155 10050 9795 [items]\001
+4 0 0 50 -1 0 24 0.0000 4 345 855 10050 11055 testy:\001
+4 0 0 50 -1 0 24 0.0000 4 345 1155 10050 11475 [items]\001
+4 0 0 50 -1 0 24 0.0000 4 375 2400 10800 13170 [requirements]\001
+4 0 0 50 -1 0 24 0.0000 4 345 855 10050 12735 testy:\001
+4 0 0 50 -1 0 24 0.0000 4 375 3615 10800 13590 waitoncompleted testx\001
+4 0 0 50 -1 0 24 0.0000 4 270 2835 10800 14010 waitonitems testx\001
+4 0 0 50 -1 0 24 0.0000 4 270 1680 10050 10215 X A B D E\001
+4 0 0 50 -1 0 24 0.0000 4 270 1335 10050 11895 Y A B C\001
+4 0 0 50 -1 0 24 0.0000 4 375 7170 2100 3450 waiton #{shell get-valid-tests-for-dotproc.sh}\001

Index: docs/manual/writing_tests.txt
==================================================================
--- docs/manual/writing_tests.txt
+++ docs/manual/writing_tests.txt
@@ -1,5 +1,21 @@
+//  Copyright 2006-2017, Matthew Welland.
+// 
+// This file is part of Megatest.
+// 
+//     Megatest is free software: you can redistribute it and/or modify
+//     it under the terms of the GNU General Public License as published by
+//     the Free Software Foundation, either version 3 of the License, or
+//     (at your option) any later version.
+// 
+//     Megatest is distributed in the hope that it will be useful,
+//     but WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//     GNU General Public License for more details.
+// 
+//     You should have received a copy of the GNU General Public License
+//     along with Megatest.  If not, see .
 
 Writing Tests
 -------------
 
 Creating a new Test

ADDED   docs/megatest-desktop.png
Index: docs/megatest-desktop.png
==================================================================
--- /dev/null
+++ docs/megatest-desktop.png
cannot compute difference between binary files

Index: docs/megatest-state-status.dot
==================================================================
--- docs/megatest-state-status.dot
+++ docs/megatest-state-status.dot
@@ -1,5 +1,23 @@
+//  Copyright 2006-2017, Matthew Welland.
+// 
+// This file is part of Megatest.
+// 
+//     Megatest is free software: you can redistribute it and/or modify
+//     it under the terms of the GNU General Public License as published by
+//     the Free Software Foundation, either version 3 of the License, or
+//     (at your option) any later version.
+// 
+//     Megatest is distributed in the hope that it will be useful,
+//     but WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//     GNU General Public License for more details.
+// 
+//     You should have received a copy of the GNU General Public License
+//     along with Megatest.  If not, see .
+//
+
 digraph megatest_state_status {
   ranksep=0.05
   // rankdir=LR
 
 node [shape=box,style=filled];
@@ -31,11 +49,11 @@
      label="{RUNNING|{n/a| PASS | FAIL}}";
   ]
 
   "COMPLETED" [
       shape="record";
-      label = "{COMPLETED|{PASS |  FAIL | CHECK| SKIP}}";
+      label = "{COMPLETED|{PASS | SKIP | WAIVED | FAIL | CHECK| ABORT}}";
   ]
 
 
 "RUNNING" -> "COMPLETED";
 "RUNNING" -> "INCOMPLETE" [label="test dead for > 24hrs"];

Index: docs/megatest-training.odp
==================================================================
--- docs/megatest-training.odp
+++ docs/megatest-training.odp
cannot compute difference between binary files

DELETED docs/megatest.lyx
Index: docs/megatest.lyx
==================================================================
--- docs/megatest.lyx
+++ /dev/null
@@ -1,4102 +0,0 @@
-#LyX 2.0 created this file. For more info see http://www.lyx.org/
-\lyxformat 413
-\begin_document
-\begin_header
-\textclass article
-\begin_preamble
-% Include the proper LaTeX packages:
-%----------------------------------------------------------------------------------------------------
-\usepackage{graphicx}
-\usepackage{titling}
-\usepackage{ifthen}
-\usepackage[absolute]{textpos}
-\usepackage[colorlinks=true,
-                       pagecolor=black,
-                       menucolor=black,
-                       linkcolor=black,
-                       citecolor=blue,
-                       pagebordercolor=1 1 1,
-                       urlcolor=red,
-                       plainpages=false,
-                       pdfpagelabels=true,
-                       bookmarksnumbered=true]{hyperref}
-\usepackage{lastpage}
-
-\newcommand{\reportTopic}{}
-\newcommand{\revisionNumber}{}
-\newcommand{\documentNumber}{}
-
-
-% Setup the right-hand header to display the current doc section:
-%----------------------------------------------------------------------------------------------------
-\renewcommand{\sectionmark}[1]{\markright{#1}}
-\renewcommand{\subsectionmark}[1]{\markright{#1}}
-
-% Setup for roman numeral page numbers until TOC:
-%----------------------------------------------------------------------------------------------------
-\newboolean{romanpn}
-
-\pagenumbering{roman}
-\setboolean{romanpn}{true}
-\let\myTOC\tableofcontents
-
-\renewcommand\tableofcontents{%
-\myTOC
-\clearpage
-\pagenumbering{arabic}
-\setboolean{romanpn}{false}
-}
-
-% Modify titlepage format:
-%----------------------------------------------------------------------------------------------------
-\setlength{\TPHorizModule}{1in}
-\setlength{\TPVertModule}{\TPHorizModule}
-\textblockorigin{3.25in}{1in}
-
-\pretitle
- {
-    \begin{flushright}\LARGE\sffamily 
-    \thispagestyle{empty}
-    \begin{textblock}{4}(0,0)
-    \includegraphics[width=2in,keepaspectratio=true]
-{/home/matt/data/megatest/docs/megatest_logo.png}
-    \end{textblock}
-    \vspace{1in}
-  }
-
-\posttitle{\par\end{flushright}}
-
-\preauthor{\begin{flushright} \large \sffamily \lineskip 0.5em 
-\begin{tabular}[t]{c}}
-\postauthor{\end{tabular} \par\end{flushright}}
-
-\predate{\begin{flushright}\large \sffamily Document Number: \documentNumber \\ Revision Number: \revisionNumber \\}
-
-\postdate{
-\vspace{2in}
-\\Matt Welland.
-\par\end{flushright}}
-
-% Setup "fancy" page layout:
-%----------------------------------------------------------------------------------------------------
-\fancyhf{}
-\setlength{\topmargin}{-1in}
-\setlength{\headheight}{1in}
-\setlength{\headsep}{0.5in}
-\setlength{\oddsidemargin}{0.25in}
-\setlength{\evensidemargin}{\oddsidemargin}
-\setlength{\textwidth}{6in}
-\setlength{\headwidth}{\textwidth}
-\setlength{\textheight}{8.375in}
-\setlength{\footskip}{0.5in}
-
-% Setup header:
-%------------------------------------------------------------------------------------------
-\fancyhead[L]{\sffamily \bfseries \large Megatest.\\\mdseries \reportTopic}
-\fancyhead[R]{\sffamily \bfseries \large User Manual\\ \mdseries \nouppercase{\rightmark}}
-
-% Setup footer:
-%------------------------------------------------------------------------------------------
-\renewcommand{\footrulewidth}{0.4pt}
-\fancyfoot[L]{\sffamily \bfseries \documentNumber \\ \mdseries Revision:  \revisionNumber}
-\fancyfoot[C]{\sffamily \bfseries\thedate \\ \mdseries Free Software. License: GPL v2.0}
-\fancyfoot[R]{\ifthenelse{\boolean{romanpn}}{\sffamily  \thepage}{\sffamily \bfseries Page \thepage\ of \pageref{LastPage}}}
-\end_preamble
-\use_default_options false
-\maintain_unincluded_children false
-\language english
-\language_package default
-\inputencoding auto
-\fontencoding global
-\font_roman times
-\font_sans helvet
-\font_typewriter courier
-\font_default_family default
-\use_non_tex_fonts false
-\font_sc false
-\font_osf false
-\font_sf_scale 100
-\font_tt_scale 100
-
-\graphics default
-\default_output_format default
-\output_sync 0
-\bibtex_command default
-\index_command default
-\paperfontsize 11
-\spacing single
-\use_hyperref false
-\papersize letterpaper
-\use_geometry false
-\use_amsmath 1
-\use_esint 0
-\use_mhchem 0
-\use_mathdots 1
-\cite_engine basic
-\use_bibtopic false
-\use_indices false
-\paperorientation portrait
-\suppress_date false
-\use_refstyle 0
-\index Index
-\shortcut idx
-\color #008000
-\end_index
-\secnumdepth 3
-\tocdepth 3
-\paragraph_separation skip
-\defskip medskip
-\quotes_language english
-\papercolumns 1
-\papersides 1
-\paperpagestyle fancy
-\tracking_changes false
-\output_changes false
-\html_math_output 0
-\html_css_as_file 0
-\html_be_strict false
-\end_header
-
-\begin_body
-
-\begin_layout Standard
-\begin_inset ERT
-status open
-
-\begin_layout Plain Layout
-
-
-\backslash
-renewcommand{
-\backslash
-documentNumber}{TSETAGEM-011}
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-\begin_inset ERT
-status open
-
-\begin_layout Plain Layout
-
-
-\backslash
-renewcommand{
-\backslash
-reportTopic}{Megatest User Manual}
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-\begin_inset ERT
-status open
-
-\begin_layout Plain Layout
-
-
-\backslash
-renewcommand{
-\backslash
-revisionNumber}{v1.36}
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Title
-Megatest User Manual
-\end_layout
-
-\begin_layout Author
-Matthew Welland
-\end_layout
-
-\begin_layout Date
-Jan.
- 29, 2012 
-\end_layout
-
-\begin_layout Standard
-\begin_inset Newpage newpage
-\end_inset
-
-
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-copyright
-\end_layout
-
-\end_inset
-
-2011 Matthew Welland.
- All rights reserved.
- 
-\end_layout
-
-\begin_layout Standard
-Megatest is free software released under the General Public License v2.0.
- Please see the file COPYING in the source distribution for details.
- 
-\end_layout
-
-\begin_layout Standard
-\begin_inset VSpace medskip
-\end_inset
-
-Email: matt@kiatoa.com.
- 
-\end_layout
-
-\begin_layout Standard
-Web: www.kiatoa.com/fossils/megatest
-\end_layout
-
-\begin_layout Standard
-\begin_inset VSpace medskip
-\end_inset
-
-This document is believed to be acurate at the time of writing but as with
- any opensource project the source code itself is the reference.
- It is the responsibility of the end user to validate that the code will
- perform as they expect.
- The author assumes no responsibility for any inaccuracies that this document
- may contain.
- In no event will Matthew Welland be liable for direct, indirect, special,
- exemplary, incidental, or consequential damages resulting from any defect
- or omission in this document, even if advised of the possibility of such
- damages.
- 
-\end_layout
-
-\begin_layout Standard
-This document is a snapshot in time and Megatest software has likely changed
- since publication.
- This document and Megatest may be improved at any time, without notice
- or obligation.
- 
-\end_layout
-
-\begin_layout Standard
-\begin_inset Newpage newpage
-\end_inset
-
-
-\end_layout
-
-\begin_layout Section*
-Megatest/document Revision History
-\end_layout
-
-\begin_layout Standard
-
-\shape italic
-Notable revisions of the software are occasionally documented here
-\shape default
-.
-\end_layout
-
-\begin_layout Standard
-\align center
-\begin_inset Tabular
-
-
-
-
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-Version
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-Author
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-Description
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-Date
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-v1.25
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-matt
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-converted to new document template
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-\begin_inset ERT
-status open
-
-\begin_layout Plain Layout
-
-
-\backslash
-thedate
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\end_inset
-
-
-
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-\begin_inset Newpage newpage
-\end_inset
-
-
-\begin_inset CommandInset toc
-LatexCommand tableofcontents
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-\begin_inset Newpage newpage
-\end_inset
-
-
-\end_layout
-
-\begin_layout Section
-Introduction
-\end_layout
-
-\begin_layout Subsection
-Megatest design philosophy
-\end_layout
-
-\begin_layout Standard
-Megatest is intended to provide the minimum needed resources to make writing
- a suite of tests and implementing continuous build for software, design
- engineering or process control (via owlfs for example) without being specialize
-d for any specific problem space.
- Megatest in of itself does not know what constitutes a PASS or FAIL of
- a test.
- In most cases megatest is best used in conjunction with logpro or a similar
- tool to parse, analyze and decide on the test outcome.
-\end_layout
-
-\begin_layout Subsection
-Megatest architecture
-\end_layout
-
-\begin_layout Standard
-All data to specify the tests and configure the system is stored in plain
- text files.
- All system state is stored in an sqlite3 database.
- Tests are launched using the launching system available for the distributed
- compute platform in use.
- A template script is provided which can launch jobs on local and remote
- Linux hosts.
- Currently megatest uses the network filesystem to 
-\begin_inset Quotes eld
-\end_inset
-
-call home
-\begin_inset Quotes erd
-\end_inset
-
- to your master sqlite3 database.
-\end_layout
-
-\begin_layout Section
-Installation
-\end_layout
-
-\begin_layout Subsection
-Dependencies
-\end_layout
-
-\begin_layout Standard
-Chicken scheme and a number of 
-\begin_inset Quotes eld
-\end_inset
-
-eggs
-\begin_inset Quotes erd
-\end_inset
-
- are required for building megatest.
- See the file utils/installall.sh for an automated way to install the dependencie
-s on Linux.
-\end_layout
-
-\begin_layout Subsection
-Build and Install
-\end_layout
-
-\begin_layout Standard
-Run “make test” to create the megatest executable.
- You may wish to copy the executable to a centrally accessible location.
-\end_layout
-
-\begin_layout Section
-Setup
-\end_layout
-
-\begin_layout Subsection
-Create megatest.config
-\end_layout
-
-\begin_layout Standard
-Create the file megatest.config using the megatest.config template from the
- tests directory.
- At a minimum you need the following:
-\end_layout
-
-\begin_layout Standard
-\begin_inset listings
-lstparams "basicstyle={\small\ttfamily},language=sh"
-inline false
-status open
-
-\begin_layout Plain Layout
-
-# Fields are the keys under which your test runs are organized
-\end_layout
-
-\begin_layout Plain Layout
-
-[fields]
-\end_layout
-
-\begin_layout Plain Layout
-
-field1 TEXT
-\end_layout
-
-\begin_layout Plain Layout
-
-field2 TEXT
-\end_layout
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\begin_layout Plain Layout
-
-[jobtools]
-\end_layout
-
-\begin_layout Plain Layout
-
-# The launcher launches jobs to the local or remote hosts,
-\end_layout
-
-\begin_layout Plain Layout
-
-# the job is managed on the target host by megatest,
-\end_layout
-
-\begin_layout Plain Layout
-
-# comment out launcher to run local only.
- An example launcher
-\end_layout
-
-\begin_layout Plain Layout
-
-# "nbfake" can be found in the utils directory.
- 
-\end_layout
-
-\begin_layout Plain Layout
-
-launcher nbfake
-\end_layout
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\begin_layout Plain Layout
-
-# The disks section specifies where the tests will be run.
- As you
-\end_layout
-
-\begin_layout Plain Layout
-
-# run out of space in a partition you can add additional disks
-\end_layout
-
-\begin_layout Plain Layout
-
-# entries.
-\end_layout
-
-\begin_layout Plain Layout
-
-# Format is:
-\end_layout
-
-\begin_layout Plain Layout
-
-# name /path/to/area 
-\end_layout
-
-\begin_layout Plain Layout
-
-[disks]
-\end_layout
-
-\begin_layout Plain Layout
-
-disk1 /tmp 
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Subsection
-Create runconfigs.config
-\end_layout
-
-\begin_layout Standard
-This file is used to set environment variables that are run specific.
- You can simply create an empty file to start.
-\end_layout
-
-\begin_layout Standard
-\begin_inset listings
-lstparams "basicstyle={\small\ttfamily},language=sh"
-inline false
-status open
-
-\begin_layout Plain Layout
-
-# runconfigs.config
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Subsection
-Create the tests directory and your first test
-\end_layout
-
-\begin_layout Standard
-\begin_inset listings
-lstparams "basicstyle={\small\ttfamily},language=sh"
-inline false
-status open
-
-\begin_layout Plain Layout
-
-mt
-\end_layout
-
-\begin_layout Plain Layout
-
-|-- megatest.config
-\end_layout
-
-\begin_layout Plain Layout
-
-|-- runconfigs.config
-\end_layout
-
-\begin_layout Plain Layout
-
-`-- tests
-\end_layout
-
-\begin_layout Plain Layout
-
-    `-- mytest
-\end_layout
-
-\begin_layout Plain Layout
-
-        |-- main.sh
-\end_layout
-
-\begin_layout Plain Layout
-
-        `-- testconfig
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Subsection
-Create the testconfig file for your test
-\end_layout
-
-\begin_layout Standard
-\begin_inset listings
-lstparams "basicstyle={\small\ttfamily},language=sh"
-inline false
-status open
-
-\begin_layout Plain Layout
-
-[setup]
-\end_layout
-
-\begin_layout Plain Layout
-
-runscript main.sh
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Subsection
-Create your test running script, main.sh
-\end_layout
-
-\begin_layout Standard
-\begin_inset listings
-lstparams "basicstyle={\small\ttfamily},language=sh"
-inline false
-status open
-
-\begin_layout Plain Layout
-
-#!/bin/bash
-\end_layout
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\begin_layout Plain Layout
-
-$MT_MEGATEST -runstep mystep1 "sleep 20;echo Done" -m "mystep1 is done"
-\end_layout
-
-\begin_layout Plain Layout
-
-$MT_MEGATEST -test-status :state COMPLETED :status PASS -m "This is a comment"
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Subsection
-Run megatest and watch your run progress
-\end_layout
-
-\begin_layout Standard
-\begin_inset listings
-lstparams "basicstyle={\small\ttfamily},language=sh"
-inline false
-status open
-
-\begin_layout Plain Layout
-
-megatest :field1 abc :field2 def :runname 2011week08.4a -runall
-\end_layout
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\begin_layout Plain Layout
-
-watch megatest -list-runs %
-\end_layout
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\begin_layout Plain Layout
-
-# OR use the dashboard
-\end_layout
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\begin_layout Plain Layout
-
-dashboard &
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Section
-Choose Flow or Unstructured Run?
-\end_layout
-
-\begin_layout Standard
-A flow is a structured and specifically sequenced set of tests.
- See the Flows chapter to understand the difference.
-\end_layout
-
-\begin_layout Section
-How to Write Tests
-\end_layout
-
-\begin_layout Subsection
-A Simple Test with one Step
-\end_layout
-
-\begin_layout Standard
-\begin_inset listings
-lstparams "basicstyle={\small\ttfamily},language=sh"
-inline false
-status open
-
-\begin_layout Plain Layout
-
-mkdir simpletest
-\end_layout
-
-\begin_layout Plain Layout
-
-cd simpletest
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Subsection
-Create your testconfig file
-\end_layout
-
-\begin_layout Standard
-\begin_inset listings
-inline false
-status open
-
-\begin_layout Plain Layout
-
-# testconfig
-\end_layout
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\begin_layout Plain Layout
-
-[setup]
-\end_layout
-
-\begin_layout Plain Layout
-
-runscript main.csh
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Subsection
-Create the main.csh script
-\end_layout
-
-\begin_layout Standard
-Note: Using csh is NOT recommended.
- Use bash, perl, ruby, zsh or anything other than csh.
- We use csh here because it is popular in the EDA industry for which Megatest
- was originally created.
- 
-\end_layout
-
-\begin_layout Standard
-\noindent
-\align left
-\begin_inset listings
-lstparams "basicstyle={\small\ttfamily},language=sh"
-inline false
-status open
-
-\begin_layout Plain Layout
-
-#!/bin/tcsh -x
-\end_layout
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\begin_layout Plain Layout
-
-# run the cpu1 simulation.
-\end_layout
-
-\begin_layout Plain Layout
-
-#   The step name is "run_simulation"
-\end_layout
-
-\begin_layout Plain Layout
-
-#   The commandline being run for this step is "runsim cpu1"
-\end_layout
-
-\begin_layout Plain Layout
-
-#   The logpro file to validate the output from the run is "runsim.logpro"
-\end_layout
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\begin_layout Plain Layout
-
-$MT_MEGATEST -runstep run_simulation -logpro runsim.logpro "runsim cpu1"
-\end_layout
-
-\begin_layout Plain Layout
-
-$MT_MEGATEST -test-status :state COMPLETED :status $?
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-You can now run megatest and the created test directory will contain the
- new files “run_simulation.html” and “run_simulation.log”.
- If you are using the dashboard you can click on the run and then push the
- “View log” button to view the log file in firefox.
-\end_layout
-
-\begin_layout Subsection
-Simple Test with Multiple Steps 
-\end_layout
-
-\begin_layout Standard
-To run multiple steps simply add them to the main.csh file.
- Here we add a step to test “cpu2”.
- The second step that tests cpu2 will only run after the step that tested
- “cpu1” completes.
-\end_layout
-
-\begin_layout Standard
-\begin_inset listings
-lstparams "basicstyle={\small\ttfamily},language=sh"
-inline false
-status open
-
-\begin_layout Plain Layout
-
-#!/bin/tcsh -x
-\end_layout
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\begin_layout Plain Layout
-
-# run the cpu1 simulation.
-\end_layout
-
-\begin_layout Plain Layout
-
-#   The step name is "run_simulation"
-\end_layout
-
-\begin_layout Plain Layout
-
-#   The commandline being run for this step is "runsim cpu1"
-\end_layout
-
-\begin_layout Plain Layout
-
-#   The logpro file to validate the output from the run is "runsim.logpro"
-\end_layout
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\begin_layout Plain Layout
-
-$MT_MEGATEST -runstep run_simulation_cpu1 -logpro runsim.logpro "runsim cpu1"
- && 
-\backslash
-
-\end_layout
-
-\begin_layout Plain Layout
-
-$MT_MEGATEST -runstep run_simulation_cpu2 -logpro runsim.logpro "runsim cpu2"
-\end_layout
-
-\begin_layout Plain Layout
-
-$MT_MEGATEST -test-status :state COMPLETED :status $?
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Section
-Simple Test with Multiple Steps, Some in Parallel
-\end_layout
-
-\begin_layout Subsection
-The Makefile
-\end_layout
-
-\begin_layout Standard
-A good way to run steps in parallel within a single test, especially when
- there are following steps, is to use the Unix Make utility.
- Writing Makefiles is beyond the scope of this document but here is a minimal
- example that will run “runsim cpu1” and “runsim cpu2” in parallel.
- For more information on make try “info make” at the Linux command prompt.
-\end_layout
-
-\begin_layout Standard
-\begin_inset listings
-lstparams "basicstyle={\small\ttfamily},language=sh"
-inline false
-status open
-
-\begin_layout Plain Layout
-
-# Example Makefile to run two steps in parallel
-\end_layout
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\begin_layout Plain Layout
-
-RTLDIR=/path/to/rtl
-\end_layout
-
-\begin_layout Plain Layout
-
-CPUS = cpu1 cpu2
-\end_layout
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\begin_layout Plain Layout
-
-run_simulation_$(CPUS).html : $(RTLDIR)/$(CPUS)
-\end_layout
-
-\begin_layout Plain Layout
-
-	$(MT_MEGATEST) -runstep run_simulation_$(CPUS) -logpro runsim.logpro "runsim
- $(CPUS)
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Subsection
-The main.csh file
-\end_layout
-
-\begin_layout Standard
-\begin_inset listings
-lstparams "basicstyle={\small\ttfamily},language=sh"
-inline false
-status open
-
-\begin_layout Plain Layout
-
-#!/bin/tcsh -x
-\end_layout
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\begin_layout Plain Layout
-
-# run the cpu1 and cpu2 simulations in parallel.
- 
-\end_layout
-
-\begin_layout Plain Layout
-
-# The -j parameter tells make how many jobs it may run in parallel
-\end_layout
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\begin_layout Plain Layout
-\noindent
-\align left
-
-make -j 2 
-\end_layout
-
-\begin_layout Plain Layout
-
-$MT_MEGATEST -test-status :state COMPLETED :status $?
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Section
-Simple Test with Iteration
-\end_layout
-
-\begin_layout Standard
-Since no jobs run after the cpu1 and cpu2 simulations in this test it is
- possible to use iterated mode.
-\end_layout
-
-\begin_layout Subsection
-Update your testconfig file for iteration
-\end_layout
-
-\begin_layout Standard
-\begin_inset listings
-lstparams "basicstyle={\small\ttfamily},language=sh"
-inline false
-status open
-
-\begin_layout Plain Layout
-
-[setup]
-\end_layout
-
-\begin_layout Plain Layout
-
-runscript main.csh
-\end_layout
-
-\begin_layout Plain Layout
-\noindent
-\align left
-
-\end_layout
-
-\begin_layout Plain Layout
-
-[items]
-\end_layout
-
-\begin_layout Plain Layout
-
-CPU cpu1 cpu2
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Subsection
-Rewrite your main.csh for iteration
-\end_layout
-
-\begin_layout Standard
-\begin_inset listings
-lstparams "basicstyle={\small\ttfamily},language=sh"
-inline false
-status open
-
-\begin_layout Plain Layout
-\noindent
-
-#!/bin/tcsh -x
-\end_layout
-
-\begin_layout Plain Layout
-\noindent
-
-\end_layout
-
-\begin_layout Plain Layout
-\noindent
-
-# run the cpu simulation but now use the environment variable $CPU
-\end_layout
-
-\begin_layout Plain Layout
-\noindent
-
-# to select what cpu to run the simulation against
-\end_layout
-
-\begin_layout Plain Layout
-\noindent
-
-\end_layout
-
-\begin_layout Plain Layout
-\noindent
-
-$MT_MEGATEST -runstep run_simulation -logpro runsim.logpro "runsim $CPU"
-\end_layout
-
-\begin_layout Plain Layout
-\noindent
-
-# As of version 1.07 Megatest automatically converts a status of "0"
-\end_layout
-
-\begin_layout Plain Layout
-\noindent
-
-# to "PASS", any other number to "FAIL" and directly uses the value of
-\end_layout
-
-\begin_layout Plain Layout
-\noindent
-
-# a string passed in.
-\end_layout
-
-\begin_layout Plain Layout
-\noindent
-
-$MT_MEGATEST -test-status :state COMPLETED :status $?
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Subsection
-Tests with Inter-test dependencies
-\end_layout
-
-\begin_layout Standard
-Sometimes a test depends on the output from a previous test or it may not
- make sense to run a test is another test does not complete with status
- “PASS”.
- In either of these scenarios you can use the “waiton” keyword in your testconfi
-g file to indicate that this test must wait on one or more tests to complete
- before being launched.
- In this example there is no point in running the “system” test if the “cpu”
- and “mem” tests either do not complete or complete but with status “FAIL”.
-\end_layout
-
-\begin_layout Standard
-\begin_inset listings
-lstparams "basicstyle={\small\ttfamily},language=sh"
-inline false
-status open
-
-\begin_layout Plain Layout
-\noindent
-
-# testconfig for the "system" test
-\end_layout
-
-\begin_layout Plain Layout
-\noindent
-
-[setup]
-\end_layout
-
-\begin_layout Plain Layout
-\noindent
-
-runscript main.csh
-\end_layout
-
-\begin_layout Plain Layout
-\noindent
-
-waiton cpu mem
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Subsection
-Rolling up Miscellaneous Data
-\end_layout
-
-\begin_layout Standard
-Use the -load-test-data switch to roll up arbitrary data from a test into
- the test_data table.
-\end_layout
-
-\begin_layout Standard
-\begin_inset listings
-lstparams "basicstyle={\small\ttfamily},language=sh"
-inline false
-status open
-
-\begin_layout Plain Layout
-
-# Fields are:
-\end_layout
-
-\begin_layout Plain Layout
-
-# category,variable,value,expected,tol,units,comment,status
-\end_layout
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\begin_layout Plain Layout
-
-$MT_MEGATEST -load-test-data << EOF
-\end_layout
-
-\begin_layout Plain Layout
-
-foo,bar,1.2,1.9,>
-\end_layout
-
-\begin_layout Plain Layout
-
-foo,rab,1.0e9,10e9,1e9
-\end_layout
-
-\begin_layout Plain Layout
-
-foo,bla,1.2,1.9,<
-\end_layout
-
-\begin_layout Plain Layout
-
-foo,bal,1.2,1.2,<,,Check for overload
-\end_layout
-
-\begin_layout Plain Layout
-
-foo,alb,1.2,1.2,<=,Amps,This is the high power circuit test
-\end_layout
-
-\begin_layout Plain Layout
-
-foo,abl,1.2,1.3,0.1
-\end_layout
-
-\begin_layout Plain Layout
-
-foo,bra,1.2,pass,silly stuff
-\end_layout
-
-\begin_layout Plain Layout
-
-faz,bar,10,8mA,,,"this is a comment"
-\end_layout
-
-\begin_layout Plain Layout
-
-EOF
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-New entries are keyed on the category and variable.
- If a new record is inserted with a category and variable that have already
- been used the new record will replace the old record.
-\end_layout
-
-\begin_layout Standard
-Where value, expected and tol are specified the behavior is as follows.
-\end_layout
-
-\begin_layout Itemize
-If value, expected and tol are numbers then status is calculated as PASS
- if (expected-tol) <= value <= (expected+tol)
-\end_layout
-
-\begin_layout Itemize
-If value and expected are numbers and tol is >, <, >= or <= then value is
- compared with expected using the operator given by tol
-\end_layout
-
-\begin_layout Itemize
-If status is specified its value overrides the above calculations.
-\end_layout
-
-\begin_layout Subsection
-Rolling up Runs
-\end_layout
-
-\begin_layout Standard
-To roll up a number of tests in a sequence of runs to a single run use the
- -rollup command.
- 
-\end_layout
-
-\begin_layout Standard
-\begin_inset listings
-lstparams "basicstyle={\small\ttfamily},language=sh"
-inline false
-status open
-
-\begin_layout Plain Layout
-
-megatest -rollup :sysname ubuntu :fsname nfs :datapath none :runname rollup_ww38
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-All keys must be specified and the runname is the name of the run that will
- be created.
- All paths are kept original inside the database.
- When -remove-runs is used to delete runs the data is not deleted if there
- are rollups that refer to the data.
- 
-\end_layout
-
-\begin_layout Section
-Dashboard
-\end_layout
-
-\begin_layout Standard
-\begin_inset listings
-lstparams "basicstyle={\small\ttfamily},language=sh"
-inline false
-status open
-
-\begin_layout Plain Layout
-
-> dashboard &
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-\begin_inset Graphics
-	filename dashboard.png
-	scale 80
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-Pushing one of the buttons on the main dashboard will bring up the test
- specific dashboard.
- Values are updated in semi-real time as the test runs.
-\end_layout
-
-\begin_layout Standard
-\begin_inset Graphics
-	filename dashboard-test.png
-	scale 80
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Section
-Generating an OpenDocument Spreadsheet from the Database
-\end_layout
-
-\begin_layout Standard
-And OpenDocument multi-paned spreadsheet can be generated from the megatest.db
- file by running -extract-ods
-\end_layout
-
-\begin_layout Standard
-\begin_inset listings
-lstparams "basicstyle={\small\ttfamily},language=sh"
-inline false
-status open
-
-\begin_layout Plain Layout
-
-megatest -extract-ods results.ods :runname % 
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-You can optionally specify the keys for your database to limit further the
- runs to extract into the spreadsheet.
- The first sheet contains all the run data and subsequent sheets contain
- data rolled up for the individual tests.
-\end_layout
-
-\begin_layout Section
-Introspection
-\end_layout
-
-\begin_layout Subsection
-Getting previous test paths
-\end_layout
-
-\begin_layout Standard
-\begin_inset listings
-lstparams "basicstyle={\small\ttfamily},language=sh"
-inline false
-status open
-
-\begin_layout Plain Layout
-
-megatest -test-paths -target %/%/% :runname % -testpatt % -itempatt % :status
- PASS 
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Section
-Flows
-\end_layout
-
-\begin_layout Standard
-A flow specifies the tests to run, the order and dependencies and is managed
- by a running megatest process.
-\end_layout
-
-\begin_layout Section
-Flow Specification and Running (Not released yet)
-\end_layout
-
-\begin_layout Subsection
-Write your flow file
-\end_layout
-
-\begin_layout Standard
-flows/.config
-\end_layout
-
-\begin_layout Standard
-\begin_inset listings
-lstparams "basicstyle={\small\ttfamily},language=sh"
-inline false
-status open
-
-\begin_layout Plain Layout
-
-# Flow: 
-\end_layout
-
-\begin_layout Plain Layout
-
-[flowconfig]
-\end_layout
-
-\begin_layout Plain Layout
-
-# turn on item level dependencies
-\end_layout
-
-\begin_layout Plain Layout
-
-itemdeps on
-\end_layout
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\begin_layout Plain Layout
-
-[flowsteps]
-\end_layout
-
-\begin_layout Plain Layout
-
-# [,]
-\end_layout
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\begin_layout Plain Layout
-
-# Run the test "copydata"
-\end_layout
-
-\begin_layout Plain Layout
-
-copydata
-\end_layout
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\begin_layout Plain Layout
-
-# Run the test "setup" after copydata completes with PASS, WARN or WAIVE
-\end_layout
-
-\begin_layout Plain Layout
-
-setup,copydata
-\end_layout
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\begin_layout Plain Layout
-
-# once the test "setup" completes successfully run sim1, sim2 and sim3
-\end_layout
-
-\begin_layout Plain Layout
-
-sim1,setup
-\end_layout
-
-\begin_layout Plain Layout
-
-sim2,setup
-\end_layout
-
-\begin_layout Plain Layout
-
-sim3,setup
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Subsection
-Run the flow
-\end_layout
-
-\begin_layout Standard
-\begin_inset listings
-lstparams "basicstyle={\small\ttfamily},language=sh"
-inline false
-status open
-
-\begin_layout Plain Layout
-
-megatest -runflow  :FIELD1 val1 :FIELD2 val2 :runname wk32.4
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Section
-Monitor based running
-\end_layout
-
-\begin_layout Subsection
-Monitor logic
-\end_layout
-
-\begin_layout Standard
-Note: The monitor is usable but incomplete as of Megatest v1.31.
- Click on the 
-\begin_inset Quotes eld
-\end_inset
-
-Monitor
-\begin_inset Quotes erd
-\end_inset
-
- button on the dashboard to start the monitor and give it a try.
-\end_layout
-
-\begin_layout Standard
-\begin_inset Graphics
-	filename monitor-state-diagram.svg
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Section
-Reference
-\end_layout
-
-\begin_layout Subsection
-Configuration file Syntax
-\end_layout
-
-\begin_layout Standard
-Note: whitespace is preserved including at the end of line.
- Ensure your entries only have whitespace at the end of line when needed
- to avoid problems.
-\end_layout
-
-\begin_layout Subsubsection
-Sections
-\end_layout
-
-\begin_layout Standard
-\begin_inset listings
-lstparams "basicstyle={\small\ttfamily}"
-inline false
-status open
-
-\begin_layout Plain Layout
-
-[section name]
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-This creates a section named “section name”
-\end_layout
-
-\begin_layout Subsubsection
-Variables
-\end_layout
-
-\begin_layout Standard
-\begin_inset listings
-lstparams "basicstyle={\small\ttfamily}"
-inline false
-status open
-
-\begin_layout Plain Layout
-
-VARX has this value
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-The variable “VARX” will have the value “has this value”
-\end_layout
-
-\begin_layout Subsubsection
-Includes
-\end_layout
-
-\begin_layout Standard
-\begin_inset listings
-inline false
-status open
-
-\begin_layout Plain Layout
-
-[include filename]
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-The file named “filename” will be included as if part of the calling file.
- NOTE: This means no section can be named “include “ (with the whitespace).
-\end_layout
-
-\begin_layout Subsubsection
-Setting a variable by running a command
-\end_layout
-
-\begin_layout Standard
-\begin_inset listings
-lstparams "basicstyle={\small\ttfamily}"
-inline false
-status open
-
-\begin_layout Plain Layout
-
-VARNAME [system ls /tmp]
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-The variable “VARNAME” will get a value created by the Unix command “ls
- /tmp”.
- All lines of output from the command will be joined with a space.
-\end_layout
-
-\begin_layout Subsubsection
-Notes
-\end_layout
-
-\begin_layout Itemize
-Some variables are infered as lists.
- Each token on the line separated by whitespace will be member of the list.
-\end_layout
-
-\begin_layout Itemize
-Comments (lines starting with #) and blank lines are ignored.
-\end_layout
-
-\begin_layout Subsection
-Environment variables
-\end_layout
-
-\begin_layout Standard
-\begin_inset Tabular
-
-
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-Variable
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-Purpose
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-MT_CMDINFO
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-Conveys test variables to the megatest test runner.
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-MT_TEST_RUN_DIR
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-Directory assigned by megatest for the test to run.
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-MT_TEST_NAME
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-Name of the test, corrosponds to the directory name under tests.
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-MT_ITEM_INFO
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-Iterated tests will set this to a sequence of key/values ((KEY val) ...) 
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-MT_RUN_AREA_HOME
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-Directory where megatest was launched from and where the tests code can
- be found
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-MT_RUNNAME
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-Name of this run as set by the :runname parameter
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-MT_MEGATEST
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-Path/Filename to megatest executable.
- Found either from called path or but using the “exectuable” keyword in
- the [setup] section.
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
- ....
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-The field values as set on the megatest -runall command line (e.g.
- :field1 abc)
-\end_layout
-
-\end_inset
-
-
-
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Subsection
-megatest.config
-\end_layout
-
-\begin_layout Standard
-\begin_inset Tabular
-
-
-
-
-
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-section
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-variable
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-value
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-required
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-comment
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-[setup]
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-max_concurrent_jobs
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-if variable is not defined no limit on jobs
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-no
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-executable
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-full path to megatest binary
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-no
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-Use only if necessary, megatest will extract the location from where it
- used to launch and add append that to the PATH for test runs.
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-runsdir
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-full path to where the link tree to all runs will be created
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-no
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-Because your runs may be spread out over several disk partitions a central
- link tree is created to make finding all the runs easy.
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-[fields]
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-string of letters, numbers and underscore
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-string of letters, numbers and underscore
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-at least one
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-[jobtools]
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-launcher
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-command line used to launch jobs - the job command (megatest -execute) will
- be appended to this
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-no
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-workhosts
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-list of hostnames to run jobs on NOT SUPPORTED RIGHT NOW
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-n/a
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-[jobgroups]
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-string of letters, numbers and underscore
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-number
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-no
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-Control number of jobs allowed to concurrently run in categories.
- See [jobgroup] in testconfig
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-[env-override]
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-string of letters, numbers and underscore
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-any string
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-no
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-These are set on the test launching machine, not the test running machine.
- Typical usage is to control the host or run queue for launching tests.
- These values will not be seen by the test when it runs.
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-[disks]
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-string of letters, numbers and underscore
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-a valid path writable by the test launching process and by the test process
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-yes
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-The disk usage balancing algorithm is to choose the disk with the least
- space for each test run.
- 
-\end_layout
-
-\end_inset
-
-
-
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Subsection
-runconfigs.config file
-\end_layout
-
-\begin_layout Standard
-\begin_inset Tabular
-
-
-
-
-
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-section
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-variable
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-value
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-required?
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-comment
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-[default]
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-string of letters, numbers and underscore
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-any
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-no
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-variables set in this section will be available for all runs, defining the
- same variable in another section will override the value from the default
- section
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-[field1value/field2value...]
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-string of letters, numbers and underscore
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-any
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-no
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-the values in this section will be set for any run where field1 is field1value,
- field2 is field2value and fieldN is fieldNvalue.
- 
-\end_layout
-
-\end_inset
-
-
-
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-Example: a test suite that checks that a piece of software works correctly
- for different customer configurations and locations each of which is done
- as a separate release regression run.
- The fields, CUSTOMER and LOCATION were chosen.
- The following runconfigs.config file would set some variables specific to
- runs for megacorp in India and femtocorp in the Cook Islands and New Zealand:
-\end_layout
-
-\begin_layout Standard
-\begin_inset listings
-lstparams "basicstyle={\small\ttfamily},language=sh"
-inline false
-status open
-
-\begin_layout Plain Layout
-
-# runconfigs.config
-\end_layout
-
-\begin_layout Plain Layout
-
-[default]
-\end_layout
-
-\begin_layout Plain Layout
-
-ENCRYTION true
-\end_layout
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\begin_layout Plain Layout
-
-[megacorp/india]
-\end_layout
-
-\begin_layout Plain Layout
-
-TESTPATH /nfs/testing/megacorp_runs
-\end_layout
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\begin_layout Plain Layout
-
-[femtocorp/cook_islands]
-\end_layout
-
-\begin_layout Plain Layout
-
-ENCRYTION false
-\end_layout
-
-\begin_layout Plain Layout
-
-TESTPATH /afs/kiatoa/testing/cook_islands
-\end_layout
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\begin_layout Plain Layout
-
-[femtocorp/new_zealand]
-\end_layout
-
-\begin_layout Plain Layout
-
-TESTPATH /afs/kiatoa/testing/new_zealand
-\end_layout
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\begin_layout Plain Layout
-
-[megacorp/new_zealand]
-\end_layout
-
-\begin_layout Plain Layout
-
-TESTPATH /nfs/testing/megacorp_runs
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Paragraph*
-Running megatest like this:
-\end_layout
-
-\begin_layout Code
-megatest :CUSTOMER megacorp :LOCATION new_zealand :runname week12_2011_run1
- -runall
-\end_layout
-
-\begin_layout Paragraph*
-Would set:
-\end_layout
-
-\begin_layout Code
-ENCRYPTION true
-\end_layout
-
-\begin_layout Code
-TESTPATH /nfs/testing/megacorp_runs
-\end_layout
-
-\begin_layout Subsection
-Writing tests
-\end_layout
-
-\begin_layout Subsubsection
-testconfig file
-\end_layout
-
-\begin_layout Standard
-\begin_inset Tabular
-
-
-
-
-
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-section
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-variable
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-value
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-required?
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-comments
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-[setup]
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-runscript
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-name of script to execute for this test
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-yes
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-The script must be executable and either provide the full path or put a
- copy at the top of your test directory
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-[requirements]
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-waiton
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-list of valid test names
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-no
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-This test will not run until the named tests are state completed and status
- PASS
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-jobgroup
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-[items]
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-any valid
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-list of values
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-no
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-The test will be repeated once for each item with the variable name set
- to the value.
- If there is more than one variable then the test will be run against all
- unique combinations of the values
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-[eztests]
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-any valid
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-stepname command
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-no
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-Use in addition to or instead of runscript for easy implementation of steps.
- If .logpro exists it will be applied to the .log and
- resulting exit code will be used to determine PASS/FAIL/WARN
-\end_layout
-
-\end_inset
-
-
-
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Subsubsection
-Command line
-\end_layout
-
-\begin_layout Standard
-\begin_inset Tabular
-
-
-
-
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-switch or param
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-parameter
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-purpose
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-comments
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
--h
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-brief help
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
--runall
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-run all tests
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
--runtests
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-test1,test2,...
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-run one or more tests
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
--step
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-stepname
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-record a step
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-requires :state and :status
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
--test-status
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-record the test status
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-requires :state and :status
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
--setlog
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-logfilename
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-set the logfile name for a test
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-path is assumed to be relative to the test run directory
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
--set-toplog
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-logfilename
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-set the logfile name for the top test in an iterated test run
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-each sub test can have its own logfile set
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
--m
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-\begin_inset Quotes eld
-\end_inset
-
-comment
-\begin_inset Quotes erd
-\end_inset
-
-
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-sets a comment for the step, test or run
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-:runname
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-[a-zA-Z0-9_-]+
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-directory in which this run will be stored in the test run area 
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-:state
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-any value
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-Set the step or test state, this is stored in the state field in the steps
- or tests table respectively
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-For tests Megatest recognises 
-\begin_inset Quotes eld
-\end_inset
-
-INCOMPLETE
-\begin_inset Quotes erd
-\end_inset
-
-, 
-\begin_inset Quotes eld
-\end_inset
-
-COMPLETE
-\begin_inset Quotes erd
-\end_inset
-
-
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-:status
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-any value
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-Set the step or test status, this is stored in the status field in the steps
- or tests table respectively
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-For tests Megatest recognises 
-\begin_inset Quotes eld
-\end_inset
-
-PASS
-\begin_inset Quotes erd
-\end_inset
-
-, 
-\begin_inset Quotes eld
-\end_inset
-
-FAIL
-\begin_inset Quotes erd
-\end_inset
-
-, and 
-\begin_inset Quotes eld
-\end_inset
-
-CHECK
-\begin_inset Quotes erd
-\end_inset
-
-
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
--list-runs
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-any value, % is wildcard
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-Respects -itempatt and -testpatt for filters
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
--testpatt
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-any value, % is wildcard
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
--itempatt
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-any value, % is wildcard
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
--showkeys
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-Print the keys being used for this database
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
--force
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-Test will not re-run if in the 
-\begin_inset Quotes eld
-\end_inset
-
-PASS
-\begin_inset Quotes erd
-\end_inset
-
-, 
-\begin_inset Quotes eld
-\end_inset
-
-CHECK
-\begin_inset Quotes erd
-\end_inset
-
- or 
-\begin_inset Quotes eld
-\end_inset
-
-KILLED
-\begin_inset Quotes erd
-\end_inset
-
-, using -force will force the run to be launched.
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-WARNING: The -force switch will bypass any 
-\begin_inset Quotes eld
-\end_inset
-
-waiton
-\begin_inset Quotes erd
-\end_inset
-
- dependencies.
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
--xterm
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-Launch an xterm instead of run the test.
- The xterm will have the environment that the test would see.
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
--remove-runs
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-Remove a run, test or subtest from the database and the disk.
- Cannot be undone.
- Requires -testpatt, -itempatt, :runname and all keys be specified.
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\shape italic
-Test helpers
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
--runstep
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-Used inside a test to run a step, record the start and end of the step and
- optionally analyze the output using logpro.
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
--logpro
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-If using logpro to acess the PASS/FAIL status of the step you specify the
- logpro file with this parameter.
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-
-
-
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Section
-\start_of_appendix
-Data
-\end_layout
-
-\begin_layout Section
-References
-\end_layout
-
-\end_body
-\end_document

Index: docs/mt/megatest.config
==================================================================
--- docs/mt/megatest.config
+++ docs/mt/megatest.config
@@ -0,0 +1,17 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+

Index: docs/mt/runconfigs.config
==================================================================
--- docs/mt/runconfigs.config
+++ docs/mt/runconfigs.config
@@ -0,0 +1,17 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+

Index: docs/mt/tests/mytest/main.sh
==================================================================
--- docs/mt/tests/mytest/main.sh
+++ docs/mt/tests/mytest/main.sh
@@ -0,0 +1,17 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+

Index: docs/mt/tests/mytest/testconfig
==================================================================
--- docs/mt/tests/mytest/testconfig
+++ docs/mt/tests/mytest/testconfig
@@ -0,0 +1,17 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+

ADDED   docs/pkts.dot
Index: docs/pkts.dot
==================================================================
--- /dev/null
+++ docs/pkts.dot
@@ -0,0 +1,76 @@
+//  Copyright 2006-2017, Matthew Welland.
+// 
+// This file is part of Megatest.
+// 
+//     Megatest is free software: you can redistribute it and/or modify
+//     it under the terms of the GNU General Public License as published by
+//     the Free Software Foundation, either version 3 of the License, or
+//     (at your option) any later version.
+// 
+//     Megatest is distributed in the hope that it will be useful,
+//     but WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//     GNU General Public License for more details.
+// 
+//     You should have received a copy of the GNU General Public License
+//     along with Megatest.  If not, see .
+// 
+digraph megatest_pkts {
+  ranksep=0.05
+  // rankdir=LR
+
+node [shape=box,style=filled];
+  
+  "SENSORS" [ label = "{ Sensor Processing | { file | git | fossil | script }}"
+	      shape = "record"; ];
+  
+  "RUNS"    [ label = "{ Runs Processing | { launch | clean | re-run | archive } | { dispatcher }}";
+	      shape = "record"; ];
+
+  "WORK"    [ label = "{ Work Items | { start task | task competed }}";
+	      shape = "record"; ];
+
+  "USERREQ" [ label = "{ User Requests (Unix and Web) | { launch | clean | re-run | archive }}";
+	      shape = "record"; ];
+
+  "MTAREA1" [ label = "{ Megatest Area 1 | { parallel job\nmanagement | test\nmanagement | data\nrollup }}";
+	      shape = "record"; ];
+  
+  "MTAREA2" [ label = "{ Megatest Area 2 | { parallel job\nmanagement | test\nmanagement | data\nrollup }}";
+	      shape = "record"; ];
+  
+  "MTAREA3" [ label = "More Megatest Areas ... ";
+	      shape = "record"; ];
+
+  "PGDB"    [ label = "postgres database";
+	      shape = "cylinder"; ];
+
+  "WEBAPP"  [ label = "{ Web View | { Runs | Contours | Control | Time View }}";
+	      shape = "record"; ];
+
+  // "WEBCTRL" [ label = "{ Web View \n(control) }";
+  //	      shape = "record"; ];
+  
+  "SENSORS" -> "SPKTS";
+  "RUNS"    -> "run pkts";
+  "run pkts" -> "RUNS";
+  "WORK"    -> "work pkts";
+  "work pkts" -> "RUNS";
+  "USERREQ" -> "user request pkts";
+  "SPKTS"   -> "RUNS";
+  "user request pkts" -> "RUNS";
+  "RUNS"    -> "MTAREA1" -> "PGDB";
+  "RUNS"    -> "MTAREA2" -> "PGDB";
+  "RUNS"    -> "MTAREA3" -> "PGDB";
+  "PGDB"    -> "WEBAPP";
+  // "WEBCTRL" -> "run pkts";
+  
+  subgraph cluster_pkts {
+    label="Packets";
+    "SPKTS" [ label = "Sensor Packets" ];
+    "run pkts";
+    "work pkts";
+    "user request pkts";
+  }
+}
+

ADDED   docs/pkts.pdf
Index: docs/pkts.pdf
==================================================================
--- /dev/null
+++ docs/pkts.pdf
cannot compute difference between binary files

DELETED docs/plan.txt
Index: docs/plan.txt
==================================================================
--- docs/plan.txt
+++ /dev/null
@@ -1,126 +0,0 @@
-Road Map
---------
-
-Note 1: This road-map is still evolving and subject to change without notice.
-
-Architecture Refactor
-~~~~~~~~~~~~~~~~~~~~~
-
-Goals
-^^^^^
-
-. Reduce load on the file system. Sqlite3 files on network filesystem can be
-  a burden.
-. Reduce number of servers and frequency of start/stop. This is mostly an
-  issue of clutter but also a reduction in "moving parts".
-. Coalesce activities to a single home host where possible. Give the user
-  feedback that they have started the dashboard on a host other than the
-  home host.
-. Reduce number of processes involved in managing running tests.
-
-Changes Needed
-^^^^^^^^^^^^^^
-
-. ACID compliant db will be on /tmp and synced to megatest.db with a five
-  second max delay.
-. Read/writes to db for processes on homehost will go direct to /tmp
-  megatest.db file.
-. Read/wites fron non-homehost processes will go through one server. Bulk
-  reads (e.g. for dashboard or list-runs) will be cached on the current host
-  in /tmp and synced from the home megatest.db in the testsuite area.
-. Db syncs rely on the target db file timestame minus some margin.
-. Since bulk reads do not use the server we can switch to simple RPC for the
-  network transport.
-. Test running manager process extended to manage multiple running tests.
-
-Current Items
-~~~~~~~~~~~~~
-
-ww05 - migrate to inmem-db
-^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-. Switch to inmem db with fast sync to on disk db's [DONE]
-. Server polls tasks table for next action
-.. Task table used for tracking runner process [DONE]
-.. Task table used for jobs to run
-.. Task table used for queueing runner actions (remove runs, cleanRunExecute, etc)
-
-
-// ww32
-// ~~~~
-// 
-// . Rerun step and or subsequent steps from gui
-// . Refresh test area files from gui
-// . Clean and re-run button
-// . Clean up STATE and STATUS handling.
-// .. Dashboard and Test control panel are reverse order - choose and fix
-// .. Move seldom used states and status to drop down selector
-// . Access test control panel when clicking on Run Summary tests
-// . Feature: -generate-index-tree
-// . Change specifing of state and status to use STATE1/STATUS1,STATE2/STATUS2
-// 
-// ww33
-// ~~~~
-// 
-// . http api available for use with Perl, Ruby etc. scripts
-// . megatest.config setup entries for:
-// .. run launching (e.g. /bin/sh %CMD% > /dev/null)
-// .. browser "konqueror %FNAME%
-// 
-// ww34
-// ~~~~
-// 
-// . Mark dependent tests for clean/rerun -rerun-downstream
-// . On run start check for defunct tests in RUNNING, LAUNCHED or REMOTEHOSTSTART and correct or notify
-// . Fix: refresh of gui sometimes fails on last item (race condition?)
-// 
-// ww35
-// ~~~~
-// 
-// . refdb: Add export of csv, json and sexp
-// . Convert to using call-with-environment-variables where possible. Should allow handling of parallel runs in same process.
-// . Re-work text interface wizards. Several bugs on record. Possibly convert to gui based.
-// . Add to testconfig requirements section; launchlimiter scriptname, calls scriptname to check if ok to launch test
-// . Refactor Run Summary view, currently very clumsy
-// . Add option to show steps in Run Summary view
-// 
-// ww36
-// ~~~~
-// 
-// . Refactor guis for resizeablity
-// . Add filters to Run Summary view and Run Control view
-// . Add to megatest.config or testconfig; rerunok STATE/STATUS,STATE/STATUS...
-// . Launch gates for diskspace; /path/one>1G,/path/two>200M,/tmp>5G,#{scheme *toppath*}>1G
-// 
-// Bin List
-// ~~~~~~~~
-// 
-// .	Quality improvements
-// ..	Server stutters occasionally
-// ..	Large number of items or tests still has some issues.
-// ..	Code refactoring
-// ..	Replace remote process with true API using json (supports Web app also)
-// .	Streamline the gui
-// ..	Everything resizable
-// ..	Less clutter
-// ..	Tool tips
-// ..	Filters on Run Summary, Summary and Run Control panel
-// ..	Built in log viewer (partially implemented)
-// ..	Refactor the test control panel
-// .	Help and documentation
-// ..	Complete the user manual (I’ve been working on this lately).
-// ..	Online help in the gui
-// .	Streamlined install
-// ..	Deployed version (download a location independent ready to run binary bundle)
-// ..	Install Makefile (in progress, needed for Mike to install on VMs)
-// ..	Added option to compile IUP (needed for VMs)
-// .	Server side run launching
-// .	Support for re-running, cleaning etc. of individual steps (ezsteps makes this very easy to implement).
-// .	Launch process needs built in daemonizing (easy to do, just need to test it thoroughly).
-// .	Wizards for creating tests, regression areas (current ones are text only and limited).
-// .	Fully functional built in web service (currently you can browse runs but it is very simplistic).
-// .	Wildcards in runconfigs: e.g. [p1271/9/%/%]
-// .	Gui panels for editing megatest.config and runconfigs.config
-// .	Fully isolated tests (no use of NFS to see regression area files)
-// .	Windows version
-

ADDED   docs/ulex-transition.fig
Index: docs/ulex-transition.fig
==================================================================
--- /dev/null
+++ docs/ulex-transition.fig
@@ -0,0 +1,39 @@
+#FIG 3.2  Produced by xfig version 3.2.5-alpha5
+Landscape
+Center
+Inches
+Letter  
+100.00
+Single
+-2
+1200 2
+5 1 0 1 0 7 50 -1 -1 0.000 0 1 1 0 3450.000 7793.750 2475 8625 3450 9075 4425 8625
+	0 0 1.00 60.00 120.00
+5 1 0 1 0 7 50 -1 -1 0.000 0 0 1 0 3450.000 7762.500 4725 8625 3375 9300 2175 8625
+	0 0 1.00 60.00 120.00
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 1200 1425 3675 1425 3675 4800 1200 4800 1200 1425
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 3825 1425 7425 1425 7425 4800 3825 4800 3825 1425
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 2325 4950 2325 7200
+2 4 0 1 0 7 50 -1 -1 0.000 0 0 7 0 0 5
+	 3150 8550 3150 7200 1650 7200 1650 8550 3150 8550
+2 4 0 1 0 7 50 -1 -1 0.000 0 0 7 0 0 5
+	 5700 8550 5700 7200 3975 7200 3975 8550 5700 8550
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
+	0 0 1.00 60.00 120.00
+	 4800 4875 4800 7125
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
+	0 0 1.00 60.00 120.00
+	 4800 4875 2700 7125
+4 0 0 50 -1 0 12 0.0000 4 150 1185 1350 1725 runs and tests\001
+4 0 0 50 -1 0 12 0.0000 4 195 1065 1725 7650 megatest.db\001
+4 0 0 50 -1 0 12 0.0000 4 195 1140 4950 5775 config setting\001
+4 0 0 50 -1 0 12 0.0000 4 150 375 4125 7575 1.db\001
+4 0 0 50 -1 0 12 0.0000 4 150 375 4125 7830 2.db\001
+4 0 0 50 -1 0 12 0.0000 4 15 240 4125 8085 ....\001
+4 0 0 50 -1 0 12 0.0000 4 150 360 4875 5325 ulex\001
+4 0 0 50 -1 0 12 0.0000 4 150 690 1125 825 v1.6535\001
+4 0 0 50 -1 0 12 0.0000 4 195 2190 2400 9600 import/export steps script\001
+4 0 0 50 -1 0 12 0.0000 4 195 1590 3900 1725 steps and test data\001

ADDED   ducttape-lib.scm
Index: ducttape-lib.scm
==================================================================
--- /dev/null
+++ ducttape-lib.scm
@@ -0,0 +1,23 @@
+;;======================================================================
+;; Copyright 2019, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
+;;======================================================================
+
+(declare (unit ducttape-lib))
+
+(include "ducttape/ducttape-lib.scm")

Index: ducttape/Makefile
==================================================================
--- ducttape/Makefile
+++ ducttape/Makefile
@@ -14,10 +14,11 @@
 
 install:
 	chicken-install
 
 test:
+	echo '(handle-exceptions exn (begin (print-call-chain) (exit 1)) (load "ducttape-lib.scm") (inote "hello")) (exit 0)'  | csi
 	chicken-install -no-install
 	csc test_ducttape.scm
 
 	./test_ducttape
 	rm -f foo

Index: ducttape/ducttape-lib.scm
==================================================================
--- ducttape/ducttape-lib.scm
+++ ducttape/ducttape-lib.scm
@@ -16,11 +16,13 @@
      iputs
      re-match?
                                         ;     launch-repl
      keyword-skim
      skim-cmdline-opts-noarg-by-regex
-     skim-cmdline-opts-withargs-by-regex 
+     skim-cmdline-opts-withargs-by-regex
+     get-cli-arg
+     get-cli-switch
      concat-lists
      ducttape-process-command-line
      ducttape-append-logfile
      ducttape-activate-logfile
      isys
@@ -42,24 +44,1054 @@
      isodate->wwdate
      wwdate->seconds
      wwdate->isodate
      current-wwdate
      current-isodate
-     
+     *this-exe-dir*
+     *this-exe-name*
+     *this-exe-fullpath*
      )
 
   (import scheme chicken extras ports data-structures )
   (use posix regex ansi-escape-sequences test srfi-1 irregex slice srfi-13 rfc3339)
   ;;scsh-process ;; dropping scsh-process, it was clobbering posix's process and process*
   (use directory-utils uuid-lib filepath srfi-19 ) ; linenoise
-  
-  (include "mimetypes.scm") ; provides ext->mimetype
-  (include "workweekdate.scm")
+
+    ;; plugs a hole in posix-extras in latter chicken versions
+  (use posix-extras pathname-expand files)
+  (define ##sys#expand-home-path pathname-expand)
+  (define (realpath x) (resolve-pathname  (pathname-expand (or x "/dev/null")) ))
+
+  ;; (include "mimetypes.scm") ; provides ext->mimetype
+  ;; (include "workweekdate.scm")
+
+  ;; gathered from macosx:
+;;   cat /etc/apache2/mime.types | grep -v '^#' | perl -ne 'print "(\"$2\" . \"$1\")\n" if /(\S+)\s+(\S+)/' > mimetypes.scm
+;; + manual manipulation
+
+(define ducttape_ext2mimetype '(("ez" . "application/andrew-inset")
+("aw" . "application/applixware")
+("atom" . "application/atom+xml")
+("atomcat" . "application/atomcat+xml")
+("atomsvc" . "application/atomsvc+xml")
+("ccxml" . "application/ccxml+xml")
+("cdmia" . "application/cdmi-capability")
+("cdmic" . "application/cdmi-container")
+("cdmid" . "application/cdmi-domain")
+("cdmio" . "application/cdmi-object")
+("cdmiq" . "application/cdmi-queue")
+("cu" . "application/cu-seeme")
+("davmount" . "application/davmount+xml")
+("dbk" . "application/docbook+xml")
+("dssc" . "application/dssc+der")
+("xdssc" . "application/dssc+xml")
+("ecma" . "application/ecmascript")
+("emma" . "application/emma+xml")
+("epub" . "application/epub+zip")
+("exi" . "application/exi")
+("pfr" . "application/font-tdpfr")
+("gml" . "application/gml+xml")
+("gpx" . "application/gpx+xml")
+("gxf" . "application/gxf")
+("stk" . "application/hyperstudio")
+("ink" . "application/inkml+xml")
+("ipfix" . "application/ipfix")
+("jar" . "application/java-archive")
+("ser" . "application/java-serialized-object")
+("class" . "application/java-vm")
+("js" . "application/javascript")
+("json" . "application/json")
+("jsonml" . "application/jsonml+json")
+("lostxml" . "application/lost+xml")
+("hqx" . "application/mac-binhex40")
+("cpt" . "application/mac-compactpro")
+("mads" . "application/mads+xml")
+("mrc" . "application/marc")
+("mrcx" . "application/marcxml+xml")
+("ma" . "application/mathematica")
+("mathml" . "application/mathml+xml")
+("mbox" . "application/mbox")
+("mscml" . "application/mediaservercontrol+xml")
+("metalink" . "application/metalink+xml")
+("meta4" . "application/metalink4+xml")
+("mets" . "application/mets+xml")
+("mods" . "application/mods+xml")
+("m21" . "application/mp21")
+("mp4s" . "application/mp4")
+("doc" . "application/msword")
+("mxf" . "application/mxf")
+("bin" . "application/octet-stream")
+("oda" . "application/oda")
+("opf" . "application/oebps-package+xml")
+("ogx" . "application/ogg")
+("omdoc" . "application/omdoc+xml")
+("onetoc" . "application/onenote")
+("oxps" . "application/oxps")
+("xer" . "application/patch-ops-error+xml")
+("pdf" . "application/pdf")
+("pgp" . "application/pgp-encrypted")
+("asc" . "application/pgp-signature")
+("prf" . "application/pics-rules")
+("p10" . "application/pkcs10")
+("p7m" . "application/pkcs7-mime")
+("p7s" . "application/pkcs7-signature")
+("p8" . "application/pkcs8")
+("ac" . "application/pkix-attr-cert")
+("cer" . "application/pkix-cert")
+("crl" . "application/pkix-crl")
+("pkipath" . "application/pkix-pkipath")
+("pki" . "application/pkixcmp")
+("pls" . "application/pls+xml")
+("ai" . "application/postscript")
+("cww" . "application/prs.cww")
+("pskcxml" . "application/pskc+xml")
+("rdf" . "application/rdf+xml")
+("rif" . "application/reginfo+xml")
+("rnc" . "application/relax-ng-compact-syntax")
+("rl" . "application/resource-lists+xml")
+("rld" . "application/resource-lists-diff+xml")
+("rs" . "application/rls-services+xml")
+("gbr" . "application/rpki-ghostbusters")
+("mft" . "application/rpki-manifest")
+("roa" . "application/rpki-roa")
+("rsd" . "application/rsd+xml")
+("rss" . "application/rss+xml")
+("rtf" . "application/rtf")
+("sbml" . "application/sbml+xml")
+("scq" . "application/scvp-cv-request")
+("scs" . "application/scvp-cv-response")
+("spq" . "application/scvp-vp-request")
+("spp" . "application/scvp-vp-response")
+("sdp" . "application/sdp")
+("setpay" . "application/set-payment-initiation")
+("setreg" . "application/set-registration-initiation")
+("shf" . "application/shf+xml")
+("smi" . "application/smil+xml")
+("rq" . "application/sparql-query")
+("srx" . "application/sparql-results+xml")
+("gram" . "application/srgs")
+("grxml" . "application/srgs+xml")
+("sru" . "application/sru+xml")
+("ssdl" . "application/ssdl+xml")
+("ssml" . "application/ssml+xml")
+("tei" . "application/tei+xml")
+("tfi" . "application/thraud+xml")
+("tsd" . "application/timestamped-data")
+("plb" . "application/vnd.3gpp.pic-bw-large")
+("psb" . "application/vnd.3gpp.pic-bw-small")
+("pvb" . "application/vnd.3gpp.pic-bw-var")
+("tcap" . "application/vnd.3gpp2.tcap")
+("pwn" . "application/vnd.3m.post-it-notes")
+("aso" . "application/vnd.accpac.simply.aso")
+("imp" . "application/vnd.accpac.simply.imp")
+("acu" . "application/vnd.acucobol")
+("atc" . "application/vnd.acucorp")
+("air" . "application/vnd.adobe.air-application-installer-package+zip")
+("fcdt" . "application/vnd.adobe.formscentral.fcdt")
+("fxp" . "application/vnd.adobe.fxp")
+("xdp" . "application/vnd.adobe.xdp+xml")
+("xfdf" . "application/vnd.adobe.xfdf")
+("ahead" . "application/vnd.ahead.space")
+("azf" . "application/vnd.airzip.filesecure.azf")
+("azs" . "application/vnd.airzip.filesecure.azs")
+("azw" . "application/vnd.amazon.ebook")
+("acc" . "application/vnd.americandynamics.acc")
+("ami" . "application/vnd.amiga.ami")
+("apk" . "application/vnd.android.package-archive")
+("cii" . "application/vnd.anser-web-certificate-issue-initiation")
+("fti" . "application/vnd.anser-web-funds-transfer-initiation")
+("atx" . "application/vnd.antix.game-component")
+("mpkg" . "application/vnd.apple.installer+xml")
+("m3u8" . "application/vnd.apple.mpegurl")
+("swi" . "application/vnd.aristanetworks.swi")
+("iota" . "application/vnd.astraea-software.iota")
+("aep" . "application/vnd.audiograph")
+("mpm" . "application/vnd.blueice.multipass")
+("bmi" . "application/vnd.bmi")
+("rep" . "application/vnd.businessobjects")
+("cdxml" . "application/vnd.chemdraw+xml")
+("mmd" . "application/vnd.chipnuts.karaoke-mmd")
+("cdy" . "application/vnd.cinderella")
+("cla" . "application/vnd.claymore")
+("rp9" . "application/vnd.cloanto.rp9")
+("c4g" . "application/vnd.clonk.c4group")
+("c11amc" . "application/vnd.cluetrust.cartomobile-config")
+("c11amz" . "application/vnd.cluetrust.cartomobile-config-pkg")
+("csp" . "application/vnd.commonspace")
+("cdbcmsg" . "application/vnd.contact.cmsg")
+("cmc" . "application/vnd.cosmocaller")
+("clkx" . "application/vnd.crick.clicker")
+("clkk" . "application/vnd.crick.clicker.keyboard")
+("clkp" . "application/vnd.crick.clicker.palette")
+("clkt" . "application/vnd.crick.clicker.template")
+("clkw" . "application/vnd.crick.clicker.wordbank")
+("wbs" . "application/vnd.criticaltools.wbs+xml")
+("pml" . "application/vnd.ctc-posml")
+("ppd" . "application/vnd.cups-ppd")
+("car" . "application/vnd.curl.car")
+("pcurl" . "application/vnd.curl.pcurl")
+("dart" . "application/vnd.dart")
+("rdz" . "application/vnd.data-vision.rdz")
+("uvf" . "application/vnd.dece.data")
+("uvt" . "application/vnd.dece.ttml+xml")
+("uvx" . "application/vnd.dece.unspecified")
+("uvz" . "application/vnd.dece.zip")
+("fe_launch" . "application/vnd.denovo.fcselayout-link")
+("dna" . "application/vnd.dna")
+("mlp" . "application/vnd.dolby.mlp")
+("dpg" . "application/vnd.dpgraph")
+("dfac" . "application/vnd.dreamfactory")
+("kpxx" . "application/vnd.ds-keypoint")
+("ait" . "application/vnd.dvb.ait")
+("svc" . "application/vnd.dvb.service")
+("geo" . "application/vnd.dynageo")
+("mag" . "application/vnd.ecowin.chart")
+("nml" . "application/vnd.enliven")
+("esf" . "application/vnd.epson.esf")
+("msf" . "application/vnd.epson.msf")
+("qam" . "application/vnd.epson.quickanime")
+("slt" . "application/vnd.epson.salt")
+("ssf" . "application/vnd.epson.ssf")
+("es3" . "application/vnd.eszigno3+xml")
+("ez2" . "application/vnd.ezpix-album")
+("ez3" . "application/vnd.ezpix-package")
+("fdf" . "application/vnd.fdf")
+("mseed" . "application/vnd.fdsn.mseed")
+("seed" . "application/vnd.fdsn.seed")
+("gph" . "application/vnd.flographit")
+("ftc" . "application/vnd.fluxtime.clip")
+("fm" . "application/vnd.framemaker")
+("fnc" . "application/vnd.frogans.fnc")
+("ltf" . "application/vnd.frogans.ltf")
+("fsc" . "application/vnd.fsc.weblaunch")
+("oas" . "application/vnd.fujitsu.oasys")
+("oa2" . "application/vnd.fujitsu.oasys2")
+("oa3" . "application/vnd.fujitsu.oasys3")
+("fg5" . "application/vnd.fujitsu.oasysgp")
+("bh2" . "application/vnd.fujitsu.oasysprs")
+("ddd" . "application/vnd.fujixerox.ddd")
+("xdw" . "application/vnd.fujixerox.docuworks")
+("xbd" . "application/vnd.fujixerox.docuworks.binder")
+("fzs" . "application/vnd.fuzzysheet")
+("txd" . "application/vnd.genomatix.tuxedo")
+("ggb" . "application/vnd.geogebra.file")
+("ggt" . "application/vnd.geogebra.tool")
+("gex" . "application/vnd.geometry-explorer")
+("gxt" . "application/vnd.geonext")
+("g2w" . "application/vnd.geoplan")
+("g3w" . "application/vnd.geospace")
+("gmx" . "application/vnd.gmx")
+("kml" . "application/vnd.google-earth.kml+xml")
+("kmz" . "application/vnd.google-earth.kmz")
+("gqf" . "application/vnd.grafeq")
+("gac" . "application/vnd.groove-account")
+("ghf" . "application/vnd.groove-help")
+("gim" . "application/vnd.groove-identity-message")
+("grv" . "application/vnd.groove-injector")
+("gtm" . "application/vnd.groove-tool-message")
+("tpl" . "application/vnd.groove-tool-template")
+("vcg" . "application/vnd.groove-vcard")
+("hal" . "application/vnd.hal+xml")
+("zmm" . "application/vnd.handheld-entertainment+xml")
+("hbci" . "application/vnd.hbci")
+("les" . "application/vnd.hhe.lesson-player")
+("hpgl" . "application/vnd.hp-hpgl")
+("hpid" . "application/vnd.hp-hpid")
+("hps" . "application/vnd.hp-hps")
+("jlt" . "application/vnd.hp-jlyt")
+("pcl" . "application/vnd.hp-pcl")
+("pclxl" . "application/vnd.hp-pclxl")
+("sfd-hdstx" . "application/vnd.hydrostatix.sof-data")
+("mpy" . "application/vnd.ibm.minipay")
+("afp" . "application/vnd.ibm.modcap")
+("irm" . "application/vnd.ibm.rights-management")
+("sc" . "application/vnd.ibm.secure-container")
+("icc" . "application/vnd.iccprofile")
+("igl" . "application/vnd.igloader")
+("ivp" . "application/vnd.immervision-ivp")
+("ivu" . "application/vnd.immervision-ivu")
+("igm" . "application/vnd.insors.igm")
+("xpw" . "application/vnd.intercon.formnet")
+("i2g" . "application/vnd.intergeo")
+("qbo" . "application/vnd.intu.qbo")
+("qfx" . "application/vnd.intu.qfx")
+("rcprofile" . "application/vnd.ipunplugged.rcprofile")
+("irp" . "application/vnd.irepository.package+xml")
+("xpr" . "application/vnd.is-xpr")
+("fcs" . "application/vnd.isac.fcs")
+("jam" . "application/vnd.jam")
+("rms" . "application/vnd.jcp.javame.midlet-rms")
+("jisp" . "application/vnd.jisp")
+("joda" . "application/vnd.joost.joda-archive")
+("ktz" . "application/vnd.kahootz")
+("karbon" . "application/vnd.kde.karbon")
+("chrt" . "application/vnd.kde.kchart")
+("kfo" . "application/vnd.kde.kformula")
+("flw" . "application/vnd.kde.kivio")
+("kon" . "application/vnd.kde.kontour")
+("kpr" . "application/vnd.kde.kpresenter")
+("ksp" . "application/vnd.kde.kspread")
+("kwd" . "application/vnd.kde.kword")
+("htke" . "application/vnd.kenameaapp")
+("kia" . "application/vnd.kidspiration")
+("kne" . "application/vnd.kinar")
+("skp" . "application/vnd.koan")
+("sse" . "application/vnd.kodak-descriptor")
+("lasxml" . "application/vnd.las.las+xml")
+("lbd" . "application/vnd.llamagraphics.life-balance.desktop")
+("lbe" . "application/vnd.llamagraphics.life-balance.exchange+xml")
+("123" . "application/vnd.lotus-1-2-3")
+("apr" . "application/vnd.lotus-approach")
+("pre" . "application/vnd.lotus-freelance")
+("nsf" . "application/vnd.lotus-notes")
+("org" . "application/vnd.lotus-organizer")
+("scm" . "application/vnd.lotus-screencam")
+("lwp" . "application/vnd.lotus-wordpro")
+("portpkg" . "application/vnd.macports.portpkg")
+("mcd" . "application/vnd.mcd")
+("mc1" . "application/vnd.medcalcdata")
+("cdkey" . "application/vnd.mediastation.cdkey")
+("mwf" . "application/vnd.mfer")
+("mfm" . "application/vnd.mfmp")
+("flo" . "application/vnd.micrografx.flo")
+("igx" . "application/vnd.micrografx.igx")
+("mif" . "application/vnd.mif")
+("daf" . "application/vnd.mobius.daf")
+("dis" . "application/vnd.mobius.dis")
+("mbk" . "application/vnd.mobius.mbk")
+("mqy" . "application/vnd.mobius.mqy")
+("msl" . "application/vnd.mobius.msl")
+("plc" . "application/vnd.mobius.plc")
+("txf" . "application/vnd.mobius.txf")
+("mpn" . "application/vnd.mophun.application")
+("mpc" . "application/vnd.mophun.certificate")
+("xul" . "application/vnd.mozilla.xul+xml")
+("cil" . "application/vnd.ms-artgalry")
+("cab" . "application/vnd.ms-cab-compressed")
+("xls" . "application/vnd.ms-excel")
+("xlam" . "application/vnd.ms-excel.addin.macroenabled.12")
+("xlsb" . "application/vnd.ms-excel.sheet.binary.macroenabled.12")
+("xlsm" . "application/vnd.ms-excel.sheet.macroenabled.12")
+("xltm" . "application/vnd.ms-excel.template.macroenabled.12")
+("eot" . "application/vnd.ms-fontobject")
+("chm" . "application/vnd.ms-htmlhelp")
+("ims" . "application/vnd.ms-ims")
+("lrm" . "application/vnd.ms-lrm")
+("thmx" . "application/vnd.ms-officetheme")
+("cat" . "application/vnd.ms-pki.seccat")
+("stl" . "application/vnd.ms-pki.stl")
+("ppt" . "application/vnd.ms-powerpoint")
+("ppam" . "application/vnd.ms-powerpoint.addin.macroenabled.12")
+("pptm" . "application/vnd.ms-powerpoint.presentation.macroenabled.12")
+("sldm" . "application/vnd.ms-powerpoint.slide.macroenabled.12")
+("ppsm" . "application/vnd.ms-powerpoint.slideshow.macroenabled.12")
+("potm" . "application/vnd.ms-powerpoint.template.macroenabled.12")
+("mpp" . "application/vnd.ms-project")
+("docm" . "application/vnd.ms-word.document.macroenabled.12")
+("dotm" . "application/vnd.ms-word.template.macroenabled.12")
+("wps" . "application/vnd.ms-works")
+("wpl" . "application/vnd.ms-wpl")
+("xps" . "application/vnd.ms-xpsdocument")
+("mseq" . "application/vnd.mseq")
+("mus" . "application/vnd.musician")
+("msty" . "application/vnd.muvee.style")
+("taglet" . "application/vnd.mynfc")
+("nlu" . "application/vnd.neurolanguage.nlu")
+("ntf" . "application/vnd.nitf")
+("nnd" . "application/vnd.noblenet-directory")
+("nns" . "application/vnd.noblenet-sealer")
+("nnw" . "application/vnd.noblenet-web")
+("ngdat" . "application/vnd.nokia.n-gage.data")
+("n-gage" . "application/vnd.nokia.n-gage.symbian.install")
+("rpst" . "application/vnd.nokia.radio-preset")
+("rpss" . "application/vnd.nokia.radio-presets")
+("edm" . "application/vnd.novadigm.edm")
+("edx" . "application/vnd.novadigm.edx")
+("ext" . "application/vnd.novadigm.ext")
+("odc" . "application/vnd.oasis.opendocument.chart")
+("otc" . "application/vnd.oasis.opendocument.chart-template")
+("odb" . "application/vnd.oasis.opendocument.database")
+("odf" . "application/vnd.oasis.opendocument.formula")
+("odft" . "application/vnd.oasis.opendocument.formula-template")
+("odg" . "application/vnd.oasis.opendocument.graphics")
+("otg" . "application/vnd.oasis.opendocument.graphics-template")
+("odi" . "application/vnd.oasis.opendocument.image")
+("oti" . "application/vnd.oasis.opendocument.image-template")
+("odp" . "application/vnd.oasis.opendocument.presentation")
+("otp" . "application/vnd.oasis.opendocument.presentation-template")
+("ods" . "application/vnd.oasis.opendocument.spreadsheet")
+("ots" . "application/vnd.oasis.opendocument.spreadsheet-template")
+("odt" . "application/vnd.oasis.opendocument.text")
+("odm" . "application/vnd.oasis.opendocument.text-master")
+("ott" . "application/vnd.oasis.opendocument.text-template")
+("oth" . "application/vnd.oasis.opendocument.text-web")
+("xo" . "application/vnd.olpc-sugar")
+("dd2" . "application/vnd.oma.dd2+xml")
+("oxt" . "application/vnd.openofficeorg.extension")
+("pptx" . "application/vnd.openxmlformats-officedocument.presentationml.presentation")
+("sldx" . "application/vnd.openxmlformats-officedocument.presentationml.slide")
+("ppsx" . "application/vnd.openxmlformats-officedocument.presentationml.slideshow")
+("potx" . "application/vnd.openxmlformats-officedocument.presentationml.template")
+("xlsx" . "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")
+("xltx" . "application/vnd.openxmlformats-officedocument.spreadsheetml.template")
+("docx" . "application/vnd.openxmlformats-officedocument.wordprocessingml.document")
+("dotx" . "application/vnd.openxmlformats-officedocument.wordprocessingml.template")
+("mgp" . "application/vnd.osgeo.mapguide.package")
+("dp" . "application/vnd.osgi.dp")
+("esa" . "application/vnd.osgi.subsystem")
+("pdb" . "application/vnd.palm")
+("paw" . "application/vnd.pawaafile")
+("str" . "application/vnd.pg.format")
+("ei6" . "application/vnd.pg.osasli")
+("efif" . "application/vnd.picsel")
+("wg" . "application/vnd.pmi.widget")
+("plf" . "application/vnd.pocketlearn")
+("pbd" . "application/vnd.powerbuilder6")
+("box" . "application/vnd.previewsystems.box")
+("mgz" . "application/vnd.proteus.magazine")
+("qps" . "application/vnd.publishare-delta-tree")
+("ptid" . "application/vnd.pvi.ptid1")
+("qxd" . "application/vnd.quark.quarkxpress")
+("bed" . "application/vnd.realvnc.bed")
+("mxl" . "application/vnd.recordare.musicxml")
+("musicxml" . "application/vnd.recordare.musicxml+xml")
+("cryptonote" . "application/vnd.rig.cryptonote")
+("cod" . "application/vnd.rim.cod")
+("rm" . "application/vnd.rn-realmedia")
+("rmvb" . "application/vnd.rn-realmedia-vbr")
+("link66" . "application/vnd.route66.link66+xml")
+("st" . "application/vnd.sailingtracker.track")
+("see" . "application/vnd.seemail")
+("sema" . "application/vnd.sema")
+("semd" . "application/vnd.semd")
+("semf" . "application/vnd.semf")
+("ifm" . "application/vnd.shana.informed.formdata")
+("itp" . "application/vnd.shana.informed.formtemplate")
+("iif" . "application/vnd.shana.informed.interchange")
+("ipk" . "application/vnd.shana.informed.package")
+("twd" . "application/vnd.simtech-mindmapper")
+("mmf" . "application/vnd.smaf")
+("teacher" . "application/vnd.smart.teacher")
+("sdkm" . "application/vnd.solent.sdkm+xml")
+("dxp" . "application/vnd.spotfire.dxp")
+("sfs" . "application/vnd.spotfire.sfs")
+("sdc" . "application/vnd.stardivision.calc")
+("sda" . "application/vnd.stardivision.draw")
+("sdd" . "application/vnd.stardivision.impress")
+("smf" . "application/vnd.stardivision.math")
+("sdw" . "application/vnd.stardivision.writer")
+("sgl" . "application/vnd.stardivision.writer-global")
+("smzip" . "application/vnd.stepmania.package")
+("sm" . "application/vnd.stepmania.stepchart")
+("sxc" . "application/vnd.sun.xml.calc")
+("stc" . "application/vnd.sun.xml.calc.template")
+("sxd" . "application/vnd.sun.xml.draw")
+("std" . "application/vnd.sun.xml.draw.template")
+("sxi" . "application/vnd.sun.xml.impress")
+("sti" . "application/vnd.sun.xml.impress.template")
+("sxm" . "application/vnd.sun.xml.math")
+("sxw" . "application/vnd.sun.xml.writer")
+("sxg" . "application/vnd.sun.xml.writer.global")
+("stw" . "application/vnd.sun.xml.writer.template")
+("sus" . "application/vnd.sus-calendar")
+("svd" . "application/vnd.svd")
+("sis" . "application/vnd.symbian.install")
+("xsm" . "application/vnd.syncml+xml")
+("bdm" . "application/vnd.syncml.dm+wbxml")
+("xdm" . "application/vnd.syncml.dm+xml")
+("tao" . "application/vnd.tao.intent-module-archive")
+("pcap" . "application/vnd.tcpdump.pcap")
+("tmo" . "application/vnd.tmobile-livetv")
+("tpt" . "application/vnd.trid.tpt")
+("mxs" . "application/vnd.triscape.mxs")
+("tra" . "application/vnd.trueapp")
+("ufd" . "application/vnd.ufdl")
+("utz" . "application/vnd.uiq.theme")
+("umj" . "application/vnd.umajin")
+("unityweb" . "application/vnd.unity")
+("uoml" . "application/vnd.uoml+xml")
+("vcx" . "application/vnd.vcx")
+("vsd" . "application/vnd.visio")
+("vis" . "application/vnd.visionary")
+("vsf" . "application/vnd.vsf")
+("wbxml" . "application/vnd.wap.wbxml")
+("wmlc" . "application/vnd.wap.wmlc")
+("wmlsc" . "application/vnd.wap.wmlscriptc")
+("wtb" . "application/vnd.webturbo")
+("nbp" . "application/vnd.wolfram.player")
+("wpd" . "application/vnd.wordperfect")
+("wqd" . "application/vnd.wqd")
+("stf" . "application/vnd.wt.stf")
+("xar" . "application/vnd.xara")
+("xfdl" . "application/vnd.xfdl")
+("hvd" . "application/vnd.yamaha.hv-dic")
+("hvs" . "application/vnd.yamaha.hv-script")
+("hvp" . "application/vnd.yamaha.hv-voice")
+("osf" . "application/vnd.yamaha.openscoreformat")
+("osfpvg" . "application/vnd.yamaha.openscoreformat.osfpvg+xml")
+("saf" . "application/vnd.yamaha.smaf-audio")
+("spf" . "application/vnd.yamaha.smaf-phrase")
+("cmp" . "application/vnd.yellowriver-custom-menu")
+("zir" . "application/vnd.zul")
+("zaz" . "application/vnd.zzazz.deck+xml")
+("vxml" . "application/voicexml+xml")
+("wgt" . "application/widget")
+("hlp" . "application/winhlp")
+("wsdl" . "application/wsdl+xml")
+("wspolicy" . "application/wspolicy+xml")
+("7z" . "application/x-7z-compressed")
+("abw" . "application/x-abiword")
+("ace" . "application/x-ace-compressed")
+("dmg" . "application/x-apple-diskimage")
+("aab" . "application/x-authorware-bin")
+("aam" . "application/x-authorware-map")
+("aas" . "application/x-authorware-seg")
+("bcpio" . "application/x-bcpio")
+("torrent" . "application/x-bittorrent")
+("blb" . "application/x-blorb")
+("bz" . "application/x-bzip")
+("bz2" . "application/x-bzip2")
+("cbr" . "application/x-cbr")
+("vcd" . "application/x-cdlink")
+("cfs" . "application/x-cfs-compressed")
+("chat" . "application/x-chat")
+("pgn" . "application/x-chess-pgn")
+("nsc" . "application/x-conference")
+("cpio" . "application/x-cpio")
+("csh" . "application/x-csh")
+("deb" . "application/x-debian-package")
+("dgc" . "application/x-dgc-compressed")
+("dir" . "application/x-director")
+("wad" . "application/x-doom")
+("ncx" . "application/x-dtbncx+xml")
+("dtb" . "application/x-dtbook+xml")
+("res" . "application/x-dtbresource+xml")
+("dvi" . "application/x-dvi")
+("evy" . "application/x-envoy")
+("eva" . "application/x-eva")
+("bdf" . "application/x-font-bdf")
+("gsf" . "application/x-font-ghostscript")
+("psf" . "application/x-font-linux-psf")
+("otf" . "application/x-font-otf")
+("pcf" . "application/x-font-pcf")
+("snf" . "application/x-font-snf")
+("ttf" . "application/x-font-ttf")
+("pfa" . "application/x-font-type1")
+("woff" . "application/x-font-woff")
+("arc" . "application/x-freearc")
+("spl" . "application/x-futuresplash")
+("gca" . "application/x-gca-compressed")
+("ulx" . "application/x-glulx")
+("gnumeric" . "application/x-gnumeric")
+("gramps" . "application/x-gramps-xml")
+("gtar" . "application/x-gtar")
+("hdf" . "application/x-hdf")
+("install" . "application/x-install-instructions")
+("iso" . "application/x-iso9660-image")
+("jnlp" . "application/x-java-jnlp-file")
+("latex" . "application/x-latex")
+("lzh" . "application/x-lzh-compressed")
+("mie" . "application/x-mie")
+("prc" . "application/x-mobipocket-ebook")
+("m3u8" . "application/x-mpegurl")
+("application" . "application/x-ms-application")
+("lnk" . "application/x-ms-shortcut")
+("wmd" . "application/x-ms-wmd")
+("wmz" . "application/x-ms-wmz")
+("xbap" . "application/x-ms-xbap")
+("mdb" . "application/x-msaccess")
+("obd" . "application/x-msbinder")
+("crd" . "application/x-mscardfile")
+("clp" . "application/x-msclip")
+("exe" . "application/x-msdownload")
+("mvb" . "application/x-msmediaview")
+("wmf" . "application/x-msmetafile")
+("mny" . "application/x-msmoney")
+("pub" . "application/x-mspublisher")
+("scd" . "application/x-msschedule")
+("trm" . "application/x-msterminal")
+("wri" . "application/x-mswrite")
+("nc" . "application/x-netcdf")
+("nzb" . "application/x-nzb")
+("p12" . "application/x-pkcs12")
+("p7b" . "application/x-pkcs7-certificates")
+("p7r" . "application/x-pkcs7-certreqresp")
+("rar" . "application/x-rar-compressed")
+("ris" . "application/x-research-info-systems")
+("sh" . "application/x-sh")
+("shar" . "application/x-shar")
+("swf" . "application/x-shockwave-flash")
+("xap" . "application/x-silverlight-app")
+("sql" . "application/x-sql")
+("sit" . "application/x-stuffit")
+("sitx" . "application/x-stuffitx")
+("srt" . "application/x-subrip")
+("sv4cpio" . "application/x-sv4cpio")
+("sv4crc" . "application/x-sv4crc")
+("t3" . "application/x-t3vm-image")
+("gam" . "application/x-tads")
+("tar" . "application/x-tar")
+("tcl" . "application/x-tcl")
+("tex" . "application/x-tex")
+("tfm" . "application/x-tex-tfm")
+("texinfo" . "application/x-texinfo")
+("obj" . "application/x-tgif")
+("ustar" . "application/x-ustar")
+("src" . "application/x-wais-source")
+("der" . "application/x-x509-ca-cert")
+("fig" . "application/x-xfig")
+("xlf" . "application/x-xliff+xml")
+("xpi" . "application/x-xpinstall")
+("xz" . "application/x-xz")
+("z1" . "application/x-zmachine")
+("xaml" . "application/xaml+xml")
+("xdf" . "application/xcap-diff+xml")
+("xenc" . "application/xenc+xml")
+("xhtml" . "application/xhtml+xml")
+("xml" . "application/xml")
+("dtd" . "application/xml-dtd")
+("xop" . "application/xop+xml")
+("xpl" . "application/xproc+xml")
+("xslt" . "application/xslt+xml")
+("xspf" . "application/xspf+xml")
+("mxml" . "application/xv+xml")
+("yang" . "application/yang")
+("yin" . "application/yin+xml")
+("zip" . "application/zip")
+("adp" . "audio/adpcm")
+("au" . "audio/basic")
+("mid" . "audio/midi")
+("mp4a" . "audio/mp4")
+("m4a" . "audio/mp4a-latm")
+("mpga" . "audio/mpeg")
+("oga" . "audio/ogg")
+("s3m" . "audio/s3m")
+("sil" . "audio/silk")
+("uva" . "audio/vnd.dece.audio")
+("eol" . "audio/vnd.digital-winds")
+("dra" . "audio/vnd.dra")
+("dts" . "audio/vnd.dts")
+("dtshd" . "audio/vnd.dts.hd")
+("lvp" . "audio/vnd.lucent.voice")
+("pya" . "audio/vnd.ms-playready.media.pya")
+("ecelp4800" . "audio/vnd.nuera.ecelp4800")
+("ecelp7470" . "audio/vnd.nuera.ecelp7470")
+("ecelp9600" . "audio/vnd.nuera.ecelp9600")
+("rip" . "audio/vnd.rip")
+("weba" . "audio/webm")
+("aac" . "audio/x-aac")
+("aif" . "audio/x-aiff")
+("caf" . "audio/x-caf")
+("flac" . "audio/x-flac")
+("mka" . "audio/x-matroska")
+("m3u" . "audio/x-mpegurl")
+("wax" . "audio/x-ms-wax")
+("wma" . "audio/x-ms-wma")
+("ram" . "audio/x-pn-realaudio")
+("rmp" . "audio/x-pn-realaudio-plugin")
+("wav" . "audio/x-wav")
+("xm" . "audio/xm")
+("cdx" . "chemical/x-cdx")
+("cif" . "chemical/x-cif")
+("cmdf" . "chemical/x-cmdf")
+("cml" . "chemical/x-cml")
+("csml" . "chemical/x-csml")
+("xyz" . "chemical/x-xyz")
+("bmp" . "image/bmp")
+("cgm" . "image/cgm")
+("g3" . "image/g3fax")
+("gif" . "image/gif")
+("ief" . "image/ief")
+("jp2" . "image/jp2")
+("jpeg" . "image/jpeg")
+("ktx" . "image/ktx")
+("pict" . "image/pict")
+("png" . "image/png")
+("btif" . "image/prs.btif")
+("sgi" . "image/sgi")
+("svg" . "image/svg+xml")
+("tiff" . "image/tiff")
+("psd" . "image/vnd.adobe.photoshop")
+("uvi" . "image/vnd.dece.graphic")
+("sub" . "image/vnd.dvb.subtitle")
+("djvu" . "image/vnd.djvu")
+("dwg" . "image/vnd.dwg")
+("dxf" . "image/vnd.dxf")
+("fbs" . "image/vnd.fastbidsheet")
+("fpx" . "image/vnd.fpx")
+("fst" . "image/vnd.fst")
+("mmr" . "image/vnd.fujixerox.edmics-mmr")
+("rlc" . "image/vnd.fujixerox.edmics-rlc")
+("mdi" . "image/vnd.ms-modi")
+("wdp" . "image/vnd.ms-photo")
+("npx" . "image/vnd.net-fpx")
+("wbmp" . "image/vnd.wap.wbmp")
+("xif" . "image/vnd.xiff")
+("webp" . "image/webp")
+("3ds" . "image/x-3ds")
+("ras" . "image/x-cmu-raster")
+("cmx" . "image/x-cmx")
+("fh" . "image/x-freehand")
+("ico" . "image/x-icon")
+("pntg" . "image/x-macpaint")
+("sid" . "image/x-mrsid-image")
+("pcx" . "image/x-pcx")
+("pic" . "image/x-pict")
+("pnm" . "image/x-portable-anymap")
+("pbm" . "image/x-portable-bitmap")
+("pgm" . "image/x-portable-graymap")
+("ppm" . "image/x-portable-pixmap")
+("qtif" . "image/x-quicktime")
+("rgb" . "image/x-rgb")
+("tga" . "image/x-tga")
+("xbm" . "image/x-xbitmap")
+("xpm" . "image/x-xpixmap")
+("xwd" . "image/x-xwindowdump")
+("eml" . "message/rfc822")
+("igs" . "model/iges")
+("msh" . "model/mesh")
+("dae" . "model/vnd.collada+xml")
+("dwf" . "model/vnd.dwf")
+("gdl" . "model/vnd.gdl")
+("gtw" . "model/vnd.gtw")
+("mts" . "model/vnd.mts")
+("vtu" . "model/vnd.vtu")
+("wrl" . "model/vrml")
+("x3db" . "model/x3d+binary")
+("x3dv" . "model/x3d+vrml")
+("x3d" . "model/x3d+xml")
+("manifest" . "text/cache-manifest")
+("appcache" . "text/cache-manifest")
+("ics" . "text/calendar")
+("css" . "text/css")
+("csv" . "text/csv")
+("html" . "text/html")
+("n3" . "text/n3")
+("txt" . "text/plain")
+("dsc" . "text/prs.lines.tag")
+("rtx" . "text/richtext")
+("sgml" . "text/sgml")
+("tsv" . "text/tab-separated-values")
+("t" . "text/troff")
+("ttl" . "text/turtle")
+("uri" . "text/uri-list")
+("vcard" . "text/vcard")
+("curl" . "text/vnd.curl")
+("dcurl" . "text/vnd.curl.dcurl")
+("scurl" . "text/vnd.curl.scurl")
+("mcurl" . "text/vnd.curl.mcurl")
+("sub" . "text/vnd.dvb.subtitle")
+("fly" . "text/vnd.fly")
+("flx" . "text/vnd.fmi.flexstor")
+("gv" . "text/vnd.graphviz")
+("3dml" . "text/vnd.in3d.3dml")
+("spot" . "text/vnd.in3d.spot")
+("jad" . "text/vnd.sun.j2me.app-descriptor")
+("wml" . "text/vnd.wap.wml")
+("wmls" . "text/vnd.wap.wmlscript")
+("s" . "text/x-asm")
+("c" . "text/x-c")
+("f" . "text/x-fortran")
+("java" . "text/x-java-source")
+("opml" . "text/x-opml")
+("p" . "text/x-pascal")
+("nfo" . "text/x-nfo")
+("etx" . "text/x-setext")
+("sfv" . "text/x-sfv")
+("uu" . "text/x-uuencode")
+("vcs" . "text/x-vcalendar")
+("vcf" . "text/x-vcard")
+("3gp" . "video/3gpp")
+("3g2" . "video/3gpp2")
+("h261" . "video/h261")
+("h263" . "video/h263")
+("h264" . "video/h264")
+("jpgv" . "video/jpeg")
+("jpm" . "video/jpm")
+("mj2" . "video/mj2")
+("ts" . "video/mp2t")
+("mp4" . "video/mp4")
+("mpeg" . "video/mpeg")
+("ogv" . "video/ogg")
+("qt" . "video/quicktime")
+("uvh" . "video/vnd.dece.hd")
+("uvm" . "video/vnd.dece.mobile")
+("uvp" . "video/vnd.dece.pd")
+("uvs" . "video/vnd.dece.sd")
+("uvv" . "video/vnd.dece.video")
+("dvb" . "video/vnd.dvb.file")
+("fvt" . "video/vnd.fvt")
+("mxu" . "video/vnd.mpegurl")
+("pyv" . "video/vnd.ms-playready.media.pyv")
+("uvu" . "video/vnd.uvvu.mp4")
+("viv" . "video/vnd.vivo")
+("dv" . "video/x-dv")
+("webm" . "video/webm")
+("f4v" . "video/x-f4v")
+("fli" . "video/x-fli")
+("flv" . "video/x-flv")
+("m4v" . "video/x-m4v")
+("mkv" . "video/x-matroska")
+("mng" . "video/x-mng")
+("asf" . "video/x-ms-asf")
+("vob" . "video/x-ms-vob")
+("wm" . "video/x-ms-wm")
+("wmv" . "video/x-ms-wmv")
+("wmx" . "video/x-ms-wmx")
+("wvx" . "video/x-ms-wvx")
+("avi" . "video/x-msvideo")
+("movie" . "video/x-sgi-movie")
+("smv" . "video/x-smv")
+("ice" . "x-conference/x-cooltalk")))
+
+(use srfi-19)
+(use test)
+;;(use format)
+(use regex)
+;(declare (unit wwdate))
+;; utility procedures to convert among
+;; different ways to express date (wwdate, seconds since epoch, isodate)
+;;
+;; samples:
+;; isodate   -> "2016-01-01"
+;; wwdate -> "16ww01.5"
+;; seconds   -> 1451631600
+
+;; procedures provided:
+;; ====================
+;; seconds->isodate
+;; seconds->wwdate
+;;
+;; isodate->seconds
+;; isodate->wwdate
+;;
+;; wwdate->seconds
+;; wwdate->isodate
+
+;; srfi-19 used extensively; this doc is better tha the eggref:
+;; http://srfi.schemers.org/srfi-19/srfi-19.html
+
+;; Author: brandon.j.barclay@intel.com 16ww18.6
+
+(define (date->seconds date)
+  (inexact->exact
+   (string->number
+    (date->string date "~s"))))
+
+(define (seconds->isodate seconds)
+  (let* ((date (seconds->date seconds))
+         (result (date->string date "~Y-~m-~d")))
+    result))
+
+(define (isodate->seconds isodate)
+  "Takes a string input of the form 'YY-MM-DD' or 'YYYY-MM-DD' and returns epoch time; for YY, assume after Y2K"
+  (let* ((numlist (map string->number (string-split isodate "-")))
+        (raw-year (car numlist))
+        (year (if (< raw-year 100) (+ raw-year 2000) raw-year))
+        (month (list-ref numlist 1))
+        (day (list-ref numlist 2))
+        (date (make-date 0 0 0 0 day month year))
+        (seconds (date->seconds date)))
+
+    seconds))
+
+;; adapted from perl Intel::WorkWeek perl module
+;; workweek year consists of numbered weeks starting from week 1
+;;   days of week are numbered starting from 0 on sunday
+;;   weeks begin on sunday- day number 0 and end saturday- day 6
+;;   week 1 is defined as the week containing jan 1 of the year
+;;   workweek year does not match calendar year in workweek 1
+;;     since workweek 1 contains jan1 and workweek begins sunday,
+;;     days prior to jan1 in workweek 1 belong to the next workweek year
+(define (seconds->wwdate-values seconds)
+  (define (date-difference->seconds d1 d2)
+    (- (date->seconds d1) (date->seconds d2)))
+
+  (let* ((thisdate (seconds->date seconds))
+         (thisdow (string->number (date->string thisdate "~w")))
+
+         (year (date-year thisdate))
+         ;; intel workweek 1 begins on sunday of week containing jan1
+         (jan1 (make-date 0 0 0 0 1 1 year))
+         (jan1dow (date-week-day jan1))
+         (ww01 (date-subtract-duration jan1 (seconds->time (* 60 60 24 jan1dow))))
+
+         (ww01_delta_seconds (date-difference->seconds thisdate ww01))
+         (wwnum_initial (inexact->exact (add1 (floor (/ ww01_delta_seconds 24 3600 7) ))))
+         
+         ;; we could be in ww1 of next year
+         (this-saturday (seconds->date
+                         (+ seconds
+                            (* 60 60 24 (- 6 thisdow)))))
+         (this-week-ends-next-year?
+          (> (date-year this-saturday) year))
+         (intelyear
+          (if this-week-ends-next-year?
+              (add1 year)
+              year))
+         (intelweek
+          (if this-week-ends-next-year?
+              1
+              wwnum_initial)))
+   (values intelyear intelweek thisdow)))
+
+(define (string-leftpad in width pad-char)
+  (let* ((unpadded-str (->string in))
+         (padlen_temp (- width (string-length unpadded-str)))
+         (padlen (if (< padlen_temp 0) 0 padlen_temp))
+         (padding (make-string padlen pad-char)))
+    (conc padding unpadded-str)))
+
+(define (string-rightpad in width pad-char)
+  (let* ((unpadded-str (->string in))
+         (padlen_temp (- width (string-length unpadded-str)))
+         (padlen (if (< padlen_temp 0) 0 padlen_temp))
+         (padding (make-string padlen pad-char)))
+    (conc unpadded-str padding)))
+
+(define (zeropad num width)
+  (string-leftpad num width #\0))
+
+(define (seconds->wwdate seconds)
+
+  (let-values (((intelyear intelweek day-of-week-num)
+                (seconds->wwdate-values seconds)))
+    (let ((intelyear-str
+           (zeropad
+            (->string
+             (if (> intelyear 1999)
+                 (- intelyear 2000) intelyear))
+            2))
+          (intelweek-str
+           (zeropad (->string intelweek) 2))
+          (dow-str (->string day-of-week-num)))
+      (conc intelyear-str "ww" intelweek-str "." dow-str))))
+
+(define (isodate->wwdate isodate)
+  (seconds->wwdate
+   (isodate->seconds isodate)))
+
+(define (wwdate->seconds wwdate)
+  (let ((match (string-match "^(\\d+)ww(\\d+).(\\d)$" wwdate)))
+    (if
+     (not match)
+     #f
+     (let* (
+            (intelyear-raw (string->number (list-ref match 1)))
+            (intelyear (if (< intelyear-raw 100)
+                           (+ intelyear-raw 2000)
+                           intelyear-raw))
+            (intelww (string->number (list-ref match 2)))
+            (dayofweek (string->number (list-ref match 3)))
+
+            (day-of-seconds (* 60 60 24 ))
+            (week-of-seconds (* day-of-seconds 7))
+            
+
+            ;; get seconds at ww1.0
+            (new-years-date (make-date 0 0 0 0 1 1 intelyear))
+            (new-years-seconds
+             (date->seconds new-years-date))
+            (new-years-dayofweek (date-week-day new-years-date))
+            (ww1.0_seconds (- new-years-seconds
+                              (* day-of-seconds
+                                 new-years-dayofweek)))
+            (workweek-adjustment (* week-of-seconds (sub1 intelww)))
+            (weekday-adjustment (* dayofweek day-of-seconds))
+
+            (result (+ ww1.0_seconds workweek-adjustment weekday-adjustment)))
+       result))))
+
+(define (wwdate->isodate wwdate)
+  (seconds->isodate (wwdate->seconds wwdate)))
+
+(define (current-wwdate)
+  (seconds->wwdate (current-seconds)))
+
+(define (current-isodate)
+  (seconds->isodate (current-seconds)))
+
+(define (wwdate-tests)
+  (test-group
+   "date conversion tests"
+   (let ((test-table
+          '(("16ww01.5" . "2016-01-01")
+            ("16ww18.5" . "2016-04-29")
+            ("1999ww33.5" . "1999-08-13")
+            ("16ww18.4" . "2016-04-28")
+            ("16ww18.3" . "2016-04-27")
+            ("13ww01.0" . "2012-12-30")
+            ("13ww52.6" . "2013-12-28")
+            ("16ww53.3" . "2016-12-28"))))
+     (for-each
+      (lambda (test-pair)
+        (let ((wwdate (car test-pair))
+              (isodate (cdr test-pair)))
+          (test
+           (conc "(isodate->wwdate "isodate ") => "wwdate)
+           wwdate
+           (isodate->wwdate isodate))
+          
+          (test
+           (conc "(wwdate->isodate "wwdate ")   => "isodate)
+           isodate
+           (wwdate->isodate wwdate))))
+      test-table))))
+
+
+(define (ext->mimetype ext)
+  (let ((x (assoc ext ducttape_ext2mimetype)))
+   (if x (cdr x) "text/plain")))
+
+  
   (define ducttape-lib-version 1.00)
   (define (toplevel-command sym proc) (lambda () #f))
+
+  ;; like shell "which" command
+  (define (find-exe exe)
+    (let* ((path-items
+            (string-split
+             (or
+              (get-environment-variable "PATH") "")
+             ":")))
+
+      (let loop ((rest-path-items path-items))
+        (if (null? rest-path-items)
+            #f
+            (let* ((this-dir (car rest-path-items))
+                   (next-rest (cdr rest-path-items))
+                   (candidate (conc this-dir "/" exe)))
+              (if (file-execute-access? candidate)
+                  candidate
+                  (loop next-rest)))))))
+
+
+  
+;;;; define some handy globals
+  ;; resolve fullpath to this script or binary.
+  (define (__get-this-script-fullpath #!key (argv (argv)))
+    (let* ((this-script
+            (cond
+             ((and (> (length argv) 2)
+                   (string-match "^(.*/csi|csi)$" (car argv))
+                   (string-match "^-(s|ss|sx|script)$" (cadr argv)))
+              (caddr argv))
+             (else (car argv))))
+           
+           ;;(foo (begin (print "hello "(find-exe "/bin/sh") #f)))
+           (fullpath (or (find-exe this-script) (realpath this-script))))
+      fullpath))
+  
+  (define *this-exe-fullpath* (__get-this-script-fullpath))
+  (define *this-exe-dir*      (pathname-directory *this-exe-fullpath*))
+  (define *this-exe-name*     (pathname-strip-directory *this-exe-fullpath*))
+  
+
 ;;;; utility procedures
 
+
+  
   ;; begin credit: megatest's process.scm
   (define (port->list fh )
     (if (eof-object? fh) #f
         (let loop ((curr (read-line fh))
                    (result '()))
@@ -582,28 +1614,10 @@
         (close-output-port sendmail-port)))
     
     (do-or-die "/usr/sbin/sendmail -t"
                stdin-proc: sendmail-proc))
 
-  ;; like shell "which" command
-  (define (find-exe exe)
-    (let* ((path-items
-            (string-split
-             (or
-              (get-environment-variable "PATH") "")
-             ":")))
-
-      (let loop ((rest-path-items path-items))
-        (if (null? rest-path-items)
-            #f
-            (let* ((this-dir (car rest-path-items))
-                   (next-rest (cdr rest-path-items))
-                   (candidate (conc this-dir "/" exe)))
-              (if (file-execute-access? candidate)
-                  candidate
-                  (loop next-rest)))))))
-
 
 ;;;; process command line options
 
   ;; get command line switches (have no subsequent arg; eg. [-foo])
   ;;  assumes these are switches without arguments
@@ -637,10 +1651,26 @@
                 (loop (list (cadr args-remaining)) (cddr args-remaining) args-to-return)
                 (loop (cons (cadr args-remaining) kwval) (cddr args-remaining) args-to-return))
             (loop (cadr args-remaining) (cddr args-remaining) args-to-return)))
        (else (loop kwval (cdr args-remaining) (cons (car args-remaining) args-to-return))))))
 
+
+  (define (get-cli-arg arg #!key (default #f) (is-list #f))
+    (let* ((temp    (skim-cmdline-opts-withargs-by-regex arg)))
+      (if (> (length temp) 0)
+          (if is-list
+              temp
+              (car temp))
+          default)))
+
+  (define (get-cli-switch arg)
+    (let ((temp (skim-cmdline-opts-noarg-by-regex arg)))
+      (if (> (length temp) 0)
+          (car temp)
+          #f)))
+  
+
 
 
   ;; get command line switches (have a subsequent arg; eg. [-foo bar])
   ;;  assumes these are switches without arguments
   ;;  will return list of arguments to matches

ADDED   emacs.config
Index: emacs.config
==================================================================
--- /dev/null
+++ emacs.config
@@ -0,0 +1,13 @@
+;; Indenting module body code at column 0
+(defun scheme-module-indent (state indent-point normal-indent) 0)
+(put 'module 'scheme-indent-function 'scheme-module-indent)
+
+(put 'and-let* 'scheme-indent-function 1)
+(put 'parameterize 'scheme-indent-function 1)
+(put 'handle-exceptions 'scheme-indent-function 1)
+(put 'when 'scheme-indent-function 1)
+(put 'unless 'scheme-indent-function 1)
+(put 'match 'scheme-indent-function 1)
+(put 'let-values 'scheme-indent-function 1)
+
+

Index: env.scm
==================================================================
--- env.scm
+++ env.scm
@@ -1,31 +1,42 @@
 ;;======================================================================
 ;; Copyright 2006-2013, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 ;;======================================================================
 
 (declare (unit env))
 
 (use sql-de-lite) ;; srfi-1 posix regex regex-case srfi-69 srfi-18 call-with-environment-variables)
 
 (define (env:open-db fname)
-  (let* ((db-exists (file-exists? fname))
+  (let* ((db-exists (if (equal? fname ":memory:")
+			#f
+			(common:file-exists? fname)))
 	 (db        (open-database fname)))
     (if (not db-exists)
 	(begin
-	  (exec (sql db "CREATE TABLE envvars (
-                    id INTEGER PRIMARY KEY,
-                    context TEXT NOT NULL,
-                    var TEXT NOT NULL,
-                    val TEXT NOT NULL,
-                       CONSTRAINT envvars_constraint UNIQUE (context,var))"))))
+	  (exec (sql db "CREATE TABLE IF NOT EXISTS envvars (
+                            id INTEGER PRIMARY KEY,
+                            context TEXT NOT NULL,
+                            var TEXT NOT NULL,
+                            val TEXT NOT NULL,
+                               CONSTRAINT envvars_constraint UNIQUE (context,var))"))))
     (set-busy-handler! db (busy-timeout 10000))
     db))
 
 ;; save vars in given context, this is NOT incremental by default
 ;;
@@ -59,19 +70,42 @@
 	(for-each-row
 	 (lambda (row)
 	   (let ((var  (car row))
 		 (val  (cadr row)))
 	     (hash-table-set! result var 
-			      (if (and (hash-table-ref/default results var #f)
+			      (if (and (hash-table-ref/default result var #f)
 				       (assoc var paths)) ;; this var is a path and there is a previous path
 				  (let ((sep (cadr (assoc var paths))))
-				    (env:merge-path-envvar sep (hash-table-ref results var) valb))
-				  valb)))))
+				    (env:merge-path-envvar sep (hash-table-ref result var) val))
+				  val)))))
 	(sql db "SELECT var,val FROM envvars WHERE context=?")
 	context))
      contexts)
     result))
+
+;; envdelta: a-b (start=a, end=b, get the delta)
+;; ofile:    #f = write to stdout, else write to file with string name
+;;
+(define (env:envdelta db envdelta ofile)
+  (let ((match (string-split envdelta "-")));; (string-match "([a-z0-9_]+)=([a-z0-9_\\-,]+)" envdelta)))
+    (if (not (null? match))
+	(let* ((parts     match) ;; (string-split equn "-"))
+	       (minuend   (car parts))
+	       (subtraend (cadr parts))
+	       (added     (env:get-added   db minuend subtraend))
+	       (removed   (env:get-removed db minuend subtraend))
+	       (changed   (env:get-changed db minuend subtraend)))
+	  ;; (pp (hash-table->alist added))
+	  ;; (pp (hash-table->alist removed))
+	  ;; (pp (hash-table->alist changed))
+	  (if (args:get-arg "-o")
+	      (with-output-to-file
+		  (args:get-arg "-o")
+		(lambda ()
+		  (env:print added removed changed)))
+	      (env:print added removed changed)))
+	#f)))
 
 ;;  get list of removed variables between two contexts
 ;;
 (define (env:get-removed db contexta contextb)
   (let ((result (make-hash-table)))
@@ -108,11 +142,11 @@
       (lambda (row)
 	(let ((var  (car row))
 	      (val  (cadr row)))
 	  (hash-table-set! result var val))))
      (sql db "SELECT var,val FROM envvars AS a WHERE context=? AND val != (SELECT val FROM envvars WHERE var=a.var AND context=?)")
-     contexta contextb)
+     contextb contexta)
     result))
 
 ;;
 (define (env:blind-merge l1 l2)
   (if (null? l1) l2

ADDED   example/README
Index: example/README
==================================================================
--- /dev/null
+++ example/README
@@ -0,0 +1,21 @@
+;;======================================================================
+;; Copyright 2006-2012, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
+You can get the example from the Megatest tests fossil at:
+
+    http://www.kiatoa.com/fossils/megatest_qa

DELETED example/cfg/machines.dat
Index: example/cfg/machines.dat
==================================================================
--- example/cfg/machines.dat
+++ /dev/null
@@ -1,16 +0,0 @@
-[]
-[maxload]
-zeus 0.40000000000000002
-xena 0.20000000000000001
-myth2 0.01
-hades 1
-[minfree]
-zeus 1000
-xena 20000
-myth2 300000
-hades 4000000
-[reqprocs]
-zeus mfsmount mythbackend mfschunkserver
-xena mfsmount
-myth2 mfsmount mythfrontend mfschunkserver
-hades mfsmount mfsmetalogger mfschunkserver

DELETED example/cfg/sheet-names.cfg
Index: example/cfg/sheet-names.cfg
==================================================================
--- example/cfg/sheet-names.cfg
+++ /dev/null
@@ -1,1 +0,0 @@
-machines

DELETED example/cfg/sxml/_sheets.sxml
Index: example/cfg/sxml/_sheets.sxml
==================================================================
--- example/cfg/sxml/_sheets.sxml
+++ /dev/null
@@ -1,47 +0,0 @@
-((@ (http://www.w3.org/2001/XMLSchema-instance:schemaLocation
-      "http://www.gnumeric.org/v9.xsd"))
- (http://www.gnumeric.org/v10.dtd:Version
-   (@ (Minor "17") (Major "10") (Full "1.10.17") (Epoch "1")))
- (http://www.gnumeric.org/v10.dtd:Attributes
-   (http://www.gnumeric.org/v10.dtd:Attribute
-     (http://www.gnumeric.org/v10.dtd:type "4")
-     (http://www.gnumeric.org/v10.dtd:name
-       "WorkbookView::show_horizontal_scrollbar")
-     (http://www.gnumeric.org/v10.dtd:value "TRUE"))
-   (http://www.gnumeric.org/v10.dtd:Attribute
-     (http://www.gnumeric.org/v10.dtd:type "4")
-     (http://www.gnumeric.org/v10.dtd:name
-       "WorkbookView::show_vertical_scrollbar")
-     (http://www.gnumeric.org/v10.dtd:value "TRUE"))
-   (http://www.gnumeric.org/v10.dtd:Attribute
-     (http://www.gnumeric.org/v10.dtd:type "4")
-     (http://www.gnumeric.org/v10.dtd:name "WorkbookView::show_notebook_tabs")
-     (http://www.gnumeric.org/v10.dtd:value "TRUE"))
-   (http://www.gnumeric.org/v10.dtd:Attribute
-     (http://www.gnumeric.org/v10.dtd:type "4")
-     (http://www.gnumeric.org/v10.dtd:name "WorkbookView::do_auto_completion")
-     (http://www.gnumeric.org/v10.dtd:value "TRUE"))
-   (http://www.gnumeric.org/v10.dtd:Attribute
-     (http://www.gnumeric.org/v10.dtd:type "4")
-     (http://www.gnumeric.org/v10.dtd:name "WorkbookView::is_protected")
-     (http://www.gnumeric.org/v10.dtd:value "FALSE")))
- (urn:oasis:names:tc:opendocument:xmlns:office:1.0:document-meta
-   (@ (urn:oasis:names:tc:opendocument:xmlns:office:1.0:version "1.2"))
-   (urn:oasis:names:tc:opendocument:xmlns:office:1.0:meta
-     (http://purl.org/dc/elements/1.1/:date "2014-02-14T06:16:26Z")
-     (urn:oasis:names:tc:opendocument:xmlns:meta:1.0:creation-date
-       "2014-02-14T06:16:17Z")))
- (http://www.gnumeric.org/v10.dtd:Calculation
-   (@ (MaxIterations "100")
-      (ManualRecalc "0")
-      (IterationTolerance "0.001")
-      (FloatRadix "2")
-      (FloatDigits "53")
-      (EnableIteration "1")))
- (http://www.gnumeric.org/v10.dtd:SheetNameIndex
-   (http://www.gnumeric.org/v10.dtd:SheetName
-     (@ (http://www.gnumeric.org/v10.dtd:Rows "65536")
-        (http://www.gnumeric.org/v10.dtd:Cols "256"))
-     "machines"))
- (http://www.gnumeric.org/v10.dtd:Geometry (@ (Width "835") (Height "320")))
- (http://www.gnumeric.org/v10.dtd:UIData (@ (SelectedTab "0"))))

DELETED example/cfg/sxml/_workbook.sxml
Index: example/cfg/sxml/_workbook.sxml
==================================================================
--- example/cfg/sxml/_workbook.sxml
+++ /dev/null
@@ -1,1 +0,0 @@
-(*TOP* (*PI* xml "version=\"1.0\" encoding=\"UTF-8\""))

DELETED example/cfg/sxml/machines.sxml
Index: example/cfg/sxml/machines.sxml
==================================================================
--- example/cfg/sxml/machines.sxml
+++ /dev/null
@@ -1,105 +0,0 @@
-(http://www.gnumeric.org/v10.dtd:Sheet
-  (@ (Visibility "GNM_SHEET_VISIBILITY_VISIBLE")
-     (OutlineSymbolsRight "1")
-     (OutlineSymbolsBelow "1")
-     (HideZero "0")
-     (HideRowHeader "0")
-     (HideGrid "0")
-     (HideColHeader "0")
-     (GridColor "0:0:0")
-     (DisplayOutlines "1")
-     (DisplayFormulas "0"))
-  (http://www.gnumeric.org/v10.dtd:MaxCol "3")
-  (http://www.gnumeric.org/v10.dtd:MaxRow "4")
-  (http://www.gnumeric.org/v10.dtd:Zoom "1")
-  (http://www.gnumeric.org/v10.dtd:Names
-    (http://www.gnumeric.org/v10.dtd:Name
-      (http://www.gnumeric.org/v10.dtd:name "Print_Area")
-      (http://www.gnumeric.org/v10.dtd:value "#REF!")
-      (http://www.gnumeric.org/v10.dtd:position "A1"))
-    (http://www.gnumeric.org/v10.dtd:Name
-      (http://www.gnumeric.org/v10.dtd:name "Sheet_Title")
-      (http://www.gnumeric.org/v10.dtd:value "\"machines\"")
-      (http://www.gnumeric.org/v10.dtd:position "A1")))
-  (http://www.gnumeric.org/v10.dtd:PrintInformation
-    (http://www.gnumeric.org/v10.dtd:Margins
-      (http://www.gnumeric.org/v10.dtd:top (@ (PrefUnit "mm") (Points "120")))
-      (http://www.gnumeric.org/v10.dtd:bottom
-        (@ (PrefUnit "mm") (Points "120")))
-      (http://www.gnumeric.org/v10.dtd:left (@ (PrefUnit "mm") (Points "72")))
-      (http://www.gnumeric.org/v10.dtd:right (@ (PrefUnit "mm") (Points "72")))
-      (http://www.gnumeric.org/v10.dtd:header
-        (@ (PrefUnit "mm") (Points "72")))
-      (http://www.gnumeric.org/v10.dtd:footer
-        (@ (PrefUnit "mm") (Points "72"))))
-    (http://www.gnumeric.org/v10.dtd:Scale
-      (@ (type "percentage") (percentage "100")))
-    (http://www.gnumeric.org/v10.dtd:vcenter (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:hcenter (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:grid (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:even_if_only_styles (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:monochrome (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:draft (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:titles (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:do_not_print (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:print_range (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:order "d_then_r")
-    (http://www.gnumeric.org/v10.dtd:orientation "portrait")
-    (http://www.gnumeric.org/v10.dtd:Header
-      (@ (Right "") (Middle "&[TAB]") (Left "")))
-    (http://www.gnumeric.org/v10.dtd:Footer
-      (@ (Right "") (Middle "Page &[PAGE]") (Left "")))
-    (http://www.gnumeric.org/v10.dtd:paper "na_letter")
-    (http://www.gnumeric.org/v10.dtd:comments "in_place")
-    (http://www.gnumeric.org/v10.dtd:errors "as_displayed"))
-  (http://www.gnumeric.org/v10.dtd:Styles
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "0") (startCol "0") (endRow "65535") (endCol "255"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "0")
-           (Rotation "0")
-           (PatternColor "0:0:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "General")
-           (Fore "0:0:0")
-           (Back "FFFF:FFFF:FFFF"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "10")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans"))))
-  (http://www.gnumeric.org/v10.dtd:Cols
-    (@ (DefaultSizePts "48"))
-    (http://www.gnumeric.org/v10.dtd:ColInfo (@ (Unit "48") (No "0")))
-    (http://www.gnumeric.org/v10.dtd:ColInfo
-      (@ (Unit "52.5") (No "1") (HardSize "1")))
-    (http://www.gnumeric.org/v10.dtd:ColInfo (@ (Unit "48") (No "2")))
-    (http://www.gnumeric.org/v10.dtd:ColInfo
-      (@ (Unit "182.2") (No "3") (HardSize "1"))))
-  (http://www.gnumeric.org/v10.dtd:Rows
-    (@ (DefaultSizePts "12.75"))
-    (http://www.gnumeric.org/v10.dtd:RowInfo
-      (@ (Unit "13.5") (No "0") (Count "5"))))
-  (http://www.gnumeric.org/v10.dtd:Selections
-    (@ (CursorRow "4") (CursorCol "0"))
-    (http://www.gnumeric.org/v10.dtd:Selection
-      (@ (startRow "4") (startCol "0") (endRow "4") (endCol "0"))))
-  (http://www.gnumeric.org/v10.dtd:SheetLayout (@ (TopLeft "A1")))
-  (http://www.gnumeric.org/v10.dtd:Solver
-    (@ (ProgramR "0")
-       (ProblemType "0")
-       (NonNeg "1")
-       (ModelType "0")
-       (MaxTime "60")
-       (MaxIter "1000")
-       (Discr "0")
-       (AutoScale "0"))))

DELETED example/megatest.config
Index: example/megatest.config
==================================================================
--- example/megatest.config
+++ /dev/null
@@ -1,22 +0,0 @@
-[fields]
-CFG_TYPE This is the refdb to use.
-RUN_TYPE Can be: full or quick
-
-[setup]
-# Adjust max_concurrent_jobs to limit parallel jobs
-max_concurrent_jobs 50
-
-# This is your link path, best to set it and then not change it
-linktree #{getenv MT_RUN_AREA_HOME}/linktree
-
-# Job tools control how your jobs are launched
-[jobtools]
-launcher nbfake
-
-# As you run more tests you may need to add additional disks 
-# the names are arbitrary but must be unique
-[disks]
-disk0 #{getenv MT_RUN_AREA_HOME}/runs
-
-[include local.megatest.config]
-

DELETED example/runconfigs.config
Index: example/runconfigs.config
==================================================================
--- example/runconfigs.config
+++ /dev/null
@@ -1,9 +0,0 @@
-[default]
-ALLTESTS see this variable
-
-# Your variables here are grouped by targets [SYSTEM/RELEASE]
-[cfg/default]
-ANOTHERVAR only defined if target is SYSTEM_val/RELEASE_val
-
-[include local.runconfigs.config]
-

DELETED example/tests/diskspace/diskspace.logpro
Index: example/tests/diskspace/diskspace.logpro
==================================================================
--- example/tests/diskspace/diskspace.logpro
+++ /dev/null
@@ -1,6 +0,0 @@
-;; Analyze the output from diskspace.sh
-;;
-(expect:error in    "LogFileBody" = 0 "Insufficient space" #/ERROR: available space is less/)
-(expect:error in    "LogFileBody" = 0 "Any error"         #/err/i)
-(expect:required in "LogFileBody" > 1 "Sucess signature"  #/INFO: space available/)
-

DELETED example/tests/diskspace/diskspace.sh
Index: example/tests/diskspace/diskspace.sh
==================================================================
--- example/tests/diskspace/diskspace.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash -e
-
-filter=`refdb lookup $MT_RUN_AREA_HOME/$CFG_TYPE machines $TARGETHOST filter`
-
-echo "Using filter: $filter"
-
-diskareas=`mount | egrep 'ext|mfs|nfs'| egrep -v "$filter" | awk '{print $3}'`
-
-for dirname in $diskareas;do
-
-    echo "dirname: $dirname"
-
-    # measure the free space
-    freespace=`df -P -k $dirname | grep $dirname | awk '{print $4}'`
-
-    # get the minfree allowed from the refdb
-    minfree=`refdb lookup $MT_RUN_AREA_HOME/$CFG_TYPE machines $TARGETHOST minfree`
-
-    if [[ "$freespace" -lt "$minfree" ]];then
-	echo "ERROR: available space $freespace is less than minimum allowed of $minfree on $dirname"
-    else
-	echo "INFO: space available of $freespace k on $dirname meets required minimum of $minfree."
-    fi
-done

DELETED example/tests/diskspace/hostname.logpro
Index: example/tests/diskspace/hostname.logpro
==================================================================
--- example/tests/diskspace/hostname.logpro
+++ /dev/null
@@ -1,4 +0,0 @@
-(define hostname (get-host-name))
-
-(expect:required in "LogFileBody" > 0 (conc "Hostname matches " hostname) (regexp (conc "^" hostname "$")))
-

DELETED example/tests/diskspace/testconfig
Index: example/tests/diskspace/testconfig
==================================================================
--- example/tests/diskspace/testconfig
+++ /dev/null
@@ -1,12 +0,0 @@
-# Add steps here. Format is "stepname script"
-[ezsteps]
-hostname  hostname
-diskspace diskspace.sh
-
-[requirements]
-waiton ping
-mode itemwait
-
-# Iteration for your tests are controlled by the items section
-[items]
-TARGETHOST [system refdb getrownames $CFG_TYPE machines]

DELETED example/tests/ping/ping.logpro
Index: example/tests/ping/ping.logpro
==================================================================
--- example/tests/ping/ping.logpro
+++ /dev/null
@@ -1,3 +0,0 @@
-(expect:error in    "LogFileBody" = 0 "Any error"         #/err/i)
-(expect:required in "LogFileBody" = 5 "Successful pings"  #/bytes from.*/)
-

DELETED example/tests/ping/testconfig
Index: example/tests/ping/testconfig
==================================================================
--- example/tests/ping/testconfig
+++ /dev/null
@@ -1,7 +0,0 @@
-# Add steps here. Format is "stepname script"
-[ezsteps]
-ping ping -c 5 $PINGHOST
-
-# Iteration for your tests are controlled by the items section
-[items]
-PINGHOST [system refdb getrownames $CFG_TYPE machines]

ADDED   example2/rx.v
Index: example2/rx.v
==================================================================
--- /dev/null
+++ example2/rx.v
@@ -0,0 +1,649 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// Filename: 	rxuartlite.v
+//
+// Project:	wbuart32, a full featured UART with simulator
+//
+// Purpose:	Receive and decode inputs from a single UART line.
+//
+//
+//	To interface with this module, connect it to your system clock,
+//	and a UART input.  Set the parameter to the number of clocks per
+//	baud.  When data becomes available, the o_wr line will be asserted
+//	for one clock cycle.
+//
+//	This interface only handles 8N1 serial port communications.  It does
+//	not handle the break, parity, or frame error conditions.
+//
+//
+// Creator:	Dan Gisselquist, Ph.D.
+//		Gisselquist Technology, LLC
+//
+////////////////////////////////////////////////////////////////////////////////
+//
+// Copyright (C) 2015-2020, Gisselquist Technology, LLC
+//
+// This program is free software (firmware): you can redistribute it and/or
+// modify it under the terms of the GNU General Public License as published
+// by the Free Software Foundation, either version 3 of the License, or (at
+// your option) any later version.
+//
+// This program is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTIBILITY or
+// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+// for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with this program.  (It's in the $(ROOT)/doc directory.  Run make with no
+// target there if the PDF file isn't present.)  If not, see
+//  for a copy.
+//
+// License:	GPL, v3, as defined and found on www.gnu.org,
+//		http://www.gnu.org/licenses/gpl.html
+//
+//
+////////////////////////////////////////////////////////////////////////////////
+//
+//
+`default_nettype	none
+//
+`define	RXUL_BIT_ZERO		4'h0
+`define	RXUL_BIT_ONE		4'h1
+`define	RXUL_BIT_TWO		4'h2
+`define	RXUL_BIT_THREE		4'h3
+`define	RXUL_BIT_FOUR		4'h4
+`define	RXUL_BIT_FIVE		4'h5
+`define	RXUL_BIT_SIX		4'h6
+`define	RXUL_BIT_SEVEN		4'h7
+`define	RXUL_STOP		4'h8
+`define	RXUL_WAIT		4'h9
+`define	RXUL_IDLE		4'hf
+
+module rxuartlite(i_clk, i_uart_rx, o_wr, o_data);
+	parameter			TIMER_BITS = 10;
+`ifdef	FORMAL
+	parameter  [(TIMER_BITS-1):0]	CLOCKS_PER_BAUD = 16; // Necessary for formal proof
+`else
+	parameter  [(TIMER_BITS-1):0]	CLOCKS_PER_BAUD = 868;	// 115200 MBaud at 100MHz
+`endif
+	localparam			TB = TIMER_BITS;
+	input	wire		i_clk;
+	input	wire		i_uart_rx;
+	output	reg		o_wr;
+	output	reg	[7:0]	o_data;
+
+
+	wire	[(TB-1):0]	half_baud;
+	reg	[3:0]		state;
+
+	assign	half_baud = { 1'b0, CLOCKS_PER_BAUD[(TB-1):1] };
+	reg	[(TB-1):0]	baud_counter;
+	reg			zero_baud_counter;
+
+
+	// Since this is an asynchronous receiver, we need to register our
+	// input a couple of clocks over to avoid any problems with 
+	// metastability.  We do that here, and then ignore all but the
+	// ck_uart wire.
+	reg	q_uart, qq_uart, ck_uart;
+	initial	q_uart  = 1'b1;
+	initial	qq_uart = 1'b1;
+	initial	ck_uart = 1'b1;
+	always @(posedge i_clk)
+		{ ck_uart, qq_uart, q_uart } <= { qq_uart, q_uart, i_uart_rx };
+
+	// Keep track of the number of clocks since the last change.
+	//
+	// This is used to determine if we are in either a break or an idle
+	// condition, as discussed further below.
+	reg	[(TB-1):0]	chg_counter;
+	initial	chg_counter = {(TB){1'b1}};
+	always @(posedge i_clk)
+	if (qq_uart != ck_uart)
+		chg_counter <= 0;
+	else if (chg_counter != { (TB){1'b1} })
+		chg_counter <= chg_counter + 1;
+
+	// Are we in the middle of a baud iterval?  Specifically, are we
+	// in the middle of a start bit?  Set this to high if so.  We'll use
+	// this within our state machine to transition out of the IDLE
+	// state.
+	reg	half_baud_time;
+	initial	half_baud_time = 0;
+	always @(posedge i_clk)
+		half_baud_time <= (!ck_uart)&&(chg_counter >= half_baud-1'b1-1'b1);
+
+
+	initial	state = `RXUL_IDLE;
+	always @(posedge i_clk)
+	if (state == `RXUL_IDLE)
+	begin // Idle state, independent of baud counter
+		// By default, just stay in the IDLE state
+		state <= `RXUL_IDLE;
+		if ((!ck_uart)&&(half_baud_time))
+			// UNLESS: We are in the center of a valid
+			// start bit
+			state <= `RXUL_BIT_ZERO;
+	end else if ((state >= `RXUL_WAIT)&&(ck_uart))
+		state <= `RXUL_IDLE;
+	else if (zero_baud_counter)
+	begin
+		if (state <= `RXUL_STOP)
+			// Data arrives least significant bit first.
+			// By the time this is clocked in, it's what
+			// you'll have.
+			state <= state + 1;
+	end
+
+	// Data bit capture logic.
+	//
+	// This is drastically simplified from the state machine above, based
+	// upon: 1) it doesn't matter what it is until the end of a captured
+	// byte, and 2) the data register will flush itself of any invalid
+	// data in all other cases.  Hence, let's keep it real simple.
+	reg	[7:0]	data_reg;
+	always @(posedge i_clk)
+	if ((zero_baud_counter)&&(state != `RXUL_STOP))
+		data_reg <= { qq_uart, data_reg[7:1] };
+
+	// Our data bit logic doesn't need nearly the complexity of all that
+	// work above.  Indeed, we only need to know if we are at the end of
+	// a stop bit, in which case we copy the data_reg into our output
+	// data register, o_data, and tell others (for one clock) that data is
+	// available.
+	//
+	initial	o_wr = 1'b0;
+	initial	o_data = 8'h00;
+	always @(posedge i_clk)
+	if ((zero_baud_counter)&&(state == `RXUL_STOP)&&(ck_uart))
+	begin
+		o_wr   <= 1'b1;
+		o_data <= data_reg;
+	end else
+		o_wr   <= 1'b0;
+
+	// The baud counter
+	//
+	// This is used as a "clock divider" if you will, but the clock needs
+	// to be reset before any byte can be decoded.  In all other respects,
+	// we set ourselves up for CLOCKS_PER_BAUD counts between baud
+	// intervals.
+	initial	baud_counter = 0;
+	always @(posedge i_clk)
+	if (((state==`RXUL_IDLE))&&(!ck_uart)&&(half_baud_time))
+		baud_counter <= CLOCKS_PER_BAUD-1'b1;
+	else if (state == `RXUL_WAIT)
+		baud_counter <= 0;
+	else if ((zero_baud_counter)&&(state < `RXUL_STOP))
+		baud_counter <= CLOCKS_PER_BAUD-1'b1;
+	else if (!zero_baud_counter)
+		baud_counter <= baud_counter-1'b1;
+
+	// zero_baud_counter
+	//
+	// Rather than testing whether or not (baud_counter == 0) within our
+	// (already too complicated) state transition tables, we use
+	// zero_baud_counter to pre-charge that test on the clock
+	// before--cleaning up some otherwise difficult timing dependencies.
+	initial	zero_baud_counter = 1'b1;
+	always @(posedge i_clk)
+	if ((state == `RXUL_IDLE)&&(!ck_uart)&&(half_baud_time))
+		zero_baud_counter <= 1'b0;
+	else if (state == `RXUL_WAIT)
+		zero_baud_counter <= 1'b1;
+	else if ((zero_baud_counter)&&(state < `RXUL_STOP))
+		zero_baud_counter <= 1'b0;
+	else if (baud_counter == 1)
+		zero_baud_counter <= 1'b1;
+
+`ifdef	FORMAL
+`define	FORMAL_VERILATOR
+`else
+`ifdef	VERILATOR
+`define	FORMAL_VERILATOR
+`endif
+`endif
+
+`ifdef	FORMAL
+`define ASSUME	assume
+`define ASSERT	assert
+`ifdef	VERIFIC
+	(* gclk *) wire	gbl_clk;
+	global clocking @(posedge gbl_clk); endclocking
+`endif
+
+
+	localparam	F_CKRES = 10;
+
+	(* anyseq *) wire	f_tx_start;
+	(* anyconst *) wire	[(F_CKRES-1):0]	f_tx_step;
+	reg			f_tx_zclk;
+	reg	[(TB-1):0]	f_tx_timer;
+	wire	[7:0]		f_rx_newdata;
+	reg	[(TB-1):0]	f_tx_baud;
+	wire			f_tx_zbaud;
+
+	wire	[(TB-1):0]	f_max_baud_difference;
+	reg	[(TB-1):0]	f_baud_difference;
+	reg	[(TB+3):0]	f_tx_count, f_rx_count;
+	(* anyseq *) wire	[7:0]		f_tx_data;
+
+
+
+	wire			f_txclk;
+	reg	[1:0]		f_rx_clock;
+	reg	[(F_CKRES-1):0]	f_tx_clock;
+	reg			f_past_valid, f_past_valid_tx;
+
+	initial	f_past_valid = 1'b0;
+	always @(posedge i_clk)
+		f_past_valid <= 1'b1;
+
+	initial	f_rx_clock = 3'h0;
+	always @($global_clock)
+		f_rx_clock <= f_rx_clock + 1'b1;
+
+	always @(*)
+		assume(i_clk == f_rx_clock[1]);
+	///////////////////////////////////////////////////////////
+	//
+	//
+	// Generate a transmitted signal
+	//
+	//
+	///////////////////////////////////////////////////////////
+	// First, calculate the transmit clock
+	localparam [(F_CKRES-1):0] F_MIDSTEP = { 2'b01, {(F_CKRES-2){1'b0}} };
+	//
+	// Need to allow us to slip by half a baud clock over 10 baud intervals
+	//
+	// (F_STEP / (2^F_CKRES)) * (CLOCKS_PER_BAUD)*10 < CLOCKS_PER_BAUD/2
+	// F_STEP * 2 * 10 < 2^F_CKRES
+	localparam [(F_CKRES-1):0] F_HALFSTEP= F_MIDSTEP/32;
+	localparam [(F_CKRES-1):0] F_MINSTEP = F_MIDSTEP - F_HALFSTEP + 1;
+	localparam [(F_CKRES-1):0] F_MAXSTEP = F_MIDSTEP + F_HALFSTEP - 1;
+	initial assert(F_MINSTEP <= F_MIDSTEP);
+	initial assert(F_MIDSTEP <= F_MAXSTEP);
+	//	assume((f_tx_step >= F_MINSTEP)&&(f_tx_step <= F_MAXSTEP));
+	//
+	//
+	always @(*) assume((f_tx_step == F_MINSTEP)
+			||(f_tx_step == F_MIDSTEP)
+			||(f_tx_step == F_MAXSTEP));
+	always @($global_clock)
+		f_tx_clock <= f_tx_clock + f_tx_step;
+	assign	f_txclk = f_tx_clock[F_CKRES-1];
+	// 
+	initial	f_past_valid_tx = 1'b0;
+	always @(posedge f_txclk)
+		f_past_valid_tx <= 1'b1;
+	initial	assume(i_uart_rx);
+	//////////////////////////////////////////////
+	//
+	//
+	// Build a simulated transmitter
+	//
+	//
+	//////////////////////////////////////////////
+	//
+	// First, the simulated timing generator
+	// parameter	TIMER_BITS = 10;
+	// parameter [(TIMER_BITS-1):0] CLOCKS_PER_BAUD = 868;
+	// localparam	TB = TIMER_BITS;
+	always @(*)
+	if (f_tx_busy)
+		assume(!f_tx_start);
+	initial	f_tx_baud = 0;
+	always @(posedge f_txclk)
+	if ((f_tx_zbaud)&&((f_tx_busy)||(f_tx_start)))
+		f_tx_baud <= CLOCKS_PER_BAUD-1'b1;
+	else if (!f_tx_zbaud)
+		f_tx_baud <= f_tx_baud - 1'b1;
+	always @(*)
+		`ASSERT(f_tx_baud < CLOCKS_PER_BAUD);
+	always @(*)
+	if (!f_tx_busy)
+		`ASSERT(f_tx_baud == 0);
+	assign	f_tx_zbaud = (f_tx_baud == 0);
+	// But only if we aren't busy
+	initial	assume(f_tx_data == 0);
+	always @(posedge f_txclk)
+	if ((!f_tx_zbaud)||(f_tx_busy)||(!f_tx_start))
+		assume(f_tx_data == $past(f_tx_data));
+	// Force the data to change on a clock only
+	always @($global_clock)
+	if ((f_past_valid)&&(!$rose(f_txclk)))
+		assume($stable(f_tx_data));
+	else if (f_tx_busy)
+		assume($stable(f_tx_data));
+	//
+	always @($global_clock)
+	if ((!f_past_valid)||(!$rose(f_txclk)))
+	begin
+		assume($stable(f_tx_start));
+		assume($stable(f_tx_data));
+	end
+	//
+	//
+	//
+	reg	[9:0]	f_tx_reg;
+	reg		f_tx_busy;
+	// Here's the transmitter itself (roughly)
+	initial	f_tx_busy   = 1'b0;
+	initial	f_tx_reg    = 0;
+	always @(posedge f_txclk)
+	if (!f_tx_zbaud)
+	begin
+		`ASSERT(f_tx_busy);
+	end else begin
+		f_tx_reg  <= { 1'b0, f_tx_reg[9:1] };
+		if (f_tx_start)
+			f_tx_reg <= { 1'b1, f_tx_data, 1'b0 };
+	end
+	// Create a busy flag that we'll use
+	always @(*)
+	if (!f_tx_zbaud)
+		f_tx_busy <= 1'b1;
+	else if (|f_tx_reg)
+		f_tx_busy <= 1'b1;
+	else
+		f_tx_busy <= 1'b0;
+	//
+	// Tie the TX register to the TX data
+	always @(posedge f_txclk)
+	if (f_tx_reg[9])
+		`ASSERT(f_tx_reg[8:0] == { f_tx_data, 1'b0 });
+	else if (f_tx_reg[8])
+		`ASSERT(f_tx_reg[7:0] == f_tx_data[7:0] );
+	else if (f_tx_reg[7])
+		`ASSERT(f_tx_reg[6:0] == f_tx_data[7:1] );
+	else if (f_tx_reg[6])
+		`ASSERT(f_tx_reg[5:0] == f_tx_data[7:2] );
+	else if (f_tx_reg[5])
+		`ASSERT(f_tx_reg[4:0] == f_tx_data[7:3] );
+	else if (f_tx_reg[4])
+		`ASSERT(f_tx_reg[3:0] == f_tx_data[7:4] );
+	else if (f_tx_reg[3])
+		`ASSERT(f_tx_reg[2:0] == f_tx_data[7:5] );
+	else if (f_tx_reg[2])
+		`ASSERT(f_tx_reg[1:0] == f_tx_data[7:6] );
+	else if (f_tx_reg[1])
+		`ASSERT(f_tx_reg[0] == f_tx_data[7]);
+	// Our counter since we start
+	initial	f_tx_count = 0;
+	always @(posedge f_txclk)
+	if (!f_tx_busy)
+		f_tx_count <= 0;
+	else
+		f_tx_count <= f_tx_count + 1'b1;
+	always @(*)
+	if (f_tx_reg == 10'h0)
+		assume(i_uart_rx);
+	else
+		assume(i_uart_rx == f_tx_reg[0]);
+	//
+	// Make sure the absolute transmit clock timer matches our state
+	//
+	always @(posedge f_txclk)
+	if (!f_tx_busy)
+	begin
+		if ((!f_past_valid_tx)||(!$past(f_tx_busy)))
+			`ASSERT(f_tx_count == 0);
+	end else if (f_tx_reg[9])
+		`ASSERT(f_tx_count ==
+				    CLOCKS_PER_BAUD -1 -f_tx_baud);
+	else if (f_tx_reg[8])
+		`ASSERT(f_tx_count ==
+				2 * CLOCKS_PER_BAUD -1 -f_tx_baud);
+	else if (f_tx_reg[7])
+		`ASSERT(f_tx_count ==
+				3 * CLOCKS_PER_BAUD -1 -f_tx_baud);
+	else if (f_tx_reg[6])
+		`ASSERT(f_tx_count ==
+				4 * CLOCKS_PER_BAUD -1 -f_tx_baud);
+	else if (f_tx_reg[5])
+		`ASSERT(f_tx_count ==
+				5 * CLOCKS_PER_BAUD -1 -f_tx_baud);
+	else if (f_tx_reg[4])
+		`ASSERT(f_tx_count ==
+				6 * CLOCKS_PER_BAUD -1 -f_tx_baud);
+	else if (f_tx_reg[3])
+		`ASSERT(f_tx_count ==
+				7 * CLOCKS_PER_BAUD -1 -f_tx_baud);
+	else if (f_tx_reg[2])
+		`ASSERT(f_tx_count ==
+				8 * CLOCKS_PER_BAUD -1 -f_tx_baud);
+	else if (f_tx_reg[1])
+		`ASSERT(f_tx_count ==
+				9 * CLOCKS_PER_BAUD -1 -f_tx_baud);
+	else if (f_tx_reg[0])
+		`ASSERT(f_tx_count ==
+				10 * CLOCKS_PER_BAUD -1 -f_tx_baud);
+	else
+		`ASSERT(f_tx_count ==
+				11 * CLOCKS_PER_BAUD -1 -f_tx_baud);
+	///////////////////////////////////////
+	//
+	// Receiver
+	//
+	///////////////////////////////////////
+	//
+	// Count RX clocks since the start of the first stop bit, measured in
+	// rx clocks
+	initial	f_rx_count = 0;
+	always @(posedge i_clk)
+	if (state == `RXUL_IDLE)
+		f_rx_count = (!ck_uart) ? (chg_counter+2) : 0;
+	else
+		f_rx_count <= f_rx_count + 1'b1;
+	always @(posedge i_clk)
+	if (state == 0)
+		`ASSERT(f_rx_count
+				== half_baud + (CLOCKS_PER_BAUD-baud_counter));
+	else if (state == 1)
+		`ASSERT(f_rx_count == half_baud + 2 * CLOCKS_PER_BAUD
+					- baud_counter);
+	else if (state == 2)
+		`ASSERT(f_rx_count == half_baud + 3 * CLOCKS_PER_BAUD
+					- baud_counter);
+	else if (state == 3)
+		`ASSERT(f_rx_count == half_baud + 4 * CLOCKS_PER_BAUD
+					- baud_counter);
+	else if (state == 4)
+		`ASSERT(f_rx_count == half_baud + 5 * CLOCKS_PER_BAUD
+					- baud_counter);
+	else if (state == 5)
+		`ASSERT(f_rx_count == half_baud + 6 * CLOCKS_PER_BAUD
+					- baud_counter);
+	else if (state == 6)
+		`ASSERT(f_rx_count == half_baud + 7 * CLOCKS_PER_BAUD
+					- baud_counter);
+	else if (state == 7)
+		`ASSERT(f_rx_count == half_baud + 8 * CLOCKS_PER_BAUD
+					- baud_counter);
+	else if (state == 8)
+		`ASSERT((f_rx_count == half_baud + 9 * CLOCKS_PER_BAUD
+					- baud_counter)
+			||(f_rx_count == half_baud + 10 * CLOCKS_PER_BAUD
+					- baud_counter));
+	always @(*)
+		`ASSERT( ((!zero_baud_counter)
+				&&(state == `RXUL_IDLE)
+				&&(baud_counter == 0))
+			||((zero_baud_counter)&&(baud_counter == 0))
+			||((!zero_baud_counter)&&(baud_counter != 0)));
+	always @(posedge i_clk)
+	if (!f_past_valid)
+		`ASSERT((state == `RXUL_IDLE)&&(baud_counter == 0)
+			&&(zero_baud_counter));
+	always @(*)
+	begin
+		`ASSERT({ ck_uart,qq_uart,q_uart,i_uart_rx } != 4'h2);
+		`ASSERT({ ck_uart,qq_uart,q_uart,i_uart_rx } != 4'h4);
+		`ASSERT({ ck_uart,qq_uart,q_uart,i_uart_rx } != 4'h5);
+		`ASSERT({ ck_uart,qq_uart,q_uart,i_uart_rx } != 4'h6);
+		`ASSERT({ ck_uart,qq_uart,q_uart,i_uart_rx } != 4'h9);
+		`ASSERT({ ck_uart,qq_uart,q_uart,i_uart_rx } != 4'ha);
+		`ASSERT({ ck_uart,qq_uart,q_uart,i_uart_rx } != 4'hb);
+		`ASSERT({ ck_uart,qq_uart,q_uart,i_uart_rx } != 4'hd);
+	end
+	always @(posedge i_clk)
+	if ((f_past_valid)&&($past(state) >= `RXUL_WAIT)&&($past(ck_uart)))
+		`ASSERT(state == `RXUL_IDLE);
+	always @(posedge i_clk)
+	if ((f_past_valid)&&($past(state) >= `RXUL_WAIT)
+			&&(($past(state) != `RXUL_IDLE)||(state == `RXUL_IDLE)))
+		`ASSERT(zero_baud_counter);
+	// Calculate an absolute value of the difference between the two baud
+	// clocks
+	always @(posedge i_clk)
+	if ((f_past_valid)&&($past(state)==`RXUL_IDLE)&&(state == `RXUL_IDLE))
+	begin
+		`ASSERT(($past(ck_uart))
+			||(chg_counter <=
+				{ 1'b0, CLOCKS_PER_BAUD[(TB-1):1] }));
+	end
+	always @(posedge f_txclk)
+	if (!f_past_valid_tx)
+		`ASSERT((state == `RXUL_IDLE)&&(baud_counter == 0)
+			&&(zero_baud_counter)&&(!f_tx_busy));
+	wire	[(TB+3):0]	f_tx_count_two_clocks_ago;
+	assign	f_tx_count_two_clocks_ago = f_tx_count - 2;
+	always @(*)
+	if (f_tx_count >= f_rx_count + 2)
+		f_baud_difference = f_tx_count_two_clocks_ago - f_rx_count;
+	else
+		f_baud_difference = f_rx_count - f_tx_count_two_clocks_ago;
+	localparam	F_SYNC_DLY = 8;
+	reg	[(TB+4+F_CKRES-1):0]	f_sub_baud_difference;
+	reg	[F_CKRES-1:0]	ck_tx_clock;
+	reg	[((F_SYNC_DLY-1)*F_CKRES)-1:0]	q_tx_clock;
+	reg	[TB+3:0]	ck_tx_count;
+	reg	[(F_SYNC_DLY-1)*(TB+4)-1:0]	q_tx_count;
+	initial	q_tx_count = 0;
+	initial	ck_tx_count = 0;
+	initial	q_tx_clock = 0;
+	initial	ck_tx_clock = 0;
+	always @($global_clock)
+		{ ck_tx_clock, q_tx_clock } <= { q_tx_clock, f_tx_clock };
+	always @($global_clock)
+		{ ck_tx_count, q_tx_count } <= { q_tx_count, f_tx_count };
+	reg	[TB+4+F_CKRES-1:0]	f_ck_tx_time, f_rx_time;
+	always @(*)
+		f_ck_tx_time = { ck_tx_count, !ck_tx_clock[F_CKRES-1],
+						ck_tx_clock[F_CKRES-2:0] };
+	always @(*)
+		f_rx_time = { f_rx_count, !f_rx_clock[1], f_rx_clock[0],
+						{(F_CKRES-2){1'b0}} };
+	reg	[TB+4+F_CKRES-1:0]	f_signed_difference;
+	always @(*)
+		f_signed_difference = f_ck_tx_time - f_rx_time;
+	always @(*)
+	if (f_signed_difference[TB+4+F_CKRES-1])
+		f_sub_baud_difference = -f_signed_difference;
+	else
+		f_sub_baud_difference =  f_signed_difference;
+	always @($global_clock)
+	if (state == `RXUL_WAIT)
+		`ASSERT((!f_tx_busy)||(f_tx_reg[9:1] == 0));
+	always @($global_clock)
+	if (state == `RXUL_IDLE)
+	begin
+		`ASSERT((!f_tx_busy)||(f_tx_reg[9])||(f_tx_reg[9:1]==0));
+		if (!ck_uart)
+			;//`PHASE_TWO_ASSERT((f_rx_count < 4)||(f_sub_baud_difference <= ((CLOCKS_PER_BAUD< 6))
+		// assert(i_uart_rx == ck_uart);
+	// Make sure the data register matches
+	always @(posedge i_clk)
+	// if ((f_past_valid)&&(state != $past(state)))
+	begin
+		if (state == 4'h0)
+			`ASSERT(!data_reg[7]);
+		if (state == 4'h1)
+			`ASSERT((data_reg[7]
+				== $past(f_tx_data[0]))&&(!data_reg[6]));
+		if (state == 4'h2)
+			`ASSERT(data_reg[7:6]
+					== $past(f_tx_data[1:0]));
+		if (state == 4'h3)
+			`ASSERT(data_reg[7:5] == $past(f_tx_data[2:0]));
+		if (state == 4'h4)
+			`ASSERT(data_reg[7:4] == $past(f_tx_data[3:0]));
+		if (state == 4'h5)
+			`ASSERT(data_reg[7:3] == $past(f_tx_data[4:0]));
+		if (state == 4'h6)
+			`ASSERT(data_reg[7:2] == $past(f_tx_data[5:0]));
+		if (state == 4'h7)
+			`ASSERT(data_reg[7:1] == $past(f_tx_data[6:0]));
+		if (state == 4'h8)
+			`ASSERT(data_reg[7:0] == $past(f_tx_data[7:0]));
+	end
+	////////////////////////////////////////////////////////////////////////
+	//
+	// Cover properties
+	//
+	////////////////////////////////////////////////////////////////////////
+	//
+	always @(posedge i_clk)
+		cover(o_wr); // Step 626, takes about 20mins
+	always @(posedge i_clk)
+	begin
+		cover(!ck_uart);
+		cover((f_past_valid)&&($rose(ck_uart)));               //  82
+		cover((zero_baud_counter)&&(state == `RXUL_BIT_ZERO)); // 110
+		cover((zero_baud_counter)&&(state == `RXUL_BIT_ONE));  // 174
+		cover((zero_baud_counter)&&(state == `RXUL_BIT_TWO));  // 238
+		cover((zero_baud_counter)&&(state == `RXUL_BIT_THREE));// 302
+		cover((zero_baud_counter)&&(state == `RXUL_BIT_FOUR)); // 366
+		cover((zero_baud_counter)&&(state == `RXUL_BIT_FIVE)); // 430
+		cover((zero_baud_counter)&&(state == `RXUL_BIT_SIX));  // 494
+		cover((zero_baud_counter)&&(state == `RXUL_BIT_SEVEN));// 558
+		cover((zero_baud_counter)&&(state == `RXUL_STOP));     // 622
+		cover((zero_baud_counter)&&(state == `RXUL_WAIT));     // 626
+	end
+`endif
+`ifdef	FORMAL_VERILATOR
+	// FORMAL properties which can be tested via Verilator as well as
+	// Yosys FORMAL
+	always @(*)
+		assert((state == 4'hf)||(state <= `RXUL_WAIT));
+	always @(*)
+		assert(zero_baud_counter == (baud_counter == 0)? 1'b1:1'b0);
+	always @(*)
+		assert(baud_counter <= CLOCKS_PER_BAUD-1'b1);
+`endif
+endmodule

ADDED   example2/tx.v
Index: example2/tx.v
==================================================================
--- /dev/null
+++ example2/tx.v
@@ -0,0 +1,434 @@
+
+////////////////////////////////////////////////////////////////////////////////
+//
+// Filename: 	txuartlite.v
+//
+// Project:	wbuart32, a full featured UART with simulator
+//
+// Purpose:	Transmit outputs over a single UART line.  This particular UART
+//		implementation has been extremely simplified: it does not handle
+//	generating break conditions, nor does it handle anything other than the
+//	8N1 (8 data bits, no parity, 1 stop bit) UART sub-protocol.
+//
+//	To interface with this module, connect it to your system clock, and
+//	pass it the byte of data you wish to transmit.  Strobe the i_wr line
+//	high for one cycle, and your data will be off.  Wait until the 'o_busy'
+//	line is low before strobing the i_wr line again--this implementation
+//	has NO BUFFER, so strobing i_wr while the core is busy will just
+//	get ignored.  The output will be placed on the o_txuart output line.
+//
+//	(I often set both data and strobe on the same clock, and then just leave
+//	them set until the busy line is low.  Then I move on to the next piece
+//	of data.)
+//
+// Creator:	Dan Gisselquist, Ph.D.
+//		Gisselquist Technology, LLC
+//
+////////////////////////////////////////////////////////////////////////////////
+//
+// Copyright (C) 2015-2020, Gisselquist Technology, LLC
+//
+// This program is free software (firmware): you can redistribute it and/or
+// modify it under the terms of the GNU General Public License as published
+// by the Free Software Foundation, either version 3 of the License, or (at
+// your option) any later version.
+//
+// This program is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTIBILITY or
+// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+// for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with this program.  (It's in the $(ROOT)/doc directory.  Run make with no
+// target there if the PDF file isn't present.)  If not, see
+//  for a copy.
+//
+// License:	GPL, v3, as defined and found on www.gnu.org,
+//		http://www.gnu.org/licenses/gpl.html
+//
+//
+////////////////////////////////////////////////////////////////////////////////
+//
+//
+`default_nettype	none
+//
+`define	TXUL_BIT_ZERO	4'h0
+`define	TXUL_BIT_ONE	4'h1
+`define	TXUL_BIT_TWO	4'h2
+`define	TXUL_BIT_THREE	4'h3
+`define	TXUL_BIT_FOUR	4'h4
+`define	TXUL_BIT_FIVE	4'h5
+`define	TXUL_BIT_SIX	4'h6
+`define	TXUL_BIT_SEVEN	4'h7
+`define	TXUL_STOP	4'h8
+`define	TXUL_IDLE	4'hf
+//
+//
+module txuartlite(i_clk, i_wr, i_data, o_uart_tx, o_busy);
+	parameter	[4:0]	TIMING_BITS = 5'd24;
+	localparam		TB = TIMING_BITS;
+	parameter	[(TB-1):0]	CLOCKS_PER_BAUD = 8; // 24'd868;
+	input	wire		i_clk;
+	input	wire		i_wr;
+	input	wire	[7:0]	i_data;
+	// And the UART input line itself
+	output	reg		o_uart_tx;
+	// A line to tell others when we are ready to accept data.  If
+	// (i_wr)&&(!o_busy) is ever true, then the core has accepted a byte
+	// for transmission.
+	output	wire		o_busy;
+
+	reg	[(TB-1):0]	baud_counter;
+	reg	[3:0]	state;
+	reg	[7:0]	lcl_data;
+	reg		r_busy, zero_baud_counter;
+
+	// Big state machine controlling: r_busy, state
+	// {{{
+	//
+	initial	r_busy = 1'b1;
+	initial	state  = `TXUL_IDLE;
+	always @(posedge i_clk)
+	begin
+		if (!zero_baud_counter)
+			// r_busy needs to be set coming into here
+			r_busy <= 1'b1;
+		else if (state > `TXUL_STOP)	// STATE_IDLE
+		begin
+			state <= `TXUL_IDLE;
+			r_busy <= 1'b0;
+			if ((i_wr)&&(!r_busy))
+			begin	// Immediately start us off with a start bit
+				r_busy <= 1'b1;
+				state <= `TXUL_BIT_ZERO;
+			end
+		end else begin
+			// One clock tick in each of these states ...
+			r_busy <= 1'b1;
+			if (state <=`TXUL_STOP) // start bit, 8-d bits, stop-b
+				state <= state + 1'b1;
+			else
+				state <= `TXUL_IDLE;
+		end
+	end
+	// }}}
+
+	// o_busy
+	// {{{
+	//
+	// This is a wire, designed to be true is we are ever busy above.
+	// originally, this was going to be true if we were ever not in the
+	// idle state.  The logic has since become more complex, hence we have
+	// a register dedicated to this and just copy out that registers value.
+	assign	o_busy = (r_busy);
+	// }}}
+
+
+	// lcl_data
+	// {{{
+	//
+	// This is our working copy of the i_data register which we use
+	// when transmitting.  It is only of interest during transmit, and is
+	// allowed to be whatever at any other time.  Hence, if r_busy isn't
+	// true, we can always set it.  On the one clock where r_busy isn't
+	// true and i_wr is, we set it and r_busy is true thereafter.
+	// Then, on any zero_baud_counter (i.e. change between baud intervals)
+	// we simple logically shift the register right to grab the next bit.
+	initial	lcl_data = 8'hff;
+	always @(posedge i_clk)
+		if ((i_wr)&&(!r_busy))
+			lcl_data <= i_data;
+		else if (zero_baud_counter)
+			lcl_data <= { 1'b1, lcl_data[7:1] };
+	// }}}
+
+	// o_uart_tx
+	// {{{
+	//
+	// This is the final result/output desired of this core.  It's all
+	// centered about o_uart_tx.  This is what finally needs to follow
+	// the UART protocol.
+	//
+	initial	o_uart_tx = 1'b1;
+	always @(posedge i_clk)
+		if ((i_wr)&&(!r_busy))
+			o_uart_tx <= 1'b0;	// Set the start bit on writes
+		else if (zero_baud_counter)	// Set the data bit.
+			o_uart_tx <= lcl_data[0];
+	// }}}
+
+	// Baud counter
+	// {{{
+	// All of the above logic is driven by the baud counter.  Bits must last
+	// CLOCKS_PER_BAUD in length, and this baud counter is what we use to
+	// make certain of that.
+	//
+	// The basic logic is this: at the beginning of a bit interval, start
+	// the baud counter and set it to count CLOCKS_PER_BAUD.  When it gets
+	// to zero, restart it.
+	//
+	// However, comparing a 28'bit number to zero can be rather complex--
+	// especially if we wish to do anything else on that same clock.  For
+	// that reason, we create "zero_baud_counter".  zero_baud_counter is
+	// nothing more than a flag that is true anytime baud_counter is zero.
+	// It's true when the logic (above) needs to step to the next bit.
+	// Simple enough?
+	//
+	// I wish we could stop there, but there are some other (ugly)
+	// conditions to deal with that offer exceptions to this basic logic.
+	//
+	// 1. When the user has commanded a BREAK across the line, we need to
+	// wait several baud intervals following the break before we start
+	// transmitting, to give any receiver a chance to recognize that we are
+	// out of the break condition, and to know that the next bit will be
+	// a stop bit.
+	//
+	// 2. A reset is similar to a break condition--on both we wait several
+	// baud intervals before allowing a start bit.
+	//
+	// 3. In the idle state, we stop our counter--so that upon a request
+	// to transmit when idle we can start transmitting immediately, rather
+	// than waiting for the end of the next (fictitious and arbitrary) baud
+	// interval.
+	//
+	// When (i_wr)&&(!r_busy)&&(state == `TXUL_IDLE) then we're not only in
+	// the idle state, but we also just accepted a command to start writing
+	// the next word.  At this point, the baud counter needs to be reset
+	// to the number of CLOCKS_PER_BAUD, and zero_baud_counter set to zero.
+	//
+	// The logic is a bit twisted here, in that it will only check for the
+	// above condition when zero_baud_counter is false--so as to make
+	// certain the STOP bit is complete.
+	initial	zero_baud_counter = 1'b1;
+	initial	baud_counter = 0;
+	always @(posedge i_clk)
+	begin
+		zero_baud_counter <= (baud_counter == 1);
+		if (state == `TXUL_IDLE)
+		begin
+			baud_counter <= 0;
+			zero_baud_counter <= 1'b1;
+			if ((i_wr)&&(!r_busy))
+			begin
+				baud_counter <= CLOCKS_PER_BAUD - 1'b1;
+				zero_baud_counter <= 1'b0;
+			end
+		end else if ((zero_baud_counter)&&(state == 4'h9))
+		begin
+			baud_counter <= 0;
+			zero_baud_counter <= 1'b1;
+		end else if (!zero_baud_counter)
+			baud_counter <= baud_counter - 1'b1;
+		else
+			baud_counter <= CLOCKS_PER_BAUD - 1'b1;
+	end
+	// }}}
+//
+//
+// FORMAL METHODS
+//
+//
+//
+`ifdef	FORMAL
+
+`ifdef	TXUARTLITE
+`define	ASSUME	assume
+`else
+`define	ASSUME	assert
+`endif
+
+	// Setup
+	// {{{
+	reg	f_past_valid, f_last_clk;
+
+	initial	f_past_valid = 1'b0;
+	always @(posedge i_clk)
+		f_past_valid <= 1'b1;
+
+	initial	`ASSUME(!i_wr);
+	always @(posedge i_clk)
+		if ((f_past_valid)&&($past(i_wr))&&($past(o_busy)))
+		begin
+			`ASSUME(i_wr   == $past(i_wr));
+			`ASSUME(i_data == $past(i_data));
+		end
+	// }}}
+
+	// Check the baud counter
+	// {{{
+	always @(posedge i_clk)
+		assert(zero_baud_counter == (baud_counter == 0));
+
+	always @(posedge i_clk)
+		if ((f_past_valid)&&($past(baud_counter != 0))&&($past(state != `TXUL_IDLE)))
+			assert(baud_counter == $past(baud_counter - 1'b1));
+
+	always @(posedge i_clk)
+		if ((f_past_valid)&&(!$past(zero_baud_counter))&&($past(state != `TXUL_IDLE)))
+			assert($stable(o_uart_tx));
+
+	reg	[(TB-1):0]	f_baud_count;
+	initial	f_baud_count = 1'b0;
+	always @(posedge i_clk)
+		if (zero_baud_counter)
+			f_baud_count <= 0;
+		else
+			f_baud_count <= f_baud_count + 1'b1;
+
+	always @(posedge i_clk)
+		assert(f_baud_count < CLOCKS_PER_BAUD);
+
+	always @(posedge i_clk)
+		if (baud_counter != 0)
+			assert(o_busy);
+	// }}}
+
+	reg	[9:0]	f_txbits;
+	// {{{
+	initial	f_txbits = 0;
+	always @(posedge i_clk)
+		if (zero_baud_counter)
+			f_txbits <= { o_uart_tx, f_txbits[9:1] };
+
+	always @(posedge i_clk)
+	if ((f_past_valid)&&(!$past(zero_baud_counter))
+			&&(!$past(state==`TXUL_IDLE)))
+		assert(state == $past(state));
+
+	reg	[3:0]	f_bitcount;
+	initial	f_bitcount = 0;
+	always @(posedge i_clk)
+		if ((!f_past_valid)||(!$past(f_past_valid)))
+			f_bitcount <= 0;
+		else if ((state == `TXUL_IDLE)&&(zero_baud_counter))
+			f_bitcount <= 0;
+		else if (zero_baud_counter)
+			f_bitcount <= f_bitcount + 1'b1;
+
+	always @(posedge i_clk)
+		assert(f_bitcount <= 4'ha);
+
+	reg	[7:0]	f_request_tx_data;
+	always @(posedge i_clk)
+		if ((i_wr)&&(!o_busy))
+			f_request_tx_data <= i_data;
+
+	wire	[3:0]	subcount;
+	assign	subcount = 10-f_bitcount;
+	always @(posedge i_clk)
+		if (f_bitcount > 0)
+			assert(!f_txbits[subcount]);
+
+	always @(posedge i_clk)
+		if (f_bitcount == 4'ha)
+		begin
+			assert(f_txbits[8:1] == f_request_tx_data);
+			assert( f_txbits[9]);
+		end
+
+	always @(posedge i_clk)
+		assert((state <= `TXUL_STOP + 1'b1)||(state == `TXUL_IDLE));
+
+	always @(posedge i_clk)
+	if ((f_past_valid)&&($past(f_past_valid))&&($past(o_busy)))
+		cover(!o_busy);
+	// }}}
+
+`endif	// FORMAL
+`ifdef	VERIFIC_SVA
+	reg	[7:0]	fsv_data;
+
+	//
+	// Grab a copy of the data any time we are sent a new byte to transmit
+	// We'll use this in a moment to compare the item transmitted against
+	// what is supposed to be transmitted
+	//
+	always @(posedge i_clk)
+		if ((i_wr)&&(!o_busy))
+			fsv_data <= i_data;
+
+	//
+	// One baud interval
+	// {{{
+	//
+	// 1. The UART output is constant at DAT
+	// 2. The internal state remains constant at ST
+	// 3. CKS = the number of clocks per bit.
+	//
+	// Everything stays constant during the CKS clocks with the exception
+	// of (zero_baud_counter), which is *only* raised on the last clock
+	// interval
+	sequence	BAUD_INTERVAL(CKS, DAT, SR, ST);
+		((o_uart_tx == DAT)&&(state == ST)
+			&&(lcl_data == SR)
+			&&(!zero_baud_counter))[*(CKS-1)]
+		##1 (o_uart_tx == DAT)&&(state == ST)
+			&&(lcl_data == SR)
+			&&(zero_baud_counter);
+	endsequence
+	// }}}
+
+	//
+	// One byte transmitted
+	// {{{
+	//
+	// DATA = the byte that is sent
+	// CKS  = the number of clocks per bit
+	//
+	sequence	SEND(CKS, DATA);
+		BAUD_INTERVAL(CKS, 1'b0, DATA, 4'h0)
+		##1 BAUD_INTERVAL(CKS, DATA[0], {{(1){1'b1}},DATA[7:1]}, 4'h1)
+		##1 BAUD_INTERVAL(CKS, DATA[1], {{(2){1'b1}},DATA[7:2]}, 4'h2)
+		##1 BAUD_INTERVAL(CKS, DATA[2], {{(3){1'b1}},DATA[7:3]}, 4'h3)
+		##1 BAUD_INTERVAL(CKS, DATA[3], {{(4){1'b1}},DATA[7:4]}, 4'h4)
+		##1 BAUD_INTERVAL(CKS, DATA[4], {{(5){1'b1}},DATA[7:5]}, 4'h5)
+		##1 BAUD_INTERVAL(CKS, DATA[5], {{(6){1'b1}},DATA[7:6]}, 4'h6)
+		##1 BAUD_INTERVAL(CKS, DATA[6], {{(7){1'b1}},DATA[7:7]}, 4'h7)
+		##1 BAUD_INTERVAL(CKS, DATA[7], 8'hff, 4'h8)
+		##1 BAUD_INTERVAL(CKS, 1'b1, 8'hff, 4'h9);
+	endsequence
+	// }}}
+
+	//
+	// Transmit one byte
+	// {{{
+	// Once the byte is transmitted, make certain we return to
+	// idle
+	//
+	assert property (
+		@(posedge i_clk)
+		(i_wr)&&(!o_busy)
+		|=> ((o_busy) throughout SEND(CLOCKS_PER_BAUD,fsv_data))
+		##1 (!o_busy)&&(o_uart_tx)&&(zero_baud_counter));
+	// }}}
+
+	// {{{
+	assume property (
+		@(posedge i_clk)
+		(i_wr)&&(o_busy) |=>
+			(i_wr)&&(o_busy)&&($stable(i_data)));
+
+	//
+	// Make certain that o_busy is true any time zero_baud_counter is
+	// non-zero
+	//
+	always @(*)
+		assert((o_busy)||(zero_baud_counter) );
+
+	// If and only if zero_baud_counter is true, baud_counter must be zero
+	// Insist on that relationship here.
+	always @(*)
+		assert(zero_baud_counter == (baud_counter == 0));
+
+	// To make certain baud_counter stays below CLOCKS_PER_BAUD
+	always @(*)
+		assert(baud_counter < CLOCKS_PER_BAUD);
+
+	//
+	// Insist that we are only ever in a valid state
+	always @(*)
+		assert((state <= `TXUL_STOP+1'b1)||(state == `TXUL_IDLE));
+	// }}}
+
+`endif // Verific SVA
+endmodule

Index: ezsteps.scm
==================================================================
--- ezsteps.scm
+++ ezsteps.scm
@@ -1,19 +1,28 @@
 
 ;; Copyright 2006-2012, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
 
 ;;  strftime('%m/%d/%Y %H:%M:%S','now','localtime')
 
-(use sqlite3 srfi-1 posix regex regex-case srfi-69 dot-locking directory-utils)
-(import (prefix sqlite3 sqlite3:))
+(use srfi-1 posix regex srfi-69 directory-utils call-with-environment-variables posix-extras
+     z3 csv typed-records pathname-expand matchable)
 
 (declare (unit ezsteps))
 (declare (uses db))
 (declare (uses common))
 (declare (uses items))
@@ -24,152 +33,428 @@
 (include "common_records.scm")
 (include "key_records.scm")
 (include "db_records.scm")
 (include "run_records.scm")
 
+
+(define (ezsteps:step-name->mode stepname)
+  (match (string-search "\\.([^\\.]+)$" stepname)
+    ((_ ext) (string->symbol ext))
+    (else    #f)))
+
+(define (ezsteps:create-step-script envdbf stepname prevstepname mode cmd shellexe)
+  (let* (#;(shebang (case mode
+		    ((sh)  "/bin/sh")
+		    ((csh) "/bin/csh")
+		    (else  "/bin/bash")))
+	 (sourcef (conc ".ezsteps/vars_" prevstepname "." mode))
+	 (scriptn (conc "ez_" stepname))) ;; remember the name already has an extension .sh, .csh etc.
+    (with-output-to-file scriptn
+      (lambda ()
+	;; the shebang line
+	(print "#!" shellexe)
+	;; save the env at start
+	(print "megatest -envcap "stepname"_start "envdbf)
+	;; source vars from previous steps
+	(if (file-exists? sourcef)
+	    (print "source " sourcef))
+	;; run the command
+	(print cmd)
+	(if (eq? mode 'csh)
+	    (print "set ecode=$?")
+	    (print "ecode=$?"))
+	;; save the env at end
+	(print "megatest -envcap "stepname"_end "envdbf)
+	;; write the delta
+	(print "megatest -envdelta "stepname"_start-"stepname"_end -dumpmode bash -o .ezsteps/vars_"stepname".sh "envdbf)
+	(print "megatest -envdelta "stepname"_start-"stepname"_end -dumpmode csh -o .ezsteps/vars_"stepname".csh "envdbf)
+	(print "exit $ecode")))
+    (system (conc "chmod a+x " scriptn))))
+
+(define (ezsteps:get-ezpropvars res) ;; testconfig)
+  ;; (let* ((res (configf:lookup testconfig "setup" "ezpropvars")))
+    (if (string? res)
+	(let* ((dat (string-split res)))
+	  (match dat
+	    ((s shellexe)
+	     (let ((shl (string->symbol s)))
+	       `(,shl . ,shellexe)))
+	    ((s)
+	     (let* ((shl      (string->symbol s))
+		    (shellexe (if (eq? shl 'csh) "/bin/csh" "/bin/bash")))
+	       `(,shl . ,shellexe)))
+	    (else #f)))
+	#f))
+
+;; NOTE: returns logpro-used?
+;;
+(define (launch:runstep ezstep run-id test-id exit-info m tal testconfig all-steps-dat prevstepname envdbf)
+  (let* ((stepname       (car ezstep))  ;; do stuff to run the step
+	 (stepmode-n     (ezsteps:step-name->mode stepname))
+	 (stepinfo       (cadr ezstep))
+	 (shellmode      (ezsteps:get-ezpropvars  (configf:lookup testconfig "setup" "ezpropvars"))) ;; returns '(csh|sh . "/path/to/shell")
+	 (stepmode       (if stepmode-n ;; the .sh or .csh always wins
+			     stepmode-n
+			     (if shellmode
+				 (car shellmode)
+				 #f)))
+	 (shellexe       (if stepmode-n
+			     (case stepmode
+			       ((csh) "/bin/csh")
+			       (else  "/bin/bash"))
+			     (if shellmode
+				 (cdr shellmode)
+				 "/bin/bash")))
+	 ;; (let ((info (cadr ezstep)))
+	 ;; 		   (if (proc? info) "" info)))
+	 ;; (stepproc       (let ((info (cadr ezstep)))
+	 ;; 		   (if (proc? info) info #f)))
+	 (stepparts      (string-match (regexp "^(\\{([^\\}\\{]*)\\}\\s*|)(.*)$") stepinfo))
+	 (stepparams     (if (and (list? stepparts)
+				  (> (length stepparts) 1))
+			     (list-ref stepparts 2)
+			     #f)) ;; for future use, {VAR=1,2,3}, run step for each
+	 (paramparts     (if (string? stepparams)
+			     (map (lambda (x)(string-split x "=")) (string-split-fields "[^;]*=[^;]*" stepparams))
+			     '()))
+	 (subrun         (alist-ref "subrun" paramparts equal?))
+	 (stepcmd        (if (and (list? stepparts)
+				  (> (length stepparts) 2))
+			     (list-ref stepparts 3)
+			     (conc "# error, no command for step "stepname)))
+	 (script         "") ; "#!/bin/bash\n") ;; yep, we depend on bin/bash FIXME!!!\
+	 (logpro-file    (conc stepname ".logpro"))
+	 (html-file      (conc stepname ".html"))
+	 (dat-file       (conc stepname ".dat"))
+	 (tconfig-logpro (configf:lookup testconfig "logpro" stepname))
+	 (logpro-used    (common:file-exists? logpro-file)))
+    (setenv "MT_STEP_NAME" stepname)
+    (hash-table-set! all-steps-dat stepname `((params . ,paramparts)))
+    (debug:print 0 *default-log-port* "stepparts: " stepparts ", stepparams: " stepparams
+                 ", paramparts: " paramparts ", subrun: " subrun ", stepcmd: " stepcmd)
+    
+    (if (and tconfig-logpro
+	     (not logpro-used)) ;; no logpro file found but have a defn in the testconfig
+	(begin
+	  (with-output-to-file logpro-file
+	    (lambda ()
+	      (print ";; logpro file extracted from testconfig\n"
+		     ";;")
+	      (print tconfig-logpro)))
+	  (set! logpro-used #t)))
+    
+    ;; NB// can safely assume we are in test-area directory
+    (debug:print 4 *default-log-port* "ezsteps:\n stepname: " stepname " stepinfo: " stepinfo
+		 " stepparts: " stepparts
+		 " stepparams: " stepparams " stepcmd: " stepcmd)
+
+    (if stepmode (ezsteps:create-step-script envdbf stepname prevstepname stepmode stepcmd shellexe))
+
+    ;; ;; first source the previous environment
+    ;; (let ((prev-env (conc ".ezsteps/" prevstep (if (string-search (regexp "csh") 
+    ;;      							 (get-environment-variable "SHELL")) ".csh" ".sh"))))
+    ;;   (if (and prevstep (common:file-exists? prev-env))
+    ;;       (set! script (conc script "source " prev-env))))
+    
+    ;; call the command using mt_ezstep
+    ;; (set! script (conc "mt_ezstep " stepname " " (if prevstep prevstep "x") " " stepcmd))
+    
+    (debug:print 4 *default-log-port* "script: " script)
+    (rmt:teststep-set-status! run-id test-id stepname "start" "-" #f #f)
+    ;; now launch the actual process
+    (call-with-environment-variables 
+     (list (cons "PATH" (conc (get-environment-variable "PATH") ":.")))
+     (lambda () ;; (process-run "/bin/bash" "-c" "exec ls -l /tmp/foobar > /tmp/delme-more.log 2>&1")
+       (let* ((cmd (conc (if stepmode
+			     (conc "ez_" stepname)
+			     stepcmd)
+			 " > " stepname ".log 2>&1")) ;; >outfile 2>&1 
+	      (pid #f))
+	 (let ((proc (lambda ()
+		       (set! pid (process-run "/bin/bash" (list "-c" cmd))))))
+	   (if subrun
+               (begin
+                 (debug:print-info 0 *default-log-port* "Running without MT_.* environment variables.")
+                 (common:propogate-mt-vars-to-subrun proc '("MT_TARGET" "MT_LINKTREE" "MT_RUNNAME")))
+	       (proc)))
+	 
+         (with-output-to-file "Makefile.ezsteps"
+           (lambda ()
+             (print stepname ".log :")
+             (print "\t" cmd)
+             (if (common:file-exists? (conc stepname ".logpro"))
+                 (print "\tlogpro " stepname ".logpro " stepname ".html < " stepname ".log"))
+             (print)
+             (print stepname " : " stepname ".log")
+             (print))
+           #:append)
+
+	 (rmt:test-set-top-process-pid run-id test-id pid)
+	 (let processloop ((i 0))
+	   (let-values (((pid-val exit-status exit-code)(process-wait pid #t)))
+		       (mutex-lock! m)
+		       (launch:einf-pid-set!         exit-info pid)         ;; (vector-set! exit-info 0 pid)
+		       (launch:einf-exit-status-set! exit-info exit-status) ;; (vector-set! exit-info 1 exit-status)
+		       (launch:einf-exit-code-set!   exit-info exit-code)   ;; (vector-set! exit-info 2 exit-code)
+		       (mutex-unlock! m)
+		       (if (eq? pid-val 0)
+			   (begin
+			     (thread-sleep! 2)
+			     (processloop (+ i 1))))
+		       )))))
+    (debug:print-info 0 *default-log-port* "step " stepname " completed with exit code " (launch:einf-exit-code exit-info)) ;; (vector-ref exit-info 2))
+    ;; now run logpro if needed
+    (if logpro-used
+	(let* ((logpro-exe (or (getenv "LOGPRO_EXE") "logpro"))
+               (pid        (process-run (conc "/bin/sh -c '"logpro-exe" "logpro-file " " (conc stepname ".html") " < " stepname ".log > /dev/null'"))))
+	  (let processloop ((i 0))
+	    (let-values (((pid-val exit-status exit-code)(process-wait pid #t)))
+			(mutex-lock! m)
+			;; (make-launch:einf pid: pid exit-status: exit-status exit-code: exit-code)
+			(launch:einf-pid-set!         exit-info pid)         ;; (vector-set! exit-info 0 pid)
+			(launch:einf-exit-status-set! exit-info exit-status) ;; (vector-set! exit-info 1 exit-status)
+			(launch:einf-exit-code-set!   exit-info exit-code)   ;; (vector-set! exit-info 2 exit-code)
+			(mutex-unlock! m)
+			(if (eq? pid-val 0)
+			    (begin
+			      (thread-sleep! 2)
+			      (processloop (+ i 1)))))
+	    (debug:print-info 0 *default-log-port* "logpro for step " stepname " exited with code " (launch:einf-exit-code exit-info))))) ;; (vector-ref exit-info 2)))))
+    
+    (let ((exinfo (launch:einf-exit-code exit-info)) ;; (vector-ref exit-info 2))
+	  (logfna (if logpro-used (conc stepname ".html") ""))
+	  (comment #f))
+      (if logpro-used
+	  (let ((datfile (conc stepname ".dat")))
+	    ;; load the .dat file into the test_data table if it exists
+	    (if (common:file-exists? datfile)
+		(set! comment (launch:load-logpro-dat run-id test-id stepname)))
+	    (rmt:test-set-log! run-id test-id (conc stepname ".html"))))
+      (rmt:teststep-set-status! run-id test-id stepname "end" exinfo comment logfna))
+    ;; set the test final status
+    (let* ((process-exit-status (launch:einf-exit-code exit-info)) ;; (vector-ref exit-info 2))
+	   (this-step-status (cond
+			      ((and (eq? process-exit-status 2) logpro-used) 'warn)   ;; logpro 2 = warnings
+			      ((and (eq? process-exit-status 3) logpro-used) 'check)  ;; logpro 3 = check
+			      ((and (eq? process-exit-status 4) logpro-used) 'waived) ;; logpro 4 = waived
+			      ((and (eq? process-exit-status 5) logpro-used) 'abort)  ;; logpro 5 = abort
+			      ((and (eq? process-exit-status 6) logpro-used) 'skip)   ;; logpro 6 = skip
+			      ((eq? process-exit-status 0)                   'pass)   ;; logpro 0 = pass
+			      (else 'fail)))
+	   (overall-status   (cond
+			      ((eq? (launch:einf-rollup-status exit-info) 2) 'warn) ;; rollup-status (vector-ref exit-info 3)
+			      ((eq? (launch:einf-rollup-status exit-info) 0) 'pass) ;; (vector-ref exit-info 3)
+			      (else 'fail)))
+	   (next-status      (cond 
+			      ((eq? overall-status 'pass) this-step-status)
+			      ((eq? overall-status 'warn)
+			       (if (eq? this-step-status 'fail) 'fail 'warn))
+			      ((eq? overall-status 'abort) 'abort)
+			      (else 'fail)))
+	   (next-state       ;; "RUNNING") ;; WHY WAS THIS CHANGED TO NOT USE (null? tal) ??
+	    (cond
+	     ((null? tal) ;; more to run?
+	      "COMPLETED")
+	     (else "RUNNING"))))
+      (debug:print 4 *default-log-port* "Exit value received: " (launch:einf-exit-code exit-info) " logpro-used: " logpro-used 
+		   " this-step-status: " this-step-status " overall-status: " overall-status 
+		   " next-status: " next-status " rollup-status: "  (launch:einf-rollup-status exit-info)) ;; (vector-ref exit-info 3))
+      (case next-status
+	((warn)
+	 (launch:einf-rollup-status-set! exit-info 2) ;; (vector-set! exit-info 3 2) ;; rollup-status
+	 ;; NB// test-set-status! does rdb calls under the hood
+	 (tests:test-set-status! run-id test-id next-state "WARN" 
+				 (if (eq? this-step-status 'warn) "Logpro warning found" #f)
+				 #f))
+	((check)
+	 (launch:einf-rollup-status-set! exit-info 3) ;; (vector-set! exit-info 3 3) ;; rollup-status
+	 ;; NB// test-set-status! does rdb calls under the hood
+	 (tests:test-set-status! run-id test-id next-state "CHECK" 
+				 (if (eq? this-step-status 'check) "Logpro check found" #f)
+				 #f))
+	((waived)
+	 (launch:einf-rollup-status-set! exit-info 4) ;; (vector-set! exit-info 3 3) ;; rollup-status
+	 ;; NB// test-set-status! does rdb calls under the hood
+	 (tests:test-set-status! run-id test-id next-state "WAIVED" 
+				 (if (eq? this-step-status 'check) "Logpro waived found" #f)
+				 #f))
+	((abort)
+	 (launch:einf-rollup-status-set! exit-info 5) ;; (vector-set! exit-info 3 4) ;; rollup-status
+	 ;; NB// test-set-status! does rdb calls under the hood
+	 (tests:test-set-status! run-id test-id next-state "ABORT" 
+				 (if (eq? this-step-status 'abort) "Logpro abort found" #f)
+				 #f))
+	((skip)
+	 (launch:einf-rollup-status-set! exit-info 6) ;; (vector-set! exit-info 3 4) ;; rollup-status
+	 ;; NB// test-set-status! does rdb calls under the hood
+	 (tests:test-set-status! run-id test-id next-state "SKIP" 
+				 (if (eq? this-step-status 'skip) "Logpro skip found" #f)
+				 #f))
+	((pass)
+	 (tests:test-set-status! run-id test-id next-state "PASS" #f #f))
+	(else ;; 'fail
+	 (launch:einf-rollup-status-set! exit-info 1) ;; (vector-set! exit-info 3 1) ;; force fail, this used to be next-state but that doesn't make sense. should always be "COMPLETED" 
+	 (tests:test-set-status! run-id test-id "COMPLETED" "FAIL" (conc "Failed at step " stepname) #f)
+	 )))
+    logpro-used))
+
 (define (ezsteps:run-from testdat start-step-name run-one)
-  (let* ((test-run-dir  ;; (filedb:get-path *fdb* 
+  ;;# TODO - recapture item variables, debug repeated step eval; regen logpro from test
+  (let* ((do-update-test-state-status #f)
+         (test-run-dir  ;; (filedb:get-path *fdb* 
 	  (db:test-get-rundir testdat)) ;; )
 	 (testconfig    (read-config (conc test-run-dir "/testconfig") #f #t environ-patt: "pre-launch-env-vars"))
 	 (ezstepslst    (hash-table-ref/default testconfig "ezsteps" '()))
 	 (run-mutex     (make-mutex))
 	 (rollup-status 0)
+         (rollup-status-string #f)
+         (rollup-status-sym #f)
 	 (exit-info     (vector #t #t #t))
-	 (test-id       (db:test-get-id testdat))
-	 (run-id        (db:test-get-run_id testdat))
-	 (test-name     (db:test-get-testname testdat))
-	 (kill-job      #f)) ;; for future use (on re-factoring with launch.scm code
+	 (test-id       (db:test-get-id        testdat))
+	 (run-id        (db:test-get-run_id    testdat))
+	 (test-name     (db:test-get-testname  testdat))
+         (orig-test-state (db:test-get-state   testdat))
+         (orig-test-status (db:test-get-status testdat))
+	 (kill-job      #f) ;; for future use (on re-factoring with launch.scm code
+	 (the-step-params '())) ;; not exactly "functional"
+
+    ;; keep trying till NFS deigns to populate test run dir on this host
     (let loop ((count 5))
-      (if (file-exists? test-run-dir)
-	  (push-directory test-run-dir)
+      (if (not (common:file-exists? test-run-dir))
+	  ;;(push-directory test-run-dir)
 	  (if (> count 0)
 	      (begin
 		(debug:print 0 *default-log-port* "WARNING: ezsteps attempting to run but test run directory " test-run-dir " is not there. Waiting and trying again " count " more times")
 		(sleep 3)
 		(loop (- count 1))))))
+    
     (debug:print-info 0 *default-log-port* "Running in directory " test-run-dir)
-    (if (not (file-exists? ".ezsteps"))(create-directory ".ezsteps"))
+    (if (not (common:file-exists? ".ezsteps"))(create-directory ".ezsteps"))
     ;; if ezsteps was defined then we are sure to have at least one step but check anyway
+    
     (if (not (> (length ezstepslst) 0))
 	(message-window "ERROR: You can only re-run steps defined via ezsteps")
 	(begin
 	  (let loop ((ezstep   (car ezstepslst))
 		     (tal      (cdr ezstepslst))
-		     (prevstep #f)
-		     (runflag  #f)) ;; flag used to skip steps when not starting at the beginning
-	    (if (vector-ref exit-info 1)
-		(let* ((stepname  (car ezstep))  ;; do stuff to run the step
-		       (stepinfo  (cadr ezstep))
-		       (stepparts (string-match (regexp "^(\\{([^\\}]*)\\}\\s*|)(.*)$") stepinfo))
-		       (stepparms (list-ref stepparts 2)) ;; for future use, {VAR=1,2,3}, run step for each 
-		       (stepcmd   (list-ref stepparts 3))
-		       (script    "") ; "#!/bin/bash\n") ;; yep, we depend on bin/bash FIXME!!!
-		       (logpro-used #f))
-
-		  ;; Skip steps until hit start-step-name
-		  ;;
-		  (if (and start-step-name
-			   (not runflag))
-		      (if (equal? stepname start-step-name)
-			  (set! runflag #t) ;; and continue
-			  (if (not (null? tal))
-			      (loop (car tal)(cdr tal) stepname #f))))
-
-		  (debug:print 4 *default-log-port* "ezsteps:\n stepname: " stepname " stepinfo: " stepinfo " stepparts: " stepparts
-			       " stepparms: " stepparms " stepcmd: " stepcmd)
-		  
-		  (if (file-exists? (conc stepname ".logpro"))(set! logpro-used #t))
-		  
-		  ;; call the command using mt_ezstep
-		  (set! script (conc "mt_ezstep " stepname " " (if prevstep prevstep "-") " " stepcmd))
-		  
-		  (debug:print 4 *default-log-port* "script: " script)
-		  (rmt:teststep-set-status! run-id test-id stepname "start" "-" #f #f)
-		  ;; now launch
-		  (let ((pid (process-run script)))
-		    (let processloop ((i 0))
-		      (let-values (((pid-val exit-status exit-code)(process-wait pid #t)))
-				  (mutex-lock! run-mutex)
-				  (vector-set! exit-info 0 pid)
-				  (vector-set! exit-info 1 exit-status)
-				  (vector-set! exit-info 2 exit-code)
-				  (mutex-unlock! run-mutex)
-				  (if (eq? pid-val 0)
-				      (begin
-					(thread-sleep! 1)
-					(processloop (+ i 1))))
-				  ))
-		    (let ((exinfo (vector-ref exit-info 2))
-			  (logfna (if logpro-used (conc stepname ".html") "")))
-		      (rmt:teststep-set-status! run-id test-id stepname "end" exinfo #f logfna))
-		    (if logpro-used
-			(rmt:test-set-log! test-id (conc stepname ".html")))
-		    ;; set the test final status
-		    (let* ((this-step-status (cond
-					      ((and (eq? (vector-ref exit-info 2) 2) logpro-used) 'warn)
-					      ((eq? (vector-ref exit-info 2) 0)                   'pass)
-					      (else 'fail)))
-			   (overall-status   (cond
-					      ((eq? rollup-status 2) 'warn)
-					      ((eq? rollup-status 0) 'pass)
-					      (else 'fail)))
-			   (next-status      (cond 
-					      ((eq? overall-status 'pass) this-step-status)
-					      ((eq? overall-status 'warn)
-					       (if (eq? this-step-status 'fail) 'fail 'warn))
-					      (else 'fail))))
-		      (debug:print 4 *default-log-port* "Exit value received: " (vector-ref exit-info 2) " logpro-used: " logpro-used 
-				   " this-step-status: " this-step-status " overall-status: " overall-status 
-				   " next-status: " next-status " rollup-status: " rollup-status)
-		      (case next-status
-			((warn)
-			 (set! rollup-status 2)
-			 ;; NB// test-set-status! does rdb calls under the hood
-			 (tests:test-set-status! test-id "RUNNING" "WARN" 
-						 (if (eq? this-step-status 'warn) "Logpro warning found" #f)
-						 #f))
-			((pass)
-			 (tests:test-set-status! test-id "RUNNING" "PASS" #f #f))
-			(else ;; 'fail
-			 (set! rollup-status 1) ;; force fail
-			 (tests:test-set-status! test-id "RUNNING" "FAIL" (conc "Failed at step " stepname) #f)
-			 ))))
-		  (if (and (steprun-good? logpro-used (vector-ref exit-info 2))
-			   (not (null? tal)))
-		      (if (not run-one) ;; if we got here we completed the step, if run-one is true, stop
-			  (loop (car tal) (cdr tal) stepname runflag))))
+                     (status-sym-so-far 'pass)
+		     ;;(runflag  #f)
+                     (saw-start-step-name #f)) ;; flag used to skip steps when not starting at the beginning
+	    (if (or (vector-ref exit-info 1)
+		    (equal? (alist-ref 'keep-going prev-step-params) 'yes))
+		(let* ((prev-step-params the-step-params) ;; need to snag this now
+		       (stepname    (car ezstep))  ;; do stuff to run the step
+                       (logpro-used (common:file-exists? (conc test-run-dir "/" stepname ".logpro")))
+		       (stepinfo    (cadr ezstep))
+		       (stepparts   (string-match (regexp "^(\\{([^\\}]*)\\}\\s*|)(.*)$") stepinfo))
+		       (stepparms   (list-ref stepparts 2)) ;; for future use, {VAR=1,2,3}, run step for each 
+		       (stepcmd     (list-ref stepparts 3))
+		       (script      (conc "mt_ezstep '"test-run-dir"' '"stepname"' '"stepcmd"'")) ;; call the command using mt_ezstep
+                       (saw-start-step-name-next (or saw-start-step-name (equal? stepname start-step-name)))
+                       (proceed-with-this-step
+                        (or (not start-step-name)
+                            (equal? stepname start-step-name)
+                            (and saw-start-step-name (not run-one))
+                            saw-start-step-name-next
+                            (and start-step-name (equal? stepname start-step-name))))
+                       )
+		  (debug:print 0 *default-log-port* "NOTE: stepparms=" stepparms)
+		  (set! prev-step-params stepparms)
+                  (set! do-update-test-state-status (and proceed-with-this-step (null? tal)))
+                  ;;(BB> "stepname="stepname" proceed-with-this-step="proceed-with-this-step " do-update-test-state-status="do-update-test-state-status " orig-test-state="orig-test-state" orig-test-status="orig-test-status)
+                  (cond
+                   ((and (not proceed-with-this-step) (null? tal))
+                    'done)
+                   ((not proceed-with-this-step)
+                      (loop (car tal)
+                            (cdr tal)
+                            status-sym-so-far
+                            saw-start-step-name-next))
+                   (else
+		    (debug:print 4 *default-log-port* "ezsteps:\n stepname: " stepname " stepinfo: " stepinfo " stepparts: " stepparts
+			         " stepparms: " stepparms " stepcmd: " stepcmd)
+		    (debug:print 4 *default-log-port* "script: " script)
+		    (rmt:teststep-set-status! run-id test-id stepname "start" "-" #f #f)
+
+		    ;; now launch the script
+		    (let ((pid (process-run script)))
+		      (let processloop ((i 0))
+		        (let-values (((pid-val exit-status exit-code)(process-wait pid #t)))
+			  (mutex-lock! run-mutex)
+			  (vector-set! exit-info 0 pid)
+			  (vector-set! exit-info 1 exit-status)
+			  (vector-set! exit-info 2 exit-code)
+			  (mutex-unlock! run-mutex)
+			  (if (eq? pid-val 0)
+			      (begin
+			        (thread-sleep! 1)
+			        (processloop (+ i 1))))
+			  ))
+		      (let ((exinfo (vector-ref exit-info 2))
+			    (logfna (if logpro-used (conc stepname ".html") "")))
+		        (rmt:teststep-set-status! run-id test-id stepname "end" exinfo #f logfna))
+                      
+		      (if logpro-used
+			  (rmt:test-set-log! run-id test-id (conc stepname ".html")))
+                      
+		      ;; set the test final status
+		      (let* ((this-step-status      (cond
+                                                     (logpro-used
+                                                      (common:logpro-exit-code->status-sym (vector-ref exit-info 2)))
+					             ((eq? (vector-ref exit-info 2) 0)
+                                                      'pass)
+					             (else
+                                                      'fail)))
+			     (overall-status-sym    (common:worse-status-sym this-step-status status-sym-so-far))
+                             (overall-status-string (status-sym->string overall-status-sym)))
+		        (debug:print 4 *default-log-port* "Exit value received: " (vector-ref exit-info 2) " logpro-used: " logpro-used 
+				     " this-step-status: " this-step-status " overall-status: " overall-status-sym) 
+		        ;;" next-status: " next-status " rollup-status: " rollup-status)
+                        (set! rollup-status-string overall-status-string)
+                        (set! rollup-status-sym overall-status-sym)
+                        (tests:test-set-status! run-id test-id "RUNNING" overall-status-string #f #f)))
+
+                    (if (and
+                         (not run-one)
+                         (common:steps-can-proceed-given-status-sym rollup-status-sym)
+                         (not (null? tal)))
+                        (loop (car tal)
+                              (cdr tal)
+                              rollup-status-sym
+                              saw-start-step-name-next)))))
 		(debug:print 4 *default-log-port* "WARNING: a prior step failed, stopping at " ezstep)))
 	  
 	  ;; Once done with step/steps update the test record
 	  ;;
 	  (let* ((item-path (db:test-get-item-path testdat)) ;; (item-list->path itemdat))
-		 (testinfo  (rmt:get-testinfo-by-id run-id test-id))) ;; refresh the testdat, call it iteminfo in case need prev/curr
+		 (testinfo  (rmt:get-testinfo-state-status run-id test-id))) ;; refresh the testdat, call it iteminfo in case need prev/curr
 	    ;; Am I completed?
 	    (if (equal? (db:test-get-state testinfo) "RUNNING") ;; (not (equal? (db:test-get-state testinfo) "COMPLETED"))
 		(let ((new-state  (if kill-job "KILLED" "COMPLETED") ;; (if (eq? (vector-ref exit-info 2) 0) ;; exited with "good" status
 				  ;; "COMPLETED"
 				  ;; (db:test-get-state testinfo)))   ;; else preseve the state as set within the test
 				  )
-		      (new-status (cond
-				   ((not (vector-ref exit-info 1)) "FAIL") ;; job failed to run
-				   ((eq? rollup-status 0)
-				    ;; if the current status is AUTO the defer to the calculated value (i.e. leave this AUTO)
-				    (if (equal? (db:test-get-status testinfo) "AUTO") "AUTO" "PASS"))
-				   ((eq? rollup-status 1) "FAIL")
-				   ((eq? rollup-status 2)
-				    ;; if the current status is AUTO the defer to the calculated value but qualify (i.e. make this AUTO-WARN)
-				    (if (equal? (db:test-get-status testinfo) "AUTO") "AUTO-WARN" "WARN"))
-				   (else "FAIL")))) ;; (db:test-get-status testinfo)))
+                      (new-status rollup-status-string)
+                      ) ;; (db:test-get-status testinfo)))
 		  (debug:print-info 2 *default-log-port* "Test NOT logged as COMPLETED, (state=" (db:test-get-state testinfo) "), updating result, rollup-status is " rollup-status)
-		  (tests:test-set-status! test-id 
-					  new-state
-					  new-status
+		  (tests:test-set-status! run-id test-id 
+					  (if do-update-test-state-status new-state orig-test-state)
+					  (if do-update-test-state-status new-status orig-test-status)
 					  (args:get-arg "-m") #f)
 		  ;; need to update the top test record if PASS or FAIL and this is a subtest
-		  (if (not (equal? item-path ""))
-		      (cdb:set-state-status-and-roll-up-items *runremote* run-id test-name item-path new-status))))
+		  (if (and (not (equal? item-path "")) do-update-test-state-status)
+                      (rmt:set-state-status-and-roll-up-items run-id test-name item-path new-state new-status #f))))
 	    ;; for automated creation of the rollup html file this is a good place...
 	    (if (not (equal? item-path ""))
-		(tests:summarize-items #f run-id test-id test-name #f)) ;; don't force - just update if no
+	      (tests:summarize-items run-id test-id test-name #f)) ;; don't force - just update if no
 	    )))
-    (pop-directory)
-    rollup-status))
+    ;;(pop-directory)
+    rollup-status-string))
+
+(define (ezsteps:spawn-run-from testdat start-step-name run-one)
+  (thread-start! 
+   (make-thread
+    (lambda ()
+      (ezsteps:run-from testdat start-step-name run-one))
+    (conc "ezstep run single step " start-step-name " run-one="run-one)))
+  )
+

Index: fdb_records.scm
==================================================================
--- fdb_records.scm
+++ fdb_records.scm
@@ -1,5 +1,22 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 ;; Single record for managing a filedb
 ;; make-vector-record "Filedb record" filedb fdb db dbpath pathcache idcache partcache
 ;; Filedb record
 (define (make-filedb:fdb)(make-vector 5))
 (define-inline (filedb:fdb-get-db          vec)    (vector-ref  vec 0))

Index: filedb.scm
==================================================================
--- filedb.scm
+++ filedb.scm
@@ -1,13 +1,22 @@
 ;; Copyright 2006-2011, Matthew Welland.
 ;;
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
 ;;
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
 
 ;; (require-extension synch sqlite3 posix srfi-13 srfi-1 utils regex)
 (use sqlite3 srfi-1 posix regex srfi-69 srfi-13 posix-extras)
 (import (prefix sqlite3 sqlite3:))
 
@@ -16,11 +25,11 @@
 (include "fdb_records.scm")
 ;; (include "settings.scm")
 
 (define (filedb:open-db dbpath)
   (let* ((fdb      (make-filedb:fdb))
-	 (dbexists (file-exists? dbpath))
+	 (dbexists (common:file-exists? dbpath))
 	 (db (sqlite3:open-database dbpath)))
     (filedb:fdb-set-db!        fdb db)
     (filedb:fdb-set-dbpath!    fdb dbpath)
     (filedb:fdb-set-pathcache! fdb (make-hash-table))
     (filedb:fdb-set-idcache!   fdb (make-hash-table))

ADDED   fossil-utils/Makefile
Index: fossil-utils/Makefile
==================================================================
--- /dev/null
+++ fossil-utils/Makefile
@@ -0,0 +1,14 @@
+
+
+all : run.sh
+
+go : run.sh
+	bash run.sh
+
+fossilrebase : fossilrebase.scm
+	csc fossilrebase.scm
+
+run.sh : fossilrebase justtesting/*.dat
+	./fossilrebase dumpcmds justtesting > run.sh
+
+

ADDED   fossil-utils/fossilrebase.scm
Index: fossil-utils/fossilrebase.scm
==================================================================
--- /dev/null
+++ fossil-utils/fossilrebase.scm
@@ -0,0 +1,262 @@
+(use yaml matchable srfi-1 sqlite3 regex)
+
+(define (get-timeline)
+  (let* ((inp (open-input-pipe "fossil json timeline checkin -n 0"))
+	 (res (yaml-load inp)))
+    (close-input-pipe inp)
+    res))
+
+(define (get-val data key)
+  (alist-ref key data equal?))
+
+(define (any->string val)
+  (if (string? val)
+      val
+      (conc val)))
+
+(define (branch-match branches tags)
+  (if (list? tags)
+      (any (lambda (x)
+	     (member x branches))
+	   tags)
+      (member tags branches)))
+
+(define (refdb-set-value dbname sheetname row col value)
+  (let ((pid (process-run "refdb" `("set" ,dbname ,sheetname ,row ,col ,value))))
+    (let-values (((a b c)(process-wait pid)))
+      b)))
+
+(define (seconds->std-time-str sec)
+  (time->string 
+   (seconds->local-time sec)
+   "%Y-%m-%d %H:%M:%S"))
+
+(define (gen-refdb dbname branches)
+  (if (not (file-exists? (conc dbname "/sheet-names.cfg")))
+      (begin
+	(print "ERROR: You must precreate the refdb with \"refdb edit \"")
+	(exit 1)))
+  (print "Getting data from timeline...")
+  (let* ((data (get-timeline))
+	 (branches (string-split branches ",")))
+    (print "Got data from timeline...")
+    (let* ((timeline (get-val (get-val data "payload") "timeline")))
+      (print "Got " (length timeline) " timeline records. Filling refdb...")
+    (for-each
+     (lambda (rec)
+       (let ((uuid (get-val rec "uuid")))
+	 (if (branch-match branches (get-val rec "tags"))
+	     (let ((tagnum 0)
+		   (tags   (get-val rec "tags")))
+	       (print "uuid: " uuid " tags: " (get-val rec "tags"))
+	       ;; First the tags so they are visible to left
+	       (for-each
+		(lambda (tagv)
+		  (refdb-set-value dbname "timeline" uuid (conc "tag" tagnum) tagv)
+		  (set! tagnum (+ tagnum 1)))
+		(if (list? tags)
+		    tags
+		    (list tags)))
+	       (for-each
+		(lambda (key)
+		  (refdb-set-value dbname "timeline" uuid key (any->string (get-val rec key))))
+		'("user" "comment"))
+	       (refdb-set-value dbname "extra" uuid "parents" (string-intersperse (get-val rec "parents") ","))
+	       (refdb-set-value dbname "timeline" uuid "timestamp" (seconds->std-time-str (get-val rec "timestamp")))
+	       (refdb-set-value dbname "timeline" uuid "timestamp_sec" (any->string (get-val rec "timestamp")))
+	       ))))
+     timeline))))
+
+(define (escape-string-for-bash str)
+  (string-substitute "'" "''" str #t))
+
+;; tag0 tag1 tag2 cherrypick backout hide usedate recomment user
+;; comment timestamp timestamp_sec
+;;
+(define (get-node-details db node-id)
+  (let* ((result #f)
+	 (count  0))
+    (for-each-row
+     (lambda (rowkey tag0 cmdnum cherrypick do-commit backout hide usedate recomment user comment timestamp timestamp_sec)
+       (set! result `((uuid . ,rowkey)
+		      (tag0 . ,tag0)
+		      (cmdnum . ,cmdnum)
+		      (cherrypick . ,cherrypick)
+		      (do-commit  . ,do-commit)
+		      (backout    . ,backout)
+		      (hide . ,hide)
+		      (usedate . ,usedate)
+		      (recomment . ,recomment)
+		      (user . ,user)
+		      (comment . ,comment)
+		      (timestamp . ,timestamp)
+		      (timestamp_sec . ,timestamp_sec)))
+       (set! count (+ count 1)))
+     db
+     "SELECT rowkey,tag0,cmdnum,cherrypick,do_commit,backout,hide,usedate,recomment,user,comment,timestamp,timestamp_sec FROM timeline WHERE rowkey LIKE ?;"
+     node-id)
+    (if (> count 1)
+	(print "WARNING: more than one node matches " node-id ", found " count " nodes"))
+    result))
+
+;; get branches to create
+;;
+(define (get-new-branches db)
+  (let* ((res '()))
+    (for-each-row
+     (lambda (rowkey node mode)
+       (set! res (cons `((branch . ,rowkey)
+			 (node   . ,node)
+			 (mode   . ,mode))
+		       res)))
+     db
+     "SELECT rowkey,node,mode FROM branches;")
+    res))
+
+;; get cherrypicks
+;;
+(define (get-cherry-picks db)
+  (let* ((res '()))
+    (for-each-row
+     (lambda (rowkey tag0 cherrypick firstmerge do-commit usedate comment recomment)
+       (set! res (cons `((uuid       . ,rowkey)
+			 (tag0       . ,tag0)
+			 (cherrypick . ,cherrypick)
+			 (firstmerge . ,firstmerge)
+			 (do-commit  . ,do-commit)
+			 (usedate    . ,usedate)
+			 (comment    . ,comment)
+			 (recomment  . ,recomment))
+		       res)))
+     db ;; sort desc and the cons puts it back in correct order
+     "SELECT rowkey,tag0,cherrypick,firstmerge,do_commit,usedate,comment,recomment FROM timeline WHERE cherrypick != '' AND cherrypick NOT NULL ORDER BY timestamp_sec DESC;")
+    res))
+
+;; always private and same time as parent node + 1 second
+;;
+;; fossil branch new BRANCH-NAME BASIS ?OPTIONS?
+;; 
+;;        Create a new branch BRANCH-NAME off of check-in BASIS.
+;;        Supported options for this subcommand include:
+;;        --private             branch is private (i.e., remains local)
+;;        --bgcolor COLOR       use COLOR instead of automatic background
+;;        --nosign              do not sign contents on this branch
+;;        --date-override DATE  DATE to use instead of 'now'
+;;        --user-override USER  USER to use instead of the current default
+;; 
+;;        DATE may be "now" or "YYYY-MM-DDTHH:MM:SS.SSS". If in
+;;        year-month-day form, it may be truncated, the "T" may be
+;;        replaced by a space, and it may also name a timezone offset
+;;        from UTC as "-HH:MM" (westward) or "+HH:MM" (eastward).
+;;        Either no timezone suffix or "Z" means UTC.
+;; 
+(define (create-branch db branch-name parent-node)
+  (let* ((parent-info (get-node-details db (conc parent-node "%"))))
+    (if (not parent-info)
+	(print "ERROR: no info found for node " parent-node)
+	(let* ((parent-date (alist-ref 'timestamp parent-info))
+	       (parent-user (alist-ref 'user      parent-info)))
+	  (print "fossil branch new " branch-name " " parent-node " --private --date-override '" parent-date "'")
+	  ;; (print "Creating private branch " branch-name " from node " parent-node)
+	  ;; (pp parent-info)
+	  ;; (print "")
+	  ))))
+
+(define (do-cherrypick db cherrypick dbfname)
+  (let* ((tag0       (alist-ref 'tag0 cherrypick))
+	 (uuid       (alist-ref 'uuid cherrypick))
+	 (nodeinf    (get-node-details db uuid))
+	 (nodedate   (alist-ref 'timestamp nodeinf))
+	 (user       (alist-ref 'user      nodeinf))
+	 (targ       (alist-ref 'cherrypick cherrypick))     ;; do fossil up to this node
+	 (firstmerge (alist-ref 'firstmerge cherrypick))
+	 (do-commit  (alist-ref 'do-commit     cherrypick)) ;; if yes do a commit
+	 (usedate    (alist-ref 'usedate    cherrypick)) ;; if no use current time
+	 (comment    (alist-ref 'comment    cherrypick))
+	 (recomment  (alist-ref 'recomment cherrypick)))
+    (print "#======= Start of cherrypick for " uuid "=======")
+    (print "fossil checkout " targ)
+    ;; first - do we have a firstmerge?
+    (if (and (string? firstmerge)
+	     (> (string-length firstmerge) 0))
+	(print "fossil merge " firstmerge))
+    
+    (print "fossil merge --cherrypick " uuid)
+    (if #t ;;(member do-commit '("x" "yes"))
+	(print "fossil commit -m '" (escape-string-for-bash comment) "' "
+	       (if (equal? usedate "no")
+		   ""
+		   (conc " --date-override '" nodedate "'"))
+	       " --user-override " user
+	       ))
+    (print "if [[ $(fossil status | grep CONFLICT | wc -l) -gt 0 ]];then")
+    (print "  echo \"\nHAVE CONFLICT - STOPPING\n\"")
+    (print "  echo \"cherry pick of " uuid " into " targ " resulted in conflicts\"")
+    (print "  exit 1")
+    (print "else")
+    (print "  echo GOOD, marking node " uuid " as DONE")
+    (print "  refdb set " dbfname " timeline " uuid " status DONE")
+    (print "fi")
+    (print "#======= end of cherrypick for " uuid "=======")
+    (print "")
+    ))
+		   
+;; 
+(define (gen-rebase-commands dbname)
+  (let* ((sqldbname (conc "/tmp/" (current-user-name) "-" dbname ".db"))
+	 (dbfname   (conc (current-directory) "/" dbname))) ;; want the fully qualified path so we can call the generated script from anywhere
+    (print "# Create sqlite db " sqldbname "...")
+    (system (conc "refdb dump2sqlite3 " dbname " " sqldbname))
+    (let* ((db (open-database sqldbname))
+	   (branches (get-new-branches db))
+	   (cherrypicks (get-cherry-picks db)))
+      ;; create the setup
+      (dump-setup db)
+      
+      ;; create the branches
+      (for-each
+       (lambda (branchdat)
+	 (create-branch db
+			(alist-ref 'branch branchdat)
+			(alist-ref 'node   branchdat)))
+       branches)
+
+      ;; create the cherrypicks
+      (for-each
+       (lambda (cherrypick)
+	 (do-cherrypick db cherrypick dbfname))
+       cherrypicks)
+      )))
+
+(define (dump-setup db)
+  (for-each-row
+   (lambda (cmd)
+     (print cmd))
+   db
+   "SELECT command FROM 'setup' ORDER BY rowkey ASC;"))
+
+(define help
+"fossilrebase - register commits in a refdb, edit them by hand then execute them
+
+WARNING: It is highly recommended you do this on a disconnected copy of your fossil database!!
+
+Usage: fossilrebase cmd [params ...]
+  where cmd is one of:
+    genrefdb fname b1,b2... : generate a refdb of all the commits for branches matching patterns listed, edit with \"refdb edit fname\"
+    dumpcmds fname          : from refdb fname dump fossil commands to implement the rebase you want to do.
+")
+
+(define (main)
+  (if (< (length (command-line-arguments)) 1)
+      (begin
+	(print help)
+	(exit 1))
+      (match (command-line-arguments)
+	(("genrefdb" fname branches) (gen-refdb fname branches))
+	(("dumpcmds" fname)          (gen-rebase-commands fname))
+	(else
+	 (print "Sorry, didn't know what to do with \"" (string-intersperse (command-line-arguments) " ") "\"")
+	 (exit 1)))))
+
+
+(main)

ADDED   fossil-utils/justtesting/branches.dat
Index: fossil-utils/justtesting/branches.dat
==================================================================
--- /dev/null
+++ fossil-utils/justtesting/branches.dat
@@ -0,0 +1,6 @@
+[node]
+v1.65-broken-fixes 367ffc5bdf
+nobranch 367ffc5bdf
+[mode]
+v1.65-broken-fixes private
+nobranch private

ADDED   fossil-utils/justtesting/extra.dat
Index: fossil-utils/justtesting/extra.dat
==================================================================
--- /dev/null
+++ fossil-utils/justtesting/extra.dat
@@ -0,0 +1,723 @@
+[parents]
+e7b6428a2533b1901a3bb12411a4095ce23a4d35 e5c65818cc818ef14c94682202fac7bf40375ec1
+e5c65818cc818ef14c94682202fac7bf40375ec1 9fc475313fb461746f4de5df8343ddf15f6b345d,f6dc7607a8ecb7df68b5e50455a97f17eaefa348
+9fc475313fb461746f4de5df8343ddf15f6b345d e9153fe95b68ac1ab72d38b5cbe22b1f1237f8cc
+e9153fe95b68ac1ab72d38b5cbe22b1f1237f8cc 3bd95bc26bb7491d5ab89f264232159d7c188e1b
+c7baa27145762eab04802b34d95818386df2e3f7 1b0d4f257e6d9740397662ede6dc01bf0f5fcec7
+1b0d4f257e6d9740397662ede6dc01bf0f5fcec7 c13726326ce034fbedb36a634179fc1f685ef076
+c13726326ce034fbedb36a634179fc1f685ef076 ad2000389bacbff6847a9920ec8cc44363ff9682
+ad2000389bacbff6847a9920ec8cc44363ff9682 473d6eaf82c96fb6db9905da82b1ef1419852a93
+473d6eaf82c96fb6db9905da82b1ef1419852a93 367ffc5bdf35456922c1d3ceebbe633b65a65bcf
+f6dc39b0f7277ade8986ad06aa9a5f043c3fba2c 2ded3e4899f49656d06b26c1a35ff730ed9768be
+2ded3e4899f49656d06b26c1a35ff730ed9768be 39ec01ec3bb664aa2293ed35dc6f131e00b1d4db
+39ec01ec3bb664aa2293ed35dc6f131e00b1d4db 7f1e84d10d19cd8fa9a639fd60c5102aa6c3fdf5
+7f1e84d10d19cd8fa9a639fd60c5102aa6c3fdf5 7f0801084261f8dec9f4eaa05707897c239bd577
+7f0801084261f8dec9f4eaa05707897c239bd577 901de8992f8a31ef8ddfe47edfb31c251044de61
+901de8992f8a31ef8ddfe47edfb31c251044de61 6118471b3384fcc3ae99fd9400d2193b05ceb0f7
+6118471b3384fcc3ae99fd9400d2193b05ceb0f7 73dfd99fe60a44fc519d78117e3bfb0791268fa1
+73dfd99fe60a44fc519d78117e3bfb0791268fa1 2f7d94848b24bab8702d82654351d25711cc89b6
+2f7d94848b24bab8702d82654351d25711cc89b6 875a0b48c6fa9e2eb37094a0b53f80fa316f1189
+875a0b48c6fa9e2eb37094a0b53f80fa316f1189 66d6fd1aaf5dee5b79fbf7f47a3e7325851b7d6d
+66d6fd1aaf5dee5b79fbf7f47a3e7325851b7d6d 268055792a6b6210a6d53f3bce9555a6b2de7075,e7b6428a2533b1901a3bb12411a4095ce23a4d35
+f6dc7607a8ecb7df68b5e50455a97f17eaefa348 3bd95bc26bb7491d5ab89f264232159d7c188e1b
+f13cb3f1bc36ede7b967ea347fa9cad59d680c88 bd18bd00ac2955b4864a543b19522525434dfe80
+3bd95bc26bb7491d5ab89f264232159d7c188e1b 522b48d828c3295920e0dbd15480dae21426a74b
+522b48d828c3295920e0dbd15480dae21426a74b 5dc1573e7d958fae8fb3711663a07f7f5a0670f3
+5dc1573e7d958fae8fb3711663a07f7f5a0670f3 c5bd5112a83452b0cbae5dddc852d47c76ab9ff4
+c5bd5112a83452b0cbae5dddc852d47c76ab9ff4 9d1cc54fe17184885380c438aaa3a2f172d3c275
+9d1cc54fe17184885380c438aaa3a2f172d3c275 da2b09089751193627241c81260e7cafa10657bc
+da2b09089751193627241c81260e7cafa10657bc 7fc5b1bdcc47a6f43723efd27f2edcf63bc564b1
+7fc5b1bdcc47a6f43723efd27f2edcf63bc564b1 bb4c7dd6b98dbe9924182e9e5010f8846d702525
+bb4c7dd6b98dbe9924182e9e5010f8846d702525 071ebc34ba460be1bdead4ec1a3c261e6bcd2bc4
+071ebc34ba460be1bdead4ec1a3c261e6bcd2bc4 64aa9347d5e5af8d43fdcfbf64891596022cebe9
+64aa9347d5e5af8d43fdcfbf64891596022cebe9 50237f6e1f5f369b5e1022774427028c4dba7d6b
+50237f6e1f5f369b5e1022774427028c4dba7d6b e28be4def5c32dd0a16a6059db1fac22b2aa3653
+e28be4def5c32dd0a16a6059db1fac22b2aa3653 b487e8f3c5ee74eeeaa6edabd92e2548a33210f7
+b487e8f3c5ee74eeeaa6edabd92e2548a33210f7 63e558983a2101551ea0fa140888a5e6fd4322ae
+63e558983a2101551ea0fa140888a5e6fd4322ae 19f75192e22ab76c4de3eacbf57416d192617b48
+19f75192e22ab76c4de3eacbf57416d192617b48 8fd408420ba2b46d851b409832a4b0eb55f33a19
+8fd408420ba2b46d851b409832a4b0eb55f33a19 2e3a570e3e8896f290135b2dfc012b0f69c3516d
+268055792a6b6210a6d53f3bce9555a6b2de7075 aa29985039a593ff4c56ddc64870c8e205999184
+2e3a570e3e8896f290135b2dfc012b0f69c3516d e5bf9db624e5904b1efb29df7d7ed14f7fc23bc0
+e5bf9db624e5904b1efb29df7d7ed14f7fc23bc0 0a7ddadc4dece2446166d8156ecd1de168115649
+0a7ddadc4dece2446166d8156ecd1de168115649 aa29985039a593ff4c56ddc64870c8e205999184
+bd18bd00ac2955b4864a543b19522525434dfe80 0cb77d7f74edafa41a5d9ac28467c532b679325d
+aa29985039a593ff4c56ddc64870c8e205999184 0a9e690b28f0ef4ee710dab3af7b3c45a0e4a38d
+3d9c1de6339fcecbd59eb7cbec2be5680f0f914d 6625f3bc6a98d3f05f57ab42d329391613bbe008
+6625f3bc6a98d3f05f57ab42d329391613bbe008 3ccc64251fcfc210fe7ba1998fa90a96d3bf2fa3
+3ccc64251fcfc210fe7ba1998fa90a96d3bf2fa3 0a9e690b28f0ef4ee710dab3af7b3c45a0e4a38d
+0a9e690b28f0ef4ee710dab3af7b3c45a0e4a38d 18da8b6a613e8ee42c2b82fd00fedcf38c153433
+18da8b6a613e8ee42c2b82fd00fedcf38c153433 7ff937a8a2df1a3e473a760363b85e98aa01bbc4
+7ff937a8a2df1a3e473a760363b85e98aa01bbc4 5b7f0c6aa302ede19e96946ad2e33a7fa97e4fbb
+5b7f0c6aa302ede19e96946ad2e33a7fa97e4fbb ea8c3e52e9f9c216ed88a2707722d4c61e246522
+ea8c3e52e9f9c216ed88a2707722d4c61e246522 a374d9084bb19e0715a3981a05f81b259a7500fc
+a374d9084bb19e0715a3981a05f81b259a7500fc 07ff7dca1e64439988168406443a703b0ad929fa
+07ff7dca1e64439988168406443a703b0ad929fa 15b59cfa429cb21c7ea1dbe8cdc3d8074d3617b6
+0cb77d7f74edafa41a5d9ac28467c532b679325d d825e32743716501b8fe878f973898a5caa0c450
+15b59cfa429cb21c7ea1dbe8cdc3d8074d3617b6 0364beb9c92e54e3e658cdf1876d7c75b2d68e15,d825e32743716501b8fe878f973898a5caa0c450
+0364beb9c92e54e3e658cdf1876d7c75b2d68e15 0645166f9cdc9cbb2e922e7a3b0094fbf78e9c8c
+0645166f9cdc9cbb2e922e7a3b0094fbf78e9c8c 5de2fd17b5348d5283f874e7ec9bf2c53cad12a0
+d825e32743716501b8fe878f973898a5caa0c450 220b14a861c4883ff947e46ea39af32c046aaa99
+220b14a861c4883ff947e46ea39af32c046aaa99 8724301727841358def98a48e191a0e344ddbf68
+8724301727841358def98a48e191a0e344ddbf68 cdd5e92143e616f56b8b4ba90f6bc2114de0dee1
+5de2fd17b5348d5283f874e7ec9bf2c53cad12a0 2a858c5054f56588fefe6039621ebaefc5344d29
+2a858c5054f56588fefe6039621ebaefc5344d29 0495fb12176784b1907c243c54898c23f2afc140
+0495fb12176784b1907c243c54898c23f2afc140 3b86fd8d4c9f097a04885021f902a69cfc375eeb
+3b86fd8d4c9f097a04885021f902a69cfc375eeb 367ffc5bdf35456922c1d3ceebbe633b65a65bcf,cdd5e92143e616f56b8b4ba90f6bc2114de0dee1
+cdd5e92143e616f56b8b4ba90f6bc2114de0dee1 c7d9089a6f8e857878fcdfda8b46b9034379dcf9
+c7d9089a6f8e857878fcdfda8b46b9034379dcf9 c7977972a11df8cb1ea188cf6cf7a30e71d4292f
+c7977972a11df8cb1ea188cf6cf7a30e71d4292f ccab6e04aff4406711aecbfa9b41ea0a6349fb43
+ccab6e04aff4406711aecbfa9b41ea0a6349fb43 eeb358089d89aee9f2b1804a4c630ef42a231ee2
+eeb358089d89aee9f2b1804a4c630ef42a231ee2 e9a528680b234a33522c1b4f6d1719d95dda5b7e
+e9a528680b234a33522c1b4f6d1719d95dda5b7e caed2ecdc2c88e2ee1572137ec4cc6fe38e632bd
+caed2ecdc2c88e2ee1572137ec4cc6fe38e632bd b82fdf714f1b169991340004c60d758e09ba0fbf
+b82fdf714f1b169991340004c60d758e09ba0fbf 2c22506f667e6c675af6256a6bcc5bf3519f68c3
+2c22506f667e6c675af6256a6bcc5bf3519f68c3 03755c29bfeaf4f4b6d00c21048eb5dd798e5cba
+03755c29bfeaf4f4b6d00c21048eb5dd798e5cba 55a9a872eed80f88b6a2e2dd82da8d2822ae3fe6
+55a9a872eed80f88b6a2e2dd82da8d2822ae3fe6 f02d97f2923801d99f3dd769654032cb12ce7266
+f02d97f2923801d99f3dd769654032cb12ce7266 4c2b15c948deb5ac11fbd034872081dd93b029aa
+4c2b15c948deb5ac11fbd034872081dd93b029aa 6fef3e6460425a7627a787fee924c8077ceae6b6
+6fef3e6460425a7627a787fee924c8077ceae6b6 03921a66f9001e8fbc4252a2c355763aef6b2198
+03921a66f9001e8fbc4252a2c355763aef6b2198 db55d34798110efd902302e670128e5860e4e820
+db55d34798110efd902302e670128e5860e4e820 c9f20f12f36bad0d76d71faaac64f7d1a45a610e,367ffc5bdf35456922c1d3ceebbe633b65a65bcf
+c9f20f12f36bad0d76d71faaac64f7d1a45a610e 3d4fba2e820c1e62f2bc2822311388172aeece58
+3d4fba2e820c1e62f2bc2822311388172aeece58 681523dd88dc59a656b458bad144821ec5ac1411
+681523dd88dc59a656b458bad144821ec5ac1411 23a58a862f09874f9977dc7e56866c9537b25b3b
+23a58a862f09874f9977dc7e56866c9537b25b3b 156279118f7b88026768cec53312a037e6361062
+156279118f7b88026768cec53312a037e6361062 8b3c7571c1376d5d6bf49935e2ecdb37ab18a82f
+367ffc5bdf35456922c1d3ceebbe633b65a65bcf e1e57863eaf85b8ab3f383491a1ead12a9b46b79,e24a447e399223972ac25a520705a99221429b82
+e1e57863eaf85b8ab3f383491a1ead12a9b46b79 0193399945554a426feec8595486cbc212259970
+e24a447e399223972ac25a520705a99221429b82 0193399945554a426feec8595486cbc212259970
+0193399945554a426feec8595486cbc212259970 37d16ef457b144b699e5d0456a8110e697b0e892
+8b3c7571c1376d5d6bf49935e2ecdb37ab18a82f c3f58e0a36a34fc63b39a0e8b6dd714452a81b38
+c3f58e0a36a34fc63b39a0e8b6dd714452a81b38 462317ce59bff2956b603255c533579cd960e2c1
+462317ce59bff2956b603255c533579cd960e2c1 9d160839b2b6ef2f1f4ec697a4bb58595b9749ed,37d16ef457b144b699e5d0456a8110e697b0e892
+37d16ef457b144b699e5d0456a8110e697b0e892 9529e99c78d2bf1ffb1b0fd6d53f8e80c73eba17
+9d160839b2b6ef2f1f4ec697a4bb58595b9749ed 879965196f0456b5d09c387f51ad1aa8bc517b7e
+879965196f0456b5d09c387f51ad1aa8bc517b7e 074a5dfda2c9ce4d5d98e092edef0214a15e1243
+074a5dfda2c9ce4d5d98e092edef0214a15e1243 a6e3ff583a14d4a5ca8d660859a00e7501a9a4bd
+a6e3ff583a14d4a5ca8d660859a00e7501a9a4bd 6ba016ecfeaf3ae2aa56e66040cc96270b94b147,d0c812fcf1a7463a75a4b0821aad7b53a698ae94
+6ba016ecfeaf3ae2aa56e66040cc96270b94b147 51bf826840a8c9ae4cad2e8b5ef6d52183ede70f,9529e99c78d2bf1ffb1b0fd6d53f8e80c73eba17
+d0c812fcf1a7463a75a4b0821aad7b53a698ae94 51bf826840a8c9ae4cad2e8b5ef6d52183ede70f
+9529e99c78d2bf1ffb1b0fd6d53f8e80c73eba17 164020026e3a719738a3bb388ed211c757b66327
+164020026e3a719738a3bb388ed211c757b66327 79f23e4a0a71efe4bcfd5d12194b5be8116b3d95
+79f23e4a0a71efe4bcfd5d12194b5be8116b3d95 7dbdcbf5a0b70e2610cc6a033d855cf49277c14b
+51bf826840a8c9ae4cad2e8b5ef6d52183ede70f c9f5ad314ed551d772f67971e2bf31c41c86c692
+c9f5ad314ed551d772f67971e2bf31c41c86c692 cd0ae03e77f5e6b40577d94b4cad95beb0024205
+7dbdcbf5a0b70e2610cc6a033d855cf49277c14b 4021551b199416dec89ccf166f168aef66cf4607
+cd0ae03e77f5e6b40577d94b4cad95beb0024205 34c17b3528a056aa806b966b8fe2c875dcdfcf0f
+34c17b3528a056aa806b966b8fe2c875dcdfcf0f 28423d419711ab263d31dffd54765ac939b04ed8
+28423d419711ab263d31dffd54765ac939b04ed8 4021551b199416dec89ccf166f168aef66cf4607
+4021551b199416dec89ccf166f168aef66cf4607 99e278145e3f48aa41d9eec257ed0e9682d80449
+99e278145e3f48aa41d9eec257ed0e9682d80449 a0e6c2fdcb7cc5b53a65c204e6aacd6a41980d60
+a0e6c2fdcb7cc5b53a65c204e6aacd6a41980d60 4e53ed2041f4640f0f9bd87af471042a56d55539
+4e53ed2041f4640f0f9bd87af471042a56d55539 f7368a81a94f513114cb2cc1fed5f0b72269356e
+f7368a81a94f513114cb2cc1fed5f0b72269356e 1aa2709b5fa6242898d01a2c7a65dac7478a65f0
+1aa2709b5fa6242898d01a2c7a65dac7478a65f0 7458dc962f7de10c581e01d58ed10a190e725a95
+7458dc962f7de10c581e01d58ed10a190e725a95 7c99ac42bb0d578a369f60222222878bb4bb2cea
+7c99ac42bb0d578a369f60222222878bb4bb2cea 5df054d940f33812707b7c4db2ecbabb88c007f9
+5df054d940f33812707b7c4db2ecbabb88c007f9 e37d51cfa5b7019e32b59051293ac069a7eb3c76
+e37d51cfa5b7019e32b59051293ac069a7eb3c76 36d5ae8d9f42524366b6f3e0766235258888f879
+36d5ae8d9f42524366b6f3e0766235258888f879 7e2466117d4b0a7b8d3c096d65254c3a72deaf4d
+7e2466117d4b0a7b8d3c096d65254c3a72deaf4d 9fa5ffffd985c6c6835789649594f4c3eabe3e58
+9fa5ffffd985c6c6835789649594f4c3eabe3e58 070a358879597c688719a64957b27b06c6ae3470
+070a358879597c688719a64957b27b06c6ae3470 c7af076fb5441a6521944c470fcc7eb7e2379d1a
+c7af076fb5441a6521944c470fcc7eb7e2379d1a fca9c83d5196974ec2583dc568cd6d4d13373700
+fca9c83d5196974ec2583dc568cd6d4d13373700 00f6f2a2c39c22d21672f6c7d906c690d0df8df4
+00f6f2a2c39c22d21672f6c7d906c690d0df8df4 2d41b2e87dc70ee208e16fb5dbdbddb807635f4d
+2d41b2e87dc70ee208e16fb5dbdbddb807635f4d 844ff4c128bf32c32a02735411dbf058e5a1ed6b
+844ff4c128bf32c32a02735411dbf058e5a1ed6b 224048bd1995aca9704c0bd8e3702b3da8d89b13
+224048bd1995aca9704c0bd8e3702b3da8d89b13 578c1ae2425620886ec2a98b800bdfc5a75fedd6
+578c1ae2425620886ec2a98b800bdfc5a75fedd6 201844bfafadb8adbb2f8e8b66d024d0798561c0
+201844bfafadb8adbb2f8e8b66d024d0798561c0 9b45090ffbfdaa2b89d848b421a48b2df083977e
+9b45090ffbfdaa2b89d848b421a48b2df083977e e313d518c57ab333d2f81356e52ca3cf884672f0
+e313d518c57ab333d2f81356e52ca3cf884672f0 6f67e195394c055bd1f81e09f12dcd12b7b00594
+6f67e195394c055bd1f81e09f12dcd12b7b00594 e94599755425765da97442e9b266d93f465df718
+e94599755425765da97442e9b266d93f465df718 16da8558ede201d82667e5df765977aa99888f7b
+16da8558ede201d82667e5df765977aa99888f7b 02787730a2e6787aeb1dc8cbd2d20e43925b9272
+6fa2e78406096d30186b3237e119aa7d40206316 9ab2add492901a823f238b673f091a011a259f95
+9ab2add492901a823f238b673f091a011a259f95 77cd1aff880b9ae014d9495bfc358095c1007049
+77cd1aff880b9ae014d9495bfc358095c1007049 a7636bcfcc51032fb33630218d9761b01c219465
+a7636bcfcc51032fb33630218d9761b01c219465 dde06b663fd358e1704ecf43df3465204be6a92e
+dde06b663fd358e1704ecf43df3465204be6a92e 7e32aa8d9e0889efc2f30250e52aa82a832272a3
+7e32aa8d9e0889efc2f30250e52aa82a832272a3 69d1d314cd31b774f4336fa2c8906e4387696013
+69d1d314cd31b774f4336fa2c8906e4387696013 7ed5a5de192f37b2b56057b1d227d870c55eb769
+02787730a2e6787aeb1dc8cbd2d20e43925b9272 bce20f2af9049caf12c4cab893672a0c7db2f76a
+7ed5a5de192f37b2b56057b1d227d870c55eb769 bf33407036998851ea0546470d52a8954d3df5b2
+bf33407036998851ea0546470d52a8954d3df5b2 841c3f498e72b482c6dc66631427ab1292cef062
+841c3f498e72b482c6dc66631427ab1292cef062 27e03ab10c5de7b1c9479842a274873824d726f0
+27e03ab10c5de7b1c9479842a274873824d726f0 b433734ae4d1cd0014708b7172d9cb16303105b9
+b433734ae4d1cd0014708b7172d9cb16303105b9 f7cdc16245d3f850767e0c1e4b4ec954d0fa0be4
+bce20f2af9049caf12c4cab893672a0c7db2f76a c5229569095ff3749bf58ea164ae082ef65a6937
+f7cdc16245d3f850767e0c1e4b4ec954d0fa0be4 830231e6626606438e35d7d4320cd5a449db60ad
+830231e6626606438e35d7d4320cd5a449db60ad 88ef67d3eeb590a2f45277fa236264eeda6677f5
+88ef67d3eeb590a2f45277fa236264eeda6677f5 600378be441be44b2ec38356993736c374d604cf
+c5229569095ff3749bf58ea164ae082ef65a6937 a7f72a923ae16e361ae18fc8473754ea2de4b1da
+a7f72a923ae16e361ae18fc8473754ea2de4b1da 80a94ea109520c8cc719f9f7fb83e78f670a2c06
+80a94ea109520c8cc719f9f7fb83e78f670a2c06 c8e58c2956d3ae8924cea61bbfc83fd3f0914b6f
+600378be441be44b2ec38356993736c374d604cf f27cf9f446e2c0181415ed25d55c5047200c63ef
+c8e58c2956d3ae8924cea61bbfc83fd3f0914b6f e22603e687c8a3c0e025a432e8082431420c3d66
+e22603e687c8a3c0e025a432e8082431420c3d66 2454028ce7b5efdf6e1c7c467846d322c9b6e8c7
+f27cf9f446e2c0181415ed25d55c5047200c63ef 2daae45b51f3454a8f74d876ab6adf98e9fdf836
+2daae45b51f3454a8f74d876ab6adf98e9fdf836 27df8e8106135e2cd38975f36f07fdb4d944d484
+27df8e8106135e2cd38975f36f07fdb4d944d484 04fc782eae164945d7eca8c85d44ea51c525d547
+04fc782eae164945d7eca8c85d44ea51c525d547 577bbbab0b399075da217ec94d0521ae897185b3
+2454028ce7b5efdf6e1c7c467846d322c9b6e8c7 c165b411100e84002dded53504d2151a5fda47d5
+577bbbab0b399075da217ec94d0521ae897185b3 03fc95cacb87025a409d7dda22687770234e461f
+03fc95cacb87025a409d7dda22687770234e461f dfa5ecc8d17d379e8e2961297d116b7d818c9075
+dfa5ecc8d17d379e8e2961297d116b7d818c9075 2415804df98278e66a8f2a3837ec93f4c7ca1823
+c165b411100e84002dded53504d2151a5fda47d5 64fa416b34d4225a42ca988820b6cd356dc0419b
+64fa416b34d4225a42ca988820b6cd356dc0419b 8ec43965a7e5f43a9090442d36674c16595b9641
+8ec43965a7e5f43a9090442d36674c16595b9641 78105f5bdbb89ab66f1f2aa409e58d9c9a5cd59f
+78105f5bdbb89ab66f1f2aa409e58d9c9a5cd59f 8a260ddbc7f6c72167041280ae17c74934db579b
+2415804df98278e66a8f2a3837ec93f4c7ca1823 e057f70f5187dd2e058d15950be4eac0cd49e4ad
+e057f70f5187dd2e058d15950be4eac0cd49e4ad c54ed87ce367cf35aaf0916a9d3bf7108a52477c
+c54ed87ce367cf35aaf0916a9d3bf7108a52477c 3decad145bdb968c13959f6f2d7e6b85ca2079b7
+3decad145bdb968c13959f6f2d7e6b85ca2079b7 2c1a4adb23ced0b1be1e6b237573f08c48806cdf
+2c1a4adb23ced0b1be1e6b237573f08c48806cdf 5c9f3ec17a904eb05e916b3bca595db7ffd12a0e
+5c9f3ec17a904eb05e916b3bca595db7ffd12a0e 339aab0882a72b280c84f94b39d94e6f1b101b32
+339aab0882a72b280c84f94b39d94e6f1b101b32 740d248cf846ed8128931483a12247ed3a179813
+740d248cf846ed8128931483a12247ed3a179813 76caa1268409ae81c086266f91a1904711e90cc1
+76caa1268409ae81c086266f91a1904711e90cc1 b7a9734bdf60928400cdc3785c6c0e47ed4ca7fd
+8a260ddbc7f6c72167041280ae17c74934db579b 368d761da8fa62ab3fed5bad2aa03bd156d4fd4d,33694be5f862fb551556bc292347983d3629009b
+368d761da8fa62ab3fed5bad2aa03bd156d4fd4d 634c52d06c7fd44853ffba7bf5dce34256570a7f
+634c52d06c7fd44853ffba7bf5dce34256570a7f b3fbd7024b3f06a8d4dd4bda1cad1c8614367514
+b7a9734bdf60928400cdc3785c6c0e47ed4ca7fd 7a5eb536d0e29f04d7927150d3e8bfa43150191f
+33694be5f862fb551556bc292347983d3629009b e6e04b8c79af9dba388b2d7bdaaef52e4b46d1ee
+e6e04b8c79af9dba388b2d7bdaaef52e4b46d1ee dc43b3418e799d4a28a530781b89111b32fea18f
+dc43b3418e799d4a28a530781b89111b32fea18f b3fbd7024b3f06a8d4dd4bda1cad1c8614367514
+7a5eb536d0e29f04d7927150d3e8bfa43150191f 159145e9c371ad7bcab6f91856a06ad57afd509f
+159145e9c371ad7bcab6f91856a06ad57afd509f 7f499ea08bb1f3f491aac185a980444ddb694d54
+7f499ea08bb1f3f491aac185a980444ddb694d54 b056a2ef6454c89441a49ff127e73ea1d3a5e4bc
+b056a2ef6454c89441a49ff127e73ea1d3a5e4bc 8fb98dda5f358dfeca48c1d054fe474521ed8c45
+8fb98dda5f358dfeca48c1d054fe474521ed8c45 5f97e5ae8d8d44f424886e7dce0224698a157516
+5f97e5ae8d8d44f424886e7dce0224698a157516 566a3b0cf88b86bb0c2da1fea2ad970004d12d47
+566a3b0cf88b86bb0c2da1fea2ad970004d12d47 d6f3b7c58c9ec886897422a482ca25123ea92ccb
+d6f3b7c58c9ec886897422a482ca25123ea92ccb 016c7dba29c59cccea17fb2a1bcc93a839cb38d9
+016c7dba29c59cccea17fb2a1bcc93a839cb38d9 792cf5fe01f5cf08c1c69bcc242b5ff0fa6e970d
+792cf5fe01f5cf08c1c69bcc242b5ff0fa6e970d cfaa83fc7069a9cd0ee9d930b7d2c97042f517a0
+cfaa83fc7069a9cd0ee9d930b7d2c97042f517a0 3405d7b2dbfe7eb8f4bb9ce55fb4aa4298d820c4
+3405d7b2dbfe7eb8f4bb9ce55fb4aa4298d820c4 d22d4fa40848bafb724a0624c3d6d45da92f7982
+d22d4fa40848bafb724a0624c3d6d45da92f7982 074c36575043c530d29db1f9029aa9aecfc2df78
+074c36575043c530d29db1f9029aa9aecfc2df78 1773996e332e9fe68035384e4ea956345e5349aa
+1773996e332e9fe68035384e4ea956345e5349aa 93858377ad386a94ea9d93b82725bcd351222921
+93858377ad386a94ea9d93b82725bcd351222921 23f8fa562020b18153f44fe614bfb6e10576c723
+23f8fa562020b18153f44fe614bfb6e10576c723 036b7a9d4e9ad3bc6ec6c8a009b7104708bf2ea4
+036b7a9d4e9ad3bc6ec6c8a009b7104708bf2ea4 6afd2e723ab6072f128b66ebdae01d4f84fdaf3c
+6afd2e723ab6072f128b66ebdae01d4f84fdaf3c fde3cd0ad14f2e195c1dfd46a5ad3abf3bfd8f6d
+fde3cd0ad14f2e195c1dfd46a5ad3abf3bfd8f6d 932f8e97c02dd4a1a6a905862ade47d5a33ecefc
+932f8e97c02dd4a1a6a905862ade47d5a33ecefc 813b6b2b305151df1a237a4e3f9f3b3e2ca77efb
+813b6b2b305151df1a237a4e3f9f3b3e2ca77efb b564e3a921293af1df4c6425823045d083ea7abc
+b564e3a921293af1df4c6425823045d083ea7abc d684bd81f12e96d65885c9d23936bf313fdac673
+d684bd81f12e96d65885c9d23936bf313fdac673 9f0b57c507c1c8f7eff359e8ebd0047084138ff2
+9f0b57c507c1c8f7eff359e8ebd0047084138ff2 6b93274918649a6b61050d37c9aa787bb99b1db0
+6b93274918649a6b61050d37c9aa787bb99b1db0 5751790037c9a2a99b68388d884c2b514179d44a
+5751790037c9a2a99b68388d884c2b514179d44a d64b4b4760be2163a0b5e0321248fd1635dc8277
+d64b4b4760be2163a0b5e0321248fd1635dc8277 ebaba5e3733c35203175a40998d9b6f11ade5217
+ebaba5e3733c35203175a40998d9b6f11ade5217 a8e82ae9f4bd20bea816b3be31549e58fb7a70e6
+a8e82ae9f4bd20bea816b3be31549e58fb7a70e6 232c8ec0e8f142e78bad8f775bd65054b4a6997b
+232c8ec0e8f142e78bad8f775bd65054b4a6997b 01be4cf099557c79896956dcf4d0575cd97b71fd
+01be4cf099557c79896956dcf4d0575cd97b71fd f83553313cf13c83e8bc13cf8d4c2f071e7a7145
+f83553313cf13c83e8bc13cf8d4c2f071e7a7145 22eaf9c6fa040e13c652928b8bd56797ca3c6ae5
+22eaf9c6fa040e13c652928b8bd56797ca3c6ae5 f22dab86da656a98303cfa4839907922ed3fbe52
+f22dab86da656a98303cfa4839907922ed3fbe52 082ff62d8007aee4c47867bc92261c623d536e83
+082ff62d8007aee4c47867bc92261c623d536e83 0df1257922823f33bc48f8d468825ac205477c7c
+0df1257922823f33bc48f8d468825ac205477c7c 093e8bc8c2728655b17aeba753a25665ce1c4535
+093e8bc8c2728655b17aeba753a25665ce1c4535 d636d628b5a0f41bff89d72b66f374764f85fc69
+b3fbd7024b3f06a8d4dd4bda1cad1c8614367514 3eaa18cb5bd478a6d2dc747bef1073b29113abe8
+d636d628b5a0f41bff89d72b66f374764f85fc69 28468fe546a2cc9fd6650cac6a4064b70d0ebbe2
+28468fe546a2cc9fd6650cac6a4064b70d0ebbe2 07e5f0959111e1144339881645dd599bf793c9ca
+07e5f0959111e1144339881645dd599bf793c9ca 6871dc0b7945ef34afd2eadd67f4d32e9a1f4105
+3eaa18cb5bd478a6d2dc747bef1073b29113abe8 8a70b57bea4d1e5312f8826ffa5f16417531bbae
+6871dc0b7945ef34afd2eadd67f4d32e9a1f4105 b7b562b7b3af9671b0c986dcfdd98972607216a3
+b7b562b7b3af9671b0c986dcfdd98972607216a3 028f0d8c40e871fdf6ce62f08a8e5805d513c6a9
+028f0d8c40e871fdf6ce62f08a8e5805d513c6a9 77149209be527afd33c4f67b37e55cb5d64b982b
+77149209be527afd33c4f67b37e55cb5d64b982b fc8c642fb9b81ae9bcbc73cf5e0036231e09f15b
+fc8c642fb9b81ae9bcbc73cf5e0036231e09f15b 129edccbd5f34d3128bbb177bd104bad684d7eb4
+129edccbd5f34d3128bbb177bd104bad684d7eb4 a1f5573562dd58df7106703a41665b233bf82753
+a1f5573562dd58df7106703a41665b233bf82753 78799c8e556b479804fcf4b9cd8e487a405e90b5
+78799c8e556b479804fcf4b9cd8e487a405e90b5 1d3928260aa5e7503ca7ccdf71236c9849e51cff
+1d3928260aa5e7503ca7ccdf71236c9849e51cff f6d852ea5423899a904625e7ffb4afbdf2dd3045
+3dee8c9dd39b25a661cb50f7ed4e9b5533de0489 9b6c3193e6f492c668c89846b83b3a6b0a8f0a7a
+f6d852ea5423899a904625e7ffb4afbdf2dd3045 9b6c3193e6f492c668c89846b83b3a6b0a8f0a7a
+9b6c3193e6f492c668c89846b83b3a6b0a8f0a7a 99551309fa5760491b267e1754c2ee79a9c31c6f
+99551309fa5760491b267e1754c2ee79a9c31c6f dc7ab217fe2743658babab5613b2451356e448ed
+dc7ab217fe2743658babab5613b2451356e448ed 0869d10a938cbcba1b028d87fd7a6cc843303683
+0869d10a938cbcba1b028d87fd7a6cc843303683 71a141e42eef4f86e4e1ce50b9aebbf5bf80b0ef
+71a141e42eef4f86e4e1ce50b9aebbf5bf80b0ef 386b7b1848ab5f0babbbc73fa424b2514472e359
+386b7b1848ab5f0babbbc73fa424b2514472e359 2d1ae5e50841133cb6e39e5e60eb89c368b42ff0
+2d1ae5e50841133cb6e39e5e60eb89c368b42ff0 0ffb3c1a2bc275dd5482538586860091b97e9b5f
+0ffb3c1a2bc275dd5482538586860091b97e9b5f 634d2c37e0e30b768fcf211d9ae70a6f4860cdf2
+634d2c37e0e30b768fcf211d9ae70a6f4860cdf2 a114850abbcb083dc50de6e75cadaeb9ba3ea54c
+a114850abbcb083dc50de6e75cadaeb9ba3ea54c 54f26c491b0d2dd73fc2c9e7823e3aca72a9f5a2,8a70b57bea4d1e5312f8826ffa5f16417531bbae
+8a70b57bea4d1e5312f8826ffa5f16417531bbae 65e88e7bdc2bf7140c941bb20d46cb5875ee35d9
+65e88e7bdc2bf7140c941bb20d46cb5875ee35d9 92c72d977c5f448716b94425e030b6f759d89ba3,78c9e0e0c54cab356975604dd664f0df46404580
+92c72d977c5f448716b94425e030b6f759d89ba3 a7fef27f05f019b017d6c204aabf432f42b9b40e
+a7fef27f05f019b017d6c204aabf432f42b9b40e 61dc513a05232d6f7bb36636190b31cda11feace
+61dc513a05232d6f7bb36636190b31cda11feace 57d0d68288770282c430fa37afeb360fd9425c8c
+57d0d68288770282c430fa37afeb360fd9425c8c 84f39d59fbcb3bc49fa4c856d7126f1adc2f5d4a
+84f39d59fbcb3bc49fa4c856d7126f1adc2f5d4a ffb3fa86c6fd6939f728d06b404414cfd9ef55d5
+54f26c491b0d2dd73fc2c9e7823e3aca72a9f5a2 5b4dacbff273c38e8706c3aa60a2121d18b3f7d3
+5b4dacbff273c38e8706c3aa60a2121d18b3f7d3 fcf5650f1fe9f9a54858beab9087c62539873b93
+fcf5650f1fe9f9a54858beab9087c62539873b93 b767764b1adf9413412a3572d33a40a548d30bf9
+b767764b1adf9413412a3572d33a40a548d30bf9 e300afb35f20d9867341f92c250e911729cc8453,ffb3fa86c6fd6939f728d06b404414cfd9ef55d5
+ffb3fa86c6fd6939f728d06b404414cfd9ef55d5 0d84db9635a9271fa8b4009346c38a35b266b914
+e300afb35f20d9867341f92c250e911729cc8453 38212a804adc593bc4386c7445e5932b618605a9
+38212a804adc593bc4386c7445e5932b618605a9 0d84db9635a9271fa8b4009346c38a35b266b914
+0d84db9635a9271fa8b4009346c38a35b266b914 ad4a6187780e93ca8e49892b4c9b787fc18ab4cb,3e30a989772d3d1931bbe7a7065a905be61385c8
+ad4a6187780e93ca8e49892b4c9b787fc18ab4cb 1153bc2fbaf02086ad2b989accba68e6a9cb5ab5
+1153bc2fbaf02086ad2b989accba68e6a9cb5ab5 8f2462ead6441802a313373831c049a10465ba73
+8f2462ead6441802a313373831c049a10465ba73 7c04317658e9e33cc13113d833b0dff1c92c134e
+3e30a989772d3d1931bbe7a7065a905be61385c8 16ede37af50bf397cb08a4b83766a7c7465857d9,7c04317658e9e33cc13113d833b0dff1c92c134e
+7c04317658e9e33cc13113d833b0dff1c92c134e 20a8d29b9b4732f0aaa19129e9fa35cb95404edc
+20a8d29b9b4732f0aaa19129e9fa35cb95404edc 931244e94b062bb1a9d7af0078fc55465079d14c
+16ede37af50bf397cb08a4b83766a7c7465857d9 c4b5049ef650faded2af059d1e2dd2357f917a77,641de07eb28ec9fc09db6a32cf9c82908a8f8fdd
+c4b5049ef650faded2af059d1e2dd2357f917a77 741ee4b6a72d021b97712a303f6b3dfd5e91e379,e9444e85d37ef71fae8264684e627d14ccdb0e34,931244e94b062bb1a9d7af0078fc55465079d14c
+931244e94b062bb1a9d7af0078fc55465079d14c 769eada4588c4c14812c10d8bfcec36e169b46c5
+741ee4b6a72d021b97712a303f6b3dfd5e91e379 769eada4588c4c14812c10d8bfcec36e169b46c5,1fe765631fd96ed6e04304818a102c7a232d106e
+769eada4588c4c14812c10d8bfcec36e169b46c5 702e56f5a226458ce02fba6c18902b0b7bef2926
+702e56f5a226458ce02fba6c18902b0b7bef2926 b2688e276938c63f0e83343755c96e4ee87dcc8d
+b2688e276938c63f0e83343755c96e4ee87dcc8d e45a9670135d682a6a5f2af660950a6b8b2f589c
+e45a9670135d682a6a5f2af660950a6b8b2f589c f20587918bc5e1886f910058e5189d33ca07e2bb
+f20587918bc5e1886f910058e5189d33ca07e2bb ae80d00cc7e94dbfbe164d9a63022f16c61082b2
+ae80d00cc7e94dbfbe164d9a63022f16c61082b2 eb90f6fe980d47e0aeec5e24b106ff77ee4373bf
+eb90f6fe980d47e0aeec5e24b106ff77ee4373bf 2e84f80306de8d059a99affe97a6566244630b50
+2e84f80306de8d059a99affe97a6566244630b50 ffaeb9b69270c01c528394cb080e2ba815b0413b
+ffaeb9b69270c01c528394cb080e2ba815b0413b ec5345e6ecc7783dee188df0d4eae343912d9eac
+ec5345e6ecc7783dee188df0d4eae343912d9eac 731033a46a8632934c70c4a5aa1d354e91e2619f
+731033a46a8632934c70c4a5aa1d354e91e2619f 37a2da3f610d19d28099467f73fabe68713dd44b
+37a2da3f610d19d28099467f73fabe68713dd44b f08db11c36260ef555311695aef4290b4e6a22ee
+f08db11c36260ef555311695aef4290b4e6a22ee af3a660dfbb6065dafea4b91677da02ef8398f7a
+af3a660dfbb6065dafea4b91677da02ef8398f7a 19f2bc121f642d42ac3ccfab583566cc567bf0b0
+19f2bc121f642d42ac3ccfab583566cc567bf0b0 a36cdd0820c18f70ccc19e284c4b81dd1b8be2a1
+a36cdd0820c18f70ccc19e284c4b81dd1b8be2a1 00665c494078299dd945b4c438f8d7644cd04608
+00665c494078299dd945b4c438f8d7644cd04608 965c3fa0774eee49c5d8a6b128cf820a41f95fb6,f66fad5ea749f3df400e17e58c347b99e380a2dc
+965c3fa0774eee49c5d8a6b128cf820a41f95fb6 059415e777ed0967b88997c5e11f10e417024926,f7a5f0b8f14cda009733dc89a69c97a60a7ee4fe
+059415e777ed0967b88997c5e11f10e417024926 d3caf011b4c7ec0b40cadc97bd5d619654e5d03b,f66fad5ea749f3df400e17e58c347b99e380a2dc
+d3caf011b4c7ec0b40cadc97bd5d619654e5d03b 2c08c1f7c0493877c114715633c59bc2381a1113
+f7a5f0b8f14cda009733dc89a69c97a60a7ee4fe b129805ac85708a12a222c298b9c361f6ccf116d
+2c08c1f7c0493877c114715633c59bc2381a1113 49469ad16e121ddc47ac2cb268a71f5fe4e84e2f
+49469ad16e121ddc47ac2cb268a71f5fe4e84e2f 1aaf1064c64285d7466f05f2521d0a3554ea5fb0
+1aaf1064c64285d7466f05f2521d0a3554ea5fb0 eecf6b993e5deb874410fa317bb020d3b68b76e1
+eecf6b993e5deb874410fa317bb020d3b68b76e1 57d7865ae2c1a2a34822f253dcf9655e2e65de5c
+57d7865ae2c1a2a34822f253dcf9655e2e65de5c 0be89c389a4609197fe89dcda300528fc8c35c5a
+0be89c389a4609197fe89dcda300528fc8c35c5a b129805ac85708a12a222c298b9c361f6ccf116d
+b129805ac85708a12a222c298b9c361f6ccf116d f3be772e6ca62c38a11429c4c833cb038efe88e4
+f3be772e6ca62c38a11429c4c833cb038efe88e4 2cf2b7b1449efe706e802779e083fe6b358450b5,234608b6ff336c17a62e728fa8940e81393ef2d9
+2cf2b7b1449efe706e802779e083fe6b358450b5 44b91abd1f8477a45c7e257a51f5053e1fa207e1
+44b91abd1f8477a45c7e257a51f5053e1fa207e1 ca9da88e3e855c589ccb1d55c6661c76724b5279,1b5d412efbfb5634ce7799a505afe4925825df0f
+ca9da88e3e855c589ccb1d55c6661c76724b5279 e03d5c75f8af0be58e38b630f20de226de34a355
+e03d5c75f8af0be58e38b630f20de226de34a355 231a14dc2dd954ba25edc51a72e662daa53a192e
+231a14dc2dd954ba25edc51a72e662daa53a192e ec43e24ac438d698688e9afdd1a8e5edac65d67d
+ec43e24ac438d698688e9afdd1a8e5edac65d67d 351fd3ff4fd7df647baa430e6ed5a131824d655d
+351fd3ff4fd7df647baa430e6ed5a131824d655d ac8a516285c3fc79a272f935794a42e06621b46f
+ac8a516285c3fc79a272f935794a42e06621b46f 3a76f000c0bfa520b3b8d28b68d118caf37ef60d
+3a76f000c0bfa520b3b8d28b68d118caf37ef60d b7dfc5691b1deb29ddc0ff2d0d8417914960581f
+b7dfc5691b1deb29ddc0ff2d0d8417914960581f ab579cdb7a3bc9bca352591376aa7ac11ffe871b
+ab579cdb7a3bc9bca352591376aa7ac11ffe871b db1d22eadb8a586d7fc580a3d82029bdf7443d3c,8e9712a5d398a9fe5f8934af787d5d5d95a49a15
+db1d22eadb8a586d7fc580a3d82029bdf7443d3c f61052be3c1cb795806f4c8895add22d6d1c9bf8,1550ea7ddf75b4478f9cf8719b00fc1cafa26a1e
+f61052be3c1cb795806f4c8895add22d6d1c9bf8 8293650fcd428a498d500053f6d145e51b6ca526,2ea9ce81b49510a06465aa57e03fa9f5846abed7
+8293650fcd428a498d500053f6d145e51b6ca526 6fbc0a6bcf00bdf91d1ad9d133b34a29751ae9df
+6fbc0a6bcf00bdf91d1ad9d133b34a29751ae9df 2be9e621916f2895bc52f74d45a2c65b0d10f91c
+2be9e621916f2895bc52f74d45a2c65b0d10f91c c038aff905aa4ecad62a1da3d559d4bbd7ed2204,fe83540f6ad304de3f03fda268112557485781de
+c038aff905aa4ecad62a1da3d559d4bbd7ed2204 28de54b8dbfb3b2e5038fb59ab43ecf869733e70
+28de54b8dbfb3b2e5038fb59ab43ecf869733e70 61b1af2634de8b4dd1da756c3c7a57620b517aa6
+61b1af2634de8b4dd1da756c3c7a57620b517aa6 54a615c4aafa3617e6a60b911277ed87d163a162
+54a615c4aafa3617e6a60b911277ed87d163a162 16e5e51d776f635f0aeec080a5e4c26645cf83f6
+16e5e51d776f635f0aeec080a5e4c26645cf83f6 4b37eea7d09d818497b7fdaca5f139d64823e288
+4b37eea7d09d818497b7fdaca5f139d64823e288 002d037cb3d0cbab979b4e2e14b09e16ab2c76ee
+002d037cb3d0cbab979b4e2e14b09e16ab2c76ee 183f89d3457c45a95e5a70bd77943526eb59e45f
+183f89d3457c45a95e5a70bd77943526eb59e45f fa5f74982be4138bda1124183612e353bfe37503
+fa5f74982be4138bda1124183612e353bfe37503 3a179173299d7fdbd0cdeb64095bdd889ae3994f
+3a179173299d7fdbd0cdeb64095bdd889ae3994f d9ba150235432800ddbd88b1c1d36ec2d1fb3169
+d9ba150235432800ddbd88b1c1d36ec2d1fb3169 7ef81d8632ba5534eba2e00152396bf19fae1066,589e316b300ba53abd4c61730283ec7a3026de79
+7ef81d8632ba5534eba2e00152396bf19fae1066 7b1e0451690771f00400b797fbda41496c3941b0
+7b1e0451690771f00400b797fbda41496c3941b0 73cb4bf58e99c6154baa6981ca3e144c4bcbd03c,1d106be1728ca9ca36f72f9c60f0238bdba094e7
+73cb4bf58e99c6154baa6981ca3e144c4bcbd03c 2aaccbd409e28b08e66b8271cce18279d363d982,1b4e30d106adb0ba869c736335aede5e1fd7359d
+2aaccbd409e28b08e66b8271cce18279d363d982 31c8ca7f7868fc612e50a40a8b336abfe59947c2,ef2ec4a2aa8bbc0c3f805b815729f8b3430ac207
+adbeb66c05311ae7dd12044e50ffe30a7bac4d5c e52f8b2513cf17879f6a00d912aa445b35a45d76
+31c8ca7f7868fc612e50a40a8b336abfe59947c2 081ae45cc81c7d9bbcf14dbf11e947868786f4ca
+081ae45cc81c7d9bbcf14dbf11e947868786f4ca 8fe99604383456d3e09bf637076453d9c103690f
+8fe99604383456d3e09bf637076453d9c103690f 29f35f475c1ed2287f876308834d179cd39611ca
+e52f8b2513cf17879f6a00d912aa445b35a45d76 0c8e6ec6fdc3c7fbab8ca602f6aeb6cf430add71
+0c8e6ec6fdc3c7fbab8ca602f6aeb6cf430add71 bea6ae9a16fa70b27d1b341e7c280af1e97e31c0
+bea6ae9a16fa70b27d1b341e7c280af1e97e31c0 13061daea933c0ca8871abf3aa7d09a75b224706
+13061daea933c0ca8871abf3aa7d09a75b224706 e69f5bdf52f9b9757fc8db839951fa114296d6b4
+e69f5bdf52f9b9757fc8db839951fa114296d6b4 e7f856437160ec8916590616ec6f4b3fd17ce57d
+29f35f475c1ed2287f876308834d179cd39611ca 55bfa73d283ae904ae5cea04b8b27e6c3a75eb3a
+e7f856437160ec8916590616ec6f4b3fd17ce57d 977b907588e312b9feb26c3c49f168aaec0ac0e1
+977b907588e312b9feb26c3c49f168aaec0ac0e1 e0622d9f3d96c83e832c2e833c3d619e1ce765dd
+e0622d9f3d96c83e832c2e833c3d619e1ce765dd b28d552c97adc2d965ab7babf7c890e56e4eb4ce
+b28d552c97adc2d965ab7babf7c890e56e4eb4ce 366547935e9b654834b37a1cf05cf02a8bf1bbb0
+366547935e9b654834b37a1cf05cf02a8bf1bbb0 86a0fe717f7d121df52f81d3b4447c6d89d68c63
+86a0fe717f7d121df52f81d3b4447c6d89d68c63 20ab92b6e4a54fbc9f880852cbea28dc4a880f08
+20ab92b6e4a54fbc9f880852cbea28dc4a880f08 439caadb720f77df4157a7622ec441c6a01c6890
+439caadb720f77df4157a7622ec441c6a01c6890 82da6b65d8f801579b16415c2d2bc937694dbabd
+82da6b65d8f801579b16415c2d2bc937694dbabd e660d445bedeea6fc21810ef805b072b12056719
+e660d445bedeea6fc21810ef805b072b12056719 f8012076472f9a344abd6e7bafe3fd87c8714c47
+f8012076472f9a344abd6e7bafe3fd87c8714c47 959864784f3e7cf5452de90a774c7772eb3f7e51
+959864784f3e7cf5452de90a774c7772eb3f7e51 6899c9d176819ece27b00273876bea0647978d87
+6899c9d176819ece27b00273876bea0647978d87 723893d25c365adf9a50c309bd86458bad42e854
+723893d25c365adf9a50c309bd86458bad42e854 3484aad0053fc732860b110832ad11b445a45a20
+1d106be1728ca9ca36f72f9c60f0238bdba094e7 b5a0ecc65a1717a86364171529faf7352cd06bff,55bfa73d283ae904ae5cea04b8b27e6c3a75eb3a
+3484aad0053fc732860b110832ad11b445a45a20 da6d7b66552aac978cb586e2851fb56dfd167326,55bfa73d283ae904ae5cea04b8b27e6c3a75eb3a
+da6d7b66552aac978cb586e2851fb56dfd167326 b0a3cd70ab279e18883552db4a58982f84247294
+b0a3cd70ab279e18883552db4a58982f84247294 60b0f467ffc8670113b608b2ddbf88278a8a4ecf
+60b0f467ffc8670113b608b2ddbf88278a8a4ecf b5a0ecc65a1717a86364171529faf7352cd06bff
+55bfa73d283ae904ae5cea04b8b27e6c3a75eb3a 582b7fa0fbd2cecebceaa05b153860a49174d68f
+582b7fa0fbd2cecebceaa05b153860a49174d68f 7566f2bf71d40b4db4e7c42a4ed5b9604f5cc01c
+7566f2bf71d40b4db4e7c42a4ed5b9604f5cc01c c7a72a621149e788759cc375d5edf021a4eb35b5,06d1c273aab289fb1085e2d470c892222ca9086b
+c7a72a621149e788759cc375d5edf021a4eb35b5 4952641dd93462e7fde19779ba307e3e8e970816
+4952641dd93462e7fde19779ba307e3e8e970816 3c893a4210512daa70e7c955633e824f84d32d30,017981efcd5dbe3b7a59e19a0b8b1b3345a3deb9
+017981efcd5dbe3b7a59e19a0b8b1b3345a3deb9 900b334740ad45bcbcfc7421e0703a51890f05c5
+900b334740ad45bcbcfc7421e0703a51890f05c5 d9e675ce754550947c6e46586afc9705499a27fb
+d9e675ce754550947c6e46586afc9705499a27fb 3c893a4210512daa70e7c955633e824f84d32d30
+b5a0ecc65a1717a86364171529faf7352cd06bff 1254c88236907d47f7445c3f21ddb2606a3ea264
+1254c88236907d47f7445c3f21ddb2606a3ea264 542b91337514945425da3d5722a87c0564d068c8,3c893a4210512daa70e7c955633e824f84d32d30
+3c893a4210512daa70e7c955633e824f84d32d30 d26d705d6d4ae7234ee0a81b5ade3861e21abf15
+542b91337514945425da3d5722a87c0564d068c8 50ea23ff376618ba330117cf27c0d105f4e4e35b
+50ea23ff376618ba330117cf27c0d105f4e4e35b d26d705d6d4ae7234ee0a81b5ade3861e21abf15
+d26d705d6d4ae7234ee0a81b5ade3861e21abf15 ac0148ceafdaced62f5dfa03eaabb657185608de
+ac0148ceafdaced62f5dfa03eaabb657185608de 430f66247caec1a031a28b997f05a6f84155adda
+430f66247caec1a031a28b997f05a6f84155adda 1f6bb250f849ccfceb3ca03d383913896c7ca04b
+1f6bb250f849ccfceb3ca03d383913896c7ca04b 6d8663e1519c3c38126b6b35a7dc51d10692b558
+ed59d297988963292cb5f31798edb2c095027d2c c6ecb4ee03f6726df71fd4c74448315bdd31c285
+6d8663e1519c3c38126b6b35a7dc51d10692b558 32331b404a5e8fd77f7f83a15ef6e0dad4556959,85039c3ea470a14df0c2ce193ed4bc101b0ba761
+85039c3ea470a14df0c2ce193ed4bc101b0ba761 32331b404a5e8fd77f7f83a15ef6e0dad4556959
+c6ecb4ee03f6726df71fd4c74448315bdd31c285 32331b404a5e8fd77f7f83a15ef6e0dad4556959
+32331b404a5e8fd77f7f83a15ef6e0dad4556959 16c73ccb256348cf2de008746ea8d8a61c164173
+16c73ccb256348cf2de008746ea8d8a61c164173 8fddfd8f37adc66bdca13e41909e34bfe95ca285
+8fddfd8f37adc66bdca13e41909e34bfe95ca285 c066b7977151553d9ec37f5db8eb3776ee1d8c88
+c066b7977151553d9ec37f5db8eb3776ee1d8c88 738e6abeed9a984f31700812d084cd6ec40fe47d
+738e6abeed9a984f31700812d084cd6ec40fe47d 59a626c53fe61faf9fd4a1565814c0087d38e8b0
+aefba9d5f100edcf3c42a787563a2c231f7d27a6 99dec402d5e4207653a81fb914c06cfb50359d7c
+99dec402d5e4207653a81fb914c06cfb50359d7c 86beaad7468f163c3efd9f7f224e29768bfbbf0e
+86beaad7468f163c3efd9f7f224e29768bfbbf0e 386832d44235c0915bd0c59098ed39eeadc5d789
+386832d44235c0915bd0c59098ed39eeadc5d789 adb0f2f99cc50f48d0c1be93f04c78f2ed71f9e3
+adb0f2f99cc50f48d0c1be93f04c78f2ed71f9e3 f2aaee910053f7f2803ae67858011d7aaa50a1bd
+f2aaee910053f7f2803ae67858011d7aaa50a1bd 884a77869d8281d66058ef769c4f880fb6f51865
+884a77869d8281d66058ef769c4f880fb6f51865 8a363f876e77ab3e144a67ef3120384b6b1b513c
+8a363f876e77ab3e144a67ef3120384b6b1b513c 59a626c53fe61faf9fd4a1565814c0087d38e8b0
+59a626c53fe61faf9fd4a1565814c0087d38e8b0 4c0b5593dd64f4f03ea32ee9d1853347fa022db8
+4c0b5593dd64f4f03ea32ee9d1853347fa022db8 a5596b73e4822e25faf10acd35abf01b9b111b07
+a5596b73e4822e25faf10acd35abf01b9b111b07 5834a7acc8eaf3139a43dac4f56bb59a9c4679e8
+5834a7acc8eaf3139a43dac4f56bb59a9c4679e8 74324f583bc9dd7317a7c31cc6a3fd754693a903
+74324f583bc9dd7317a7c31cc6a3fd754693a903 eb63661bd1476f9156c6cf61534644f5b2d7b6bc,71d89918c0e5efb435591a5e25dd67b157540146
+71d89918c0e5efb435591a5e25dd67b157540146 934132ed7c6b885d00911062f5e0d2cad1032f8b
+934132ed7c6b885d00911062f5e0d2cad1032f8b edcc532c167c4ae2b74d6cbbe040ae356e1862f3
+edcc532c167c4ae2b74d6cbbe040ae356e1862f3 a647090d9409d12c72248d6b4a20ad38d252214a
+a647090d9409d12c72248d6b4a20ad38d252214a eb63661bd1476f9156c6cf61534644f5b2d7b6bc
+eb63661bd1476f9156c6cf61534644f5b2d7b6bc dbcb3cf9a959924a84fdc7cf79d1887c5e95f4dd
+dbcb3cf9a959924a84fdc7cf79d1887c5e95f4dd b2e6ae7b8938c2518d58179bf92c54d7454c5243
+b2e6ae7b8938c2518d58179bf92c54d7454c5243 a4dbbfa5fddfc3e167a1b4c05e57336b05ee9222
+a4dbbfa5fddfc3e167a1b4c05e57336b05ee9222 22faaf83686db877ff9058220271ba8827717a9b
+22faaf83686db877ff9058220271ba8827717a9b 2b11d3acea19d9917ac6a3b11c71e44d52c200d3
+2b11d3acea19d9917ac6a3b11c71e44d52c200d3 866681b74e95b997147b99c51e07da5d60feb432
+866681b74e95b997147b99c51e07da5d60feb432 494eadce2e32082499eddbf082ccc0e49ece3466
+494eadce2e32082499eddbf082ccc0e49ece3466 c45b0ca87c2b86f41f14bac0b162a446681aa601
+c45b0ca87c2b86f41f14bac0b162a446681aa601 11a467a8ef91545bb242890660b7c1ed16481f55
+11a467a8ef91545bb242890660b7c1ed16481f55 be6116e971bb865603ed4a6c8f83bd691c54422a
+fff83466f384a50a9cdbc24fdbec64fbe97b397b be6116e971bb865603ed4a6c8f83bd691c54422a
+be6116e971bb865603ed4a6c8f83bd691c54422a 38764bf86da93d5795e40d18947e4c6a8d71842f
+38764bf86da93d5795e40d18947e4c6a8d71842f 566569e56f5ce387da9bd1238e12e4a4673193a9
+566569e56f5ce387da9bd1238e12e4a4673193a9 33cf143a502e8422991ffd33794c4344e3cfd733
+33cf143a502e8422991ffd33794c4344e3cfd733 2a51bc466941c8e4cc79a790df3b41f94efe902e
+2a51bc466941c8e4cc79a790df3b41f94efe902e 67b2c7d27d32bc86e5c85546911865e6d53cbbd2
+67b2c7d27d32bc86e5c85546911865e6d53cbbd2 d12eb7e791044c266d07998cd4e302390f73c881
+d12eb7e791044c266d07998cd4e302390f73c881 5d8a2f9b91d23ef0302b3adf7c8c307a138eb03e
+5d8a2f9b91d23ef0302b3adf7c8c307a138eb03e 6c93b89220d50081c68cfcc49a18b3f413c91044
+6c93b89220d50081c68cfcc49a18b3f413c91044 6733bbf4a7a0255f2134f3bc7013a3a0b44d9723
+6733bbf4a7a0255f2134f3bc7013a3a0b44d9723 e669693ecfde3d8f65b6f79da4c0a5275908855a
+e669693ecfde3d8f65b6f79da4c0a5275908855a 0a8c497528261aa173658da4e2b416b3a58071f8
+0a8c497528261aa173658da4e2b416b3a58071f8 058bef15102031f9c04c7887b6497986f722513c
+058bef15102031f9c04c7887b6497986f722513c e4339a3c50515554d514886f630f68557ccc57a3,7a8dbd329924b2c3a1c5b3dd7a754ae677995f25
+7a8dbd329924b2c3a1c5b3dd7a754ae677995f25 52591d24f412f3dedf650c931009dfe99dd74b3e
+e4339a3c50515554d514886f630f68557ccc57a3 1b80dd0400d1deace38ef139ff02ff621f785bdf
+1b80dd0400d1deace38ef139ff02ff621f785bdf fd4c0d8701b7646e93dba00409e9022dac714827
+52591d24f412f3dedf650c931009dfe99dd74b3e fb7e6638f82b75f13d06d9695667992eba806073
+fd4c0d8701b7646e93dba00409e9022dac714827 b04e689404c660fdf6727bf2645dd515f6a2fed4
+b04e689404c660fdf6727bf2645dd515f6a2fed4 83edad0b8e3b7d7932fa579d0dce19b074773b29
+83edad0b8e3b7d7932fa579d0dce19b074773b29 10d6c50ecd62eaaf8476fd1f7878a7e6a4b9bf0f,27a8f638a910eca20e09ad51deb3ea22182077e8
+10d6c50ecd62eaaf8476fd1f7878a7e6a4b9bf0f 97716c5057503600ac267505e910b7b601c2ae26
+97716c5057503600ac267505e910b7b601c2ae26 fb7e6638f82b75f13d06d9695667992eba806073
+fb7e6638f82b75f13d06d9695667992eba806073 d55ba5cbfdf0cb089cdb58a32d7aaea623fef1ed
+d55ba5cbfdf0cb089cdb58a32d7aaea623fef1ed 6f7d6654c501279e136dae443ed655021fc25124
+6f7d6654c501279e136dae443ed655021fc25124 949d5407dbad5db056abd5b028a9cdce2c3eae58
+949d5407dbad5db056abd5b028a9cdce2c3eae58 6139430731c2e3daf64bf3515effab4064da2eef
+6139430731c2e3daf64bf3515effab4064da2eef c1e7660763b4416639fb0e35b58f290da1a854e5
+c1e7660763b4416639fb0e35b58f290da1a854e5 c260f8f3ea5df6be3602ccddc140193ba64443fd
+c260f8f3ea5df6be3602ccddc140193ba64443fd 2f6d498c71980333cb734d6a1226e8ebd46b2bef
+2f6d498c71980333cb734d6a1226e8ebd46b2bef 10a8cb99bfe2b89a84510196977d3a6c9401e78c
+10a8cb99bfe2b89a84510196977d3a6c9401e78c f4e6b4ecb213799fe9ebfaff2799b803eb4fa53d
+f4e6b4ecb213799fe9ebfaff2799b803eb4fa53d 6b4a7cf4a41521712a2d8076f3d20acc84111f61
+6b4a7cf4a41521712a2d8076f3d20acc84111f61 96a83f9ea5e62c9adced7d43f9818eb86e832d25
+96a83f9ea5e62c9adced7d43f9818eb86e832d25 5a7b531a5237bc6f9d8ccdf4ead5db55a8017ce2
+5a7b531a5237bc6f9d8ccdf4ead5db55a8017ce2 ac5c30cfa9a0af5aa442b6cf1c3cb60809e6ae9f
+ac5c30cfa9a0af5aa442b6cf1c3cb60809e6ae9f eed93e593410ead2dfb213c22cd4d461d748caf5
+eed93e593410ead2dfb213c22cd4d461d748caf5 681c4c04e0479999d9c39ba33a6c961c5f21e932
+681c4c04e0479999d9c39ba33a6c961c5f21e932 268ce73e8a93b35c48177f348e55e2b09ecf2ac2
+268ce73e8a93b35c48177f348e55e2b09ecf2ac2 91fc43b9f0070cc6c64f813846a19dc38e5885fe
+91fc43b9f0070cc6c64f813846a19dc38e5885fe c4eadcfc06eeb2f82f7e84ebf3c1eede03f20c65
+c4eadcfc06eeb2f82f7e84ebf3c1eede03f20c65 50a6d511213fbb79c2105e6478e0a0c89ae32dff
+50a6d511213fbb79c2105e6478e0a0c89ae32dff 55ad7b5c0301c04c61f781ec2e7c760eda44b8a5
+55ad7b5c0301c04c61f781ec2e7c760eda44b8a5 c64db4cd71340dec95f5e1fb95ce7a5c4b783cbd
+c64db4cd71340dec95f5e1fb95ce7a5c4b783cbd e15d743b85df021b3c3a8af77165c81db0684ed8
+e15d743b85df021b3c3a8af77165c81db0684ed8 8a75426772eb59bd97a9657c5e622a4e934eecb7
+8a75426772eb59bd97a9657c5e622a4e934eecb7 7011408fb5511bc3278fa56429b2f4a43819dcc3
+7011408fb5511bc3278fa56429b2f4a43819dcc3 ee1d5c9fac14e0c5a23f0b1479968d535cb361ce
+ee1d5c9fac14e0c5a23f0b1479968d535cb361ce a3760325d1d17ed96dc4138ae6e1f32bb3107f90
+a3760325d1d17ed96dc4138ae6e1f32bb3107f90 0323ded23f0f2937f939f8cb935a0529d1eac99c
+0323ded23f0f2937f939f8cb935a0529d1eac99c 5cda9f73463a504d040ccce183bcfc3d1239fcd6
+5cda9f73463a504d040ccce183bcfc3d1239fcd6 aa94695956a625174f6d85c2f566a81c4107867e
+aa94695956a625174f6d85c2f566a81c4107867e 03d9a6fefa74839a49232900092f7c5b1a4e53d9
+03d9a6fefa74839a49232900092f7c5b1a4e53d9 abf642e1fb04d7765589d5599e0de281bb92029e
+abf642e1fb04d7765589d5599e0de281bb92029e 0c15178d6d1f09ff8f09fa430bc73adaab1d2d62
+0c15178d6d1f09ff8f09fa430bc73adaab1d2d62 708a0404a7604d2efcede5917e3254725bc86acf
+708a0404a7604d2efcede5917e3254725bc86acf e174a07c36829083e912566dcd3907aa9bc83877
+6929385e83c3c54019e85e5eb4094d0c4fcbcb21 e174a07c36829083e912566dcd3907aa9bc83877
+e174a07c36829083e912566dcd3907aa9bc83877 754913fd32aa45542db1ef62fa4a9652b936fc29
+64c9c79a950c8a37d631cf7ea078270ac4eca7d9 1519ed155c9c1400fd579bc02cb50e1c47a3a56b
+754913fd32aa45542db1ef62fa4a9652b936fc29 0251c2384e7f1b247cb63560c5ef1b5a7ad6331c
+0251c2384e7f1b247cb63560c5ef1b5a7ad6331c 8e8dd3185e704f0b699e8712e1d4e1b4bbc94439,7a74b8e95278601116074b745efb8cc0cda35be5
+1519ed155c9c1400fd579bc02cb50e1c47a3a56b 5fb5dbfbf78c969ff4590c7d5e6ee60a98d6a256
+5fb5dbfbf78c969ff4590c7d5e6ee60a98d6a256 3200899a59caa8666a805583b2c0ea3228931542
+3200899a59caa8666a805583b2c0ea3228931542 39082cc602697fab98b65fa1a07daa276f31d1d0
+8e8dd3185e704f0b699e8712e1d4e1b4bbc94439 087b1eac2a1b7f3034e6eb39ba4fa6bb545ed25b,cb3bbc9d2e0a39c37bce340972c524a3b0c8e77f
+087b1eac2a1b7f3034e6eb39ba4fa6bb545ed25b 1dd24dcdda7d20f38bd88a0c2c01a4283d0e3eb0
+39082cc602697fab98b65fa1a07daa276f31d1d0 a00177454224cbad76c210cdb433359f7628ff07
+a00177454224cbad76c210cdb433359f7628ff07 8f16c927857bc68a2d317d10641842e5ae4f475e
+8f16c927857bc68a2d317d10641842e5ae4f475e 8abfd3775131b06db3b745f1c67a3b9ad5bba6ec
+8abfd3775131b06db3b745f1c67a3b9ad5bba6ec 992c83b80ddbf4d0dbd67afd1f5cb0050d9bbacb
+992c83b80ddbf4d0dbd67afd1f5cb0050d9bbacb 7a74b8e95278601116074b745efb8cc0cda35be5,00b438b957bdfbe2385f11cbd189ab5ddb02b05c
+00b438b957bdfbe2385f11cbd189ab5ddb02b05c eb1aa9c1230160fe1a8cf99c5943c0c19cc4c82d,7a74b8e95278601116074b745efb8cc0cda35be5
+eb1aa9c1230160fe1a8cf99c5943c0c19cc4c82d a32edcfb82854905ee5d3efd3a59c158209c4b16
+7a74b8e95278601116074b745efb8cc0cda35be5 2741d9eb4fd52f98b05fc33534428c226c016bef
+a32edcfb82854905ee5d3efd3a59c158209c4b16 c6224b1a9100e05cc5850b3dd5bcdab4c705fbed
+2741d9eb4fd52f98b05fc33534428c226c016bef c661628acbf41075ef824a737bc225f6f173a0c6
+c661628acbf41075ef824a737bc225f6f173a0c6 56e69f81e0f86eb66f9ab620298f00e4613232d2
+c6224b1a9100e05cc5850b3dd5bcdab4c705fbed ac6f23131f686339af403d236dac13c1fd6f2e14,56e69f81e0f86eb66f9ab620298f00e4613232d2
+56e69f81e0f86eb66f9ab620298f00e4613232d2 1dd24dcdda7d20f38bd88a0c2c01a4283d0e3eb0
+ac6f23131f686339af403d236dac13c1fd6f2e14 f5fba357bdfc3898731bfbb3866ef40ee75b16c0
+f5fba357bdfc3898731bfbb3866ef40ee75b16c0 f5559ef39a659c9f42979d45e7583a1d388c881e
+1dd24dcdda7d20f38bd88a0c2c01a4283d0e3eb0 b9f1218ee50d5a4df6aa0b76289e826b72d4f1bc
+f5559ef39a659c9f42979d45e7583a1d388c881e 335c8473b59bdc38492c9ead1bc3a0b5245d2e17
+335c8473b59bdc38492c9ead1bc3a0b5245d2e17 e551f1cae08dbe419dc2320cdd30f1cb04dad75b
+e551f1cae08dbe419dc2320cdd30f1cb04dad75b 90e6a7e419181c0fb3ea16d70a097b7099e25bd4
+90e6a7e419181c0fb3ea16d70a097b7099e25bd4 03ef168ab1775755638995b16d4c73ac64776c75
+03ef168ab1775755638995b16d4c73ac64776c75 b9f1218ee50d5a4df6aa0b76289e826b72d4f1bc
+b9f1218ee50d5a4df6aa0b76289e826b72d4f1bc f5f300b27d1b2a90d051f6137dcad9aae07a556c
+f5f300b27d1b2a90d051f6137dcad9aae07a556c 2d65cd8ad02de59743a61d2a04517f4b3968718b
+2d65cd8ad02de59743a61d2a04517f4b3968718b 93e4191ac585f159d69c56d24ff90f8cbd130f72,e99d630f5587c9fc7c3319e98a4c0c45ee3ce939
+e99d630f5587c9fc7c3319e98a4c0c45ee3ce939 649822464b92911db5733c5a6cd604d27f691387
+649822464b92911db5733c5a6cd604d27f691387 93e4191ac585f159d69c56d24ff90f8cbd130f72
+93e4191ac585f159d69c56d24ff90f8cbd130f72 4f2bafcb9e72d6be2bbfd96f8496b897cae985f3
+4f2bafcb9e72d6be2bbfd96f8496b897cae985f3 470f227b7c55112c04a4d63ad7e7d081be0b1e36
+470f227b7c55112c04a4d63ad7e7d081be0b1e36 5e968a126b69f89494596d6e429dee59826abbf6
+5e968a126b69f89494596d6e429dee59826abbf6 8232118283fc2cfa70eec8239a1012a62a15948d,1ba6aba073c6860a1a020486827144afef86abba
+8232118283fc2cfa70eec8239a1012a62a15948d 59a93a028a7d69ebeea9d2148615c411bb8be404
+1ba6aba073c6860a1a020486827144afef86abba 94a053d0eab42120fb0896f671db5fc1a9de46f5,a2ee369f433a570c5bcf673ec5d57f93a57ce54b
+59a93a028a7d69ebeea9d2148615c411bb8be404 a2ee369f433a570c5bcf673ec5d57f93a57ce54b,94a053d0eab42120fb0896f671db5fc1a9de46f5
+a2ee369f433a570c5bcf673ec5d57f93a57ce54b 977ca5be29771ae6680f3cee3cb420feb186a691
+977ca5be29771ae6680f3cee3cb420feb186a691 9480b4262994433d56ea454f5f942631f4346774
+94a053d0eab42120fb0896f671db5fc1a9de46f5 c28e4b5652ff8d1c9c3a5525a3762034086c9ab6
+c28e4b5652ff8d1c9c3a5525a3762034086c9ab6 f8b993531b45d0022629fd19ca5340dd9c397618
+9480b4262994433d56ea454f5f942631f4346774 9ebad2b30da5317976e8176fc160fccef4c589fb
+9ebad2b30da5317976e8176fc160fccef4c589fb 4aeb75f670ba69c9abd0ad109cc2d5b2ff3033d2
+4aeb75f670ba69c9abd0ad109cc2d5b2ff3033d2 d668d912e4bf2d89acbe50c524f72e4eaec835dd
+d668d912e4bf2d89acbe50c524f72e4eaec835dd c2d166b052fc39a8461a56b46d0ee330893402d0
+c2d166b052fc39a8461a56b46d0ee330893402d0 90452f880b21795692a2ac3d5113aefc5963abba
+f8b993531b45d0022629fd19ca5340dd9c397618 90452f880b21795692a2ac3d5113aefc5963abba
+90452f880b21795692a2ac3d5113aefc5963abba c280060f24e08bbd58a9d8ea941ff3780ede11d1
+c280060f24e08bbd58a9d8ea941ff3780ede11d1 77f61cd330a3ca2373c1d432d05ce087c8fd0db1
+77f61cd330a3ca2373c1d432d05ce087c8fd0db1 9e56800a6942b9cc89cd15a1373c414049393b05
+9e56800a6942b9cc89cd15a1373c414049393b05 01ed63fe8a3016ef61c067400cee73407c1a4d79,14e9c3fb650acaa291b75625bfa4a58f05c8297e
+14e9c3fb650acaa291b75625bfa4a58f05c8297e 01ed63fe8a3016ef61c067400cee73407c1a4d79
+01ed63fe8a3016ef61c067400cee73407c1a4d79 d7e5356bcad6e5622ea68cc039e89e86ba749493
+d7e5356bcad6e5622ea68cc039e89e86ba749493 3f0d1f8803cb6a95353b635c2dfe9c9cc4ef3899
+3f0d1f8803cb6a95353b635c2dfe9c9cc4ef3899 b5ed77d7454aac9d98703f7cd688bf408847c1ee
+b5ed77d7454aac9d98703f7cd688bf408847c1ee 2a86e587bcf4871707cb3aa55ceb44702495b91d
+2a86e587bcf4871707cb3aa55ceb44702495b91d 497953438434d529d1362091a6ee1fbca1ef2ee9
+497953438434d529d1362091a6ee1fbca1ef2ee9 1e9a20f13ab327da684893f312d18f06815f5a77,ae42e0260e2f476bb6c0558e1604d9b812a4b004
+ae42e0260e2f476bb6c0558e1604d9b812a4b004 ae21e2aec14b38a3186f609656779e22eec3a11b
+ae21e2aec14b38a3186f609656779e22eec3a11b 915e74bc332cca88f57964fe501c1d5c05b6e79a
+915e74bc332cca88f57964fe501c1d5c05b6e79a d05d52e7504b851b0932af9d52fbef30e08accca
+d05d52e7504b851b0932af9d52fbef30e08accca 1e9a20f13ab327da684893f312d18f06815f5a77
+1e9a20f13ab327da684893f312d18f06815f5a77 b7bca59fa9703a5a024fc550340524fc591132fc
+b7bca59fa9703a5a024fc550340524fc591132fc f598a7e51ea45ca101f2e89a1b31aa0618a9041e,18868f44fd07e5c73329377c60e946c8c4c4efb5
+f598a7e51ea45ca101f2e89a1b31aa0618a9041e b6ea4f981a526654afe9d6d30d5b462ae3a0cf62
+b6ea4f981a526654afe9d6d30d5b462ae3a0cf62 c57a166878875b960e8051d72eec716c016baf5b
+c57a166878875b960e8051d72eec716c016baf5b f1ae1885662d78efd7bc206352c21a1a974a2c0b
+f1ae1885662d78efd7bc206352c21a1a974a2c0b ab7e6db80c30b830ec8dc016e162f52b2ee7eb94
+ab7e6db80c30b830ec8dc016e162f52b2ee7eb94 6961246ad7afecc990d346b9d2f543b6abb76bf7
+6961246ad7afecc990d346b9d2f543b6abb76bf7 97727e82b875406e51e022fcddc642180f06e675
+97727e82b875406e51e022fcddc642180f06e675 3321c2c52278ba7f8d12aaea3cbc07f6a505fedc
+3321c2c52278ba7f8d12aaea3cbc07f6a505fedc 067b4c3661c6a97f88ff34072107ee601e782183
+067b4c3661c6a97f88ff34072107ee601e782183 cd9d9347c272aa02e2292cc3fa2fd599f53bd2f8
+cd9d9347c272aa02e2292cc3fa2fd599f53bd2f8 64d93529768e368d3dbf59e3da39a1750ab556bb
+64d93529768e368d3dbf59e3da39a1750ab556bb 30b0302862cb860f31ab9ab80e7fc8874e5be1a5
+30b0302862cb860f31ab9ab80e7fc8874e5be1a5 83fad2f941618f4b3efe58a2a40354e7d7f228e9
+83fad2f941618f4b3efe58a2a40354e7d7f228e9 744916ab205a49f31e30a3c215c50b9c1e7ba43c
+744916ab205a49f31e30a3c215c50b9c1e7ba43c 8a292192e55474a928883137244d11ff852ac2f5
+8a292192e55474a928883137244d11ff852ac2f5 d2b6ddbe9c4dc205ed92955daceae90b976399e4
+d2b6ddbe9c4dc205ed92955daceae90b976399e4 794d62eebe3a2bb8dc687152712f02804c76714e
+794d62eebe3a2bb8dc687152712f02804c76714e 856838e0f017591c07fa91f41cdca3423710d1a1
+856838e0f017591c07fa91f41cdca3423710d1a1 6f2b3e137f04276d578b367adf5b8ef4b1b75e7a
+6f2b3e137f04276d578b367adf5b8ef4b1b75e7a f37121f8b18ab9076f299c55249a5f4a5ce83602,fde3dc46b70e5b82c514fe2af4c02cc0c6c8cf78
+fde3dc46b70e5b82c514fe2af4c02cc0c6c8cf78 504c555d5a09ab502c55ef8f6eba884ae8090421
+504c555d5a09ab502c55ef8f6eba884ae8090421 0179214de8763308df414fdd8c25174c2c4d1ac6
+0179214de8763308df414fdd8c25174c2c4d1ac6 237a19178bf7b962c419090447ed12b093f98031
+237a19178bf7b962c419090447ed12b093f98031 be9acfd8edc953fd7c1a27df479f5dcb22d3d023
+be9acfd8edc953fd7c1a27df479f5dcb22d3d023 6b11655edddb7fe8219566adf05a7313cd3f3a52
+f37121f8b18ab9076f299c55249a5f4a5ce83602 3271143f7080ffd0be43286f513b58200a6bde42
+6b11655edddb7fe8219566adf05a7313cd3f3a52 fe0ca9de59f0dd99b5fb45340b42bc2884b263f6
+3271143f7080ffd0be43286f513b58200a6bde42 fe0ca9de59f0dd99b5fb45340b42bc2884b263f6
+ee563960f8474b8b2d6ef1d964ce55be449caa94 fe0ca9de59f0dd99b5fb45340b42bc2884b263f6
+fe0ca9de59f0dd99b5fb45340b42bc2884b263f6 114eed176f7dc84e70c567f7a20d59093bed7105,e4b276aa24aa86724ac0cd824a7227881519c126,ece2bfcae2b3897da82c44c8371486191f1e8c10
+114eed176f7dc84e70c567f7a20d59093bed7105 a8cb71c532ecef1e04cc0090d7bbc9953f673362
+a8cb71c532ecef1e04cc0090d7bbc9953f673362 b79b86ca4b2865063eac92cbdee0fbb37c5f0743
+b79b86ca4b2865063eac92cbdee0fbb37c5f0743 de8934622a88ef3efcae29b44871ffbbbaff4753
+de8934622a88ef3efcae29b44871ffbbbaff4753 08a3d6e3440b4221f4191377a95795e408e90962
+08a3d6e3440b4221f4191377a95795e408e90962 6275b9b5c591725e9d838cfb0d9a69a676cfb736
+0fe0deb19435d23d4b71a8b359dcaf38963b7e2e ece2bfcae2b3897da82c44c8371486191f1e8c10
+ece2bfcae2b3897da82c44c8371486191f1e8c10 776745031ae77aa2af8cafe7d4f6084780499182
+776745031ae77aa2af8cafe7d4f6084780499182 3d4ae9e02e2e680af484d3072dd52945b6c5b83f
+3d4ae9e02e2e680af484d3072dd52945b6c5b83f c460b80adbd94283479a317a59632e9ccf4600ce
+c460b80adbd94283479a317a59632e9ccf4600ce 6275b9b5c591725e9d838cfb0d9a69a676cfb736,0b61bcfc94a82dde32ed899aaebf16a055aa4de9
+6275b9b5c591725e9d838cfb0d9a69a676cfb736 aaa37a7f4af579627ee26c512e13e995f0d0f777,5be250d6fc1102b29d0529bc344ab2f604b9e71f
+aaa37a7f4af579627ee26c512e13e995f0d0f777 bfb563fbe2b0771d55b0f58de88c52b0e65e5157
+bfb563fbe2b0771d55b0f58de88c52b0e65e5157 ba67d062aed155feb5898ba14710bb9373576d44
+0b61bcfc94a82dde32ed899aaebf16a055aa4de9 ba67d062aed155feb5898ba14710bb9373576d44
+ba67d062aed155feb5898ba14710bb9373576d44 93728683855435e098dd85c5865dc9d5394358d5
+93728683855435e098dd85c5865dc9d5394358d5 e4718cf7ed770ae44fa1f433204f0313d2a82fef
+e4b276aa24aa86724ac0cd824a7227881519c126 b711d2b4301cad9eb2d600792480c8365193e2a1
+b711d2b4301cad9eb2d600792480c8365193e2a1 e4718cf7ed770ae44fa1f433204f0313d2a82fef
+e4718cf7ed770ae44fa1f433204f0313d2a82fef 87b98ca112fd8143b05ee24c80ab6734d0eca45a
+87b98ca112fd8143b05ee24c80ab6734d0eca45a 9f03d93cddf2c7503c53eb639fe66d37cefb6a9b
+9f03d93cddf2c7503c53eb639fe66d37cefb6a9b 8b52109594c7f506182eb0cf780a8e30d7605ab7
+8b52109594c7f506182eb0cf780a8e30d7605ab7 a630d7090cea3b1b4eb0b760d16b11506f8a59b6
+a630d7090cea3b1b4eb0b760d16b11506f8a59b6 4432b3c8fa5e5205e70b2195ff3869f1ebee18a5
+4432b3c8fa5e5205e70b2195ff3869f1ebee18a5 441e299543e0f819da8d988de6f36e5f593b5582
+441e299543e0f819da8d988de6f36e5f593b5582 c8b69bc77f121376922659f8a45b85026798313c
+c8b69bc77f121376922659f8a45b85026798313c a354b5c1cb82ccca2e2ad6ccbe161f88e2e5f0d4
+a354b5c1cb82ccca2e2ad6ccbe161f88e2e5f0d4 68d79bff21bb8edebbe644e4ce83279bf1c680b8
+68d79bff21bb8edebbe644e4ce83279bf1c680b8 8de562aa651be4ca133a38bc798c05e5e5d9ac4c
+8de562aa651be4ca133a38bc798c05e5e5d9ac4c 39718da514fa680d3b36220f278ded94fb864a8f
+39718da514fa680d3b36220f278ded94fb864a8f 2e121e3655c16a333eaafabdf3d9a9be0979a99e
+2e121e3655c16a333eaafabdf3d9a9be0979a99e a91345f8e232d8d120a1ba2a6959cf9b3009edaf,70391eee14574b70d75f91f6a7ba24fd0ffd93df
+a91345f8e232d8d120a1ba2a6959cf9b3009edaf 596110698ae00ddcb774e58070f12f35f67b00ab
+596110698ae00ddcb774e58070f12f35f67b00ab 7953e9dc317d38b0b7596c1249c2251c5a8528e4
+7953e9dc317d38b0b7596c1249c2251c5a8528e4 4a97fe2a81a0aa10a8bec8e6dea7189f6f3f4dc4
+18db59ea626c5bcfe6cad451022a7a369e40fa10 4a97fe2a81a0aa10a8bec8e6dea7189f6f3f4dc4
+4a97fe2a81a0aa10a8bec8e6dea7189f6f3f4dc4 7cb9fcca308241b8ee47ac03fbe225f34e4eab44
+7cb9fcca308241b8ee47ac03fbe225f34e4eab44 dabd344efb93270ef258726f7870d4485d334add
+dabd344efb93270ef258726f7870d4485d334add c0aef352366ca03fc684a04a26af9123a2d7f403
+c0aef352366ca03fc684a04a26af9123a2d7f403 3eb427f66fab067982a1525785b6035db89f8fc3
+3eb427f66fab067982a1525785b6035db89f8fc3 25d7ed4419d1f50254f6b4f42dd78938ac4e5d1e
+25d7ed4419d1f50254f6b4f42dd78938ac4e5d1e b5369b3646723455d85a19efde21b54b20f99b27,c60797615037705d285c62bb15b4ff38efa77d1a
+b5369b3646723455d85a19efde21b54b20f99b27 2f99cf9da6268db580aa2046abcc7a4a70644887,55cc440b5e3701841011542eabd752945e529082
+2f99cf9da6268db580aa2046abcc7a4a70644887 c0aaf523c6e77bd3dc079a00b5e34a1584863a8a,3944bdfd6a0741fdd3fdf41c8e6ce4d3c124af66
+c0aaf523c6e77bd3dc079a00b5e34a1584863a8a 5824d18b655397fe0c5d316c228a886f70ec7e9c,a399f30afdaeb5b0b247b3cfdef05300c6f3803f
+5824d18b655397fe0c5d316c228a886f70ec7e9c b054d488904c1db742d4d491a17a2fc7cd287b9e
+b054d488904c1db742d4d491a17a2fc7cd287b9e 5fe44e93934b015546033d33ecbff9f3fbec8e9f,621d3c2ef213a43cad70eb978b3308a4c3e0595e
+5fe44e93934b015546033d33ecbff9f3fbec8e9f b2ea6646eb94c43ebcbb98463157dcd38c1eac50
+b2ea6646eb94c43ebcbb98463157dcd38c1eac50 52d24fd4b2ee1236eb33e6f58ebba63f6af9ba79
+52d24fd4b2ee1236eb33e6f58ebba63f6af9ba79 244e676ac0b0e386d7620794d23806c13bca9113
+244e676ac0b0e386d7620794d23806c13bca9113 b6bf1dd82ba9dedbbbd963c379960f46a2555df0
+2abfcad6eb95acc73472061251b4d9fbb897c989 b6bf1dd82ba9dedbbbd963c379960f46a2555df0
+b6bf1dd82ba9dedbbbd963c379960f46a2555df0 0f8fa0be12ccac493e1d7d6be25ddcc7cb16a18e,456c27dbc63c1fd70ae48de899833c5ca02e6e32
+456c27dbc63c1fd70ae48de899833c5ca02e6e32 9f5f817c0ed579f0a3a7f3ba3a391403f6ee37bc
+9f5f817c0ed579f0a3a7f3ba3a391403f6ee37bc 624ddf95e6b54a943a644c0b5e785c990880999f,0f8fa0be12ccac493e1d7d6be25ddcc7cb16a18e
+624ddf95e6b54a943a644c0b5e785c990880999f 9a750784a33ab9d714cdc68949906610f76cb964
+9a750784a33ab9d714cdc68949906610f76cb964 0706805720a141819654f6446f832416b5c551a4
+0f8fa0be12ccac493e1d7d6be25ddcc7cb16a18e 6f42a208581102d3679d23617d936fa9f3c2225a,6789a2c68486802961334f34c07e8e881261e54c
+6789a2c68486802961334f34c07e8e881261e54c a01342192b8f798b5700d48b060a927a1714d636,6f42a208581102d3679d23617d936fa9f3c2225a
+6f42a208581102d3679d23617d936fa9f3c2225a 9e070b3017644c5621ea48c2beae202be4232c84,f1f17cc9c784db6de2905ed1374879c7524ba376
+0706805720a141819654f6446f832416b5c551a4 92c8226782546e3086fef83d361cf2cc866a9ec1
+9e070b3017644c5621ea48c2beae202be4232c84 92c8226782546e3086fef83d361cf2cc866a9ec1,849b4de9ea7d0cdf1fe4006709ee7072f2d13e23
+92c8226782546e3086fef83d361cf2cc866a9ec1 170a77e923c53908caff93faf855b22cf871cf6a
+170a77e923c53908caff93faf855b22cf871cf6a a533b6fa408fd80356242171e2f827a449ea3812
+a533b6fa408fd80356242171e2f827a449ea3812 0ae58081efbb1cc9fc7b20368d9c1208972e767b
+0ae58081efbb1cc9fc7b20368d9c1208972e767b 77620de737b78f85f7b30f7e298428ddd67bd928
+77620de737b78f85f7b30f7e298428ddd67bd928 b95f77dc672b96ded94aa1392769abcdd8eb2470
+b95f77dc672b96ded94aa1392769abcdd8eb2470 9d5efca0bda7c6edb3936805bfb5cd7ae32126dd
+9d5efca0bda7c6edb3936805bfb5cd7ae32126dd 703316903c43fb0ee8b445fb4811262fc937968e
+703316903c43fb0ee8b445fb4811262fc937968e d5ab33bd7c48cc126fb4ef8f086a6d862df59ef5
+d5ab33bd7c48cc126fb4ef8f086a6d862df59ef5 57fdf136efcbda786125e07951d6f8a8b7d14592
+57fdf136efcbda786125e07951d6f8a8b7d14592 1b76773ad44f3180d8d0dc4e77dc3b50485aa05d
+1b76773ad44f3180d8d0dc4e77dc3b50485aa05d 37803689fe1e764cb95508dad401f34972f73179
+37803689fe1e764cb95508dad401f34972f73179 0d58b5f4ddb056a6c8cb2350292d118696aa63b0,f8bf61270c28add4f64ab7d4bc9767a21f18e831
+0d58b5f4ddb056a6c8cb2350292d118696aa63b0 76b4277ddca72719e1ce0692c44b8907085f9791
+76b4277ddca72719e1ce0692c44b8907085f9791 67151b5753c7819309760ac097aaed33d74e2f93,23745b43026065c5ec6a3d61b964e1d65659036a
+67151b5753c7819309760ac097aaed33d74e2f93 a9bdb539385321ec79cace958a816d397b6625c7,43341d56e0f80c10302563c5773d8ed4c2f9f420
+a9bdb539385321ec79cace958a816d397b6625c7 5c94f3c9196e51913a0b8516423c95a1cca43362
+68a6b805c52f5da6ce3a5c58df25270c2045ab32 adc89fda393154699c1712a5d8869184419dd798
+5c94f3c9196e51913a0b8516423c95a1cca43362 c3d314c7c50116890ecf8cb6155c6ca7b9f711ef
+c3d314c7c50116890ecf8cb6155c6ca7b9f711ef 25f400c8f88eaddd0ca48c63e6e3f0791cc9f21a
+25f400c8f88eaddd0ca48c63e6e3f0791cc9f21a 8a40b211a4197f5016f1497240761123a7523fb2
+8a40b211a4197f5016f1497240761123a7523fb2 a1dbd06515099561a77523765ad303e23051b456
+a1dbd06515099561a77523765ad303e23051b456 2f03232e1d7998dd77f1e118585ba2e1420304e8,5464c15055afb0cf2627838a18d92f1081c7b066
+2f03232e1d7998dd77f1e118585ba2e1420304e8 a5ed8f0caaed7d6b63ad93abc1dddeb45a27fb8e
+a5ed8f0caaed7d6b63ad93abc1dddeb45a27fb8e 2120db9cffa7487197f01bf528fdb79c5319d0c9,2f6825c738be3a9d276e65d43975278ba174d9b5
+2120db9cffa7487197f01bf528fdb79c5319d0c9 10b99d180db996c6f438191e7521b7c39826979b,32584d6c1d9d8af3873babb0d356e8400c9582c0
+10b99d180db996c6f438191e7521b7c39826979b bcfb084eb25a7124496664afc5c48df85d85e838
+bcfb084eb25a7124496664afc5c48df85d85e838 82bd7da1b39153c0429fb36653a21994150420c1
+82bd7da1b39153c0429fb36653a21994150420c1 900f227fc0add02b87b86d8c509242eff7a6c264,2890f3b6933eb96b4f338b85524ab4562abda157
+900f227fc0add02b87b86d8c509242eff7a6c264 eac8148602a78ff2819b562f63e09679f24b4cbf
+eac8148602a78ff2819b562f63e09679f24b4cbf 841b30b8c962d535454b80a8e0bb5d4161225699
+841b30b8c962d535454b80a8e0bb5d4161225699 277cc86ec7d1921574b6fdc40e5af33efd1d27d4
+277cc86ec7d1921574b6fdc40e5af33efd1d27d4 69ed787cf98b13e1c6b9031871fbe5fe88284bd3
+69ed787cf98b13e1c6b9031871fbe5fe88284bd3 1bf5c0bd2017622e9d5cad94683a7f00b3a7985d,a692915fb36b1f34dabf71452af63e04c91be209
+1bf5c0bd2017622e9d5cad94683a7f00b3a7985d d823b9ddaeb9c1f2dfe6e1e914337bd0543357ae,cd95146b0abcec1cd52629d80db969fdd27fa303
+d823b9ddaeb9c1f2dfe6e1e914337bd0543357ae 5148b5915f997c933f63570bdff8461f1aa7278e
+5148b5915f997c933f63570bdff8461f1aa7278e a6afe6e1d7adba44262416bd4931e54f70b479d8,1c79e4a8344be1d5d9a293a542fc057aa524c50d
+a6afe6e1d7adba44262416bd4931e54f70b479d8 fc84397e48939f77d2f783eb85143bd9db674e1a
+fc84397e48939f77d2f783eb85143bd9db674e1a 20865cc9cf5470ee39ab9e99ef6a853233a9ca2a,e821f056086d11d0a8ff2fa6ae58f5a44678f707
+20865cc9cf5470ee39ab9e99ef6a853233a9ca2a ddc112387c36d1c270004bc9458b3cd3d6749ce9
+ddc112387c36d1c270004bc9458b3cd3d6749ce9 6a182939795451cf6d3817c41c343ecf905e831c
+6a182939795451cf6d3817c41c343ecf905e831c c269abcad799c19d0488a098ad3a861256e4aaac
+c269abcad799c19d0488a098ad3a861256e4aaac 2a906e05b06fa45908f2cf37b416649fecf09b7e,85fa0e2f1429aadd858971eec1a3798867a5112e
+2a906e05b06fa45908f2cf37b416649fecf09b7e 346da738c4dd3e54fc827b42ca65790e22239c23,d806a4bc7493caf7d6ac3d447ec476eb4ce428fd
+24a725dc99507e55283f453f7b5ca7d8e70be52f 3766f8e4ea2efd1e01520e99d4e5bf2885c302c4,346da738c4dd3e54fc827b42ca65790e22239c23
+7b2c89a42fa0a68561aee72886a479db368d713b fa65768bcc90fec0ddaf912d92a6bda4d06b3f61,346da738c4dd3e54fc827b42ca65790e22239c23
+aca1299f55bdb0844095f98de9c4a2008eac6ad0 a16fc0d2d04199c1d6664bc80706f165dc915d39,346da738c4dd3e54fc827b42ca65790e22239c23
+346da738c4dd3e54fc827b42ca65790e22239c23 b960ebe7d03d215353778093773b8ce3bcc9fb27,eaf721a3d3f690dc5766dca97c05ee8f779f828b
+5464c15055afb0cf2627838a18d92f1081c7b066 259631117742cbc4a691f43bc3ce278082455ab1,39bde846fc3cee61a8ca81872ddde83253f48925
+b960ebe7d03d215353778093773b8ce3bcc9fb27 259631117742cbc4a691f43bc3ce278082455ab1,03e6b6ae8854c6f585f3e82553dfc5311e49f53e
+259631117742cbc4a691f43bc3ce278082455ab1 cdbe742d201adb616cba467563fb2bfb524dd16a
+cdbe742d201adb616cba467563fb2bfb524dd16a d7af4dd892b8a48a5107c4bf871d5d25f63e8511
+d7af4dd892b8a48a5107c4bf871d5d25f63e8511 614169b1acb86b21b562f807a6b54aa164d4056a
+614169b1acb86b21b562f807a6b54aa164d4056a 7e269b22b6070768ce18c0b81d7b802662b2b6ed
+7e269b22b6070768ce18c0b81d7b802662b2b6ed 7d703fee73ee850af7325ac7e4eebb6514c2757e
+7d703fee73ee850af7325ac7e4eebb6514c2757e 6b673d12166ae1a5729aa517bdfd2e8ad974170e
+6b673d12166ae1a5729aa517bdfd2e8ad974170e edc83414c9a7955c8f874c2fed261d8e1ae2eb91
+edc83414c9a7955c8f874c2fed261d8e1ae2eb91 17f63f989af77ffcca34d142b8ef5c210323e098
+17f63f989af77ffcca34d142b8ef5c210323e098 958206e68abbb9bb2cc76256ab3202363678e61f,06a1cb9d9b23aadc5231cbb188b2fac1003fbe28
+958206e68abbb9bb2cc76256ab3202363678e61f da26ce8d3cc378e9e0d8246540197575428132f9
+da26ce8d3cc378e9e0d8246540197575428132f9 aeabc7304c582c9a58e6098443430cbd2b323616
+aeabc7304c582c9a58e6098443430cbd2b323616 6efedc27d5e08a15fb9501ad32c257738c48334e
+6efedc27d5e08a15fb9501ad32c257738c48334e 3a9471a6ea20a92b57325b0c56448d3e313a1d1a,1eb7abcd285650928a22eb81185a63d36b1b2cba
+3a9471a6ea20a92b57325b0c56448d3e313a1d1a 6aa0069d074711085d57def494f56ddeb65a7551,6129574e1588a0cf30d5d0762a8cf49a9ebb5585
+6aa0069d074711085d57def494f56ddeb65a7551 704e7039441ea5383545da405e3b5f4cf01077c3,b0c45c85fe85689c0c59660a15e3476340b6819a
+704e7039441ea5383545da405e3b5f4cf01077c3 b44a2afd2a47a63d510b1d4b7d58cdf5fc13b65d
+b0c45c85fe85689c0c59660a15e3476340b6819a 8a26c9c9d71007dad93508ff17c5971ff7dc13b3
+8a26c9c9d71007dad93508ff17c5971ff7dc13b3 b44a2afd2a47a63d510b1d4b7d58cdf5fc13b65d,8528e93d3ce01d0b8b209c599ab261aa1987a108
+b44a2afd2a47a63d510b1d4b7d58cdf5fc13b65d 8bb5134286f52a3dbb1979de5bee25d7460b3c36,09c716a4e30e8744365c158619b44006fbf6d3b6
+fa65768bcc90fec0ddaf912d92a6bda4d06b3f61 bb194efe1821622d96c8c43d2a4c9de17e800391,8bb5134286f52a3dbb1979de5bee25d7460b3c36
+a01342192b8f798b5700d48b060a927a1714d636 bbe5c643c42223f97c8914ba3cd26b3c8d2c5030,8bb5134286f52a3dbb1979de5bee25d7460b3c36
+8bb5134286f52a3dbb1979de5bee25d7460b3c36 cb8d623593567f34e3fbf89a1b640cdb7b1eda75,2fae4888f332dfba920901c5afaf9ac448ca89c9
+cb8d623593567f34e3fbf89a1b640cdb7b1eda75 c31a46930cee2835641e43171f6c3f8800da3ae8,e71001dca11670f6e468d5b3c05c78292a748834
+c31a46930cee2835641e43171f6c3f8800da3ae8 90059ea0179772a7d296a382bb3c94865003c33e,dec8d412cdcc82e55fd516b1b1a874f290e7a806
+90059ea0179772a7d296a382bb3c94865003c33e 07eda936ba952eb3255eca4e2cbc00d49c3fd831,a2b3efa030a54e6cfb6c6736fca7e1e27d07cd15
+07eda936ba952eb3255eca4e2cbc00d49c3fd831 0ac98cae0481794557025cd5002aa2508d5347b6
+0ac98cae0481794557025cd5002aa2508d5347b6 fdfd424b83ec718a8cf74f38b01d8f1005e01faa,50414b8e0e67e191f1ae38bde54e30189de97b34
+fdfd424b83ec718a8cf74f38b01d8f1005e01faa 0cadfc4182b8bb43635020f393f5cdd6578b7cfd
+0cadfc4182b8bb43635020f393f5cdd6578b7cfd dcf421dabda2384d57913343e73dd01688eb4dcf
+dcf421dabda2384d57913343e73dd01688eb4dcf 82e28e89e54c198a6aa3c6435b5b32eec05ed65f
+82e28e89e54c198a6aa3c6435b5b32eec05ed65f 657b6ecb353c1f5b0b91d2d5161aff9063af3fb0
+657b6ecb353c1f5b0b91d2d5161aff9063af3fb0 afa3279d3b6cb8913ba3d6eed8e635f66fa59d8e,30dc6100056269e9d384711478be9dd1bd744ddf
+afa3279d3b6cb8913ba3d6eed8e635f66fa59d8e 4485968e237121d19cce63d18312987c84f0860e,599461b731bbb3081f49dcd72c356695da4bf483
+4485968e237121d19cce63d18312987c84f0860e 21dd573ab7ab0a63d35c0df07df08dae8b19bb16,08a1393c61b3c6d2ee96a35b52ae945806d0299e
+21dd573ab7ab0a63d35c0df07df08dae8b19bb16 66eb2de9fa18125906e5d13abf52705839c9d088,3129220de08efe91135e7b1256772167e0dcdf15
+66eb2de9fa18125906e5d13abf52705839c9d088 fc9432d5a51c65f1716cf0ba20b1e693ccd2edce,5941191cd2682ef374df3afeebc0ae9d242162db
+fc9432d5a51c65f1716cf0ba20b1e693ccd2edce f72fea4b3bc98ca7ab186eacce57b3dfd2557032
+f72fea4b3bc98ca7ab186eacce57b3dfd2557032 ade6384a7b0e4d065e18076ffa901e580679e26d,dd090afbe47f0aa25d6ec8cfe484fa02c23eb61a

ADDED   fossil-utils/justtesting/setup.dat
Index: fossil-utils/justtesting/setup.dat
==================================================================
--- /dev/null
+++ fossil-utils/justtesting/setup.dat
@@ -0,0 +1,9 @@
+[command]
+0 rm -rf /tmp/$USER/megatest
+1 mkdir -p /tmp/$USER/megatest
+2 cp /home/matt/fossils/megatest.fossil /tmp/$USER/megatest
+3 cd /tmp/$USER/megatest
+4 fossil open megatest.fossil;fossil up trunk
+5 fossil set autosync 0
+7 fossil set gmerge ''
+8 fossil scrub --private --force

ADDED   fossil-utils/justtesting/sheet-names.cfg
Index: fossil-utils/justtesting/sheet-names.cfg
==================================================================
--- /dev/null
+++ fossil-utils/justtesting/sheet-names.cfg
@@ -0,0 +1,4 @@
+timeline
+extra
+branches
+setup

ADDED   fossil-utils/justtesting/sxml/_sheets.sxml
Index: fossil-utils/justtesting/sxml/_sheets.sxml
==================================================================
--- /dev/null
+++ fossil-utils/justtesting/sxml/_sheets.sxml
@@ -0,0 +1,69 @@
+((@ (http://www.w3.org/2001/XMLSchema-instance:schemaLocation
+      "http://www.gnumeric.org/v9.xsd"))
+ (http://www.gnumeric.org/v10.dtd:Version
+   (@ (Minor "17")
+      (Major "10")
+      (Full "1.10.17")
+      (Epoch "1")))
+ (http://www.gnumeric.org/v10.dtd:Attributes
+   (http://www.gnumeric.org/v10.dtd:Attribute
+     (http://www.gnumeric.org/v10.dtd:type "4")
+     (http://www.gnumeric.org/v10.dtd:name
+       "WorkbookView::show_horizontal_scrollbar")
+     (http://www.gnumeric.org/v10.dtd:value "TRUE"))
+   (http://www.gnumeric.org/v10.dtd:Attribute
+     (http://www.gnumeric.org/v10.dtd:type "4")
+     (http://www.gnumeric.org/v10.dtd:name
+       "WorkbookView::show_vertical_scrollbar")
+     (http://www.gnumeric.org/v10.dtd:value "TRUE"))
+   (http://www.gnumeric.org/v10.dtd:Attribute
+     (http://www.gnumeric.org/v10.dtd:type "4")
+     (http://www.gnumeric.org/v10.dtd:name
+       "WorkbookView::show_notebook_tabs")
+     (http://www.gnumeric.org/v10.dtd:value "TRUE"))
+   (http://www.gnumeric.org/v10.dtd:Attribute
+     (http://www.gnumeric.org/v10.dtd:type "4")
+     (http://www.gnumeric.org/v10.dtd:name
+       "WorkbookView::do_auto_completion")
+     (http://www.gnumeric.org/v10.dtd:value "TRUE"))
+   (http://www.gnumeric.org/v10.dtd:Attribute
+     (http://www.gnumeric.org/v10.dtd:type "4")
+     (http://www.gnumeric.org/v10.dtd:name
+       "WorkbookView::is_protected")
+     (http://www.gnumeric.org/v10.dtd:value "FALSE")))
+ (urn:oasis:names:tc:opendocument:xmlns:office:1.0:document-meta
+   (@ (urn:oasis:names:tc:opendocument:xmlns:office:1.0:version
+        "1.2"))
+   (urn:oasis:names:tc:opendocument:xmlns:office:1.0:meta
+     (http://purl.org/dc/elements/1.1/:date
+       "2020-06-01T04:28:18Z")
+     (urn:oasis:names:tc:opendocument:xmlns:meta:1.0:creation-date
+       "2020-06-01T01:13:31Z")))
+ (http://www.gnumeric.org/v10.dtd:Calculation
+   (@ (MaxIterations "100")
+      (ManualRecalc "0")
+      (IterationTolerance "0.001")
+      (FloatRadix "2")
+      (FloatDigits "53")
+      (EnableIteration "1")))
+ (http://www.gnumeric.org/v10.dtd:SheetNameIndex
+   (http://www.gnumeric.org/v10.dtd:SheetName
+     (@ (http://www.gnumeric.org/v10.dtd:Rows "65536")
+        (http://www.gnumeric.org/v10.dtd:Cols "256"))
+     "timeline")
+   (http://www.gnumeric.org/v10.dtd:SheetName
+     (@ (http://www.gnumeric.org/v10.dtd:Rows "65536")
+        (http://www.gnumeric.org/v10.dtd:Cols "256"))
+     "extra")
+   (http://www.gnumeric.org/v10.dtd:SheetName
+     (@ (http://www.gnumeric.org/v10.dtd:Rows "65536")
+        (http://www.gnumeric.org/v10.dtd:Cols "256"))
+     "branches")
+   (http://www.gnumeric.org/v10.dtd:SheetName
+     (@ (http://www.gnumeric.org/v10.dtd:Rows "65536")
+        (http://www.gnumeric.org/v10.dtd:Cols "256"))
+     "setup"))
+ (http://www.gnumeric.org/v10.dtd:Geometry
+   (@ (Width "2220") (Height "804")))
+ (http://www.gnumeric.org/v10.dtd:UIData
+   (@ (SelectedTab "0"))))

ADDED   fossil-utils/justtesting/sxml/_workbook.sxml
Index: fossil-utils/justtesting/sxml/_workbook.sxml
==================================================================
--- /dev/null
+++ fossil-utils/justtesting/sxml/_workbook.sxml
@@ -0,0 +1,1 @@
+(*TOP* (*PI* xml "version=\"1.0\" encoding=\"UTF-8\""))

ADDED   fossil-utils/justtesting/sxml/branches.sxml
Index: fossil-utils/justtesting/sxml/branches.sxml
==================================================================
--- /dev/null
+++ fossil-utils/justtesting/sxml/branches.sxml
@@ -0,0 +1,135 @@
+(http://www.gnumeric.org/v10.dtd:Sheet
+  (@ (Visibility "GNM_SHEET_VISIBILITY_VISIBLE")
+     (OutlineSymbolsRight "1")
+     (OutlineSymbolsBelow "1")
+     (HideZero "0")
+     (HideRowHeader "0")
+     (HideGrid "0")
+     (HideColHeader "0")
+     (GridColor "0:0:0")
+     (DisplayOutlines "1")
+     (DisplayFormulas "0"))
+  (http://www.gnumeric.org/v10.dtd:MaxCol "8")
+  (http://www.gnumeric.org/v10.dtd:MaxRow "16")
+  (http://www.gnumeric.org/v10.dtd:Zoom "1")
+  (http://www.gnumeric.org/v10.dtd:Names
+    (http://www.gnumeric.org/v10.dtd:Name
+      (http://www.gnumeric.org/v10.dtd:name
+        "Print_Area")
+      (http://www.gnumeric.org/v10.dtd:value "#REF!")
+      (http://www.gnumeric.org/v10.dtd:position "A1"))
+    (http://www.gnumeric.org/v10.dtd:Name
+      (http://www.gnumeric.org/v10.dtd:name
+        "Sheet_Title")
+      (http://www.gnumeric.org/v10.dtd:value
+        "\"First_Sheet\"")
+      (http://www.gnumeric.org/v10.dtd:position "A1")))
+  (http://www.gnumeric.org/v10.dtd:PrintInformation
+    (http://www.gnumeric.org/v10.dtd:Margins
+      (http://www.gnumeric.org/v10.dtd:top
+        (@ (PrefUnit "mm") (Points "93.26")))
+      (http://www.gnumeric.org/v10.dtd:bottom
+        (@ (PrefUnit "mm") (Points "93.26")))
+      (http://www.gnumeric.org/v10.dtd:left
+        (@ (PrefUnit "mm") (Points "72")))
+      (http://www.gnumeric.org/v10.dtd:right
+        (@ (PrefUnit "mm") (Points "72")))
+      (http://www.gnumeric.org/v10.dtd:header
+        (@ (PrefUnit "mm") (Points "72")))
+      (http://www.gnumeric.org/v10.dtd:footer
+        (@ (PrefUnit "mm") (Points "72"))))
+    (http://www.gnumeric.org/v10.dtd:Scale
+      (@ (type "percentage") (percentage "100")))
+    (http://www.gnumeric.org/v10.dtd:vcenter
+      (@ (value "0")))
+    (http://www.gnumeric.org/v10.dtd:hcenter
+      (@ (value "0")))
+    (http://www.gnumeric.org/v10.dtd:grid
+      (@ (value "0")))
+    (http://www.gnumeric.org/v10.dtd:even_if_only_styles
+      (@ (value "0")))
+    (http://www.gnumeric.org/v10.dtd:monochrome
+      (@ (value "0")))
+    (http://www.gnumeric.org/v10.dtd:draft
+      (@ (value "0")))
+    (http://www.gnumeric.org/v10.dtd:titles
+      (@ (value "0")))
+    (http://www.gnumeric.org/v10.dtd:do_not_print
+      (@ (value "0")))
+    (http://www.gnumeric.org/v10.dtd:print_range
+      (@ (value "0")))
+    (http://www.gnumeric.org/v10.dtd:order
+      "d_then_r")
+    (http://www.gnumeric.org/v10.dtd:orientation
+      "portrait")
+    (http://www.gnumeric.org/v10.dtd:Header
+      (@ (Right "") (Middle "&[tab]") (Left "")))
+    (http://www.gnumeric.org/v10.dtd:Footer
+      (@ (Right "") (Middle "&[page]") (Left "")))
+    (http://www.gnumeric.org/v10.dtd:paper
+      "na_letter")
+    (http://www.gnumeric.org/v10.dtd:comments "none")
+    (http://www.gnumeric.org/v10.dtd:errors
+      "as_displayed"))
+  (http://www.gnumeric.org/v10.dtd:Styles
+    (http://www.gnumeric.org/v10.dtd:StyleRegion
+      (@ (startRow "0")
+         (startCol "0")
+         (endRow "65535")
+         (endCol "255"))
+      (http://www.gnumeric.org/v10.dtd:Style
+        (@ (WrapText "0")
+           (VAlign "2")
+           (ShrinkToFit "0")
+           (Shade "0")
+           (Rotation "0")
+           (PatternColor "0:0:0")
+           (Locked "1")
+           (Indent "0")
+           (Hidden "0")
+           (HAlign "1")
+           (Format "General")
+           (Fore "0:0:0")
+           (Back "FFFF:FFFF:FFFF"))
+        (http://www.gnumeric.org/v10.dtd:Font
+          (@ (Unit "10")
+             (Underline "0")
+             (StrikeThrough "0")
+             (Script "0")
+             (Italic "0")
+             (Bold "0"))
+          "Sans"))))
+  (http://www.gnumeric.org/v10.dtd:Cols
+    (@ (DefaultSizePts "48"))
+    (http://www.gnumeric.org/v10.dtd:ColInfo
+      (@ (Unit "95.25") (No "0")))
+    (http://www.gnumeric.org/v10.dtd:ColInfo
+      (@ (Unit "99") (No "1") (HardSize "1")))
+    (http://www.gnumeric.org/v10.dtd:ColInfo
+      (@ (Unit "64.01") (No "2") (Count "7"))))
+  (http://www.gnumeric.org/v10.dtd:Rows
+    (@ (DefaultSizePts "12.1"))
+    (http://www.gnumeric.org/v10.dtd:RowInfo
+      (@ (Unit "12.64") (No "0")))
+    (http://www.gnumeric.org/v10.dtd:RowInfo
+      (@ (Unit "13.5") (No "1") (Count "16"))))
+  (http://www.gnumeric.org/v10.dtd:Selections
+    (@ (CursorRow "2") (CursorCol "1"))
+    (http://www.gnumeric.org/v10.dtd:Selection
+      (@ (startRow "2")
+         (startCol "1")
+         (endRow "2")
+         (endCol "1"))))
+  (http://www.gnumeric.org/v10.dtd:SheetLayout
+    (@ (TopLeft "A2"))
+    (http://www.gnumeric.org/v10.dtd:FreezePanes
+      (@ (UnfrozenTopLeft "A2") (FrozenTopLeft "A1"))))
+  (http://www.gnumeric.org/v10.dtd:Solver
+    (@ (ProgramR "0")
+       (ProblemType "0")
+       (NonNeg "1")
+       (ModelType "0")
+       (MaxTime "60")
+       (MaxIter "1000")
+       (Discr "0")
+       (AutoScale "0"))))

ADDED   fossil-utils/justtesting/sxml/extra.sxml
Index: fossil-utils/justtesting/sxml/extra.sxml
==================================================================
--- /dev/null
+++ fossil-utils/justtesting/sxml/extra.sxml
@@ -0,0 +1,137 @@
+(http://www.gnumeric.org/v10.dtd:Sheet
+  (@ (Visibility "GNM_SHEET_VISIBILITY_VISIBLE")
+     (OutlineSymbolsRight "1")
+     (OutlineSymbolsBelow "1")
+     (HideZero "0")
+     (HideRowHeader "0")
+     (HideGrid "0")
+     (HideColHeader "0")
+     (GridColor "0:0:0")
+     (DisplayOutlines "1")
+     (DisplayFormulas "0"))
+  (http://www.gnumeric.org/v10.dtd:MaxCol "8")
+  (http://www.gnumeric.org/v10.dtd:MaxRow "722")
+  (http://www.gnumeric.org/v10.dtd:Zoom "1")
+  (http://www.gnumeric.org/v10.dtd:Names
+    (http://www.gnumeric.org/v10.dtd:Name
+      (http://www.gnumeric.org/v10.dtd:name
+        "Print_Area")
+      (http://www.gnumeric.org/v10.dtd:value "#REF!")
+      (http://www.gnumeric.org/v10.dtd:position "A1"))
+    (http://www.gnumeric.org/v10.dtd:Name
+      (http://www.gnumeric.org/v10.dtd:name
+        "Sheet_Title")
+      (http://www.gnumeric.org/v10.dtd:value
+        "\"First_Sheet\"")
+      (http://www.gnumeric.org/v10.dtd:position "A1")))
+  (http://www.gnumeric.org/v10.dtd:PrintInformation
+    (http://www.gnumeric.org/v10.dtd:Margins
+      (http://www.gnumeric.org/v10.dtd:top
+        (@ (PrefUnit "mm") (Points "93.26")))
+      (http://www.gnumeric.org/v10.dtd:bottom
+        (@ (PrefUnit "mm") (Points "93.26")))
+      (http://www.gnumeric.org/v10.dtd:left
+        (@ (PrefUnit "mm") (Points "72")))
+      (http://www.gnumeric.org/v10.dtd:right
+        (@ (PrefUnit "mm") (Points "72")))
+      (http://www.gnumeric.org/v10.dtd:header
+        (@ (PrefUnit "mm") (Points "72")))
+      (http://www.gnumeric.org/v10.dtd:footer
+        (@ (PrefUnit "mm") (Points "72"))))
+    (http://www.gnumeric.org/v10.dtd:Scale
+      (@ (type "percentage") (percentage "100")))
+    (http://www.gnumeric.org/v10.dtd:vcenter
+      (@ (value "0")))
+    (http://www.gnumeric.org/v10.dtd:hcenter
+      (@ (value "0")))
+    (http://www.gnumeric.org/v10.dtd:grid
+      (@ (value "0")))
+    (http://www.gnumeric.org/v10.dtd:even_if_only_styles
+      (@ (value "0")))
+    (http://www.gnumeric.org/v10.dtd:monochrome
+      (@ (value "0")))
+    (http://www.gnumeric.org/v10.dtd:draft
+      (@ (value "0")))
+    (http://www.gnumeric.org/v10.dtd:titles
+      (@ (value "0")))
+    (http://www.gnumeric.org/v10.dtd:do_not_print
+      (@ (value "0")))
+    (http://www.gnumeric.org/v10.dtd:print_range
+      (@ (value "0")))
+    (http://www.gnumeric.org/v10.dtd:order
+      "d_then_r")
+    (http://www.gnumeric.org/v10.dtd:orientation
+      "portrait")
+    (http://www.gnumeric.org/v10.dtd:Header
+      (@ (Right "") (Middle "&[tab]") (Left "")))
+    (http://www.gnumeric.org/v10.dtd:Footer
+      (@ (Right "") (Middle "&[page]") (Left "")))
+    (http://www.gnumeric.org/v10.dtd:paper
+      "na_letter")
+    (http://www.gnumeric.org/v10.dtd:comments "none")
+    (http://www.gnumeric.org/v10.dtd:errors
+      "as_displayed"))
+  (http://www.gnumeric.org/v10.dtd:Styles
+    (http://www.gnumeric.org/v10.dtd:StyleRegion
+      (@ (startRow "0")
+         (startCol "0")
+         (endRow "65535")
+         (endCol "255"))
+      (http://www.gnumeric.org/v10.dtd:Style
+        (@ (WrapText "0")
+           (VAlign "2")
+           (ShrinkToFit "0")
+           (Shade "0")
+           (Rotation "0")
+           (PatternColor "0:0:0")
+           (Locked "1")
+           (Indent "0")
+           (Hidden "0")
+           (HAlign "1")
+           (Format "General")
+           (Fore "0:0:0")
+           (Back "FFFF:FFFF:FFFF"))
+        (http://www.gnumeric.org/v10.dtd:Font
+          (@ (Unit "10")
+             (Underline "0")
+             (StrikeThrough "0")
+             (Script "0")
+             (Italic "0")
+             (Bold "0"))
+          "Sans"))))
+  (http://www.gnumeric.org/v10.dtd:Cols
+    (@ (DefaultSizePts "48"))
+    (http://www.gnumeric.org/v10.dtd:ColInfo
+      (@ (Unit "243") (No "0")))
+    (http://www.gnumeric.org/v10.dtd:ColInfo
+      (@ (Unit "462") (No "1")))
+    (http://www.gnumeric.org/v10.dtd:ColInfo
+      (@ (Unit "64.01") (No "2") (Count "7"))))
+  (http://www.gnumeric.org/v10.dtd:Rows
+    (@ (DefaultSizePts "12.1"))
+    (http://www.gnumeric.org/v10.dtd:RowInfo
+      (@ (Unit "12.64") (No "0")))
+    (http://www.gnumeric.org/v10.dtd:RowInfo
+      (@ (Unit "13.5") (No "1") (Count "17")))
+    (http://www.gnumeric.org/v10.dtd:RowInfo
+      (@ (Unit "12.1") (No "18") (Count "705"))))
+  (http://www.gnumeric.org/v10.dtd:Selections
+    (@ (CursorRow "3") (CursorCol "1"))
+    (http://www.gnumeric.org/v10.dtd:Selection
+      (@ (startRow "3")
+         (startCol "1")
+         (endRow "3")
+         (endCol "1"))))
+  (http://www.gnumeric.org/v10.dtd:SheetLayout
+    (@ (TopLeft "A2"))
+    (http://www.gnumeric.org/v10.dtd:FreezePanes
+      (@ (UnfrozenTopLeft "A2") (FrozenTopLeft "A1"))))
+  (http://www.gnumeric.org/v10.dtd:Solver
+    (@ (ProgramR "0")
+       (ProblemType "0")
+       (NonNeg "1")
+       (ModelType "0")
+       (MaxTime "60")
+       (MaxIter "1000")
+       (Discr "0")
+       (AutoScale "0"))))

ADDED   fossil-utils/justtesting/sxml/setup.sxml
Index: fossil-utils/justtesting/sxml/setup.sxml
==================================================================
--- /dev/null
+++ fossil-utils/justtesting/sxml/setup.sxml
@@ -0,0 +1,129 @@
+(http://www.gnumeric.org/v10.dtd:Sheet
+  (@ (Visibility "GNM_SHEET_VISIBILITY_VISIBLE")
+     (OutlineSymbolsRight "1")
+     (OutlineSymbolsBelow "1")
+     (HideZero "0")
+     (HideRowHeader "0")
+     (HideGrid "0")
+     (HideColHeader "0")
+     (GridColor "0:0:0")
+     (DisplayOutlines "1")
+     (DisplayFormulas "0"))
+  (http://www.gnumeric.org/v10.dtd:MaxCol "1")
+  (http://www.gnumeric.org/v10.dtd:MaxRow "8")
+  (http://www.gnumeric.org/v10.dtd:Zoom "1")
+  (http://www.gnumeric.org/v10.dtd:Names
+    (http://www.gnumeric.org/v10.dtd:Name
+      (http://www.gnumeric.org/v10.dtd:name
+        "Print_Area")
+      (http://www.gnumeric.org/v10.dtd:value "#REF!")
+      (http://www.gnumeric.org/v10.dtd:position "A1"))
+    (http://www.gnumeric.org/v10.dtd:Name
+      (http://www.gnumeric.org/v10.dtd:name
+        "Sheet_Title")
+      (http://www.gnumeric.org/v10.dtd:value
+        "\"setup\"")
+      (http://www.gnumeric.org/v10.dtd:position "A1")))
+  (http://www.gnumeric.org/v10.dtd:PrintInformation
+    (http://www.gnumeric.org/v10.dtd:Margins
+      (http://www.gnumeric.org/v10.dtd:top
+        (@ (PrefUnit "mm") (Points "120")))
+      (http://www.gnumeric.org/v10.dtd:bottom
+        (@ (PrefUnit "mm") (Points "120")))
+      (http://www.gnumeric.org/v10.dtd:left
+        (@ (PrefUnit "mm") (Points "72")))
+      (http://www.gnumeric.org/v10.dtd:right
+        (@ (PrefUnit "mm") (Points "72")))
+      (http://www.gnumeric.org/v10.dtd:header
+        (@ (PrefUnit "mm") (Points "72")))
+      (http://www.gnumeric.org/v10.dtd:footer
+        (@ (PrefUnit "mm") (Points "72"))))
+    (http://www.gnumeric.org/v10.dtd:Scale
+      (@ (type "percentage") (percentage "100")))
+    (http://www.gnumeric.org/v10.dtd:vcenter
+      (@ (value "0")))
+    (http://www.gnumeric.org/v10.dtd:hcenter
+      (@ (value "0")))
+    (http://www.gnumeric.org/v10.dtd:grid
+      (@ (value "0")))
+    (http://www.gnumeric.org/v10.dtd:even_if_only_styles
+      (@ (value "0")))
+    (http://www.gnumeric.org/v10.dtd:monochrome
+      (@ (value "0")))
+    (http://www.gnumeric.org/v10.dtd:draft
+      (@ (value "0")))
+    (http://www.gnumeric.org/v10.dtd:titles
+      (@ (value "0")))
+    (http://www.gnumeric.org/v10.dtd:do_not_print
+      (@ (value "0")))
+    (http://www.gnumeric.org/v10.dtd:print_range
+      (@ (value "0")))
+    (http://www.gnumeric.org/v10.dtd:order
+      "d_then_r")
+    (http://www.gnumeric.org/v10.dtd:orientation
+      "portrait")
+    (http://www.gnumeric.org/v10.dtd:Header
+      (@ (Right "") (Middle "&[TAB]") (Left "")))
+    (http://www.gnumeric.org/v10.dtd:Footer
+      (@ (Right "") (Middle "Page &[PAGE]") (Left "")))
+    (http://www.gnumeric.org/v10.dtd:paper
+      "na_letter")
+    (http://www.gnumeric.org/v10.dtd:comments "none")
+    (http://www.gnumeric.org/v10.dtd:errors
+      "as_displayed"))
+  (http://www.gnumeric.org/v10.dtd:Styles
+    (http://www.gnumeric.org/v10.dtd:StyleRegion
+      (@ (startRow "0")
+         (startCol "0")
+         (endRow "65535")
+         (endCol "255"))
+      (http://www.gnumeric.org/v10.dtd:Style
+        (@ (WrapText "0")
+           (VAlign "2")
+           (ShrinkToFit "0")
+           (Shade "0")
+           (Rotation "0")
+           (PatternColor "0:0:0")
+           (Locked "1")
+           (Indent "0")
+           (Hidden "0")
+           (HAlign "1")
+           (Format "General")
+           (Fore "0:0:0")
+           (Back "FFFF:FFFF:FFFF"))
+        (http://www.gnumeric.org/v10.dtd:Font
+          (@ (Unit "10")
+             (Underline "0")
+             (StrikeThrough "0")
+             (Script "0")
+             (Italic "0")
+             (Bold "0"))
+          "Sans"))))
+  (http://www.gnumeric.org/v10.dtd:Cols
+    (@ (DefaultSizePts "48"))
+    (http://www.gnumeric.org/v10.dtd:ColInfo
+      (@ (Unit "48") (No "0")))
+    (http://www.gnumeric.org/v10.dtd:ColInfo
+      (@ (Unit "333") (No "1"))))
+  (http://www.gnumeric.org/v10.dtd:Rows
+    (@ (DefaultSizePts "12.75"))
+    (http://www.gnumeric.org/v10.dtd:RowInfo
+      (@ (Unit "13.5") (No "0") (Count "9"))))
+  (http://www.gnumeric.org/v10.dtd:Selections
+    (@ (CursorRow "7") (CursorCol "0"))
+    (http://www.gnumeric.org/v10.dtd:Selection
+      (@ (startRow "7")
+         (startCol "0")
+         (endRow "7")
+         (endCol "255"))))
+  (http://www.gnumeric.org/v10.dtd:SheetLayout
+    (@ (TopLeft "A1")))
+  (http://www.gnumeric.org/v10.dtd:Solver
+    (@ (ProgramR "0")
+       (ProblemType "0")
+       (NonNeg "1")
+       (ModelType "0")
+       (MaxTime "60")
+       (MaxIter "1000")
+       (Discr "0")
+       (AutoScale "0"))))

ADDED   fossil-utils/justtesting/sxml/timeline.sxml
Index: fossil-utils/justtesting/sxml/timeline.sxml
==================================================================
--- /dev/null
+++ fossil-utils/justtesting/sxml/timeline.sxml
@@ -0,0 +1,547 @@
+(http://www.gnumeric.org/v10.dtd:Sheet
+  (@ (Visibility "GNM_SHEET_VISIBILITY_VISIBLE")
+     (OutlineSymbolsRight "1")
+     (OutlineSymbolsBelow "1")
+     (HideZero "0")
+     (HideRowHeader "0")
+     (HideGrid "0")
+     (HideColHeader "0")
+     (GridColor "0:0:0")
+     (DisplayOutlines "1")
+     (DisplayFormulas "0"))
+  (http://www.gnumeric.org/v10.dtd:MaxCol "17")
+  (http://www.gnumeric.org/v10.dtd:MaxRow "65535")
+  (http://www.gnumeric.org/v10.dtd:Zoom "1")
+  (http://www.gnumeric.org/v10.dtd:Names
+    (http://www.gnumeric.org/v10.dtd:Name
+      (http://www.gnumeric.org/v10.dtd:name
+        "Print_Area")
+      (http://www.gnumeric.org/v10.dtd:value "#REF!")
+      (http://www.gnumeric.org/v10.dtd:position "A1"))
+    (http://www.gnumeric.org/v10.dtd:Name
+      (http://www.gnumeric.org/v10.dtd:name
+        "Sheet_Title")
+      (http://www.gnumeric.org/v10.dtd:value
+        "\"First_Sheet\"")
+      (http://www.gnumeric.org/v10.dtd:position "A1")))
+  (http://www.gnumeric.org/v10.dtd:PrintInformation
+    (http://www.gnumeric.org/v10.dtd:Margins
+      (http://www.gnumeric.org/v10.dtd:top
+        (@ (PrefUnit "mm") (Points "93.26")))
+      (http://www.gnumeric.org/v10.dtd:bottom
+        (@ (PrefUnit "mm") (Points "93.26")))
+      (http://www.gnumeric.org/v10.dtd:left
+        (@ (PrefUnit "mm") (Points "72")))
+      (http://www.gnumeric.org/v10.dtd:right
+        (@ (PrefUnit "mm") (Points "72")))
+      (http://www.gnumeric.org/v10.dtd:header
+        (@ (PrefUnit "mm") (Points "72")))
+      (http://www.gnumeric.org/v10.dtd:footer
+        (@ (PrefUnit "mm") (Points "72"))))
+    (http://www.gnumeric.org/v10.dtd:Scale
+      (@ (type "percentage") (percentage "100")))
+    (http://www.gnumeric.org/v10.dtd:vcenter
+      (@ (value "0")))
+    (http://www.gnumeric.org/v10.dtd:hcenter
+      (@ (value "0")))
+    (http://www.gnumeric.org/v10.dtd:grid
+      (@ (value "0")))
+    (http://www.gnumeric.org/v10.dtd:even_if_only_styles
+      (@ (value "0")))
+    (http://www.gnumeric.org/v10.dtd:monochrome
+      (@ (value "0")))
+    (http://www.gnumeric.org/v10.dtd:draft
+      (@ (value "0")))
+    (http://www.gnumeric.org/v10.dtd:titles
+      (@ (value "0")))
+    (http://www.gnumeric.org/v10.dtd:do_not_print
+      (@ (value "0")))
+    (http://www.gnumeric.org/v10.dtd:print_range
+      (@ (value "0")))
+    (http://www.gnumeric.org/v10.dtd:order
+      "d_then_r")
+    (http://www.gnumeric.org/v10.dtd:orientation
+      "portrait")
+    (http://www.gnumeric.org/v10.dtd:Header
+      (@ (Right "") (Middle "&[tab]") (Left "")))
+    (http://www.gnumeric.org/v10.dtd:Footer
+      (@ (Right "") (Middle "&[page]") (Left "")))
+    (http://www.gnumeric.org/v10.dtd:paper
+      "na_letter")
+    (http://www.gnumeric.org/v10.dtd:comments "none")
+    (http://www.gnumeric.org/v10.dtd:errors
+      "as_displayed"))
+  (http://www.gnumeric.org/v10.dtd:Styles
+    (http://www.gnumeric.org/v10.dtd:StyleRegion
+      (@ (startRow "0")
+         (startCol "0")
+         (endRow "255")
+         (endCol "63"))
+      (http://www.gnumeric.org/v10.dtd:Style
+        (@ (WrapText "0")
+           (VAlign "2")
+           (ShrinkToFit "0")
+           (Shade "0")
+           (Rotation "0")
+           (PatternColor "0:0:0")
+           (Locked "1")
+           (Indent "0")
+           (Hidden "0")
+           (HAlign "1")
+           (Format "General")
+           (Fore "0:0:0")
+           (Back "FFFF:FFFF:FFFF"))
+        (http://www.gnumeric.org/v10.dtd:Font
+          (@ (Unit "10")
+             (Underline "0")
+             (StrikeThrough "0")
+             (Script "0")
+             (Italic "0")
+             (Bold "0"))
+          "Sans")))
+    (http://www.gnumeric.org/v10.dtd:StyleRegion
+      (@ (startRow "256")
+         (startCol "0")
+         (endRow "431")
+         (endCol "7"))
+      (http://www.gnumeric.org/v10.dtd:Style
+        (@ (WrapText "0")
+           (VAlign "2")
+           (ShrinkToFit "0")
+           (Shade "0")
+           (Rotation "0")
+           (PatternColor "0:0:0")
+           (Locked "1")
+           (Indent "0")
+           (Hidden "0")
+           (HAlign "1")
+           (Format "General")
+           (Fore "0:0:0")
+           (Back "FFFF:FFFF:FFFF"))
+        (http://www.gnumeric.org/v10.dtd:Font
+          (@ (Unit "10")
+             (Underline "0")
+             (StrikeThrough "0")
+             (Script "0")
+             (Italic "0")
+             (Bold "0"))
+          "Sans")))
+    (http://www.gnumeric.org/v10.dtd:StyleRegion
+      (@ (startRow "432")
+         (startCol "0")
+         (endRow "463")
+         (endCol "4"))
+      (http://www.gnumeric.org/v10.dtd:Style
+        (@ (WrapText "0")
+           (VAlign "2")
+           (ShrinkToFit "0")
+           (Shade "0")
+           (Rotation "0")
+           (PatternColor "0:0:0")
+           (Locked "1")
+           (Indent "0")
+           (Hidden "0")
+           (HAlign "1")
+           (Format "General")
+           (Fore "0:0:0")
+           (Back "FFFF:FFFF:FFFF"))
+        (http://www.gnumeric.org/v10.dtd:Font
+          (@ (Unit "10")
+             (Underline "0")
+             (StrikeThrough "0")
+             (Script "0")
+             (Italic "0")
+             (Bold "0"))
+          "Sans")))
+    (http://www.gnumeric.org/v10.dtd:StyleRegion
+      (@ (startRow "464")
+         (startCol "0")
+         (endRow "511")
+         (endCol "7"))
+      (http://www.gnumeric.org/v10.dtd:Style
+        (@ (WrapText "0")
+           (VAlign "2")
+           (ShrinkToFit "0")
+           (Shade "0")
+           (Rotation "0")
+           (PatternColor "0:0:0")
+           (Locked "1")
+           (Indent "0")
+           (Hidden "0")
+           (HAlign "1")
+           (Format "General")
+           (Fore "0:0:0")
+           (Back "FFFF:FFFF:FFFF"))
+        (http://www.gnumeric.org/v10.dtd:Font
+          (@ (Unit "10")
+             (Underline "0")
+             (StrikeThrough "0")
+             (Script "0")
+             (Italic "0")
+             (Bold "0"))
+          "Sans")))
+    (http://www.gnumeric.org/v10.dtd:StyleRegion
+      (@ (startRow "512")
+         (startCol "0")
+         (endRow "65535")
+         (endCol "63"))
+      (http://www.gnumeric.org/v10.dtd:Style
+        (@ (WrapText "0")
+           (VAlign "2")
+           (ShrinkToFit "0")
+           (Shade "0")
+           (Rotation "0")
+           (PatternColor "0:0:0")
+           (Locked "1")
+           (Indent "0")
+           (Hidden "0")
+           (HAlign "1")
+           (Format "General")
+           (Fore "0:0:0")
+           (Back "FFFF:FFFF:FFFF"))
+        (http://www.gnumeric.org/v10.dtd:Font
+          (@ (Unit "10")
+             (Underline "0")
+             (StrikeThrough "0")
+             (Script "0")
+             (Italic "0")
+             (Bold "0"))
+          "Sans")))
+    (http://www.gnumeric.org/v10.dtd:StyleRegion
+      (@ (startRow "432")
+         (startCol "5")
+         (endRow "448")
+         (endCol "5"))
+      (http://www.gnumeric.org/v10.dtd:Style
+        (@ (WrapText "0")
+           (VAlign "2")
+           (ShrinkToFit "0")
+           (Shade "0")
+           (Rotation "0")
+           (PatternColor "0:0:0")
+           (Locked "1")
+           (Indent "0")
+           (Hidden "0")
+           (HAlign "1")
+           (Format "General")
+           (Fore "0:0:0")
+           (Back "FFFF:FFFF:FFFF"))
+        (http://www.gnumeric.org/v10.dtd:Font
+          (@ (Unit "10")
+             (Underline "0")
+             (StrikeThrough "0")
+             (Script "0")
+             (Italic "0")
+             (Bold "0"))
+          "Sans")))
+    (http://www.gnumeric.org/v10.dtd:StyleRegion
+      (@ (startRow "449")
+         (startCol "5")
+         (endRow "449")
+         (endCol "5"))
+      (http://www.gnumeric.org/v10.dtd:Style
+        (@ (WrapText "0")
+           (VAlign "2")
+           (ShrinkToFit "0")
+           (Shade "0")
+           (Rotation "0")
+           (PatternColor "0:0:0")
+           (Locked "1")
+           (Indent "0")
+           (Hidden "0")
+           (HAlign "1")
+           (Format "General")
+           (Fore "0:0:0")
+           (Back "FFFF:FFFF:FFFF"))
+        (http://www.gnumeric.org/v10.dtd:Font
+          (@ (Unit "10")
+             (Underline "0")
+             (StrikeThrough "0")
+             (Script "0")
+             (Italic "0")
+             (Bold "0"))
+          "Sans")))
+    (http://www.gnumeric.org/v10.dtd:StyleRegion
+      (@ (startRow "450")
+         (startCol "5")
+         (endRow "463")
+         (endCol "5"))
+      (http://www.gnumeric.org/v10.dtd:Style
+        (@ (WrapText "0")
+           (VAlign "2")
+           (ShrinkToFit "0")
+           (Shade "0")
+           (Rotation "0")
+           (PatternColor "0:0:0")
+           (Locked "1")
+           (Indent "0")
+           (Hidden "0")
+           (HAlign "1")
+           (Format "General")
+           (Fore "0:0:0")
+           (Back "FFFF:FFFF:FFFF"))
+        (http://www.gnumeric.org/v10.dtd:Font
+          (@ (Unit "10")
+             (Underline "0")
+             (StrikeThrough "0")
+             (Script "0")
+             (Italic "0")
+             (Bold "0"))
+          "Sans")))
+    (http://www.gnumeric.org/v10.dtd:StyleRegion
+      (@ (startRow "432")
+         (startCol "6")
+         (endRow "463")
+         (endCol "7"))
+      (http://www.gnumeric.org/v10.dtd:Style
+        (@ (WrapText "0")
+           (VAlign "2")
+           (ShrinkToFit "0")
+           (Shade "0")
+           (Rotation "0")
+           (PatternColor "0:0:0")
+           (Locked "1")
+           (Indent "0")
+           (Hidden "0")
+           (HAlign "1")
+           (Format "General")
+           (Fore "0:0:0")
+           (Back "FFFF:FFFF:FFFF"))
+        (http://www.gnumeric.org/v10.dtd:Font
+          (@ (Unit "10")
+             (Underline "0")
+             (StrikeThrough "0")
+             (Script "0")
+             (Italic "0")
+             (Bold "0"))
+          "Sans")))
+    (http://www.gnumeric.org/v10.dtd:StyleRegion
+      (@ (startRow "256")
+         (startCol "8")
+         (endRow "511")
+         (endCol "63"))
+      (http://www.gnumeric.org/v10.dtd:Style
+        (@ (WrapText "0")
+           (VAlign "2")
+           (ShrinkToFit "0")
+           (Shade "0")
+           (Rotation "0")
+           (PatternColor "0:0:0")
+           (Locked "1")
+           (Indent "0")
+           (Hidden "0")
+           (HAlign "1")
+           (Format "General")
+           (Fore "0:0:0")
+           (Back "FFFF:FFFF:FFFF"))
+        (http://www.gnumeric.org/v10.dtd:Font
+          (@ (Unit "10")
+             (Underline "0")
+             (StrikeThrough "0")
+             (Script "0")
+             (Italic "0")
+             (Bold "0"))
+          "Sans")))
+    (http://www.gnumeric.org/v10.dtd:StyleRegion
+      (@ (startRow "0")
+         (startCol "64")
+         (endRow "65535")
+         (endCol "255"))
+      (http://www.gnumeric.org/v10.dtd:Style
+        (@ (WrapText "0")
+           (VAlign "2")
+           (ShrinkToFit "0")
+           (Shade "0")
+           (Rotation "0")
+           (PatternColor "0:0:0")
+           (Locked "1")
+           (Indent "0")
+           (Hidden "0")
+           (HAlign "1")
+           (Format "General")
+           (Fore "0:0:0")
+           (Back "FFFF:FFFF:FFFF"))
+        (http://www.gnumeric.org/v10.dtd:Font
+          (@ (Unit "10")
+             (Underline "0")
+             (StrikeThrough "0")
+             (Script "0")
+             (Italic "0")
+             (Bold "0"))
+          "Sans"))))
+  (http://www.gnumeric.org/v10.dtd:Cols
+    (@ (DefaultSizePts "48"))
+    (http://www.gnumeric.org/v10.dtd:ColInfo
+      (@ (Unit "243.8") (No "0")))
+    (http://www.gnumeric.org/v10.dtd:ColInfo
+      (@ (Unit "89.25")
+         (No "1")
+         (HardSize "1")
+         (Count "2")))
+    (http://www.gnumeric.org/v10.dtd:ColInfo
+      (@ (Unit "51") (No "3") (HardSize "1")))
+    (http://www.gnumeric.org/v10.dtd:ColInfo
+      (@ (Unit "49.5") (No "4") (HardSize "1")))
+    (http://www.gnumeric.org/v10.dtd:ColInfo
+      (@ (Unit "105") (No "5") (HardSize "1")))
+    (http://www.gnumeric.org/v10.dtd:ColInfo
+      (@ (Unit "48") (No "6")))
+    (http://www.gnumeric.org/v10.dtd:ColInfo
+      (@ (Unit "70.5") (No "7") (HardSize "1")))
+    (http://www.gnumeric.org/v10.dtd:ColInfo
+      (@ (Unit "48") (No "8")))
+    (http://www.gnumeric.org/v10.dtd:ColInfo
+      (@ (Unit "60.75") (No "9") (HardSize "1")))
+    (http://www.gnumeric.org/v10.dtd:ColInfo
+      (@ (Unit "34.5") (No "10") (HardSize "1")))
+    (http://www.gnumeric.org/v10.dtd:ColInfo
+      (@ (Unit "177") (No "11") (HardSize "1")))
+    (http://www.gnumeric.org/v10.dtd:ColInfo
+      (@ (Unit "63.75") (No "12") (HardSize "1")))
+    (http://www.gnumeric.org/v10.dtd:ColInfo
+      (@ (Unit "413.2") (No "13") (HardSize "1")))
+    (http://www.gnumeric.org/v10.dtd:ColInfo
+      (@ (Unit "213.8") (No "14") (HardSize "1")))
+    (http://www.gnumeric.org/v10.dtd:ColInfo
+      (@ (Unit "198.8") (No "15") (HardSize "1")))
+    (http://www.gnumeric.org/v10.dtd:ColInfo
+      (@ (Unit "104.2") (No "16")))
+    (http://www.gnumeric.org/v10.dtd:ColInfo
+      (@ (Unit "78.75") (No "17"))))
+  (http://www.gnumeric.org/v10.dtd:Rows
+    (@ (DefaultSizePts "12.1"))
+    (http://www.gnumeric.org/v10.dtd:RowInfo
+      (@ (Unit "13.5") (No "0")))
+    (http://www.gnumeric.org/v10.dtd:RowInfo
+      (@ (Unit "13.5")
+         (No "1")
+         (Hidden "1")
+         (Count "17")))
+    (http://www.gnumeric.org/v10.dtd:RowInfo
+      (@ (Unit "12.1")
+         (No "18")
+         (Hidden "1")
+         (Count "41")))
+    (http://www.gnumeric.org/v10.dtd:RowInfo
+      (@ (Unit "13.5") (No "59") (Hidden "1")))
+    (http://www.gnumeric.org/v10.dtd:RowInfo
+      (@ (Unit "12.1")
+         (No "60")
+         (Hidden "1")
+         (Count "131")))
+    (http://www.gnumeric.org/v10.dtd:RowInfo
+      (@ (Unit "13.5") (No "191") (Hidden "1")))
+    (http://www.gnumeric.org/v10.dtd:RowInfo
+      (@ (Unit "12.1")
+         (No "192")
+         (Hidden "1")
+         (Count "215")))
+    (http://www.gnumeric.org/v10.dtd:RowInfo
+      (@ (Unit "13.5") (No "407")))
+    (http://www.gnumeric.org/v10.dtd:RowInfo
+      (@ (Unit "12.1") (No "408") (Count "10")))
+    (http://www.gnumeric.org/v10.dtd:RowInfo
+      (@ (Unit "12.1") (No "418") (Hidden "1")))
+    (http://www.gnumeric.org/v10.dtd:RowInfo
+      (@ (Unit "13.5") (No "419") (Hidden "1")))
+    (http://www.gnumeric.org/v10.dtd:RowInfo
+      (@ (Unit "12.1") (No "420")))
+    (http://www.gnumeric.org/v10.dtd:RowInfo
+      (@ (Unit "13.5") (No "421") (Hidden "1")))
+    (http://www.gnumeric.org/v10.dtd:RowInfo
+      (@ (Unit "12.1") (No "422") (Hidden "1")))
+    (http://www.gnumeric.org/v10.dtd:RowInfo
+      (@ (Unit "13.5") (No "423") (Hidden "1")))
+    (http://www.gnumeric.org/v10.dtd:RowInfo
+      (@ (Unit "12.1") (No "424") (Count "18")))
+    (http://www.gnumeric.org/v10.dtd:RowInfo
+      (@ (Unit "12.1") (No "442") (Hidden "1")))
+    (http://www.gnumeric.org/v10.dtd:RowInfo
+      (@ (Unit "12.1") (No "443")))
+    (http://www.gnumeric.org/v10.dtd:RowInfo
+      (@ (Unit "13.5") (No "444") (Hidden "1")))
+    (http://www.gnumeric.org/v10.dtd:RowInfo
+      (@ (Unit "12.1") (No "445")))
+    (http://www.gnumeric.org/v10.dtd:RowInfo
+      (@ (Unit "12.1")
+         (No "446")
+         (Hidden "1")
+         (Count "3")))
+    (http://www.gnumeric.org/v10.dtd:RowInfo
+      (@ (Unit "12.1") (No "449") (Count "7")))
+    (http://www.gnumeric.org/v10.dtd:RowInfo
+      (@ (Unit "13.5") (No "456") (Hidden "1")))
+    (http://www.gnumeric.org/v10.dtd:RowInfo
+      (@ (Unit "12.1") (No "457") (Hidden "1")))
+    (http://www.gnumeric.org/v10.dtd:RowInfo
+      (@ (Unit "12.1") (No "458") (Count "2")))
+    (http://www.gnumeric.org/v10.dtd:RowInfo
+      (@ (Unit "13.5")
+         (No "460")
+         (Hidden "1")
+         (Count "3")))
+    (http://www.gnumeric.org/v10.dtd:RowInfo
+      (@ (Unit "12.1") (No "463") (Count "4")))
+    (http://www.gnumeric.org/v10.dtd:RowInfo
+      (@ (Unit "13.5")
+         (No "467")
+         (Hidden "1")
+         (Count "15")))
+    (http://www.gnumeric.org/v10.dtd:RowInfo
+      (@ (Unit "12.1") (No "482") (Hidden "1")))
+    (http://www.gnumeric.org/v10.dtd:RowInfo
+      (@ (Unit "13.5")
+         (No "483")
+         (Hidden "1")
+         (Count "5")))
+    (http://www.gnumeric.org/v10.dtd:RowInfo
+      (@ (Unit "12.1") (No "488") (Hidden "1")))
+    (http://www.gnumeric.org/v10.dtd:RowInfo
+      (@ (Unit "13.5")
+         (No "489")
+         (Hidden "1")
+         (Count "4")))
+    (http://www.gnumeric.org/v10.dtd:RowInfo
+      (@ (Unit "12.1")
+         (No "493")
+         (Hidden "1")
+         (Count "5")))
+    (http://www.gnumeric.org/v10.dtd:RowInfo
+      (@ (Unit "13.5")
+         (No "498")
+         (Hidden "1")
+         (Count "3")))
+    (http://www.gnumeric.org/v10.dtd:RowInfo
+      (@ (Unit "12.1")
+         (No "501")
+         (Hidden "1")
+         (Count "65035"))))
+  (http://www.gnumeric.org/v10.dtd:Selections
+    (@ (CursorRow "426") (CursorCol "13"))
+    (http://www.gnumeric.org/v10.dtd:Selection
+      (@ (startRow "426")
+         (startCol "13")
+         (endRow "426")
+         (endCol "13"))))
+  (http://www.gnumeric.org/v10.dtd:SheetLayout
+    (@ (TopLeft "A2"))
+    (http://www.gnumeric.org/v10.dtd:FreezePanes
+      (@ (UnfrozenTopLeft "A2") (FrozenTopLeft "A1"))))
+  (http://www.gnumeric.org/v10.dtd:Filters
+    (http://www.gnumeric.org/v10.dtd:Filter
+      (@ (Area "A1:Q65536"))
+      (http://www.gnumeric.org/v10.dtd:Field
+        (@ (ValueType0 "v1.65-broken")
+           (Value0 "60")
+           (Type "expr")
+           (Op0 "eq")
+           (Index "1")))))
+  (http://www.gnumeric.org/v10.dtd:Solver
+    (@ (ProgramR "0")
+       (ProblemType "0")
+       (NonNeg "1")
+       (ModelType "0")
+       (MaxTime "60")
+       (MaxIter "1000")
+       (Discr "0")
+       (AutoScale "0"))))

ADDED   fossil-utils/justtesting/timeline.dat
Index: fossil-utils/justtesting/timeline.dat
==================================================================
--- /dev/null
+++ fossil-utils/justtesting/timeline.dat
cannot compute difference between binary files

Index: fs-transport.scm
==================================================================
--- fs-transport.scm
+++ fs-transport.scm
@@ -1,14 +1,22 @@
 
 ;; Copyright 2006-2012, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
 
 (require-extension (srfi 18) extras tcp s11n)
 
 (use sqlite3 srfi-1 posix regex regex-case srfi-69 hostinfo md5 message-digest)
 (import (prefix sqlite3 sqlite3:))

DELETED fsl-rebase.scm
Index: fsl-rebase.scm
==================================================================
--- fsl-rebase.scm
+++ /dev/null
@@ -1,37 +0,0 @@
-;; given branch and baseline commit generate list of commands to cherry pick commits
-;;
-;;
-;; Usage: fsl-rebase basecommit branch
-;;         
-
-(use regex posix)
-
-(let* ((basecommit (cadr (argv)))
-       (branch     (caddr (argv)))
-       (cmd        (conc "fossil timeline after " basecommit " -n 1000000 -W 0"))
-       (theregex   (conc ;; "^[^\\]]+"
-			 "\\[([a-z0-9]+)\\]\\s+"
-			 "(.*)"
-			 "\\s+\\(.*tags:\\s+" branch 
-			 ;; ".*\\)"
-			 )))
-  (print "basecommit: " basecommit ", branch: " branch ", theregex: " theregex ", cmd: \"" cmd "\"")
-  (with-input-from-pipe
-   cmd
-   (lambda ()
-     (let loop ((inl (read-line))
-		(res '()))
-       (if (not (eof-object? inl))
-	   (let ((have-match (string-search theregex inl)))
-	     (if have-match
-		 (loop (read-line)
-		       (cons (conc "fossil merge --cherrypick " (cadr have-match)
-				   "\nfossil commit -m \"Cherry pick from " (cadr have-match)
-				   ": " (caddr have-match) "\"")
-			     res))
-		 (loop (read-line) res)))
-	   (map print res))))))
-
-;; (print "match: " inl "\n   $1: " (cadr have-match) " $2: " (caddr have-match))
-;; (print "no match: " theregex " " inl))
-;; (loop (read-line))))))))

ADDED   ftail.scm
Index: ftail.scm
==================================================================
--- /dev/null
+++ ftail.scm
@@ -0,0 +1,108 @@
+;;======================================================================
+;; Copyright 2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
+;;======================================================================
+
+(declare (unit ftail))
+
+(module ftail
+    (
+     open-tail-db
+     tail-write
+     tail-get-fid
+     file-tail
+     )
+
+(import scheme chicken data-structures extras)
+(use (prefix sqlite3 sqlite3:) posix typed-records)
+
+(define (open-tail-db )
+  (let* ((basedir   (create-directory (conc "/tmp/" (current-user-name))))
+	 (dbpath    (conc basedir "/megatest_logs.db"))
+	 (dbexists  (file-exists? dbpath))
+	 (db        (sqlite3:open-database dbpath))
+	 (handler   (sqlite3:make-busy-timeout 136000)))
+    (sqlite3:set-busy-handler! db handler)
+    (sqlite3:execute db "PRAGMA synchronous = 0;")
+    (if (not dbexists)
+	(begin
+	  (sqlite3:execute db "CREATE TABLE IF NOT EXISTS log_files (id INTEGER PRIMARY KEY,filename TEXT,event_time TIMESTAMP DEFAULT (strftime('%s','now')));")
+	  (sqlite3:execute db "CREATE TABLE IF NOT EXISTS log_data  (id INTEGER PRIMARY KEY,fid INTEGER,line TEXT,event_time TIMESTAMP DEFAULT (strftime('%s','now')));")
+	  ))
+    db))
+
+(define (tail-write db fid lines)
+  (sqlite3:with-transaction
+   db
+   (lambda ()
+     (for-each
+      (lambda (line)
+	(sqlite3:execute db "INSERT INTO log_data (fid,line) VALUES (?,?);" fid line))
+      lines))))
+
+(define (tail-get-fid db fname)
+  (let ((fid   (handle-exceptions
+		   exn
+		   #f
+		 (sqlite3:first-result db "SELECT id FROM log_files WHERE filename=?;" fname))))
+    (if fid
+	fid
+	(begin
+	  (sqlite3:execute db "INSERT INTO log_files (filename) VALUES (?);" fname)
+	  (tail-get-fid db fname)))))
+
+(define (file-tail fname #!key (db-in #f))
+  (let* ((inp (open-input-file fname))
+	 (db  (or db-in (open-tail-db)))
+	 (fid (tail-get-fid db fname)))
+    (let loop ((inl    (read-line inp))
+	       (lines '())
+	       (lastwr (current-seconds)))
+      (if (eof-object? inl)
+	  (let ((timed-out (> (- (current-seconds) lastwr) 60)))
+	    (if timed-out (tail-write db fid (reverse lines)))
+	    (sleep 1)
+	    (if timed-out
+		(loop (read-line inp) '() (current-seconds))
+		(loop (read-line inp) lines lastwr)))
+	  (let* ((savelines (> (length lines) 19)))
+	    ;; (print inl)
+	    (if savelines (tail-write db fid (reverse lines)))
+	    (loop (read-line inp)
+		  (if savelines
+		      '()
+		      (cons inl lines))
+		  (if savelines
+		      (current-seconds)
+		      lastwr)))))))
+
+;; offset -20 means get last 20 lines
+;;
+(define (tail-get-lines db fid offset count)
+  (if (> offset 0)
+      (sqlite3:map-row (lambda (id line)
+		 (vector id line))
+	       db
+	       "SELECT id,line FROM log_data WHERE fid=? OFFSET ? LIMIT ?;" fid offset count)
+      (reverse ;; get N from the end
+       (sqlite3:map-row (lambda (id line)
+		  (vector id line))
+		db
+		"SELECT id,line FROM log_data WHERE fid=? ORDER BY id DESC LIMIT ?;" fid (abs offset)))))
+
+)

Index: gen-data-for-graph.scm
==================================================================
--- gen-data-for-graph.scm
+++ gen-data-for-graph.scm
@@ -1,5 +1,22 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
 (use foof-loop sql-de-lite posix)
 
 (define beginning-2016 1451636435.0)
 (define now (current-seconds))
 (define one-year-ago (- now (* 365 24 60 60)))

Index: genexample.scm
==================================================================
--- genexample.scm
+++ genexample.scm
@@ -1,18 +1,29 @@
 ;;======================================================================
 ;; Copyright 2006-2012, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 ;;======================================================================
 
 (declare (unit genexample))
-(use posix regex)
+(use posix regex matchable)
+
+(include "db_records.scm")
 
 (define genexample:example-logpro
 #<\" to create a test.
 
 Thank you for using Megatest. 
 
 You can edit your config files and create tests in the " path " directory
 
@@ -210,22 +221,22 @@
 	(scripts  '())
 	(items    '())
 	(rel-path #f))
 
     (cond
-     ((file-exists? "megatest.config")         (set! rel-path "./"))
-     ((file-exists? "../megatest.config")      (set! rel-path "../"))
-     ((file-exists? "../../megatest.config")   (set! rel-path "../../"))
-     ((file-exists? "../../../megatest.config")(set! rel-path "../../../"))) ;; good enough dang it.
+     ((common:file-exists? "megatest.config")         (set! rel-path "./"))
+     ((common:file-exists? "../megatest.config")      (set! rel-path "../"))
+     ((common:file-exists? "../../megatest.config")   (set! rel-path "../../"))
+     ((common:file-exists? "../../../megatest.config")(set! rel-path "../../../"))) ;; good enough dang it.
 
     ;; Don't gather data or continue if a) megatest.config can't be found or b) testconfig already exists
     (if (not rel-path)
 	(begin
 	  (print "ERROR: I could not find megatest.config, please run -create-test in the top dir of your megatest area")
 	  (exit 1)))
 
-    (if (file-exists? (conc rel-path "tests/" testname "/testconfig"))
+    (if (common:file-exists? (conc rel-path "tests/" testname "/testconfig"))
 	(begin
 	  (print "WARNING: You already have a testconfig in " rel-path "tests/" testname ", do you want to clobber your files?")
 	  (display "Enter y/n: ")
 	  (if (not (equal? "y" (read-line)))
 	      (begin
@@ -329,5 +340,179 @@
 			      (with-output-to-file (conc testdir "/" script)
 				(lambda ()
 				  (print genexample:example-script)))
 			      (system (conc "chmod ug+r,a+x " (conc testdir "/" script)))))))
 		    steps))))))
+
+;; easier to work backwards than change the upstream code
+;;
+(define (hrs-min-sec->seconds str)
+  (let* ((parts (string-split str))
+	 (res   0))
+    (for-each
+     (lambda (part)
+       (set! res
+	     (+ res
+		(match (string-match "(\\d+)([a-z])" part)
+		  ((_ val units)(* (string->number val)(case (string->symbol units)
+							 ((s) 1)
+							 ((m) 60)
+							 ((h) 3600))))
+		  (else 0)))))
+     parts)
+    res))
+
+;; generate a skeleton Megatest area from a current area with runs
+;;
+;;    specify target, runname etc to use specific runs for the template
+;;
+(define (genexample:extract-skeleton-area dest-path)
+  (let* ((target    (args:get-arg "-target"))
+	 (runname   (args:get-arg "-runname"))
+	 (obtuse    (make-hash-table))
+	 (obtusef   (args:get-arg "-obfuscate"))
+	 (letters   (string-split-fields "\\S" "abcdefghijklmnopqrstuvwxyz"))
+	 (maxletter (- (length letters) 1))
+	 (lastlet   0)
+	 (lastnum   1) 
+	 (obfuscate (lambda (instr)
+		      (or (hash-table-ref/default obtuse instr #f)
+			  (if obtusef
+			      (let* ((letter (list-ref letters lastlet))
+				     (val    (conc letter lastnum)))
+				(if (>= lastlet maxletter)
+				    (begin
+				      (set! lastlet 0)
+				      (set! lastnum (+ lastnum 1)))
+				    (set! lastlet (+ lastlet 1)))
+				(hash-table-set! obtuse instr val)
+				val)
+			      instr)))))
+    (if (not (and target runname))
+	(debug:print 0 *default-log-port* "WARNING: For best results please specifiy -target and -runname for a good run to use as a template."))
+    (if (not (and (file-exists? "megatest.config")
+		  (file-exists? "megatest.db")))
+	(begin
+	  (debug:print 0 *default-log-port* "ERROR: this command must be run at the top level of a megatest area where runs have been completed")
+	  (exit)))
+	     
+    ;; first create the dest path and needed subdirectories
+    (if (not (file-exists? dest-path))
+	(begin
+	  (create-directory dest-path)
+	  (create-directory (conc dest-path "/tests")))
+	(if (file-exists? (conc dest-path "/megatest.config"))
+	    (begin
+	      (debug:print 0 *default-log-port* "ERROR: destination path already has megatest.config, stopping now.")
+	      (exit))))
+
+    ;; dump the config files from this area to the dest area
+    (if (args:get-arg "-obfuscate")
+	(debug:print 0 *default-log-port* "WARNING: obfuscation is NOT done on megatest.config and runconfigs.config. Please edit those files to remove any sensitive information!"))
+    (system (conc "megatest -show-config > " dest-path "/megatest.config"))
+    (system (conc "megatest -show-runconfig > " dest-path "/runconfigs.config"))
+
+    ;; create stepsinfo and items refdbs, some stuff has to be done due to refdb not initing area
+    ;;
+    ;;            sheet       row       col      value
+    ;; stepsinfo  testname    itempath  stepname steptime
+    ;; miscinfo   "itemsinfo" testname  itempath "x"
+    ;;  
+    (for-each
+     (lambda (rdbname)
+       (if (not (file-exists? (conc dest-path "/" rdbname)))
+	   (begin
+	     (create-directory (conc dest-path "/" rdbname "/sxml") #t)
+	     (with-output-to-file (conc dest-path "/" rdbname "/sheet-names.cfg")
+	       (lambda ()(print))))))
+     '("stepsinfo" "miscinfo"))
+    
+    (let* ((runs     (rmt:simple-get-runs (or runname "%") #f #f (or target "%") #f))
+	   (tests    (make-hash-table)) ;; just tests
+	   (fullt    (make-hash-table)) ;; all test/items
+	   (testreg  (make-hash-table)) ;; for the testconfigs
+	   (stepsrdb (conc dest-path "/stepsinfo"))
+	   (miscrdb  (conc dest-path "/miscinfo")))
+      (if (> (length runs) 1)
+	  (debug:print-info 0 *default-log-port* "More than one run matches, first found data will be used."))
+      ;; get all testnames
+      (for-each
+       (lambda (run-id)
+	 (let* ((tests-data (rmt:get-tests-for-run run-id "%" '() '() #f #f #f #f #f #f #f #f)))
+	   (for-each
+	    (lambda (testdat)
+	      (let* ((test-id      (db:test-get-id testdat))
+		     (testname     (db:test-get-testname testdat))
+		     (item-path    (db:test-get-item-path testdat))
+		     (tlevel       (db:test-get-is-toplevel testdat))
+		     (tfullname    (db:test-get-fullname testdat))
+		     ;; now get steps info
+		     (test-steps   (tests:get-compressed-steps run-id test-id))
+		     (testconfig   (tests:get-testconfig testname item-path testreg #f)))
+
+		
+		(if (not (hash-table-exists? fullt tfullname))
+		    ;; do the work for this test if not previously done
+		    (let* ((new-test-dir (conc dest-path "/tests/" (obfuscate testname)))
+			   (tconfigf     (conc new-test-dir "/testconfig")))
+		      (print "Analyzing and extracting info for " tfullname " as " (obfuscate testname))
+		      (print "  toplevel: " (if tlevel "yes" "no"))
+		      (hash-table-set! fullt tfullname #t) ;; track that this one has been seen
+		      (if (not (directory-exists? new-test-dir))
+			  (create-directory new-test-dir #t))
+
+		      ;; create the testconfig IIF we are a toplevel or an item AND the testconfig has not been previously created
+		      (if (and (or (not tlevel)
+				   (not (equal? item-path "")))
+			       (not (file-exists? tconfigf)))
+			  (with-output-to-file tconfigf
+			    (lambda ()
+			      ;; first the ezsteps
+			      (print "[ezsteps]")
+			      (for-each
+			       (lambda (teststep)
+				 (let* ((step-name  (vector-ref teststep 0)))
+				   (print (obfuscate step-name)
+					  " sleep $(refdb lookup #{getenv MT_RUN_AREA_HOME}/stepsinfo "
+					  (obfuscate testname) " $MT_ITEMPATH "
+					  (obfuscate step-name) ")")))
+			       test-steps)
+
+			      ;; now the requirements section
+			      (if testconfig
+				  (begin
+				    (print "\n[requirements]")
+				    (for-each
+				     (lambda (entry)
+				       (let* ((key (car entry))
+					      (val (cadr entry)))
+					 (case (string->symbol key)
+					   ((waiton)  (print "waiton " (obfuscate val)))
+					   (else      (print key " " val)))))
+				     (configf:get-section testconfig "requirements")))
+				  #;(print "WARNING: No testconfig data for " testname ", " item-path))
+				    
+			      (print "\n[items]")
+			      (print "THE_ITEM [system refdb getrow #{getenv MT_RUN_AREA_HOME}/miscinfo itemsinfo " (obfuscate testname)" | awk '{print $1}']")
+			      )))
+
+		      ;; fill the stepsrdb
+		      (for-each
+		       (lambda (teststep)
+			 (let* ((step-name     (vector-ref teststep 0))
+				(step-duration (hrs-min-sec->seconds (vector-ref teststep 4))))
+			   
+			   (system (conc "refdb set " stepsrdb " " (obfuscate testname)
+					 " '" (if (equal? item-path "")
+						  "no-item-path"
+						  (obfuscate item-path))
+					 "' " (obfuscate step-name) " " step-duration))))
+		       test-steps)
+
+		      ;; miscinfo   "itemsinfo" testname  itempath "x"
+		      (if (not (equal? item-path ""))
+			  (system (conc "refdb set " miscrdb " itemsinfo " (obfuscate testname) " " (obfuscate item-path) " x")))
+
+		      ))))
+	    tests-data)))
+       (map (lambda (runrec)(simple-run-id runrec)) runs)))
+    ))

Index: gentargets.sh
==================================================================
--- gentargets.sh
+++ gentargets.sh
@@ -1,6 +1,23 @@
 #!/bin/bash
 
-echo '[v1.63/tip/dev]'
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
+echo '[all/v1.65/tip/dev]'
 echo 'x 1'
-echo '[v1.64/tip/dev]'
+echo '[all/v1.64/tip/dev]'
 echo 'x 1'

ADDED   get-config-settings.sh
Index: get-config-settings.sh
==================================================================
--- /dev/null
+++ get-config-settings.sh
@@ -0,0 +1,19 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
+ grep configf:lookup *.scm | sed 's/^.*:lookup//; s/^-number//; s/^ //' | grep -v '^\(section\|test-conf\|tconfig\|testconfig\|dat\|config\|views-cfgdat\)' | perl -pe 's/^\s*(\*configdat\*|configdat|mtconf)//; s/^\s+//; s/\).*$//; s/"//g' | awk '{print $1,$2}' | sort | grep -v section | sort | uniq
+

Index: gutils.scm
==================================================================
--- gutils.scm
+++ gutils.scm
@@ -1,43 +1,66 @@
 ;;======================================================================
 ;; Copyright 2006-2012, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
 ;;======================================================================
 
 (require-library iup)
 (import (prefix iup iup:))
 (use canvas-draw)
 
 (use srfi-1 regex regex-case srfi-69)
 (declare (unit gutils))
 
+;; NOTE: These functions will move to iuputils
+
 (define (gutils:colors-similar? color1 color2)
   (let* ((c1 (map string->number (string-split color1)))
 	 (c2 (map string->number (string-split color2)))
 	 (delta (map (lambda (a b)(abs (- a b))) c1 c2)))
     (null? (filter (lambda (x)(> x 3)) delta))))
 
+(define gutils:colors
+  '((PASS . "70 249 73")
+    (FAIL . "253 33 49")
+    (SKIP . "230 230 0")))
+
+(define (gutils:get-color-spec effective-state)
+  (or (alist-ref effective-state gutils:colors)
+      (alist-ref 'FAIL gutils:colors)))
+
+;; BBnote - state status dashboard button color / text defined here
 (define (gutils:get-color-for-state-status state status);; #!key (get-label #f))
   ;; ((if get-label cadr car)
   (case (string->symbol state)
     ((COMPLETED) ;; ARCHIVED)
      (case (string->symbol status)
        ((PASS)        (list "70  249 73" status))
+       ((PREQ_FAIL PREQ_DISCARDED) (list "255 127 127" status))
        ((WARN WAIVED) (list "255 172 13" status))
-       ((SKIP)        (list "230 230 0" status))
+       ((SKIP)        (list (gutils:get-color-spec 'SKIP) status))
+       ((ABORT)       (list "198 36 166" status))
        (else (list "253 33 49" status))))
     ((ARCHIVED)
      (case (string->symbol status)
        ((PASS)        (list "70  170 73" status))
        ((WARN WAIVED) (list "200 130 13" status))
-       ((SKIP)        (list "180 180 0" status))
+       ((SKIP)        (list (gutils:get-color-spec 'SKIP) status))
        (else (list "180 33 49" status))))
     ;;      (if (equal? status "PASS")
     ;;	  '("70 249 73" "PASS")
     ;;	  (if (or (equal? status "WARN")
     ;;		  (equal? status "WAIVED"))
@@ -44,14 +67,16 @@
     ;;	      (list "255 172 13" status)
     ;;	      (list "223 33 49"  status)))) ;; greenish orangeish redish
     ((LAUNCHED)         (list "101 123 142"  state))
     ((CHECK)            (list "255 100 50"   state))
     ((REMOTEHOSTSTART)  (list "50 130 195"   state))
-    ((RUNNING)          (list "9 131 232"    state))
+    ((RUNNING STARTED)          (list "9 131 232"    state))
     ((KILLREQ)          (list "39 82 206"    state))
     ((KILLED)           (list "234 101 17"   state))
-    ((NOT_STARTED)      (list "240 240 240"  state))
+    ((NOT_STARTED)      (case (string->symbol status)
+			  ((CHECK STARTED)(list (gutils:get-color-spec 'SKIP) state))
+			  (else   (list "240 240 240"                 state))))
     ;; for xor mode below
     ;;
     ((CLEAN)
      (case (string->symbol status)
        ((CLEAN-FAIL CLEAN-CHECK CLEAN-ABORT)  (list "200 130 13" status)) ;; orange requested for these

Index: http-transport.scm
==================================================================
--- http-transport.scm
+++ http-transport.scm
@@ -1,19 +1,27 @@
 
 ;; Copyright 2006-2012, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
 
 (require-extension (srfi 18) extras tcp s11n)
 
-(use  srfi-1 posix regex regex-case srfi-69 hostinfo md5 message-digest posix-extras) ;; sqlite3
-;; (import (prefix sqlite3 sqlite3:))
+
+(use  srfi-1 posix regex regex-case srfi-69 hostinfo md5 message-digest posix-extras)
 
 (use spiffy uri-common intarweb http-client spiffy-request-vars intarweb spiffy-directory-listing)
 
 ;; Configurations for server
 (tcp-buffer-size 2048)
@@ -24,45 +32,53 @@
 (declare (uses common))
 (declare (uses db))
 (declare (uses tests))
 (declare (uses tasks)) ;; tasks are where stuff is maintained about what is running.
 (declare (uses server))
-(declare (uses daemon))
+;; (declare (uses daemon))
 (declare (uses portlogger))
 (declare (uses rmt))
 
 (include "common_records.scm")
 (include "db_records.scm")
+(include "js-path.scm")
 
+(require-library stml)
 (define (http-transport:make-server-url hostport)
   (if (not hostport)
       #f
       (conc "http://" (car hostport) ":" (cadr hostport))))
 
 (define *server-loop-heart-beat* (current-seconds))
 
 ;;======================================================================
 ;; S E R V E R
-;;======================================================================
+;; ======================================================================
 
 ;; Call this to start the actual server
 ;;
 
 (define *db:process-queue-mutex* (make-mutex))
 
 (define (http-transport:run hostn)
+  ;; Configurations for server
+  (tcp-buffer-size 2048)
+  (max-connections 2048) 
   (debug:print 2 *default-log-port* "Attempting to start the server ...")
   (let* ((db              #f) ;;        (open-db)) ;; we don't want the server to be opening and closing the db unnecesarily
 	 (hostname        (get-host-name))
 	 (ipaddrstr       (let ((ipstr (if (string=? "-" hostn)
 					   ;; (string-intersperse (map number->string (u8vector->list (hostname->ip hostname))) ".")
 					   (server:get-best-guess-address hostname)
 					   #f)))
 			    (if ipstr ipstr hostn))) ;; hostname))) 
 	 (start-port      (portlogger:open-run-close portlogger:find-port))
-	 (link-tree-path  (common:get-linktree))) ;; (configf:lookup *configdat* "setup" "linktree")))
+	 (link-tree-path  (common:get-linktree))
+	 (tmp-area        (common:get-db-tmp-area))
+	 (start-file      (conc tmp-area "/.server-start")))
     (debug:print-info 0 *default-log-port* "portlogger recommended port: " start-port)
+    ;; set some parameters for the server
     (root-path     (if link-tree-path 
 		       link-tree-path
 		       (current-directory))) ;; WARNING: SECURITY HOLE. FIX ASAP!
     (handle-directory spiffy-directory-listing)
     (handle-exception (lambda (exn chain)
@@ -101,29 +117,48 @@
 					   '(/ any))
 				   (send-response body: "hey there!\n"
 						  headers: '((content-type text/plain))))
 				  ((equal? (uri-path (request-uri (current-request))) 
 					   '(/ "hey"))
-				   (send-response body: "hey there!\n"
+				   (send-response body: "hey there!\n" 
 						  headers: '((content-type text/plain))))
+                                  ((equal? (uri-path (request-uri (current-request))) 
+					   '(/ "jquery3.1.0.js"))
+				   (send-response body: (http-transport:show-jquery) 
+						  headers: '((content-type application/javascript))))
+                                  ((equal? (uri-path (request-uri (current-request))) 
+					   '(/ "test_log"))
+				   (send-response body: (http-transport:html-test-log $) 
+						  headers: '((content-type text/HTML))))    
+                                  ((equal? (uri-path (request-uri (current-request))) 
+					   '(/ "dashboard"))
+				   (send-response body: (http-transport:html-dboard $) 
+						  headers: '((content-type text/HTML)))) 
 				  (else (continue))))))))
+    (handle-exceptions
+	exn
+      (debug:print 0 *default-log-port* "Failed to create file " start-file ", exn=" exn)
+      (with-output-to-file start-file (lambda ()(print (current-process-id)))))
     (http-transport:try-start-server ipaddrstr start-port)))
 
 ;; This is recursively run by http-transport:run until sucessful
 ;;
 (define (http-transport:try-start-server ipaddrstr portnum)
-  (let ((config-hostname (configf:lookup *configdat* "server" "hostname")))
+  (let ((config-hostname (configf:lookup *configdat* "server" "hostname"))
+	(config-use-proxy (equal? (configf:lookup *configdat* "client" "use-http_proxy") "yes")))
+    (if (not config-use-proxy)
+	(determine-proxy (constantly #f)))
     (debug:print-info 0 *default-log-port* "http-transport:try-start-server time=" (seconds->time-string (current-seconds)) " ipaddrsstr=" ipaddrstr " portnum=" portnum " config-hostname=" config-hostname)
     (handle-exceptions
 	exn
 	(begin
 	  (print-error-message exn)
 	  (if (< portnum 64000)
 	      (begin 
 		(debug:print 0 *default-log-port* "WARNING: attempt to start server failed. Trying again ...")
 		(debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn))
-		(debug:print 0 *default-log-port* "exn=" (condition->list exn))
+		(debug:print 5 *default-log-port* "exn=" (condition->list exn))
 		(portlogger:open-run-close portlogger:set-failed portnum)
 		(debug:print 0 *default-log-port* "WARNING: failed to start on portnum: " portnum ", trying next port")
 		(thread-sleep! 0.1)
 		
 		;; get_next_port goes here
@@ -233,14 +268,18 @@
 					  (handle-exceptions
 					      exn
 					      (let ((call-chain (get-call-chain))
 						    (msg        ((condition-property-accessor 'exn 'message) exn)))
 						(set! success #f)
-						(debug:print 0 *default-log-port* "WARNING: failure in with-input-from-request to " fullurl ".")
-						(debug:print 0 *default-log-port* " message: " msg)
-						(debug:print 0 *default-log-port* " cmd: " cmd " params: " params)
-						(if runremote
+                                                (if (debug:debug-mode 1)
+                                                    (debug:print-info 0 *default-log-port* "couldn't talk to server, trying again ...")
+                                                    (begin
+                                                      (debug:print 0 *default-log-port* "WARNING: failure in with-input-from-request to " fullurl ".")
+                                                      (debug:print 0 *default-log-port* " message: " msg ", exn=" exn)
+                                                      (debug:print 0 *default-log-port* " cmd: " cmd " params: " params)
+                                                      (debug:print 0 *default-log-port* " call-chain: " call-chain)))
+                                                (if runremote
 						    (remote-conndat-set! runremote #f))
 						;; Killing associated server to allow clean retry.")
 						;; (tasks:kill-server-run-id run-id)  ;; better to kill the server in the logic that called this routine?
 						(mutex-unlock! *http-mutex*)
 					     ;;; (signal (make-composite-condition
@@ -247,11 +286,11 @@
 					     ;;;          (make-property-condition 'commfail 'message "failed to connect to server")))
 					     ;;; "communications failed"
 						(db:obj->string #f))
 					    (with-input-from-request ;; was dat
 					     fullurl 
-					     (list (cons 'key "thekey")
+					     (list (cons 'key (or *server-id* "thekey"))
 						   (cons 'cmd cmd)
 						   (cons 'params sparams))
 					     read-string))
 					  transport: 'http)
                                          0)) ;; added this speculatively
@@ -259,10 +298,11 @@
 			      (close-all-connections!)
 			      (mutex-unlock! *http-mutex*)
 			      ))
 	      (time-out     (lambda ()
 			      (thread-sleep! 45)
+			      (debug:print 0 *default-log-port* "WARNING: send-receive took more than 45 seconds!!")
 			      #f))
 	      (th1 (make-thread send-recieve "with-input-from-request"))
 	      (th2 (make-thread time-out     "time out")))
 	 (thread-start! th1)
 	 (thread-start! th2)
@@ -273,11 +313,11 @@
 	     (if (vector-ref res 0) ;; this is the first flag or the second flag?
 		 res ;; this is the *inner* vector? seriously? why?
                  (if (debug:debug-mode 11)
                      (let ((call-chain (get-call-chain))) ;; note: this code also called in nmsg-transport - consider consolidating it
                        (print-call-chain (current-error-port))
-                       (debug:print-error 11 *default-log-port* "error above occured at server, res=" res " message: " ((condition-property-accessor 'exn 'message) exn))
+                       (debug:print-error 11 *default-log-port* "error above occured at server, res=" res) ;; " message: " ((condition-property-accessor 'exn 'message) exn))
                        (debug:print 11 *default-log-port* " server call chain:")
                        (pp (vector-ref res 1) (current-error-port))
                        (signal (vector-ref res 0)))
                      res))
 	     (signal (make-composite-condition
@@ -292,12 +332,18 @@
 	 (server-dat (if runremote
                          (remote-conndat runremote)
                          #f))) ;; (hash-table-ref/default *runremote* run-id #f)))
     (if (vector? server-dat)
 	(let ((api-dat (http-transport:server-dat-get-api-uri server-dat)))
-	  (close-connection! api-dat)
-	  #t)
+	  (handle-exceptions
+	    exn
+	    (begin
+	      (print-call-chain *default-log-port*)
+	      (debug:print-error 0 *default-log-port* " closing connection failed with error: " ((condition-property-accessor 'exn 'message) exn) ", exn=" exn))
+	    (close-connection! api-dat)
+            ;;(close-idle-connections!)
+	    #t))
 	#f)))
 
 
 (define (make-http-transport:server-dat)(make-vector 6))
 (define (http-transport:server-dat-get-iface         vec)    (vector-ref  vec 0))
@@ -340,15 +386,18 @@
 (define (http-transport:keep-running) 
   ;; if none running or if > 20 seconds since 
   ;; server last used then start shutdown
   ;; This thread waits for the server to come alive
   (debug:print-info 0 *default-log-port* "Starting the sync-back, keep alive thread in server")
-  (let* ((server-start-time (current-seconds))
+  (let* ((sdat              #f)
+	 (tmp-area          (common:get-db-tmp-area))
+	 (started-file      (conc tmp-area "/.server-started"))
+	 (server-start-time (current-seconds))
 	 (server-info (let loop ((start-time (current-seconds))
 				 (changed    #t)
 				 (last-sdat  "not this"))
-                        (let ((sdat #f))
+                        (begin ;; let ((sdat #f))
 			  (thread-sleep! 0.01)
 			  (debug:print-info 0 *default-log-port* "Waiting for server alive signature")
                           (mutex-lock! *heartbeat-mutex*)
                           (set! sdat *server-info*)
                           (mutex-unlock! *heartbeat-mutex*)
@@ -355,36 +404,55 @@
                           (if (and sdat
 				   (not changed)
 				   (> (- (current-seconds) start-time) 2))
 			      (begin
 				(debug:print-info 0 *default-log-port* "Received server alive signature")
+                                (common:save-pkt `((action . alive)
+                                                   (T      . server)
+                                                   (pid    . ,(current-process-id))
+                                                   (ipaddr . ,(car sdat))
+                                                   (port   . ,(cadr sdat)))
+                                                 *configdat* #t)
 				sdat)
                               (begin
 				(debug:print-info 0 *default-log-port* "Still waiting, last-sdat=" last-sdat)
                                 (sleep 4)
 				(if (> (- (current-seconds) start-time) 120) ;; been waiting for two minutes
 				    (begin
 				      (debug:print-error 0 *default-log-port* "transport appears to have died, exiting server")
+                                      (common:save-pkt `((action . died)
+                                                         (T      . server)
+                                                         (pid    . ,(current-process-id))
+                                                         (ipaddr . ,(car sdat))
+                                                         (port   . ,(cadr sdat))
+                                                         (msg    . "Transport died?"))
+						       *configdat* #t)
 				      (exit))
 				    (loop start-time
 					  (equal? sdat last-sdat)
 					  sdat)))))))
-         (iface       (car server-info))
+	 (iface       (car server-info))
          (port        (cadr server-info))
          (last-access 0)
-	 (server-timeout (server:get-timeout))
+	 (server-timeout (server:expiration-timeout))
 	 (server-going  #f)
 	 (server-log-file (args:get-arg "-log"))) ;; always set when we are a server
+
+    (handle-exceptions
+	exn
+      (debug:print 0 *default-log-port* "Failed to create " started-file ", exn=" exn)
+      (with-output-to-file started-file (lambda ()(print (current-process-id)))))
+
     (let loop ((count         0)
 	       (server-state 'available)
 	       (bad-sync-count 0)
 	       (start-time     (current-milliseconds)))
       ;; Use this opportunity to sync the tmp db to megatest.db
       (if (not server-going) ;; *dbstruct-db* 
 	  (begin
 	    (debug:print 0 *default-log-port* "SERVER: dbprep")
-	    (set! *dbstruct-db*  (db:setup)) ;;  run-id))
+	    (set! *dbstruct-db*  (db:setup #t)) ;;  run-id))
 	    (set! server-going #t)
 	    (debug:print 0 *default-log-port* "SERVER: running, megatest version: " (common:get-full-version)) ;; NOTE: the server is NOT yet marked as running in the log. We do that in the keep-running routine.
 	    (thread-start! *watchdog*)))
       
       ;; when things go wrong we don't want to be doing the various queries too often
@@ -423,28 +491,23 @@
 	    (flush-output *default-log-port*)))
       (if (common:low-noise-print 60 "dbstats")
 	  (begin
 	    (debug:print 0 *default-log-port* "Server stats:")
 	    (db:print-current-query-stats)))
-      (let* ((hrs-since-start  (/ (- (current-seconds) server-start-time) 3600))
-	     (adjusted-timeout (if (> hrs-since-start 1)
-				   (- server-timeout (inexact->exact (round (* hrs-since-start 60))))  ;; subtract 60 seconds per hour
-				   server-timeout)))
-	(if (common:low-noise-print 120 "server timeout")
-	    (debug:print-info 0 *default-log-port* "Adjusted server timeout: " adjusted-timeout))
+      (let* ((hrs-since-start  (/ (- (current-seconds) server-start-time) 3600)))
 	(cond
          ((and *server-run*
 	       (> (+ last-access server-timeout)
-		  (current-seconds))
-	       (< (- (current-seconds) server-start-time) 3600)) ;; do not update log or touch log if we've been running for more than one hour.
+		  (current-seconds)))
           (if (common:low-noise-print 120 "server continuing")
               (debug:print-info 0 *default-log-port* "Server continuing, seconds since last db access: " (- (current-seconds) last-access))
 	      (let ((curr-time (current-seconds)))
 		(handle-exceptions
 		    exn
-		    (debug:print 0 *default-log-port* "ERROR: Failed to change timestamp on log file " server-log-file ". Are you out of space on that disk?")
-		  (change-file-times server-log-file curr-time curr-time))))
+		    (debug:print 0 *default-log-port* "ERROR: Failed to change timestamp on log file " server-log-file ". Are you out of space on that disk? exn=" exn)
+		  (if (not *server-overloaded*)
+		      (change-file-times server-log-file curr-time curr-time)))))
           (loop 0 server-state bad-sync-count (current-milliseconds)))
          (else
           (debug:print-info 0 *default-log-port* "Server timed out. seconds since last db access: " (- (current-seconds) last-access))
           (http-transport:server-shutdown port)))))))
 
@@ -474,66 +537,128 @@
     ;; 			  (/ *total-non-write-delay* 
     ;; 			     *number-non-write-queries*))
     ;; 		      " ms")
     
     (db:print-current-query-stats)
-    
+    (common:save-pkt `((action . exit)
+                       (T      . server)
+                       (pid    . ,(current-process-id)))
+                     *configdat* #t)
     (debug:print-info 0 *default-log-port* "Server shutdown complete. Exiting")
     (exit)))
 
 ;; all routes though here end in exit ...
 ;;
 ;; start_server? 
 ;;
 (define (http-transport:launch)
-  ;; (if (args:get-arg "-daemonize")
-  ;;     (begin
-  ;; 	(daemon:ize)
-  ;; 	(if *alt-log-file* ;; we should re-connect to this port, I think daemon:ize disrupts it
-  ;; 	    (begin
-  ;; 	      (current-error-port *alt-log-file*)
-  ;; 	      (current-output-port *alt-log-file*)))))
-  (let* ((th2 (make-thread (lambda ()
-			     (debug:print-info 0 *default-log-port* "Server run thread started")
-			     (http-transport:run 
-			      (if (args:get-arg "-server")
-				  (args:get-arg "-server")
-				  "-")
-			      )) "Server run"))
-	 (th3 (make-thread (lambda ()
-			     (debug:print-info 0 *default-log-port* "Server monitor thread started")
-			     (http-transport:keep-running)
-			   "Keep running"))))
-    (thread-start! th2)
-    (thread-sleep! 0.25) ;; give the server time to settle before starting the keep-running monitor.
-    (thread-start! th3)
-    (set! *didsomething* #t)
-    (thread-join! th2)
-    (exit)))
-
-(define (http-transport:server-signal-handler signum)
-  (signal-mask! signum)
-  (handle-exceptions
-   exn
-   (debug:print 0 *default-log-port* " ... exiting ...")
-   (let ((th1 (make-thread (lambda ()
-			     (thread-sleep! 1))
-			   "eat response"))
-	 (th2 (make-thread (lambda ()
-			     (debug:print-error 0 *default-log-port* "Received ^C, attempting clean exit. Please be patient and wait a few seconds before hitting ^C again.")
-			     (thread-sleep! 3) ;; give the flush three seconds to do it's stuff
-			     (debug:print 0 *default-log-port* "       Done.")
-			     (exit 4))
-			   "exit on ^C timer")))
-     (thread-start! th2)
-     (thread-start! th1)
-     (thread-join! th2))))
+  ;; check that a server start is in progress, pause or exit if so
+  (let* ((tmp-area            (common:get-db-tmp-area))
+	 (server-start        (conc tmp-area "/.server-start"))
+	 (server-started      (conc tmp-area "/.server-started"))
+	 (start-time          (common:lazy-modification-time server-start))
+	 (started-time        (common:lazy-modification-time server-started))
+	 (server-starting     (< start-time started-time)) ;; if start-time is less than started-time then a server is still starting
+	 (start-time-old      (> (- (current-seconds) start-time) 5))
+         (cleanup-proc        (lambda (msg)
+                                (let* ((serv-fname      (conc "server-" (current-process-id) "-" (get-host-name) ".log"))
+                                       (full-serv-fname (conc *toppath* "/logs/" serv-fname))
+                                       (new-serv-fname  (conc *toppath* "/logs/" "defunct-" serv-fname)))
+                                  (debug:print 0 *default-log-port* msg)
+                                  (if (common:file-exists? full-serv-fname)
+                                      (system (conc "sleep 1;mv -f " full-serv-fname " " new-serv-fname))
+                                      (debug:print 0 *default-log-port* "INFO: cannot move " full-serv-fname " to " new-serv-fname))
+                                  (exit)))))
+    #;(if (and (not start-time-old) ;; last server start try was less than five seconds ago
+	     (not server-starting))
+	(begin
+	  (cleanup-proc "NOT starting server, there is either a recently started server or a server in process of starting")
+	  (exit)))
+    ;; lets not even bother to start if there are already three or more server files ready to go
+    #;(let* ((num-alive   (server:get-num-alive (server:get-list *toppath*))))
+      (if (> num-alive 3)
+          (begin
+            (cleanup-proc (conc "ERROR: Aborting server start because there are already " num-alive " possible servers either running or starting up"))
+            (exit))))
+  (common:save-pkt `((action . start)
+		     (T      . server)
+		     (pid    . ,(current-process-id)))
+		   *configdat* #t)
+    (let* ((th2 (make-thread (lambda ()
+                               (debug:print-info 0 *default-log-port* "Server run thread started")
+                               (http-transport:run 
+                                (if (args:get-arg "-server")
+                                    (args:get-arg "-server")
+                                    "-")
+                                )) "Server run"))
+           (th3 (make-thread (lambda ()
+                               (debug:print-info 0 *default-log-port* "Server monitor thread started")
+                               (http-transport:keep-running)
+                               "Keep running"))))
+      (thread-start! th2)
+      (thread-sleep! 0.25) ;; give the server time to settle before starting the keep-running monitor.
+      (thread-start! th3)
+      (set! *didsomething* #t)
+      (thread-join! th2)
+      (exit))))
+
+;; (define (http-transport:server-signal-handler signum)
+;;   (signal-mask! signum)
+;;   (handle-exceptions
+;;    exn
+;;    (debug:print 0 *default-log-port* " ... exiting ...")
+;;    (let ((th1 (make-thread (lambda ()
+;; 			     (thread-sleep! 1))
+;; 			   "eat response"))
+;; 	 (th2 (make-thread (lambda ()
+;; 			     (debug:print-error 0 *default-log-port* "Received ^C, attempting clean exit. Please be patient and wait a few seconds before hitting ^C again.")
+;; 			     (thread-sleep! 3) ;; give the flush three seconds to do it's stuff
+;; 			     (debug:print 0 *default-log-port* "       Done.")
+;; 			     (exit 4))
+;; 			   "exit on ^C timer")))
+;;      (thread-start! th2)
+;;      (thread-start! th1)
+;;      (thread-join! th2))))
+
+;;===============================================
+;; Java script
+;;===============================================
+(define (http-transport:show-jquery)
+  (let* ((data  (tests:readlines *java-script-lib*)))
+(string-join data "\n")))
+
+
 
 ;;======================================================================
 ;; web pages
 ;;======================================================================
 
+(define (http-transport:html-test-log $)
+   (let* ((run-id ($ 'runid))
+         (test-item ($ 'testname))
+         (parts (string-split test-item ":"))
+         (test-name (car parts))
+             
+         (item-name (if (equal? (length parts) 1)
+             ""
+             (cadr parts))))
+  ;(print $) 
+(tests:get-test-log run-id test-name item-name)))
+
+
+(define (http-transport:html-dboard $)
+  (let* ((page ($ 'page))
+         (oup       (open-output-string)) 
+         (bdy "--------------------------")
+
+         (ret  (tests:dynamic-dboard page)))
+    (s:output-new  oup  ret)
+   (close-output-port oup)
+
+  (set! bdy   (get-output-string oup))
+     (conc "
    Dashboard
    " bdy "
     
     "  )))
+
 (define (http-transport:main-page)
   (let ((linkpath (root-path)))
     (conc "
    " (pathname-strip-directory *toppath*) "
    "
 	  ""
 	  "Run area: " *toppath*
@@ -540,11 +665,11 @@
 	  "
    Server Stats
    "
 	  (http-transport:stats-table) 
 	  "
    "
 	  (http-transport:runs linkpath)
 	  "
    "
-	  (http-transport:run-stats)
+	  ;; (http-transport:run-stats)
 	  ""
 	  )))
 
 (define (http-transport:stats-table)
   (mutex-lock! *heartbeat-mutex*)
@@ -575,14 +700,14 @@
 	   (map (lambda (p)
 		  (conc "" p "
    "))
 		files))
 	 " ")))
 
-(define (http-transport:run-stats)
+#;(define (http-transport:run-stats)
   (let ((stats (open-run-close db:get-running-stats #f)))
     (conc ""
 	  (string-intersperse
 	   (map (lambda (stat)
 		  (conc ""))
 		stats)
 	   " ")
 	  "
    " (car stat) "" (cadr stat) "
    ")))

Index: index-tree.scm
==================================================================
--- index-tree.scm
+++ index-tree.scm
@@ -1,14 +1,23 @@
 ;;======================================================================
 ;; Copyright 2006-2013, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
 ;;======================================================================
 
 ;;======================================================================
 ;; Tests
 ;;======================================================================

Index: items.scm
==================================================================
--- items.scm
+++ items.scm
@@ -1,14 +1,22 @@
 
 ;; Copyright 2006-2012, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
 
 
 ;; (define itemdat '((ripeness    "green ripe overripe")
 ;; 		     (temperature "cool medium hot")
 ;; 		     (season      "summer winter fall spring")))
@@ -109,19 +117,69 @@
 		  #f)))
       res)))
             ;; Nope, not now, return null as of 6/6/2011
 		
 (define (items:check-valid-items class item)
-  (let ((valid-values (let ((s (config-lookup *configdat* "validvalues" class)))
+  (let ((valid-values (let ((s (configf:lookup *configdat* "validvalues" class)))
 			(if s (string-split s) #f))))
     (if valid-values
 	(if (member item valid-values)
 	    item #f)
 	item)))
+
+;;  '(("k1" "k2" "k3")
+;;    ("a" "b" "c")
+;;    ("d" "e" "f"))
+;;
+;;    => '((("k1" "a")("k2" "b")("k3" "c"))
+;;         (("k1" "d")("k2" "e")("k3" "f")))
+;;
+(define (items:first-row-intersperse data)
+  (if (< (length data) 2)
+      '()
+      (let ((header (car data))
+	    (rows   (cdr data)))
+	(map (lambda (row)
+	       (map list header row))
+	     rows))))
+
+;; k1/k2/k3
+;; a/b/c
+;; d/e/f
+;;    => '(("k1" "k2" "k3")
+;;         ("a" "b" "c")
+;;         ("d" "e" "f"))
+;;
+;;    => '((("k1" "a")("k2" "b")("k3" "c"))
+;;         (("k1" "d")("k2" "e")("k3" "f")))
+;;
+(define (items:read-items-file fname ftype) ;; 'sxml 'slash 'space 
+  (if (and fname (file-exists? fname))
+      (items:first-row-intersperse (case ftype
+				     ((slash space)
+				      (let ((splitter (case ftype
+							((slash) (lambda (x)(string-split x "/")))
+							(else    string-split))))
+					(debug:print 0 *default-log-port* "Reading " fname " of type " ftype)
+					(with-input-from-file fname
+					  (lambda ()
+					    (let loop ((inl (read-line))
+						       (res '()))
+					      (if (eof-object? inl)
+						  res
+						  (loop (read-line)(cons (splitter inl) res))))))))
+				     ((sxml)(with-input-from-file fname read))
+				     (else (debug:print 0 *default-log-port* "items file type " ftype " not recognised"))))
+      (begin
+	(if fname (debug:print 0 *default-log-port* "no items file " fname " found"))
+	'())))
 
 (define (items:get-items-from-config tconfig)
-  (let* ((have-items  (hash-table-ref/default tconfig "items"      #f))
+  (let* ((slashf      (configf:lookup tconfig "itemopts" "slash")) ;; a/b/c\nd/e/f\n ...
+	 (sxmlf       (configf:lookup tconfig "itemopts" "sxml"))  ;; '(("a" "b" "c")("d" "e" "f") ...)
+	 (spacef      (configf:lookup tconfig "itemopts" "space")) ;; a b c\nd e f\n ...
+	 (have-items  (hash-table-ref/default tconfig "items"      #f))
 	 (have-itable (hash-table-ref/default tconfig "itemstable" #f))
 	 (items       (hash-table-ref/default tconfig "items"      '()))
 	 (itemstable  (hash-table-ref/default tconfig "itemstable" '())))
     (debug:print 5 *default-log-port* "items: " items " itemstable: " itemstable)
     (set! items (map (lambda (item)
@@ -132,16 +190,23 @@
     (set! itemstable (map (lambda (item)
 			    (if (procedure? (cadr item))
 				(list (car item)((cadr item)))  ;; evaluate the proc
 				item))
 			  itemstable))
-    (if (and have-items  (null? items))     (debug:print-error 0 *default-log-port* "[items] section in testconfig but no entries defined"))
-    (if (and have-itable (null? itemstable))(debug:print-error 0 *default-log-port* "[itemstable] section in testconfig but no entries defined"))
-    (if (or (not (null? items))(not (null? itemstable)))
+    (if (and have-items  (null? items))     (debug:print 0 *default-log-port* "WARNING:[items] section in testconfig but no entries defined"))
+    (if (and have-itable (null? itemstable))(debug:print 0 *default-log-port* "WARNNG:[itemstable] section in testconfig but no entries defined"))
+    (if (or (not (null? items))
+	    (not (null? itemstable))
+	    slashf
+	    sxmlf
+	    spacef)
 	(append (item-assoc->item-list items)
-		(item-table->item-list itemstable))
+		(item-table->item-list itemstable)
+		(items:read-items-file slashf 'slash)
+		(items:read-items-file sxmlf  'sxml)
+		(items:read-items-file spacef 'space))
 	'(()))))
 
 ;; (pp (item-assoc->item-list itemdat))
 
 
 	

ADDED   iup-test/Makefile
Index: iup-test/Makefile
==================================================================
--- /dev/null
+++ iup-test/Makefile
@@ -0,0 +1,5 @@
+LIBSRC = "<$PATH>/chicken-4.10.0-patch"
+
+
+sample : sample.c
+	gcc -I$(LIBSRC)/include/ -L$(LIBSRC)/lib -L$(LIBSRC)/lib64 -liup -liupimglib -o sample sample.c

ADDED   iup-test/matrix.c
Index: iup-test/matrix.c
==================================================================
--- /dev/null
+++ iup-test/matrix.c
@@ -0,0 +1,275 @@
+#include 
+#include 
+#include 
+#include 
+
+#undef __IUPDEF_H
+#include "iup.h"
+#include "iupcontrols.h"
+#include "iupcbs.h"
+#include "iup_plus.h"
+
+
+#define TEST_IMAGE_SIZE 20
+
+static unsigned char image_data_32 [TEST_IMAGE_SIZE*TEST_IMAGE_SIZE*4] = 
+{
+  000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,
+  000,000,000,255,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255,
+  000,000,000,255,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255,
+  000,000,000,255,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255,
+  000,000,000,255,000,000,000,000,000,000,000,000,000,000,000,000,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255, 
+  000,000,000,255,000,000,000,000,000,000,000,000,000,000,000,000,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255, 
+  000,000,000,255,000,000,000,000,000,000,000,000,000,000,000,000,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255, 
+  000,000,000,255,000,000,000,000,000,000,000,000,000,000,000,000,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255, 
+  000,000,000,255,000,000,000,000,000,000,000,000,000,000,000,000,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255, 
+  000,000,000,255,000,000,000,000,000,000,000,000,000,000,000,000,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255, 
+  000,000,000,255,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,255,255,255,192,255,255,255,192,255,255,255,192,255,255,255,192,255,255,255,192,255,255,255,192,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255, 
+  000,000,000,255,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,255,255,255,192,255,255,255,192,255,255,255,192,255,255,255,192,255,255,255,192,255,255,255,192,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255, 
+  000,000,000,255,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,255,255,255,192,255,255,255,192,255,255,255,192,255,255,255,192,255,255,255,192,255,255,255,192,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255, 
+  000,000,000,255,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,255,255,255,192,255,255,255,192,255,255,255,192,255,255,255,192,255,255,255,192,255,255,255,192,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255, 
+  000,000,000,255,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,255,255,255,192,255,255,255,192,255,255,255,192,255,255,255,192,255,255,255,192,255,255,255,192,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255, 
+  000,000,000,255,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,255,255,255,192,255,255,255,192,255,255,255,192,255,255,255,192,255,255,255,192,255,255,255,192,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255,
+  000,000,000,255,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255,
+  000,000,000,255,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255,
+  000,000,000,255,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255,
+  000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,
+};
+
+static int mousemove_cb(Ihandle *ih, int lin, int col)
+{
+  printf("mousemove_cb(%d, %d)\n", lin, col);
+  return IUP_DEFAULT;
+}
+
+static int drop(Ihandle *self, Ihandle *drop, int lin, int col)
+{
+  printf("drop_cb(%d, %d)\n", lin, col);
+  if(lin == 3 && col == 1)
+  {
+    IupSetAttribute(drop, "1", "A - Test of Very Big String for Dropdown!");
+    IupSetAttribute(drop, "2", "B");
+    IupSetAttribute(drop, "3", "C");
+    IupSetAttribute(drop, "4", "XXX");
+    IupSetAttribute(drop, "5", "5");
+    IupSetAttribute(drop, "6", "6");
+    IupSetAttribute(drop, "7", "7");
+    IupSetAttribute(drop, "8", NULL);
+    IupSetAttribute(drop, "VALUE", "4");
+    return IUP_DEFAULT;
+  }
+  return IUP_IGNORE;
+}
+
+static int dropcheck_cb(Ihandle *self, int lin, int col)
+{
+  if (lin == 3 && col == 1)
+    return IUP_DEFAULT;
+  if (lin == 4 && col == 4)
+    return IUP_CONTINUE;
+  return IUP_IGNORE;
+}
+
+static int togglevalue_cb(Ihandle *self, int lin, int col, int value)
+{
+  printf("togglevalue_cb(%d, %d)=%d\n", lin, col, value);
+  return IUP_DEFAULT;
+}
+
+static int click(Ihandle *self, int lin, int col)
+{
+  printf("click_cb(%d, %d)\n", lin, col);
+  IupSetAttribute(self,"MARKED", NULL);  /* clear all marks */
+  IupSetAttributeId2(self,"MARK", lin, 0, "1");
+  IupSetfAttribute(self,"REDRAW", "L%d", lin);
+  return IUP_DEFAULT;
+}
+
+static int enteritem_cb(Ihandle *ih, int lin, int col)
+{
+  IupSetAttribute(ih,"MARKED", NULL);  /* clear all marks */
+  IupSetAttributeId2(ih,"MARK", lin, 0, "1");
+  IupSetfAttribute(ih,"REDRAW", "L%d", lin);
+  return IUP_DEFAULT;
+}
+
+static Ihandle* create_matrix(void)
+{
+  Ihandle* mat = IupMatrix(NULL); 
+  
+//  IupSetAttribute(mat, "NUMLIN", "3"); 
+  IupSetAttribute(mat, "NUMLIN", "20"); 
+  IupSetAttribute(mat, "NUMCOL", "8"); 
+//  IupSetAttribute(mat, "NUMCOL", "15"); 
+//  IupSetAttribute(mat, "NUMLIN", "3"); 
+//  IupSetAttribute(mat, "NUMCOL", "2"); 
+//  IupSetAttribute(mat, "NUMLIN", "8"); 
+//  IupSetAttribute(mat, "NUMCOL", "5"); 
+//  IupSetAttribute(mat, "ACTIVE", "NO");
+//  IupSetAttribute(mat, "EDITHIDEONFOCUS", "NO");
+//  IupSetAttribute(mat, "EDITALIGN", "Yes");
+//  IupSetAttribute(mat, "EDITFITVALUE", "Yes");
+//  IupSetAttribute(mat, "READONLY", "Yes");
+  
+  //IupSetAttribute(mat, "0:0", "Inflation");
+  //IupSetAttribute(mat, "1:0", "Medicine\nPharma");
+  //IupSetAttribute(mat, "2:0", "Food"); 
+  //IupSetAttribute(mat, "3:0", "Energy"); 
+  //IupSetAttribute(mat, "0:1", "January 2000"); 
+  //IupSetAttribute(mat, "0:2", "February 2000"); 
+  IupSetAttribute(mat, "1:1", "5.6\n3.33");
+  IupSetAttribute(mat, "2:1", "2.2");
+  IupSetAttribute(mat, "3:2", "Very Very Very Very Very Large Text");
+  IupSetAttribute(mat, "1:2", "4.5");
+  if (IupGetInt(NULL, "UTF8MODE"))
+    IupSetAttribute(mat, "2:2", "(çãõáóé)");
+  else
+    IupSetAttribute(mat, "2:2", "(çãõáóé)");
+
+  IupSetAttribute(mat, "3:1", "3.4");
+  IupSetAttribute(mat, "3:3", "Font Test");
+//  IupSetAttribute(mat, "HEIGHT2", "30");
+//  IupSetAttribute(mat, "WIDTH2", "190");
+//  IupSetAttributeId(mat, "WIDTH", 2, "190");
+  IupSetAttribute(mat,"SORTSIGN2","DOWN");
+//  IupSetAttribute(mat, "WIDTHDEF", "34");
+//  IupSetAttribute(mat,"MULTILINE", "YES");
+  IupSetAttribute(mat,"RESIZEMATRIX", "YES");
+//  IupSetAttribute(mat,"HIDDENTEXTMARKS", "YES");
+//  IupSetAttribute(mat,"USETITLESIZE", "YES");
+  //IupSetAttribute(mat,"SCROLLBAR", "NO");
+  //IupSetAttribute(mat, "BGCOLOR1:2", "255 92 255");
+  //IupSetAttribute(mat, "BGCOLOR2:*", "92 92 255");
+  //IupSetAttribute(mat, "BGCOLOR*:3", "255 92 92");
+  //IupSetAttribute(mat, "FGCOLOR1:2", "255 0 0");
+  //IupSetAttribute(mat, "FGCOLOR2:*", "0 128 0");
+  //IupSetAttribute(mat, "FGCOLOR*:3", "0 0 255");
+  IupSetAttribute(mat, "FONT3:3", "Helvetica, 24");
+  //IupSetAttribute(mat, "FONT2:*", "Courier, 14");
+  //IupSetAttribute(mat, "FONT*:3", "Times, Bold 14");
+//  IupSetAttribute(mat, "ALIGNMENT1", "ALEFT");
+//  IupSetAttribute(mat, "ALIGNMENT3", "ARIGHT");
+//  IupSetAttribute(mat, "ALIGN2:1", ":ARIGHT");
+//  IupSetAttribute(mat, "LINEALIGNMENT1", "ATOP");
+  //  IupSetAttribute(mat, "ACTIVE", "NO");
+//  IupSetAttribute(mat, "EXPAND", "NO");
+//  IupSetAttribute(mat, "ALIGNMENT", "ALEFT");
+
+//  IupSetAttribute(mat, "MASK1:3", IUP_MASK_FLOAT);
+//  IupSetAttribute(mat, "MASK1:3", "[a-zA-Z][0-9a-zA-Z_]*");
+//  IupSetAttribute(mat, "MASKFLOAT1:3", "0.0:10.0");
+  IupSetAttribute(mat, "MASK*:3", "[a-zA-Z][0-9a-zA-Z_]*");
+
+  IupSetAttribute(mat, "TYPE4:1", "COLOR");
+  IupSetAttribute(mat, "4:1", "255 0 128");
+
+  IupSetAttribute(mat, "TYPE4:2", "FILL");
+  IupSetAttribute(mat, "4:2", "60");
+  IupSetAttribute(mat, "SHOWFILLVALUE", "Yes");
+
+  {
+    Ihandle* image = IupImageRGBA(TEST_IMAGE_SIZE, TEST_IMAGE_SIZE, image_data_32);
+    IupSetAttribute(mat, "TYPE4:3", "IMAGE");
+    IupSetAttributeHandle(mat, "4:3", image);
+  }
+
+//  IupSetAttribute(mat, "TOGGLEVALUE4:4", "ON");
+//  IupSetAttribute(mat, "VALUE4:4", "1");
+  IupSetAttribute(mat, "TOGGLECENTERED", "Yes");
+
+  IupSetAttribute(mat,"MARKMODE","CELL");
+//  IupSetAttribute(mat,"MARKMODE","LIN");
+//  IupSetAttribute(mat,"MARKMULTIPLE","NO");
+  IupSetAttribute(mat,"MARKMULTIPLE","YES");
+//  IupSetAttribute(mat,"MARKAREA","NOT_CONTINUOUS");
+//  IupSetAttribute(mat,"MARK2:2","YES");
+//  IupSetAttribute(mat,"MARK2:3","YES");
+//  IupSetAttribute(mat,"MARK3:3","YES");
+
+  IupSetAttribute(mat,"FRAMEVERTCOLOR1:2","BGCOLOR");
+  IupSetAttribute(mat,"FRAMEHORIZCOLOR1:2","0 0 255");
+  IupSetAttribute(mat,"FRAMEHORIZCOLOR1:3","0 255 0");
+  IupSetAttribute(mat,"FRAMEVERTCOLOR2:2","255 255 0");
+  IupSetAttribute(mat,"FRAMEVERTCOLOR*:4","0 255 0");
+  IupSetAttribute(mat,"FRAMEVERTCOLOR*:5","BGCOLOR");
+
+//  IupSetAttribute(mat,"MARKMODE","LINCOL");
+
+  //IupSetAttribute(mat, "NUMCOL_VISIBLE_LAST", "YES");
+  //IupSetAttribute(mat, "NUMLIN_VISIBLE_LAST", "YES");
+//  IupSetAttribute(mat, "WIDTHDEF", "15");
+  IupSetAttribute(mat, "20:8", "The End");
+  //IupSetAttribute(mat, "10:0", "Middle Line");
+  //IupSetAttribute(mat, "15:0", "Middle Line");
+  //IupSetAttribute(mat, "0:4", "Middle Column");
+  //IupSetAttribute(mat, "20:0", "Line Title Test");
+  //IupSetAttribute(mat, "0:8", "Column Title Test");
+  IupSetAttribute(mat, "NUMCOL_VISIBLE", "3");
+  IupSetAttribute(mat, "NUMLIN_VISIBLE", "5");
+//  IupSetAttribute(mat,"EDITNEXT","COLCR");
+//  IupSetAttribute(mat, "NUMCOL_NOSCROLL", "1");
+
+//  IupSetAttribute(mat, "LIMITEXPAND", "Yes");
+//  IupSetAttribute(mat, "XAUTOHIDE", "NO");
+//  IupSetAttribute(mat, "YAUTOHIDE", "NO");
+
+//  IupSetAttribute(mat,"RASTERSIZE","x300");
+//  IupSetAttribute(mat,"FITTOSIZE","LINES");
+  
+//  IupSetAttribute(mat,"TYPECOLORINACTIVE","No");
+//  IupSetAttribute(mat, "ACTIVE", "No");
+
+  IupSetAttribute(mat, "FRAMEBORDER", "Yes");
+
+  /* test for custom matrix attributes */
+  //{
+  //  char* v;
+  //  IupSetAttribute(mat, "MTX_LINE_ACTIVE_FLAG3:4", "Test1");
+  //  IupSetAttributeId2(mat, "MTX_LINE_ACTIVE_FLAG", 5, 7, "Test2");
+  //  printf("Test1=%s\n", IupGetAttribute(mat, "MTX_LINE_ACTIVE_FLAG3:4"));
+  //  printf("Test2=%s\n", IupGetAttributeId2(mat, "MTX_LINE_ACTIVE_FLAG", 5, 7));
+  //}
+
+  IupSetCallback(mat, "DROPCHECK_CB", (Icallback)dropcheck_cb);
+  IupSetCallback(mat,"DROP_CB",(Icallback)drop);
+//  IupSetCallback(mat,"MENUDROP_CB",(Icallback)drop);
+//  IupSetCallback(mat, "MOUSEMOVE_CB", (Icallback)mousemove_cb);
+//  IupSetCallback(mat,"CLICK_CB",(Icallback)click);
+//  IupSetCallback(mat,"ENTERITEM_CB",(Icallback)enteritem_cb);
+  IupSetCallback(mat,"TOGGLEVALUE_CB",(Icallback)togglevalue_cb);
+
+  return mat;
+}
+
+void MatrixTest(void)
+{
+  Ihandle* dlg, *box, *mat;
+
+  box = IupVbox(mat = create_matrix(), NULL);
+  IupSetAttribute(box, "MARGIN", "10x10");
+//  IupSetAttribute(box, "FONT", "Arial, 7");
+
+  dlg = IupDialog(box);
+  IupSetAttribute(dlg, "TITLE", "IupMatrix Simple Test");
+  IupShowXY(dlg, IUP_CENTER, IUP_CENTER);
+
+//        IupSetAttribute(mat, "ADDLIN", "1");
+//        IupSetAttribute(mat,"4:0","Teste");
+//        IupSetAttribute(mat, "REDRAW", "ALL");
+}
+
+#ifndef BIG_TEST
+int main(int argc, char* argv[])
+{
+  IupOpen(&argc, &argv);
+  IupControlsOpen();
+
+  MatrixTest();
+
+  IupMainLoop();
+
+  IupClose();
+
+  return EXIT_SUCCESS;
+}
+#endif

ADDED   iup-test/sample.c
Index: iup-test/sample.c
==================================================================
--- /dev/null
+++ iup-test/sample.c
@@ -0,0 +1,684 @@
+#include 
+#include 
+#include 
+#include 
+
+#undef __IUPDEF_H
+#include 
+#include "iupcontrols.h"
+#include "iupcbs.h"
+
+#define TEST_IMAGE_SIZE 20
+
+static unsigned char image_data_32 [TEST_IMAGE_SIZE*TEST_IMAGE_SIZE*4] = 
+{
+  000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,
+  000,000,000,255,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255,
+  000,000,000,255,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255,
+  000,000,000,255,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255,
+  000,000,000,255,000,000,000,000,000,000,000,000,000,000,000,000,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255, 
+  000,000,000,255,000,000,000,000,000,000,000,000,000,000,000,000,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255, 
+  000,000,000,255,000,000,000,000,000,000,000,000,000,000,000,000,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255, 
+  000,000,000,255,000,000,000,000,000,000,000,000,000,000,000,000,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255, 
+  000,000,000,255,000,000,000,000,000,000,000,000,000,000,000,000,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255, 
+  000,000,000,255,000,000,000,000,000,000,000,000,000,000,000,000,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255, 
+  000,000,000,255,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,255,255,255,192,255,255,255,192,255,255,255,192,255,255,255,192,255,255,255,192,255,255,255,192,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255, 
+  000,000,000,255,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,255,255,255,192,255,255,255,192,255,255,255,192,255,255,255,192,255,255,255,192,255,255,255,192,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255, 
+  000,000,000,255,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,255,255,255,192,255,255,255,192,255,255,255,192,255,255,255,192,255,255,255,192,255,255,255,192,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255, 
+  000,000,000,255,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,255,255,255,192,255,255,255,192,255,255,255,192,255,255,255,192,255,255,255,192,255,255,255,192,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255, 
+  000,000,000,255,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,255,255,255,192,255,255,255,192,255,255,255,192,255,255,255,192,255,255,255,192,255,255,255,192,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255, 
+  000,000,000,255,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,255,255,255,192,255,255,255,192,255,255,255,192,255,255,255,192,255,255,255,192,255,255,255,192,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255,
+  000,000,000,255,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255,
+  000,000,000,255,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255,
+  000,000,000,255,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255,
+  000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,
+};
+
+static int drop(Ihandle *self, Ihandle *drop, int lin, int col)
+{
+  printf("drop_cb(%d, %d)\n", lin, col);
+  if(lin == 3 && col == 1)
+  {
+    IupSetAttribute(drop, "1", "A - Test of Very Big String for Dropdown!");
+    IupSetAttribute(drop, "2", "B");
+    IupSetAttribute(drop, "3", "C");
+    IupSetAttribute(drop, "4", "XXX");
+    IupSetAttribute(drop, "5", "5");
+    IupSetAttribute(drop, "6", "6");
+    IupSetAttribute(drop, "7", "7");
+    IupSetAttribute(drop, "8", NULL);
+    IupSetAttribute(drop, "VALUE", "4");
+    return IUP_DEFAULT;
+  }
+  return IUP_IGNORE;
+}
+
+static int togglevalue_cb(Ihandle *self, int lin, int col, int value)
+{
+  printf("togglevalue_cb(%d, %d)=%d\n", lin, col, value);
+  return IUP_DEFAULT;
+}
+
+static Ihandle* load_image_Tecgraf(void)
+{
+  unsigned char imgdata[] = {
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 88, 95, 108, 1, 90, 100, 117, 99, 123, 138, 166, 126, 137, 152, 181, 60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 95, 105, 123, 147, 122, 137, 165, 255, 136, 152, 183, 255, 132, 149, 179, 250, 133, 149, 178, 69, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 92, 100, 115, 43, 111, 125, 150, 253, 140, 158, 190, 255, 135, 151, 182, 255, 132, 149, 179, 255, 131, 147, 177, 217, 153, 164, 188, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 102, 113, 134, 148, 134, 151, 182, 255, 137, 154, 185, 255, 115, 129, 154, 252, 114, 128, 155, 255, 130, 146, 175, 255, 132, 147, 175, 71, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 158, 159, 162, 3, 108, 121, 145, 230, 144, 162, 195, 255, 137, 154, 185, 197, 74, 79, 86, 45, 41, 46, 55, 246, 120, 134, 162, 255, 129, 145, 174, 156, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 95, 101, 113, 48, 124, 139, 167, 255, 144, 161, 194, 255, 138, 155, 186, 67, 0, 0, 0, 0, 49, 54, 62, 150, 87, 98, 118, 255, 128, 144, 173, 223, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 102, 113, 132, 105, 137, 154, 185, 255, 139, 156, 188, 231, 143, 159, 187, 3, 0, 0, 0, 0, 64, 68, 76, 61, 70, 79, 95, 255, 127, 143, 172, 254, 134, 149, 175, 25, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 109, 121, 142, 153, 141, 159, 191, 255, 139, 156, 188, 164, 0, 0, 0, 0, 0, 0, 0, 0, 79, 82, 87, 3, 69, 77, 92, 241, 122, 137, 165, 255, 127, 142, 170, 70, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 110, 122, 146, 191, 145, 163, 196, 255, 139, 156, 188, 107, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 77, 86, 101, 190, 115, 129, 156, 255, 126, 141, 170, 113, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 112, 125, 149, 227, 150, 168, 201, 255, 141, 157, 188, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 82, 91, 107, 144, 113, 127, 153, 255, 125, 140, 169, 144, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 163, 165, 167, 2, 112, 125, 150, 252, 155, 173, 203, 255, 143, 159, 189, 26, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 85, 94, 110, 109, 114, 128, 155, 255, 125, 140, 168, 175, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 160, 167, 181, 1, 120, 130, 149, 33, 48, 53, 59, 69, 43, 46, 52, 100, 50, 54, 59, 137, 116, 130, 156, 255, 155, 171, 201, 255, 105, 118, 142, 155, 104, 117, 141, 151, 105, 118, 141, 151, 105, 118, 142, 151, 101, 113, 136, 185, 111, 124, 150, 255, 116, 130, 156, 220, 112, 125, 148, 95, 115, 127, 150, 67, 123, 134, 156, 33, 168, 176, 190, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 119, 129, 147, 5, 109, 121, 142, 71, 106, 118, 140, 140, 105, 117, 140, 197, 107, 120, 144, 242, 120, 135, 162, 255, 123, 137, 163, 255, 44, 49, 58, 255, 28, 32, 39, 255, 125, 139, 164, 255, 150, 167, 197, 255, 138, 155, 186, 255, 131, 148, 178, 255, 125, 141, 170, 255, 119, 134, 162, 255, 114, 128, 154, 255, 108, 122, 147, 255, 104, 117, 141, 255, 102, 115, 138, 255, 103, 116, 139, 255, 107, 120, 145, 255, 111, 124, 149, 245, 113, 126, 151, 200, 113, 127, 152, 140, 116, 129, 154, 71, 122, 135, 158, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 118, 128, 145, 14, 106, 118, 140, 130, 104, 116, 139, 234, 105, 118, 142, 255, 128, 144, 173, 255, 147, 165, 199, 255, 157, 177, 213, 255, 150, 168, 202, 255, 140, 156, 187, 229, 41, 45, 52, 196, 39, 43, 51, 183, 130, 143, 168, 255, 144, 161, 192, 233, 109, 122, 145, 109, 105, 116, 138, 109, 99, 110, 130, 109, 92, 103, 123, 109, 91, 100, 117, 145, 97, 109, 131, 255, 95, 106, 128, 248, 74, 83, 97, 193, 64, 72, 85, 227, 56, 63, 75, 255, 55, 62, 75, 255, 65, 73, 88, 255, 90, 101, 121, 255, 111, 125, 150, 255, 114, 128, 154, 236, 116, 129, 155, 130, 127, 140, 165, 16, 0, 0, 0, 0,
+    95, 101, 113, 22, 103, 115, 137, 220, 103, 116, 140, 255, 110, 123, 148, 255, 146, 165, 198, 255, 147, 165, 197, 232, 142, 158, 188, 147, 131, 144, 169, 78, 115, 123, 139, 20, 0, 0, 0, 0, 0, 0, 0, 0, 91, 97, 108, 68, 128, 142, 167, 255, 144, 162, 193, 212, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 95, 100, 107, 31, 120, 135, 163, 255, 133, 150, 180, 231, 0, 0, 0, 0, 0, 0, 0, 0, 86, 89, 93, 20, 50, 54, 61, 73, 37, 40, 46, 141, 33, 36, 42, 230, 46, 52, 63, 255, 107, 120, 144, 255, 116, 130, 157, 255, 118, 133, 159, 223, 132, 147, 174, 24,
+    76, 83, 95, 114, 104, 117, 140, 255, 105, 117, 141, 255, 118, 133, 160, 253, 139, 155, 184, 116, 134, 143, 161, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 93, 100, 110, 74, 122, 137, 163, 255, 143, 160, 191, 200, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 110, 114, 120, 31, 123, 138, 166, 255, 136, 153, 183, 228, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 90, 93, 97, 5, 42, 45, 51, 111, 86, 97, 117, 253, 118, 133, 160, 255, 119, 133, 161, 255, 133, 149, 180, 116,
+    46, 50, 56, 109, 67, 76, 91, 255, 105, 118, 142, 255, 107, 120, 145, 254, 112, 125, 149, 131, 127, 139, 161, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 93, 98, 109, 74, 116, 130, 156, 255, 142, 159, 190, 200, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 112, 115, 122, 31, 128, 143, 172, 255, 141, 157, 185, 228, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 124, 137, 163, 7, 122, 136, 162, 122, 120, 135, 162, 254, 121, 136, 164, 255, 136, 152, 184, 255, 126, 141, 168, 116,
+    71, 74, 79, 17, 31, 35, 41, 206, 42, 47, 57, 255, 77, 87, 105, 255, 103, 116, 140, 255, 110, 124, 149, 239, 112, 125, 150, 157, 115, 128, 153, 89, 122, 134, 158, 30, 147, 158, 177, 2, 0, 0, 0, 0, 81, 87, 96, 65, 109, 123, 148, 255, 141, 158, 190, 212, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 98, 103, 112, 31, 135, 151, 180, 255, 141, 156, 183, 231, 0, 0, 0, 0, 153, 164, 183, 1, 134, 147, 171, 30, 124, 138, 165, 84, 123, 138, 165, 154, 122, 137, 164, 235, 127, 143, 172, 255, 140, 157, 189, 255, 144, 162, 195, 255, 129, 144, 172, 218, 126, 138, 161, 22,
+    0, 0, 0, 0, 64, 68, 73, 7, 39, 43, 49, 118, 32, 36, 42, 225, 30, 35, 42, 255, 50, 57, 68, 255, 72, 81, 97, 255, 91, 102, 123, 255, 105, 118, 142, 255, 113, 127, 152, 240, 115, 129, 155, 204, 111, 124, 149, 196, 111, 125, 150, 255, 126, 141, 170, 234, 119, 133, 159, 120, 120, 134, 160, 116, 121, 135, 161, 117, 121, 135, 162, 119, 116, 130, 155, 152, 127, 142, 170, 255, 125, 140, 168, 248, 123, 138, 166, 199, 130, 145, 173, 235, 140, 155, 183, 255, 143, 160, 190, 255, 143, 161, 193, 255, 147, 165, 199, 255, 145, 164, 197, 255, 132, 148, 177, 230, 127, 140, 166, 126, 124, 134, 151, 12, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 138, 141, 144, 3, 55, 58, 63, 58, 37, 40, 46, 126, 34, 38, 44, 184, 34, 38, 44, 235, 35, 39, 47, 254, 49, 55, 66, 255, 64, 72, 87, 255, 77, 87, 104, 255, 88, 98, 118, 255, 96, 108, 130, 255, 103, 116, 139, 255, 108, 122, 147, 255, 113, 127, 153, 255, 118, 133, 160, 255, 124, 140, 168, 255, 133, 148, 176, 255, 141, 156, 183, 255, 146, 161, 187, 255, 144, 159, 186, 255, 131, 146, 174, 254, 127, 141, 168, 237, 126, 141, 168, 188, 123, 137, 162, 131, 112, 123, 143, 61, 128, 132, 140, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 91, 94, 98, 19, 64, 68, 73, 56, 53, 57, 65, 82, 62, 67, 76, 116, 66, 74, 89, 255, 95, 107, 129, 255, 80, 88, 103, 155, 81, 90, 105, 151, 86, 95, 112, 151, 95, 104, 122, 151, 98, 109, 128, 180, 124, 139, 166, 255, 109, 122, 146, 218, 100, 110, 128, 84, 96, 104, 118, 56, 105, 109, 117, 22, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 173, 174, 176, 2, 74, 83, 98, 252, 131, 147, 178, 255, 140, 155, 184, 29, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 122, 134, 157, 114, 151, 169, 203, 255, 123, 138, 165, 174, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 76, 90, 224, 122, 137, 165, 255, 136, 152, 182, 69, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 125, 139, 165, 147, 146, 164, 198, 255, 122, 137, 165, 144, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 62, 69, 81, 191, 110, 124, 149, 255, 134, 151, 181, 113, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 143, 170, 193, 142, 160, 192, 255, 122, 137, 164, 111, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 58, 63, 74, 150, 94, 105, 127, 255, 133, 149, 179, 166, 0, 0, 0, 0, 0, 0, 0, 0, 115, 119, 128, 5, 130, 145, 174, 242, 137, 154, 186, 255, 125, 139, 166, 70, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 54, 58, 66, 102, 72, 81, 97, 255, 132, 148, 178, 236, 148, 161, 187, 5, 0, 0, 0, 0, 110, 121, 140, 64, 140, 157, 189, 255, 127, 142, 171, 254, 131, 144, 169, 23, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 62, 65, 71, 43, 47, 52, 63, 255, 127, 143, 172, 255, 132, 148, 177, 75, 0, 0, 0, 0, 121, 134, 158, 160, 139, 156, 188, 255, 123, 138, 165, 223, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 154, 156, 158, 1, 36, 39, 46, 227, 106, 119, 143, 255, 130, 145, 175, 203, 114, 125, 147, 51, 123, 138, 166, 247, 131, 147, 177, 255, 123, 138, 165, 151, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 37, 41, 47, 143, 68, 77, 93, 255, 128, 144, 174, 255, 126, 141, 170, 252, 129, 145, 174, 255, 123, 138, 166, 255, 127, 141, 167, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 65, 68, 73, 40, 34, 38, 46, 250, 117, 131, 158, 255, 126, 142, 171, 255, 124, 140, 168, 255, 125, 139, 166, 214, 140, 152, 172, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 41, 44, 50, 134, 58, 66, 79, 255, 123, 138, 166, 255, 123, 138, 166, 250, 127, 140, 165, 66, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 154, 156, 158, 1, 46, 50, 55, 83, 82, 89, 102, 123, 106, 116, 136, 51, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+
+  Ihandle* image = IupImageRGBA(32, 32, imgdata);
+  return image;
+}
+
+static Ihandle* load_image_LogoTecgraf(void)
+{
+  unsigned char imgdata[] = {
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 108, 120, 143, 125, 132, 148, 178, 173, 133, 149, 178, 17, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 100, 110, 130, 48, 130, 147, 177, 254, 124, 139, 167, 254, 131, 147, 176, 137, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 115, 128, 153, 134, 142, 159, 191, 194, 47, 52, 61, 110, 114, 128, 154, 222, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 143, 172, 192, 140, 156, 188, 99, 65, 69, 76, 16, 97, 109, 131, 251, 129, 144, 172, 24, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 131, 147, 175, 232, 140, 157, 188, 43, 0, 0, 0, 0, 100, 112, 134, 211, 126, 141, 169, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 72, 78, 88, 26, 48, 52, 57, 60, 135, 150, 178, 254, 108, 121, 145, 83, 105, 118, 142, 76, 106, 119, 143, 201, 118, 133, 159, 122, 117, 129, 152, 25, 168, 176, 190, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    118, 128, 145, 3, 104, 117, 140, 92, 114, 127, 152, 180, 131, 147, 177, 237, 133, 149, 178, 249, 38, 42, 50, 222, 137, 152, 180, 249, 126, 142, 170, 182, 114, 128, 154, 182, 104, 117, 140, 227, 95, 107, 128, 238, 83, 93, 112, 248, 84, 95, 113, 239, 104, 117, 141, 180, 115, 129, 155, 93, 127, 140, 165, 4,
+    98, 109, 130, 153, 109, 123, 147, 254, 145, 163, 195, 153, 138, 154, 182, 56, 115, 123, 138, 5, 92, 99, 109, 35, 134, 149, 177, 230, 0, 0, 0, 0, 0, 0, 0, 0, 120, 133, 159, 143, 135, 151, 181, 115, 86, 89, 93, 5, 41, 45, 51, 54, 40, 45, 53, 150, 107, 120, 144, 254, 122, 137, 164, 154,
+    51, 57, 66, 147, 83, 93, 112, 255, 108, 121, 145, 159, 113, 126, 151, 62, 123, 136, 159, 8, 87, 93, 103, 35, 125, 141, 169, 230, 0, 0, 0, 0, 0, 0, 0, 0, 129, 143, 169, 143, 140, 156, 184, 115, 134, 147, 172, 8, 124, 138, 165, 60, 124, 139, 167, 155, 131, 147, 177, 255, 131, 147, 176, 153,
+    64, 68, 73, 2, 36, 39, 45, 86, 41, 46, 54, 173, 60, 67, 80, 232, 75, 84, 101, 251, 89, 100, 120, 228, 105, 118, 142, 250, 110, 123, 148, 187, 118, 132, 158, 187, 126, 141, 169, 229, 134, 149, 177, 239, 136, 152, 179, 250, 136, 152, 181, 234, 139, 156, 186, 175, 130, 145, 173, 90, 124, 134, 151, 3,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 71, 74, 79, 19, 60, 64, 73, 50, 92, 103, 124, 254, 86, 95, 111, 84, 90, 100, 117, 76, 126, 141, 168, 201, 113, 126, 150, 119, 99, 105, 117, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 93, 105, 125, 231, 135, 151, 181, 46, 0, 0, 0, 0, 137, 154, 184, 212, 123, 137, 164, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 74, 83, 98, 191, 133, 149, 179, 102, 111, 121, 139, 17, 134, 150, 180, 252, 126, 140, 166, 23, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 43, 48, 57, 132, 121, 136, 164, 197, 121, 135, 161, 115, 130, 146, 175, 221, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 43, 47, 52, 46, 87, 98, 118, 254, 126, 142, 170, 254, 124, 139, 166, 135, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 51, 57, 67, 118, 115, 128, 152, 170, 127, 140, 164, 17, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+
+  Ihandle* image = IupImageRGBA(16, 16, imgdata);
+  return image;
+}
+
+static unsigned char img_bits1[] = 
+{
+ 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1
+,1,1,1,1,1,1,1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,1
+,1,1,1,1,1,1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,1,1
+,1,1,1,1,1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,1,1,1
+,1,1,1,1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,1,1,1,1
+,1,1,1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,1,1,1,1,1
+,1,1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,1,1,1,1,1,1
+,1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,1,1,1,1,1,1,1
+,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
+,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
+,2,2,2,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
+,2,2,2,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
+,2,2,2,0,2,0,2,0,2,2,0,2,2,2,0,0,0,2,2,2,0,0,2,0,2,2,0,0,0,2,2,2
+,2,2,2,0,2,0,0,2,0,0,2,0,2,0,2,2,2,0,2,0,2,2,0,0,2,0,2,2,2,0,2,2
+,2,2,2,0,2,0,2,2,0,2,2,0,2,2,2,2,2,0,2,0,2,2,2,0,2,0,2,2,2,0,2,2
+,2,2,2,0,2,0,2,2,0,2,2,0,2,2,0,0,0,0,2,0,2,2,2,0,2,0,0,0,0,0,2,2
+,2,2,2,0,2,0,2,2,0,2,2,0,2,0,2,2,2,0,2,0,2,2,2,0,2,0,2,2,2,2,2,2
+,2,2,2,0,2,0,2,2,0,2,2,0,2,0,2,2,2,0,2,0,2,2,0,0,2,0,2,2,2,0,2,2
+,2,2,2,0,2,0,2,2,0,2,2,0,2,2,0,0,0,0,2,2,0,0,2,0,2,2,0,0,0,2,2,2
+,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,2,2,2,2,2,2,2,2
+,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,2,2,2,0,2,2,2,2,2,2,2,2
+,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,2,2,2,2,2,2,2,2,2
+,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
+,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
+,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,1,1,1,1,1,1,1,1,1,1
+,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,1,1,1,1,1,1,1,1,1,1,1
+,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,1,1,1,1,1,1,1,1,1,1,1,1
+,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,1,1,1,1,1,1,1,1,1,1,1,1,1
+,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
+,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
+,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
+,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
+};
+
+static unsigned char img_bits2[] = 
+{
+ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2
+,2,2,2,2,2,2,2,2,2,2,2,2,2,2,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,2
+,2,2,2,2,2,2,2,2,2,2,2,2,2,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,2,2
+,2,2,2,2,2,2,2,2,2,2,2,2,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,2,2,2
+,2,2,2,2,2,2,2,2,2,2,2,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,2,2,2,2
+,2,2,2,2,2,2,2,2,2,2,3,3,3,3,1,1,3,3,3,3,3,3,3,3,3,3,2,2,2,2,2,2
+,2,2,2,2,2,2,2,2,2,3,3,3,3,3,1,1,3,3,3,3,3,3,3,3,3,2,2,2,2,2,2,2
+,2,2,2,2,2,2,2,2,3,3,3,3,3,3,1,1,3,3,3,3,3,3,3,3,2,2,2,2,2,2,2,2
+,3,3,3,3,3,3,3,3,3,3,3,3,3,3,1,1,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3
+,3,3,3,3,3,3,3,3,3,3,3,3,3,3,1,1,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3
+,3,3,3,0,3,3,3,3,3,3,3,3,3,3,1,1,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3
+,3,3,3,0,3,3,3,3,3,3,3,3,3,3,1,1,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3
+,3,3,3,0,3,0,3,0,3,3,0,3,3,3,1,1,0,3,3,3,0,0,3,0,3,3,0,0,0,3,3,3
+,3,3,3,0,3,0,0,3,0,0,3,0,3,0,1,1,3,0,3,0,3,3,0,0,3,0,3,3,3,0,3,3
+,3,3,3,0,3,0,3,3,0,3,3,0,3,3,1,1,3,0,3,0,3,3,3,0,3,0,3,3,3,0,3,3
+,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
+,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
+,3,3,3,0,3,0,3,3,0,3,3,0,3,0,1,1,3,0,3,0,3,3,0,0,3,0,3,3,3,0,3,3
+,3,3,3,0,3,0,3,3,0,3,3,0,3,3,1,1,0,0,3,3,0,0,3,0,3,3,0,0,0,3,3,3
+,3,3,3,3,3,3,3,3,3,3,3,3,3,3,1,1,3,3,3,3,3,3,3,0,3,3,3,3,3,3,3,3
+,3,3,3,3,3,3,3,3,3,3,3,3,3,3,1,1,3,3,3,0,3,3,3,0,3,3,3,3,3,3,3,3
+,3,3,3,3,3,3,3,3,3,3,3,3,3,3,1,1,3,3,3,3,0,0,0,3,3,3,3,3,3,3,3,3
+,3,3,3,3,3,3,3,3,3,3,3,3,3,3,1,1,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3
+,3,3,3,3,3,3,3,3,3,3,3,3,3,3,1,1,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3
+,2,2,2,2,2,2,2,3,3,3,3,3,3,3,1,1,3,3,3,3,3,2,2,2,2,2,2,2,2,2,2,2
+,2,2,2,2,2,2,3,3,3,3,3,3,3,3,1,1,3,3,3,3,2,2,2,2,2,2,2,2,2,2,2,2
+,2,2,2,2,2,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,2,2,2,2,2,2,2,2,2,2,2,2
+,2,2,2,2,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,2,2,2,2,2,2,2,2,2,2,2,2,2
+,2,2,2,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
+,2,2,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
+,2,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
+,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
+};
+
+static int copydata_cb(Ihandle* ih, char* value, int size)
+{
+  printf("COPYDATA(%s, %d)\n", value, size);
+  return IUP_DEFAULT;
+}
+
+static int valuechanged_cb(Ihandle *ih)
+{
+  printf("VALUECHANGED_CB(%s)=%s\n", IupGetClassName(ih), IupGetAttribute(ih, "VALUE"));
+  return IUP_DEFAULT;
+}
+
+static int getfocus_cb(Ihandle *ih)
+{
+  printf("GETFOCUS_CB(%s)\n", IupGetClassName(ih));
+  return IUP_DEFAULT;
+}
+
+static int killfocus_cb(Ihandle *ih)
+{
+  printf("KILLFOCUS_CB(%s)\n", IupGetClassName(ih));
+  return IUP_DEFAULT;
+}
+
+static int leavewindow_cb(Ihandle *ih)
+{
+  printf("LEAVEWINDOW_CB(%s)\n", IupGetClassName(ih));
+  return IUP_DEFAULT;
+}
+
+static int enterwindow_cb(Ihandle *ih)
+{
+  printf("ENTERWINDOW_CB(%s)\n", IupGetClassName(ih));
+  return IUP_DEFAULT;
+}
+
+/* Internal SDK function */
+char *iupKeyCodeToName(int code);
+
+static int k_any(Ihandle *ih, int c)
+{
+  if (iup_isprint(c))
+    printf("K_ANY(%s, %d = %s \'%c\')\n", IupGetClassName(ih), c, iupKeyCodeToName(c), (char)c);
+  else
+    printf("K_ANY(%s, %d = %s)\n", IupGetClassName(ih), c, iupKeyCodeToName(c));
+  if (c==K_r) { IupRecordInput("inputtest.iup", IUP_RECTEXT); return IUP_IGNORE; }  //IUP_RECBINARY, IUP_RECTEXT 
+  if (c==K_s) { IupRecordInput(NULL, 0); IupPlayInput(NULL); return IUP_IGNORE; }
+  if (c==K_p) { IupPlayInput("inputtest.iup"); return IUP_IGNORE; }
+  return IUP_CONTINUE;
+}
+
+static int help_cb(Ihandle* ih)
+{
+  printf("HELP_CB(%s)\n", IupGetClassName(ih));
+  return IUP_DEFAULT;
+}
+
+static void show_menu(Ihandle* ih)
+{
+  int x, y;
+
+  Ihandle* menu_file = IupMenu(
+    IupSetAttributes(IupItem("Item with Image", "item_cb"), "IMAGE=image_tec"),
+    IupSetAttributes(IupItem("Toggle using VALUE", NULL), "VALUE=ON, KEY=K_V"), 
+    IupSetAttributes(IupItem("Auto &Toggle", "item_cb"), "AUTOTOGGLE=YES, VALUE=OFF, IMAGE=image_test, IMPRESS=image_test_pressed"), 
+    IupSeparator(), 
+    IupItem("E&xit (Close)", NULL), 
+    NULL);
+  Ihandle* menu = IupMenu(
+    IupSetAttributes(IupSubmenu("Submenu", menu_file), "KEY=K_S, IMAGE=image_tec"), 
+    IupItem("Item", "item_cb"), 
+    IupSetAttributes(IupItem("Item", "item_cb"), "VALUE=ON"), 
+    IupSetAttributes(IupItem("Item", "item_cb"), "KEY=K_I, IMAGE=image_tec"), 
+    NULL);
+
+  x = IupGetInt(ih, "X");
+  y = IupGetInt(ih, "Y") + IupGetInt2(ih, "RASTERSIZE");
+
+  IupPopup(menu, x, y);
+  IupDestroy(menu);
+}
+
+static int action1_cb(Ihandle* ih)
+{
+//  IupSetAttribute(IupGetDialog(ih), "BACKGROUND", "255 128 128");
+  show_menu(ih);
+  return IUP_DEFAULT;
+}
+
+static int action2_cb(Ihandle* ih)
+{
+  IupSetAttribute(IupGetDialog(ih), "BGCOLOR", "0 128 0");
+  return IUP_DEFAULT;
+}
+
+static int action3_cb(Ihandle* ih)
+{
+  printf("ACTION3\n");
+//  IupSetAttribute(IupGetChild(IupGetDialog(ih), 0), "BGCOLOR", "128 0 0");
+  return IUP_DEFAULT;
+}
+
+static Ihandle* set_callbacks(Ihandle* ih)
+{
+  IupSetCallback(ih, "VALUECHANGED_CB", (Icallback)valuechanged_cb);
+
+//  IupSetCallback(ih, "GETFOCUS_CB", (Icallback)getfocus_cb);
+//  IupSetCallback(ih, "KILLFOCUS_CB", (Icallback)killfocus_cb);
+
+//  IupSetCallback(ih, "ENTERWINDOW_CB", (Icallback)enterwindow_cb);
+//  IupSetCallback(ih, "LEAVEWINDOW_CB", (Icallback)leavewindow_cb);
+
+  IupSetCallback(ih, "K_ANY", (Icallback)k_any);
+//  IupSetCallback(ih, "HELP_CB", (Icallback)help_cb);
+
+  return ih;
+}
+
+int btn_big_button_cb(Ihandle *self, int button, int press)
+{
+  printf("BUTTON_CB(button=%c, press=%d)\n", button, press);
+  return IUP_DEFAULT;
+}
+
+static void globalkeypress_cb(int code, int pressed)
+{
+  printf("GLOBALKEYPRESS_CB(code=%s, pressed=%d)\n", iupKeyCodeToName(code), pressed);
+}
+
+static void globalmotion_cb(int x, int y, char* status)
+{
+  printf("GLOBALMOTION_CB(x=%d, y=%d, status=%s)\n", x, y, status);
+}
+
+static void globalbutton_cb(int button, int pressed, int x, int y, char* status)
+{
+  printf("GLOBALBUTTON_CB(button=%c, pressed=%d, x=%d, y=%d, status=%s)\n", (char)button, pressed, x, y, status);
+}
+
+static void globalwheel_cb(float delta,int x, int y, char* status)
+{
+  printf("GLOBALWHEEL_CB(delta=%g, x=%d, y=%d, status=%s)\n", delta, x, y, status);
+}
+
+int btn_image_button_cb( Ihandle *self,int b, int e )
+{
+  /* If the left button changed its state... */
+  if( b == IUP_BUTTON1 )
+  {
+    /* IUP handles */
+    Ihandle* text;
+    
+    /* Recovers "text" handle */
+    text = IupGetHandle( "text" );
+    
+    /* If the button was pressed... */
+    if(e == 1) 
+    {
+      /* Sets text's value */ 
+      IupSetAttribute( text, "VALUE", "Red button pressed" );
+    }
+    /* else the button was released */
+    else       
+    {
+      /* Sets text's value */ 
+      IupSetAttribute( text, "VALUE", "Red button released" );
+    }
+  }
+  
+  /* Executed function successfully */
+  return IUP_DEFAULT;
+}
+
+void SampleTest(void)
+{
+  Ihandle *mnu, *_hbox_1, *_cnv_1, *_vbox_1, *dlg, *img, 
+    *_frm_1, *_frm_2, *_frm_3, *_frm_4, *_frm_5, *pbar, *val, *tabs,
+    *_list_1, *_list_2, *_list_3, *_text_1, *_ml_1, *tree;
+
+  //img = IupImage(32,32, img_bits1);
+  //IupSetHandle ("img1", img); 
+  //IupSetAttribute (img, "0", "0 0 0"); 
+  //IupSetAttribute (img, "1", "BGCOLOR");
+  //IupSetAttribute (img, "2", "255 0 0");
+
+  img = load_image_Tecgraf();
+  IupSetHandle ("img1", img); 
+
+  img = IupImage(32,32, img_bits2);
+  IupSetHandle ("img2", img); 
+  IupSetAttribute (img, "0", "0 0 0"); 
+  IupSetAttribute (img, "1", "0 255 0");
+  IupSetAttribute (img, "2", "BGCOLOR");
+  IupSetAttribute (img, "3", "255 0 0");
+
+  mnu = IupMenu(
+    IupSubmenu("IupSubmenu 1", IupMenu(
+      IupSetAttributes(IupItem("IupItem 1 Checked", NULL), "VALUE=ON"),
+      IupSeparator(),
+
+      IupSetAttributes(IupItem("IupItem 2 Disabled", NULL), "VALUE=ON"),
+      NULL)),
+    IupItem("IupItem 3", NULL),
+    IupItem("IupItem 4", NULL), 
+    NULL);
+  IupSetHandle("mnu",mnu);
+
+  _frm_1 = IupFrame(
+    IupVbox(
+      set_callbacks(IupSetAttributes(IupButton("Button Text", NULL), "PADDING=5x5")), 
+      IupSetCallbacks(set_callbacks(IupSetAttributes(IupButton("Text", NULL), "IMAGE=img1, PADDING=5x5")),"ACTION", action1_cb, NULL), 
+      IupSetCallbacks(set_callbacks(IupSetAttributes(IupButton(NULL, NULL), "IMAGE=img1")),"ACTION", action2_cb, NULL),
+      IupSetCallbacks(set_callbacks(IupSetAttributes(IupButton("Text", NULL), "IMAGE=img1")),"BUTTON_CB", (Icallback)btn_big_button_cb, NULL),
+      IupSetCallbacks(set_callbacks(IupSetAttributes(IupButton("", NULL), "IMAGE=img1,IMPRESS=img2")),"ACTION", action3_cb, NULL), 
+      IupSetCallbacks(set_callbacks(IupSetAttributes(IupButton(NULL, NULL), "BGCOLOR=\"255 0 128\", SIZE=20x10")),"ACTION", action3_cb, NULL), 
+      NULL));
+  IupSetAttribute(_frm_1,"TITLE","IupButton");
+
+  _frm_2 = IupFrame(
+    IupVbox(
+      IupLabel("Label Text"), 
+      IupSetAttributes(IupLabel(NULL), "SEPARATOR=HORIZONTAL, MAXSIZE=150, NAME=SAMP_SEP"),
+      IupSetAttributes(IupLabel(NULL), "IMAGE=img1"),
+      NULL));
+  IupSetAttribute(_frm_2,"TITLE","IupLabel");
+
+  _frm_3 = IupFrame(
+    IupVbox(
+      set_callbacks(IupSetAttributes(IupToggle("Toggle Text", NULL), "VALUE=ON")),
+      set_callbacks(IupSetAttributes(IupToggle(NULL, NULL), "VALUE=ON,IMAGE=img1,IMPRESS=img2")),
+      set_callbacks(IupSetAttributes(IupToggle(NULL, NULL), "VALUE=ON,IMAGE=img1")),
+      IupSetAttributes(IupFrame(IupRadio(IupVbox(
+        set_callbacks(IupToggle("Toggle Text", NULL)), 
+        set_callbacks(IupToggle("Toggle Text", NULL)), 
+        NULL))), "TITLE=IupRadio"),
+      NULL));
+  IupSetAttribute(_frm_3,"TITLE","IupToggle");
+
+  _text_1 = IupText( NULL);
+  IupSetAttribute(_text_1,"VALUE","Single Line Text");
+  IupSetAttribute(_text_1,"SIZE","80x");
+
+  _ml_1 = IupMultiLine( NULL);
+  IupSetAttribute(_ml_1,"VALUE","Multiline Text\nSecond Line\nThird Line");
+  IupSetAttribute(_ml_1,"EXPAND","YES");
+  IupSetAttribute(_ml_1,"SIZE","80x40");
+
+  _frm_4 = IupFrame(IupVbox(
+    set_callbacks(_text_1),
+    set_callbacks(_ml_1),
+    NULL));
+  IupSetAttribute(_frm_4,"TITLE","IupText");
+
+  _list_1 = IupList( NULL);
+//  IupSetAttribute(_list_1,"EXPAND","YES");
+  IupSetAttribute(_list_1,"VALUE","1");
+  IupSetAttribute(_list_1,"1","Item 1 Text");
+  IupSetAttribute(_list_1,"2","Item 2 Text");
+  IupSetAttribute(_list_1,"3","Item 3 Text");
+  IupSetAttribute(_list_1,"TIP","List 1");
+
+  _list_2 = IupList( NULL);
+  IupSetAttribute(_list_2,"DROPDOWN","YES");
+//  IupSetAttribute(_list_2,"EXPAND","YES");
+  IupSetAttribute(_list_2,"VALUE","2");
+  IupSetAttribute(_list_2,"1","Item 1 Text");
+  IupSetAttribute(_list_2,"2","Item 2 Text");
+  IupSetAttribute(_list_2,"3","Item 3 Text");
+  IupSetAttribute(_list_2,"TIP","List 2");
+
+  _list_3 = IupList( NULL);
+  IupSetAttribute(_list_3,"EDITBOX","YES");
+//  IupSetAttribute(_list_3,"EXPAND","YES");
+  IupSetAttribute(_list_3,"VALUE","3");
+  IupSetAttribute(_list_3,"1","Item 1 Text");
+  IupSetAttribute(_list_3,"2","Item 2 Text");
+  IupSetAttribute(_list_3,"3","Item 3 Text");
+  IupSetAttribute(_list_3,"TIP","List 3");
+
+  _frm_5 =  IupFrame(IupVbox(
+      set_callbacks(_list_1),
+      set_callbacks(_list_2),
+      set_callbacks(_list_3),
+      NULL));
+  IupSetAttribute(_frm_5,"TITLE","IupList");
+
+  _hbox_1 = IupHbox(
+    _frm_1,
+    _frm_2,
+    _frm_3,
+    _frm_4,
+    _frm_5,
+    NULL);
+
+  val = IupVal(NULL);
+  set_callbacks(val);
+  
+  pbar = IupProgressBar();
+  IupSetAttribute(pbar, "VALUE", "0.5");
+  set_callbacks(pbar);
+
+  tabs = IupTabs(IupVbox(IupLabel(""), NULL), IupVbox(IupFill(), NULL), IupVbox(IupFill(), NULL), NULL);
+  IupSetAttribute(tabs,"TABTITLE0","Tab Title 0");
+  IupSetAttribute(tabs,"TABTITLE1","Tab Title 1");
+  IupSetAttributeHandle(tabs,"TABIMAGE1", load_image_LogoTecgraf());
+  IupSetAttribute(tabs,"TABTITLE2","Tab Title 2");
+  IupSetAttribute(tabs,"RASTERSIZE","300x50");
+//  IupSetAttribute(tabs,"TABPADDING","5x5");
+  set_callbacks(tabs);
+
+  tree = IupTree();
+  IupSetAttribute(tree, "SHOWRENAME",   "YES");
+  IupSetAttribute(tree,"RASTERSIZE","100x150");
+  set_callbacks(tree);
+
+  _cnv_1 = IupCanvas(NULL);
+  IupSetAttribute(_cnv_1,"BGCOLOR","128 255 0");
+  IupSetAttribute(_cnv_1,"SCROLLBAR","YES");
+  IupSetAttribute(_cnv_1,"EXPAND","HORIZONTAL");
+  IupSetAttribute(_cnv_1,"RASTERSIZE","x100");
+//  IupSetAttribute(_cnv_1,"CANFOCUS","NO");
+  set_callbacks(_cnv_1);
+
+  _vbox_1 = IupVbox(
+    _hbox_1,
+    IupHbox(IupSetAttributes(IupFrame(IupHbox(val, NULL)), "TITLE=IupVal"),
+            IupSetAttributes(IupFrame(IupHbox(pbar, NULL)), "TITLE=IupProgressBar"),
+            IupSetAttributes(IupFrame(IupHbox(tabs, NULL)), "TITLE=IupTabs"),
+            NULL),
+    IupHbox(IupSetAttributes(IupFrame(IupHbox(_cnv_1, NULL)), "TITLE=IupCanvas"),
+            IupSetAttributes(IupFrame(IupHbox(tree, NULL)), "TITLE=IupTree"),
+            NULL),
+    NULL);
+  IupSetAttribute(_vbox_1,"MARGIN","5x5");
+  IupSetAttribute(_vbox_1,"GAP","5");
+
+  dlg = IupDialog(_vbox_1);
+  IupSetHandle("dlg",dlg);
+  IupSetAttribute(dlg,"MENU","mnu");
+  IupSetAttribute(dlg,"TITLE","Iup Sample Dialog Title");
+//  IupSetAttribute(dlg,"COMPOSITED","YES");   /* Windows Only */
+//  IupSetAttribute(dlg, "OPACITY", "192");
+
+//  IupSetAttribute(dlg, "BGCOLOR", "173 177 194");  // Motif BGCOLOR for documentation
+//  IupSetAttribute(_vbox_1, "BGCOLOR", "92 92 255");
+//  IupSetAttribute(dlg, "BGCOLOR", "92 92 255");
+//  IupSetAttribute(dlg, "BACKGROUND", "200 10 80");
+
+  //IupSetGlobal("DLGBGCOLOR", "92 92 255");
+  //IupSetGlobal("TXTFGCOLOR", "255 92 92");
+  //IupSetGlobal("TXTBGCOLOR", "92 92 255");
+
+//  IupSetAttribute(dlg, "FONT", "Helvetica, 24");
+//  IupSetAttribute(dlg, "FONT", "-*-helvetica-*-r-*-*-18-*-*-*-*-*-*-*");
+  
+//  IupSetAttribute(box, "FGCOLOR", "255 0 0");
+
+//  IupSetAttribute(dlg,"RASTERSIZE","1000x800");
+
+  IupSetCallback(dlg, "COPYDATA_CB", (Icallback)copydata_cb);
+
+  //IupSetGlobal("INPUTCALLBACKS", "Yes");
+  //IupSetFunction("GLOBALKEYPRESS_CB", (Icallback)globalkeypress_cb);
+  //IupSetFunction("GLOBALMOTION_CB", (Icallback)globalmotion_cb);
+  IupSetFunction("GLOBALBUTTON_CB", (Icallback)globalbutton_cb);
+  //IupSetFunction("GLOBALWHEEL_CB", (Icallback)globalwheel_cb);
+
+  IupMap(dlg);
+
+  IupSetAttribute(tree, "TITLE0",         "Figures");  
+  IupSetAttribute(tree, "ADDLEAF0",      "Other");     /* new id=1 */
+  IupSetAttribute(tree, "ADDBRANCH1",   "triangle");  /* new id=2 */     
+  IupSetAttribute(tree, "ADDLEAF2",     "equilateral");  /* ... */
+  IupSetAttribute(tree, "ADDLEAF3",     "isoceles");
+  IupSetAttribute(tree, "ADDLEAF4",     "scalenus");
+
+  IupShow(dlg);
+
+//  IupSetAttribute(dlg,"RASTERSIZE", NULL);
+}
+
+static int dropcheck_cb(Ihandle *self, int lin, int col)
+{
+  if (lin == 3 && col == 1)
+    return IUP_DEFAULT;
+  if (lin == 4 && col == 4)
+    return IUP_CONTINUE;
+  return IUP_IGNORE;
+}
+
+static Ihandle* create_matrix(void)
+{
+  Ihandle *img;
+  
+  Ihandle* mat = IupMatrix(NULL);
+
+  img = IupImage(32,32, img_bits2);
+  IupSetHandle ("img2", img);
+  
+  IupSetAttribute(mat, "NUMLIN", "20");
+  IupSetAttribute(mat, "NUMCOL", "8");
+  
+  IupSetAttribute(mat, "1:1", "5.6\n3.33");
+  IupSetAttribute(mat, "2:1", "2.2");
+  IupSetAttribute(mat, "3:2", "Very Very Very Very Very Large Text");
+  IupSetAttribute(mat, "1:2", "4.5");
+  if (IupGetInt(NULL, "UTF8MODE"))
+    IupSetAttribute(mat, "2:2", "(çãõáóé)");
+  else
+    IupSetAttribute(mat, "2:2", "(çãõáóé)");
+  IupSetAttribute(mat, "3:1", "3.4");
+  IupSetAttribute(mat, "3:3", "Font Test");
+  IupSetAttribute(mat,"SORTSIGN2","DOWN");
+  IupSetAttribute(mat,"RESIZEMATRIX", "YES");
+  IupSetAttribute(mat, "FONT3:3", "Helvetica, 24");
+  IupSetAttribute(mat, "MASK*:3", "[a-zA-Z][0-9a-zA-Z_]*");
+
+  IupSetAttribute(mat, "TYPE4:1", "COLOR");
+  IupSetAttribute(mat, "4:1", "255 0 128");
+
+  IupSetAttribute(mat, "TYPE4:2", "FILL");
+  IupSetAttribute(mat, "4:2", "60");
+  IupSetAttribute(mat, "SHOWFILLVALUE", "Yes");
+
+  {
+    Ihandle* image = IupImageRGBA(TEST_IMAGE_SIZE, TEST_IMAGE_SIZE, image_data_32 );
+    IupSetAttribute(mat, "TYPE4:3", "IMAGE");
+    IupSetAttributeHandle(mat, "4:3", image);
+  }
+  IupSetAttribute(mat, "TOGGLECENTERED", "Yes");
+
+  IupSetAttribute(mat,"MARKMODE","CELL");
+  IupSetAttribute(mat,"MARKMULTIPLE","YES");
+  IupSetAttribute(mat,"FRAMEVERTCOLOR1:2","BGCOLOR");
+  IupSetAttribute(mat,"FRAMEHORIZCOLOR1:2","0 0 255");
+  IupSetAttribute(mat,"FRAMEHORIZCOLOR1:3","0 255 0");
+  IupSetAttribute(mat,"FRAMEVERTCOLOR2:2","255 255 0");
+  IupSetAttribute(mat,"FRAMEVERTCOLOR*:4","0 255 0");
+  IupSetAttribute(mat,"FRAMEVERTCOLOR*:5","BGCOLOR");
+  IupSetAttribute(mat, "20:8", "The End");
+  IupSetAttribute(mat, "NUMCOL_VISIBLE", "3");
+  IupSetAttribute(mat, "NUMLIN_VISIBLE", "5");
+  IupSetAttribute(mat, "FRAMEBORDER", "Yes");
+  IupSetCallback(mat, "DROPCHECK_CB", (Icallback)dropcheck_cb);
+  IupSetCallback(mat,"DROP_CB",(Icallback)drop);
+  IupSetCallback(mat,"TOGGLEVALUE_CB",(Icallback)togglevalue_cb);
+  return mat;
+}
+
+  
+void MatrixTest(void)
+{
+  Ihandle* dlg, *box, *mat;
+
+  box = IupVbox(mat = create_matrix(), NULL);
+  IupSetAttribute(box, "MARGIN", "10x10");
+//  IupSetAttribute(box, "FONT", "Arial, 7");
+
+  dlg = IupDialog(box);
+  IupSetAttribute(dlg, "TITLE", "IupMatrix Simple Test");
+  IupShowXY(dlg, IUP_CENTER, IUP_CENTER);
+
+}
+
+#ifndef BIG_TEST
+int main(int argc, char* argv[])
+{
+  IupOpen(&argc, &argv);
+
+  IupSetGlobal("SINGLEINSTANCE", "Iup Sample");  /* must partially match dialog title so COPYDATA_CB can work */
+  if (!IupGetGlobal("SINGLEINSTANCE"))
+  {
+    IupClose();  
+    return EXIT_SUCCESS;
+  }
+
+  SampleTest();
+
+  MatrixTest();
+
+  IupMainLoop();
+
+  IupClose();
+
+  return EXIT_SUCCESS;
+}
+#endif

ADDED   iup-test/sample.scm
Index: iup-test/sample.scm
==================================================================
--- /dev/null
+++ iup-test/sample.scm
@@ -0,0 +1,9 @@
+(use iup)
+
+(show (dialog (vbox (button "PUSHME"
+                            button-cb: (lambda (obj . param)
+                                        (print "obj: " obj " param: " param))
+                            action: (lambda (obj)
+                                      (print "obj: " obj))))))
+
+(main-loop)

DELETED iupexamples/graph.scm
Index: iupexamples/graph.scm
==================================================================
--- iupexamples/graph.scm
+++ /dev/null
@@ -1,62 +0,0 @@
-(use iup)
-(import iup-pplot)
-
- 
-
-(define (tl)
-  (let* ((lastx 0)
-	 (lastsample 2)
-	 (plt (pplot 
-	       #:title "MyTitle"
-	       #:marginbottom "65"
-	       #:marginleft   "65"
-	       #:axs_xlabel   "Score" 
-	       #:axs_ylabel "Count"
-	       #:legendshow "YES"
-	       ;; #:axs_xmin    "0"
-	       ;; #:axs_ymin    "0"
-	       #:axs_yautomin "YES"
-	       #:axs_xautomin "YES"
-	       #:axs_xautotick "YES"
-	       #:axs_yautotick "YES"
-	       #:ds_showvalues "YES"
-	       #:size "200x200"
-	       ))
-	 (plt1  (call-with-pplot 
-		 plt
-		 (lambda (x)
-		   (pplot-add! plt 10 100)
-		   (pplot-add! plt 20 120)
-		   (pplot-add! plt 30 200))
-		 #:x-string #f
-		 ))
-	 (plt2  (call-with-pplot 
-		 plt
-		 (lambda (x)
-		   (pplot-add! plt 10 180)
-		   (pplot-add! plt 20 125)
-		   (pplot-add! plt 30 100))
-		 #:x-string #f
-		 ))
-	 (dlg (dialog
-	       (vbox
-		plt
-		(hbox
-		;;  (button "Redraw" size: "50x" action: (lambda (obj)
-		;; 					(redraw plt)))
-		 (button "Quit"   size: "50x" action: (lambda (obj)
-							(exit)))
-		 (button "AddPoint" size: "50x" action: (lambda (obj)
-							  (set! lastx (+ lastx 10))
-							  (set! lastsample (+ lastsample 1))
-							  ;; (attribute-set! plt 'current 0)
-							  (print "lastx: " lastx " lastsample: " lastsample)
-							  (pplot-add! plt lastx (random 300) lastsample 1)
-							  (attribute-set! plt "REDRAW" "1"))))))))
-    (set! lastx 30)
-    (attribute-set! plt 'ds_mode "LINE")
-    ;; (attribute-set! plt 'ds_legend "Yada")
-    (show dlg)
-    (main-loop)))
-
-(tl)

DELETED iupexamples/iupwidgetinfo.scm
Index: iupexamples/iupwidgetinfo.scm
==================================================================
--- iupexamples/iupwidgetinfo.scm
+++ /dev/null
@@ -1,191 +0,0 @@
-#! /usr/bin/env csi
-
-(require-library srfi-4 iup)
-(import srfi-4 iup iup-pplot iup-glcanvas)
-
-(define (popup dlg . args)
-  (apply show dlg #:modal? 'yes args)
-  (destroy! dlg))
-
-(define (properties ih)
-  (popup (element-properties-dialog ih))
-  'default)
-
-(define dlg
-  (dialog
-    (vbox
-      (hbox ; headline
-        (fill)
-        (frame (label " Inspect control and dialog classes "
-                      fontsize: 15))
-        (fill)
-        margin: '0x0)
-
-      (label "") 
-      (label "Dialogs" fontsize: 12)
-      (hbox
-        (button "dialog"
-                action: (lambda (self) (properties (dialog (vbox)))))
-        (button "color-dialog"
-                action: (lambda (self) (properties (color-dialog))))
-        (button "file-dialog"
-                action: (lambda (self) (properties (file-dialog))))
-        (button "font-dialog"
-                action: (lambda (self) (properties (font-dialog))))
-        (button "message-dialog"
-                action: (lambda (self) (properties (message-dialog))))
-        (fill)
-        margin: '0x0)
-      (hbox
-        (button "layout-dialog"
-                action: (lambda (self) (properties (layout-dialog))))
-        (button "element-properties-dialog"
-                action: (lambda (self)
-                          (properties
-                            (element-properties-dialog (create 'user)))))
-        (fill)
-        margin: '0x0)
-
-      (label "") 
-      (label "Composition widgets" fontsize: 12)
-      (hbox
-        (button "fill"
-                action: (lambda (self) (properties (fill))))
-        (button "hbox"
-                action: (lambda (self) (properties (hbox))))
-        (button "vbox"
-                action: (lambda (self) (properties (vbox))))
-        (button "zbox"
-                action: (lambda (self) (properties (zbox))))
-        (button "radio"
-                action: (lambda (self) (properties (radio (vbox)))))
-        (button "normalizer"
-                action: (lambda (self) (properties (normalizer))))
-        (button "cbox"
-                action: (lambda (self) (properties (cbox))))
-        (button "sbox"
-                action: (lambda (self) (properties (sbox (vbox)))))
-        (button "split"
-                action: (lambda (self) (properties (split (vbox) (vbox)))))
-        (fill)
-        margin: '0x0)
-
-      (label "") 
-      (label "Standard widgets" fontsize: 12)
-      (hbox
-        (button "button"
-                action: (lambda (self) (properties (button))))
-        (button "canvas"
-                action: (lambda (self) (properties (canvas))))
-        (button "frame"
-                action: (lambda (self) (properties (frame))))
-        (button "label"
-                action: (lambda (self) (properties (label))))
-        (button "listbox"
-                action: (lambda (self) (properties (listbox))))
-        (button "progress-bar"
-                action: (lambda (self) (properties (progress-bar))))
-        (button "spin"
-                action: (lambda (self) (properties (spin))))
-        (fill)
-        margin: '0x0)
-      (hbox
-        (button "tabs"
-                action: (lambda (self) (properties (tabs))))
-        (button "textbox"
-                action: (lambda (self) (properties (textbox))))
-        (button "toggle"
-                action: (lambda (self) (properties (toggle))))
-        (button "treebox"
-                action: (lambda (self) (properties (treebox))))
-        (button "valuator"
-                action: (lambda (self) (properties (valuator ""))))
-        (fill)
-        margin: '0x0)
-
-      (label "") 
-      (label "Additional widgets" fontsize: 12)
-      (hbox
-        (button "cells"
-                action: (lambda (self) (properties (cells))))
-        (button "color-bar"
-                action: (lambda (self) (properties (color-bar))))
-        (button "color-browser"
-                action: (lambda (self) (properties (color-browser))))
-        (button "dial"
-                action: (lambda (self) (properties (dial ""))))
-        (button "matrix"
-                action: (lambda (self) (properties (matrix))))
-        (fill)
-        margin: '0x0)
-      (hbox
-        (button "pplot"
-                action: (lambda (self) (properties (pplot))))
-        (button "glcanvas"
-                action: (lambda (self) (properties (glcanvas))))
-        (button "web-browser"
-                action: (lambda (self) (properties (web-browser))))
-        (fill)
-        margin: '0x0)
-
-      (label "") 
-      (label "Menu widgets" fontsize: 12)
-      (hbox
-        (button "menu"
-                action: (lambda (self) (properties (menu))))
-        (button "menu-item"
-                action: (lambda (self) (properties (menu-item))))
-        (button "menu-separator"
-                action: (lambda (self) (properties (menu-separator))))
-        (fill)
-        margin: '0x0)
-
-      (label "") 
-      (label "Images" fontsize: 12)
-      (hbox
-        (button "image/palette"
-                action: (lambda (self)
-                          (properties
-                            (image/palette 1 1 (u8vector->blob (u8vector 0))))))
-        (button "image/rgb"
-                action: (lambda (self)
-                          (properties
-                            (image/rgb 1 1 (u8vector->blob (u8vector 0))))))
-        (button "image/rgba"
-                action: (lambda (self)
-                          (properties
-                            (image/rgba 1 1 (u8vector->blob (u8vector 0))))))
-        (button "image/file"
-                action: (lambda (self)
-                          (properties
-                            ;; same attributes as image/palette
-                            (image/palette 1 1 (u8vector->blob (u8vector 0))))))
-                            ;; needs a file in current directory
-                            ;(image/file "chicken.ico")))) ; ok
-                            ;(image/file "chicken.png")))) ; doesn't work
-        (fill)
-        margin: '0x0)
-
-      (label "") 
-      (label "Other widgets" fontsize: 12)
-      (hbox
-        (button "clipboard"
-                action: (lambda (self) (properties (clipboard))))
-        (button "timer"
-                action: (lambda (self) (properties (timer))))
-        (button "spinbox"
-                action: (lambda (self) (properties (spinbox (vbox)))))
-        (fill)
-        margin: '0x0)
-
-      (fill)
-      (button "E&xit"
-              expand: 'horizontal
-              action: (lambda (self) 'close))
-      )
-    margin: '15x15
-    title: "Iup inspector"))
-
-(show dlg)
-(main-loop)
-(exit 0)

DELETED iupexamples/tree.scm
Index: iupexamples/tree.scm
==================================================================
--- iupexamples/tree.scm
+++ /dev/null
@@ -1,145 +0,0 @@
-
-(use test)
-(require-library iup)
-(import (prefix iup iup:))
-
-(define t #f) 
-
-(define tree-dialog
-  (iup:dialog
-   #:title "Tree Test"
-   (let ((t1 (iup:treebox
-	      #:selection_cb (lambda (obj id state)
-			       (print "selection_db with id=" id " state=" state)
-			       (print "USERDATA: " (iup:attribute obj "USERDATA"))
-			       (print "SPECIALDATA: " (iup:attribute obj "SPECIALDATA"))
-			       (print "Depth: " (iup:attribute obj "DEPTH"))
-			       ))))
-     (set! t t1)
-     t1)))
-
-(iup:show tree-dialog)
-
-(map (lambda (elname el)
-       (print "Adding " elname " with value " el)
-       (iup:attribute-set! t elname el)
-       (iup:attribute-set! t "USERDATA" el))
-     '("VALUE" "NAME"    "ADDLEAF" "ADDBRANCH1" "ADDLEAF2"    "VALUE")
-     '("0"     "Figures" "Other"   "triangle"   "equilateral" "4")
-     )
-(map (lambda (attr)
-       (print attr " is " (iup:attribute t attr)))
-     '("KIND1" "PARENT2" "STATE1"))
-
-(define (tree-find-node obj path)
-  ;; start at the base of the tree
-  (if (null? path)
-      #f ;; or 0 ????
-      (let loop ((hed      (car path))
-		 (tal      (cdr path))
-		 (depth    0)
-		 (nodenum  0))
-	;; nodes in iup tree are 100% sequential so iterate over nodenum
-	(if (iup:attribute obj (conc "DEPTH" nodenum)) ;; end when no more nodes
-	    (let ((node-depth (string->number (iup:attribute obj (conc "DEPTH" nodenum))))
-		  (node-title (iup:attribute obj (conc "TITLE" nodenum))))
-	      ;; (print 0 "hed: " hed ", depth: " depth ", node-depth: " node-depth ", nodenum: " nodenum ", node-title: " node-title)
-	      (if (and (equal? depth node-depth)
-		       (equal? hed   node-title)) ;; yep, this is the one!
-		  (if (null? tal) ;; end of the line
-		      nodenum
-		      (loop (car tal)(cdr tal)(+ depth 1)(+ 1 nodenum)))
-		  ;; this is the case where we found part of the hierarchy but not 
-		  ;; all of it, i.e. the node-depth went from deep to less deep
-		  (if (> depth node-depth) ;; (+ 1 node-depth))
-		      #f
-		      (loop hed tal depth (+ nodenum 1)))))
-	    #f))))
-
-;; top is the top node name zeroeth node VALUE=0
-(define (tree-add-node obj top nodelst)
-  (if (not (iup:attribute obj "TITLE0"))
-      (iup:attribute-set! obj "ADDBRANCH0" top))
-  (cond
-   ((not (string=? top (iup:attribute obj "TITLE0")))
-    (print "ERROR: top name " top " doesn't match " (iup:attribute obj "TITLE0")))
-   ((null? nodelst))
-   (else
-    (let loop ((hed      (car nodelst))
-	       (tal      (cdr nodelst))
-	       (depth    1)
-	       (pathl    (list top)))
-      ;; Because the tree dialog changes node numbers when
-      ;; nodes are added or removed we must look up nodes
-      ;; each and every time. 0 is the top node so default
-      ;; to that.
-      (let* ((newpath    (append pathl (list hed)))
-	       (parentnode (tree-find-node obj pathl))
-	       (nodenum    (tree-find-node obj newpath)))
-	  ;; (print "newpath: " newpath ", nodenum " nodenum ", hed: " hed ", depth: " depth ", parentnode: " parentnode ", pathl: " pathl)
-	  ;; Add the branch under lastnode if not found
-	  (if (not nodenum)
-	      (begin
-		(iup:attribute-set! obj (conc "ADDBRANCH" parentnode) hed)
-		(if (null? tal)
-		    #t
-		    ;; reset to top
-		    (loop (car nodelst)(cdr nodelst) 1 (list top)))) 
-	      (if (null? tal) ;; if null here then this path has already been added
-		  #t
-		  ;; (if nodenum
-		  (loop (car tal)(cdr tal)(+ depth 1) newpath)))))))) ;;  (if nodenum nodenum lastnode)))))))
-	      ;; 	  (loop hed tal depth pathl lastnode)))))))
-
-(define (tree-node->path obj nodenum)
-  ;; (print "\ncurrnode  nodenum  depth  node-depth  node-title   path")
-  (let loop ((currnode 0)
-	     (depth    0)
-	     (path     '()))
-    (let ((node-depth (iup:attribute obj (conc "DEPTH" currnode)))
-	  (node-title (iup:attribute obj (conc "TITLE" currnode))))
-      ;; (display (conc "\n   "currnode "        " nodenum "       " depth "         " node-depth "          " node-title "         " path))
-      (if (> currnode nodenum)
-	  path
-	  (if (not node-depth) ;; #f if we are out of nodes
-	      '()
-	      (let ((ndepth (string->number node-depth)))
-		(if (eq? ndepth depth)
-		    ;; This next is the match condition depth == node-depth
-		    (if (eq? currnode nodenum)
-			(begin
-			  ;; (display " ")
-			  (append path (list node-title)))
-			(loop (+ currnode 1)
-			      (+ depth 1)
-			      (append path (list node-title))))
-		    ;; didn't match, reset to base path and keep looking
-		    ;; due to more iup odditys we don't reset to base
-		    (begin 
-		      ;; (display " ")
-		      (loop (+ 1 currnode)
-			    2
-			    (append (take path ndepth)(list node-title)))))))))))
-
-(test #f 0  (tree-find-node t '("Figures")))
-(test #f 1  (tree-find-node t '("Figures" "Other")))
-(test #f #f (tree-find-node t '("Figures" "Other"    "equilateral")))
-(test #f 3  (tree-find-node t '("Figures" "triangle" "equilateral")))
-(test #f #t (tree-add-node  t "Figures" '()))
-(test #f #t (tree-add-node  t "Figures" '("a" "b" "c")))
-(test #f 3  (tree-find-node t '("Figures" "a" "b" "c")))
-(test #f #t (tree-add-node  t "Figures" '("d" "b" "c")))
-(test #f 3  (tree-find-node t '("Figures" "d" "b" "c")))
-(test #f 6  (tree-find-node t '("Figures" "a" "b" "c")))
-(test #f #t (tree-add-node  t "Figures" '("a" "e" "c")))
-(test #f 6  (tree-find-node t '("Figures" "a" "e" "c")))
-
-(test #f '("Figures")             (tree-node->path t 0))
-(test #f '("Figures" "d")         (tree-node->path t 1))
-(test #f '("Figures" "d" "b" "c") (tree-node->path t 3))
-(test #f '("Figures" "a")         (tree-node->path t 4))
-(test #f '("Figures" "a" "b" "c")     (tree-node->path t 8)) 
-(test #f '()                      (tree-node->path t 40))
-
-(iup:main-loop)
-

ADDED   js-path.scm
Index: js-path.scm
==================================================================
--- /dev/null
+++ js-path.scm
@@ -0,0 +1,18 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
+(define *java-script-lib* (conc  (common:get-install-area) "/share/js/jquery-3.1.0.slim.min.js")) 

ADDED   junk/cube.scm
Index: junk/cube.scm
==================================================================
--- /dev/null
+++ junk/cube.scm
@@ -0,0 +1,103 @@
+(use gl glut 3viewer typed-records matchable)
+
+(define red    '#f32(1 0 0 1))   ;;      
+(define blue   '#f32(0 0 1 1))	  ;;	  
+(define green  '#f32(0 1 0 1))	  ;;	  
+(define yellow '#f32(1 1 0 1))	  ;;	  
+(define white  '#f32(1 1 1 1))	  ;;	  
+(define orange '#f32(1 0.5 0 1)) ;; 	  
+(define black  '#f32(0 0 0 1)) ;;	 
+
+(define colors
+  `((1 . ,red    ) ;;  red    
+    (2 . ,blue   ) ;;	 blue   
+    (3 . ,green  ) ;;	 green  
+    (4 . ,yellow ) ;;	 yellow 
+    (5 . ,white  ) ;;	 white  
+    (6 . ,orange ) ;; 	 orange 
+    (7 . ,black  ) ;;	 black
+    ))
+
+;; retrive color
+(define (rc c)
+  (alist-ref c colors))
+
+(defstruct cspec
+  (x 0)
+  (y 0)
+  (z 0)
+  (n (rc 1))   ;; north
+  (s (rc 1))   ;; south
+  (e (rc 1))   ;; east
+  (w (rc 1))   ;; west
+  (t (rc 1))   ;; top
+  (b (rc 1)))  ;; bottom
+
+(define a 0)
+
+(define (spin id)
+  (set! a (modulo (+ a 1) 360)))
+
+(define (colorize id col)
+  (gl:Materialfv 
+   gl:FRONT_AND_BACK gl:AMBIENT_AND_DIFFUSE
+   (if (object-highlighted? id)
+       '#f32(1 1 0 1)
+       col)))
+
+(define (make-cuber cspec)
+  (lambda (id)
+    (gl:Translatef (cspec-x cspec)(cspec-y cspec)(cspec-z cspec))
+    (draw-side id (cspec-w cspec)) ;; west side
+    (gl:Translatef 0 1 0)
+    (gl:Rotatef 90 1 0 0)
+    (draw-side id (cspec-e cspec)) ;; east side
+    (gl:Translatef 0 0 1)
+    (gl:Rotatef 90 0 1 0)
+    (draw-side id (cspec-n cspec)) ;; east side
+    (gl:Translatef 0 0 1)
+    (gl:Rotatef 90 0 1 0)
+    (draw-side id (cspec-s cspec)) ;; east side
+    (gl:Translatef 0 0 1)
+    (gl:Rotatef 90 0 1 0)
+    (draw-side id (cspec-t cspec)) ;; east side
+    (gl:Translatef 0 1 0)
+    (gl:Rotatef 90 1 0 0)
+    (draw-side id (cspec-b cspec)) ;; east side
+       ))
+    
+(define (draw-side id color)
+  (colorize id color) ;; '#f32(1 0 0 1))
+  (gl:Begin gl:POLYGON)
+  (gl:Vertex2f 0 0) 
+  (gl:Vertex2f 0 1) 
+  (gl:Vertex2f 1 1) 
+  (gl:Vertex2f 1 0) 
+  (gl:End) 
+  )
+
+(define data
+  (map (lambda (inl)
+	 (map string->number (string-split inl)))
+       (with-input-from-file "data.txt"
+	 read-lines)))
+
+(print "data: " data)
+
+(use trace)
+
+;; (add-object draw-cube animate: spin select: (lambda _ (print "oink!")))
+;; (add-object draw-polygon animate: spin select: (lambda _ (print "oink!")))
+(gl:Clear gl:COLOR_BUFFER_BIT)
+(for-each
+ (lambda (dat)
+   ;; (let ((c1 (make-cspec e: red w: blue n: green s: yellow t: white b: orange)))
+   (match dat
+     ((x y z n s e w t b)
+      (let ((c1 (make-cspec x: x y: y z: z n: (rc n) s: (rc s) e: (rc e) w: (rc w) t: (rc t) b: (rc b))))
+	(pp (cspec->alist c1))
+	(add-object (make-cuber c1) select: (lambda _ (print "oink!")))))
+     (else (print "bad object " dat))))
+ data)
+(gl:Flush)      
+(start-viewer)

ADDED   junk/data.txt
Index: junk/data.txt
==================================================================
--- /dev/null
+++ junk/data.txt
@@ -0,0 +1,1 @@
+0 0 0 1 2 3 4 5 6

Index: key_records.scm
==================================================================
--- key_records.scm
+++ key_records.scm
@@ -1,22 +1,31 @@
 ;;======================================================================
 ;; Copyright 2006-2012, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 ;;======================================================================
 
 (define-inline (keys->valslots keys) ;; => ?,?,? ....
   (string-intersperse (map (lambda (x) "?") keys) ","))
 
-(define-inline (keys->key/field keys . additional)
-  (string-join (map (lambda (k)(conc k " TEXT"))
-		    (append keys additional)) ","))
+;; (define-inline (keys->key/field keys . additional)
+;;   (string-join (map (lambda (k)(conc k " TEXT"))
+;; 		    (append keys additional)) ","))
 
 (define-inline (item-list->path itemdat)
   (if (list? itemdat)
       (string-intersperse  (map cadr itemdat) "/")
       ""))

Index: keys.scm
==================================================================
--- keys.scm
+++ keys.scm
@@ -1,14 +1,23 @@
 
 ;; Copyright 2006-2012, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
  
 ;;======================================================================
 ;; Run keys, these are used to hierarchially organise tests and run areas
 ;;======================================================================
 
@@ -64,9 +73,13 @@
 
 ;;======================================================================
 ;; config file related routines
 ;;======================================================================
 
-(define (keys:config-get-fields confdat)
-  (let ((fields (hash-table-ref/default confdat "fields" '())))
-    (map car fields)))
+(define keys:config-get-fields common:get-fields)
+(define (keys:make-key/field-string confdat)
+  (let ((fields (configf:get-section confdat "fields")))
+    (string-join
+     (map (lambda (field)(conc (car field) " " (cadr field)))
+	  fields)
+     ",")))
 

Index: launch.scm
==================================================================
--- launch.scm
+++ launch.scm
@@ -1,37 +1,46 @@
 
 ;; Copyright 2006-2017, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
 
 ;;======================================================================
 ;; launch a task - this runs on the originating host, tests themselves
 ;;
 ;;======================================================================
 
-(use regex regex-case base64 sqlite3 srfi-18 directory-utils posix-extras z3 call-with-environment-variables csv)
+(use regex regex-case base64 sqlite3 srfi-18 directory-utils posix-extras z3
+     call-with-environment-variables csv)
 (use typed-records pathname-expand matchable)
 
 (import (prefix base64 base64:))
 (import (prefix sqlite3 sqlite3:))
 
 (declare (unit launch))
+(declare (uses subrun))
 (declare (uses common))
 (declare (uses configf))
 (declare (uses db))
-;; (declare (uses sdb))
-(declare (uses tdb))
-;; (declare (uses filedb))
+(declare (uses ezsteps))
 
 (include "common_records.scm")
 (include "key_records.scm")
 (include "db_records.scm")
+(include "megatest-fossil-hash.scm")
 
 ;;======================================================================
 ;; ezsteps
 ;;======================================================================
 
@@ -42,13 +51,19 @@
 ;; stepname {VAR=first,second,third ...} command ...
 ;; where the {VAR=first,second,third ...} is optional.
 
 ;; given an exit code and whether or not logpro was used calculate OK/BAD
 ;; return #t if we are ok, #f otherwise
-(define (steprun-good? logpro exitcode)
+(define (steprun-good? logpro exitcode stepparms)
   (or (eq? exitcode 0)
-      (and logpro (eq? exitcode 2))))
+      (and logpro (eq? exitcode 2)) ;; shouldn't this be (member exitcode 2 ...) with the other ok codes?
+      (let* ((params (alist-ref 'params stepparms)) ;; get the params section
+	     (keep-going (if params
+			     (alist-ref "keep-going" params equal?)
+			     #f)))
+	(debug:print 0 *default-log-port* "keep-going=" keep-going)
+	(and keep-going (equal? (car keep-going) "yes")))))
 
 ;; if handed a string, process it, else look for MT_CMDINFO
 (define (launch:get-cmdinfo-assoc-list #!key (encoded-cmd #f))
   (let ((enccmd (if encoded-cmd encoded-cmd (getenv "MT_CMDINFO"))))
     (if enccmd
@@ -61,11 +76,11 @@
 ;; return (conc status ": " comment) from the final section so that
 ;;   the comment can be set in the step record in launch.scm
 ;;
 (define (launch:load-logpro-dat run-id test-id stepname)
   (let ((cname (conc stepname ".dat")))
-    (if (file-exists? cname)
+    (if (common:file-exists? cname)
 	(let* ((dat  (read-config cname #f #f))
 	       (csvr (db:logpro-dat->csv dat stepname))
 	       (csvt (let-values (((fmt-cell fmt-record fmt-csv) (make-format ",")))
 		       (fmt-csv (map list->csv-record csvr))))
 	       (status (configf:lookup dat "final" "exit-status"))
@@ -79,175 +94,11 @@
 	   ((equal? status "PASS") "PASS") ;; skip the message part if status is pass
 	   (status (conc (configf:lookup dat "final" "exit-status") ": " (if msg msg "no message")))
 	   (else #f)))
 	#f)))
 
-(define (launch:runstep ezstep run-id test-id exit-info m tal testconfig)
-  (let* ((stepname       (car ezstep))  ;; do stuff to run the step
-	 (stepinfo       (cadr ezstep))
-	 (stepparts      (string-match (regexp "^(\\{([^\\}]*)\\}\\s*|)(.*)$") stepinfo))
-	 (stepparms      (list-ref stepparts 2)) ;; for future use, {VAR=1,2,3}, run step for each 
-	 (stepcmd        (list-ref stepparts 3))
-	 (script         "") ; "#!/bin/bash\n") ;; yep, we depend on bin/bash FIXME!!!\
-	 (logpro-file    (conc stepname ".logpro"))
-	 (html-file      (conc stepname ".html"))
-	 (dat-file       (conc stepname ".dat"))
-	 (tconfig-logpro (configf:lookup testconfig "logpro" stepname))
-	 (logpro-used    (file-exists? logpro-file)))
-
-    (if (and tconfig-logpro
-	     (not logpro-used)) ;; no logpro file found but have a defn in the testconfig
-	(begin
-	  (with-output-to-file logpro-file
-	    (lambda ()
-	      (print ";; logpro file extracted from testconfig\n"
-		     ";;")
-	      (print tconfig-logpro)))
-	  (set! logpro-used #t)))
-    
-    ;; NB// can safely assume we are in test-area directory
-    (debug:print 4 *default-log-port* "ezsteps:\n stepname: " stepname " stepinfo: " stepinfo " stepparts: " stepparts
-		 " stepparms: " stepparms " stepcmd: " stepcmd)
-    
-    ;; ;; first source the previous environment
-    ;; (let ((prev-env (conc ".ezsteps/" prevstep (if (string-search (regexp "csh") 
-    ;;      							 (get-environment-variable "SHELL")) ".csh" ".sh"))))
-    ;;   (if (and prevstep (file-exists? prev-env))
-    ;;       (set! script (conc script "source " prev-env))))
-    
-    ;; call the command using mt_ezstep
-    ;; (set! script (conc "mt_ezstep " stepname " " (if prevstep prevstep "x") " " stepcmd))
-    
-    (debug:print 4 *default-log-port* "script: " script)
-    (rmt:teststep-set-status! run-id test-id stepname "start" "-" #f #f)
-    ;; now launch the actual process
-    (call-with-environment-variables 
-     (list (cons "PATH" (conc (get-environment-variable "PATH") ":.")))
-     (lambda () ;; (process-run "/bin/bash" "-c" "exec ls -l /tmp/foobar > /tmp/delme-more.log 2>&1")
-       (let* ((cmd (conc stepcmd " > " stepname ".log 2>&1")) ;; >outfile 2>&1 
-	      (pid (process-run "/bin/bash" (list "-c" cmd))))
-
-         (with-output-to-file "Makefile.ezsteps"
-           (lambda ()
-             (print stepname ".log :")
-             (print "\t" cmd)
-             (if (file-exists? (conc stepname ".logpro"))
-                 (print "\tlogpro " stepname ".logpro " stepname ".html < " stepname ".log"))
-             (print)
-             (print stepname " : " stepname ".log")
-             (print))
-           #:append)
-
-	 (rmt:test-set-top-process-pid run-id test-id pid)
-	 (let processloop ((i 0))
-	   (let-values (((pid-val exit-status exit-code)(process-wait pid #t)))
-		       (mutex-lock! m)
-		       (launch:einf-pid-set!         exit-info pid)         ;; (vector-set! exit-info 0 pid)
-		       (launch:einf-exit-status-set! exit-info exit-status) ;; (vector-set! exit-info 1 exit-status)
-		       (launch:einf-exit-code-set!   exit-info exit-code)   ;; (vector-set! exit-info 2 exit-code)
-		       (mutex-unlock! m)
-		       (if (eq? pid-val 0)
-			   (begin
-			     (thread-sleep! 2)
-			     (processloop (+ i 1))))
-		       )))))
-    (debug:print-info 0 *default-log-port* "step " stepname " completed with exit code " (launch:einf-exit-code exit-info)) ;; (vector-ref exit-info 2))
-    ;; now run logpro if needed
-    (if logpro-used
-	(let ((pid (process-run (conc "logpro " logpro-file " " (conc stepname ".html") " < " stepname ".log"))))
-	  (let processloop ((i 0))
-	    (let-values (((pid-val exit-status exit-code)(process-wait pid #t)))
-			(mutex-lock! m)
-			;; (make-launch:einf pid: pid exit-status: exit-status exit-code: exit-code)
-			(launch:einf-pid-set!         exit-info pid)         ;; (vector-set! exit-info 0 pid)
-			(launch:einf-exit-status-set! exit-info exit-status) ;; (vector-set! exit-info 1 exit-status)
-			(launch:einf-exit-code-set!   exit-info exit-code)   ;; (vector-set! exit-info 2 exit-code)
-			(mutex-unlock! m)
-			(if (eq? pid-val 0)
-			    (begin
-			      (thread-sleep! 2)
-			      (processloop (+ i 1)))))
-	    (debug:print-info 0 *default-log-port* "logpro for step " stepname " exited with code " (launch:einf-exit-code exit-info))))) ;; (vector-ref exit-info 2)))))
-    
-    (let ((exinfo (launch:einf-exit-code exit-info)) ;; (vector-ref exit-info 2))
-	  (logfna (if logpro-used (conc stepname ".html") ""))
-	  (comment #f))
-      (if logpro-used
-	  (let ((datfile (conc stepname ".dat")))
-	    ;; load the .dat file into the test_data table if it exists
-	    (if (file-exists? datfile)
-		(set! comment (launch:load-logpro-dat run-id test-id stepname)))
-	    (rmt:test-set-log! run-id test-id (conc stepname ".html"))))
-      (rmt:teststep-set-status! run-id test-id stepname "end" exinfo comment logfna))
-    ;; set the test final status
-    (let* ((process-exit-status (launch:einf-exit-code exit-info)) ;; (vector-ref exit-info 2))
-	   (this-step-status (cond
-			      ((and (eq? process-exit-status 2) logpro-used) 'warn)   ;; logpro 2 = warnings
-			      ((and (eq? process-exit-status 3) logpro-used) 'check)  ;; logpro 3 = check
-			      ((and (eq? process-exit-status 4) logpro-used) 'waived) ;; logpro 4 = waived
-			      ((and (eq? process-exit-status 5) logpro-used) 'abort)  ;; logpro 5 = abort
-			      ((and (eq? process-exit-status 6) logpro-used) 'skip)   ;; logpro 6 = skip
-			      ((eq? process-exit-status 0)                   'pass)   ;; logpro 0 = pass
-			      (else 'fail)))
-	   (overall-status   (cond
-			      ((eq? (launch:einf-rollup-status exit-info) 2) 'warn) ;; rollup-status (vector-ref exit-info 3)
-			      ((eq? (launch:einf-rollup-status exit-info) 0) 'pass) ;; (vector-ref exit-info 3)
-			      (else 'fail)))
-	   (next-status      (cond 
-			      ((eq? overall-status 'pass) this-step-status)
-			      ((eq? overall-status 'warn)
-			       (if (eq? this-step-status 'fail) 'fail 'warn))
-			      ((eq? overall-status 'abort) 'abort)
-			      (else 'fail)))
-	   (next-state       ;; "RUNNING") ;; WHY WAS THIS CHANGED TO NOT USE (null? tal) ??
-	    (cond
-	     ((null? tal) ;; more to run?
-	      "COMPLETED")
-	     (else "RUNNING"))))
-      (debug:print 4 *default-log-port* "Exit value received: " (launch:einf-exit-code exit-info) " logpro-used: " logpro-used 
-		   " this-step-status: " this-step-status " overall-status: " overall-status 
-		   " next-status: " next-status " rollup-status: "  (launch:einf-rollup-status exit-info)) ;; (vector-ref exit-info 3))
-      (case next-status
-	((warn)
-	 (launch:einf-rollup-status-set! exit-info 2) ;; (vector-set! exit-info 3 2) ;; rollup-status
-	 ;; NB// test-set-status! does rdb calls under the hood
-	 (tests:test-set-status! run-id test-id next-state "WARN" 
-				 (if (eq? this-step-status 'warn) "Logpro warning found" #f)
-				 #f))
-	((check)
-	 (launch:einf-rollup-status-set! exit-info 3) ;; (vector-set! exit-info 3 3) ;; rollup-status
-	 ;; NB// test-set-status! does rdb calls under the hood
-	 (tests:test-set-status! run-id test-id next-state "CHECK" 
-				 (if (eq? this-step-status 'check) "Logpro check found" #f)
-				 #f))
-	((waived)
-	 (launch:einf-rollup-status-set! exit-info 4) ;; (vector-set! exit-info 3 3) ;; rollup-status
-	 ;; NB// test-set-status! does rdb calls under the hood
-	 (tests:test-set-status! run-id test-id next-state "WAIVED" 
-				 (if (eq? this-step-status 'check) "Logpro waived found" #f)
-				 #f))
-	((abort)
-	 (launch:einf-rollup-status-set! exit-info 5) ;; (vector-set! exit-info 3 4) ;; rollup-status
-	 ;; NB// test-set-status! does rdb calls under the hood
-	 (tests:test-set-status! run-id test-id next-state "ABORT" 
-				 (if (eq? this-step-status 'abort) "Logpro abort found" #f)
-				 #f))
-	((skip)
-	 (launch:einf-rollup-status-set! exit-info 6) ;; (vector-set! exit-info 3 4) ;; rollup-status
-	 ;; NB// test-set-status! does rdb calls under the hood
-	 (tests:test-set-status! run-id test-id next-state "SKIP" 
-				 (if (eq? this-step-status 'skip) "Logpro skip found" #f)
-				 #f))
-	((pass)
-	 (tests:test-set-status! run-id test-id next-state "PASS" #f #f))
-	(else ;; 'fail
-	 (launch:einf-rollup-status-set! exit-info 1) ;; (vector-set! exit-info 3 1) ;; force fail, this used to be next-state but that doesn't make sense. should always be "COMPLETED" 
-	 (tests:test-set-status! run-id test-id "COMPLETED" "FAIL" (conc "Failed at step " stepname) #f)
-	 )))
-    logpro-used))
-
-(define (launch:manage-steps run-id test-id item-path fullrunscript ezsteps test-name tconfigreg exit-info m)
+(define (launch:manage-steps run-id test-id item-path fullrunscript ezsteps subrun test-name tconfigreg exit-info m)
   ;; (let-values
   ;;  (((pid exit-status exit-code)
   ;;    (run-n-wait fullrunscript)))
   ;; (tests:test-set-status! test-id "RUNNING" "n/a" #f #f)
   ;; Since we should have a clean slate at this time there is no need to do 
@@ -277,12 +128,13 @@
 		 (thread-sleep! 2)
 		 (loop (+ i 1)))
 	       )))))
   ;; then, if runscript ran ok (or did not get called)
   ;; do all the ezsteps (if any)
-  (if ezsteps
-      (let* ((testconfig ;; (read-config (conc work-area "/testconfig") #f #t environ-patt: "pre-launch-env-vars")) ;; FIXME??? is allow-system ok here?
+  (if (or ezsteps subrun)
+      (let* ((test-run-dir (tests:get-test-path-from-environment))
+             (testconfig ;; (read-config (conc work-area "/testconfig") #f #t environ-patt: "pre-launch-env-vars")) ;; FIXME??? is allow-system ok here?
 	      ;; NOTE: it is tempting to turn off force-create of testconfig but dynamic
 	      ;;       ezstep names need a full re-eval here.
 	      (tests:get-testconfig test-name item-path tconfigreg #t force-create: #t)) ;; 'return-procs)))
 	     (ezstepslst (if (hash-table? testconfig)
 			     (hash-table-ref/default testconfig "ezsteps" '())
@@ -296,66 +148,122 @@
 	;; after all that, still no testconfig? Time to abort
 	(if (not testconfig)
 	    (begin
 	      (debug:print-error 0 *default-log-port* "Failed to resolve megatest.config, runconfigs.config and testconfig issues. Giving up now")
 	      (exit 1)))
-	(if (not (file-exists? ".ezsteps"))(create-directory ".ezsteps"))
-	;; if ezsteps was defined then we are sure to have at least one step but check anyway
-	(if (not (> (length ezstepslst) 0))
-	    (debug:print-error 0 *default-log-port* "ezsteps defined but ezstepslst is zero length")
-	    (let loop ((ezstep (car ezstepslst))
-		       (tal    (cdr ezstepslst))
-		       (prevstep #f))
-	      ;; check exit-info (vector-ref exit-info 1)
-	      (if (launch:einf-exit-status exit-info) ;; (vector-ref exit-info 1)
-		  (let ((logpro-used (launch:runstep ezstep run-id test-id exit-info m tal testconfig))
-			(stepname    (car ezstep)))
-		    ;; if logpro-used read in the stepname.dat file
-		    (if (and logpro-used (file-exists? (conc stepname ".dat")))
-			(launch:load-logpro-dat run-id test-id stepname))
-		    (if (steprun-good? logpro-used (launch:einf-exit-code exit-info))
-			(if (not (null? tal))
-			    (loop (car tal) (cdr tal) stepname))
-			(debug:print 4 *default-log-port* "WARNING: step " (car ezstep) " failed. Stopping")))
-		  (debug:print 4 *default-log-port* "WARNING: a prior step failed, stopping at " ezstep)))))))
+
+	;; create a proc for the subrun if requested, save that proc in the ezsteps table as the last entry
+	;; 1. get section [runarun]
+	;; 2. unset MT_* vars
+	;; 3. fix target
+	;; 4. fix runname
+	;; 5. fix testpatt or calculate it from contour
+	;; 6. launch the run
+	;; 7. roll up the run result and or roll up the logpro processed result
+	(when (configf:lookup testconfig "subrun" "runwait") ;; we use runwait as the flag that a subrun is requested
+            (subrun:initialize-toprun-test testconfig test-run-dir)
+	    (let* ((mt-cmd (subrun:launch-cmd test-run-dir)))
+              (debug:print-info 0 *default-log-port* "Subrun command is \"" mt-cmd "\"")
+              (set! ezsteps #t) ;; set the needed flag
+	      (set! ezstepslst
+                    (append (or ezstepslst '())
+                            (list (list "subrun" (conc "{subrun=true} " mt-cmd)))))))
+
+	;; process the ezsteps
+	(if ezsteps
+	    (let* ((envdbf        (conc "/tmp/."(current-user-name)"-"(current-process-id)"-"run-id"-"test-id".db"))
+		   (all-steps-dat (make-hash-table))) ;; keep all the info around as stepname ==> alist;
+	                                              ;;; where  'params is the params list (add other
+	                                              ;;; stuff as needed)
+	      (if (not (common:file-exists? ".ezsteps"))(create-directory ".ezsteps"))
+	      ;; if ezsteps was defined then we are sure to have at least one step but check anyway
+	      (if (not (> (length ezstepslst) 0))
+		  (debug:print-error 0 *default-log-port* "ezsteps defined but ezstepslst is zero length")
+		  (let loop ((ezstep (car ezstepslst))
+			     (tal    (cdr ezstepslst))
+			     (prevstep #f))
+                    (debug:print-info 0 *default-log-port* "Processing ezstep \"" (string-intersperse ezstep " ") "\"")
+		    ;; check exit-info (vector-ref exit-info 1)
+		    (if (launch:einf-exit-status exit-info) ;; (vector-ref exit-info 1)
+			(let* ((logpro-used (launch:runstep ezstep run-id test-id exit-info m
+							    tal testconfig all-steps-dat prevstep envdbf))
+			       (stepname    (car ezstep))
+			       (stepparms   (hash-table-ref all-steps-dat stepname)))
+			  (setenv "MT_STEP_NAME" stepname)
+			  (pp (hash-table->alist all-steps-dat))
+			  ;; if logpro-used read in the stepname.dat file
+			  (if (and logpro-used (common:file-exists? (conc stepname ".dat")))
+			      (launch:load-logpro-dat run-id test-id stepname))
+			  (if (steprun-good? logpro-used (launch:einf-exit-code exit-info) stepparms)
+			      (if (not (null? tal))
+				  (loop (car tal) (cdr tal) stepname))
+			      (debug:print 0 *default-log-port* "WARNING: step " (car ezstep) " failed. Stopping")))
+			(debug:print 0 *default-log-port* "WARNING: a prior step failed, stopping at " ezstep)))))))))
 
 (define (launch:monitor-job run-id test-id item-path fullrunscript ezsteps test-name tconfigreg exit-info m work-area runtlim misc-flags)
-  (let* ((start-seconds (current-seconds))
+  (let* ((update-period (string->number (or (configf:lookup *configdat* "setup" "test-stats-update-period") "30")))
+         (start-seconds (current-seconds))
 	 (calc-minutes  (lambda ()
 			  (inexact->exact 
 			   (round 
 			    (- 
 			     (current-seconds) 
 			     start-seconds)))))
 	 (kill-tries 0))
     ;; (tests:set-full-meta-info #f test-id run-id (calc-minutes) work-area)
     ;; (tests:set-full-meta-info test-id run-id (calc-minutes) work-area)
-    (tests:set-full-meta-info #f test-id run-id (calc-minutes) work-area 10)
+    (tests:set-full-meta-info #f test-id run-id (calc-minutes) work-area 10 update-db: #t)
+
     (let loop ((minutes   (calc-minutes))
 	       (cpu-load  (alist-ref 'adj-core-load (common:get-normalized-cpu-load #f)))
-	       (disk-free (get-df (current-directory))))
-      (let ((new-cpu-load (let* ((load  (alist-ref 'adj-core-load (common:get-normalized-cpu-load #f)))
-				 (delta (abs (- load cpu-load))))
-			    (if (> delta 0.1) ;; don't bother updating with small changes
-				load
-				#f)))
-	    (new-disk-free (let* ((df    (get-df (current-directory)))
-				  (delta (abs (- df disk-free))))
-			     (if (> delta 200) ;; ignore changes under 200 Meg
-				 df
-				 #f))))
-	(set! kill-job? (or (test-get-kill-request run-id test-id) ;; run-id test-name itemdat))
-			    (and runtlim (let* ((run-seconds   (- (current-seconds) start-seconds))
-						(time-exceeded (> run-seconds runtlim)))
-					   (if time-exceeded
-					       (begin
-						 (debug:print-info 0 *default-log-port* "KILLING TEST DUE TO TIME LIMIT EXCEEDED! Runtime=" run-seconds " seconds, limit=" runtlim)
-						 #t)
-					       #f)))))
-	(tests:update-central-meta-info run-id test-id new-cpu-load new-disk-free (calc-minutes) #f #f)
+	       (disk-free (get-df (current-directory)))
+               (last-sync (current-seconds)))
+      ;; (common:telemetry-log "zombie" (conc "launch:monitor-job -
+      ;; top of loop encountered at "(current-seconds)" with
+      ;; last-sync="last-sync))
+      (let* ((over-time     (> (current-seconds) (+ last-sync update-period)))
+             (new-cpu-load  (let* ((load  (alist-ref 'adj-core-load (common:get-normalized-cpu-load #f)))
+                                   (delta (abs (- load cpu-load))))
+                              (if (> delta 0.1) ;; don't bother updating with small changes
+                                  load
+                                  #f)))
+             (new-disk-free (let* ((df    (if over-time ;; only get df every 30 seconds
+                                              (get-df (current-directory))
+                                              disk-free))
+                                   (delta (abs (- df disk-free))))
+                              (if (and (> df 0)
+                                       (> (/ delta df) 0.1)) ;; (> delta 200) ;; ignore changes under 200 Meg
+                                  df
+                                  #f)))
+             (do-sync       (or new-cpu-load new-disk-free over-time))
+
+             (test-info   (rmt:get-test-info-by-id run-id test-id))
+             (state       (db:test-get-state test-info))
+             (status      (db:test-get-status test-info))
+             (kill-reason  "no kill reason specified")
+             (kill-job?    #f))
+        #;(common:telemetry-log "zombie" (conc "launch:monitor-job - decision time encountered at "(current-seconds)" with last-sync="last-sync" do-sync="do-sync" over-time="over-time" update-period="update-period))
+        (cond
+         ((test-get-kill-request run-id test-id)
+          (set! kill-reason "KILLING TEST since received kill request (KILLREQ)")
+          (set! kill-job? #t))
+         ((and runtlim (> (- (current-seconds) start-seconds) runtlim))
+          (set! kill-reason (conc "KILLING TEST DUE TO TIME LIMIT EXCEEDED! Runtime=" (- (current-seconds) start-seconds) " seconds, limit=" runtlim))
+          (set! kill-job? #t))
+         ((equal? status "DEAD")
+          (tests:update-central-meta-info run-id test-id new-cpu-load new-disk-free (calc-minutes) #f #f update-db: #t)
+          (rmt:set-state-status-and-roll-up-items run-id test-id 'foo "RUNNING" "n/a" "was marked dead; really still running.")
+          ;;(set! kill-reason "KILLING TEST because it was marked as DEAD by launch:handle-zombie-tests (might indicate really overloaded server or else overzealous setup.deadtime)") ;; MARK RUNNING
+          (set! kill-job? #f)))
+
+        (debug:print 4 *default-log-port* "cpu: " new-cpu-load " disk: " new-disk-free " last-sync: " last-sync " do-sync: " do-sync)
+        (launch:handle-zombie-tests run-id)
+        (if do-sync ;; save meta data about the running of this test
+	    (tests:update-central-meta-info run-id test-id new-cpu-load new-disk-free (calc-minutes) #f #f))
 	(if kill-job? 
 	    (begin
+              (debug:print-info 0 *default-log-port* "proceeding to kill test: "kill-reason)
 	      (mutex-lock! m)
 	      ;; NOTE: The pid can change as different steps are run. Do we need handshaking between this
 	      ;;       section and the runit section? Or add a loop that tries three times with a 1/4 second
 	      ;;       between tries?
 	      (let* ((pid1 (launch:einf-pid exit-info)) ;; (vector-ref exit-info 0))
@@ -367,11 +275,11 @@
 		       (lambda (pid)
 			 (handle-exceptions
 			  exn
 			  (begin
 			    (debug:print-info 0 *default-log-port* "Unable to kill process with pid " pid ", possibly already killed.")
-			    (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn)))
+			    (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn) ", exn=" exn))
 			  (debug:print 0 *default-log-port* "WARNING: Request received to kill job " pid) ;;  " (attempt # " kill-tries ")")
 			  (debug:print-info 0 *default-log-port* "Signal mask=" (signal-mask))
 			  ;; (if (process:alive? pid)
 			  ;;     (begin
 			  (map (lambda (pid-num)
@@ -379,30 +287,37 @@
 			       (process:get-sub-pids pid))
 			  (thread-sleep! 5)
 			  ;; (if (process:process-alive? pid)
 			  (map (lambda (pid-num)
 				 (handle-exceptions
-				  exn
-				  #f
-				  (process-signal pid-num signal/kill)))
+				     exn
+				   (begin
+				     (debug:print 0 *default-log-port* " .... had trouble sending kill to " pid-num ", exn=" exn)
+				     #f)
+				   (process-signal pid-num signal/kill)))
 			       (process:get-sub-pids pid))))
 		       ;;    (debug:print-info 0 *default-log-port* "not killing process " pid " as it is not alive"))))
 		       pids)
-		      (tests:test-set-status! run-id test-id "KILLED"  "KILLED" (args:get-arg "-m") #f))
+                      ;; BB: question to Matt -- does the tests:test-state-status! encompass rollup to toplevel?  If not, should it?
+		      (tests:test-set-status! run-id test-id "KILLED"  "KILLED" (conc (args:get-arg "-m")" "kill-reason) #f)) ;; BB ADDED kill-reason -- confirm OK with Matt
 		    (begin
 		      (debug:print-error 0 *default-log-port* "Nothing to kill, pid1=" pid1 ", pid2=" pid2)
-		      (tests:test-set-status! run-id test-id "KILLED"  "FAILED TO KILL" (args:get-arg "-m") #f)
+		      (tests:test-set-status! run-id test-id "KILLED"  "FAILED TO KILL" (conc (args:get-arg "-m")" "kill-reason) #f) ;; BB ADDED kill-reason -- confirm OK with Matt
 		      )))
 	      (mutex-unlock! m)
-	      ;; no point in sticking around. Exit now.
+	      ;; no point in sticking around. Exit now. But run end of run before exiting?
+        (launch:end-of-run-check run-id)
 	      (exit)))
 	(if (hash-table-ref/default misc-flags 'keep-going #f)
 	    (begin
 	      (thread-sleep! 3) ;; (+ 3 (random 6))) ;; add some jitter to the call home time to spread out the db accesses
 	      (if (hash-table-ref/default misc-flags 'keep-going #f)  ;; keep originals for cpu-load and disk-free unless they change more than the allowed delta
-		  (loop (calc-minutes) (or new-cpu-load cpu-load) (or new-disk-free disk-free)))))))
-    (tests:update-central-meta-info run-id test-id (get-cpu-load) (get-df (current-directory))(calc-minutes) #f #f))) ;; NOTE: Checking twice for keep-going is intentional
+		  (loop (calc-minutes)
+                        (or new-cpu-load cpu-load)
+                        (or new-disk-free disk-free)
+                        (if do-sync (current-seconds) last-sync)))))))
+    (tests:update-central-meta-info run-id test-id (get-cpu-load) (get-df (current-directory))(calc-minutes) #f #f update-db: #t))) ;; NOTE: Checking twice for keep-going is intentional
 
 
 (define (launch:execute encoded-cmd)
   (let* ((cmdinfo    (common:read-encoded-string encoded-cmd))
 	 (tconfigreg #f))
@@ -414,10 +329,11 @@
 	       (top-path  (assoc/default 'toppath   cmdinfo))
 	       (work-area (assoc/default 'work-area cmdinfo))  ;; work-area is the test run area
 	       (test-name (assoc/default 'test-name cmdinfo))
 	       (runscript (assoc/default 'runscript cmdinfo))
 	       (ezsteps   (assoc/default 'ezsteps   cmdinfo))
+	       (subrun    (assoc/default 'subrun    cmdinfo))
 	       ;; (runremote (assoc/default 'runremote cmdinfo))
 	       ;; (transport (assoc/default 'transport cmdinfo))  ;; not used
 	       ;; (serverinf (assoc/default 'serverinf cmdinfo))
 	       ;; (port      (assoc/default 'port      cmdinfo))
 	       (serverurl (assoc/default 'serverurl cmdinfo))
@@ -439,98 +355,92 @@
 	       (keyvals   #f)
 	       (fullrunscript (if (not runscript)
                                   #f
                                   (if (substring-index "/" runscript)
                                       runscript ;; use unadultered if contains slashes
-                                      (let ((fulln (conc testpath "/" runscript)))
-	                                  (if (and (file-exists? fulln)
+                                      (let ((fulln (conc work-area "/" runscript)))
+	                                  (if (and (common:file-exists? fulln)
                                                    (file-execute-access? fulln))
                                               fulln
                                               runscript))))) ;; assume it is on the path
-	       ) ;; (rollup-status 0)
+               (check-work-area           (lambda ()
+                                            ;; NFS might not have propagated the directory meta data to the run host - give it time if needed
+                                            (let loop ((count 0))
+                                              (if (or (common:directory-exists? work-area)
+                                                      (> count 10))
+                                                  (change-directory work-area)
+                                                  (begin
+                                                    (debug:print 0 *default-log-port* "INFO: Not starting job yet - directory " work-area " not found")
+                                                    (thread-sleep! 10)
+                                                    (loop (+ count 1)))))
+
+                                            (if (not (string=?  (common:real-path work-area)(common:real-path (current-directory))))
+                                                (begin
+                                                  (debug:print 0 *default-log-port*
+                                                               "INFO: we are expecting to be in directory " work-area "\n"
+                                                               "     but we are actually in the directory " (current-directory) "\n"
+                                                               "     doing another change dir.")
+                                                  (change-directory work-area)))
+                                            
+                                            ;; spot check that the files in testpath are available. Too often NFS delays cause problems here.
+                                            (let ((files      (glob (conc testpath "/*")))
+                                                  (bad-files '()))
+                                              (for-each
+                                               (lambda (fullname)
+                                                 (let* ((fname (pathname-strip-directory fullname))
+                                                        (targn (conc work-area "/" fname)))
+                                                   (if (not (file-exists? targn))
+                                                       (set! bad-files (cons fname bad-files)))))
+                                               files)
+                                              (if (not (null? bad-files))
+                                                  (begin
+                                                    (debug:print 0 *default-log-port* "INFO: test data from " testpath " not copied properly or filesystem problems causing data to not be found. Re-running the copy command.")
+                                                    (debug:print 0 *default-log-port* "INFO: missing files from " work-area ": " (string-intersperse bad-files ", "))
+                                                    (launch:test-copy testpath work-area))))
+                                            ;; one more time, change to the work-area directory
+                                            (change-directory work-area)))
+	       ) ;; let*
+
+	  (if contour (setenv "MT_CONTOUR" contour))
+	  
+	  ;; immediated set some key variables from CMDINFO data, yes, these will be set again below ...
+	  ;;
+	  (setenv "MT_TESTSUITENAME" areaname)
+	  (setenv "MT_RUN_AREA_HOME" top-path)
+	  (set! *toppath* top-path)
+          (change-directory *toppath*) ;; temporarily switch to the run area home
+	  (setenv "MT_TEST_RUN_DIR"  work-area)
+
+	  (launch:setup) ;; should be properly in the run area home now
 
 	  (if contour (setenv "MT_CONTOUR" contour))
 	  
 	  ;; immediated set some key variables from CMDINFO data, yes, these will be set again below ...
 	  ;;
 	  (setenv "MT_TESTSUITENAME" areaname)
 	  (setenv "MT_RUN_AREA_HOME" top-path)
 	  (set! *toppath* top-path)
+          (change-directory *toppath*) ;; temporarily switch to the run area home
 	  (setenv "MT_TEST_RUN_DIR"  work-area)
 
-	  ;; On NFS it can be slow and unreliable to get needed startup information.
-	  ;;  i. Check if we are on the homehost, if so, proceed
-	  ;; ii. Check if host and port passed in via CMDINFO are valid and if
-	  ;;     possible use them.
-	  (let ((bestadrs (server:get-best-guess-address (get-host-name)))
-		(needcare #f))
-	    (if (equal? homehost bestadrs) ;; we are likely on the homehost
-		(debug:print-info 0 *default-log-port* "test " test-name " appears to be running on the homehost " homehost)
-		(let ((host-port (if serverurl (string-split serverurl ":") #f)))
-		  (if (not *runremote*)(set! *runremote* (make-remote))) ;; init *runremote*
-		  (if (string? homehost)
-		      (if (and host-port
-			       (> (length host-port) 1))
-			  (let* ((host      (car host-port))
-                                 (port      (cadr host-port))
-                                 (start-res (http-transport:client-connect host port))
-                                 (ping-res  (rmt:login-no-auto-client-setup start-res)))
-			    (if (and start-res
-				     ping-res)
-				;; (begin ;; let ((url  (http-transport:server-dat-make-url start-res)))
-				(begin
-				  (remote-conndat-set! *runremote* start-res)
-				  ;; (remote-server-url-set! *runremote* url)
-				  ;; (if (server:ping url)
-				  (debug:print-info 0 *default-log-port* "connected to " host ":" port " using CMDINFO data."))
-				(begin
-				  (debug:print-info 0 *default-log-port* "have CMDINFO data but failed to connect to " host ":" port)
-				  (set! *runremote* #f))
-				  ;; (remote-conndat-set! *runremote* #f))
-				))
-			  (begin
-			    (set! *runremote* #f)
-			    (debug:print-info 0 *default-log-port* (if host-port
-								       (conc "received invalid host-port information " host-port)
-								       "no host-port information received"))
-			    ;; potential for bad situation if simultaneous starting of hundreds of jobs on servers, set needcare.
-			    (set! needcare #t)))
-		      (begin
-			(set! *runremote* #f)
-			(debug:print-info 0 *default-log-port* "received no homehost information. Please report this to support as it should not happen.")
-			(set! needcare #t)))))
-	    (if needcare  ;; due to very slow NFS we will do a brute force mkdir to ensure that the directory inode it truly available on this host
-		(let ((logdir (conc top-path "/logs"))) ;; we'll try to create this directory
-		  (handle-exceptions
-		      exn
-		      (debug:print 0 *default-log-port* "Failed to create directory " logdir " expect problems, message: " ((condition-property-accessor 'exn 'message) exn))
-		    (create-directory logdir #t)))))
-		  
-	  ;; NFS might not have propagated the directory meta data to the run host - give it time if needed
-	  (let loop ((count 0))
-	    (if (or (file-exists? top-path)
-		    (> count 10))
-		(change-directory top-path)
-		(begin
-		  (debug:print 0 *default-log-port* "INFO: Not starting job yet - directory " top-path " not found")
-		  (thread-sleep! 10)
-		  (loop (+ count 1)))))
-	  (launch:setup) ;; should be properly in the top-path now
-	  (set! tconfigreg (tests:get-all))
+	  (launch:setup) ;; should be properly in the run area home now
+          
+	  (set! tconfigreg (tests:get-all)) ;; mapping of testname => test source path
 	  (let ((sighand (lambda (signum)
 			   ;; (signal-mask! signum) ;; to mask or not? seems to cause issues in exiting
 			   (if (eq? signum signal/stop)
 			       (debug:print-error 0 *default-log-port* "attempt to STOP process. Exiting."))
 			   (set! *time-to-exit* #t)
-			   (print "Received signal " signum ", cleaning up before exit. Please wait...")
+			   (print "Received signal " signum ", cleaning up before exit (set this test to COMPLETED/ABORT) . Please wait...")
 			   (let ((th1 (make-thread (lambda ()
-						     (rmt:test-set-state-status run-id test-id "INCOMPLETE" "KILLED" #f)
+                                                     (print "set test to COMPLETED/ABORT begin.")
+						     (rmt:test-set-state-status run-id test-id "COMPLETED" "ABORT" "received kill signal")
+                                                     (print "set test to COMPLETED/ABORT complete.")
 						     (print "Killed by signal " signum ". Exiting")
-						     (thread-sleep! 1)
 						     (exit 1))))
 				 (th2 (make-thread (lambda ()
-						     (thread-sleep! 2)
+						     (thread-sleep! 20)
 						     (debug:print 0 *default-log-port* "Done")
 						     (exit 4)))))
 			     (thread-start! th2)
 			     (thread-start! th1)
 			     (thread-join! th2)))))
@@ -539,43 +449,69 @@
 	    ) ;; (set-signal-handler! signal/stop sighand)
 	  
 	  ;; Do not run the test if it is REMOVING, RUNNING, KILLREQ or REMOTEHOSTSTART,
 	  ;; Mark the test as REMOTEHOSTSTART *IMMEDIATELY*
 	  ;;
-	  (let* ((test-info (rmt:get-test-info-by-id run-id test-id))
-		 (test-host (db:test-get-host        test-info))
+	  (let* ((test-info (let loop ((tries 0))
+			      (let ((tinfo (rmt:get-test-info-by-id run-id test-id)))
+				(if tinfo
+				    tinfo
+				    (if (> tries 5)
+					#f
+					(begin
+					  (thread-sleep! (+ 1 (* tries 10)))
+					  (loop (+ tries 1))))))))
+		 (test-host (if test-info
+				(db:test-get-host        test-info)
+				(begin
+				  (debug:print 0 *default-log-port* "ERROR: failed to find a record for test-id " test-id ", exiting.")
+				  (exit))))
 		 (test-pid  (db:test-get-process_id  test-info)))
 	    (cond
-	     ((member (db:test-get-state test-info) '("INCOMPLETE" "KILLED" "UNKNOWN" "KILLREQ" "STUCK")) ;; prior run of this test didn't complete, go ahead and try to rerun
+             ;; -mrw- I'm removing KILLREQ from this list so that a test in KILLREQ state is treated as a "do not run" flag.
+	     ;;((or (member (db:test-get-state test-info) '("INCOMPLETE" "KILLED" "UNKNOWN" "STUCK")) ;; prior run of this test didn't complete, go ahead and try to rerun
+	     ;;	  (and (equal? (db:test-get-state test-info) "COMPLETED")                           ;; completed/abort => rerun if asked
+	     ;;	       (member (db:test-get-status test-info) '("ABORT"))))
+	     ((member (db:test-get-state test-info) '("INCOMPLETE" "KILLED" "UNKNOWN" "STUCK")) ;; prior run of this test didn't complete, go ahead and try to rerun
 	      (debug:print 0 *default-log-port* "INFO: test is INCOMPLETE or KILLED, treat this execute call as a rerun request")
 	      ;; (tests:test-force-state-status! run-id test-id "REMOTEHOSTSTART" "n/a")
-	      (rmt:test-set-state-status run-id test-id "REMOTEHOSTSTART" "n/a" #f)
+
+              (rmt:general-call 'set-test-start-time #f test-id)
+              (rmt:test-set-state-status run-id test-id "REMOTEHOSTSTART" "n/a" #f)
 	      ) ;; prime it for running
 	     ((member (db:test-get-state test-info) '("RUNNING" "REMOTEHOSTSTART"))
 	      (if (process:alive-on-host? test-host test-pid)
 		  (debug:print-error 0 *default-log-port* "test state is "  (db:test-get-state test-info) " and process " test-pid " is still running on host " test-host ", cannot proceed")
-		  ;; (tests:test-force-state-status! run-id test-id "REMOTEHOSTSTART" "n/a")
-		  (rmt:test-set-state-status run-id test-id "REMOTEHOSTSTART" "n/a" #f)
-		  ))
+		  (exit)))
+	     ((member (db:test-get-state test-info) '("COMPLETED"))  ;; we do NOT want to re-run COMPLETED jobs. Mark as NOT_STARTED to run!
+	      (debug:print-error 0 *default-log-port* "test state is " (db:test-get-state test-info) ", cannot proceed")
+	      (exit))
 	     ((not (member (db:test-get-state test-info) '("REMOVING" "REMOTEHOSTSTART" "RUNNING" "KILLREQ")))
 	      ;; (tests:test-force-state-status! run-id test-id "REMOTEHOSTSTART" "n/a")
-	      (rmt:test-set-state-status run-id test-id "REMOTEHOSTSTART" "n/a" #f)
-	      )
+              (rmt:general-call 'set-test-start-time #f test-id)
+	      (rmt:test-set-state-status run-id test-id "REMOTEHOSTSTART" "n/a" #f))
 	     (else ;; (member (db:test-get-state test-info) '("REMOVING" "REMOTEHOSTSTART" "RUNNING" "KILLREQ"))
 	      (debug:print-error 0 *default-log-port* "test state is " (db:test-get-state test-info) ", cannot proceed")
 	      (exit))))
-	  
-	  (debug:print 2 *default-log-port* "Exectuing " test-name " (id: " test-id ") on " (get-host-name))
+
+          ;; cleanup prior execution's steps
+          (rmt:delete-steps-for-test! run-id test-id)
+          
+	  (debug:print 2 *default-log-port* "Executing " test-name " (id: " test-id ") on " (get-host-name))
 	  (set! keys       (rmt:get-keys))
 	  ;; (runs:set-megatest-env-vars run-id inkeys: keys inkeyvals: keyvals) ;; these may be needed by the launching process
 	  ;; one of these is defunct/redundant ...
-	  (if (not (launch:setup force: #t))
+	  (if (not (launch:setup force-reread: #t))
 	      (begin
 		(debug:print 0 *default-log-port* "Failed to setup, exiting") 
 		;; (sqlite3:finalize! db)
 		;; (sqlite3:finalize! tdb)
 		(exit 1)))
+          ;; validate that the test run area is available
+          (check-work-area)
+          
+          ;; still need to go back to run area home for next couple steps
 	  (change-directory *toppath*) 
 
 	  ;; NOTE: Current order is to process runconfigs *before* setting the MT_ vars. This 
 	  ;;       seems non-ideal but could well break stuff
 	  ;;    BUG? BUG? BUG?
@@ -583,31 +519,36 @@
 	  (let ((rconfig (full-runconfigs-read)) ;; (read-config (conc  *toppath* "/runconfigs.config") #f #t sections: (list "default" target))))
 		(wconfig (read-config "waivers.config" #f #t sections: `( "default" ,target )))) ;; read the waivers config if it exists
 	    ;; (setup-env-defaults (conc *toppath* "/runconfigs.config") run-id (make-hash-table) keyvals target)
 	    ;; (set-run-config-vars run-id keyvals target) ;; (db:get-target db run-id))
 	    ;; Now have runconfigs data loaded, set environment vars
-	    (for-each (lambda (section)
-			(for-each (lambda (varval)
-				    (let ((var (car varval))
-					  (val (cadr varval)))
-				      (if (and (string? var)(string? val))
-					  (begin
-					    (setenv var (config:eval-string-in-environment val))) ;; val)
-					  (debug:print-error 0 *default-log-port* "bad variable spec, " var "=" val))))
-				  (configf:get-section rconfig section)))
-		      (list "default" target)))
+	    (for-each
+	     (lambda (section)
+	       (for-each
+		(lambda (varval)
+		  (let ((var (car varval))
+			(val (cadr varval)))
+		    (if (and (string? var)(string? val))
+			(begin
+			  (safe-setenv var (config:eval-string-in-environment val))) ;; val)
+			(debug:print-error 0 *default-log-port* "bad variable spec, " var "=" val))))
+		(configf:get-section rconfig section)))
+	     (list "default" target)))
           ;;(bb-check-path msg: "launch:execute post block 1")
 
 	  ;; NFS might not have propagated the directory meta data to the run host - give it time if needed
 	  (let loop ((count 0))
-	    (if (or (file-exists? work-area)
+	    (if (or (common:file-exists? work-area)
 		    (> count 10))
 		(change-directory work-area)
 		(begin
 		  (debug:print 0 *default-log-port* "INFO: Not starting job yet - directory " work-area " not found")
 		  (thread-sleep! 10)
 		  (loop (+ count 1)))))
+
+          ;; now we can switch to the work-area?
+          (change-directory work-area)
           ;;(bb-check-path msg: "launch:execute post block 1.5")
 	  ;; (change-directory work-area) 
 	  (set! keyvals    (keys:target->keyval keys target))
 	  ;; apply pre-overrides before other variables. The pre-override vars must not
 	  ;; clobbers things from the official sources such as megatest.config and runconfigs.config
@@ -656,11 +597,18 @@
           ;;(bb-check-path msg: "launch:execute post block 41")
 	  (runs:set-megatest-env-vars run-id inkeys: keys inkeyvals: keyvals)
           ;;(bb-check-path msg: "launch:execute post block 42")
 	  (set-item-env-vars itemdat)
           ;;(bb-check-path msg: "launch:execute post block 43")
-	  (save-environment-as-files "megatest")
+          (let ((blacklist (configf:lookup *configdat* "setup" "blacklistvars")))
+            (if blacklist
+		(let ((vars (string-split blacklist)))
+		  (save-environment-as-files "megatest" ignorevars: vars)
+		  (for-each (lambda (var)
+			      (unsetenv var))
+			    vars))
+                (save-environment-as-files "megatest")))
           ;;(bb-check-path msg: "launch:execute post block 44")
 	  ;; open-run-close not needed for test-set-meta-info
 	  ;; (tests:set-full-meta-info #f test-id run-id 0 work-area)
 	  ;; (tests:set-full-meta-info test-id run-id 0 work-area)
 	  (tests:set-full-meta-info #f test-id run-id 0 work-area 10)
@@ -668,18 +616,40 @@
 	  ;; (thread-sleep! 0.3) ;; NFS slowness has caused grief here
 
 	  (if (args:get-arg "-xterm")
 	      (set! fullrunscript "xterm")
 	      (if (and fullrunscript 
-		       (file-exists? fullrunscript)
+		       (common:file-exists? fullrunscript)
 		       (not (file-execute-access? fullrunscript)))
 		  (system (conc "chmod ug+x " fullrunscript))))
 
 	  ;; We are about to actually kick off the test
 	  ;; so this is a good place to remove the records for 
 	  ;; any previous runs
 	  ;; (db:test-remove-steps db run-id testname itemdat)
+	  ;; now is also a good time to write the .testconfig file
+	  (let* ((tconfig-fname   (conc work-area "/.testconfig"))
+		 (tconfig-tmpfile (conc tconfig-fname ".tmp"))
+		 (tconfig         (tests:get-testconfig test-name item-path tconfigreg #t force-create: #t)) ;; 'return-procs)))
+		 (scripts (configf:get-section tconfig "scripts")))
+	    ;; create .testconfig file
+	    (configf:write-alist tconfig tconfig-tmpfile)
+	    (file-move tconfig-tmpfile tconfig-fname #t)
+	    (delete-file* ".final-status")
+
+	    ;; extract scripts from testconfig and write them to files in test run dir
+	    (for-each
+	     (lambda (scriptdat)
+	       (match scriptdat
+		      ((name content)
+		       (with-output-to-file name
+			 (lambda ()
+			   (print content)
+			   (change-file-mode name (bitwise-ior perm/irwxg perm/irwxu)))))
+		      (else
+		       (debug:print-info 0 "Invalid script definiton found in [scripts] section of testconfig. \"" scriptdat "\""))))
+	     scripts))
 	  ;; 
 	  (let* ((m            (make-mutex))
 		 (kill-job?    #f)
 		 (exit-info    (make-launch:einf pid: #t exit-status: #t exit-code: #t rollup-status: 0)) ;; pid exit-status exit-code (i.e. process was successfully run) rollup-status
 		 (job-thread   #f)
@@ -686,11 +656,11 @@
 		 ;; (keep-going   #t)
 		 (misc-flags   (let ((ht (make-hash-table)))
 				 (hash-table-set! ht 'keep-going #t)
 				 ht))
 		 (runit        (lambda ()
-				 (launch:manage-steps run-id test-id item-path fullrunscript ezsteps test-name tconfigreg exit-info m)))
+				 (launch:manage-steps run-id test-id item-path fullrunscript ezsteps subrun test-name tconfigreg exit-info m)))
 		 (monitorjob   (lambda ()
 				 (launch:monitor-job  run-id test-id item-path fullrunscript ezsteps test-name tconfigreg exit-info m work-area runtlim misc-flags)))
 		 (th1          (make-thread monitorjob "monitor job"))
 		 (th2          (make-thread runit "run job")))
 	    (set! job-thread th2)
@@ -706,12 +676,11 @@
 		   ;; only state and status needed - use lazy routine
 		   (testinfo  (rmt:get-testinfo-state-status run-id test-id)))
 	      ;; Am I completed?
 	      (if (member (db:test-get-state testinfo) '("REMOTEHOSTSTART" "RUNNING")) ;; NOTE: It should *not* be REMOTEHOSTSTART but for reasons I don't yet understand it sometimes gets stuck in that state ;; (not (equal? (db:test-get-state testinfo) "COMPLETED"))
 		  (let ((new-state  (if kill-job? "KILLED" "COMPLETED") ;; (if (eq? (vector-ref exit-info 2) 0) ;; exited with "good" status
-				                                        ;; "COMPLETED"
-							                ;; (db:test-get-state testinfo)))   ;; else preseve the state as set within the test
+				                                        ;; "COMPLETED"							                ;; (db:test-get-state testinfo)))   ;; else preseve the state as set within the test
 				    )
 			(new-status (cond
 				     ((not (launch:einf-exit-status exit-info)) "FAIL") ;; job failed to run ... (vector-ref exit-info 1)
 				     ((eq? (launch:einf-rollup-status exit-info) 0)     ;; (vector-ref exit-info 3)
 				      ;; if the current status is AUTO then defer to the calculated value (i.e. leave this AUTO)
@@ -724,10 +693,14 @@
 				     ((eq? (launch:einf-rollup-status exit-info) 4) "WAIVED")
 				     ((eq? (launch:einf-rollup-status exit-info) 5) "ABORT")
 				     ((eq? (launch:einf-rollup-status exit-info) 6) "SKIP")
 				     (else "FAIL")))) ;; (db:test-get-status testinfo)))
 		    (debug:print-info 1 *default-log-port* "Test exited in state=" (db:test-get-state testinfo) ", setting state/status based on exit code of " (launch:einf-exit-status exit-info) " and rollup-status of " (launch:einf-rollup-status exit-info))
+   
+        ;; Leave a .final-status file for each sub-test
+        (tests:save-final-status run-id test-id)
+
 		    (tests:test-set-status! run-id 
 					    test-id 
 					    new-state
 					    new-status
 					    (args:get-arg "-m") #f)
@@ -734,19 +707,113 @@
 		    ;; need to update the top test record if PASS or FAIL and this is a subtest
 		    ;; NO NEED TO CALL set-state-status-and-roll-up-items HERE, THIS IS DONE IN set-state-status-and-roll-up-items called by tests:test-set-status!
 		    ))
 	      ;; for automated creation of the rollup html file this is a good place...
 	      (if (not (equal? item-path ""))
-		  (tests:summarize-items run-id test-id test-name #f))
+		      (tests:summarize-items run-id test-id test-name #f))
 	      (tests:summarize-test run-id test-id)  ;; don't force - just update if no
+        ;; Leave a .final-status file for the top level test
+        (tests:save-final-status run-id test-id)
 	      (rmt:update-run-stats run-id (rmt:get-raw-run-stats run-id)))
 	    (mutex-unlock! m)
+            (launch:end-of-run-check run-id )
 	    (debug:print 2 *default-log-port* "Output from running " fullrunscript ", pid " (launch:einf-pid exit-info) " in work area " 
 			 work-area ":\n====\n exit code " (launch:einf-exit-code exit-info) "\n" "====\n")
 	    (if (not (launch:einf-exit-status exit-info))
-		(exit 4)))))))
+		(exit 4))))
+        )))
+
+;; Spec for End of test
+;; At end of each test call, after marking self as COMPLETED do run-state-status-rollup
+;; At transition to run COMPLETED/X do hooks
+;; Definition: test_dead if event_time + duration + 1 minute? < current_time AND
+;; we can prove the process is not alive (ssh host pstree -A pid)
+;; if dead safe to mark the test as killed in the db
+;; State/status table
+;; new
+;; 100% COMPLETED/ (PASS,FAIL,ABORT etc.) ==> COMPLETED / X where X is same as itemized rollup
+;; > 3 RUNNING with not test_dead do nothing (run should already be RUNNING/ na
+;; > 0 RUNNING and test_dead then send KILLREQ ==> COMPLETED
+;; 0 RUNNING ==> this is actually the first condition, should not get here
+
+(define (launch:end-of-run-check run-id )
+    (let* ((not-completed-cnt (rmt:get-not-completed-cnt run-id))  
+           (running-cnt (rmt:get-count-tests-running-for-run-id run-id))
+           (all-test-launched (rmt:get-var (conc "lunch-complete-" run-id)))
+           (current-state (rmt:get-run-state run-id))
+           (current-status (rmt:get-run-status run-id)))
+     ;;get-vars run-id to query metadata table to check if all completed. if all-test-launched = yes then only not-completed-cnt = 0 means everyting is completed if no entry found in the table do nothing 
+     (debug:print 0 *default-log-port* "Running test cnt :" running-cnt)                      
+     (rmt:set-state-status-and-roll-up-run  run-id current-state current-status)
+     (runs:update-junit-test-reporter-xml run-id) 
+     (cond 
+       ((and all-test-launched (eq? not-completed-cnt 0) (equal? all-test-launched "yes" ))
+                (if (and (equal? (rmt:get-var (conc "end-of-run-" run-id)) "no") (common:simple-lock (conc "endOfRun" run-id)))
+                (begin
+           	(debug:print 4 *default-log-port* "look for  post hook. currseconds: " (current-seconds) " EOR " (rmt:get-var (conc "end-of-run-" run-id)))
+                (debug:print 0 *default-log-port* "End of Run Detected.")
+                (rmt:set-var (conc "end-of-run-" run-id) "yes")
+                ;(thread-sleep! 10)
+          	(runs:run-post-hook run-id)
+                (debug:print 4 *default-log-port* "currseconds: " (current-seconds)" eor: " (rmt:get-var (conc "end-of-run-" run-id)))
+                (common:simple-unlock (conc "endOfRun" run-id)))
+                 (debug:print 0 *default-log-port* "End of Run Detected but not running post hook. This should happen when eor is set to yes. This will happen only when 2 tests exit at smae time. eor= " (rmt:get-var (conc "end-of-run-" run-id)))))
+        ((> running-cnt 3) 
+        	  (debug:print 0 *default-log-port* "There are " running-cnt " tests running." ))
+        ((> running-cnt 0)
+            (debug:print 0 *default-log-port* "running cnt > 0 but <= 3 kill-running-tests-if-dead" )
+   				  (let ((kill-cnt (launch:kill-tests-if-dead run-id)))
+           			(if (and all-test-launched  (equal? all-test-launched "yes") (eq? kill-cnt running-cnt))
+           					(launch:end-of-run-check run-id)))) ;;todo
+        (else  (debug:print 0 *default-log-port* "Should it get here?? May be everything is not launched yet. Running test cnt:" running-cnt " Not completed test cnt:" not-completed-cnt)
+         (let* ((not-completed-tests (rmt:get-tests-for-run run-id "%" `("NOT_STARTED" "RUNNING" "LAUNCHED" "REMOTEHOSTSTART") `() #f #f #f #f #f #f #f #f)))
+       (if (> (length not-completed-tests) 0) 
+           (let loop ((running-test (car not-completed-tests))
+			     (tal    (cdr not-completed-tests)))
+		       (let* ((test-name (vector-ref running-test 2))
+                 (item-path (vector-ref running-test 11)))
+			       	(debug:print 0 *default-log-port* "test " test-name "/" item-path " not completed")
+              (if (not (null? tal))
+				  (loop (car tal) (cdr tal)))))))))))        
+ 
+(define (launch:is-test-alive host pid)
+  (if (and host pid (not (equal? host "n/a")))
+      (let* ((is-local (equal? host (get-host-name)))
+	     (ssh-cmd   (if is-local " " (conc "ssh " host " ")))
+	     (cmd (conc ssh-cmd "pstree -A " pid))
+	     (output (with-input-from-pipe cmd read-lines)))
+	(debug:print 2 *default-log-port* "Running " cmd " received " output)
+	(if (eq? (length output) 0)
+	   #f
+	   #t))
+      #t))
+ 
+(define (launch:kill-tests-if-dead run-id)
+  (let* ((running-tests (rmt:get-tests-for-run run-id "%" `("RUNNING" "LAUNCHED" "REMOTEHOSTSTART") `() #f #f #f #f #f #f #f #f)))
+       (let loop ((running-test (car running-tests))
+			     (tal    (cdr running-tests))
+			     (kill-cnt 0))
+		       (let* ((test-name (vector-ref running-test 2))
+                 (item-path (vector-ref running-test 11))
+								 (test-id (vector-ref running-test 0))
+                 (host (vector-ref running-test 6))
+                 (pid  (rmt:test-get-top-process-pid run-id test-id))   
+                 (event-time (vector-ref running-test 5))
+                 (duration (vector-ref running-test 12))
+                 (flag 0)   
+                 (curr-time (current-seconds)))
+       (if (and (< (+ event-time duration 600) curr-time) (not (launch:is-test-alive host pid))) ;;test has not updated duration in last 10 min then likely its not running but confirm before marking it as killed
+           (begin    
+			       	(debug:print 0 *default-log-port* "test " test-name "/" item-path " needs to be killed")
+              (set! flag 1) 
+              (rmt:set-state-status-and-roll-up-items run-id test-name item-path "KILLREQ" "n/a" #f)))
+               (if (not (null? tal))
+				  (loop (car tal) (cdr tal) (+ kill-cnt flag))
+                 (+ kill-cnt flag))))))
 
+;; DO NOT USE - caching of configs is handled in launch:setup now.
+;;
 (define (launch:cache-config)
   ;; if we have a linktree and -runtests and -target and the directory exists dump the config
   ;; to megatest-(current-seconds).cfg and symlink it to megatest.cfg
   (if (and *configdat* 
 	   (or (args:get-arg "-run")
@@ -758,22 +825,22 @@
 			   (args:get-arg ":runname")
 			   (getenv "MT_RUNNAME")))
 	     (fulldir  (conc linktree "/"
 			     target "/"
 			     runname)))
-	(if (and linktree (file-exists? linktree)) ;; can't proceed without linktree
+	(if (and linktree (common:file-exists? linktree)) ;; can't proceed without linktree
 	    (begin
 	      (debug:print-info 0 *default-log-port* "Have -run with target=" target ", runname=" runname ", fulldir=" fulldir ", testpatt=" (or (args:get-arg "-testpatt") "%"))
-	      (if (not (file-exists? fulldir))
+	      (if (not (common:file-exists? fulldir))
 		  (create-directory fulldir #t)) ;; need to protect with exception handler 
 	      (if (and target
 		       runname
-		       (file-exists? fulldir))
+		       (common:file-exists? fulldir))
 		  (let ((tmpfile  (conc fulldir "/.megatest.cfg." (current-seconds)))
 			(targfile (conc fulldir "/.megatest.cfg-"  megatest-version "-" megatest-fossil-hash))
 			(rconfig  (conc fulldir "/.runconfig." megatest-version "-" megatest-fossil-hash)))
-		    (if (file-exists? rconfig) ;; only cache megatest.config AFTER runconfigs has been cached
+		    (if (common:file-exists? rconfig) ;; only cache megatest.config AFTER runconfigs has been cached
 			(begin
 			  (debug:print-info 0 *default-log-port* "Caching megatest.config in " tmpfile)
                           (if (not (common:in-running-test?))
                               (configf:write-alist *configdat* tmpfile))
 			  (system (conc "ln -sf " tmpfile " " targfile))))
@@ -794,61 +861,92 @@
 ;;   side effects:
 ;;     sets; *configdat*    (megatest.config info)
 ;;           *runconfigdat* (runconfigs.config info)
 ;;           *configstatus* (status of the read data)
 ;;
-(define (launch:setup #!key (force #f) (areapath #f))
+(define (launch:setup #!key (force-reread #f) (areapath #f))
   (mutex-lock! *launch-setup-mutex*)
   (if (and *toppath*
-	   (eq? *configstatus* 'fulldata)) ;; got it all
+	   (eq? *configstatus* 'fulldata) (not force-reread)) ;; got it all
       (begin
-	(debug:print 0 *default-log-port* "NOTE: skipping launch:setup-body call since we have fulldata")
+	(debug:print 2 *default-log-port* "NOTE: skipping launch:setup-body call since we have fulldata")
 	(mutex-unlock! *launch-setup-mutex*)
 	*toppath*)
-      (let ((res (launch:setup-body force: force areapath: areapath)))
+      (let ((res (launch:setup-body force-reread: force-reread areapath: areapath)))
 	(mutex-unlock! *launch-setup-mutex*)
 	res)))
+
+;; return paths depending on what info is available.
+;;
+(define (launch:get-cache-file-paths areapath toppath target mtconfig)
+  (let* ((use-cache (common:use-cache?))
+         (runname  (common:args-get-runname))
+         (linktree (common:get-linktree))
+         (testname (common:get-full-test-name))
+         (rundir   (if (and runname target linktree)
+                       (common:directory-writable? (conc linktree "/" target "/" runname))
+                       #f))
+         (testdir  (if (and rundir testname)
+                       (common:directory-writable? (conc rundir "/" testname))
+                       #f))
+         (cachedir (or testdir rundir))
+         (mtcachef (and cachedir (conc cachedir "/" ".megatest.cfg-"  megatest-version "-" megatest-fossil-hash)))
+         (rccachef (and cachedir (conc cachedir "/" ".runconfigs.cfg-"  megatest-version "-" megatest-fossil-hash))))
+    (debug:print-info 6 *default-log-port* 
+                      "runname=" runname 
+                      "\n  linktree=" linktree
+                      "\n  testname=" testname
+                      "\n  rundir=" rundir 
+                      "\n  testdir=" testdir 
+                      "\n  cachedir=" cachedir
+                      "\n  mtcachef=" mtcachef
+                      "\n  rccachef=" rccachef)
+    (cons mtcachef rccachef)))
 
 (define (launch:setup-body #!key (force-reread #f) (areapath #f))
   (if (and (eq? *configstatus* 'fulldata)
 	   *toppath*
 	   (not force-reread)) ;; no need to reprocess
       *toppath*   ;; return toppath
-      (let* ((use-cache (common:use-cache?))
-	     (toppath  (or *toppath* areapath (getenv "MT_RUN_AREA_HOME"))) ;; preserve toppath
-	     
-	     (runname  (common:args-get-runname))
+      (let* ((use-cache (common:use-cache?)) ;; BB- use-cache checks *configdat* for use-cache setting.  We do not have *configdat*.  Bootstrapping problem here.
+	     (toppath  (common:get-toppath areapath))
 	     (target   (common:args-get-target))
-	     (linktree (common:get-linktree))
-	     (contour  #f) ;; NOT READY FOR THIS (args:get-arg "-contour"))
 	     (sections (if target (list "default" target) #f)) ;; for runconfigs
 	     (mtconfig (or (args:get-arg "-config") "megatest.config")) ;; allow overriding megatest.config 
-	     (rundir   (if (and runname target linktree)
-			   (conc linktree (if contour (conc "/" contour) "") "/" target "/" runname)
-			   #f))
-             
-	     (mtcachef (and rundir (conc rundir "/" ".megatest.cfg-"  megatest-version "-" megatest-fossil-hash)))
-	     (rccachef (and rundir (conc rundir "/" ".runconfigs.cfg-"  megatest-version "-" megatest-fossil-hash)))
-	     (cancreate (and rundir (common:file-exists? rundir)(file-write-access? rundir) (not (common:in-running-test?)))))
-	;; (cxt       (hash-table-ref/default *contexts* toppath #f)))
-
-	;; create our cxt for this area if it doesn't already exist
-	;; (if (not cxt)(hash-table-set! *contexts* toppath (make-cxt)))
-	
-	;; (print "runname: " runname " target: " target " mtcachef: " mtcachef " rccachef: " rccachef)
+             (cachefiles (launch:get-cache-file-paths areapath toppath target mtconfig))
+	     ;; checking for null cachefiles should not be necessary, I was seeing error car of '(), might be a chicken bug or a red herring ...
+	     (mtcachef   (if (null? cachefiles)
+			     #f
+			     (car cachefiles))) ;; (and cachedir (conc cachedir "/" ".megatest.cfg-"  megatest-version "-" megatest-fossil-hash)))
+	     (rccachef   (if (null? cachefiles)
+			     #f
+			     (cdr cachefiles)))) ;; (and cachedir (conc cachedir "/" ".runconfigs.cfg-"  megatest-version "-" megatest-fossil-hash)))
+	      ;; (cancreate (and cachedir (common:file-exists? cachedir)(file-write-access? cachedir) (not (common:in-running-test?)))))
 	(set! *toppath* toppath) ;; This is needed when we are running as a test using CMDINFO as a datasource
+        ;;(BB> "launch:setup-body -- cachefiles="cachefiles)
 	(cond
 	 ;; if mtcachef exists just read it, however we need to assume toppath is available in $MT_RUN_AREA_HOME
-	 ((and mtcachef (common:file-exists? mtcachef) (get-environment-variable "MT_RUN_AREA_HOME") use-cache)
-	  (set! *configdat*    (configf:read-alist mtcachef))
+	 ((and (not force-reread)
+	       mtcachef  rccachef
+	       use-cache
+	       (get-environment-variable "MT_RUN_AREA_HOME")
+	       (common:file-exists? mtcachef)
+	       (common:file-exists? rccachef))
+          ;;(BB> "launch:setup-body -- cond branch 1 - use-cache")
+          (set! *configdat*    (configf:read-alist mtcachef))
+          ;;(BB> "launch:setup-body -- 1 set! *configdat*="*configdat*)
 	  (set! *runconfigdat* (configf:read-alist rccachef))
 	  (set! *configinfo*   (list *configdat*  (get-environment-variable "MT_RUN_AREA_HOME")))
 	  (set! *configstatus* 'fulldata)
 	  (set! *toppath*      (get-environment-variable "MT_RUN_AREA_HOME"))
 	  *toppath*)
+	 ;; there are no existing cached configs, do full reads of the configs and cache them
 	 ;; we have all the info needed to fully process runconfigs and megatest.config
-	 (mtcachef              
+	 ((and ;; (not force-reread) ;; force-reread is irrelevant in the AND, could however OR it?
+	       mtcachef
+	       rccachef) ;; BB- why are we doing this without asking if caching is desired?
+          ;;(BB> "launch:setup-body -- cond branch 2")
 	  (let* ((first-pass    (find-and-read-config        ;; NB// sets MT_RUN_AREA_HOME as side effect
 				 mtconfig
 				 environ-patt: "env-override"
 				 given-toppath: toppath
 				 pathenvvar: "MT_RUN_AREA_HOME"))
@@ -863,21 +961,24 @@
 				   *runconfigdat* #t 
 				   sections: sections))))
 	    (set! *runconfigdat* first-rundat)
 	    (if first-pass  ;; 
 		(begin
+                  ;;(BB> "launch:setup-body -- \"first-pass\"=first-pass")
 		  (set! *configdat*  (car first-pass))
+                  ;;(BB> "launch:setup-body -- 2 set! *configdat*="*configdat*)
 		  (set! *configinfo* first-pass)
 		  (set! *toppath*    (or toppath (cadr first-pass))) ;; use the gathered data unless already have it
 		  (set! toppath      *toppath*)
 		  (if (not *toppath*)
 		      (begin
 			(debug:print-error 0 *default-log-port* "you are not in a megatest area!")
 			(exit 1)))
 		  (setenv "MT_RUN_AREA_HOME" *toppath*)
 		  ;; the seed read is done, now read runconfigs, cache it then read megatest.config one more time and cache it
-		  (let* ((keys         (rmt:get-keys))
+		  (let* ((keys         (common:list-or-null (rmt:get-keys)
+							    message: "Failed to retrieve keys in launch.scm. Please report this to the developers."))
 			 (key-vals     (keys:target->keyval keys target))
 			 (linktree     (common:get-linktree)) ;; (or (getenv "MT_LINKTREE")(if *configdat* (configf:lookup *configdat* "setup" "linktree") #f)))
 					;     (if *configdat*
 					; 	   (configf:lookup *configdat* "setup" "linktree")
 					; 	   (conc *toppath* "/lt"))))
@@ -889,26 +990,45 @@
 			 (runconfigdat (begin     ;; this read of the runconfigs will see any adjustments made by re-reading megatest.config
 					 (for-each (lambda (kt)
 						     (setenv (car kt) (cadr kt)))
 						   key-vals)
 					 (read-config (conc toppath "/runconfigs.config") *runconfigdat* #t ;; consider using runconfig:read some day ...
-						      sections: sections))))
-		    (if cancreate (configf:write-alist runconfigdat rccachef))
+						      sections: sections)))
+                         (cachefiles   (launch:get-cache-file-paths areapath toppath target mtconfig))
+                         (mtcachef     (car cachefiles))
+                         (rccachef     (cdr cachefiles)))
+                    ;;  trap exception due to stale NFS handle -- Error: (open-output-file) cannot open file - Stale NFS file handle: "/p/fdk/gwa/lefkowit/mtTesting/qa/primbeqa/links/p1222/11/PDK_r1.1.1/prim/clean/pcell_testgen/.runconfigs.cfg-1.6427-7d1e789cb3f62f9cde719a4865bb51b3c17ea853" - ticket 220546342
+                    ;; TODO - consider 1) using simple-lock to bracket cache write
+                    ;;                 2) cache in hash on server, since need to do rmt: anyway to lock.
+
+		    (if rccachef
+                        (common:fail-safe
+                         (lambda ()
+                           (configf:write-alist runconfigdat rccachef))
+                         (conc "Could not write cache file - "rccachef)))
+                    (if mtcachef
+                        (common:fail-safe
+                         (lambda ()
+                           (configf:write-alist *configdat* mtcachef))
+                         (conc "Could not write cache file - "mtcachef)))
 		    (set! *runconfigdat* runconfigdat)
-		    (if cancreate (configf:write-alist *configdat* mtcachef))
-		    (if cancreate (set! *configstatus* 'fulldata))))
+		    (if (and rccachef mtcachef) (set! *configstatus* 'fulldata))))
 		;; no configs found? should not happen but let's try to recover gracefully, return an empty hash-table
 		(set! *configdat* (make-hash-table))
 		)))
+
 	 ;; else read what you can and set the flag accordingly
+	 ;; here we don't have either mtconfig or rccachef
 	 (else
+          ;;(BB> "launch:setup-body -- cond branch 3 - else")
 	  (let* ((cfgdat   (find-and-read-config 
 			    (or (args:get-arg "-config") "megatest.config")
 			    environ-patt: "env-override"
 			    given-toppath: (get-environment-variable "MT_RUN_AREA_HOME")
 			    pathenvvar: "MT_RUN_AREA_HOME")))
-	    (if cfgdat
+
+            (if (and cfgdat (list? cfgdat) (> (length cfgdat) 0) (hash-table? (car cfgdat)))
 		(let* ((toppath  (or (get-environment-variable "MT_RUN_AREA_HOME")(cadr cfgdat)))
 		       (rdat     (read-config (conc toppath  ;; convert this to use runconfig:read!
 						    "/runconfigs.config") *runconfigdat* #t sections: sections)))
 		  (set! *configinfo*   cfgdat)
 		  (set! *configdat*    (car cfgdat))
@@ -916,30 +1036,33 @@
 		  (set! *toppath*      toppath)
 		  (set! *configstatus* 'partial))
 		(begin
 		  (debug:print-error 0 *default-log-port* "No " mtconfig " file found. Giving up.")
 		  (exit 2))))))
+	;; COND ends here.
+	
 	;; additional house keeping
-	(let* ((linktree (common:get-linktree)))
+	(let* ((linktree (or (common:get-linktree)
+			     (conc *toppath* "/lt"))))
 	  (if linktree
 	      (begin
 		(if (not (common:file-exists? linktree))
 		    (begin
 		      (handle-exceptions
 			  exn
 			  (begin
 			    (debug:print-error 0 *default-log-port* "Something went wrong when trying to create linktree dir at " linktree)
-			    (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn))
+			    (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn) ", exn=" exn)
 			    (exit 1))
 			(create-directory linktree #t))))
 		(handle-exceptions
 		    exn
 		    (begin
 		      (debug:print-error 0 *default-log-port* "Something went wrong when trying to create link to linktree at " *toppath*)
-		      (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn)))
+		      (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn) ", exn=" exn))
 		  (let ((tlink (conc *toppath* "/lt")))
-		    (if (not (file-exists? tlink))
+		    (if (not (common:file-exists? tlink))
 			(create-symbolic-link linktree tlink)))))
 	      (begin
 		(debug:print-error 0 *default-log-port* "linktree not defined in [setup] section of megatest.config")
 		)))
 	(if (and *toppath*
@@ -947,20 +1070,43 @@
 	    (begin
 	      (setenv "MT_RUN_AREA_HOME" *toppath*)
 	      (setenv "MT_TESTSUITENAME" (common:get-testsuite-name)))
 	    (begin
 	      (debug:print-error 0 *default-log-port* "failed to find the top path to your Megatest area.")
-	      ;;(exit 1)
 	      (set! *toppath* #f) ;; force it to be false so we return #f
-	      #f
-	      ))
+	      #f))
+	
+        ;; one more attempt to cache the configs for future reading
+        (let* ((cachefiles   (launch:get-cache-file-paths areapath toppath target mtconfig))
+               (mtcachef     (car cachefiles))
+               (rccachef     (cdr cachefiles)))
+
+          ;; trap exception due to stale NFS handle -- Error: (open-output-file) cannot open file - Stale NFS file handle: "...somepath.../.runconfigs.cfg-1.6427-7d1e789cb3f62f9cde719a4865bb51b3c17ea853" - ticket 220546342
+          ;; TODO - consider 1) using simple-lock to bracket cache write
+          ;;                 2) cache in hash on server, since need to do rmt: anyway to lock.
+          (if (and rccachef *runconfigdat* (not (common:file-exists? rccachef)))
+              (common:fail-safe
+               (lambda ()
+                 (configf:write-alist *runconfigdat* rccachef))
+               (conc "Could not write cache file - "rccachef))
+              )
+          (if (and mtcachef *configdat*    (not (common:file-exists? mtcachef)))
+              (common:fail-safe
+               (lambda ()
+                 (configf:write-alist *configdat* mtcachef))
+               (conc "Could not write cache file - "mtcachef))
+              )
+          (if (and rccachef mtcachef *runconfigdat* *configdat*)
+              (set! *configstatus* 'fulldata)))
+
 	;; if have -append-config then read and append here
 	(let ((cfname (args:get-arg "-append-config")))
 	  (if (and cfname
 		   (file-read-access? cfname))
 	      (read-config cfname *configdat* #t))) ;; values are added to the hash, no need to do anything special.
 	*toppath*)))
+
 
 (define (get-best-disk confdat testconfig)
   (let* ((disks   (or (and testconfig (hash-table-ref/default testconfig "disks" #f))
 		      (hash-table-ref/default confdat "disks" #f)))
 	 (minspace (let ((m (configf:lookup confdat "setup" "minspace")))
@@ -967,14 +1113,54 @@
 		     (string->number (or m "10000")))))
     (if disks 
 	(let ((res (common:get-disk-with-most-free-space disks minspace))) ;; min size of 1000, seems tad dumb
 	  (if res
 	      (cdr res)
-	      (begin
-		(if (common:low-noise-print 20 "No valid disks or no disk with enough space")
-		    (debug:print-error 0 *default-log-port* "No valid disks found in megatest.config. Please add some to your [disks] section and ensure the directory exists and has enough space!\n    You can change minspace in the [setup] section of megatest.config. Current setting is: " minspace))
-		(exit 1))))))) ;; TODO - move the exit to the calling location and return #f
+	      (begin ;; DEAD CODE PATH - REVISIT!
+;;		(if (common:low-noise-print 20 "No valid disks or no disk with enough space")
+;;		    (debug:print-error 0 *default-log-port* "No valid disks found in megatest.config. Please add some to your [disks] section and ensure the directory exists and has enough space!\n    You can change minspace in the [setup] section of megatest.config. Current setting is: " minspace))
+		;;(exit 1)
+                 (if (null? disks)
+                     (cons 1 (conc *toppath* "/runs"))
+                     (let ((paths (sort disks (lambda (x y) (> (string-length (cadr x)) (string-length (cadr y)))))))
+                       (let loop ((head (car paths)) (tail (cdr paths)))
+                         (let ((result (handle-exceptions exn
+					 (begin
+					   (debug:print 0 *default-log-port* "failed to create dir " (cadr head) ", exn=" exn)
+					   #f)
+					 (create-directory (cadr head) #t))))
+                           (if result
+                               result
+                               (if (null? tail)
+                                   (cons 1 (conc *toppath* "/runs"))
+                                   (loop (car tail) (cdr tail)))))))))))
+	;; no disks definition - use mtrah/runs, fall back to currdir/runs
+	(let* ((toppath (or *toppath*
+			    (common:get-toppath *toppath*)
+			    (begin
+			      (debug:print-error 0 *default-log-port* "Creating runs dir in current directory, this is probably not what you wanted. Please check your setup.")
+			      (current-directory))))
+	       (runsdir (conc toppath "/runs")))
+	  (if (not (file-exists? runsdir))(create-directory runsdir))
+	  runsdir)
+	))) ;; the code creates the necessary directories if it does not exist and returns the path.
+
+(define (launch:test-copy test-src-path test-path)
+  (let* ((ovrcmd (let ((cmd (configf:lookup *configdat* "setup" "testcopycmd")))
+		   (if cmd
+		       ;; substitute the TEST_SRC_PATH and TEST_TARG_PATH
+		       (string-substitute "TEST_TARG_PATH" test-path
+					  (string-substitute "TEST_SRC_PATH" test-src-path cmd #t) #t)
+		       #f)))
+	 (cmd    (if ovrcmd 
+		     ovrcmd
+		     (conc "rsync -av" (if (debug:debug-mode 1) "" "q") " " test-src-path "/ " test-path "/"
+			   " >> " test-path "/mt_launch.log 2>> " test-path "/mt_launch.log")))
+	 (status (system cmd)))
+    (if (not (eq? status 0))
+	(debug:print 2 *default-log-port* "ERROR: problem with running \"" cmd "\""))))
+
 
 ;; Desired directory structure:
 ;;
 ;;   -  -  -.
 ;;                                     |
@@ -1010,11 +1196,11 @@
 	 (toptest-path (conc disk-path (if contour (conc "/" contour) "") "/" testtop-base))
 	 (test-path    (conc disk-path (if contour (conc "/" contour) "") "/" test-base))
 
 	 ;; ensure this exists first as links to subtests must be created there
 	 (linktree  (common:get-linktree))
-	 ;; WAS: (let ((rd (config-lookup *configdat* "setup" "linktree")))
+	 ;; WAS: (let ((rd (configf:lookup *configdat* "setup" "linktree")))
 	 ;;         (if rd rd (conc *toppath* "/runs"))))
 	 ;; which seems wrong ...
 
 	 (lnkbase   (conc linktree (if contour (conc "/" contour) "") "/" target "/" runname))
 	 (lnkpath   (conc lnkbase "/" testname))
@@ -1028,19 +1214,24 @@
     (debug:print 2 *default-log-port* "INFO:\n       lnkbase=" lnkbase "\n       lnkpath=" lnkpath "\n  toptest-path=" toptest-path "\n     test-path=" test-path)
     (if (not (common:file-exists? linktree))
 	(begin
 	  (debug:print 0 *default-log-port* "WARNING: linktree did not exist! Creating it now at " linktree)
 	  (create-directory linktree #t))) ;; (system (conc "mkdir -p " linktree))))
-    ;; create the directory for the tests dir links, this is needed no matter what...
-    (if (and (not (common:directory-exists? lnkbase))
-	     (not (common:file-exists? lnkbase)))
-	(handle-exceptions
-	 exn
-	 (begin
-	   (debug:print-error 0 *default-log-port* "Problem creating linktree base at " lnkbase)
-	   (print-error-message exn (current-error-port)))
-	 (create-directory lnkbase #t)))
+    ;; create the directory for the tests dir links, this is needed no matter what... try up to three times
+    (let loop ((done 3)) 
+      (let ((success (if (and (not (common:directory-exists? lnkbase))
+			      (not (common:file-exists? lnkbase)))
+			 (handle-exceptions
+			  exn
+			  (begin
+			    (debug:print-error 0 *default-log-port* "Problem creating linktree base at " lnkbase ", exn=" exn)
+			    (print-error-message exn (current-error-port))
+			    #t)
+			  (create-directory lnkbase #t)
+			  #f))))
+	(if (and (not success)(> done 0))
+	    (loop (- done 1)))))
     
     ;; update the toptest record with its location rundir, cache the path
     ;; This wass highly inefficient, one db write for every subtest, potentially
     ;; thousands of unnecessary updates, cache the fact it was set and don't set it 
     ;; again. 
@@ -1053,29 +1244,32 @@
 	(let ((iterated-parent  (pathname-directory (conc lnkpath "/" item-path))))
 	  (debug:print-info 2 *default-log-port* "Creating iterated parent " iterated-parent)
 	  (handle-exceptions
 	   exn
 	   (begin
-	     (debug:print-error 0 *default-log-port* " Failed to create directory " iterated-parent ((condition-property-accessor 'exn 'message) exn) ", exiting")
-	     (exit 1))
+	     (debug:print-error 0 *default-log-port* " Failed to create directory " iterated-parent ((condition-property-accessor 'exn 'message) exn)
+				", continuing but link tree may be corrupted, exn=" exn)
+	     #;(exit 1))
 	   (create-directory iterated-parent #t))))
 
     (if (symbolic-link? lnkpath) 
 	(handle-exceptions
 	 exn
 	 (begin
-	   (debug:print-error 0 *default-log-port* " Failed to remove symlink " lnkpath ((condition-property-accessor 'exn 'message) exn) ", exiting")
-	   (exit 1))
+	   (debug:print-error 0 *default-log-port* " Failed to remove symlink " lnkpath ((condition-property-accessor 'exn 'message) exn)
+			      ", continuing but link tree may be corrupted. exn=" exn)
+	   #;(exit 1))
 	 (delete-file lnkpath)))
 
-    (if (not (or (file-exists? lnkpath)
+    (if (not (or (common:file-exists? lnkpath)
 		 (symbolic-link? lnkpath)))
 	(handle-exceptions
 	 exn
 	 (begin
-	   (debug:print-error 0 *default-log-port* " Failed to create symlink " lnkpath ((condition-property-accessor 'exn 'message) exn) ", exiting")
-	   (exit 1))
+	   (debug:print-error 0 *default-log-port* " Failed to create symlink " lnkpath ((condition-property-accessor 'exn 'message) exn)
+			      ", continuing but link tree may be corrupted. exn=" exn)
+	   #;(exit 1))
 	 (create-symbolic-link toptest-path lnkpath)))
     
     ;; NB - This was not working right - some top tests are not getting the path set!!!
     ;;
     ;; Do the setting of this record after the paths are created so that the shortdir can 
@@ -1090,11 +1284,11 @@
 				   (db:test-get-rundir testinfo) ;; ) ;; )
 				   #f)))
 	  (hash-table-set! *toptest-paths* testname curr-test-path)
 	  ;; NB// Was this for the test or for the parent in an iterated test?
 	  (rmt:general-call 'test-set-rundir-shortdir run-id lnkpath 
-			    (if (file-exists? lnkpath)
+			    (if (common:file-exists? lnkpath)
 				;; (resolve-pathname lnkpath)
 				(common:nice-path lnkpath)
 				lnkpath)
 			    testname "" run-id)
 	  ;; (rmt:general-call 'test-set-rundir run-id lnkpath testname "") ;; toptest-path)
@@ -1101,12 +1295,14 @@
 	  (if (or (not curr-test-path)
 		  (not (directory-exists? toptest-path)))
 	      (begin
 		(debug:print-info 2 *default-log-port* "Creating " toptest-path " and link " lnkpath)
 		(handle-exceptions
-		 exn
-		 #f ;; don't care to catch and deal with errors here for now.
+		    exn
+		  (begin
+		    (debug:print 0 *default-log-port* "failed to create directory " toptest-path ", exn=" exn)
+		    #f)
 		 (create-directory toptest-path #t))
 		(hash-table-set! *toptest-paths* testname toptest-path)))))
 
     ;; The toptest path has been created, the link to the test in the linktree has
     ;; been created. Now, if this is an iterated test the real test dir must be created
@@ -1115,11 +1311,12 @@
 	  (debug:print 2 *default-log-port* "Setting up sub test run area")
 	  (debug:print 2 *default-log-port* " - creating run area in " test-path)
 	  (handle-exceptions
 	   exn
 	   (begin
-	     (debug:print-error 0 *default-log-port* " Failed to create directory " test-path ((condition-property-accessor 'exn 'message) exn) ", exiting")
+	     (debug:print-error 0 *default-log-port* " Failed to create directory " test-path ((condition-property-accessor 'exn 'message) exn)
+				", exiting, exn=" exn)
 	     (exit 1))
 	   (create-directory test-path #t))
 	  (debug:print 2 *default-log-port* 
 		       " - creating link from: " test-path "\n"
 		       "                   to: " lnktarget)
@@ -1126,40 +1323,50 @@
 
 	  ;; If there is already a symlink delete it and recreate it.
 	  (handle-exceptions
 	   exn
 	   (begin
-	     (debug:print-error 0 *default-log-port* " Failed to re-create link " lnktarget ((condition-property-accessor 'exn 'message) exn) ", exiting")
+	     (debug:print-error 0 *default-log-port* " Failed to re-create link " lnktarget ((condition-property-accessor 'exn 'message) exn) ", exiting, exn=" exn)
 	     (exit))
 	   (if (symbolic-link? lnktarget)     (delete-file lnktarget))
-	   (if (not (file-exists? lnktarget)) (create-symbolic-link test-path lnktarget)))))
+	   (if (not (common:file-exists? lnktarget)) (create-symbolic-link test-path lnktarget)))))
 
     (if (not (directory? test-path))
 	(create-directory test-path #t)) ;; this is a hack, I don't know why out of the blue this path does not exist sometimes
 
     (if (and test-src-path (directory? test-path))
 	(begin
-	  (let* ((ovrcmd (let ((cmd (config-lookup *configdat* "setup" "testcopycmd")))
-			   (if cmd
-			       ;; substitute the TEST_SRC_PATH and TEST_TARG_PATH
-			       (string-substitute "TEST_TARG_PATH" test-path
-						  (string-substitute "TEST_SRC_PATH" test-src-path cmd #t) #t)
-			       #f)))
-		 (cmd    (if ovrcmd 
-			     ovrcmd
-			     (conc "rsync -av" (if (debug:debug-mode 1) "" "q") " " test-src-path "/ " test-path "/"
-				   " >> " test-path "/mt_launch.log 2>> " test-path "/mt_launch.log")))
-		 (status (system cmd)))
-	    (if (not (eq? status 0))
-		(debug:print 2 *default-log-port* "ERROR: problem with running \"" cmd "\"")))
+	  (launch:test-copy test-src-path test-path)
 	  (list lnkpathf lnkpath ))
 	(if (and test-src-path (> remtries 0))
 	    (begin
 	      (debug:print-error 0 *default-log-port* "Failed to create work area at " test-path " with link at " lnktarget ", remaining attempts " remtries)
 	      ;; 
 	      (create-work-area run-id run-info keyvals test-id test-src-path disk-path testname itemdat remtries: (- remtries 1)))
 	    (list #f #f)))))
+
+
+(define (launch:handle-zombie-tests run-id)
+  (let* ((key (conc "zombiescan-runid-"run-id))
+         (now (current-seconds))
+         (threshold (- (current-seconds)  (* 2 (or (configf:lookup-number *configdat* "setup" "deadtime") 120))))
+         (val (rmt:get-var key))
+         (do-scan?
+          (cond
+           ((not val)
+            #t)
+           ((< val threshold)
+            #t)
+           (else #f))))
+    (when do-scan?
+      (debug:print 1 *default-log-port* "INFO: search and mark zombie tests")
+      (rmt:set-var key (current-seconds))
+      (rmt:find-and-mark-incomplete run-id #f))))
+
+
+
+
 
 ;; 1. look though disks list for disk with most space
 ;; 2. create run dir on disk, path name is meaningful
 ;; 3. create link from run dir to megatest runs area 
 ;; 4. remotely run the test on allocated host
@@ -1166,17 +1373,31 @@
 ;;    - could be ssh to host from hosts table (update regularly with load)
 ;;    - could be netbatch
 ;;      (launch-test db (cadr status) test-conf))
 (define (launch-test test-id run-id run-info keyvals runname test-conf test-name test-path itemdat params)
   (mutex-lock! *launch-setup-mutex*) ;; setting variables and processing the testconfig is NOT thread-safe, reuse the launch-setup mutex
-  (let* ((item-path       (item-list->path itemdat))
+  (let* ( ;; (lock-key        (conc "test-" test-id))
+	;; (got-lock        (let loop ((lock        (rmt:no-sync-get-lock lock-key))
+	;; 			     (expire-time (+ (current-seconds) 15))) ;; give up on getting the lock and steal it after 15 seconds
+	;; 		    (if (car lock)
+	;; 			#t
+	;; 			(if (> (current-seconds) expire-time)
+	;; 			    (begin
+	;; 			      (debug:print-info 0 *default-log-port* "Timed out waiting for a lock to launch test " keyvals " " runname " " test-name " " test-path)
+	;; 			      (rmt:no-sync-del! lock-key) ;; destroy the lock
+	;; 			      (loop (rmt:no-sync-get-lock lock-key) expire-time)) ;; 
+	;; 			    (begin
+	;; 			      (thread-sleep! 1)
+	;; 			      (loop (rmt:no-sync-get-lock lock-key) expire-time))))))
+	 (item-path       (item-list->path itemdat))
 	 (contour         #f)) ;; NOT READY FOR THIS (args:get-arg "-contour")))
     (let loop ((delta        (- (current-seconds) *last-launch*))
-	       (launch-delay (string->number (or (configf:lookup *configdat* "setup" "launch-delay") "5"))))
+	       (launch-delay (configf:lookup-number *configdat* "setup" "launch-delay" default: 0)))
       (if (> launch-delay delta)
 	  (begin
-	    (debug:print-info 0 *default-log-port* "Delaying launch of " test-name " for " (- launch-delay delta) " seconds")
+	    (if (common:low-noise-print 1200 "test launch delay") ;; every two hours or so remind the user about launch delay.
+		(debug:print-info 0 *default-log-port* "NOTE: test launches are delayed by " launch-delay " seconds. See megatest.config launch-delay setting to adjust.")) ;; launch of " test-name " for " (- launch-delay delta) " seconds"))
 	    (thread-sleep! (- launch-delay delta))
 	    (loop (- (current-seconds) *last-launch*) launch-delay))))
     (change-directory *toppath*)
     (alist->env-vars ;; consolidate this code with the code in megatest.scm for "-execute", *maybe* - the longer they are set the longer each launch takes (must be non-overlapping with the vars)
      (append
@@ -1192,38 +1413,40 @@
            ;; for tconfig, why do we allow fallback to test-conf?
 	   (tconfig         (or (tests:get-testconfig test-name item-path tregistry #t force-create: #t)
 				(begin
                                   (debug:print 0 *default-log-port* "WARNING: falling back to pre-calculated testconfig. This is likely not desired.")
                                   test-conf))) ;; force re-read now that all vars are set
-	   (useshell        (let ((ush (config-lookup *configdat* "jobtools"     "useshell")))
+	   (useshell        (let ((ush (configf:lookup *configdat* "jobtools"     "useshell")))
 			      (if ush 
 				  (if (equal? ush "no") ;; must use "no" to NOT use shell
 				      #f
 				      ush)
 				  #t)))     ;; default is yes
-	   (runscript       (config-lookup tconfig   "setup"        "runscript"))
-	   (ezsteps         (> (length (hash-table-ref/default tconfig "ezsteps" '())) 0)) ;; don't send all the steps, could be big
-	   ;; (diskspace       (config-lookup tconfig   "requirements" "diskspace"))
-	   ;; (memory          (config-lookup tconfig   "requirements" "memory"))
-	   ;; (hosts           (config-lookup *configdat* "jobtools"     "workhosts")) ;; I'm pretty sure this was never completed
-	   (remote-megatest (config-lookup *configdat* "setup" "executable"))
+	   (runscript       (configf:lookup tconfig   "setup"        "runscript"))
+	   (ezsteps         (> (length (hash-table-ref/default tconfig "ezsteps" '())) 0)) ;; don't send all the steps, could be big, just send a flag
+	   (subrun          (> (length (hash-table-ref/default tconfig "subrun"  '())) 0)) ;; send a flag to process a subrun
+	   ;; (diskspace       (configf:lookup tconfig   "requirements" "diskspace"))
+	   ;; (memory          (configf:lookup tconfig   "requirements" "memory"))
+	   ;; (hosts           (configf:lookup *configdat* "jobtools"     "workhosts")) ;; I'm pretty sure this was never completed
+	   (remote-megatest (configf:lookup *configdat* "setup" "executable"))
 	   (run-time-limit  (or (configf:lookup  tconfig   "requirements" "runtimelim")
 				(configf:lookup  *configdat* "setup" "runtimelim")))
 	   ;; FIXME SOMEDAY: not good how this is so obtuse, this hack is to 
 	   ;;                allow running from dashboard. Extract the path
 	   ;;                from the called megatest and convert dashboard
 	   ;;             	  or dboard to megatest
-	   (local-megatest  (let* ((lm  (car (argv)))
+	   (local-megatest  (common:find-local-megatest))
+	   #;(local-megatest  (let* ((lm  (car (argv)))
 				   (dir (pathname-directory lm))
 				   (exe (pathname-strip-directory lm)))
 			      (conc (if dir (conc dir "/") "")
 				    (case (string->symbol exe)
 				      ((dboard)    "../megatest")
 				      ((mtest)     "../megatest")
 				      ((dashboard) "megatest")
 				      (else exe)))))
-	   (launcher        (common:get-launcher *configdat* test-name item-path)) ;; (config-lookup *configdat* "jobtools"     "launcher"))
+	   (launcher        (common:get-launcher *configdat* test-name item-path)) ;; (configf:lookup *configdat* "jobtools"     "launcher"))
 	   (test-sig        (conc (common:get-testsuite-name) ":" test-name ":" item-path)) ;; (item-list->path itemdat))) ;; test-path is the full path including the item-path
 	   (work-area       #f)
 	   (toptest-work-area #f) ;; for iterated tests the top test contains data relevant for all
 	   (diskpath   #f)
 	   (cmdparms   #f)
@@ -1230,11 +1453,14 @@
 	   (fullcmd    #f) ;; (define a (with-output-to-string (lambda ()(write x))))
 	   (mt-bindir-path #f)
 	   (testinfo   (rmt:get-test-info-by-id run-id test-id))
 	   (mt_target  (string-intersperse (map cadr keyvals) "/"))
 	   (debug-param (append (if (args:get-arg "-debug")  (list "-debug" (args:get-arg "-debug")) '())
-				(if (args:get-arg "-logging")(list "-logging") '()))))
+				(if (args:get-arg "-logging")(list "-logging") '())
+				(if (configf:lookup *configdat* "misc" "profilesw")
+				    (list (configf:lookup *configdat* "misc" "profilesw"))
+				    '()))))
       ;; (if hosts (set! hosts (string-split hosts)))
       ;; set the megatest to be called on the remote host
       (if (not remote-megatest)(set! remote-megatest local-megatest)) ;; "megatest"))
       (set! mt-bindir-path (pathname-directory remote-megatest))
       (if launcher (set! launcher (string-split launcher)))
@@ -1283,11 +1509,12 @@
 					(list 'run-id    run-id   )
 					(list 'test-id   test-id  )
 					;; (list 'item-path item-path )
 					(list 'itemdat   itemdat  )
 					(list 'megatest  remote-megatest)
-					(list 'ezsteps   ezsteps) 
+					(list 'ezsteps   ezsteps)
+					(list 'subrun    subrun)
 					(list 'target    mt_target)
 					(list 'contour   contour)
 					(list 'runtlim   (if run-time-limit (common:hms-string->seconds run-time-limit) #f))
 					(list 'env-ovrd  (hash-table-ref/default *configdat* "env-override" '())) 
 					(list 'set-vars  (if params (hash-table-ref/default params "-setvars" #f)))
@@ -1295,11 +1522,11 @@
 					(list 'mt-bindir-path mt-bindir-path))))))))
       
       ;; clean out step records from previous run if they exist
       ;; (rmt:delete-test-step-records run-id test-id)
       ;; if the dir does not exist we may have a itempath where individual variables are a path, launch anyway
-      (if (file-exists? work-area)
+      (if (common:file-exists? work-area)
 	  (change-directory work-area)) ;; so that log files from the launch process don't clutter the test dir
       (cond
        ;; ((and launcher hosts) ;; must be using ssh hostname
        ;;    (set! fullcmd (append launcher (car hosts)(list remote-megatest "-m" test-sig "-execute" cmdparms) debug-param)))
        ;; (set! fullcmd (append launcher (car hosts)(list remote-megatest test-sig "-execute" cmdparms))))
@@ -1321,30 +1548,34 @@
 			      (append (list (list "MT_TEST_RUN_DIR" work-area)
 					    (list "MT_TEST_NAME" test-name)
 					    (list "MT_ITEM_INFO" (conc itemdat)) 
 					    (list "MT_RUNNAME"   runname)
 					    (list "MT_TARGET"    mt_target)
-					    (list "MT_ITEMPATH"  item-path)
-					    )
+					    (list "MT_ITEMPATH"  item-path))
 				      itemdat)))
 	     (testprevvals   (alist->env-vars
 			      (hash-table-ref/default tconfig "pre-launch-env-overrides" '())))
 	     ;; Launchwait defaults to true, must override it to turn off wait
 	     (launchwait     (if (equal? (configf:lookup *configdat* "setup" "launchwait") "no") #f #t))
-	     (launch-results (apply (if launchwait
-					process:cmd-run-with-stderr->list
-					process-run)
-				    (if useshell
-					(let ((cmdstr (string-intersperse fullcmd " ")))
-					  (if launchwait
-					      cmdstr
-					      (conc cmdstr " >> mt_launch.log 2>&1 &")))
-					(car fullcmd))
-				    (if useshell
-					'()
-					(cdr fullcmd)))))
+	     (launch-results-prev (apply (if launchwait ;; BB: TODO: refactor this to examine return code of launcher, if nonzero, set state to launch failed.
+					     process:cmd-run-with-stderr-and-exitcode->list
+					     process-run)
+					 (if useshell
+					     (let ((cmdstr (string-intersperse fullcmd " ")))
+					       (if launchwait
+						   cmdstr
+						   (conc cmdstr " >> mt_launch.log 2>&1 &")))
+					     (car fullcmd))
+					 (if useshell
+					     '()
+					     (cdr fullcmd))))
+             (success        (if launchwait (equal? 0 (cadr launch-results-prev)) #t))
+             (launch-results (if launchwait (car launch-results-prev) launch-results-prev)))
+        (if (not success)
+            (tests:test-set-status! run-id test-id "COMPLETED" "DEAD" "launcher failed; exited non-zero; check mt_launch.log" #f)) ;; (if launch-results launch-results "FAILED"))
         (mutex-unlock! *launch-setup-mutex*) ;; yes, really should mutex all the way to here. Need to put this entire process into a fork.
+	;; (rmt:no-sync-del! lock-key)         ;; release the lock for starting this test
 	(if (not launchwait) ;; give the OS a little time to allow the process to start
 	    (thread-sleep! 0.01))
 	(with-output-to-file "mt_launch.log"
 	  (lambda ()
 	    (print "LAUNCHCMD: " (string-intersperse fullcmd " "))
@@ -1366,11 +1597,12 @@
 	      ))
 	(alist->env-vars miscprevvals)
 	(alist->env-vars testprevvals)
 	(alist->env-vars commonprevvals)
 	launch-results))
-    (change-directory *toppath*)))
+    (change-directory *toppath*)
+    (thread-sleep! (configf:lookup-number *configdat* "setup" "inter-test-delay" default: 0.0))))
 
 ;; recover a test where the top controlling mtest may have died
 ;;
 (define (launch:recover-test run-id test-id)
   ;; this function is called on the test run host via ssh
@@ -1380,11 +1612,11 @@
   ;;    - it it's run directory correct for the test
   ;;    - is there a controlling mtest (maybe stuck)
   ;; 2. if recovery is needed watch pid
   ;;    - when it exits take the exit code and do the needful
   ;;
-  (let* ((pid (rmt:test-get-top-process-id run-id test-id))
+  (let* ((pid (rmt:test-get-top-process-pid run-id test-id))
 	 (psres (with-input-from-pipe
 		 (conc "ps -F -u " (current-user-name) " | grep -E '" pid " ' | grep -v 'grep -E " pid "'")
 		 (lambda ()
 		   (read-line))))
 	 (rundir (if (string? psres) ;; real process owned by user

DELETED loadwatch/Makefile
Index: loadwatch/Makefile
==================================================================
--- loadwatch/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-
-all : launch-many queuefeeder queuefeeder-server
-
-launch-many : launch-many.scm
-	csc launch-many.scm
-
-queuefeeder : queuefeeder.scm
-	csc queuefeeder.scm
-
-queuefeeder-server : queuefeeder-server.scm
-	csc queuefeeder-server.scm

DELETED loadwatch/bjob-count.sh
Index: loadwatch/bjob-count.sh
==================================================================
--- loadwatch/bjob-count.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-bqueues | grep normal |awk '{print $8}'

DELETED loadwatch/launch-many.scm
Index: loadwatch/launch-many.scm
==================================================================
--- loadwatch/launch-many.scm
+++ /dev/null
@@ -1,9 +0,0 @@
-(use posix)
-
-(let loop ((count 0))
-  (if (> count 500000)
-      (print "DONE")
-      (let ((cmd (conc "./queuefeeder xena:22022 bsub ./testopenlava.sh " count " " (random 30))))
-	(print "Running: " cmd)
-	(system cmd)
-	(loop (+ count 1)))))

DELETED loadwatch/loadwatch.scm
Index: loadwatch/loadwatch.scm
==================================================================
--- loadwatch/loadwatch.scm
+++ /dev/null
@@ -1,86 +0,0 @@
-(use regex srfi-69)
-
-(define-record processdat
-  %cpu
-  virt
-  res
-  %mem
-  count
-  )
-
-(define (pp-processdat dat)
-  (print "(processdat"
-	 " %cpu="  (processdat-%cpu dat)
-	 " virt="  (processdat-virt dat)
-	 " res="   (processdat-res  dat)
-	 " %mem="  (processdat-%mem dat)
-	 " count=" (processdat-count dat)))
-
-
-(define nrex (regexp "^(\\d+[\\d\\.]*)([mkgMKG])$"))
-
-(define (get-number numstr)
-  (let ((n (string->number numstr)))
-    (if n 
-	n
-	(let ((nmatch (string-match nrex numstr)))
-	  (if nmatch
-	      (* (string->number (cadr nmatch))
-		 (case (string->symbol (caddr nmatch))
-		   ((k) 1024)
-		   ((m) 1048576)
-		   ((g) 1073741824)
-		   (else 
-		    (print "ERROR: Unrecognised unit: " (caddr nmatch) ", extracted for " numstr)
-		    1)))
-	      #f)))))
-
-
-(define (snagload)
-  (let ((dat (make-hash-table)) ;; user => hash-of-processdat
-	(hdr (regexp "^\\s+PID"))
-	(rx  (regexp "\\s+"))
-	(wht (regexp "^\\s+"))
-	)
-    (with-input-from-pipe 
-     "top -n 1 -b"
-     (lambda ()
-       (let loop ((inl   (read-line))
-		  (inbod #f))
-	 (if (eof-object? inl)
-	     dat
-	     (if (not inbod)
-		 (if (string-search hdr inl)
-		     (loop (read-line) #t)
-		     (loop (read-line) #f))
-		 (let* ((lparts (map (lambda (x)
-				       (let ((num (get-number x)))
-					 (if num num x)))
-				     (string-split-fields rx (string-substitute wht "" inl) #:infix))))
-		   (if (> (length lparts) 10)
-		       (let* ((user   (list-ref lparts 1))
-			      (virt   (list-ref lparts 4))
-			      (res    (list-ref lparts 5))
-			      (%cpu   (list-ref lparts 8))
-			      (%mem   (list-ref lparts 9))
-			      (time   (list-ref lparts 10))
-			      (pname  (list-ref lparts 11))
-			      (udat   (or (hash-table-ref/default dat user #f)
-					  (let ((u (make-hash-table)))
-					    (hash-table-set! dat user u)
-					    u)))
-			      (pdat   (or (hash-table-ref/default udat pname #f)
-					  (let ((p (make-processdat 0 0 0 0 0)))
-					    (hash-table-set! udat pname p)
-					    p))))
-			 (print "User: " user ", pname: " pname ", virt: " virt ", res: " res ", %cpu: " %cpu ", %mem: " %mem)
-			 (processdat-%cpu-set!  pdat (+ (processdat-%cpu pdat) %cpu))
-			 (processdat-%mem-set!  pdat (+ (processdat-%mem pdat) %mem))
-			 (processdat-virt-set!  pdat (+ (processdat-virt pdat) virt))
-			 (processdat-res-set!   pdat (+ (processdat-res pdat)  res))
-			 (processdat-count-set! pdat (+ (processdat-count pdat) 1))
-			 (loop (read-line) inbod))
-		       dat)))))))))
-    
-(define x (snagload))
-;; (processdat-%cpu (hash-table-ref (hash-table-ref x "matt") "evolution-calen"))

DELETED loadwatch/queuefeeder-server.scm
Index: loadwatch/queuefeeder-server.scm
==================================================================
--- loadwatch/queuefeeder-server.scm
+++ /dev/null
@@ -1,185 +0,0 @@
-;;======================================================================
-;; Copyright 2015-2015, Matthew Welland.
-;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
-;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
-;;======================================================================
-
-;; Queue Feeder. Use a crude droop curve to limit feeding jobs into a queue
-;;               to prevent slamming the queue
-
-;;======================================================================
-;; Methodology
-;;
-;;   Connect to the server, the server delays the appropriate time (if 
-;;   any) and then launch the task.
-;;
-
-(use nanomsg posix regex)
-
-;; (use trace)
-;; (trace nn-bind nn-socket nn-assert nn-recv nn-send thread-terminate! nn-close )
-
-(define port  22022)
-
-;; get needed stuff from commandline
-;;
-(define queuelen #f)
-(define cmd '()) ;; cmd is run to give a count of the queue length => returns number in queue
-
-(define usage "Usage: queuefeeder-server port target_queue_length command
-       where command is a script or program that gives an integer on stdout of current queue length")
-
-(let ((args (argv)))
-  (if (> (length args) 3)
-      (begin
-	(set! port     (cadr args))
-	(set! queuelen (string->number (caddr args)))
-	(set! cmd      (cadddr args))) ;; no params supported
-      (begin
-	(print usage)
-	(exit))))
-
-(if (not queuelen)
-    (begin
-      (print "queuelen must be a number")
-      (print usage)
-      (exit)))
-
-(print "Running queue feeder with port=" port ", command=" cmd)
-
-(define rep   (nn-socket 'rep))
-
-(print "connecting, got: " (nn-bind    rep  (conc "tcp://" "*" ":" port)))
-
-(define *current-delay* 0)
-(define (exp-droop-calc x targ)
-  (cond
-   ((> (- x targ) 1) 136) ;; top off at 136 seconds
-   (else 
-    (let ((res (* 50 (exp (- x targ)))))
-      (cond
-       ((and (> res 0)(< res 0.01)) 0.01)
-       ((> res 45)                  45) ;; cap at 45 seconds
-       (else res))))))
-
-;; x input value (current number in the queue)
-;; targ is the desired queue length
-;;
-(define (piecewise-droop-calc x targ)
-  (let ((top 50))
-    (cond
-     ((> (- x targ) 0)
-      top) ;; top off at top seconds
-     ((> x (- targ top))
-      (+ (* 1 (- x (- targ top)))
-	 (/ (- top targ) targ)))
-     (else (let ((res (/ x targ)))
-	     (if (< res 0.01)
-		 0.01
-		 res))))))
-
-(define (server soc)
-  (print "server starting")
-  (let loop ((msg-in (nn-recv soc))
-	     (count  0))
-    (if (eq? 0 (modulo count 1000))
-	(print "server received: " msg-in ", count=" count))
-    (cond
-     ((equal? msg-in "quit")
-      (nn-send soc "Ok, quitting"))
-     ((and (>= (string-length msg-in) 4)
-	   (equal? (substring msg-in 0 4) "ping"))
-      (nn-send soc (conc (current-process-id)))
-      (loop (nn-recv soc)(+ count 1)))
-     (else
-      (mutex-lock! *current-delay-mutex*)
-      (let ((current-delay *current-delay*))
-	(mutex-unlock! *current-delay-mutex*)
-	;; (thread-sleep! current-delay)
-	(nn-send soc (conc current-delay " hello " msg-in " you waited " current-delay " seconds"))
-	(loop (nn-recv soc)(if (> count 20000000)
-			       0
-			       (+ count 1))))))))
-
-(define (ping-self host port #!key (return-socket #t))
-  ;; send a random number along with pid and check that we get it back
-  (let* ((req     (nn-socket 'req))
-	 (key     "ping")
-	 (success #f)
-	 (keepwaiting #t)
-	 (ping    (make-thread
-		   (lambda ()
-		     (print "ping: sending string \"" key "\", expecting " (current-process-id))
-		     (nn-send req key)
-		     (let ((result  (nn-recv req)))
-		       (if (equal? (conc (current-process-id)) result)
-			   (begin
-			     (print "ping, success: received \"" result "\"")
-			     (set! success #t))
-			   (begin
-			     (print "ping, failed: received key \"" result "\"")
-			     (set! keepwaiting #f)
-			     (set! success #f)))))
-		   "ping"))
-	 (timeout (make-thread (lambda ()
-				 (let loop ((count 0))
-				   (thread-sleep! 1)
-				   (print "still waiting after " count " seconds...")
-				   (if (and keepwaiting (< count 10))
-				       (loop (+ count 1))))
-				 (if keepwaiting
-				     (begin
-				       (print "timeout waiting for ping")
-				       (thread-terminate! ping))))
-			       "timeout")))
-    (nn-connect req (conc "tcp://" host ":" port))
-    (handle-exceptions
-     exn
-     (begin
-       (print-call-chain)
-       (print 0 " message: " ((condition-property-accessor 'exn 'message) exn))
-       (print "exn=" (condition->list exn))
-       (print "ping failed to connect to " host ":" port))
-     (thread-start! timeout)
-     (thread-start! ping)
-     (thread-join! ping)
-     (if success (thread-terminate! timeout)))
-    (if return-socket
-	(if success req #f)
-	(begin
-	  (nn-close req)
-	  success))))
-
-(define *current-delay-mutex* (make-mutex))
-
-;; update the *current-delay* value every minute or QUEUE_CHK_DELAY seconds
-(thread-start! (make-thread (lambda ()
-			      (let ((delay-time (string->number (or (get-environment-variable "QUEUE_CHK_DELAY") "30"))))
-				(let loop ()
-				  (with-input-from-pipe 
-				   cmd  ;;; my query to get queue length
-				   (lambda ()
-				     (let* ((val       (read))
-					    (droop-val (if (number? val)(piecewise-droop-calc val queuelen) #f)))
-				       ;; val is number of jobs in queue. Use a linear droop of val/40
-				       (mutex-lock! *current-delay-mutex*)
-				       (set! *current-delay* (or droop-val 30)) ;; (/ (or droop-val 100) 50))
-				       (mutex-unlock! *current-delay-mutex*)
-				       (print "droop-val=" droop-val)
-				       (thread-sleep! delay-time))))
-				  (loop))))))
-
-(let ((server-thread (make-thread (lambda ()(server rep)) "server")))
-  (thread-start! server-thread)
-  (if (ping-self (get-host-name) port)
-      (begin
-	(thread-join! server-thread)
-	(nn-close rep))
-      (print "ping failed")))
-
-(exit)

DELETED loadwatch/queuefeeder.scm
Index: loadwatch/queuefeeder.scm
==================================================================
--- loadwatch/queuefeeder.scm
+++ /dev/null
@@ -1,96 +0,0 @@
-;;======================================================================
-;; Copyright 2015-2015, Matthew Welland.
-;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
-;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
-;;======================================================================
-
-;; Queue Feeder. Use a crude droop curve to limit feeding jobs into a queue
-;;               to prevent slamming the queue
-
-;;======================================================================
-;; Methodology
-;;
-;;   Connect to the server, the server delays the appropriate time (if 
-;;   any) and then launch the task.
-;;
-(use nanomsg posix regex message-digest md5)
-
-(define req   (nn-socket 'req))
-
-;; get needed stuff from commandline
-;;
-(define hostport #f)
-(define cmd '())
-
-(let ((args (argv)))
-  (if (> (length args) 2)
-      (begin
-	(set! hostport (cadr args))
-	(set! cmd      (cddr args)))
-      (begin
-	(print "Usage: queuefeeder host:port command params ....")
-	(exit))))
-
-(nn-connect req  (conc "tcp://" hostport)) ;; xena:22022")
-
-(define (client-send-receive soc msg)
-  (nn-send soc msg)
-  (nn-recv soc))
-
-;; Generate a unique signature for this client location
-;;
-(define (make-signature)
-  (message-digest-string (md5-primitive) 
-                         (with-output-to-string
-                           (lambda ()
-                             (write (current-directory))))))
-
-;; (define ((talk-to-server soc))
-;;   (let loop ((cnt 200000))
-;;     (let ((name (list-ref '("Matt" "Tom" "Bob" "Jill" "James" "Jane")(random 6))))
-;;       ;; (print "Sending " name)
-;;       ;; (print
-;;       (client-send-receive req name) ;; )
-;;       (if (> cnt 0)(loop (- cnt 1)))))
-;;   (print (client-send-receive req "quit"))
-;;   (nn-close req)
-;;   (exit))
-;; 
-
-(define (get-delay signature)
-  (let* ((full-msg   (client-send-receive req (conc (current-user-name) "@" (get-host-name) ":" signature))))
-    (print "Got " full-msg)
-    (let* ((reply-msg  (string-match "^([\\d\\.]+)\\s+(.*)$" full-msg))
-	   (delay-time (if (> (length reply-msg) 2)
-			   (string->number (cadr reply-msg))
-			   1)) ;; fall back to one sec delay
-	   (msg        (if (> (length reply-msg) 2)
-			   (caddr reply-msg)
-			   full-msg)))
-      (values delay-time msg))))
-
-
-(let ((signature (make-signature)))
-  
-  (thread-start! (lambda ()
-		   (thread-sleep! 60)
-		   (print "Give up on waiting for the server")
-		   ;; (nn-close req)
-		   ;; (exit)
-		   ))
-  (thread-join! (thread-start! (lambda ()
-				 (let-values 
-				  (((delay-time msg)(get-delay signature)))
-				  (print "INFO: sleeping " delay-time " seconds per request of queuefeeder server")
-				  (thread-sleep! delay-time)
-				  (print "INFO: done waiting, now executing requested task.")))))
-  (nn-close req))
-
-(process-execute (car cmd) (cdr cmd))
-
-

DELETED loadwatch/testopenlava.sh
Index: loadwatch/testopenlava.sh
==================================================================
--- loadwatch/testopenlava.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-job_order=$1
-job_length=$2
-
-echo "START: $job_order" > $job_order.log
-sleep $job_length
-echo "END: $job_order" >> $job_order.log
-

Index: lock-queue.scm
==================================================================
--- lock-queue.scm
+++ lock-queue.scm
@@ -1,16 +1,24 @@
 ;; Copyright 2006-2013, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
 
-(use sqlite3 srfi-18)
-(import (prefix sqlite3 sqlite3:))
+(use (prefix sqlite3 sqlite3:) srfi-18)
 
 (declare (unit lock-queue))
 (declare (uses common))
 (declare (uses tasks))
 
@@ -33,11 +41,11 @@
   (let ((fname (lock-queue:db-dat-get-path dbdat)))
     (system (conc "rm -f " fname "*"))))
 
 (define (lock-queue:open-db fname #!key (count 10))
   (let* ((actualfname (conc fname ".lockdb"))
-	 (dbexists (file-exists? actualfname))
+	 (dbexists (common:file-exists? actualfname))
 	 (db       (sqlite3:open-database actualfname))
 	 (handler  (make-busy-timeout 136000)))
     (if dbexists
 	(vector db actualfname)
 	(begin
@@ -164,12 +172,12 @@
 	     ;; If we've tried ten times and failed there is a serious problem
 	     ;; try to remove the lock db and allow it to be recreated
 	     (handle-exceptions
 	      exn
 	      #f
-	      (if (file-exists? journal)(delete-file journal))
-	      (if (file-exists? fname)  (delete-file fname))
+	      (if (common:file-exists? journal)(delete-file journal))
+	      (if (common:file-exists? fname)  (delete-file fname))
 	      #f))))
      (sqlite3:execute (lock-queue:db-dat-get-db dbdat) "DELETE FROM runlocks WHERE test_id=?;" test-id)
      (sqlite3:finalize! (lock-queue:db-dat-get-db dbdat)))))
 
 (define (lock-queue:steal-lock dbdat test-id #!key (count 10))

Index: margs.scm
==================================================================
--- margs.scm
+++ margs.scm
@@ -1,13 +1,22 @@
 ;; Copyright 2007-2010, Matthew Welland.
 ;;
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
-;;
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 
 (declare (unit margs))
 ;; (declare (uses common))
 
 (define args:arg-hash (make-hash-table))

Index: megatest-version.scm
==================================================================
--- megatest-version.scm
+++ megatest-version.scm
@@ -1,7 +1,23 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 ;; Always use two or four digit decimal
 ;; 1.01, 1.02...1.10,1.11,1.1101 ... 1.99,2.00..
 
-(declare (unit megatest-version))
+;; (declare (unit megatest-version))
 
-(define megatest-version 1.6404)
-
+(define megatest-version 1.6576)

Index: megatest.config
==================================================================
--- megatest.config
+++ megatest.config
@@ -1,22 +1,74 @@
-[fields]
-a text
-b text
-c text
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
+## commented out due to a bug in v1.6501 in mtutil
+## [fields]
+## a text
+## b text
+## c text
+usercode    .mtutil.scm
+areafilter  area-to-run
+targtrans   generic-target-translator
+runtrans    generic-runname-translator
 
 [setup]
-pktsdirs /tmp/pkts /some/other/source
+pktsdirs /tmp/mt_pkts /some/other/source
 
 [areas]
 #         path-to-area   map-target-script(future, optional)
-fullrun   path=tests/fullrun
+# someqa     path=../megatestqa/someqa; targtrans=somefunc; areafilter=area-to-run
+fullrun   path=tests/fullrun; 
 # targtrans is name of scheme proc stored in .mtutil.scm, which lives in PWD where mtutil is run
+#           the target translator can return: a/target OR (list/of targets/to apply/run) OR #f i.e. run nothing
 # ext-tests path=ext-tests; targtrans=prefix-contour;
-ext-tests path=ext-tests
+ext       path=ext-tests
 
 [contours]
-#     mode-patt/tag-expr
-quick selector=QUICKPATT/quick
-full  areas=fullrun,ext-tests; selector=MAXPATT/
-all   areas=fullrun,ext-tests
-snazy areas=%; selector=QUICKPATT/
+#     selector=tag-expr/mode-patt
+quick areas=ext;    selector=/QUICKPATT
+quick2 areafn=check-area; selector=/QUICKPATT
+# quick areas=fullrun,ext-tests; selector=QUICKPATT/quick
+# full  areas=fullrun,ext-tests; selector=MAXPATT/
+# short areas=fullrun,ext-tests; selector=MAXPATT/
+# all   areas=fullrun,ext-tests
+# snazy selector=QUICKPATT/
+
+[nopurpose]
+
+[access]
+ext #{getenv USER}:admin matt:admin mattw:owner
+
+[accesstypes]
+admin run rerun resume remove set-ss rerun-clean
+owner run rerun resume remove rerun-all
+badguy set-ss
+
+[setup]
+maxload 1.2
+
+[listeners]
+localhost:12345  contact=matt@kiatoa.com
+localhost:54321  contact=matt@kiatoa.com
+
+[listener]
+script nbfake echo
+
+
+[server]
+timeout 1
 
+[include local.config]

Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -1,85 +1,123 @@
 ;; Copyright 2006-2017, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
 
 ;; (include "common.scm")
-;; (include "megatest-version.scm")
+(include "megatest-version.scm")
 
 ;; fake out readline usage of toplevel-command
 (define (toplevel-command . a) #f)
 
-(use sqlite3 srfi-1 posix regex regex-case srfi-69 base64 readline apropos json http-client directory-utils rpc typed-records;; (srfi 18) extras)
-     http-client srfi-18 extras format) ;;  zmq extras)
-
-;; Added for csv stuff - will be removed
-;;
-(use sparse-vectors)
-
-(import (prefix sqlite3 sqlite3:))
-(import (prefix base64 base64:))
-(import (prefix rpc rpc:))
-(require-library mutils)
-
-;; (use zmq)
-
 (declare (uses common))
-(declare (uses megatest-version))
+;; (declare (uses megatest-version))
 (declare (uses margs))
 (declare (uses runs))
 (declare (uses launch))
 (declare (uses server))
 (declare (uses client))
 (declare (uses tests))
 (declare (uses genexample))
-(declare (uses daemon))
+;; (declare (uses daemon))
 (declare (uses db))
 ;; (declare (uses dcommon))
 
 (declare (uses tdb))
 (declare (uses mt))
 (declare (uses api))
 (declare (uses tasks)) ;; only used for debugging.
 (declare (uses env))
 (declare (uses diff-report))
+(declare (uses mutils))
+;; (declare (uses ftail))
+;; (import ftail)
 
 (define *db* #f) ;; this is only for the repl, do not use in general!!!!
 
 (include "common_records.scm")
 (include "key_records.scm")
 (include "db_records.scm")
 (include "run_records.scm")
 (include "megatest-fossil-hash.scm")
 
+(use (prefix sqlite3 sqlite3:) srfi-1 posix regex regex-case srfi-69 (prefix base64 base64:)
+     readline apropos json http-client directory-utils typed-records
+     http-client srfi-18 extras format)
+
+;; Added for csv stuff - will be removed
+;;
+(use sparse-vectors)
+
+(import mutils)
+
+;;(require-library mutils)
+
+(define *usage-log-file* #f)    ;; put path to file for logging usage in this var in the ~/.megatestrc file
+(define *usage-use-seconds* #t) ;; for Epoc seconds in usage logging change this to #t in ~/.megatestrc file
+
+;; load the ~/.megatestrc file, put (use trace)(trace-call-sites #t)(trace function-you-want-to-trace) in this file
+;;
 (let ((debugcontrolf (conc (get-environment-variable "HOME") "/.megatestrc")))
-  (if (file-exists? debugcontrolf)
+  (if (common:file-exists? debugcontrolf)
       (load debugcontrolf)))
+
+;; usage logging, careful with this, it is not designed to deal with all real world challenges!
+;;
+(if (and *usage-log-file*
+         (file-write-access? *usage-log-file*))
+    (with-output-to-file
+        *usage-log-file*
+      (lambda ()
+        (print
+         (if *usage-use-seconds*
+             (current-seconds)
+             (time->string
+              (seconds->local-time (current-seconds))
+              "%Yww%V.%w %H:%M:%S"))
+         " "
+         (current-user-name) " "
+         (current-directory) " "
+         "\"" (string-intersperse (argv) " ") "\""))
+      #:append))
 
 ;; Disabled help items
 ;;  -rollup                 : (currently disabled) fill run (set by :runname)  with latest test(s)
 ;;                            from prior runs with same keys
 ;;  -daemonize              : fork into background and disconnect from stdin/out
 
 (define help (conc "
 Megatest, documentation at http://www.kiatoa.com/fossils/megatest
   version " megatest-version "
-  license GPL, Copyright Matt Welland 2006-2015
-
+  license GPL, Copyright Matt Welland 2006-2017
+ 
 Usage: megatest [options]
   -h                      : this help
   -manual                 : show the Megatest user manual
   -version                : print megatest version (currently " megatest-version ")
 
 Launching and managing runs
   -run                    : run all tests or as specified by -testpatt
   -remove-runs            : remove the data for a run, requires -runname and -testpatt
-                            Optionally use :state and :status
+                            Optionally use :state and :status, use -keep-records to remove only
+                            the run data. Use -kill-wait to override the 10 second
+                            per test wait after kill delay (e.g. -kill-wait 0). 
+  -kill-runs              : kill existing run(s) (all incomplete tests killed)
+  -kill-rerun             : kill an existing run (all incomplete tests killed and run is rerun)
   -set-state-status X,Y   : set state to X and status to Y, requires controls per -remove-runs
   -rerun FAIL,WARN...     : force re-run for tests with specificed status(s)
   -rerun-clean            : set all tests not COMPLETED+PASS,WARN,WAIVED to NOT_STARTED,n/a
                             and then run the specified testpatt with -preclean
   -rerun-all              : set all tests to NOT_STARTED,n/a and run with -preclean
@@ -89,20 +127,27 @@
   -get-run-status         : gets status for run specified by target and runname
   -run-wait               : wait on run specified by target and runname
   -preclean               : remove the existing test directory before running the test
   -clean-cache            : remove the cached megatest.config and runconfigs.config files
   -no-cache               : do not use the cached config files. 
+  -one-pass               : launch as many tests as you can but do not wait for more to be ready
+  -remove-keep N          : remove all but N most recent runs per target; use '-actions, -age, -precmd'
+  -age               : 120d,3h,20m to apply only to runs older than the 
+                                 specified age. NB// M=month, m=minute
+  -actions [,...] : actions to take; print,remove-runs,archive,kill-runs
+  -precmd                 : insert a wrapper command in front of the commands run
 
 Selectors (e.g. use for -runtests, -remove-runs, -set-state-status, -list-runs etc.)
   -target key1/key2/...   : run for key1, key2, etc.
   -reqtarg key1/key2/...  : run for key1, key2, etc. but key1/key2 must be in runconfigs
   -testpatt patt1/patt2,patt3/...  : % is wildcard
   -runname                : required, name for this particular test run
   -state                  : Applies to runs, tests or steps depending on context
   -status                 : Applies to runs, tests or steps depending on context
-  --modepatt key          : load testpatt from  in runconfigs instead of default TESTPATT if -testpatt and -tagexpr are not specified
+  -modepatt key           : load testpatt from  in runconfigs instead of default TESTPATT if -testpatt and -tagexpr are not specified
   -tagexpr tag1,tag2%,..  : select tests with tags matching expression
+  
 
 Test helpers (for use inside tests)
   -step stepname
   -test-status            : set the state and status of a test (use :state and :status)
   -setlog logfname        : set the path/filename to the final log relative to the test
@@ -133,21 +178,24 @@
   -list-disks             : list the disks available for storing runs
   -list-targets           : list the targets in runconfigs.config
   -list-db-targets        : list the target combinations used in the db
   -show-config            : dump the internal representation of the megatest.config file
   -show-runconfig         : dump the internal representation of the runconfigs.config file
-  -dumpmode MODE          : dump in MODE format instead of sexpr, MODE=json,ini,sexp etc.
+  -dumpmode MODE          : dump in MODE format instead of sexpr, MODE=json,ini,sexp etc. (add -debug 0,9 to see which file contributes each line)
   -show-cmdinfo           : dump the command info for a test (run in test environment)
   -section sectionName
   -var varName            : for config and runconfig lookup value for sectionName varName
   -since N                : get list of runs changed since time N (Unix seconds)
   -fields fieldspec       : fields to include in json dump; runs:id,runame+tests:testname+steps
   -sort fieldname         : in -list-runs sort tests by this field
+  -testdata-csv [categorypatt/]varpatt  : dump testdata for given category
 
 Misc 
   -start-dir path         : switch to this directory before running megatest
   -contour cname          : add a level of hierarcy to the linktree and run paths
+  -area-tag tagname       : add a tag to an area while syncing to pgdb
+  -run-tag tagname        : add a tag to a run while syncing to pgdb
   -rebuild-db             : bring the database schema up to date
   -cleanup-db             : remove any orphan records, vacuum the db
   -import-megatest.db     : push data from megatest.db to cache db files in /tmp/$USER
   -sync-to-megatest.db    : pull data from cache files in /tmp/$USER to megatest.db
   -sync-to dest           : sync to new postgresql central style database
@@ -154,19 +202,22 @@
   -update-meta            : update the tests metadata for all tests
   -setvars VAR1=val1,VAR2=val2 : Add environment variables to a run NB// these are
                                  overwritten by values set in config files.
   -server -|hostname      : start the server (reduces contention on megatest.db), use
                             - to automatically figure out hostname
+  -adjutant C,M           : start the server/adjutant with allocated cores C and Mem M (Gig), 
+                            use 0,0 to auto use full machine
   -transport http|rpc     : use http or rpc for transport (default is http) 
   -log logfile            : send stdout and stderr to logfile
   -list-servers           : list the servers 
   -kill-servers           : kill all servers
   -repl                   : start a repl (useful for extending megatest)
   -load file.scm          : load and run file.scm
   -mark-incompletes       : find and mark incomplete tests
   -ping run-id|host:port  : ping server, exit with 0 if found
   -debug N|N,M,O...       : enable debug 0-N or N and M and O ...
+  -debug-noprop N|M,M,O...: enable debug but do not propagate to subprocesses via MT_DEBUG
   -config fname           : override the megatest.config file with fname
   -append-config fname    : append fname to the megatest.config file
 
 Utilities
   -env2file fname         : write the environment to fname.csh and fname.sh
@@ -179,12 +230,21 @@
                             will substitute %s for the sheet name in generating 
                             multiple sheets)
   -o                      : output file for refdb2dat (defaults to stdout)
   -archive cmd            : archive runs specified by selectors to one of disks specified
                             in the [archive-disks] section.
-                            cmd: keep-html, restore, save, save-remove
-  -generate-html          : create a simple html tree for browsing your runs
+                            cmd: keep-html, restore, save, save-remove, get, replicate-db (use 
+                            -dest to set destination), -include path1,path2... to get or save specific files
+  -generate-html          : create a simple html dashboard for browsing your runs
+  -generate-html-structure  : create a top level html veiw to list targets/runs and a Run view within each run directory.  
+  -list-run-time          : list time requered to complete runs. It supports following switches
+                            -run-patt  -target-patt  -dumpmode 
+  -list-test-time	  : list time requered to complete each test in a run. It following following arguments
+                            -runname  -target  -dumpmode 
+  -syscheck               : do some very basic checks; write access and space in tmp, home, runs, links and 
+                            is $DISPLAY valid 
+  -list-waivers           : dump waivers for specified target, runname, testpatt to stdout
 
 Diff report
   -diff-rep               : generate diff report (must include -src-target, -src-runname, -target, -runname
                                                   and either -diff-email or -diff-html)
   -src-target 
@@ -197,12 +257,12 @@
   -pathmod path           : insert path, i.e. path/runame/itempath/logfile.html
                             will clear the field if no rundir/testname/itempath/logfile
                             if it contains forward slashes the path will be converted
                             to windows style
 Getting started
-  -create-megatest-area       : create a skeleton megatest area. You will be prompted for paths
-  -create-test testname       : create a skeleton megatest test. You will be prompted for info
+  -create-megatest-area   : create a skeleton megatest area. You will be prompted for paths
+  -create-test testname   : create a skeleton megatest test. You will be prompted for info
 
 Examples
 
 # Get test path, use '.' to get a single path or a specific path/file pattern
 megatest -test-files 'logs/*.log' -target ubuntu/n%/no% -runname w49% -testpatt test_mt%
@@ -228,45 +288,72 @@
 			":state"  
 			"-state"
 			":status"
 			"-status"
 			"-list-runs"
+                        "-testdata-csv"
 			"-testpatt"
                         "--modepatt"
+                        "-modepatt"
                         "-tagexpr"
 			"-itempatt"
 			"-setlog"
 			"-set-toplog"
 			"-runstep"
 			"-logpro"
 			"-m"
 			"-rerun"
+
 			"-days"
 			"-rename-run"
 			"-to"
+			"-dest"
+                        "-source" 
+                        "-time-stamp" 
 			;; values and messages
 			":category"
 			":variable"
 			":value"
 			":expected"
 			":tol"
 			":units"
+
 			;; misc
 			"-start-dir"
+                        "-run-patt"
+                        "-target-patt"   
 			"-contour"
+                        "-area-tag"  
+                        "-area"  
+			"-run-tag"
 			"-server"
+			"-adjutant"
 			"-transport"
 			"-port"
 			"-extract-ods"
 			"-pathmod"
 			"-env2file"
 			"-envcap"
 			"-envdelta"
 			"-setvars"
 			"-set-state-status"
+
+                        ;; move runs stuff here
+                        "-remove-keep"           
 			"-set-run-status"
+			"-age"
+
+			;; archive 
+			"-archive"
+			"-actions"
+			"-precmd"
+			"-include"
+			"-exclude-rx"
+			"-exclude-rx-from"
+			
 			"-debug" ;; for *verbosity* > 2
+			"-debug-noprop"
 			"-create-test"
 			"-override-timeout"
 			"-test-files"  ;; -test-paths is for listing all
 			"-load"        ;; load and exectute a scheme file
 			"-section"
@@ -275,11 +362,11 @@
 			"-run-id"
 			"-ping"
 			"-refdb2dat"
 			"-o"
 			"-log"
-			"-archive"
+                        "-sync-log"
 			"-since"
 			"-fields"
 			"-recover-test" ;; run-id,test-id - used internally to recover a test stuck in RUNNING state
 			"-sort"
 			"-target-db"
@@ -289,11 +376,15 @@
                         "-src-target"
                         "-src-runname"
                         "-diff-email"
 			"-sync-to"			
 			"-pgsync"
+			"-kill-wait"    ;; wait this long before removing test (default is 10 sec)
                         "-diff-html"
+
+			;; wizards, area capture, setup new ...
+			"-extract-skeleton"
 			)
  		 (list  "-h" "-help" "--help"
 			"-manual"
 			"-version"
 		        "-force"
@@ -310,37 +401,48 @@
 			"-rerun-clean"
 			"-rerun-all"
 			"-clean-cache"
 			"-no-cache"
 			"-cache-db"
+			"-cp-eventtime-to-publishtime"
                         "-use-db-cache"
                         "-prepend-contour"
+
+
 			;; misc
 			"-repl"
 			"-lock"
 			"-unlock"
 			"-list-servers"
 			"-kill-servers"
                         "-run-wait"      ;; wait on a run to complete (i.e. no RUNNING)
+			"-one-pass"      ;;
 			"-local"         ;; run some commands using local db access
-                        "-generate-html"
-
+			"-generate-html"
+			"-generate-html-structure" 
+			"-list-run-time"
+                        "-list-test-time"
+			
 			;; misc queries
 			"-list-disks"
 			"-list-targets"
 			"-list-db-targets"
 			"-show-runconfig"
 			"-show-config"
 			"-show-cmdinfo"
 			"-get-run-status"
+			"-list-waivers"
 
 			;; queries
 			"-test-paths" ;; get path(s) to a test, ordered by youngest first
 
 			"-runall"    ;; run all tests, respects -testpatt, defaults to %
 			"-run"       ;; alias for -runall
 			"-remove-runs"
+                        "-kill-runs"
+                        "-kill-rerun"
+                        "-keep-records" ;; use with -remove-runs to remove only the run data
 			"-rebuild-db"
 			"-cleanup-db"
 			"-rollup"
 			"-update-meta"
 			"-create-megatest-area"
@@ -348,16 +450,22 @@
 
 			"-convert-to-norm"
 			"-convert-to-old"
 			"-import-megatest.db"
 			"-sync-to-megatest.db"
-			
+                        "-sync-brute-force"
 			"-logging"
 			"-v" ;; verbose 2, more than normal (normal is 1)
 			"-q" ;; quiet 0, errors/warnings only
 
                         "-diff-rep"
+
+			"-syscheck"
+			"-obfuscate"
+			;; junk placeholder
+			;; "-:p"
+			
                         )
 		 args:arg-hash
 		 0))
 
 ;; Add args that use remargs here
@@ -372,11 +480,11 @@
     (debug:print-error 0 *default-log-port* "Unrecognised arguments: " (string-intersperse (if (list? remargs) remargs (argv))  " ")))
 
 ;; before doing anything else change to the start-dir if provided
 ;;
 (if (args:get-arg "-start-dir")
-    (if (file-exists? (args:get-arg "-start-dir"))
+    (if (common:file-exists? (args:get-arg "-start-dir"))
         (let ((fullpath (common:real-path (args:get-arg "-start-dir"))))
           (setenv "PWD" fullpath)
           (change-directory fullpath))
 	(begin
 	  (debug:print-error 0 *default-log-port* "non-existant start dir " (args:get-arg "-start-dir") " specified, exiting.")
@@ -389,53 +497,74 @@
 
 ;; The watchdog is to keep an eye on things like db sync etc.
 ;;
 
 ;; TODO: for multiple areas, we will have multiple watchdogs; and multiple threads to manage
-(define *watchdog* (make-thread common:watchdog "Watchdog thread"))
+(define *watchdog* (make-thread
+		    (lambda ()
+		      (handle-exceptions
+			  exn
+			  (begin
+			    (print-call-chain)
+			    (print " message: " ((condition-property-accessor 'exn 'message) exn) ", exn=" exn))
+			(common:watchdog)))
+		    "Watchdog thread"))
 
 ;;(if (not (args:get-arg "-server"))
 ;;    (thread-start! *watchdog*)) ;; if starting a server; wait till we get to running state before kicking off watchdog
 (let* ((no-watchdog-args
        '("-list-runs"
+         "-testdata-csv"
          "-list-servers"
          "-server"
+	 "-adjutant"
          "-list-disks"
          "-list-targets"
          "-show-runconfig"
          ;;"-list-db-targets"
          "-show-runconfig"
          "-show-config"
-         "-show-cmdinfo"))
+         "-show-cmdinfo"
+	 "-cleanup-db"))
        (no-watchdog-args-vals (filter (lambda (x) x)
                                       (map args:get-arg no-watchdog-args)))
        (start-watchdog (null? no-watchdog-args-vals)))
+       ;;(print  "no-watchdog-args="no-watchdog-args "no-watchdog-args-vals="no-watchdog-args-vals " start-watchdog-specail-arg-val:" start-watchdog-specail-arg-val " start-watchdog:" start-watchdog) 
   ;;(BB> "no-watchdog-args="no-watchdog-args "no-watchdog-args-vals="no-watchdog-args-vals) 
   (if start-watchdog
       (thread-start! *watchdog*)))
 
 
 ;; bracket open-output-file with code to make leading directory if it does not exist and handle exceptions
-(define (open-logfile logpath)
+(define (open-logfile logpath-in)
   (condition-case
-   (let* ((log-dir (or (pathname-directory logpath) ".")))
+   (let* ((log-dir (or (pathname-directory logpath-in) "."))
+	  (fname   (pathname-strip-directory logpath-in))
+	  (logpath (if (> (string-length fname) 250)
+		       (let ((newlogf (conc log-dir "/" (common:get-signature fname) ".log")))
+			 (debug:print 0 *default-log-port* "WARNING: log file " logpath-in " path too long, converted to " newlogf)
+			 newlogf)
+		       logpath-in)))
      (if (not (directory-exists? log-dir))
          (system (conc "mkdir -p " log-dir)))
      (open-output-file logpath))
    (exn ()
         (debug:print-error 0 *default-log-port* "Could not open log file for write: "logpath)
         (define *didsomething* #t)  
         (exit 1))))
 
-    
+;; this segment will run launch:setup only if -log is not set. This is fairly safe as servers are not
+;; manually started and thus should never be started in a non-megatest area. Thus no need to handle situation
+;; where (launch:setup) returns #f?
+;;
 (if (or (args:get-arg "-log")(args:get-arg "-server")) ;; redirect the log always when a server
     (handle-exceptions
 	exn
 	(begin
-	  (print "ERROR: Failed to switch to log output. " ((conition-property-accessor 'exn 'message) exn))
+	  (print "ERROR: Failed to switch to log output. " ((condition-property-accessor 'exn 'message) exn) ", exn=" exn)
 	  )
-      (let* ((tl   (or (args:get-arg "-log")(launch:setup)))   ;; run launch:setup if -server
+      (let* ((tl   (or (args:get-arg "-log")(launch:setup)))   ;; run launch:setup if -server, ensure we do NOT run launch:setup if -log specified
 	     (logf (or (args:get-arg "-log") ;; use -log unless we are a server, then craft a logfile name
 		       (conc tl "/logs/server-" (current-process-id) "-" (get-host-name) ".log")))
 	     (oup  (open-logfile logf)))
 	(if (not (args:get-arg "-log"))
 	    (hash-table-set! args:arg-hash "-log" logf)) ;; fake out future queries of -log
@@ -453,11 +582,11 @@
     (let* ((htmlviewercmd (or (configf:lookup *configdat* "setup" "htmlviewercmd")
 			      (common:which '("firefox" "arora"))))
 	   (install-home  (common:get-install-area))
 	   (manual-html   (conc install-home "/share/docs/megatest_manual.html")))
       (if (and install-home
-	       (file-exists? manual-html))
+	       (common:file-exists? manual-html))
 	  (system (conc "(" htmlviewercmd " " manual-html " ) &"))
 	  (system (conc "(" htmlviewercmd " http://www.kiatoa.com/cgi-bin/fossils/megatest/doc/tip/docs/manual/megatest_manual.html ) &")))
       (exit)))
 
 (if (args:get-arg "-version")
@@ -479,12 +608,14 @@
 		      (printf "Preparing to exit with exit code ~A ...\n" exit-code)
 		      (for-each
 		       
 		       (lambda (pid)
 			 (handle-exceptions
-			  exn
-			  #t
+			     exn
+			   (begin
+			     (printf "process reap failed. exn=~A\n" exn)
+			     #t)
 			  (let-values (((pid-val exit-status exit-code) (process-wait pid #t)))
 				      (if (or (eq? pid-val pid)
 					      (eq? pid-val 0))
 					  (begin
 					    (printf "Sending signal/term to ~A\n" pid)
@@ -492,23 +623,37 @@
 		       (process:children #f))
 		      (original-exit exit-code)))))
 
 ;; for some switches always print the command to stderr
 ;;
-(if (args:any? "-run" "-runall" "-remove-runs" "-set-state-status")
+(if (args:any? "-run" "-runall" "-remove-runs" "-set-state-status" "-kill-runs" "-kill-rerun")
     (debug:print 0 *default-log-port* (string-intersperse (argv) " ")))
+
+;; some switches imply homehost. Exit here if not on homehost
+;;
+(let ((homehost-required  (list "-cleanup-db" "-server")))
+  (if (apply args:any? homehost-required)
+      (if (not (common:on-homehost?))
+	  (for-each
+	   (lambda (switch)
+	     (if (args:get-arg switch)
+		 (begin
+		   (debug:print 0 *default-log-port* "ERROR: you must be on the homehost to run with " switch
+				", you can move homehost by removing the .homehost file but this will disrupt any runs in progress.")
+		   (exit 1))))
+	   homehost-required))))
 
 ;;======================================================================
 ;; Misc setup stuff
 ;;======================================================================
 
 (debug:setup)
 
 (if (args:get-arg "-logging")(set! *logging* #t))
 
-(if (debug:debug-mode 3) ;; we are obviously debugging
-    (set! open-run-close open-run-close-no-exception-handling))
+;;(if (debug:debug-mode 3) ;; we are obviously debugging
+;;    (set! open-run-close open-run-close-no-exception-handling))
 
 (if (args:get-arg "-itempatt")
     (let ((newval (conc (args:get-arg "-testpatt") "/" (args:get-arg "-itempatt"))))
       (debug:print 0 *default-log-port* "WARNING: -itempatt has been deprecated, please use -testpatt testpatt/itempatt method, new testpatt is "newval)
       (hash-table-set! args:arg-hash "-testpatt" newval)
@@ -534,11 +679,13 @@
 ;; handle a clean-cache request as early as possible
 ;;
 (if (args:get-arg "-clean-cache")
     (let ((toppath  (launch:setup)))
       (set! *didsomething* #t) ;; suppress the help output.
-      (runs:clean-cache (getenv "MT_TARGET")(args:get-arg "-runname") toppath)))
+      (runs:clean-cache (common:args-get-target)
+			(args:get-arg "-runname")
+			toppath)))
 	  
 (if (args:get-arg "-env2file")
     (begin
       (save-environment-as-files (args:get-arg "-env2file"))
       (set! *didsomething* #t)))
@@ -690,11 +837,11 @@
 				 (else
 				  (loop row (+ col 1) (append curr-row (list val)) result)))))))))
 		    (hash-table-keys results))))
 		((sqlite3)
 		 (let* ((db-file   (or out-file (pathname-file input-db)))
-			(db-exists (file-exists? db-file))
+			(db-exists (common:file-exists? db-file))
 			(db        (sqlite3:open-database db-file)))
 		   (if (not db-exists)(sqlite3:execute db "CREATE TABLE data (sheet,section,var,val);"))
 		   (configf:map-all-hier-alist
 		    data
 		    (lambda (sheetname sectionname varname val)
@@ -724,11 +871,14 @@
       (let* ((db      (env:open-db (if (null? remargs) "envdat.db" (car remargs)))))
 	(env:save-env-vars db envcap)
 	(env:close-database db)
 	(set! *didsomething* #t))))
 
-;; delta "language" will eventually be res=a+b-c but for now it is just res=a-b 
+;; delta "language" will eventually be res=a+b-c but for now it is just res=a-b
+;;
+;; db file can be stuck on the end of the command line:
+;;   megatest -envdelta start-end -dumpmode bash -o .ezsteps/step5.sh /tmp/myfile.db 
 ;;
 (let ((envdelta (args:get-arg "-envdelta")))
   (if envdelta
       (let ((match (string-split envdelta "-")));; (string-match "([a-z0-9_]+)=([a-z0-9_\\-,]+)" envdelta)))
 	(if (not (null? match))
@@ -750,11 +900,11 @@
 		    (lambda ()
 		      (env:print added removed changed)))
 		  (env:print added removed changed))
 	      (env:close-database db)
 	      (set! *didsomething* #t))
-	    (debug:print-error 0 *default-log-port* "Parameter to -envdelta should be new=star-end")))))
+	    (debug:print-error 0 *default-log-port* "Parameter to -envdelta should be new=start-end")))))
 
 ;;======================================================================
 ;; Start the server - can be done in conjunction with -runall or -runtests (one day...)
 ;;   we start the server if not running else start the client thread
 ;;======================================================================
@@ -764,10 +914,18 @@
 (if (args:get-arg "-server")
     (let ((tl        (launch:setup))
           (transport-type (string->symbol (or (args:get-arg "-transport") "http"))))
       (server:launch 0 transport-type)
       (set! *didsomething* #t)))
+
+;; The adjutant is a bit different, it does NOT run (launch:setup) as it is not necessarily tied to
+;; a specific Megatest area. Detail are being hashed out and this may change.
+;;
+(if (args:get-arg "-adjutant")
+    (begin
+      (adjutant-run)
+      (set! *didsomething* #t)))
 
 (if (or (args:get-arg "-list-servers")
         (args:get-arg "-kill-servers"))
     (let ((tl (launch:setup)))
       (if tl ;; all roads from here exit
@@ -838,11 +996,11 @@
   (let* ((rundir (if (and (getenv "MT_LINKTREE")(getenv "MT_TARGET")(getenv "MT_RUNNAME"))
 		     (conc (getenv "MT_LINKTREE") "/" (getenv "MT_TARGET") "/" (getenv "MT_RUNNAME"))
 		     #f))
 	 (cfgf   (if rundir (conc rundir "/.runconfig." megatest-version "-" megatest-fossil-hash) #f)))
     (if (and cfgf
-	     (file-exists? cfgf)
+	     (common:file-exists? cfgf)
 	     (file-write-access? cfgf)
 	     (common:use-cache?))
 	(configf:read-alist cfgf)
 	(let* ((keys   (rmt:get-keys))
 	       (target (common:args-get-target))
@@ -861,12 +1019,13 @@
 		   (file-write-access? rundir))
 	      (begin
                 (if (not (common:in-running-test?))
                     (configf:write-alist data cfgf))
 		;; force re-read of megatest.config - this resolves circular references between megatest.config
-		(launch:setup force: #t)
-		(launch:cache-config))) ;; we can safely cache megatest.config since we have a valid runconfig
+		(launch:setup force-reread: #t)
+		;; (launch:cache-config) ;; there are two independent config cache locations, turning this one off for now. MRW.
+		)) ;; we can safely cache megatest.config since we have a valid runconfig
 	  data))))
 
 (if (args:get-arg "-show-runconfig")
     (let ((tl (launch:setup)))
       (push-directory *toppath*)
@@ -901,15 +1060,16 @@
 	(let ((val (configf:lookup data (args:get-arg "-section")(args:get-arg "-var"))))
 	  (if val (print val))))
 
        ;; print just a section if only -section
 
-       ((not (args:get-arg "-dumpmode"))
+       ((equal? (args:get-arg "-dumpmode") "sexp")
 	(pp (hash-table->alist data)))
-       ((string=? (args:get-arg "-dumpmode") "json")
+       ((equal? (args:get-arg "-dumpmode") "json")
 	(json-write data))
-       ((string=? (args:get-arg "-dumpmode") "ini")
+       ((or (not (args:get-arg "-dumpmode"))
+	    (string=? (args:get-arg "-dumpmode") "ini"))
 	(configf:config->ini data))
        (else
 	(debug:print-error 0 *default-log-port* "-dumpmode of " (args:get-arg "-dumpmode") " not recognised")))
       (set! *didsomething* #t)
       (pop-directory)
@@ -928,23 +1088,34 @@
 ;; Remove old run(s)
 ;;======================================================================
 
 ;; since several actions can be specified on the command line the removal
 ;; is done first
-(define (operate-on action)
+(define (operate-on action #!key (mode #f)(target-in #f)(runname-in #f)(keys-in #f)(keyvals-in #f)) ;; #f is "use default"
   (let* ((runrec (runs:runrec-make-record))
-	 (target (common:args-get-target)))
+	 (target (or target-in   (common:args-get-target))) ;; eventually get rid of the call to common:args-get-target
+	 (runname (or runname-in
+		      (args:get-arg "-runname"))) ;; eventually get rid of the get-arg calls
+	 (testpatt (or (args:get-arg "-testpatt")
+		       (and (eq? action 'archive) ;; if it is an archive command fallback to MT_TEST_NAME and MT_ITEMPATH
+			    (common:get-full-test-name))
+		       (and (eq? action 'kill-runs)
+			    "%/%") ;; I'm just guessing that this is correct :(
+		       (common:args-get-testpatt #f) ;; (args:get-arg "-testpatt")))
+		       ))) ;;
     (cond
      ((not target)
-      (debug:print-error 0 *default-log-port* "Missing required parameter for " action ", you must specify -target or -reqtarg")
+      (debug:print-error 0 *default-log-port* "Missing required parameter for "
+			 action ", you must specify -target or -reqtarg")
       (exit 1))
-     ((not (or (args:get-arg ":runname")
-	       (args:get-arg "-runname")))
-      (debug:print-error 0 *default-log-port* "Missing required parameter for " action ", you must specify the run name pattern with -runname patt")
+     ((not runname)
+      (debug:print-error 0 *default-log-port* "Missing required parameter for "
+			 action ", you must specify the run name pattern with -runname patt")
       (exit 2))
-     ((not (args:get-arg "-testpatt"))
-      (debug:print-error 0 *default-log-port* "Missing required parameter for " action ", you must specify the test pattern with -testpatt")
+     ((not testpatt)
+      (debug:print-error 0 *default-log-port* "Missing required parameter for "
+			 action ", you must specify the test pattern with -testpatt")
       (exit 3))
      (else
       (if (not (car *configinfo*))
 	  (begin
 	    (debug:print-error 0 *default-log-port* "Attempted " action "on test(s) but run area config file not found")
@@ -953,23 +1124,76 @@
 	  (begin
 	    ;; check for correct version, exit with message if not correct
 	    (common:exit-on-version-changed)
 	    (runs:operate-on  action
 			      target
-			      (common:args-get-runname)  ;; (or (args:get-arg "-runname")(args:get-arg ":runname"))
-			      (common:args-get-testpatt #f) ;; (args:get-arg "-testpatt")
-			      state: (common:args-get-state)
+			      runname
+			      testpatt
+			      state:  (common:args-get-state)
 			      status: (common:args-get-status)
-			      new-state-status: (args:get-arg "-set-state-status"))))
+			      new-state-status: (args:get-arg "-set-state-status")
+                              mode: mode)))
       (set! *didsomething* #t)))))
+
+(if (args:get-arg "-kill-runs")
+    (general-run-call 
+     "-kill-runs"
+     "kill runs"
+     (lambda (target runname keys keyvals)
+       (operate-on 'kill-runs mode: #f)
+       )))
+
+(if (args:get-arg "-kill-rerun")
+    (let* ((target-patt (common:args-get-target))
+           (runname-patt (args:get-arg "-runname")))
+      (cond ((not target-patt)
+             (debug:print-error 0 *default-log-port* "Missing target, must specify target for -kill-rerun with -target ")
+             (exit 1))
+            ((not runname-patt)
+             (debug:print-error 0 *default-log-port* "Missing runname, must specify runname for -kill-rerun with -runname ")
+             (exit 1))
+            ((string-search "[ ,%]" target-patt)
+             (debug:print-error 0 *default-log-port* "Invalid target ["target-patt"], must specify exact target (no wildcards) for -kill-rerun with -target ")
+             (exit 1))
+            ((string-search "[ ,%]" runname-patt)
+             (debug:print-error 0 *default-log-port* "Invalid runname ["runname-patt"], must specify exact runname (no wildcards) for -kill-rerun with -runname ")
+             (exit 1))
+            (else
+             (general-run-call 
+              "-kill-runs"
+              "kill runs"
+              (lambda (target runname keys keyvals)
+                (operate-on 'kill-runs mode: #f)
+                ))
+      
+             (thread-sleep! 15))
+            ;; fall thru and let "-run" loop fire
+            )))
+
 
 (if (args:get-arg "-remove-runs")
     (general-run-call 
      "-remove-runs"
      "remove runs"
      (lambda (target runname keys keyvals)
-       (operate-on 'remove-runs))))
+       (operate-on 'remove-runs mode: (if (args:get-arg "-keep-records")
+                                          'remove-data-only
+                                          'remove-all)))))
+
+(if (args:get-arg "-remove-keep")
+    (general-run-call 
+     "-remove-keep"
+     "remove keep"
+     (lambda (target runname keys keyvals)
+       (let ((actions (map string->symbol
+                           (string-split
+			    (or (args:get-arg "-actions")
+				"print")
+			    ",")))) ;; default to printing the output
+         (runs:remove-all-but-last-n-runs-per-target target runname
+						     (string->number (args:get-arg "-remove-keep"))
+						     actions: actions)))))
 
 (if (args:get-arg "-set-state-status")
     (general-run-call 
      "-set-state-status"
      "set state and status"
@@ -1023,10 +1247,114 @@
     (if indx
 	(if (>= indx (vector-length datavec))
 	    #f ;; index too high, should raise an error I suppose
 	    (vector-ref datavec indx))
 	#f)))
+
+
+
+
+
+(when (args:get-arg "-testdata-csv")
+  (if (launch:setup)
+      (let* ((keys        (rmt:get-keys)) ;; (db:get-keys dbstruct))
+             (runpatt     (or (args:get-arg "-runname") "%"))
+             (testpatt    (common:args-get-testpatt #f))
+             (datapatt    (args:get-arg "-testdata-csv"))
+             (match-data  (string-match "^([^/]+)/(.*)" (args:get-arg "-testdata-csv")))
+             (categorypatt (if match-data (list-ref match-data 1) "%"))
+             (setvarpatt  (if match-data
+                              (list-ref match-data 2)
+                              (args:get-arg "-testdata-csv")))
+             (runsdat     (rmt:get-runs-by-patt keys (or runpatt "%") 
+                                                (common:args-get-target) #f #f '("id" "runname" "state" "status" "owner" "event_time" "comment") 0))
+             (header      (db:get-header runsdat))
+             (access-mode (db:get-access-mode))
+             (testpatt    (common:args-get-testpatt #f))
+             (fields-spec (if (args:get-arg "-fields")
+                              (extract-fields-constraints (args:get-arg "-fields"))
+                              (list (cons "runs" (append keys (list "id" "runname" "state" "status" "owner" "event_time" "comment" "fail_count" "pass_count")))
+                                    (cons "tests"  db:test-record-fields) ;; "id" "testname" "test_path")
+                                    (list "steps" "id" "stepname"))))
+             (tests-spec  (let ((t (alist-ref "tests" fields-spec equal?)))
+                            (if (and t (null? t)) ;; all fields
+                                db:test-record-fields
+                                t)))
+             (adj-tests-spec (delete-duplicates (if tests-spec (cons "id" tests-spec) db:test-record-fields))) 
+             (test-field-index (make-hash-table))
+             (runs (db:get-rows runsdat))
+             )
+        (if (and tests-spec (not (null? tests-spec))) ;; do some validation and processing of the test-spec
+            (let ((invalid-tests-spec (filter (lambda (x)(not (member x db:test-record-fields))) tests-spec)))
+              (if (null? invalid-tests-spec)
+                  ;; generate the lookup map test-field-name => index-number
+                  (let loop ((hed (car adj-tests-spec))
+                             (tal (cdr adj-tests-spec))
+                             (idx 0))
+                    (hash-table-set! test-field-index hed idx)
+                    (if (not (null? tal))(loop (car tal)(cdr tal)(+ idx 1))))
+                  (begin
+                    (debug:print-error 0 *default-log-port* "Invalid test fields specified: " (string-intersperse invalid-tests-spec ", "))
+                    (exit)))))
+        (let* ((table-header (string-split "target,run,test,itempath,category,var,value,comment" ","))
+               (table-rows
+                (apply append (map  
+                               (lambda (run)
+                                 (let* ((target (string-intersperse (map (lambda (x)
+							 (db:get-value-by-header run header x))
+						       keys) "/"))
+                                        (statuses (string-split (or (args:get-arg "-status") "") ","))
+                                        (run-id  (db:get-value-by-header run header "id"))
+                                        (runname (db:get-value-by-header run header "runname")) 
+                                        (states  (string-split (or (args:get-arg "-state") "") ","))
+                                        (tests   (if tests-spec
+                                                     (rmt:get-tests-for-run run-id testpatt states statuses #f #f #f 'testname 'asc ;; (db:get-tests-for-run dbstruct run-id testpatt '() '() #f #f #f 'testname 'asc 
+                                                                        ;; use qryvals if test-spec provided
+                                                                        (if tests-spec
+                                                                            (string-intersperse adj-tests-spec ",")
+                                                                            ;; db:test-record-fields
+                                                                            #f)
+                                                                        #f
+                                                                        'normal)
+                                                     '())))
+                                   (apply append
+                                          (map
+                                           (lambda (test)
+                                             (let* (
+                                                    (test-id      (if (member "id"           tests-spec)(get-value-by-fieldname test test-field-index "id"          ) #f)) ;; (db:test-get-id         test))
+                                                    (testname     (if (member "testname"     tests-spec)(get-value-by-fieldname test test-field-index "testname"    ) #f)) ;; (db:test-get-testname   test))
+                                                    (itempath     (if (member "item_path"    tests-spec)(get-value-by-fieldname test test-field-index "item_path"   ) #f)) ;; (db:test-get-item-path  test))
+                                                    (fullname     (conc testname
+                                                                        (if (equal? itempath "")
+                                                                            "" 
+                                                                            (conc "/" itempath ))))
+                                                    (testdat-raw (map vector->list (rmt:read-test-data* run-id test-id categorypatt setvarpatt)))
+                                                    (testdat (filter
+                                                              (lambda (x)
+                                                                (not (equal? "logpro"
+                                                                             (list-ref x 10))))
+                                                              testdat-raw)))
+                                               (map 
+                                                (lambda (item)
+                                                  (receive (id test_id category
+                                                               variable value expected
+                                                               tol units comment status type)
+                                                      (apply values item)
+                                                    (list target runname testname itempath category variable value comment)))
+                                                testdat)))
+                                           tests))))
+                               runs))))
+          (print (string-join table-header ","))
+          (for-each (lambda(table-row)
+                      (print (string-join (map ->string table-row) ",")))
+
+                    
+                            table-rows))))
+  (set! *didsomething* #t)
+  (set! *time-to-exit* #t))
+
+
 
 ;; NOTE: list-runs and list-db-targets operate on local db!!!
 ;;
 ;; IDEA: megatest list -runname blah% ...
 ;;
@@ -1113,11 +1441,11 @@
 		   (let* ((run-id  (db:get-value-by-header run header "id"))
 			  (runname (db:get-value-by-header run header "runname")) 
 			  (states  (string-split (or (args:get-arg "-state") "") ","))
 			  (statuses (string-split (or (args:get-arg "-status") "") ","))
 			  (tests   (if tests-spec
-				       (db:dispatch-query access-mode rmt:get-tests-for-run db:get-tests-for-run run-id testpatt states statuses #f #f #f 'testname 'asc ;; (db:get-tests-for-run dbstruct run-id testpatt '() '() #f #f #f 'testname 'asc 
+				       (rmt:get-tests-for-run run-id testpatt states statuses #f #f #f 'testname 'asc ;; (db:get-tests-for-run dbstruct run-id testpatt '() '() #f #f #f 'testname 'asc 
 							     ;; use qryvals if test-spec provided
 							     (if tests-spec
 								 (string-intersperse adj-tests-spec ",")
 								 ;; db:test-record-fields
 								 #f)
@@ -1160,11 +1488,11 @@
 		      (lambda (test)
 		      	(common:debug-handle-exceptions #f
 			 exn
 			 (begin
 			   (debug:print-error 0 *default-log-port* "Bad data in test record? " test)
-			   (print "exn=" (condition->list exn))
+			   (debug:print-error 5 *default-log-port* "exn=" (condition->list exn))
 			   (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn))
 			   (print-call-chain (current-error-port)))
 			 (let* ((test-id      (if (member "id"           tests-spec)(get-value-by-fieldname test test-field-index "id"          ) #f)) ;; (db:test-get-id         test))
 				(testname     (if (member "testname"     tests-spec)(get-value-by-fieldname test test-field-index "testname"    ) #f)) ;; (db:test-get-testname   test))
 				(itempath     (if (member "item_path"    tests-spec)(get-value-by-fieldname test test-field-index "item_path"   ) #f)) ;; (db:test-get-item-path  test))
@@ -1238,11 +1566,11 @@
 ;;					     "\n         rundir:   " (get-value-by-fieldname test test-field-index "") ;; (sdb:qry 'getstr ;; (filedb:get-path *fdb* 
 ;; 					     (db:test-get-rundir test) ;; )
 					     )
 				    ;; Each test
 				    ;; DO NOT remote run
-				    (let ((steps (db:dispatch-query access-mode rmt:get-steps-for-test db:get-steps-for-test run-id (db:test-get-id test)))) ;; (db:get-steps-for-test dbstruct run-id (db:test-get-id test))))
+				    (let ((steps (rmt:get-steps-for-test run-id (db:test-get-id test)))) ;; (db:get-steps-for-test dbstruct run-id (db:test-get-id test))))
 				      (for-each 
 				       (lambda (step)
 					 (format #t 
 						 "    Step: ~20a State: ~10a Status: ~10a Time ~22a\n"
 						 (tdb:step-get-stepname step)
@@ -1368,24 +1696,113 @@
           (set! *time-to-exit* #t)
           ) ;; end if true branch (end of a let)
         ) ;; end if
     ) ;; end if -list-runs
 
-;; Don't think I need this. Incorporated into -list-runs instead
-;;
-;; (if (and (args:get-arg "-since")
-;; 	 (launch:setup))
-;;     (let* ((since-time (string->number (args:get-arg "-since")))
-;; 	   (run-ids    (db:get-changed-run-ids since-time)))
-;;       ;; (rmt:get-tests-for-runs-mindata run-ids testpatt states status not-in)
-;;       (print (sort run-ids <))
-;;       (set! *didsomething* #t)))
-      
+;; list-waivers
+(if (and (args:get-arg "-list-waivers")
+	 (launch:setup))
+    (let* ((runpatt     (or (args:get-arg "-runname") "%"))
+	   (testpatt    (common:args-get-testpatt #f))
+	   (keys        (rmt:get-keys)) 
+	   (runsdat     (rmt:get-runs-by-patt
+			 keys runpatt 
+			 (common:args-get-target) #f #f
+			 '("id" "runname" "state" "status" "owner" "event_time" "comment") 0))
+	   (runs        (db:get-rows runsdat))
+	   (header      (db:get-header runsdat))
+	   (results     (make-hash-table))  ;; [target] ( (testname/itempath . "comment") ... )
+	   (addtest     (lambda (target testname itempath comment)
+			  (hash-table-set! results target (cons (cons (conc testname "/" itempath) comment)
+								(hash-table-ref/default results target '())))))
+	   (last-target #f))
+      (for-each
+       (lambda (run)
+	 (let* ((run-id  (db:get-value-by-header run header "id"))
+		(target  (rmt:get-target run-id))
+		(runname (db:get-value-by-header run header "runname")) 
+		(tests   (rmt:get-tests-for-run
+			  run-id testpatt '("COMPLETED") '("WAIVED") #f #f #f 'testname 'asc							     ;; use qryvals if test-spec provided
+			  #f #f #f)))
+	   (if (not (equal? target last-target))
+	       (print "[" target "]"))
+	   (set! last-target target)
+	   (print "# " runname)
+	   (for-each
+	    (lambda (testdat)
+	      (let* ((testfullname (conc (db:test-get-testname testdat)
+					 (if (equal? "" (db:test-get-item-path testdat))
+					     ""
+					     (conc "/" (db:test-get-item-path testdat)))
+					 )))
+	      (print testfullname " " (db:test-get-comment testdat))))
+	    tests)))
+       runs)
+      (set! *didsomething* #t)))
       
 ;;======================================================================
 ;; full run
 ;;======================================================================
+
+(define (handle-run-requests target runname keys keyvals need-clean)	 
+  (if (or (args:get-arg "-kill-rerun") (args:get-arg "-rerun-clean")) ;; first set states/statuses correct
+      ;; For rerun-clean do we or do we not support the testpatt?
+      (let ((states   (or (configf:lookup *configdat* "validvalues" "cleanrerun-states")
+			  "KILLREQ,KILLED,UNKNOWN,INCOMPLETE,STUCK,NOT_STARTED"))
+	    (statuses (or (configf:lookup *configdat* "validvalues" "cleanrerun-statuses")
+			  "FAIL,INCOMPLETE,ABORT,CHECK,DEAD,PREQ_FAIL,PREQ_DISCARDED")))
+	(hash-table-set! args:arg-hash "-preclean" #t)
+	(runs:operate-on 'set-state-status
+			 target
+			 (common:args-get-runname)  ;; (or (args:get-arg "-runname")(args:get-arg ":runname"))
+			 ;; "%" ;; (common:args-get-testpatt #f) ;; (args:get-arg "-testpatt")
+			 (common:args-get-testpatt #f) ;; (args:get-arg "-testpatt")
+			 state:  states
+			 ;; status: statuses
+			 new-state-status: "NOT_STARTED,n/a")
+	(runs:clean-cache target runname *toppath*)
+	(runs:operate-on 'set-state-status
+			 target
+			 (common:args-get-runname)  ;; (or (args:get-arg "-runname")(args:get-arg ":runname"))
+			 ;; "%" ;; (common:args-get-testpatt #f) ;; (args:get-arg "-testpatt")
+			 (common:args-get-testpatt #f) ;; (args:get-arg "-testpatt")
+			 ;; state:  states
+			 status: statuses
+			 new-state-status: "NOT_STARTED,n/a")))
+  ;; RERUN ALL
+  (if (args:get-arg "-rerun-all") ;; first set states/statuses correct
+      (let* ((rconfig (full-runconfigs-read)))
+	(hash-table-set! args:arg-hash "-preclean" #t)
+	(runs:operate-on 'set-state-status
+			 target
+			 (common:args-get-runname)  ;; (or (args:get-arg "-runname")(args:get-arg ":runname"))
+			 (common:args-get-testpatt rconfig) ;; (args:get-arg "-testpatt")
+			 state:  #f
+			 ;; status: statuses
+			 new-state-status: "NOT_STARTED,n/a")
+	(runs:clean-cache target runname *toppath*)
+	(runs:operate-on 'set-state-status
+			 target
+			 (common:args-get-runname)  ;; (or (args:get-arg "-runname")(args:get-arg ":runname"))
+			 (common:args-get-testpatt rconfig) ;; (args:get-arg "-testpatt")
+			 ;; state:  states
+			 status: #f
+			 new-state-status: "NOT_STARTED,n/a")))
+  (let* ((config-reruns      (let ((x (configf:lookup *configdat* "setup" "reruns")))
+			       (if x (string->number x) #f)))
+	 (rerun-cnt (if config-reruns
+			config-reruns
+			1)))
+
+    (runs:run-tests target
+		    runname
+		    #f ;; (common:args-get-testpatt #f)
+		    ;; (or (args:get-arg "-testpatt")
+		    ;;     "%")
+		    user
+		    args:arg-hash
+		    run-count: rerun-cnt)))
 
 ;; get lock in db for full run for this directory
 ;; for all tests with deps
 ;;   walk tree of tests to find head tasks
 ;;   add head tasks to task queue
@@ -1402,62 +1819,42 @@
 ;; run all tests are are Not COMPLETED and PASS or CHECK
 (if (or (args:get-arg "-runall")
 	(args:get-arg "-run")
 	(args:get-arg "-rerun-clean")
 	(args:get-arg "-rerun-all")
-	(args:get-arg "-runtests"))
-    (general-run-call 
-     "-runall"
-     "run all tests"
-     (lambda (target runname keys keyvals)
-       (if (args:get-arg "-rerun-clean") ;; first set states/statuses correct
-	   (let ((states   (or (configf:lookup *configdat* "validvalues" "cleanrerun-states")
-			       "KILLREQ,KILLED,UNKNOWN,INCOMPLETE,STUCK,NOT_STARTED"))
-		 (statuses (or (configf:lookup *configdat* "validvalues" "cleanrerun-statuses")
-			       "FAIL,INCOMPLETE,ABORT,CHECK")))
-	     (hash-table-set! args:arg-hash "-preclean" #t)
-	     (runs:operate-on 'set-state-status
-			      target
-			      (common:args-get-runname)  ;; (or (args:get-arg "-runname")(args:get-arg ":runname"))
-			      "%" ;; (common:args-get-testpatt #f) ;; (args:get-arg "-testpatt")
-			      state:  states
-			      ;; status: statuses
-			      new-state-status: "NOT_STARTED,n/a")
-	     (runs:clean-cache target runname *toppath*)
-	     (runs:operate-on 'set-state-status
-			      target
-			      (common:args-get-runname)  ;; (or (args:get-arg "-runname")(args:get-arg ":runname"))
-			      "%" ;; (common:args-get-testpatt #f) ;; (args:get-arg "-testpatt")
-			      ;; state:  states
-			      status: statuses
-			      new-state-status: "NOT_STARTED,n/a")))
-       ;; RERUN ALL
-       (if (args:get-arg "-rerun-all") ;; first set states/statuses correct
-	   (begin
-	     (hash-table-set! args:arg-hash "-preclean" #t)
-	     (runs:operate-on 'set-state-status
-			      target
-			      (common:args-get-runname)  ;; (or (args:get-arg "-runname")(args:get-arg ":runname"))
-			      "%" ;; (common:args-get-testpatt #f) ;; (args:get-arg "-testpatt")
-			      state:  #f
-			      ;; status: statuses
-			      new-state-status: "NOT_STARTED,n/a")
-	     (runs:clean-cache target runname *toppath*)
-	     (runs:operate-on 'set-state-status
-			      target
-			      (common:args-get-runname)  ;; (or (args:get-arg "-runname")(args:get-arg ":runname"))
-			      "%" ;; (common:args-get-testpatt #f) ;; (args:get-arg "-testpatt")
-			      ;; state:  states
-			      status: #f
-			      new-state-status: "NOT_STARTED,n/a")))
-       (runs:run-tests target
-		       runname
-		       #f ;; (common:args-get-testpatt #f)
-		       ;; (or (args:get-arg "-testpatt")
-		       ;;     "%")
-		       user
-		       args:arg-hash))))
+	(args:get-arg "-runtests")
+        (args:get-arg "-kill-rerun"))
+    (let ((need-clean (or (args:get-arg "-rerun-clean")
+                          (args:get-arg "-rerun-all")))
+	  (orig-cmdline (string-intersperse (argv) " ")))
+      (general-run-call 
+       "-runall"
+       "run all tests"
+       (lambda (target runname keys keyvals)
+	 (if (or (string-search "%" target)
+		 (string-search "%" runname)) ;; we are being asked to re-run multiple runs
+	     (let* ((run-specs (rmt:simple-get-runs runname #f #f target #f))) ;; list of simple-run records
+	       (debug:print-info 0 *default-log-port* "Pattern supplied for target or runname with "
+				 (length run-specs) " matches round. Running each in turn.")
+	       (if (null? run-specs)
+		   (debug:print 0 *default-log-port* "WARNING: No runs match target " target " and runname " runname))
+	       (for-each (lambda (spec) 
+			   (let* ((precmd     (if (args:get-arg "-precmd")(conc (args:get-arg "-precmd") " ") ""))
+				  (newcmdline (conc
+					       precmd
+					       (string-substitute
+						(conc "target " target)
+						(conc "target " (simple-run-target spec))
+						(string-substitute
+						 (conc "runname " runname)
+						 (conc "runname " (simple-run-runname spec))
+						 orig-cmdline)))))
+			     (debug:print 0 *default-log-port* "ORIG: " orig-cmdline)
+			     (debug:print 0 *default-log-port* "NEW:  " newcmdline)
+			     (system newcmdline)))
+			 run-specs))
+	     (handle-run-requests target runname keys keyvals need-clean))))))
 
 ;;======================================================================
 ;; run one test
 ;;======================================================================
 
@@ -1543,11 +1940,12 @@
 	       (db-host   (assoc/default 'db-host   cmdinfo))
 	       (run-id    (assoc/default 'run-id    cmdinfo))
 	       (itemdat   (assoc/default 'itemdat   cmdinfo))
 	       (state     (args:get-arg ":state"))
 	       (status    (args:get-arg ":status"))
-	       (target    (args:get-arg "-target"))
+	       ;;(target    (args:get-arg "-target"))
+	       (target    (common:args-get-target))
 	       (toppath   (assoc/default 'toppath   cmdinfo)))
 	  (change-directory toppath)
 	  (if (not target)
 	      (begin
 		(debug:print-error 0 *default-log-port* "-target is required.")
@@ -1559,11 +1957,11 @@
 	  (let* ((keys     (rmt:get-keys))
 		 ;; db:test-get-paths must not be run remote
 		 (paths    (tests:test-get-paths-matching keys target (args:get-arg "-test-files"))))
 	    (set! *didsomething* #t)
 	    (for-each (lambda (path)
-			(if (file-exists? path)
+			(if (common:file-exists? path)
 			(print path)))	
 		      paths)))
 	;; else do a general-run-call
 	(general-run-call 
 	 "-test-files"
@@ -1578,17 +1976,54 @@
 
 ;;======================================================================
 ;; Archive tests
 ;;======================================================================
 ;; Archive tests matching target, runname, and testpatt
-(if (args:get-arg "-archive")
+(if (equal? (args:get-arg "-archive") "replicacte-db")
+    (begin
+          ;; check if source
+          ;; check if megatest.db exist 
+         (launch:setup)   
+         (if (not (args:get-arg "-source"))
+             (begin 
+             (debug:print-info 1 *default-log-port* "Missing required argument -source ")
+             (exit 1)))
+         (if (common:file-exists? (conc  *toppath* "/megatest.db"))
+             (begin  
+               (debug:print-info 1 *default-log-port* "File " (conc  *toppath* "/megatest.db") " already exists. Please remove it before trying to replicate db")
+               (exit 1)))
+         (if (and (common:get-db-tmp-area) (> (length (directory   (common:get-db-tmp-area) #f)) 0))
+           (begin
+           (debug:print-info 1 *default-log-port* (common:get-db-tmp-area) " not empty. Please remove it before trying to replicate db")
+           (exit 1)))    
+          ;; check if timestamp 
+          (let* ((source (args:get-arg "-source"))
+                (src     (if (not (equal? (substring source 0 1) "/"))
+                             (conc (current-directory) "/" source)
+                             source))
+                (ts (if (args:get-arg "-time-stamp")   (args:get-arg "-time-stamp") "latest")))
+              (if  (common:directory-exists? src)
+                  (begin 
+                  (archive:restore-db src ts)
+            (set! *didsomething* #t))
+       (begin
+         (debug:print-error 1 *default-log-port* "Path " source " not found")
+         (exit 1))))))   
     ;; else do a general-run-call
-    (general-run-call 
-     "-archive"
-     "Archive"
-     (lambda (target runname keys keyvals)
-       (operate-on 'archive))))
+   (if (and (args:get-arg "-archive") (not (equal? (args:get-arg "-archive") "replicacte-db"))) 
+    (begin
+      ;; for the archive get we need to preserve the starting dir as part of the target path
+      (if (and (args:get-arg "-dest")
+	       (not (equal? (substring (args:get-arg "-dest") 0 1) "/")))
+	  (let ((newpath  (conc (current-directory) "/" (args:get-arg "-dest"))))
+	    (debug:print-info 1 *default-log-port* "Preserving original path to destination, was " (args:get-arg "-dest") ", now " newpath)
+	    (hash-table-set! args:arg-hash "-dest" newpath)))
+      (general-run-call 
+       "-archive"
+       "Archive"
+       (lambda (target runname keys keyvals)
+	 (operate-on 'archive target-in: target runname-in: runname )))))
 
 ;;======================================================================
 ;; Extract a spreadsheet from the runs database
 ;;======================================================================
 
@@ -1671,18 +2106,20 @@
 	      (debug:print-error 0 *default-log-port* "You must specify :state and :status with every call to -step")
 	      (exit 6))))))
 
 (if (args:get-arg "-step")
     (begin
+      (thread-sleep! 1.5)
       (megatest:step 
        (args:get-arg "-step")
        (or (args:get-arg "-state")(args:get-arg ":state"))
        (or (args:get-arg "-status")(args:get-arg ":status"))
        (args:get-arg "-setlog")
        (args:get-arg "-m"))
       ;; (if db (sqlite3:finalize! db))
-      (set! *didsomething* #t)))
+      (set! *didsomething* #t)
+      (thread-sleep! 1.5)))
     
 (if (or (args:get-arg "-setlog")       ;; since setting up is so costly lets piggyback on -test-status
 	;;     (not (args:get-arg "-step")))  ;; -setlog may have been processed already in the "-step" previous
 	;;     NEW POLICY - -setlog sets test overall log on every call.
 	(args:get-arg "-set-toplog")
@@ -1849,20 +2286,22 @@
       (if (not (launch:setup))
 	  (begin
 	    (debug:print 0 *default-log-port* "Failed to setup, exiting") 
 	    (exit 1)))
       ;; keep this one local
-      (open-run-close patch-db #f)
+      ;; (open-run-close patch-db #f)
+      (let ((dbstruct (db:setup #f areapath: *toppath*)))
+        (common:cleanup-db dbstruct full: #t))
       (set! *didsomething* #t)))
 
 (if (args:get-arg "-cleanup-db")
     (begin
       (if (not (launch:setup))
 	  (begin
 	    (debug:print 0 *default-log-port* "Failed to setup, exiting") 
 	    (exit 1)))
-      (let ((dbstruct (db:setup *toppath*)))
+      (let ((dbstruct (db:setup #f areapath: *toppath*)))
         (common:cleanup-db dbstruct))
       (set! *didsomething* #t)))
 
 (if (args:get-arg "-mark-incompletes")
     (begin
@@ -1917,11 +2356,11 @@
 	(args:get-arg "-repl")
 	(args:get-arg "-load"))
     (let* ((toppath (launch:setup))
 	   (dbstruct (if (and toppath
                               (common:on-homehost?))
-                         (db:setup)
+                         (db:setup #t)
                          #f))) ;; make-dbr:dbstruct path: toppath local: (args:get-arg "-local")) #f)))
       (if *toppath*
 	  (cond
 	   ((getenv "MT_RUNSCRIPT")
 	    ;; How to run megatest scripts
@@ -2006,39 +2445,82 @@
 ;; ;; ;; redo me       (set! *didsomething* #t)))
 
 (if (args:get-arg "-import-megatest.db")
     (begin
       (db:multi-db-sync 
-       (db:setup)
+       (db:setup #f)
        'killservers
        'dejunk
        'adj-testids
        'old2new
        ;; 'new2old
        )
       (set! *didsomething* #t)))
+
+(when (args:get-arg "-sync-brute-force")
+  ((server:get-bruteforce-syncer (db:setup #t) persist-until-sync: #t))
+  (set! *didsomething* #t))
 
 (if (args:get-arg "-sync-to-megatest.db")
-    (begin
-      (db:multi-db-sync 
-       (db:setup)
-       'new2old
-       )
+    (let* ((dbstruct (db:setup #f))
+	   (tmpdbpth (cdr (dbr:dbstruct-tmpdb dbstruct)))
+	   (lockfile (conc tmpdbpth ".lock"))
+	   (locked   (common:simple-file-lock lockfile)) 
+	   (res      (if locked
+			 (db:multi-db-sync 
+			  dbstruct
+			  'new2old)
+			 #f)))
+      (if res
+	  (begin
+	    (common:simple-file-release-lock lockfile)
+	    (print "Synced " res " records to megatest.db"))
+	  (print "Skipping sync, there is a sync in progress."))
       (set! *didsomething* #t)))
 
 (if (args:get-arg "-sync-to")
     (let ((toppath (launch:setup)))
       (tasks:sync-to-postgres *configdat* (args:get-arg "-sync-to"))
       (set! *didsomething* #t)))
 
+(if (args:get-arg "-list-test-time")
+     (let* ((toppath (launch:setup))) 
+     (task:get-test-times)  
+     (set! *didsomething* #t)))
+
+(if (args:get-arg "-list-run-time")
+     (let* ((toppath (launch:setup))) 
+     (task:get-run-times)  
+     (set! *didsomething* #t)))
+     
 (if (args:get-arg "-generate-html")
     (let* ((toppath (launch:setup)))
       (if (tests:create-html-tree #f)
-          (debug:print-info 0 *default-log-port* "HTML output created in " toppath "/lt/page#.html")
+          (debug:print-info 0 *default-log-port* "HTML output created in " toppath "/lt/page0.html")
+          (debug:print 0 *default-log-port* "Failed to create HTML output in " toppath "/lt/runs-index.html"))
+      (set! *didsomething* #t)))
+
+(if (args:get-arg "-generate-html-structure")
+    (let* ((toppath (launch:setup)))
+      ;(if (tests:create-html-tree #f)
+ 				(if (tests:create-html-summary #f)
+          (debug:print-info 0 *default-log-port* "HTML output created in " toppath "/lt/targets.html")
           (debug:print 0 *default-log-port* "Failed to create HTML output in " toppath "/lt/runs-index.html"))
       (set! *didsomething* #t)))
 
+(if (args:get-arg "-syscheck")
+    (begin
+      (mutils:syscheck common:raw-get-remote-host-load
+		       server:get-best-guess-address
+		       read-config)
+      (set! *didsomething* #t)))
+
+(if (args:get-arg "-extract-skeleton")
+    (let* ((toppath (launch:setup)))
+      (genexample:extract-skeleton-area (args:get-arg "-extract-skeleton"))
+      (set! *didsomething* #t)))
+
 ;;======================================================================
 ;; Exit and clean up
 ;;======================================================================
 
 (if (not *didsomething*)

Index: minimal/manyservers.sh
==================================================================
--- minimal/manyservers.sh
+++ minimal/manyservers.sh
@@ -1,7 +1,24 @@
 #!/bin/bash
 
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 echo manyservers.sh pid $$
 
 logdir=$PWD/log-manysrv
 
 

Index: minimal/megatest.config
==================================================================
--- minimal/megatest.config
+++ minimal/megatest.config
@@ -1,5 +1,21 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
 [fields]
 RUNTYPE text
 
 [setup]
 linktree #{getenv PWD}/linktree

Index: minimal/runconfigs.config
==================================================================
--- minimal/runconfigs.config
+++ minimal/runconfigs.config
@@ -1,3 +1,19 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
 [default]
 EXAMPLEVAR 1
 

Index: minimal/tests/tmpspace/testconfig
==================================================================
--- minimal/tests/tmpspace/testconfig
+++ minimal/tests/tmpspace/testconfig
@@ -1,5 +1,21 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
 [ezsteps]
 
 df [ `df -m /tmp | grep /tmp | awk '{print $3}'` -gt 200000 ]
 
 [items]

ADDED   minimt/Makefile
Index: minimt/Makefile
==================================================================
--- /dev/null
+++ minimt/Makefile
@@ -0,0 +1,29 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
+minimt : minimt.scm db.scm setup.scm direct.scm
+	csc minimt.scm
+
+run    : minimt
+	export PATH="$(PWD)":$(PATH) ; minimt runrun foo/bar run1 
+
+runseq : clean run 
+	sleep 5;tail -F runtest/*log
+
+clean :
+	rm -rf runtest/*
+

ADDED   minimt/db.scm
Index: minimt/db.scm
==================================================================
--- /dev/null
+++ minimt/db.scm
@@ -0,0 +1,190 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
+;; pretend to be a simplified Megatest
+
+(use sql-de-lite defstruct)
+
+;; init the db - NOTE: takes a db NOT a dbconn
+;;
+(define (init-db db)
+  (with-transaction
+   db
+   (lambda ()
+     (for-each
+      (lambda (qrystr)
+	(exec (sql db qrystr)))
+      '("CREATE TABLE IF NOT EXISTS runs 
+           (id        INTEGER PRIMARY KEY,
+            target    TEXT NOT NULL,
+            run_name  TEXT NOT NULL,
+            state     TEXT NOT NULL,
+            status    TEXT NOT NULL,
+            CONSTRAINT runs_constraint UNIQUE (run_name));"
+	"CREATE TABLE IF NOT EXISTS tests
+           (id        INTEGER PRIMARY KEY,
+            run_id    INTEGER NOT NULL,
+            test_name TEXT NOT NULL,
+            state     TEXT NOT NULL,
+            status    TEXT NOT NULL,
+            start_time INTEGER DEFAULT (strftime('%s','now')),
+            end_time   INTEGER DEFAULT -1,
+            CONSTRAINT tests_constraint UNIQUE (run_id,test_name));"
+	"CREATE TABLE IF NOT EXISTS steps
+           (id        INTEGER PRIMARY KEY,
+            test_id   INTEGER NOT NULL,
+            step_name  TEXT NOT NULL,
+            state     TEXT NOT NULL,
+            status    TEXT NOT NULL,
+            CONSTRAINT step_constraint UNIQUE (test_id,step_name));")))))
+
+(defstruct dbconn-dat
+  dbh       ;; the database handle
+  writeable ;; do we have write access?
+  path      ;; where the db lives
+  name      ;; name of the db
+  )
+
+;; open the database, return a dbconn struct
+(define (open-create-db path fname init)
+  (let* ((fullname       (conc path "/" fname))
+	 (already-exists (file-exists? fullname))
+	 (write-access   (and (file-write-access? path)
+			      (or (not already-exists)
+				  (and already-exists
+				       (file-write-access? fullname)))))
+	 (db             (if (or already-exists write-access)
+			     (open-database fullname)
+			     (begin
+			       (print "FATAL: No existing db and no write access thus cannot create " fullname)  ;; no db and no write access cannot proceed.
+			       (exit 1))))
+	 (dbconn         (make-dbconn-dat)))
+    (set-busy-handler! db (busy-timeout 120000)) ;; set a busy timeout
+    (exec (sql db "PRAGMA synchronous=0;"))
+    (if (and init write-access (not already-exists))
+	(init db))
+    (dbconn-dat-dbh-set!       dbconn db)
+    (dbconn-dat-writeable-set! dbconn write-access)
+    (dbconn-dat-path-set!      dbconn path)
+    (dbconn-dat-name-set!      dbconn fname)
+    dbconn))
+
+(define-inline (get-db dbconn)
+  (dbconn-dat-dbh dbconn))
+
+;; RUNS
+
+;; create a run
+(define (create-run dbconn target run-name)
+  (exec (sql (get-db dbconn) "INSERT INTO runs (run_name,target,state,status) VALUES (?,?,'NEW','na');")
+	run-name target))
+
+;; get a run id
+(define (get-run-id dbconn target run-name)
+  (first-column (query fetch (sql (get-db dbconn) "SELECT id FROM runs WHERE target=? AND run_name=?;")
+		       target run-name)))
+
+;; TESTS
+
+(defstruct test-dat
+  id
+  run-id
+  test-name
+  state
+  status)
+
+;; create a test
+(define (create-test dbconn run-id test-name)
+  (exec (sql (get-db dbconn) "INSERT INTO tests (run_id,test_name,state,status) VALUES (?,?,'NOT_STARTED','na');")
+	run-id test-name))
+
+;; get a test id
+(define (get-test-id dbconn run-id test-name)
+  (first-column (query fetch (sql (get-db dbconn) "SELECT id FROM tests WHERE run_id=? AND test_name=?;")
+		       run-id test-name)))
+
+(define-inline (test-row->test-dat row)
+    (make-test-dat
+     id:        (list-ref row 0)
+     run-id:    (list-ref row 1)
+     test-name: (list-ref row 2)
+     state:     (list-ref row 3)
+     status:    (list-ref row 4)))
+  
+;; get the data for given test-id
+(define (test-get-record dbconn test-id)
+  (let* ((row (query fetch-row (sql (get-db dbconn) "SELECT id,run_id,test_name,state,status FROM tests WHERE test_id=?;")
+		     test-id)))
+    (test-row->test-dat row)))
+
+;; get a bunch of tests data
+(define (test-get-tests dbconn run-ids test-name-patt)
+  (let* ((rows (query fetch-rows
+		      (sql (get-db dbconn)
+			   (conc "SELECT id,run_id,test_name,state,status FROM tests WHERE test_name LIKE ? AND run_id IN ("
+				 (string-intersperse (map conc run-ids) ",") ");"))
+		      test-name-patt)))
+    (map test-row->test-dat rows)))
+   
+(define (test-set-state-status dbconn test-id new-state new-status)
+  (exec (sql (get-db dbconn) "UPDATE tests SET state=?,status=?,end_time=? WHERE id=?;")
+	new-state new-status (current-seconds) test-id))
+
+;; STEPS
+
+;; create a step
+(define (create-step dbconn test-id step-name)
+  (exec (sql (get-db dbconn) "INSERT INTO steps (test_id,step_name,state,status) VALUES (?,?,'NOT_STARTED','na');")
+	test-id step-name))
+
+;; get a step id
+(define (get-step-id dbconn test-id step-name)
+  (first-column (query fetch (sql (get-db dbconn) "SELECT id FROM steps WHERE test_id=? AND step_name=?;")
+		       test-id step-name)))
+
+(define (step-set-state-status dbconn step-id new-state new-status)
+  (exec (sql (get-db dbconn) "UPDATE steps SET state=?,status=? WHERE id=?;")
+	new-state new-status step-id))
+
+;;======================================================================
+;; Statistics gathering
+;;======================================================================
+
+(define *stats* (make-hash-table))
+
+(define (update-stats key duration)
+  (let ((rec (or (hash-table-ref/default *stats* key #f)
+		 (let ((new (vector 0 0 0)))
+		   (hash-table-set! *stats* key new)
+		   new))))
+    (vector-set! rec 0 (+ (vector-ref rec 0) 1))        ;; num calls
+    (vector-set! rec 1 (+ (vector-ref rec 1) duration)) ;; total duration
+    (if (> duration (vector-ref rec 2) )
+	(vector-set! rec 2 duration))))
+
+(define (statwrap name proc)
+  (lambda params
+    (let ((start-time (current-milliseconds))
+	  (res        (apply proc params)))
+      (update-stats name (- (current-milliseconds) start-time))
+      res)))
+
+(define (print-stats statdat)
+  (hash-table-for-each
+   statdat
+   (lambda (key val)
+     (print key " count: " (vector-ref val 0) " avg: " (/ (vector-ref val 1)(vector-ref val 0)) " max: " (vector-ref val 2)))))

ADDED   minimt/direct.scm
Index: minimt/direct.scm
==================================================================
--- /dev/null
+++ minimt/direct.scm
@@ -0,0 +1,28 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
+;; direct API, call the db calls directly
+(define rmt:create-run            (statwrap 'create-run  create-run))
+(define rmt:create-step           (statwrap 'create-step create-step))
+(define rmt:create-test           (statwrap 'create-test create-test))
+(define rmt:get-test-id           (statwrap 'get-test-id get-test-id))
+(define rmt:get-run-id            (statwrap 'get-run-id  get-run-id))
+(define rmt:open-create-db        (statwrap 'open        open-create-db))
+(define rmt:step-set-state-status (statwrap 'step-set-state-status step-set-state-status))
+(define rmt:test-set-state-status (statwrap 'test-set-state-status test-set-state-status))
+(define rmt:test-get-tests        (statwrap 'test-get-tests        test-get-tests))
+

ADDED   minimt/minimt.scm
Index: minimt/minimt.scm
==================================================================
--- /dev/null
+++ minimt/minimt.scm
@@ -0,0 +1,103 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
+(use posix)
+
+(include "db.scm")
+
+;; define following in setup.scm
+;;    *remotehost*  => host for "tests"
+;;    *homehost*    => host for servers
+;;    *homepath*    => directory from which to run
+;;    *numtests*    => how many tests to simulate for each run
+;;    *numruns*     => how many runs to simulate
+;;    
+(include "setup.scm")
+
+(include "direct.scm") ;; direct db calls
+
+;; RUN A TEST
+(define (run-test dbconn run-id test-name)
+  (rmt:create-test dbconn run-id test-name)
+  (let ((test-id (rmt:get-test-id dbconn run-id test-name)))
+    (rmt:test-set-state-status dbconn test-id "LAUNCHED" "na")
+    (thread-sleep! *launchdelay*)
+    (rmt:test-set-state-status dbconn test-id "RUNNING" "na")
+    (let loop ((step-num 0))
+      (let ((step-name (conc "step" step-num)))
+       (rmt:create-step dbconn test-id step-name)
+       (let ((step-id (get-step-id dbconn test-id step-name)))
+	 (rmt:step-set-state-status dbconn step-id "START" -1)
+	 (thread-sleep! *stepdelay*)
+	 (rmt:step-set-state-status dbconn step-id "END" 0)
+	 (print"   STEP: " step-name " done.")))
+      (if (< step-num *numsteps*)
+	  (loop (+ step-num 1))))
+    ;; we will do a large but bogus read to simulate the logic in Megatest
+    (rmt:test-get-tests dbconn `(,run-id) "%")
+    (rmt:test-set-state-status dbconn test-id "COMPLETED" (if (> (random 10) 2) "PASS" "FAIL"))
+    (print "TEST: " test-name " done.")
+    (print "Stats:")
+    (print-stats *stats*)
+    test-id))
+
+;; RUN A RUN
+(define (run-run dbconn target run-name num-tests)
+  (rmt:create-run dbconn target run-name)
+  (let ((run-id (rmt:get-run-id dbconn target run-name)))
+    (let loop ((test-num 0))
+      (system (conc "NBFAKE_LOG=test-" test-num "-run-id-" run-id ".log NBFAKE_HOST=" *remotehost* " nbfake minimt runtest " run-id " test-" test-num))
+      (if (< test-num num-tests)
+	  (loop (+ test-num 1))))))
+
+;; Do what is asked
+(let ((args (cdr (argv))))
+  (if (< (length args) 1)
+      (print
+       "Usage: minimt [options]" "
+  runtest run-id testname
+  runrun  target runname")
+      (let ((cmd    (car args))
+	    (dbconn (rmt:open-create-db *homepath* "mt.db" init-db)))
+	(thread-sleep! 0.5) ;; be sure the db is written out to disk? Should really not be needed.
+	(change-directory *homepath*)
+	(case (string->symbol cmd)
+	  ((runtest)
+	   (let ((run-id    (string->number (cadr args)))
+		 (test-name (caddr args)))
+	     (print "Launching test " test-name " for run-id " run-id)
+	     (run-test dbconn run-id test-name)))
+	  ((runrun)
+	   (let ((target   (cadr args))
+		 (run-name (caddr args)))
+	     (run-run dbconn target run-name *numtests*)
+	     (print "Use: sqlite3 runtest/mt.db 'select max(end_time)-min(start_time) from tests;' to see the total run time")
+	     ))
+	  ((runall)
+	   (for-each
+	    (lambda (target)
+	      (let loop ((run-num 0))
+		(thread-sleep! *rundelay*)
+		(system (conc "NBFAKE_LOG=run-" target "-" run-num ".log nbfake minimt runrun " target " run-" run-num))
+		(if (< run-num *numruns*)
+		    (loop (+ run-num 1)))))
+	    *targets*))
+	  ((server)
+	   (start-server dbconn))
+	  (else
+	   (print "Command: " cmd " not recognised. Run without params to see help.")))
+	(close-database (dbconn-dat-dbh dbconn)))))

ADDED   minimt/queued.scm
Index: minimt/queued.scm
==================================================================
--- /dev/null
+++ minimt/queued.scm
@@ -0,0 +1,225 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
+(use nanomsg defstruct srfi-18)
+
+;;======================================================================
+;; Commands
+;;======================================================================
+
+(define *commands* (make-hash-table))
+
+(defstruct cmd
+  key
+  proc
+  ctype ;; command type; 'r (read), 'w (write) or 't (transaction)
+  )
+
+(define (register-command key ctype proc)
+  (hash-table-set! *commands*
+		   key
+		   (make-cmd key: key ctype: ctype proc: proc)))
+
+(define (get-proc key)
+  (cmd-proc (hash-table-ref key *commands*)))
+
+(for-each
+ (lambda (dat)
+   (apply register-command dat))
+ `( (create-run    w ,create-run)
+    (create-step   w ,create-step)
+    (create-test   w ,create-test)
+    (get-test-id   r ,get-test-id)
+    (get-run-id    r ,get-run-id)
+    ;; (open-db       w ,open-create-db)
+    (step-set-ss   w ,step-set-state-status)
+    (test-set-ss   w ,test-set-state-status)
+    (test-get-tests r ,test-get-tests) ))
+
+;;======================================================================
+;; Server/client stuff
+;;======================================================================
+
+(define-inline (encode data)
+  (with-output-to-string
+    (lambda ()
+      (write data))))
+
+(define-inline (decode data)
+  (with-input-from-string
+      data
+    (lambda ()
+      (read))))
+  
+;;======================================================================
+;; Command queue
+;;======================================================================
+
+(defstruct qitem
+  command
+  params
+  host-port)
+
+(define *cmd-queue* '())
+(define *queue-mutex* (make-mutex))
+
+(define (queue-push cmddat)
+  (mutex-lock! *queue-mutex*)
+  (set! *cmd-queue* (cons cmddat *cmd-queue*))
+  (mutex-unlock! *queue-mutex*))
+
+;; get all the cmds of type ctype and return them, also remove them from the queue
+(define (queue-take ctype)
+  (mutex-lock! *queue-mutex*)
+  (let ((res (filter (lambda (x)(eq? (cmd-ctype x) ctype))       *cmd-queue*))
+	(rem (filter (lambda (x)(not (eq? (cmd-ctype x) ctype))) *cmd-queue*)))
+    (set! *queue* rem)
+    (mutex-unlock! *queue-mutex*)
+    res))
+
+(define (queue-process-commands dbconn commands)
+  (for-each
+   (lambda (qitem)
+     (let ((soc (request-connect (qitem-host-port qitem))) ;; we will be sending the data back to host-port via soc
+	   (cmd (hash-table-ref/default *commands* (qitem-command qitem) #f)))
+       (if cmd
+	   (let* ((res (apply (get-proc cmd) dbconn (qitem-params qitem)))
+		  (pkg (encode `((r . ,res)))))
+	     (nn-send soc pkg)
+	     (if (not (eq? (nn-recv soc)) "ok")
+		 (print "Client failed to receive properly the data from " cmd " request"))))))
+   commands))
+
+;; the continuously running queue processor
+;;
+(define ((queue-processor dbconn))
+  (let loop ()
+    (queue-process-commands dbconn (queue-take 'r))  ;; reads first, probably largest numbers of them
+    (queue-process-commands dbconn (queue-take 'w))  ;; writes next
+    (queue-process-commands dbconn (queue-take 't))  ;; lastly process transactions
+    (thread-sleep! 0.2)                              ;; open up the db for any other processes to access
+    (loop)))
+
+;;======================================================================
+;; Client stuff
+;;======================================================================
+
+;; client struct
+(defstruct client
+  host-port
+  socket
+  last-access)
+
+(define *clients* (make-hash-table)) ;; host:port -> client struct
+(define *client-mutex* (make-mutex))
+
+;; add a channel or return existing channel, this is a normal req
+;; 
+(define (request-connect host-port)
+  (mutex-lock! *client-mutex*)
+  (let* ((curr (hash-table-ref/default *clients* host-port #f)))
+    (if curr
+	(begin
+	  (mutex-unlock! *client-mutex*)
+	  curr)
+	(let ((req (nn-socket 'req)))
+	  (nn-connect req host-port) ;; "inproc://test")
+	  (hash-table-set! *clients* host-port req)
+	  (mutex-unlock! *client-mutex*)
+	  req))))
+
+;; open up a channel to the server and send a package of info for the server to act on
+;; host-port needs to be found and provided
+;;
+(define (generic-db-access host-port)
+  (let* ((soc (request-connect host-port))
+	 ;; NEED *MY* host/port also to let the server know where to send the results
+	 )))
+    
+
+(define (client-send-receive soc msg)
+  (nn-send soc msg)
+  (nn-recv soc))
+  
+;;======================================================================
+;; Server
+;;======================================================================
+
+(defstruct srvdat
+  host
+  port
+  soc)
+
+;; remember, everyone starts a server, both client and the actual server alike.
+;; clients start a server for the server to return results to.
+;;
+(define (start-raw-server #!key (given-host-name #f))
+  (let ((srvdat    (let loop ((portnum 10000))
+		     (handle-exceptions
+			 exn
+			 (if (< portnum 64000)
+			     (loop (+ portnum 1))
+			     #f)
+		       (let* ((rep (nn-socket 'rep)))
+			 (nn-bind rep (conc "tcp://*:" portnum)) ;; "inproc://test")
+			 (make-srvdat port: portnum soc: rep)))))
+	(host-name (or give-host-name (get-host-name)))
+	(soc       (srvdat-soc srvdat)))
+    (srvdat-host-set! srvdat host-name)
+    srvdat))
+
+;; The actual *server* side server
+;;
+(define (start-server dbconn #!key (given-host-name #f))
+  (let* ((srvdat    (start-raw-server given-host-name: given-host-name))
+	 (host-name (srvdat-host srvdat))
+	 (soc       (srvdat-soc srvdat)))
+    
+    ;; start the queue processor
+    (thread-start! (queue-processory dbconn) "Queue processor")
+    ;; msg is an alist
+    ;;  'r host:port  <== where to return the data
+    ;;  'p params     <== data to apply the command to
+    ;;  'e j|s|l      <== encoding of the params. default is s (sexp), if not specified is assumed to be default
+    ;;  'c command    <== look up the function to call using this key
+    ;;
+    (let loop ((msg-in (nn-recv soc)))
+      (if (not (equal? msg-in "quit"))
+	  (let* ((dat        (decode msg-in))
+		 (host-port  (alist-ref 'r dat)) ;; this is for the reverse req rep where the server is a client of the original client
+		 (params     (alist-ref 'p dat))
+		 (command    (let ((c (alist-ref 'c dat)))(if c (string->symbol c) #f)))
+		 (all-good   (and host-port params command (hash-table-exists? *commands* command))))
+	    (if all-good
+		(let ((cmddat (make-qitem
+			       command:   command
+			       host-port: host-port
+			       params:    params)))
+		  (queue-push cmddat) 		;; put request into the queue
+		  (nn-send soc "queued"))         ;; reply with "queued"
+		(print "ERROR: BAD request " dat))
+	    (loop (nn-recv soc)))))
+    (nn-close soc)))
+  
+;;======================================================================
+;; Gasket layer
+;;======================================================================
+
+(define rmt:open-create-db open-create-db)
+(define (rmt:create-run . params)
+  
+  

ADDED   minimt/setup.scm
Index: minimt/setup.scm
==================================================================
--- /dev/null
+++ minimt/setup.scm
@@ -0,0 +1,34 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
+(define *remotehost* "orion")
+(define *homehost*   "zeus")
+(define *homepath*   "/nfs/phoebe/disk1/home/mfs_matt/data/megatest/minimt/runtest")
+(define *numsteps*   20)
+(define *numtests*   20)
+(define *numruns*    5)
+(define *targets*    '("targ1"))
+(define *testdelay*  0)
+(define *rundelay*   0)
+(define *launchdelay* 0)
+(define *stepdelay*   0)
+
+(use trace)
+(trace-call-sites #t)
+(trace
+;;  open-create-db
+ )

Index: mkdeploy/megatest.config
==================================================================
--- mkdeploy/megatest.config
+++ mkdeploy/megatest.config
@@ -1,5 +1,21 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
 [fields]
 PLATFORM TEXT
 OS       TEXT
 OSVER    TEXT
 

Index: mkdeploy/runconfigs.config
==================================================================
--- mkdeploy/runconfigs.config
+++ mkdeploy/runconfigs.config
@@ -1,5 +1,21 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
 [default]
 TARGDIR_tmp /tmp
 TARGDIR_opt /opt
 TARGDIR_runs #{getenv MT_RUN_AREA_HOME}/runs
 BUILDDIR    #{getenv MT_RUN_AREA_HOME}/..

Index: mkdeploy/tests/checkspace/checkspace.logpro
==================================================================
--- mkdeploy/tests/checkspace/checkspace.logpro
+++ mkdeploy/tests/checkspace/checkspace.logpro
@@ -1,3 +1,20 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 (expect:error in    "LogFileBody" = 0 "Any error"         #/err/i)
 (expect:required in "LogFileBody" = 1 "Sucess signature" #/adequate space/)
 

Index: mkdeploy/tests/checkspace/checkspace.sh
==================================================================
--- mkdeploy/tests/checkspace/checkspace.sh
+++ mkdeploy/tests/checkspace/checkspace.sh
@@ -1,6 +1,22 @@
 #!/bin/bash -e
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
 freespace=`df -k /$DIRECTORY | grep $DIRECTORY | awk '{print $4}'`
 if [[ $freespace -lt $REQUIRED ]];then
   echo "ERROR: insufficient space on /$DIRECTORY"
   exit 1
 else

Index: mkdeploy/tests/checkspace/testconfig
==================================================================
--- mkdeploy/tests/checkspace/testconfig
+++ mkdeploy/tests/checkspace/testconfig
@@ -1,5 +1,21 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
 # Add steps here. Format is "stepname script"
 [ezsteps]
 checkspace checkspace.sh
 
 # Iteration for your tests are controlled by the items section

Index: mkdeploy/tests/eggs/install.logpro
==================================================================
--- mkdeploy/tests/eggs/install.logpro
+++ mkdeploy/tests/eggs/install.logpro
@@ -1,5 +1,22 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 (expect:ignore in   "LogFileBody" >= 0 "ignore setup-error-handling" #/setup-error-handling/)
 (expect:ignore in   "LogFileBody" >= 0 "ignore check-errors" (list #/check-errors/ #/type-errors/ #/srfi-4-errors/))
 (expect:error in    "LogFileBody" = 0 "Any error"         #/error/i)
 (expect:required in "LogFileBody" = 1 "Sucess signature" #/DONE/)
 

Index: mkdeploy/tests/eggs/install.sh
==================================================================
--- mkdeploy/tests/eggs/install.sh
+++ mkdeploy/tests/eggs/install.sh
@@ -1,4 +1,20 @@
 #!/bin/bash -e
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
 targpath=`megatest -test-paths -target $MT_TARGET :runname $MT_RUNNAME -testpatt executables/megatest`
 chicken-install -prefix $targpath/megatest -deploy $EGGNAME
 echo DONE

Index: mkdeploy/tests/eggs/testconfig
==================================================================
--- mkdeploy/tests/eggs/testconfig
+++ mkdeploy/tests/eggs/testconfig
@@ -1,5 +1,21 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
 # Add steps here. Format is "stepname script"
 [ezsteps]
 install install.sh
 
 [requirements]

Index: mkdeploy/tests/executables/addlibs.logpro
==================================================================
--- mkdeploy/tests/executables/addlibs.logpro
+++ mkdeploy/tests/executables/addlibs.logpro
@@ -1,3 +1,20 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 (expect:error in    "LogFileBody" = 0 "Any error"         #/err/i)
 (expect:required in "LogFileBody" = 1 "Sucess signature" #/libchicken.so.6/)
 

Index: mkdeploy/tests/executables/addlibs.sh
==================================================================
--- mkdeploy/tests/executables/addlibs.sh
+++ mkdeploy/tests/executables/addlibs.sh
@@ -1,7 +1,24 @@
 #!/bin/bash -e
 
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 CSIPATH=$(echo $(type csi)|awk '{print $3}')
 CKPATH=$(dirname $(dirname $CSIPATH))
 rsync -av $EXECUTABLE/ ../deploytarg/
 for i in iup im cd av call sqlite; do
   cp $(CKPATH)/lib/lib$i* ../deploytarg/

Index: mkdeploy/tests/executables/install.logpro
==================================================================
--- mkdeploy/tests/executables/install.logpro
+++ mkdeploy/tests/executables/install.logpro
@@ -1,3 +1,20 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 (expect:error in    "LogFileBody" = 0 "Any error"         #/err/i)
 (expect:required in "LogFileBody" = 1 "Sucess signature" #/libchicken.so.6/)
 

Index: mkdeploy/tests/executables/install.sh
==================================================================
--- mkdeploy/tests/executables/install.sh
+++ mkdeploy/tests/executables/install.sh
@@ -1,7 +1,23 @@
 #!/bin/bash -e
 
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
 unset LD_LIBRARY_PATH
 rm -rf $EXECUTABLE
 mkdir $EXECUTABLE
 csc -deploy $EXECUTABLE
 ls $EXECUTABLE

Index: mkdeploy/tests/executables/linksrc.logpro
==================================================================
--- mkdeploy/tests/executables/linksrc.logpro
+++ mkdeploy/tests/executables/linksrc.logpro
@@ -1,3 +1,20 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 (expect:error in    "LogFileBody" = 0 "Any error"         #/err/i)
 (expect:required in "LogFileBody" = 1 "Sucess signature" #/Makefile/)
 

Index: mkdeploy/tests/executables/linksrc.sh
==================================================================
--- mkdeploy/tests/executables/linksrc.sh
+++ mkdeploy/tests/executables/linksrc.sh
@@ -1,6 +1,22 @@
 #!/bin/bash -e
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
 
 rm -f *.scm *.o Makefile
 ln -s $BUILDDIR/*.scm .
 ln -s $BUILDDIR/Makefile .
 ls Makefile *.scm 

Index: mkdeploy/tests/executables/make_mt.logpro
==================================================================
--- mkdeploy/tests/executables/make_mt.logpro
+++ mkdeploy/tests/executables/make_mt.logpro
@@ -1,3 +1,20 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 (expect:error in    "LogFileBody" = 0 "Any error"         #/err/i)
 (expect:required in "LogFileBody" = 1 "Sucess signature" #/mtest/)
 

Index: mkdeploy/tests/executables/testconfig
==================================================================
--- mkdeploy/tests/executables/testconfig
+++ mkdeploy/tests/executables/testconfig
@@ -1,5 +1,21 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
 # Add steps here. Format is "stepname script"
 [ezsteps]
 linksrc linksrc.sh
 make_mt make
 install install.sh

Index: mkdeploy/tests/helpers/install.logpro
==================================================================
--- mkdeploy/tests/helpers/install.logpro
+++ mkdeploy/tests/helpers/install.logpro
@@ -1,3 +1,20 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 (expect:error in    "LogFileBody" = 0 "Any error"         #/err/i)
 (expect:required in "LogFileBody" = 1 "Sucess signature" #/adequate space/)
 

Index: mkdeploy/tests/helpers/install.sh
==================================================================
--- mkdeploy/tests/helpers/install.sh
+++ mkdeploy/tests/helpers/install.sh
@@ -1,6 +1,22 @@
 #!/bin/bash -e
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
 freespace=`df -k /$DIRECTORY | grep $DIRECTORY | awk '{print $4}'`
 if [[ $freespace -lt $REQUIRED ]];then
   echo "ERROR: insufficient space on /$DIRECTORY"
   exit 1
 else

Index: mkdeploy/tests/helpers/testconfig
==================================================================
--- mkdeploy/tests/helpers/testconfig
+++ mkdeploy/tests/helpers/testconfig
@@ -1,5 +1,21 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
 # Add steps here. Format is "stepname script"
 [ezsteps]
 install install.sh
 
 # Iteration for your tests are controlled by the items section

Index: mlaunch.scm
==================================================================
--- mlaunch.scm
+++ mlaunch.scm
@@ -1,13 +1,21 @@
 ;; Copyright 2006-2014, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
 
 ;;  strftime('%m/%d/%Y %H:%M:%S','now','localtime')
 
 ;;======================================================================
 ;; MLAUNCH
@@ -15,12 +23,11 @@
 ;;   take jobs from the given queue and keep launching them keeping
 ;;   the cpu load at the targeted level
 ;;
 ;;======================================================================
 
-(use sqlite3 srfi-1 posix regex regex-case srfi-69 dot-locking format)
-(import (prefix sqlite3 sqlite3:))
+(use sqlite3 srfi-1 posix regex regex-case srfi-69 format)
 
 (declare (unit mlaunch))
 (declare (uses db))
 (declare (uses common))
 

Index: mockup-cached-writes.scm
==================================================================
--- mockup-cached-writes.scm
+++ mockup-cached-writes.scm
@@ -1,5 +1,22 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
 
 
 (define (make-cached-writer the-db)
   (let ((db    the-db)
 	(queue '()))

Index: monitor.scm
==================================================================
--- monitor.scm
+++ monitor.scm
@@ -1,13 +1,21 @@
 ;; Copyright 2006-2012, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
 
 ;;  strftime('%m/%d/%Y %H:%M:%S','now','localtime')
 
 (use sqlite3 srfi-1 posix regex regex-case srfi-69 dot-locking)
 (import (prefix sqlite3 sqlite3:))

Index: mt-pg.sql
==================================================================
--- mt-pg.sql
+++ mt-pg.sql
@@ -1,11 +1,28 @@
+--  Copyright 2006-2017, Matthew Welland.
+-- 
+-- This file is part of Megatest.
+-- 
+--     Megatest is free software: you can redistribute it and/or modify
+--     it under the terms of the GNU General Public License as published by
+--     the Free Software Foundation, either version 3 of the License, or
+--     (at your option) any later version.
+-- 
+--     Megatest is distributed in the hope that it will be useful,
+--     but WITHOUT ANY WARRANTY; without even the implied warranty of
+--     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+--     GNU General Public License for more details.
+-- 
+--     You should have received a copy of the GNU General Public License
+--     along with Megatest.  If not, see .
+
 -- CREATE TABLE IF NOT EXISTS keys (
 --        id SERIAL PRIMARY KEY,
 --        fieldname TEXT,
 --        fieldtype TEXT,
 --        CONSTRAINT keyconstraint UNIQUE (fieldname));
-
+DROP VIEW IF EXISTS area_tag_view;
 DROP TABLE IF EXISTS areas;
 DROP TABLE IF EXISTS ttype;
 DROP TABLE IF EXISTS runs;
 DROP TABLE IF EXISTS run_stats;
 DROP TABLE IF EXISTS test_meta;
@@ -21,10 +38,23 @@
 DROP TABLE IF EXISTS test_data;
 DROP TABLE IF EXISTS test_rundat;
 DROP TABLE IF EXISTS archives;
 DROP TABLE IF EXISTS session_vars;
 DROP TABLE IF EXISTS sessions;
+DROP TABLE IF EXISTS tags;
+DROP TABLE IF EXISTS users; 
+DROP TABLE IF EXISTS webviews;
+DROP TABLE IF EXISTS area_tags;
+DROP TABLE IF EXISTS run_tags;
+DROP TABLE IF EXISTS users_webviews;
+DROP TABLE IF EXISTS base_paths;
+DROP TABLE IF EXISTS area_owners;
+DROP TABLE IF EXISTS shared_user_views;
+DROP TABLE IF EXISTS cctrl_info;
+DROP TABLE IF EXISTS cctrl_config;
+DROP TABLE IF EXISTS platforms;
+
 
 CREATE TABLE IF NOT EXISTS session_vars (
        id SERIAL PRIMARY KEY,
        session_id INTEGER,
        page TEXT,
@@ -40,10 +70,37 @@
        id SERIAL PRIMARY KEY,
        area_name TEXT NOT NULL,
        area_path TEXT NOT NULL,
        last_sync INTEGER DEFAULT 0,
        CONSTRAINT areaconstraint UNIQUE (area_name));
+
+CREATE TABLE IF NOT EXISTS tags (
+       id SERIAL PRIMARY KEY,
+       tag_name TEXT NOT NULL,
+       CONSTRAINT tagconstraint UNIQUE (tag_name));
+
+CREATE TABLE IF NOT EXISTS area_tags (
+       id SERIAL PRIMARY KEY,
+       tag_id   INTEGER DEFAULT 0,
+       area_id  INTEGER DEFAULT 0,
+       CONSTRAINT areatagconstraint UNIQUE (tag_id, area_id));
+
+CREATE TABLE IF NOT EXISTS run_tags (
+       id SERIAL PRIMARY KEY,
+       tag_id   INTEGER DEFAULT 0,
+       run_id  INTEGER DEFAULT 0,
+       CONSTRAINT areatagconstraint UNIQUE (tag_id, run_id));
+
+
+CREATE VIEW area_tag_view as 
+select a.id as aid, t.id as tid,area_name,tag_name,area_path from areas as a inner join area_tags as at on at.area_id = a.id
+inner join tags as t on t.id = at.tag_id  ;
+
+CREATE VIEW run_tag_view as 
+select r.id as rid, t.id as tid,tag_name from runs as r inner join run_tags as rt on rt.run_id = r.id
+inner join tags as t on t.id = rt.tag_id  ;
+
 
 INSERT INTO areas (id,area_name,area_path) VALUES (0,'local','.');
 
 CREATE TABLE IF NOT EXISTS ttype (
        id SERIAL PRIMARY KEY,
@@ -61,11 +118,20 @@
        comment    TEXT DEFAULT '',
        fail_count INTEGER DEFAULT 0,
        pass_count INTEGER DEFAULT 0,
        last_update INTEGER DEFAULT extract(epoch from now()),
        area_id     INTEGER DEFAULT 0,
-       CONSTRAINT runsconstraint UNIQUE (target,ttype_id,run_name));
+       publish_time INTEGER default date_part('epoch'::text, now()),
+       CONSTRAINT runsconstraint UNIQUE (target,ttype_id,run_name, area_id));
+
+create Table if not exists change_triggers (
+       id SERIAL           PRIMARY KEY,
+       target              TEXT NOT NULL,
+       area                TEXT NOT NULL,
+       iteration           INTEGER NOT NULL,
+       iteration_timestamp TIMESTAMP WITHOUT TIME ZONE DEFAULT now(),  
+       reason              TEXT Not null);
 
 CREATE TABLE IF NOT EXISTS run_stats (
        id     SERIAL PRIMARY KEY,
        run_id INTEGER,
        state  TEXT,
@@ -208,9 +274,94 @@
        status       TEXT DEFAULT 'n/a',
        archive_type TEXT DEFAULT 'bup',
        du           INTEGER,
        archive_path TEXT);
  
+CREATE TABLE IF NOT EXISTS users(
+   id SERIAL  PRIMARY KEY   ,
+   username           TEXT    NOT NULL,
+   fullname          TEXT    NOT NULL, 
+   email             TEXT    NOT NULL, 
+   default_view      TEXT    default '',
+   is_admin          boolean default 'f',
+   deleted           INTEGER     default 0
+);
+
+CREATE TABLE IF NOT EXISTS base_paths(
+   id SERIAL  PRIMARY KEY   ,
+   path           TEXT    NOT NULL,
+   deleted           INTEGER     default 0
+);
+
+
+CREATE TABLE IF NOT EXISTS area_owners(
+   id SERIAL  PRIMARY KEY   ,
+   user_id INTEGER,
+   base_path_id INTEGER,
+	 deleted           INTEGER     default 0
+);
+
+CREATE TABLE IF NOT EXISTS shared_user_views(
+   id SERIAL  PRIMARY KEY   ,
+   user_id INTEGER,
+   view_id INTEGER,
+	 deleted           INTEGER     default 0
+);
+
+ 
+CREATE TABLE IF NOT EXISTS webviews(
+   id SERIAL  PRIMARY KEY   ,
+   owner_id          INTEGER NOT NULL,
+   name              TEXT    NOT NULL, 
+   ttype_id          INTEGER DEFAULT 0,
+   view_specifics    TEXT   ,
+   col               TEXT    NOT NULL,
+   row               TEXT    NOT NULL,
+   public            INTEGER DEFAULT 0,
+   search_patt      TEXT    default '.*',
+   deleted           INTEGER     default 0
+);
+
+CREATE TABLE IF NOT EXISTS flexviews(
+   id SERIAL  PRIMARY KEY   ,
+   public            INTEGER DEFAULT 0,
+   attributes         TEXT    NOT NULL,
+   name 						 TEXT    NOT NULL,
+   deleted           INTEGER default 0
+);
+
+
+CREATE TABLE IF NOT EXISTS users_webviews(
+ id      SERIAL  PRIMARY KEY   ,
+ user_id         INTEGER NOT NULL,
+ webview_id  		 INTEGER NOT NULL,
+ deleted     		 INTEGER default 0,
+ searchpattern 	 TEXT Default '',
+ web_page   		 TEXT Default '',
+ is_default      boolean default 'f',
+ other_search_data TEXT Default ''
+);
+
+CREATE TABLE IF NOT EXISTS cctrl_info(
+ id      SERIAL  PRIMARY KEY   ,
+ user_id   INTEGER NOT NULL,
+ input TEXT Default '',
+ result_file TEXT Default NULL,
+ chksum TEXT
+);
+
+CREATE TABLE IF NOT EXISTS cctrl_config(
+	id      SERIAL  PRIMARY KEY   ,
+  area_type Text,
+  metadata text default '',
+  cmd TEXT 
+);
+
+CREATE TABLE IF NOT EXISTS platforms(
+	id      SERIAL  PRIMARY KEY   ,
+  name Text
+);
+
 
 -- TRUNCATE archive_blocks, archive_allocations, extradat, metadat,
 -- access_log, tests, test_steps, test_data, test_rundat, archives, runs,
 -- run_stats, test_meta, tasks_queue, archive_disks;

Index: mt-sqlite3.sql
==================================================================
--- mt-sqlite3.sql
+++ mt-sqlite3.sql
@@ -1,5 +1,22 @@
+--  Copyright 2006-2017, Matthew Welland.
+-- 
+-- This file is part of Megatest.
+-- 
+--     Megatest is free software: you can redistribute it and/or modify
+--     it under the terms of the GNU General Public License as published by
+--     the Free Software Foundation, either version 3 of the License, or
+--     (at your option) any later version.
+-- 
+--     Megatest is distributed in the hope that it will be useful,
+--     but WITHOUT ANY WARRANTY; without even the implied warranty of
+--     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+--     GNU General Public License for more details.
+-- 
+--     You should have received a copy of the GNU General Public License
+--     along with Megatest.  If not, see .
+
 -- CREATE TABLE IF NOT EXISTS keys (
 --        id SERIAL PRIMARY KEY,
 --        fieldname TEXT,
 --        fieldtype TEXT,
 --        CONSTRAINT keyconstraint UNIQUE (fieldname));

Index: mt.scm
==================================================================
--- mt.scm
+++ mt.scm
@@ -1,13 +1,22 @@
 ;; Copyright 2006-2013, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
 
 
 (use sqlite3 srfi-1 posix regex regex-case srfi-69 dot-locking (srfi 18) posix-extras directory-utils call-with-environment-variables)
 (import (prefix sqlite3 sqlite3:))
 
@@ -127,47 +136,103 @@
 			  (cons testn res)))))))))
 
 ;;======================================================================
 ;;  T R I G G E R S
 ;;======================================================================
+
+(define (mt:run-trigger cmd test-id test-rundir trigger logname test-name item-path event-time actual-state actual-status)
+  ;; Putting the commandline into ( )'s means no control over the shell. 
+  ;; stdout and stderr will be caught in the NBFAKE or mt_launch.log files
+  ;; or equivalent. No need to do this. Just run it?
+  (let* ((fullcmd (conc "nbfake "
+			cmd           " "
+			test-id       " "
+			test-rundir   " "
+			trigger       " "
+			test-name     " "
+			item-path     " " ;; has / prepended to deal with toplevel tests
+			actual-state  " "
+			actual-status " "
+			event-time
+			))
+	 (prev-nbfake-log (get-environment-variable "NBFAKE_LOG")))
+    (setenv "NBFAKE_LOG" (conc (cond
+				((and (directory-exists? test-rundir)
+				      (file-write-access? test-rundir))
+				 test-rundir)
+				((and (directory-exists? *toppath*)
+				      (file-write-access? *toppath*))
+				 *toppath*)
+				(else (conc "/tmp/" (current-user-name))))
+			       "/" logname))
+    (debug:print-info 0 *default-log-port* "TRIGGERED on " trigger ", running command " fullcmd " output at " (get-environment-variable "NBFAKE_LOG"))
+    ;; (call-with-environment-variables
+    ;;  `(("NBFAKE_LOG" . ,(conc test-rundir "/" logname)))
+    ;;  (lambda ()
+    (process-run fullcmd)
+    (if prev-nbfake-log
+	(setenv "NBFAKE_LOG" prev-nbfake-log)
+	(unsetenv "NBFAKE_LOG"))
+    )) ;; ))
 
 (define (mt:process-triggers dbstruct run-id test-id newstate newstatus)
-  (let* ((test-dat      (db:get-test-info-by-id dbstruct run-id test-id)))
-    (if test-dat
-	(let* ((test-rundir   ;; (rmt:sdb-qry 'getstr ;; (filedb:get-path *fdb*
-		(db:test-get-rundir test-dat)) ;; ) ;; )
-	       (test-name     (db:test-get-testname test-dat))
-	       (tconfig       #f)
-	       (state         (if newstate  newstate  (db:test-get-state  test-dat)))
-	       (status        (if newstatus newstatus (db:test-get-status test-dat))))
-	  (if (and test-name
-		   test-rundir   ;; #f means no dir set yet
-		   (file-exists? test-rundir)
-		   (directory? test-rundir))
-	      (call-with-environment-variables
-	       (list (cons "MT_TEST_NAME" test-name)
-		     (cons "MT_TEST_RUN_DIR" test-rundir)
-		     (cons "MT_ITEMPATH"     (db:test-get-item-path test-dat)))
-	       (lambda ()
-		 (push-directory test-rundir)
-		 (set! tconfig (mt:lazy-read-test-config test-name))
-		 (for-each (lambda (trigger)
-			     (let ((cmd  (configf:lookup tconfig "triggers" trigger))
-				   (logf (conc  test-rundir "/last-trigger.log")))
-			       (if cmd
-				   ;; Putting the commandline into ( )'s means no control over the shell. 
-				   ;; stdout and stderr will be caught in the NBFAKE or mt_launch.log files
-				   ;; or equivalent. No need to do this. Just run it?
-				   (let ((fullcmd (conc cmd " " test-id " " test-rundir " " trigger "&")))
-				     (debug:print-info 0 *default-log-port* "TRIGGERED on " trigger ", running command " fullcmd)
-				     (process-run fullcmd)))))
-			   (list
-			    (conc state "/" status)
-			    (conc state "/")
-			    (conc "/" status)))
-		 (pop-directory))
-	       ))))))
+  (if test-id 
+      (let* ((test-dat      (db:get-test-info-by-id dbstruct run-id test-id)))
+	(if test-dat
+	    (let* ((test-rundir   (db:test-get-rundir       test-dat)) ;; ) ;; )
+		   (test-name     (db:test-get-testname     test-dat))
+		   (item-path     (db:test-get-item-path    test-dat))
+		   (duration      (db:test-get-run_duration test-dat))
+		   (comment       (db:test-get-comment      test-dat))
+		   (event-time    (db:test-get-event_time   test-dat))
+		   (tconfig       #f)
+		   (state         (if newstate  newstate  (db:test-get-state  test-dat)))
+		   (status        (if newstatus newstatus (db:test-get-status test-dat))))
+	      ;; (mutex-lock! *triggers-mutex*)
+              (handle-exceptions
+               exn
+               (begin
+                 (debug:print-error 0 *default-log-port* " Exception in mt:process-triggers for run-id="run-id" test-id="test-id" newstate="newstate" newstatus="newstatus
+                                    "\n   error: " ((condition-property-accessor 'exn 'message) exn) ", exn=" exn
+                                    "\n   test-rundir="test-rundir
+                                    "\n   test-name="test-name
+                                    "\n   item-path="item-path
+                                    "\n   state="state
+                                    "\n   status="status
+                                    "\n")
+                 (print-call-chain (current-error-port))
+                 #f)
+               (if (and test-name
+                        test-rundir)   ;; #f means no dir set yet
+                   ;; (common:file-exists? test-rundir)
+                   ;; (directory? test-rundir))
+                   (call-with-environment-variables
+                    (list (cons "MT_TEST_NAME"    (or test-name "no such test"))
+                          (cons "MT_TEST_RUN_DIR" (or test-rundir "no test directory yet"))
+                          (cons "MT_ITEMPATH"     (or item-path "")))
+                    (lambda ()
+                      (if (directory-exists? test-rundir)
+                          (push-directory test-rundir)
+                          (push-directory *toppath*))
+                      (set! tconfig (mt:lazy-read-test-config test-name))
+                      (for-each (lambda (trigger)
+                                  (let* ((munged-trigger (string-translate trigger "/ " "--"))
+					(logname        (conc "last-trigger-" munged-trigger ".log")))
+                                    ;; first any triggers from the testconfig
+                                    (let ((cmd  (configf:lookup tconfig "triggers" trigger)))
+                                      (if cmd (mt:run-trigger cmd test-id test-rundir trigger (conc "tconfig-" logname) test-name item-path event-time state status)))
+                                    ;; next any triggers from megatest.config
+                                    (let ((cmd  (configf:lookup *configdat* "triggers" trigger)))
+                                      (if cmd (mt:run-trigger cmd test-id test-rundir trigger (conc "mtconfig-" logname) test-name item-path event-time state status)))))
+                                (list
+                                 (conc state "/" status)
+                                 (conc state "/")
+                                 (conc "/" status)))
+		     (pop-directory))
+                    )))
+	      ;; (mutex-unlock! *triggers-mutex*)
+	      )))))
 
 ;;======================================================================
 ;;  S T A T E   A N D   S T A T U S   F O R   T E S T S 
 ;;======================================================================
 
@@ -190,27 +255,40 @@
 	;;  (if newcomment (rmt:general-call 'set-test-comment run-id newcomment test-id))))
 	(rmt:set-state-status-and-roll-up-items run-id test-id #f newstate newstatus newcomment)
 	;; (mt:process-triggers run-id test-id newstate newstatus)
 	#t)))
 
+
+(define (mt:test-set-state-status-by-id-unless-completed run-id test-id newstate newstatus newcomment)
+  (let* ((test-vec   (rmt:get-testinfo-state-status run-id test-id))
+         (state     (vector-ref test-vec 3)))
+    (if (equal? state "COMPLETED")
+        #t
+        (rmt:set-state-status-and-roll-up-items run-id test-id #f newstate newstatus newcomment))))
+
+  
 (define (mt:test-set-state-status-by-testname run-id test-name item-path new-state new-status new-comment)
-  (let ((test-id (rmt:get-test-id run-id test-name item-path)))
-    (rmt:set-state-status-and-roll-up-items run-id test-name item-path new-state new-status new-comment)
-    ;; (mt:process-triggers run-id test-id new-state new-status)
-    #t))
+  ;(let ((test-id (rmt:get-test-id run-id test-name item-path)))
+  (rmt:set-state-status-and-roll-up-items run-id test-name item-path new-state new-status new-comment)
+  ;; (mt:process-triggers run-id test-id new-state new-status)
+  #t);)
 	;;(mt:test-set-state-status-by-id run-id test-id new-state new-status new-comment)))
 
+(define (mt:test-set-state-status-by-testname-unless-completed run-id test-name item-path new-state new-status new-comment)
+  (let ((test-id (rmt:get-test-id run-id test-name item-path)))
+    (mt:test-set-state-status-by-id-unless-completed run-id test-id new-state new-status new-comment)))
+    
 (define (mt:lazy-read-test-config test-name)
   (let ((tconf (hash-table-ref/default *testconfigs* test-name #f)))
     (if tconf
 	tconf
 	(let ((test-dirs (tests:get-tests-search-path *configdat*)))
 	  (let loop ((hed (car test-dirs))
 		     (tal (cdr test-dirs)))
 	    ;; Setting MT_LINKTREE here is almost certainly unnecessary. 
 	    (let ((tconfig-file (conc hed "/" test-name "/testconfig")))
-	      (if (and (file-exists? tconfig-file)
+	      (if (and (common:file-exists? tconfig-file)
 		       (file-read-access? tconfig-file))
 		  (let ((link-tree-path (common:get-linktree)) ;; (configf:lookup *configdat* "setup" "linktree"))
 			(old-link-tree  (get-environment-variable "MT_LINKTREE")))
 		    (if link-tree-path (setenv "MT_LINKTREE" link-tree-path))
 		    (let ((newtcfg (read-config tconfig-file #f #f))) ;; NOTE: Does NOT run [system ...]

ADDED   mtargs.scm
Index: mtargs.scm
==================================================================
--- /dev/null
+++ mtargs.scm
@@ -0,0 +1,23 @@
+;;======================================================================
+;; Copyright 2019, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
+;;======================================================================
+
+(declare (unit mtargs))
+
+(include "mtargs/mtargs.scm")

ADDED   mtargs/Makefile
Index: mtargs/Makefile
==================================================================
--- /dev/null
+++ mtargs/Makefile
@@ -0,0 +1,22 @@
+# Copyright 2007-2010, Matthew Welland.
+#
+#  This program is made available under the GNU GPL version 2.0 or
+#  greater. See the accompanying file COPYING for details.
+#
+#  This program is distributed WITHOUT ANY WARRANTY; without even the
+#  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#  PURPOSE.
+
+# TARGDIR = $(shell csi -e "(print (car \#\#sys\#include-pathnames))(exit)")
+
+all : uptodate.log # $(TARGDIR)/mtargs.so
+
+uptodate.log : mtargs.scm mtargs.setup
+	chicken-install | tee uptodate.log
+
+$(TARGDIR)/mtargs.so : mtargs.so
+	@echo installing to $(TARGDIR)
+	cp mtargs.so $(TARGDIR)
+
+mtargs.so : mtargs.scm
+	csc -s mtargs.scm

ADDED   mtargs/mtargs.meta
Index: mtargs/mtargs.meta
==================================================================
--- /dev/null
+++ mtargs/mtargs.meta
@@ -0,0 +1,20 @@
+(
+; Your egg's license:
+(license "LGPL")
+
+; Pick one from the list of categories (see below) for your egg and enter it
+; here.
+(category misc)
+
+; A list of eggs mpeg3 depends on.  If none, you can omit this declaration
+; altogether. If you are making an egg for chicken 3 and you need to use
+; procedures from the `files' unit, be sure to include the `files' egg in the
+; `needs' section (chicken versions < 3.4.0 don't provide the `files' unit).
+; `depends' is an alias to `needs'.
+(needs srfi-69 srfi-1)
+
+; A list of eggs required for TESTING ONLY.  See the `Tests' section.
+(test-depends test)
+
+(author "Matt Welland")
+(synopsis "Primitive argument processor."))

ADDED   mtargs/mtargs.scm
Index: mtargs/mtargs.scm
==================================================================
--- /dev/null
+++ mtargs/mtargs.scm
@@ -0,0 +1,96 @@
+;; Copyright 2007-2010, Matthew Welland.
+;;
+;; This file is part of mtargs.
+;; 
+;;     mtargs is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     mtargs is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with mtargs.  If not, see .
+
+
+(module mtargs
+    (
+     arg-hash
+     get-arg
+     get-arg-from
+     usage
+     get-args
+     print-args
+     any-defined?
+     help
+     )
+
+(import scheme chicken data-structures extras posix ports files)
+(use srfi-69 srfi-1)
+
+(define arg-hash (make-hash-table))
+(define help "")
+
+(define (get-arg arg . default)
+  (if (null? default)
+      (hash-table-ref/default arg-hash arg #f)
+      (hash-table-ref/default arg-hash arg (car default))))
+
+(define (any-defined? . args)
+  (not (null? (filter (lambda (x) x)
+		      (map get-arg args)))))
+
+;; (define any any-defined?)
+
+(define (get-arg-from ht arg . default)
+  (if (null? default)
+      (hash-table-ref/default ht arg #f)
+      (hash-table-ref/default ht arg (car default))))
+
+(define (usage . args)
+  (if (> (length args) 0)
+      (apply print "ERROR: " args))
+  (if (string? help)
+      (print help)
+      (print "Usage: " (car (argv)) " ... "))
+  (exit 0))
+
+(define (get-args args params switches arg-hash num-needed)
+  (let* ((numtargs (length args))
+	 (adj-num-needed (if num-needed (+ num-needed 2) #f)))
+    (if (< numtargs (if adj-num-needed adj-num-needed 2))
+	(if (>= num-needed 1)
+	    (usage "No arguments provided")
+	    '())
+	(let loop ((arg (cadr args))
+		   (tail (cddr args))
+		   (remtargs '()))
+	  (cond 
+	   ((member arg params) ;; args with params
+	    (if (< (length tail) 1)
+		(usage "param given without argument " arg)
+		(let ((val     (car tail))
+		      (newtail (cdr tail)))
+		  (hash-table-set! arg-hash arg val)
+		  (if (null? newtail) remtargs
+		      (loop (car newtail)(cdr newtail) remtargs)))))
+	   ((member arg switches)         ;; args with no params (i.e. switches)
+	    (hash-table-set! arg-hash arg #t)
+	    (if (null? tail) remtargs
+		(loop (car tail)(cdr tail) remtargs)))
+	   (else
+	    (if (null? tail)(append remtargs (list arg)) ;; return the non-used args
+		(loop (car tail)(cdr tail)(append remtargs (list arg))))))))
+    ))
+
+(define (print-args remtargs arg-hash)
+  (print "ARGS: " remtargs)
+  (for-each (lambda (arg)
+	      (print "   " arg "   " (hash-table-ref/default arg-hash arg #f)))
+	    (hash-table-keys arg-hash)))
+
+
+)

ADDED   mtargs/mtargs.setup
Index: mtargs/mtargs.setup
==================================================================
--- /dev/null
+++ mtargs/mtargs.setup
@@ -0,0 +1,18 @@
+;; Copyright 2007-2010, Matthew Welland.
+;;
+;;  This program is made available under the GNU GPL version 2.0 or
+;;  greater. See the accompanying file COPYING for details.
+;;
+;;  This program is distributed WITHOUT ANY WARRANTY; without even the
+;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+;;  PURPOSE.
+
+;;;; mtargs.setup
+
+;; compile the code into a dynamically loadable shared object
+;; (will generate mtargs.so)
+(compile -s mtargs.scm)
+
+;; Install as extension library
+(standard-extension 'mtargs "mtargs.so")
+

ADDED   mtexec.scm
Index: mtexec.scm
==================================================================
--- /dev/null
+++ mtexec.scm
@@ -0,0 +1,121 @@
+; Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
+
+;; (include "common.scm")
+;; (include "megatest-version.scm")
+
+;; fake out readline usage of toplevel-command
+(define (toplevel-command . a) #f)
+
+(use srfi-1 posix srfi-69 readline ;;  regex regex-case srfi-69 apropos json http-client directory-utils rpc typed-records;; (srfi 18) extras)
+   srfi-19  srfi-18 extras format pkts regex regex-case
+     (prefix dbi dbi:)
+     )
+
+;; (declare (uses common))
+(declare (uses margs))
+(declare (uses configf))
+;; (declare (uses rmt))
+
+;; (use ducttape-lib)
+(include "megatest-version.scm")
+(include "megatest-fossil-hash.scm")
+
+;; (require-library stml)
+
+(define help (conc "
+mtutil, part of the Megatest tool suite, documentation at http://www.kiatoa.com/fossils/megatest
+  version " megatest-version "
+  license GPL, Copyright Matt Welland 2006-2017
+
+Usage: mtutil action [options]
+  -h                         : this help
+  -manual                    : show the Megatest user manual
+  -version                   : print megatest version (currently " megatest-version ")
+			     
+Queries:
+   show [areas|contours... ] : show areas, contours or other section from megatest.config
+   gendot                    : generate a graphviz dot file from pkts.
+
+Contour actions:
+   process                   : runs import, rungen and dispatch 
+			     
+Trigger propagation actions:
+   tsend a=b,c=d...          : send trigger info to all recpients in the [listeners] section
+   tlisten -port N           : listen for trigger info on port N
+
+Misc 			     
+  -start-dir path            : switch to this directory before running mtutil
+  -set-vars V1=1,V2=2        : Add environment variables to a run NB// these are
+                                   overwritten by values set in config files.
+  -log logfile               : send stdout and stderr to logfile
+  -repl                      : start a repl (useful for extending megatest)
+  -load file.scm             : load and run file.scm
+  -debug N|N,M,O...          : enable debug messages 0-N or N and M and O ...
+  -list-pkt-keys             : list all pkt keys
+
+Examples:
+
+# Start a megatest run in the area \"mytests\"
+mtutil run -area mytests -target v1.63/aa3e -mode-patt MYPATT -tag-expr quick
+
+# Start a contour
+mtutil run -contour quick -target v1.63/aa3e 
+
+Called as " (string-intersperse (argv) " ") "
+Version " megatest-version ", built from " megatest-fossil-hash ))
+  ;; first token is our action, but only if no leading dash
+
+(define *action* (if (and (> (length (argv)) 1)
+                          (not (string-match "^\\-.*" (cadr (argv)))))
+		     (cadr (argv))
+		     #f))
+
+(define *remargs*
+  (args:get-args
+ (if *action* (cdr (argv)) (argv))
+ '("-log")
+ '("-h")
+ args:arg-hash
+ 0))
+
+(if (args:get-arg "-h")
+    (begin
+      (print help)
+      (exit)))
+
+(if (or (args:get-arg "-repl")
+	(args:get-arg "-load"))
+    (begin
+      (import extras) ;; might not be needed
+      ;; (import csi)
+      (import readline)
+      (import apropos)
+      ;; (import (prefix sqlite3 sqlite3:)) ;; doesn't work ...
+      
+      (install-history-file (get-environment-variable "HOME") ".mtutil_history") ;;  [homedir] [filename] [nlines])
+      (current-input-port (make-readline-port "mtutil> "))
+      (if (args:get-arg "-repl")
+	  (repl)
+	  (load (args:get-arg "-load")))))
+
+#|
+(define mtconf (car (simple-setup #f)))
+(define dat (common:with-queue-db mtconf (lambda (conn)(get-pkts conn '()))))
+(pp (pkts#flatten-all dat '((cmd . ((parent . P)(url . M)))(runtype . ((parent . P)))) 'id 'group-id 'uuid 'parent 'pkt-type 'pkt 'processed))
+|#

Index: mtut.scm
==================================================================
--- mtut.scm
+++ mtut.scm
@@ -1,50 +1,125 @@
-;; Copyright 2006-2017, Matthew Welland.
-;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
-;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+; Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
 
 ;; (include "common.scm")
-;; (include "megatest-version.scm")
+(include "megatest-version.scm")
 
 ;; fake out readline usage of toplevel-command
 (define (toplevel-command . a) #f)
 
 (use srfi-1 posix srfi-69 readline ;;  regex regex-case srfi-69 apropos json http-client directory-utils rpc typed-records;; (srfi 18) extras)
-     srfi-18 extras format pkts pkts regex regex-case
-     (prefix dbi dbi:)) ;;  zmq extras)
+   srfi-19  srfi-18 extras format pkts regex regex-case
+     (prefix dbi dbi:)
+     (prefix sqlite3 sqlite3:)
+     nanomsg)
 
 (declare (uses common))
-(declare (uses megatest-version))
 (declare (uses margs))
 (declare (uses configf))
 ;; (declare (uses rmt))
+
+(use ducttape-lib)
 
 (include "megatest-fossil-hash.scm")
 
 (require-library stml)
 
-(define *target-mappers*  (make-hash-table)) ;; '())
-(define *runname-mappers* (make-hash-table)) ;; '())
+;; stuff for the mapper and checker functions
+;;
+(define *target-mappers*  (make-hash-table)) 
+(define *runname-mappers* (make-hash-table)) 
+(define *area-checkers*   (make-hash-table)) 
 
+(define (mtut:stml->string in-stml)
+  (with-output-to-string
+    (lambda ()
+      (s:output-new
+       (current-output-port)
+       in-stml))))
+
+;; helpers for mappers/checkers
+(define (add-target-mapper name proc)
+  (hash-table-set! *target-mappers* name proc))
+(define (add-runname-mapper name proc)
+  (hash-table-set! *runname-mappers* name proc))
+(define (add-area-checker name proc)
+  (hash-table-set! *area-checkers* name proc))
+
+;; given a runkey, xlatr-key and other info return one of the following:
+;;   list of targets, null list to skip processing
+;;   
+(define (map-targets mtconf aval-alist runkey area contour #!key (xlatr-key-in #f))
+  (pp aval-alist)
+  (print "In Map-targets")
+  (let* ((xlatr-key (or xlatr-key-in
+                        (conf-get/default mtconf aval-alist 'targtrans)))
+         (proc      (hash-table-ref/default *target-mappers* xlatr-key #f)))
+    (if proc
+        (begin
+          (print "Using target mapper: " xlatr-key)
+          (handle-exceptions
+           exn
+           (begin
+             (print "FAILED TO RUN TARGET MAPPER FOR " area ", called " xlatr-key)
+             (print "   function is: " (hash-table-ref/default *target-mappers* xlatr-key #f ) )
+             (print " message: " ((condition-property-accessor 'exn 'message) exn))
+             runkey)
+           (proc runkey area contour)))
+        (begin
+          (if xlatr-key 
+              (print "ERROR: Failed to find named target translator " xlatr-key ", using original target."))
+          `(,runkey))))) ;; no proc then use runkey
+
+;; given mtconf and areaconf extract a translator/filter, first look at areaconf
+;; then if not found look at default
+;;
+(define (conf-get/default mtconf areaconf keyname #!key (default #f))
+  (let ((res (or (alist-ref keyname areaconf)
+                 (configf:lookup mtconf "default" (conc keyname))
+                 default)))
+    (if res
+        (string->symbol res)
+        res)))
+  
 ;; this needs some thought regarding security implications.
 ;;
 ;;   i. Check that owner of the file and calling user are same?
 ;;  ii. Check that we are in a legal megatest area?
 ;; iii. Have some form of authentication or record of the md5sum or similar of the file?
 ;;  iv. Use compiled version in preference to .scm version. Thus there is a manual "blessing"
 ;;      required to use .mtutil.scm.
 ;;
-(if (file-exists? "megatest.config")
-    (if (file-exists? ".mtutil.so")
+(if (common:file-exists? "megatest.config")
+    (if (common:file-exists? ".mtutil.so")
 	(load ".mtutil.so")
-	(if (file-exists? ".mtutil.scm")
-	(load ".mtutil.scm"))))
+	(if (common:file-exists? ".mtutil.scm")
+            (load ".mtutil.scm"))))
+
+;; main three types of run
+;;  "-run"         => initiate a run
+;;  "-rerun-clean" => set failed, aborted, killed, etc. (not pass/fail) to NOT_STARTED and kick off run
+;;  "-rerun-all"   => set all tests NOT_STARTED and kick off run again
+
+;; deprecated/do not use
+;;  "-runall"      => synonym for run, do not use
+;;  "-runtests"    => synonym for run, do not use
 
 ;; Disabled help items
 ;;  -rollup                 : (currently disabled) fill run (set by :runname)  with latest test(s)
 ;;                            from prior runs with same keys
 ;; Contour actions
@@ -56,55 +131,71 @@
 mtutil, part of the Megatest tool suite, documentation at http://www.kiatoa.com/fossils/megatest
   version " megatest-version "
   license GPL, Copyright Matt Welland 2006-2017
 
 Usage: mtutil action [options]
-  -h                       : this help
-  -manual                  : show the Megatest user manual
-  -version                 : print megatest version (currently " megatest-version ")
-
-Actions:
-   run                     : initiate runs
-   remove                  : remove runs
-   rerun                   : register action for processing
-   set-ss                  : set state/status
-   archive                 : compress and move test data to archive disk
-   kill                    : stop tests or entire runs
-   db                      : database utilities
+  -h                         : this help
+  -manual                    : show the Megatest user manual
+  -version                   : print megatest version (currently " megatest-version ")
+			     
+Run management:		     
+   run                       : initiate or resume a run, already completed and in-progress
+                               tests are not affected.
+   rerun-clean               : clean and rerun all not completed pass/fail tests
+   rerun-all                 : clean and rerun entire run
+   kill-run                  : kill all tests in run
+   kill-rerun                : kill all tests in run and restart non-completed tests
+   remove                    : remove runs
+   set-ss                    : set state/status
+   archive                   : compress and move test data to archive disk
+   kill                      : stop tests or entire runs
+   db                        : database utilities
+
+Queries:
+   show [areas|contours... ] : show areas, contours or other section from megatest.config
+   gendot                    : generate a graphviz dot file from pkts.
 
 Contour actions:
-   process                 : runs import, rungen and dispatch 
-
-Selectors 
-  -immediate               : apply this action immediately, default is to queue up actions
-  -area areapatt1,area2... : apply this action only to the specified areas
-  -target key1/key2/...    : run for key1, key2, etc.
-  -test-patt p1/p2,p3/...  : % is wildcard
-  -run-name                : required, name for this particular test run
-  -contour contourname     : run all targets for contourname, requires -run-name, -target
-  -state-status c/p,c/f    : Specify a list of state and status patterns
-  -tag-expr tag1,tag2%,..  : select tests with tags matching expression
-  -mode-patt key           : load testpatt from  in runconfigs instead of default TESTPATT
-                             if -testpatt and -tagexpr are not specified
-  -new state/status        : specify new state/status for set-ss
-
-Misc 
-  -start-dir path          : switch to this directory before running mtutil
-  -set-vars V1=1,V2=2      : Add environment variables to a run NB// these are
-                                 overwritten by values set in config files.
-  -log logfile             : send stdout and stderr to logfile
-  -repl                    : start a repl (useful for extending megatest)
-  -load file.scm           : load and run file.scm
-  -debug N|N,M,O...        : enable debug messages 0-N or N and M and O ...
-
-Utility
- db pgschema               : emit postgresql schema; do \"mtutil db pgschema | psql -d mydb\"
+   process                   : runs import, rungen and dispatch 
+			     
+Trigger propagation actions:
+   tsend a=b,c=d...          : send trigger info to all recpients in the [listeners] section
+   tlisten -port N           : listen for trigger info on port N
+			     
+Selectors 		     
+  -immediate                 : apply this action immediately, default is to queue up actions
+  -area areapatt1,area2...   : apply this action only to the specified areas
+  -target key1/key2/...      : run for key1, key2, etc.
+  -test-patt p1/p2,p3/...    : % is wildcard
+  -run-name                  : required, name for this particular test run
+  -contour contourname       : run all targets for contourname, requires -run-name, -target
+  -state-status c/p,c/f      : Specify a list of state and status patterns
+  -tag-expr tag1,tag2%,..    : select tests with tags matching expression
+  -mode-patt key             : load testpatt from  in runconfigs instead of default TESTPATT
+                               if -testpatt and -tagexpr are not specified
+  -new state/status          : specify new state/status for set-ss
+			     
+Misc 			     
+  -start-dir path            : switch to this directory before running mtutil
+  -set-vars V1=1,V2=2        : Add environment variables to a run NB// these are
+                                   overwritten by values set in config files.
+  -log logfile               : send stdout and stderr to logfile
+  -repl                      : start a repl (useful for extending megatest)
+  -load file.scm             : load and run file.scm
+  -debug N|N,M,O...          : enable debug messages 0-N or N and M and O ...
+  -list-pkt-keys             : list all pkt keys
+			     
+Utility			     
+ db pgschema                 : emit postgresql schema; do \"mtutil db pgschema | psql -d mydb\"
+ gatherdb [propagate]        : gather dbs from all areas into /tmp/$USER_megatest/alldbs,
+                               optionally propagate the data to megatest2.0 format
+ 
 
 Examples:
 
 # Start a megatest run in the area \"mytests\"
-mtutil -area mytests -action run -target v1.63/aa3e -mode-patt MYPATT -tag-expr quick
+mtutil run -area mytests -target v1.63/aa3e -mode-patt MYPATT -tag-expr quick
 
 # Start a contour
 mtutil run -contour quick -target v1.63/aa3e 
 
 Called as " (string-intersperse (argv) " ") "
@@ -111,30 +202,39 @@
 Version " megatest-version ", built from " megatest-fossil-hash ))
 
 ;; args and pkt key specs
 ;;
 (define *arg-keys*
+  ;; used keys
+  ;;    a  - action
   '(
     ("-area"            . G) ;; maps to group
     ("-contour"         . c)
     ("-append-config"   . d)
     ("-state"           . e)
     ("-item-patt"       . i)
     ("-sync-to"         . k)
+    ("-new"             . l) ;; l (see below) is new-ss
     ("-run-name"        . n)
     ("-mode-patt"       . o)
     ("-test-patt"       . p)  ;; idea, enhance margs ("-test-patt" "-testpatt") => yields one value in "-test-patt"
     ("-status"          . s)
     ("-target"          . t)
+    ("-reqtarg"         . R)
+
     ("-tag-expr"        . x)
     ;; misc
     ("-debug"           . #f)  ;; for *verbosity* > 2
     ("-load"            . #f)  ;; load and exectute a scheme file
     ("-log"             . #f)
+    ("-override-user"   . #f)
     ("-msg"             . M)
     ("-start-dir"       . S)
     ("-set-vars"        . v)
+    ("-config"          . h)
+    ("-time-out"        . u)
+    ("-archive"         . b)
     ))
 (define *switch-keys*
   '(
     ("-h"               . #f)
     ("-help"            . #f)
@@ -143,20 +243,65 @@
     ("-version"         . #f)
     ;; misc	        
     ("-repl"            . #f)
     ("-immediate"       . I)
     ("-preclean"        . r)
-    ("-rerun-all"       . u)
     ("-prepend-contour" . w)
+    ("-force"           . F)
+    ("-list-pkt-keys"   . #f)
     ))
 
 ;; alist to map actions to old megatest commands
 (define *action-keys*
   '((run         . "-run")
+    (rerun-clean . "-rerun-clean")
+    (rerun-all   . "-rerun-all")
+    (kill-run    . "-kill-runs")
+    (kill-rerun  . "-kill-rerun")
+    (lock        . "-lock")
+    (unlock      . "-unlock")
     (sync        . "")
-    (archive     . "-archive")
-    (set-ss      . "-set-state-status")))
+    (archive     . "")
+    (set-ss      . "-set-state-status")
+    (remove      . "-remove-runs")))
+
+;; manually keep this list updated from the keys to
+;; the case *action* near the end of this file.
+(define *other-actions*
+  '(run remove rerun set-ss archive kill list
+	dispatch import rungen process
+	show gendot db tsend tlisten))
+
+;; Card types:
+;;
+;; A action
+;; U username (Unix)
+;; D timestamp
+;; T card type
+
+;; a summary list of used card types for helping to not accidentally re-use them
+;;
+;; ADGIMSTUZabcdefghiklnoprstuvwx
+
+;; utilitarian alist for standard cards
+;;
+(define *additional-cards*
+  '(
+    ;; Standard Cards
+    (A  . action    )
+    (D  . timestamp )
+    (T  . cardtype  )
+    (U  . user      ) ;; username
+    (Z  . shar1sum  )
+
+    ;; Extras
+    (a  . runkey    ) ;; needed for matching up pkts with target derived from runkey
+    ;; (l  . new-ss    ) ;; new state/status
+    (b  . branch    ) ;; repository branch or tag (fossil or git)
+    (f  . url       ) ;; repository URL (e.g. fossil or git)
+    (g  . clone     ) ;; existing clone area (cached in /tmp)
+    ))
 
 ;; inlst is an alternative input
 ;;
 (define (lookup-param-by-key key #!key (inlst #f))
   (fold (lambda (a res)
@@ -167,37 +312,25 @@
 	(or inlst *arg-keys*)))
 
 (define (lookup-action-by-key key)
   (alist-ref (string->symbol key) *action-keys*))
 
+(define (swizzle-alist lst)
+  (map (lambda (x)(cons (cdr x)(car x))) lst))
+
 ;;======================================================================
 ;;  U T I L S
 ;;======================================================================
 
 ;; given a mtutil param, return the old megatest equivalent
 ;;
-(define (param-translate param)
-  (or (alist-ref (string->symbol param)
-		 '((-tag-expr  . "-tagexpr")
-		   (-mode-patt . "--modepatt")
-		   (-run-name  . "-runname")
-		   (-test-patt . "-testpatt")
-		   (-msg       . "-m")))
-      param))
-
-(define (val->alist val)
-  (let ((val-list (string-split-fields ";\\s*" val #:infix)))
-    (if val-list
-	(map (lambda (x)
-	       (let ((f (string-split-fields "\\s*=\\s*" x #:infix)))
-		 (case (length f)
-		   ((0) `(,#f))  ;; null string case
-		   ((1) `(,(string->symbol (car f))))
-		   ((2) `(,(string->symbol (car f)) . ,(cadr f)))
-		   (else f))))
-	     val-list)
-	'())))
+(define (megatest-param->mtutil-param param)
+  (let* ((mapping-alist (common:get-param-mapping flavor: 'switch-symbol)))
+    (alist-ref (string->symbol param) mapping-alist eq? param)
+    param))
+
+(define val->alist common:val->alist)
 
 (define (push-run-spec torun contour runkey spec)
   (configf:section-var-set! torun contour runkey
 			    (cons spec
 				  (or (configf:lookup torun contour runkey)
@@ -210,11 +343,11 @@
 	(print "ERROR: failed to create directory " dest-dir " message: " ((condition-property-accessor 'exn 'message) exn))
       (create-directory dest-dir #t))
     (handle-exceptions
 	exn
 	(print "ERROR: failed to clone or sync 1ossil " url " message: " ((condition-property-accessor 'exn 'message) exn))
-      (if (file-exists? targ-file)
+      (if (common:file-exists? targ-file)
 	  (system (conc "fossil pull --once " url " -R " targ-file))
 	  (system (conc "fossil clone " url " " targ-file))
 	  ))))
 
 (define (fossil:last-change-node-and-time fossils-dir fossil-name branch)
@@ -259,40 +392,83 @@
 	   (loop (get-line) date node time))))
        (else ;; no more datat and last node on branch not found
 	(close-input-port timeline-port)
 	(values  (common:date-time->seconds (conc date " " time)) node))))))
 
-
 ;;======================================================================
 ;; GLOBALS
 ;;======================================================================
 
-;; Card types:
-;;
-;; a action
-;; u username (Unix)
-;; D timestamp
-;; T card type
-
-;; process args
-(define *action* (if (> (length (argv)) 1)
+;; first token is our action, but only if no leading dash
+(define *action* (if (and (> (length (argv)) 1)
+                          (not (string-match "^\\-.*" (cadr (argv)))))
 		     (cadr (argv))
 		     #f))
+
+;; process arguments, extract switches and parameters first
 (define remargs (args:get-args 
 		 (if *action* (cdr (argv)) (argv)) ;; args:get-args dumps first in argv list (the program name)
 		 (map car *arg-keys*)
 		 (map car *switch-keys*)
 		 args:arg-hash
 		 0))
 
+;; handle requests for help
+;;
 (if (or (member *action* '("-h" "-help" "help" "--help"))
 	(args:any-defined? "-h" "-help" "--help"))
     (begin
       (print help)
       (exit 1)))
 
+(define (print-pkt-keys inlst)
+  (for-each
+   (lambda (p)
+     (let ((sw (car p))
+           (c  (cdr p)))
+       (print (or c "n/a") "\t" sw)))
+   inlst))
+
+(define (print-duplicate-keys . all)
+  (let ((card-hash (make-hash-table)))
+    (for-each
+     (lambda (lst)
+       (for-each
+        (lambda (card-spec)
+          (let ((k (cdr card-spec)))
+            ;; (print "card-spec: " card-spec ", k: " k)
+            (if k (hash-table-set! card-hash k (+ (hash-table-ref/default card-hash k 0) 1)))))
+        lst))
+     all)
+    (for-each
+     (lambda (k)
+       (if (> (hash-table-ref card-hash k) 1)
+           (print k "\t" (hash-table-ref card-hash k))))
+     (sort (hash-table-keys card-hash) (lambda (a b)(>= (hash-table-ref card-hash a)(hash-table-ref card-hash b)))))
+    ))
+
+(define (print-pkt-key-info)
+  (print "Argument keys")
+  (print-pkt-keys *arg-keys*)
+  (print "\nSwitch keys")
+  (print-pkt-keys *switch-keys*)
+  (print "\nAction keys")
+  (print-pkt-keys *action-keys*)
+  (print "\nAdditional cards")
+  (print-pkt-keys (swizzle-alist *additional-cards*))
+  (print "\nDuplicate keys")
+  (print-duplicate-keys *arg-keys* *switch-keys* *action-keys* (swizzle-alist *additional-cards*))
+  (print "\nEnd of report.")
+  )
+
+;; list packet keys
+;;
+(if (args:get-arg "-list-pkt-keys")
+    (begin (print-pkt-key-info)(exit 0)))
+
 ;; (print "*action*: " *action*)
+
 ;; (let-values (((uuid pkt)
 ;; 	      (command-line->pkt #f args:arg-hash)))
 ;;   (print pkt))
 
 ;; Add args that use remargs here
@@ -300,11 +476,12 @@
 (if (and (not (null? remargs))
 	 (not (or
 	       (args:get-arg "-runstep")
 	       (args:get-arg "-envcap")
 	       (args:get-arg "-envdelta")
-	       (member *action* '("db"))   ;; very loose checks on db.
+	       (member *action* '("db" "tsend" "tlisten"))   ;; very loose checks on db and tsend/listen
+	       (equal? *action* "show")    ;; just keep going if list
 	       )))
     (debug:print-error 0 *default-log-port* "Unrecognised arguments: " (string-intersperse (if (list? remargs) remargs (argv))  " ")))
 
 (if (or (args:any? "-h" "help" "-help" "--help")
 	(member *action* '("-h" "-help" "--help" "help")))
@@ -311,69 +488,145 @@
     (begin
       (print help)
       (exit 1)))
 
 ;;======================================================================
-;; pkts
+;; Nanomsg transport
 ;;======================================================================
 
-(define (with-queue-db mtconf proc)
-  (let* ((pktsdirs (configf:lookup mtconf "setup"  "pktsdirs"))
-	 (pktsdir  (if pktsdirs (car (string-split pktsdirs " ")) #f))
-	 (toppath  (configf:lookup mtconf "dyndat" "toppath"))
-	 (pdbpath  (or (configf:lookup mtconf "setup"  "pdbpath") pktsdir)))
-    (if (not (and  pktsdir toppath pdbpath))
-	(begin
-	  (print "ERROR: settings are missing in your megatest.config for area management.")
-	  (print "  you need to have pktsdir in the [setup] section."))
-	(let* ((pdb  (open-queue-db pdbpath "pkts.db"
-				    schema: '("CREATE TABLE groups (id INTEGER PRIMARY KEY,groupname TEXT, CONSTRAINT group_constraint UNIQUE (groupname));"))))
-	  (proc pktsdirs pktsdir pdb)
-	  (dbi:close pdb)))))
-
-(define (load-pkts-to-db mtconf)
-  (with-queue-db
-   mtconf
-   (lambda (pktsdirs pktsdir pdb)
-     (for-each
-      (lambda (pktsdir) ;; look at all
-	(if (and (file-exists? pktsdir)
-		 (directory? pktsdir)
-		 (file-read-access? pktsdir))
-	    (let ((pkts (glob (conc pktsdir "/*.pkt"))))
-	      (for-each
-	       (lambda (pkt)
-		 (let* ((uuid    (cadr (string-match ".*/([0-9a-f]+).pkt" pkt)))
-			(exists  (lookup-by-uuid pdb uuid #f)))
-		   (if (not exists)
-		       (let* ((pktdat (string-intersperse
-				       (with-input-from-file pkt read-lines)
-				       "\n"))
-			      (apkt   (pkt->alist pktdat))
-			      (ptype  (alist-ref 'T apkt)))
-			 (add-to-queue pdb pktdat uuid (or ptype 'cmd) #f 0)
-			 (debug:print 4 *default-log-port* "Added " uuid " of type " ptype " to queue"))
-		       (debug:print 4 *default-log-port* "pkt: " uuid " exists, skipping...")
-		       )))
-	       pkts))))
-      (string-split pktsdirs)))))
-
-(define (get-pkt-alists pkts)
-  (map (lambda (x)
-	 (alist-ref 'apkt x)) ;; 'pkta pulls out the alist from the read pkt
-       pkts))
-
-;; given list of pkts (alist mode) return list of D cards as Unix epoch, sorted descending
-;; also delete duplicates by target i.e. (car pkt)
-(define (get-pkt-times pkts)
-  (delete-duplicates
-   (sort 
-    (map (lambda (x)
-	   `(,(alist-ref 't x) . ,(string->number (alist-ref 'D x))))
-	 pkts)
-    (lambda (a b)(> (cdr a)(cdr b))))      ;; sort descending
-   (lambda (a b)(equal? (car a)(car b))))) ;; remove duplicates by target
+(define-inline (encode data)
+  (with-output-to-string
+    (lambda ()
+      (write data))))
+
+(define-inline (decode data)
+  (with-input-from-string
+      data
+    (lambda ()
+      (read))))
+
+(define (is-port-in-use port-num)
+ (let* ((ret #f))
+     (let-values (((inp oup pid)
+                (process "netstat" (list  "-tulpn" ))))
+      (let loop ((inl (read-line inp)))
+        (if (not (eof-object? inl))
+            (begin 
+                (if (string-search (regexp (conc ":" port-num)) inl)
+                 (begin
+                 ;(print "Output: "  inl)
+                  (set! ret  #t))
+                 (loop (read-line inp)))))))
+ret))
+
+;;start a server, returns the connection
+;;
+(define (start-nn-server portnum )
+  (let ((rep (nn-socket 'rep)))
+    (handle-exceptions
+     exn
+     (let ((emsg ((condition-property-accessor 'exn 'message) exn)))
+       (print "ERROR: Failed to start server \"" emsg "\"")
+       (exit 1))
+      
+     (nn-bind rep (conc "tcp://*:" portnum)))
+    rep))
+
+(define (can-user-kill-listner user-info attrib)
+  (let* ((contacts (alist-ref 'contact attrib))
+         (user-id (cadddr (cdr user-info)))
+         (ret #f)  
+         (contact-list (string-split contacts ","))) 
+    (for-each
+      (lambda (admin)
+        (if (string-contains  user-id (car (string-split admin "@")))
+         (set! ret #t)))  
+    contact-list)
+   ret))
+
+;; open connection to server, send message, close connection
+;;
+(define (open-send-close-nn host-port msg attrib #!key (timeout 3) ) ;; default timeout is 3 seconds
+  (let ((req  (nn-socket 'req))
+        (uri  (conc "tcp://" host-port))
+        (res  #f)
+        (contacts (alist-ref 'contact attrib))
+        (mode (alist-ref 'mode attrib))) 
+    (handle-exceptions
+     exn
+     (let ((emsg ((condition-property-accessor 'exn 'message) exn)))
+       ;; Send notification       
+       (print "ERROR: Failed to connect / send to " uri " message was \"" emsg "\"" )
+         (if (equal? mode "production")
+             (begin 
+             (print " Sending email to contacts : " contacts )
+             (let ((email-body (mtut:stml->string (s:body
+										(s:p (conc "We could not send messages to the server on " uri "."  "Please check if the listner is running. It is possible that the host is overloaded due to which it may take too long to respond. \n Contact your system adminstrator if server load is high." (s:br)" Thank You ") )))))
+             (sendmail (string-join (string-split contacts ";" )) (conc "[Listner Error] Filed to connect to listner on " uri) email-body  use_html: #t)))
+             (print " mode : " mode " Not sending any emails" ))
+       #f)
+     (nn-connect req uri)
+     (print "Connected to the server " )
+     (nn-send req msg)
+     (print "Request Sent")  
+     (let* ((th1  (make-thread (lambda ()
+                                 (let ((resp (nn-recv req)))
+                                   (nn-close req)
+                                   (set! res (if (equal? resp "ok")
+                                                 #t
+                                                 #f))))
+                               "recv thread"))
+            (th2 (make-thread (lambda ()
+                                (thread-sleep! timeout)
+                                (thread-terminate! th1))
+                             "timer thread")))
+       (thread-start! th1)
+       (thread-start! th2)
+       (thread-join! th1)
+       res))))
+
+(define (open-send-receive-nn host-port msg attrib #!key (timeout 3) ) ;; default timeout is 3 seconds
+  (let ((req  (nn-socket 'req))
+        (uri  (conc "tcp://" host-port))
+        (res  #f)
+        (contacts (alist-ref 'contact attrib))
+        (mode (alist-ref 'mode attrib))) 
+    (handle-exceptions
+     exn
+     (let ((emsg ((condition-property-accessor 'exn 'message) exn)))
+       ;; Send notification      
+       (print "ERROR: Failed to connect / send to " uri " message was \"" emsg "\"" )
+         (if (equal? mode "production")
+             (begin 
+             (print " Sending email to contacts : " contacts )
+             (let ((email-body (mtut:stml->string (s:body
+										(s:p (conc "We could not send messages to the server on " uri "."  "Please check if the listner is running. It is possible that the host is overloaded due to which it may take too long to respond. \n Contact your system adminstrator if server load is high." (s:br)" Thank You ") )))))
+             (sendmail (string-join (string-split contacts ";" )) (conc "[Listner Error] Filed to connect to listner on " uri) email-body  use_html: #t)))
+             (print " mode : " mode " Not sending any emails" ))
+       #f)
+     (nn-connect req uri)
+     (print "Connected to the server " )
+     (nn-send req msg)
+     (print "Request Sent")  
+     ;; receive code here
+     ;;(print (nn-recv req))
+     (let* ((th1  (make-thread (lambda ()
+                                 (let ((resp (nn-recv req)))
+                                   (nn-close req)
+                                   (print resp)
+                                   (set! res (if (equal? resp "ok")
+                                                 #t
+                                                 #f))))
+                               "recv thread"))
+            (th2 (make-thread (lambda ()
+                                (thread-sleep! timeout)
+                                (thread-terminate! th1))
+                             "timer thread")))
+       (thread-start! th1)
+       (thread-start! th2)
+       (thread-join! th1)
+       res))))
 
 ;;======================================================================
 ;; Runs
 ;;======================================================================
 
@@ -386,38 +639,53 @@
 ;; collect, translate, collate and assemble a pkt from the command-line
 ;;
 ;; sched => force the run start time to be recorded as sched Unix
 ;; epoch. This aligns times properly for triggers in some cases.
 ;;
-(define (command-line->pkt action args-alist sched-in)
-  (let* ((sched     (cond
+;;  extra-dat format is ( 'x xval 'y yval .... )
+;;
+(define (command-line->pkt action args-alist sched-in #!key (extra-dat '())(area-path #f)(new-ss #f))
+   (let* ((sched     (cond
 		     ((vector? sched-in)(local-time->seconds sched-in)) ;; we recieved a time
 		     ((number? sched-in) sched-in)
 		     (else     (current-seconds))))
+   (user  (if (and args-alist (hash-table? args-alist))
+              (hash-table-ref/default args-alist "-override-user" (current-user-name))
+						  (current-user-name)))
+                    
 	 (args-data (if args-alist
 			(if (hash-table? args-alist) ;; seriously?
 			    (hash-table->alist args-alist)
 			    args-alist)
 			(hash-table->alist args:arg-hash))) ;; if no args-alist then we assume this is a call driven directly by commandline
-	 (alldat    (apply append (list 'T "cmd"
-					'a action
-					'U (current-user-name)
-					'D sched)
+	 (alldat    (apply append
+			   (list 'A action
+				 'U user
+				 'D sched)
+			   (if area-path
+			       (list 'S area-path) ;; the area-path is mapped to the start-dir
+			       '())
+                           (if (list? extra-dat)
+			       extra-dat
+			       (begin
+				 (debug:print 0 *default-log-port* "ERROR: command-line->pkt received bad extra-dat " extra-dat)
+				 '()))
 			   (map (lambda (x)
 				  (let* ((param (car x))
 					 (value (cdr x))
 					 (pmeta (assoc param *arg-keys*))    ;; translate the card key to a megatest switch or parameter
 					 (smeta (assoc param *switch-keys*)) ;; first lookup the key in arg-keys or switch-keys
 					 (meta  (if (or pmeta smeta)
 						    (cdr (or pmeta smeta))   ;; found it?
 						    #f)))
-				    (if (or pmeta smeta)                     ;; construct the switch/param pair.
+           (if meta                     ;; construct the switch/param pair.
 					(list meta value)
 					'())))
+          
 				(filter cdr args-data)))))
-;; (print  "Alldat: " alldat
-;;         " args-data: " args-data)
+    (print  "Alldat: " alldat  ) ;;Do not remove. This is uesed by other applications to calculate z card 
+    ;(exit)
     (add-z-card
      (apply construct-sdat alldat))))
 
 (define (simple-setup start-dir-in)
   (let* ((start-dir (or start-dir-in "."))
@@ -427,17 +695,53 @@
 		     ;; environ-patt: "env-override"
 		     given-toppath: start-dir
 		     ;; pathenvvar: "MT_RUN_AREA_HOME"
 		     ))
 	 (mtconf    (if mtconfdat (car mtconfdat) #f)))
-    ;; we set some dynamic data in a section called "dyndata"
+    ;; we set some dynamic data in a section called "scratchdata"
     (if mtconf
 	(begin
-	  (configf:section-var-set! mtconf "dyndat" "toppath" start-dir)))
-    ;; (print "TOPPATH: " (configf:lookup mtconf "dyndat" "toppath"))
+	  (configf:section-var-set! mtconf "scratchdat" "toppath" start-dir)))
+    ;; (print "TOPPATH: " (configf:lookup mtconf "scratchdat" "toppath"))
     mtconfdat))
 
+;;======================================================================
+;; Areas
+;;======================================================================
+
+;; look for areas=a1,a2,a3 OR areafn=somefuncname
+;;
+(define (val-alist->areas val-alist)
+  (let ((areas-string   (alist-ref 'areas  val-alist))
+	(areas-procname (alist-ref 'areafn val-alist)))
+    (if areas-procname ;; areas-procname take precedence
+	areas-procname
+	(string-split (or areas-string "") ","))))
+
+;; area   - the current area under consideration
+;; areas  - the list of allowed areas from the contour spec -OR-
+;;          if it is a string then it is the function to use to
+;;          lookup in *area-checkers*
+;;
+(define (area-allowed? area areas runkey contour mode-patt)
+  ;;(print "Areas: " areas)
+  (cond
+   ((not areas) #t) ;; no spec
+   ((string? areas) ;; 
+    (let ((check-fn (hash-table-ref/default *area-checkers* (string->symbol areas) #f)))
+      (if check-fn
+	  (check-fn area runkey contour mode-patt)
+	  #f)))
+   ((list? areas)(member area areas))
+   (else #f))) ;; shouldn't get here 
+
+(define (get-area-names mtconf)
+  (map car (configf:get-section mtconf "areas")))
+
+;;======================================================================
+;; Pkts for remote control
+;;======================================================================
 
 ;; NEED TIMESTAMP ON PKTS for efficient loading of packets into db.
 
 
 ;; make a run request pkt from basic data, this seriously needs to be refactored
@@ -446,16 +750,19 @@
 ;;  ii. Pass the pkt keys and values to this proc and go from there.
 ;; iii. Maybe have an abstraction alist with meaningful names for the pkt keys
 ;;
 ;; Override the run start time record with sched. Usually #f is fine.
 ;; 
-(define (create-run-pkt mtconf action area runkey runname mode-patt tag-expr pktsdir reason contour sched dbdest append-conf runtrans)
+(define (create-run-pkt mtconf action area runkey target runname mode-patt 
+                        tag-expr pktsdir reason contour sched dbdest append-conf
+                        runtrans)
   (let* ((good-val   (lambda (inval)(and inval (string? inval)(not (string-null? inval)))))
-	 (area-dat   (val->alist (or (configf:lookup mtconf "areas" area) "")))
+	 (area-dat   (common:val->alist (or (configf:lookup mtconf "areas" area) "")))
 	 (area-path  (alist-ref 'path      area-dat))
-	 (area-xlatr (alist-ref 'targtrans area-dat))
-	 (new-runname (let* ((callname (if (string? runtrans)(string->symbol runtrans) #f))
+	 ;; (area-xlatr (alist-ref 'targtrans area-dat))
+         ;; (xlatr-key  (if area-xlatr (string->symbol area-xlatr) #f))
+         (new-runname (let* ((callname (if (string? runtrans)(string->symbol runtrans) #f))
 			     (mapper   (if callname (hash-table-ref/default *runname-mappers* callname #f) #f)))
 			;; (print "callname=" callname " runtrans=" runtrans " mapper=" mapper)
 			(if (and callname
 				 (not (equal? callname "auto"))
 				 (not mapper))
@@ -469,30 +776,13 @@
 				  (print " message: " ((condition-property-accessor 'exn 'message) exn))
 				  runname)
 			      (print "(mapper " (string-intersperse (list runkey runname area area-path reason contour mode-patt) ", ") ")")
 			      (mapper runkey runname area area-path reason contour mode-patt))
 			    (case callname
-			      ((auto) runname)
+			      ((auto #f) runname)
 			      (else   runtrans)))))
-	 (new-target (if area-xlatr 
-			 (let ((xlatr-key (string->symbol area-xlatr)))
-			   (if (hash-table-exists? *target-mappers* xlatr-key)
-			       (begin
-				 (print "Using target mapper: " area-xlatr)
-				 (handle-exceptions
-				     exn
-				     (begin
-				       (print "FAILED TO RUN TARGET MAPPER FOR " area ", called " area-xlatr)
-				       (print "   function is: " (hash-table-ref/default *target-mappers* xlatr-key #f ) )
-				       (print " message: " ((condition-property-accessor 'exn 'message) exn))
-				       runkey)
-				   ((hash-table-ref *target-mappers* xlatr-key)
-				    runkey new-runname area area-path reason contour mode-patt)))
-			       (begin
-				 (print "ERROR: Failed to find named target translator " xlatr-key ", using original target.")
-				 runkey)))
-			 runkey))
+	 (new-target     target) ;; I believe we will want target manipulation here .. (map-targets xlatr-key runkey area contour))
 	 (actual-action  (if action
 			     (if (equal? action "sync-prepend")
 				 "sync"
 				 action)
 			     "run"))) ;; this has gotten a bit ugly. Need a function to handle actions processing.
@@ -499,20 +789,22 @@
     ;; some hacks to remove switches not needed in certain cases
     (case (string->symbol (or action "run"))
       ((sync sync-prepend)
        (set! new-target #f)
        (set! runame     #f)))
-    (print "area-path: " area-path " area-xlatr: " area-xlatr " orig-target: " runkey " new-target: " new-target)
+    ;; (print "area-path: " area-path " orig-target: " runkey " new-target: " new-target)
     (let-values (((uuid pkt)
 		  (command-line->pkt
 		   actual-action
 		   (append 
 		    `(("-start-dir"  . ,area-path)
-		      ("-msg"        . ,reason)
+		      ;;("-msg"        . ,reason)
+                      ("-msg"        . ,"Script-triggered")
 		      ("-contour"    . ,contour))
 		    (if (good-val new-runname) `(("-run-name"      . ,new-runname)) '())
 		    (if (good-val new-target)  `(("-target"        . ,new-target))  '())
+		    (if (good-val area)        `(("-area"          . ,area))        '())
 		    (if (good-val mode-patt)   `(("-mode-patt"     . ,mode-patt))   '())
 		    (if (good-val tag-expr)    `(("-tag-expr"      . ,tag-expr))    '())
 		    (if (good-val dbdest)      `(("-sync-to"       . ,dbdest))      '())
 		    (if (good-val append-conf) `(("-append-config" . ,append-conf)) '())
 		    (if (equal? action "sync-prepend") '(("-prepend-contour" . " "))   '())
@@ -523,35 +815,38 @@
 			    (equal? action "run"))
 			`(("-preclean"  . " ")
 			  ("-rerun-all" . " "))      ;; if run we *always* want preclean set, use single space as placeholder
 			'())
 		    )
-		   sched)))
+		   sched
+                   extra-dat: `(a ,runkey)  ;; we need the run key for marking the run as launched
+                   )))
       (with-output-to-file
 	  (conc pktsdir "/" uuid ".pkt")
 	(lambda ()
 	  (print pkt))))))
 
 ;; (use trace)(trace create-run-pkt)
+(define (contains list x) (cond ((null? list) #f) ((eq? (car list) x) #t) (else (contains (cdr list) x))))
 
 ;; collect all needed data and create run pkts for contours with changed inputs
 ;;
 (define (generate-run-pkts mtconf toppath)
-  (let ((std-runname (conc "sched"  (time->string (seconds->local-time (current-seconds)) "%M%H%d"))))
-    (with-queue-db
+  (let ((std-runname (conc "sched"  (time->string (seconds->local-time (current-seconds)) "%M%H%d")))
+        (packets-generated 0))
+    (common:with-queue-db
      mtconf
      (lambda (pktsdirs pktsdir pdb)
        (let* ((rgconfdat (find-and-read-config (conc toppath "/runconfigs.config")))
 	      (rgconf    (car rgconfdat))
 	      (all-areas (map car (configf:get-section mtconf "areas")))
 	      (contours  (configf:get-section mtconf "contours"))
 	      (torun     (make-hash-table)) ;; target => ( ... info ... )
 	      (rgentargs (hash-table-keys rgconf))) ;; these are the targets registered for automatically triggering
 
-	 (print "rgentargs: " rgentargs)
-	 
-	 (for-each
+	 ;;(print "rgentargs: " rgentargs)
+	  (for-each
 	  (lambda (runkey)
 	    (let* ((keydats   (configf:get-section rgconf runkey)))
 	      (for-each
 	       (lambda (sense) ;; these are the sense rules
 		 (let* ((key        (car sense))
@@ -561,36 +856,51 @@
 			(len-key    (length keyparts))
 			(ruletype   (if (> len-key 1)(cadr keyparts) #f))
 			(action     (if (> len-key 2)(caddr keyparts) #f))
 			(optional   (if (> len-key 3)(cadddr keyparts) #f))
 			;; (val-list   (string-split-fields ";\\s*" val #:infix)) ;; (string-split val)) ;; runname-rule params
-			(val-alist  (val->alist val))
+			(val-alist  (common:val->alist val))
 			(runname    (make-runname "" ""))
 			(runtrans   (alist-ref 'runtrans val-alist))
+
+			;; these may or may not be defined and not all are used in each handler type in the case below
+			(run-name   (alist-ref 'run-name val-alist))
+			(target     (alist-ref 'target   val-alist))
+			(crontab    (alist-ref 'cron     val-alist))
+			(areas      (val-alist->areas    val-alist)) ;; areas can be a single string (a reference to call an areas function), or a list of area names.
+			(dbdest     (alist-ref 'dbdest   val-alist))
+			(appendconf (alist-ref 'appendconf val-alist))
+			(file-globs (alist-ref 'glob val-alist))
 			
-			(runstarts  (find-pkts pdb '(runstart) `((o . ,contour)
+			(runstarts  (find-pkts pdb '(runstart) `((c . ,contour)
 								 (t . ,runkey))))
-			(rspkts     (get-pkt-alists runstarts))
+			(rspkts     (common:get-pkt-alists runstarts))
 			;; starttimes is for run start times and is used to know when the last run was launched
-			(starttimes (get-pkt-times rspkts)) ;; sort by age (youngest first) and delete duplicates by target
-			(last-run (if (null? starttimes) ;; if '() then it has never been run, else get the max
-				      0
-				      (apply max (map cdr starttimes))))
+			(starttimes (common:get-pkt-times rspkts)) ;; sort by age (youngest first) and delete duplicates by target
+			(last-run   (if (null? starttimes) ;; if '() then it has never been run, else get the max
+					0
+					(apply max (map cdr starttimes))))
 			;; synctimes is for figuring out the last time a sync was done
-			(syncstarts   (find-pkts pdb '(syncstart) '())) ;; no qualifiers, a sync does all tarets etc.
-			(sspkts       (get-pkt-alists syncstarts))
-			(synctimes    (get-pkt-times  sspkts))
-			(last-sync (if (null? synctimes) ;; if '() then it has never been run, else get the max
-				      0
-				      (apply max (map cdr synctimes))))
+			(syncstarts (find-pkts pdb '(syncstart) '())) ;; no qualifiers, a sync does all tarets etc.
+			(sspkts       (common:get-pkt-alists syncstarts))
+			(synctimes    (common:get-pkt-times  sspkts))
+			(last-sync  (if (null? synctimes) ;; if '() then it has never been run, else get the max
+					0
+					(apply max (map cdr synctimes))))
 			)
 
 		   (let ((delta (lambda (x)
 				  (round (/ (- (current-seconds) x) 60)))))
-		     (print "runkey: " runkey ", ruletype: " ruletype ", action: " action ", last-run: " last-run " time since; last-run: " (delta last-run) ", last-sync: " (delta last-sync)))
+             (if (args:get-arg "-target")
+               (if (string= (args:get-arg "-target") runkey)
+		       (begin (print "runkey: " runkey ", ruletype: " ruletype ", action: " action ", last-run: " last-run " time since; last-run: " (delta last-run) ", last-sync: " (delta last-sync))
+		              (print "val-alist=" val-alist " runtrans=" runtrans))
+               (if #f (print "skipping: " runkey)))
+		       (begin (print "runkey: " runkey ", ruletype: " ruletype ", action: " action ", last-run: " last-run " time since; last-run: " (delta last-run) ", last-sync: " (delta last-sync))
+		              (print "val-alist=" val-alist " runtrans=" runtrans))
+           ))
 
-		   (print "val-alist=" val-alist " runtrans=" runtrans)
 		   
 		   ;; look in runstarts for matching runs by target and contour
 		   ;; get the timestamp for when that run started and pass it
 		   ;; to the rule logic here where "ruletype" will be applied
 		   ;; if it comes back "changed" then proceed to register the runs
@@ -597,41 +907,54 @@
 		   
 		   (case (string->symbol (or ruletype "no-such-rule"))
 
 		     ((no-such-rule) (print "ERROR: no such rule for " sense))
 
+		     ;; Handle crontab like rules
+		     ;;
 		     ((scheduled)
 		      (if (not (alist-ref 'cron val-alist)) ;; gotta have cron spec
 			  (print "ERROR: bad sense spec \"" (string-intersperse sense " ") "\" params: " val-alist)
-			  (let* ((run-name (alist-ref 'run-name val-alist))
-				 (target   (alist-ref 'target   val-alist))
-				 (crontab  (alist-ref 'cron     val-alist))
+			  (let* (
 				 ;; (action   (alist-ref 'action   val-alist))
-				 (cron-safe-string (string-translate (string-intersperse (string-split (alist-ref 'cron val-alist)) "-") "*" "X"))
+				 (cron-safe-string (string-translate (string-intersperse (string-split crontab) "-") "*" "X"))
 				 (runname  std-runname)) ;; (conc "sched" (time->string (seconds->local-time (current-seconds)) "%M%H%d")))))
 			    ;; (print "last-run: " last-run " need-run: " need-run)
 			    ;; (if need-run
 			    (case (string->symbol action)
 			      ((sync sync-prepend)
 			       (if (common:extended-cron crontab #f last-sync)
 				   (push-run-spec torun contour runkey
 						  `((message . ,(conc ruletype ":sync-" cron-safe-string))
 						    (action  . ,action)
-						    (dbdest  . ,(alist-ref 'dbdest val-alist))
-						    (append  . ,(alist-ref 'appendconf val-alist))))))
+						    (dbdest  . ,dbdest)
+						    (append  . ,appendconf)
+						    (areas   . ,areas)))))
 			      ((run)
 			       (if (common:extended-cron crontab #f last-run)
 				   (push-run-spec torun contour runkey
-						  `((message . ,(conc ruletype ":" cron-safe-string))
-						    (runname . ,runname)
+						  `((message  . ,(conc ruletype ":" cron-safe-string))
+						    (runname  . ,runname)
+						    (runtrans . ,runtrans)
+						    (action   . ,action)
+						    (areas    . ,areas)
+						    (target   . ,target)))))
+                              ((remove)
+                               (push-run-spec torun contour runkey
+						  `((message  . ,(conc ruletype ":" cron-safe-string))
+						    (runname  . ,runname)
 						    (runtrans . ,runtrans)
-						    (action  . ,action)
-						    (target  . ,target)))))
+						    (action   . ,action)
+						    (areas    . ,areas)
+						    (target   . ,target))))
 			      (else
 			       (print "ERROR: action \"" action "\" has no scheduled handler")
 			       )))))
 
+
+		     ;; script based sensors
+		     ;;
 		     ((script)
 		      ;; syntax is a little different here. It is a list of commands to run, "scriptname = extra_parameters;scriptname = ..."
 		      ;; where scriptname may be repeated multiple times. The script must return unix-epoch of last change, new-target-name and new-run-name
 		      ;; the script is called like this:  scriptname contour runkey std-runname action extra_param1 extra_param2 ...
 		      (for-each
@@ -661,22 +984,161 @@
 						       (string-intersperse rem-lines "-")))
 				      (need-run    (> last-change last-run)))
 				 (print "last-run: " last-run " need-run: " need-run)
 				 (if need-run
 				     (let* ((key-msg    `((message  . ,(conc ruletype ":" message))
-							  (runname  . ,runname)
+							  (runname  . ,new-runname)
 							  (runtrans . ,runtrans)
 							  (action   . ,action)
-							  (target   . ,new-target))))
+							  (areas    . ,areas)
+							  ;;(target   . ,(list new-target)) ;; overriding with result from runing the script
+                                                          )))
 				       (print "key-msg: " key-msg)
 				       (push-run-spec torun contour
 						      (if optional  ;; we need to be able to differentiate same contour, different behavior. 
 							  (conc runkey ":" optional)  ;; NOTE: NOT COMPLETELY IMPLEMENTED. DO NOT USE
 							  runkey)
 						      key-msg)))))))
 		       val-alist)) ;; iterate over the param split by ;\s*
 
+		     ;; script based sensors
+		     ;;
+		     ((area-script)
+		      ;; syntax is a little different here. It is a list of commands to run, "scriptname = extra_parameters;scriptname = ..."
+		      ;; where scriptname may be repeated multiple times. The script must return unix-epoch of last change, new-target-name and new-run-name
+		      ;; the script is called like this:  scriptname contour runkey std-runname action extra_param1 extra_param2 ...
+		      (for-each
+		       (lambda (cmd)
+			 ;;(print "cmd: " cmd)
+                         ;;(print "Areas: " all-areas)
+                         (for-each 
+                           (lambda (area) 
+                             ;;(print "Area: " area)
+                             ;;(print "Target: " runkey)
+                             ;;(print "OR: " (or (string->number (if (configf:lookup mtconf "setup" "max_packets_per_run") (configf:lookup mtconf "setup" "max_packets_per_run") "10000" ))))
+                             ;;(print "Packets generated: " packets-generated)
+                             ;;(print "Comparison: " (< packets-generated 4))
+                             ;;(print "Full Comparison: " 
+                             ;;   (and (< packets-generated (or (string->number (if (configf:lookup mtconf "setup" "max_packets_per_run") (configf:lookup mtconf "setup" "max_packets_per_run") "10000" )) 10000))  
+                             ;;        (if (args:get-arg "-target") 
+                             ;;             (if (string= (args:get-arg "-target") runkey) (area-allowed? area "area-needs-to-be-run" runkey contour #f) #f) 
+                             ;;             (area-allowed? area "area-needs-to-be-run" runkey contour #f))))
+			    ;;(print "Area Allowed: " (area-allowed? area "area-needs-to-be-run" runkey contour #f))
+;Add code to check whether area is valid
+			     (if 
+                   ;; This code checks whether the target has been passed in via argument, and only runs the specified target
+                   (and (< packets-generated (or (string->number (if (configf:lookup mtconf "setup" "max_packets_per_run") (configf:lookup mtconf "setup" "max_packets_per_run") "10000" )) 10000))  
+                        (if (args:get-arg "-target") 
+                            (if (string= (args:get-arg "-target") runkey) (area-allowed? area "area-needs-to-be-run" runkey contour #f) #f) 
+                                (area-allowed? area "area-needs-to-be-run" runkey contour #f)))
+       
+			     (let* ((script (car cmd))
+				(params (cdr cmd))
+				(cmd    (conc script " " contour " " area " " runkey " " std-runname " " action " " params))
+				(res    (handle-exceptions
+					    exn
+					    #f
+					  (print "Running " cmd)
+					  (with-input-from-pipe cmd read-lines)))
+                                (cval       (or (configf:lookup mtconf "contours" contour) ""))
+                                (cval-alist (common:val->alist cval))                     ;; BEWARE ... NOT the same val-alist as above!
+                                ;;(areas      (val-alist->areas cval-alist))
+                                (selector   (alist-ref 'selector cval-alist))
+                                (mode-tag   (and selector (string-split-fields "/" selector #:infix)))
+                                (mode-patt  (and mode-tag (if (eq? (length mode-tag) 2)(cadr mode-tag) #f)))
+                                (tag-expr   (and mode-tag (if (null? mode-tag) #f (car mode-tag))))
+                              )
+			     (if (and res (not (null? res)))
+			       (let* ((parts       (string-split (car res))) ;;
+				      (rem-lines   (cdr res))
+				      (num-parts   (length parts))
+				      (last-change (string->number (if (> num-parts 0)(car parts) "abc")))  ;; force no run if not a number returned
+				      (new-target  (if (> num-parts 1)
+						       (cadr parts)
+						       runkey))
+				      (new-runname (if (> num-parts 2)
+						       (caddr parts)
+						       std-runname))
+                        	      (area-pkts  (find-pkts pdb '(runstart) `((c . ,contour)
+                                                                               (t . ,runkey)
+                                                                               (G . ,area ))))
+                                      (runstarts (filter (lambda (my-pkt)
+                                           ;;(print my-pkt)
+                                           (not (contains (map
+                                               (lambda (c)
+                                                ;;(print "C: " c "PKT: " my-pkt) 
+                                                (let* ((ctype (car c))
+                                                       (rx (cdr c))
+                                                       ;;(foo2 (print "Ctype: " ctype " RX: " rx))
+                                                       (pkt (alist-ref 'pkt my-pkt))
+                                                       (apkt (pkt->alist pkt))
+                                                       (cdat (alist-ref ctype apkt)))
+                                                 (if rx
+                                                 (if (string-match "t" (symbol->string ctype) )
+                                                 (begin (if #f (print "RX: " rx " CDAT: " (string-join (take (string-split cdat "/") 3) "/"))) (if cdat (string-match rx (string-join (take (string-split cdat "/") 3) "/")) #f))
+                                                 (begin (if #f (print "RX: " rx " CDAT: " cdat)) (if cdat (string-match rx cdat) #f))) #f)
+
+                                               ))
+                                          `((c . ,contour) (t . ,runkey) (G . ,area))) #f)))
+                                        area-pkts))
+
+                                      ;;(test (pp runstarts))
+                        	      (rspkts     (common:get-pkt-alists runstarts))
+                        	      ;; starttimes is for run start times and is used to know when the last run was launched
+                        	      (starttimes (common:get-pkt-times rspkts)) ;; sort by age (youngest first) and delete duplicates by target
+                        	      (last-run   (if (null? starttimes) ;; if '() then it has never been run, else get the max
+                                          0
+                                        (apply max (map cdr starttimes))))
+
+                                     ;; (last-run  9) ;; I think we can do a more valid calculation for this based on the run started packets for this particular area and target
+                                      (reason "Area-script-triggered")
+                                      ;;(mode-patt #f)
+                                      ;;(tag-expr #f)
+				      (sched #f)
+				      (message     (if (null? rem-lines)
+						       cmd
+						       (string-intersperse rem-lines "-")))
+				      (need-run    (> last-change last-run)))
+				 (print "last-change: " last-change " last-run: " last-run " need-run: " need-run)
+				 (if need-run
+				     (let* ((key-msg    `((message  . ,(conc ruletype ":" message))
+							  (runname  . ,new-runname)
+							  (runtrans . ,runtrans)
+							  (action   . ,action)
+							  (areas    . ,area)
+							  ;;(target   . ,(list new-target)) ;; overriding with result from runing the script
+                                                          ))
+							(aval       (or (configf:lookup mtconf "areas" area) ""))
+                                    			(aval-alist (common:val->alist aval))
+
+							(targets (map-targets mtconf aval-alist runkey area contour)))
+                                        (pp targets)
+				        (for-each (lambda (target) 
+                                                     (create-run-pkt mtconf action area runkey target new-runname mode-patt
+                                                      tag-expr pktsdir reason contour sched dbdest append
+                                                      runtrans)
+                                                     (set! packets-generated (+ packets-generated 1))
+                                                  ) targets)
+					;; Add filter for targets
+
+                                       ;;(create-run-pkt mtconf action area runkey target runname
+                                       ;;               pktsdir reason contour dbdest append
+                                       ;;               runtrans)
+				       (print "key-msg: " key-msg)
+				       ;;(push-run-spec torun contour
+				;;		      (if optional  ;; we need to be able to differentiate same contour, different behavior. 
+				;;			  (conc runkey ":" optional)  ;; NOTE: NOT COMPLETELY IMPLEMENTED. DO NOT USE
+				;;			  runkey)
+				;;		      key-msg)
+                                       ))))) 
+                                       (if (>= packets-generated (string->number (configf:lookup mtconf "setup" "max_packets_per_run"))) (print "Skipping area: " area " and target: " runkey " due to packets-generated: " packets-generated " higher than " (configf:lookup mtconf "setup" "max_packets_per_run"))))    
+
+                       ) (filter (lambda (x) (if (not (args:get-arg "-area")) #t (if (string= x (args:get-arg "-area")) #t #f))) all-areas))
+		       ) val-alist)) ;; iterate over the param split by ;\s*
+
+		     ;; fossil scm based triggers
+		     ;;
 		     ((fossil)
 		      (for-each
 		       (lambda (fspec)
 			 (print "fspec: " fspec)
 			 (let* ((url         (symbol->string (car fspec))) ;; THIS COULD BE TROUBLE. Add option to reading line to return as string.
@@ -688,65 +1150,78 @@
 			   (fossil:clone-or-sync url fname fdir) ;; )
 			   (let-values (((datetime node)
 					 (fossil:last-change-node-and-time fdir fname branch)))
 			     (if (null? starttimes)
 				 (push-run-spec torun contour runkey
-						`((message . ,(conc "fossil:" branch "-neverrun"))
-						  (runname . ,(conc runname "-" node))
+						`((message  . ,(conc "fossil:" branch "-neverrun"))
+						  (runname  . ,(conc runname "-" node))
 						  (runtrans . ,runtrans)
-						  (target  . ,runkey)))
+						  (areas    . ,areas)
+						  ;; (target   . ,runkey)
+						  (action   . ,action)
+                                                  ))
 				 (if (> datetime last-run) ;; change time is greater than last-run time
 				     (push-run-spec torun contour runkey
-						    `((message . ,(conc "fossil:" branch "-" node))
-						      (runname . ,(conc runname "-" node))
+						    `((message  . ,(conc "fossil:" branch "-" node))
+						      (runname  . ,(conc runname "-" node))
 						      (runtrans . ,runtrans)
-						      (target  . ,runkey)))))
+						      (areas    . ,areas)
+						      ;; (target   . ,runkey)
+						      (action   . ,action)
+						      (branch   . ,branch)
+						      (url      . ,url)
+						      (clone    . ,(conc fdir "/" fname))
+                                                      ))))
 			     (print "Got datetime=" datetime " node=" node))))
 		       val-alist))
-		     
+
+		     ;; sensor looking for one or more files newer than reference
+		     ;;
 		     ((file file-or) ;; one or more files must be newer than the reference
-		      (let* ((file-globs  (alist-ref 'glob val-alist))
-			     (youngestdat (common:get-youngest (common:bash-glob file-globs)))
+		      (let* ((youngestdat (common:get-youngest (common:bash-glob file-globs)))
 			     (youngestmod (car youngestdat)))
 			;; (print "youngestmod: " youngestmod " starttimes: " starttimes)
 			(if (null? starttimes) ;; this target has never been run
 			    (push-run-spec torun contour runkey
-					   `((message . "file:neverrun")
-					     (action  . ,action)
+					   `((message  . "file:neverrun")
+					     (action   . ,action)
 					     (runtrans . ,runtrans)
-					     (target  . ,runkey)
-					     (runname . ,runname)))
+					     ;; (target   . ,runkey)
+					     (areas    . ,areas)
+					     (runname  . ,runname)))
 			;; (for-each
 			;;  (lambda (starttime) ;; look at the time the last run was kicked off for this contour
 			;;    (if (> youngestmod (cdr starttime))
 			;; 	   (begin
 			;; 	     (print "starttime younger than youngestmod: " starttime " Youngestmod: " youngestmod)
 			    (if (> youngestmod last-run)
 				(push-run-spec torun contour runkey
-					       `((message . ,(conc ruletype ":" (cadr youngestdat)))
-						 (action  . ,action)
-						 (target  . ,runkey)
+					       `((message  . ,(conc ruletype ":" (cadr youngestdat)))
+						 (action   . ,action)
+						 ;; (target   . ,runkey)
 						 (runtrans . ,runtrans)
-						 (runname . ,runname)
+						 (areas    . ,areas)
+						 (runname  . ,runname)
 						 ))))))
-		      ;; starttimes))
 
+		     ;; all globbed files must be newer than the reference
+		     ;;
 		     ((file-and) ;; all files must be newer than the reference
-		      (let* ((file-globs  (alist-ref 'glob val-alist))
-			     (youngestdat (common:get-youngest file-globs))
+		      (let* ((youngestdat (common:get-youngest file-globs))
 			     (youngestmod (car youngestdat))
 			     (success     #t)) ;; any cases of not true, set flag to #f for AND
 			;; (print "youngestmod: " youngestmod " starttimes: " starttimes)
 			(if (null? starttimes) ;; this target has never been run
 			    (push-run-spec torun contour runkey
-					   `((message . "file:neverrun")
-					     (runname . ,runname)
+					   `((message  . "file:neverrun")
+					     (runname  . ,runname)
 					     (runtrans . ,runtrans)
-					     (target  . ,runkey)
-					     (action  . ,action)))
+					     (areas    . ,areas)
+					     ;; (target   . ,runkey)
+					     (action   . ,action)))
 			    ;; NB// I think this is wrong. It should be looking at last-run only.
-			    (if (> youngestmod last-run)
+			    (if (> youngestmod last-run) ;; WAIT!! Shouldn't file-and be looking at the *oldest* file (thus all are younger than ...)
 				
 				;; 			    (for-each
 				;; 			     (lambda (starttime) ;; look at the time the last run was kicked off for this contour
 				;; 			       (if (< youngestmod (cdr starttime))
 				;; 				   (set! success #f)))
@@ -753,82 +1228,105 @@
 				;; 			     starttimes))
 				;; 			(if success
 				;; 			    (begin
 				;; 			      (print "starttime younger than youngestmod: " starttime " Youngestmod: " youngestmod)
 				(push-run-spec torun contour runkey
-					       `((message . ,(conc ruletype ":" (cadr youngestdat)))
-						 (runname . ,runname)
+					       `((message  . ,(conc ruletype ":" (cadr youngestdat)))
+						 (runname  . ,runname)
 						 (runtrans . ,runtrans)
-						 (target  . ,runkey)
-						 (action  . ,action)
+						 ;; (target   . ,runkey)
+						 (areas    . ,areas)
+						 (action   . ,action)
 						 ))))))
 		     (else (print "ERROR: unrecognised rule \"" ruletype)))))
 	       keydats))) ;; sense rules
 	  (hash-table-keys rgconf))
 	 
 	 ;; now have to run populated
 	 (for-each
 	  (lambda (contour)
-	    (print "contour: " contour)
-	    (let* ((val       (or (configf:lookup mtconf "contours" contour) ""))
-		   (val-alist (val->alist val))
-		   (areas     (string-split (or (alist-ref 'areas val-alist) "") ","))
-		   (selector  (alist-ref 'selector val-alist))
-		   (mode-tag  (and selector (string-split-fields "/" selector #:infix)))
-		   (mode-patt (and mode-tag (if (eq? (length mode-tag) 2)(cadr mode-tag) #f)))
-		   (tag-expr  (and mode-tag (if (null? mode-tag) #f (car mode-tag)))))
+	    (let* ((cval       (or (configf:lookup mtconf "contours" contour) ""))
+		   (cval-alist (common:val->alist cval))                     ;; BEWARE ... NOT the same val-alist as above!
+		   (areas      (val-alist->areas cval-alist))
+		   (selector   (alist-ref 'selector cval-alist))
+		   (mode-tag   (and selector (string-split-fields "/" selector #:infix)))
+		   (mode-patt  (and mode-tag (if (eq? (length mode-tag) 2)(cadr mode-tag) #f)))
+		   (tag-expr   (and mode-tag (if (null? mode-tag) #f (car mode-tag)))))
+	      (print "contour: " contour " areas=" areas " cval=" cval)
 	      (for-each
-	       (lambda (runkeydatset)
+	       (lambda (runkeydatset) 
 		 ;; (print "runkeydatset: ")(pp runkeydatset)
 		 (let ((runkey     (car runkeydatset))
-		       (runkeydats (cadr runkeydatset)))
+		       (runkeydats (cadr runkeydatset))
+                       )
 		   (for-each
 		    (lambda (runkeydat)
 		      (for-each
 		       (lambda (area)
-			 (let ((runname (alist-ref 'runname runkeydat))
-			       (runtrans (alist-ref 'runtrans runkeydat))
-			       (reason  (alist-ref 'message runkeydat))
-			       (sched   (alist-ref 'sched   runkeydat))
-			       (action  (alist-ref 'action  runkeydat))
-			       (dbdest  (alist-ref 'dbdest  runkeydat))
-			       (append  (alist-ref 'append  runkeydat))
-			       (target  (or (alist-ref 'target  runkeydat) runkey))) ;; override with target if forced
-			   (print "Have: runkey=" runkey " contour=" contour " area=" area " action=" action " tag-expr=" tag-expr " mode-patt=" mode-patt " target=" target)
-			   (if (case (or (and action (string->symbol action)) 'noaction)  ;; ensure we have the needed data to run this action
-				 ((noaction) #f)
-				 ((run)      (and runname reason))
-				 ((sync sync-prepend)     (and reason dbdest))
-				 (else       #f))
-			       ;; instead of unwrapping the runkeydat alist, pass it directly to create-run-pkt
-			       (create-run-pkt mtconf action area runkey runname mode-patt tag-expr pktsdir reason contour sched dbdest append runtrans) 
-			       (print "ERROR: Missing info to make a " action " call: runkey=" runkey " contour=" contour " area=" area  " tag-expr=" tag-expr " mode-patt=" mode-patt " dbdest=" dbdest)
-			       )))
-		       all-areas))
+			 (if (area-allowed? area areas runkey contour mode-patt) ;; is this area to be handled (from areas=a,b,c OR using areafn=abcfn and *area-checks* ...)
+                             (let* ((aval       (or (configf:lookup mtconf "areas" area) ""))
+                                    (aval-alist (common:val->alist aval))
+                                    (runname    (alist-ref 'runname runkeydat))
+                                    (runtrans   (alist-ref 'runtrans runkeydat))
+                                    
+                                    (reason     (alist-ref 'message runkeydat))
+                                    (sched      (alist-ref 'sched   runkeydat))
+                                    (action     (alist-ref 'action  runkeydat))
+                                    (dbdest     (alist-ref 'dbdest  runkeydat))
+                                    (append     (alist-ref 'append  runkeydat))
+                                    (targets    ;;(or (alist-ref 'target  runkeydat)
+                                                    (map-targets mtconf aval-alist runkey area contour))) ;; override with target if forced
+                                    ;;(targets    (or (alist-ref 'target  runkeydat)
+                                    ;;                (map-targets mtconf aval-alist runkey area contour)))) ;; override with target if forced
+                               ;; NEED TO EXPAND RUNKEY => ALL TARGETS MAPPED AND THEN FOREACH .... 
+                               ;;(print "Targets: " targets)
+                               ;;(print "alist: " (alist-ref 'target runkeydat))
+                               (for-each
+                                (lambda (target)
+                                  (print "Creating pkt for runkey=" runkey " target=" target " contour=" contour " area=" area " action=" action " tag-expr=" tag-expr " mode-patt=" mode-patt)
+                                  (if (case (or (and action (string->symbol action)) 'noaction)  ;; ensure we have the needed data to run this action
+                                        ((noaction)           #f)
+                                        ((run)                (and runname reason))
+                                        ((sync sync-prepend)  (and reason dbdest))
+                                        (else                 #f))
+                                      ;; instead of unwrapping the runkeydat alist, pass it directly to create-run-pkt
+                                      (create-run-pkt mtconf action area runkey target runname mode-patt
+                                                      tag-expr pktsdir reason contour sched dbdest append 
+                                                      runtrans) 
+                                      (print "ERROR: Missing info to make a " action " call: runkey=" runkey " contour=" contour " area=" area  " tag-expr=" tag-expr " mode-patt=" mode-patt " dbdest=" dbdest)
+                                      ))
+                                targets))
+                             (print "NOTE: skipping " runkeydat " for area \"" area "\", not in " areas)))
+                       all-areas))
 		    runkeydats)))
 	       (let ((res (configf:get-section torun contour))) ;; each contour / target
 		 ;; (print "res=" res)
 		 res))))
 	  (hash-table-keys torun)))))))
 
 (define (pkt->cmdline pkta)
-  (let ((action (or (lookup-action-by-key (alist-ref 'a pkta)) "noaction")))
+  (let* ((param-mapping-alist (common:get-param-mapping flavor: 'switch-symbol))
+         (action        (or (lookup-action-by-key (alist-ref 'A pkta)) "noaction"))
+	 (action-param  (case (string->symbol action)
+                          ((-set-state-status) (conc (alist-ref 'l pkta) " "))
+                          (else ""))))
     (fold (lambda (a res)
 	    (let* ((key (car a)) ;; get the key name
 		   (val (cdr a))
 		   (par (or (lookup-param-by-key key)  ;; need to check also if it is a switch
 			    (lookup-param-by-key key inlst: *switch-keys*))))
-	      ;; (print "key: " key " val: " val " par: " par)
-	      (if par
-		  (conc res " " (param-translate par) " " val)
-		  (if (member key '(a Z U D T)) ;; a is the action
+	      (print "key: " key " val: " val " par: " par)
+	      ;;(if (and par  (not (string= (symbol->string key) "G")))
+	      (if (and par)
+		  (conc res " " (alist-ref (string->symbol par) param-mapping-alist eq? par) " " val)
+		  (if (alist-ref key *additional-cards*) ;; these cards do not translate to parameters or switches
 		      res
 		      (begin
 			(print "ERROR: Unknown key in packet \"" key "\" with value \"" val "\"")
 			res)))))
 	  (conc "megatest " (if (not (member action '("sync")))
-				(conc action " ")
+				(conc action " " action-param)
 				""))
 	  pkta)))
 
 ;; (use trace)(trace pkt->cmdline)
 
@@ -838,112 +1336,557 @@
 	  (conc pktsdir "/" uuid ".pkt")
 	(lambda ()
 	  (print pkt)))
       (print "ERROR: cannot process commands without a pkts directory")))
 
+(define (check-if-modepatt-defined  pkta notification-hook pktfile)
+  (let* ((start-dir (alist-ref 'S pkta))
+	 (target (or (alist-ref 'R pkta) (alist-ref 't pkta)))
+	 (patt (alist-ref 'o pkta))
+	 (uuid    (alist-ref 'Z pkta))
+	 (cmd (conc "megatest -show-runconfig -target " target " -start-dir " start-dir))
+	 (res    (handle-exceptions
+		  exn
+		  #f
+		  (print "Running " cmd)
+		  (with-input-from-pipe cmd read-lines)))) 
+    (let loop ((hed (car res))
+	       (tail (cdr res)))
+      (if (string-contains hed patt)
+	  #t
+	  (if (null? tail)
+	      (begin
+		(if notification-hook
+		    (let* ((notification-cmd (conc notification-hook " --pkt " pktfile " --msg INVALID_MODEPATT")))
+		      (print "Running " notification-cmd)
+		      (system notification-cmd))) 
+		#f)
+	      (loop (car tail) (cdr tail)))))))
+
+(define (check-if-target-defined pkta notification-hook pktfile)
+  (let* ((start-dir (alist-ref 'S pkta))
+	 (target (alist-ref 'R pkta))
+	 (uuid    (alist-ref 'Z pkta))
+	 (cmd (conc "megatest -list-targets -start-dir " start-dir))
+	 (res    (handle-exceptions
+		  exn
+		  #f
+		  (print "Running " cmd)
+		  (with-input-from-pipe cmd read-lines)))) 
+    (if (member target res)  
+	#t 
+	(begin 
+	  (if notification-hook
+	      (let* ((notification-cmd (conc notification-hook " --pkt "  pktfile " --msg INVALID_TARGET")))
+		(print "Running " notification-cmd)
+		(system notification-cmd)))
+	  #f))))
+
+
+(define (validate-cmd cmd pkta notification-hook pktfile)
+  (let ((ret #t)) 
+    (if (string-contains cmd "-reqtarg") 
+	(if (check-if-target-defined pkta notification-hook pktfile)
+	    (begin
+	      (print "Target is valid")
+	      (if (string-contains cmd "-modepatt")
+		  (if (check-if-modepatt-defined pkta notification-hook pktfile)
+		      (print "Modepatt is valid")
+		      (set! ret #f))))
+	    (set! ret #f))
+	(if (string-contains cmd "-modepatt")
+	    (if (check-if-modepatt-defined pkta notification-hook pktfile)
+		(print "Modepatt is valid")
+		(set! ret #f)))) 
+    ret))
+
+   
 ;; collect all needed data and create run pkts for contours with changed inputs
 ;;
 (define (dispatch-commands mtconf toppath)
   ;; we are expecting a directory "logs", check and create it, create the log in /tmp if not able to create logs dir
   (let ((logdir
 	 (if (if (not (directory? "logs"))
 		 (handle-exceptions
-		     exn
-		     #f
-		   (create-directory "logs")
-		   #t)
+		  exn
+		  #f
+		  (create-directory "logs")
+		  #t)
 		 #t)
 	     "logs"
-	     "/tmp")))
-    (with-queue-db
+	     "/tmp"))
+	(cpuload (alist-ref 'adj-proc-load (common:get-normalized-cpu-load #f)))
+	(maxload (string->number (or (configf:lookup mtconf "setup" "maxload")
+				     (configf:lookup mtconf "jobtools" "maxload") ;; respect value used by Megatest calls
+				     "1.1")))
+	(notification-hook (if (configf:lookup mtconf "setup" "notification-hook")
+			       (configf:lookup mtconf "setup" "notification-hook")
+			       #f)))
+    (common:with-queue-db
      mtconf
      (lambda (pktsdirs pktsdir pdb)
        (let* ((rgconfdat (find-and-read-config (conc toppath "/runconfigs.config")))
 	      (rgconf    (car rgconfdat))
 	      (areas     (configf:get-section mtconf "areas"))
 	      (contours  (configf:get-section mtconf "contours"))
 	      (pkts      (find-pkts pdb '(cmd) '()))
 	      (torun     (make-hash-table)) ;; target => ( ... info ... )
 	      (rgentargs (hash-table-keys rgconf))) ;; these are the targets registered for automatically triggering
+         (sqlite3:set-busy-handler! (dbi:db-conn pdb) (sqlite3:make-busy-timeout 10000))
 	 (for-each
 	  (lambda (pktdat)
 	    (let* ((pkta    (alist-ref 'apkt pktdat))
-		   (action  (alist-ref 'a pkta))
+		   (action  (alist-ref 'A pkta))
 		   (cmdline (pkt->cmdline pkta))
 		   (uuid    (alist-ref 'Z pkta))
+		   (user    (alist-ref 'U pkta))
+		   (area    (alist-ref 'G pkta))
 		   (logf    (conc logdir "/" uuid "-run.log"))
+		   (pktfile (conc pktsdir "/" uuid ".pkt"))
 		   (fullcmd (conc "NBFAKE_LOG=" logf " nbfake " cmdline)))
-	      (print "RUNNING: " fullcmd)
-	      (system fullcmd)
-	      (mark-processed pdb (list (alist-ref 'id pktdat)))
-	      (let-values (((ack-uuid ack-pkt)
-			    (add-z-card
-			     (construct-sdat 'P uuid
-					     'T (case (string->symbol action)
-						  ((run) "runstart")
-						  ((sync) "syncstart")    ;; example of translating run -> runstart
-						  (else   action))
-					     'c (alist-ref 'o pkta) ;; THIS IS WRONG! SHOULD BE 'c
-					     't (alist-ref 't pkta)))))
-		(write-pkt pktsdir ack-uuid ack-pkt))))
+	      (if (check-access user mtconf action area)
+		  (if (and (> cpuload maxload)
+			   (member action '("run" "archive"))) ;; do not run archive or run if load is over the specified limit
+		      (begin
+			(print "WARNING: cpuload too high, skipping processing of " uuid " due to " cpuload " > " maxload)
+			(if notification-hook
+			    (let* ((notification-cmd (conc notification-hook " --pkt " pktfile " --msg HIGH_LOAD")))
+			      (print "Running " notification-cmd) 
+			      (system notification-cmd))))
+		      (begin
+			;; if modepatt used chek if it is defined for the target. If -reqtarg check if target exist.
+			(if (validate-cmd fullcmd pkta notification-hook pktfile)
+			    (begin
+			      (print "RUNNING: " fullcmd)
+			      (system fullcmd) ;; replace with process ...
+			      (mark-processed pdb (list (alist-ref 'id pktdat)))
+			      (let-values (((ack-uuid ack-pkt)
+					    (add-z-card
+					     (construct-sdat 'P uuid
+							     'T (case (string->symbol action)
+								  ((run) "runstart")
+								  ((sync) "syncstart")    ;; example of translating run -> runstart
+								  (else   action))
+							     'G (alist-ref 'G pkta)
+							     'c (alist-ref 'c pkta) ;; THIS IS WRONG! SHOULD BE 'c
+							     't (alist-ref 't pkta)))))
+				(write-pkt pktsdir ack-uuid ack-pkt))
+			      (if notification-hook
+				  (let* ((notification-cmd (conc notification-hook " --pkt " pktfile " --msg RUN_LAUNCHED --contour " (caar  contours) " --log_path " logf )))
+				    (print "Running " notification-cmd)				
+				    (system notification-cmd))))
+			    (begin
+			      (mark-processed pdb (list (alist-ref 'id pktdat)))
+			      (let-values (((ack-uuid ack-pkt)
+					    (add-z-card
+					     (construct-sdat 'P uuid
+							     'T "invalid-input"
+							     'c (alist-ref 'o pkta) ;; THIS IS WRONG! SHOULD BE 'c
+							     't (alist-ref 't pkta)))))
+				(write-pkt pktsdir ack-uuid ack-pkt))))))
+		  (begin ;; access denied! Mark as such
+		    (mark-processed pdb (list (alist-ref 'id pktdat)))
+		    (let-values (((ack-uuid ack-pkt)
+				  (add-z-card
+				   (construct-sdat 'P uuid
+						   'T "access-denied"
+						   'c (alist-ref 'o pkta) ;; THIS IS WRONG! SHOULD BE 'c
+						   't (alist-ref 't pkta)))))
+		      (write-pkt pktsdir ack-uuid ack-pkt))
+		    (if notification-hook
+			(let* ((notification-cmd (conc notification-hook " --pkt " pktfile " --msg ACCESS_DENIED")))
+			  (print "Running " notification-cmd)
+			  (system notification-cmd)))))))
 	  pkts))))))
-  
+
+
+(define (check-access user mtconf action area)
+  ;; NOTE: Need control over defaults. E.g. default might be no access
+  (let* ((access-ctrl (hash-table-exists? mtconf "access"))  ;; if there is an access section the default is to REQUIRE enablement/access
+	 (access-list (map (lambda (x)
+			     (string-split x ":"))
+			   (string-split (or (configf:lookup mtconf "access" area) ;; userid:rightstype userid2:rightstype2 ...
+					     (if access-ctrl
+						 "*:none"  ;; nobody has access by default
+						 "*:all")))))
+	 (access-types-dat (configf:get-section mtconf "accesstypes")))
+    (debug:print 2 *default-log-port* "Checking access in " access-list " with access-ctrl " access-ctrl " for area " area)
+    (if access-ctrl
+	(let* ((user-access     (or (assoc user access-list)
+				    (assoc "*"  access-list)))
+	       (access-type   (if user-access
+												  (cadr user-access)
+                           #f))
+	       (access-types    (let ((res (alist-ref access-type access-types-dat equal?)))
+				  (if res (car res) res)))
+	       (allowed-actions (string-split (or access-types ""))))
+	  (debug:print 2 *default-log-port* "Got " allowed-actions " for user " user " where access-types=" access-types " access-type=" access-type)
+	  (cond
+	   ((and access-types (member action allowed-actions))
+	    ;; (print "Access granted for " user " for " action)
+	    #t)
+	   (else
+	    ;; (print "Access denied for " user " for " action)
+	    #f))))))
+
+(define (open-logfile logpath)
+  (condition-case
+   (let* ((log-dir (or (pathname-directory logpath) ".")))
+     (if (not (directory-exists? log-dir))
+         (system (conc "mkdir -p " log-dir)))
+     (open-output-file logpath))
+   (exn ()
+        (debug:print-error 0 *default-log-port* "Could not open log file for write: "logpath)
+        (define *didsomething* #t)  
+        (exit 1))))
+
+
 (define (get-pkts-dir mtconf)
   (let ((pktsdirs  (configf:lookup mtconf "setup" "pktsdirs"))
 	(pktsdir   (if pktsdirs (car (string-split pktsdirs " ")) #f)))
     pktsdir))
 
 (let ((debugcontrolf (conc (get-environment-variable "HOME") "/.mtutilrc")))
-  (if (file-exists? debugcontrolf)
+  (if (common:file-exists? debugcontrolf)
       (load debugcontrolf)))
+
+(if (args:get-arg "-log") ;; redirect the log always when a server
+    (handle-exceptions
+	exn
+	(begin
+	  (print "ERROR: Failed to switch to log output. " ((condition-property-accessor 'exn 'message) exn))
+	  )
+      (let* ((tl   (args:get-arg "-log"))   ;; run launch:setup if -server, ensure we do NOT run launch:setup if -log specified
+	     (logf (args:get-arg "-log")) ;; use -log unless we are a server, then craft a logfile name
+	     (oup  (open-logfile logf)))
+	;(if (not (args:get-arg "-log"))
+	;    (hash-table-set! args:arg-hash "-log" logf)) ;; fake out future queries of -log
+	(print *default-log-port* "Sending log output to " logf)
+	(set! *default-log-port* oup)
+)))
 
 (if *action*
     (case (string->symbol *action*)
-      ((run remove rerun set-ss archive kill)
+      ((run remove rerun rerun-clean rerun-all set-ss archive kill list kill-run kill-rerun lock unlock)
+          
        (let* ((mtconfdat (simple-setup (args:get-arg "-start-dir")))
 	      (mtconf    (car mtconfdat))
+	      (area      (args:get-arg "-area")) ;; look up the area to dispatch to from [areas] section
+	      (areasec   (if area (configf:lookup mtconf "areas" area) #f))
+	      (areadat   (if areasec (common:val->alist areasec) #f))
+	      (area-path (if areadat (alist-ref 'path areadat) #f))
 	      (pktsdirs  (configf:lookup mtconf "setup" "pktsdirs"))
 	      (pktsdir   (if pktsdirs (car (string-split pktsdirs " ")) #f))
-	      (adjargs   (hash-table-copy args:arg-hash)))
+	      (adjargs   (hash-table-copy args:arg-hash))
+	      (new-ss    (args:get-arg "-new")))
+	 ;; check a few things
+	 (cond
+	  ((and area (not area-path))
+	   (print "ERROR: the specified area was not found in the [areas] table. Area name=" area)
+	   (exit 1))
+	  ((not area)
+	   (print "ERROR: no area specified. Use -area ")
+	   (exit 1))
+	  (else
+	   (let* ((usr-admin (check-access (current-user-name) mtconf "override" area))
+					(user (if (and usr-admin (args:get-arg "-override-user"))
+                    (args:get-arg "-override-user")
+									  (current-user-name))))
+       ; (print "user 123 " usr-admin )
+        ;(exit 1)
+     (if (and (not usr-admin) (args:get-arg "-override-user"))
+         (begin
+            (print  user " does not have access to override user")
+          (exit 1)))
+	   (if (check-access user mtconf *action* area);; check rights
+		 (print "Access granted for " *action* " action by " user)
+		 (begin
+		   (print "Access denied for " *action* " action by " user)
+		   (exit 1))))))
+	 
 	 ;; (for-each
 	 ;;  (lambda (key)
 	 ;;    (if (not (member key *legal-params*))
 	 ;; 	(hash-table-delete! adjargs key))) ;; we need to delete any params intended for mtutil
 	 ;;  (hash-table-keys adjargs))
 	 (let-values (((uuid pkt)
-		       (command-line->pkt *action* adjargs #f)))
+		       (command-line->pkt *action* adjargs #f area-path: area-path new-ss: new-ss)))
+           (print "run log @ " (conc (current-directory) "/" uuid "-" *action* ".log"))
 	   (write-pkt pktsdir uuid pkt))))
       ((dispatch import rungen process)
        (let* ((mtconfdat (simple-setup (args:get-arg "-start-dir")))
 	      (mtconf    (car mtconfdat))
-	      (toppath   (configf:lookup mtconf "dyndat" "toppath")))
+	      (toppath   (configf:lookup mtconf "scratchdat" "toppath")))
 	 (case (string->symbol *action*)
 	   ((process)  (begin
-			 (load-pkts-to-db mtconf)
+			 (common:load-pkts-to-db mtconf)
 			 (generate-run-pkts mtconf toppath)
-			 (load-pkts-to-db mtconf)
+			 (common:load-pkts-to-db mtconf)
 			 (dispatch-commands mtconf toppath)))
-	   ((import)   (load-pkts-to-db mtconf)) ;; import pkts
+	   ((import)   (common:load-pkts-to-db mtconf)) ;; import pkts
 	   ((rungen)   (generate-run-pkts mtconf toppath))
 	   ((dispatch) (dispatch-commands mtconf toppath)))))
+      ;; misc
+      ((show)
+       (if (> (length remargs) 0)
+	   (let* ((mtconfdat (simple-setup (args:get-arg "-start-dir")))
+		  (mtconf    (car mtconfdat))
+		  (sect-dat (configf:get-section mtconf (car remargs))))
+	     (if sect-dat
+		 (for-each
+		  (lambda (entry)
+		    (if (> (length entry) 1)
+			(print (car entry) "   " (cadr entry))
+			(print (car entry))))
+		  sect-dat)
+		 (print "No section \"" (car remargs) "\" found")))
+	   (print "ERROR: list requires section parameter; areas, setup or contours")))
+      ((gendot)
+       (let* ((mtconfdat (simple-setup (args:get-arg "-start-dir")))
+	      (mtconf    (car mtconfdat)))
+	 (common:load-pkts-to-db mtconf use-lt: #t) ;; need to NOT do this by default ...
+	 (common:with-queue-db
+	  mtconf
+	  (lambda (pktsdirs pktsdir conn)
+	    ;;                       pktspec display-fields 
+	    (make-report "out.dot" conn
+			 '((cmd      . ((parent . P)
+					(user   . M)
+					(target . t)))
+			   (runstart . ((parent . P)
+					(target . t)))
+			   (runtype . ((parent . P)))) ;; pktspec
+			 '(P U t)                                                     ;; 
+			 )))))  ;; no ptypes listed (ptypes are strings of pkt types to read from db
       ((db)
        (if (null? remargs)
 	   (print "ERROR: missing sub command for db command")
 	   (let ((subcmd (car remargs)))
 	     (case (string->symbol subcmd)
 	       ((pgschema)
 		(let* ((install-home (common:get-install-area))
 		       (schema-file  (conc install-home "/share/db/mt-pg.sql")))
-		  (if (file-exists? schema-file)
+		  (if (common:file-exists? schema-file)
 		      (system (conc "/bin/cat " schema-file)))))
 	       ((sqlite3schema)
 		(let* ((install-home (common:get-install-area))
 		       (schema-file  (conc install-home "/share/db/mt-sqlite3.sql")))
-		  (if (file-exists? schema-file)
+		  (if (common:file-exists? schema-file)
 		      (system (conc "/bin/cat " schema-file)))))
 	       ((junk)
-		(rmt:get-keys))))))))
+		(rmt:get-keys))))))
+    ((tsend)
+       (if (null? remargs)
+	      (print "ERROR: missing data to send to trigger listeners")
+	      (let* ((msg       (car remargs))
+                  (mtconfdat (simple-setup (args:get-arg "-start-dir")))
+                  (mtconf    (car mtconfdat))
+                  (time-out  (if (args:get-arg "-time-out")
+                                 (string->number (args:get-arg "-time-out")) 
+                               5))
+                  (listeners (configf:get-section mtconf "listeners"))
+                  (user-info  (user-information (current-user-id)))
+                  (prev-seen (make-hash-table))) ;; catch duplicates
+             (if user-info
+              (begin
+               (for-each
+              (lambda (listener)
+                (let ((host-port (car listener))
+                      (attrib (val->alist (cadr listener))))
+                  (if (and (equal? msg "time-to-die") (not (can-user-kill-listner user-info attrib)))
+                   (begin
+                      (debug:print-error 0 *default-log-port* "User " (car user-info) " is not allowed to send message '" msg"'")
+                      (exit 1)))
+                  (print "sending " msg " to " host-port )
+                  (open-send-close-nn host-port msg attrib timeout: time-out )))
+              listeners))
+              (begin
+               (debug:print-error 0 *default-log-port* "Could not Identify executing user. Will not send any message")
+               (exit 1))))))
+     ((tquery)
+       (if (null? remargs)
+	      (print "ERROR: missing data to send to trigger listeners")
+	      (let* ((msg       (car remargs))
+                  (mtconfdat (simple-setup (args:get-arg "-start-dir")))
+                  (mtconf    (car mtconfdat))
+                  (time-out  (if (args:get-arg "-time-out")
+                                 (string->number (args:get-arg "-time-out")) 
+                               5))
+                  (listeners (configf:get-section mtconf "listeners"))
+                  (user-info  (user-information (current-user-id)))
+                  (prev-seen (make-hash-table))) ;; catch duplicates
+             (if user-info
+              (begin
+               (for-each
+              (lambda (listener)
+                (let ((host-port (car listener))
+                      (attrib (val->alist (cadr listener))))
+                  (if (and (equal? msg "time-to-die") (not (can-user-kill-listner user-info attrib)))
+                   (begin
+                      (debug:print-error 0 *default-log-port* "User " (car user-info) " is not allowed to send message '" msg"'")
+                      (exit 1)))
+                  (print "sending " msg " to " host-port )
+                  (open-send-receive-nn host-port msg attrib timeout: time-out )))
+              listeners))
+              (begin
+               (debug:print-error 0 *default-log-port* "Could not Identify executing user. Will not send any message")
+               (exit 1))))))
+
+    ((tquerylisten)
+       (if (null? remargs)
+           (print "ERROR: useage for tlisten is \"mtutil tlisten portnum\"")
+           (let ((portnum (string->number (car remargs))))
+              
+             (if (not portnum)
+                 (print "ERROR: the portnumber parameter must be a number, you gave: " (car remargs))
+                 (begin
+                   (if (not (is-port-in-use portnum))  
+                       (let* ((rep       (start-nn-server portnum))
+                              (mtconfdat (simple-setup (args:get-arg "-start-dir")))
+                              (mtconf    (car mtconfdat))
+                              (contact   (configf:lookup mtconf "listener" "owner"))
+                              (script    (configf:lookup mtconf "listener" "script")))
+                         (print "Listening on port " portnum " for messages.")
+                         (set-signal-handler! signal/int  (lambda (signum) 
+															(set! *time-to-exit* #t)
+  														(debug:print-error 0 *default-log-port* "Received signal " signum " sending email befor exiting !!")
+  														(let ((email-body (mtut:stml->string (s:body
+																						(s:p (conc "Received signal " signum ". Lister has been terminated on host " (get-environment-variable "HOST") ". "))))))
+             					        (sendmail contact "Listner has been terminated." email-body  use_html: #t))
+                              (exit)))
+															(set-signal-handler! signal/term  (lambda (signum) 
+															(set! *time-to-exit* #t)
+  														(debug:print-error 0 *default-log-port* "Received signal " signum " sending email befor exiting !!")
+  														(let ((email-body (mtut:stml->string (s:body
+																						(s:p (conc "Received signal " signum ". Lister has been terminated on host " (get-environment-variable "HOST") ". "))))))
+             					        (sendmail contact "Listner has been terminated." email-body  use_html: #t))
+                              (exit)))
+
+                         ;(set-signal-handler! signal/term special-signal-handler)
+                         
+                         (let loop ((instr (nn-recv rep)))
+                             ;;(nn-send rep "3.9")
+                             (with-input-from-pipe (conc "/usr/bin/uptime | cut -d':' -f4 | awk '{print $1}' | cut -d',' -f1")
+                             	(lambda()
+                             		(let loop ((inl (read-line)))
+                          				(if (not (eof-object? inl))
+                              				(begin
+                                			;;(print "fdk73: " inl ":")
+                                			;;(set! current-list-ciaf (append! current-list-ciaf (list (string-substitute "\\s+$" "" inl))))
+                                			(nn-send rep inl)
+                                			(loop(read-line)))
+                          				))
+
+                             	)
+                             )
+                             ;;(print (isys "/usr/bin/uptime" foreach-stdout-thunk: foreach-stdout))
+                             (let ((ctime (date->string (current-date)))) 
+                             (if  (equal? instr "time-to-die")
+                              (begin 
+                              (debug:print 0 *default-log-port* ctime " received '" instr "'. Time to sucide." )
+                               (let ((pid  (current-process-id)))
+                              (debug:print 0 *default-log-port* "Killing current process (pid=" pid ")")
+                               (system (conc "kill " pid))))  
+                             (begin
+								(debug:print 0 *default-log-port* ctime " received " instr )
+								;(nn-send rep "ok")
+                                (if (not (equal? instr "ping"))
+                                  (begin
+                                   (debug:print 0 *default-log-port* ctime " running \"" script " " instr "\"")
+                                    ;(system (conc script " '" instr "'"))
+                                      (process-run script (list  instr ))  
+                                     (debug:print 0 *default-log-port* ctime " done" ))
+                                   (begin
+                                   	 (if (not (equal? instr "load"))
+                                   	 	(print "Checking load")
+
+                                   	 ) 
+                                   )
+
+                                  )
+
+                                )))
+                           (loop (nn-recv rep))))
+		       (print "ERROR: Port " portnum " already in use. Try another port")))))))
+      
+
+
+
+      ((tlisten)
+       (if (null? remargs)
+           (print "ERROR: useage for tlisten is \"mtutil tlisten portnum\"")
+           (let ((portnum (string->number (car remargs))))
+              
+             (if (not portnum)
+                 (print "ERROR: the portnumber parameter must be a number, you gave: " (car remargs))
+                 (begin
+                   (if (not (is-port-in-use portnum))  
+                       (let* ((rep       (start-nn-server portnum))
+                              (mtconfdat (simple-setup (args:get-arg "-start-dir")))
+                              (mtconf    (car mtconfdat))
+                              (contact   (configf:lookup mtconf "listener" "owner"))
+                              (script    (configf:lookup mtconf "listener" "script")))
+                         (print "Listening on port " portnum " for messages.")
+                         (set-signal-handler! signal/int  (lambda (signum) 
+															(set! *time-to-exit* #t)
+  														(debug:print-error 0 *default-log-port* "Received signal " signum " sending email befor exiting !!")
+  														(let ((email-body (mtut:stml->string (s:body
+																						(s:p (conc "Received signal " signum ". Lister has been terminated on host " (get-environment-variable "HOST") ". "))))))
+             					        (sendmail contact "Listner has been terminated." email-body  use_html: #t))
+                              (exit)))
+															(set-signal-handler! signal/term  (lambda (signum) 
+															(set! *time-to-exit* #t)
+  														(debug:print-error 0 *default-log-port* "Received signal " signum " sending email befor exiting !!")
+  														(let ((email-body (mtut:stml->string (s:body
+																						(s:p (conc "Received signal " signum ". Lister has been terminated on host " (get-environment-variable "HOST") ". "))))))
+             					        (sendmail contact "Listner has been terminated." email-body  use_html: #t))
+                              (exit)))
+
+                         ;(set-signal-handler! signal/term special-signal-handler)
+                         
+                         (let loop ((instr (nn-recv rep)))
+                             (nn-send rep "ok")
+                             (let ((ctime (date->string (current-date)))) 
+                             (if  (equal? instr "time-to-die")
+                              (begin 
+                              (debug:print 0 *default-log-port* ctime " received '" instr "'. Time to sucide." )
+                               (let ((pid  (current-process-id)))
+                              (debug:print 0 *default-log-port* "Killing current process (pid=" pid ")")
+                               (system (conc "kill " pid))))  
+                             (begin
+								(debug:print 0 *default-log-port* ctime " received " instr )
+								;(nn-send rep "ok")
+                                (if (not (equal? instr "ping"))
+                                  (begin
+                                   (debug:print 0 *default-log-port* ctime " running \"" script " " instr "\"")
+                                      (system (conc script " '" instr "' &"))
+                                      ;(process-run script (list  instr ))  
+                                     (debug:print 0 *default-log-port* ctime " done" ))
+                                   (begin
+                                   	 (if (not (equal? instr "load"))
+                                   	 	(print "Checking load")
+
+                                   	 ) 
+                                   )
+
+                                  )
+
+                                )))
+                           (loop (nn-recv rep))))
+		       (print "ERROR: Port " portnum " already in use. Try another port")))))))
+      ((gather) ;; gather all area db's into /tmp/$USER_megatest/alldbs
+       (let* ((mtconfdat (simple-setup (args:get-arg "-start-dir")))
+              (mtconf    (car mtconfdat))
+              (areas     (get-area-names mtconf)))
+         (print "areas: " areas)))
+      
+      (else
+       (let ((all-actions (sort (map conc (delete-duplicates (append *other-actions* (map car *action-keys*)))) string<=?)))
+	 (print "unrecognised action: \"" *action* "\", try one of; \"" (string-intersperse all-actions "\", \"") "\"")))
+      
+      )) ;; the end
+             
 
 ;; If HTTP_HOST is defined then we must be in the cgi environment
 ;; so run stml and exit
 ;;
 (if (get-environment-variable "HTTP_HOST")
@@ -963,5 +1906,11 @@
       (install-history-file (get-environment-variable "HOME") ".mtutil_history") ;;  [homedir] [filename] [nlines])
       (current-input-port (make-readline-port "mtutil> "))
       (if (args:get-arg "-repl")
 	  (repl)
 	  (load (args:get-arg "-load")))))
+
+#|
+(define mtconf (car (simple-setup #f)))
+(define dat (common:with-queue-db mtconf (lambda (conn)(get-pkts conn '()))))
+(pp (pkts#flatten-all dat '((cmd . ((parent . P)(url . M)))(runtype . ((parent . P)))) 'id 'group-id 'uuid 'parent 'pkt-type 'pkt 'processed))
+|#

ADDED   mutils.scm
Index: mutils.scm
==================================================================
--- /dev/null
+++ mutils.scm
@@ -0,0 +1,23 @@
+;;======================================================================
+;; Copyright 2019, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
+;;======================================================================
+
+(declare (unit mutils))
+
+(include "mutils/mutils.scm")

ADDED   mutils/Makefile
Index: mutils/Makefile
==================================================================
--- /dev/null
+++ mutils/Makefile
@@ -0,0 +1,22 @@
+# Copyright 2007-2010, Matthew Welland.
+#
+#  This program is made available under the GNU GPL version 2.0 or
+#  greater. See the accompanying file COPYING for details.
+#
+#  This program is distributed WITHOUT ANY WARRANTY; without even the
+#  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#  PURPOSE.
+
+# TARGDIR = $(shell csi -e "(print (car \#\#sys\#include-pathnames))(exit)")
+
+all : uptodate.log # $(TARGDIR)/mutils.so
+
+uptodate.log : mutils.scm mutils.setup
+	chicken-setup | tee uptodate.log
+
+$(TARGDIR)/mutils.so : mutils.so
+	@echo installing to $(TARGDIR)
+	cp mutils.so $(TARGDIR)
+
+mutils.so : mutils.scm
+	csc -s mutils.scm

ADDED   mutils/mutils.meta
Index: mutils/mutils.meta
==================================================================
--- /dev/null
+++ mutils/mutils.meta
@@ -0,0 +1,20 @@
+(
+; Your egg's license:
+(license "BSD")
+
+; Pick one from the list of categories (see below) for your egg and enter it
+; here.
+(category misc)
+
+; A list of eggs mpeg3 depends on.  If none, you can omit this declaration
+; altogether. If you are making an egg for chicken 3 and you need to use
+; procedures from the `files' unit, be sure to include the `files' egg in the
+; `needs' section (chicken versions < 3.4.0 don't provide the `files' unit).
+; `depends' is an alias to `needs'.
+(needs sparse-vectors)
+
+; A list of eggs required for TESTING ONLY.  See the `Tests' section.
+(test-depends test)
+
+(author "Matt Welland")
+(synopsis "A basic description of the purpose of the egg."))

ADDED   mutils/mutils.scm
Index: mutils/mutils.scm
==================================================================
--- /dev/null
+++ mutils/mutils.scm
@@ -0,0 +1,310 @@
+;; Copyright 2006-2011, Matthew Welland.
+;; 
+;;  This program is made available under the GNU GPL version 2.0 or
+;;  greater. See the accompanying file COPYING for details.
+;; 
+;;  This program is distributed WITHOUT ANY WARRANTY; without even the
+;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+;;  PURPOSE.
+
+;; This is from the perl world, a hash of hashes is a super easy way to keep a handle on
+;; lots of disparate data
+;;
+
+(module mutils
+    *
+
+  (import chicken scheme
+	  ;; data-structures posix
+	  srfi-1
+	  ;; srfi-13
+	  srfi-69
+	  ports
+	  extras
+	  regex
+	  posix
+	  data-structures
+	  matchable
+	  )
+
+(define (mutils:hierhash-ref hh . keys)
+  (if (null? keys)
+      #f
+      (let loop ((ht   hh)
+		 (key  (car keys))
+		 (tail (cdr keys)))
+	(if (null? tail)
+	    (if (hash-table? ht)
+		(hash-table-ref/default ht key #f)
+		#f)
+	    (if (hash-table? ht)
+		(loop (hash-table-ref/default ht key #f)
+		      (car tail)
+		      (cdr tail))
+		#f)))))
+
+;; WATCH THE NON-INTUITIVE INTERFACE HERE!!!!
+;; val comes first!
+;;
+(define (mutils:hierhash-set! hh val . keys)
+  (if (null? keys)
+      #f
+      (let loop ((ht    hh)
+		 (key  (car keys))
+		 (tail (cdr keys)))
+	(if (null? tail) ;; last one!
+	    (hash-table-set! ht key val)
+	    (let ((nh (hash-table-ref/default ht key #f)))
+	      (if (not nh)(set! nh (make-hash-table)))
+	      (hash-table-set! ht key nh)
+	      (loop nh
+		    (car tail)
+		    (cdr tail)))))))
+
+;; nice little routine to add an item to a list in a hashtable 
+;;
+(define (mutils:hash-table-add-to-list htbl key item)
+  (let ((l (hash-table-ref/default htbl key #f)))
+    (if l
+	(hash-table-set! htbl key (cons item l))
+	(hash-table-set! htbl key (list item)))))
+
+(define (mutils:hash-table-append-to-list htbl key lst)
+  (let ((l (hash-table-ref/default htbl key #f)))
+    (if l
+	(hash-table-set! htbl key (append lst l))
+        (hash-table-set! htbl key lst))))
+
+;;======================================================================
+;; Utils
+;;======================================================================
+
+(define (mutils:file->list fname)
+  (let ((fh (open-input-file fname))
+	(comment (regexp "^\\s*#"))
+	(blank   (regexp "^\\s*$")))
+    (let loop ((l   (read-line fh))
+	       (res '()))
+      (if (eof-object? l)
+	  (reverse res)
+	  (if (or (string-match comment l)
+		  (string-match blank l))
+	      (loop (read-line fh) res)
+	      (loop (read-line fh) (cons l res)))))))
+
+(use sparse-vectors)
+
+;; this is a simple two dimensional sparse array
+
+;; ONLY TWO DIMENSIONS!!! SEE ARRAY-LIB IF YOUR NEEDS ARE GREATER!!
+;;
+(define (mutils:make-sparse-array)
+  (let ((a (make-sparse-vector)))
+    (sparse-vector-set! a 0 (make-sparse-vector))
+    a))
+
+(define (mutils:sparse-array? a)
+  (and (sparse-vector? a)
+       (sparse-vector? (sparse-vector-ref a 0))))
+
+(define (mutils:sparse-array-ref a x y)
+  (let ((row (sparse-vector-ref a x)))
+    (if row
+	(sparse-vector-ref row y)
+	#f)))
+
+(define (mutils:sparse-array-set! a x y val)
+  (let ((row (sparse-vector-ref a x)))
+    (if row
+	(sparse-vector-set! row y val)
+	(let ((new-row (make-sparse-vector)))
+	  (sparse-vector-set! a x new-row)
+	  (sparse-vector-set! new-row y val)))))
+
+;; some routines for treating assoc lists a bit like hash tables
+
+(define (mutils:assoc-get/default alist key default)
+  (let ((res (assoc key alist)))
+    (if (and res (list? res)(> (length res) 1))
+	(cadr res)
+	default)))
+
+(define (mutils:assoc-get alist key)
+  (cadr (assoc key alist)))
+
+(define (mutils:hier-list? @hierlist)
+  (and (list? @hierlist)
+       (> (length @hierlist) 0)
+       (list? (car @hierlist))
+       (> (length (car @hierlist)) 1)))
+
+(define (mutils:hier-list-get @hierlist . @path)
+  (if (list? @hierlist)
+      (let* (($path (car @path))
+	     (@rempath (cdr @path))
+	     (@match (assoc $path @hierlist)))
+	(if @match
+	    (if (or (not (list? @rempath))(null? @rempath))
+		(cadr @match)
+		(apply mutils:hier-list-get (cadr @match) @rempath))
+	    #f))
+      #f))
+
+(define (mutils:hier-list-put! @hierlist . @path)
+  (let* (($path (car @path))
+	 (@rempath (cdr @path))
+	 ($value   (cadr @path))
+	 (@match (assoc $path @hierlist))
+	 (@remhierlist (remove (lambda (a)
+                                 (equal? a @match))
+                               @hierlist))
+         (@old-pair (let (($value (mutils:hier-list-get @hierlist $path))) (if $value $value '())))
+	 (@new-pair (list $path (if (eq? (length @rempath) 1) 
+				    (car @rempath)
+				    (apply mutils:hier-list-put! @old-pair @rempath)))))
+    (cons @new-pair @remhierlist)))
+
+(define (mutils:hier-list-remove! @hierlist . @path)
+  (let (($path (car @path)))
+    (if (eq? (length @path) 1)
+	(remove (lambda (a)
+                  (equal? a (assoc $path @hierlist)))
+                @hierlist)
+	(let* ((@rempath (cdr @path))
+	       (@match (assoc $path @hierlist))
+	       (@remhierlist (remove (lambda (a) 
+                                       (equal? @match a))
+                                     @hierlist))
+	       (@old-pair (let (($value (mutils:hier-list-get @hierlist $path))) (if $value $value '())))
+	       (@new-pair (list $path (apply mutils:hier-list-remove! @old-pair @rempath))))
+	  (cons @new-pair @remhierlist)))))
+
+(define (mutils:keys @hierlist . @path)
+  (map (lambda (@l)
+	 (if (and (list? @l)(not (null? @l))) 
+	     (car @l))) 
+       (if (null? @path) @hierlist
+	   (apply mutils:hier-list-get @hierlist @path))))
+
+;;======================================================================
+;; Other utils
+;;======================================================================
+
+(define (check-write-create fpath)
+  (and (file-write-access? fpath)
+       (let ((fname (conc fpath "/.junk-" (current-seconds) "-" (random 10000))))
+	 ;;(print "trying to create/remove " fname)
+	 (handle-exceptions
+	  exn
+	  #f
+	  (begin
+	    (with-output-to-file fname
+	      (lambda ()
+		(print "You can delete this file")))
+	    (delete-file fname)
+	    #t)))))
+
+(define (run-and-return-output cmd . params)
+  (let-values (((inp oup pid)
+		(process cmd params)))
+    (let ((res (with-input-from-port inp read-lines)))
+      (let-values (((pidres status estatus)
+		    (process-wait pid)))
+	(and status (eq? estatus 0) res)))))
+
+(define (confirm-ssh-access-to-host hostname)
+  (run-and-return-output "ssh" hostname "uptime"))
+
+(define (check-display dsp)
+  (run-and-return-output "xdpyinfo" "-display" dsp))
+
+#;(define (check-display dsp)
+  (let-values (((inp oup pid)
+		(process "xdpyinfo" `("-display" ,dsp))))
+    (let ((res (with-input-from-port inp read-lines)))
+      (let-values (((pidres status estatus)
+		    (process-wait pid)))
+	(and status (eq? estatus 0) res)))))
+
+;; do some sanity checks on the system
+;;
+(define (mutils:syscheck common:raw-get-remote-host-load
+			 server:get-best-guess-address
+			 read-config)
+  ;; current dir writeable and do megatest.config, runconfigs.config files exist/readable
+  (print "Current directory " (current-directory) " writeable: " 
+	 (if (check-write-create ".") "yes" "NO"))
+  ;; home dir writeable
+  (print "Home directory " (get-environment-variable "HOME") " writeable: "
+	 (if (check-write-create (get-environment-variable "HOME")) "yes" "NO"))
+  ;; /tmp writeable
+  (print "/tmp directory writeable: " (if (check-write-create "/tmp") "yes" "NO"))
+  ;; load configs
+  (print "$DISPLAY set: " (if (get-environment-variable "DISPLAY")
+			      (conc  (get-environment-variable "DISPLAY") " yes")
+			      "NO"))
+
+  (print "$DISPLAY accessible? "
+	  ;; (eq? (system "xdpyinfo -display $DISPLAY &>/dev/null") 0)
+	 (if (check-display (get-environment-variable "DISPLAY"))
+	     "yes" "NO"))
+
+  (print "Password-less ssh access to localhost: "
+	 (if  (confirm-ssh-access-to-host "localhost")
+	      "yes"
+	      "NO"))
+
+  ;; if I'm in a Megatest area do some checks
+  (print "Have megatest.config: "
+	 (if (file-exists? "megatest.config")
+	     "yes"
+	     "NO"))
+
+  (print "Have runconfigs.config: "
+	 (if (file-exists? "runconfigs.config")
+	     "yes"
+	     "NO"))
+
+  (if (file-exists? ".homehost")
+      (let* ((homehost (with-input-from-file ".homehost"
+			 read-line))
+	     (currhost (get-host-name))
+	     (bestadrs (server:get-best-guess-address currhost)))
+	(print "Have .homehost and it is the localhost: "
+	       (if (equal? homehost bestadrs)
+		   "yes"
+		   (conc ".homehost=" homehost ", localhost=" bestadrs ", NO")))
+	(print "Have .homehost and it is reachable via ssh: "
+	       (if (confirm-ssh-access-to-host homehost)
+		   "yes"
+		   "NO"))
+	))
+
+  (if (file-exists? "megatest.config")
+      (let* ((cdat (read-config "megatest.config" #f #f)))
+	(print "Have [disks] section: "
+	       (if (hash-table-ref/default cdat "disks" #f)
+		   (conc (hash-table-ref cdat "disks") " yes")
+		   "NO"))
+	(for-each
+	 (lambda (entry)
+	   (match
+	    entry
+	    ((dname path)
+	     (print "Disk " dname " at " path " writeable: "
+		    (if (check-write-create path) "yes" "NO")))
+	    (else (print "bad entry: " entry))))
+	 (hash-table-ref/default cdat "disks" '()))))
+
+  (print "Have link tree and it is writable: "
+	 (if (and (file-exists? "lt")
+		  (check-write-create "lt"))
+	     "yes"
+	     "NO"))
+  ;;    check load on homehost
+  )
+
+;; Develop stuff here - then move to where it belongs.
+
+
+)

ADDED   mutils/mutils.setup
Index: mutils/mutils.setup
==================================================================
--- /dev/null
+++ mutils/mutils.setup
@@ -0,0 +1,18 @@
+;; Copyright 2007-2010, Matthew Welland.
+;;
+;;  This program is made available under the GNU GPL version 2.0 or
+;;  greater. See the accompanying file COPYING for details.
+;;
+;;  This program is distributed WITHOUT ANY WARRANTY; without even the
+;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+;;  PURPOSE.
+
+;;;; mutils.setup
+
+;; compile the code into a dynamically loadable shared object
+;; (will generate mutils.so)
+(compile -s mutils.scm)
+
+;; Install as extension library
+(install-extension 'mutils "mutils.so")
+

ADDED   mutils/tests/datastruct.scm
Index: mutils/tests/datastruct.scm
==================================================================
--- /dev/null
+++ mutils/tests/datastruct.scm
@@ -0,0 +1,15 @@
+
+(use test)
+
+(include "datastruct.scm")
+
+(define hh (make-hash-table))
+
+(hierhash-set! hh 5 1 2 3 4)
+
+(test 5 (hierhash-ref hh 1 2 3 4))
+
+(hierhash-set! hh 10 1 2 3 5)
+
+(test 10 (hierhash-ref hh 1 2 3 5))
+(test 5  (hierhash-ref hh 1 2 3 4))

Index: newdashboard.scm
==================================================================
--- newdashboard.scm
+++ newdashboard.scm
@@ -1,25 +1,23 @@
-;;======================================================================
-;; Copyright 2006-2013, Matthew Welland.
-;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
-;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
-;;======================================================================
-
 ;;======================================================================
 ;; Copyright 2006-2016, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 ;;======================================================================
 
 (use format)
 
 (use (prefix iup iup:))
@@ -84,11 +82,11 @@
       (print help)
       (exit)))
 
 ;; ease debugging by loading ~/.dashboardrc
 (let ((debugcontrolf (conc (get-environment-variable "HOME") "/.dashboardrc")))
-  (if (file-exists? debugcontrolf)
+  (if (common:file-exists? debugcontrolf)
       (load debugcontrolf)))
 
 (debug:setup)
 
 (define *tim* (iup:timer))
@@ -375,11 +373,11 @@
       #f))
 
 (define (test-panel window-id)
   (let* ((curr-row-num 0)
 	 (viewlog    (lambda (x)
-		       (if (file-exists? logfile)
+		       (if (common:file-exists? logfile)
 					;(system (conc "firefox " logfile "&"))
 			   (iup:send-url logfile)
 			   (message-window (conc "File " logfile " not found")))))
 	 (xterm      (lambda (x)
 		       (if (directory-exists? rundir)
@@ -730,14 +728,15 @@
 		       (lambda (x)
 			 ;; Want to dedicate no more than 50% of the time to this so skip if
 			 ;; 2x delta time has not passed since last query
 			 (if (< nextmintime (current-milliseconds))
 			     (let* ((starttime (current-milliseconds))
-				    (changes   (dcommon:run-update keys data runname keypatts testpatt states statuses 'full my-window-id))
+				    ;; (changes   (dcommon:run-update keys data runname keypatts testpatt states statuses 'full my-window-id))
 				    (endtime   (current-milliseconds)))
 			       (set! nextmintime (+ endtime (* 2 (- endtime starttime))))
-			       (debug:print 11 *default-log-port* "CHANGE(S): " (car changes) "..."))
+			       ;; (debug:print 11 *default-log-port* "CHANGE(S): " (car changes) "..."))
+                               )
 			     (debug:print-info 11 *default-log-port* "Server overloaded"))))))
 
 ;; (dboard:data-updaters-set! *data* (make-hash-table))
 (newdashboard #f) ;; *dbstruct-local*)    
 (iup:main-loop)

ADDED   nexttag.rb
Index: nexttag.rb
==================================================================
--- /dev/null
+++ nexttag.rb
@@ -0,0 +1,62 @@
+#!/usr/bin/env ruby
+
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
+def get_next_tag(branch)
+
+
+
+  abort "Not on a version branch like v1.64 (got: >#{branch}<)" unless branch.match(/^v\d\.\d\d$/)
+  
+  #puts "this branch: #{branch}"
+
+  tag_pat = /#{branch}(\d\d)/
+  remote=`fsl remote`.chomp.sub(/^file:\/\//,'') # get tagset from origin
+  cmd="fossil tag -R '#{remote}' list"
+  tags = `#{cmd}`.split /\n/
+  abort "fossil command failed [#{cmd}]" if $? != 0
+  branch_tags = tags.find_all{|x| x.match(tag_pat) }.sort
+  if branch_tags.length == 0
+    return branch + "01"
+  else
+    latest_tag = branch_tags.last
+    m1 = latest_tag.match(tag_pat)
+    minor_digits = m1[1].to_i + 1
+    if (minor_digits % 10) == 0
+      minor_digits += 1
+    end
+    new_tag=sprintf("%s%02d", branch, minor_digits)
+    return new_tag
+  end
+end
+
+branch = `fossil branch`.sub(/\A.*\* /m,'').sub(/\n.*\z/m,'')
+tag= get_next_tag(branch)
+
+puts "TODO: Write to megatest-version.scm:"
+puts ";; Always use two or four digit decimal
+;; 1.01, 1.02...1.10,1.11,1.1101 ... 1.99,2.00..
+
+(declare (unit megatest-version))
+
+(define megatest-version #{tag.sub(/^v/,'')})
+
+"
+
+puts "TODO: fossil tag add #{tag} #{branch}"
+puts ""

Index: ods.scm
==================================================================
--- ods.scm
+++ ods.scm
@@ -1,13 +1,22 @@
 ;; Copyright 2011, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
 
 (use csv-xml regex)
 (declare (unit ods))
 (declare (uses common))
 
@@ -197,11 +206,11 @@
 ;;   '( (sheet1 (r1c1 r1c2 r1c3 ...)
 ;;              (r2c1 r2c3 r2c3 ...) )
 ;;      (sheet2 ( ... )
 ;;              ( ... ) ) )
 (define (ods:list->ods path fname data)
-  (if (not (file-exists? path))
+  (if (not (common:file-exists? path))
       (print "ERROR: path to create ods data must pre-exist")
       (begin
 	(with-output-to-file (conc path "/content.xml")
 	  (lambda ()
 	    (ods:construct-dir path)

Index: oldsrc/debugger.scm
==================================================================
--- oldsrc/debugger.scm
+++ oldsrc/debugger.scm
@@ -1,5 +1,22 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 (use iup)
 
 (define *debugger-control* #f)
 (define *debugger-rownum*  0)
 (define *debugger-matrix*  #f)

Index: oldsrc/fs-transport.scm
==================================================================
--- oldsrc/fs-transport.scm
+++ oldsrc/fs-transport.scm
@@ -1,14 +1,23 @@
 
 ;; Copyright 2006-2012, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
 
 (require-extension (srfi 18) extras tcp s11n)
 
 (use sqlite3 srfi-1 posix regex regex-case srfi-69 hostinfo md5 message-digest)
 (import (prefix sqlite3 sqlite3:))

ADDED   oldsrc/multi-dboard.scm
Index: oldsrc/multi-dboard.scm
==================================================================
--- /dev/null
+++ oldsrc/multi-dboard.scm
@@ -0,0 +1,809 @@
+;;======================================================================
+;; Copyright 2006-2013, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;======================================================================
+
+(use format numbers sql-de-lite srfi-1 posix regex regex-case srfi-69 srfi-18 call-with-environment-variables)
+(require-library iup)
+(import (prefix iup iup:))
+(use canvas-draw)
+
+(declare (uses margs))
+(declare (uses megatest-version))
+(declare (uses gutils))
+(declare (uses tree))
+(declare (uses configf))
+(declare (uses portlogger))
+(declare (uses keys))
+(declare (uses common))
+
+(include "common_records.scm")
+;; (include "db_records.scm")
+;; (include "key_records.scm")
+
+(define help (conc 
+	      "Megatest Dashboard, documentation at http://www.kiatoa.com/fossils/megatest
+  version " megatest-version "
+  license GPL, Copyright (C) Matt Welland 2011
+
+Usage: dashboard [options]
+  -h                : this help
+  -group groupname  : display this group of areas
+  -test testid      : control test identified by testid
+  -guimonitor       : control panel for runs
+
+Misc
+  -rows N         : set number of rows
+"))
+
+;; process args
+(define remargs (args:get-args 
+		 (argv)
+		 (list  "-group" ;; display this group of areas
+			"-debug"
+			) 
+		 (list  "-h"
+			"-v"
+			"-q"
+			)
+		 args:arg-hash
+		 0))
+
+(if (args:get-arg "-h")
+    (begin
+      (print help)
+      (exit)))
+
+;; (if (args:get-arg "-host")
+;;     (begin
+;;       (set! (common:get-remote remote) (string-split (args:get-arg "-host" ":")))
+;;       (client:launch))
+;;     (client:launch))
+
+(define *runremote* #f)
+(define *windows* (make-hash-table))
+(define *changed-main* (make-hash-table)) ;; set path/... => #t
+(define *changed-mutex* (make-mutex))     ;; use for all incoming change requests
+(define *searchpatts*   (make-hash-table))
+
+(debug:setup)
+
+(define *tim* (iup:timer))
+(define *ord* #f)
+
+(iup:attribute-set! *tim* "TIME" 300)
+(iup:attribute-set! *tim* "RUN" "YES")
+
+(define (message-window msg)
+  (iup:show
+   (iup:dialog
+    (iup:vbox 
+     (iup:label msg #:margin "40x40")))))
+
+(define (iuplistbox-fill-list lb items . default)
+  (let ((i 1)
+	(selected-item (if (null? default) #f (car default))))
+    (iup:attribute-set! lb "VALUE" (if selected-item selected-item ""))
+    (for-each (lambda (item)
+		(iup:attribute-set! lb (number->string i) item)
+		(if selected-item
+		    (if (equal? selected-item item)
+			(iup:attribute-set! lb "VALUE" item))) ;; (number->string i))))
+		(set! i (+ i 1)))
+	      items)
+    i))
+
+(define (pad-list l n)(append l (make-list (- n (length l)))))
+
+
+(define (mkstr . x)
+  (string-intersperse (map conc x) ","))
+
+(define (update-search x val)
+  (hash-table-set! *searchpatts* x val))
+
+
+;;======================================================================
+;; R E C O R D S
+;;======================================================================
+
+;; NOTE: Consider switching to defstruct.
+
+;; data for an area (regression or testsuite)
+;;
+(define-record areadat
+  name               ;; area name
+  path               ;; mt run area home
+  configdat          ;; megatest config
+  denoise            ;; focal point for not putting out same messages over and over
+  client-signature   ;; key for client-server conversation
+  remote             ;; hash of all the client side connnections
+  run-keys           ;; target keys for this area
+  runs               ;; used in dashboard, hash of run-ids -> rundat
+  read-only          ;; can I write to this area?
+  monitordb          ;; db handle for monitor.db
+  maindb             ;; db handle for main.db
+  )
+
+;; rundat, basic run data
+;;
+(define-record rundat
+  id                 ;; the run-id
+  target             ;; val1/val2 ... corrosponding to run-keys in areadat
+  runname
+  state              ;; state of the run, symbol 
+  status             ;; status of the run, symbol
+  event-time         ;; when the run was initiated
+  tests              ;; hash of test-id -> testdat, QUESTION: separate by run-id?
+  db                 ;; db handle
+  )
+
+;; testdat, basic test data
+(define-record testdat
+  run-id             ;; what run is this from
+  id                 ;; test id
+  testname           ;; test name
+  itempath           ;; item path
+  state              ;; test state, symbol
+  status             ;; test status, symbol
+  event-time         ;; when the test started
+  duration           ;; how long the test took
+  )
+
+;; general data for the dboard application
+;;
+(define-record data
+  cfgdat             ;; data from ~/.megatest/.dat
+  areas              ;; hash of areaname -> area-rec
+  current-window-id  ;; 
+  current-tab-id     ;; 
+  update-needed      ;; flag to indicate that the tab pointed to by current tab id needs refreshing immediately
+  tabs               ;; hash of tab-id -> areaname (??) should be of type "tab"
+  )
+
+;; all the components of an area display, all fits into a tab but
+;; parts may be swapped in/out as needed
+;;
+(define-record tab
+  tree
+  matrix    ;; the spreadsheet 
+  areadat   ;; the one-structure (one day dbstruct will be put in here)
+  view-path ;; //...
+  view-type ;; standard, etc.
+  controls  ;; the controls
+  data      ;; all the data kept in sync with db
+  filters   ;; user filters, alist name -> filter record, eventually store these in ~/.megatest/.dat?
+  run-id    ;; the current run-id
+  test-ids  ;; the current test id hash, run-id => test-id
+  command   ;; the command from the entry field
+  headers   ;; hash of header  -> colnum
+  rows      ;; hash of rowname -> rownum
+  )
+
+(define-record filter
+  target    ;; hash of widgets for the target
+  runname   ;; the runname widget
+  testpatt  ;; the testpatt widget
+  )
+
+;;======================================================================
+;; D B
+;;======================================================================
+
+;; These are all using sql-de-lite and independent of area so cannot use stuff 
+;; from db.scm
+
+;; NB// run-id=#f => return dbdir only
+;;
+(define (areadb:dbfile-path areadat run-id)
+  (let* ((cfgdat  (areadat-configdat areadat))
+	 (dbdir   (or (configf:lookup cfgdat "setup" "dbdir")
+		      (conc (configf:lookup cfgdat "setup" "linktree") "/.db")))
+	 (fname   (if run-id
+		      (case run-id
+			((-1) "monitor.db")
+			((0) "main.db")
+			(else (conc run-id ".db")))
+		      #f)))
+    (handle-exceptions
+     exn
+     (begin
+       (debug:print-error 0 *default-log-port* "Couldn't create path to " dbdir)
+       (exit 1))
+     (if (not (directory? dbdir))(create-directory dbdir #t)))
+    (if fname
+	(conc dbdir "/" fname)
+	dbdir)))
+
+;; -1 => monitor.db
+;;  0 => main.db
+;; >1 => .db
+;;
+(define (areadb:open areadat run-id)
+  (let* ((runs   (areadat-runs areadat))
+	 (rundat (if (> run-id 0) ;; it is a run
+		     (hash-table-ref/default runs run-id #f)
+		     #f))
+	 (db     (case run-id ;; if already opened, get the db and return it
+		   ((-1) (areadat-monitordb areadat))
+		   ((0)  (areadat-maindb    areadat))
+		   (else (if rundat
+			     (rundat-db rundat)
+			     #f)))))
+    (if db
+	db ;; merely return the already opened db
+	(let* ((dbfile (areadb:dbfile-path areadat run-id)) ;; not already opened, so open it
+	       (db     (if (file-exists? dbfile)
+			   (open-database dbfile)
+			   (begin
+			     (debug:print-error 0 *default-log-port* "I was asked to open " dbfile ", but file does not exist or is not readable.")
+			     #f))))
+	  (case run-id
+	    ((-1)(areadat-monitordb-set! areadat db))
+	    ((0) (areadat-maindb-set!    areadat db))
+	    (else (rundat-db-set!        rundat  db)))
+	  db))))
+
+;; populate the areadat tests info, does NOT fill the tests data itself unless asked
+;;
+(define (areadb:populate-run-info areadat)
+  (let* ((runs   (or (areadat-runs areadat) (make-hash-table)))
+	 (keys   (areadat-run-keys areadat))
+	 (maindb (areadb:open areadat 0)))
+    (if maindb
+	(query (for-each-row (lambda (row)
+			       (let ((id  (list-ref row 0))
+				     (dat (apply make-rundat (append row (list #f #f))))) ;; add placeholders for tests and db
+				 (print row)
+				 (hash-table-set! runs id dat))))
+	       (sql maindb (conc "SELECT id,"
+				 (string-intersperse keys "||'/'||")
+				 ",runname,state,status,event_time FROM runs WHERE state != 'deleted';")))
+	(debug:print-error 0 *default-log-port* "no main.db found at "  (areadb:dbfile-path areadat 0)))
+    areadat))
+
+;; given an areadat and target/runname patt fill up runs data
+;;
+;; ?????/
+
+;; given a list of run-ids refresh/retrieve runs data into areadat
+;;
+(define (areadb:fill-tests areadat #!key (run-ids #f))
+  (let* ((runs   (or (areadat-runs areadat) (make-hash-table))))
+    (for-each
+     (lambda (run-id)
+       (let* ((rundat (hash-table-ref/default runs run-id #f))
+	      (tests  (if (and rundat
+			       (rundat-tests rundat)) ;; re-use existing hash table?
+			  (rundat-tests rundat)
+			  (let ((ht (make-hash-table)))
+			    (rundat-tests-set! rundat ht)
+			    ht)))
+	      (rundb  (areadb:open areadat run-id)))
+	 (query (for-each-row (lambda (row)
+				(let* ((id         (list-ref row 0))
+				       (testname   (list-ref row 1))
+				       (itempath   (list-ref row 2))
+				       (state      (list-ref row 3))
+				       (status     (list-ref row 4))
+				       (eventtim   (list-ref row 5))
+				       (duration   (list-ref row 6)))
+				  (hash-table-set! tests id
+						   (make-testdat run-id id testname itempath state status eventtim duration)))))
+		(sql rundb "SELECT id,testname,item_path,state,status,event_time,run_duration FROM tests WHERE state != 'DELETED';"))))
+     (or run-ids (hash-table-keys runs)))
+    areadat))
+    
+
+;; initialize and refresh data
+;;		
+(define (dboard:general-updater con port)
+  (for-each
+   (lambda (window-id)
+     ;; (print "Processing for window-id " window-id)
+     (let* ((window-dat     (hash-table-ref *windows* window-id))
+	    (areas          (data-areas     window-dat))
+	    ;; (keys           (areadat-run-keys area-dat))
+	    (tabs           (data-tabs      window-dat))
+	    (tab-ids        (hash-table-keys tabs))
+	    (current-tab    (if (null? tab-ids)
+				#f
+				(hash-table-ref tabs (car tab-ids))))
+	    (current-tree   (if (null? tab-ids) #f (tab-tree   current-tab)))
+	    (current-node   (if (null? tab-ids) 0  (string->number (iup:attribute current-tree "VALUE"))))
+	    (current-path   (if (eq? current-node 0)
+				"Areas"
+				(string-intersperse (tree:node->path current-tree current-node) "/")))
+	    (current-matrix (if (null? tab-ids) #f (tab-matrix current-tab)))
+	    (seen-nodes     (make-hash-table))
+	    (path-changed   (if current-tab
+				(equal? current-path (tab-view-path current-tab))
+				#t)))
+       ;; (debug:print-info 0 *default-log-port* "Current path: " current-path)
+       ;; now for each area in the window gather the data
+       (if path-changed
+	   (begin
+	     (debug:print-info 0 *default-log-port* "clearing matrix - path changed")
+	     (dboard:clear-matrix current-tab)))
+       (for-each
+	(lambda (area-name)
+	  ;; (print "Processing for area-name " area-name)
+	  (let* ((area-dat  (hash-table-ref areas area-name))
+		 (area-path (areadat-path   area-dat))
+		 (runs      (areadat-runs   area-dat)))
+	    (if (hash-table-ref/default *changed-main* area-path 'processed)
+		(begin
+		  (print "Processing " area-dat " for area-name " area-name)
+		  (hash-table-set! *changed-main* area-path #f)
+		  (areadb:populate-run-info area-dat)
+		  (for-each 
+		   (lambda (run-id)
+		     (let* ((run     (hash-table-ref runs run-id))
+			    (target  (rundat-target run))
+			    (runname (rundat-runname run)))
+		       (if current-tree
+			   (let* ((partial-path (append (string-split target "/")(list runname)))
+				  (full-path    (cons area-name partial-path)))
+			     (if (not (hash-table-exists? seen-nodes full-path))
+				 (begin
+				   (print "INFO: Adding node " partial-path " to section " area-name)
+				   (tree:add-node current-tree "Areas" full-path)
+				   (areadb:fill-tests area-dat run-ids: (list run-id))))
+				   (hash-table-set! seen-nodes full-path #t)))))
+		   (hash-table-keys runs))))
+	    (if (or (equal? "Areas" current-path)
+		    (string-match (conc "^Areas/" area-name "(|\\/.*)$") current-path))
+		(dboard:redraw-area area-name area-dat current-tab current-matrix current-path))))
+	(hash-table-keys areas))))
+   (hash-table-keys *windows*)))
+
+;;======================================================================
+;; D A S H B O A R D   D B 
+;;======================================================================
+
+;; All moved to common.scm		
+
+;;======================================================================
+;; T R E E 
+;;======================================================================
+
+;;  -  -  -  - 
+
+(define (dashboard:tree-browser data adat window-id)
+  ;; (iup:split
+  (let* ((tb      (iup:treebox
+		   #:value 0
+		   #:title "Areas"
+		   #:expand "YES"
+		   #:addexpanded "NO"
+		   #:selection-cb
+		   (lambda (obj id state)
+		     ;; (print "obj: " obj ", id: " id ", state: " state)
+		     (let* ((tree-path (tree:node->path obj id))
+			    (area      (car tree-path))
+			    (areadat-path (cdr tree-path)))
+		       #f
+		       ;; (test-id  (tree-path->test-id (cdr run-path))))
+		       ;; (if test-id
+		       ;;    (hash-table-set! (dboard:data-curr-test-ids *data*)
+		       ;;		     window-id test-id))
+		       ;; (print "path: " (tree:node->path obj id) " test-id: " test-id))))))
+		       )))))
+    ;; (iup:attribute-set! tb "VALUE" "0")
+    ;; (iup:attribute-set! tb "NAME" "Runs")
+    ;; (iup:attribute-set! tb "ADDEXPANDED" "NO")
+    ;; (dboard:data-tests-tree-set! *data* tb)
+    tb))
+
+;;======================================================================
+;; M A I N   M A T R I X
+;;======================================================================
+
+;; General displayer
+;;
+(define (dashboard:main-matrix data adat window-id)
+  (let* (;; (tab-dat         (areadat-
+	 (view-matrix     (iup:matrix
+			   ;; (runs-for-targ (db:get-runs-by-patt *dbstruct-local* *keys* "%" target #f #f #f))
+			   #:expand "YES"
+			   ;; #:fittosize "YES"
+			   #:resizematrix "YES"
+			   #:scrollbar "YES"
+			   #:numcol 100
+			   #:numlin 100
+			   #:numcol-visible 3
+			   #:numlin-visible 20
+			   #:click-cb (lambda (obj lin col status)
+					(print "obj: " obj " lin: " lin " col: " col " status: " status " value: " (iup:attribute obj "VALUE"))))))
+    
+    ;; (iup:attribute-set! view-matrix "RESIZEMATRIX" "YES")
+    (iup:attribute-set! view-matrix "WIDTH0" "100")
+    ;; (dboard:data-runs-matrix-set! *data* runs-matrix)
+    ;; (iup:hbox
+    ;;  (iup:frame 
+    ;;   #:title "Runs browser"
+    ;;   (iup:vbox
+    view-matrix))
+
+;;======================================================================
+;; A R E A S
+;;======================================================================
+
+(define (dashboard:init-area data area-name apath)
+  (let* ((mtconf      (dboard:read-mtconf apath))
+	 (area-dat    (let ((ad (make-areadat
+				 area-name ;; area name
+				 apath     ;; path to area
+				 ;; 'http     ;; transport
+				 mtconf    ;; megatest.config
+				 (make-hash-table) ;; denoise hash
+				 #f        ;; client-signature
+				 #f        ;; remote connections
+				 (keys:config-get-fields mtconf) ;; run keys
+				 (make-hash-table) ;; run-id -> (hash of test-ids => dat)
+				 (and (file-exists? apath)(file-write-access? apath)) ;; read-only
+				 #f
+				 #f
+				 )))
+			(hash-table-set! (data-areas data) area-name ad)
+			ad)))
+    area-dat))
+
+;; given the keys for an area and a path from the tree browser
+;; return the level: areas area runs run tests test
+;;
+(define (dboard:get-view-type keys current-path)
+  (let* ((path-parts (string-split current-path "/"))
+	 (path-len   (length path-parts)))
+    (cond
+     ((equal? current-path "Areas")     'areas)
+     ((eq? path-len 2)                  'area)
+     ((<= (+ (length keys) 2) path-len) 'runs)
+     (else                              'run))))
+
+(define (dboard:clear-matrix tab)
+  (if tab
+      (begin
+	(iup:attribute-set! (tab-matrix tab) "CLEARVALUE" "ALL")
+	(tab-headers-set! tab (make-hash-table))
+	(tab-rows-set!    tab (make-hash-table)))))
+
+;; full redraw of a given area
+;;
+(define (dboard:redraw-area area-name area-dat tab-dat current-matrix current-path)
+  (let* ((keys      (areadat-run-keys area-dat))
+	 (runs      (areadat-runs     area-dat))
+	 (headers   (tab-headers   tab-dat))
+	 (rows      (tab-rows      tab-dat))
+	 (used-cols (hash-table-values headers))
+	 (used-rows (hash-table-values rows))
+	 (touched   (make-hash-table)) ;; (vector row col) ==> true, touched cell
+	 (view-type (dboard:get-view-type keys current-path))
+	 (changed   #f)
+	 (state-statuses  (list "PASS" "FAIL" "WARN" "CHECK" "SKIP" "RUNNING" "LAUNCHED")))
+    ;; (debug:print 0 *default-log-port* "current-matrix=" current-matrix)
+    (case view-type
+      ((areas) ;; find row for this area, if not found, create new entry
+       (let* ((curr-rownum (hash-table-ref/default rows area-name #f))
+	      (next-rownum (+ (apply max (cons 0 used-rows)) 1))
+	      (rownum      (or curr-rownum next-rownum))
+	      (coord       (conc rownum ":0")))
+	 (if (not curr-rownum)(hash-table-set! rows area-name rownum))
+	 (if (not (equal? (iup:attribute current-matrix coord) area-name))
+	     (begin
+	       (let loop ((hed  (car state-statuses))
+			  (tal  (cdr state-statuses))
+			  (count 1))
+		 (if (not (equal? (iup:attribute current-matrix (conc "0:" count)) hed))
+		     (iup:attribute-set! current-matrix (conc "0:" count) hed))
+		 (iup:attribute-set! current-matrix (conc rownum ":" count) "0")
+		 (if (not (null? tal))
+		     (loop (car tal)(cdr tal)(+ count 1))))
+	       (debug:print-info 0 *default-log-port* "view-type=" view-type ", rownum=" rownum ", curr-rownum=" curr-rownum ", next-rownum=" next-rownum ", coord=" coord ", area-name=" area-name)
+	       (iup:attribute-set! current-matrix coord area-name)
+	       (set! changed #t))))))
+    (if changed (iup:attribute-set! current-matrix "REDRAW" "ALL"))))
+	     
+
+       
+   ;; (dboard:clear-matrix current-matrix used-cols used-rows touched) ;; clear all
+    
+	
+  
+;;======================================================================
+;; D A S H B O A R D
+;;======================================================================
+
+(define (dashboard:area-panel aname data window-id)
+  (let* ((apath      (configf:lookup (data-cfgdat data) aname "path")) ;;  (hash-table-ref (dboard:data-cfgdat data) area-name))
+	 ;;          (hash-table-ref (dboard:data-cfgdat data) aname))
+	 (area-dat   (dashboard:init-area data aname apath))
+	 (tb         (dashboard:tree-browser data area-dat window-id)) ;; (dboard:areas-tree-browser data)
+	 (ad         (dashboard:main-matrix  data area-dat window-id))
+	 (areas      (data-areas data))
+	 (dboard-dat (make-tab
+		      #f           ;; tree
+		      #f           ;; matrix
+		      area-dat     ;;
+		      #f           ;; view path
+		      'default     ;; view type
+		      #f           ;; controls
+		      (make-hash-table) ;; cached data? not sure how to use this yet :)
+		      #f           ;; filters
+		      #f           ;; the run-id
+		      (make-hash-table) ;; run-id -> test-id, for current test id
+		      ""
+		      (make-hash-table) ;; headername -> colnum
+		      (make-hash-table) ;; rowname    -> rownum
+		      )))
+    (hash-table-set! (data-areas data) aname area-dat) ;; dboard-dat)
+    (hash-table-set! (data-tabs data) window-id dboard-dat)
+    (tab-tree-set!   dboard-dat tb)
+    (tab-matrix-set! dboard-dat ad)
+    (iup:split
+     #:value 200
+     tb ad)))
+
+
+;; Main Panel
+;;
+(define (dashboard:main-panel data window-id)
+  (iup:dialog
+   #:title "Megatest Control Panel"
+;;   #:menu (dcommon:main-menu data)
+   #:shrink "YES"
+   (iup:vbox
+    (let* ((area-names  (hash-table-keys (data-cfgdat data)))
+	   (area-panels (map (lambda (aname)
+			       (dashboard:area-panel aname data window-id))
+			     area-names))
+	   (tabtop      (apply iup:tabs  
+			       #:tabchangepos-cb (lambda (obj curr prev)
+						   (data-current-tab-id-set! data curr)
+						   (data-update-needed-set!  data #t)
+						   (print "Tab is: " curr ", prev was " prev))
+			       area-panels))
+	   (tabs     (data-tabs data)))
+      (if (not (null? area-names))
+	  (let loop ((index 0)
+		     (hed   (car area-names))
+		     (tal   (cdr area-names)))
+	    ;; (hash-table-set! tabs index hed)
+	    (debug:print 0 *default-log-port* "Adding area " hed " with index " index " to dashboard")
+	    (iup:attribute-set! tabtop (conc "TABTITLE" index) hed)
+	    (if (not (null? tal))
+		(loop (+ index 1)(car tal)(cdr tal)))))
+      tabtop))))
+
+
+;;======================================================================
+;; N A N O M S G   S E R V E R
+;;======================================================================
+
+(define (dboard:server-service soc port)
+  (print "server starting")
+  (let loop ((msg-in (nn-recv soc))
+	     (count  0))
+    (if (eq? 0 (modulo count 1000))
+	(print "server received: " msg-in ", count=" count))
+    (cond
+     ;;
+     ;; quit
+     ;;
+     ((equal? msg-in "quit")
+      (nn-send soc "Ok, quitting"))
+     ;;
+     ;; ping
+     ;;
+     ((and (>= (string-length msg-in) 4)
+	   (equal? (substring msg-in 0 4) "ping"))
+      (nn-send soc (conc (current-process-id)))
+      (loop (nn-recv soc)(+ count 1)))
+     ;;
+     ;; main changed
+     ;;
+     ((and (>= (string-length msg-in) 4)
+	   (equal? (substring msg-in 0 4) "main"))
+      (let ((parts (string-split msg-in " ")))
+	(hash-table-set! *changed-main* (cadr parts) #t)
+	(nn-send soc "got it!")))
+     ;;
+     ;; ??
+     ;;
+     (else
+      (nn-send soc "hello " msg-in " you got to the else clause!")))
+    (loop (nn-recv soc)(if (> count 20000000)
+			   0
+			   (+ count 1)))))
+
+(define (dboard:one-time-ping-receive soc port)
+  (let ((msg-in (nn-recv soc)))
+    (if (and (>= (string-length msg-in) 4)
+	     (equal? (substring msg-in 0 4) "ping"))
+	(nn-send soc (conc (current-process-id))))))
+
+(define (dboard:server-start given-port #!key (num-tries 200))
+  (let* ((rep (nn-socket 'rep))
+	 (port (or given-port  (portlogger:main "find")))
+	 (con (conc "tcp://*:" port)))
+    ;; register this connect here ....
+    (nn-bind rep con)
+    (thread-start! 
+     (make-thread (lambda ()
+		    (dboard:one-time-ping-receive rep port))
+		  "one time receive thread"))
+    (if (dboard:ping-self "localhost" port)
+	(begin
+	  (print "INFO: dashboard nanomsg server started on " port)
+	  (values rep port))
+	(begin
+	  (print "WARNING: couldn't create server on port " port)
+	  (portlogger:main "set" "failed")
+	  (if (> num-tries 0)
+	      (dboard:server-start #f (- num-tries 1))
+	      (begin
+		(print "ERROR: failed to start nanomsg server")
+		(values #f #f)))))))
+
+(define (dboard:server-close con port)
+  (nn-close con)
+  (portlogger:main "set" port "released"))
+
+(define (dboard:ping-self host port #!key (return-socket #t))
+  ;; send a random number along with pid and check that we get it back
+  (let* ((req     (nn-socket 'req))
+	 (key     "ping")
+	 (success #f)
+	 (keepwaiting #t)
+	 (ping    (make-thread
+		   (lambda ()
+		     (print "ping: sending string \"" key "\", expecting " (current-process-id))
+		     (nn-send req key)
+		     (let ((result  (nn-recv req)))
+		       (if (equal? (conc (current-process-id)) result)
+			   (begin
+			     (print "ping, success: received \"" result "\"")
+			     (set! success #t))
+			   (begin
+			     (print "ping, failed: received key \"" result "\"")
+			     (set! keepwaiting #f)
+			     (set! success #f)))))
+		   "ping"))
+	 (timeout (make-thread (lambda ()
+				 (let loop ((count 0))
+				   (thread-sleep! 1)
+				   (print "still waiting after " count " seconds...")
+				   (if (and keepwaiting (< count 10))
+				       (loop (+ count 1))))
+				 (if keepwaiting
+				     (begin
+				       (print "timeout waiting for ping")
+				       (thread-terminate! ping))))
+			       "timeout")))
+    (nn-connect req (conc "tcp://" host ":" port))
+    (handle-exceptions
+     exn
+     (begin
+       (print-call-chain)
+       (print 0 " message: " ((condition-property-accessor 'exn 'message) exn))
+       (print "exn=" (condition->list exn))
+       (print "ping failed to connect to " host ":" port))
+     (thread-start! timeout)
+     (thread-start! ping)
+     (thread-join! ping)
+     (if success (thread-terminate! timeout)))
+    (if return-socket
+	(if success req #f)
+	(begin
+	  (nn-close req)
+	  success))))
+
+;;======================================================================
+;; C O N F I G U R A T I O N 
+;;======================================================================
+
+;; Get the configuration file for a group name, if the group name is "default" and it doesn't 
+;; exist, create it and add the current path if it contains megatest.config
+;;
+(define (dboard:get-config group-name)
+  (let* ((fname (conc (getenv "HOME") "/.megatest/" group-name ".dat")))
+    (if (file-exists? fname)
+	(read-config fname (make-hash-table) #t)
+	(if (dboard:create-config fname)
+	    (dboard:get-config group-name)
+	    (make-hash-table)))))
+
+(define (dboard:create-config fname)
+  ;; (handle-exceptions
+  ;;  exn
+  ;;  
+  ;;  #f ;; failed to create - just give up
+   (let* ((dirname       (pathname-directory fname))
+	  (file-name     (pathname-strip-directory fname))
+	  (curr-mtcfgdat (find-config "megatest.config"
+				      toppath: (or (get-environment-variable "MT_RUN_AREA_HOME")(current-directory))))
+	  (curr-mtcfg    (if (and curr-mtcfgdat (not (null? curr-mtcfgdat)))(cadr curr-mtcfgdat) #f))
+	  (curr-mtpath   (if curr-mtcfg (car curr-mtcfgdat) #f)))
+     (if curr-mtpath
+	 (begin
+	   (debug:print-info 0 *default-log-port* "Creating config file " fname)
+	   (if (not (file-exists? dirname))
+	       (create-directory dirname #t))
+	   (with-output-to-file fname
+	     (lambda ()
+	       (let ((aname (pathname-strip-directory curr-mtpath)))
+		 (print "[" aname "]")
+		 (print  "path " curr-mtpath))))
+	   #t)
+	 (begin
+	   (debug:print-info 0 *default-log-port* "Need to create a config but no megatest.config found: " curr-mtcfgdat)
+	   #f))))
+;; )
+
+(define (dboard:read-mtconf apath)
+  (let* ((mtconffile  (conc apath "/megatest.config")))
+    (call-with-environment-variables
+     (list (cons "MT_RUN_AREA_HOME" apath))
+     (lambda ()
+       (read-config mtconffile (make-hash-table) #f)) ;; megatest.config
+     )))
+	 
+
+;;======================================================================
+;; G U I   S T U F F 
+;;======================================================================
+
+;;; main. Theoretically could have multiple windows (each with a group of tags, thus window-id
+;;;
+(define (dboard:make-window window-id)
+  (let* (;; (window-id 0)
+	 (groupn    (or (args:get-arg "-group") "default"))
+	 (cfgdat    (dboard:get-config groupn))
+	 ;; (cfgdat    (if (file-exists? cfname)(read-config cfname (make-hash-table) #t)(make-hash-table)))
+	 (data      (make-data
+		     cfgdat ;; this is the data from ~/.megatest for the selected group
+		     (make-hash-table) ;; areaname -> area-rec
+		     0                 ;; current window id
+		     0                 ;; current tab id
+		     #f                ;; redraw needed for current tab id
+		     (make-hash-table) ;; tab-id -> areaname
+		     )))
+    (hash-table-set! *windows* window-id data)
+    (iup:show (dashboard:main-panel data window-id))
+    (iup:main-loop)))
+
+;; ease debugging by loading ~/.dashboardrc
+(let ((debugcontrolf (conc (get-environment-variable "HOME") "/.dashboardrc")))
+  (if (file-exists? debugcontrolf)
+      (load debugcontrolf)))
+
+(define (main)
+  (let-values 
+      (((con port)(dboard:server-start #f)))
+    (let ((portnum   (if (string? port)(string->number port) port)))
+      ;; got here, monitor/dashboard was started
+      (mddb:register-dashboard portnum)
+      (thread-start! (make-thread (lambda ()(dboard:server-service con portnum)) "server service"))
+      (thread-start! (make-thread (lambda ()
+				    (let loop ()
+				      (dboard:general-updater con portnum)
+				      (thread-sleep! 1)
+				      (loop))) "general updater"))
+      (dboard:make-window 0)
+      (mddb:unregister-dashboard (get-host-name) portnum)
+      (dboard:server-close con port))))
+

Index: oldsrc/newdashboard.scm
==================================================================
--- oldsrc/newdashboard.scm
+++ oldsrc/newdashboard.scm
@@ -1,14 +1,23 @@
 ;;======================================================================
 ;; Copyright 2006-2013, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
 ;;======================================================================
 
 (use format numbers)
 (require-library iup)
 (import (prefix iup iup:))

ADDED   oldsrc/nmsg-transport.scm
Index: oldsrc/nmsg-transport.scm
==================================================================
--- /dev/null
+++ oldsrc/nmsg-transport.scm
@@ -0,0 +1,367 @@
+
+;; Copyright 2006-2012, Matthew Welland.
+
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
+
+(require-extension (srfi 18) extras tcp s11n)
+
+(use sqlite3 srfi-1 posix regex regex-case srfi-69 hostinfo md5 message-digest)
+(import (prefix sqlite3 sqlite3:))
+
+;; (use nanomsg)
+
+(declare (unit nmsg-transport))
+
+(declare (uses common))
+(declare (uses db))
+(declare (uses tests))
+(declare (uses tasks)) ;; tasks are where stuff is maintained about what is running.
+(declare (uses server))
+
+(include "common_records.scm")
+(include "db_records.scm")
+
+;; Transition to pub --> sub with pull <-- push
+;;
+;;   1. client sends request to server via push to the pull port
+;;   2. server puts request in queue or processes immediately as appropriate
+;;   3. server puts responses from completed requests into pub port 
+;;
+;; TODO
+;;
+;; Done Tested
+;; [x]  [ ]    1. Add columns pullport pubport to servers table
+;; [x]  [ ]    2. Add rm of monitor.db if older than 11/12/2012 
+;; [x]  [ ]    3. Add create of pullport and pubport with finding of available ports
+;; [x]  [ ]    4. Add client compose of request
+;; [x]  [ ]        - name of client: testname/itempath-test_id-hostname 
+;; [x]  [ ]        - name of request: callname, params
+;; [x]  [ ]        - request key: f(clientname, callname, params)
+;; [x]  [ ]    5. Add processing of subscription hits
+;; [x]  [ ]        - done when get key 
+;; [x]  [ ]        - return results
+;; [x]  [ ]    6. Add timeout processing
+;; [x]  [ ]        - after 60 seconds
+;; [ ]  [ ]            i. check server alive, connect to new if necessary
+;; [ ]  [ ]           ii. resend request
+;; [ ]  [ ]    7. Turn self ping back on
+
+(define (nmsg-transport:make-server-url hostport #!key (bindall #f))
+  (if (not hostport)
+      #f
+      (conc "tcp://" (if bindall "*" (car hostport)) ":" (cadr hostport))))
+
+(define *server-loop-heart-beat* (current-seconds))
+(define *heartbeat-mutex* (make-mutex))
+
+;;======================================================================
+;; S E R V E R
+;;======================================================================
+
+(define (nmsg-transport:run dbstruct hostn run-id server-id #!key (retrynum 1000))
+  (debug:print 2 *default-log-port* "Attempting to start the server ...")
+  (let* ((start-port      (portlogger:open-run-close portlogger:find-port))
+	 (server-thread   (make-thread (lambda ()
+					 (nmsg-transport:try-start-server dbstruct run-id start-port server-id))
+				       "server thread"))
+	 (tdbdat          (tasks:open-db)))
+    (thread-start! server-thread)
+    (thread-sleep! 0.1)
+    (if (nmsg-transport:ping hostn start-port timeout: 2 expected-key: (current-process-id))
+	(let ((interface (if (equal? hostn "-")(get-host-name) hostn)))
+	  (tasks:server-set-interface-port (db:delay-if-busy tdbdat) server-id interface start-port)
+	  (tasks:server-set-state! (db:delay-if-busy tdbdat) server-id "dbprep")
+	  (set! *server-info* (list hostn start-port)) ;; probably not needed anymore? currently used by keep-running
+	  (thread-sleep! 3) ;; give some margin for queries to complete before switching from file based access to server based access
+	  ;; (set! *inmemdb*  dbstruct)
+	  (tasks:server-set-state! (db:delay-if-busy tdbdat) server-id "running")
+	  (thread-start! (make-thread
+			  (lambda ()(nmsg-transport:keep-running server-id run-id))
+			  "keep running"))
+	  (thread-join! server-thread))
+	(if (> retrynum 0)
+	    (begin
+	      (debug:print 0 *default-log-port* "WARNING: Failed to connect to server (self) on host " hostn ":" start-port ", trying again.")
+	      (tasks:server-delete-record (db:delay-if-busy tdbdat) server-id "failed to start, never received server alive signature")
+	      (portlogger:open-run-close portlogger:set-failed start-port)
+	      (nmsg-transport:run dbstruct hostn run-id server-id))
+	    (begin
+	      (debug:print-error 0 *default-log-port* "could not find an open port to start server on. Giving up")
+	      (exit 1))))))
+
+(define (nmsg-transport:try-start-server dbstruct run-id portnum server-id)
+  (let ((repsoc (nn-socket 'rep)))
+    (nn-bind repsoc (conc "tcp://*:" portnum))
+    (let loop ((msg-in (nn-recv repsoc)))
+      (let* ((dat    (db:string->obj msg-in transport: 'nmsg)))
+	(debug:print 0 *default-log-port* "server, received: " dat)
+	(let ((result (api:execute-requests dbstruct dat)))
+	  (debug:print 0 *default-log-port* "server, sending: " result)
+	  (nn-send repsoc (db:obj->string result  transport: 'nmsg)))
+	(loop (nn-recv repsoc))))))
+
+;; all routes though here end in exit ...
+;;
+(define (nmsg-transport:launch run-id)
+  (let* ((tdbdat   (tasks:open-db))
+	 (dbstruct (db:setup run-id))
+	 (hostn    (or (args:get-arg "-server") "-")))
+    (set! *run-id*   run-id)
+    (set! *inmemdb* dbstruct)
+    ;; with nbfake daemonize isn't really needed
+    ;;
+    ;; (if (args:get-arg "-daemonize")
+    ;;     (begin
+    ;;       (daemon:ize)
+    ;;       (if *alt-log-file* ;; we should re-connect to this port, I think daemon:ize disrupts it
+    ;;           (begin
+    ;;     	(current-error-port *alt-log-file*)
+    ;;     	(current-output-port *alt-log-file*)))))
+    (if (server:check-if-running run-id)
+	(begin
+	  (debug:print-info 0 *default-log-port* "Server for run-id " run-id " already running")
+	  (exit 0)))
+    (let loop ((server-id (tasks:server-lock-slot (db:delay-if-busy tdbdat) run-id))
+	       (remtries  4))
+      (if (not server-id)
+	  (if (> remtries 0)
+	      (begin
+		(thread-sleep! 2)
+		(if (not (server:check-if-running run-id))
+		    (loop (tasks:server-lock-slot (db:delay-if-busy tdbdat) run-id)
+			  (- remtries 1))
+		    (begin
+		      (debug:print-info 0 *default-log-port* "Another server took the slot, exiting")
+		      (exit 0))))
+	      (begin
+		;; since we didn't get the server lock we are going to clean up and bail out
+		(debug:print-info 2 *default-log-port* "INFO: server pid=" (current-process-id) ", hostname=" (get-host-name) " not starting due to other candidates ahead in start queue")
+		(tasks:server-delete-records-for-this-pid (db:delay-if-busy tdbdat) " http-transport:launch")
+		))
+	  ;; locked in a server id, try to start up
+	  (nmsg-transport:run dbstruct hostn run-id server-id))
+      (set! *didsomething* #t)
+      (exit))))
+
+;;======================================================================
+;; S E R V E R   U T I L I T I E S 
+;;======================================================================
+
+(define (nmsg-transport:mk-signature)
+  (message-digest-string (md5-primitive) 
+			 (with-output-to-string
+			   (lambda ()
+			     (write (list (current-directory)
+					  (argv)))))))
+
+;;======================================================================
+;; C L I E N T S
+;;======================================================================
+
+;; ping the server at host:port
+;;   return the open socket if successful (return-socket == #t)
+;;   expect the key expected-key returned in payload
+;;   send our-key or #f as payload
+;;
+(define (nmsg-transport:ping hostn port #!key (timeout 3)(return-socket #t)(expected-key #f)(our-key #f)(socket #f))
+  ;; send a random number along with pid and check that we get it back
+  (let* ((host    (if (or (not hostn)
+			  (equal? hostn "-")) ;; use localhost
+		      (get-host-name)
+		      hostn))
+	 (req     (or socket
+		      (let ((soc (nn-socket 'req)))
+			(nn-connect soc (conc "tcp://" host ":" port))
+			soc)))
+	 (success #t)
+	 (dat     (vector "ping" our-key))
+	 (result  (condition-case 
+		   (nmsg-transport:client-api-send-receive-raw req dat timeout: timeout)
+		   ((timeout)(set! success #f) #f)))
+	 (key     (if success 
+		      (vector-ref result 1)
+		      #f)))
+    (debug:print 0 *default-log-port* "success=" success ", key=" key ", expected-key=" expected-key ", equal? " (equal? key expected-key))
+    (if (and success
+	     (or (not expected-key) ;; just getting a reply is good enough then
+		 (equal? key expected-key)))
+	(if return-socket
+	    req
+	    (begin
+	      (if (not socket)(nn-close req)) ;; don't want a side effect of closing socket if handed it
+	      #t))
+	(begin
+	  (if (not socket)(nn-close req)) ;; failed to ping, close socket as side effect
+	  #f))))
+
+;; send data to server, wait max of timeout seconds for a response.
+;; return #( success/fail result )
+;;
+;; for effiency it is easier to do the obj->string and string->obj here.
+;;
+(define (nmsg-transport:client-api-send-receive-raw socreq indat #!key (enable-send #t)(timeout 25))
+  (let* ((success     #f)
+	 (result      #f)
+	 (keepwaiting #t)
+	 (dat         (db:obj->string indat transport: 'nmsg))
+	 (send-recv   (make-thread
+		       (lambda ()
+			 (nn-send socreq dat)
+			 (let* ((res (nn-recv socreq)))
+			   (set! success #t)
+			   (set! result (db:string->obj res transport: 'nmsg))))
+		       "send-recv"))
+	 (timeout     (make-thread
+		       (lambda ()
+			 (let loop ((count 0))
+			   (thread-sleep! 1)
+			   (debug:print-info 1 *default-log-port* "send-receive-raw, still waiting after " count " seconds...")
+			   (if (and keepwaiting (< count timeout)) ;; yes, this is very aproximate
+			       (loop (+ count 1))))
+			 (if keepwaiting
+			     (begin
+			       (print "timeout waiting for ping")
+			       (thread-terminate! send-recv))))
+		       "timeout")))
+    ;; replace with condition-case?
+    (handle-exceptions
+     exn
+     (set! result "timeout")
+     (thread-start! timeout)
+     (thread-start! send-recv)
+     (thread-join! send-recv)
+     (if success (thread-terminate! timeout)))
+    ;; raise timeout error if timed out
+    (if success
+	(if (and (vector? result)
+		 (vector-ref result 0)) ;; did it fail at the server?
+	    result                ;; nope, all good
+	    (begin
+	      (debug:print-error 0 *default-log-port* "error occured at server, info=" (vector-ref result 2))
+	      (debug:print 0 *default-log-port* " client call chain:")
+	      (print-call-chain (current-error-port))
+	      (debug:print 0 *default-log-port* " server call chain:")
+	      (pp (vector-ref result 1) (current-error-port))
+	      (signal (vector-ref result 0))))
+	(signal (make-composite-condition
+		 (make-property-condition 'timeout 'message "nmsg-transport:client-api-send-receive-raw timed out talking to server"))))))
+
+;; run nmsg-transport:keep-running in a parallel thread to monitor that the db is being 
+;; used and to shutdown after sometime if it is not.
+;;
+(define (nmsg-transport:keep-running server-id run-id)
+  ;; if none running or if > 20 seconds since 
+  ;; server last used then start shutdown
+  ;; This thread waits for the server to come alive
+  (let* ((server-info (let loop ()
+                        (let ((sdat #f))
+                          (mutex-lock! *heartbeat-mutex*)
+                          (set! sdat *server-info*)
+                          (mutex-unlock! *heartbeat-mutex*)
+                          (if sdat 
+			      (begin
+				(debug:print-info 0 *default-log-port* "keep-running got sdat=" sdat)
+				sdat)
+                              (begin
+                                (thread-sleep! 0.5)
+                                (loop))))))
+         (iface       (car server-info))
+         (port        (cadr server-info))
+         (last-access 0)
+	 (tdbdat      (tasks:open-db))
+	 (server-timeout (let ((tmo (configf:lookup  *configdat* "server" "timeout")))
+			   (if (and (string? tmo)
+				    (string->number tmo))
+			       (* 60 60 (string->number tmo))
+			       ;; (* 3 24 60 60) ;; default to three days
+			       (* 60 1)         ;; default to one minute
+			       ;; (* 60 60 25)      ;; default to 25 hours
+			       ))))
+    (print "Keep-running got server pid " server-id ", using iface " iface " and port " port)
+    (let loop ((count 0))
+      (thread-sleep! 4) ;; no need to do this very often
+      ;; NB// sync currently does NOT return queue-length
+      (let () ;; (queue-len (cdb:client-call server-info 'sync #t 1)))
+      ;; (print "Server running, count is " count)
+        (if (< count 1) ;; 3x3 = 9 secs aprox
+            (loop (+ count 1)))
+        
+        (mutex-lock! *heartbeat-mutex*)
+        (set! last-access *last-db-access*)
+        (mutex-unlock! *heartbeat-mutex*)
+	(db:sync-touched *inmemdb* run-id force-sync: #t)
+        (if (and *server-run*
+	       (> (+ last-access server-timeout)
+		  (current-seconds)))
+            (begin
+              (debug:print-info 0 *default-log-port* "Server continuing, seconds since last db access: " (- (current-seconds) last-access))
+              (loop 0))
+            (begin
+              (debug:print-info 0 *default-log-port* "Starting to shutdown the server.")
+              (set! *time-to-exit* #t)
+	      (db:sync-touched *inmemdb* run-id force-sync: #t)
+              (tasks:server-delete-record (db:delay-if-busy tdbdat) server-id " http-transport:keep-running")
+              (debug:print-info 0 *default-log-port* "Server shutdown complete. Exiting")
+              (exit)
+	      ))))))
+
+;;======================================================================
+;; C L I E N T S
+;;======================================================================
+
+(define (nmsg-transport:client-connect iface portnum)
+  (let* ((reqsoc      (nmsg-transport:ping iface portnum return-socket: #t)))
+    (vector iface portnum #f #f #f (current-seconds) reqsoc)))
+
+;; returns result, there is no sucess/fail flag - handled via excpections
+;;
+(define (nmsg-transport:client-api-send-receive run-id connection-info cmd param #!key (remtries 5))
+  ;; NB// In the html version of this routine there is a call to 
+  ;;      tasks:kill-server-run-id when there is an exception
+  (mutex-lock! *http-mutex*)
+  (let* ((packet  (vector cmd param))
+	 (reqsoc  (http-transport:server-dat-get-socket connection-info))
+	 (res     (nmsg-transport:client-api-send-receive-raw reqsoc packet)))
+;;	 (status  (vector-ref rawres 0))
+;;	 (result  (vector-ref rawres 1)))
+    (mutex-unlock! *http-mutex*)
+    res)) ;; (vector status (if status (db:string->obj result transport: 'nmsg) result))))
+	
+;;======================================================================
+;; J U N K 
+;;======================================================================
+
+;; DO NOT USE
+;;
+(define (nmsg-transport:client-signal-handler signum)
+  (handle-exceptions
+   exn
+   (debug:print 0 *default-log-port* " ... exiting ...")
+   (let ((th1 (make-thread (lambda ()
+			     (if (not *received-response*)
+				 (receive-message* *runremote*))) ;; flush out last call if applicable
+			   "eat response"))
+	 (th2 (make-thread (lambda ()
+			     (debug:print-error 0 *default-log-port* "Received ^C, attempting clean exit. Please be patient and wait a few seconds before hitting ^C again.")
+			     (thread-sleep! 3) ;; give the flush three seconds to do it's stuff
+			     (debug:print 0 *default-log-port* "       Done.")
+			     (exit 4))
+			   "exit on ^C timer")))
+     (thread-start! th2)
+     (thread-start! th1)
+     (thread-join! th2))))
+

Index: oldsrc/zmq-transport.scm
==================================================================
--- oldsrc/zmq-transport.scm
+++ oldsrc/zmq-transport.scm
@@ -1,14 +1,23 @@
 ;;======================================================================
 ;; Copyright 2006-2012, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
 ;;======================================================================
 
 (require-extension (srfi 18) extras tcp s11n)
 
 (use sqlite3 srfi-1 posix regex regex-case srfi-69 hostinfo md5 message-digest)

ADDED   path-glob/path-glob.scm
Index: path-glob/path-glob.scm
==================================================================
--- /dev/null
+++ path-glob/path-glob.scm
@@ -0,0 +1,46 @@
+(define (multi-glob pathspec)
+  (let* ((path-parts (intersperse (string-split pathspec "/" #t) "/")))
+    (print "path-parts: " path-parts)
+    (if (null? path-parts)
+	'()
+	(let loop ((parts  (cdr path-parts))
+		   (result (let ((p (car path-parts)))
+			     (if (string=? p "")
+				 '("")
+				 (glob (car path-parts))))))
+	  (if (null? parts)
+	      result
+	      (let* ((part (car parts))
+		     (rem  (cdr parts)))
+		(loop rem
+		      (apply append
+			     (map (lambda (curr)
+				    (let ((new (string-append curr part)))
+				      (print "new: " new " part: " part)
+				      (cond
+				       ((and (directory? curr)(file-read-access? curr))
+					(glob new))
+				       ((member part '("." ".." "/")) (list new part))
+				       (else '()))))
+				  result)))))))))
+
+;; alternative implementation
+
+(define (path-glob pattern)
+  (let ((parts (string-split pattern "/" '())))
+    (if (null? parts)
+       '()
+       (glob-expand (car parts) (cdr parts))
+    )))
+
+(define (glob-expand pattern #!optional (rest '()))
+  (let ((result  '())
+	(expanded (glob pattern)))
+    (apply append result (cond
+			  ((null? expanded) (list '()))
+			  ((null? rest)     (list expanded))
+			  (else (map (lambda (x)
+				       (if (directory? x)
+					   (glob-expand (conc x "/" (car rest)) (cdr rest))
+					   '()))
+				     expanded))))))

ADDED   path-glob/test.scm
Index: path-glob/test.scm
==================================================================
--- /dev/null
+++ path-glob/test.scm
@@ -0,0 +1,46 @@
+(use test posix srfi-1)
+(load "path-glob.scm")
+
+;; (define globbers `((multi-glob . ,multi-glob)(path-glob . ,path-glob)))
+(define globbers `((path-glob . ,path-glob)))
+
+(define interesting-patts '("../*/*" "/*/bin/*" "./*/bin/*"))
+(define simple-patts '("../*" "/*" "/bin/*" "." ".." "*" "a[0-1]*"))
+
+(define (trim-list lst)
+  (if (> (length lst) 3)
+      (append (take lst 3) '(...))
+      lst))
+
+(define (generate-prefix patt)
+  (write (conc "patt: " patt (make-string (- 10 (string-length patt)) #\ ))))
+
+(print "\nCompare each globber with glob") ;; can only do one level globs here
+(for-each
+ (lambda (globber)
+   (print "\nGlobber: " globber " vs glob")
+   (for-each
+    (lambda (patt)
+      (generate-prefix patt)
+      (test #f '() (trim-list
+		    (lset-xor string=? ((alist-ref globber globbers) patt)(glob patt)))))
+    simple-patts))
+ (map car globbers))
+
+(print "\nTest the globbers against patts - only checks for resiliance, not correctness.")
+(for-each
+ (lambda (patt)
+   (generate-prefix patt)(test #f #t (list? (path-glob patt)))
+   ;; (generate-prefix patt)(test #f #t (list? (multi-glob patt)))
+   )
+ interesting-patts)
+
+(print "\nCompare the globbers against each other")
+#;(for-each
+ (lambda (patt)
+   (generate-prefix patt)
+   (test #f '() (trim-list
+		 (lset-xor string=? (path-glob patt)(multi-glob patt)))))
+ interesting-patts)
+
+(test-exit)

ADDED   pkts.scm
Index: pkts.scm
==================================================================
--- /dev/null
+++ pkts.scm
@@ -0,0 +1,23 @@
+;;======================================================================
+;; Copyright 2019, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
+;;======================================================================
+
+(declare (unit pkts))
+
+(include "pkts/pkts.scm")

ADDED   pkts/pktrec.scm
Index: pkts/pktrec.scm
==================================================================
--- /dev/null
+++ pkts/pktrec.scm
@@ -0,0 +1,196 @@
+(define-syntax define-record-type
+  (syntax-rules ()
+    ((define-record-type type
+       (constructor constructor-tag ...)
+       predicate
+       (field-tag accessor . more) ...)
+     (begin
+       (define type
+         (make-record-type 'type '(field-tag ...)))
+       (define constructor
+         (record-constructor type '(constructor-tag ...)))
+       (define predicate
+         (record-predicate type))
+       (define-record-field type field-tag accessor . more)
+       ...))))
+
+; An auxilliary macro for define field accessors and modifiers.
+; This is needed only because modifiers are optional.
+
+(define-syntax define-record-field
+  (syntax-rules ()
+    ((define-record-field type field-tag accessor)
+     (define accessor (record-accessor type 'field-tag)))
+    ((define-record-field type field-tag accessor modifier)
+     (begin
+       (define accessor (record-accessor type 'field-tag))
+       (define modifier (record-modifier type 'field-tag))))))
+
+; Record types
+
+; We define the following procedures:
+; 
+; (make-record-type )    -> 
+; (record-constructor ) -> 
+; (record-predicate )               -> 
+; (record-accessor )    -> 
+; (record-modifier )    -> 
+;   where
+; (  ...)         -> 
+; ( )                       -> 
+; ( )                       -> 
+; (  )         -> 
+
+; Record types are implemented using vector-like records.  The first
+; slot of each record contains the record's type, which is itself a
+; record.
+
+(define (record-type record)
+  (record-ref record 0))
+
+;----------------
+; Record types are themselves records, so we first define the type for
+; them.  Except for problems with circularities, this could be defined as:
+;  (define-record-type :record-type
+;    (make-record-type name field-tags)
+;    record-type?
+;    (name record-type-name)
+;    (field-tags record-type-field-tags))
+; As it is, we need to define everything by hand.
+
+(define :record-type (make-record 3))
+(record-set! :record-type 0 :record-type)	; Its type is itself.
+(record-set! :record-type 1 ':record-type)
+(record-set! :record-type 2 '(name field-tags))
+
+; Now that :record-type exists we can define a procedure for making more
+; record types.
+
+(define (make-record-type name field-tags)
+  (let ((new (make-record 3)))
+    (record-set! new 0 :record-type)
+    (record-set! new 1 name)
+    (record-set! new 2 field-tags)
+    new))
+
+; Accessors for record types.
+
+(define (record-type-name record-type)
+  (record-ref record-type 1))
+
+(define (record-type-field-tags record-type)
+  (record-ref record-type 2))
+
+;----------------
+; A utility for getting the offset of a field within a record.
+
+(define (field-index type tag)
+  (let loop ((i 1) (tags (record-type-field-tags type)))
+    (cond ((null? tags)
+           (error "record type has no such field" type tag))
+          ((eq? tag (car tags))
+           i)
+          (else
+           (loop (+ i 1) (cdr tags))))))
+
+;----------------
+; Now we are ready to define RECORD-CONSTRUCTOR and the rest of the
+; procedures used by the macro expansion of DEFINE-RECORD-TYPE.
+
+(define (record-constructor type tags)
+  (let ((size (length (record-type-field-tags type)))
+        (arg-count (length tags))
+        (indexes (map (lambda (tag)
+                        (field-index type tag))
+                      tags)))
+    (lambda args
+      (if (= (length args)
+             arg-count)
+          (let ((new (make-record (+ size 1))))
+            (record-set! new 0 type)
+            (for-each (lambda (arg i)
+			(record-set! new i arg))
+                      args
+                      indexes)
+            new)
+          (error "wrong number of arguments to constructor" type args)))))
+
+(define (record-predicate type)
+  (lambda (thing)
+    (and (record? thing)
+         (eq? (record-type thing)
+              type))))
+
+(define (record-accessor type tag)
+  (let ((index (field-index type tag)))
+    (lambda (thing)
+      (if (and (record? thing)
+               (eq? (record-type thing)
+                    type))
+          (record-ref thing index)
+          (error "accessor applied to bad value" type tag thing)))))
+
+(define (record-modifier type tag)
+  (let ((index (field-index type tag)))
+    (lambda (thing value)
+      (if (and (record? thing)
+               (eq? (record-type thing)
+                    type))
+          (record-set! thing index value)
+          (error "modifier applied to bad value" type tag thing)))))
+
+Records
+
+; This implements a record abstraction that is identical to vectors,
+; except that they are not vectors (VECTOR? returns false when given a
+; record and RECORD? returns false when given a vector).  The following
+; procedures are provided:
+;   (record? )                -> 
+;   (make-record )             -> 
+;   (record-ref  )    -> 
+;   (record-set!   ) -> 
+;
+; These can implemented in R5RS Scheme as vectors with a distinguishing
+; value at index zero, providing VECTOR? is redefined to be a procedure
+; that returns false if its argument contains the distinguishing record
+; value.  EVAL is also redefined to use the new value of VECTOR?.
+
+; Define the marker and redefine VECTOR? and EVAL.
+
+(define record-marker (list 'record-marker))
+
+(define real-vector? vector?)
+
+(define (vector? x)
+  (and (real-vector? x)
+       (or (= 0 (vector-length x))
+	   (not (eq? (vector-ref x 0)
+		record-marker)))))
+
+; This won't work if ENV is the interaction environment and someone has
+; redefined LAMBDA there.
+
+(define eval
+  (let ((real-eval eval))
+    (lambda (exp env)
+      ((real-eval `(lambda (vector?) ,exp))
+       vector?))))
+
+; Definitions of the record procedures.
+
+(define (record? x)
+  (and (real-vector? x)
+       (< 0 (vector-length x))
+       (eq? (vector-ref x 0)
+            record-marker)))
+
+(define (make-record size)
+  (let ((new (make-vector (+ size 1))))
+    (vector-set! new 0 record-marker)
+    new))
+
+(define (record-ref record index)
+  (vector-ref record (+ index 1)))
+
+(define (record-set! record index value)
+  (vector-set! record (+ index 1) value))

ADDED   pkts/pkts.meta
Index: pkts/pkts.meta
==================================================================
--- /dev/null
+++ pkts/pkts.meta
@@ -0,0 +1,21 @@
+;; -*- scheme -*-
+(
+; Your egg's license:
+(license "BSD")
+
+; Pick one from the list of categories (see below) for your egg and enter it
+; here.
+(category db)
+
+; A list of eggs pkts depends on.  If none, you can omit this declaration
+; altogether. If you are making an egg for chicken 3 and you need to use
+; procedures from the `files' unit, be sure to include the `files' egg in the
+; `needs' section (chicken versions < 3.4.0 don't provide the `files' unit).
+; `depends' is an alias to `needs'.
+;; (needs (autoload "3.0"))
+
+; A list of eggs required for TESTING ONLY.  See the `Tests' section.
+(test-depends test)
+
+(author "Matt Welland")
+(synopsis "A sha1-chain based datastore built on packets consisting of single line cards modeled loosely on the fossil scm datastore."))

ADDED   pkts/pkts.release-info
Index: pkts/pkts.release-info
==================================================================
--- /dev/null
+++ pkts/pkts.release-info
@@ -0,0 +1,3 @@
+(repo fossil "http://www.kiatoa.com/cgi-bin/fossils/{egg-name}")
+(uri zip "http://www.kiatoa.com/cgi-bin/fossils/{egg-name}/zip/{egg-name}.zip?uuid={egg-release}")
+(release "1.0")

ADDED   pkts/pkts.scm
Index: pkts/pkts.scm
==================================================================
--- /dev/null
+++ pkts/pkts.scm
@@ -0,0 +1,1075 @@
+;; Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Pkts
+;; 
+;;     Pkts is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Pkts is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Pkts.  If not, see .
+;;
+
+;; CARDS:
+;;
+;; A card is a line of text, the first two characters are a letter followed by a
+;;   space. The letter is the card type.
+;;
+;; PKTS:
+;;
+;; A pkt is a sorted list of cards with a final card Z that contains the shar1 hash
+;;   of all of the preceding cards.
+;;
+;; APKT:
+;;
+;;  An alist mapping card types to card data
+;;      '((T . "pkttype")
+;;        (a . "some content"))
+;;
+;; EPKT:
+;;
+;;  Extended packet using friendly keys. Must use a pktspec to convert to/from epkts
+;;    '((ptype . "pkttype")
+;;      (adata . "some content))
+;;
+;; DPKT:
+;;
+;; pkts pulled from the database have this format:
+;;
+;;((apkt (Z . "7de89c09ac024b3832c93e16cd78d11e2e28733b")     <= this is a the alist
+;;       (t . "v1.63/tip/dev")
+;;       (c . "QUICKPATT")
+;;       (T . "runstart")
+;;       (P . "354eeb67120a921e3e33155ecab1b522ac10b6bd")
+;;       (D . "1488995096.0"))
+;;  (id . 8)
+;;  (group-id . 0)
+;;  (uuid . "7de89c09ac024b3832c93e16cd78d11e2e28733b")
+;;  (parent . "")
+;;  (pkt-type . "runstart")
+;;  (pkt . "D 1488995096.0\nP 354eeb67120a921e3e33155ecab1b522ac10b6bd\nT runstart\nc QUICKPATT\nt v1.63/tip/dev\nZ 7de89c09ac024b3832c93e16cd78d11e2e28733b"))
+;;
+;; pktspec is alist of alists mapping types and nicekeys to keys
+;;
+;; '((posting . ((title . t)
+;;               (url   . u)
+;;               (blurb . b)))
+;;   (comment . ((comment . c)
+;;               (score   . s))))
+
+;; Reserved cards:
+;;   P      : pkt parent
+;;   R      : reference pkt containing mapping of short string -> sha1sum strings
+;;   T      : pkt type
+;;   D      : current time from (current-time), unless provided
+;;   Z      : shar1 hash of the packet
+
+;; Example usage:
+;;
+;; Create a pkt:
+;;
+;; (use pkts)
+;; (define-values (uuid pkt)
+;;     (alist->pkt
+;;       '((fruit . "apple") (meat . "beef"))  ;; this is the data to convert
+;;       '((foods (fruit . f) (meat . m)))     ;; this is the pkt spec
+;;       ptype:
+;;       'foods))
+;;
+;; Add to pkt queue:
+;;
+;; (define db (open-queue-db "/tmp/pkts" "pkts.db"))
+;; (add-to-queue db pkt uuid 'foods #f 0) ;; no parent and use group_id of 0
+;;
+;; Retrieve the packet from the db and extract a value:
+;;
+;; (alist-ref
+;;    'meat
+;;    (dpkt->alist
+;;         (car (get-dpkts db #f 0 #f))
+;;        '((foods (fruit . f)
+;;                 (meat . m)))))
+;; => "beef"
+;;
+
+(module pkts
+(
+;; cards, util and misc
+;; sort-cards
+;; calc-shar1
+;;
+;; low-level constructor procs, exposed only for development/testing, will be removed
+construct-sdat
+construct-pkt     
+card->type/value  
+add-z-card
+
+;; queue database procs
+open-queue-db
+add-to-queue
+create-and-queue
+lookup-by-uuid
+lookup-by-id
+get-dpkts
+get-not-processed-pkts
+get-related
+find-pkts
+process-pkts
+get-descendents
+get-ancestors
+get-pkts
+get-last-descendent
+with-queue-db
+load-pkts-to-db
+
+;; procs that operate directly on pkts, sdat, apkts, dpkts etc.
+pkt->alist    ;; pkt -> apkt (i.e. alist)
+pkt->sdat     ;; pkt -> '("a aval" "b bval" ...)
+sdat->alist   ;; '("a aval" "b bval"...) -> ((a . "aval")(b . "bval") ...)
+dblst->dpkts  ;; convert list of tuples from queue db into dpkts
+dpkt->alist   ;; flatten a dpkt into an alist containing all db fields and the pkt alist
+dpkts->alists ;; apply dpkt->alist to a list of alists using a pkt-spec
+alist->pkt    ;; returns two values uuid, pkt
+get-value     ;; looks up a value given a key in a dpkt
+flatten-all   ;; merge the list of values from a query which includes a pkt into a flat alist <== really useful!
+check-pkt
+
+;; pkt alists
+write-alist->pkt
+read-pkt->alist
+
+;; archive database
+archive-open-db
+write-archive-pkts
+archive-pkts
+mark-processed
+
+;; pktsdb
+pktdb-conn     ;; useful
+pktdb-fname
+pktsdb-open
+pktsdb-close
+pktsdb-add-record
+;; temporary
+pktdb-pktspec
+
+;; utility procs
+increment-string ;; used to get indexes for strings in ref pkts
+make-report      ;; make a .dot file 
+)
+
+(import chicken scheme data-structures posix srfi-1 regex srfi-13 srfi-69 ports extras)
+(use crypt sha1 message-digest (prefix dbi dbi:) typed-records)
+
+;;======================================================================
+;; DATA MANIPULATION UTILS
+;;======================================================================
+
+(define-inline (unescape-data data)
+  (string-translate* data '(("\\n" . "\n") ("\\\\" . "\\"))))
+
+(define-inline (escape-data data)
+  (string-translate* data '(("\n" . "\\n") ("\\" . "\\\\"))))
+
+(define-inline (make-card type data)
+  (conc type " " (escape-data (->string data))))
+
+;; reverse an alist for doing pktkey -> external key conversions
+;;
+(define-inline (reverse-aspec aspec)
+  (map (lambda (dat)
+	 (cons (cdr dat)(car dat)))
+       aspec))
+
+;; add a card to the list of cards, sdat
+;; if type is #f return only sdat
+;; if data is #f return only sdat
+;;
+(define-inline (add-card sdat type data)
+  (if (and type data)
+      (cons (make-card type data) sdat)
+      sdat))
+
+;;======================================================================
+;; STRING AS FUNKY NUMBER
+;;======================================================================
+
+;; NOTE: PTDZ are removed as they are reserved. NB// the R card is not used in a
+;;       ref, instead the P parent card is used.
+;;       Question: Why does it matter to remove PTDZ?
+;;                 To make the ref easier to use the ref strings will be the keys
+;;                 so we cannot have overlap with any actual keys. But this is a
+;;                 bit silly. What we need to do instead is reject keys of length
+;;                 one where the char is in PTDZ
+;;
+;; This is basically base92
+;;
+(define string-num-chars (string->list "!#$%&'()*+,-./0123456789:;<=>?@ABCEFGHIJKLMNOQRSUVWXY[\\]^_abcdefghijklmnopqrstuvwxyz{|}~"))
+;; "0123456789abcdefghijklmnopqrstuvwxyzABCEFGHIJKLMNOQSUVWXY!#$%&'()*+,-./[]:;<=>?\\^_{}|"))
+
+(define (char-incr inchar)
+  (let* ((carry     #f)
+	 (next-char (let ((rem (member inchar string-num-chars)))
+		      (if (eq? (length rem) 1) ;; we are at the last character in our string-num-chars list
+			  (begin
+			    (set! carry #t)
+			    (car string-num-chars))
+			  (cadr rem)))))
+    (values next-char carry)))
+    
+(define (increment-string str)
+  (if (string-null? str)
+      "0"
+      (let ((strlst (reverse (string->list str)))) ;; need to process the string from the lsd
+	(list->string
+	 (let loop ((hed (car strlst))
+		    (tal (cdr strlst))
+		    (res '()))
+	   (let-values (((newhed carry)(char-incr hed)))
+	     ;; (print "newhed: " newhed " carry: " carry " tal: " tal)
+	     (let ((newres (cons newhed res)))
+	       (if carry ;; we'll have to propagate the carry
+		   (if (null? tal) ;; at the end, tack on "0" (which is really a "1")
+		       (cons (car string-num-chars) newres)
+		       (loop (car tal)(cdr tal) newres))
+		   (append (reverse tal) newres)))))))))
+    
+;;======================================================================
+;; P K T S D B   I N T E R F A C E
+;;
+;; INTEGER, REAL, TEXT
+;;======================================================================
+;;
+;; spec
+;;  ( (tablename1 . (field1name L1 TYPE)
+;;                  (field2name L2 TYPE) ... )
+;;    (tablename2 ... ))
+;;
+;;  Example: (tests (testname n TEXT)
+;;                  (rundir   r TEXT)
+;;                   ... )
+;;
+;; pkt keys are taken from the first letter, if that is not unique
+;; then look at the next letter and so on
+;;
+
+;; use this struct to hold the pktspec and the db handle
+;;
+(defstruct pktdb
+  (fname       #f)
+  (pktsdb-spec #f)
+  (pktspec     #f)  ;; cache the pktspec
+  (field-keys  #f)  ;; cache the field->key mapping (field1 . k1) ...
+  (key-fields  #f)  ;; cache the key->field mapping
+  (conn        #f)
+  )
+
+;; WARNING: There is a simplification in the pktsdb spec w.r.t. pktspec.
+;;          The field specs are the cdr of the table list - not a full
+;;          list. The extra list level in pktspec is gratuitous and should
+;;          be removed.
+;;
+(define (pktsdb-spec->pktspec tables-spec)
+  (map (lambda (tablespec)
+	 (list (car tablespec)
+	       (map (lambda (field-spec)
+		      (cons (car field-spec)(cadr field-spec)))
+		    (cdr tablespec))))
+       tables-spec))
+
+(define (pktsdb-open dbfname pktsdb-spec)
+  (let* ((pdb      (make-pktdb))
+	 (dbexists (file-exists? dbfname))
+	 (db       (dbi:open 'sqlite3 `((dbname . ,dbfname)))))
+    (pktdb-pktsdb-spec-set! pdb pktsdb-spec)
+    (pktdb-pktspec-set!     pdb (pktsdb-spec->pktspec pktsdb-spec))
+    (pktdb-fname-set!       pdb dbfname)
+    (pktdb-conn-set!        pdb db)
+    (if (not dbexists)
+	(pktsdb-init pdb))
+    pdb))
+
+(define (pktsdb-init pktsdb)
+  (let* ((db          (pktdb-conn pktsdb))
+	 (pktsdb-spec (pktdb-pktsdb-spec pktsdb)))
+    ;; create a table for the pkts themselves
+    (dbi:exec db "CREATE TABLE IF NOT EXISTS pkts (id INTEGER PRIMARY KEY, zkey TEXT, record_id INTEGER, pkt TEXT);")
+    (for-each
+     (lambda (table)
+       (let* ((table-name (car table))
+	      (fields     (cdr table))
+	      (stmt (conc "CREATE TABLE IF NOT EXISTS "
+			  table-name
+			  " (id INTEGER PRIMARY KEY,"
+			  (string-intersperse
+			   (map (lambda (fieldspec)
+				  (conc (car fieldspec) " "
+					(caddr fieldspec)))
+				fields)
+			   ",")
+			  ");")))
+	 (dbi:exec db stmt)))
+     pktsdb-spec)))
+
+;; create pkt from the data and insert into pkts table
+;; 
+;; data is assoc list of (field . value) ...
+;; tablename is a symbol matching the table name
+;;
+(define (pktsdb-add-record pktsdb tablename data #!optional (parent #f))
+  (let*-values (((zkey pkt) (alist->pkt data (pktdb-pktspec pktsdb) ptype: tablename)))
+    ;; have the data as alist so insert it into appropriate table also
+    (let* ((db        (pktdb-conn pktsdb)))
+      ;; TODO: Address collisions
+      (dbi:exec db "INSERT INTO pkts (zkey,pkt,record_id) VALUES (?,?,?);"
+		zkey pkt -1)
+      (let* (;; (pktid     (pktsdb-pktkey->pktid pktsdb pktkey))
+	     (record-id (pktsdb-insert pktsdb tablename data)))
+	(dbi:exec db "UPDATE pkts SET record_id=? WHERE zkey=?;"
+		  record-id zkey)
+      ))))
+
+;; 
+(define (pktsdb-insert pktsdb tablename data)
+  (let* ((db (pktdb-conn pktsdb))
+	 (stmt (conc "INSERT INTO " tablename
+		     " (" (string-intersperse (map conc (map car data)) ",")
+		     ") VALUES ('"
+		     ;; TODO: Add lookup of data type and do not
+		     ;;       wrap integers with quotes
+		     (string-intersperse (map conc (map cdr data)) "','")
+		     "');")))
+    (print "stmt: " stmt)
+    (dbi:exec db stmt)
+    ;; lookup the record-id and return it
+    
+    ))
+    
+
+(define (pktsdb-close pktsdb)
+  (dbi:close (pktdb-conn pktsdb)))
+
+;; (let loop ((s "0")(n 0))(print s)(if (< n 5000)(loop (increment-string s)(+ n 1))))
+
+;;======================================================================
+;; CARDS, MISC and UTIL
+;;======================================================================
+
+;; given string (likely multi-line) "dat" return shar1 hash
+;;
+(define-inline (calc-shar1 instr)
+  (message-digest-string
+   (sha1-primitive)
+   instr))
+
+;; given a single card return its type and value
+;;
+(define (card->type/value card)
+  (let ((ctype (substring card 0 1))
+	(cval  (substring card 2 (string-length card))))
+    (values (string->symbol ctype) cval)))
+
+;;======================================================================
+;; SDAT procs
+;;  sdat is legacy/internal usage. Intention is to remove sdat calls from
+;;  the exposed calls.
+;;======================================================================
+
+;; sort list of cards
+;;
+(define-inline (sort-cards sdat)
+  (sort sdat string<=?))
+
+;; pkt rules
+;; 1. one card per line
+;; 2. at least one card
+;; 3. no blank lines
+
+;; given sdat, a list of cards return uuid, packet (as sdat)
+;;
+(define (add-z-card sdat)
+  (let* ((sorted-sdat (sort-cards sdat))
+	 (dat         (string-intersperse sorted-sdat "\n"))
+	 (uuid        (calc-shar1 dat)))
+    (values
+     uuid
+     (conc
+      dat
+      "\nZ "
+      uuid))))
+
+(define (check-pkt pkt)
+  (handle-exceptions
+      exn
+      #f ;; anything goes wrong - call it a crappy pkt
+    (let* ((sdat (string-split pkt "\n"))
+	   (rdat (reverse sdat)) ;; reversed
+	   (zdat (car rdat))
+	   (Z    (cadr (string-split zdat)))
+	   (cdat (string-intersperse (reverse (cdr rdat)) "\n")))
+      (equal? Z (calc-shar1 cdat)))))
+
+;;======================================================================
+;; APKTs
+;;======================================================================
+
+;; convert a sdat (list of cards) to an alist
+;;
+(define (sdat->alist sdat)
+  (let loop ((hed (car sdat))
+	     (tal (cdr sdat))
+	     (res '()))
+    (let-values (( (ctype cval)(card->type/value hed) ))
+      ;; if this card is not one of the common ones tack it on to rem
+      (let* ((oldval (alist-ref ctype res))
+	     (newres (cons (cons ctype
+				 (if oldval ;; list or string
+				     (if (list? oldval)
+					 (cons cval oldval)
+					 (cons cval (list oldval)))
+				     cval))
+			   res)))
+	(if (null? tal)
+	    newres
+	    (loop (car tal)(cdr tal) newres))))))
+
+;;((apkt (Z . "7de89c09ac024b3832c93e16cd78d11e2e28733b")     <= this is a the alist
+;;       (t . "v1.63/tip/dev")
+;;       (c . "QUICKPATT")
+;;       (T . "runstart")
+;;       (P . "354eeb67120a921e3e33155ecab1b522ac10b6bd")
+;;       (D . "1488995096.0"))
+;;  (id . 8)
+;;  (group-id . 0)
+;;  (uuid . "7de89c09ac024b3832c93e16cd78d11e2e28733b")
+;;  (parent . "")
+;;  (pkt-type . "runstart")
+;;  (pkt . "D 1488995096.0\nP 354eeb67120a921e3e33155ecab1b522ac10b6bd\nT runstart\nc QUICKPATT\nt v1.63/tip/dev\nZ 7de89c09ac024b3832c93e16cd78d11e2e28733b"))
+;;
+;; pktspec is alist of alists mapping types and nicekeys to keys
+;;
+;; '((posting . ((title . t)
+;;               (url   . u)
+;;               (blurb . b)))
+;;   (comment . ((comment . c)
+;;               (score   . s))))
+
+;; DON'T USE? 
+;;
+(define (get-value field dpkt . spec-in)
+  (if (null? spec-in)
+      (alist-ref field dpkt)
+      (let* ((spec  (car spec-in))
+	     (apkt  (alist-ref 'apkt dpkt))) ;; get the pkt alist
+	(if (and apkt spec)
+	    (let* ((ptype (alist-ref 'pkt-type dpkt))
+		   (pspec (alist-ref (string->symbol ptype) spec))) ;; do we have a spec for this type of pkt
+	      (and pspec
+		  (let* ((key (alist-ref field pspec)))
+		    (and key (alist-ref key apkt)))))
+	    #f))))
+
+;; convert a dpkt to a pure alist given a pktspec
+;; this flattens out the alist to include the data from
+;; the queue database record
+;;
+(define (dpkt->alist dpkt pktspec)
+  (let* ((apkt       (alist-ref 'apkt dpkt))
+	 (pkt-type   (or (alist-ref 'pkt-type dpkt) ;; pkt-type is from the database field pkt_type
+			 (alist-ref 'T apkt)))
+	 (pkt-fields (alist-ref (string->symbol pkt-type) pktspec))
+	 (rev-fields (if pkt-fields
+			 (reverse-aspec pkt-fields)
+			 '())))
+    (append (map (lambda (entry)
+		   (let* ((pkt-key (car entry))
+			  (new-key (or (alist-ref pkt-key rev-fields) pkt-key)))
+		     `(,new-key . ,(cdr entry))))
+		 apkt)
+	    dpkt)))
+
+;; convert a list of dpkts into a list of alists using pkt-spec
+;;
+(define (dpkts->alists dpkts pkt-spec)
+   (map (lambda (x)
+	  (dpkt->alist x pkt-spec))
+	dpkts))
+
+;; Generic flattener, make the tuple and pkt into a single flat alist
+;;
+;; qry-result-spec is a list of symbols corresponding to each field
+;;
+(define (flatten-all inlst pktspec . qry-result-spec)
+  (map
+   (lambda (tuple)
+     (dpkt->alist
+      (apply dblst->dpkts tuple qry-result-spec)
+      pktspec))
+   inlst))
+
+;; call like this:
+;;  (construct-sdat 'a "a data" 'S "S data" ...)
+;; returns list of cards
+;;  ( "A a value" "D 12345678900" ...)
+;;
+(define (construct-sdat . alldat)
+  (let ((have-D-card #f)) ;; flag
+    (if (even? (length alldat))
+	(let loop ((type (car alldat))
+		   (data (cadr alldat))
+		   (tail (cddr alldat))
+		   (res  '()))
+	  (if (eq? type 'D)(set! have-D-card #t))
+	  (if (null? tail)
+	      (if have-D-card ;; return the constructed pkt, add a D card if none found
+		  (add-card res type data)
+		  (add-card 
+		   (add-card res 'D (current-seconds))
+		   type data))
+	      (loop (car tail)
+		    (cadr tail)
+		    (cddr tail)
+		    (add-card res type data))))
+	#f))) ;; #f means it failed to create the sdat
+
+(define (construct-pkt . alldat)
+  (add-z-card
+   (apply construct-sdat alldat)))
+
+;;======================================================================
+;; CONVERTERS
+;;======================================================================
+
+(define (pkt->sdat pkt)
+  (map unescape-data (string-split pkt "\n")))
+
+;; given a pure pkt return an alist
+;;
+(define (pkt->alist pkt #!key (pktspec #f))
+  (let ((sdat (cond
+	       ((string? pkt)  (pkt->sdat pkt))
+	       ((list? pkt)    pkt)
+	       (else #f))))
+    (if pkt
+	(if pktspec
+	    (dpkt->alist (list (cons 'apkt (sdat->alist sdat))) pktspec)
+	    (sdat->alist sdat))
+	#f)))
+
+;; convert an alist to an sdat
+;;  in: '((a . "blah")(b . "foo"))
+;; out: '("a blah" "b foo")
+;;
+(define (alist->sdat adat)
+  (map (lambda (dat)
+	 (conc (car dat) " " (cdr dat)))
+       adat))
+
+;; adat is the incoming alist, aspec is the mapping
+;; from incoming key to the pkt key (usually one
+;; letter to keep data tight) see the pktspec at the
+;; top of this file
+;;
+;; NOTE: alists can contain multiple instances of the same key (supported fine by pkts)
+;;       but you (obviously I suppose) cannot use alist-ref to access those entries.
+;;
+(define (alist->pkt adat aspec #!key (ptype #f))
+  (let* ((pkt-type (or ptype
+		       (alist-ref 'T adat) ;; can provide in the incoming alist
+		       #f))
+	 (pkt-spec (if pkt-type            ;; alist of external-key -> key
+		       (or (alist-ref pkt-type aspec) '())
+		       (if (null? aspec)
+			   '()
+			   (cdar aspec)))) ;; default to first one if nothing specified
+	 (new-alist (map (lambda (dat)
+			   (let* ((key    (car dat))
+				  (val    (cdr dat))
+				  (newkey (or (alist-ref key pkt-spec)
+					      key)))
+			     (cons newkey (escape-data (conc val))))) ;; convert all incoming data (symbols, numbers etc.) to a string and then escape newlines.
+			 adat))
+	 (new-with-type (if (alist-ref 'T new-alist)
+			    new-alist
+			    (cons `(T . ,pkt-type) new-alist)))
+	 (with-d-card   (if (alist-ref 'D new-with-type)
+			    new-with-type
+			    (cons `(D . ,(current-seconds))
+				  new-with-type))))
+    (add-z-card
+     (alist->sdat with-d-card))))
+
+;;======================================================================
+;;  D B   Q U E U E   I N T E R F A C E
+;;======================================================================
+
+;; pkts (
+;;   id SERIAL PRIMARY KEY,
+;;   uuid TEXT NOT NULL,
+;;   parent_uuid TEXT default '',
+;;   pkt_type INTEGER DEFAULT 0,
+;;   group_id INTEGER NOT NULL,
+;;   pkt TEXT NOT NULL
+
+;; schema is list of SQL statements - can be used to extend db with more tables
+;;
+(define (open-queue-db dbpath dbfile #!key (schema '()))
+  (let* ((dbfname  (conc dbpath "/" dbfile))
+	 (dbexists (if (file-exists? dbfname) #t (begin (create-directory dbpath #t) #f)))
+	 (db       (dbi:open 'sqlite3 (list (cons 'dbname dbfname)))))
+    ;; (set-busy-handler! (dbi:db-conn db) (busy-timeout 10000))
+    (if (not dbexists) ;; NOTE: In the archive we allow duplicates and other messiness. 
+	(for-each
+	 (lambda (stmt)
+	   (dbi:exec db stmt))
+	 (cons "CREATE TABLE IF NOT EXISTS pkts
+                          (id           INTEGER PRIMARY KEY,
+                           group_id     INTEGER NOT NULL,
+                           uuid         TEXT NOT NULL,
+                           parent_uuid  TEXT TEXT DEFAULT '',
+                           pkt_type     TEXT NOT NULL,
+                           pkt          TEXT NOT NULL,
+                           processed    INTEGER DEFAULT 0)"
+		   schema))) ;; 0=not processed, 1=processed, 2... for expansion
+    db))
+
+(define (add-to-queue db pkt uuid pkt-type parent-uuid group-id)
+  (dbi:exec db "INSERT INTO pkts (uuid,parent_uuid,pkt_type,pkt,group_id)
+                   VALUES(?,?,?,?,?);" ;; $1,$2,$3,$4,$5);"
+	    uuid
+	    (if parent-uuid parent-uuid "");; use null string as placeholder for no parent uuid.
+	    (if pkt-type (conc pkt-type) "") 
+	    pkt
+	    group-id))
+
+;; given all needed parameters create a pkt and store it in the queue
+;;  procs is an alist that maps pkt-type to a function that takes a list of pkt params
+;;  in data and returns the uuid and pkt
+;;
+(define (create-and-queue conn procs pkt-type parent-uuid group-id data)
+  (let ((proc (alist-ref pkt-type procs)))
+    (if proc
+	(let-values (( (uuid pkt) (proc data) ))
+	  (add-to-queue conn pkt uuid pkt-type parent-uuid group-id)
+	  uuid)
+	#f)))
+
+;; given uuid get pkt, if group-id is specified use it (reduces probablity of
+;;     being messed up by a uuid collision)
+;;
+(define (lookup-by-uuid db pkt-uuid group-id)
+  (if group-id
+      (dbi:get-one db "SELECT pkt FROM pkts WHERE group_id=? AND uuid=?;" group-id pkt-uuid)
+      (dbi:get-one db "SELECT pkt FROM pkts WHERE uuid=?;" pkt-uuid)))
+      
+;; find a packet by its id
+;;
+(define (lookup-by-id db id)
+  (dbi:get-one db "SELECT pkt FROM pkts WHERE id=?;" id))
+
+;; apply a proc to the open db handle for a pkt db in pdbpath
+;;
+(define (with-queue-db pdbpath proc #!key (schema #f))
+  (cond
+   ((not (equal? (file-owner pdbpath)(current-effective-user-id)))
+    (print "ERROR: directory " pdbpath " is not owned by " (current-effective-user-name)))
+   (else
+    (let* ((pdb  (open-queue-db pdbpath "pkts.db"
+				schema: schema)) ;;  '("CREATE TABLE groups (id INTEGER PRIMARY KEY,groupname TEXT, CONSTRAINT group_constraint UNIQUE (groupname));"))))
+	   (res  (proc pdb)))
+      (dbi:close pdb)
+      res))))
+
+(define (load-pkts-to-db pktsdirs pdbpath #!key (schema #f))
+  (with-queue-db
+   pdbpath
+   (lambda (pdb)
+     (for-each
+      (lambda (pktsdir) ;; look at all
+	(cond
+	 ((not (file-exists? pktsdir))
+	  (print "ERROR: packets directory " pktsdir " does not exist."))
+	 ((not (directory? pktsdir))
+	  (print "ERROR: packets directory path " pktsdir " is not a directory."))
+	 ((not (file-read-access? pktsdir))
+	  (print "ERROR: packets directory path " pktsdir " is not readable."))
+	 (else
+	  ;; (print "INFO: Loading packets found in " pktsdir)
+	  (let ((pkts (glob (conc pktsdir "/*.pkt"))))
+	    (for-each
+	     (lambda (pkt)
+	       (let* ((uuid    (cadr (string-match ".*/([0-9a-f]+).pkt" pkt)))
+		      (exists  (lookup-by-uuid pdb uuid #f)))
+		 (if (not exists)
+		     (let* ((pktdat (string-intersperse
+				     (with-input-from-file pkt read-lines)
+				     "\n"))
+			    (apkt   (pkt->alist pktdat))
+			    (ptype  (alist-ref 'T apkt)))
+		       (add-to-queue pdb pktdat uuid (or ptype 'cmd) #f 0))
+		       ;; (debug:print 4 *default-log-port* "Added " uuid " of type " ptype " to queue"))
+		       ;; (debug:print 4 *default-log-port* "pkt: " uuid " exists, skipping...")
+		     )))
+	     pkts)))))
+      pktsdirs))))
+
+;;======================================================================
+;;  P R O C E S S   P K T S
+;;======================================================================
+
+;; given a list of field values pulled from the queue db generate a list
+;; of dpkt's
+;;
+(define (dblst->dpkts lst . altmap)
+  (let* ((maplst (if (null? altmap)
+		     '(id group-id uuid parent pkt-type pkt processed)
+		     altmap))
+	 (res (map cons maplst lst))) ;; produces list of pairs, i.e an alist
+    (cons `(apkt . ,(pkt->alist (alist-ref 'pkt res)))
+	  res)))
+
+;; NB// ptypes is a list of symbols, '() or #f find all types
+;;
+(define (get-dpkts db ptypes group-id parent-uuid #!key (uuid #f))
+  (let* ((ptype-qry (if (and ptypes
+			     (not (null? ptypes)))
+			(conc " IN ('" (string-intersperse (map conc ptypes) "','") "')")
+			(conc " LIKE '%' ")))
+	 (rows      (dbi:get-rows
+		     db
+		     (conc
+		      "SELECT id,group_id,uuid,parent_uuid,pkt_type,pkt,processed FROM pkts
+                         WHERE pkt_type " ptype-qry " AND group_id=?
+                         AND processed=0 "
+			 (if parent-uuid (conc "AND parent_uuid='" parent-uuid "' ") "")
+			 (if uuid        (conc "AND        uuid='"        uuid "' ") "")
+			 "ORDER BY id DESC;")
+		     group-id)))
+    (map dblst->dpkts (map vector->list rows))))
+
+;; get N pkts not yet processed for group-id
+;;
+(define (get-not-processed-pkts db group-id pkt-type limit offset)
+  (map dblst->dpkts
+       (map vector->list
+	    (dbi:get-rows
+	     db
+	     "SELECT id,group_id,uuid,parent_uuid,pkt_type,pkt,processed FROM pkts
+                WHERE pkt_type = ? AND group_id = ? AND processed=0
+                LIMIT ? OFFSET ?;"
+	     (conc pkt-type) ;; convert symbols to string
+	     group-id
+	     limit
+	     offset
+	     ))))
+
+;; given a uuid, get not processed child pkts 
+;;
+(define (get-related db group-id uuid)
+  (map dblst->dpkts
+       (dbi:get-rows
+	db
+	"SELECT id,group_id,uuid,parent_uuid,pkt_type,pkt,processed FROM pkts
+           WHERE parent_uuid=? AND group_id=? AND processed=0;"
+	uuid group-id)))
+
+;; generic pkt processor
+;;
+;; find all packets in group-id of type in ptypes and apply proc to pktdat
+;;
+(define (process-pkts conn group-id ptypes parent-uuid proc)
+  (let* ((pkts (get-dpkts conn ptypes group-id parent-uuid)))
+    (map proc pkts)))
+
+;; criteria is an alist ((k . valpatt) ...)
+;;   - valpatt is a regex
+;;   - ptypes is a list of types (symbols expected)
+;;   match-type: 'any or 'all
+;;
+(define (find-pkts db ptypes criteria #!key (processed #f)(match-type 'any)(pkt-spec #f)) ;; processed=#f, don't use, else use
+  (let* ((pkts (get-dpkts db ptypes 0 #f))
+	 (match-rules (lambda (pktdat) ;; returns a list of matching rules
+			(filter (lambda (c)
+				  ;; (print "c: " c)
+				  (let* ((ctype (car c)) ;; card type
+					 (rx    (cdr c)) ;; card pattern
+					 ;; (t     (alist-ref 'pkt-type pktdat))
+					 (pkt   (alist-ref 'pkt pktdat))
+					 (apkt  (pkt->alist pkt))
+					 (cdat  (alist-ref ctype apkt)))
+				    ;; (print "cdat: " cdat) ;; " apkt: " apkt)
+				    (if cdat
+					(string-match rx cdat)
+					#f)))
+				criteria)))
+	 (res         (filter (lambda (pktdat)
+				(if (null? criteria) ;; looking for all pkts
+				    #t
+				    (case match-type
+				      ((any)(not (null? (match-rules pktdat))))
+				      ((all)(eq? (length (match-rules pktdat))(length criteria)))
+				      (else
+				       (print "ERROR: bad match type " match-type ", expecting any or all.")))))
+			      pkts)))
+    (if pkt-spec
+	(dpkts->alists res pkt-spec)
+	res)))
+
+;; get descendents of parent-uuid
+;;
+;; NOTE: Should be doing something like the following:
+;;
+;; given a uuid, get not processed child pkts 
+;; processed:
+;;    #f => get all
+;;     0 => get not processed
+;;     1 => get processed
+;;
+(define (get-ancestors db group-id uuid #!key (processed #f))
+  (map dblst->dpkts
+       (map vector->list
+	    (dbi:get-rows
+	     db
+	     (conc
+	      "SELECT id,group_id,uuid,parent_uuid,pkt_type,pkt,processed 
+                FROM pkts
+                 WHERE uuid IN 
+                     (WITH RECURSIVE
+                       tree(uuid,parent_uuid)
+                        AS
+                        (
+                           SELECT uuid, parent_uuid
+                           FROM pkts
+                           WHERE uuid = ?
+                           UNION ALL
+                           SELECT t.uuid, t.parent_uuid
+                           FROM pkts t
+                           JOIN tree ON t.uuid = tree.parent_uuid
+                        )
+	              SELECT uuid FROM tree)
+	    AND group_id=?" (if processed (conc " AND processed=" processed) "") ";")
+	     uuid group-id))))
+
+;; Untested
+;;
+(define (get-descendents db group-id uuid #!key (processed #f))
+  (map dblst->dpkts
+       (map vector->list
+	    (dbi:get-rows
+	     db
+	     (conc
+	      "SELECT id,group_id,uuid,parent_uuid,pkt_type,pkt,processed 
+                FROM pkts
+                 WHERE uuid IN 
+                     (WITH RECURSIVE
+                       tree(uuid,parent_uuid)
+                        AS
+                        (
+                           SELECT uuid, parent_uuid
+                           FROM pkts
+                           WHERE uuid = ?
+                           UNION ALL
+                           SELECT t.uuid, t.parent_uuid
+                           FROM pkts t
+                           JOIN tree ON t.parent_uuid = tree.uuid
+                        )
+	              SELECT uuid FROM tree)
+	    AND group_id=?" (if processed (conc " AND processed=" processed) "") ";")
+	     uuid group-id))))
+
+;; look up descendents based on given info unless passed in a list via inlst
+;;
+(define (get-last-descendent db group-id uuid #!key (processed #f)(inlst #f))
+  (let ((descendents (or inlst (get-descendents db group-id uuid processed: processed))))
+    (if (null? descendents)
+	#f
+	(last descendents))))
+
+;;======================================================================
+;;  A R C H I V E S - always to a sqlite3 db 
+;;======================================================================
+
+;; open an archive db
+;; path: archive-dir//month.db
+;;
+(define (archive-open-db archive-dir)
+  (let* ((curr-time (seconds->local-time (current-seconds)))
+	 (dbpath    (conc archive-dir "/" (time->string curr-time "%Y")))
+	 (dbfile    (conc dbpath "/" (time->string curr-time "%m") ".db"))
+	 (dbexists (if (file-exists? dbfile) #t (begin (create-directory dbpath #t) #f))))
+    (let ((db (dbi:open 'sqlite3 (list (cons 'dbname dbfile)))))
+      ;; (set-busy-handler! db (busy-timeout 10000))
+      (if (not dbexists) ;; NOTE: In the archive we allow duplicates and other messiness. 
+	  (dbi:exec db "CREATE TABLE IF NOT EXISTS pkts
+                          (id           INTEGER,
+                           group_id     INTEGER,
+                           uuid         TEXT,
+                           parent_uuid  TEXT,
+                           pkt_type     TEXT,
+                           pkt          TEXT,
+                           processed    INTEGER DEFAULT 0)"))
+      db)))
+
+;; turn on transactions! otherwise this will be painfully slow
+;;
+(define (write-archive-pkts src-db db pkt-ids)
+  (let ((pkts (dbi:get-rows
+	       src-db
+	       (conc "SELECT id,group_id,uuid,parent_uuid,pkt_type,pkt FROM pkts WHERE id IN ("
+		     (string-intersperse (map conc pkt-ids) ",") ")"))))
+    ;; (dbi:with-transaction
+    ;;  db
+     (lambda ()
+       (for-each
+	(lambda (pkt)
+	  (apply dbi:exec  db "INSERT INTO pkts (id,group_id,uuid,parent_uuid,pkt_type,pkt)
+                               VALUES (?,?,?,?,?,?)"
+		 pkt))
+	pkts)))) ;; )
+
+;; given a list of uuids and lists of uuids move all to
+;; the sqlite3 db for the current archive period
+;;
+(define (archive-pkts conn pkt-ids archive-dir)
+  (let ((db (archive-open-db archive-dir)))
+    (write-archive-pkts conn db pkt-ids)
+    (dbi:close db))
+  ;; (pg:with-transaction
+  ;;  conn
+  ;; (lambda ()
+     (for-each
+      (lambda (id)
+	(dbi:get-one
+	 conn
+	 "DELETE FROM pkts WHERE id=?" id))
+      pkt-ids)) ;; ))
+
+;; given a list of ids mark all as processed
+;;
+(define (mark-processed conn pkt-ids)
+  ;; (pg:with-transaction
+   ;; conn
+   ;; (lambda ()
+     (for-each
+      (lambda (id)
+	(dbi:get-one
+	 conn
+	 "UPDATE pkts SET processed=1 WHERE id=?;" id))
+      pkt-ids)) ;; x))
+
+;; a generic pkt getter, gets from the pkts db
+;;
+(define (get-pkts conn ptypes)
+  (let* ((ptypes-str    (if (null? ptypes)
+			    ""
+			    (conc " WHERE pkt_type IN ('" (string-intersperse ptypes ",") "') ")))
+	 (qry-str       (conc "SELECT id,group_id,uuid,parent_uuid,pkt_type,pkt,processed FROM pkts" ptypes-str)))
+    (map vector->list (dbi:get-rows conn qry-str))))
+
+;; make a report of the pkts in the db
+;; ptypes of '() gets all pkts
+;; display-fields
+;;
+(define (make-report dest conn pktspec display-fields . ptypes)
+  (let* (;; (conn          (dbi:db-conn (s:db)))
+	 (all-rows      (get-pkts conn ptypes))
+	 (all-pkts      (flatten-all
+			 all-rows
+			 pktspec
+			 'id 'group-id 'uuid 'parent 'pkt-type 'pkt 'processed))
+	 (by-uuid       (let ((ht (make-hash-table)))
+			  (for-each
+			   (lambda (pkt)
+			     (let ((uuid (alist-ref 'uuid pkt)))
+			       (hash-table-set! ht uuid pkt)))
+			   all-pkts)
+			  ht))
+	 (by-parent     (let ((ht (make-hash-table)))
+			  (for-each
+			   (lambda (pkt)
+			     (let ((parent (alist-ref 'parent pkt)))
+			       (hash-table-set! ht parent (cons pkt (hash-table-ref/default ht parent '())))))
+			   all-pkts)
+			    ht))
+	 (oup           (if dest (open-output-file dest) (current-output-port))))
+    
+    (with-output-to-port
+	oup
+      (lambda ()
+	(print "digraph megatest_state_status {
+  // ranksep=0.05
+  rankdir=LR;
+  node [shape=\"box\"];
+")
+	;; first all the names
+	(for-each
+	 (lambda (pkt)
+	   (let* ((uuid        (alist-ref 'uuid pkt))
+		  (shortuuid   (substring uuid 0 4))
+		  (type        (alist-ref 'pkt-type pkt))
+		  (processed   (alist-ref 'processed pkt)))
+	     
+	     (print "\"" uuid "\" [label=\"" shortuuid ", ("
+		    type ", "
+		    (if processed "processed" "not processed") ")")
+	     (for-each
+	      (lambda (key-field)
+		(let ((val (alist-ref key-field pkt)))
+		  (if val
+		      (print key-field "=" val))))
+	      display-fields)
+	     (print "\" ];")))
+	 all-pkts)
+	;; now for parent-child relationships
+	(for-each
+	 (lambda (pkt)
+	   (let ((uuid   (alist-ref 'uuid pkt))
+		 (parent (alist-ref 'parent pkt)))
+	     (if (not (equal? parent ""))
+		 (print "\"" parent "\" -> \"" uuid"\";"))))
+	 all-pkts)
+
+	(print "}")
+	))
+    (if dest
+	(begin
+	  (close-output-port oup)
+	  (system "dot -Tpdf out.dot -o out.pdf")))
+    
+    ))
+
+;;======================================================================
+;; Read ref pkts into a vector < laststr hash table > 
+;;======================================================================
+
+
+
+;;======================================================================
+;; Read/write packets to files (convience functions)
+;;======================================================================
+
+;; write alist to a pkt file
+;;
+(define (write-alist->pkt targdir dat #!key (pktspec '())(ptype #f))
+  (let-values (((uuid pkt)(alist->pkt dat pktspec ptype: ptype)))
+    (with-output-to-file (conc targdir "/" uuid ".pkt")
+      (lambda ()
+	(print pkt)))
+    uuid)) ;; return the uuid
+
+;; read pkt into alist
+;;
+(define (read-pkt->alist pkt-file #!key (pktspec #f))
+  (pkt->alist (with-input-from-file
+		  pkt-file
+		read-string)
+	      pktspec: pktspec))
+
+
+) ;; module pkts

ADDED   pkts/pkts.setup
Index: pkts/pkts.setup
==================================================================
--- /dev/null
+++ pkts/pkts.setup
@@ -0,0 +1,11 @@
+;; Copyright 2007-2017, Matthew Welland.
+;;
+;;  This program is made available under the GNU GPL version 2.0 or
+;;  greater. See the accompanying file COPYING for details.
+;;
+;;  This program is distributed WITHOUT ANY WARRANTY; without even the
+;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+;;  PURPOSE.
+
+;;;; pkts.setup
+(standard-extension 'pkts "1.0")

ADDED   pkts/tests/run.scm
Index: pkts/tests/run.scm
==================================================================
--- /dev/null
+++ pkts/tests/run.scm
@@ -0,0 +1,139 @@
+(use test)
+
+;; (use (prefix pkts pkts:))
+(use pkts (prefix dbi dbi:))
+;; (use trace)(trace sdat->alist pkt->alist)
+
+(if (file-exists? "queue.db")(delete-file "queue.db"))
+
+(test-begin "pkts and pkt archives")
+
+;;======================================================================
+;; Basic pkt creation, parsing and conversion routines
+;;======================================================================
+
+(test-begin "basic packets")
+(test #f '(A "This is a packet") (let-values (((t v)
+					       (card->type/value "A This is a packet")))
+				   (list t v)))
+(test #f "A A\nZ 664449e7299e0065a3e25c138ccef2df13ba291e"
+      (let-values (((uuid res)
+		    (add-z-card '("A A"))))
+	res))
+(test #f '("CC C++" "D 1486332719.0" "a A" "b C")(sort (construct-sdat 'b "C" 'a "A" 'CC "C++" 'D 1486332719.0)
+						       string<=?))
+(define pkt-example #f)
+(test #f "CC C++\nD 1486332719.0\na A\nb C\nZ 263eb3b6193de7fe65b1ded5bcda513e8b4d6b84"
+      (let-values (((uuid res)
+		    (construct-pkt 'b "C" 'a "A" 'CC "C++" 'D 1486332719.0)))
+	(set! pkt-example (cons uuid res))
+	res))
+(test-end "basic packets")
+
+;;======================================================================
+;; Sqlite and postgresql based queue of pkts
+;;======================================================================
+
+(test-begin "pkt queue")
+(define db #f)
+(test #f 'sqlite3 (let ((dbh (open-queue-db "." "queue.db")))
+		    (set! db dbh)
+		    (dbi:db-dbtype dbh)))
+(test #f (cdr pkt-example)
+      (begin
+	(add-to-queue db (cdr pkt-example)(car pkt-example) 'basic #f 0)
+	(lookup-by-uuid db (car pkt-example) 0)))
+(test #f (cdr pkt-example)
+      (lookup-by-id db 1))
+(test #f 1 (length (find-pkts db '(basic) '())))
+
+(test-end "pkt queue")
+
+
+;;======================================================================
+;; Process groups of pkts
+;;======================================================================
+
+(test-begin "lists of packets")
+(test #f '((apkt . #f) (id . 1) (group-id . 2) (uuid . 3) (parent . 4) (pkt-type . 5)) ;; ((id . 1) (group-id . 2) (uuid . 3) (parent . 4) (pkt-type . 5))
+      (dblst->dpkts '(1 2 3 4 5)))
+(test #f '(((apkt (Z . "263eb3b6193de7fe65b1ded5bcda513e8b4d6b84") (b . "C") (a . "A") (D . "1486332719.0") (C . " C++")) (id . 1) (group-id . 0) (uuid . "263eb3b6193de7fe65b1ded5bcda513e8b4d6b84") (parent . "") (pkt-type . "basic") (pkt . "CC C++\nD 1486332719.0\na A\nb C\nZ 263eb3b6193de7fe65b1ded5bcda513e8b4d6b84") (processed . 0)))
+      ;; '(((apkt (Z . "263eb3b6193de7fe65b1ded5bcda513e8b4d6b84") (b . "C") (a . "A") (D . "1486332719.0") (C . " C++")) (id . 1) (group-id . 0) (uuid . "263eb3b6193de7fe65b1ded5bcda513e8b4d6b84") (parent . "") (pkt-type . "basic") (pkt . "CC C++\nD 1486332719.0\na A\nb C\nZ 263eb3b6193de7fe65b1ded5bcda513e8b4d6b84")))
+      ;; '(((id . 1) (group-id . 0) (uuid . "263eb3b6193de7fe65b1ded5bcda513e8b4d6b84") (parent . "") (pkt-type . "basic") (pkt . "CC C++\nD 1486332719.0\na A\nb C\nZ 263eb3b6193de7fe65b1ded5bcda513e8b4d6b84")))
+      (get-dpkts db '(basic) 0 #f))
+(test #f '(((apkt (Z . "263eb3b6193de7fe65b1ded5bcda513e8b4d6b84") (b . "C") (a . "A") (D . "1486332719.0") (C . " C++")) (id . 1) (group-id . 0) (uuid . "263eb3b6193de7fe65b1ded5bcda513e8b4d6b84") (parent . "") (pkt-type . "basic") (pkt . "CC C++\nD 1486332719.0\na A\nb C\nZ 263eb3b6193de7fe65b1ded5bcda513e8b4d6b84") (processed . 0)))
+      ;; '(((apkt (Z . "263eb3b6193de7fe65b1ded5bcda513e8b4d6b84") (b . "C") (a . "A") (D . "1486332719.0") (C . " C++")) (id . 1) (group-id . 0) (uuid . "263eb3b6193de7fe65b1ded5bcda513e8b4d6b84") (parent . "") (pkt-type . "basic") (pkt . "CC C++\nD 1486332719.0\na A\nb C\nZ 263eb3b6193de7fe65b1ded5bcda513e8b4d6b84")))
+      ;; '(((id . 1) (group-id . 0) (uuid . "263eb3b6193de7fe65b1ded5bcda513e8b4d6b84") (parent . "") (pkt-type . "basic") (pkt . "CC C++\nD 1486332719.0\na A\nb C\nZ 263eb3b6193de7fe65b1ded5bcda513e8b4d6b84")))
+      (get-not-processed-pkts db 0 'basic 1000 0))
+(test-end "lists of packets")
+
+(test-begin "pkts as alists")
+(define pktspec '((posting . ((title . t)   ;; NOTE: same as ((posting (title . t)(url . u)(blub . b)) ... 
+			      (url   . u)
+			      (blurb . b)))
+		  (comment . ((comment . c)
+			      (score   . s)))
+		  (basic   . ((b-field . b)
+			      (a-field . a)))))
+(define pktlst (find-pkts db '(basic) '()))
+(define dpkt (car pktlst))
+(test #f "A" (get-value 'a-field dpkt pktspec))
+
+(test #f "C" (alist-ref 'b-field (dpkt->alist dpkt pktspec)))
+
+(define basic-spec '((nada (foo . b)(bar . f))(basic (foo . f)(bar . b))))
+(define test-pkt   '((foo . "fooval")(bar . "barval")))
+(let*-values (((u p)  (alist->pkt test-pkt basic-spec ptype: 'basic))
+		((apkt) (pkt->alist p))
+		((bpkt) (pkt->alist p pktspec: basic-spec)))
+    (test #f "fooval" (alist-ref 'f apkt))
+    (test #f "fooval" (alist-ref 'foo bpkt))
+    (test #f #f       (alist-ref 'f   bpkt)))
+
+(test-end "pkts as alists")
+
+(test-begin "descendents and ancestors")
+
+(define (get-uuid pkt)(alist-ref 'uuid pkt))
+
+;; add a child to 263e
+(let-values (((uuid pkt)
+	      (construct-pkt 'x "X" 'y "Y" 'P "263eb3b6193de7fe65b1ded5bcda513e8b4d6b84"
+			     'D "1486332719.0")))
+  (add-to-queue db pkt uuid 'basic "263eb3b6193de7fe65b1ded5bcda513e8b4d6b84" 0))
+
+(test #f '("263eb3b6193de7fe65b1ded5bcda513e8b4d6b84" "818fe30988c9673441b8f203972a8bda6af682f8")
+      (map (lambda (x)(alist-ref 'uuid x))
+	   (get-descendents
+	    db 0
+	    "263eb3b6193de7fe65b1ded5bcda513e8b4d6b84")))
+
+(test #f '("263eb3b6193de7fe65b1ded5bcda513e8b4d6b84" "818fe30988c9673441b8f203972a8bda6af682f8")
+      (map (lambda (x)(alist-ref 'uuid x))
+	   (get-ancestors
+	    db 0
+	    "818fe30988c9673441b8f203972a8bda6af682f8")))
+
+(test-end "descendents and ancestors")
+
+(test-end "pkts and pkt archives")
+
+(test-begin "pktsdb")
+
+(define spec '((tests (testname n TEXT)
+		      (testpath p TEXT)
+		      (duration d INTEGER))))
+;; (define pktsdb (make-pktdb))
+;; (pktdb-pktsdb-spec-set! pktsdb spec)
+
+(define pktsdb #f)
+
+(test #f #t (dbi:database? (let ((pdb (pktsdb-open "test.db" spec)))
+			     (set! pktsdb pdb)
+			     (pktdb-conn pdb))))
+;; (pp (pktdb-pktspec pktsdb))
+(test #f #t (pktsdb-add-record pktsdb 'tests '((testname . "test1"))))
+
+(pktsdb-close pktsdb)
+
+(test-end "pktsdb")

Index: portlogger-example.scm
==================================================================
--- portlogger-example.scm
+++ portlogger-example.scm
@@ -1,4 +1,21 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 
 (declare (uses portlogger))
 
 (print (apply portlogger:main (cdr (argv))))

Index: portlogger.scm
==================================================================
--- portlogger.scm
+++ portlogger.scm
@@ -1,14 +1,23 @@
 
 ;; Copyright 2006-2014, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
 
 (require-extension (srfi 18) extras tcp s11n)
 
 (use sqlite3 srfi-1 posix srfi-69 hostinfo dot-locking z3)
 (import (prefix sqlite3 sqlite3:))
@@ -16,20 +25,19 @@
 (declare (unit portlogger))
 (declare (uses db))
 
 ;; lsof -i
 
-
 (define (portlogger:open-db fname)
   (let* ((avail    (tasks:wait-on-journal fname 5 remove: #t)) ;; wait up to about 10 seconds for the journal to go away
-	 (exists   (file-exists? fname))
+	 (exists   (common:file-exists? fname))
 	 (db       (if avail 
 		       (sqlite3:open-database fname)
 		       (begin
 			 (system (conc "rm -f " fname))
 			 (sqlite3:open-database fname))))
-	 (handler  (make-busy-timeout 136000))
+	 (handler  (sqlite3:make-busy-timeout 136000))
 	 (canwrite (file-write-access? fname)))
 	 ;; (db-init  (lambda ()
 	 ;;             (sqlite3:execute 
 	 ;;              db
 	 ;;              "CREATE TABLE IF NOT EXISTS ports (
@@ -56,12 +64,12 @@
      exn
      (begin
        ;; (release-dot-lock fname)
        (debug:print-error 0 *default-log-port* "portlogger:open-run-close failed. " proc " " params)
        (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn))
-       (debug:print 0 *default-log-port* "exn=" (condition->list exn))
-       (if (file-exists? fname)(delete-file fname)) ;; brutally get rid of it
+       (debug:print 5 *default-log-port* "exn=" (condition->list exn))
+       (if (common:file-exists? fname)(delete-file fname)) ;; brutally get rid of it
        (print-call-chain (current-error-port)))
      (let* (;; (lock   (obtain-dot-lock fname 2 9 10))
 	    (db     (portlogger:open-db fname))
 	    (res    (apply proc db params)))
        (sqlite3:finalize! db)
@@ -103,11 +111,11 @@
   (handle-exceptions
       exn
       (begin
 	(debug:print 0 *default-log-port* "EXCEPTION: portlogger database probably overloaded or unreadable. If you see this message again remove /tmp/.$USER-portlogger.db")
 	(debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn))
-	(debug:print 0 *default-log-port* "exn=" (condition->list exn))
+	(debug:print 5 *default-log-port* "exn=" (condition->list exn))
 	(print-call-chain (current-error-port))
 	(debug:print 0 *default-log-port* "Continuing anyway.")
 	#f)
     (sqlite3:fold-row
      (lambda (var curr)
@@ -128,11 +136,11 @@
     (handle-exceptions
      exn
      (begin
        (debug:print 0 *default-log-port* "EXCEPTION: portlogger database probably overloaded or unreadable. If you see this message again remove /tmp/.$USER-portlogger.db")
        (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn))
-       (debug:print 0 *default-log-port* "exn=" (condition->list exn))
+       (debug:print 5 *default-log-port* "exn=" (condition->list exn))
        (print-call-chain (current-error-port))
        (debug:print 0 *default-log-port* "Continuing anyway."))
      (portlogger:take-port db portnum))
     portnum))
 
@@ -158,11 +166,11 @@
 	  (handle-exceptions
 	   exn
 	   (begin
 	     (debug:print 0 *default-log-port* "EXCEPTION: portlogger database at " dbfname " probably overloaded or unreadable. Try removing it.")
 	     (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn))
-	     (print "exn=" (condition->list exn))
+	     (debug:print 5 *default-log-port* "exn=" (condition->list exn))
 	     (debug:print 0 *default-log-port* " status:  " ((condition-property-accessor 'sqlite3 'status) exn))
 	     (print-call-chain (current-error-port))
 	     #f)
 	   (case (string->symbol (car args)) ;; commands with two or more params
 	     ((take)(portlogger:take-port db (string->number (cadr args))))

Index: process.scm
==================================================================
--- process.scm
+++ process.scm
@@ -1,23 +1,31 @@
 ;;======================================================================
 ;; Copyright 2006-2012, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 ;;======================================================================
 
 ;;======================================================================
 ;; Process convience utils
 ;;======================================================================
 
-(use regex)
+(use regex directory-utils)
 (declare (unit process))
-;;(declare (uses common))
 
 (define (process:conservative-read port)
   (let loop ((res ""))
     (if (not (eof-object? (peek-char port)))
 	(loop (conc res (read-char port)))
@@ -46,18 +54,44 @@
 	     (close-input-port fh)
 	     (close-input-port fhe)
 	     (close-output-port fho)
 	     result))))) ;; )
 
+(define (process:cmd-run-with-stderr-and-exitcode->list cmd . params)
+  ;; (print "Called with cmd=" cmd ", proc=" proc ", params=" params)
+;;  (handle-exceptions
+;;   exn
+;;   (begin
+;;     (print "ERROR:  Failed to run command: " cmd " " (string-intersperse params " "))
+;;     (print "       " ((condition-property-accessor 'exn 'message) exn))
+;;     #f)
+   (let-values (((fh fho pid fhe) (if (null? params)
+				      (process* cmd)
+				      (process* cmd params))))
+       (let loop ((curr (read-line fh))
+		  (result  '()))
+	 (let ((errstr (process:conservative-read fhe)))
+	   (if (not (string=? errstr ""))
+	       (set! result (append result (list errstr)))))
+       (if (not (eof-object? curr))
+	   (loop (read-line fh)
+		 (append result (list curr)))
+	   (begin
+             (let-values (((anotherpid normalexit? exitstatus)  (process-wait pid)))
+	     (close-input-port fh)
+	     (close-input-port fhe)
+	     (close-output-port fho)
+               (list result (if normalexit? exitstatus -1))))))))
+
 (define (process:cmd-run-proc-each-line cmd proc . params)
   ;; (print "Called with cmd=" cmd ", proc=" proc ", params=" params)
   (handle-exceptions
    exn
    (begin
      (print "ERROR:  Failed to run command: " cmd " " (string-intersperse params " "))
      (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn))
-     (print "exn=" (condition->list exn))
+     (debug:print 5 *default-log-port* "exn=" (condition->list exn))
      #f)
    (let-values (((fh fho pid) (if (null? params)
 				  (process cmd)
 				  (process cmd params))))
        (let loop ((curr (read-line fh))
@@ -65,26 +99,29 @@
        (if (not (eof-object? curr))
 	   (loop (read-line fh)
 		 (append result (list (proc curr))))
 	   (begin
 	     (close-input-port fh)
-	     (close-input-port fhe)
+	     ;;(close-input-port fhe)
 	     (close-output-port fho)
 	     result))))))
 
 (define (process:cmd-run-proc-each-line-alt cmd proc)
   (let* ((fh (open-input-pipe cmd))
          (res (port-proc->list fh proc))
          (status (close-input-pipe fh)))
     (if (eq? status 0) res #f)))
 
-(define (process:cmd-run->list cmd)
-  (let* ((fh (open-input-pipe cmd))
-         (res (port->list fh))
-         (status (close-input-pipe fh)))
-    (list res status)))
-
+(define (process:cmd-run->list cmd #!key (delta-env-alist-or-hash-table '()))
+  (common:with-env-vars
+   delta-env-alist-or-hash-table
+   (lambda ()
+     (let* ((fh (open-input-pipe cmd))
+            (res (port->list fh))
+            (status (close-input-pipe fh)))
+       (list res status)))))
+   
 (define (port->list fh)
   (if (eof-object? fh) #f
       (let loop ((curr (read-line fh))
                  (result '()))
         (if (not (eof-object? curr))
@@ -102,30 +139,38 @@
                   (append result (list curr)))
             result))))
 
 ;; here is an example line where the shell is sh or bash
 ;; "find / -print 2&>1 > findall.log"
-(define (run-n-wait cmdline #!key (params #f)(print-cmd #f))
+(define (run-n-wait cmdline #!key (params #f)(print-cmd #f)(run-dir #f))
   (if print-cmd 
       (debug:print 0 *default-log-port* 
 		   (if (string? print-cmd)
 		       print-cmd
 		       "")
+		   (if run-dir (conc "Run in " run-dir ";") "")
 		   cmdline
 		   (if params
-		       (string-intersperse params " ")
+		       (conc " " (string-intersperse params " "))
 		       "")))
+  (if (and run-dir
+	   (directory-exists? run-dir))
+      (push-directory run-dir))
   (let ((pid (if params
 		 (process-run cmdline params)
 		 (process-run cmdline))))
     (let loop ((i 0))
       (let-values (((pid-val exit-status exit-code) (process-wait pid #t)))
          (if (eq? pid-val 0)
 	     (begin
 	       (thread-sleep! 2)
 	       (loop (+ i 1)))
-	     (values pid-val exit-status exit-code))))))
+	     (begin
+	       (if (and run-dir
+			(directory-exists? run-dir))
+		   (pop-directory))
+	       (values pid-val exit-status exit-code)))))))
   
 ;;======================================================================
 ;; MISC PROCESS RELATED STUFF
 ;;======================================================================
 
@@ -143,20 +188,22 @@
 
 (define (process:alive? pid)
   (handle-exceptions
    exn
    ;; possibly pid is a process not a child, look in /proc to see if it is running still
-   (file-exists? (conc "/proc/" pid))
+   (common:file-exists? (conc "/proc/" pid))
    (let-values (((rpid exit-type exit-signal)(process-wait pid #t)))
        (and (number? rpid)
 	    (equal? rpid pid)))))
 
 (define (process:alive-on-host? host pid)
   (let ((cmd (conc "ssh " host " ps -o pid= -p " pid)))
     (handle-exceptions
-     exn
-     #f ;; anything goes wrong - assume the process in NOT running.
+	exn
+      (begin
+	(debug:print 0 *default-log-port* "failed to identify if process " pid ", on host " host " is alive. exn=" exn)
+	#f) ;; anything goes wrong - assume the process in NOT running.
      (with-input-from-pipe 
       cmd
       (lambda ()
 	(let loop ((inl (read-line)))
 	  (if (eof-object? inl)

Index: records-vs-vectors-vs-coops.scm
==================================================================
--- records-vs-vectors-vs-coops.scm
+++ records-vs-vectors-vs-coops.scm
@@ -1,5 +1,22 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 ;; (include "vg.scm")
 
 ;; (declare (uses vg))
 
 (use foof-loop defstruct coops)

Index: records.sh
==================================================================
--- records.sh
+++ records.sh
@@ -1,16 +1,54 @@
 #! /bin/bash
 
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # extents caches extents calculated on draw
 # proc is called on draw and takes the obj itself as a parameter
 # attrib is an alist of parameters
 # libs: hash of name->lib, insts: hash of instname->inst
 #
 # Add -safe when doing development
 #
 export MODE='-safe'
 (echo ";; Created by records.sh. DO NOT EDIT THIS FILE. Edit records.sh instead"
+
+ echo <.
+;;
+EOF
+ 
 make-vector-record $MODE vg lib     comps
 make-vector-record $MODE vg comp    objs name file
 make-vector-record $MODE vg obj     type pts fill-color text line-color call-back angle font attrib extents proc
 make-vector-record $MODE vg inst    libname compname theta xoff yoff scalex scaley mirrx mirry call-back cache
 make-vector-record $MODE vg drawing libs insts scalex scaley xoff yoff cnv cache

ADDED   reindent.el
Index: reindent.el
==================================================================
--- /dev/null
+++ reindent.el
@@ -0,0 +1,14 @@
+; Indenting module body code at column 0
+(defun scheme-module-indent (state indent-point normal-indent) 0)
+(put 'module 'scheme-indent-function 'scheme-module-indent)
+
+(put 'and-let* 'scheme-indent-function 1)
+(put 'parameterize 'scheme-indent-function 1)
+(put 'handle-exceptions 'scheme-indent-function 1)
+(put 'when 'scheme-indent-function 1)
+(put 'unless 'scheme-indent-function 1)
+(put 'match 'scheme-indent-function 1)
+(put 'let-values 'scheme-indent-function 1)
+
+;; do the work
+(indent-region (point-min) (point-max) nil)

DELETED remotediff-nmsg.scm
Index: remotediff-nmsg.scm
==================================================================
--- remotediff-nmsg.scm
+++ /dev/null
@@ -1,187 +0,0 @@
-(use posix)
-(use regex)
-(use directory-utils)
-(use srfi-18 srfi-69 nanomsg)
-
-(define (client-send-receive soc msg)
-  (nn-send soc msg)
-  (nn-recv soc))
-
-;;do as calling user
-(define (do-as-calling-user proc)
-  (let ((eid (current-effective-user-id))
-        (cid (current-user-id)))
-    (if (not (eq? eid cid)) ;; running suid
-        (set! (current-effective-user-id) cid))
-    (proc)
-    (if (not (eq? eid cid))
-        (set! (current-effective-user-id) eid))))
-
-;; use mutex to not open/close files at same time
-;;
-(define (checksum mtx file #!key (cmd "shasum"))
-  (mutex-lock! mtx)
-  (let-values (((inp oup pid)
-                (process cmd (list file))))
-    (mutex-unlock! mtx)
-    (let ((result (read-line inp)))
-      ;; now flush out remaining output
-      (let loop ((inl (read-line inp)))
-        (if (eof-object? inl)
-            (if (string? result)
-                (begin
-                  (mutex-lock! mtx)
-                  (close-input-port inp)
-                  (close-output-port oup)
-                  (mutex-unlock! mtx)
-                  (car (string-split result)))
-                #f)
-            (loop (read-line inp)))))))
-
-(define *max-running* 40)
-
-(define my-mutex-lock! conc)
-(define my-mutex-unlock! conc)
-;; (define my-mutex-lock! mutex-lock!)
-;; (define my-mutex-unlock! mutex-unlock!)
-
-(define (gather-dir-info path)
-  (let ((mtx1     (make-mutex))
-        (threads  (make-hash-table))
-        (last-num 0)
-        (req      (nn-socket 'req)))
-    (print "starting client with pid " (current-process-id))
-    (nn-connect req
-                ;; "tcp://localhost:5559")
-                "ipc:///tmp/test-ipc")
-    (find-files 
-     path 
-     ;; test: #t
-     action: (lambda (p res)
-               (let ((info (cond
-                            ((not (file-read-access? p)) '(cant-read))
-                            ((directory? p)              '(dir))
-                            ((symbolic-link? p)          (list 'symlink (read-symbolic-link p)))
-                            (else                        '(data)))))
-                 (if (eq? (car info) 'data)
-                     (let loop ((start-time (current-seconds)))
-                       (my-mutex-lock! mtx1)
-                       (let* ((num-threads (hash-table-size threads))
-                              (ok-to-run   (> *max-running* num-threads)))
-                         ;; (if (> (abs (- num-threads last-num)) 2)
-                         ;;     (begin
-                         ;;       ;; (print "num-threads:" num-threads)
-                         ;;       (set! last-num num-threads)))
-                         (my-mutex-unlock! mtx1)
-                         (if ok-to-run
-                             (let ((run-time-start (current-seconds)))
-                               ;; (print "num threads: " num-threads)
-                               (let ((th1  (make-thread
-                                            (lambda ()
-                                              (let ((cksum (checksum mtx1 p cmd: "md5sum"))
-                                                    (run-time (- (current-seconds) run-time-start)))
-                                                (my-mutex-lock! mtx1)
-                                                (client-send-receive req (conc p " " cksum))
-                                                (my-mutex-unlock! mtx1))
-                                              (let loop2 ()
-                                                (my-mutex-lock! mtx1)
-                                                (let ((registered (hash-table-exists? threads p)))
-                                                  (if registered
-                                                      (begin
-                                                        ;; (print "deleting thread reference for " p)
-                                                        (hash-table-delete! threads p))) ;; delete myself
-                                                  (my-mutex-unlock! mtx1)
-                                                  (if (not registered)
-                                                      (begin
-                                                        (thread-sleep! 0.5)
-                                                        (loop2))))))
-                                            p)))
-                                 (thread-start! th1)
-                                 ;; (thread-sleep! 0.05) ;; give things a little time to get going
-                                 ;; (thread-join! th1) ;; 
-                                 (my-mutex-lock! mtx1)
-                                 (hash-table-set! threads p th1)
-                                 (my-mutex-unlock! mtx1)
-                                 )) ;; thread is launched
-                             (let ((run-time (- (current-seconds) start-time))) ;; couldn't launch yet
-                               (cond
-                                ((< run-time 5)) ;; blast on through
-                                ((< run-time 30)(thread-sleep! 0.1))
-                                ((< run-time 60)(thread-sleep! 2))
-                                ((< run-time 120)(thread-sleep! 3))
-                                (else (thread-sleep! 3)))
-                               (loop start-time)))))))))
-    (map thread-join! (hash-table-values threads))
-    (client-send-receive req "quit")
-    (nn-close req)
-    (exit)))
-
-;; recieve and store the file data, note: this is effectively a *server*, not a client.
-;;
-(define (compare-directories path1 path2)
-  (let ((p1dat       (make-hash-table))
-        (p2dat       (make-hash-table))
-        (numdone     0) ;; increment when recieved a quit. exit when > 2
-        (rep         (nn-socket 'rep))
-        (p1len       (string-length path1))
-        (p2len       (string-length path2))
-        (both-seen   (make-hash-table)))
-    (nn-bind    rep  
-                ;; "tcp://*:5559")
-                "ipc:///tmp/test-ipc")
-    ;; start clients
-    (thread-sleep! 0.1)
-    (system (conc "./remotediff-nmsg " path1 " &"))
-    (system (conc "./remotediff-nmsg " path2 " &"))
-    (let loop ((msg-in (nn-recv rep))
-               (last-print 0))
-      (if (equal? msg-in "quit")
-          (set! numdone (+ numdone 1)))
-      (if (and (not (equal? msg-in "quit"))
-               (< numdone 2))
-          (let* ((parts (string-split msg-in))
-                 (filen (car parts))
-                 (finfo (cadr parts))
-                 (isp1  (substring-index path1 filen 0)) ;; is this a path1?
-                 (isp2  (substring-index path2 filen 0)) ;; is this a path2?
-                 (tpth  (substring filen (if isp1 p1len p2len) (string-length filen))))
-            (hash-table-set! (if isp1 p1dat p2dat)
-                             tpth
-                             finfo)
-            (if (and (hash-table-exists? p1dat tpth)
-                     (hash-table-exists? p2dat tpth))
-                (begin
-                  (if (not (equal? (hash-table-ref p1dat tpth)
-                                   (hash-table-ref p2dat tpth)))
-                      (print "DIFF: " tpth))
-                  (hash-table-set! both-seen tpth finfo)))
-            (nn-send rep "done")
-            (loop (nn-recv rep)
-                  (if (> (- (current-seconds) last-print) 15)
-                      (begin
-                        (print "Processed " (hash-table-size p1dat) ", " (hash-table-size p2dat))
-                        (current-seconds))
-                      last-print)))))
-    (print "p1: " (hash-table-size p1dat) " p2: " (hash-table-size p2dat))
-    (hash-table-for-each
-     p1dat
-     (lambda (k v)
-       (if (not (hash-table-exists? p2dat k))
-           (print "REMOVED: " k))))
-    (hash-table-for-each
-     p2dat
-     (lambda (k v)
-       (if (not (hash-table-exists? p1dat k))
-           (print "ADDED: " k))))
-    (list p1dat p2dat)))
-
-(if (< (length (argv)) 2)
-    (begin
-      (print "Usage: remotediff-nmsg file1 file2")
-      (exit)))
-
-(if (eq? (length (argv)) 2) ;; given a single path
-    (gather-dir-info (cadr (argv)))
-    (compare-directories (cadr (argv))(caddr (argv))))
-
-(print "Done")

Index: rmt.scm
==================================================================
--- rmt.scm
+++ rmt.scm
@@ -1,24 +1,34 @@
 ;;======================================================================
 ;; Copyright 2006-2017, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
 ;;======================================================================
 
 (use format typed-records) ;; RADT => purpose of json format??
 
 (declare (unit rmt))
 (declare (uses api))
-(declare (uses tdb))
 (declare (uses http-transport))
-;;(declare (uses nmsg-transport))
 (include "common_records.scm")
+;; (declare (uses rmtmod))
+
+;; (import rmtmod)
 
 ;;
 ;; THESE ARE ALL CALLED ON THE CLIENT SIDE!!!
 ;;
 
@@ -44,200 +54,289 @@
 		  (client:setup areapath)
 		  #f))))
 
 (define *send-receive-mutex* (make-mutex)) ;; should have separate mutex per run-id
 
+(define *rmt-query-last-call-time* 0)
+(define *rmt-query-last-rest-time* 0) ;; last time there was at least a 1/2 second rest - giving other processes access to the db
+
+;; NOTE: This query rest algorythm will not adapt to long query times. REDESIGN NEEDED. TODO. FIXME.
+;;
+(define (rmt:query-rest cmd rid params)
+  (let* ((now (current-milliseconds)))
+    (cond
+     ((> (- now *rmt-query-last-call-time*) 100)  ;; it's been a while since last query - no need to rest
+      (set! *rmt-query-last-rest-time*  now)
+      (set! *rmt-query-last-call-time*  now))
+     ((> (- now *rmt-query-last-rest-time*) 5000) ;; no natural rests have happened
+      (debug:print 0 *default-log-port* "query rest needed. blocking for 0.1 second. cmd="cmd", run id="rid", params="params)
+      (thread-sleep! 0.1) ;; force a rest of a half second
+      (set! *rmt-query-last-rest-time* now)
+      (set! *rmt-query-last-call-time* now))
+     (else ;; sufficient rests have occurred, just record the last query time
+      (set! *rmt-query-last-call-time* now)))))
+
 ;; RA => e.g. usage (rmt:send-receive 'get-var #f (list varname))
 ;;
 (define (rmt:send-receive cmd rid params #!key (attemptnum 1)(area-dat #f)) ;; start attemptnum at 1 so the modulo below works as expected
 
+  #;(common:telemetry-log (conc "rmt:"(->string cmd))
+                        payload: `((rid . ,rid)
+                                   (params . ,params)))
+  (if (not (equal? (configf:lookup *configdat* "setup" "query-rest") "no"))
+      (rmt:query-rest cmd rid params))
+  
+  (if (> attemptnum 2)
+      (debug:print 0 *default-log-port* "INFO: attemptnum in rmt:send-receive is " attemptnum))
+    
+  (cond
+   ((> attemptnum 2) (thread-sleep! 0.05))
+   ((> attemptnum 10) (thread-sleep! 0.5))
+   ((> attemptnum 20) (thread-sleep! 1)))
+  (if (and (> attemptnum 5) (= 0 (modulo attemptnum 15)))  
+    (begin (server:run *toppath*) (thread-sleep! 3))) 
+  
+  
+  ;;DOT digraph megatest_state_status {
+  ;;DOT   ranksep=0;
+  ;;DOT   // rankdir=LR;
+  ;;DOT   node [shape="box"];
+  ;;DOT "rmt:send-receive" -> MUTEXLOCK;
+  ;;DOT { edge [style=invis];"case 1" -> "case 2" -> "case 3" -> "case 4" -> "case 5" -> "case 6" -> "case 7" -> "case 8" -> "case 9" -> "case 10" -> "case 11"; }
   ;; do all the prep locked under the rmt-mutex
   (mutex-lock! *rmt-mutex*)
-
+  
   ;; 1. check if server is started IFF cmd is a write OR if we are not on the homehost, store in runremote
   ;; 2. check the age of the connections. refresh the connection if it is older than timeout-20 seconds.
   ;; 3. do the query, if on homehost use local access
   ;;
   (let* ((start-time    (current-seconds)) ;; snapshot time so all use cases get same value
          (areapath      *toppath*);; TODO - resolve from dbstruct to be compatible with multiple areas
 	 (runremote     (or area-dat
 			    *runremote*))
-	 (readonly-mode (if (and runremote
-				 (remote-ro-mode-checked runremote))
-			    (remote-ro-mode runremote)
-			    (let* ((dbfile  (conc *toppath* "/megatest.db"))
-				   (ro-mode (not (file-write-access? dbfile)))) ;; TODO: use dbstruct or runremote to figure this out in future
-			      (if runremote
-				  (begin
-				    (remote-ro-mode-set! runremote ro-mode)
-				    (remote-ro-mode-checked-set! runremote #t)
-				    ro-mode)
-				  ro-mode)))))
-
-     ;; ensure we have a record for our connection for given area
-     (if (not runremote)                   ;; can remove this one. should never get here.         
-	 (begin
-	   (set! *runremote* (make-remote))
-	   (set! runremote   *runremote*))) ;; new runremote will come from this on next iteration
-     ;; ensure we have a homehost record
-     (if (not (pair? (remote-hh-dat runremote)))  ;; not on homehost
-	 (thread-sleep! 0.1) ;; since we shouldn't get here, delay a little
-	 (remote-hh-dat-set! runremote (common:get-homehost)))
-
-     ;;(print "BB> readonly-mode is "readonly-mode" dbfile is "dbfile)
+         (attemptnum    (+ 1 attemptnum))
+	 (readonly-mode (rmtmod:calc-ro-mode runremote *toppath*)))
+
+    ;; DOT INIT_RUNREMOTE; // leaving off - doesn't really add to the clarity
+    ;; DOT MUTEXLOCK -> INIT_RUNREMOTE [label="no remote?"];
+    ;; DOT INIT_RUNREMOTE -> MUTEXLOCK;
+    ;; ensure we have a record for our connection for given area
+    (if (not runremote)                   ;; can remove this one. should never get here.         
+	(begin
+	  (set! *runremote* (make-remote))
+	  (set! runremote   *runremote*))) ;; new runremote will come from this on next iteration
+    
+    ;; DOT SET_HOMEHOST; // leaving off - doesn't really add to the clarity
+    ;; DOT MUTEXLOCK -> SET_HOMEHOST [label="no homehost?"];
+    ;; DOT SET_HOMEHOST -> MUTEXLOCK;
+    ;; ensure we have a homehost record
+    (if (not (pair? (remote-hh-dat runremote)))  ;; not on homehost
+	(thread-sleep! 0.1) ;; since we shouldn't get here, delay a little
+	(remote-hh-dat-set! runremote (common:get-homehost)))
+    
+    ;;(print "BB> readonly-mode is "readonly-mode" dbfile is "dbfile)
     (cond
-     ;; give up if more than 15 attempts
-     ((> attemptnum 15)
-      (debug:print 0 *default-log-port* "ERROR: 15 tries to start/connect to server. Giving up.")
+     ;;DOT EXIT;
+     ;;DOT MUTEXLOCK -> EXIT [label="> 15 attempts"]; {rank=same "case 1" "EXIT" }
+     ;; give up if more than 150 attempts
+     ((> attemptnum 150)
+      (debug:print 0 *default-log-port* "ERROR: 150 tries to start/connect to server. Giving up.")
       (exit 1))
 
-     ;; readonly mode, read request-  handle it - case 20
+     ;;DOT CASE2 [label="local\nreadonly\nquery"];
+     ;;DOT MUTEXLOCK -> CASE2; {rank=same "case 2" CASE2}
+     ;;DOT CASE2 -> "rmt:open-qry-close-locally";
+     ;; readonly mode, read request-  handle it - case 2
      ((and readonly-mode
            (member cmd api:read-only-queries)) 
       (mutex-unlock! *rmt-mutex*)
-      (debug:print-info 12 *default-log-port* "rmt:send-receive, case 20")
+      (debug:print-info 12 *default-log-port* "rmt:send-receive, case 2")
       (rmt:open-qry-close-locally cmd 0 params)
       )
 
+     ;;DOT CASE3 [label="write in\nread-only mode"];
+     ;;DOT MUTEXLOCK -> CASE3 [label="readonly\nmode?"]; {rank=same "case 3" CASE3}
+     ;;DOT CASE3 -> "#f";
      ;; readonly mode, write request.  Do nothing, return #f
-     (readonly-mode
-      (mutex-unlock! *rmt-mutex*)
-      (debug:print-info 12 *default-log-port* "rmt:send-receive, case 21")
-      (debug:print 0 *default-log-port* "WARNING: write transaction requested on a readonly area.  cmd="cmd" params="params)
-      #f
-      )
+     (readonly-mode (extras-readonly-mode *rmt-mutex* *default-log-port* cmd params))
 
+     ;; This block was for pre-emptively resetting the connection if there had been no communication for some time.
+     ;; I don't think it adds any value. If the server is not there, just fail and start a new connection.
+     ;; also, the expire-time calculation might not be correct. We want, time-since-last-server-access > (server:get-timeout)
+     ;;
+     ;;DOT CASE4 [label="reset\nconnection"];
+     ;;DOT MUTEXLOCK -> CASE4 [label="have connection,\nlast_access > expire_time"]; {rank=same "case 4" CASE4}
+     ;;DOT CASE4 -> "rmt:send-receive";
      ;; reset the connection if it has been unused too long
      ((and runremote
            (remote-conndat runremote)
-	   (let ((expire-time (+ (- start-time (remote-server-timeout runremote))(random 10)))) ;; Subtract or add the random value? Seems like it should be substract but Neither fixes the "WARNING: failure in with-input-from-request to #.\n message: Server closed connection before sending response"
-	     (< (http-transport:server-dat-get-last-access (remote-conndat runremote)) expire-time)))
+	   (> (current-seconds) ;; if it has been more than server-timeout seconds since last contact, close this connection and start a new on
+	      (+ (http-transport:server-dat-get-last-access (remote-conndat runremote))
+		 (remote-server-timeout runremote))))
       (debug:print-info 0 *default-log-port* "Connection to " (remote-server-url runremote) " expired due to no accesses, forcing new connection.")
+      (http-transport:close-connections area-dat: runremote)
       (remote-conndat-set! runremote #f) ;; invalidate the connection, thus forcing a new connection.
       (mutex-unlock! *rmt-mutex*)
       (rmt:send-receive cmd rid params attemptnum: attemptnum))
+     
+     ;;DOT CASE5 [label="local\nread"];
+     ;;DOT MUTEXLOCK -> CASE5 [label="server not required,\non homehost,\nread-only query"]; {rank=same "case 5" CASE5};
+     ;;DOT CASE5 -> "rmt:open-qry-close-locally";
+
      ;; on homehost and this is a read
-     ((and (not (remote-force-server runremote))      ;; honor forced use of server
-	   (cdr (remote-hh-dat runremote))     ;; on homehost
-           (member cmd api:read-only-queries)) ;; this is a read
+     ((and (not (remote-force-server runremote)) ;; honor forced use of server, i.e. server NOT required
+	   (cdr (remote-hh-dat runremote))       ;; on homehost
+           (member cmd api:read-only-queries))   ;; this is a read
       (mutex-unlock! *rmt-mutex*)
-      (debug:print-info 12 *default-log-port* "rmt:send-receive, case  3")
+      (debug:print-info 12 *default-log-port* "rmt:send-receive, case  5")
       (rmt:open-qry-close-locally cmd 0 params))
 
+     ;;DOT CASE6 [label="init\nremote"];
+     ;;DOT MUTEXLOCK -> CASE6 [label="on homehost,\nwrite query,\nhave server,\ncan't reach it"]; {rank=same "case 6" CASE6};
+     ;;DOT CASE6 -> "rmt:send-receive";
      ;; on homehost and this is a write, we already have a server, but server has died
      ((and (cdr (remote-hh-dat runremote))           ;; on homehost
            (not (member cmd api:read-only-queries))  ;; this is a write
            (remote-server-url runremote)             ;; have a server
            (not (server:ping (remote-server-url runremote))))  ;; server has died. NOTE: this is not a cheap call! Need better approach.
       (set! *runremote* (make-remote))
+      (remote-force-server-set! runremote (common:force-server?))
       (mutex-unlock! *rmt-mutex*)
-      (debug:print-info 12 *default-log-port* "rmt:send-receive, case  4.1")
+      (debug:print-info 12 *default-log-port* "rmt:send-receive, case  6")
       (rmt:send-receive cmd rid params attemptnum: attemptnum))
 
+     ;;DOT CASE7 [label="homehost\nwrite"];
+     ;;DOT MUTEXLOCK -> CASE7 [label="server not required,\non homehost,\na write,\nhave a server"]; {rank=same "case 7" CASE7};
+     ;;DOT CASE7 -> "rmt:open-qry-close-locally";
      ;; on homehost and this is a write, we already have a server
-     ((and (not (remote-force-server runremote))     ;; honor forced use of server
+     ((and (not (remote-force-server runremote))     ;; honor forced use of server, i.e. server NOT required
 	   (cdr (remote-hh-dat runremote))           ;; on homehost
            (not (member cmd api:read-only-queries))  ;; this is a write
            (remote-server-url runremote))            ;; have a server
       (mutex-unlock! *rmt-mutex*)
-      (debug:print-info 12 *default-log-port* "rmt:send-receive, case  4")
+      (debug:print-info 12 *default-log-port* "rmt:send-receive, case  4.1")
       (rmt:open-qry-close-locally cmd 0 params))
 
+     ;;DOT CASE8 [label="force\nserver"];
+     ;;DOT MUTEXLOCK -> CASE8 [label="server not required,\nhave homehost info,\nno connection yet,\nnot a read-only query"]; {rank=same "case 8" CASE8};
+     ;;DOT CASE8 -> "rmt:open-qry-close-locally";
      ;;  on homehost, no server contact made and this is a write, passively start a server 
-     ((and (not (remote-force-server runremote)) ;; honor forced use of server
-	   (cdr (remote-hh-dat runremote))       ;; new
-           (not (remote-server-url runremote))
-	   (not (member cmd api:read-only-queries)))
-      (debug:print-info 12 *default-log-port* "rmt:send-receive, case  5")
+     ((and (not (remote-force-server runremote))     ;; honor forced use of server, i.e. server NOT required
+	   (cdr (remote-hh-dat runremote))           ;; have homehost
+           (not (remote-server-url runremote))       ;; no connection yet
+	   (not (member cmd api:read-only-queries))) ;; not a read-only query
+      (debug:print-info 12 *default-log-port* "rmt:send-receive, case  8")
       (let ((server-url  (server:check-if-running *toppath*))) ;; (server:read-dotserver->url *toppath*))) ;; (server:check-if-running *toppath*))) ;; Do NOT want to run server:check-if-running - very expensive to do for every write call
 	(if server-url
 	    (remote-server-url-set! runremote server-url) ;; the string can be consumed by the client setup if needed
 	    (if (common:force-server?)
 		(server:start-and-wait *toppath*)
 		(server:kind-run *toppath*))))
       (remote-force-server-set! runremote (common:force-server?))
       (mutex-unlock! *rmt-mutex*)
-      (debug:print-info 12 *default-log-port* "rmt:send-receive, case  5.1")
+      (debug:print-info 12 *default-log-port* "rmt:send-receive, case  8.1")
       (rmt:open-qry-close-locally cmd 0 params))
 
+     ;;DOT CASE9 [label="force server\nnot on homehost"];
+     ;;DOT MUTEXLOCK -> CASE9 [label="no connection\nand either require server\nor not on homehost"]; {rank=same "case 9" CASE9};
+     ;;DOT CASE9 -> "start\nserver" -> "rmt:send-receive";
      ((or (and (remote-force-server runremote)              ;; we are forcing a server and don't yet have a connection to one
 	       (not (remote-conndat runremote)))
 	  (and (not (cdr (remote-hh-dat runremote)))        ;; not on a homehost 
 	       (not (remote-conndat runremote))))           ;; and no connection
-      (debug:print-info 12 *default-log-port* "rmt:send-receive, case  6  hh-dat: " (remote-hh-dat runremote) " conndat: " (remote-conndat runremote))
+      (debug:print-info 12 *default-log-port* "rmt:send-receive, case 9, hh-dat: " (remote-hh-dat runremote) " conndat: " (remote-conndat runremote))
       (mutex-unlock! *rmt-mutex*)
       (if (not (server:check-if-running *toppath*)) ;; who knows, maybe one has started up?
 	  (server:start-and-wait *toppath*))
-      (remote-force-server-set! runremote (common:force-server?))
       (remote-conndat-set! runremote (rmt:get-connection-info *toppath*)) ;; calls client:setup which calls client:setup-http
       (rmt:send-receive cmd rid params attemptnum: attemptnum)) ;; TODO: add back-off timeout as
+
+     ;;DOT CASE10 [label="on homehost"];
+     ;;DOT MUTEXLOCK -> CASE10 [label="server not required,\non homehost"]; {rank=same "case 10" CASE10};
+     ;;DOT CASE10 -> "rmt:open-qry-close-locally";
      ;; all set up if get this far, dispatch the query
      ((and (not (remote-force-server runremote))
 	   (cdr (remote-hh-dat runremote))) ;; we are on homehost
       (mutex-unlock! *rmt-mutex*)
-      (debug:print-info 12 *default-log-port* "rmt:send-receive, case  7")
+      (debug:print-info 12 *default-log-port* "rmt:send-receive, case 10")
       (rmt:open-qry-close-locally cmd (if rid rid 0) params))
 
+     ;;DOT CASE11 [label="send_receive"];
+     ;;DOT MUTEXLOCK -> CASE11 [label="else"]; {rank=same "case 11" CASE11};
+     ;;DOT CASE11 -> "rmt:send-receive" [label="call failed"];
+     ;;DOT CASE11 -> "RESULT" [label="call succeeded"];
      ;; not on homehost, do server query
-     (else
-      (mutex-unlock! *rmt-mutex*)
-      (debug:print-info 12 *default-log-port* "rmt:send-receive, case  9")
-      (mutex-lock! *rmt-mutex*)
-      (let* ((conninfo (remote-conndat runremote))
-	     (dat      (case (remote-transport runremote)
-			 ((http) (condition-case ;; handling here has caused a lot of problems. However it is needed to deal with attemtped communication to servers that have gone away
-                                  (http-transport:client-api-send-receive 0 conninfo cmd params)
-                                  ((commfail)(vector #f "communications fail"))
-                                  ((exn)(vector #f "other fail" (print-call-chain)))))
-			 (else
-			  (debug:print 0 *default-log-port* "ERROR: transport " (remote-transport runremote) " not supported")
-			  (exit))))
-	     (success  (if (vector? dat) (vector-ref dat 0) #f))
-	     (res      (if (vector? dat) (vector-ref dat 1) #f)))
-	(if (vector? conninfo)(http-transport:server-dat-update-last-access conninfo)) ;; refresh access time
-	;; (mutex-unlock! *rmt-mutex*)
-        (debug:print-info 13 *default-log-port* "rmt:send-receive, case  9. conninfo=" conninfo " dat=" dat " runremote = " runremote)
-	(mutex-unlock! *rmt-mutex*)
-	(if success ;; success only tells us that the transport was successful, have to examine the data to see if there was a detected issue at the other end
-	    (if (and (vector? res)
-		     (eq? (vector-length res) 2)
-		     (eq? (vector-ref res 1) 'overloaded)) ;; since we are looking at the data to carry the error we'll use a fairly obtuse combo to minimise the chances of some sort of collision.
-		(let ((wait-delay (+ attemptnum (* attemptnum 10))))
-		  (debug:print 0 *default-log-port* "WARNING: server is overloaded. Delaying " wait-delay " seconds and trying call again.")
-		  (mutex-lock! *rmt-mutex*)
-		  (set! *runremote* #f) ;; force starting over
-		  (mutex-unlock! *rmt-mutex*)
-		  (thread-sleep! wait-delay)
-		  (rmt:send-receive cmd rid params attemptnum: (+ attemptnum 1)))
-		res) ;; All good, return res
-	    (begin
-	      (debug:print 0 *default-log-port* "WARNING: communication failed. Trying again, try num: " attemptnum)
-	      (remote-conndat-set!    runremote #f)
-	      (remote-server-url-set! runremote #f)
-	      (debug:print-info 12 *default-log-port* "rmt:send-receive, case  9.1")
-	      (if (not (server:check-if-running *toppath*))
-		  (server:start-and-wait *toppath*))
-	      (rmt:send-receive cmd rid params attemptnum: (+ attemptnum 1)))))))))
-
-;; (define (rmt:update-db-stats run-id rawcmd params duration)
-;;   (mutex-lock! *db-stats-mutex*)
-;;   (handle-exceptions
-;;    exn
-;;    (begin
-;;      (debug:print 0 *default-log-port* "WARNING: stats collection failed in update-db-stats")
-;;      (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn))
-;;      (print "exn=" (condition->list exn))
-;;      #f) ;; if this fails we don't care, it is just stats
-;;    (let* ((cmd      (conc "run-id=" run-id " " (if (eq? rawcmd 'general-call) (car params) rawcmd)))
-;; 	  (stat-vec (hash-table-ref/default *db-stats* cmd #f)))
-;;      (if (not (vector? stat-vec))
-;; 	 (let ((newvec (vector 0 0)))
-;; 	   (hash-table-set! *db-stats* cmd newvec)
-;; 	   (set! stat-vec newvec)))
-;;      (vector-set! stat-vec 0 (+ (vector-ref stat-vec 0) 1))
-;;      (vector-set! stat-vec 1 (+ (vector-ref stat-vec 1) duration))))
-;;   (mutex-unlock! *db-stats-mutex*))
+     (else (extras-case-11 *default-log-port* runremote cmd params attemptnum rid)))))
+    ;;DOT }
+
+;; bunch of small functions factored out of send-receive to make debug easier
+;;
+
+(define (extras-case-11 *default-log-port* runremote cmd params attemptnum rid)
+  ;; (mutex-unlock! *rmt-mutex*)
+  (debug:print-info 12 *default-log-port* "rmt:send-receive, case  9")
+  ;; (mutex-lock! *rmt-mutex*)
+  (let* ((conninfo (remote-conndat runremote))
+	 (dat-in      (case (remote-transport runremote)
+		     ((http) (condition-case ;; handling here has
+					     ;; caused a lot of
+					     ;; problems. However it
+					     ;; is needed to deal with
+					     ;; attemtped
+					     ;; communication to
+					     ;; servers that have gone
+					     ;; away
+			      (http-transport:client-api-send-receive 0 conninfo cmd params)
+			      ((commfail)(vector #f "communications fail"))
+			      ((exn)(vector #f "other fail" (print-call-chain)))))
+		     (else
+		      (debug:print 0 *default-log-port* "ERROR: transport " (remote-transport runremote) " not supported")
+		      (exit))))
+
+;; No Title 
+;; Error: (vector-ref) out of range
+;; #(# (#("db.scm:3740: regex#regexp" #f #f) #("db.scm:3739: regex#string-substitute" #f #f) #("db.scm:3738: base64#base64-decode" #f #f) #("db.scm:3737: z3#z3:decode-buffer" #f #f) #("db.scm:3736: with-input-from-string" #f #f) #("db.scm:3741: s11n#deserialize" #f #f) #("api.scm:374: api:execute-requests" #f #f) #("api.scm:139: call-with-current-continuation" #f #f) #("api.scm:139: with-exception-handler" #f #f) #("api.scm:139: ##sys#call-with-values" #f #f) #("api.scm:158: string->symbol" #f #f) #("api.scm:160: current-milliseconds" #f #f) #("api.scm:161: dbr:dbstruct-read-only" #f #f) #("api.scm:139: k15" #f #f) #("api.scm:139: g19" #f #f) #("api.scm:142: get-call-chain" #f #f)) #("get-test-info-by-id" (1102 507299)))
+;; 6
+;; 
+;; 	Call history:
+;; 
+;; 	http-transport.scm:306: thread-terminate!	  
+;; 	http-transport.scm:307: debug:print-info	  
+;; 	common_records.scm:235: debug:debug-mode	  
+;; 	rmt.scm:259: k587	  
+;; 	rmt.scm:259: g591	  
+;; 	rmt.scm:276: http-transport:server-dat-update-last-access	  
+;; 	http-transport.scm:364: current-seconds	  
+;; 	rmt.scm:282: debug:print-info	  
+;; 	common_records.scm:235: debug:debug-mode	  
+;; 	rmt.scm:283: mutex-unlock!	  
+;; 	rmt.scm:287: extras-transport-succeded	  	<--
+;; +-----------------------------------------------------------------------------+
+;; | Exit Status    : 70  
+;;  
+
+	 (dat      (if (and (vector? dat-in) ;; ... check it is a correct size
+			    (> (vector-length dat-in) 1))
+		       dat-in
+		       (vector #f (conc "communications fail (type 2), dat-in=" dat-in))))
+	 (success  (if (vector? dat) (vector-ref dat 0) #f))
+	 (res      (if (vector? dat) (vector-ref dat 1) #f)))
+    (if (and (vector? conninfo) (< 5 (vector-length conninfo)))
+	(http-transport:server-dat-update-last-access conninfo) ;; refresh access time
+	(begin
+	  (debug:print 0 *default-log-port* "INFO: Should not get here! conninfo=" conninfo)
+	  (set! conninfo #f)
+	  (remote-conndat-set! *runremote* #f) ;; NOTE: *runremote* is global copy of runremote. Purpose: factor out global.
+	  (http-transport:close-connections  area-dat: runremote)))
+    (debug:print-info 13 *default-log-port* "rmt:send-receive, case  9. conninfo=" conninfo " dat=" dat " runremote = " runremote)
+    (mutex-unlock! *rmt-mutex*)
+    (if success ;; success only tells us that the transport was
+	;; successful, have to examine the data to see if
+	;; there was a detected issue at the other end
+	(extras-transport-succeded *default-log-port* *rmt-mutex* attemptnum runremote res params rid cmd)
+	(extras-transport-failed *default-log-port* *rmt-mutex* attemptnum runremote cmd rid params)
+	)))
 
 (define (rmt:print-db-stats)
   (let ((fmtstr "~40a~7-d~9-d~20,2-f")) ;; "~20,2-f"
     (debug:print 18 *default-log-port* "DB Stats\n========")
     (debug:print 18 *default-log-port* (format #f "~40a~8a~10a~10a" "Cmd" "Count" "TotTime" "Avg"))
@@ -275,28 +374,28 @@
     res))
 
 (define (rmt:open-qry-close-locally cmd run-id params #!key (remretries 5))
   (let* ((qry-is-write   (not (member cmd api:read-only-queries)))
 	 (db-file-path   (db:dbfile-path)) ;;  0))
-	 (dbstruct-local (db:setup))  ;; make-dbr:dbstruct path:  dbdir local: #t)))
+	 (dbstruct-local (db:setup #t))  ;; make-dbr:dbstruct path:  dbdir local: #t)))
 	 (read-only      (not (file-write-access? db-file-path)))
 	 (start          (current-milliseconds))
 	 (resdat         (if (not (and read-only qry-is-write))
 			     (let ((v (api:execute-requests dbstruct-local (vector (symbol->string cmd) params))))
 			       (handle-exceptions ;; there has been a long history of receiving strange errors from values returned by the client when things go wrong..
 				exn               ;;  This is an attempt to detect that situation and recover gracefully
 				(begin
-				  (debug:print0 *default-log-port* "ERROR: bad data from server " v " message: "  ((condition-property-accessor 'exn 'message) exn))
+				  (debug:print 0 *default-log-port* "ERROR: bad data from server " v " message: "  ((condition-property-accessor 'exn 'message) exn) ", exn=" exn)
 				  (vector #t '())) ;; should always get a vector but if something goes wrong return a dummy
 				(if (and (vector? v)
 					 (> (vector-length v) 1))
 				    (let ((newvec (vector (vector-ref v 0)(vector-ref v 1))))
 				      newvec)           ;; by copying the vector while inside the error handler we should force the detection of a corrupted record
 				    (vector #t '()))))  ;; we could also check that the returned types are valid
 			     (vector #t '())))
-	 (success        (vector-ref resdat 0))
-	 (res            (vector-ref resdat 1))
+	 (success        (common:safe-vector-ref resdat 0 #f)) ;; (vector-ref resdat 0))
+	 (res            (common:safe-vector-ref resdat 1 #f)) ;; (vector-ref resdat 1))
 	 (duration       (- (current-milliseconds) start)))
     (if (and read-only qry-is-write)
         (debug:print 0 *default-log-port* "ERROR: attempt to write to read-only database ignored. cmd=" cmd))
     (if (not success)
 	(if (> remretries 0)
@@ -311,35 +410,26 @@
 	  ;; (rmt:update-db-stats run-id cmd params duration)
 	  ;; mark this run as dirty if this was a write, the watchdog is responsible for syncing it
 	  (if qry-is-write
 	      (let ((start-time (current-seconds)))
 		(mutex-lock! *db-multi-sync-mutex*)
-/		(set! *db-last-access* start-time)  ;; THIS IS PROBABLY USELESS? (we are on a client)
+		(set! *db-last-access* start-time)  ;; THIS IS PROBABLY USELESS? (we are on a client)
                 (mutex-unlock! *db-multi-sync-mutex*)))))
     res))
 
 (define (rmt:send-receive-no-auto-client-setup connection-info cmd run-id params)
   (let* ((run-id   (if run-id run-id 0))
 	 (res  	   (handle-exceptions
-		    exn
-		    #f
-		    (http-transport:client-api-send-receive run-id connection-info cmd params))))
+		       exn
+		     (begin
+		       (print "transport failed. exn=" exn)
+		       #f)
+		     (http-transport:client-api-send-receive run-id connection-info cmd params))))
     (if (and res (vector-ref res 0))
 	(vector-ref res 1) ;;; YES!! THIS IS CORRECT!! CHANGE IT HERE, THEN CHANGE rmt:send-receive ALSO!!!
 	#f)))
 
-;; ;; Wrap json library for strings (why the ports crap in the first place?)
-;; (define (rmt:dat->json-str dat)
-;;   (with-output-to-string 
-;;     (lambda ()
-;;       (json-write dat))))
-;; 
-;; (define (rmt:json-str->dat json-str)
-;;   (with-input-from-string json-str
-;;     (lambda ()
-;;       (json-read))))
-
 ;;======================================================================
 ;;
 ;; A C T U A L   A P I   C A L L S  
 ;;
 ;;======================================================================
@@ -379,24 +469,30 @@
 
 ;; given a hostname, return a pair of cpu load and update time representing latest intelligence from tests running on that host
 (define (rmt:get-latest-host-load hostname)
   (rmt:send-receive 'get-latest-host-load 0 (list hostname)))
 
-;; (define (rmt:sync-inmem->db run-id)
-;;   (rmt:send-receive 'sync-inmem->db run-id '()))
-
 (define (rmt:sdb-qry qry val run-id)
   ;; add caching if qry is 'getid or 'getstr
   (rmt:send-receive 'sdb-qry run-id (list qry val)))
 
 ;; NOT COMPLETED
 (define (rmt:runtests user run-id testpatt params)
   (rmt:send-receive 'runtests run-id testpatt))
 
+(define (rmt:get-run-record-ids  target run keynames test-patt)
+  (rmt:send-receive 'get-run-record-ids #f (list target run keynames test-patt)))
+
 (define (rmt:get-changed-record-ids since-time)
   (rmt:send-receive 'get-changed-record-ids #f (list since-time)) )
 
+(define (rmt:drop-all-triggers)
+     (rmt:send-receive 'drop-all-triggers #f '()))
+
+(define (rmt:create-all-triggers)
+     (rmt:send-receive 'create-all-triggers #f '()))
+
 ;;======================================================================
 ;;  T E S T   M E T A 
 ;;======================================================================
 
 (define (rmt:get-tests-tags)
@@ -434,10 +530,14 @@
 (define (rmt:get-targets)
   (rmt:send-receive 'get-targets #f '()))
 
 (define (rmt:get-target run-id)
   (rmt:send-receive 'get-target run-id (list run-id)))
+
+(define (rmt:get-run-times runpatt targetpatt)
+  (rmt:send-receive 'get-run-times #f (list runpatt targetpatt ))) 
+
 
 ;;======================================================================
 ;;  T E S T S
 ;;======================================================================
 
@@ -446,15 +546,32 @@
   (rmt:general-call 'register-test run-id run-id test-name item-path))
 
 (define (rmt:get-test-id run-id testname item-path)
   (rmt:send-receive 'get-test-id run-id (list run-id testname item-path)))
 
-;; run-id is NOT used
+;; run-id is NOT used - but it will be! 
 ;;
 (define (rmt:get-test-info-by-id run-id test-id)
   (if (number? test-id)
-      (rmt:send-receive 'get-test-info-by-id run-id (list run-id test-id))
+      (let* ((testdat  (rmt:send-receive 'get-test-info-by-id run-id (list run-id test-id)))
+             (trundir  (vector-ref testdat 10))
+	     (trundatf (conc trundir"/.mt_data/test-run.dat")))
+	;; now we can update a couple fields from the filesystem
+	(handle-exceptions
+	    exn
+	    (begin
+	      (debug:print-info 0 *default-log-port* "Could not update testdat record from "trundatf", exn=" exn)
+	      #f)
+	  (if (and trundir
+		   (file-exists? trundatf))
+	      (let* ((duration     (vector-ref testdat 12)) ;; (db:test-get-run_duration testdat))
+		     (event-time   (vector-ref testdat 5))   ;; (db:test-get-event_time   testdat))
+		     (last-touch   (file-modification-time trundatf))
+		     (new-duration (max duration (- last-touch event-time))))
+		(vector-set! testdat 12 new-duration))))
+	      #;(db:test-set-run_duration! testdat (max duration (- last-touch event-time)))
+	testdat)
       (begin
 	(debug:print 0 *default-log-port* "WARNING: Bad data handed to rmt:get-test-info-by-id run-id=" run-id ", test-id=" test-id)
 	(print-call-chain (current-error-port))
 	#f)))
 
@@ -474,21 +591,27 @@
 
 (define (rmt:set-tests-state-status run-id                      testnames currstate currstatus newstate newstatus)
   (rmt:send-receive 'set-tests-state-status run-id (list run-id testnames currstate currstatus newstate newstatus)))
 
 (define (rmt:get-tests-for-run run-id testpatt states statuses offset limit not-in sort-by sort-order qryvals last-update mode)
-  (if (number? run-id)
-      (rmt:send-receive 'get-tests-for-run run-id (list run-id testpatt states statuses offset limit not-in sort-by sort-order qryvals last-update mode))
-      (begin
-	(debug:print-error 0 *default-log-port* "rmt:get-tests-for-run called with bad run-id=" run-id)
-	(print-call-chain (current-error-port))
-	'())))
+  ;; (if (number? run-id)
+  (rmt:send-receive 'get-tests-for-run run-id (list run-id testpatt states statuses offset limit not-in sort-by sort-order qryvals last-update mode)))
+  ;;    (begin
+  ;;	(debug:print-error 0 *default-log-port* "rmt:get-tests-for-run called with bad run-id=" run-id)
+  ;;	(print-call-chain (current-error-port))
+  ;;	'())))
+
+(define (rmt:get-tests-for-run-state-status run-id testpatt last-update)
+  (rmt:send-receive 'get-tests-for-run-state-status run-id (list run-id testpatt last-update)))
 
 ;; get stuff via synchash 
 (define (rmt:synchash-get run-id proc synckey keynum params)
   (rmt:send-receive 'synchash-get run-id (list run-id proc synckey keynum params)))
 
+(define (rmt:get-tests-for-run-mindata run-id testpatt states status not-in)
+  (rmt:send-receive 'get-tests-for-run-mindata run-id (list run-id testpatt states status not-in)))
+  
 ;; IDEA: Threadify these - they spend a lot of time waiting ...
 ;;
 (define (rmt:get-tests-for-runs-mindata run-ids testpatt states status not-in)
   (let ((multi-run-mutex (make-mutex))
 	(run-id-list (if run-ids
@@ -531,15 +654,10 @@
 ;; 		       run-id-list))))
 
 (define (rmt:delete-test-records run-id test-id)
   (rmt:send-receive 'delete-test-records run-id (list run-id test-id)))
 
-;; This is not needed as test steps are deleted on test delete call
-;;
-;; (define (rmt:delete-test-step-records run-id test-id)
-;;   (rmt:send-receive 'delete-test-step-records run-id (list run-id test-id)))
-
 (define (rmt:test-set-state-status run-id test-id state status msg)
   (rmt:send-receive 'test-set-state-status run-id (list run-id test-id state status msg)))
 
 (define (rmt:test-toplevel-num-items run-id test-name)
   (rmt:send-receive 'test-toplevel-num-items run-id (list run-id test-name)))
@@ -578,18 +696,21 @@
     (apply append 
 	   (map (lambda (run-id)
 		  (rmt:send-receive 'test-get-paths-matching-keynames-target-new run-id (list run-id keynames target res testpatt statepatt statuspatt runname)))
 	   run-ids))))
 
-;; (define (rmt:get-run-ids-matching keynames target res)
-;;   (rmt:send-receive #f 'get-run-ids-matching (list keynames target res)))
-
 (define (rmt:get-prereqs-not-met run-id waitons ref-test-name ref-item-path #!key (mode '(normal))(itemmaps #f))
   (rmt:send-receive 'get-prereqs-not-met run-id (list run-id waitons ref-test-name ref-item-path mode itemmaps)))
 
 (define (rmt:get-count-tests-running-for-run-id run-id)
-  (rmt:send-receive 'get-count-tests-running-for-run-id run-id (list run-id)))
+  (if (number? run-id)
+      (rmt:send-receive 'get-count-tests-running-for-run-id run-id (list run-id))
+      0))
+
+(define (rmt:get-not-completed-cnt run-id)
+  (rmt:send-receive 'get-not-completed-cnt run-id (list run-id)))
+
 
 ;; Statistical queries
 
 (define (rmt:get-count-tests-running run-id)
   (rmt:send-receive 'get-count-tests-running run-id (list run-id)))
@@ -602,10 +723,14 @@
 
 ;; state and status are extra hints not usually used in the calculation
 ;;
 (define (rmt:set-state-status-and-roll-up-items run-id test-name item-path state status comment)
   (rmt:send-receive 'set-state-status-and-roll-up-items run-id (list run-id test-name item-path state status comment)))
+
+(define (rmt:set-state-status-and-roll-up-run run-id state status)
+  (rmt:send-receive 'set-state-status-and-roll-up-run run-id (list run-id state status)))
+
 
 (define (rmt:update-pass-fail-counts run-id test-name)
   (rmt:general-call 'update-pass-fail-counts run-id test-name test-name test-name))
 
 (define (rmt:top-test-set-per-pf-counts run-id test-name)
@@ -612,10 +737,13 @@
   (rmt:send-receive 'top-test-set-per-pf-counts run-id (list run-id test-name)))
 
 (define (rmt:get-raw-run-stats run-id)
   (rmt:send-receive 'get-raw-run-stats run-id (list run-id)))
 
+(define (rmt:get-test-times runname target)
+  (rmt:send-receive 'get-test-times #f (list runname target ))) 
+
 ;;======================================================================
 ;;  R U N S
 ;;======================================================================
 
 (define (rmt:get-run-info run-id)
@@ -622,10 +750,13 @@
   (rmt:send-receive 'get-run-info run-id (list run-id)))
 
 (define (rmt:get-num-runs runpatt)
   (rmt:send-receive 'get-num-runs #f (list runpatt)))
 
+(define (rmt:get-runs-cnt-by-patt runpatt targetpatt keys)
+  (rmt:send-receive 'get-runs-cnt-by-patt #f (list runpatt  targetpatt keys)))
+
 ;; Use the special run-id == #f scenario here since there is no run yet
 (define (rmt:register-run keyvals runname state status user contour)
   (rmt:send-receive 'register-run #f (list keyvals runname state status user contour)))
     
 (define (rmt:get-run-name-from-id run-id)
@@ -641,10 +772,13 @@
   (rmt:send-receive 'delete-old-deleted-test-records #f '()))
 
 (define (rmt:get-runs runpatt count offset keypatts)
   (rmt:send-receive 'get-runs #f (list runpatt count offset keypatts)))
 
+(define (rmt:simple-get-runs runpatt count offset target last-update)
+  (rmt:send-receive 'simple-get-runs #f (list runpatt count offset target last-update)))
+
 (define (rmt:get-all-run-ids)
   (rmt:send-receive 'get-all-run-ids #f '()))
 
 (define (rmt:get-prev-run-ids run-id)
   (rmt:send-receive 'get-prev-run-ids #f (list run-id)))
@@ -653,19 +787,29 @@
   (rmt:send-receive 'lock/unlock-run #f (list run-id lock unlock user)))
 
 ;; set/get status
 (define (rmt:get-run-status run-id)
   (rmt:send-receive 'get-run-status #f (list run-id)))
+
+(define (rmt:get-run-state run-id)
+  (rmt:send-receive 'get-run-state #f (list run-id)))
+
 
 (define (rmt:set-run-status run-id run-status #!key (msg #f))
   (rmt:send-receive 'set-run-status #f (list run-id run-status msg)))
 
+(define (rmt:set-run-state-status run-id state status )
+  (rmt:send-receive 'set-run-state-status #f (list run-id state status)))
+
+(define (rmt:update-tesdata-on-repilcate-db old-lt new-lt)
+(rmt:send-receive 'update-tesdata-on-repilcate-db #f (list old-lt new-lt)))
+
 (define (rmt:update-run-event_time run-id)
   (rmt:send-receive 'update-run-event_time #f (list run-id)))
 
-(define (rmt:get-runs-by-patt  keys runnamepatt targpatt offset limit fields last-runs-update) ;; fields of #f uses default
-  (rmt:send-receive 'get-runs-by-patt #f (list keys runnamepatt targpatt offset limit fields last-runs-update)))
+(define (rmt:get-runs-by-patt  keys runnamepatt targpatt offset limit fields last-runs-update  #!key  (sort-order "asc")) ;; fields of #f uses default
+  (rmt:send-receive 'get-runs-by-patt #f (list keys runnamepatt targpatt offset limit fields last-runs-update sort-order)))
 
 (define (rmt:find-and-mark-incomplete run-id ovr-deadtime)
   ;; (if (rmt:send-receive 'have-incompletes? run-id (list run-id ovr-deadtime))
   (rmt:send-receive 'mark-incomplete run-id (list run-id ovr-deadtime))) ;; )
 
@@ -679,10 +823,19 @@
   (rmt:send-receive 'del-var #f (list varname)))
 
 (define (rmt:set-var varname value)
   (rmt:send-receive 'set-var #f (list varname value)))
 
+(define (rmt:inc-var varname)
+  (rmt:send-receive 'inc-var #f (list varname)))
+
+(define (rmt:dec-var varname)
+  (rmt:send-receive 'dec-var #f (list varname)))
+
+(define (rmt:add-var varname value)
+  (rmt:send-receive 'add-var #f (list varname value)))
+
 ;;======================================================================
 ;; M U L T I R U N   Q U E R I E S
 ;;======================================================================
 
 ;; Need to move this to multi-run section and make associated changes
@@ -746,23 +899,31 @@
     (if (or (not state)(not status))
 	(debug:print 3 *default-log-port* "WARNING: Invalid " (if status "status" "state")
 		     " value \"" (if status state-in status-in) "\", update your validvalues section in megatest.config"))
     (rmt:send-receive 'teststep-set-status! run-id (list run-id test-id teststep-name state-in status-in comment logfile))))
 
+
+(define (rmt:delete-steps-for-test! run-id test-id)
+  (rmt:send-receive 'delete-steps-for-test! run-id (list run-id test-id)))
+
 (define (rmt:get-steps-for-test run-id test-id)
   (rmt:send-receive 'get-steps-for-test run-id (list run-id test-id)))
 
+(define (rmt:get-steps-info-by-id test-step-id)
+  (rmt:send-receive 'get-steps-info-by-id #f (list test-step-id)))
+
 ;;======================================================================
 ;;  T E S T   D A T A 
 ;;======================================================================
 
 (define (rmt:read-test-data run-id test-id categorypatt #!key (work-area #f)) 
   (rmt:send-receive 'read-test-data run-id (list run-id test-id categorypatt)))
-;;   (let ((tdb  (rmt:open-test-db-by-test-id run-id test-id work-area: work-area)))
-;;     (if tdb
-;; 	(tdb:read-test-data tdb test-id categorypatt)
-;; 	'())))
+(define (rmt:read-test-data* run-id test-id categorypatt varpatt #!key (work-area #f)) 
+  (rmt:send-receive 'read-test-data* run-id (list run-id test-id categorypatt varpatt)))
+
+(define (rmt:get-data-info-by-id test-data-id)
+   (rmt:send-receive 'get-data-info-by-id #f (list test-data-id)))
 
 (define (rmt:testmeta-add-record testname)
   (rmt:send-receive 'testmeta-add-record #f (list testname)))
 
 (define (rmt:testmeta-get-record testname)
@@ -790,10 +951,26 @@
 (define (rmt:tasks-set-state-given-param-key param-key new-state)
   (rmt:send-receive 'tasks-set-state-given-param-key #f (list  param-key new-state)))
 
 (define (rmt:tasks-get-last target runname)
   (rmt:send-receive 'tasks-get-last #f (list target runname)))
+
+;;======================================================================
+;; N O   S Y N C   D B 
+;;======================================================================
+
+(define (rmt:no-sync-set var val)
+  (rmt:send-receive 'no-sync-set #f `(,var ,val)))
+
+(define (rmt:no-sync-get/default var default)
+  (rmt:send-receive 'no-sync-get/default #f `(,var ,default)))
+
+(define (rmt:no-sync-del! var)
+  (rmt:send-receive 'no-sync-del! #f `(,var)))
+
+(define (rmt:no-sync-get-lock keyname)
+  (rmt:send-receive 'no-sync-get-lock #f `(,keyname)))
 
 ;;======================================================================
 ;; A R C H I V E S
 ;;======================================================================
 
@@ -812,5 +989,70 @@
 (define (rmt:test-set-archive-block-id run-id test-id archive-block-id)
   (rmt:send-receive 'test-set-archive-block-id run-id (list run-id test-id archive-block-id)))
 
 (define (rmt:test-get-archive-block-info archive-block-id)
   (rmt:send-receive 'test-get-archive-block-info #f (list archive-block-id)))
+
+
+(define (rmtmod:calc-ro-mode runremote *toppath*)
+  (if (and runremote
+	   (remote-ro-mode-checked runremote))
+      (remote-ro-mode runremote)
+      (let* ((dbfile  (conc *toppath* "/megatest.db"))
+	     (ro-mode (not (file-write-access? dbfile)))) ;; TODO: use dbstruct or runremote to figure this out in future
+	(if runremote
+	    (begin
+	      (remote-ro-mode-set! runremote ro-mode)
+	      (remote-ro-mode-checked-set! runremote #t)
+	      ro-mode)
+	    ro-mode))))
+
+(define (extras-readonly-mode rmt-mutex log-port cmd params)
+  (mutex-unlock! rmt-mutex)
+  (debug:print-info 12 log-port "rmt:send-receive, case 3")
+  (debug:print 0 log-port "WARNING: write transaction requested on a readonly area.  cmd="cmd" params="params)
+  #f)
+
+(define (extras-transport-failed *default-log-port* *rmt-mutex* attemptnum runremote cmd rid params)
+  (debug:print 0 *default-log-port* "WARNING: communication failed. Trying again, try num: " attemptnum)
+  (mutex-lock! *rmt-mutex*)
+  (remote-conndat-set!    runremote #f)
+  (http-transport:close-connections area-dat: runremote)
+  (remote-server-url-set! runremote #f)
+  (mutex-unlock! *rmt-mutex*)
+  (debug:print-info 12 *default-log-port* "rmt:send-receive, case  9.1")
+  (rmt:send-receive cmd rid params attemptnum: (+ attemptnum 1)))
+  
+(define (extras-transport-succeded *default-log-port* *rmt-mutex* attemptnum runremote res params rid cmd)
+  (if (and (vector? res)
+	   (eq? (vector-length res) 2)
+	   (eq? (vector-ref res 1) 'overloaded)) ;; since we are
+						 ;; looking at the
+						 ;; data to carry the
+						 ;; error we'll use a
+						 ;; fairly obtuse
+						 ;; combo to minimise
+						 ;; the chances of
+						 ;; some sort of
+						 ;; collision.  this
+						 ;; is the case where
+						 ;; the returned data
+						 ;; is bad or the
+						 ;; server is
+						 ;; overloaded and we
+						 ;; want to ease off
+						 ;; the queries
+      (let ((wait-delay (+ attemptnum (* attemptnum 10))))
+	(debug:print 0 *default-log-port* "WARNING: server is overloaded. Delaying " wait-delay " seconds and trying call again.")
+	(mutex-lock! *rmt-mutex*)
+	(http-transport:close-connections area-dat: runremote)
+	(set! *runremote* #f) ;; force starting over
+	(mutex-unlock! *rmt-mutex*)
+	(thread-sleep! wait-delay)
+	(rmt:send-receive cmd rid params attemptnum: (+ attemptnum 1)))
+      res)) ;; All good, return res
+
+#;(set-functions rmt:send-receive                       remote-server-url-set!
+	       http-transport:close-connections	      remote-conndat-set!
+	       debug:print                            debug:print-info
+	       remote-ro-mode                         remote-ro-mode-set!
+	       remote-ro-mode-checked-set!            remote-ro-mode-checked)

Index: rmtdb.scm
==================================================================
--- rmtdb.scm
+++ rmtdb.scm
@@ -1,11 +1,20 @@
 ;;======================================================================
 ;; Copyright 2006-2013, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 ;;======================================================================
 

ADDED   rmtmod.scm
Index: rmtmod.scm
==================================================================
--- /dev/null
+++ rmtmod.scm
@@ -0,0 +1,84 @@
+;;======================================================================
+;; Copyright 2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
+;;======================================================================
+
+(declare (unit rmtmod))
+(declare (uses commonmod))
+(declare (uses apimod))
+;; (declare (uses apimod.import))
+(declare (uses ulex))
+
+;; (include "ulex/ulex.scm")
+
+(module rmtmod
+	*
+	
+(import scheme chicken data-structures extras)
+(import (prefix sqlite3 sqlite3:) posix typed-records srfi-18)
+(import (prefix commonmod cmod:))
+(import apimod)
+(import (prefix ulex ulex:))
+
+(defstruct alldat
+  (areapath #f)
+  (ulexdat  #f)
+  )
+
+;; return the handle struct for sending queries to a specific database
+;;  - initializes the connection object if this is the first access
+;;    - finds the "captain" and asks who to talk to for the given dbfname
+;;    - establishes the connection to the current dbowner
+;;
+#;(define (rmt:connect alldat dbfname dbtype)
+  (let* ((ulexdat    (or (alldat-ulexdat alldat)
+			 (rmt:setup-ulex alldat))))
+    (ulex:connect ulexdat dbfname dbtype)))
+
+;; setup the remote calls
+#;(define (rmt:setup-ulex alldat)
+  (let* ((udata (ulex:setup))) ;; establish connection to ulex
+    (alldat-ulexdat-set! alldat udata)
+    ;; register all needed procs
+    (ulex:register-handler udata 'ping cmod:get-full-version)  ;; override ping with get-full-version
+    (ulex:register-handler udata 'login cmod:get-full-version) ;; force setup of the connection
+    (ulex:register-handler udata 'execute api:execute-requests)
+    udata))
+
+;; set up a connection to the current owner of the dbfile associated with rid
+;; then send the query to that dbfile owner and wait for a response.
+;;
+#;(define (rmt:send-receive alldat cmd rid params #!key (attemptnum 1)(area-dat #f)) ;; start attemptnum at 1 so the modulo below works as expected
+  (let* (;; (alldat   *alldat*)
+	 (areapath (alldat-areapath alldat))
+	 (dbtype   (if (or (not rid)(< rid 1)) ;; this is the criteria for "main.db"
+		       "main" "runs"))
+	 (dbfname  (if (equal? dbtype "main")
+		       "main.db"
+		       (conc rid ".db")))
+	 (dbfile   (conc areapath "/.db/" dbfname))
+	 (ulexconn (rmt:connect alldat dbfname dbtype))  ;; ulexconn is our new *runremote*, it is a dbowner struct < pdat lastrefresh >
+	 (udata    (alldat-ulexdat alldat)))
+    	(ulex:remote-request udata ulexconn 'immediate dbfile 'execute rid params)))
+    ;; need to call this on the other side 
+    ;; (api:execute-requests dbstruct-local (vector (symbol->string cmd) params))))
+    
+    #;(with-input-from-string
+	(ulex:remote-request udata ulexconn 'immediate dbfile 'execute rid (with-output-to-string (lambda ()(serialize params))))
+       (lambda ()(deserialize)))
+)

DELETED rpc-transport.scm
Index: rpc-transport.scm
==================================================================
--- rpc-transport.scm
+++ /dev/null
@@ -1,228 +0,0 @@
-
-;; Copyright 2006-2012, Matthew Welland.
-;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
-;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
-
-(require-extension (srfi 18) extras tcp s11n rpc)
-(import (prefix rpc rpc:))
-
-(use sqlite3 srfi-1 posix regex regex-case srfi-69 hostinfo md5 message-digest)
-(import (prefix sqlite3 sqlite3:))
-
-(declare (unit rpc-transport))
-
-(declare (uses common))
-(declare (uses db))
-(declare (uses tests))
-(declare (uses tasks)) ;; tasks are where stuff is maintained about what is running.
-
-(include "common_records.scm")
-(include "db_records.scm")
-
-;; procstr is the name of the procedure to be called as a string
-(define (rpc-transport:autoremote procstr params)
-  (handle-exceptions
-   exn
-   (begin
-     (debug:print 1 *default-log-port* "Remote failed for " proc " " params)
-     (apply (eval (string->symbol procstr)) params))
-   ;; (if *runremote*
-   ;;    (apply (eval (string->symbol (conc "remote:" procstr))) params)
-   (apply (eval (string->symbol procstr)) params)))
-
-;; all routes though here end in exit ...
-;;
-;; start_server? 
-;;
-(define (rpc-transport:launch run-id)
-  (let* ((tdbdat (tasks:open-db)))
-    (BB> "rpc-transport:launch fired for run-id="run-id)
-    (set! *run-id*   run-id)
-    (if (args:get-arg "-daemonize")
-        (daemon:ize))
-    (if (server:check-if-running run-id)
-        (begin
-          (debug:print 0 *default-log-port* "INFO: Server for run-id " run-id " already running")
-          (exit 0)))
-    (let loop ((server-id (tasks:server-lock-slot (db:delay-if-busy tdbdat) run-id))
-               (remtries  4))
-      (if (not server-id)
-          (if (> remtries 0)
-              (begin
-                (thread-sleep! 2)
-                (loop (tasks:server-lock-slot (db:delay-if-busy tdbdat) run-id)
-                      (- remtries 1)))
-              (begin
-                ;; since we didn't get the server lock we are going to clean up and bail out
-                (debug:print-info 2 *default-log-port* "INFO: server pid=" (current-process-id) ", hostname=" (get-host-name) " not starting due to other candidates ahead in start queue")
-                (tasks:server-delete-records-for-this-pid (db:delay-if-busy tdbdat) " rpc-transport:launch")))
-          (begin
-            (rpc-transport:run (if (args:get-arg "-server")(args:get-arg "-server") "-") run-id server-id)
-            (exit))))))
-
-(define (rpc-transport:run hostn run-id server-id)
-  (debug:print 2 *default-log-port* "Attempting to start the rpc server ...")
-   ;; (trace rpc:publish-procedure!)
-
-  (rpc:publish-procedure! 'server:login server:login)
-  (rpc:publish-procedure! 'testing (lambda () "Just testing"))
-
-  (let* ((db              #f)
-	 (hostname        (get-host-name))
-	 (ipaddrstr       (let ((ipstr (if (string=? "-" hostn)
-					   ;; (string-intersperse (map number->string (u8vector->list (hostname->ip hostname))) ".")
-					   (server:get-best-guess-address hostname)
-					   #f)))
-			    (if ipstr ipstr hostn))) ;; hostname))) 
-	 (start-port      (open-run-close tasks:server-get-next-port tasks:open-db))
-	 (link-tree-path  (configf:lookup *configdat* "setup" "linktree"))
-	 (rpc:listener    (rpc-transport:find-free-port-and-open (rpc:default-server-port)))
-	 (th1             (make-thread
-			   (lambda ()
-			     ((rpc:make-server rpc:listener) #t))
-			   "rpc:server"))
-			   ;; (cute (rpc:make-server rpc:listener) "rpc:server")
-			   ;; 'rpc:server))
-	 (hostname        (if (string=? "-" hostn)
-			      (get-host-name) 
-			      hostn))
-	 (ipaddrstr       (if (string=? "-" hostn)
-			      (server:get-best-guess-address hostname) ;; (string-intersperse (map number->string (u8vector->list (hostname->ip hostname))) ".")
-			      #f))
-	 (portnum         (rpc:default-server-port))
-	 (host:port       (conc (if ipaddrstr ipaddrstr hostname) ":" portnum))
-	 (tdb             (tasks:open-db)))
-    (thread-start! th1)
-    (set! db *dbstruct-db*)
-    (open-run-close tasks:server-set-interface-port 
-		    tasks:open-db 
-		    server-id 
-		    ipaddrstr portnum)
-    (debug:print 0 *default-log-port* "Server started on " host:port)
-    
-    ;; (trace rpc:publish-procedure!)
-    ;; (rpc:publish-procedure! 'server:login server:login)
-    ;; (rpc:publish-procedure! 'testing (lambda () "Just testing"))
-
-    ;;======================================================================
-    ;;	  ;; end of publish-procedure section
-    ;;======================================================================
-    ;;
-    (on-exit (lambda ()
-	       (open-run-close tasks:server-set-state! tasks:open-db server-id "stopped")))
-
-    (set! *rpc:listener* rpc:listener)
-    (tasks:server-set-state! tdb server-id "running")
-    (set! *dbstruct-db*  (db:setup run-id))
-    ;; if none running or if > 20 seconds since 
-    ;; server last used then start shutdown
-    (let loop ((count 0))
-      (thread-sleep! 5) ;; no need to do this very often
-      (let ((numrunning -1)) ;; (db:get-count-tests-running db)))
-	(if (or (> numrunning 0)
-		(> (+ *db-last-access* 60)(current-seconds)))
-	    (begin
-	      (debug:print-info 0 *default-log-port* "Server continuing, tests running: " numrunning ", seconds since last db access: " (- (current-seconds) *db-last-access*))
-	      (loop (+ 1 count)))
-	    (begin
-	      (debug:print-info 0 *default-log-port* "Starting to shutdown the server side")
-	      (open-run-close tasks:server-delete-record tasks:open-db server-id " rpc-transport:try-start-server stop")
-	      (thread-sleep! 10)
-	      (debug:print-info 0 *default-log-port* "Max cached queries was " *max-cache-size*)
-	      (debug:print-info 0 *default-log-port* "Server shutdown complete. Exiting")
-	      ))))))
-
-(define (rpc-transport:find-free-port-and-open port)
-  (handle-exceptions
-   exn
-	  (begin
-     (print "Failed to bind to port " (rpc:default-server-port) ", trying next port")
-     (rpc-transport:find-free-port-and-open (+ port 1)))
-   (rpc:default-server-port port)
-   (tcp-read-timeout 240000)
-   (tcp-listen (rpc:default-server-port) 10000)))
-
-(define (rpc-transport:ping run-id host port)
-  (handle-exceptions
-   exn
-   (begin
-     (print "SERVER_NOT_FOUND")
-     (exit 1))
-   (let ((login-res ((rpc:procedure 'server:login host port) *toppath*)))
-     (if (and (list? login-res)
-	      (car login-res))
-	 (begin
-	   (print "LOGIN_OK")
-	   (exit 0))
-	 (begin
-	   (print "LOGIN_FAILED")
-	   (exit 1))))))
-
-(define (rpc-transport:client-setup run-id #!key (remtries 10))
-  (if *runremote*
-      (begin
-	(debug:print-error 0 *default-log-port* "Attempt to connect to server but already connected")
-	#f)
-      (let* ((host-info (hash-table-ref/default *runremote* run-id #f))) ;; (open-run-close db:get-var #f "SERVER"))
-	(if host-info
-	    (let ((iface    (car host-info))
-		  (port     (cadr host-info))
-		  (ping-res ((rpc:procedure 'server:login host port) *toppath*)))
-	      (if ping-res
-		  (let ((server-dat (list iface port #f #f #f)))
-		    (hash-table-set! *runremote* run-id server-dat)
-		    server-dat)
-		  (begin
-		    (server:try-running *toppath*)
-		    (thread-sleep! 2)
-		    (rpc-transport:client-setup run-id (- remtries 1)))))
- 	    (let* ((server-db-info (open-run-close tasks:get-server tasks:open-db run-id)))
- 	      (debug:print-info 0 *default-log-port* "client:setup server-dat=" server-dat ", remaining-tries=" remaining-tries)
-	      (if server-db-info
- 		  (let* ((iface     (tasks:hostinfo-get-interface server-db-info))
- 			 (port      (tasks:hostinfo-get-port      server-db-info))
-			 (server-dat (list iface port #f #f #f))
- 			 (ping-res  ((rpc:procedure 'server:login host port) *toppath*)))
- 		    (if start-res
- 			(begin
- 			  (hash-table-set! *runremote* run-id server-dat)
-			  server-dat)
-			(begin
-			  (server:try-running *toppath*)
-			  (thread-sleep! 2)
-			  (rpc-transport:client-setup run-id (- remtries 1)))))
-		  (begin
-		    (server:try-running *toppath*)
-		    (thread-sleep! 2)
-		    (rpc-transport:client-setup run-id (- remtries 1)))))))))
-;; 
-;; 	     (port     (if (and hostinfo (> (length hostdat) 1))(cadr hostdat) #f)))
-;; 	(if (and port
-;; 		 (string->number port))
-;; 	    (let ((portn (string->number port)))
-;; 	      (debug:print-info 2 *default-log-port* "Setting up to connect to host " host ":" port)
-;; 	      (handle-exceptions
-;; 	       exn
-;; 	       (begin
-;; 		 (debug:print-error 0 *default-log-port* "Failed to open a connection to the server at host: " host " port: " port)
-;; 		 (debug:print 0 *default-log-port* "   EXCEPTION: " ((condition-property-accessor 'exn 'message) exn))
-;; 		 ;; (open-run-close 
-;; 		 ;;  (lambda (db . param) 
-;; 		 ;;    (sqlite3:execute db "DELETE FROM metadat WHERE var='SERVER'"))
-;; 		 ;;  #f)
-;; 		 (set! *runremote* #f))
-;; 	       (if (and (not (args:get-arg "-server")) ;; no point in the server using the server using the server
-;; 			((rpc:procedure 'server:login host portn) *toppath*))
-;; 		   (begin
-;; 		     (debug:print-info 2 *default-log-port* "Logged in and connected to " host ":" port)
-;; 		     (set! *runremote* (vector host portn)))
-;; 		   (begin
-;; 		     (debug:print-info 2 *default-log-port* "Failed to login or connect to " host ":" port)
-;; 		     (set! *runremote* #f)))))
-;; 	    (debug:print-info 2 *default-log-port* "no server available")))))
-

DELETED rpctest/rpctest-continuous-client.scm
Index: rpctest/rpctest-continuous-client.scm
==================================================================
--- rpctest/rpctest-continuous-client.scm
+++ /dev/null
@@ -1,138 +0,0 @@
-;;;; rpc-demo.scm
-;;;; Simple database server / client
-
-;;; start server thusly: ./rpctest server test.db
-;;; you will need to init test.db:
-;;; sqlite3 test.db "CREATE TABLE foo (id INTEGER PRIMARY KEY, var TEXT, val TEXT);"
-
-(require-extension (srfi 18) extras tcp rpc sql-de-lite)
-
-;;; Common things
-
-(define total-queries 0)
-(define start-time (current-seconds))
-
-(define operation (string->symbol (car (command-line-arguments))))
-(define param (cadr (command-line-arguments)))
-(print "Operation: " operation ", param: " param)
-
-;; have a pool of db's to pick from
-(define *dbpool* '())
-(define *pool-mutex* (make-mutex))
-1
-(define (get-db)
-  (mutex-lock! *pool-mutex*)
-  (if (null? *dbpool*)
-      (begin
-	(mutex-unlock! *pool-mutex*)
-	(let ((db (open-database param)))
-	  (set-busy-handler! db (busy-timeout 10000))
-	  (exec (sql db "PRAGMA synchronous=0;"))
-	  db))
-      (let ((res (car *dbpool*)))
-	(set! *dbpool* (cdr *dbpool*))
-	(mutex-unlock! *pool-mutex*)
-	res)))
-
-(define (return-db db)
-  (mutex-lock! *pool-mutex*)
-  (set! *dbpool* (cons db *dbpool* ))
-  (let ((res (length *dbpool*)))
-    (mutex-unlock! *pool-mutex*)
-    res))
-
-(define rpc:listener
-  (if (eq? operation 'server)
-      (tcp-listen (rpc:default-server-port))
-      (tcp-listen 0)))
-
-;; Start server thread
-(define rpc:server
-  (make-thread
-   (cute (rpc:make-server rpc:listener) "rpc:server") ;; NOTE: see equivalent code below
-   'rpc:server))
-
-;; This is what the code would look like without cute
-;; (define rpc:server
-;;   (make-thread
-;;    (lambda ()
-;;      ((rpc:make-server rpc:listener) "rpc:server"))
-;;    'rpc:server))
-
-(thread-start! rpc:server)
-
-;;; Server side
-
-(define (server)
-  (rpc:publish-procedure!
-   'change-response-port
-   (lambda (port)
-     (rpc:default-server-port port))
-   #f)
-  ;;(let ((db  (get-db))(open-database param)))
-  ;; (set-finalizer! db finalize!)
-  (rpc:publish-procedure!
-   'query
-   (lambda (sqlstmt callback)
-     (set! total-queries (+ total-queries 1))
-     (print "Executing query '" sqlstmt "' ...")
-     (let ((db (get-db)))
-       (query (for-each-row
-	       callback)
-	      (sql db sqlstmt))
-       (print "Query rate: " (/ total-queries (/ (- (current-seconds) start-time) 60)) " per minute")
-       (print "num dbs: " (return-db db))
-       )))
-  (thread-join! rpc:server))
-
-;;; Client side
-
-(define (callback1 . columns)
-  (let loop ((c columns) (i 0))
-    (unless (null? c)
-      (printf "~a=~s " i (car c))
-      (loop (cdr c) (+ i 1))))
-  (newline))
-
-(define callback2-results '())
-
-(define (callback2 . columns)
-  (set! callback2-results (cons columns callback2-results)))
-
-(define (client param)
-  ((rpc:procedure 'change-response-port "localhost")
-   (tcp-listener-port rpc:listener))
-  ((rpc:procedure 'query "localhost") param callback1)
-  (rpc:publish-procedure! 'callback2 callback2)
-  ((rpc:procedure 'query "localhost") param callback2)
-  (pp callback2-results)
-  (rpc:close-all-connections!)
-  ;; (rpc:close-connection! "localhost" (rpc:default-server-port))
-  )
-
-(define (run-query param)
-  ((rpc:procedure 'query "localhost") param callback1)
-  ((rpc:procedure 'query "localhost") param callback2)
-  callback2-results)
-
-(define (continuous-client #!key (duration 600)) ;; default - run for 10 minutes
-  ((rpc:procedure 'change-response-port "localhost")
-   (tcp-listener-port rpc:listener))
-  (rpc:publish-procedure! 'callback2 callback2)
-  (let loop ()
-    (if (< (- (current-seconds) start-time) duration)
-	(begin
-	  (run-query (conc "INSERT INTO foo (var,val) VALUES (" (random 1000) "," (random 1000) ");"))
-	  (let ((numrows (caaar (run-query "SELECT COUNT(id) FROM foo;"))))
-	    (if (and (number? numrows)
-		     (> numrows 300))
-		(print (run-query (conc "DELETE FROM foo WHERE var > " (random 1000) ";")))))
-	  (loop))))
-  (rpc:close-all-connections!))
-
-;;; Run it
-
-(if (eq? operation 'server)
-    (server)
-    (continuous-client))
-

DELETED rpctest/rpctest.scm
Index: rpctest/rpctest.scm
==================================================================
--- rpctest/rpctest.scm
+++ /dev/null
@@ -1,109 +0,0 @@
-;;;; rpc-demo.scm
-;;;; Simple database server / client
-
-;;; start server thusly: ./rpctest server test.db
-;;; you will need to init test.db:
-;;; sqlite3 test.db "CREATE TABLE foo (id INTEGER PRIMARY KEY, var TEXT, val TEXT);"
-
-(require-extension (srfi 18) extras tcp rpc sql-de-lite)
-
-;;; Common things
-
-(define total-queries 0)
-(define start-time (current-seconds))
-
-(define operation (string->symbol (car (command-line-arguments))))
-(define param (cadr (command-line-arguments)))
-(print "Operation: " operation ", param: " param)
-
-;; have a pool of db's to pick from
-(define *dbpool* '())
-(define *pool-mutex* (make-mutex))
-
-(define (get-db)
-  (mutex-lock! *pool-mutex*)
-  (if (null? *dbpool*)
-      (begin
-	(mutex-unlock! *pool-mutex*)
-	(let ((db (open-database param)))
-	  (set-busy-handler! db (busy-timeout 10000))
-	  (exec (sql db "PRAGMA synchronous=0;"))
-	  db))
-      (let ((res (car *dbpool*)))
-	(set! *dbpool* (cdr *dbpool*))
-	(mutex-unlock! *pool-mutex*)
-	res)))
-
-(define (return-db db)
-  (mutex-lock! *pool-mutex*)
-  (set! *dbpool* (cons db *dbpool* ))
-  (let ((res (length *dbpool*)))
-    (mutex-unlock! *pool-mutex*)
-    res))
-
-(define rpc:listener
-  (if (eq? operation 'server)
-      (tcp-listen (rpc:default-server-port))
-      (tcp-listen 0)))
-
-;; Start server thread
-(define rpc:server
-  (make-thread
-   (cute (rpc:make-server rpc:listener) "rpc:server")
-   'rpc:server))
-
-(thread-start! rpc:server)
-
-;;; Server side
-
-(define (server)
-  (rpc:publish-procedure!
-   'change-response-port
-   (lambda (port)
-     (rpc:default-server-port port))
-   #f)
-  ;;(let ((db  (get-db))(open-database param)))
-  ;; (set-finalizer! db finalize!)
-  (rpc:publish-procedure!
-   'query
-   (lambda (sqlstmt callback)
-     (set! total-queries (+ total-queries 1))
-     (print "Executing query '" sqlstmt "' ...")
-     (let ((db (get-db)))
-       (query (for-each-row
-	       callback)
-	      (sql db sqlstmt))
-       (print "Query rate: " (/ total-queries (/ (- (current-seconds) start-time) 60)) " per minute")
-       (print "num dbs: " (return-db db))
-       )))
-  (thread-join! rpc:server))
-
-;;; Client side
-
-(define (callback1 . columns)
-  (let loop ((c columns) (i 0))
-    (unless (null? c)
-      (printf "~a=~s " i (car c))
-      (loop (cdr c) (+ i 1))))
-  (newline))
-
-(define callback2-results '())
-
-(define (callback2 . columns)
-  (set! callback2-results (cons columns callback2-results)))
-
-(define (client)
-  ((rpc:procedure 'change-response-port "localhost")
-   (tcp-listener-port rpc:listener))
-  ((rpc:procedure 'query "localhost") param callback1)
-  (rpc:publish-procedure! 'callback2 callback2)
-  ((rpc:procedure 'query "localhost") param callback2)
-  (pp callback2-results)
-  (rpc:close-connection! "localhost" (rpc:default-server-port)))
-
-;;; Run it
-
-(if (eq? operation 'server)
-    (server)
-    (client))
-

DELETED rpctest/run-client.sh
Index: rpctest/run-client.sh
==================================================================
--- rpctest/run-client.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-
-while ./rpctest client "insert into foo (var,val) values ($RANDOM,$RANDOM);";do
-    numrows=$(./rpctest client "select count(id) from foo;") # |wc -l)
-    deletefrom=$RANDOM
-    echo "numrows=$numrows, deletefrom=$deletefrom"
-    if [[ $numrows -gt 300 ]];then
-	echo "numrows=$numrows, deletefrom=$deletefrom"
-	./rpctest client "delete from foo where var > $deletefrom;"
-    fi
-done

Index: run-eff.sql
==================================================================
--- run-eff.sql
+++ run-eff.sql
@@ -1,5 +1,21 @@
+--  Copyright 2006-2017, Matthew Welland.
+-- 
+-- This file is part of Megatest.
+-- 
+--     Megatest is free software: you can redistribute it and/or modify
+--     it under the terms of the GNU General Public License as published by
+--     the Free Software Foundation, either version 3 of the License, or
+--     (at your option) any later version.
+-- 
+--     Megatest is distributed in the hope that it will be useful,
+--     but WITHOUT ANY WARRANTY; without even the implied warranty of
+--     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+--     GNU General Public License for more details.
+-- 
+--     You should have received a copy of the GNU General Public License
+--     along with Megatest.  If not, see .
 .mode col
 .head on
 select runs.runname,num_items,printf("%.2f",wall_runtime) AS runtime,printf("%.2f",max_duration) AS duration,ratio,testname from
    (select run_id,
           count(id) AS num_items,

DELETED run-tests-queue-new.scm
Index: run-tests-queue-new.scm
==================================================================
--- run-tests-queue-new.scm
+++ /dev/null

Index: run_records.scm
==================================================================
--- run_records.scm
+++ run_records.scm
@@ -1,14 +1,23 @@
 ;;======================================================================
 ;; Copyright 2006-2012, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
 ;;======================================================================
 
 (define-inline (runs:runrec-make-record) (make-vector 13))
 (define-inline (runs:runrec-get-target  vec)(vector-ref vec 0))  ;; a/b/c
 (define-inline (runs:runrec-get-runname vec)(vector-ref vec 1))  ;; string

Index: runconfig.scm
==================================================================
--- runconfig.scm
+++ runconfig.scm
@@ -1,5 +1,22 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 ;;======================================================================
 ;; read a config file, loading only the section pertinent
 ;; to this run field1val/field2val/field3val ...
 ;;======================================================================
 
@@ -73,11 +90,11 @@
   (let ((runconfigf (conc  *toppath* "/runconfigs.config"))
 	(targ       (or (common:args-get-target)
 			targ-from-db
 			(get-environment-variable "MT_TARGET"))))
     (pop-directory)
-    (if (file-exists? runconfigf)
+    (if (common:file-exists? runconfigf)
 	(setup-env-defaults runconfigf run-id #t keyvals
 			    environ-patt: (conc "(default"
 						(if targ
 						    (conc "|" targ ")")
 						    ")")))

Index: runconfigs.config
==================================================================
--- runconfigs.config
+++ runconfigs.config
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # To get emacs font highlighing in the various megatest configs do this:
 #
 # Install emacs-goodies-el:
 #    sudo apt install emacs-goodies-el
 # Add to your ~/.emacs file:
@@ -6,14 +23,14 @@
 #    (add-to-list 'auto-mode-alist '("config\\'" . conf-space-mode))
 #
 
 # example of a cron entry to run sync using db spec pgdb, with pgdb setting in file local.config
 #
-[a/b/c]
-all:scheduled:sync          cron=  0/5 * * * *;dbdest=pgdb;appendconf=/mfs/matt/.sysmaint/local.config
-quick:scheduled:sync        cron=  0/5 * * * *;dbdest=pgdb;appendconf=/mfs/matt/.sysmaint/local.config
-fast:scheduled:sync-prepend cron=  0/1 * * * *;dbdest=pgdb;appendconf=/mfs/matt/.sysmaint/local.config
+[a/b/c/d]
+all:scheduled:sync     cron=  0/5 * * * *;dbdest=pgdb;appendconf=/nfs/phoebe/disk1/home/mfs/matt/.sysmaint/local.config
+# quick:scheduled:sync   cron=  0/5 * * * *;dbdest=pgdb;appendconf=/nfs/phoebe/disk1/home/mfs/matt/.sysmaint/local.config
+# fast:scheduled:sync-prepend cron=  0/1 * * * *;dbdest=pgdb;appendconf=/mfs/matt/.sysmaint/local.config
 
 [scriptinc ./gentargets.sh #{getenv USER}]
 # [v1.23/45/67]
 
 # tip will be replaced with hashkey?
@@ -25,24 +42,25 @@
 # [v1.63/tip/dev]
 # file:   files changes since last run trigger new run
 # script: script is called with unix seconds as last parameter (other parameters are preserved)
 #
 # contour:sensetype:action params            data
-quick:file:run             runtrans=auto;         glob=/home/matt/data/megatest/*.scm
-snazy:file:run             runtrans=corporate-ww; glob=/home/matt/data/megatest/*.scm
-short:file:run             runtrans=short;        glob=/home/matt/data/megatest/*.scm
+# commented out for debug
+quick:file:run             runtrans=auto;         glob=/home/matt/data/megatest/*.scm foo.touchme
+# snazy:file:run             runtrans=corporate-ww; glob=/home/matt/data/megatest/*.scm
+# short:file:run       runtrans=short;        glob=/home/matt/data/megatest/*.scm
 
 # script returns change-time (unix epoch), new-target-name, run-name
 #
 # quick:script:run           checkfossil = http://www.kiatoa.com/fossils/megatest v1.63;\
 #                            checkfossil = http://www.kiatoa.com/fossils/megatest_qa trunk
 
-# fossil based trigger
-#
-quick:fossil:run           http://www.kiatoa.com/fossils/megatest=v1.63;\
-                           http://www.kiatoa.com/fossils/megatest_qa=trunk;\
-		           http://www.kiatoa.com/fossils/megatest=v1.64
+# # fossil based trigger
+# #
+# quick:fossil:run           http://www.kiatoa.com/fossils/megatest=v1.63;\
+#                            http://www.kiatoa.com/fossils/megatest_qa=trunk;\
+# 		           http://www.kiatoa.com/fossils/megatest=v1.64
 
 # field          allowed values
 # -----          --------------
 # minute         0-59
 # hour           0-23

Index: runs-launch-loop-test.scm
==================================================================
--- runs-launch-loop-test.scm
+++ runs-launch-loop-test.scm
@@ -1,5 +1,22 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
 (use srfi-69)
 
 (define (runs:queue-next-hed tal reg n regful)
   (if regful
       (car reg)

Index: runs.scm
==================================================================
--- runs.scm
+++ runs.scm
@@ -1,20 +1,27 @@
-
 ;; Copyright 2006-2016, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
 
 ;;  strftime('%m/%d/%Y %H:%M:%S','now','localtime')
 
-(use sqlite3 srfi-1 posix regex regex-case srfi-69 dot-locking (srfi 18) 
-     posix-extras directory-utils pathname-expand typed-records format)
-(import (prefix sqlite3 sqlite3:))
+(use (prefix sqlite3 sqlite3:) srfi-1 posix regex regex-case srfi-69 (srfi 18) 
+     posix-extras directory-utils pathname-expand typed-records format  sxml-serializer
+     sxml-modifications matchable)
 
 (declare (unit runs))
 (declare (uses db))
 (declare (uses common))
 (declare (uses items))
@@ -21,11 +28,10 @@
 (declare (uses runconfig))
 (declare (uses tests))
 (declare (uses server))
 (declare (uses mt))
 (declare (uses archive))
-(declare (uses keys))
 ;; (declare (uses filedb))
 
 (include "common_records.scm")
 (include "key_records.scm")
 (include "db_records.scm")
@@ -40,18 +46,164 @@
 (defstruct runs:dat
   reglen regfull
   runname max-concurrent-jobs run-id
   test-patts required-tests test-registry
   registry-mutex flags keyvals run-info all-tests-registry
-  can-run-more-tests
-  ((can-run-more-tests-count 0) : fixnum))
+  ;; stores results from last runs:can-run-more-tests 
+  (can-run-more-tests      #f) ;; (list can-run-more-flag num-running num-running-in-jobgroup max-concurrent-jobs job-group-limit)
+  ((can-run-more-tests-count 0) : fixnum)
+  (last-fuel-check         0)  ;; time when we last checked fuel
+  (beginning-of-time       (current-seconds))
+  (load-mgmt-function      #f)
+  (wait-for-jobs-function  #f)
+  (last-load-check-time    0)
+  (last-jobs-check-time    0)
+  )
 
 (defstruct runs:testdat
   hed tal reg reruns  test-record
   test-name item-path jobgroup
   waitons testmode  newtal itemmaps prereqs-not-met)
 
+(module runsmod
+    (
+     runs:wait-if-seen-recently
+     )
+  
+(import scheme chicken data-structures extras files)
+(import posix typed-records srfi-18 srfi-69
+	  md5 message-digest
+	  regex srfi-1)
+
+(define *last-seen-ht* (make-hash-table))
+
+(define (runs:wait-if-seen-recently wait-until . keys)
+  (let* ((full-key   (string-intersperse keys "-"))
+	 (last-seen  (hash-table-ref/default *last-seen-ht* full-key 0))
+	 (now        (current-seconds))
+	 (delta      (- now last-seen))
+	 (needed     (if (< delta wait-until)
+			 0
+			 (- wait-until delta))))
+    (if (> needed 0)(thread-sleep! needed))
+    (hash-table-set! *last-seen-ht* full-key (current-seconds))
+    needed))
+)
+
+(import runsmod)
+    
+;; look in the $MT_RUN_AREA_HOME/.softlocks directory for key-host-pid.softlock files
+;;  - remove any that are over 3600 seconds old
+;;  - if there are any that are younger than 10 seconds
+;;      * sleep 10 seconds
+;;      * touch my key-host-pid.softlock file
+;;      * return
+;;  - if there are no files younger than 10 seconds
+;;     * touch my key-host-pid.softlock file
+;;     * return
+;;  
+(define (runs:wait-on-softlock rdat key)
+  (if (not (and *toppath* (file-exists? *toppath*))) ;; don't seem to have toppath yet
+      (debug:print-info 0 *default-log-port* "Can't create softlocks - don't see MTRAH yet.")
+      (let* ((softlocks-dir (conc *toppath* "/.softlocks")))
+	(if (not (file-exists? softlocks-dir))
+	    (create-directory softlocks-dir #t))
+	(let* ((my-lock-file   (conc softlocks-dir "/" key "-" (get-host-name) "-" (current-process-id) ".softlock"))
+	       (lock-files     (filter (lambda (x)
+					 (not (equal? x my-lock-file)))
+				       (glob (conc softlocks-dir "/" key "*.softlock"))))
+	       (fresh-locks    (any (lambda (x) ;; do we have any locks younger than 10 seconds
+				      (let* ((mod-time (file-modification-time x))
+					     (age      (- (current-seconds) mod-time)))
+					(cond
+					 ((> age 3600) ;; too old to keep, remove it
+					  (delete-file* x) #f)
+					 ((< age 10)  #t)
+					 (else #f))))
+				    lock-files)))
+	  (if fresh-locks
+	      (begin
+		(if (runs:lownoise "runners-softlock-wait" 360)
+		    (debug:print-info 0 *default-log-port* "Other runners in flight, giving up some time..."))
+		(thread-sleep! 2))
+	      (begin
+		(if (runs:lownoise "runners-softlock-nowait" 360)
+		    (debug:print-info 0 *default-log-port* "No runners in flight, updating softlock"))
+		(let* ((ouf (open-output-file my-lock-file)))
+		  (with-output-to-port ouf
+		    (lambda ()(print (current-seconds))))
+		  (close-output-port ouf))))
+	  (runs:dat-last-fuel-check-set! rdat (current-seconds))))))
+  
+;; Fourth try, do accounting through time
+;;
+(define (runs:parallel-runners-mgmt rdat)
+  (let ((time-to-check (configf:lookup-number *configdat* "runners" "time-to-check" default: 10)) ;; 28
+	(time-to-wait  (configf:lookup-number *configdat* "runners" "time-to-wait" default: 30))
+	(now-time      (current-seconds)))
+    (if (> (- now-time (runs:dat-last-fuel-check rdat)) time-to-check) ;; time to check
+	(runs:wait-on-softlock rdat "runners"))))
+
+;; To test parallel-runners management start a repl:
+;;  megatest -repl
+;; then run:
+;;  (runs:test-parallel-runners 60)
+;;
+(define (runs:test-parallel-runners duration #!optional (proc #f))
+  (let* ((rdat   (make-runs:dat))
+	 (rtime  0)
+	 (startt (current-seconds))
+	 (endt   (+ startt duration)))
+    ((or proc runs:parallel-runners-mgmt) rdat)
+    (let loop ()
+      (let* ((wstart (current-seconds)))
+	(if (< wstart endt)
+	    (let* ((work-time (random 10)))
+	      #;(debug:print-info 0 *default-log-port* "working for " work-time
+				" seconds. Total work: " rtime ", elapsed time: " (- wstart startt))
+	      (thread-sleep! work-time)
+	      (set! rtime (+ rtime work-time))
+	      ((or proc runs:parallel-runners-mgmt) rdat)
+	      (loop)))))
+    (let* ((done-time (current-seconds)))
+      (debug:print-info 0 *default-log-port* "DONE: rtime=" rtime ", elapsed time=" (- done-time startt)
+			", ratio=" (/ rtime (- done-time startt))))))
+
+(define (runs:get-mt-env-alist run-id runname target testname itempath)
+  ;;(bb-check-path msg: "runs:set-megatest-env-vars entry")
+  `(("MT_TEST_NAME"     . ,testname)
+    
+    ("MT_ITEMPATH"      . ,itempath)
+
+    ("MT_TARGET"        . ,target)
+    
+    ("MT_RUNNAME"       . ,runname)
+    
+    ("MT_RUN_AREA_HOME" . ,*toppath*)
+    
+    ,@(let* ((link-tree (common:get-linktree))) ;; (configf:lookup *configdat* "setup" "linktree")))
+        (if link-tree
+            (list (cons "MT_LINKTREE" link-tree)
+                  
+                  (cons "MT_TEST_RUN_DIR"
+                        (conc link-tree  "/" target "/" runname "/" testname
+                              (if (and (string? itempath) (not (equal? itempath "")))
+                                  (conc "/" itempath)
+                                  "")))
+                  )
+            '()))
+    
+    ,@(map
+       (lambda (key)
+         (cons  (car key) (cadr key)))
+       (keys:target->keyval (rmt:get-keys) target))
+    
+    ,@(map (lambda (var)
+             (let ((val (configf:lookup *configdat* "env-override" var)))
+               (cons var val)))
+           (configf:section-vars *configdat* "env-override"))))
+    
 ;; set up needed environment variables given a run-id and optionally a target, itempath etc.
 ;;
 (define (runs:set-megatest-env-vars run-id #!key (inkeys #f)(inrunname #f)(inkeyvals #f)(intarget #f)(testname #f)(itempath #f))
   ;;(bb-check-path msg: "runs:set-megatest-env-vars entry")
   (let* ((target    (or intarget 
@@ -94,20 +246,32 @@
 	  exn
 	  (let ((call-chain (get-call-chain))
 		(msg        ((condition-property-accessor 'exn 'message) exn)))
 	    (if (< count 5)
 		(begin ;; this call is colliding, do some crude stuff to fix it.
-		  (debug:print 0 *default-log-port* "ERROR: *configdat* was inaccessible! This should never happen. Retry #" count)
+		  (debug:print 0 *default-log-port* "ERROR: *configdat* was inaccessible! This should never happen. Retry #" count
+			       ", exn=" exn)
 		  (launch:setup force-reread: #t)
-		  (fatal-loop (+ count 1)))
+		  (fatal-loop (+ count 1))) 
 		(begin
-		  (debug:print 0 *default-log-port* "FATAL: *configdat* was inaccessible! This should never happen. Retried " count " times. Message: " msg)
+		  (debug:print 0 *default-log-port* "FATAL: *configdat* was inaccessible! This should never happen. Retried " count
+			       " times. Message: " msg)
 		  (debug:print 0 *default-log-port* "Call chain:")
 		  (with-output-to-port *default-log-port*
-		    (lambda ()(pp call-chain)))
+
+                    (lambda ()
+                      (print "*configdat* is >>"*configdat*"<<")
+                      (pp *configdat*)
+                      (pp call-chain)))
+                  
 		  (exit 1))))
           ;;(bb-check-path msg: "runs:set-megatest-env-vars block 1.5")
+          (when (or (not *configdat*) (not (hash-table? *configdat*)))
+              (debug:print 0 *default-log-port* "WARNING: *configdat* was inaccessible! This should never happen.  Brute force reread.")
+              ;;(BB> "ERROR: *configdat* was inaccessible! This should never happen.  Brute force reread.")
+              (thread-sleep! 2) ;; assuming nfs lag.
+              (launch:setup force-reread: #t))
           (alist->env-vars (hash-table-ref/default *configdat* "env-override" '())))) ;;;; environment is tainted HERE in this let block.
     ;;(bb-check-path msg: "runs:set-megatest-env-vars block 2")
     ;; Lets use this as an opportunity to put MT_RUNNAME in the environment
     (let ((runname  (if inrunname inrunname (rmt:get-run-name-from-id run-id))))
       (if runname
@@ -176,22 +340,21 @@
 	  (hash-table-set! *runs:denoise* key currtime)
 	  #t)
 	#f)))
 
 (define (runs:can-run-more-tests runsdat run-id jobgroup max-concurrent-jobs)
+
   ;; Take advantage of a good place to exit if running the one-pass methodology
   (if (and (> (runs:dat-can-run-more-tests-count runsdat) 20)
 	   (args:get-arg "-one-pass"))
       (exit 0))
-  (thread-sleep! (cond
-        	  ((> (runs:dat-can-run-more-tests-count runsdat) 20)
-		   (if (runs:lownoise "waiting on tasks" 60)(debug:print-info 2 *default-log-port* "waiting for tasks to complete, sleeping briefly ..."))
-		   2);; obviously haven't had any work to do for a while
-        	  (else 0)))
-  (let* ((num-running             (rmt:get-count-tests-running run-id))
+
+  (if (runs:dat-load-mgmt-function runsdat)((runs:dat-load-mgmt-function runsdat)))
+
+  (let* ((num-running             (rmt:get-count-tests-running run-id)) 
 	 (num-running-in-jobgroup (rmt:get-count-tests-running-in-jobgroup run-id jobgroup))
-	 (job-group-limit         (let ((jobg-count (config-lookup *configdat* "jobgroups" jobgroup)))
+	 (job-group-limit         (let ((jobg-count (configf:lookup *configdat* "jobgroups" jobgroup)))
 				    (if (string? jobg-count)
 					(string->number jobg-count)
 					jobg-count))))
     (if (> (+ num-running num-running-in-jobgroup) 0)
 	(runs:inc-can-run-more-tests-count runsdat)) ;; (set! *runs:can-run-more-tests-count* (+ *runs:can-run-more-tests-count* 1)))
@@ -199,11 +362,11 @@
 	(begin
 	  (debug:print 2 *default-log-port* "max-concurrent-jobs: " max-concurrent-jobs ", num-running: " num-running)
 	  (set! *last-num-running-tests* num-running)))
     (if (not (eq? 0 *globalexitstatus*))
 	(list #f num-running num-running-in-jobgroup max-concurrent-jobs job-group-limit)
-	(let ((can-not-run-more (cond
+	(let* ((can-not-run-more (cond
 				 ;; if max-concurrent-jobs is set and the number running is greater 
 				 ;; than it then cannot run more jobs
 				 ((and max-concurrent-jobs (>= num-running max-concurrent-jobs))
 				  (if (runs:lownoise "mcj msg" 60)
 				      (debug:print 0 *default-log-port* "WARNING: Max running jobs exceeded, current number running: " num-running 
@@ -218,11 +381,98 @@
 						   " in jobgroup \"" jobgroup "\" exceeds limit of " job-group-limit))
 				  #t)
 				 (else #f))))
 	  (list (not can-not-run-more) num-running num-running-in-jobgroup max-concurrent-jobs job-group-limit)))))
 
+(define (runs:run-pre-hook run-id)
+    (let* ((run-pre-hook   (configf:lookup *configdat* "runs" "pre-hook"))
+           (existing-tests (if run-pre-hook
+                               (rmt:get-tests-for-run run-id "%" '() '() ;; run-id testpatt states statuses
+                                                      #f #f ;; offset limit
+                                                      #f ;; not-in
+                                                      #f ;; sort-by
+                                                      #f ;; sort-order
+                                                      #f ;; get full data (not 'shortlist)
+                                                      0 ;; (runs:gendat-inc-results-last-update *runs:general-data*) ;; last update time
+                                                      'dashboard)
+                               '()))
+           (log-dir         (conc *toppath* "/logs"))
+           (log-file        (conc "pre-hook-" (string-translate (getenv "MT_TARGET") "/" "-") "-" (getenv "MT_RUNNAME") ".log"))
+           (full-log-fname  (conc log-dir "/" log-file)))
+      (if run-pre-hook
+          (if (null? existing-tests)
+              (let* ((use-log-dir (if (not (directory-exists? log-dir))
+                                      (handle-exceptions
+                                       exn
+                                       (begin
+                                         (debug:print 0 *default-log-port* "WARNING: Failed to create " log-dir ", exn=" exn)
+                                         #f)
+                                       (create-directory log-dir #t)
+                                       #t)
+                                      #t))
+                     (start-time   (current-seconds))
+                     (actual-logf  (if use-log-dir full-log-fname log-file)))
+                (handle-exceptions
+                 exn
+                 (begin
+                   (print-call-chain *default-log-port*)
+                   (debug:print 0 *default-log-port* "Message: " ((condition-property-accessor 'exn 'message) exn) ", exn=" exn)
+                   (debug:print 0 *default-log-port* "ERROR: failed to run pre-hook " run-pre-hook ", check the log " log-file))
+                 (debug:print-info 0 *default-log-port* "running run-pre-hook: \"" run-pre-hook "\", log is " actual-logf)
+                 (system (conc run-pre-hook " >> " actual-logf " 2>&1"))
+                 (debug:print-info 0 *default-log-port* "pre-hook \"" run-pre-hook "\" took " (- (current-seconds) start-time) " seconds to run.")))
+              (debug:print 0 *default-log-port* "Skipping pre-hook call \"" run-pre-hook "\" as there are existing tests for this run.")))))
+    
+(define (runs:run-post-hook run-id)
+    (let* ((run-post-hook   (configf:lookup *configdat* "runs" "post-hook"))
+           (existing-tests (if run-post-hook
+                               (rmt:get-tests-for-run run-id "%" '() '() ;; run-id testpatt states statuses
+                                                      #f #f ;; offset limit
+                                                      #f ;; not-in
+                                                      #f ;; sort-by
+                                                      #f ;; sort-order
+                                                      #f ;; get full data (not 'shortlist)
+                                                      0 ;; (runs:gendat-inc-results-last-update *runs:general-data*) ;; last update time
+                                                      'dashboard)
+                               '()))
+           (log-dir         (conc *toppath* "/logs"))
+           (log-file        (conc "post-hook-" (string-translate (getenv "MT_TARGET") "/" "-") "-" (getenv "MT_RUNNAME") ".log"))
+           (full-log-fname  (conc log-dir "/" log-file)))
+      (if run-post-hook
+          ;; (if (null? existing-tests)
+          ;;    (debug:print 0 *default-log-port* "Skipping post-hook call \"" run-post-hook "\" as there are existing tests for this run.")))))
+	  (let* ((use-log-dir (if (not (directory-exists? log-dir))
+				  (handle-exceptions
+				      exn
+				      (begin
+					(debug:print 0 *default-log-port* "WARNING: Failed to create " log-dir ", exn=" exn)
+					#f)
+				    (create-directory log-dir #t)
+				    #t)
+				  #t))
+		 (start-time   (current-seconds))
+		 (actual-logf  (if use-log-dir full-log-fname log-file)))
+	    (handle-exceptions
+		exn
+		(begin
+		  (print-call-chain *default-log-port*)
+		  (debug:print 0 *default-log-port* "Message: " ((condition-property-accessor 'exn 'message) exn) ", exn=" exn)
+		  (debug:print 0 *default-log-port* "ERROR: failed to run post-hook " run-post-hook ", check the log " log-file))
+	      (debug:print-info 0 *default-log-port* "running run-post-hook: \"" run-post-hook "\", log is " actual-logf)
+	      (system (conc run-post-hook " >> " actual-logf " 2>&1"))
+	      (debug:print-info 0 *default-log-port* "post-hook \"" run-post-hook "\" took " (- (current-seconds) start-time) " seconds to run."))))))
 
+;; return #t when all items in waitors-upon list are represented in test-patt, #f otherwise.
+(define (runs:testpatts-mention-waitors-upon? test-patt waitors-upon)
+  (null? (tests:filter-test-names-not-matched waitors-upon test-patt)))
+
+(define *find-and-mark-incomplete-last-run* (make-hash-table))
+
+;;======================================================================
+;; runs:run-tests is called from megatest.scm and itself
+;;======================================================================
+;;
 ;;  test-names: Comma separated patterns same as test-patts but used in selection 
 ;;              of tests to run. The item portions are not respected.
 ;;              FIXME: error out if /patt specified
 ;;            
 (define (runs:run-tests target runname test-patts user flags #!key (run-count 1)) ;; test-names
@@ -237,15 +487,17 @@
 	 ;; need to process runconfigs before generating these lists
 	 (all-tests-registry #f)  ;; (tests:get-all)) ;; (tests:get-valid-tests (make-hash-table) test-search-path)) ;; all valid tests to check waiton names
 	 (all-test-names     #f)  ;; (hash-table-keys all-tests-registry))
 	 (test-names         #f)  ;; Generated by a call to (tests:filter-test-names all-test-names test-patts))
 	 (required-tests     #f)  ;; Put fully qualified test/testpath names in this list to be done
+         (waitors-upon       (make-hash-table)) ;; given a test, return list of tests waiting upon this test.
 	 (task-key           (conc (hash-table->alist flags) " " (get-host-name) " " (current-process-id)))
 	 ;; (tdbdat             (tasks:open-db))
 	 (config-reruns      (let ((x (configf:lookup *configdat* "setup" "reruns")))
 			       (if x (string->number x) #f)))
-	 (allowed-tests      #f))
+	 (allowed-tests      #f)
+	 (runconf            #f))
 
     ;; check if readonly
     (when readonly-mode
       (debug:print-error 0 *default-log-port* "megatest.db is readonly.  Cannot proceed.")
       (exit 1))
@@ -253,14 +505,15 @@
     ;; per user request. If less than 100Meg space on dbdir partition, bail out with error
     ;; this will reduce issues in database corruption
     (common:check-db-dir-and-exit-if-insufficient)
 
     ;; override the number of reruns from the configs
-    (if (and config-reruns
-	     (> run-count config-reruns))
-	(set! run-count config-reruns))
-    
+    ;; this needs to be done at the place where is first runs:run-tests called 
+    ;(if (and config-reruns
+	  ;   (> run-count config-reruns))
+ 	  ;(set! run-count config-reruns))
+
     ;; (if (tasks:need-server run-id)(tasks:start-and-wait-for-server tdbdat run-id 10))
 
     (let ((sighand (lambda (signum)
 		     ;; (signal-mask! signum) ;; to mask or not? seems to cause issues in exiting
 		     (set! *time-to-exit* #t)
@@ -279,23 +532,29 @@
 		       (thread-start! th1)
 		       (thread-join! th2)))))
       (set-signal-handler! signal/int sighand)
       (set-signal-handler! signal/term sighand))
 
-    ;; force the starting of a server
-    (debug:print 0 *default-log-port* "waiting on server...")
-    (server:start-and-wait *toppath*)
+    ;; force the starting of a server -- removed BB 17ww28 - no longer needed.
+    ;;(debug:print 0 *default-log-port* "waiting on server...")
+    ;;(server:start-and-wait *toppath*)
     
     (runs:set-megatest-env-vars run-id inkeys: keys inrunname: runname) ;; these may be needed by the launching process
-    (set! runconf (if (file-exists? runconfigf)
+    (set! runconf (if (common:file-exists? runconfigf)
 		      (setup-env-defaults runconfigf run-id *already-seen-runconfig-info* keyvals target)
 		      (begin
 			(debug:print 0 *default-log-port* "WARNING: You do not have a run config file: " runconfigf)
 			#f)))
 
     (if (not test-patts) ;; first time in - adjust testpatt
 	(set! test-patts (common:args-get-testpatt runconf)))
+    ;; if test-patts is #f at this point there is something wrong and we need to bail out
+    (if (not test-patts)
+	(begin
+	  (debug:print 0 *default-log-port* "WARNING: there is no test pattern for this run. Exiting now.")
+	  (exit 0)))
+    
     (if (args:get-arg "-tagexpr")
 	(begin
 	  (set! allowed-tests (string-join (runs:get-tests-matching-tags (args:get-arg "-tagexpr")) ","))
 	  	  (debug:print-info 0 *default-log-port* "filtering initial test list with tagexpr: " (args:get-arg "-tagexpr") " => " allowed-tests)
 		  ));; tests will be ANDed with this list
@@ -302,10 +561,17 @@
 
     ;; register this run in monitor.db
     (rmt:tasks-add "run-tests" user target runname test-patts task-key) ;; params)
     (rmt:tasks-set-state-given-param-key task-key "running")
 
+    #;(common:telemetry-log "run-tests"
+                          payload:
+                          `( (target . ,target)
+                             (run-name . ,runname)
+                             (test-patts . ,test-patts) ) )
+
+    
     ;; Now generate all the tests lists
     (set! all-tests-registry (tests:get-all))   ;; hash of testname => path-to-test
     (set! all-test-names     (hash-table-keys all-tests-registry))
     ;; filter first for allowed-tests (from -tagexpr) then for test-patts.
     (set! test-names         (tests:filter-test-names
@@ -320,12 +586,13 @@
     ;; 1. fill required tests with test-patts
     ;; 2. scan testconfigs and if waitons, itemwait, itempatt calc prior test test-patt
     ;; 3. repeat until all deps propagated
     
     ;; any tests with direct mention in test-patts can be added to required
+    ;;(set! required-tests     (lset-intersection equal? (string-split test-patts ",") all-test-names))
+    (set! required-tests     (tests:filter-test-names all-test-names test-patts))
     ;;
-    (set! required-tests     (lset-intersection equal? (string-split test-patts ",") all-test-names))
     ;; (set! required-tests     (lset-intersection equal? test-names all-test-names))
     
     ;; look up all tests matching the comma separated list of globs in
     ;; test-patts (using % as wildcard)
 
@@ -361,24 +628,49 @@
 	   (string-split (or (configf:lookup *configdat* "setup" "allow-auto-rerun") "")))))
 
     ;; Ensure all tests are registered in the test_meta table
     (runs:update-all-test_meta #f)
 
+    ;; run the run prehook if there are no tests yet run for this run:
+    ;;
+    (runs:run-pre-hook run-id)
+    ;; mark all test launced flag as false in the meta table 
+    (rmt:set-var (conc "lunch-complete-" run-id) "no")
+    (debug:print-info 1 *default-log-port* "Setting end-of-run to no")
+    (let* ((config-reruns      (let ((x (configf:lookup *configdat* "setup" "reruns")))
+				 (if x (string->number x) #f)))
+	   (config-rerun-cnt (if config-reruns
+				 config-reruns
+				 1)))
+      (if (eq? config-rerun-cnt run-count)
+	  (rmt:set-var (conc "end-of-run-" run-id) "no")))
+    
+    (rmt:set-run-state-status run-id "new" "n/a")
     ;; now add non-directly referenced dependencies (i.e. waiton)
     ;;======================================================================
     ;; refactoring this block into tests:get-full-data
     ;;
     ;; What happended, this code is now duplicated in tests!?
     ;;
     ;;======================================================================
     
-    (if (not (null? test-names))
+    (if (not (null? test-names)) ;; BEGIN test-names loop
 	(let loop ((hed (car test-names))   ;; NOTE: This is the main loop that iterates over the test-names
 		   (tal (cdr test-names)))         ;; 'return-procs tells the config reader to prep running system but return a proc
+          (debug:print-info 4 *default-log-port* "\n\ntestpatt elaboration loop => hed="hed " tal="tal" test-patts="test-patts" test-names="test-names)
 	  (change-directory *toppath*) ;; PLEASE OPTIMIZE ME!!! I think this should be a no-op but there are several places where change-directories could be happening.
 	  (setenv "MT_TEST_NAME" hed) ;; 
-	  (let*-values (((waitons waitors config)(tests:get-waitons hed all-tests-registry)))
+	  (let*-values (((waitons waitors config) (tests:get-waitons hed all-tests-registry))
+
+			;; NOTE: Have the config - can extract [waitons] section
+			
+                        ((hed-mode)
+                         (let ((m (configf:lookup config "requirements" "mode")))
+                           (if m (map string->symbol (string-split m)) '(normal))))
+                        ((hed-itemized-waiton) ;; are items in hed waiting on items of waiton?
+                         (not (null? (lset-intersection eq? hed-mode '(itemmatch itemwait)))))
+                        )
 	    (debug:print-info 8 *default-log-port* "waitons: " waitons)
 	    ;; check for hed in waitons => this would be circular, remove it and issue an
 	    ;; error
 	    (if (or (member hed waitons)
 		    (member hed waitors))
@@ -386,107 +678,110 @@
 		  (debug:print-error 0 *default-log-port* "test " hed " has listed itself as a waiton or waitor, please correct this!")
 		  (set! waitons (filter (lambda (x)(not (equal? x hed))) waitons))
 		  (set! waitors (filter (lambda (x)(not (equal? x hed))) waitors))))
 	    
 	    ;; (items   (items:get-items-from-config config)))
-	    (if (not (hash-table-ref/default test-records hed #f))
-		(hash-table-set! test-records
-				 hed (vector hed     ;; 0
-					     config  ;; 1
-					     waitons ;; 2
-					     (config-lookup config "requirements" "priority")     ;; priority 3
-					     (tests:get-items config) ;; expand the [items] and or [itemstable] into explict items
+	    (if (not (hash-table-ref/default test-records hed #f)) ;; waiton-tconfig below will be #f until that test is visted here at least once
+		(hash-table-set! test-records ;; BB: we are doing a manual make-tests:testqueue
+				 hed (vector hed     ;; 0 ;; testname
+					     config  ;; 1 
+					     waitons ;; 2 
+					     (configf:lookup config "requirements" "priority")     ;; priority 3
+					     (tests:get-items config) ;; 4 ;; expand the [items] and or [itemstable] into explict items
 					     #f      ;; itemsdat 5
 					     #f      ;; spare - used for item-path
 					     waitors ;; 
 					     )))
-	    (for-each 
+            ;; update waitors-upon here
+            (for-each
+             (lambda (waiton)
+               (let* ((current-waitors-upon (hash-table-ref/default waitors-upon waiton '())))
+                 (debug:print-info 8 *default-log-port* " current-waiters-upon["waiton"] is "current-waitors-upon )
+                 (when (not (member hed current-waitors-upon))
+                   (debug:print-info 8 *default-log-port* " current-waiters-upon["waiton"] << "hed  )
+                   (hash-table-set! waitors-upon waiton (cons hed current-waitors-upon)))))
+             (if (list? waitons) waitons '()))
+            (debug:print-info 8 *default-log-port* " process waitons&waitors of "hed": "(delete-duplicates (append waitons waitors)))
+            (for-each 
 	     (lambda (waiton)
 	       (if (and waiton (not (member waiton test-names)))
-		   (let* ((waiton-record   (hash-table-ref/default test-records waiton #f))
+		   (let* ((waitors-in-testpatt (runs:testpatts-mention-waitors-upon? test-patts (hash-table-ref/default waitors-upon waiton '())))
+                          (waiton-record   (hash-table-ref/default test-records waiton #f))
 			  (waiton-tconfig  (if waiton-record (vector-ref waiton-record 1) #f))
 			  (waiton-itemized (and waiton-tconfig
 						(or (hash-table-ref/default waiton-tconfig "items" #f)
 						    (hash-table-ref/default waiton-tconfig "itemstable" #f))))
 			  (itemmaps        (tests:get-itemmaps config))  ;; (configf:lookup config "requirements" "itemmap"))
-			  (new-test-patts  (tests:extend-test-patts test-patts hed waiton itemmaps)))
+			  (new-test-patts  (tests:extend-test-patts test-patts hed waiton itemmaps hed-itemized-waiton))) 
 		     (debug:print-info 0 *default-log-port* "Test " waiton " has " (if waiton-record "a" "no") " waiton-record and" (if waiton-itemized " " " no ") "items")
 		     ;; need to account for test-patt here, if I am test "a", selected with a test-patt of "hed/b%"
 		     ;; and we are waiting on "waiton" we need to add "waiton/,waiton/b%" to test-patt
 		     ;; is this satisfied by merely appending "/" to the waiton name added to the list?
 		     ;;
 		     ;; This approach causes all of the items in an upstream test to be run 
-
 		     ;; if we have this waiton already processed once we can analzye it for extending
 		     ;; tests to be run, since we can't properly process waitons unless they have been
 		     ;; initially added we add them again to be processed on second round AND add the hed
 		     ;; back in to also be processed on second round
-		     ;;
-		     (if waiton-tconfig
-			 (begin
-			   (set! test-names (cons waiton test-names)) ;; need to process this one, only add once the waiton tconfig read
-			   (if waiton-itemized
-			       (begin
-				 (debug:print-info 0 *default-log-port* "New test patts: " new-test-patts ", prev test patts: " test-patts)
-				 (set! required-tests (cons (conc waiton "/") required-tests))
-				 (set! test-patts new-test-patts))
-			       (begin
-				 (debug:print-info 0 *default-log-port* "Adding non-itemized test " waiton " to required-tests")
-				 (set! required-tests (cons waiton required-tests))
-				 (set! test-patts new-test-patts))))
+		     (if waiton-tconfig ;; BB: waiter should be in test-patts as well as the waiton have a tconfig.
+                         (if waiton-itemized
+                             (if waitors-in-testpatt
+                                 (begin
+                                   (debug:print-info 0 *default-log-port* "New test patts: " new-test-patts ", prev test patts: " test-patts)
+                                   (set! test-names (cons waiton test-names)) ;; need to process this one, only add once the waiton tconfig read
+                                   (set! required-tests (cons (conc waiton "/") required-tests))
+                                   (set! test-patts new-test-patts))
+                                 (begin
+                                   (debug:print-info 0 *default-log-port* "Waitor(s) not yet on testpatt for " waiton ", setting up to re-process it")
+                                   (set! tal (append (cons waiton tal)(list hed)))))
+                             (begin
+                               (debug:print-info 0 *default-log-port* "Adding non-itemized test " waiton " to required-tests")
+                               (set! required-tests (cons waiton required-tests))
+                               (set! test-patts new-test-patts)))
 			 (begin
 			   (debug:print-info 0 *default-log-port* "No testconfig info yet for " waiton ", setting up to re-process it")
 			   (set! tal (append (cons waiton tal)(list hed))))) ;; (cons (conc waiton "/") required-tests))
-			 
 		     ;; NOPE: didn't work. required needs to be plain test names. Try tacking on to test-patts
 		     ;;  - doesn't work
 		     ;; (set! test-patts (conc test-patts "," waiton "/"))
-		     
 		     ;; (set! test-names (cons waiton test-names))))) ;; was an append, now a cons
 		     )))
 	     (delete-duplicates (append waitons waitors)))
 	    (let ((remtests (delete-duplicates (append waitons tal))))
+              (debug:print-info 8 *default-log-port* " remtests are "remtests)
 	      (if (not (null? remtests))
 		  (begin
 		    ;; (debug:print-info 0 *default-log-port* "Preprocessing continues for " (string-intersperse remtests ", "))
-		    (loop (car remtests)(cdr remtests))))))))
+		    (loop (car remtests)(cdr remtests)))))))) ;; END test-names loop
 
     (if (not (null? required-tests))
 	(debug:print-info 1 *default-log-port* "Adding \"" (string-intersperse required-tests " ") "\" to the run queue"))
     ;; NOTE: these are all parent tests, items are not expanded yet.
     (debug:print-info 4 *default-log-port* "test-records=" (hash-table->alist test-records))
     (let ((reglen (configf:lookup *configdat* "setup" "runqueue")))
       (if (> (length (hash-table-keys test-records)) 0)
 	  (let* ((keep-going        #t)
 		 (run-queue-retries 5)
-		 (th1        (make-thread (lambda ()
-					    (runs:run-tests-queue run-id runname test-records keyvals flags test-patts required-tests (any->number reglen) all-tests-registry))
-					    ;; (handle-exceptions
-					    ;;  exn
-					    ;;  (begin
-					    ;;    (print-call-chain (current-error-port))
-					    ;;    (debug:print-error 0 *default-log-port* "failure in runs:run-tests-queue thread, error: " ((condition-property-accessor 'exn 'message) exn))
-					    ;;    (if (> run-queue-retries 0)
-					    ;; 	   (begin
-					    ;; 	     (set! run-queue-retries (- run-queue-retries 1))
-					    ;; 	     (runs:run-tests-queue run-id runname test-records keyvals flags test-patts required-tests (any->number reglen) all-tests-registry))))
-					    ;;  (runs:run-tests-queue run-id runname test-records keyvals flags test-patts required-tests (any->number reglen) all-tests-registry)))
-					  "runs:run-tests-queue"))
-		 (th2        (make-thread (lambda ()				    
+		 (th2        (make-thread (lambda ()			 ;; BBQ: why are we visiting ALL runs here?	    
 					    ;; (rmt:find-and-mark-incomplete-all-runs))))) CAN'T INTERRUPT IT ...
 					    (let ((run-ids (rmt:get-all-run-ids)))
 					      (for-each (lambda (run-id)
 							  (if keep-going
 							      (handle-exceptions
-							       exn
-							       (debug:print 0 *default-log-port* "error in calling find-and-mark-incomplete for run-id " run-id)
-							       (rmt:find-and-mark-incomplete run-id #f)))) ;; ovr-deadtime)))
+								  exn
+								  (debug:print 0 *default-log-port* "error in calling find-and-mark-incomplete for run-id " run-id ", exn=" exn)
+								;; lets run this only if a run has been NOT seen for more than 900 seconds
+								(if (> (- (current-seconds)(hash-table-ref/default *find-and-mark-incomplete-last-run* run-id 0)) 900)
+								    (begin
+								      (rmt:find-and-mark-incomplete run-id #f)
+								      (hash-table-set! *find-and-mark-incomplete-last-run* run-id (current-seconds)))
+								    )))) ;; ovr-deadtime))) ;; could be root of https://hsdes.intel.com/appstore/article/#/220546828/main -- Title: Megatest jobs show DEAD even though they are still running (1.64/27)
 							run-ids)))
 					  "runs: mark-incompletes")))
-	    (thread-start! th1)
 	    (thread-start! th2)
-	    (thread-join! th1)
+	    (runs:run-tests-queue run-id runname test-records keyvals flags test-patts required-tests
+								    (any->number reglen) all-tests-registry)
 	    (set! keep-going #f)
 	    (thread-join! th2)
 	    ;; if run-count > 0 call, set -preclean and -rerun STUCK/DEAD
 	    (if (> run-count 0) ;; handle reruns
 		(begin
@@ -493,14 +788,21 @@
 		  (if (not (hash-table-ref/default flags "-preclean" #f))
 		      (hash-table-set! flags "-preclean" #t))
 		  (if (not (hash-table-ref/default flags "-rerun" #f))
 		      (hash-table-set! flags "-rerun" "STUCK/DEAD,n/a,ZERO_ITEMS"))
 		  ;; recursive call to self
-		  (runs:run-tests target runname test-patts user flags run-count: (- run-count 1)))))
+		  (runs:run-tests target runname test-patts user flags run-count: (- run-count 1)))
+		(launch:end-of-run-check run-id)))
 	  (debug:print-info 0 *default-log-port* "No tests to run")))
     (debug:print-info 4 *default-log-port* "All done by here")
+    ;; TODO: try putting post hook call here
+      
+    ;  (debug:print-info 2 *default-log-port* " run-count " run-count)
+    ;  (runs:run-post-hook run-id))
+    ;  (debug:print-info 2 *default-log-port* "Not calling post hook runcount = " run-count ))   
     (rmt:tasks-set-state-given-param-key task-key "done")
+     
     ;; (sqlite3:finalize! tasks-db)
     ))
 
 
 ;; loop logic. These are used in runs:run-tests-queue to make it a bit more readable.
@@ -512,31 +814,56 @@
 ;;   but have items in reg; loop with (car reg)(cdr reg) '() reruns
 ;;   If reg is empty => all done
 
 (define (runs:queue-next-hed tal reg n regfull)
   (if regfull
-      (car reg)
+      (if (null? reg) #f (car reg))
       (if (null? tal) ;; tal is used up, pop from reg
-	  (car reg)
+	  (if (null? reg) #f (car reg))
 	  (car tal))))
 
 (define (runs:queue-next-tal tal reg n regfull)
   (if regfull
       tal
       (if (null? tal) ;; must transfer from reg
-	  (cdr reg)
+	  (if (null? reg) '() (cdr reg))
 	  (cdr tal))))
 
 (define (runs:queue-next-reg tal reg n regfull)
   (if regfull
-      (cdr reg)
+      (if (null? reg) '() (cdr reg)) ;; EXPLORE: reorder (cdr reg) such that looping is more efficient
       (if (null? tal) ;; if tal is null and reg not full then '() as reg contents moved to tal
 	  '()
 	  reg)))
 
+;; this is the list of parameters to the named loop "loop" near the top of runs:run-tests-queue, look around line 1216
+;;
+(define (runs:loop-values tal reg reglen regfull reruns)
+  (list (runs:queue-next-hed tal reg reglen regfull)      ;; hed
+        (runs:queue-next-tal tal reg reglen regfull)      ;; tal
+        (runs:queue-next-reg tal reg reglen regfull)      ;; reg
+        reruns))                                          ;; reruns
+
+;; objective - iterate thru tests
+;;    => want to prioritize tests we haven't seen before
+;;    => sometimes need to squeeze things in (added to reg)
+;;    => review of a previously seen test is higher priority of never visited test
+;; reg - list of previously visited tests
+;; tal - list of never visited tests
+;;   prefer next hed to be from reg than tal.
+
 (define runs:nothing-left-in-queue-count 0)
 
+;;======================================================================
+;; runs:expand-items is called by runs:run-tests-queue
+;;======================================================================
+;;
+;; return value of runs:expand-items is passed back to runs-tests-queue and is fed to named loop with this signature:
+;;    (let loop ((hed         (car sorted-test-names))
+;;	         (tal         (cdr sorted-test-names))
+;;	         (reg         '()) ;; registered, put these at the head of tal 
+;;	         (reruns      '()))
 (define (runs:expand-items hed tal reg reruns regfull newtal jobgroup max-concurrent-jobs run-id waitons item-path testmode test-record can-run-more items runname tconfig reglen test-registry test-records itemmaps)
   (let* ((loop-list       (list hed tal reg reruns))
 	 (prereqs-not-met (let ((res (rmt:get-prereqs-not-met run-id waitons hed item-path mode: testmode itemmaps: itemmaps)))
 			    (if (list? res)
 				res
@@ -543,15 +870,26 @@
 				(begin
 				  (debug:print 0 *default-log-port*
 					       "ERROR: rmt:get-prereqs-not-met returned non-list!\n"
 					       "  res=" res " run-id=" run-id " waitons=" waitons " hed=" hed " item-path=" item-path " testmode=" testmode " itemmaps=" itemmaps)
 				  '()))))
+         (have-itemized (not (null? (lset-intersection eq? testmode '(itemmatch itemwait)))))
 	 ;; (prereqs-not-met (mt:lazy-get-prereqs-not-met run-id waitons item-path mode: testmode itemmap: itemmap))
 	 (fails           (runs:calc-fails prereqs-not-met))
 	 (prereq-fails    (runs:calc-prereq-fail prereqs-not-met))
 	 (non-completed   (runs:calc-not-completed prereqs-not-met))
-	 (runnables       (runs:calc-runnable prereqs-not-met)))
+	 (runnables       (runs:calc-runnable prereqs-not-met))
+         (unexpanded-prereqs
+          (filter (lambda (testname)
+                    (let* ((test-rec (hash-table-ref test-records testname))
+                           (items       (tests:testqueue-get-items  test-rec)))
+                      ;;(BB> "HEY " testname "=>"items)
+                      (or (procedure? items)(eq? items 'have-procedure))))
+                  waitons))
+
+
+         )
     (debug:print-info 4 *default-log-port* "START OF INNER COND #2 "
 		      "\n can-run-more:    " can-run-more
 		      "\n testname:        " hed
 		      "\n prereqs-not-met: " (runs:pretty-string prereqs-not-met)
 		      "\n non-completed:   " (runs:pretty-string non-completed) 
@@ -566,20 +904,18 @@
 
    (cond
      ;; all prereqs met, fire off the test
      ;; or, if it is a 'toplevel test and all prereqs not met are COMPLETED then launch
 
-     ((and (not (member 'toplevel testmode))
+    ((and (not (member 'toplevel testmode))
 	   (member (hash-table-ref/default test-registry (db:test-make-full-name hed item-path) 'n/a)
 		   '(DONOTRUN removed CANNOTRUN))) ;; *common:cant-run-states-sym*) ;; '(COMPLETED KILLED WAIVED UNKNOWN INCOMPLETE)) ;; try to catch repeat processing of COMPLETED tests here
+      (debug:print-info 4 *default-log-port* "cond branch - "  "ei-1")
       (debug:print-info 1 *default-log-port* "Test " hed " set to \"" (hash-table-ref test-registry (db:test-make-full-name hed item-path)) "\". Removing it from the queue")
       (if (or (not (null? tal))
 	      (not (null? reg)))
-	  (list (runs:queue-next-hed tal reg reglen regfull)
-		(runs:queue-next-tal tal reg reglen regfull)
-		(runs:queue-next-reg tal reg reglen regfull)
-		reruns)
+          (runs:loop-values tal reg reglen regfull reruns)
 	  (begin
 	    (debug:print-info 0 *default-log-port* "Nothing left in the queue!")
 	    ;; If get here twice then we know we've tried to expand all items
 	    ;; since there must be a logic issue with the handling of loops in the 
 	    ;; items expand phase we will brute force an exit here.
@@ -588,14 +924,24 @@
 		  (debug:print 0 *default-log-port* "WARNING: this condition is triggered when there were no items to expand and nothing to run. Please check your run for completeness")
 		  (exit 0))
 		(set! runs:nothing-left-in-queue-count (+ runs:nothing-left-in-queue-count 1)))
 	    #f)))
 
-     ;; 
-     ((or (null? prereqs-not-met)
+     ;; desired result of below cond branch:
+     ;;   we want to expand items in our test of interest (hed) in the following cases:
+     ;;    case 1 - mode is itemmatch or itemwait: 
+     ;;       - all prereq tests have been expanded
+     ;;       - at least one prereq's items have completed
+     ;;    case 2 - mode is toplevel   
+     ;;       - prereqs are completed.
+     ;;       - or no prereqs can complete 
+     ;;    case 3 - mode not specified 
+     ;;       - prereqs are completed and passed (we could consider removing "and passed" -- it would change behavior from current)          
+    ((or (null? prereqs-not-met)
 	  (and (member 'toplevel testmode)
 	       (null? non-completed)))
+      (debug:print-info 4 *default-log-port* "cond branch - "  "ei-2")
       (debug:print-info 4 *default-log-port* "runs:expand-items: (or (null? prereqs-not-met) (and (member 'toplevel testmode)(null? non-completed)))")
       (let ((test-name (tests:testqueue-get-testname test-record)))
 	(setenv "MT_TEST_NAME" test-name) ;; 
 	(setenv "MT_RUNNAME"   runname)
 	(runs:set-megatest-env-vars run-id inrunname: runname) ;; these may be needed by the launching process
@@ -612,13 +958,14 @@
 		(list hed tal reg reruns))
 	      (begin
 		(debug:print-error 0 *default-log-port* "The proc from reading the items table did not yield a list - please report this")
 		(exit 1))))))
 
-     ((and (null? fails)
+    ((and (null? fails)
 	   (null? prereq-fails)
 	   (not (null? non-completed)))
+      (debug:print-info 4 *default-log-port* "cond branch - "  "ei-3")
       (let* ((allinqueue (map (lambda (x)(if (string? x) x (db:test-get-testname x)))
         		      (append newtal reruns)))
 	     ;; prereqstrs is a list of test names as strings that are prereqs for hed
              (prereqstrs (delete-duplicates (map (lambda (x)(if (string? x) x (db:test-get-testname x)))
 						 prereqs-not-met)))
@@ -643,74 +990,76 @@
 	    (let ((trimmed-tal (mt:discard-blocked-tests run-id hed tal test-records))
 		  (trimmed-reg (mt:discard-blocked-tests run-id hed reg test-records)))
 	      (debug:print 1 *default-log-port* "WARNING: test " hed " has discarded prerequisites, removing it from the queue")
 
 	      (let ((test-id (rmt:get-test-id run-id hed "")))
-		(if test-id (mt:test-set-state-status-by-id run-id test-id "NOT_STARTED" "PREQ_DISCARDED" "Failed to run due to discarded prerequisites")))
+		(if test-id (mt:test-set-state-status-by-id run-id test-id "COMPLETED" "PREQ_DISCARDED" "Failed to run due to discarded prerequisites")))
 	      
 	      (if (and (null? trimmed-tal)
 		       (null? trimmed-reg))
 		  #f
-		  (list (runs:queue-next-hed trimmed-tal trimmed-reg reglen regfull)
-			(runs:queue-next-tal trimmed-tal trimmed-reg reglen regfull)
-			(runs:queue-next-reg trimmed-tal trimmed-reg reglen regfull)
-			reruns)))
+                  (runs:loop-values trimmed-tal trimmed-reg reglen regfull reruns)
+                  ))
 	      (list (car newtal)(append (cdr newtal) reg) '() reruns))))
 
-     ((and (null? fails)
+    ((and (null? fails) ;; have not-started tests, but unable to run them.  everything looks completed with no prospect of unsticking something that is stuck.  we should mark hed as moribund and exit or continue if there are more tests to consider
 	   (null? prereq-fails)
 	   (null? non-completed))
+     (debug:print-info 4 *default-log-port* "cond branch - "  "ei-4")
       (if  (runs:can-keep-running? hed 20)
 	  (begin
 	    (runs:inc-cant-run-tests hed)
-	    (debug:print-info 1 *default-log-port* "no fails in prerequisites for " hed " but also none running, keeping " hed " for now. Try count: " (hash-table-ref/default *seen-cant-run-tests* hed 0))
+	    (debug:print-info 0 *default-log-port* "no fails in prerequisites for " hed " but also none running, keeping " hed " for now. Try count: " (hash-table-ref/default *seen-cant-run-tests* hed 0) ", going to wait 60 sec.") ;; 
 	    ;; getting here likely means the system is way overloaded, kill a full minute before continuing
-	    (thread-sleep! 60)
+	    ;; (thread-sleep! 60) ;; TODO: gate by normalized server load > 1.0 (maxload config thing) CHECKTHIS!!!
+	    ;; No runsdat, can't do this yet
+	    ;; (if (runs:dat-load-mgmt-function runsdat)((runs:dat-load-mgmt-function runsdat)))
+	    ;;
+	    (thread-sleep! 5) ;; TODO: gate by normalized server load > 1.0 (maxload config thing)
 	    ;; num-retries code was here
 	    ;; we use this opportunity to move contents of reg to tal
 	    (list (car newtal)(append (cdr newtal) reg) '() reruns)) ;; an issue with prereqs not yet met?
 	  (begin
 	    (debug:print-info 1 *default-log-port* "no fails in prerequisites for " hed " but nothing seen running in a while, dropping test " hed " from the run queue")
 	    (let ((test-id (rmt:get-test-id run-id hed "")))
 	      (if test-id (mt:test-set-state-status-by-id run-id test-id "NOT_STARTED" "TIMED_OUT" "Nothing seen running in a while.")))
-	    (list (runs:queue-next-hed tal reg reglen regfull)
-		  (runs:queue-next-tal tal reg reglen regfull)
-		  (runs:queue-next-reg tal reg reglen regfull)
-		  reruns))))
+            (runs:loop-values tal reg reglen regfull reruns)
+            )))
 
-     ((and 
+    ((and 
        (or (not (null? fails))
 	   (not (null? prereq-fails)))
        (member 'normal testmode))
+      (debug:print-info 4 *default-log-port* "cond branch - "  "ei-5")
       (debug:print-info 1 *default-log-port* "test "  hed " (mode=" testmode ") has failed prerequisite(s); "
 			(string-intersperse (map (lambda (t)(conc (db:test-get-testname t) ":" (db:test-get-state t)"/"(db:test-get-status t))) fails) ", ")
 			", removing it from to-do list")
       (let ((test-id (rmt:get-test-id run-id hed "")))
 	(if test-id
 	    (if (not (null? prereq-fails))
-		(mt:test-set-state-status-by-id run-id test-id "NOT_STARTED" "PREQ_DISCARDED" "Failed to run due to prior failed prerequisites")
-		(mt:test-set-state-status-by-id run-id test-id "NOT_STARTED" "PREQ_FAIL"      "Failed to run due to failed prerequisites"))))
+		(mt:test-set-state-status-by-id-unless-completed run-id test-id "COMPLETED" "PREQ_DISCARDED" "Failed to run due to prior failed prerequisites")
+		(mt:test-set-state-status-by-id-unless-completed run-id test-id "COMPLETED" "PREQ_FAIL"      "Failed to run due to failed prerequisites"))))
+      ;; (debug:print 4 *default-log-port*"BB> set PREQ_FAIL on "hed)
+      ;; (mt:test-set-state-status-by-id run-id test-id "NOT_STARTED" "PREQ_FAIL"      "Failed to run due to failed prerequisites")))) ;; BB: this works, btu equivalent for itemwait mode does not work.
       (if (or (not (null? reg))(not (null? tal)))
 	  (begin
 	    (hash-table-set! test-registry hed 'CANNOTRUN)
-	    (list (runs:queue-next-hed tal reg reglen regfull)
-		  (runs:queue-next-tal tal reg reglen regfull)
-		  (runs:queue-next-reg tal reg reglen regfull)
-		  (cons hed reruns)))
+            (runs:loop-values tal reg reglen regfull (cons hed reruns))
+            )
 	  #f)) ;; #f flags do not loop
-
+      
      ((and (not (null? fails))(member 'toplevel testmode))
+      (debug:print-info 4 *default-log-port* "cond branch - "  "ei-6")
       (if (or (not (null? reg))(not (null? tal)))
 	   (list (car newtal)(append (cdr newtal) reg) '() reruns)
 	  #f)) 
-     ((null? runnables) #f) ;; if we get here and non-completed is null then it is all over.
+     ((null? runnables)
+      (debug:print-info 4 *default-log-port* "cond branch - "  "ei-7")
+      #f) ;; if we get here and non-completed is null then it is all over.
      (else
+      (debug:print-info 4 *default-log-port* "cond branch - "  "ei-8")
       (debug:print 0 *default-log-port* "WARNING: FAILS or incomplete tests maybe preventing completion of this run. Watch for issues with test " hed ", continuing for now")
-      ;; (list (runs:queue-next-hed tal reg reglen regfull)
-      ;;   	(runs:queue-next-tal tal reg reglen regfull)
-      ;;   	(runs:queue-next-reg tal reg reglen regfull)
-      ;;   	reruns)
       (list (car newtal)(cdr newtal) reg reruns)))))
 
 (define (runs:mixed-list-testname-and-testrec->list-of-strings inlst)
   (if (null? inlst)
       '()
@@ -730,10 +1079,13 @@
 
 
 ;;  hed tal reg reruns reglen regfull test-record runname test-name item-path jobgroup max-concurrent-jobs run-id waitons item-path testmode test-patts required-tests test-registry registry-mutex flags keyvals run-info newtal all-tests-registry itemmaps)
 (define (runs:process-expanded-tests runsdat testdat)
   ;; unroll the contents of runsdat and testdat (due to ongoing refactoring).
+  (debug:print 2 *default-log-port* "runs:process-expanded-tests; testdat:" )
+  (debug:print 2 *default-log-port* (with-output-to-string
+                                            (lambda () (pp (runs:testdat->alist testdat) ))))
   (let* ((hed                    (runs:testdat-hed testdat))
 	 (tal                    (runs:testdat-tal testdat))
 	 (reg                    (runs:testdat-reg testdat))
 	 (reruns                 (runs:testdat-reruns testdat))
 	 (test-name              (runs:testdat-test-name testdat))
@@ -767,23 +1119,23 @@
 	 (num-running-in-jobgroup(list-ref run-limits-info 2)) 
 	 (max-concurrent-jobs    (list-ref run-limits-info 3))
 	 (job-group-limit        (list-ref run-limits-info 4))
 	 ;; (prereqs-not-met        (rmt:get-prereqs-not-met run-id waitons hed item-path mode: testmode itemmaps: itemmaps))
 	 ;; (prereqs-not-met         (mt:lazy-get-prereqs-not-met run-id waitons item-path mode: testmode itemmap: itemmap))
-	 (fails                  (if (list? prereqs-not-met)
+	 (fails                  (if (list? prereqs-not-met) ;; TODO: rename fails to failed-prereqs
 				      (runs:calc-fails prereqs-not-met)
 				      (begin
 					(debug:print-error 0 *default-log-port* "prereqs-not-met is not a list! " prereqs-not-met)
 					'())))
 	 (non-completed           (filter (lambda (x)             ;; remove hed from not completed list, duh, of course it is not completed!
 					    (not (equal? x hed)))
 					  (runs:calc-not-completed prereqs-not-met)))
 	 (loop-list               (list hed tal reg reruns))
 	 ;; configure the load runner
-	 (numcpus                 (common:get-num-cpus #f))
-	 (maxload                 (string->number (or (configf:lookup *configdat* "jobtools" "maxload") "3")))
-	 (waitdelay               (string->number (or (configf:lookup *configdat* "jobtools" "waitdelay") "60"))))
+	 (maxload                 (string->number (or (configf:lookup *configdat* "jobtools" "maxload") "3.0")))         ;; use a non-number string to disable
+         (maxhomehostload         (string->number (or (configf:lookup *configdat* "jobtools" "maxhomehostload") "2.0"))) ;; use a non-number string to disable
+         (waitdelay               (string->number (or (configf:lookup *configdat* "jobtools" "waitdelay") "60"))))
     (debug:print-info 4 *default-log-port* "have-resources: " have-resources " prereqs-not-met: (" 
 		      (string-intersperse 
 		       (map (lambda (t)
 			      (if (vector? t)
 				  (conc (db:test-get-state t) "/" (db:test-get-status t))
@@ -790,33 +1142,48 @@
 				  (conc " WARNING: t is not a vector=" t )))
 			    prereqs-not-met)
 		       ", ") ") fails: " fails
 		       "\nregistered? " (hash-table-ref/default test-registry (db:test-make-full-name test-name item-path) #f))
 			    
-
+    ;; well, first lets see if cpu load throttling is enabled. If so wait around until the
+    ;; average cpu load is under the threshold before continuing
+    ;;
+    (if (runs:dat-load-mgmt-function runsdat)
+	((runs:dat-load-mgmt-function runsdat))
+	(runs:dat-load-mgmt-function-set!
+	 runsdat
+	 (lambda ()
+	   ;; jobtools maxload is useful for where the full Megatest run is done on one machine
+	   (if (and (not (common:on-homehost?))
+		    maxload) ;; only gate if maxload is specified, NOTE: maxload is normalized, i.e. load=1 means all cpus fully utilized
+	       (common:wait-for-normalized-load maxload "Waiting for load to drop before starting more tests" #f))
+	   
+	   ;; jobtools maxhomehostload is intended to prevent overloading on the homehost which can cause database corruption issues
+	   (if maxhomehostload
+	       (common:wait-for-homehost-load maxhomehostload
+					      (conc "Waiting for homehost load to drop below normalized value of " maxhomehostload))))))
+    
+ 
     
     (if (and (not (null? prereqs-not-met))
 	     (runs:lownoise (conc "waiting on tests " prereqs-not-met hed) 60))
 	(debug:print-info 2 *default-log-port* "waiting on tests; " (string-intersperse (runs:mixed-list-testname-and-testrec->list-of-strings prereqs-not-met) ", ")))
 
     ;; Don't know at this time if the test have been launched at some time in the past
     ;; i.e. is this a re-launch?
     (debug:print-info 4 *default-log-port* "run-limits-info = " run-limits-info)
     
-    (cond
+    (cond ; cond 894- 1067
      
      ;; Check item path against item-patts, 
      ;;
      ((not (tests:match test-patts (tests:testqueue-get-testname test-record) item-path required: required-tests)) ;; This test/itempath is not to be run
       ;; else the run is stuck, temporarily or permanently
       ;; but should check if it is due to lack of resources vs. prerequisites
       (debug:print-info 1 *default-log-port* "Skipping " (tests:testqueue-get-testname test-record) " " item-path " as it doesn't match " test-patts)
       (if (or (not (null? tal))(not (null? reg)))
-	  (list (runs:queue-next-hed tal reg reglen regfull)
-		(runs:queue-next-tal tal reg reglen regfull)
-		(runs:queue-next-reg tal reg reglen regfull)
-		reruns)
+	  (runs:loop-values tal reg reglen regfull reruns)
 	  #f))
      
      ;; Register tests 
      ;;
      ((not (hash-table-ref/default test-registry (db:test-make-full-name test-name item-path) #f))
@@ -837,11 +1204,11 @@
 	    (if (rmt:get-test-id run-id test-name "")
 		(hash-table-set! test-registry (db:test-make-full-name test-name "") 'done))))
       (runs:shrink-can-run-more-tests-count runsdat)   ;; DELAY TWEAKER (still needed?)
       (if (and (null? tal)(null? reg))
 	  (list hed tal (append reg (list hed)) reruns)
-	  (list (runs:queue-next-hed tal reg reglen regfull)
+	  (list (runs:queue-next-hed tal reg reglen regfull) ;; cannot replace with a call to runs:loop-values as the logic is different for reg
 		(runs:queue-next-tal tal reg reglen regfull)
 		;; NB// Here we are building reg as we register tests
 		;; if regfull we must pop the front item off reg
 		(if regfull
 		    (append (cdr reg) (list hed))
@@ -866,11 +1233,11 @@
      ((not have-resources) ;; simply try again after waiting a second
       (if (runs:lownoise "no resources" 60)
 	  (debug:print-info 1 *default-log-port* "no resources to run new tests, waiting ..."))
       ;; Have gone back and forth on this but db starvation is an issue.
       ;; wait one second before looking again to run jobs.
-      (thread-sleep! 1)
+      (thread-sleep! 1) ;; changed back to 1 from 0.25
       ;; could have done hed tal here but doing car/cdr of newtal to rotate tests
       (list (car newtal)(cdr newtal) reg reruns))
      
      ;; This is the final stage, everything is in place so launch the test
      ;;
@@ -881,24 +1248,18 @@
 		    (not (member 'exclusive testmode)))))
       ;; (hash-table-delete! *max-tries-hash* (db:test-make-full-name test-name item-path))
       ;; we are going to reset all the counters for test retries by setting a new hash table
       ;; this means they will increment only when nothing can be run
       (set! *max-tries-hash* (make-hash-table))
-      ;; well, first lets see if cpu load throttling is enabled. If so wait around until the
-      ;; average cpu load is under the threshold before continuing
-      (if (configf:lookup *configdat* "jobtools" "maxload") ;; only gate if maxload is specified
-	  (common:wait-for-cpuload maxload numcpus waitdelay))
-      (run:test run-id run-info keyvals runname test-record flags #f test-registry all-tests-registry)
+      
+      (run:test run-id run-info keyvals runname test-record flags #f test-registry all-tests-registry runsdat testdat)
       (runs:incremental-print-results run-id)
       (hash-table-set! test-registry (db:test-make-full-name test-name item-path) 'running)
       (runs:shrink-can-run-more-tests-count runsdat)  ;; DELAY TWEAKER (still needed?)
       ;; (thread-sleep! *global-delta*)
       (if (or (not (null? tal))(not (null? reg)))
-	  (list (runs:queue-next-hed tal reg reglen regfull)
-		(runs:queue-next-tal tal reg reglen regfull)
-		(runs:queue-next-reg tal reg reglen regfull)
-		reruns)
+	  (runs:loop-values tal reg reglen regfull reruns) ;; hed should be dropped at this time
 	  #f))
      
      ;; must be we have unmet prerequisites
      ;;
      (else
@@ -915,71 +1276,69 @@
 	      (member 'toplevel testmode))
 	  (begin
 	    ;; couldn't run, take a breather
 	    (if  (runs:lownoise "Waiting for more work to do..." 60)
 		 (debug:print-info 0 *default-log-port* "Waiting for more work to do..."))
-	    (thread-sleep! 1)
+	    
+	    ;; (if (runs:dat-load-mgmt-function runsdat)((runs:dat-load-mgmt-function runsdat)))
+	    (thread-sleep! 5)
 	    (list (car newtal)(cdr newtal) reg reruns))
 	  ;; the waiton is FAIL so no point in trying to run hed ever again
-	  (if (or (not (null? reg))(not (null? tal)))
-	      (if (vector? hed)
+	  (begin
+            (let ((my-test-id (rmt:get-test-id run-id test-name item-path)))
+              (mt:test-set-state-status-by-id-unless-completed run-id my-test-id "COMPLETED" "PREQ_FAIL" "Failed to run due to failed prerequisites2"))            
+            (if (or (not (null? reg))(not (null? tal)))
+                (if (vector? hed)
 		  (begin
 		    (debug:print 1 *default-log-port* "WARNING: Dropping test " test-name "/" item-path
 				 " from the launch list as it has prerequistes that are FAIL")
 		    (let ((test-id (rmt:get-test-id run-id hed "")))
-		      (if test-id (mt:test-set-state-status-by-id run-id test-id "NOT_STARTED" "PREQ_FAIL" "Failed to run due to failed prerequisites")))
+		      (if test-id (mt:test-set-state-status-by-id-unless-completed run-id test-id "COMPLETED" "PREQ_FAIL" "Failed to run due to failed prerequisites")))
 		    (runs:shrink-can-run-more-tests-count runsdat) ;; DELAY TWEAKER (still needed?)
 		    ;; (thread-sleep! *global-delta*)
 		    ;; This next is for the items
-		    (mt:test-set-state-status-by-testname run-id test-name item-path "NOT_STARTED" "BLOCKED" #f)
+
+                    (if (not (null? fails))
+                        ;;(mt:test-set-state-status-by-testname run-id test-name item-path "NOT_STARTED" "PREQ_FAIL" #f)
+                        (rmt:set-state-status-and-roll-up-items run-id test-name item-path "NOT_STARTED" "PREQ_FAIL" #f) 
+                        ;;(mt:test-set-state-status-by-testname run-id test-name item-path "NOT_STARTED" "BLOCKED" #f)
+                        (rmt:set-state-status-and-roll-up-items run-id test-name item-path "NOT_STARTED" "BLOCKED" #f) )
 		    (hash-table-set! test-registry (db:test-make-full-name test-name item-path) 'removed)
-		    (list (runs:queue-next-hed tal reg reglen regfull)
-			  (runs:queue-next-tal tal reg reglen regfull)
-			  (runs:queue-next-reg tal reg reglen regfull)
-			  reruns ;; WAS: (cons hed reruns) ;; but that makes no sense?
-			  ))
-		  (let ((nth-try (hash-table-ref/default test-registry hed 0)))
+		    (runs:loop-values tal reg reglen regfull reruns))
+		  (let ((nth-try (hash-table-ref/default test-registry hed 0))) ;; hed not a vector...
+                    (debug:print 2 *default-log-port* "nth-try("hed")="nth-try)
 		    (cond
 		     ((member "RUNNING" (map db:test-get-state prereqs-not-met))
 		      (if (runs:lownoise (conc "possible RUNNING prerequistes " hed) 60)
 			  (debug:print 0 *default-log-port* "WARNING: test " hed " has possible RUNNING prerequisites, don't give up on it yet."))
-		      (thread-sleep! 4)
-		      (list (runs:queue-next-hed newtal reg reglen regfull)
-			    (runs:queue-next-tal newtal reg reglen regfull)
-			    (runs:queue-next-reg newtal reg reglen regfull)
-			    reruns))
-		     ((or (not nth-try)
+		      (thread-sleep! 0.1)
+		      (runs:loop-values tal reg reglen regfull reruns))
+		     ((or (not nth-try) ;; BB: condition on subsequent tries, condition below fires on first try 
 			  (and (number? nth-try)
-			       (< nth-try 10)))
+			       (< nth-try 2)))
 		      (hash-table-set! test-registry hed (if (number? nth-try)
 							     (+ nth-try 1)
 							     0))
 		      (if (runs:lownoise (conc "not removing test " hed) 60)
 			  (debug:print 1 *default-log-port* "WARNING: not removing test " hed " from queue although it may not be runnable due to FAILED prerequisites"))
 		      ;; may not have processed correctly. Could be a race condition in your test implementation? Dropping test " hed) ;;  " as it has prerequistes that are FAIL. (NOTE: hed is not a vector)")
 		      (runs:shrink-can-run-more-tests-count runsdat) ;; DELAY TWEAKER (still needed?)
-		      ;; (list hed tal reg reruns)
-		      ;; (list (car newtal)(cdr newtal) reg reruns)
-		      ;; (hash-table-set! test-registry hed 'removed)
-		      (list (runs:queue-next-hed newtal reg reglen regfull)
-			    (runs:queue-next-tal newtal reg reglen regfull)
-			    (runs:queue-next-reg newtal reg reglen regfull)
-			    reruns))
-		     ((symbol? nth-try)
+		      (runs:loop-values newtal reg reglen regfull reruns))
+		     ((symbol? nth-try) ;; BB: 'done matches here in one case where prereq itemwait failed.  This is first "try"
 		      (if (eq? nth-try 'removed) ;; removed is removed - drop it NOW
 			  (if (null? tal)
 			      #f ;; yes, really
 			      (list (car tal)(cdr tal) reg reruns))
 			  (begin
 			    (if (runs:lownoise (conc "FAILED prerequisites or other issue" hed) 60)
-				(debug:print 0 *default-log-port* "WARNING: test " hed " has FAILED prerequisites or other issue. Internal state " nth-try " will be overridden and we'll retry."))
-			    (mt:test-set-state-status-by-testname run-id test-name item-path "NOT_STARTED" "KEEP_TRYING" #f)
-			    (hash-table-set! test-registry hed 0)
-			    (list (runs:queue-next-hed newtal reg reglen regfull)
-				  (runs:queue-next-tal newtal reg reglen regfull)
-				  (runs:queue-next-reg newtal reg reglen regfull)
-				  reruns))))
+				(debug:print 0 *default-log-port* "WARNING: test " hed " has FAILED prerequisites or other issue. Internal state >" nth-try "< will be overridden and we'll retry."))
+			    ;; was: (mt:test-set-state-status-by-testname run-id test-name item-path "NOT_STARTED" "KEEP_TRYING" #f)
+                            (mt:test-set-state-status-by-testname-unless-completed run-id test-name item-path "COMPLETED" "PREQ_FAIL" #f)
+			    (hash-table-set! test-registry hed 'removed) ;; was 0
+                            (if (not (and (null? reg) (null? tal)))
+                                (runs:loop-values tal reg reglen regfull reruns)
+                                #f))))
 		     (else
 		      (if (runs:lownoise (conc "FAILED prerequitests and we tried" hed) 60)
 			  (debug:print 0 *default-log-port* "WARNING: test " hed " has FAILED prerequitests and we've tried at least 10 times to run it. Giving up now."))
 		      ;; (debug:print 0 *default-log-port* "         prereqs: " prereqs-not-met)
 		      (hash-table-set! test-registry hed 'removed)
@@ -988,18 +1347,20 @@
 		      (rmt:set-state-status-and-roll-up-items run-id test-name item-path #f "FAIL" #f) ;; treat as FAIL
 		      (list (if (null? tal)(car newtal)(car tal))
 			    tal
 			    reg
 			    reruns)))))
-	      ;; can't drop this - maybe running? Just keep trying
-	      (let ((runable-tests (runs:runable-tests prereqs-not-met)))
-		(if (null? runable-tests)
-		    #f   ;; I think we are truly done here
-		    (list (runs:queue-next-hed newtal reg reglen regfull)
-			    (runs:queue-next-tal newtal reg reglen regfull)
-			    (runs:queue-next-reg newtal reg reglen regfull)
-			    reruns)))))))))
+                ;; ELSE: can't drop this - maybe running? Just keep trying
+
+                ;;(if (not (or (not (null? reg))(not (null? tal)))) ;; old experiment
+                (let ((runable-tests (runs:runable-tests prereqs-not-met))) ;; SUSPICIOUS: Should look at more than just prereqs-not-met?
+                  (if (null? runable-tests)
+                      #f   ;; I think we are truly done here
+                      (runs:loop-values newtal reg reglen regfull reruns)))
+                ;;) ;;from old experiment
+                ) ;; end if (or (not (null? reg))(not (null? tal)))
+            ))))))
 
 ;; scan a list of tests looking to see if any are potentially runnable
 ;;
 (define (runs:runable-tests tests)
   (filter (lambda (t)
@@ -1028,28 +1389,38 @@
    inc-results-fmt: "~12a~12a~20a~12a~40a\n" ;; state status time duration test-name item-path
    run-info: #f
    runname: #f
    target: #f
    )
-)
+  )
 
 (define (runs:incremental-print-results run-id)
-  (let ((curr-sec (current-seconds)))
-    (if (> (- curr-sec (runs:gendat-inc-results-last-update *runs:general-data*)) 5) ;; at least five seconds since last update
+  (let ((curr-sec    (current-seconds))
+	(last-update (runs:gendat-inc-results-last-update *runs:general-data*)))
+    (if (> (- curr-sec last-update) 5) ;; at least five seconds since last update
 	(let* ((run-dat  (or (runs:gendat-run-info *runs:general-data*)(rmt:get-run-info run-id)))
 	       (runname  (or (runs:gendat-runname *runs:general-data*)
 			     (db:get-value-by-header (db:get-rows run-dat)
 						     (db:get-header run-dat) "runname")))
 	       (target   (or (runs:gendat-target *runs:general-data*)(rmt:get-target run-id)))
-	       (testsdat (rmt:get-tests-for-run run-id "%" '() '() ;; run-id testpatt states statuses
-						#f #f ;; offset limit
-						#f ;; not-in
-						#f ;; sort-by
-						#f ;; sort-order
-						#f ;; get full data (not 'shortlist)
-						(runs:gendat-inc-results-last-update *runs:general-data*) ;; last update time
-						'dashboard)))
+	       (testsdat (let ((res (rmt:get-tests-for-run
+				     run-id "%" '() '() ;; run-id testpatt states statuses
+				     #f #f ;; offset limit
+				     #f ;; not-in
+				     #f ;; sort-by
+				     #f ;; sort-order
+				     #f ;; get full data (not 'shortlist)
+				     last-update
+				     'dashboard)))
+			   (if (list? res)
+			       res
+			       (begin
+				 (debug:print-error
+				  0 *default-log-port*
+				  "FAILED TO GET DATA using rmt:get-tests-for-run. Notify developers if you see this. result: " res)
+				 '())))))
+	  (runs:gendat-inc-results-last-update-set! *runs:general-data* (- curr-sec 1))
 	  (if (not (runs:gendat-run-info *runs:general-data*))
 	      (runs:gendat-run-info-set! *runs:general-data* run-dat))
 	  (if (not (runs:gendat-runname  *runs:general-data*))
 	      (runs:gendat-runname-set! *runs:general-data* runname))
 	  (if (not (runs:gendat-target *runs:general-data*))
@@ -1081,17 +1452,28 @@
 			     dtime
 			     (seconds->hr-min-sec duration)
 			     (conc "lt/" target "/" runname "/" test-name (if (string-null? item-path) "" (conc "/" item-path))))
 		     (hash-table-set! (runs:gendat-inc-results *runs:general-data*) (conc run-id "," test-id) testdat)))))
 	   testsdat)))
-    (runs:gendat-inc-results-last-update-set! *runs:general-data* (- curr-sec 10))))
+
+    ;; I don't think this should be here? -- Matt
+    #;(runs:gendat-inc-results-last-update-set! *runs:general-data* (- curr-sec 10))
+
+    ))
 
 ;; every time though the loop increment the test/itempatt val.
 ;; when the min is > max-allowed and none running then force exit
 ;;
 (define *max-tries-hash* (make-hash-table))
 
+(define (runs:pretty-long-list lst)
+   (if (> (length lst) 8)(append (take lst 3)(list "...")) lst))
+
+;;======================================================================
+;; runs:run-tests-queue is called by runs:run-tests
+;;======================================================================
+;;
 ;; test-records is a hash table testname:item_path => vector < testname testconfig waitons priority items-info ... >
 (define (runs:run-tests-queue run-id runname test-records keyvals flags test-patts required-tests reglen-in all-tests-registry)
   ;; At this point the list of parent tests is expanded 
   ;; NB// Should expand items here and then insert into the run queue.
   (debug:print 5 *default-log-port* "test-records: " test-records ", flags: " (hash-table->alist flags))
@@ -1098,54 +1480,52 @@
 
   ;; Do mark-and-find clean up of db before starting runing of quue
   ;;
   ;; (rmt:find-and-mark-incomplete)
 
-  (let* ((run-info             (rmt:get-run-info run-id))
-	(tests-info            (mt:get-tests-for-run run-id #f '() '())) ;;  qryvals: "id,testname,item_path"))
-	(sorted-test-names     (tests:sort-by-priority-and-waiton test-records))
-	(test-registry         (make-hash-table))
-	(registry-mutex        (make-mutex))
-	(num-retries           0)
-	(max-retries           (config-lookup *configdat* "setup" "maxretries"))
-	(max-concurrent-jobs   (let ((mcj (config-lookup *configdat* "setup"     "max_concurrent_jobs")))
-				 (if (and mcj (string->number mcj))
-				     (string->number mcj)
-				     1))) ;; length of the register queue ahead
-	(reglen                (if (number? reglen-in) reglen-in 1))
-	(last-time-incomplete  (- (current-seconds) 900)) ;; force at least one clean up cycle
-	(last-time-some-running (current-seconds))
-	;; (tdbdat                (tasks:open-db))
-	(runsdat (make-runs:dat
-		  ;; hed: hed
-		  ;; tal: tal
-		  ;; reg: reg
-		  ;; reruns: reruns
-		  reglen: reglen
-		  regfull: #f ;; regfull
-		  ;; test-record: test-record
-		  runname: runname
-		  ;; test-name: test-name
-		  ;; item-path: item-path
-		  ;; jobgroup: jobgroup
-		  max-concurrent-jobs: max-concurrent-jobs
-		  run-id: run-id
-		  ;; waitons: waitons
-		  ;; testmode: testmode
-		  test-patts: test-patts
-		  required-tests: required-tests
-		  test-registry: test-registry
-		  registry-mutex: registry-mutex
-		  flags: flags
-		  keyvals: keyvals
-		  run-info: run-info
-		  ;; newtal: newtal
-		  all-tests-registry: all-tests-registry
-		  ;; itemmaps: itemmaps
-		  ;; prereqs-not-met: (rmt:get-prereqs-not-met run-id waitons hed item-path mode: testmode itemmaps: itemmaps)
-		  ;; can-run-more-tests: (runs:can-run-more-tests run-id jobgroup max-concurrent-jobs) ;; look at the test jobgroup and tot jobs running
-		  )))
+  (let* ((run-info              (rmt:get-run-info run-id))
+         (tests-info            (mt:get-tests-for-run run-id #f '() '())) ;;  qryvals: "id,testname,item_path"))
+         (sorted-test-names     (tests:sort-by-priority-and-waiton test-records))
+         (test-registry         (make-hash-table))
+         (registry-mutex        (make-mutex))
+         (num-retries           0)
+         (max-retries           (configf:lookup *configdat* "setup" "maxretries"))
+         (max-concurrent-jobs   (configf:lookup-number *configdat* "setup" "max_concurrent_jobs" default: 50))
+         (reglen                (if (number? reglen-in) reglen-in 1))
+         (last-time-incomplete  (- (current-seconds) 900)) ;; force at least one clean up cycle
+         (last-time-some-running (current-seconds))
+         ;; (tdbdat                (tasks:open-db))
+	 (misc-data             (make-hash-table)) ;; use as needed
+         (runsdat (make-runs:dat
+                   ;; hed: hed
+                   ;; tal: tal
+                   ;; reg: reg
+                   ;; reruns: reruns
+                   reglen: reglen
+                   regfull: #f ;; regfull
+                   ;; test-record: test-record
+                   runname: runname
+                   ;; test-name: test-name
+                   ;; item-path: item-path
+                   ;; jobgroup: jobgroup
+                   max-concurrent-jobs: max-concurrent-jobs
+                   run-id: run-id
+                   ;; waitons: waitons
+                   ;; testmode: testmode
+                   test-patts: test-patts
+                   required-tests: required-tests
+                   test-registry: test-registry
+                   registry-mutex: registry-mutex
+                   flags: flags
+                   keyvals: keyvals
+                   run-info: run-info
+                   ;; newtal: newtal
+                   all-tests-registry: all-tests-registry
+                   ;; itemmaps: itemmaps
+                   ;; prereqs-not-met: (rmt:get-prereqs-not-met run-id waitons hed item-path mode: testmode itemmaps: itemmaps)
+                   ;; can-run-more-tests: (runs:can-run-more-tests run-id jobgroup max-concurrent-jobs) ;; look at the test jobgroup and tot jobs running
+                   )))
 
     ;; Initialize the test-registery hash with tests that already have a record
     ;; convert state to symbol and use that as the hash value
     (for-each (lambda (trec)
 		(let ((id (db:test-get-id        trec))
@@ -1156,11 +1536,11 @@
 		      (hash-table-set! test-registry (db:test-make-full-name tn ip) (string->symbol st)))))
 	      tests-info)
     (set! max-retries (if (and max-retries (string->number max-retries))(string->number max-retries) 100))
 
     (let loop ((hed         (car sorted-test-names))
-	       (tal         (cdr sorted-test-names))
+               (tal         (cdr sorted-test-names))
 	       (reg         '()) ;; registered, put these at the head of tal 
 	       (reruns      '()))
 
       (runs:incremental-print-results run-id)
 
@@ -1173,24 +1553,49 @@
           (begin
             (set! last-time-incomplete (current-seconds))
             ;; (rmt:find-and-mark-incomplete-all-runs)
 	    ))
 
+      ;; WAIT FOR TIME ON TIGHT LOOP
+      (if (< (- (current-milliseconds)(hash-table-ref/default misc-data "tight-loop-last-time" 0))
+	     100) ;; less than 1/100 second since came through the loop
+	  (thread-sleep! 0.1)) ;; wait a 1/100 seconds
+      (hash-table-set! misc-data "tight-loop-last-time" (current-milliseconds))
+      
       ;; (print "Top of loop, hed=" hed ", tal=" tal " ,reruns=" reruns)
       (let* ((test-record (hash-table-ref test-records hed))
 	     (test-name   (tests:testqueue-get-testname test-record))
 	     (tconfig     (tests:testqueue-get-testconfig test-record))
-	     (jobgroup    (config-lookup tconfig "test_meta" "jobgroup"))
-	     (testmode    (let ((m (config-lookup tconfig "requirements" "mode")))
+	     (jobgroup    (configf:lookup tconfig "test_meta" "jobgroup"))
+	     (testmode    (let ((m (configf:lookup tconfig "requirements" "mode")))
 			    (if m (map string->symbol (string-split m)) '(normal))))
 	     (itemmaps    (tests:get-itemmaps tconfig)) ;;  (configf:lookup tconfig "requirements" "itemmap"))
-	     (waitons     (tests:testqueue-get-waitons    test-record))
 	     (priority    (tests:testqueue-get-priority   test-record))
 	     (itemdat     (tests:testqueue-get-itemdat    test-record)) ;; itemdat can be a string, list or #f
 	     (items       (tests:testqueue-get-items      test-record))
 	     (item-path   (item-list->path itemdat))
 	     (tfullname   (db:test-make-full-name test-name item-path))
+	      ;; these are hard coded item-item waits test/item-path => test/item-path2 ...
+	     (extra-waits (let* ((section (configf:get-section (tests:testqueue-get-testconfig test-record) "waitons"))
+				 (myextra (alist-ref tfullname section equal?)))
+			    (if myextra
+				(let ((extras (string-split (car myextra))))
+				  (if (runs:lownoise (conc tfullname "extra-waitons" tfullname) 60)
+				      (debug:print-info 0 *default-log-port* "HAVE EXTRA WAITONS for test " tfullname ": " myextra))
+				  (for-each
+				   (lambda (extra)
+				     ;; (debug:print 0 *default-log-port* "FYI: extra = " extra " reruns = " reruns)
+				     (let ((basetestname (car (string-split extra "/"))))
+				       #;(if (not (member extra tal))
+					   (set! reruns (append tal (list extra))))
+				       (if (not (member basetestname tal))
+					   (set! reruns (append tal (list basetestname))))
+				       ))
+				   extras)
+				  extras)
+				'())))
+	     (waitons     (delete-duplicates (append (tests:testqueue-get-waitons test-record) extra-waits) equal?))
 	     (newtal      (append tal (list hed)))
 	     (regfull     (>= (length reg) reglen))
 	     (num-running (rmt:get-count-tests-running-for-run-id run-id))
 	     (testdat     (make-runs:testdat
 			   hed: hed
@@ -1206,21 +1611,16 @@
 			   newtal:      newtal
 			   itemmaps:    itemmaps
 			   ;; prereqs-not-met: prereqs-not-met
 			   )))
 	(runs:dat-regfull-set! runsdat regfull)
-
-	;; every 15 minutes verify the server is there for this run
-	(if (and (common:low-noise-print 240 "try start server"  run-id)
-		 (not (server:check-if-running *toppath*)))
-	    (server:kind-run *toppath*))
-	
+    
 	(if (> num-running 0)
-	  (set! last-time-some-running (current-seconds)))
+            (set! last-time-some-running (current-seconds)))
 
-      (if (> (current-seconds)(+ last-time-some-running (or (configf:lookup *configdat* "setup" "give-up-waiting") 36000)))
-	  (hash-table-set! *max-tries-hash* tfullname (+ (hash-table-ref/default *max-tries-hash* tfullname 0) 1)))
+        (if (> (current-seconds)(+ last-time-some-running (or (configf:lookup *configdat* "setup" "give-up-waiting") 36000)))
+            (hash-table-set! *max-tries-hash* tfullname (+ (hash-table-ref/default *max-tries-hash* tfullname 0) 1)))
 	;; (debug:print 0 *default-log-port* "max-tries-hash: " (hash-table->alist *max-tries-hash*))
 
 	;; Ensure all top level tests get registered. This way they show up as "NOT_STARTED" on the dashboard
 	;; and it is clear they *should* have run but did not.
 	(if (not (hash-table-ref/default test-registry (db:test-make-full-name test-name "") #f))
@@ -1238,28 +1638,31 @@
 	      (if (or (not (null? tal))(not (null? reg)))
 		  (loop (runs:queue-next-hed tal reg reglen regfull)
 			(runs:queue-next-tal tal reg reglen regfull)
 			(runs:queue-next-reg tal reg reglen regfull)
 			reruns))))
-		  ;; (loop (car tal)(cdr tal) reg reruns))))
+        ;; (loop (car tal)(cdr tal) reg reruns))))
 
 	(runs:incremental-print-results run-id)
 	(debug:print 4 *default-log-port* "TOP OF LOOP => "
 		     "test-name: " test-name
-		     "\n  test-record  " test-record
 		     "\n  hed:         " hed
-		     "\n  itemdat:     " itemdat
+		     "\n  tal:         " (runs:pretty-long-list tal)
+		     "\n  reg:         " reg
+                     "\n  test-record  " test-record
+                     "\n  itemdat:     " itemdat
 		     "\n  items:       " items
 		     "\n  item-path:   " item-path
 		     "\n  waitons:     " waitons
 		     "\n  num-retries: " num-retries
-		     "\n  tal:         " tal
-		     "\n  reruns:      " reruns
+                     "\n  reruns:      " reruns
 		     "\n  regfull:     " regfull
 		     "\n  reglen:      " reglen
 		     "\n  length reg:  " (length reg)
-		     "\n  reg:         " reg)
+                     )
+
+	;; (runs:parallel-runners-mgmt runsdat)
 
 	;; check for hed in waitons => this would be circular, remove it and issue an
 	;; error
 	(if (member test-name waitons)
 	    (begin
@@ -1279,88 +1682,162 @@
 				   (if (and (not (member waiton tal))            ;; this waiton is not in the list to be tried to run
 					    (not (member waiton reruns)))
 				       1
 				       #f))
 				 waitons))))) ;; could do this more elegantly with a marker....
+          (debug:print-info 4 *default-log-port* "cond branch - "  "rtq-1")
 	  (debug:print 0 *default-log-port* "WARNING: Marking test " tfullname " as not runnable. It is waiting on tests that cannot be run. Giving up now.")
 	  (hash-table-set! test-registry tfullname 'removed))
 
 	 ;; items is #f then the test is ok to be handed off to launch (but not before)
 	 ;; 
 	 ((not items)
+          (debug:print-info 4 *default-log-port* "cond branch - "  "rtq-2")
 	  (debug:print-info 4 *default-log-port* "OUTER COND: (not items)")
 	  (if (and (not (tests:match test-patts (tests:testqueue-get-testname test-record) item-path required: required-tests))
 		   (not (null? tal)))
 	      (loop (car tal)(cdr tal) reg reruns))
+
+	  ;; gonna try a strategy change here.
+	  ;;
+	  ;; check if can run more tests. if yes, continue, if no, rest until can run more
+	  ;; look at the test jobgroup and tot jobs running
+	  ;;
+	  ;; NOTE: This does NOT actually gate here, only captures the proc to be called later
+	  ;; 
+	  (if (not (runs:dat-wait-for-jobs-function runsdat))
+	      (runs:dat-wait-for-jobs-function-set!
+	       runsdat 
+	       (lambda (testdat-in)
+		 (let* ((jobgroup              (runs:testdat-jobgroup testdat-in))
+			(can-run-more-tests    (runs:dat-can-run-more-tests runsdat))
+			(last-jobs-check-time  (runs:dat-last-jobs-check-time runsdat))
+			(should-check-jobs     (match can-run-more-tests
+						 ((can-run-more-flag num-running nr-in-jobgroup max-concurrent-jobs . params)
+						  (if (< (- max-concurrent-jobs num-running) 25)
+						      (begin
+							(debug:print-info 0 *default-log-port*
+									  "less than 20 jobs headroom, ("max-concurrent-jobs
+									  "-"num-running")>20. Forcing prelaunch check.")
+							#t)
+						      #f))
+						 (else #f)))) ;; no record yet
+		   (if should-check-jobs
+		       (let loop-can-run-more
+			   ((res      (runs:can-run-more-tests runsdat run-id jobgroup max-concurrent-jobs))
+			    (remtries 1440)) ;; we can wait for up to two hours for jobs to get done
+			 (match res
+			   ((run-more num-running . rem)
+			    (if (or run-more
+				    (< remtries 1))
+				(begin
+				  (if (runs:lownoise "num-running" 30)
+				      (debug:print-info 0 *default-log-port* "Have "num-running" tests of max " max-concurrent-jobs))
+				  (runs:dat-can-run-more-tests-set! runsdat res)) ;; capture the result and then drop through
+				(begin
+				  (if (runs:lownoise "num-running" 10)
+				      (debug:print-info 0 *default-log-port* "Can't run more tests, have "num-running" tests of "
+							max-concurrent-jobs " allowed."))
+				  (thread-sleep! 5) ;; if we've hit max concurrent jobs take a breather, nb// make this configurable
+				  
+				  ;; wait for load here
+				  (if (runs:dat-load-mgmt-function runsdat)((runs:dat-load-mgmt-function runsdat)))
+				  (loop-can-run-more (runs:can-run-more-tests runsdat run-id jobgroup max-concurrent-jobs)
+						     (- remtries 1)))))))
+		       )))))
+
+	  ;; I'm not clear on why prereqs are gathered here TODO: verfiy this is needed
+	  (let ((waited (runs:wait-if-seen-recently 5 "prereqs-not-met" hed item-path))) ;; if we've been down this path in the past 5 seconds - wait out the difference
+	    (if (> waited 0)(debug:print 0 *default-log-port* "Waited for prereqs-not-met-"hed"-"item-path" for " waited "seconds.")))
+	  
 	  (runs:testdat-prereqs-not-met-set! testdat (rmt:get-prereqs-not-met run-id waitons hed item-path mode: testmode itemmaps: itemmaps))
-	  (runs:dat-can-run-more-tests-set! runsdat (runs:can-run-more-tests runsdat run-id jobgroup max-concurrent-jobs)) ;; look at the test jobgroup and tot jobs running
-	  (let ((loop-list (runs:process-expanded-tests runsdat testdat)))
-	      (if loop-list (apply loop loop-list))))
+
+	  ;; I'm not clear on why we'd capture running job counts here TODO: verify this is needed
+	  (runs:dat-can-run-more-tests-set! runsdat (runs:can-run-more-tests runsdat run-id jobgroup max-concurrent-jobs))
+
+	  (let ((loop-list (runs:process-expanded-tests runsdat testdat))) ;; in process-expanded-tests ultimately run:test -> launch-test -> test actually running
+            (if loop-list (apply loop loop-list))))
 
 	 ;; items processed into a list but not came in as a list been processed
 	 ;;
 	 ((and (list? items)     ;; thus we know our items are already calculated
 	       (not   itemdat))  ;; and not yet expanded into the list of things to be done
+          (debug:print-info 4 *default-log-port* "cond branch - "  "rtq-3")
 	  (debug:print-info 4 *default-log-port* "OUTER COND: (and (list? items)(not itemdat))")
 	  ;; Must determine if the items list is valid. Discard the test if it is not.
 	  (if (and (list? items)
 		   (> (length items) 0)
 		   (and (list? (car items))
 			(> (length (car items)) 0))
 		   (debug:debug-mode 1))
 	      (debug:print 2 *default-log-port* (map (lambda (row)
-				    (conc (string-intersperse
-					   (map (lambda (varval)
-						  (string-intersperse varval "="))
-						row)
-					   " ")
-					  "\n"))
-				  items)))
-	  (for-each
-	   (lambda (my-itemdat)
-	     (let* ((new-test-record (let ((newrec (make-tests:testqueue)))
-				       (vector-copy! test-record newrec)
-				       newrec))
-		    (my-item-path (item-list->path my-itemdat)))
-	       (if (tests:match test-patts hed my-item-path required: required-tests) ;; (patt-list-match my-item-path item-patts)           ;; yes, we want to process this item, NOTE: Should not need this check here!
-		   (let ((newtestname (db:test-make-full-name hed my-item-path)))    ;; test names are unique on testname/item-path
-		     (tests:testqueue-set-items!     new-test-record #f)
-		     (tests:testqueue-set-itemdat!   new-test-record my-itemdat)
-		     (tests:testqueue-set-item_path! new-test-record my-item-path)
-		     (hash-table-set! test-records newtestname new-test-record)
-		     (set! tal (append tal (list newtestname))))))) ;; since these are itemized create new test names testname/itempath
-	   items)
-
-	  ;; (debug:print-info 0 *default-log-port* "Test " (tests:testqueue-get-testname test-record) " is itemized but has no items")
+                                                       (conc (string-intersperse
+                                                              (map (lambda (varval)
+                                                                     (string-intersperse varval "="))
+                                                                   row)
+                                                              " ")
+                                                             "\n"))
+                                                     items)))
+
+          (let* ((items-in-testpatt
+                  (filter
+                   (lambda (my-itemdat)
+                     (tests:match test-patts hed (item-list->path my-itemdat) ))
+                   ;; was: (tests:match test-patts hed (item-list->path my-itemdat) required: required-tests))
+                   items) ))
+            (if (null? items-in-testpatt)
+                (debug:print-error 0 *default-log-port* "Test " (tests:testqueue-get-testname test-record) " is itemized but has no items matching the test pattern")
+                
+                (for-each (lambda (my-itemdat)
+                            (let* ((new-test-record (let ((newrec (make-tests:testqueue)))
+                                                      (vector-copy! test-record newrec)
+                                                      newrec))
+                                   (my-item-path (item-list->path my-itemdat))
+
+                                   (newtestname (db:test-make-full-name hed my-item-path)))    ;; test names are unique on testname/item-path
+                              (tests:testqueue-set-items!     new-test-record #f)
+                              (tests:testqueue-set-itemdat!   new-test-record my-itemdat)
+                              (tests:testqueue-set-item_path! new-test-record my-item-path)
+                              (hash-table-set! test-records newtestname new-test-record)
+                              (set! tal (append tal (list newtestname)))))  ;; since these are itemized create new test names testname/itempath
+                          items-in-testpatt)))
+          
+          
 
 	  ;; At this point we have possibly added items to tal but all must be handed off to 
 	  ;; INNER COND logic. I think loop without rotating the queue 
 	  ;; (loop hed tal reg reruns))
 	  ;; (let ((newtal (append tal (list hed))))  ;; We should discard hed as it has been expanded into it's items? Yes, but only if this *is* an itemized test
 	  ;; (loop (car newtal)(cdr newtal) reg reruns)
 	  (if (null? tal)
 	      #f
 	      (loop (car tal)(cdr tal) reg reruns)))
-	    
+         
 	 ;; if items is a proc then need to run items:get-items-from-config, get the list and loop 
 	 ;;    - but only do that if resources exist to kick off the job
 	 ;; EXPAND ITEMS
 	 ((or (procedure? items)(eq? items 'have-procedure))
-	  (let ((can-run-more    (runs:can-run-more-tests runsdat run-id jobgroup max-concurrent-jobs)))
-	    (if (and (list? can-run-more)
-		     (car can-run-more))
-		(let ((loop-list (runs:expand-items hed tal reg reruns regfull newtal jobgroup max-concurrent-jobs run-id waitons item-path testmode test-record can-run-more items runname tconfig reglen test-registry test-records itemmaps)))
+          (debug:print-info 4 *default-log-port* "cond branch - "  "rtq-4")
+	  (let ((can-run-more    #f)) ;; (runs:can-run-more-tests runsdat run-id jobgroup max-concurrent-jobs)))
+	    (if (not can-run-more) #;(and (list? can-run-more)
+		(car can-run-more))
+		(let ((loop-list (runs:expand-items hed tal reg reruns regfull newtal jobgroup max-concurrent-jobs run-id waitons item-path testmode test-record can-run-more items runname tconfig reglen test-registry test-records itemmaps))) ;; itemized test expanded here
 		  (if loop-list
-		      (apply loop loop-list)))
+		      (apply loop loop-list)
+                      (debug:print-info 4 *default-log-port* " -- Can't expand hed="hed)
+                      )
+                  )
 		;; if can't run more just loop with next possible test
 		(loop (car newtal)(cdr newtal) reg reruns))))
-	    
+         
 	 ;; this case should not happen, added to help catch any bugs
 	 ((and (list? items) itemdat)
+          (debug:print-info 4 *default-log-port* "cond branch - "  "rtq-5")
 	  (debug:print-error 0 *default-log-port* "Should not have a list of items in a test and the itemspath set - please report this")
 	  (exit 1))
 	 ((not (null? reruns))
+          (debug:print-info 4 *default-log-port* "cond branch - "  "rtq-6")
 	  (let* ((newlst (tests:filter-non-runnable run-id tal test-records)) ;; i.e. not FAIL, WAIVED, INCOMPLETE, PASS, KILLED,
 		 (junked (lset-difference equal? tal newlst)))
 	    (debug:print-info 4 *default-log-port* "full drop through, if reruns is less than 100 we will force retry them, reruns=" reruns ", tal=" tal)
 	    (if (< num-retries max-retries)
 		(set! newlst (append reruns newlst)))
@@ -1368,52 +1845,68 @@
 	    ;; (thread-sleep! (+ 1 *global-delta*))
 	    (if (not (null? newlst))
 		;; since reruns have been tacked on to newlst create new reruns from junked
 		(loop (car newlst)(cdr newlst) reg (delete-duplicates junked)))))
 	 ((not (null? tal))
+          (debug:print-info 4 *default-log-port* "cond branch - "  "rtq-7")
 	  (debug:print-info 4 *default-log-port* "I'm pretty sure I shouldn't get here."))
 	 ((not (null? reg)) ;; could we get here with leftovers?
+          (debug:print-info 4 *default-log-port* "cond branch - "  "rtq-8")
 	  (debug:print-info 0 *default-log-port* "Have leftovers!")
 	  (loop (car reg)(cdr reg) '() reruns))
 	 (else
+          (debug:print-info 4 *default-log-port* "cond branch - "  "rtq-9")
 	  (debug:print-info 4 *default-log-port* "Exiting loop with...\n  hed=" hed "\n  tal=" tal "\n  reruns=" reruns))
-	 )))
+	 ))) ;; end loop on sorted test names
+    ;; this is the point where everything is launched and now you can mark the run in metadata table as all launched 
+    (rmt:set-var (conc "lunch-complete-" run-id) "yes")  
+        
     ;; now *if* -run-wait we wait for all tests to be done
     ;; Now wait for any RUNNING tests to complete (if in run-wait mode)
-    (thread-sleep! 5) ;; I think there is a race condition here. Let states/statuses settle
+    ;; (if (runs:dat-load-mgmt-function runsdat)((runs:dat-load-mgmt-function runsdat)))
+    (thread-sleep! 10) ;; I think there is a race condition here. Let states/statuses settle
+    
     (let wait-loop ((num-running      (rmt:get-count-tests-running-for-run-id run-id))
 		    (prev-num-running 0))
       ;; (debug:print-info 13 *default-log-port* "num-running=" num-running ", prev-num-running=" prev-num-running)
       (if (and (or (args:get-arg "-run-wait")
 		   (equal? (configf:lookup *configdat* "setup" "run-wait") "yes"))
 	       (> num-running 0))
 	  (begin
 	    ;; Here we mark any old defunct tests as incomplete. Do this every fifteen minutes
 	    ;; (debug:print 0 *default-log-port* "Got here eh! num-running=" num-running " (> num-running 0) " (> num-running 0))
-	    (if (> (current-seconds)(+ last-time-incomplete 900))
-		(begin
-		  (debug:print-info 0 *default-log-port* "Marking stuck tests as INCOMPLETE while waiting for run " run-id ". Running as pid " (current-process-id) " on " (get-host-name))
-		  (set! last-time-incomplete (current-seconds))
-		  (rmt:find-and-mark-incomplete run-id #f)))
-	    (if (not (eq? num-running prev-num-running))
-		(debug:print-info 0 *default-log-port* "run-wait specified, waiting on " num-running " tests in RUNNING, REMOTEHOSTSTART or LAUNCHED state at " (time->string (seconds->local-time (current-seconds)))))
-	    (thread-sleep! 5)
-	    ;; (wait-loop (rmt:get-count-tests-running-for-run-id run-id) num-running))))
-	    (wait-loop (rmt:get-count-tests-running-for-run-id run-id) num-running))))
+	    (if (> (- (current-seconds)(hash-table-ref/default *find-and-mark-incomplete-last-run* run-id 0)) 900)
+		;; (begin(if (> (current-seconds)(+ last-time-incomplete 900))
+		(let ((actual-num-running num-running)) ;; (rmt:get-count-tests-running-for-run-id run-id))) ;; why call it again?
+		  (debug:print-info 0 *default-log-port* "Marking stuck tests as INCOMPLETE while waiting for run " run-id
+				    ". Running as pid " (current-process-id) " on " (get-host-name))
+		  ;; (set! last-time-incomplete (current-seconds)) ;; FIXME, this might be causing slow down - use of set!
+		  (rmt:find-and-mark-incomplete run-id #f)
+		  (hash-table-set! *find-and-mark-incomplete-last-run* run-id (current-seconds))
+		  (debug:print-info 0 *default-log-port* "run-wait specified, waiting on " actual-num-running
+				    " tests in RUNNING, REMOTEHOSTSTART or LAUNCHED state at "
+				    (time->string (seconds->local-time (current-seconds))))))
+	    ;; (if (runs:dat-load-mgmt-function runsdat)((runs:dat-load-mgmt-function runsdat)))
+	    (thread-sleep! 5) ;; (if (>= num-running max-concurrent-jobs) 5 1))
+	    (wait-loop (rmt:get-count-tests-running-for-run-id run-id)
+		       num-running))))
     ;; LET* ((test-record
     ;; we get here on "drop through". All done!
+    ;; this is moved to runs:run-testes since this function is getting called twice to ensure everthing is completed. 
+    ;; (debug:print-info 0 *default-log-port* "Calling Post Hook")    
+    ;; (runs:run-post-hook run-id)
     (debug:print-info 1 *default-log-port* "All tests launched")))
 
 (define (runs:calc-fails prereqs-not-met)
   (filter (lambda (test)
 	    (and (vector? test) ;; not (string? test))
-		 (member (db:test-get-state test) '("INCOMPLETE" "COMPLETED"))
+		 (member (db:test-get-state test) '("INCOMPLETE" "COMPLETED")) ;; TODO: pull from *common:stuff...*
 		 (not (member (db:test-get-status test)
 			      '("PASS" "WARN" "CHECK" "WAIVED" "SKIP")))))
 	  prereqs-not-met))
 
-(define (runs:calc-prereq-fail prereqs-not-met)
+(define (runs:calc-prereq-fail prereqs-not-met) ;; REMOVEME since NOT_STARTED/PREQ_FAIL is now COMPLETED/PREQ_FAIL
   (filter (lambda (test)
 	    (and (vector? test) ;; not (string? test))
 		 (equal? (db:test-get-state test) "NOT_STARTED")
 		 (not (member (db:test-get-status test)
 			      '("n/a" "KEEP_TRYING")))))
@@ -1450,39 +1943,50 @@
 	     (conc (db:test-get-testname t) ":" (db:test-get-state t) "/" (db:test-get-status t))))
        lst))
 
 ;; parent-test is there as a placeholder for when parent-tests can be run as a setup step
 ;;
-(define (run:test run-id run-info keyvals runname test-record flags parent-test test-registry all-tests-registry)
+(define (run:test run-id run-info keyvals runname test-record flags parent-test test-registry all-tests-registry runsdat testdat-rec)
   ;; All these vars might be referenced by the testconfig file reader
+  ;; 
+  ;; NEED to reprocess testconfig here, ensuring that item variables are available.
+  ;; This is for Tal's issue with item-specific env vars not being set for use in skip.
+  ;; HSD https://hsdes.intel.com/appstore/icf/index.html#/article?articleId=1408763273
+  ;;
   (let* ((test-name    (tests:testqueue-get-testname   test-record))
 	 (test-waitons (tests:testqueue-get-waitons    test-record))
-	 (test-conf    (tests:testqueue-get-testconfig test-record))
 	 (itemdat      (tests:testqueue-get-itemdat    test-record))
-	 (test-path    (hash-table-ref all-tests-registry test-name)) ;; (conc *toppath* "/tests/" test-name)) ;; could use tests:get-testconfig here ...
-	 (force        (hash-table-ref/default flags "-force" #f))
-	 (rerun        (hash-table-ref/default flags "-rerun" #f))
-	 (keepgoing    (hash-table-ref/default flags "-keepgoing" #f))
-	 (incomplete-timeout (string->number (or (configf:lookup *configdat* "setup" "incomplete-timeout") "x")))
 	 (item-path     "")
 	 (db           #f)
 	 (full-test-name #f))
 
     ;; setting itemdat to a list if it is #f
     (if (not itemdat)(set! itemdat '()))
     (set! item-path (item-list->path itemdat))
     (set! full-test-name (db:test-make-full-name test-name item-path))
+    (runs:set-megatest-env-vars run-id inrunname: runname testname: test-name itempath: item-path) ;; these may be needed by the launching process
+
+   (let* ((test-conf ;; re-instate the tests:get-testconfig once the kinks are worked out. FIXME!!!
+	    ;; (tests:get-testconfig test-name item-path all-tests-registry #t force-create: #t))
+	    (tests:testqueue-get-testconfig test-record )) 
+	   (test-path    (hash-table-ref all-tests-registry test-name)) ;; (conc *toppath* "/tests/" test-name)) ;; could use tests:get-testconfig here ...
+
+	   (force        (hash-table-ref/default flags "-force" #f))
+	   (rerun        (hash-table-ref/default flags "-rerun" #f))
+	   (keepgoing    (hash-table-ref/default flags "-keepgoing" #f))
+	   (incomplete-timeout (string->number (or (configf:lookup *configdat* "setup" "incomplete-timeout") "x")))
+	   )
+
     (debug:print-info 4 *default-log-port*
 		      "\nTESTNAME: " full-test-name 
 		      "\n   test-config: " (hash-table->alist test-conf)
 		      "\n   itemdat: " itemdat
 		      )
     (debug:print 2 *default-log-port* "Attempting to launch test " full-test-name)
     ;; (setenv "MT_TEST_NAME" test-name) ;; 
     ;; (setenv "MT_ITEMPATH"  item-path)
     ;; (setenv "MT_RUNNAME"   runname)
-    (runs:set-megatest-env-vars run-id inrunname: runname testname: test-name itempath: item-path) ;; these may be needed by the launching process
     (change-directory *toppath*)
 
     ;; Here is where the test_meta table is best updated
     ;; Yes, another use of a global for caching. Need a better way?
     ;;
@@ -1490,12 +1994,12 @@
     ;; per-test call is not needed. Given the delicacy of the move to 
     ;; v1.55 this code is being left in place for the time being.
     ;;
     (if (not (hash-table-ref/default *test-meta-updated* test-name #f))
         (begin
-	   (hash-table-set! *test-meta-updated* test-name #t)
-           (runs:update-test_meta test-name test-conf)))
+          (hash-table-set! *test-meta-updated* test-name #t)
+          (runs:update-test_meta test-name test-conf)))
     
     ;; itemdat => ((ripeness "overripe") (temperature "cool") (season "summer"))
     (let* ((new-test-path (string-intersperse (cons test-path (map cadr itemdat)) "/"))
 	   (test-id       (rmt:get-test-id run-id test-name item-path))
 	   (testdat       (if test-id (rmt:get-test-info-by-id run-id test-id) #f)))
@@ -1517,17 +2021,18 @@
 		  (set! test-id (rmt:get-test-id run-id test-name item-path))))
 	    (debug:print-info 4 *default-log-port* "test-id=" test-id ", run-id=" run-id ", test-name=" test-name ", item-path=\"" item-path "\"")
 	    (set! testdat (rmt:get-test-info-by-id run-id test-id))
 	    (if (not testdat)
 		(begin
-		  (debug:print-info 0 *default-log-port* "WARNING: server is overloaded, trying again in one second")
-		  (thread-sleep! 1)
+		  (debug:print-info 0 *default-log-port* "WARNING: server is overloaded, trying again in two seconds")
+		  ;; (if (runs:dat-load-mgmt-function runsdat)((runs:dat-load-mgmt-function runsdat)))
+		  (thread-sleep! 2)
 		  (loop)))))
       (if (not testdat) ;; should NOT happen
 	  (debug:print-error 0 *default-log-port* "failed to get test record for test-id " test-id))
       (set! test-id (db:test-get-id testdat))
-      (if (file-exists? test-path)
+      (if (common:file-exists? test-path)
 	  (change-directory test-path)
 	  (begin
 	    (debug:print-error 0 *default-log-port* "test run path not created before attempting to run the test. Perhaps you are running -remove-runs at the same time?")
 	    (change-directory *toppath*)))
       (case (if force ;; (args:get-arg "-force")
@@ -1589,15 +2094,32 @@
 			(configf:lookup test-conf "skip" "prevrunning"))
 		   ;; run-ids = #f means *all* runs
 		   (let ((running-tests (rmt:get-tests-for-runs-mindata #f full-test-name '("RUNNING" "REMOTEHOSTSTART" "LAUNCHED") '() #f)))
 		     (if (not (null? running-tests)) ;; have to skip 
 			 (set! skip-test "Skipping due to previous tests running"))))
-		  ((and skip-check
-			(configf:lookup test-conf "skip" "fileexists"))
-		   (if (common:file-exists? (configf:lookup test-conf "skip" "fileexists"))
-		       (set! skip-test (conc "Skipping due to existance of file " (configf:lookup test-conf "skip" "fileexists")))))
-		  ((and skip-check
+
+ 		    ;; split the string and OR of file-exists?
+		    ((and skip-check
+			  (configf:lookup test-conf "skip" "fileexists"))
+		     (let* ((files    (string-split (configf:lookup test-conf "skip" "fileexists")))
+			    (existing (filter common:file-exists? files)))
+		       (if (not (null? existing)) ;; (common:file-exists? (configf:lookup test-conf "skip" "fileexists"))
+			   (set! skip-test (conc "Skipping due to existance of file(s) " (string-intersperse existing ", ")))))) ;; (configf:lookup test-conf "skip" "fileexists")))))
+
+ 		    ((and skip-check
+			  (configf:lookup test-conf "skip" "filenotexists"))
+		      (let* ((files    (string-split (configf:lookup test-conf "skip" "filenotexists")))
+			      (existing (filter common:file-exists? files)))
+			      (if (null? existing) ;;  (common:file-exists? (configf:lookup test-conf "skip" "filenotexists")))
+			        (set! skip-test (conc "Skipping due to non existance of files " (string-intersperse files ", ")))))) ;; (configf:lookup test-conf "skip" "filenotexists")))))        
+		 
+       ((and skip-check
+			(configf:lookup test-conf "skip" "script"))
+		   (if (= (system (configf:lookup test-conf "skip" "script")) 0)
+                        (set! skip-test (conc "Skipping due to zero return value of script " (configf:lookup test-conf "skip" "script")))))
+      
+                  ((and skip-check
 			(configf:lookup test-conf "skip" "rundelay"))
 		   ;; run-ids = #f means *all* runs
 		   (let* ((numseconds      (common:hms-string->seconds (configf:lookup test-conf "skip" "rundelay")))
 			  (running-tests   (rmt:get-tests-for-runs-mindata #f full-test-name '("RUNNING" "REMOTEHOSTSTART" "LAUNCHED") '() #f))
 			  (completed-tests (rmt:get-tests-for-runs-mindata #f full-test-name '("COMPLETED" "INCOMPLETE") '("PASS" "FAIL" "ABORT") #f)) ;; ironically INCOMPLETE is same as COMPLETED in this contex
@@ -1609,15 +2131,26 @@
 		 
 		 (if skip-test
 		     (begin
 		       (mt:test-set-state-status-by-id run-id test-id "COMPLETED" "SKIP" skip-test)
 		       (debug:print-info 1 *default-log-port* "SKIPPING Test " full-test-name " due to " skip-test))
-		     (if (not (launch-test test-id run-id run-info keyvals runname test-conf test-name test-path itemdat flags))
-			 (begin
-			   (print "ERROR: Failed to launch the test. Exiting as soon as possible")
-			   (set! *globalexitstatus* 1) ;; 
-			   (process-signal (current-process-id) signal/kill))))))))
+		     ;;
+		     ;; Here the test is handed off to launch.scm for launch-test to complete the launch process
+		     ;;
+		     (begin
+		       ;; wait for less than max jobs here
+		       (if (runs:dat-wait-for-jobs-function runsdat)
+			   ((runs:dat-wait-for-jobs-function runsdat) testdat-rec))
+		       
+		       (if (not (launch-test test-id run-id run-info keyvals runname test-conf test-name test-path itemdat flags))
+			   (begin
+			     (print "ERROR: Failed to launch the test. Exiting as soon as possible")
+			     (set! *globalexitstatus* 1) ;; 
+			     (process-signal (current-process-id) signal/kill))
+			   )
+		       ;; wait again here?
+		       ))))))
 	((KILLED) 
 	 (debug:print 1 *default-log-port* "NOTE: " full-test-name " is already running or was explictly killed, use -force to launch it.")
 	 (hash-table-set! test-registry (db:test-make-full-name test-name test-path) 'DONOTRUN)) ;; KILLED))
 	((LAUNCHED REMOTEHOSTSTART RUNNING)  
 	 (debug:print 2 *default-log-port* "NOTE: " test-name " is already running"))
@@ -1634,11 +2167,11 @@
 	 (debug:print-error 0 *default-log-port* "Failed to launch test " full-test-name ". Unrecognised state " (test:get-state testdat))
 	 (case (string->symbol (test:get-state testdat)) 
 	   ((COMPLETED INCOMPLETE)
 	    (hash-table-set! test-registry (db:test-make-full-name test-name test-path) 'DONOTRUN))
 	   (else
-	    (hash-table-set! test-registry (db:test-make-full-name test-name test-path) 'DONOTRUN))))))))
+	    (hash-table-set! test-registry (db:test-make-full-name test-name test-path) 'DONOTRUN)))))))))
 
 ;;======================================================================
 ;; END OF NEW STUFF
 ;;======================================================================
 
@@ -1670,23 +2203,116 @@
    (lambda (f x)
      (let ((fullname (conc real-dir "/" f)))
        (if (not (string-search (regexp "testdat.db") f))
 	   (runs:recursive-delete-with-error-msg fullname)))
      (+ 1 x))
-   0 real-dir)
+   0 real-dir #t)
   ;; then the entire directory
   (runs:recursive-delete-with-error-msg real-dir))
+
+;; cleanup often needs to remove all but the last N runs per target
+;;
+;; target-patts a1/b1/c1,a2/b2/c2 ...
+;;
+;; This will fail if called with empty target or a bad target (i.e. missing or extra fields)
+;;
+(define (runs:get-hash-by-target target-patts runpatt)
+  (let* ((targets (string-split target-patts ","))
+	 (keys    (rmt:get-keys))
+	 (res-ht  (make-hash-table))) ;; target -> ( runrecord1 runrecord2 ... )
+    (for-each
+     (lambda (target-patt)
+       (let ((runs     (rmt:simple-get-runs runpatt #f #f target-patt #f)))
+	 (for-each
+	  (lambda (run)
+	    (let ((target (simple-run-target run)))
+	      (hash-table-set! res-ht target (cons run (hash-table-ref/default res-ht target '())))))
+	  runs)))
+     targets)
+    res-ht))
+
+;; delete runs older than X (weeks, days, months years etc.)
+;; delete redundant runs within a target - N is the input
+;; delete redundant runs within a target IFF older than given date/time AND keep at least N
+;; 
+(define (runs:remove-all-but-last-n-runs-per-target target-patts runpatt num-to-keep #!key (actions '(print)))
+  (let* ((runs-ht  (runs:get-hash-by-target target-patts runpatt))
+	 (age      (if (args:get-arg "-age")(common:hms-string->seconds (args:get-arg "-age")) #f))
+	 (age-mark (if age (- (current-seconds) age) (+ (current-seconds) 86400)))
+	 (precmd   (or (args:get-arg "-precmd") "")))
+    (print "Actions: " actions)
+    (for-each
+     (lambda (target)
+       (let* ((runs      (hash-table-ref runs-ht target))
+	      (sorted    (sort runs (lambda (a b)(< (simple-run-event_time a)(simple-run-event_time b)))))
+	      (to-remove (let* ((len      (length sorted))
+                                (trim-amt (- len num-to-keep)))
+                           (if (> trim-amt 0)
+                               (take sorted trim-amt)
+                               '()))))
+	 (hash-table-set! runs-ht target to-remove)
+         (print target ":")
+         (for-each
+          (lambda (run)
+            (let ((remove (member run to-remove (lambda (a b)
+                                                  (eq? (simple-run-id a)
+                                                       (simple-run-id b))))))
+	      (if (and age (> (simple-run-event_time run) age-mark))
+		  (print "Skipping handling of " target "/" (simple-run-runname run) " as it is younger than " (args:get-arg "-age"))
+		  (for-each
+		   (lambda (action)
+		     (case action
+		       ((print)
+			(print " " (simple-run-runname run)
+			       " " (time->string (seconds->local-time (simple-run-event_time run)) "WW%V.%u %H:%M:%S")
+			       " " (if remove "REMOVE" "")))
+		       ((remove-runs)
+			(if remove (system (conc precmd " megatest -remove-runs -target " target " -runname " (simple-run-runname run) " -testpatt %"
+						 (if (member 'kill-runs actions) ;; if kill-runs is specified then set -kill-wait to 0
+						     " -kill-wait 0"
+						     "")))))
+		       ((archive)
+			(if remove (system (conc precmd " megatest -archive save-remove -target " target " -runname " (simple-run-runname run) " -testpatt %"))))
+		       ((kill-runs)
+			(if remove (system (conc precmd " megatest -kill-runs -target " target " -runname " (simple-run-runname run) " -testpatt %"))))
+			))
+		   actions))))
+          sorted)))
+     ;; (print "Sorted: " (map simple-run-event_time sorted))
+     ;; (print "Remove: " (map simple-run-event_time to-remove))))
+     (hash-table-keys runs-ht))
+    runs-ht))
+
+(define (remove-last-path-directory path-in)
+  (let* ((dparts  (string-split path-in "/"))
+    (path-out (conc "/" (string-intersperse (take dparts (- (length dparts) 1)) "/")))
+    )
+    path-out
+  )
+)
+
+
+;; (define (runs:remove-all-but-last-n-runs-per-target target-patts runpatt num-to-keep)
+;;   (let ((data (runs:get-all-but-most-recent-n-per-target target-patts runpatt num-to-keep)))
+;;     (for-each
+;;      (lambda (target)
+;;        (let ((runs-to-remove (hash-table-ref data target )))
+;;          (for-each
+;;           (lambda (run)
+;;             (print "megatest -remove-runs -target " target " -runname " (simple-run-runname run) " -testpatt %"))
+;;           runs-to-remove)))
+;;      (hash-table-keys data))))
 
 ;; Remove runs
 ;; fields are passing in through 
 ;; action:
 ;;    'remove-runs
 ;;    'set-state-status
 ;;
 ;; NB// should pass in keys?
 ;;
-(define (runs:operate-on action target runnamepatt testpatt #!key (state #f)(status #f)(new-state-status #f)(mode 'remove-all)(options '()))
+(define (runs:operate-on action target runnamepatt testpatt #!key (state #f)(status #f)(new-state-status #f)(mode #f)(options '()))
   (common:clear-caches) ;; clear all caches
   (let* ((db           #f)
 	 ;; (tdbdat       (tasks:open-db))
 	 (keys         (rmt:get-keys))
 	 (rundat       (mt:get-runs-by-patt keys runnamepatt target))
@@ -1694,20 +2320,21 @@
 	 (runs         (vector-ref rundat 1))
 	 (states       (if state  (string-split state  ",") '()))
 	 (statuses     (if status (string-split status ",") '()))
 	 (state-status (if (string? new-state-status) (string-split new-state-status ",") '(#f #f)))
 	 (rp-mutex     (make-mutex))
-	 (bup-mutex    (make-mutex)))
+	 (bup-mutex    (make-mutex))
+         (keep-records (args:get-arg "-keep-records")) ;; used in conjunction with -remove-runs to keep the records, TODO: consolidate this with "mode".
+	 (test-records '())) ;; for tasks that we wish to operate on all tests in one fell swoop
 
-    (let* ((write-access-actions '(remove-runs set-state-status archive run-wait))
+    (let* ((write-access-actions '(remove-runs set-state-status archive run-wait kill-runs))
            (dbfile             (conc  *toppath* "/megatest.db"))
            (readonly-mode      (not (file-write-access? dbfile))))
       (when (and readonly-mode
                  (member action write-access-actions))
         (debug:print-error 0 *default-log-port* "megatest.db is readonly.  Cannot proceed with action ["action"] in which write-access isrequired .")
         (exit 1)))
-
     
     (debug:print-info 4 *default-log-port* "runs:operate-on => Header: " header " action: " action " new-state-status: " new-state-status)
     (if (> 2 (length state-status))
 	(begin
 	  (debug:print-error 0 *default-log-port* "the parameter to -set-state-status is a comma delimited string. E.g. COMPLETED,FAIL")
@@ -1716,34 +2343,40 @@
      (lambda (run)
        (let ((runkey (string-intersperse (map (lambda (k)
 						(db:get-value-by-header run header k)) keys) "/"))
 	     (dirs-to-remove (make-hash-table))
 	     (proc-get-tests (lambda (run-id)
-			      (mt:get-tests-for-run run-id
-						    testpatt states statuses
-						    not-in:  #f
-						    sort-by: (case action
-							       ((remove-runs) 'rundir)
-							       (else          'event_time))))))
+                               (mt:get-tests-for-run run-id
+                                                     testpatt states statuses
+                                                     not-in:  #f
+                                                     sort-by: (case action
+                                                                ((remove-runs) 'rundir)
+                                                                (else          'event_time))))))
 	 (let* ((run-id    (db:get-value-by-header run header "id"))
 		(run-state (db:get-value-by-header run header "state"))
 		(run-name  (db:get-value-by-header run header "runname"))
 		(tests     (if (not (equal? run-state "locked"))
 			       (proc-get-tests run-id)
 			       '()))
 		(lasttpath "/does/not/exist/I/hope")
+		(lastrealpath "/does/not/exist/I/hope")
+                ;; there may be a number of different disks used in the same run.
+                (run-paths-hash (make-hash-table))
 		(worker-thread #f))
 	   (debug:print-info 4 *default-log-port* "runs:operate-on run=" run ", header=" header)
 	   (if (not (null? tests))
 	       (begin
 		 (case action
+                   ((kill-runs)
+                    (tasks:kill-runner target run-name "%")
+                    (debug:print 1 *default-log-port* "Killing tests for run: " runkey " " (db:get-value-by-header run header "runname"))
+                    )
 		   ((remove-runs)
 		    ;; (if (tasks:need-server run-id)(tasks:start-and-wait-for-server tdbdat run-id 10))
 		    ;; seek and kill in flight -runtests with % as testpatt here
 		    ;; (if (equal? testpatt "%")
 		    (tasks:kill-runner target run-name testpatt)
-		    
 		    ;; (debug:print 0 *default-log-port* "not attempting to kill any run launcher processes as testpatt is " testpatt))
 		    (debug:print 1 *default-log-port* "Removing tests for run: " runkey " " (db:get-value-by-header run header "runname")))
 		   ((set-state-status)
 		    ;; (if (tasks:need-server run-id)(tasks:start-and-wait-for-server tdbdat run-id 10))
 		    (debug:print 1 *default-log-port* "Modifying state and staus for tests for run: " runkey " " (db:get-value-by-header run header "runname")))
@@ -1752,19 +2385,29 @@
 		    action)
 		   ((run-wait)
 		    (debug:print 1 *default-log-port* "Waiting for run " runkey ", run=" runnamepatt " to complete"))
 		   ((archive)
 		    (debug:print 1 *default-log-port* "Archiving/restoring (" (args:get-arg "-archive") ") data for run: " runkey " " (db:get-value-by-header run header "runname"))
-		    (set! worker-thread (make-thread (lambda ()
-						       (case (string->symbol (args:get-arg "-archive"))
-							 ((save save-remove keep-html)(archive:run-bup (args:get-arg "-archive") run-id run-name tests rp-mutex bup-mutex))
-							 ((restore)(archive:bup-restore (args:get-arg "-archive") run-id run-name tests rp-mutex bup-mutex))
-							 (else 
-							  (debug:print-error 0 *default-log-port* "unrecognised sub command to -archive. Run \"megatest\" to see help")
-							  (exit))))
-						     "archive-bup-thread"))
-		    (thread-start! worker-thread))
+		    (let ((op (string->symbol (args:get-arg "-archive"))))
+		      (set! worker-thread
+			    (make-thread
+			     (lambda ()
+			       (case op
+				 ((save save-remove keep-html)
+				  (archive:run-bup op run-id run-name tests rp-mutex bup-mutex))
+				 ((restore)
+				  (archive:bup-restore op run-id run-name tests rp-mutex bup-mutex))
+				 ((get) ;;; NOTE: This is a special case. We wish to operate on ALL tests in one go
+				  (set! test-records (append tests test-records)))
+				 (else 
+				  (debug:print-error 0 *default-log-port* "unrecognised sub command " op " for -archive. Run \"megatest\" to see help")
+				  (exit))))
+			     "archive-bup-thread"))
+		      (thread-start! worker-thread)
+		      (if (eq? op 'get)
+			  (thread-join! worker-thread)) ;; we need the test-records set to not overlap
+		      ))
 		   (else
 		    (debug:print-info 0 *default-log-port* "action not recognised " action)))
 		 
 		 ;; actions that operate on one test at a time can be handled below
 		 ;;
@@ -1777,11 +2420,14 @@
 								     (if (and (string? dira)(string? dirb))
 									 (> (string-length dira)(string-length dirb))
 									 #f))))))
 		       (toplevel-retries (make-hash-table)) ;; try three times to loop through and remove top level tests
 		       (test-retry-time  (make-hash-table))
-		       (allow-run-time   10)) ;; seconds to allow for killing tests before just brutally killing 'em
+                       (backgrounded-remove-status     (make-hash-table))
+                       (backgrounded-remove-last-visit (make-hash-table))
+                       (backgrounded-remove-result     (make-hash-table))
+		       (allow-run-time   (string->number (or (args:get-arg "-kill-wait") "10")))) ;; seconds to allow for killing tests before just brutally killing 'em
 		   (let loop ((test (car sorted-tests))
 			      (tal  (cdr sorted-tests)))
 		     (let* ((test-id       (db:test-get-id test))
 			    (new-test-dat  (rmt:get-test-info-by-id run-id test-id)))
 		       (if (not new-test-dat)
@@ -1792,158 +2438,330 @@
 			   (let* ((item-path     (db:test-get-item-path new-test-dat))
 				  (test-name     (db:test-get-testname new-test-dat))
 				  (run-dir       ;;(filedb:get-path *fdb*
 				   ;; (rmt:sdb-qry 'getid 
 				   (db:test-get-rundir new-test-dat)) ;; )    ;; run dir is from the link tree
+                                  (has-subrun    (and (subrun:subrun-test-initialized? run-dir)
+                                                      (not (subrun:subrun-removed? run-dir))))
 				  (test-state    (db:test-get-state new-test-dat))
+                                  (test-status    (db:test-get-status new-test-dat))
 				  (test-fulln    (db:test-get-fullname new-test-dat))
 				  (uname         (db:test-get-uname    new-test-dat))
 				  (toplevel-with-children (and (db:test-get-is-toplevel test)
 							       (> (rmt:test-toplevel-num-items run-id test-name) 0))))
+                             
 			     (case action
 			       ((remove-runs)
 				;; if the test is a toplevel-with-children issue an error and do not remove
-				(if toplevel-with-children
-				    (begin
-				      (debug:print 0 *default-log-port* "WARNING: skipping removal of " test-fulln " with run-id " run-id " as it has sub tests")
-				      (hash-table-set! toplevel-retries test-fulln (+ (hash-table-ref/default toplevel-retries test-fulln 0) 1))
-				      (if (> (hash-table-ref toplevel-retries test-fulln) 3)
-					  (if (not (null? tal))
-					      (loop (car tal)(cdr tal))) ;; no else clause - drop it if no more in queue and > 3 tries
-					  (let ((newtal (append tal (list test))))
-					    (loop (car newtal)(cdr newtal))))) ;; loop with test still in queue
-				    (begin
-				      (debug:print-info 0 *default-log-port* "test: " test-name " itest-state: " test-state)
-				      (if (member test-state (list "RUNNING" "LAUNCHED" "REMOTEHOSTSTART" "KILLREQ"))
-					  (begin
-					    (if (not (hash-table-ref/default test-retry-time test-fulln #f))
-						(begin
-						  ;; want to set to REMOVING BUT CANNOT do it here?
-						  (hash-table-set! test-retry-time test-fulln (current-seconds))))
-					    (if (> (- (current-seconds)(hash-table-ref test-retry-time test-fulln)) allow-run-time)
-						;; This test is not in a correct state for cleaning up. Let's try some graceful shutdown steps first
-						;; Set the test to "KILLREQ" and wait five seconds then try again. Repeat up to five times then give
-						;; up and blow it away.
-						(begin
-						  (debug:print 0 *default-log-port* "WARNING: could not gracefully remove test " test-fulln ", tried to kill it to no avail. Forcing state to FAILEDKILL and continuing")
-					    (mt:test-set-state-status-by-id run-id (db:test-get-id test) "FAILEDKILL" "n/a" #f)
-						  (thread-sleep! 1))
-						(begin
-					    (mt:test-set-state-status-by-id run-id (db:test-get-id test) "KILLREQ" "n/a" #f)
-						  (thread-sleep! 1)))
-					    ;; NOTE: This is suboptimal as the testdata will be used later and the state/status may have changed ...
-					    (if (null? tal)
-						(loop new-test-dat tal)
-						(loop (car tal)(append tal (list new-test-dat)))))
-					  (begin
-					    (runs:remove-test-directory new-test-dat mode) ;; 'remove-all)
-					    (if (not (null? tal))
-						(loop (car tal)(cdr tal)))))))
-				(rmt:update-run-stats run-id (rmt:get-raw-run-stats run-id)))
-			       ((set-state-status)
-				(debug:print-info 2 *default-log-port* "new state " (car state-status) ", new status " (cadr state-status))
-				(mt:test-set-state-status-by-id run-id (db:test-get-id test) (car state-status)(cadr state-status) #f)
+				(cond
+                                 (toplevel-with-children
+                                  (debug:print 0 *default-log-port* "WARNING: skipping removal of " test-fulln " with run-id " run-id " as it has sub tests")
+                                  (hash-table-set! toplevel-retries test-fulln (+ (hash-table-ref/default toplevel-retries test-fulln 0) 1))
+                                  (if (> (hash-table-ref toplevel-retries test-fulln) 3)
+                                      (if (not (null? tal))
+                                          (loop (car tal)(cdr tal))) ;; no else clause - drop it if no more in queue and > 3 tries
+                                      (let ((newtal (append tal (list test))))
+                                        (loop (car newtal)(cdr newtal))))) ;; loop with test still in queue
+                                 (has-subrun
+                                  ;; 
+                                  (let ((last-visit (hash-table-ref/default backgrounded-remove-last-visit test-fulln 0))
+                                        (now        (current-seconds))
+                                        (rem-status (hash-table-ref/default backgrounded-remove-status test-fulln 'not-started)))
+                                    (case rem-status
+                                      ((not-started)
+                                       (debug:print 0 *default-log-port* "WARNING: postponing removal of " test-fulln " with run-id " run-id " as it has a subrun")
+                                       (hash-table-set! backgrounded-remove-status test-fulln 'started)
+                                       (hash-table-set! backgrounded-remove-last-visit test-fulln (current-seconds))
+                                       (common:send-thunk-to-background-thread
+                                        (lambda ()
+                                          (let* ((subrun-remove-succeeded
+                                                  (subrun:remove-subrun run-dir keep-records)))
+                                            (hash-table-set! backgrounded-remove-result test-fulln subrun-remove-succeeded)
+                                            (hash-table-set! backgrounded-remove-status test-fulln 'done)))
+                                        name: (conc "remove-subrun:"test-fulln))
+                                       
+                                       ;; send to back of line, loop
+                                       (let ((newtal (append tal (list test))))
+                                        (loop (car newtal)(cdr newtal)))
+                                       )
+                                      ((started)
+                                       ;; if last visit was within last second, sleep 1 second
+                                       (if (< (- now last-visit) 1.0)
+                                           (thread-sleep! 1.0))
+                                       (hash-table-set! backgrounded-remove-last-visit test-fulln (current-seconds))
+                                       ;; send to back of line, loop
+                                       (let ((newtal (append tal (list test))))
+                                         (loop (car newtal)(cdr newtal)))
+                                       )
+                                      ((done)
+                                       ;; drop this one; if remaining, loop, else finish
+                                       (hash-table-set! backgrounded-remove-last-visit test-fulln (current-seconds))
+                                       (let ((subrun-remove-succeeded (hash-table-ref/default backgrounded-remove-result test-fulln 'exception)))
+                                         (cond
+                                          ((eq? subrun-remove-succeeded 'exception)
+                                           (let* ((logfile (subrun:get-log-path run-dir "remove")))
+                                             (debug:print 0 *default-log-port* "ERROR: removing subrun of of " test-fulln " with run-id " run-id " ; see logfile @ "logfile))
+					   (if (not (null? tal))
+					       (loop (car tal)(cdr tal))))
+					  (subrun-remove-succeeded
+					   (debug:print 0 *default-log-port* "Now removing of " test-fulln " with run-id " run-id " since subrun was removed.")
+					   ;;(runs:remove-test-directory new-test-dat mode) ;; let normal case handle this. it will go thru loop again as non-subrun
+					   (let ((newtal (append tal (list test))))
+					     (loop (car newtal)(cdr newtal))))
+					  (else
+					   (let* ((logfile (subrun:get-log-path run-dir "remove")))
+					     (debug:print 0 *default-log-port* "WARNING: removal of subrun failed.  Please check "logfile" for details."))
+					   ;; send to back of line, loop (will not match has-subrun next time through)
+					    (if (not (null? tal))
+						(loop (car tal)(cdr tal))))))
+				       )
+				      ) ; end case rem-status
+                                    ) ; end let
+                                  ); end cond has-subrun
+
+                                 (else
+                                  ;; BB - TODO - consider backgrounding to threads to delete tests (work below) 
+                                  (debug:print-info 0 *default-log-port* "test: " test-name " itest-state: " test-state)
+                                  (if (member test-state (list "RUNNING" "LAUNCHED" "REMOTEHOSTSTART" "KILLREQ"))
+                                      (begin
+                                        (if (not (hash-table-ref/default test-retry-time test-fulln #f))
+                                            (begin
+                                              ;; want to set to REMOVING BUT CANNOT do it here?
+                                              (hash-table-set! test-retry-time test-fulln (current-seconds))))
+                                        (if (> (- (current-seconds)(hash-table-ref test-retry-time test-fulln)) allow-run-time)
+                                            ;; This test is not in a correct state for cleaning up. Let's try some graceful shutdown steps first
+                                            ;; Set the test to "KILLREQ" and wait five seconds then try again. Repeat up to five times then give
+                                            ;; up and blow it away.
+                                            (begin
+                                              (debug:print 0 *default-log-port* "WARNING: could not gracefully remove test " test-fulln ", tried to kill it to no avail. Forcing state to FAILEDKILL and continuing")
+                                              (mt:test-set-state-status-by-id run-id (db:test-get-id test) "FAILEDKILL" "n/a" #f)
+                                              (thread-sleep! 1))
+                                            (begin
+                                              (mt:test-set-state-status-by-id run-id (db:test-get-id test) "KILLREQ" "n/a" #f)
+                                              (thread-sleep! 1)))
+                                        ;; NOTE: This is suboptimal as the testdata will be used later and the state/status may have changed ...
+                                        (if (null? tal)
+                                            (loop new-test-dat tal)
+                                            (loop (car tal)(append tal (list new-test-dat)))))
+                                      (begin
+                                       (let ((rundir (db:test-get-rundir new-test-dat)))
+                                        (if (and (not (string=  rundir "/tmp/badname")) 
+                                             (file-exists? rundir)
+                                             (substring-index run-name rundir)
+                                             (substring-index target rundir)
+                                             )
+                                          (begin
+                                            (set! lasttpath (db:test-get-rundir new-test-dat)) ;; remember this path for run removal
+                                            (set! lastrealpath (remove-last-path-directory (resolve-pathname lasttpath)))
+                                            (hash-table-set! run-paths-hash lastrealpath 1)
+                                            (runs:remove-test-directory new-test-dat mode) ;; 'remove-all)
+                                          )
+                                          (begin
+                                            (debug:print 2 *default-log-port* "Not removing directory " rundir " because either it doesn't exist or has a bad name")
+                                            (debug:print 2 *default-log-port* "Is /tmp/badname: " (string=  rundir "/tmp/badname"))
+                                            (debug:print 2 *default-log-port* "Exists: " (file-exists? rundir))
+                                            (debug:print 2 *default-log-port* "Has run-name: " (substring-index run-name rundir))
+                                            (debug:print 2 *default-log-port* "Has target: " (substring-index target rundir))
+                                            ;;PJH remove record from db no need to cleanup directory
+                                            (case mode
+                                               ((remove-data-only)(mt:test-set-state-status-by-id (db:test-get-run_id test)(db:test-get-id test) (db:test-get-state test)(db:test-get-status test) #f))
+                                               ((archive-remove)  (mt:test-set-state-status-by-id (db:test-get-run_id test)(db:test-get-id test) "ARCHIVED" #f #f))
+                                               (else (rmt:delete-test-records (db:test-get-run_id test) (db:test-get-id test))))
+
+                                          )
+                                        )
+                                      )
+
+                                      (if (not (null? tal))
+                                         (loop (car tal)(cdr tal)))))))
+				(rmt:update-run-stats run-id (rmt:get-raw-run-stats run-id)))
+                               ((kill-runs)
+                                ;; RUNNING -> KILLREQ
+                                ;; LAUNCHED,RUNNING,REMOTEHOSTSTART -> NOT STARTED
+                                (cond
+                                 ((and has-subrun (member test-state (list "RUNNING" "LAUNCHED" "REMOTEHOSTSTART" "KILLREQ")))
+                                  (common:send-thunk-to-background-thread
+                                   (lambda ()
+                                     (let* ((subrun-remove-succeeded
+                                             (subrun:kill-subrun run-dir keep-records)))
+                                       #t)))
+                                  (if (not (null? tal))
+				    (loop (car tal)(cdr tal)))
+                                  )
+                                 ((member test-state (list "RUNNING" "LAUNCHED" "REMOTEHOSTSTART" "KILLREQ"))
+                                  (debug:print 1 *default-log-port* "INFO: issuing killreq to test "test-fulln)
+                                  (mt:test-set-state-status-by-id run-id (db:test-get-id test) "KILLREQ" "n/a" #f)
+                                  (if (not (null? tal))
+				      (loop (car tal)(cdr tal))))
+                                 ((and (member test-status '("PREQ_FAIL" "PREQ_DISCARDED" "BLOCKED" "ZERO_ITEMS" "KEEP_TRYING" "TEN_STRIKES" "TIMED_OUT")))
+                                  (rmt:set-state-status-and-roll-up-items run-id (db:test-get-id test) 'foo "NOT_STARTED" "n/a" (conc "kill-run moved from "test-state":"test-status" to NOT_STARTED:n/a"))
+                                  ;;(mt:test-set-state-status-by-id run-id (db:test-get-id test) "NOT_STARTED" "n/a" (conc "kill-run moved from "test-state":"test-status" to NOT_STARTED:n/a"))
+                                  (if (not (null? tal))
+				      (loop (car tal)(cdr tal)))
+                                  )
+                                 (else
+                                  (if (not (null? tal))
+				      (loop (car tal)(cdr tal)))
+                                  )))
+			       ((set-state-status)
+                                (let* ((new-state (car state-status))
+                                       (new-status (cadr state-status))
+                                       (test-id (db:test-get-id test))
+                                       (test-run-dir (db:test-get-rundir new-test-dat))
+                                       (has-subrun (and (subrun:subrun-test-initialized? test-run-dir)
+                                                      (not (subrun:subrun-removed? test-run-dir)))))
+                                  (when has-subrun
+                                     (common:send-thunk-to-background-thread
+                                        (lambda ()
+                                          (subrun:set-state-status test-run-dir state status new-state-status)
+                                          )
+                                        )
+                                    )
+                                  (debug:print-info 2 *default-log-port* "new state " new-state ", new status " new-status )
+                                  (mt:test-set-state-status-by-id run-id test-id new-state new-status #f))
 				(if (not (null? tal))
 				    (loop (car tal)(cdr tal))))
 			       ((run-wait)
+                                ;; BB TODO - manage has-subrun case
 				(debug:print-info 2 *default-log-port* "still waiting, " (length tests) " tests still running")
-				(thread-sleep! 10)
+				(thread-sleep! 5)
 				(let ((new-tests (proc-get-tests run-id)))
 				  (if (null? new-tests)
 				      (debug:print-info 1 *default-log-port* "Run completed according to zero tests matching provided criteria.")
 				      (loop (car new-tests)(cdr new-tests)))))
 			       ((archive)
+                                ;; BB TODO - manage has-subrun case
 				(if (and run-dir (not toplevel-with-children))
 				    (let ((ddir (conc run-dir "/")))
 				      (case (string->symbol (args:get-arg "-archive"))
 					((save save-remove keep-html)
-					 (if (file-exists? ddir)
+					 (if (common:file-exists? ddir)
 					     (debug:print-info 0 *default-log-port* "Estimating disk space usage for " test-fulln ": " (common:get-disk-space-used ddir)))))))
 				(if (not (null? tal))
 				    (loop (car tal)(cdr tal))))
 			       )))
 		       )
-		     (if worker-thread (thread-join! worker-thread))))))
+		     (if worker-thread (thread-join! worker-thread)))
+                   (common:join-backgrounded-threads))))
+	   
 	   ;; remove the run if zero tests remain
 	   (if (eq? action 'remove-runs)
-	       (let ((remtests (mt:get-tests-for-run (db:get-value-by-header run header "id") #f '("DELETED") '("n/a") not-in: #t)))
+	       (let* ((run-id   (db:get-value-by-header run header "id")) ;; NB// masks run-id from above?
+                      (remtests (mt:get-tests-for-run run-id #f '("DELETED") '("n/a") not-in: #t)))
 		 (if (null? remtests) ;; no more tests remaining
-		     (let* ((dparts  (string-split lasttpath "/"))
-			    (runpath (conc "/" (string-intersperse 
-						(take dparts (- (length dparts) 1))
-						"/"))))
-		       (debug:print 1 *default-log-port* "Removing run: " runkey " " (db:get-value-by-header run header "runname") " and related record")
-		       (rmt:delete-run run-id)
-		       (rmt:delete-old-deleted-test-records)
-		       ;; (rmt:set-var "DELETED_TESTS" (current-seconds))
-		       ;; need to figure out the path to the run dir and remove it if empty
-		       ;;    (if (null? (glob (conc runpath "/*")))
-		       ;;        (begin
-		       ;; 	 (debug:print 1 *default-log-port* "Removing run dir " runpath)
-		       ;; 	 (system (conc "rmdir -p " runpath))))
+	           (let* ((linkspath (remove-last-path-directory lasttpath))
+                          (runpaths (hash-table-keys run-paths-hash))
+                    )
+
+                    (debug:print 2 *default-log-port* "run-paths-hash: " (hash-table-keys run-paths-hash))
+
+                    (debug:print 1 *default-log-port* "Removing target " target "run: " run-name)
+                    (if (not keep-records)
+                      (begin
+                        (debug:print 1 *default-log-port* "Removing DB records for the run.")
+                        (rmt:delete-run run-id)
+                        (rmt:delete-old-deleted-test-records))
+                    )
+                    (if (not (equal?  linkspath "/does/not/exist/I"))
+	               (begin 
+                         (debug:print 1 *default-log-port* "Recursively removing links dir " linkspath)
+                         (runs:recursive-delete-with-error-msg linkspath)))
+
+                   (for-each (lambda(runpath)
+                       (debug:print 1 *default-log-port* "Recursively removing runs dir " runpath)
+                       (runs:recursive-delete-with-error-msg runpath)
+                     )
+                     runpaths
+                   )
 		       )))))
 	 ))
      runs)
-    ;; (sqlite3:finalize! (db:delay-if-busy tdbdat))
+    ;; special case - archive get
+    (if (equal? (args:get-arg "-archive") "get")
+	(archive:bup-get-data "get" #f #f test-records rp-mutex bup-mutex))
+    (if (or (equal? (args:get-arg "-archive") "save") (equal? (args:get-arg "-archive") "save-remove"))
+        (begin 
+             (print "db archive started")  
+             (archive:megatest-db target runnamepatt)
+             (print "db archived")))
     )
-  #t)
+  #t
+  )
 
 (define (runs:remove-test-directory test mode) ;; remove-data-only)
   (let* ((run-dir       (db:test-get-rundir test))    ;; run dir is from the link tree
-	 (real-dir      (if (file-exists? run-dir)
+	 (real-dir      (if (common:file-exists? run-dir)
 			    ;; (resolve-pathname run-dir)
 			    (common:nice-path run-dir)
-			    #f)))
-    (case mode
+			    #f))
+         (clean-mode    (or mode 'remove-all))
+         (test-id       (db:test-get-id test))
+        ;; (lock-key      (conc "test-" test-id))
+        ;; (got-lock      (let loop ((lock        (rmt:no-sync-get-lock lock-key))
+	;; 			     (expire-time (+ (current-seconds) 30))) ;; give up on getting the lock and steal it after 15 seconds
+	;; 		    (if (car lock)
+	;; 			#t
+	;; 			(if (> (current-seconds) expire-time)
+	;; 			    (begin
+	;; 			      (debug:print-info 0 *default-log-port* "Timed out waiting for a lock to clean test with id " test-id)
+	;; 			      (rmt:no-sync-del! lock-key) ;; destroy the lock
+	;; 			      (loop (rmt:no-sync-get-lock lock-key) expire-time)) ;; 
+	;; 			    (begin
+	;; 			      (thread-sleep! 1)
+	 ;; 			      (loop (rmt:no-sync-get-lock lock-key) expire-time)))))))
+	 )
+    (case clean-mode
       ((remove-data-only)(mt:test-set-state-status-by-id (db:test-get-run_id test)(db:test-get-id test) "CLEANING" "LOCKED" #f))
       ((remove-all)      (mt:test-set-state-status-by-id (db:test-get-run_id test)(db:test-get-id test) "REMOVING" "LOCKED" #f))
       ((archive-remove)  (mt:test-set-state-status-by-id (db:test-get-run_id test)(db:test-get-id test) "ARCHIVE_REMOVING" #f #f)))
     (debug:print-info 1 *default-log-port* "Attempting to remove " (if real-dir (conc " dir " real-dir " and ") "") " link " run-dir)
     (if (and real-dir 
 	     (> (string-length real-dir) 5)
-	     (file-exists? real-dir)) ;; bad heuristic but should prevent /tmp /home etc.
-	(begin ;; let* ((realpath (resolve-pathname run-dir)))
-	  (debug:print-info 1 *default-log-port* "Recursively removing " real-dir)
-	  (if (file-exists? real-dir)
-	      (runs:safe-delete-test-dir real-dir)
-	      (debug:print 0 *default-log-port* "WARNING: test dir " real-dir " appears to not exist or is not readable")))
+	     (common:file-exists? real-dir)) ;; bad heuristic but should prevent /tmp /home etc.
+	(let* ((realpath (resolve-pathname run-dir)))
+	  (debug:print-info 1 *default-log-port* "Recursively removing " realpath)
+	  (if (common:file-exists? realpath)
+	      (runs:safe-delete-test-dir realpath)
+	      (debug:print 0 *default-log-port* "WARNING: test dir " realpath " appears to not exist or is not readable")))
 	(if real-dir 
 	    (debug:print 0 *default-log-port* "WARNING: directory " real-dir " does not exist")
 	    (debug:print 0 *default-log-port* "WARNING: no real directory corrosponding to link " run-dir ", nothing done")))
     (if (symbolic-link? run-dir)
 	(begin
 	  (debug:print-info 1 *default-log-port* "Removing symlink " run-dir)
 	  (handle-exceptions
 	   exn
-	   (debug:print-error 0 *default-log-port* " Failed to remove symlink " run-dir ((condition-property-accessor 'exn 'message) exn) ", attempting to continue")
+	   (debug:print-error 0 *default-log-port* " Failed to remove symlink " run-dir ((condition-property-accessor 'exn 'message) exn) ", attempting to continue, exn=" exn)
 	   (delete-file run-dir)))
 	(if (directory? run-dir)
 	    (if (> (directory-fold (lambda (f x)(+ 1 x)) 0 run-dir) 0)
 		(debug:print 0 *default-log-port* "WARNING: refusing to remove " run-dir " as it is not empty")
 		(handle-exceptions
 		 exn
-		 (debug:print-error 0 *default-log-port* " Failed to remove directory " run-dir ((condition-property-accessor 'exn 'message) exn) ", attempting to continue")
+		 (debug:print-error 0 *default-log-port* " Failed to remove directory " run-dir ((condition-property-accessor 'exn 'message) exn) ", attempting to continue, exn=" exn)
 		 (delete-directory run-dir)))
 	    (if (and run-dir
 		     (not (member run-dir (list "n/a" "/tmp/badname"))))
 		(debug:print 0 *default-log-port* "WARNING: not removing " run-dir " as it either doesn't exist or is not a symlink")
 		(debug:print 0 *default-log-port* "NOTE: the run dir for this test is undefined. Test may have already been deleted."))
 	    ))
     ;; Only delete the records *after* removing the directory. If things fail we have a record 
-    (case mode
-      ((remove-data-only)(mt:test-set-state-status-by-id (db:test-get-run_id test)(db:test-get-id test) "NOT_STARTED" "n/a" #f))
+    (case clean-mode
+      ((remove-data-only)(mt:test-set-state-status-by-id (db:test-get-run_id test)(db:test-get-id test) (db:test-get-state test)(db:test-get-status test) #f))
       ((archive-remove)  (mt:test-set-state-status-by-id (db:test-get-run_id test)(db:test-get-id test) "ARCHIVED" #f #f))
-      (else (rmt:delete-test-records (db:test-get-run_id test) (db:test-get-id test))))))
+      (else (rmt:delete-test-records (db:test-get-run_id test) (db:test-get-id test))))
+    ;; (rmt:no-sync-del! lock-key)
+    ))
 
 ;;======================================================================
 ;; Routines for manipulating runs
 ;;======================================================================
 
 ;; Since many calls to a run require pretty much the same setup 
 ;; this wrapper is used to reduce the replication of code
 (define (general-run-call switchname action-desc proc)
-  (let ((runname (or (args:get-arg "-runname")(args:get-arg ":runname")))
+  (let ((runname (common:args-get-runname))
 	(target  (common:args-get-target)))
     (cond
      ((not target)
       (debug:print-error 0 *default-log-port* "Missing required parameter for " switchname ", you must specify the target with -target")
       (exit 3))
@@ -1954,11 +2772,12 @@
       (let (;; (db   #f)
 	    (keys #f))
 	(if (launch:setup)
 	    (begin
 	      (full-runconfigs-read) ;; cache the run config
-	      (launch:cache-config)) ;; do not cache here - need to be sure runconfigs is processed
+	      ;; (launch:cache-config) ;; there are two independent config cache locations, turning this one off for now. MRW.
+	      ) ;; do not cache here - need to be sure runconfigs is processed
 	    (begin 
 	      (debug:print 0 *default-log-port* "Failed to setup, exiting")
 	      (exit 1)))
 
         
@@ -1996,17 +2815,23 @@
   (let* ((db       #f)
 	 (rundat   (mt:get-runs-by-patt keys runname target))
 	 (header   (vector-ref rundat 0))
 	 (runs     (vector-ref rundat 1)))
     (for-each (lambda (run)
-		(let ((run-id (db:get-value-by-header run header "id")))
+		(let ((run-id (db:get-value-by-header run header "id"))
+           (str (if lock 
+									"lock"
+                  "unlock")))
 		  (if (or lock
 			  (and unlock
-			       (begin
+			       (or (args:get-arg "-force")
+                (begin
 				 (print "Do you really wish to unlock run " run-id "?\n   y/n: ")
-				 (equal? "y" (read-line)))))
+				 (equal? "y" (read-line))))))
+          (begin 
 		      (rmt:lock/unlock-run run-id lock unlock user)
+					(debug:print-info 0 *default-log-port* "Done " str " on run id " run-id))
 		      (debug:print-info 0 *default-log-port* "Skipping lock/unlock on " run-id))))
 	      runs)))
 ;;======================================================================
 ;; Rollup runs
 ;;======================================================================
@@ -2020,11 +2845,11 @@
 	  (rmt:testmeta-add-record test-name)))
     (for-each 
      (lambda (key)
        (let* ((idx (cadr key))
 	      (fld (car  key))
-	      (val (config-lookup test-conf "test_meta" fld)))
+	      (val (configf:lookup test-conf "test_meta" fld)))
 	 ;; (debug:print 5 *default-log-port* "idx: " idx " fld: " fld " val: " val)
 	 (if (and val (not (equal? (vector-ref currrecord idx) val)))
 	     (begin
 	       (print "Updating " test-name " " fld " to " val)
 	       (rmt:testmeta-update-field test-name fld val)))))
@@ -2034,14 +2859,16 @@
 ;;
 (define (runs:get-tests-matching-tags tagpatt)
   (let* ((tagdata (rmt:get-tests-tags))
          (res     '())) ;; list of tests that match one or more tags
     (for-each
-     (lambda (tag)
+     (lambda (row)
+       (let* ((tag (car row))
+              (tests (cdr row)))
        (if (patt-list-match tag tagpatt)
-           (set! res (append (hash-table-ref tagdata tag) res))))
-     (hash-table-keys tagdata))
+           (set! res (append tests res)))))
+     tagdata)
     res))
     
 
 ;; Update test_meta for all tests
 (define (runs:update-all-test_meta db)
@@ -2053,11 +2880,11 @@
      (hash-table-keys test-names))))
 
 ;; This could probably be refactored into one complex query ...
 ;; NOT PORTED - DO NOT USE YET
 ;;
-(define (runs:rollup-run keys runname user keyvals)
+#;(define (runs:rollup-run keys runname user keyvals)
   (debug:print 4 *default-log-port* "runs:rollup-run, keys: " keys " -runname " runname " user: " user)
   (let* ((db              #f)
 	 ;; register run operates on the main db
 	 (new-run-id      (rmt:register-run keyvals runname "new" "n/a" user (args:get-arg "-contour")))
 	 (prev-tests      (rmt:get-matching-previous-test-run-records new-run-id "%" "%"))
@@ -2107,19 +2934,111 @@
 	     (conc "INSERT OR REPLACE INTO test_data (test_id,category,variable,value,expected,tol,units,comment) "
 		   "SELECT " (db:test-get-id new-testdat) ",category,variable,value,expected,tol,units,comment FROM test_data WHERE test_id=?;")
 	     (db:test-get-id testdat))))
 	 ))
      prev-tests)))
+
+(define doc-template 
+  '(*TOP*
+    (*PI* xml "version='1.0'")
+    (testsuite)))
+
+(define (runs:update-junit-test-reporter-xml run-id)
+  (let*	(
+	 (junit-test-reporter	(configf:lookup *configdat* "runs" "junit-test-reporter-xml"))
+	 (junit-test-report-dir  (configf:lookup *configdat* "runs" "junit-test-report-dir"))
+	 (xml-dir		(if (and junit-test-reporter (equal? junit-test-reporter "yes" ))
+				    (if junit-test-report-dir
+					junit-test-report-dir
+					(conc (getenv "MT_LINKTREE") "/" (getenv "MT_TARGET") "/" (getenv "MT_RUNNAME")))
+				    #f))
+	 (xml-ts-name		(if xml-dir
+				    (conc (getenv "MT_TESTSUITENAME")"."(string-translate (getenv "MT_TARGET") "/" ".") "." (getenv "MT_RUNNAME"))
+				    #f))
+         (keyname               (if xml-ts-name (common:get-signature xml-ts-name) #f))
+	 (xml-path		(if xml-dir
+				    (conc xml-dir "/" keyname ".xml")
+				    #f))
+
+	 (test-data		(if xml-dir
+				    (rmt:get-tests-for-run run-id "%" '() '() ;; run-id testpatt states statuses
+							   #f #f ;; offset limit
+							   #f ;; not-in
+							   #f ;; sort-by
+							   #f ;; sort-order
+							   #f ;; get full data (not 'shortlist)
+							   0 ;; (runs:gendat-inc-results-last-update *runs:general-data*) ;; last update time
+							   #f)
+				    '()))
+	 (tests-count		(if xml-dir (length test-data) #f)))
+    (if (and junit-test-reporter (equal? junit-test-reporter "yes" ))
+	(begin
+					;((sxml-modify! `("testsuite" insert-into (@ (name ,xml-ts-name) (tests ,tests-count)))) doc)
+
+	  (let loop	((test		(car test-data))
+			 (tail		(cdr test-data))
+			 (doc		doc-template)
+			 (fail-cnt	0)
+			 (error-cnt	0))
+	    (let*	((test-name	(vector-ref test 2))
+			 (test-itempath	(vector-ref test 11))
+			 (tc-name	(conc test-name (if (and test-itempath (not (equal? test-itempath ""))) (conc "." (string-translate test-itempath "/" "." )) "")))
+			 (test-state	(vector-ref test 3))
+			 (comment	(vector-ref test 14))   
+			 (test-status	(vector-ref test 4))
+			 (exc-msg	(conc "No bucket for State " test-state " Status " test-status))
+			 (new-doc	(cond 
+						((member test-state (list "RUNNING" ))
+							((sxml-modify `("testsuite" insert-into (testcase (@ (name ,tc-name)) (inProgress)))) doc))
+						((member test-state (list "LAUNCHED" "REMOTEHOSTSTART"  "NOT_STARTED"))
+							((sxml-modify `("testsuite" insert-into (testcase (@ (name ,tc-name)) (inQueue)))) doc))
+						((member test-status (list "PASS" "WARN" "WAIVED"))
+							((sxml-modify `("testsuite" insert-into (testcase (@ (name ,tc-name))))) doc))
+						((member test-status (list "FAIL" "CHECK"))
+							((sxml-modify `("testsuite" insert-into (testcase (@ (name ,tc-name)) (failure (@ (message ,comment) (type "failure")))))) doc)) 
+						((member test-status (list "DEAD" "KILLED" "ABORT" "PREQ_FAIL" "PREQ_DISCARDED"))
+							((sxml-modify `("testsuite" insert-into (testcase (@ (name ,tc-name)) (failure (@ (message ,comment) (type "error")))))) doc))
+						((member test-status (list "SKIP"))
+							((sxml-modify `("testsuite" insert-into (testcase (@ (name ,tc-name)) (skipped (@ (type "skipped")))))) doc))
+						(else 
+							(debug:print 0 *default-log-port* (conc "What do I do with State " test-state " Status " test-status))
+							((sxml-modify `("testsuite" insert-into (testcase (@ (name ,tc-name)) (failure (@ (message ,exc-msg) (type "error")))))) doc))))
+			(new-error-cnt	(if (member test-status (list "DEAD" "KILLED" "ABORT" "PREQ_FAIL" "PREQ_DISCARDED"))
+						(+ error-cnt 1) 
+						error-cnt))
+			(new-fail-cnt	(if (member test-status (list "FAIL" "CHECK"))
+						(+ fail-cnt 1)
+						  fail-cnt)))
+ 	      (if (null? tail)
+		    (let* ((final-doc ((sxml-modify `("testsuite" insert-into (@ (name ,xml-ts-name) (tests ,tests-count) (errors ,error-cnt) (failures ,fail-cnt)))) new-doc)))
+		    (debug:print 0 *default-log-port* "modify attrib error=" error-cnt " fail= " fail-cnt)
+		    (handle-exceptions
+		     exn
+		     (let*	((msg	((condition-property-accessor 'exn 'message) exn)))
+		       (debug:print 0 *default-log-port* (conc "WARNING: Failed to update file" xml-path". Message:" msg ", exn=" exn)))
+		     		   
+		     (if (not (file-exists? xml-dir)) 
+			 (create-directory xml-dir #t))
+                     (if (not (rmt:no-sync-get/default keyname #f)) 
+                       (begin
+			 (rmt:no-sync-set  keyname "on")
+			 (debug:print 0 *default-log-port* "creating xml at " xml-path)
+		         (with-output-to-file xml-path
+		         (lambda ()
+			   (print (sxml-serializer#serialize-sxml final-doc  ns-prefixes: (list (cons 'gnm "http://foo"))))))
+                           (rmt:no-sync-del! keyname))
+                          (debug:print 0 *default-log-port*  "Could not get the lock. Skip writing the xml file."))))
+		  (loop (car tail) (cdr tail) new-doc new-fail-cnt new-error-cnt))))))))
 	 
      
 ;; clean cache files
 (define (runs:clean-cache target runname toppath)
   (if target
       (if runname
 	  (let* ((linktree (common:get-linktree)) ;; (if toppath (configf:lookup *configdat* "setup" "linktree")))
 		 (runtop   (conc linktree "/" target "/" runname))
-		 (files    (if (file-exists? runtop)
+		 (files    (if (common:file-exists? runtop)
 			       (append (glob (conc runtop "/.megatest*"))
 				       (glob (conc runtop "/.runconfig*")))
 			       '())))
 	    (if (null? files)
 		(debug:print-info 0 *default-log-port* "No cached megatest or runconfigs files found. None removed.")
@@ -2127,10 +3046,10 @@
 		  (debug:print-info 0 *default-log-port* "Removing cached files:\n    " (string-intersperse files "\n    "))
 		  (for-each 
 		   (lambda (f)
 		     (handle-exceptions
 			 exn
-			 (debug:print 0 *default-log-port* "WARNING: Failed to remove file " f)
+			 (debug:print 0 *default-log-port* "WARNING: Failed to remove file " f ", exn=" exn)
 		       (delete-file f)))
 		   files))))
 	  (debug:print-error 0 *default-log-port* "-clean-cache requires -runname."))
       (debug:print-error 0 *default-log-port* "-clean-cache requires -target or -reqtarg")))

ADDED   sample-sauth-paths.scm
Index: sample-sauth-paths.scm
==================================================================
--- /dev/null
+++ sample-sauth-paths.scm
@@ -0,0 +1,22 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
+(define *db-path* "/path/to/db") 
+(define *exe-path* "/path/to/store/suids")  
+(define *exe-src* "/path/to/spublish/and/sretrieve/executables")
+(define *sauth-path* "/path/to/production/sauthorize/exe")
+(define *super-users* '("user1" "user2"))

ADDED   sauth-common.scm
Index: sauth-common.scm
==================================================================
--- /dev/null
+++ sauth-common.scm
@@ -0,0 +1,319 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
+
+;; Create the sqlite db
+(define (sauthorize:db-do proc) 
+      (if (or (not *db-path*)
+              (not (file-exists? *db-path*))) 
+	(begin
+	  (print 0 "[database]\nlocation " *db-path* " \n\n Is missing from the config file!")
+	  (exit 1)))
+    (if (and *db-path*
+	     (directory? *db-path*)
+	     (file-read-access? *db-path*))
+	(let* ((dbpath    (conc *db-path* "/sauthorize.db"))
+	       (writeable (file-write-access? dbpath))
+	       (dbexists  (file-exists? dbpath)))
+	  (handle-exceptions
+	   exn
+	   (begin
+	     (print 2 "ERROR: problem accessing db " dbpath
+			  ((condition-property-accessor 'exn 'message) exn))
+	     (exit 1))
+            ;(print  "calling proc " proc "db path " dbpath )
+	   (call-with-database
+            dbpath
+	    (lambda (db)
+	       ;(print 0 "calling proc " proc " on db " db)
+	      (set-busy-handler! db (busy-timeout 10000)) ;; 10 sec timeout
+	      (if (not dbexists)(sauthorize:initialize-db db))
+	      (proc db)))))
+	(print 0 "ERROR: invalid path for storing database: " *db-path*)))
+
+;;execute a query
+(define (sauthorize:db-qry db qry)
+  ;(print qry)
+  (exec (sql db  qry)))
+
+
+(define (sauthorize:do-as-calling-user proc)
+  (let ((eid (current-effective-user-id))
+        (cid (current-user-id)))
+    (if (not (eq? eid cid)) ;; running suid
+            (set! (current-effective-user-id) cid))
+     ;(print 0 "cid " cid " eid:" eid)
+    (proc)
+    (if (not (eq? eid cid))
+        (set! (current-effective-user-id) eid))))
+
+
+(define (run-cmd cmd arg-list)
+  ; (print (current-effective-user-id))
+   ;(handle-exceptions
+;	     exn
+;	     (print 0 "ERROR: failed to run script " cmd " with params " arg-list " " (exn assert))
+	     (let ((pid (process-run cmd arg-list)))
+	       (process-wait pid))
+)
+;)
+
+
+(define (regster-log inl usr-id  area-id  cmd)
+  (sauth-common:shell-do-as-adm
+        (lambda ()
+         (sauthorize:db-do   (lambda (db)
+             (sauthorize:db-qry db (conc "INSERT INTO actions (cmd,user_id,area_id,action_type ) VALUES ('sretrieve " inl "'," usr-id ","  area-id ", 'cat' )")))))))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; Check user types
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+
+
+;;check if a user is an admin
+(define (is-admin username)
+   (let* ((admin #f))
+    (sauthorize:db-do  (lambda (db)
+        (let* ((data-row (query fetch (sql db (conc "SELECT users.is_admin FROM  users where users.username = '" username "'")))))
+        (if (not (null? data-row))
+             (let ((col  (car data-row)))
+             (if (equal? col "yes")
+                   (set! admin #t)))))))  	        
+admin))
+
+
+;;check if a user is an read-admin
+(define (is-read-admin username)
+   (let* ((admin #f))
+    (sauthorize:db-do  (lambda (db)
+        (let* ((data-row (query fetch (sql db (conc "SELECT users.is_admin FROM  users where users.username = '" username "'")))))
+        (if (not (null? data-row))
+             (let ((col  (car data-row)))
+             (if (equal? col "read-admin")
+                   (set! admin #t)))))))  	        
+admin))
+
+
+;;check if user has specifc role for a area
+(define (is-user role username area)
+  (let* ((has-access #f))
+    (sauthorize:db-do  (lambda (db)
+        (let* ((data-row (query fetch (sql db (conc "SELECT  permissions.access_type, permissions.expiration FROM  users ,  areas, permissions where permissions.user_id = users.id and permissions.area_id = areas.id and users.username = '" username "' and areas.code = '" area "'")))))
+        (if (not (null? data-row))
+           (begin
+               (let* ((access-type  (car data-row))
+                    (exdate (cadr data-row)))
+               (if (not (null? exdate)) 
+               (begin 
+                  (let ((valid (is-access-valid  exdate)))
+                   ;(print valid) 
+                  (if (and (equal? access-type role)
+                        (equal? valid #t))
+                   (set! has-access #t))))
+                (print "Access expired"))))))))
+ ;(print has-access)
+has-access))
+
+(define (is-access-valid exp-str)
+    (let* ((ret-val #f )
+           (date-parts  (string-split exp-str "/"))
+           (yr (string->number (car date-parts)))
+           (month (string->number(car (cdr date-parts)))) 
+           (day (string->number(caddr date-parts)))
+           (exp-date (make-date 0 0 0 0 day month yr )))
+             ;(print  exp-date)
+             ;(print (current-date))   
+            (if (> (date-compare exp-date  (current-date)) 0)
+             (set! ret-val #t))
+   ;(print ret-val)
+   ret-val))
+
+
+;check if area exists
+(define (area-exists area)
+   (let* ((area-defined #f))
+    (sauthorize:db-do  (lambda (db)
+        (let* ((data-row (query fetch (sql db (conc "SELECT  id FROM  areas where areas.code = '" area "'")))))
+           (if (not (null? data-row))
+                 (set! area-defined #t)))))
+area-defined))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; Get Record from database
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;gets area id by code 
+(define (get-area area)
+   (let* ((area-defined '()))
+    (sauthorize:db-do  (lambda (db)
+        (let* ((data-row (query fetch (sql db (conc "SELECT  id FROM  areas where areas.code = '" area "'")))))
+          (set!  area-defined data-row))))
+area-defined))
+
+;get id of users table by user name 
+(define (get-user user)
+  (let* ((user-defined '()))
+    (sauthorize:db-do  (lambda (db)
+        (let* ((data-row (query fetch (sql db (conc "SELECT  id FROM  users where users.username = '" user "'")))))
+          (set!  user-defined data-row))))
+user-defined))
+
+;get permissions id by userid and area id 
+(define (get-perm userid areaid)
+  (let* ((user-defined '()))
+    (sauthorize:db-do  (lambda (db)
+          (let* ((data-row (query fetch (sql db (conc "SELECT  id FROM  permissions where user_id = " userid " and area_id = " areaid)))))
+         (set!  user-defined data-row))))
+
+user-defined))
+
+(define (get-restrictions base-path usr)
+(let* ((user-defined '()))
+    (sauthorize:db-do  (lambda (db)
+          (let* ((data-row (query fetch (sql db (conc "SELECT  restriction FROM areas, users, permissions where  areas.id = permissions.area_id and users.id =  permissions.user_id and  users.username = '" usr "' and areas.basepath = '" base-path "'")))))
+         ;(print data-row) 
+         (set!  user-defined data-row))))
+    ;   (print user-defined)
+  (if (null? user-defined)
+      ""
+      (car user-defined))))
+
+
+(define (get-obj-by-path path)
+   (let* ((obj '()))
+    (sauthorize:db-do  (lambda (db)
+        (let* ((data-row (query fetch (sql db (conc "SELECT  code,exe_name, id, basepath FROM  areas where areas.basepath = '" path "'")))))
+         (set!  obj data-row))))
+obj))
+
+(define (get-obj-by-code code )
+  (let* ((obj '()))
+    (sauthorize:db-do  (lambda (db)
+        ;(print (conc "SELECT  code, exe_name,  id, basepath, required_grps  FROM  areas where areas.code = '" code "'"))
+        (let* ((data-row (query fetch (sql db (conc "SELECT  code, exe_name,  id, basepath, required_grps  FROM  areas where areas.code = '" code "'")))))
+         ;(print data-row)
+         (set!  obj data-row)
+         ;(print obj) 
+        )))
+    (if (not (null? obj))
+          (begin
+          (let* ((req-grp (caddr (cddr obj))))
+            (sauthorize:do-as-calling-user
+             (lambda ()
+ (sauth-common:check-user-groups req-grp))))))
+obj))
+
+(define (sauth-common:check-user-groups req-grp)
+(let* ((current-groups  (get-groups) )
+        (req-grp-list (string-split req-grp ",")))
+        ;(print req-grp-list)
+        (for-each (lambda (grp)
+	  (let ((grp-info (group-information grp)))
+               ;(print grp-info " " grp)
+               (if (not (equal? grp-info #f))
+               (begin
+                 (if (not (member  (caddr grp-info) current-groups))
+                  (begin 
+                    (sauth:print-error (conc "Please wash " grp " group in your xterm!! " ))
+                     (exit 1)))))))
+	     req-grp-list)))
+
+(define (get-obj-by-code-no-grp-validation code )
+  (let* ((obj '()))
+    (sauthorize:db-do  (lambda (db)
+        (let* ((data-row (query fetch (sql db (conc "SELECT  code, exe_name,  id, basepath  FROM  areas where areas.code = '" code "'")))))
+         (set!  obj data-row))))
+;(print obj)
+obj))
+
+
+
+
+;; function to validate the users input for target path and resolve the path
+;; TODO: Check for restriction in subpath 
+(define (sauth-common:resolve-path  new current allowed-sheets)
+   (let* ((target-path (append  current (string-split new "/")))
+          (target-path-string (string-join target-path "/"))
+          (normal-path (normalize-pathname target-path-string))
+          (normal-list (string-split normal-path "/"))
+           (ret '()))
+   (if (string-contains   normal-path "..")
+    (begin
+      (print "ERROR: Path  " new " resolved outside target area ")
+      #f)
+    (if(equal? normal-path ".")
+      ret  
+    (if (not (member  (car normal-list) allowed-sheets))
+      (begin
+      (print "ERROR: Permision denied to  " new )
+       #f)
+    normal-list)))))
+
+(define (sauth-common:get-target-path base-path-list ext-path top-areas base-path)
+  (let* ((resolved-path (sauth-common:resolve-path ext-path base-path-list top-areas ))
+          (usr (current-user-name) ) )
+          (if (not (equal? resolved-path #f))
+           (if (null? resolved-path) 
+             #f
+           (let* ((sheet (car resolved-path))
+                   (restricted-areas (get-restrictions base-path usr))
+                   (restrictions (conc ".*" (string-join (string-split restricted-areas ",") ".*|.*") ".*"))
+           	   (target-path (if (null? (cdr resolved-path)) 
+                                     base-path 
+                                     (conc base-path "/" (string-join (cdr resolved-path) "/")))))
+                    
+	              
+                           (if (and (not (equal? restricted-areas "" ))
+                             (string-match (regexp  restrictions) target-path)) 
+                           (begin
+                              (sauth:print-error "Access denied to " (string-join resolved-path "/"))
+                              ;(exit 1)   
+                            #f)
+                             target-path)
+                            
+))
+             #f)))
+
+(define (sauth-common:shell-ls-cmd base-path-list ext-path top-areas base-path tail-cmd-list)
+    (if (and (null? base-path-list) (equal? ext-path "") )
+      (print (string-intersperse top-areas " "))
+  (let* ((resolved-path (sauth-common:resolve-path ext-path base-path-list top-areas )))
+           ;(print resolved-path)
+           (if (not (equal? resolved-path #f))
+           (if (null? resolved-path) 
+             (print (string-intersperse top-areas " "))
+           (let* ((target-path (sauth-common:get-target-path  base-path-list  ext-path top-areas base-path)))
+                (print target-path)
+                (if (not (equal? target-path #f))
+                (begin 
+                (cond
+		  ((null? tail-cmd-list)
+		     (run (pipe
+      	      	      (ls "-lrt" ,target-path))))
+		  ((not (equal? (car tail-cmd-list) "|"))
+                         (print "ls cmd cannot accept " (string-join tail-cmd-list) " as an argument!!"))
+                  (else  
+                    (run (pipe
+      	      	      (ls "-lrt" ,target-path)
+                      (begin (system (string-join (cdr tail-cmd-list))))))))))))))))
+
+(define (sauth:print-error msg)
+  (with-output-to-port (current-error-port)
+	(lambda ()
+	       (print (conc "ERROR: " msg)))))
+

ADDED   sauthorize.scm
Index: sauthorize.scm
==================================================================
--- /dev/null
+++ sauthorize.scm
@@ -0,0 +1,651 @@
+
+;; Copyright 2006-2013, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
+
+(use defstruct)
+(use scsh-process)
+
+(use srfi-18)
+(use srfi-19)
+(use refdb)
+
+(use sql-de-lite srfi-1 posix regex regex-case srfi-69)
+;(declare (uses common))
+;(declare (uses configf))
+(declare (uses margs))
+
+(include "megatest-version.scm")
+(include "megatest-fossil-hash.scm")
+;;; please create this file before using sautherise. For sample file is avaliable sample-sauth-paths.scm. 
+(include "sauth-paths.scm")
+(include "sauth-common.scm")
+
+;;
+;; GLOBALS
+;;
+(define *verbosity* 1)
+(define *logging* #f)
+(define *exe-name* (pathname-file (car (argv))))
+(define *sretrieve:current-tab-number* 0)
+(define *args-hash* (make-hash-table))
+(define sauthorize:help (conc "Usage: " *exe-name* " [action [params ...]]
+
+  list                   		 			: list areas $USER's can access
+  log                    		 			: get listing of recent activity.
+  sauth  list-area-user  			: list the users that can access the area.
+  sauth open  --group                       : Open up an area. User needs to be the owner of the area to open it. 
+              --code  
+              --retrieve|--publish [--additional-grps ]
+  sauth update   --retrieve|--publish             : update the binaries with the lates changes
+  sauth grant  --area           : Grant permission to read or write to a area that is alrady opend up.    
+             --expiration yyyy/mm/dd --retrieve|--publish 
+             [--restrict  ]  
+  sauth read-shell                        :  Open sretrieve shell for reading.  
+  sauth write-shell                       :  Open spublish shell for writing.
+   
+Part of the Megatest tool suite.
+Learn more at http://www.kiatoa.com/fossils/megatest
+
+Version: " megatest-fossil-hash)) ;; "
+
+;;======================================================================
+;; RECORDS
+;;======================================================================
+
+;;======================================================================
+;; DB
+;;======================================================================
+
+;; replace (strftime('%s','now')), with datetime('now'))
+(define (sauthorize:initialize-db db)
+  (for-each
+   (lambda (qry)
+     (exec (sql db qry)))
+   (list 
+    "CREATE TABLE IF NOT EXISTS actions
+         (id           INTEGER PRIMARY KEY,
+          cmd       TEXT NOT NULL,
+          user_id      INTEGER NOT NULL,
+          datetime     TIMESTAMP DEFAULT (datetime('now','localtime')),
+          area_id      INTEGER NOT NULL,
+          comment      TEXT DEFAULT '' NOT NULL,
+          action_type  TEXT NOT NULL);"
+        "CREATE TABLE IF NOT EXISTS users
+         (id           INTEGER PRIMARY KEY,
+          username     TEXT NOT NULL,
+          is_admin     TEXT NOT NULL,
+          datetime     TIMESTAMP DEFAULT (datetime('now','localtime'))
+          );" 
+          "CREATE TABLE IF NOT EXISTS areas
+         (id           INTEGER PRIMARY KEY,
+          basepath     TEXT NOT NULL,
+          code         TEXT NOT NULL,
+          exe_name     TEXT NOT NULL,
+          required_grps TEXT DEFAULT '' NOT NULL,
+          datetime     TIMESTAMP DEFAULT (datetime('now','localtime'))
+          );" 
+         "CREATE TABLE IF NOT EXISTS permissions
+         (id              INTEGER PRIMARY KEY,
+          access_type     TEXT NOT NULL,
+          user_id         INTEGER NOT NULL,
+          datetime        TIMESTAMP DEFAULT (datetime('now','localtime')),
+          area_id         INTEGER NOT NULL,
+          restriction     TEXT DEFAULT '' NOT NULL,
+          expiration       TIMESTAMP DEFAULT NULL);"
+    )))
+
+
+
+
+(define (get-access-type args)
+   (let loop ((hed (car args))
+		 (tal (cdr args)))
+                   (cond
+                   ((equal? hed "--retrieve")
+                      "retrieve") 
+                   ((equal? hed "--publish")
+                      "publish") 
+                   ((equal? hed "--area-admin")
+                      "area-admin")
+                   ((equal? hed "--writer-admin")
+                      "writer-admin")
+                   ((equal? hed "--read-admin")
+                      "read-admin")
+
+                   ((null? tal)
+                      #f) 
+                   (else 
+		  	(loop (car tal)(cdr tal))))))
+
+
+
+;; check if user can gran access to an area
+(define (can-grant-perm username access-type area)
+   (let* ((isadmin (is-admin username))
+          (is-area-admin (is-user "area-admin" username area ))
+          (is-read-admin (is-user "read-admin" username area) )
+          (is-writer-admin (is-user "writer-admin" username area) ) )
+   (cond
+   ((equal? isadmin  #t)
+     #t)
+   ((equal? is-area-admin #t ) 
+     #t)
+   ((and (equal? is-writer-admin #t ) (equal? access-type "retrieve"))
+     #t)
+   ((and (equal? is-read-admin #t ) (equal? access-type "retrieve"))
+     #t)
+
+   (else  
+    #f))))
+
+(define (sauthorize:list-areausers  area )
+  (sauthorize:db-do  (lambda (db)
+				     (print "Users having access to " area ":")
+				     (query (for-each-row
+					     (lambda (row)
+                                               (let* ((exp-date (cadr row)))
+                                                (if  (is-access-valid  exp-date)   
+					        (apply print (intersperse row " | "))))))
+					    (sql db (conc "SELECT users.username, permissions.expiration, permissions.access_type  FROM users, areas, permissions where permissions.user_id = users.id and permissions.area_id = areas.id and areas.code = '" area "'"))))))
+
+
+
+
+; check if executable exists
+(define (exe-exist exe access-type)
+    (let* ((filepath (conc *exe-path* "/" access-type "/" exe)))
+    ; (print filepath)
+     (if (file-exists? filepath)
+       #t
+       #f)))
+
+(define (copy-exe access-type exe-name group)
+  (run-cmd "/bin/chmod" (list "g+w" (conc *exe-path* "/" access-type)))
+  (let* ((spath (conc *exe-src*  "/s" access-type))
+         (dpath (conc *exe-path* "/" access-type "/" exe-name)))
+         (sauthorize:do-as-calling-user
+        (lambda ()
+            (run-cmd "/bin/cp" (list spath dpath )) 
+            (if (equal? access-type "publish")
+              (run-cmd "/bin/chmod" (list "u+s,o+rx" dpath))
+              (begin
+               (if (equal? group "none")
+                 (run-cmd "/bin/chmod" (list "u+s,o+rx" dpath))
+                 (begin   
+                     (run-cmd "/bin/chgrp" (list group dpath))
+                       (run-cmd "/bin/chmod" (list "g+s,o+rx" dpath))))))))
+	(run-cmd "chmod" (list "g-w" (conc *exe-path* "/" access-type)))))
+
+(define (get-exe-name path group)
+   (let ((name ""))
+   (sauthorize:do-as-calling-user
+        (lambda ()
+        (if (equal? (current-effective-user-id) (file-owner path)) 
+          (set! name (conc (current-user-name) "_" group))
+          (begin
+            (print "You cannot open areas that you dont own!!")  
+             (exit 1)))))
+name))
+
+(define (sauthorize:valid-unix-user username)
+    (let* ((ret-val #f))
+    (let-values (((inp oup pid)
+              (process "/usr/bin/id" (list username))))
+        (let loop ((inl (read-line inp)))
+          (if (string? inl) 
+          (if (string-contains inl  "No such user") 
+            (set! ret-val #f)
+             (set! ret-val #t)))   
+          (if (eof-object? inl)
+              (begin
+                   (close-input-port inp)
+                  (close-output-port oup))
+            (loop (read-line inp)))))
+            ret-val))
+
+
+;check if a paths/codes are vaid and if area is alrady open  
+(define (open-area group path code access-type other-grps)
+   (let* ((exe-name (get-exe-name path group))
+           (path-obj (get-obj-by-path path))
+           (code-obj (get-obj-by-code-no-grp-validation code)))
+           ;(print path-obj)   
+          (cond
+            ((not (null? path-obj))
+                (if (equal? code (car path-obj))
+                  (begin
+                     (if (equal? exe-name (cadr path-obj))
+                        (begin
+                            (if (not (exe-exist exe-name  access-type))
+                                 (copy-exe access-type exe-name group)
+                                 (begin 
+                                  (print "Area already open!!")
+                                  (exit 1))))   
+			(begin
+                           (if (not (exe-exist exe-name  access-type))
+                                 (copy-exe access-type exe-name group))
+                           ;; update exe-name  in db 
+                      (sauthorize:db-do   (lambda (db)
+                         (sauthorize:db-qry db (conc "update areas set exe_name = '" exe-name "' where id = " (caddr path-obj)))))
+                        )))
+                   (begin
+                       (print "Path " path " is registered with --code " (car path-obj) ". To open this area please execute following cmd: \n  sauthorize open " path " --group " group " --code " (car path-obj) " --" access-type )
+                       (exit 1))))
+                      
+            ((not (null? code-obj))
+                   (print "Code " code " is used for diffrent path. Please try diffrent value of --code" ) 
+                   (exit 1))
+            (else
+               ; (print (exe-exist exe-name  access-type))
+                (if (not (exe-exist exe-name  access-type))
+                        (copy-exe access-type exe-name group))
+                (sauthorize:db-do   (lambda (db)
+               (print conc "insert into areas (code, basepath, exe_name, required_grps) values ('" code "', '" path "', '" exe-name "', '" other-grps "') ") 
+             (sauthorize:db-qry db (conc "insert into areas (code, basepath, exe_name, required_grps) values ('" code "', '" path "', '" exe-name "', '" other-grps "') "))))))))
+
+(define (user-has-open-perm user path access)
+  (let* ((has-access #f)
+         (eid (current-user-id)))
+    (cond
+     ((is-admin  user)
+       (set! has-access #t ))
+     ((and (is-read-admin  user) (equal? access "retrieve"))
+       (set! has-access #t ))
+     (else
+        (print "User " user " does not have permission to open areas")))
+        has-access))
+
+
+;;check if user has group access
+(define (is-group-washed req_grpid current-grp-list)
+  (let loop ((hed (car current-grp-list))
+		 (tal (cdr current-grp-list)))
+                   (cond
+                   ((equal? hed req_grpid)
+                    #t)    
+                   ((null? tal)
+                      #f)
+                   (else 
+		  	(loop (car tal)(cdr tal))))))
+
+;create executables with appropriate suids
+(define (sauthorize:open user path group code access-type other-groups)
+   (let* ((gpid (group-information group))
+         (req_grpid (if (equal? group "none")
+                      group 
+                      (if (equal? gpid #f)
+                           #f      
+                     (caddr gpid))))
+         (current-grp-list (get-groups))
+         (valid-grp (if (equal? group "none")
+                     group
+                    (is-group-washed req_grpid current-grp-list))))
+   (if (and (not (equal? group "none")) (equal? valid-grp #f ))
+       (begin
+       (print "Group " group " is not washed in the current xterm!!") 
+       (exit 1)))) 
+   (if (not (file-write-access? path))
+     (begin
+       (print "You can open areas owned by yourself. You do not have permissions to open path." path)
+        (exit 1)))
+   (if (user-has-open-perm user path access-type)
+      (begin 
+       ;(print "here")   
+       (open-area group path code access-type other-groups)
+       (sauthorize:grant user user code "2017/12/25"  "read-admin" "") 
+       (sauthorize:db-do   (lambda (db)
+             (sauthorize:db-qry db (conc "INSERT INTO actions (cmd,user_id,area_id,action_type ) VALUES ('sauthorize open " path " --code " code " --group " group " --" access-type "'," (car (get-user user)) "," (car (get-area code)) ", 'open' )"))))
+         (print "Area has " path "  been opened for " access-type ))))
+
+(define (sauthorize:update username exe area access-type)
+  (let* ((parts (string-split exe "_"))
+         (owner (car parts))
+         (group (cadr parts))
+         (gpid (group-information group))
+         (req_grpid (if (equal? group "none")
+                      group 
+                      (if (equal? gpid #f)
+                           #f      
+                     (caddr gpid))))
+ 
+         (current-grp-list (get-groups))
+         (valid-grp (if (equal? group "none")
+                     group
+                    (is-group-washed req_grpid current-grp-list))))
+         (if (not (equal? username owner))
+            (begin
+              (print "You cannot update " area ". Only " owner " can update this area!!") 
+               (exit 1)))
+          (copy-exe access-type exe group)
+           (print "recording action..")    
+          (sauthorize:db-do   (lambda (db)
+             
+             (sauthorize:db-qry db (conc "INSERT INTO actions (cmd,user_id,area_id,action_type ) VALUES ('sauthorize update " area " --" access-type "'," (car (get-user username)) "," (car (get-area area)) ", 'update' )"))))
+         (print "Area has " area "  been update!!" )))
+
+(define (sauthorize:grant auser guser area exp-date access-type restrict)
+    ; check if user exist in db
+    (let* ((area-obj (get-area area))
+           (auser-obj (get-user auser)) 
+           (user-obj (get-user guser)))
+          
+        (if (null? user-obj)
+           (begin
+            ;; is guser a valid unix user
+            (if (not (sauthorize:valid-unix-user guser))
+               (begin  
+                (print "User " guser " is Invalid unix user!!")
+                 (exit 1)))
+            (sauthorize:db-do   (lambda (db)
+             (sauthorize:db-qry db (conc "insert into users (username, is_admin) values ('" guser "', 'no') "))))
+             (set! user-obj (get-user guser))))
+        (let* ((perm-obj (get-perm (car user-obj) (car area-obj))))
+          (if(null? perm-obj)
+          (begin   
+            ;; insert permissions
+            (sauthorize:db-do   (lambda (db)
+            (sauthorize:db-qry db (conc "insert into permissions (access_type, user_id, area_id, restriction, expiration ) values ('" access-type "', " (car user-obj) ", " (car area-obj) ", '" restrict "', '" exp-date "')")))))
+          (begin 
+             ;update permissions
+             (sauthorize:db-do   (lambda (db)
+             (sauthorize:db-qry db (conc "update permissions set access_type = '" access-type "' , restriction = '" restrict "', expiration =  '" exp-date "' where user_id = " (car user-obj) " and area_id = " (car area-obj)))))))
+             (sauthorize:db-do   (lambda (db)
+             (sauthorize:db-qry db (conc "INSERT INTO actions (cmd,user_id,area_id,action_type ) VALUES ('sauthorize grant " guser " --area " area " --expiration " exp-date " --" access-type " --restrict " restrict "'," (car auser-obj) "," (car area-obj) ", 'grant' )"))))  
+             (print "Permission has been sucessfully granted to user " guser))))
+
+(define (sauthorize:process-action  username action . args)
+   (case (string->symbol action)
+   ((grant)
+      (if (< (length args) 6)
+         (begin 
+	     (print  "ERROR: Missing arguments; " (string-intersperse args ", "))
+	     (exit 1)))
+       (let* ((remargs     (args:get-args args '("--area" "--expiration" "--restrict") '() args:arg-hash 0))
+              (guser     (car args))
+	      (restrict         (or (args:get-arg "--restrict") ""))
+              (area         (or (args:get-arg "--area") ""))  
+              (exp-date        (or (args:get-arg "--expiration") ""))
+              (access-type (get-access-type remargs)))
+	; (print  "version " guser " restrict " restrict )
+        ; (print "area " area " exp-date " exp-date " access-type " access-type)
+        (cond
+           ((equal? guser "")
+              (print "Username not found!! Try \"sauthorize help\" for useage ")
+               (exit 1))   
+           ((equal? area "")
+              (print "Area not found!! Try \"sauthorize help\" for useage ")
+              (exit 1)) 
+           ((equal? access-type #f)
+              (print "Access type not found!! Try \"sauthorize help\" for useage ")
+               (exit 1)) 
+           ((equal? exp-date "")
+              (print "Date of expiration not found!! Try \"sauthorize help\" for useage ")
+              (exit 1)))
+           (if (not (area-exists area))
+              (begin
+              (print "Area does not exisit!!")
+              (exit 1)))   
+           (if (can-grant-perm username access-type area)
+	   (begin
+             (print "calling sauthorize:grant ") 
+              (sauthorize:grant username guser area exp-date access-type restrict))   
+           (begin
+              (print "User " username " does not have permission to grant permissions to area " area "!!")
+              (exit 1)))))
+       ((list-area-user)
+          (if (not (equal? (length args) 1))
+              (begin
+              (print "Missing argument area code to list-area-user ") 
+              (exit 1)))
+           (let* ((area (car args)))
+           (if (not (area-exists area))
+              (begin
+              (print "Area does not exisit!!")
+              (exit 1))) 
+                                
+                (sauthorize:list-areausers  area )
+              ))
+      ((read-shell)
+          (if (not (equal? (length args) 1))
+              (begin
+              (print "Missing argument area code to read-shell ") 
+              (exit 1)))
+           (let* ((area (car args))
+                  (code-obj (get-obj-by-code area)))
+           (if (or (null? code-obj)
+                   (not (exe-exist (cadr code-obj)  "retrieve")))
+              (begin
+              (print "Area " area " is not open for reading!!")
+              (exit 1))) 
+              (sauthorize:do-as-calling-user
+             (lambda ()
+                (run-cmd (conc *exe-path* "/retrieve/" (cadr code-obj) ) (list "shell" area ))))))
+      ((write-shell)
+          (if (not (equal? (length args) 1))
+              (begin
+              (print "Missing argument area code to read-shell ") 
+              (exit 1)))
+           (let* ((area (car args))
+                  (code-obj (get-obj-by-code area)))
+           (if (or (null? code-obj)
+                   (not (exe-exist (cadr code-obj)  "publish")))
+              (begin
+              (print "Area " area " is not open for Writing!!")
+              (exit 1))) 
+              (sauthorize:do-as-calling-user
+             (lambda ()
+                (run-cmd (conc *exe-path* "/publish/" (cadr code-obj) ) (list "shell" area))))))
+      ((publish)
+          (if (< (length args) 2)
+              (begin
+              (print "Missing argument to publish. \n publish   [opts] ") 
+              (exit 1)))
+            
+           (let* ((action (car args))
+                  (area (cadr args))
+                  (cmd-args (cddr args)) 
+                  (code-obj (get-obj-by-code area)))
+           ;(print "area " area)
+           ;(print "code: " code-obj)  
+           ;(print (exe-exist (cadr code-obj)  "publish")) 
+           (if (or (null? code-obj)
+                   (not (exe-exist (cadr code-obj)  "publish")))
+              (begin
+              (print "Area " area " is not open for writing!!")
+              (exit 1)))
+              ;(print "hear") 
+              (sauthorize:do-as-calling-user
+             (lambda ()
+               ; (print  *exe-path* "/publish/" (cadr code-obj) action area cmd-args  )
+                (run-cmd (conc *exe-path* "/publish/" (cadr code-obj) ) (append (list action area ) cmd-args))))))
+      
+     ((retrieve)
+          (if (< (length args) 2)
+              (begin
+              (print "Missing argument to publish. \n publish   [opts] ") 
+              (exit 1)))
+           (let* ((action (car args))
+                  (area (cadr args))
+                  (cmd-args (cddr args)) 
+                  (code-obj (get-obj-by-code area)))
+           (if (or (null? code-obj)
+                   (not (exe-exist (cadr code-obj)  "retrieve")))
+              (begin
+              (print "Area " area " is not open for reading!!")
+              (exit 1))) 
+               ;(print (conc *exe-path* "/retrieve/" (cadr code-obj) " " action " " area " " (string-join cmd-args)))
+              (sauthorize:do-as-calling-user
+             (lambda ()
+                (run-cmd (conc *exe-path* "/retrieve/" (cadr code-obj) ) (append (list action area ) cmd-args))))))
+
+ 
+ 
+      ((open)
+         (if (< (length args) 6)
+              (begin
+              (print "sauthorize open cmd takes 6 arguments!! \n Useage: sauthorize open  --group  --code  --retrieve|--publish") 
+              (exit 1)))
+         (let* ((remargs     (args:get-args args '("--group" "--code" "--additional-grps") '() args:arg-hash 0))
+              (path     (car args))
+	      (group         (or (args:get-arg "--group") ""))
+              (area         (or (args:get-arg "--code") ""))
+              (other-grps          (or (args:get-arg "--additional-grps") ""))     
+              (access-type (get-access-type remargs)))
+                
+              (cond
+                ((equal? path "")
+                  (print "path not found!! Try \"sauthorize help\" for useage ")
+                  (exit 1))   
+                ((equal? area "")
+                  (print "--code not found!! Try \"sauthorize help\" for useage ")
+                  (exit 1)) 
+                ((equal? access-type #f)
+                  (print "Access type not found!! Try \"sauthorize help\" for useage ")
+                  (exit 1)) 
+                ((and (not (equal? access-type "publish")) 
+                  (not (equal? access-type "retrieve")))
+                  (print "Access type can be eiter --retrieve or --publish !! Try \"sauthorize help\" for useage ")
+                  (exit 1)))
+                ; (print other-grps) 
+                (sauthorize:open username path group area access-type other-grps)))
+         ((update)
+            (if (< (length args) 2)
+              (begin
+              (print "sauthorize update cmd takes 2 arguments!! \n Useage: sauthorize update  --retrieve|--publish") 
+              (exit 1)))
+              (let* ((area (car args))
+                     (code-obj (get-obj-by-code area))
+                    (access-type (get-access-type (cdr args))))
+               (if  (and (not (equal? access-type "publish")) (not (equal? access-type "retrieve")))
+                  (begin 
+                  (print "Access type can be --retrieve|--publish ")
+                  (exit 1)))
+              (if (or (null? code-obj)
+                   (not (exe-exist (cadr code-obj)  access-type)))
+              (begin
+              (print "Area " area " is not open for reading!!")
+              (exit 1))) 
+              (sauthorize:update username (cadr code-obj) area access-type ))) 
+         ((area-admin)
+           (let* ((usr (car args))
+                  (usr-obj (get-user usr))
+                  (user-id (car (get-user username))))
+           
+                (if (is-admin  username)
+                (begin
+                  ; (print usr-obj) 
+                  (if (null? usr-obj)
+                    (begin
+                        (sauthorize:db-do   (lambda (db)
+              ;(print (conc "INSERT INTO users (username,is_admin) VALUES ( '" usr "', 'read-admin' )"))
+             (sauthorize:db-qry db (conc "INSERT INTO users (username,is_admin) VALUES ( '" usr "', 'read-admin' )")))))
+               (begin
+                ; (print (conc "update users set is_admin = 'no' where id = " (car usr-obj) ))
+                 (sauthorize:db-do   (lambda (db)
+                (sauthorize:db-qry db (conc "update users set is_admin = 'read-admin' where id = " (car usr-obj)))))))
+                (print "User " usr " is updated with area-admin access!"))
+                (print "Admin only function"))
+                (sauthorize:db-do   (lambda (db)
+             (sauthorize:db-qry db (conc "INSERT INTO actions (cmd,user_id,area_id,action_type ) VALUES ('area-admin " usr " ', " user-id ",0, 'area-admin ')" )))))) 
+          ((mk-admin)
+           (let* ((usr (car args))
+                  (usr-obj (get-user usr))
+                  (user-id (car (get-user username))))
+                (if (not (sauthorize:valid-unix-user usr))
+               (begin  
+                (print "User " usr " is Invalid unix user!!")
+                 (exit 1)))
+
+                (if (member  username  *super-users*)
+                (begin
+                  (if (null? usr-obj)
+                    (begin
+                        (sauthorize:db-do   (lambda (db)
+                           (sauthorize:db-qry db (conc "INSERT INTO users (username,is_admin) VALUES ( '" usr "', 'yes' )")))))
+               (begin
+                 (sauthorize:db-do   (lambda (db)
+                (sauthorize:db-qry db (conc "update users set is_admin = 'yes' where id = " (car usr-obj)))))))
+                (print "User " usr " is updated with admin access!"))
+                (print "Super-Admin only function"))
+                (sauthorize:db-do   (lambda (db)
+             (sauthorize:db-qry db (conc "INSERT INTO actions (cmd,user_id,area_id,action_type ) VALUES ('mk-admin " usr " ', " user-id ",0, 'mk-admin ')" )))))) 
+
+         ((register-log)
+            (if (< (length args) 4)
+                (print "Invalid arguments"))
+             ;(print args)
+             (let* ((cmd-line (car args))
+                     (user-id (cadr args))
+                     (area-id (caddr args))
+                     (user-obj (get-user username))
+                      (cmd (cadddr args)))
+                
+               (if (and (not (null? user-obj)) (equal? user-id (number->string(car user-obj))))
+                (begin 
+                (sauthorize:db-do   (lambda (db)
+             (sauthorize:db-qry db (conc "INSERT INTO actions (cmd,user_id,area_id,action_type ) VALUES ('" cmd-line"', " user-id "," area-id ", '" cmd "')" )))))
+                (print "You ar not authorised to run this cmd")
+
+)))     
+
+       
+      (else (print 0 "Unrecognised command " action))))
+  
+(define (main)
+  (let* ((args      (argv))
+	 (prog      (car args))
+	 (rema      (cdr args))
+         (username     (current-user-name)))
+    ;; preserve the exe data in the config file
+    (cond
+     ;; one-word commands
+     ((eq? (length rema) 1)
+      (case (string->symbol (car rema))
+	((help -h -help --h --help)
+	 (print sauthorize:help))
+	((list)
+            
+          (sauthorize:db-do  (lambda (db)
+				     (print "My Area accesses: ")
+				     (query (for-each-row
+					     (lambda (row)
+                                               (let* ((exp-date (car row)))
+                                                (if  (is-access-valid  exp-date)     
+					           (apply print (intersperse (cdr row) " | "))))))
+					    (sql db (conc "SELECT permissions.expiration, areas.basepath, areas.code, permissions.access_type  FROM users, areas, permissions where permissions.user_id = users.id and permissions.area_id = areas.id and users.username = '" username "'"))))))
+         
+	((log)
+	 (sauthorize:db-do  (lambda (db)
+				     (print "Logs : ")
+				     (query (for-each-row
+					     (lambda (row)
+                                                   
+					       (apply print (intersperse row " | "))))
+					    (sql db "SELECT actions.cmd, users.username, actions.action_type, actions.datetime, areas.code  FROM actions, users, areas where actions.user_id = users.id and actions.area_id = areas.id ")))))
+	(else
+	 (print "ERROR: Unrecognised command. Try \"sauthorize help\""))))
+     ;; multi-word commands
+     ((null? rema)(print sauthorize:help))
+     ((>= (length rema) 2)
+      (apply sauthorize:process-action username (car rema)(cdr rema)))
+     (else (debug:print 0 "ERROR: Unrecognised command. Try \"sauthorize help\"")))))
+
+(main)
+
+
+      

Index: sdb.scm
==================================================================
--- sdb.scm
+++ sdb.scm
@@ -1,14 +1,23 @@
 ;;======================================================================
 ;; Copyright 2006-2013, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 ;;======================================================================
 
 ;;======================================================================
 ;; Simple persistant strings lookup table. Keep out of the main db
 ;; so writes/reads don't slow down central access.
@@ -22,11 +31,11 @@
 (declare (unit sdb))
 
 ;; 
 (define (sdb:open fname)
   (let* ((dbpath    (pathname-directory fname))
-	 (dbexists  (let ((fe (file-exists? fname)))
+	 (dbexists  (let ((fe (common:file-exists? fname)))
 		      (if fe 
 			  fe
 			  (begin
 			    (create-directory dbpath #t)
 			    #f))))

ADDED   serialize-env.scm
Index: serialize-env.scm
==================================================================
--- /dev/null
+++ serialize-env.scm
@@ -0,0 +1,9 @@
+(use z3)
+(use base64)
+
+(let* ((env-str        (with-output-to-string (lambda () (pp (get-environment-variables)))))
+       (zipped-env-str (z3:encode-buffer env-str))
+       (b64-env-str    (base64-encode zipped-env-str)))
+  (print b64-env-str))
+
+

Index: server.scm
==================================================================
--- server.scm
+++ server.scm
@@ -1,33 +1,40 @@
-
-;; Copyright 2006-2012, Matthew Welland.
-;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
-;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;; Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
 
 (require-extension (srfi 18) extras tcp s11n)
 
-(use srfi-1 posix regex regex-case srfi-69 hostinfo md5 message-digest directory-utils posix-extras matchable)
-;; (use zmq)
+(use srfi-1 posix regex regex-case srfi-69 hostinfo md5 message-digest
+     directory-utils posix-extras matchable)
 
 (use spiffy uri-common intarweb http-client spiffy-request-vars)
 
 (declare (unit server))
 
 (declare (uses common))
 (declare (uses db))
 (declare (uses tasks)) ;; tasks are where stuff is maintained about what is running.
-(declare (uses synchash))
+;; (declare (uses synchash))
 (declare (uses http-transport))
-(declare (uses rpc-transport))
-;;(declare (uses nmsg-transport))
+;;(declare (uses rpc-transport))
 (declare (uses launch))
-(declare (uses daemon))
+;; (declare (uses daemon))
 
 (include "common_records.scm")
 (include "db_records.scm")
 
 (define (server:make-server-url hostport)
@@ -34,10 +41,22 @@
   (if (not hostport)
       #f
       (conc "http://" (car hostport) ":" (cadr hostport))))
 
 (define  *server-loop-heart-beat* (current-seconds))
+
+;;======================================================================
+;; P K T S   S T U F F 
+;;======================================================================
+
+;; ???
+
+;;======================================================================
+;; P K T S   S T U F F 
+;;======================================================================
+
+;; ???
 
 ;;======================================================================
 ;; S E R V E R
 ;;======================================================================
 
@@ -50,11 +69,11 @@
 ;;
 (define (server:launch run-id transport-type)
   (case transport-type
     ((http)(http-transport:launch))
     ;;((nmsg)(nmsg-transport:launch run-id))
-    ((rpc)  (rpc-transport:launch run-id))
+    ;;((rpc)  (rpc-transport:launch run-id))
     (else (debug:print-error 0 *default-log-port* "unknown server type " transport-type))))
 
 ;;======================================================================
 ;; S E R V E R   U T I L I T I E S 
 ;;======================================================================
@@ -106,17 +125,22 @@
 	 (curr-pid    (current-process-id))
 	 (homehost    (common:get-homehost)) ;; configf:lookup *configdat* "server" "homehost" ))
 	 (target-host (car homehost))
 	 (testsuite   (common:get-testsuite-name))
 	 (logfile     (conc areapath "/logs/server.log")) ;; -" curr-pid "-" target-host ".log"))
+	 (profile-mode (or (configf:lookup *configdat* "misc" "profilesw")
+			   ""))
 	 (cmdln (conc (common:get-megatest-exe)
 		      " -server " (or target-host "-") (if (equal? (configf:lookup *configdat* "server" "daemonize") "yes")
 							   " -daemonize "
 							   "")
 		      ;; " -log " logfile
-		      " -m testsuite:" testsuite)) ;; (conc " >> " logfile " 2>&1 &")))))
-	 (log-rotate  (make-thread common:rotate-logs  "server run, rotate logs thread")))
+		      " -m testsuite:" testsuite
+		      " " profile-mode
+		      )) ;; (conc " >> " logfile " 2>&1 &")))))
+	 (log-rotate  (make-thread common:rotate-logs  "server run, rotate logs thread")) ;; why are we rotating logs here? This is a sensitive location with a lot going on!?
+         (load-limit  (configf:lookup-number *configdat* "jobtools" "max-server-start-load" default: 3.0)))
     ;; we want the remote server to start in *toppath* so push there
     (push-directory areapath)
     (debug:print 0 *default-log-port* "INFO: Trying to start server (" cmdln ") ...")
     (thread-start! log-rotate)
     
@@ -129,11 +153,13 @@
 	(begin
 	  (debug:print-info 0 *default-log-port* "Starting server on " target-host ", logfile is " logfile)
 	  (setenv "TARGETHOST" target-host)))
       
     (setenv "TARGETHOST_LOGF" logfile)
-    (common:wait-for-normalized-load 4 " delaying server start due to load" remote-host: (get-environment-variable "TARGETHOST")) ;; do not try starting servers on an already overloaded machine, just wait forever
+    (thread-sleep! (/ (random 5000) 1000)) ;; add about a random (up to 5 seconds) initial delay. It seems pretty common that many running tests request a server at the same time
+    ;; (common:wait-for-normalized-load load-limit " delaying server start due to load" target-host) ;; do not try starting servers on an already overloaded machine, just wait forever
+    #;(common:wait-for-homehost-load load-limit (conc " delaying server start due to load on homehost. limit is " load-limit))
     (system (conc "nbfake " cmdln))
     (unsetenv "TARGETHOST_LOGF")
     (if (get-environment-variable "TARGETHOST")(unsetenv "TARGETHOST"))
     (thread-join! log-rotate)
     (pop-directory)))
@@ -142,11 +168,13 @@
 ;;
 (define (server:logf-get-start-info logf)
   (let ((rx (regexp "^SERVER STARTED: (\\S+):(\\d+) AT ([\\d\\.]+)"))) ;; SERVER STARTED: host:port AT timesecs
     (handle-exceptions
 	exn
-	(list #f #f #f) ;; no idea what went wrong, call it a bad server
+      (begin
+	(print "failed to get server info from " logf ", exn=" exn)
+	(list #f #f #f)) ;; no idea what went wrong, call it a bad server
       (with-input-from-file
 	  logf
 	(lambda ()
 	  (let loop ((inl  (read-line))
 		     (lnum 0))
@@ -174,13 +202,13 @@
     (if (if (directory-exists? (conc areapath "/logs"))
 	    '()
 	    (if (file-write-access? areapath)
 		(begin
 		  (condition-case
-		      (create-directory (conc areapath "/logs") #t)
-		    (exn (i/o file)(debug:print 0 *default-log-port* "ERROR: Cannot create directory at " (conc areapath "/logs")))
-		    (exn ()(debug:print 0 *default-log-port* "ERROR: Unknown error attemtping to get server list.")))
+		   (create-directory (conc areapath "/logs") #t)
+		   (exn (i/o file)(debug:print 0 *default-log-port* "ERROR: Cannot create directory at " (conc areapath "/logs")))
+		   (exn ()(debug:print 0 *default-log-port* "ERROR: Unknown error attemtping to get server list. exn=" exn)))
 		  (directory-exists? (conc areapath "/logs")))
 		'()))
 	(let* ((server-logs   (glob (conc areapath "/logs/server-*.log")))
 	       (num-serv-logs (length server-logs)))
 	  (if (null? server-logs)
@@ -187,13 +215,15 @@
 	      '()
 	      (let loop ((hed  (car server-logs))
 			 (tal  (cdr server-logs))
 			 (res '()))
 		(let* ((mod-time  (handle-exceptions
-				      exn
-				      (current-seconds) ;; 0
-				    (file-modification-time hed))) ;; default to *very* old so log gets ignored if deleted
+				   exn
+				   (begin
+				     (debug:print 0 *default-log-port* "failed to get modification time on " hed ", exn=" exn)
+				     (current-seconds)) ;; 0
+				   (file-modification-time hed))) ;; default to *very* old so log gets ignored if deleted
 		       (down-time (- (current-seconds) mod-time))
 		       (serv-dat  (if (or (< num-serv-logs 10)
 				  	  (< down-time 900)) ;; day-seconds))
 				      (server:logf-get-start-info hed)
 				      '())) ;; don't waste time processing server files not touched in the 15 minutes if there are more than ten servers to look at
@@ -201,16 +231,30 @@
 		       (fmatch   (string-match fname-rx hed))
 		       (pid      (if fmatch (string->number (list-ref fmatch 2)) #f))
 		       (new-res  (if (null? serv-dat)
 				     res
 				     (cons (append serv-rec (list pid)) res))))
-		(if (null? tal)
-		    (if (and limit
-			     (> (length new-res) limit))
-			new-res ;; (take new-res limit)  <= need intelligent sorting before this will work
-			new-res)
+		  (if (null? tal)
+		      (if (and limit
+			       (> (length new-res) limit))
+			  new-res ;; (take new-res limit)  <= need intelligent sorting before this will work
+			  new-res)
 		      (loop (car tal)(cdr tal) new-res)))))))))
+
+(define (server:get-num-alive srvlst)
+  (let ((num-alive 0))
+    (for-each
+     (lambda (server)
+       (match-let (((mod-time host port start-time pid)
+		    server))
+	 (let* ((uptime  (- (current-seconds) mod-time))
+		(runtime (if start-time
+			     (- mod-time start-time)
+			     0)))
+	   (if (< uptime 5)(set! num-alive (+ num-alive 1))))))
+     srvlst)
+    num-alive))
 
 ;; given a list of servers get a list of valid servers, i.e. at least
 ;; 10 seconds old, has started and is less than 1 hour old and is
 ;; active (i.e. mod-time < 10 seconds
 ;;
@@ -230,14 +274,15 @@
 				    (mod-time   (list-ref rec 0)))
 				;; (print "start-time: " start-time " mod-time: " mod-time)
 				(and start-time mod-time
 				     (> (- now start-time) 0)    ;; been running at least 0 seconds
 				     (< (- now mod-time)   16)   ;; still alive - file touched in last 16 seconds
-				     (< (- now start-time) 
-					(+ (- (string->number (or (configf:lookup *configdat* "server" "runtime") "3600"))
-					      180)
-					   (random 360))) ;; under one hour running time +/- 180
+				     (or (not (configf:lookup *configdat* "server" "runtime")) ;; skip if not set
+					 (< (- now start-time)       
+					    (+ (- (string->number (configf:lookup *configdat* "server" "runtime"))
+					       180)
+					    (random 360)))) ;; under one hour running time +/- 180
 				     ))
 			      #f))
 			srvlst)
 		(lambda (a b)
 		  (< (list-ref a 3)
@@ -274,13 +319,46 @@
   (if *my-client-signature* *my-client-signature*
       (let ((sig (server:mk-signature)))
         (set! *my-client-signature* sig)
         *my-client-signature*)))
 
+;; wait for server=start-last to be three seconds old
+;;
+(define (server:wait-for-server-start-last-flag areapath)
+  (let* ((start-flag (conc areapath "/logs/server-start-last"))
+	 ;;; THIS INTERACTS WITH [server] timeout. Suggest using 0.1 or above for timeout (6 seconds)
+	 (reftime    (configf:lookup-number *configdat* "server" "idletime" default: 4))
+	 (server-key (conc (get-host-name) "-" (current-process-id))))
+    ;; (thread-sleep! (/ (random 500) 1000)) ;; I don't think this made a difference
+    (if (file-exists? start-flag)
+	(let* ((fmodtime (file-modification-time start-flag))
+	       (delta    (- (current-seconds) fmodtime))
+	       (all-go   (> delta reftime)))
+	  (if (and all-go
+		   (begin
+		     (with-output-to-file start-flag
+		       (lambda ()
+			 (print server-key)))
+		     (thread-sleep! 0.25)
+		     (let ((res (with-input-from-file start-flag
+				  (lambda ()
+				    (read-line)))))
+		       (equal? server-key res))))
+	      #t ;; (system (conc "touch " start-flag)) ;; lazy but safe
+	      (begin
+		(debug:print-info 0 *default-log-port* "Gating server start, last start: "
+				  fmodtime ", delta: " delta ", reftime: " reftime ", all-go=" all-go)
+		(thread-sleep! reftime)
+		(server:wait-for-server-start-last-flag areapath)))))))
+
 ;; kind start up of servers, wait 40 seconds before allowing another server for a given
 ;; run-id to be launched
+;;
 (define (server:kind-run areapath)
+  ;; look for $MT_RUN_AREA_HOME/logs/server-start-last
+  ;; and wait for it to be at least 3 seconds old
+  (server:wait-for-server-start-last-flag areapath)
   (if (not (server:check-if-running areapath)) ;; why try if there is already a server running?
       (let* ((last-run-dat (hash-table-ref/default *server-kind-run* areapath '(0 0))) ;; callnum, whenrun
 	     (call-num     (car last-run-dat))
 	     (when-run     (cadr last-run-dat))
 	     (run-delay    (+ (case call-num
@@ -289,17 +367,20 @@
 				((2)  300)
 				(else 600))
 			      (random 5)))   ;; add a small random number just in case a lot of jobs hit the work hosts simultaneously
 	     (lock-file    (conc areapath "/logs/server-start.lock")))
 	(if	(> (- (current-seconds) when-run) run-delay)
-		(begin
+		(let* ((start-flag (conc areapath "/logs/server-start-last")))
 		  (common:simple-file-lock-and-wait lock-file expire-time: 15)
+		  (system (conc "touch " start-flag)) ;; lazy but safe
 		  (server:run areapath)
-		  (thread-sleep! 5) ;; don't release the lock for at least a few seconds
+		  (thread-sleep! 2) ;; don't release the lock for at least a few seconds
 		  (common:simple-file-release-lock lock-file)))
 	(hash-table-set! *server-kind-run* areapath (list (+ call-num 1)(current-seconds))))))
 
+;; this one seems to be the general entry point
+;;
 (define (server:start-and-wait areapath #!key (timeout 60))
   (let ((give-up-time (+ (current-seconds) timeout)))
     (let loop ((server-url (server:check-if-running areapath))
 	       (try-num    0))
       (if (or server-url
@@ -424,16 +505,292 @@
     (set! *db-last-access* (current-seconds)) ;; might not be needed.
     (if (equal? *toppath* toppath)
 	#t
 	#f)))
 
-;; timeout is in hours
-(define (server:get-timeout)
-  (let ((tmo (configf:lookup  *configdat* "server" "timeout")))
+;; timeout is hms string: 1h 5m 3s, default is 1 minute
+;;
+(define (server:expiration-timeout)
+  (let ((tmo (configf:lookup *configdat* "server" "timeout")))
     (if (and (string? tmo)
-	     (string->number tmo))
-	(* 60 60 (string->number tmo))
-	;; (* 3 24 60 60) ;; default to three days
-	;;(* 60 60 1)     ;; default to one hour
-	(* 60 5)          ;; default to five minutes
-	)))
+	     (common:hms-string->seconds tmo)) ;; BUG: hms-string->seconds is broken, if given "10" returns 0. Also, it doesn't belong in this logic unless the string->number is changed below
+        (* 3600 (string->number tmo))
+	60)))
+
+(define (server:get-best-guess-address hostname)
+  (let ((res #f))
+    (for-each 
+     (lambda (adr)
+       (if (not (eq? (u8vector-ref adr 0) 127))
+	   (set! res adr)))
+     ;; NOTE: This can fail when there is no mention of the host in /etc/hosts. FIXME
+     (vector->list (hostinfo-addresses (hostname->hostinfo hostname))))
+    (string-intersperse 
+     (map number->string
+	  (u8vector->list
+	   (if res res (hostname->ip hostname)))) ".")))
+
+;; (define server:sync-lock-token "SERVER_SYNC_LOCK")
+;; (define (server:release-sync-lock)
+;;   (db:no-sync-del! *no-sync-db* server:sync-lock-token))
+;; (define (server:have-sync-lock?)
+;;   (let* ((have-lock-pair (db:no-sync-get-lock *no-sync-db* server:sync-lock-token))
+;;          (have-lock?     (car have-lock-pair))
+;;          (lock-time      (cdr have-lock-pair))
+;;          (lock-age       (- (current-seconds) lock-time)))
+;;     (cond
+;;      (have-lock? #t)
+;;      ((>lock-age
+;;        (* 3 (configf:lookup-number *configdat* "server" "minimum-intersync-delay" default: 180)))
+;;       (server:release-sync-lock)
+;;       (server:have-sync-lock?))
+;;      (else #f))))
+
+;; moving this here as it needs access to db and cannot be in common.
+;;
+
+(define (server:get-bruteforce-syncer dbstruct #!key (fork-to-background #f) (persist-until-sync #f))
+  (let* ((sqlite-exe   (or (get-environment-variable "MT_SQLITE3_EXE"))) ;; defined in cfg.sh
+         (sync-log     (or (args:get-arg "-sync-log") (conc *toppath* "/logs/sync-" (current-process-id) "-" (get-host-name) ".log")))
+	 (tmp-area     (common:get-db-tmp-area))
+	 (tmp-db       (conc tmp-area "/megatest.db"))
+	 (staging-file (conc *toppath* "/.megatest.db"))
+	 (mtdbfile     (conc *toppath* "/megatest.db"))
+	 (lockfile     (common:get-sync-lock-filepath))
+         (sync-cmd-core     (conc sqlite-exe" " tmp-db " .dump | "sqlite-exe" " staging-file "&>"sync-log))
+         (sync-cmd     (if fork-to-background 
+                           (conc "/usr/bin/env NBFAKE_LOG="*toppath*"/logs/last-server-sync-"(current-process-id)".log nbfake \""sync-cmd-core" && /bin/mv -f " staging-file " " mtdbfile" \"")
+                           sync-cmd-core))
+         (default-min-intersync-delay 2)
+	 (min-intersync-delay (configf:lookup-number *configdat* "server" "minimum-intersync-delay" default: default-min-intersync-delay))
+         (default-duty-cycle 0.1)
+         (duty-cycle   (configf:lookup-number *configdat* "server" "sync-duty-cycle" default: default-duty-cycle))
+         (last-sync-seconds 10) ;; we will adjust this to a measurement and delay last-sync-seconds * (1 - duty-cycle)
+         (calculate-off-time (lambda (work-duration duty-cycle)
+                                  (* (/ (- 1 duty-cycle) duty-cycle) last-sync-seconds)))
+         (off-time min-intersync-delay) ;; adjusted in closure below.
+         (do-a-sync
+          (lambda ()
+            (BB> "Start do-a-sync with fork-to-background="fork-to-background" persist-until-sync="persist-until-sync)
+            (let* ((finalres
+                    (let retry-loop ((num-tries 0))
+                         (if (common:simple-file-lock lockfile)
+	                     (begin
+                               (cond
+                                ((not (or fork-to-background persist-until-sync))
+                                 (debug:print 0 *default-log-port* "INFO: syncer thread sleeping for max of (server.minimum-intersync-delay="min-intersync-delay
+                                              " , off-time="off-time" seconds ]")
+                                 (thread-sleep! (max off-time min-intersync-delay)))
+                                (else
+                                 (debug:print 0 *default-log-port* "INFO: syncer thread NOT sleeping ; maybe time-to-exit...")))
+
+                               (if (not (configf:lookup *configdat* "server" "disable-db-snapshot"))
+                                   (common:snapshot-file mtdbfile subdir: ".db-snapshot"))
+		               (delete-file* staging-file)
+		               (let* ((start-time (current-milliseconds))
+                                      (res (system sync-cmd))
+                                      (dbbackupfile (conc mtdbfile ".backup"))
+                                      (res2 
+                                       (cond
+                                        ((eq? 0 res )
+                                         (if (file-exists? dbbackupfile)
+		                           (delete-file* dbbackupfile)
+                                         )
+                                         (if (eq? 0 (file-size sync-log))
+                                             (delete-file sync-log))
+		                         (system (conc "/bin/mv " staging-file " " mtdbfile))
+                                         
+                                         (set! last-sync-seconds (/ (- (current-milliseconds) start-time) 1000))
+                                         (set! off-time (calculate-off-time
+                                                         last-sync-seconds
+                                                         (cond
+                                                          ((and (number? duty-cycle) (> duty-cycle 0) (< duty-cycle 1))
+                                                           duty-cycle)
+                                                          (else
+                                                           (debug:print 0 *default-log-port* "WARNING: ["(common:human-time)"] server.sync-duty-cycle is invalid.  Should be a number between 0 and 1, but "duty-cycle" was specified.  Using default value: "default-duty-cycle)
+                                                           default-duty-cycle))))
+                                         
+                                         (debug:print 1 *default-log-port* "INFO: ["(common:human-time)"] pid="(current-process-id)" SYNC took "last-sync-seconds" sec")
+                                         (debug:print 1 *default-log-port* "INFO: ["(common:human-time)"] pid="(current-process-id)" SYNC took "last-sync-seconds" sec ; with duty-cycle of "duty-cycle" off time is now "off-time)
+                                         'sync-completed)
+                                        (else
+                                         (system (conc "/bin/cp "sync-log" "sync-log".fail"))
+                                         (debug:print 0 *default-log-port* "ERROR: ["(common:human-time)"] Sync failed. See log at "sync-log".fail")
+                                         (if (file-exists? (conc mtdbfile ".backup"))
+                                             (system (conc "/bin/cp "mtdbfile ".backup " mtdbfile)))
+                                         #f))))
+                                 (common:simple-file-release-lock lockfile)
+                                 (BB> "released lockfile: " lockfile)
+                                 (when (common:file-exists? lockfile)
+                                   (BB> "DID NOT ACTUALLY RELEASE LOCKFILE"))
+                                 res2) ;; end let
+                               );; end begin
+                             ;; else
+                             (cond
+                              (persist-until-sync
+                               (thread-sleep! 1)
+                               (debug:print 1 *default-log-port* "INFO: ["(common:human-time)"] pid="(current-process-id)" other SYNC in progress; we're in a fork-to-background so we need to succeed.  Let's wait a jiffy and and try again. num-tries="num-tries" (waiting for lockfile="lockfile" to disappear)")
+                               (retry-loop (add1 num-tries)))
+                              (else
+                               (thread-sleep! (max off-time (+ last-sync-seconds min-intersync-delay)))
+                               (debug:print 1 *default-log-port* "INFO: ["(common:human-time)"] pid="(current-process-id)" other SYNC in progress; not syncing.")
+                               'parallel-sync-in-progress))
+                             ) ;; end if got lockfile
+                         )
+                    ))
+              (BB> "End do-a-sync with fork-to-background="fork-to-background" persist-until-sync="persist-until-sync" and result="finalres)
+              finalres)
+            ) ;; end lambda
+          ))
+    do-a-sync))
+
+(define (server:writable-watchdog-bruteforce dbstruct)
+  (thread-sleep! 1) ;; delay for startup
+  (let* ((do-a-sync  (server:get-bruteforce-syncer dbstruct))
+         (final-sync (server:get-bruteforce-syncer dbstruct fork-to-background: #t persist-until-sync: #t)))
+    (when (and (not (args:get-arg "-sync-to-megatest.db")) ;; conditions under which we do not run the sync
+	       (args:get-arg "-server"))
+      
+      (let loop ()
+	(do-a-sync)
+        (if (not *time-to-exit*) (loop))) ;; keep going unless time to exit
+
+      ;; time to exit, close the no-sync db here
+      (final-sync)
+
+      (if (common:low-noise-print 30)
+	  (debug:print-info 0 *default-log-port* "Exiting watchdog timer, *time-to-exit* = " *time-to-exit*" pid="(current-process-id)
+			    )))))
+
+(define (server:writable-watchdog-deltasync dbstruct)
+  (thread-sleep! 0.05) ;; delay for startup
+  (let ((legacy-sync  (common:run-sync?))
+        (sync-stale-seconds (configf:lookup-number *configdat* "server" "sync-stale-seconds" default: 300))
+	(debug-mode   (debug:debug-mode 1))
+	(last-time    (current-seconds))
+	(no-sync-db   (db:open-no-sync-db))
+	(stmt-cache   (dbr:dbstruct-stmt-cache dbstruct))
+        (sync-duration 0) ;; run time of the sync in milliseconds
+        ;;(this-wd-num  (begin (mutex-lock! *wdnum*mutex) (let ((x *wdnum*)) (set! *wdnum* (add1 *wdnum*)) (mutex-unlock! *wdnum*mutex) x)))
+        )
+    (set! *no-sync-db* no-sync-db) ;; make the no sync db available to api calls
+    (debug:print-info 2 *default-log-port* "Periodic sync thread started.")
+    (debug:print-info 3 *default-log-port* "watchdog starting. legacy-sync is " legacy-sync" pid="(current-process-id)  );;  " this-wd-num="this-wd-num)
+    (if (and legacy-sync (not *time-to-exit*))
+	(let* (;;(dbstruct (db:setup))
+	       (mtdb       (dbr:dbstruct-mtdb dbstruct))
+	       (mtpath     (db:dbdat-get-path mtdb))
+	       (tmp-area   (common:get-db-tmp-area))
+	       (start-file (conc tmp-area "/.start-sync"))
+	       (end-file   (conc tmp-area "/.end-sync")))
+	  (debug:print-info 0 *default-log-port* "Server running, periodic sync started.")
+	  (let loop ()
+	    ;; sync for filesystem local db writes
+	    ;;
+	    (mutex-lock! *db-multi-sync-mutex*)
+	    (let* ((need-sync        (>= *db-last-access* *db-last-sync*)) ;; no sync since last write
+		   (sync-in-progress *db-sync-in-progress*)
+                   (min-intersync-delay (configf:lookup-number *configdat* "server" "minimum-intersync-delay" default: 5))
+		   (should-sync      (and (not *time-to-exit*)
+                                          (> (- (current-seconds) *db-last-sync*) min-intersync-delay))) ;; sync every five seconds minimum, deprecated logic, can probably be removed
+		   (start-time       (current-seconds))
+                   (cpu-load-adj     (alist-ref 'adj-proc-load (common:get-normalized-cpu-load #f)))
+		   (mt-mod-time      (file-modification-time mtpath))
+		   (last-sync-start  (if (common:file-exists? start-file)
+					 (file-modification-time start-file)
+					 0))
+		   (last-sync-end    (if (common:file-exists? end-file)
+					 (file-modification-time end-file)
+					 10))
+                   (sync-period      (+ 3 (* cpu-load-adj 30))) ;; as adjusted load increases increase the sync period
+		   (recently-synced  (and (< (- start-time mt-mod-time) sync-period) ;; not useful if sync didn't modify megatest.db!
+					  (< mt-mod-time last-sync-start)))
+		   (sync-done        (<= last-sync-start last-sync-end))
+                   (sync-stale       (> start-time (+ last-sync-start sync-stale-seconds)))
+		   (will-sync        (and (not *time-to-exit*)       ;; do not start a sync if we are in the process of exiting
+                                          (or need-sync should-sync)
+					  (or sync-done sync-stale)
+					  (not sync-in-progress)
+					  (not recently-synced))))
+              (debug:print-info 13 *default-log-port* "WD writable-watchdog top of loop.  need-sync="need-sync" sync-in-progress=" sync-in-progress
+				" should-sync="should-sync" start-time="start-time" mt-mod-time="mt-mod-time" recently-synced="recently-synced" will-sync="will-sync
+				" sync-done=" sync-done " sync-period=" sync-period)
+              (if (and (> sync-period 5)
+                       (common:low-noise-print 30 "sync-period"))
+                  (debug:print-info 0 *default-log-port* "Increased sync period due to long sync times, sync took: " sync-period " seconds."))
+	      ;; (if recently-synced (debug:print-info 0 *default-log-port* "Skipping sync due to recently-synced flag=" recently-synced))
+	      ;; (debug:print-info 0 *default-log-port* "need-sync: " need-sync " sync-in-progress: " sync-in-progress " should-sync: " should-sync " will-sync: " will-sync)
+	      (if will-sync (set! *db-sync-in-progress* #t))
+	      (mutex-unlock! *db-multi-sync-mutex*)
+	      (if will-sync
+                  (let (;; (max-sync-duration  (configf:lookup-number *configdat* "server" "max-sync-duration")) ;; KEEPING THIS AVAILABLE BUT SHOULD NOT USE, I'M PRETTY SURE IT DOES NOT WORK!
+                        (sync-start         (current-milliseconds)))
+		    (with-output-to-file start-file (lambda ()(print (current-process-id))))
+		    
+		    ;; put lock here
+		    
+                    ;; (if (or (not max-sync-duration)
+                    ;;        (< sync-duration max-sync-duration)) ;; NOTE: db:sync-to-megatest.db keeps track of time of last sync and syncs incrementally
+                        (let ((res        (db:sync-to-megatest.db dbstruct no-sync-db: no-sync-db))) ;; did we sync any data? If so need to set the db touched flag to keep the server alive
+                          (set! sync-duration (- (current-milliseconds) sync-start))
+                          (if (> res 0) ;; some records were transferred, keep the db alive
+                              (begin
+                                (mutex-lock! *heartbeat-mutex*)
+                                (set! *db-last-access* (current-seconds))
+                                (mutex-unlock! *heartbeat-mutex*)
+                                (debug:print-info 0 *default-log-port* "sync called, " res " records transferred."))
+                              (debug:print-info 2 *default-log-port* "sync called but zero records transferred")))))
+;;                         ;; TODO: factor this next routine out into a function
+;;                         (with-input-from-pipe ;; this should not block other threads but need to verify this
+;;                          (conc "megatest -sync-to-megatest.db -m testsuite:" (common:get-area-name) ":" *toppath*)
+;;                          (lambda ()
+;;                            (let loop ((inl (read-line))
+;;                                       (res #f))
+;;                              (if (eof-object? inl)
+;;                                  (begin
+;;                                    (set! sync-duration (- (current-milliseconds) sync-start))
+;;                                    (cond
+;;                                     ((not res)
+;;                                      (debug:print 0 *default-log-port* "ERROR: sync from /tmp db to megatest.db appears to have failed. Recommended that you stop your runs and run \"megatest -cleanup-db\""))
+;;                                     ((> res 0)
+;;                                      (mutex-lock! *heartbeat-mutex*)
+;;                                      (set! *db-last-access* (current-seconds))
+;;                                      (mutex-unlock! *heartbeat-mutex*))))
+;;                                  (let ((num-synced (let ((matches (string-match "^Synced (\\d+).*$" inl)))
+;;                                                      (if matches
+;;                                                          (string->number (cadr matches))
+;;                                                          #f))))
+;;                                    (loop (read-line)
+;;                                          (or num-synced res))))))))))
+	      (if will-sync
+		  (begin
+		    (mutex-lock! *db-multi-sync-mutex*)
+		    (set! *db-sync-in-progress* #f)
+		    (set! *db-last-sync* start-time)
+		    (with-output-to-file end-file (lambda ()(print (current-process-id))))
+
+		    ;; release lock here
+
+		    (mutex-unlock! *db-multi-sync-mutex*)))
+	      (if (and debug-mode
+		       (> (- start-time last-time) 60))
+		  (begin
+		    (set! last-time start-time)
+		    (debug:print-info 4 *default-log-port* "timestamp -> " (seconds->time-string (current-seconds)) ", time since start -> " (seconds->hr-min-sec (- (current-seconds) *time-zero*))))))
+	    
+	    ;; keep going unless time to exit
+	    ;;
+	    (if (not *time-to-exit*)
+		(let delay-loop ((count 0))
+                  ;;(debug:print-info 13 *default-log-port* "delay-loop top; count="count" pid="(current-process-id)" this-wd-num="this-wd-num" *time-to-exit*="*time-to-exit*)
+                                                            
+		  (if (and (not *time-to-exit*)
+			   (< count 6)) ;; was 11, changing to 4. 
+		      (begin
+			(thread-sleep! 1)
+			(delay-loop (+ count 1))))
+		  (if (not *time-to-exit*) (loop))))
+	    ;; time to exit, close the no-sync db here
+	    (db:no-sync-close-db no-sync-db stmt-cache)
+	    (if (common:low-noise-print 30)
+		(debug:print-info 0 *default-log-port* "Exiting watchdog timer, *time-to-exit* = " *time-to-exit*" pid="(current-process-id) ))))))) ;;" this-wd-num="this-wd-num)))))))
 

Index: sharedat.scm
==================================================================
--- sharedat.scm
+++ sharedat.scm
@@ -1,14 +1,23 @@
 
 ;; Copyright 2006-2013, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 
 (use defstruct)
 
 ;; (use ssax)
 ;; (use sxml-serializer)

ADDED   show-uncalled-procedures.scm
Index: show-uncalled-procedures.scm
==================================================================
--- /dev/null
+++ show-uncalled-procedures.scm
@@ -0,0 +1,30 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
+(include "codescanlib.scm")
+
+(define (show-danglers)
+  (let* ((all-scm-files (glob "*.scm"))
+         (xref (get-xref all-scm-files))
+         (dangling-procs
+          (map car (filter (lambda (x) (equal? 1 (length x))) xref))))
+    (for-each print dangling-procs) ;; our product.
+    ))
+
+(show-danglers)
+
+    

DELETED spreadsheet/basic/Configurations2/accelerator/current.xml
Index: spreadsheet/basic/Configurations2/accelerator/current.xml
==================================================================
--- spreadsheet/basic/Configurations2/accelerator/current.xml
+++ /dev/null

DELETED spreadsheet/basic/META-INF/manifest.xml
Index: spreadsheet/basic/META-INF/manifest.xml
==================================================================
--- spreadsheet/basic/META-INF/manifest.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
-

DELETED spreadsheet/basic/Thumbnails/thumbnail.png
Index: spreadsheet/basic/Thumbnails/thumbnail.png
==================================================================
--- spreadsheet/basic/Thumbnails/thumbnail.png
+++ /dev/null
cannot compute difference between binary files

DELETED spreadsheet/basic/content.xml
Index: spreadsheet/basic/content.xml
==================================================================
--- spreadsheet/basic/content.xml
+++ /dev/null
@@ -1,132 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Row 1,A
-
-
-Row 1,B
-
-
-
-
-Row 2,A
-
-
-Row 2,B
-
-
-
-
-
-
-
-this is sheet one
-
-
-
-
-
-
-
-
-Row 1,A
-
-
-Row 1,B
-
-
-
-
-Row 2,A
-
-
-Row 2,B
-
-
-
-
-
-
-
-this is sheet two
-
-
-
-
-
-
-
-
-1
-
-
-2
-
-
-
-
-2
-
-
-4
-
-
-
-
-3
-
-
-6
-
-
-
-
-4
-
-
-8
-
-
-
-
-5
-
-
-10
-
-
-
-
-6
-
-
-12
-
-
-
-
-
-

DELETED spreadsheet/basic/content.xml~
Index: spreadsheet/basic/content.xml~
==================================================================
--- spreadsheet/basic/content.xml~
+++ /dev/null
@@ -1,2 +0,0 @@
-
-Row 1,ARow 1,BRow 2,ARow 2,Bthis is sheet oneRow 1,ARow 1,BRow 2,ARow 2,Bthis is sheet two12243648510612

DELETED spreadsheet/basic/meta.xml
Index: spreadsheet/basic/meta.xml
==================================================================
--- spreadsheet/basic/meta.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-Matt Welland2011-09-06T20:46:232011-09-06T22:05:47Matt WellandPT1H19M25S2LibreOffice/3.3$Linux LibreOffice_project/330m19$Build-301

DELETED spreadsheet/basic/mimetype
Index: spreadsheet/basic/mimetype
==================================================================
--- spreadsheet/basic/mimetype
+++ /dev/null
@@ -1,1 +0,0 @@
-application/vnd.oasis.opendocument.spreadsheet

DELETED spreadsheet/basic/settings.xml
Index: spreadsheet/basic/settings.xml
==================================================================
--- spreadsheet/basic/settings.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-0045161799view100000020000010060true04000020000010060true15000020000010060trueSheet3270010060falsetruetruetrue12632256truetruetruetruefalsefalse1270127011truefalsetrue3falsetruetruetrue12701270false1truetrue1true12632256falsefalsetrue0truetruetruefalsetrue

DELETED spreadsheet/basic/styles.xml
Index: spreadsheet/basic/styles.xml
==================================================================
--- spreadsheet/basic/styles.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-$-$???Page 1??? (???)09/06/2011, 22:05:47Page 1 / 99

Index: spublish.scm
==================================================================
--- spublish.scm
+++ spublish.scm
@@ -1,67 +1,60 @@
 
 ;; Copyright 2006-2013, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
 
 (use defstruct)
-
-;; (use ssax)
-;; (use sxml-serializer)
-;; (use sxml-modifications)
-;; (use regex)
-;; (use srfi-69)
-;; (use regex-case)
-;; (use posix)
-;; (use json)
-;; (use csv)
+(use scsh-process)
+(use refdb)
 (use srfi-18)
+(use srfi-19)
 (use format)
-
-;; (require-library ini-file)
-;; (import (prefix ini-file ini:))
-
 (use sql-de-lite srfi-1 posix regex regex-case srfi-69)
-;; (import (prefix sqlite3 sqlite3:))
-;; 
-(declare (uses configf))
+
+;(declare (uses configf))
 ;; (declare (uses tree))
 (declare (uses margs))
-;; (declare (uses dcommon))
-;; (declare (uses launch))
-;; (declare (uses gutils))
-;; (declare (uses db))
-;; (declare (uses synchash))
-;; (declare (uses server))
-(declare (uses megatest-version))
-;; (declare (uses tbd))
-
+
+(include "megatest-version.scm")
 (include "megatest-fossil-hash.scm")
+;;; please create this file before using sautherise. For sample file is avaliable sample-sauth-paths.scm. 
+(include "sauth-paths.scm")
+(include "sauth-common.scm")
+(define (toplevel-command . args) #f)
+(use readline)
 
 ;;
 ;; GLOBALS
 ;;
 (define *spublish:current-tab-number* 0)
 (define *args-hash* (make-hash-table))
-(define spublish:help (conc "Usage: spublish [action [params ...]]
-
-  ls                     : list contents of target area
-  cp|publish        : copy file to target area
-  mkdir        : maks directory in target area  
-  rm               : remove file  from target area
-  ln   : creates a symlink
-  log                    :
-
+(define spublish:help (conc "Usage: spublish  [action [params ...]]
+
+  ls                     : list contents of target area
+  cp|publish         : copy file to target area
+  mkdir         : maks directory in target area  
+  rm                : remove file  from target area
+  ln    : creates a symlink
+ 
   options:
 
     -m \"message\"        : describe what was done
-
+Note: All the target locations relative to base path 
 Part of the Megatest tool suite.
 Learn more at http://www.kiatoa.com/fossils/megatest
 
 Version: " megatest-fossil-hash)) ;; "
 
@@ -71,237 +64,240 @@
 
 ;;======================================================================
 ;; DB
 ;;======================================================================
 
-(define (spublish:initialize-db db)
-  (for-each
-   (lambda (qry)
-     (exec (sql db qry)))
-   (list 
-    "CREATE TABLE IF NOT EXISTS actions
-         (id           INTEGER PRIMARY KEY,
-          action       TEXT NOT NULL,
-          submitter    TEXT NOT NULL,
-          datetime     TIMESTAMP DEFAULT (strftime('%s','now')),
-          srcpath      TEXT NOT NULL,
-          comment      TEXT DEFAULT '' NOT NULL,
-          state        TEXT DEFAULT 'new');"
-    )))
-
-(define (spublish:register-action db action submitter source-path comment)
-  (exec (sql db "INSERT INTO actions (action,submitter,srcpath,comment)
-                 VALUES(?,?,?,?)")
-	action
-	submitter
-	source-path
-	comment))
+(define *default-log-port* (current-error-port))
+(define *verbosity*         1)
+
+;(define (spublish:initialize-db db)
+;  (for-each
+;   (lambda (qry)
+;     (exec (sql db qry)))
+;   (list 
+;    "CREATE TABLE IF NOT EXISTS actions
+;         (id           INTEGER PRIMARY KEY,
+;          action       TEXT NOT NULL,
+;          submitter    TEXT NOT NULL,
+;          datetime     TIMESTAMP DEFAULT (strftime('%s','now')),
+;          srcpath      TEXT NOT NULL,
+;          comment      TEXT DEFAULT '' NOT NULL,
+;          state        TEXT DEFAULT 'new');"
+;    )))
+
+;(define (spublish:register-action db action submitter source-path comment)
+;  (exec (sql db "INSERT INTO actions (action,submitter,srcpath,comment)
+;                 VALUES(?,?,?,?)")
+;	action
+;	submitter
+;	source-path
+;	comment))
 
 ;; (call-with-database
 ;;  (lambda (db)
 ;;   (set-busy-handler! db (busy-timeout 10000)) ; 10 second timeout
 ;;   ...))
 
 ;; Create the sqlite db
-(define (spublish:db-do configdat proc) 
-  (let ((path (configf:lookup configdat "database" "location")))
-    (if (not path)
-	(begin
-	  (print "[database]\nlocation /some/path\n\n Is missing from the config file!")
-	  (exit 1)))
-    (if (and path
-	     (directory? path)
-	     (file-read-access? path))
-	(let* ((dbpath    (conc path "/spublish.db"))
-	       (writeable (file-write-access? dbpath))
-	       (dbexists  (file-exists? dbpath)))
-	  (handle-exceptions
-	   exn
-	   (begin
-	     (debug:print 2 *default-log-port* "ERROR: problem accessing db " dbpath
-			  ((condition-property-accessor 'exn 'message) exn))
-	     (exit 1))
-	   (call-with-database
-            dbpath
-	    (lambda (db)
-	      ;; (print "calling proc " proc " on db " db)
-	      (set-busy-handler! db (busy-timeout 10000)) ;; 10 sec timeout
-	      (if (not dbexists)(spublish:initialize-db db))
-	      (proc db)))))
-	(print "ERROR: invalid path for storing database: " path))))
-
-;; copy in file to dest, validation is done BEFORE calling this
-;;
-(define (spublish:cp configdat submitter source-path target-dir targ-file dest-dir comment)
-  (let ((dest-dir-path (conc target-dir "/" dest-dir))
-        (targ-path (conc target-dir "/" dest-dir "/" targ-file)))
-    (if (file-exists? targ-path)
-	(begin
-	  (print "ERROR: target file already exists, remove it before re-publishing")
-	  (exit 1)))
-       (if (not(file-exists? dest-dir-path))
-	(begin
-	  (print "ERROR: target directory " dest-dir-path " does not exists." )
-	  (exit 1)))
-
-    (spublish:db-do
-     configdat
-     (lambda (db)
-       (spublish:register-action db "cp" submitter source-path comment)))
-    (let* (;; (target-path (configf:lookup "settings" "target-path"))
-	   (th1         (make-thread
-			 (lambda ()
-			   (file-copy source-path targ-path #t))
-                            (print " ... file " targ-path " copied to" targ-path)
-			 ;; (let ((pid (process-run "cp" (list source-path target-dir))))
-			 ;;   (process-wait pid)))
-			 "copy thread"))
-	   (th2         (make-thread
-			 (lambda ()
-			   (let loop ()
-			     (thread-sleep! 15)
-			     (display ".")
-			     (flush-output)
-			     (loop)))
-			 "action is happening thread")))
-      (thread-start! th1)
-      (thread-start! th2)
-      (thread-join! th1))
-    (cons #t "Successfully saved data")))
-
-;; copy directory to dest, validation is done BEFORE calling this
-;;
-
-(define (spublish:tar configdat submitter target-dir dest-dir comment)
-  (let ((dest-dir-path (conc target-dir "/" dest-dir)))
-       (if (not(file-exists? dest-dir-path))
-	(begin
-	  (print "ERROR: target directory " dest-dir-path " does not exists." )
-	  (exit 1)))
-    ;;(print dest-dir-path )
-    (spublish:db-do
-     configdat
-     (lambda (db)
-       (spublish:register-action db "tar" submitter dest-dir-path comment)))
-       (change-directory dest-dir-path)
-       (process-wait (process-run "/bin/tar" (list "xf" "-")))
-       (print "Data copied to " dest-dir-path) 
-
-        (cons #t "Successfully saved data")))
-
-
-(define (spublish:validate target-dir targ-mk)
-  (let* ((normal-path (normalize-pathname targ-mk))
-        (targ-path (conc target-dir "/" normal-path)))
-    (if (string-contains   normal-path "..")
-    (begin
-      (print "ERROR: Path  " targ-mk " resolved outside target area "  target-dir )
-      (exit 1)))
-
-    (if (not (string-contains targ-path target-dir))
-    (begin
-      (print "ERROR: You cannot update data outside " target-dir ".")
-      (exit 1)))
-    (print "Path " targ-mk " is valid.")   
- ))
+;(define (spublish:db-do configdat proc) 
+;  (let ((path (configf:lookup configdat "database" "location")))
+;    (if (not path)
+;	(begin
+;	  (print "[database]\nlocation /some/path\n\n Is missing from the config file!")
+;	  (exit 1)))
+;    (if (and path
+;	     (directory? path)
+;	     (file-read-access? path))
+;	(let* ((dbpath    (conc path "/spublish.db"))
+;	       (writeable (file-write-access? dbpath))
+;	       (dbexists  (file-exists? dbpath)))
+;	  (handle-exceptions
+;	   exn
+;	   (begin
+;	     (debug:print 2 *default-log-port* "ERROR: problem accessing db " dbpath
+;			  ((condition-property-accessor 'exn 'message) exn))
+;	     (exit 1))
+;	   (call-with-database
+;            dbpath
+;	    (lambda (db)
+;	      ;; (print "calling proc " proc " on db " db)
+;	      (set-busy-handler! db (busy-timeout 10000)) ;; 10 sec timeout
+;	      (if (not dbexists)(spublish:initialize-db db))
+;	      (proc db)))))
+;	(print "ERROR: invalid path for storing database: " path))))
+;
+;;; copy in file to dest, validation is done BEFORE calling this
+;;;
+;(define (spublish:cp configdat submitter source-path target-dir targ-file dest-dir comment)
+;  (let ((dest-dir-path (conc target-dir "/" dest-dir))
+;        (targ-path (conc target-dir "/" dest-dir "/" targ-file)))
+;    (if (file-exists? targ-path)
+;	(begin
+;	  (print "ERROR: target file already exists, remove it before re-publishing")
+;	  (exit 1)))
+;       (if (not(file-exists? dest-dir-path))
+;	(begin
+;	  (print "ERROR: target directory " dest-dir-path " does not exists." )
+;	  (exit 1)))
+;
+;    (spublish:db-do
+;     configdat
+;     (lambda (db)
+;       (spublish:register-action db "cp" submitter source-path comment)))
+;    (let* (;; (target-path (configf:lookup "settings" "target-path"))
+;	   (th1         (make-thread
+;			 (lambda ()
+;			   (file-copy source-path targ-path #t))
+;                            (print " ... file " targ-path " copied to " targ-path)
+;			 ;; (let ((pid (process-run "cp" (list source-path target-dir))))
+;			 ;;   (process-wait pid)))
+;			 "copy thread"))
+;	   (th2         (make-thread
+;			 (lambda ()
+;			   (let loop ()
+;			     (thread-sleep! 15)
+;			     (display ".")
+;			     (flush-output)
+;			     (loop)))
+;			 "action is happening thread")))
+;      (thread-start! th1)
+;      (thread-start! th2)
+;      (thread-join! th1))
+;    (cons #t "Successfully saved data")))
+;
+;;; copy directory to dest, validation is done BEFORE calling this
+;;;
+;
+;(define (spublish:tar configdat submitter target-dir dest-dir comment)
+;  (let ((dest-dir-path (conc target-dir "/" dest-dir)))
+;       (if (not(file-exists? dest-dir-path))
+;	(begin
+;	  (print "ERROR: target directory " dest-dir-path " does not exists." )
+;	  (exit 1)))
+;    ;;(print dest-dir-path )
+;    (spublish:db-do
+;     configdat
+;     (lambda (db)
+;       (spublish:register-action db "tar" submitter dest-dir-path comment)))
+;       (change-directory dest-dir-path)
+;       (process-wait (process-run "/bin/tar" (list "xf" "-")))
+;       (print "Data copied to " dest-dir-path) 
+;
+;        (cons #t "Successfully saved data")))
+
+
+;(define (spublish:validate target-dir targ-mk)
+;  (let* ((normal-path (normalize-pathname targ-mk))
+;        (targ-path (conc target-dir "/" normal-path)))
+;    (if (string-contains   normal-path "..")
+;    (begin
+;      (print "ERROR: Path  " targ-mk " resolved outside target area "  target-dir )
+;      (exit 1)))
+;
+;    (if (not (string-contains targ-path target-dir))
+;    (begin
+;      (print "ERROR: You cannot update data outside " target-dir ".")
+;      (exit 1)))
+;    (print "Path " targ-mk " is valid.")   
+; ))
 ;; make directory in dest
 ;;
 
-(define (spublish:mkdir configdat submitter target-dir targ-mk comment)
-  (let ((targ-path (conc target-dir "/" targ-mk)))
-    
-    (if (file-exists? targ-path)
-	(begin
-	  (print "ERROR: target Directory " targ-path " already exist!!")
-	  (exit 1)))
-    (spublish:db-do
-     configdat
-     (lambda (db)
-       (spublish:register-action db "mkdir" submitter targ-mk comment)))
-    (let* ((th1         (make-thread
-			 (lambda ()
-			   (create-directory targ-path #t)
-			   (print " ... dir " targ-path " created"))
-			 "mkdir thread"))
-	   (th2         (make-thread
-			 (lambda ()
-			   (let loop ()
-			     (thread-sleep! 15)
-			     (display ".")
-			     (flush-output)
-			     (loop)))
-			 "action is happening thread")))
-      (thread-start! th1)
-      (thread-start! th2)
-      (thread-join! th1))
-    (cons #t "Successfully saved data")))
+;(define (spublish:mkdir configdat submitter target-dir targ-mk comment)
+;  (let ((targ-path (conc target-dir "/" targ-mk)))
+;    
+;    (if (file-exists? targ-path)
+;	(begin
+;	  (print "ERROR: target Directory " targ-path " already exist!!")
+;	  (exit 1)))
+;    (spublish:db-do
+;     configdat
+;     (lambda (db)
+;       (spublish:register-action db "mkdir" submitter targ-mk comment)))
+;    (let* ((th1         (make-thread
+;			 (lambda ()
+;			   (create-directory targ-path #t)
+;			   (print " ... dir " targ-path " created"))
+;			 "mkdir thread"))
+;	   (th2         (make-thread
+;			 (lambda ()
+;			   (let loop ()
+;			     (thread-sleep! 15)
+;			     (display ".")
+;			     (flush-output)
+;			     (loop)))
+;			 "action is happening thread")))
+;      (thread-start! th1)
+;      (thread-start! th2)
+;      (thread-join! th1))
+;    (cons #t "Successfully saved data")))
 
 ;; create a symlink in dest
 ;;
-(define (spublish:ln configdat submitter target-dir targ-link link-name comment)
-  (let ((targ-path (conc target-dir "/" link-name)))
-    (if (file-exists? targ-path)
-	(begin
-	  (print "ERROR: target file " targ-path " already exist!!")
-	  (exit 1)))
-     (if (not (file-exists? targ-link ))
-	(begin
-	  (print "ERROR: target file " targ-link " does not exist!!")
-	  (exit 1)))
- 
-    (spublish:db-do
-     configdat
-     (lambda (db)
-       (spublish:register-action db "ln" submitter link-name comment)))
-    (let* ((th1         (make-thread
-			 (lambda ()
-			   (create-symbolic-link targ-link targ-path  )
-			   (print " ... link " targ-path " created"))
-			 "symlink thread"))
-	   (th2         (make-thread
-			 (lambda ()
-			   (let loop ()
-			     (thread-sleep! 15)
-			     (display ".")
-			     (flush-output)
-			     (loop)))
-			 "action is happening thread")))
-      (thread-start! th1)
-      (thread-start! th2)
-      (thread-join! th1))
-    (cons #t "Successfully saved data")))
+;(define (spublish:ln configdat submitter target-dir targ-link link-name comment)
+;  (let ((targ-path (conc target-dir "/" link-name)))
+;    (if (file-exists? targ-path)
+;	(begin
+;	  (print "ERROR: target file " targ-path " already exist!!")
+;	  (exit 1)))
+;     (if (not (file-exists? targ-link ))
+;	(begin
+;	  (print "ERROR: target file " targ-link " does not exist!!")
+;	  (exit 1)))
+; 
+;    (spublish:db-do
+;     configdat
+;     (lambda (db)
+;       (spublish:register-action db "ln" submitter link-name comment)))
+;    (let* ((th1         (make-thread
+;			 (lambda ()
+;			   (create-symbolic-link targ-link targ-path  )
+;			   (print " ... link " targ-path " created"))
+;			 "symlink thread"))
+;	   (th2         (make-thread
+;			 (lambda ()
+;			   (let loop ()
+;			     (thread-sleep! 15)
+;			     (display ".")
+;			     (flush-output)
+;			     (loop)))
+;			 "action is happening thread")))
+;      (thread-start! th1)
+;      (thread-start! th2)
+;      (thread-join! th1))
+;    (cons #t "Successfully saved data")))
 
 
 ;; remove copy of file in dest
 ;;
-(define (spublish:rm configdat submitter target-dir targ-file comment)
-  (let ((targ-path (conc target-dir "/" targ-file)))
-    (if (not (file-exists? targ-path))
-	(begin
-	  (print "ERROR: target file " targ-path " not found, nothing to remove.")
-	  (exit 1)))
-    (spublish:db-do
-     configdat
-     (lambda (db)
-       (spublish:register-action db "rm" submitter targ-file comment)))
-    (let* ((th1         (make-thread
-			 (lambda ()
-			   (delete-file targ-path)
-			   (print " ... file " targ-path " removed"))
-			 "rm thread"))
-	   (th2         (make-thread
-			 (lambda ()
-			   (let loop ()
-			     (thread-sleep! 15)
-			     (display ".")
-			     (flush-output)
-			     (loop)))
-			 "action is happening thread")))
-      (thread-start! th1)
-      (thread-start! th2)
-      (thread-join! th1))
-    (cons #t "Successfully saved data")))
+;(define (spublish:rm configdat submitter target-dir targ-file comment)
+;  (let ((targ-path (conc target-dir "/" targ-file)))
+;    (if (not (file-exists? targ-path))
+;	(begin
+;	  (print "ERROR: target file " targ-path " not found, nothing to remove.")
+;	  (exit 1)))
+;    (spublish:db-do
+;     configdat
+;     (lambda (db)
+;       (spublish:register-action db "rm" submitter targ-file comment)))
+;    (let* ((th1         (make-thread
+;			 (lambda ()
+;			   (delete-file targ-path)
+;			   (print " ... file " targ-path " removed"))
+;			 "rm thread"))
+;	   (th2         (make-thread
+;			 (lambda ()
+;			   (let loop ()
+;			     (thread-sleep! 15)
+;			     (display ".")
+;			     (flush-output)
+;			     (loop)))
+;			 "action is happening thread")))
+;      (thread-start! th1)
+;      (thread-start! th2)
+;      (thread-join! th1))
+;    (cons #t "Successfully saved data")))
 
 (define (spublish:backup-move path)
   (let* ((trashdir  (conc (pathname-directory path) "/.trash"))
 	 (trashfile (conc trashdir "/" (current-seconds) "-" (pathname-file path))))
     (create-directory trashdir #t)
@@ -323,182 +319,476 @@
 
 ;;======================================================================
 ;; MISC
 ;;======================================================================
 
-(define (spublish:do-as-calling-user proc)
-  (let ((eid (current-effective-user-id))
-        (cid (current-user-id)))
-    (if (not (eq? eid cid)) ;; running suid
-            (set! (current-effective-user-id) cid))
-    ;; (print "running as " (current-effective-user-id))
-    (proc)
-    (if (not (eq? eid cid))
-        (set! (current-effective-user-id) eid))))
-
-(define (spublish:find name paths)
-  (if (null? paths)
-      #f
-      (let loop ((hed (car paths))
-		 (tal (cdr paths)))
-	(if (file-exists? (conc hed "/" name))
-	    hed
-	    (if (null? tal)
-		#f
-		(loop (car tal)(cdr tal)))))))
+;(define (spublish:do-as-calling-user proc)
+;  (let ((eid (current-effective-user-id))
+;        (cid (current-user-id)))
+;    (if (not (eq? eid cid)) ;; running suid
+;            (set! (current-effective-user-id) cid))
+;    ;; (print "running as " (current-effective-user-id))
+;    (proc)
+;    (if (not (eq? eid cid))
+;        (set! (current-effective-user-id) eid))))
+
+;(define (spublish:find name paths)
+;  (if (null? paths)
+;      #f
+;      (let loop ((hed (car paths))
+;		 (tal (cdr paths)))
+;	(if (file-exists? (conc hed "/" name))
+;	    hed
+;	    (if (null? tal)
+;		#f
+;		(loop (car tal)(cdr tal)))))))
+
+;;========================================================================
+;;Shell 
+;;========================================================================
+(define (spublish:get-accessable-projects  area)
+   (let* ((projects `()))
+            (if (spublish:has-permission area)
+               (set! projects (cons area projects))
+               (begin
+                 (print "User cannot access area " area "!!")  
+                (exit 1))) 
+    projects))
+
+;; function to find sheets to which use has access 
+(define (spublish:has-permission  area)
+  ;(print "in spublish:has-permission")
+  (let* ((username     (current-user-name))
+        (ret-val #f))
+  (cond
+   ((equal? (is-admin username) #t)
+     (set! ret-val #t))
+    ((equal? (is-user "publish" username area) #t)
+     (set! ret-val #t))
+   ((equal? (is-user "writer-admin" username area) #t) 
+     (set! ret-val #t))
+
+   ((equal? (is-user "area-admin" username area) #t) 
+     (set! ret-val #t))
+   (else  
+    (set! ret-val #f)))
+       ret-val))
+
+(define (is_directory target-path) 
+  (let* ((retval #f))
+  (sauthorize:do-as-calling-user
+    	(lambda ()
+          ;(print (current-effective-user-id) ) 
+          (if (directory? target-path)
+               (set! retval  #t))))
+             ;(print (current-effective-user-id))
+     retval)) 
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; shell functions
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(define (spublish:shell-cp src-path target-path)  
+  (cond
+   ((not (file-exists? target-path))
+	(sauth:print-error (conc " target Directory " target-path " does not exist!!")))
+   ((not (file-exists? src-path))
+    (sauth:print-error (conc "Source path " src-path " does not exist!!" )))
+   (else
+     (if (is_directory src-path) 
+        (begin
+            (let* ((parent-dir src-path)
+                   (start-dir target-path))
+                 (run (pipe
+                   (begin (system (conc "cd " parent-dir " ;tar chf - ." )))
+                   (begin (change-directory start-dir)
+                          ;(print "123")
+                          (run-cmd "tar" (list "xf" "-")))))
+                          (print "Copied data to " start-dir))) 
+        (begin
+           (let*((parent-dir (pathname-directory src-path))
+                  (start-dir target-path)
+                (filename (if  (pathname-extension src-path)  
+                                      (conc(pathname-file src-path) "." (pathname-extension src-path))
+                                      (pathname-file src-path))))
+                ;(print "parent-dir " parent-dir " start-dir " start-dir)   
+                 (run (pipe
+                   (begin (system (conc "cd " parent-dir ";tar chf - " filename )))
+                   (begin (change-directory start-dir)
+                          (run-cmd "tar" (list "xf" "-")))))
+                          (print "Copied data to " start-dir)))))))
+
+
+(define (spublish:shell-mkdir targ-path)
+    (if (file-exists? targ-path)
+	(begin
+	  (print "Info: Target Directory " targ-path " already exist!!"))
+        (let* ((th1         (make-thread
+			 (lambda ()
+			   (create-directory targ-path #t)
+			   (print " ... dir " targ-path " created"))
+			 "mkdir thread"))
+	   (th2         (make-thread
+			 (lambda ()
+			   (let loop ()
+			     (thread-sleep! 15)
+			     (display ".")
+			     (flush-output)
+			     (loop)))
+			 "action is happening thread")))
+      (thread-start! th1)
+      (thread-start! th2)
+      (thread-join! th1)
+    (cons #t "Successfully saved data"))))
+ 
+
+(define (spublish:shell-rm targ-path iport)
+    (if (not (file-exists? targ-path))
+	(begin
+	  (sauth:print-error (conc "target path " targ-path " does not exist!!")))
+        (begin 
+           (print "Are you sure you want to delete " targ-path "?[y/n]") 
+            (let* ((inl (read-line iport)))
+                (if (equal? inl "y")
+	             (let* ((th1         (make-thread
+			     (lambda ()
+                                (if (symbolic-link? targ-path)
+                                  (delete-file  targ-path )  
+                                  (if (directory? targ-path)
+                                    (delete-directory targ-path #t)     
+			            (delete-file  targ-path )))
+			        (print " ... path " targ-path " deleted"))
+			        "rm thread"))
+	   		    (th2         (make-thread
+			      (lambda ()
+			         (let loop ()
+			            (thread-sleep! 15)
+			            (display ".")
+			            (flush-output)
+			            (loop)))
+			 "action is happening thread")))
+      			(thread-start! th1)
+      			(thread-start! th2)
+      			(thread-join! th1)
+    			(cons #t "Successfully saved data")))))))
+
+(define (spublish:shell-ln src-path target-path sub-path)
+   (if (not (file-exists? sub-path))
+	 (sauth:print-error (conc "Path " sub-path " does not exist!! cannot proceed with link creation!!"))
+        (begin  
+          (if (not (file-exists? src-path))
+  	    (sauth:print-error (conc "Path " src-path " does not exist!! cannot proceed with link creation!!"))
+            (begin
+                (if (file-exists? target-path)
+                   (sauth:print-error (conc "Path " target-path "already exist!! cannot proceed with link creation!!"))
+                   (begin 
+                      (create-symbolic-link src-path target-path  )
+			   (print " ... link " target-path " created"))))))))
+ 
+(define (spublish:shell-help)
+(conc "Usage: [action [params ...]]
+
+  ls    [target path]               	  : list contents of target area.
+  cd     	     	          : To change the current directory within the sretrive shell. 
+  pwd				     	  : Prints the full pathname of the current directory within the sretrive shell.
+  mkdir                             : creates directory. Note it does not create's a path recursive manner.
+  rm                         : removes files and emoty directories   
+  cp                    : copy a file/dir to target path. if src is a dir it automatically makes a recursive copy.
+  ln TARGET LINK_NAME                     : creates a symlink      
+Part of the Megatest tool suite.
+Learn more at http://www.kiatoa.com/fossils/megatest
+
+Version: " megatest-fossil-hash)
+)	
+
+(define (toplevel-command . args) #f)
+
+(define (spublish:shell area)
+ ; (print area)
+  (use readline)
+
+  (let* ((path      '())
+	 (prompt    "spublish> ")
+	 (args      (argv))
+         (usr (current-user-name) )   
+         (top-areas (spublish:get-accessable-projects area))
+         (close-port     #f)
+         (area-obj  (get-obj-by-code area))
+         (user-obj (get-user usr)) 
+         (base-path (if (null? area-obj) 
+                         "" 
+                        (caddr (cdr area-obj))))      
+	 (iport     (make-readline-port prompt)))
+        ;(print base-path) 
+        (if (null? area-obj)
+          (begin 
+             (print "Area " area " does not exist")
+          (exit 1)))
+        ; (print "here")    
+	(let loop ((inl (read-line iport)))
+	  (if (not (or (or (eof-object? inl)
+		       (equal? inl "exit")) (port-closed? iport)))
+	      (let* ((parts (string-split inl))
+		     (cmd   (if (null? parts) #f (car parts))))
+		(if (and (not cmd) (not (port-closed? iport)))
+		    (loop (read-line))
+		    (case (string->symbol cmd)
+		      ((cd)
+		       (if (> (length parts) 1) ;; have a parameter
+                           (begin
+                             (let*((arg (cadr parts))
+                                   (resolved-path (sauth-common:resolve-path  arg path top-areas))
+                                   (target-path (sauth-common:get-target-path path  arg top-areas base-path)))
+                                 (if (not (equal? target-path #f))
+                                 (if (or (equal? resolved-path #f) (not (file-exists? target-path)))    
+                                 (print "Invalid argument " arg ".. ")
+                                  (begin      
+			            (set! path resolved-path)
+                                     (sauthorize:do-as-calling-user
+                              (lambda ()
+			    (run-cmd (conc *sauth-path* "/sauthorize") (list "register-log" (conc "\"" inl "\"") (number->string (car user-obj))  (number->string (caddr area-obj))  "cd"))))
+                                  )))))  
+   			   (set! path '())))
+                      ((pwd)
+                         (if (null? path)
+                           (print "/")  
+                           (print "/" (string-join path "/")))) 
+		      ((ls)
+		       (let* ((thepath (if (> (length parts) 1) ;; have a parameter
+					   (cdr parts)
+					   `()))
+			      (plen    (length thepath)))
+                         (cond
+			  ((null? thepath)
+                           (sauth-common:shell-ls-cmd path "" top-areas base-path  '())
+                            (sauthorize:do-as-calling-user
+                              (lambda ()
+			    (run-cmd (conc *sauth-path* "/sauthorize") (list "register-log" (conc "\"" inl "\"") (number->string (car user-obj))  (number->string (caddr area-obj))  "ls"))))   )
+			  ((< plen 2)
+                            (sauth-common:shell-ls-cmd path  (car thepath) top-areas base-path '())
+                              (sauthorize:do-as-calling-user
+                              (lambda ()
+			    (run-cmd (conc *sauth-path* "/sauthorize") (list "register-log" (conc "\"" inl "\"") (number->string (car user-obj))  (number->string (caddr area-obj))  "ls")))))
+                          (else 
+                            (if (equal? (car thepath) "|")
+                              (sauth-common:shell-ls-cmd path "" top-areas base-path thepath)
+                              (sauth-common:shell-ls-cmd path  (car thepath) top-areas base-path (cdr thepath)))
+                           (sauthorize:do-as-calling-user
+                              (lambda ()
+			    (run-cmd (conc *sauth-path* "/sauthorize") (list "register-log" (conc "\"" inl "\"") (number->string (car user-obj))  (number->string (caddr area-obj))  "ls"))))))))
+                       ((mkdir)
+                         (let* ((thepath (if (> (length parts) 1) ;; have a parameter
+				   (cdr parts)
+				   `()))
+			      (plen    (length thepath)))
+                         (cond
+                          ((null? thepath)
+                            (print "mkdir takes one argument"))
+                          ((< plen 2) 
+                            (let*((mk-path (cadr parts))
+                                  (resolved-path (sauth-common:resolve-path  mk-path path top-areas))
+                                  (target-path (sauth-common:get-target-path path  mk-path top-areas base-path)))
+                              (if (not (equal? target-path #f))
+                                 (if (equal? resolved-path #f)     
+                                 (print "Invalid argument " mk-path ".. ")
+                                  (begin 
+                                       (print "here")
+                                      (spublish:shell-mkdir target-path)   
+                                      (sauthorize:do-as-calling-user
+                              (lambda ()
+			    (run-cmd (conc *sauth-path* "/sauthorize") (list "register-log" (conc "\"" inl "\"") (number->string (car user-obj))  (number->string (caddr area-obj))  "mkdir")))))))
+		       )))))
+                       ((rm)
+                          (let* ((thepath (if (> (length parts) 1) ;; have a parameter
+				   (cdr parts)
+				   `()))
+			      (plen    (length thepath)))
+                         (cond
+                          ((null? thepath)
+                            (print "rm takes one argument"))
+                          ((< plen 2) 
+                            (let*((rm-path (cadr parts))
+                                  (resolved-path (sauth-common:resolve-path  rm-path path top-areas))
+                                  (target-path (sauth-common:get-target-path path  rm-path top-areas base-path)))
+                              (if (not (equal? target-path #f))
+                                 (if (equal? resolved-path #f)     
+                                 (print "Invalid argument " rm-path ".. ")
+                                  (begin 
+                                      (spublish:shell-rm target-path iport)   
+                                      (sauthorize:do-as-calling-user
+                              (lambda ()
+			    (run-cmd (conc *sauth-path* "/sauthorize") (list "register-log" (conc "\"" inl "\"") (number->string (car user-obj))  (number->string (caddr area-obj))  "rm")))))))
+		       )))))
+
+                      ((cp publish)
+                          (let* ((thepath (if (> (length parts) 1) ;; have a parameter
+				   (cdr parts)
+				   `()))
+			      (plen    (length thepath)))
+                         (cond
+                          ((or (null? thepath) (< plen 2)) 
+                            (print "cp takes two argument"))
+                          ((< plen 3) 
+                            (let*((src-path (car thepath))
+                                  (dest-path (cadr thepath))   
+                                  (resolved-path (sauth-common:resolve-path  dest-path path top-areas))
+                                  (target-path (sauth-common:get-target-path path  dest-path top-areas base-path)))
+                              (if (not (equal? target-path #f))
+                                 (if (equal? resolved-path #f)     
+                                 (print "Invalid argument " dest-path ".. ")
+                                  (begin 
+                                      (spublish:shell-cp src-path target-path)   
+                                      (sauthorize:do-as-calling-user
+                              (lambda ()
+			    (run-cmd (conc *sauth-path* "/sauthorize") (list "register-log" (conc "\"" inl "\"") (number->string (car user-obj))  (number->string (caddr area-obj))  "cp")))))))
+		       )))))
+                      ((ln)
+                           (let* ((thepath (if (> (length parts) 1) ;; have a parameter
+				   (cdr parts)
+				   `()))
+			      (plen    (length thepath)))
+                         (cond
+                          ((or (null? thepath) (< plen 2)) 
+                            (print "ln takes two argument"))
+                          ((< plen 3) 
+                            (let*((src-path (car thepath))
+                                  (dest-path (cadr thepath))   
+                                  (resolved-path (sauth-common:resolve-path  dest-path path top-areas))
+                                  (target-path (sauth-common:get-target-path path  dest-path top-areas base-path))
+                                  (sub-path (conc "/" (string-reverse (string-join (cdr (string-split (string-reverse  target-path) "/")) "/")))))
+                              (if (not (equal? target-path #f))
+                                 (if (equal? resolved-path #f)     
+                                 (print "Invalid argument " dest-path ".. ")
+                                  (begin 
+                                      (spublish:shell-ln src-path target-path sub-path)   
+                                      (sauthorize:do-as-calling-user
+                              (lambda ()
+			    (run-cmd (conc *sauth-path* "/sauthorize") (list "register-log" (conc "\"" inl "\"") (number->string (car user-obj))  (number->string (caddr area-obj))  "ln")))))))
+		       )))))  
+                      ((exit)
+                          (print "got exit"))  
+                      ((help)
+                          (print (spublish:shell-help)))
+		      (else 
+		       (print "Got command: " inl))))
+                 (loop (read-line iport)))))))
+
 
 ;;======================================================================
 ;; MAIN
 ;;======================================================================
 
-(define (spublish:load-config exe-dir exe-name)
-  (let* ((fname   (conc exe-dir "/." exe-name ".config")))
+;(define (spublish:load-config exe-dir exe-name)
+;  (let* ((fname   (conc exe-dir "/." exe-name ".config")))
     ;; (ini:property-separator-patt " *  *")
     ;; (ini:property-separator #\space)
-    (if (file-exists? fname)
-	;; (ini:read-ini fname)
-	(read-config fname #f #t)
-	(make-hash-table))))
-
-(define (spublish:process-action configdat action . args)
-  (let* ((target-dir    (configf:lookup configdat "settings" "target-dir"))
-	 (user          (current-user-name))
-	 (allowed-users (string-split
-			 (or (configf:lookup configdat "settings" "allowed-users")
-			     ""))))
-    (if (not target-dir)
-	(begin
-	  (print "[settings]\ntarget-dir /some/path\n\n Is MISSING from the config file!")
-	  (exit)))
-    (if (null? allowed-users)
-	(begin
-	  (print "[setings]\nallowed-users user1 user2 ...\n\n Is MISSING from the config file!")
-	  (exit)))
-    (if (not (member user allowed-users))
-	(begin
-	  (print "User \"" (current-user-name) "\" does not have access. Exiting")
-	  (exit 1)))
+;    (if (file-exists? fname)
+;	;; (ini:read-ini fname)
+;	(read-config fname #f #t)
+;	(make-hash-table))))
+
+(define (spublish:process-action action . args)
+  ;(print args)
+  (let* ((usr          (current-user-name))
+         (user-obj (get-user usr)) 
+         (area   (car args))
+         (area-obj  (get-obj-by-code area))
+         (top-areas (spublish:get-accessable-projects area))  
+         (base-path (if (null? area-obj) 
+                         "" 
+                        (caddr (cdr area-obj))))   
+         (remargs (cdr args)))
+     (if (null? area-obj)
+          (begin 
+             (print "Area " area " does not exist")
+          (exit 1)))
     (case (string->symbol action)
       ((cp publish)
-       (if (< (length args) 2)
+       (if (< (length remargs) 2)
 	   (begin 
-	     (print "ERROR: Missing arguments; " (string-intersperse args ", "))
+	     (print "ERROR: Missing arguments; spublish   " )
 	     (exit 1)))
-       (let* ((remargs     (args:get-args args '("-m") '() args:arg-hash 0))
-              (dest-dir (cadr args))
-              (src-path-in (car args))
+       (let* ((filter-args     (args:get-args args '("-m") '() args:arg-hash 0))
+              (src-path-in (car filter-args))
+              (dest-path (cadr filter-args))
 	      (src-path    (with-input-from-pipe
 			    (conc "readlink -f " src-path-in)
 			    (lambda ()
 			      (read-line))))
 	      (msg         (or (args:get-arg "-m") ""))
-	      (targ-file   (pathname-strip-directory src-path)))
-	 (if (not (file-read-access? src-path))
-	     (begin
-	       (print "ERROR: source file not readable: " src-path)
-	       (exit 1)))
-	 (if (directory? src-path)
-	     (begin
-              (print "ERROR: source file is a directory, this is not supported yet.")
-	       (exit 1)))
-	     (print "publishing " src-path-in " to " target-dir)
-             (spublish:validate     target-dir dest-dir)
-	     (spublish:cp configdat user src-path target-dir targ-file dest-dir msg)))
-      ((tar)
-        (if (< (length args) 1)
-          (begin 
-	     (print "ERROR: Missing arguments; " (string-intersperse args ", "))
-	     (exit 1)))
-        (let* ((dst-dir (car args))
-               (msg         (or (args:get-arg "-m") "")))
-               (spublish:validate     target-dir  dst-dir)
-               (spublish:tar configdat user target-dir dst-dir msg)))
- 
-      ((mkdir)
-        (if (< (length args) 1)
-          (begin 
-	     (print "ERROR: Missing arguments; " (string-intersperse args ", "))
-	     (exit 1)))
-        (let* ((targ-mk (car args))
-               (msg         (or (args:get-arg "-m") ""))) 
-               (print "attempting to create directory " targ-mk " in " target-dir)
-               (spublish:validate     target-dir targ-mk)
-               (spublish:mkdir configdat user target-dir targ-mk msg)))
-
-      ((ln) 
-        (if (< (length args) 2)
-          (begin 
-	     (print "ERROR: Missing arguments; " (string-intersperse args ", "))
-	     (exit 1)))
-        (let* ((targ-link (car args))
-               (link-name (cadr args))  
-               (sub-path (string-reverse (string-join (cdr (string-split (string-reverse link-name) "/")) "/"))) 
-               (msg         (or (args:get-arg "-m") "")))
-               (if (> (string-length(string-trim sub-path)) 0)
-                (begin 
-                  (print "attempting to create directory " sub-path " in " target-dir)
-                  (spublish:validate     target-dir sub-path)
-                  (print (conc target-dir "/" sub-path ) )
-                  (print (directory-exists?(conc target-dir "/" sub-path )))
-                  (if (directory-exists?(conc target-dir "/" sub-path ))
-                   (print "Target Directory " (conc target-dir sub-path ) " exist!!")
-                  (spublish:mkdir configdat user target-dir sub-path msg))))
-
-               (print "attempting to create link " link-name " in " target-dir)
-               (spublish:ln configdat user target-dir targ-link link-name msg)))
-
+              (resolved-path (sauth-common:resolve-path  (conc area "/" dest-path) `() top-areas))
+              (target-path (sauth-common:get-target-path `()  (conc area "/" dest-path) top-areas base-path)))
+ 	     (if (not (equal? target-path #f))
+                 (if (equal? resolved-path #f)     
+                    (print "Invalid argument " dest-path ".. ")
+                    (begin 
+                      (spublish:shell-cp src-path target-path)   
+                      (sauthorize:do-as-calling-user
+                      (lambda ()
+		        (run-cmd (conc *sauth-path* "/sauthorize") (list "register-log" (conc "\" cp " src-path-in " " dest-path  "\"") (number->string (car user-obj))  (number->string (caddr area-obj))  "cp")))))))))   
+      ((mkdir)
+        (if (< (length remargs) 1)
+          (begin 
+	     (print "ERROR: Missing arguments;  ")
+	     (exit 1)))
+        (let* ((filter-args     (args:get-args args '("-m") '() args:arg-hash 0))
+               (mk-path (car filter-args))
+               (msg         (or (args:get-arg "-m") ""))
+               (resolved-path (sauth-common:resolve-path  mk-path (list area) top-areas))
+               (target-path (sauth-common:get-target-path (list area)  mk-path top-areas base-path))) 
+               (print "attempting to create directory " mk-path  )
+               (if (not (equal? target-path #f))
+                 (if (equal? resolved-path #f)     
+                   (print "Invalid argument " mk-path ".. ")
+                   (begin 
+                     (spublish:shell-mkdir target-path)   
+                     (sauthorize:do-as-calling-user
+                       (lambda ()
+		        (run-cmd (conc *sauth-path* "/sauthorize") (list "register-log" (conc "\" mkdir " mk-path  "\"") (number->string (car user-obj))  (number->string (caddr area-obj))  "mkdir")))))))))  
+      ((ln) 
+        (if (< (length remargs) 2)
+          (begin 
+	     (print "ERROR: Missing arguments;    " )
+	     (exit 1)))
+        (let* ((filter-args     (args:get-args args '("-m") '() args:arg-hash 0))
+              (src-path (car filter-args))
+              (dest-path (cadr filter-args))   
+              (resolved-path (sauth-common:resolve-path  dest-path (list area) top-areas))
+              (target-path (sauth-common:get-target-path  (list area)  dest-path top-areas base-path))
+              (sub-path (conc "/" (string-reverse (string-join (cdr (string-split (string-reverse  target-path) "/")) "/")))))
+               (if (not (equal? target-path #f))
+                  (if (equal? resolved-path #f)     
+                    (print "Invalid argument " dest-path ".. ")
+                    (begin 
+                   (spublish:shell-ln src-path target-path sub-path)   
+                  (sauthorize:do-as-calling-user
+                 (lambda ()
+		   (run-cmd (conc *sauth-path* "/sauthorize") (list "register-log" (conc "\" ln " src-path " " dest-path  "\"") (number->string (car user-obj))  (number->string (caddr area-obj))  "ln")))))))))
       ((rm)
-       (if (< (length args) 1)
+       (if (< (length remargs) 1)
 	   (begin 
-	     (print "ERROR: Missing arguments; " (string-intersperse args ", "))
+	     (print "ERROR: Missing arguments;   ")
 	     (exit 1)))
-       (let* ((targ-file (car args))
-	      (msg         (or (args:get-arg "-m") "")))
-	 (print "attempting to remove " targ-file " from " target-dir)
-           (spublish:validate     target-dir targ-file)
-
-	 (spublish:rm configdat user target-dir targ-file msg)))
-      ((publish)
-       (if (< (length args) 3)
-	   (begin 
-	     (print "ERROR: Missing arguments; " (string-intersperse args ", "))
+       (let* ((filter-args  (args:get-args args '("-m") '() args:arg-hash 0))
+              (rm-path (car filter-args))
+              (resolved-path (sauth-common:resolve-path  rm-path (list area) top-areas))
+               (prompt    ">")
+              (iport     (make-readline-port prompt))
+              (target-path (sauth-common:get-target-path (list area)  rm-path top-areas base-path)))
+	       (if (not (equal? target-path #f))
+                                 (if (equal? resolved-path #f)     
+                                 (print "Invalid argument " rm-path ".. ")
+                                  (begin 
+                                      (spublish:shell-rm target-path iport)   
+                                      (sauthorize:do-as-calling-user
+                              (lambda ()
+			    (run-cmd (conc *sauth-path* "/sauthorize") (list "register-log" (conc "\" rm " rm-path "\"") (number->string (car user-obj))  (number->string (caddr area-obj))  "rm")))))))))
+      ((shell)
+          (if (< (length args) 1)
+             (begin 
+	     (print  "ERROR: Missing arguments area!!" )
 	     (exit 1))
-	   (let* ((srcpath  (list-ref args 0))
-		  (areaname (list-ref args 1))
-		  (version  (list-ref args 2))
-		  (remargs  (args:get-args (drop args 2)
-					   '("-type" ;; link or copy (default is copy)
-					     "-m")
-					   '()
-					   args:arg-hash
-					   0))
-		  (publish-type (if (equal? (args:get-arg "-type") "link") 'link 'copy))
-		  (comment      (or (args:get-arg "-m") ""))
-		  (submitter    (current-user-name))
-		  (quality      (args:get-arg "-quality"))
-		  (publish-res  (spublish:publish configdat publish-type areaname version comment srcpath submitter quality)))
-	     (if (not (car publish-res))
-		 (begin
-		   (print "ERROR: " (cdr publish-res))
-		   (exit 1))))))
-      ((list-versions)
-       (let ((area-name (car args)) ;;      version patt   full print
-	     (remargs   (args:get-args args '("-vpatt") '("-full") args:arg-hash 0))
-	     (db        (spublish:open-db configdat))
-	     (versions  (spublish:get-versions-for-area db (car args) version-patt: (args:get-arg "-vpatt"))))
-	 ;; (print "area-name=" area-name " args=" args " *args-hash*=" (hash-table->alist *args-hash*))
-	 (map (lambda (x)
-		(if (args:get-arg "-full")
-		    (format #t 
-			    "~10a~10a~4a~27a~30a\n"
-			    (vector-ref x 0)
-			    (vector-ref x 1) 
-			    (vector-ref x 2) 
-			    (conc "\"" (time->string (seconds->local-time (vector-ref x 3))) "\"")
-			    (conc "\"" (vector-ref x 4) "\""))
-		    (print (vector-ref x 0))))
-	      versions)))
+             (spublish:shell area))) 
       (else (print "Unrecognised command " action)))))
   
 ;; ease debugging by loading ~/.dashboardrc - REMOVE FROM PRODUCTION!
 ;; (let ((debugcontrolf (conc (get-environment-variable "HOME") "/.spublishrc")))
 ;;   (if (file-exists? debugcontrolf)
@@ -506,37 +796,21 @@
 
 (define (main)
   (let* ((args      (argv))
 	 (prog      (car args))
 	 (rema      (cdr args))
-	 (exe-name  (pathname-file (car (argv))))
-	 (exe-dir   (or (pathname-directory prog)
-			(spublish:find exe-name (string-split (get-environment-variable "PATH") ":"))))
-	 (configdat (spublish:load-config exe-dir exe-name)))
+	 (exe-name  (pathname-file (car (argv)))))
     (cond
      ;; one-word commands
      ((eq? (length rema) 1)
       (case (string->symbol (car rema))
 	((help -h -help --h --help)
 	 (print spublish:help))
-	((list-vars) ;; print out the ini file
-	 (map print (spublish:get-areas configdat)))
-	((ls)
-	 (let ((target-dir (configf:lookup configdat "settings" "target-dir")))
-	   (print "Files in " target-dir)
-	   (system (conc "ls " target-dir))))
-	((log)
-	 (spublish:db-do configdat (lambda (db)
-				     (print "Listing actions")
-				     (query (for-each-row
-					     (lambda (row)
-					       (apply print (intersperse row " | "))))
-					    (sql db "SELECT * FROM actions")))))
 	(else
 	 (print "ERROR: Unrecognised command. Try \"spublish help\""))))
      ;; multi-word commands
      ((null? rema)(print spublish:help))
      ((>= (length rema) 2)
-      (apply spublish:process-action configdat (car rema)(cdr rema)))
+      (apply spublish:process-action (car rema)(cdr rema)))
      (else (print "ERROR: Unrecognised command2. Try \"spublish help\"")))))
 
 (main)

Index: sretrieve.scm
==================================================================
--- sretrieve.scm
+++ sretrieve.scm
@@ -1,49 +1,45 @@
 
 ;; Copyright 2006-2013, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
 
 (use defstruct)
-
-;; (use ssax)
-;; (use sxml-serializer)
-;; (use sxml-modifications)
-;; (use regex)
-;; (use srfi-69)
-;; (use regex-case)
-;; (use posix)
-;; (use json)
-;; (use csv)
-;; (use directory-utils)
+(use scsh-process)
 (use srfi-18)
-(use format)
-
-;; (require-library ini-file)
-;; (import (prefix ini-file ini:))
-
+(use srfi-19)
+(use refdb)
 (use sql-de-lite srfi-1 posix regex regex-case srfi-69)
-;; (import (prefix sqlite3 sqlite3:))
-;; 
-(declare (uses configf))
-;; (declare (uses tree))
+;(declare (uses common))
+;(declare (uses configf))
 (declare (uses margs))
-;; (declare (uses dcommon))
-;; (declare (uses launch))
-;; (declare (uses gutils))
-;; (declare (uses db))
-;; (declare (uses synchash))
-;; (declare (uses server))
-(declare (uses megatest-version))
-;; (declare (uses tbd))
-
+
+(include "megatest-version.scm")
 (include "megatest-fossil-hash.scm")
+;;; please create this file before using sautherise. For sample file is avaliable sample-sauth-paths.scm. 
+(include "sauth-paths.scm")
+(include "sauth-common.scm")
+
+(define (toplevel-command . args) #f)
+(use readline)
+
+
+
 
 ;;
 ;; GLOBALS
 ;;
 (define *verbosity* 1)
@@ -51,16 +47,14 @@
 (define *exe-name* (pathname-file (car (argv))))
 (define *sretrieve:current-tab-number* 0)
 (define *args-hash* (make-hash-table))
 (define sretrieve:help (conc "Usage: " *exe-name* " [action [params ...]]
 
-  ls                     : list contents of target area
-  get        : retrieve data for release 
-    -m \"message\"       : why retrieved?
-  cp      : copy file to current directory 
-  log                    : get listing of recent downloads
-  shell                  : start a shell-like interface
+  ls                           : list contents of target area
+  get           : retrieve path to the data within 
+     -m \"message\"       : why retrieved?
+  shell                     : start a shell-like interface
 
 Part of the Megatest tool suite.
 Learn more at http://www.kiatoa.com/fossils/megatest
 
 Version: " megatest-fossil-hash)) ;; "
@@ -72,320 +66,214 @@
 ;;======================================================================
 ;; DB
 ;;======================================================================
 
 ;; replace (strftime('%s','now')), with datetime('now'))
-(define (sretrieve:initialize-db db)
-  (for-each
-   (lambda (qry)
-     (exec (sql db qry)))
-   (list 
-    "CREATE TABLE IF NOT EXISTS actions
-         (id           INTEGER PRIMARY KEY,
-          action       TEXT NOT NULL,
-          retriever    TEXT NOT NULL,
-          datetime     TIMESTAMP DEFAULT (datetime('now','localtime')),
-          srcpath      TEXT NOT NULL,
-          comment      TEXT DEFAULT '' NOT NULL,
-          state        TEXT DEFAULT 'new');"
-    "CREATE TABLE IF NOT EXISTS bundles
-         (id           INTEGER PRIMARY KEY,
-          bundle       TEXT NOT NULL,
-          release      TEXT NOT NULL,
-          status       TEXT NOT NULL,
-          event_date   TEXT NOT NULL);"
-    )))
-
-(define (sretrieve:register-action db action submitter source-path comment)
-  (print "(sretrieve:register-action db " db " action " action " submitter " submitter " source-path " source-path " comment " comment)
-  (exec (sql db "INSERT INTO actions (action,retriever,srcpath,comment)
-                 VALUES(?,?,?,?)")
-	action
-	submitter
-	source-path
-	(or comment "")))
+;(define (sretrieve:initialize-db db)
+;  (for-each
+;   (lambda (qry)
+;     (exec (sql db qry)))
+;   (list 
+;    "CREATE TABLE IF NOT EXISTS actions
+;         (id           INTEGER PRIMARY KEY,
+;          action       TEXT NOT NULL,
+;          retriever    TEXT NOT NULL,
+;          datetime     TIMESTAMP DEFAULT (datetime('now','localtime')),
+;          srcpath      TEXT NOT NULL,
+;          comment      TEXT DEFAULT '' NOT NULL,
+;          state        TEXT DEFAULT 'new');"
+;    "CREATE TABLE IF NOT EXISTS bundles
+;         (id           INTEGER PRIMARY KEY,
+;          bundle       TEXT NOT NULL,
+;          release      TEXT NOT NULL,
+;          status       TEXT NOT NULL,
+;          event_date   TEXT NOT NULL);"
+;    )))
+;
+;(define (sretrieve:register-action db action submitter source-path comment)
+; ; (print "(sretrieve:register-action db " db " action " action " submitter " submitter " source-path " source-path " comment " comment)
+;  (exec (sql db "INSERT INTO actions (action,retriever,srcpath,comment)
+;                 VALUES(?,?,?,?)")
+;	action
+;	submitter
+;	source-path
+;	(or comment "")))
 
 ;; (call-with-database
 ;;  (lambda (db)
 ;;   (set-busy-handler! db (busy-timeout 10000)) ; 10 second timeout
 ;;   ...))
 
 ;; Create the sqlite db
-(define (sretrieve:db-do configdat proc) 
-
-  (let ((path (configf:lookup configdat "database" "location")))
-    (if (not path)
-	(begin
-	  (debug:print 0 *default-log-port* "[database]\nlocation /some/path\n\n Is missing from the config file!")
-	  (exit 1)))
-    (if (and path
-	     (directory? path)
-	     (file-read-access? path))
-	(let* ((dbpath    (conc path "/" *exe-name* ".db"))
-	       (writeable (file-write-access? dbpath))
-	       (dbexists  (file-exists? dbpath)))
-	  (handle-exceptions
-	   exn
-	   (begin
-	     (debug:print 2 *default-log-port* "ERROR: problem accessing db " dbpath
-			  ((condition-property-accessor 'exn 'message) exn))
-	     (exit 1))
-            ;;(debug:print 0 *default-log-port* "calling proc " proc "db path " dbpath )
-	   (call-with-database
-            dbpath
-	    (lambda (db)
-	       ;;(debug:print 0 *default-log-port* "calling proc " proc " on db " db)
-	      (set-busy-handler! db (busy-timeout 10000)) ;; 10 sec timeout
-	      (if (not dbexists)(sretrieve:initialize-db db))
-	      (proc db)))))
-	(debug:print-error 0 *default-log-port* "invalid path for storing database: " path))))
+;(define (sretrieve:db-do configdat proc) 
+;  (let ((path (configf:lookup configdat "database" "location")))
+;    (if (not path)
+;	(begin
+;	  (debug:print 0 "[database]\nlocation /some/path\n\n Is missing from the config file!")
+;	  (exit 1)))
+;    (if (and path
+;	     (directory? path)
+;	     (file-read-access? path))
+;	(let* ((dbpath    (conc path "/" *exe-name* ".db"))
+;	       (writeable (file-write-access? dbpath))
+;	       (dbexists  (file-exists? dbpath)))
+;	  (handle-exceptions
+;	   exn
+;	   (begin
+;	     (debug:print 2 "ERROR: problem accessing db " dbpath
+;			  ((condition-property-accessor 'exn 'message) exn))
+;	     (exit 1))
+;            ;;(debug:print 0 "calling proc " proc "db path " dbpath )
+;	   (call-with-database
+;            dbpath
+;	    (lambda (db)
+;	       ;;(debug:print 0 "calling proc " proc " on db " db)
+;	      (set-busy-handler! db (busy-timeout 10000)) ;; 10 sec timeout
+;	      (if (not dbexists)(sretrieve:initialize-db db))
+;	      (proc db)))))
+;	(debug:print 0 "ERROR: invalid path for storing database: " path))))
 
 ;; copy in directory to dest, validation is done BEFORE calling this
 ;;
-(define (sretrieve:get configdat retriever version comment)
-  (let* ((base-dir  (configf:lookup configdat "settings" "base-dir"))
-	 (datadir   (conc base-dir "/" version)))
-    (if (or (not base-dir)
-	    (not (file-exists? base-dir)))
-	(begin
-	  (debug:print-error 0 *default-log-port* "Bad configuration! base-dir " base-dir " not found")
-	  (exit 1)))
-    (print datadir)
-    (if (not (file-exists? datadir))
-	(begin
-	  (debug:print-error 0 *default-log-port* "Bad version (" version "), no data found at " datadir "." )
-	  (exit 1)))
-    
-    (sretrieve:db-do
-     configdat
-     (lambda (db)
-       (sretrieve:register-action db "get" retriever datadir comment)))
-      (sretrieve:do-as-calling-user
-       (lambda ()
-         (if (directory? datadir)
-	   (begin
-  	    (change-directory datadir)
-	    (let ((files (filter (lambda (x)
-				(not (member x '("." ".."))))
-			      (glob "*" ".*"))))
-	     (print "files: " files)
-	     (process-execute "/bin/tar" (append (append (list  "chfv" "-") files) (list "--ignore-failed-read")))))
-             (begin
-               (let* ((parent-dir (pathname-directory datadir) )
-                      (filename  (conc(pathname-file datadir) "." (pathname-extension datadir))))
-                  (change-directory parent-dir)  
-                  (process-execute "/bin/tar" (list "chfv" "-" filename))
-             )))
-))
-))
-
-
-;; copy in file to dest, validation is done BEFORE calling this
-;;
-(define (sretrieve:cp configdat retriever file comment)
-  (let* ((base-dir  (configf:lookup configdat "settings" "base-dir"))
-         (allowed-sub-paths (configf:lookup configdat "settings" "allowed-sub-paths"))    
-	 (datadir   (conc base-dir "/" file))
-         (filename  (conc(pathname-file datadir) "." (pathname-extension datadir))))
-    (if (or (not base-dir)
-	    (not (file-exists? base-dir)))
-	(begin
-	  (debug:print-error 0 *default-log-port* "Bad configuration! base-dir " base-dir " not found")
-	  (exit 1)))
-    (print datadir)
-    (if (not (file-exists? datadir))
-	(begin
-	  (debug:print-error 0 *default-log-port* "File  (" file "), not found at " base-dir "." )
-	  (exit 1)))
-    (if (directory? datadir)
-	(begin
-	  (debug:print-error 0 *default-log-port* "(" file ") is a dirctory!! cp cmd works only on files ." )
-	  (exit 1)))
-    (if(not (string-match (regexp  allowed-sub-paths) file))
-        (begin
-	  (debug:print-error 0 *default-log-port* "Access denied to file (" file ")!! " )
-	  (exit 1)))
-     
-     (sretrieve:db-do
-     configdat
-     (lambda (db)
-       (sretrieve:register-action db "cp" retriever datadir comment)))
-      (sretrieve:do-as-calling-user
-      ;;  (debug:print 0 *default-log-port* "ph:  "(pathname-directory datadir)  "!! " )
-       (change-directory (pathname-directory datadir))  
-       ;;(debug:print 0 *default-log-port* "ph: /bin/tar" (list "chfv" "-" filename) )
-      (process-execute "/bin/tar" (list "chfv" "-" filename)))
-      ))
-
-;; ls in file to dest, validation is done BEFORE calling this
-;;
-(define (sretrieve:ls configdat retriever file comment)
-  (let* ((base-dir  (configf:lookup configdat "settings" "base-dir"))
-         (allowed-sub-paths (configf:lookup configdat "settings" "allowed-sub-paths"))    
-	 (datadir   (conc base-dir "/" file))
-         (filename  (conc(pathname-file datadir) "." (pathname-extension datadir))))
-    (if (or (not base-dir)
-	    (not (file-exists? base-dir)))
-	(begin
-	  (debug:print-error 0 *default-log-port* "Bad configuration! base-dir " base-dir " not found")
-	  (exit 1)))
-    (print datadir)
-    (if (not (file-exists? datadir))
-	(begin
-	  (debug:print-error 0 *default-log-port* "File  (" file "), not found at " base-dir "." )
-	  (exit 1)))
-      (if(not (string-match (regexp  allowed-sub-paths) file))
-        (begin
-	  (debug:print-error 0 *default-log-port* "Access denied to file (" file ")!! " )
-	  (exit 1)))
-   
-        (sretrieve:do-as-calling-user
-        (lambda ()
-	 ;;(change-directory datadir)
-         ;; (debug:print 0 *default-log-port*  "/usr/bin/find" (list datadir "-ls" "|" "grep" "-E" "'"allowed-file-patt"'"))
-         ;; (status (with-input-from-pipe "find " datadir " -ls | grep -E '" allowed-file-patt "'" (lambda () (read-line))))
-         ;; (debug:print 0 *default-log-port* status) 
-	  (process-execute "/bin/ls" (list "-ls"  "-lrt" datadir ))
- ))))
-
-
-
-;;(filter (lambda (x)
-;;							     (not (member x '("." ".."))))
-;;							   (glob "*" ".*"))))))))
+;(define (sretrieve:get configdat retriever version comment)
+;  (let* ((base-dir  (configf:lookup configdat "settings" "base-dir"))
+;	 (datadir   (conc base-dir "/" version)))
+;    (if (or (not base-dir)
+;	    (not (file-exists? base-dir)))
+;	(begin
+;	  (debug:print 0 "ERROR: Bad configuration! base-dir " base-dir " not found")
+;	  (exit 1)))
+;    (print datadir)
+;    (if (not (file-exists? datadir))
+;	(begin
+;	  (debug:print 0 "ERROR: Bad version (" version "), no data found at " datadir "." )
+;	  (exit 1)))
+;    
+;    (sretrieve:db-do
+;     configdat
+;     (lambda (db)
+;       (sretrieve:register-action db "get" retriever datadir comment)))
+;      (sretrieve:do-as-calling-user
+;       (lambda ()
+;         (if (directory? datadir)
+;	   (begin
+;  	    (change-directory datadir)
+;	    (let ((files (filter (lambda (x)
+;				(not (member x '("." ".."))))
+;			      (glob "*" ".*"))))
+;	     (print "files: " files)
+;	     (process-execute "/bin/tar" (append (append (list  "chfv" "-") files) (list "--ignore-failed-read")))))
+;             (begin
+;               (let* ((parent-dir (pathname-directory datadir) )
+;                      (filename  (conc(pathname-file datadir) "." (pathname-extension datadir))))
+;                  (change-directory parent-dir)  
+;                  (process-execute "/bin/tar" (list "chfv" "-" filename))
+;             )))
+;))))
+;
+;
+;;; copy in file to dest, validation is done BEFORE calling this
+;;;
+;(define (sretrieve:cp configdat retriever file comment)
+;  (let* ((base-dir  (configf:lookup configdat "settings" "base-dir"))
+;         (allowed-sub-paths (configf:lookup configdat "settings" "allowed-sub-paths"))    
+;	 (datadir   (conc base-dir "/" file))
+;         (filename  (conc(pathname-file datadir) "." (pathname-extension datadir))))
+;    (if (or (not base-dir)
+;	    (not (file-exists? base-dir)))
+;	(begin
+;	  (debug:print 0 "ERROR: Bad configuration! base-dir " base-dir " not found")
+;	  (exit 1)))
+;    (print datadir)
+;    (if (not (file-exists? datadir))
+;	(begin
+;	  (debug:print 0 "ERROR: File  (" file "), not found at " base-dir "." )
+;	  (exit 1)))
+;    (if (directory? datadir)
+;	(begin
+;	  (debug:print 0 "ERROR: (" file ") is a dirctory!! cp cmd works only on files ." )
+;	  (exit 1)))
+;    (if(not (string-match (regexp  allowed-sub-paths) file))
+;        (begin
+;	  (debug:print 0 "ERROR: Access denied to file (" file ")!! " )
+;	  (exit 1)))
+;     
+;     (sretrieve:db-do
+;     configdat
+;     (lambda (db)
+;       (sretrieve:register-action db "cp" retriever datadir comment)))
+;      (sretrieve:do-as-calling-user
+;      ;;  (debug:print 0 "ph:  "(pathname-directory datadir)  "!! " )
+;       (change-directory (pathname-directory datadir))  
+;       ;;(debug:print 0 "ph: /bin/tar" (list "chfv" "-" filename) )
+;      (process-execute "/bin/tar" (list "chfv" "-" filename)))
+;      ))
+;
+;;; ls in file to dest, validation is done BEFORE calling this
+;;;
+;(define (sretrieve:ls configdat retriever file comment)
+;  (let* ((base-dir  (configf:lookup configdat "settings" "base-dir"))
+;         (allowed-sub-paths (configf:lookup configdat "settings" "allowed-sub-paths"))    
+;	 (datadir   (conc base-dir "/" file))
+;         (filename  (conc(pathname-file datadir) "." (pathname-extension datadir))))
+;    (if (or (not base-dir)
+;	    (not (file-exists? base-dir)))
+;	(begin
+;	  (debug:print 0 "ERROR: Bad configuration! base-dir " base-dir " not found")
+;	  (exit 1)))
+;    (print datadir)
+;    (if (not (file-exists? datadir))
+;	(begin
+;	  (debug:print 0 "ERROR: File  (" file "), not found at " base-dir "." )
+;	  (exit 1)))
+;      (if(not (string-match (regexp  allowed-sub-paths) file))
+;        (begin
+;	  (debug:print 0 "ERROR: Access denied to file (" file ")!! " )
+;	  (exit 1)))
+;   
+;        (sretrieve:do-as-calling-user
+;        (lambda ()
+;	  (process-execute "/bin/ls" (list "-ls"  "-lrt" datadir ))
+; ))))
+
+
 
 (define (sretrieve:validate target-dir targ-mk)
   (let* ((normal-path (normalize-pathname targ-mk))
         (targ-path (conc target-dir "/" normal-path)))
     (if (string-contains   normal-path "..")
     (begin
-      (debug:print-error 0 *default-log-port* "Path  " targ-mk " resolved outside target area "  target-dir )
+      (debug:print 0 "ERROR: Path  " targ-mk " resolved outside target area "  target-dir )
       (exit 1)))
 
     (if (not (string-contains targ-path target-dir))
     (begin
-      (debug:print-error 0 *default-log-port* "You cannot update data outside " target-dir ".")
+      (debug:print 0 "ERROR: You cannot update data outside " target-dir ".")
       (exit 1)))
-    (debug:print 0 *default-log-port* "Path " targ-mk " is valid.")   
+    (debug:print 0 "Path " targ-mk " is valid.")   
  ))
-;; make directory in dest
-;;
-
-(define (sretrieve:mkdir configdat submitter target-dir targ-mk comment)
-  (let ((targ-path (conc target-dir "/" targ-mk)))
-    
-    (if (file-exists? targ-path)
-	(begin
-	  (debug:print-error 0 *default-log-port* "target Directory " targ-path " already exist!!")
-	  (exit 1)))
-    (sretrieve:db-do
-     configdat
-     (lambda (db)
-       (sretrieve:register-action db "mkdir" submitter targ-mk comment)))
-    (let* ((th1         (make-thread
-			 (lambda ()
-			   (create-directory targ-path #t)
-			   (debug:print 0 *default-log-port* " ... dir " targ-path " created"))
-			 "mkdir thread"))
-	   (th2         (make-thread
-			 (lambda ()
-			   (let loop ()
-			     (thread-sleep! 15)
-			     (display ".")
-			     (flush-output)
-			     (loop)))
-			 "action is happening thread")))
-      (thread-start! th1)
-      (thread-start! th2)
-      (thread-join! th1))
-    (cons #t "Successfully saved data")))
-
-;; create a symlink in dest
-;;
-(define (sretrieve:ln configdat submitter target-dir targ-link link-name comment)
-  (let ((targ-path (conc target-dir "/" link-name)))
-    (if (file-exists? targ-path)
-	(begin
-	  (debug:print-error 0 *default-log-port* "target file " targ-path " already exist!!")
-	  (exit 1)))
-     (if (not (file-exists? targ-link ))
-	(begin
-	  (debug:print-error 0 *default-log-port* "target file " targ-link " does not exist!!")
-	  (exit 1)))
- 
-    (sretrieve:db-do
-     configdat
-     (lambda (db)
-       (sretrieve:register-action db "ln" submitter link-name comment)))
-    (let* ((th1         (make-thread
-			 (lambda ()
-			   (create-symbolic-link targ-link targ-path  )
-			   (debug:print 0 *default-log-port* " ... link " targ-path " created"))
-			 "symlink thread"))
-	   (th2         (make-thread
-			 (lambda ()
-			   (let loop ()
-			     (thread-sleep! 15)
-			     (display ".")
-			     (flush-output)
-			     (loop)))
-			 "action is happening thread")))
-      (thread-start! th1)
-      (thread-start! th2)
-      (thread-join! th1))
-    (cons #t "Successfully saved data")))
-
-
-;; remove copy of file in dest
-;;
-(define (sretrieve:rm configdat submitter target-dir targ-file comment)
-  (let ((targ-path (conc target-dir "/" targ-file)))
-    (if (not (file-exists? targ-path))
-	(begin
-	  (debug:print-error 0 *default-log-port* "target file " targ-path " not found, nothing to remove.")
-	  (exit 1)))
-    (sretrieve:db-do
-     configdat
-     (lambda (db)
-       (sretrieve:register-action db "rm" submitter targ-file comment)))
-    (let* ((th1         (make-thread
-			 (lambda ()
-			   (delete-file targ-path)
-			   (debug:print 0 *default-log-port* " ... file " targ-path " removed"))
-			 "rm thread"))
-	   (th2         (make-thread
-			 (lambda ()
-			   (let loop ()
-			     (thread-sleep! 15)
-			     (display ".")
-			     (flush-output)
-			     (loop)))
-			 "action is happening thread")))
-      (thread-start! th1)
-      (thread-start! th2)
-      (thread-join! th1))
-    (cons #t "Successfully saved data")))
-
-(define (sretrieve:backup-move path)
-  (let* ((trashdir  (conc (pathname-directory path) "/.trash"))
-	 (trashfile (conc trashdir "/" (current-seconds) "-" (pathname-file path))))
-    (create-directory trashdir #t)
-    (if (directory? path)
-	(system (conc "mv " path " " trashfile))
-	(file-move path trash-file))))
-
-
-(define (sretrieve:lst->path pathlst)
-  (conc "/" (string-intersperse (map conc pathlst) "/")))
-
-(define (sretrieve:path->lst path)
-  (string-split path "/"))
-
-(define (sretrieve:pathdat-apply-heuristics configdat path)
-  (cond
-   ((file-exists? path) "found")
-   (else (conc path " not installed"))))
+
+
+;(define (sretrieve:backup-move path)
+;  (let* ((trashdir  (conc (pathname-directory path) "/.trash"))
+;	 (trashfile (conc trashdir "/" (current-seconds) "-" (pathname-file path))))
+;    (create-directory trashdir #t)
+;    (if (directory? path)
+;	(system (conc "mv " path " " trashfile))
+;	(file-move path trash-file))))
+;
+;
+;(define (sretrieve:lst->path pathlst)
+;  (conc "/" (string-intersperse (map conc pathlst) "/")))
+;
+;(define (sretrieve:path->lst path)
+;  (string-split path "/"))
+;
+;(define (sretrieve:pathdat-apply-heuristics configdat path)
+;  (cond
+;   ((file-exists? path) "found")
+;   (else (conc path " not installed"))))
 
 ;;======================================================================
 ;; MISC
 ;;======================================================================
 
@@ -392,11 +280,11 @@
 (define (sretrieve:do-as-calling-user proc)
   (let ((eid (current-effective-user-id))
         (cid (current-user-id)))
     (if (not (eq? eid cid)) ;; running suid
             (set! (current-effective-user-id) cid))
-    ;; (debug:print 0 *default-log-port* "running as " (current-effective-user-id))
+    ;; (debug:print 0 "running as " (current-effective-user-id))
     (proc)
     (if (not (eq? eid cid))
         (set! (current-effective-user-id) eid))))
 
 (define (sretrieve:find name paths)
@@ -417,203 +305,807 @@
 
 ;;======================================================================
 ;; SHELL
 ;;======================================================================
 
-(define (toplevel-command . args) #f)
-(define (sretrieve:shell)
+;; Create the sqlite db for shell
+;(define (sretrieve:shell-db-do path proc) 
+;    (if (not path)
+;	(begin
+;	  (debug:print 0 "[database]\nlocation /some/path\n\n Is missing from the config file!")
+;	  (exit 1)))
+;    (if (and path
+;	     (directory? path)
+;	     (file-read-access? path))
+;	(let* ((dbpath    (conc path "/" *exe-name* ".db"))
+;	       (writeable (file-write-access? dbpath))
+;	       (dbexists  (file-exists? dbpath)))
+;	  (handle-exceptions
+;	   exn
+;	   (begin
+;	     (debug:print 2 "ERROR: problem accessing db " dbpath
+;			  ((condition-property-accessor 'exn 'message) exn))
+;	     (exit 1))
+;            ;;(debug:print 0 "calling proc " proc "db path " dbpath )
+;	   (call-with-database
+;            dbpath
+;	    (lambda (db)
+;	       ;;(debug:print 0 "calling proc " proc " on db " db)
+;	      (set-busy-handler! db (busy-timeout 10000)) ;; 10 sec timeout
+;	      (if (not dbexists)(sretrieve:initialize-db db))
+;	      (proc db)))))
+;	(debug:print 0 "ERROR: invalid path for storing database: " path)))
+
+
+
+;; function to find sheets to which use has access 
+(define (sretrieve:has-permission  area)
+  (let ((username     (current-user-name)))
+  (cond
+   ((is-admin username)
+     #t)
+   ((is-user "retrieve" username area) 
+     #t)
+    ((is-user "publish" username area) 
+     #t)
+   ((is-user "writer-admin" username area) 
+     #t)
+   ((is-user "read-admin" username area) 
+     #t)
+   ((is-user "area-admin" username area) 
+     #t)
+   (else  
+    #f))))
+ 
+
+(define (sretrieve:get-accessable-projects  area)
+   (let* ((projects `()))
+         
+        (if (sretrieve:has-permission area)
+               (set! projects (cons area projects))
+               (begin
+                 (sauth:print-error (conc "User cannot access area " area "!!"))  
+                (exit 1))) 
+   ; (print projects)
+    projects))
+		 
+(define (sauth-common:shell-ls-cmd base-path-list ext-path top-areas base-path tail-cmd-list)
+    (if (and (null? base-path-list) (equal? ext-path "") )
+      (print (string-intersperse top-areas " "))
+  (let* ((resolved-path (sauth-common:resolve-path ext-path base-path-list top-areas )))
+           ;(print resolved-path)
+           (if (not (equal? resolved-path #f))
+           (if (null? resolved-path) 
+             (print (string-intersperse top-areas " "))
+           (let* ((target-path (sauth-common:get-target-path  base-path-list  ext-path top-areas base-path)))
+                ;(print "Resolved path: " target-path)
+                (if (not (equal? target-path #f))
+                  (begin   
+                (if (symbolic-link? target-path)
+                   (set! target-path (conc target-path "/"))) 
+                (if (not (equal? target-path #f))
+                (begin 
+                (cond
+		  ((null? tail-cmd-list)
+		     (run (pipe
+      	      	      (ls "-lrt" ,target-path))))
+		  ((not (equal? (car tail-cmd-list) "|"))
+                         (print "ls cmd cannot accept "(string-join tail-cmd-list) " as an argument!!"))
+                  (else  
+                    (run (pipe
+      	      	      (ls "-lrt" ,target-path)
+                      (begin (system (string-join (cdr tail-cmd-list))))))
+      ))))))))))))
+
+(define (sretrieve:shell-cat-cmd base-pathlist ext-path top-areas base-path tail-cmd-list)
+  (let* ((resolved-path (sauth-common:resolve-path ext-path base-pathlist top-areas ))
+          (data "") )
+         (if (not (equal? resolved-path #f))
+           (if (null? resolved-path) 
+             (print "Path could not be resolved!!")
+           (let* ((target-path (sauth-common:get-target-path  base-pathlist  ext-path top-areas base-path)))
+             (if (not (equal? target-path #f))
+               (if (or (not (file-exists? target-path)) (directory? target-path))
+               (print "Target path does not exist or is a directory!") 
+               (begin 
+                 (cond
+		  ((null? tail-cmd-list)
+		     (run (pipe
+      	      	      (cat  ,target-path))))
+		  ((not (equal? (car tail-cmd-list) "|"))
+                         (print "cat cmd cannot accept "(string-join tail-cmd-list) " as an argument!!"))
+                  (else  
+                    (run (pipe
+      	      	      (cat ,target-path)
+                      (begin (system (string-join (cdr tail-cmd-list))))))))))
+)))
+             (print "Path could not be resolved!!"))))
+
+(define (get-options cmd-list split-str)
+    (if (null? cmd-list)
+              (list '() '())
+    (let loop ((hed (car cmd-list))
+		 (tal (cdr cmd-list))
+                  (res '()))
+                   (cond
+                   ((equal? hed split-str)
+                      (list res tal))
+                   ((null? tal)
+                      (list (cons hed res) tal)) 
+                   (else 
+		  	(loop (car tal)(cdr tal)(cons hed res)))))))
+
+  
+(define (sretrieve:shell-grep-cmd base-pathlist ext-path top-areas base-path tail-cmd-list)
+  (let* ((resolved-path (sauth-common:resolve-path ext-path base-pathlist top-areas ))
+          (pattern (car tail-cmd-list))
+          (pipe-cmd-list (get-options (cdr tail-cmd-list) "|"))
+          (options (string-join (car pipe-cmd-list)))
+          (pipe-cmd (cadr  pipe-cmd-list))
+          (redirect-split (string-split (string-join  tail-cmd-list) ">"))   )
+         (if(and ( > (length redirect-split) 2 ))
+            (print "sgrep  cmd cannot accept > " (string-join redirect-split) " as an argument!!" )  
+         (if (not (equal? resolved-path #f))
+           (if (null? resolved-path) 
+             (print "Path could not be resolved!!")
+           (let* ((target-path (sauth-common:get-target-path  base-pathlist  ext-path top-areas base-path))
+                  (restrictions (if (equal? target-path #f)
+                                                 ""
+                                               (sretrieve:shell-lookup base-path)))
+                 (rest-str  (string-split (conc " --exclude-dir=" (string-join (string-split restrictions ",") " --exclude-dir=") ))))
+             (if (not (file-exists? target-path))
+               (print "Target path does not exist!") 
+               (begin 
+                 (cond
+	 	  ((and (null? pipe-cmd) (string-null? options))
+	 	     (run (pipe
+      	      	      (grep ,pattern ,target-path ))))
+		  ((and (null? pipe-cmd) (not (string-null? options)))
+		     (run (pipe
+      	      	      (begin (process-execute "/usr/bin/grep" (append (list options pattern target-path) rest-str))))))
+                  ((and (not (null? pipe-cmd)) (string-null? options))
+                        (run (pipe
+      	      	      (grep ,exclude-dir ,pattern ,target-path)
+                      (begin (system (string-join pipe-cmd))))))
+                  (else   
+                      (run (pipe
+      	      	      ;(grep  ,options ,exclude-dir ,pattern ,target-path)
+                       (begin (process-execute "/usr/bin/grep" (append (list options pattern target-path) rest-str)))
+
+                      (begin (system (string-join  pipe-cmd)))))))
+))))
+             (print "Path could not be resolved!!")))))
+
+
+(define (sretrieve:shell-less-cmd base-pathlist ext-path top-areas base-path)
+  (let* ((resolved-path (sauth-common:resolve-path ext-path base-pathlist top-areas )))
+         (if (not (equal? resolved-path #f))
+           (if (null? resolved-path) 
+             (print "Path could not be resolved!!")
+           (let* ((target-path (sauth-common:get-target-path  base-pathlist  ext-path top-areas base-path)))
+               (if (not (equal? target-path #f))
+           	 (if (or (not (file-exists? target-path)) (directory? target-path))
+                   (print "Target path does not exist or is a directory!") 
+                   (begin 
+                     ;(sretrieve:shell-db-do
+         	     ;     db-location
+     		     ;	  (lambda (db)
+       		;		(sretrieve:register-action db "less" (current-user-name) target-path (conc "Executing cmd: less "  target-path))))   
+ 
+                     (setenv "LESSSECURE" "1")
+                     (run (pipe
+      	      	     (less ,target-path))))))))
+             (print "Path could not be resolved!!"))))
+
+
+
+(define (sretrieve:shell-lookup base-path)
+  (let* ((usr (current-user-name))
+          (value (get-restrictions base-path usr)))
+                              value))
+             
+
+(define (sretrieve:load-shell-config fname)
+          (if (file-exists? fname)
+	(read-config fname #f #f)
+	))
+
+
+(define (is_directory target-path) 
+  (let* ((retval #f))
+  (sretrieve:do-as-calling-user
+    	(lambda ()
+          ;(print (current-effective-user-id) ) 
+          (if (directory? target-path)
+               (set! retval  #t))))
+             ;(print (current-effective-user-id))
+     retval)) 
+
+(define (make-exclude-pattern  restriction-list  )
+  (if (null? restriction-list)
+     ""
+   (let loop ((hed (car restriction-list))
+		 (tal (cdr restriction-list))
+                  (ret-str ""))
+                   (cond
+                   ((null? tal)
+                      (conc ret-str ".+" hed ".*")) 
+                   (else 
+		  	(loop (car tal)(cdr tal)(conc ret-str ".+" hed ".*|"))))))    )
+
+(define (sretrieve:get-shell-cmd target-path base-path restrictions iport)
+     (if (not (file-exists? target-path))
+        (sauth:print-error "Target path does not exist!")
+    (begin
+    (if (not (equal? target-path #f))
+    (begin     
+        (if (is_directory target-path) 
+        (begin
+           (let* ((tmpfile (conc "/tmp/" (current-user-name) "/my-pipe"))
+                  (parent-dir target-path)
+                  (last-dir-name (if  (pathname-extension target-path)  
+                                      (conc(pathname-file target-path) "." (pathname-extension target-path))
+                                      (pathname-file target-path)))
+                  (curr-dir (current-directory))   
+                  (start-dir (conc (current-directory) "/" last-dir-name))
+                  (execlude (make-exclude-pattern (string-split restrictions ","))))
+                  ; (print tmpfile)
+                    (if  (file-exists? start-dir)
+                    (begin
+                         (print last-dir-name " already exist in your work dir. Do you want to over write it? [y|n]")
+                        (let* ((inl (read-line iport)))
+                            (if (equal? inl "y")
+                              (begin
+                                 (change-directory parent-dir)
+                                  (create-fifo  tmpfile)
+                                  (process-fork 
+    				   (lambda()
+                                       (sleep 1) 
+       					(with-output-to-file tmpfile
+         				(lambda ()
+            				(sretrieve:make_file parent-dir execlude parent-dir)))))
+ 
+                                  (run (pipe
+                   		   (tar "chfv" "-" "-T" ,tmpfile )
+                   		   (begin (system (conc "cd " start-dir ";tar  xUf - "   )))))
+                                   (change-directory curr-dir)
+                                    (system (conc "rm " tmpfile)) )
+			      (begin	
+                               (print  "Nothing has been retrieved!!  ")))))
+                     (begin
+                       (sretrieve:do-as-calling-user
+                    (lambda ()
+		      (create-directory start-dir #t)))
+                          (change-directory parent-dir)
+                          ; (print execlude)
+                           (create-fifo tmpfile)
+                            (process-fork 
+    				   (lambda()
+                                       (sleep 1) 
+       					(with-output-to-file tmpfile
+         				(lambda ()
+            				(sretrieve:make_file parent-dir execlude parent-dir)))))
+
+                                  (run (pipe
+                   		   (tar "chfv" "-"  "-T" ,tmpfile)
+                   		   (begin (system (conc "cd " start-dir ";tar  xUf - "    )))))
+                           (change-directory curr-dir)
+                            (system (conc "rm " tmpfile)))))) 
+        (begin
+           (let*((parent-dir (pathname-directory target-path))
+                 (start-dir (current-directory))
+                 (filename (if  (pathname-extension target-path)  
+                                      (conc(pathname-file target-path) "." (pathname-extension target-path))
+                                      (pathname-file target-path)))
+                 (work-dir-file (conc (current-directory) "/" filename)))
+                 (if  (file-exists? work-dir-file)
+                    (begin
+                       (print filename " already exist in your work dir. Do you want to over write it? [y|n]")
+                        (let* ((inl (read-line iport)))
+                            (if (equal? inl "y")
+                              (begin
+                                 (change-directory parent-dir)
+                                  (run (pipe
+                   		   (tar "chfv" "-" ,filename)
+                   		   (begin (system (conc "cd " start-dir ";tar  xUf - "   )))))
+                                     (change-directory start-dir))
+			      (begin	
+                               (print  "Nothing has been retrieved!!  ")))))
+                    (begin
+               (change-directory parent-dir)  
+                 (run (pipe
+                   (tar "chfv" "-" ,filename)
+                   (begin (system (conc "cd " start-dir ";tar xUf -")))))
+                    (change-directory start-dir)))))))))))
+
+(define (sretrieve:get-shell-cmd-line target-path base-path restrictions iport)
+   (handle-exceptions
+	   exn 
+	   (begin
+	     (sauth:print-error (conc "Problem fetching the data. Sauth provieds sudo access to only one unix group. Please ensure you have washed all the remaining groups. System Error: " 
+			  ((condition-property-accessor 'exn 'message) exn)))
+	     (exit 1))
+  
+    (if (not (file-exists? target-path))
+        (sauth:print-error "Error:Target path does not exist!")
+    (begin
+    (if (not (equal? target-path #f))
+    (begin     
+        (if (is_directory target-path) 
+        (begin
+           (let* ((parent-dir target-path)
+                  (last-dir-name (if  (pathname-extension target-path)  
+                                      (conc(pathname-file target-path) "." (pathname-extension target-path))
+                                      (pathname-file target-path)))
+                  (curr-dir (current-directory))   
+                  (start-dir (conc (current-directory) "/" last-dir-name))
+                  (execlude (make-exclude-pattern (string-split restrictions ",")))
+                   (tmpfile (conc "/tmp/" (current-user-name) "/my-pipe-" (current-process-id))))
+                    (if  (file-exists? start-dir)
+                    (begin
+                         (sauth:print-error (conclast-dir-name " already exist in your work dir."))
+                         (sauth:print-error  "Nothing has been retrieved!!  "))
+                     (begin
+                   ;    (sretrieve:do-as-calling-user
+                   ; (lambda ()
+                    
+                  (if (not (file-exists?  (conc "/tmp/" (current-user-name)))) 
+		      (create-directory (conc "/tmp/" (current-user-name)) #t))
+                          (change-directory parent-dir)
+                            (create-fifo  tmpfile)
+                                  (process-fork 
+    				   (lambda()
+                                       (sleep 1) 
+       					(with-output-to-file tmpfile
+         				(lambda ()
+            				(sretrieve:make_file parent-dir execlude parent-dir)))))
+
+                           (process-execute "/bin/tar" (append (list  "chfv" "-"  "-T" tmpfile)  (list "--ignore-failed-read")))    
+                                  ;(run (pipe
+                   		   ;(tar "chfv" "-" "." )
+                   		   ;(begin (system (conc "cd " start-dir ";tar  xUf - "   execlude )))))
+                            (system (conc "rm " tmpfile))    
+                           (change-directory curr-dir))))) 
+        (begin
+           (let*((parent-dir (pathname-directory target-path))
+                 (start-dir (current-directory))
+                 (filename (if  (pathname-extension target-path)  
+                                      (conc(pathname-file target-path) "." (pathname-extension target-path))
+                                      (pathname-file target-path)))
+                 (work-dir-file (conc (current-directory) "/" filename)))
+                 (if  (file-exists? work-dir-file)
+                    (begin
+                       (print filename " already exist in your work dir.")
+                               (print  "Nothing has been retrieved!!  "))
+                    (begin
+               (change-directory parent-dir)
+                (process-execute "/bin/tar" (append (append (list  "chfv" "-") (list filename)) (list "--ignore-failed-read"))) 
+                 ;(run (pipe
+                  ; (tar "chfv" "-" ,filename)
+                  ; (begin (system (conc "cd " start-dir ";tar xUf -")))))
+                    (change-directory start-dir))))))))))))
+
+(define (sretrieve:make_file path exclude base_path)
+   (find-files 
+     path
+     action: (lambda (p res)
+           (cond
+                ((symbolic-link? p)   
+                 (if (directory?(read-symbolic-link p)) 
+                      (sretrieve:make_file p exclude base_path)
+                      (print (string-substitute (conc base_path "/") "" p "-"))))
+                 ((directory? p)              
+                 ;;do nothing for dirs)
+                 ) 
+                (else 
+                                        
+                     (if (not (string-match (regexp exclude)  p ))
+                        (print (string-substitute (conc base_path "/") "" p "-"))))))))
+
+(define (sretrieve:shell-help)
+(conc "Usage: " *exe-name* " [action [params ...]]
+
+  ls    [target path]               	  : list contents of target area. The output of the cmd can be piped into other system cmd. eg ls  | grep txt
+  cd    	     	  : To change the current directory within the sretrive shell. 
+  pwd				     	  : Prints the full pathname of the current directory within the sretrive shell.
+  get        	  : download directory/files into the directory where sretrieve shell cmd was invoked   
+  less  		     	  : Read input file to allows backward movement in the file as well as forward movement 
+  cat                     	  : show the contents of a file. The output of the cmd can be piped into other system cmd.
+
+  sgrep   [options] : Similar to unix grep cmd But with diffrent parameter ordering. The output of the cmd can be piped into other system cmd. 
+Part of the Megatest tool suite.
+Learn more at http://www.kiatoa.com/fossils/megatest
+
+Version: " megatest-fossil-hash)
+)	
+;(define (toplevel-command . args) #f)
+(define (sretrieve:shell area)
+ ; (print area)
   (use readline)
   (let* ((path      '())
-	 (prompt    "> ")
-	 (top-areas '("mrwellan" "pjhatwal" "bjbarcla" "ritikaag" "jmoon18"))
+	 (prompt    "sretrieve> ")
+	 (args      (argv))
+         (usr (current-user-name) )   
+         (top-areas (sretrieve:get-accessable-projects area))
+         (close-port     #f)
+         (area-obj  (get-obj-by-code area))
+         (user-obj (get-user usr)) 
+         (base-path (if (null? area-obj) 
+                         "" 
+                        (caddr (cdr area-obj))))      
 	 (iport     (make-readline-port prompt)))
-    (install-history-file) ;;  [homedir] [filename] [nlines])
-    (with-input-from-port iport
-      (lambda ()
-	(let loop ((inl (read-line)))
-	  (if (not (or (eof-object? inl)
-		       (equal? inl "exit")))
+        (if (null? area-obj)
+          (begin 
+             (print "Area " area " does not exist")
+          (exit 1)))
+	(let loop ((inl (read-line iport)))
+          ;(print 1) 
+	  (if (not (or (or (eof-object? inl)
+		       (equal? inl "exit")) (port-closed? iport)))
 	      (let* ((parts (string-split inl))
 		     (cmd   (if (null? parts) #f (car parts))))
-		(if (not cmd)
+              ;  (print "2")
+		(if (and (not cmd) (not (port-closed? iport)))
 		    (loop (read-line))
 		    (case (string->symbol cmd)
 		      ((cd)
 		       (if (> (length parts) 1) ;; have a parameter
-			   (set! path (append path (string-split (cadr parts)))) ;; not correct for relative paths
-			   (set! path '())))
+                           (begin
+                             (let*((arg (cadr parts))
+                                   (resolved-path (sauth-common:resolve-path  arg path top-areas))
+                                   (target-path (sauth-common:get-target-path path  arg top-areas base-path)))
+                                 (if (not (equal? target-path #f))
+                                 (if (or (equal? resolved-path #f) (not (file-exists? target-path)))    
+                                 (print "Invalid argument " arg ".. ")
+                                  (begin      
+			            (set! path resolved-path)
+                                     (sauthorize:do-as-calling-user
+                              (lambda ()
+			    (run-cmd (conc *sauth-path* "/sauthorize") (list "register-log" (conc "\"" inl "\"") (number->string (car user-obj))  (number->string (caddr area-obj))  "cd"))))
+                                  )))))  
+   			   (set! path '())))
+                      ((pwd)
+                         (if (null? path)
+                           (print "/")  
+                           (print "/" (string-join path "/")))) 
 		      ((ls)
 		       (let* ((thepath (if (> (length parts) 1) ;; have a parameter
 					   (cdr parts)
-					   path))
+					   `()))
+			      (plen    (length thepath)))
+                         (cond
+			  ((null? thepath)
+                           (sauth-common:shell-ls-cmd path "" top-areas base-path  '())
+                            (sauthorize:do-as-calling-user
+                              (lambda ()
+			    (run-cmd (conc *sauth-path* "/sauthorize") (list "register-log" (conc "\"" inl "\"") (number->string (car user-obj))  (number->string (caddr area-obj))  "ls"))))   )
+			  ((< plen 2)
+                  
+                            (sauth-common:shell-ls-cmd path  (car thepath) top-areas base-path '())
+                              (sauthorize:do-as-calling-user
+                              (lambda ()
+			    (run-cmd (conc *sauth-path* "/sauthorize") (list "register-log" (conc "\"" inl "\"") (number->string (car user-obj))  (number->string (caddr area-obj))  "ls")))))
+                          (else 
+                            (if (equal? (car thepath) "|")
+                              (sauth-common:shell-ls-cmd path "" top-areas base-path thepath)
+                              (sauth-common:shell-ls-cmd path  (car thepath) top-areas base-path (cdr thepath)))
+                           (sauthorize:do-as-calling-user
+                              (lambda ()
+			    (run-cmd (conc *sauth-path* "/sauthorize") (list "register-log" (conc "\"" inl "\"") (number->string (car user-obj))  (number->string (caddr area-obj))  "ls"))))))))
+                       ((cat)
+		       (let* ((thepath (if (> (length parts) 1) ;; have a parameter
+					   (cdr parts)
+					   `()))
+			      (plen    (length thepath)))
+			 (cond
+			  ((null? thepath)
+                          (print "Error: Missing argument to cat"))
+			  ((< plen 2)
+                            (sretrieve:shell-cat-cmd path  (car thepath) top-areas base-path '())
+                              (sauthorize:do-as-calling-user
+                              (lambda ()
+			    (run-cmd (conc *sauth-path* "/sauthorize") (list "register-log" (conc "\"" inl "\"") (number->string (car user-obj))  (number->string (caddr area-obj))  "cat")))))
+
+			  (else
+                             (sretrieve:shell-cat-cmd path  (car thepath) top-areas base-path (cdr thepath))
+                             (sauthorize:do-as-calling-user
+                              (lambda ()
+			    (run-cmd (conc *sauth-path* "/sauthorize") (list "register-log" (conc "\"" inl "\"") (number->string (car user-obj))  (number->string (caddr area-obj))  "cat"))))
+))))
+                       ((sgrep)
+		       (let* ((thepath (if (> (length parts) 1) ;; have a parameter
+					   (cdr parts)
+					   `()))
+			      (plen    (length thepath)))
+			 (cond
+			  ((null? thepath) 
+                            (print "Error: Missing arguments to grep!! Useage: grep   [options] "))
+                          ((< plen  2)
+                          (print "Error: Missing arguments to grep!! Useage: grep   [options] "))
+			  (else
+                             (sretrieve:shell-grep-cmd path  (car thepath) top-areas base-path  (cdr thepath))
+				(sauthorize:do-as-calling-user
+                              (lambda ()
+			    (run-cmd (conc *sauth-path* "/sauthorize") (list "register-log" (conc "\"" inl "\"") (number->string (car user-obj))  (number->string (caddr area-obj))  "grep"))))))))
+
+                      ((less)
+		       (let* ((thepath (if (> (length parts) 1) ;; have a parameter
+					   (cdr parts)
+					   `()))
+			      (plen    (length thepath)))
+			 (cond
+			  ((null? thepath)
+                          (print "Error: Missing argument to less"))
+			  ((< plen 2)
+                            (sretrieve:shell-less-cmd path  (car thepath) top-areas base-path)
+                             (sauthorize:do-as-calling-user
+                              (lambda ()
+			    (run-cmd (conc *sauth-path* "/sauthorize") (list "register-log" (conc "\"" inl "\"") (number->string (car user-obj))  (number->string (caddr area-obj))  "less")))))
+			  (else
+                             (print "less cmd takes only one () argument!!")))))
+                      ((get)
+                         (let* ((thepath (if (> (length parts) 1) ;; have a parameter
+					   (cdr parts)
+					   `()))
 			      (plen    (length thepath)))
 			 (cond
 			  ((null? thepath)
-			   (print (string-intersperse top-areas " ")))
-			  ((and (< plen 2)
-				(member (car thepath) top-areas))
-			   (system (conc "ls /p/fdk/gwa/" (car thepath))))
-			  (else ;; have a long path
-			   ;; check for access rights here
-			   (system (conc "ls /p/fdk/gwa/" (string-intersperse thepath "/")))))))
+                          (print "Error: Missing argument  to get"))
+			  ((< plen 2)
+                           (let* ((target-path (sauth-common:get-target-path path  (car thepath) top-areas base-path))
+				 (restrictions (if (equal? target-path #f)
+                                                 ""
+                                               (sretrieve:shell-lookup base-path))))
+                               (if (not (equal? target-path #f))
+                             (begin  
+                                 (sretrieve:get-shell-cmd target-path base-path restrictions iport)
+                                  (sauthorize:do-as-calling-user
+                              (lambda ()
+			    (run-cmd (conc *sauth-path* "/sauthorize") (list "register-log" (conc "\"" inl "\"") (number->string (car user-obj))  (number->string (caddr area-obj))  "get"))))))))
+			  (else
+                            (print "Error: get cmd takes only one argument ")))))
+                      ((exit)
+                          (print "got exit"))  
+                      ((help)
+                          (print (sretrieve:shell-help)))
 		      (else 
 		       (print "Got command: " inl))))
-		(loop (read-line)))))))))
+                 (loop (read-line iport)))))))
+;;))
     
 
 ;;======================================================================
 ;; MAIN
 ;;======================================================================
-
-(define (sretrieve:load-config exe-dir exe-name)
-  (let* ((fname   (conc exe-dir "/." exe-name ".config")))
-    ;; (ini:property-separator-patt " *  *")
-    ;; (ini:property-separator #\space)
-    (if (file-exists? fname)
-	;; (ini:read-ini fname)
-	(read-config fname #f #t)
-	(make-hash-table))))
+;;(define *default-log-port* (current-error-port))
+
+;(define (sretrieve:load-config exe-dir exe-name)
+;  (let* ((fname   (conc exe-dir "/." exe-name ".config")))
+;    ;; (ini:property-separator-patt " *  *")
+;    ;; (ini:property-separator #\space)
+;    (if (file-exists? fname)
+;	;; (ini:read-ini fname)
+;	(read-config fname #f #f)
+;	(make-hash-table))))
 
 ;; package-type is "megatest", "builds", "kits" etc.
 ;;
-(define (sretrieve:load-packages configdat exe-dir package-type)
-  (push-directory exe-dir)
-  (let* ((packages-metadir  (configf:lookup configdat "settings" "packages-metadir"))
-	 (conversion-script (configf:lookup configdat "settings" "conversion-script"))
-	 (upstream-file     (configf:lookup configdat "settings" "upstream-file"))
-	 (package-config    (conc packages-metadir "/" package-type ".config")))
-    ;; this section here does a timestamp based rebuild of the
-    ;;   /.config file using
-    ;;    as an input
-    (if (file-exists? upstream-file)
-	(if (or (not (file-exists? package-config)) ;; if not created call the updater, otherwise call only if upstream newer
-		(> (file-modification-time upstream-file)(file-modification-time package-config)))
-	    (handle-exceptions
-	     exn
-	     (debug:print-error 0 *default-log-port* "failed to run script " conversion-script " with params " upstream-file " " package-config)
-	     (let ((pid (process-run conversion-script (list upstream-file package-config))))
-	       (process-wait pid)))
-	    (debug:print 0 *default-log-port* "Skipping update of " package-config " from " upstream-file))
-	(debug:print 0 *default-log-port* "Skipping update of " package-config " as " upstream-file " not found"))
-    ;; (ini:property-separator-patt " *  *")
-    ;; (ini:property-separator #\space)
-    (let ((res (if (file-exists? package-config)
-		   (begin
-		     (debug:print 0 *default-log-port* "Reading package config " package-config)
-		     (read-config package-config #f #t))
-		   (make-hash-table))))
-      (pop-directory)
-      res)))
-
-(define (sretrieve:process-action configdat action . args)
-  (let* ((base-dir      (configf:lookup configdat "settings" "base-dir"))
-	 (user          (current-user-name))
-         (allowed-sub-paths (configf:lookup configdat "settings" "allowed-sub-paths")) 
-	 (allowed-users (string-split
-			 (or (configf:lookup configdat "settings" "allowed-users")
-			     "")))
-	 (default-area  (configf:lookup configdat "settings" "default-area"))) ;; otherwise known as the package
-    
-    (if (not base-dir)
-	(begin
-	  (debug:print 0 *default-log-port* "[settings]\nbase-dir /some/path\n\n Is MISSING from the config file!")
-	  (exit)))
-    (if (null? allowed-users)
-	(begin
-	  (debug:print 0 *default-log-port* "[setings]\nallowed-users user1 user2 ...\n\n Is MISSING from the config file!")
-	  (exit)))
-    (if (not (member user allowed-users))
-	(begin
-	  (debug:print 0 *default-log-port* "User \"" (current-user-name) "\" does not have access. Exiting")
-	  (exit 1)))
+
+;(define (sretrieve:load-packages configdat exe-dir package-type)
+;  (push-directory exe-dir)
+;  (let* ((packages-metadir  (configf:lookup configdat "settings" "packages-metadir"))
+;	 (conversion-script (configf:lookup configdat "settings" "conversion-script"))
+;	 (upstream-file     (configf:lookup configdat "settings" "upstream-file"))
+;	 (package-config    (conc packages-metadir "/" package-type ".config")))
+;       (if (file-exists? upstream-file)
+;	(if (or (not (file-exists? package-config)) ;; if not created call the updater, otherwise call only if upstream newer
+;		(> (file-modification-time upstream-file)(file-modification-time package-config)))
+;	    (handle-exceptions
+;	     exn
+;	     (debug:print 0 "ERROR: failed to run script " conversion-script " with params " upstream-file " " package-config)
+;	     (let ((pid (process-run conversion-script (list upstream-file package-config))))
+;	       (process-wait pid)))
+;	    (debug:print 0 "Skipping update of " package-config " from " upstream-file))
+;	(debug:print 0 "Skipping update of " package-config " as " upstream-file " not found"))
+;       (let ((res (if (file-exists? package-config)
+;		   (begin
+;		     (debug:print 0 "Reading package config " package-config)
+;		     (read-config package-config #f #t))
+;		   (make-hash-table))))
+;      (pop-directory)
+;      res)))
+
+(define (toplevel-command . args) #f)
+(define (sretrieve:process-action  action . args)
+    ; (print action)
+ ;  (use readline)
     (case (string->symbol action)
       ((get)
-       (if (< (length args) 1)
+       (if (< (length args) 2)
 	   (begin 
-	     (debug:print-error 0 *default-log-port* "Missing arguments; " (string-intersperse args ", "))
+	     (sauth:print-error  "Missing arguments;  " )
 	     (exit 1)))
-       (let* ((remargs     (args:get-args args '("-m" "-i" "-package") '() args:arg-hash 0))
-              (version     (car args))
-	      (msg         (or (args:get-arg "-m") ""))
-	      (package-type (or (args:get-arg "-package")
-				default-area))
-	      (exe-dir     (configf:lookup configdat "exe-info" "exe-dir")))
-;;	      (relconfig   (sretrieve:load-packages configdat exe-dir package-type)))
-
-	 (debug:print 0 *default-log-port* "retrieving " version " of " package-type " as tar data on stdout")
-	 (sretrieve:get configdat user version msg)))
+       (let* ((remargs     (args:get-args args '("-m" ) '() args:arg-hash 0))
+              (iport (make-readline-port ">"))
+              (area     (car args))
+              (usr (current-user-name))
+              (area-obj  (get-obj-by-code area))
+              (user-obj (get-user usr))
+              (top-areas (sretrieve:get-accessable-projects area)) 
+              (base-path (if (null? area-obj) 
+                                      "" 
+                                     (caddr (cdr area-obj))))
+	      (sub-path       (if (null? remargs) 
+                                       "" 
+                                       (car remargs))))
+
+          (if (null? area-obj)
+          	    (begin 
+             		(sauth:print-error (conc "Area " area " does not exist"))
+          	         (exit 1)))
+              (let* ((target-path (sauth-common:get-target-path '()  (conc area "/" sub-path) top-areas base-path))
+		     (restrictions (if (equal? target-path #f)
+                                        ""
+                                       (sretrieve:shell-lookup base-path))))
+             (if (not (equal? target-path #f))
+                 (begin  
+                   (sauthorize:do-as-calling-user
+                      (lambda ()
+   		        (run-cmd (conc *sauth-path* "/sauthorize") (list "register-log" (conc "get " area " " sub-path) (number->string (car user-obj))  (number->string (caddr area-obj))  "get"))))
+                        (sretrieve:get-shell-cmd-line target-path base-path restrictions  iport))))))
          ((cp)
-            (if (< (length args) 1)
-             (begin 
-	     (debug:print-error 0 *default-log-port* "Missing arguments; " (string-intersperse args ", "))
-	     (exit 1)))
-          (let* ((remargs     (args:get-args args '("-m" "-i" "-package") '() args:arg-hash 0))
-              (file     (car args))
-	      (msg         (or (args:get-arg "-m") "")) )
-
-	 (debug:print 0 *default-log-port* "copinging " file " to current directory " )
-	 (sretrieve:cp configdat user file msg)))
-      ((ls)
-            (if (< (length args) 1)
-             (begin 
-	     (debug:print-error 0 *default-log-port* "Missing arguments; " (string-intersperse args ", "))
-	     (exit 1)))
-          (let* ((remargs     (args:get-args args '("-m" "-i" "-package") '() args:arg-hash 0))
-              (dir     (car args))
-	      (msg         (or (args:get-arg "-m") "")) )
-
-	 (debug:print 0 *default-log-port* "Listing files in " )
-	 (sretrieve:ls configdat user dir msg)))
- 
-      (else (debug:print 0 *default-log-port* "Unrecognised command " action)))))
-  
-;; ease debugging by loading ~/.dashboardrc - REMOVE FROM PRODUCTION!
-;; (let ((debugcontrolf (conc (get-environment-variable "HOME") "/.sretrieverc")))
-;;   (if (file-exists? debugcontrolf)
-;;       (load debugcontrolf)))
+             (if (< (length args) 2)
+	   (begin 
+	     (sauth:print-error  "Missing arguments;  " )
+	     (exit 1)))
+       (let* ((remargs     (args:get-args args '("-m" ) '() args:arg-hash 0))
+              (iport (make-readline-port ">"))
+              (area     (car args))
+              (usr (current-user-name))
+              (area-obj  (get-obj-by-code area))
+              (user-obj (get-user usr))
+              (top-areas (sretrieve:get-accessable-projects area)) 
+              (base-path (if (null? area-obj) 
+                                      "" 
+                                     (caddr (cdr area-obj))))
+	      (sub-path       (if (null? remargs) 
+                                       "" 
+                                       (car remargs))))
+         ;  (print args)
+          (if (null? area-obj)
+          	    (begin 
+             		(sauth:print-error (conc "Area " area " does not exist"))
+          	         (exit 1)))
+              (let* ((target-path (sauth-common:get-target-path '()  (conc area "/" sub-path) top-areas base-path))
+				 (restrictions (if (equal? target-path #f)
+                                                 ""
+                                              (sretrieve:shell-lookup base-path))))
+                          ;(print target-path) 
+                          (if (not (equal? target-path #f))
+                             (begin  
+                              (sauthorize:do-as-calling-user
+                              (lambda ()
+			    (run-cmd (conc *sauth-path* "/sauthorize") (list "register-log" (conc "get " area " " sub-path) (number->string (car user-obj))  (number->string (caddr area-obj))  "get"))))
+                            (sretrieve:get-shell-cmd-line target-path base-path restrictions  iport))))))
+      ((cat)
+      (if (< (length args) 2)
+	   (begin 
+	     (sauth:print-error  "Missing arguments;  " )
+	     (exit 1)))
+       (let* ((remargs     (args:get-args args '("-m" ) '() args:arg-hash 0))
+              (area     (car args))
+              (usr (current-user-name))
+              (area-obj  (get-obj-by-code area))
+              (user-obj (get-user usr))
+              (top-areas (sretrieve:get-accessable-projects area)) 
+              (base-path (if (null? area-obj) 
+                                      "" 
+                                     (caddr (cdr area-obj))))
+	            (sub-path       (if (null? remargs) 
+                                       "" 
+                                       (car remargs))))
+
+          (if (null? area-obj)
+          	    (begin 
+             		(sauth:print-error (conc "Area " area " does not exist"))
+          	         (exit 1)))
+              (let* ((target-path (sauth-common:get-target-path '()  (conc area "/" sub-path) top-areas base-path))
+		     (restrictions (if (equal? target-path #f)
+                                        ""
+                                       (sretrieve:shell-lookup base-path))))
+;(sauth-common:shell-ls-cmd base-path-list ext-path top-areas base-path tail-cmd-list)
+
+             (if (not (equal? target-path #f))
+                 (begin  
+                   (sauthorize:do-as-calling-user
+                      (lambda ()
+   		        (run-cmd (conc *sauth-path* "/sauthorize") (list "register-log" (conc "get " area " " sub-path) (number->string (car user-obj))  (number->string (caddr area-obj))  "get"))))
+               (sretrieve:shell-cat-cmd (list area) sub-path  top-areas base-path '())))))) 
+      ((ls)
+          (cond
+            ((< (length args) 1)
+              (begin 
+	      (print  "ERROR: Missing arguments;  ")
+	      (exit 1)))
+              ((equal? (length args) 1)
+                 (let*  ((area     (car args))
+                         (usr (current-user-name))
+                         (area-obj  (get-obj-by-code area))
+                         (user-obj (get-user usr))
+                         (top-areas (sretrieve:get-accessable-projects area)) 
+                         (base-path (if (null? area-obj) 
+                                      "" 
+                                     (caddr (cdr area-obj)))))
+                  (if (null? area-obj)
+          	    (begin 
+             		(print "Area " area " does not exist")
+          	         (exit 1)))
+             
+            ; (sretrieve:shell-cat-cmd base-pathlist ext-path top-areas base-path tail-cmd-list)
+   
+           	 (sauth-common:shell-ls-cmd '() area top-areas base-path  '())
+                 (sauthorize:do-as-calling-user
+                   (lambda ()
+		    (run-cmd (conc *sauth-path* "/sauthorize") (list "register-log" "ls" (number->string (car user-obj)) (number->string (caddr area-obj)) "ls"))))))
+             ((> (length args) 1)
+               (let*  ((remargs     (args:get-args args '("-m" ) '() args:arg-hash 0))
+                        (usr (current-user-name))
+                        (user-obj (get-user usr))
+                         (area     (car args)))
+                         (let* ((area-obj  (get-obj-by-code area))
+                               (top-areas (sretrieve:get-accessable-projects area)) 
+                               (base-path (if (null? area-obj) 
+                                      "" 
+                                     (caddr (cdr area-obj))))
+                                 
+                               (sub-path (if (null? remargs) 
+                                       area 
+                                      (conc area "/" (car remargs)))))
+                             ;(print "sub path "  sub-path)
+                            (if (null? area-obj)
+          	              (begin 
+             		        (print "Area " area " does not exist")
+          	                 (exit 1)))
+                              (sauth-common:shell-ls-cmd `()  sub-path top-areas base-path '())
+                            (sauthorize:do-as-calling-user
+				(lambda ()
+                       	       (run-cmd (conc *sauth-path* "/sauthorize") (list "register-log" (conc "ls " sub-path) (number->string (car user-obj)) (number->string (caddr area-obj)) "ls")))))))))
+
+       ((shell)
+          (if (< (length args) 1)
+             (begin 
+	     (print  "ERROR: Missing arguments !!" )
+	     (exit 1))
+             (sretrieve:shell (car args)))) 
+      (else (print 0 "Unrecognised command " action))))
 
 (define (main)
   (let* ((args      (argv))
 	 (prog      (car args))
 	 (rema      (cdr args))
 	 (exe-name  (pathname-file (car (argv))))
 	 (exe-dir   (or (pathname-directory prog)
 			(sretrieve:find exe-name (string-split (get-environment-variable "PATH") ":"))))
-	 (configdat (sretrieve:load-config exe-dir exe-name)))
+	 ;(configdat (sretrieve:load-config exe-dir exe-name))
+)
     ;; preserve the exe data in the config file
-    (hash-table-set! configdat "exe-info" (list (list "exe-name" exe-name)
-						(list "exe-dir"  exe-dir)))
+    ;(hash-table-set! configdat "exe-info" (list (list "exe-name" exe-name)
+					;	(list "exe-dir"  exe-dir)))
     (cond
      ;; one-word commands
      ((eq? (length rema) 1)
       (case (string->symbol (car rema))
 	((help -h -help --h --help)
 	 (print sretrieve:help))
-	((list-vars) ;; print out the ini file
-	 (map print (sretrieve:get-areas configdat)))
-	((ls)
-	 (let* ((base-dir (configf:lookup configdat "settings" "base-dir")))
-	   (if base-dir
-	       (begin
-		 (print "Files in " base-dir)
-                 (sretrieve:do-as-calling-user
-                    (lambda ()
-		 (process-execute "/bin/ls" (list "-lrt" base-dir)))))
-	       (print "ERROR: No base dir specified!"))))
-	((log)
-	 (sretrieve:db-do configdat (lambda (db)
-				     (print "Logs : ")
-				     (query (for-each-row
-					     (lambda (row)
-					       (apply print (intersperse row " | "))))
-					    (sql db "SELECT * FROM actions")))))
-	((shell)
-	 (sretrieve:shell))
 	(else
 	 (print "ERROR: Unrecognised command. Try \"sretrieve help\""))))
      ;; multi-word commands
      ((null? rema)(print sretrieve:help))
      ((>= (length rema) 2)
-      (apply sretrieve:process-action configdat (car rema)(cdr rema)))
-     (else (debug:print-error 0 *default-log-port* "Unrecognised command. Try \"sretrieve help\"")))))
+      
+      (apply sretrieve:process-action  (car rema) (cdr rema)))
+     (else (debug:print 0 "ERROR: Unrecognised command. Try \"sretrieve help\"")))))
 
 (main)
+
+
+      

ADDED   stml2.scm
Index: stml2.scm
==================================================================
--- /dev/null
+++ stml2.scm
@@ -0,0 +1,23 @@
+;;======================================================================
+;; Copyright 2019, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
+;;======================================================================
+
+(declare (unit stml2))
+
+(include "stml2/stml2.scm")

ADDED   stml2/COPYING
Index: stml2/COPYING
==================================================================
--- /dev/null
+++ stml2/COPYING
@@ -0,0 +1,724 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+                       51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    
+    Copyright (C)   
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year  name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  , 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
+
+
+GNU Free Documentation License
+******************************
+
+                        Version 1.1, March 2000
+     Copyright (C) 2000 Free Software Foundation, Inc.
+     51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+     
+     Everyone is permitted to copy and distribute verbatim copies
+     of this license document, but changing it is not allowed.
+
+  0. PREAMBLE
+
+     The purpose of this License is to make a manual, textbook, or other
+     written document "free" in the sense of freedom: to assure everyone
+     the effective freedom to copy and redistribute it, with or without
+     modifying it, either commercially or noncommercially.  Secondarily,
+     this License preserves for the author and publisher a way to get
+     credit for their work, while not being considered responsible for
+     modifications made by others.
+
+     This License is a kind of "copyleft", which means that derivative
+     works of the document must themselves be free in the same sense.
+     It complements the GNU General Public License, which is a copyleft
+     license designed for free software.
+
+     We have designed this License in order to use it for manuals for
+     free software, because free software needs free documentation: a
+     free program should come with manuals providing the same freedoms
+     that the software does.  But this License is not limited to
+     software manuals; it can be used for any textual work, regardless
+     of subject matter or whether it is published as a printed book.
+     We recommend this License principally for works whose purpose is
+     instruction or reference.
+
+  1. APPLICABILITY AND DEFINITIONS
+
+     This License applies to any manual or other work that contains a
+     notice placed by the copyright holder saying it can be distributed
+     under the terms of this License.  The "Document", below, refers to
+     any such manual or work.  Any member of the public is a licensee,
+     and is addressed as "you".
+
+     A "Modified Version" of the Document means any work containing the
+     Document or a portion of it, either copied verbatim, or with
+     modifications and/or translated into another language.
+
+     A "Secondary Section" is a named appendix or a front-matter
+     section of the Document that deals exclusively with the
+     relationship of the publishers or authors of the Document to the
+     Document's overall subject (or to related matters) and contains
+     nothing that could fall directly within that overall subject.
+     (For example, if the Document is in part a textbook of
+     mathematics, a Secondary Section may not explain any mathematics.)
+     The relationship could be a matter of historical connection with
+     the subject or with related matters, or of legal, commercial,
+     philosophical, ethical or political position regarding them.
+
+     The "Invariant Sections" are certain Secondary Sections whose
+     titles are designated, as being those of Invariant Sections, in
+     the notice that says that the Document is released under this
+     License.
+
+     The "Cover Texts" are certain short passages of text that are
+     listed, as Front-Cover Texts or Back-Cover Texts, in the notice
+     that says that the Document is released under this License.
+
+     A "Transparent" copy of the Document means a machine-readable copy,
+     represented in a format whose specification is available to the
+     general public, whose contents can be viewed and edited directly
+     and straightforwardly with generic text editors or (for images
+     composed of pixels) generic paint programs or (for drawings) some
+     widely available drawing editor, and that is suitable for input to
+     text formatters or for automatic translation to a variety of
+     formats suitable for input to text formatters.  A copy made in an
+     otherwise Transparent file format whose markup has been designed
+     to thwart or discourage subsequent modification by readers is not
+     Transparent.  A copy that is not "Transparent" is called "Opaque".
+
+     Examples of suitable formats for Transparent copies include plain
+     ASCII without markup, Texinfo input format, LaTeX input format,
+     SGML or XML using a publicly available DTD, and
+     standard-conforming simple HTML designed for human modification.
+     Opaque formats include PostScript, PDF, proprietary formats that
+     can be read and edited only by proprietary word processors, SGML
+     or XML for which the DTD and/or processing tools are not generally
+     available, and the machine-generated HTML produced by some word
+     processors for output purposes only.
+
+     The "Title Page" means, for a printed book, the title page itself,
+     plus such following pages as are needed to hold, legibly, the
+     material this License requires to appear in the title page.  For
+     works in formats which do not have any title page as such, "Title
+     Page" means the text near the most prominent appearance of the
+     work's title, preceding the beginning of the body of the text.
+
+  2. VERBATIM COPYING
+
+     You may copy and distribute the Document in any medium, either
+     commercially or noncommercially, provided that this License, the
+     copyright notices, and the license notice saying this License
+     applies to the Document are reproduced in all copies, and that you
+     add no other conditions whatsoever to those of this License.  You
+     may not use technical measures to obstruct or control the reading
+     or further copying of the copies you make or distribute.  However,
+     you may accept compensation in exchange for copies.  If you
+     distribute a large enough number of copies you must also follow
+     the conditions in section 3.
+
+     You may also lend copies, under the same conditions stated above,
+     and you may publicly display copies.
+
+  3. COPYING IN QUANTITY
+
+     If you publish printed copies of the Document numbering more than
+     100, and the Document's license notice requires Cover Texts, you
+     must enclose the copies in covers that carry, clearly and legibly,
+     all these Cover Texts: Front-Cover Texts on the front cover, and
+     Back-Cover Texts on the back cover.  Both covers must also clearly
+     and legibly identify you as the publisher of these copies.  The
+     front cover must present the full title with all words of the
+     title equally prominent and visible.  You may add other material
+     on the covers in addition.  Copying with changes limited to the
+     covers, as long as they preserve the title of the Document and
+     satisfy these conditions, can be treated as verbatim copying in
+     other respects.
+
+     If the required texts for either cover are too voluminous to fit
+     legibly, you should put the first ones listed (as many as fit
+     reasonably) on the actual cover, and continue the rest onto
+     adjacent pages.
+
+     If you publish or distribute Opaque copies of the Document
+     numbering more than 100, you must either include a
+     machine-readable Transparent copy along with each Opaque copy, or
+     state in or with each Opaque copy a publicly-accessible
+     computer-network location containing a complete Transparent copy
+     of the Document, free of added material, which the general
+     network-using public has access to download anonymously at no
+     charge using public-standard network protocols.  If you use the
+     latter option, you must take reasonably prudent steps, when you
+     begin distribution of Opaque copies in quantity, to ensure that
+     this Transparent copy will remain thus accessible at the stated
+     location until at least one year after the last time you
+     distribute an Opaque copy (directly or through your agents or
+     retailers) of that edition to the public.
+
+     It is requested, but not required, that you contact the authors of
+     the Document well before redistributing any large number of
+     copies, to give them a chance to provide you with an updated
+     version of the Document.
+
+  4. MODIFICATIONS
+
+     You may copy and distribute a Modified Version of the Document
+     under the conditions of sections 2 and 3 above, provided that you
+     release the Modified Version under precisely this License, with
+     the Modified Version filling the role of the Document, thus
+     licensing distribution and modification of the Modified Version to
+     whoever possesses a copy of it.  In addition, you must do these
+     things in the Modified Version:
+
+       A. Use in the Title Page (and on the covers, if any) a title
+          distinct from that of the Document, and from those of
+          previous versions (which should, if there were any, be listed
+          in the History section of the Document).  You may use the
+          same title as a previous version if the original publisher of
+          that version gives permission.
+
+       B. List on the Title Page, as authors, one or more persons or
+          entities responsible for authorship of the modifications in
+          the Modified Version, together with at least five of the
+          principal authors of the Document (all of its principal
+          authors, if it has less than five).
+
+       C. State on the Title page the name of the publisher of the
+          Modified Version, as the publisher.
+
+       D. Preserve all the copyright notices of the Document.
+
+       E. Add an appropriate copyright notice for your modifications
+          adjacent to the other copyright notices.
+
+       F. Include, immediately after the copyright notices, a license
+          notice giving the public permission to use the Modified
+          Version under the terms of this License, in the form shown in
+          the Addendum below.
+
+       G. Preserve in that license notice the full lists of Invariant
+          Sections and required Cover Texts given in the Document's
+          license notice.
+
+       H. Include an unaltered copy of this License.
+
+       I. Preserve the section entitled "History", and its title, and
+          add to it an item stating at least the title, year, new
+          authors, and publisher of the Modified Version as given on
+          the Title Page.  If there is no section entitled "History" in
+          the Document, create one stating the title, year, authors,
+          and publisher of the Document as given on its Title Page,
+          then add an item describing the Modified Version as stated in
+          the previous sentence.
+
+       J. Preserve the network location, if any, given in the Document
+          for public access to a Transparent copy of the Document, and
+          likewise the network locations given in the Document for
+          previous versions it was based on.  These may be placed in
+          the "History" section.  You may omit a network location for a
+          work that was published at least four years before the
+          Document itself, or if the original publisher of the version
+          it refers to gives permission.
+
+       K. In any section entitled "Acknowledgments" or "Dedications",
+          preserve the section's title, and preserve in the section all
+          the substance and tone of each of the contributor
+          acknowledgments and/or dedications given therein.
+
+       L. Preserve all the Invariant Sections of the Document,
+          unaltered in their text and in their titles.  Section numbers
+          or the equivalent are not considered part of the section
+          titles.
+
+       M. Delete any section entitled "Endorsements".  Such a section
+          may not be included in the Modified Version.
+
+       N. Do not retitle any existing section as "Endorsements" or to
+          conflict in title with any Invariant Section.
+
+     If the Modified Version includes new front-matter sections or
+     appendices that qualify as Secondary Sections and contain no
+     material copied from the Document, you may at your option
+     designate some or all of these sections as invariant.  To do this,
+     add their titles to the list of Invariant Sections in the Modified
+     Version's license notice.  These titles must be distinct from any
+     other section titles.
+
+     You may add a section entitled "Endorsements", provided it contains
+     nothing but endorsements of your Modified Version by various
+     parties--for example, statements of peer review or that the text
+     has been approved by an organization as the authoritative
+     definition of a standard.
+
+     You may add a passage of up to five words as a Front-Cover Text,
+     and a passage of up to 25 words as a Back-Cover Text, to the end
+     of the list of Cover Texts in the Modified Version.  Only one
+     passage of Front-Cover Text and one of Back-Cover Text may be
+     added by (or through arrangements made by) any one entity.  If the
+     Document already includes a cover text for the same cover,
+     previously added by you or by arrangement made by the same entity
+     you are acting on behalf of, you may not add another; but you may
+     replace the old one, on explicit permission from the previous
+     publisher that added the old one.
+
+     The author(s) and publisher(s) of the Document do not by this
+     License give permission to use their names for publicity for or to
+     assert or imply endorsement of any Modified Version.
+
+  5. COMBINING DOCUMENTS
+
+     You may combine the Document with other documents released under
+     this License, under the terms defined in section 4 above for
+     modified versions, provided that you include in the combination
+     all of the Invariant Sections of all of the original documents,
+     unmodified, and list them all as Invariant Sections of your
+     combined work in its license notice.
+
+     The combined work need only contain one copy of this License, and
+     multiple identical Invariant Sections may be replaced with a single
+     copy.  If there are multiple Invariant Sections with the same name
+     but different contents, make the title of each such section unique
+     by adding at the end of it, in parentheses, the name of the
+     original author or publisher of that section if known, or else a
+     unique number.  Make the same adjustment to the section titles in
+     the list of Invariant Sections in the license notice of the
+     combined work.
+
+     In the combination, you must combine any sections entitled
+     "History" in the various original documents, forming one section
+     entitled "History"; likewise combine any sections entitled
+     "Acknowledgments", and any sections entitled "Dedications".  You
+     must delete all sections entitled "Endorsements."
+
+  6. COLLECTIONS OF DOCUMENTS
+
+     You may make a collection consisting of the Document and other
+     documents released under this License, and replace the individual
+     copies of this License in the various documents with a single copy
+     that is included in the collection, provided that you follow the
+     rules of this License for verbatim copying of each of the
+     documents in all other respects.
+
+     You may extract a single document from such a collection, and
+     distribute it individually under this License, provided you insert
+     a copy of this License into the extracted document, and follow
+     this License in all other respects regarding verbatim copying of
+     that document.
+
+  7. AGGREGATION WITH INDEPENDENT WORKS
+
+     A compilation of the Document or its derivatives with other
+     separate and independent documents or works, in or on a volume of
+     a storage or distribution medium, does not as a whole count as a
+     Modified Version of the Document, provided no compilation
+     copyright is claimed for the compilation.  Such a compilation is
+     called an "aggregate", and this License does not apply to the
+     other self-contained works thus compiled with the Document, on
+     account of their being thus compiled, if they are not themselves
+     derivative works of the Document.
+
+     If the Cover Text requirement of section 3 is applicable to these
+     copies of the Document, then if the Document is less than one
+     quarter of the entire aggregate, the Document's Cover Texts may be
+     placed on covers that surround only the Document within the
+     aggregate.  Otherwise they must appear on covers around the whole
+     aggregate.
+
+  8. TRANSLATION
+
+     Translation is considered a kind of modification, so you may
+     distribute translations of the Document under the terms of section
+     4.  Replacing Invariant Sections with translations requires special
+     permission from their copyright holders, but you may include
+     translations of some or all Invariant Sections in addition to the
+     original versions of these Invariant Sections.  You may include a
+     translation of this License provided that you also include the
+     original English version of this License.  In case of a
+     disagreement between the translation and the original English
+     version of this License, the original English version will prevail.
+
+  9. TERMINATION
+
+     You may not copy, modify, sublicense, or distribute the Document
+     except as expressly provided for under this License.  Any other
+     attempt to copy, modify, sublicense or distribute the Document is
+     void, and will automatically terminate your rights under this
+     License.  However, parties who have received copies, or rights,
+     from you under this License will not have their licenses
+     terminated so long as such parties remain in full compliance.
+
+ 10. FUTURE REVISIONS OF THIS LICENSE
+
+     The Free Software Foundation may publish new, revised versions of
+     the GNU Free Documentation License from time to time.  Such new
+     versions will be similar in spirit to the present version, but may
+     differ in detail to address new problems or concerns.  See
+     `http://www.gnu.org/copyleft/'.
+
+     Each version of the License is given a distinguishing version
+     number.  If the Document specifies that a particular numbered
+     version of this License "or any later version" applies to it, you
+     have the option of following the terms and conditions either of
+     that specified version or of any later version that has been
+     published (not as a draft) by the Free Software Foundation.  If
+     the Document does not specify a version number of this License,
+     you may choose any version ever published (not as a draft) by the
+     Free Software Foundation.
+
+ADDENDUM: How to use this License for your documents
+----------------------------------------------------
+
+  To use this License in a document you have written, include a copy of
+the License in the document and put the following copyright and license
+notices just after the title page:
+
+       Copyright (C)  YEAR  YOUR NAME.
+       Permission is granted to copy, distribute and/or modify this document
+       under the terms of the GNU Free Documentation License, Version 1.1
+       or any later version published by the Free Software Foundation;
+       with the Invariant Sections being LIST THEIR TITLES, with the
+       Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.
+       A copy of the license is included in the section entitled ``GNU
+       Free Documentation License''.
+
+  If you have no Invariant Sections, write "with no Invariant Sections"
+instead of saying which ones are invariant.  If you have no Front-Cover
+Texts, write "no Front-Cover Texts" instead of "Front-Cover Texts being
+LIST"; likewise for Back-Cover Texts.
+
+  If your document contains nontrivial examples of program code, we
+recommend releasing these examples in parallel under your choice of
+free software license, such as the GNU General Public License, to
+permit their use in free software.
+

ADDED   stml2/INSTALL
Index: stml2/INSTALL
==================================================================
--- /dev/null
+++ stml2/INSTALL
@@ -0,0 +1,23 @@
+These are rough installation instructions. Please contact me at matt@kiatoa.com
+if you have trouble installing.
+
+1. Copy install.cfg.template to install.cfg and modify appropriately
+
+2. Copy stml.config.template to your cgi dir as .stml.config and modify appropriately
+    - choose your db
+
+3. Copy requirements.scm.template to requirements.scm and modify as needed
+    - choose your db (must match what you choose in 2. above)
+
+If on 64 bit and you get error in compiling try fPIC:
+
+CSC_OPTIONS='-C "-fPIC"' make
+
+run 
+
+> make 
+
+or 
+
+> CSC_OPTIONS='-C "-fPIC"' make
+

ADDED   stml2/Makefile
Index: stml2/Makefile
==================================================================
--- /dev/null
+++ stml2/Makefile
@@ -0,0 +1,88 @@
+# Copyright 2007-2008, Matthew Welland.
+# 
+#  This program is made available under the GNU GPL version 2.0 or
+#  greater. See the accompanying file COPYING for details.
+# 
+#  This program is distributed WITHOUT ANY WARRANTY; without even the
+#  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#  PURPOSE.
+#
+# Following needed on bluehost (maybe on all 64bit?)
+#
+# CSC_OPTIONS='-C "-fPIC"' make
+#
+include install.cfg
+
+SRCFILES    = stml2.scm misc-stml.scm session.scm sqltbl.scm formdat.scm setup.scm keystore.scm html-filter.scm cookie.scm 
+MODULEFILES = $(wildcard modules/*/*-mod.scm)
+SOFILES     = $(MODULEFILES:%.scm=%.so)
+CFILES      = $(MODULEFILES:%.scm=%.c)
+OFILES      = $(SRCFILES:%.scm=%.o)
+TARGFILES   = $(notdir $(SOFILES))
+MODULES     = $(addprefix $(TARGDIR)/modules/,$(TARGFILES))
+
+install : $(TARGDIR)/stmlrun $(LOGDIR) $(MODULES)
+	chicken-install
+
+all : $(SOFILES)
+
+# stmlrun : stmlrun.scm formdat.scm  misc-stml.scm  session.scm stml.scm \
+#           setup.scm html-filter.scm requirements.scm keystore.scm \
+#           cookie.scm sqltbl.scm
+# 	csc stmlrun.scm
+
+$(TARGDIR)/stmlrun : stmlrun stml2.so
+	echo "NOTE: CSC_OPTIONS='-C \"-fPIC\"' make"
+	install stmlrun $(TARGDIR)
+	chmod a+rx $(TARGDIR)/stmlrun
+
+$(TARGDIR)/modules :
+	mkdir -p $(TARGDIR)/modules
+
+$(MODULES) : $(SOFILES) $(TARGDIR)/modules
+	cp $< $@
+
+stmlrun : $(OFILES) stmlrun.scm requirements.scm stmlcommon.scm
+	csc $(CSCOPTS) $(OFILES) stmlrun.scm -o stmlrun
+
+stml.so : stmlmodule.so
+	cp stmlmodule.so stml.so
+
+stmlmodule.so : $(OFILES) stmlmodule.scm requirements.scm stmlcommon.scm
+	csc $(CSCOPTS) $(OFILES) -s stmlmodule.scm
+
+# logging currently relies on this
+#
+$(LOGDIR) :
+	mkdir -p $(LOGDIR)
+	chmod a+rwx $(LOGDIR)
+
+test: kiatoa.db cookie.so
+	echo '(exit)'| csi -q  ./tests/test.scm 
+
+# modules
+#
+%.so : %.scm
+	csc $(CSCOPTS) -I modules/* -s $<
+
+%.o : %.scm
+	csc $(CSCOPTS) -c $<
+
+# Cookie is a special case for now. Make a loadable so for test
+# Complile it in by include (see dependencies above).
+cookie.so : cookie.scm
+	csc i$(CSCOPTS) -s cookie.scm
+
+clean :
+	rm -f doc/*~ modules/*/*.so *.import.scm *.import.so *.o *.so *~
+
+# $(CFILES): build/%.c: ../scm/%.scm ../scm/macros.scm
+# 	chicken $< -output-file $@
+# 
+# 
+# $(OFILES): src/%.o: src/%.c
+# 	gcc -c $< `chicken-config -cflags` -o $@
+# 
+# $(src_code): %: src/%.o src/laedlib.o src/layobj.o
+# 	gcc src/$*.o src/laedlib.o src/layobj.o -o $* `chicken-config -libs`
+# 

ADDED   stml2/README
Index: stml2/README
==================================================================
--- /dev/null
+++ stml2/README
@@ -0,0 +1,1 @@
+This is the stml, scheme based cgi application framework. 

ADDED   stml2/TODO
Index: stml2/TODO
==================================================================
--- /dev/null
+++ stml2/TODO
@@ -0,0 +1,22 @@
+1. Documentation. 
+      multiple apps in same cgi dir
+      compilation of models for speed and code protection
+      tricks
+2. Hierarchial pages. Currently pages can be hierarchial but the control.scm 
+   doesn't get called at the right time. 
+3. For sqlite3 usage put session into own db?
+4. A mechanism for sharing variables better between control and view
+   would be good.
+   Perhaps:
+     (let ()
+       (load control)
+       (load view))
+5. Change all the "included" files to be seperately compiled units
+   and adj. makefile accordingly. This would speed up compilation
+   when changes are isolated to one or two files.
+6. The dbi interface needs a simple config mecanism alternative to
+   the current list of pairs which is hard to use on the fly. 
+   Something like the perl:
+     "dbi:host:port:user:password"
+
+I'm sure there is more ...

ADDED   stml2/cookie.scm
Index: stml2/cookie.scm
==================================================================
--- /dev/null
+++ stml2/cookie.scm
@@ -0,0 +1,264 @@
+;;;
+;;; cookie.scm - parse and construct http state information
+;;;  
+;;;   Copyright (c) 2000-2003 Shiro Kawai, All rights reserved.
+;;;   
+;;;   Redistribution and use in source and binary forms, with or without
+;;;   modification, are permitted provided that the following conditions
+;;;   are met:
+;;;   
+;;;   1. Redistributions of source code must retain the above copyright
+;;;      notice, this list of conditions and the following disclaimer.
+;;;  
+;;;   2. Redistributions in binary form must reproduce the above copyright
+;;;      notice, this list of conditions and the following disclaimer in the
+;;;      documentation and/or other materials provided with the distribution.
+;;;  
+;;;   3. Neither the name of the authors nor the names of its contributors
+;;;      may be used to endorse or promote products derived from this
+;;;      software without specific prior written permission.
+;;;  
+;;;   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+;;;   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+;;;   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+;;;   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+;;;   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+;;;   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+;;;   TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+;;;   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+;;;   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+;;;   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+;;;   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+;;;  
+;;;  Ported to Chicken by Reed Sheridan
+;;;
+
+;; Parser and constructor of http "Cookies" defined in
+;; RFC 2965 HTTP state managemnet mechanism
+;;   
+;; See also
+;; RFC 2964 Use of HTTP state management
+;;   
+;; The parser also supports the old Netscape spec
+;;   
+
+;; (declare (unit cookie))
+
+(module cookie
+    *
+
+(import chicken scheme data-structures extras srfi-13 ports posix)
+  
+(require-extension srfi-1 srfi-13 srfi-14 regex)
+;; (use  srfi-1 srfi-13 srfi-14 regex)
+;; (declare (export parse-cookie-string construct-cookie-string))
+
+;; #>
+;; #include 
+;; <#
+;; 
+;; (define fmt-time
+;;   (foreign-lambda* c-string ((long secs_since_epoch))
+;;     "static char buf[256];"
+;;     "time_t t = (time_t) secs_since_epoch;"
+;;     "strftime(buf, sizeof(buf), \"%a, %d-%b-%Y %H:%M:%S GMT\", gmtime(&t));"
+;;     "return(buf);"))
+
+
+(define (fmt-time seconds)
+   (time->string (seconds->utc-time seconds) "%D"))
+
+ ;; utility fn.  breaks  ``attr=value;attr=value ... '' into alist.
+ ;; version is a cookie version.  if version>0, we allow comma as the
+ ;; delimiter as well as semicolon.
+ (define (parse-av-pairs input version)
+   (define attr-regexp
+     (if (= version 0)
+         (regexp "\\s*([\\w$_-]+)\\s*([=\\;]\\s*)?")
+         (regexp "\\s*([\\w$_-]+)\\s*([=\\;,]\\s*)?")))
+   (define attr-delim
+     (if (= version 0) #\; (char-set #\, #\\ #\;)))
+   
+   (define (read-attr input r)
+     (cond ((string-null? input) (reverse! r))
+           ((string-search attr-regexp input)
+            => (lambda (m)
+                 (if (and-let* ((delimiter (third m))) ;;is an attr_value pai
+ 		      (string-prefix? "=" delimiter))
+                     (let ((attr (second m))
+                           (rest (string-search-after attr-regexp input)))
+                       (if (string-prefix? "\"" rest)
+                           (read-token-quoted attr (string-drop rest 1) r)
+                           (read-token attr rest r)))
+                     (read-attr (string-search-after attr-regexp input) ;; Skip ahead if broken input?
+                                (alist-cons (second m) #f r)))))
+           (else
+            ;; the input is broken; for now, we ignore the rest.
+            (reverse! r))))
+   (define (read-token attr input r)
+     (cond ((string-index input attr-delim)
+            => (lambda (i)
+                 (read-attr (string-drop input (+ i 1))
+                            (alist-cons attr
+ 				       (string-trim-right (string-take input i))
+ 				       r))))
+           (else
+            (reverse! (alist-cons attr (string-trim-right input) r)))))
+   (define (read-token-quoted attr input r)
+     (let loop ((input input)
+                (partial '()))
+       (cond ((string-index input (char-set #\\ #\"))
+              => (lambda (i)
+                   (let ((c (string-ref input i)))
+                     (if (char=? c #\\)
+                         (if (< (string-length input) (+ i 1))
+                             (error-unterminated attr)
+                             (loop (string-drop input (+ i 2))
+                                   (cons* (string (string-ref input (+ i 1)))
+                                          (string-take input i)
+                                          partial)))
+                         (read-attr (string-drop input (+ i 1))
+                                    (alist-cons attr
+ 					       (string-concatenate-reverse
+ 						(cons (string-take input i)
+ 						      partial))
+ 					       r))))))
+             (else (error-unterminated attr)))))
+   (define (error-unterminated attr)
+     (error "Unterminated quoted value given for attribute" attr))
+ 
+   (read-attr input '()))
+ 
+ ;; Parses the header value of "Cookie" request header.
+ ;; If cookie version is known by "Cookie2" request header, it should
+ ;; be passed to version (as integer).  Otherwise, it figures out
+ ;; the cookie version from input.
+ ;;
+ ;; Returns the following format.
+ ;;   ((  [:path ] [:domain ] [:port ])
+ ;;    ...)
+ 
+ (define (parse-cookie-string input #!optional version)
+   (let ((ver (cond ((integer? version) version)
+                    ((string-search "^\\s*\\$Version\\s*=\\s*(\\d+)" input)
+                     => (lambda (m)
+                          (string->number (cadr m))))
+                    (else 0))))
+     (let loop ((av-pairs (parse-av-pairs input ver))
+                (r '())
+                (current '()))
+       (cond ((null? av-pairs)
+              (if (null? current)
+                  (reverse r)
+                  (reverse (cons (reverse current) r))))
+             ((string-ci=? "$path" (caar av-pairs))
+              (loop (cdr av-pairs) r (cons* (cdar av-pairs) path: current)))
+             ((string-ci=? "$domain" (caar av-pairs))
+              (loop (cdr av-pairs) r (cons* (cdar av-pairs) domain: current)))
+             ((string-ci=? "$port" (caar av-pairs))
+              (loop (cdr av-pairs) r (cons* (cdar av-pairs) port: current)))
+             (else
+              (if (null? current)
+                  (loop (cdr av-pairs) r (list (cdar av-pairs) (caar av-pairs)))
+                  (loop (cdr av-pairs)
+                        (cons (reverse current) r)
+                        (list (cdar av-pairs) (caar av-pairs)))))))))
+ 
+ ;; Construct a cookie string suitable for Set-Cookie or Set-Cookie2 header.
+ ;; specs is the following format.
+ ;;
+ ;;   ((  [:comment ] [:comment-url ]
+ ;;                    [:discard ] [:domain ]
+ ;;                    [:max-age ] [:path ] [:port ]
+ ;;                    [:secure ] [:version ] [:expires ]
+ ;;    ) ...)
+ ;;
+ ;; Returns a list of cookie strings for each = pair.  In the
+ ;; ``new cookie'' implementation, you can join them by comma and send it
+ ;; at once with Set-cookie2 header.  For the old netscape protocol, you
+ ;; must send each of them by Set-cookie header.
+ 
+ 
+ (define (construct-cookie-string specs #!optional (version 1))
+   (map (lambda (spec) (construct-cookie-string-1 spec version))
+        specs))
+ 
+ (define (construct-cookie-string-1 spec ver)
+   (when (< (length spec) 2)
+     (error "bad cookie spec: at least  and  required" spec))
+   (let ((name (car spec))
+         (value (cadr spec)))
+     (let loop ((attr (cddr spec))
+                (r    (list (if value
+                                (string-append name "="
+                                               (quote-if-needed value))
+                                name))))
+       (define (next s) (loop (cddr attr) (cons s r)))
+       (define (ignore) (loop (cddr attr) r))
+       (cond
+        ((null? attr) (string-join (reverse r) ";"))
+        ((null? (cdr attr))
+         (error (conc "bad cookie spec: attribute " (car attr) " requires value" )))
+        ((eqv? comment: (car attr))
+         (if (> ver 0)
+ 	    (next (string-append "Comment=" (quote-if-needed (cadr attr))))
+             (ignore)))
+        ((eqv? comment-url: (car attr))
+         (if (> ver 0)
+             (next (string-append "CommentURL=" (quote-value (cadr attr))))
+             (ignore)))
+        ((eqv? discard: (car attr))
+         (if (and (> ver 0) (cadr attr)) (next "Discard") (ignore)))
+        ((eqv? domain: (car attr))
+         (next (string-append "Domain=" (cadr attr))))
+        ((eqv? max-age: (car attr))
+         (if (> ver 0)
+             (next (sprintf "Max-Age=~a" (cadr attr)))
+             (ignore)))
+        ((eqv? path: (car attr))
+         (next (string-append "Path=" (quote-if-needed (cadr attr)))))
+        ((eqv? port: (car attr))
+         (if (> ver 0)
+             (next (string-append "Port=" (quote-value (cadr attr))))
+             (ignore)))
+        ((eqv? secure: (car attr))
+         (if (cadr attr) (next "Secure") (ignore)))
+        ((eqv? version: (car attr))
+         (if (> ver 0)
+             (next (sprintf "Version=~a" (cadr attr)))
+             (ignore)))
+        ((eqv? expires: (car attr))
+         (if (> ver 0)
+             (ignore)
+             (next (make-expires-attr (cadr attr)))))
+        (else (error "Unknown cookie attribute" (car attr))))
+       ))
+   )
+ 
+ 
+ ;; (define (quote-value value)
+ ;;   (string-append "\"" (regexp-replace-all #/\"|\\/ value "\\\\\\0") "\""))
+ 
+ (define (quote-value value)
+   (string-append "\"" (string-substitute* value '(("\\\"" . "\\\"") ("\\\\" . "\\\\"))) "\""))
+ 
+ (define quote-if-needed
+   (let ((rx (regexp "[\\\",;\\\\ \\t\\n]")))
+     (lambda (value)
+       (if (string-search rx value)
+ 	  (quote-value value)
+ 	  value))))
+ 
+ (define (make-expires-attr time)
+   (sprintf "Expires=~a"
+ 	   (if (number? time)
+ 	       (fmt-time time)
+ 	       time)))
+ 
+ ;;;; Added support functions from my utils, split this out
+ 
+ (define (string-search-after r s #!optional (start 0))
+   (and-let* ((match-indices (string-search-positions r s start))
+ 	     (right-match (second (first match-indices))))
+     (substring s right-match)))
+)

ADDED   stml2/doc/Makefile
Index: stml2/doc/Makefile
==================================================================
--- /dev/null
+++ stml2/doc/Makefile
@@ -0,0 +1,7 @@
+all : manual.pdf web-page.html
+
+manual.pdf : manual.txt
+	a2x -a toc -f pdf manual.txt
+	# asciidoc -a toc plan.txt
+	a2x -f chunked -a toc manual.txt
+

ADDED   stml2/doc/howto.txt
Index: stml2/doc/howto.txt
==================================================================
--- /dev/null
+++ stml2/doc/howto.txt
@@ -0,0 +1,177 @@
+Gotchas!
+=======
+
+All items for a page *must* be part of a list!
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+   OK:     (list (function1 param1)(function2 param2))
+   NOT OK: (begin (function1 param1)(function2 param2))
+
+
+Various components
+~~~~~~~~~~~~~~~~~~
+
+The URL:
+
+http://the.domain.com/pagename/p1/p2/p3?param1=value1
+
+(s:get-page-params) => '("p1" "p2")
+
+(s:get-param 'param1) => "value1"
+(s:get-param 'param1 'number) => number or #f 
+
+NOTE: it is often practical to use the generic (s:get-inp ...) which
+      will first look for the POST input variable and then fall back
+      to the GET param. This allows one to switch back and forth
+      between GET and POST during development without changing the code.
+
+(s:get-inp 'param1)  ;; trys to find input by name of param1, followed by trying get-param
+
+Create a link.
+~~~~~~~~~~~~~~
+
+(s:a name 'href 
+    (s:link-to "pagename/blah" ""))
+
+Call current page with new param
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+In view.scm:
+
+ (s:center "[" (s:a 'href (s:link-to "polls"
+                           'id
+                            (begin
+                              (poll:poll 'fill-polls)
+                              (poll:poll 'get-next-poll)))
+                          "Go to the next poll")  "]")
+
+In control.scm:
+
+(let ((poll-id (s:get-param 'id)))
+ ;; do stuff based on poll-id
+
+
+Call an action on a specific page
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+ (s:a 'href (s:link-to "polls" 'id (poll:poll 'get 'id) 
+			       'action "poll.edit")
+            "Suggest changes to this poll")
+
+ NOT TRUE! This calls fuction poll.edit (should be in control.scm). Parameter set is 'id to a poll num.
+
+
+A complex link example
+~~~~~~~~~~~~~~~~~~~~~~
+
+(s:a "Reply" 'href (s:link-to (s:current-page) 
+	           'action "discussion.reply" ;; .
+	           'reply_to (number->string (hash-table-ref row 'posts.id)) 
+	           'id (s:get "discussion.parent_object_id")) "reply")
+
+;; use (s:get-param to get the 'id, or 'reply_to values
+
+
+Get and set a session var
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+(s:session-var-get "keyname")
+(s:session-var-get "keyname" 'number) 
+(s:session-var-set! "keyname" "value")
+
+5.1 Page local vars
+
+(s:set! key val)
+(s:get key)
+
+
+make a selection drop down
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+;; items is a hierarchial alist
+;; ( (label1 value1 dispval1 #t) ;; <== this one is selected
+;;   (label2 (label3 value2 dispval2)
+;;           (label4 value3 dispval3)))
+
+In view.scm: 
+
+;;                                   Label   Value visible-str selected
+(s:select '(("World" 0)("Country" 1)("State" 2     "The state" #t       )("Town/City" 3)) 'name 'scope)
+
+Visible str will be shown if provided. Selected will set that entry to pre-selected.
+
+To select a specific entry:
+
+(s:select '(("World" 0 "world" #f)("Country" 1 "country" #t)("State" 2 "state" #f)("Town/City" 3 "town" #f)) 'name 'scope)
+
+In control.scm:
+
+(let ((scope     (s:get-input 'scope))
+      (scope-num (s:get-input 'scope 'number))) ;; 'number, 'raw or 'escaped
+  ....
+
+The optional fourth entry sets that item as selected if true
+
+Simple error reporting
+~~~~~~~~~~~~~~~~~~~~~~
+
+In control.scm:
+(s:set-err "You must provide an email address")
+
+In view.scm:
+(s:get-err s:err-font)
+
+Or:
+(s:get-err (lambda (x)(s:err-font x (s:br))))
+
+
+Sharing data between pages
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+NOTE: This data is *not* preserved between cgi calls.
+
+;; In first page called
+(s:shared-set! "somekey" somevalue)
+
+;; In a page called later
+(let ((dat (s:shared-get "somekey")))
+  ( .... ))
+
+
+Misc useful stuff
+~~~~~~~~~~~~~~~~~
+
+  i. Lazy/safe string->number 
+
+(s:any->number val)
+
+  ii. Random string
+
+(session:make-rand-string len)
+
+ iii. string to number for pgint
+ 
+(s:any->pgint val)
+
+
+Forms and input
+~~~~~~~~~~~~~~~
+
+(s:form 'action "login.login" 'method "post"
+   (s:input-preserve 'type "text" 'name "email-address" 'size "16" 'maxlength "30")
+   (s:input 'type "submit"   'name "form-name" 'value "login"))
+
+(s:get-input 'email-address)
+
+To preserve the input simply do a set of the value on the 'name field:
+(s:set! "email-address" "matt@kiatoa.com")
+
+Radio buttons:
+
+	(s:div 'class "col_3"
+		       (s:input 'type "radio" 'id "group-type1" 'name "group-type" 'value "private" 'checked "checked")
+		       (s:label 'for "group-type1" 'class "inline" "Private")
+		       (s:input 'type "radio" 'id "group-type2" 'name "group-type" 'value "public")
+		       (s:label 'for "group-type2" 'class "inline" "Public"))
+
+       (s:get-input 'group-type) ==> returns private or public depending on which is selected.

ADDED   stml2/doc/manual.txt
Index: stml2/doc/manual.txt
==================================================================
--- /dev/null
+++ stml2/doc/manual.txt
@@ -0,0 +1,56 @@
+STML User Manual
+================
+Matt Welland 
+v1.0, 2012-6
+
+NOT DONE YET! :( sorry.
+
+:numbered!:
+[abstract]
+Example Abstract
+----------------
+
+Yada about stml
+
+:numbered:
+
+User Data Specification
+-----------------------
+
+.User Data
+[width="100%",options="header",cols="-- create table polls(id serial not null,poll_type text,title text,description text,poll_state text);
+-- create table poll_categories(id serial not null,poll_id integer,description text);
+-- create table poll_votes(id serial not null,period integer,poll_type text,poll_category text,voter_group integer, votes integer);
+
+-- create table vote_items (id serial primary key,type integer,item_id integer,item_level text,town_votes integer,state_votes integer,country_votes integer,world_votes integer);
+-- 
+-- alter table vote_items alter column town_votes set default 0;
+-- alter table vote_items alter column state_votes set default 0;
+-- alter table vote_items alter column country_votes set default 0;
+-- alter table vote_items alter column world_votes set default 0;
+-- 
+-- alter table poll_items add column class_0 int4;
+-- alter table poll_items add column class_1 int4;
+-- alter table poll_items add column class_2 int4;
+-- 
+-- alter table poll_items add column classp_0 int4;
+-- alter table poll_items add column classp_1 int4;
+-- alter table poll_items add column classp_2 int4;
+-- 
+-- alter table poll_items alter column classp_0 set default 0;
+-- alter table poll_items alter column classp_1 set default 0;
+-- alter table poll_items alter column classp_2 set default 0;
+-- 
+-- alter table poll_items add column suggestor int4;
+-- 
+-- alter table poll_items alter column class_0 set default 0;
+-- alter table poll_items alter column class_1 set default 0;
+-- alter table poll_items alter column class_2 set default 0;
+-- 
+-- alter table poll_items add column status int4;
+-- alter table poll_items alter column status set default 0;
+
+-- alter table poll_items add column url text;
+-- alter table vote_items add column submit_date date;
+-- alter table poll_items add column submit_date date;
+
+-- alter table people add column pt_balance int4;
+-- alter table people alter column pt_balance set default 0;
+
+-- alter table people add column cert_date date;
+-- alter table people alter column pt_balance set default 0;
+
+-- create table pt_transactions (id serial not null,from_id integer,to_id integer,amount integer,transaction_time timestamp);
+-- alter table pt_transactions alter column amount set default 0;
+
+-- alter table classifieds add column points int4;
+-- alter table classifieds alter column points set default 0;
+
+-- alter table pt_transactions add column comment text;
+-- alter table pt_transactions add column comment text;
+
+-- create table temp_key(id serial not null,key  text,sent_date date);
+-- alter table people add column lastlogin timestamp;
+
+-- create table pictures(id serial not null,owner integer,size integer,name  text,type text,md5sum text,uploaded date);
+-- alter table pictures add column status text;
+
+-- create table pic_allocation(id serial not null,picnum integer,used_by integer);
+
+-- alter table posts add column url text;
+-- alter table posts add column blurb text;
+
+insert into subjects (subjectid,subject,item_type,description) values('VoSp','Spanish','lang','Basic Spanish Vocabulary');
+insert into subjects (subjectid,subject,item_type,description) values('HoMe','Homeopathy','Info','Basic Homeopathy');
+
+alter table items add column group_name text;
+alter table items add column state int4;
+
+create table sessions (id serial not null,session_key text);
+create table session_vars (id serial not null,session_id integer,page text,key text,value text);
+
+alter table poll_items add column num_voted  integer default 0;
+alter table poll_items add column vote_tot   integer default 0;
+alter table poll_items add column item_votes integer default 0;
+
+-- remember ballots are used for many things other than polls!!!!!!!!
+create table ballots (id serial not null, item_id integer, class_id integer, votes integer, type_id integer);
+create table ballot_classes (id serial not null, name text, pts_per_vote integer); -- join with ballots to sum up votes (pts are really votes)
+insert into ballot_classes values (0,'',1);
+insert into ballot_classes values (1,'',2);
+insert into ballot_classes values (2,'',10);
+insert into ballot_classes values (3,'',20);
+insert into ballot_classes values (4,'',45);
+insert into ballot_classes values (5,'',90);
+insert into ballot_classes values (6,'',105);
+insert into ballot_classes values (7,'',145);
+insert into ballot_classes values (8,'',205);
+insert into ballot_classes values (9,'',245);
+
+create table ballot_types (id serial not null, name text);                         -- poll plurality = 0, poll approval = 1
+insert into ballot_types (id,name) values (0,'poll plurality');
+insert into ballot_types (id,name) values (1,'poll approval');
+
+alter table voted add column type_id integer;
+alter table voted add column id serial not null;
+create table voted_types (id serial not null, name text);
+insert into voted_types (id, name) values (0, 'poll vote');                -- YES!!! WE DO NEED voted_types SEPERATE FROM ballot_types
+insert into voted_types (id, name) values (1, 'council vote for poll');    -- yes, they are similar but I think combining them would be
+insert into voted_types (id, name) values (2, 'council vote for item');    -- painful.
+insert into voted_types (id, name) values (3, 'council vote for story');
+
+alter table people add column email_validated integer default 0;  -- has email been validated? Hmmm... should this be a seperate table
+alter table people add column grade integer default 0;            -- 
+
+alter table voted add column grade integer default 0;
+
+-- grade
+-- 
+-- 0 - no status (refusing cookies)
+-- 1 - has session
+-- 2 - logged in, has user id
+-- 3 - email validated
+-- 4 ++ add 1 for every 20 points of cert_level
+
+alter table poll_items drop column class_0  ;
+alter table poll_items drop column class_1  ;
+alter table poll_items drop column class_2  ;
+alter table poll_items drop column classp_0 ;
+alter table poll_items drop column classp_1 ;
+alter table poll_items drop column classp_2 ;
+alter table poll_items drop column votes    ;
+alter table poll_items drop column vote_tot ;
+alter table poll_items drop column num_voted;
+
+alter table poll_items add column a_vote_tot integer default 0; -- approval  votes total
+alter table poll_items add column p_vote_tot integer default 0; -- plurality votes total
+
+alter table people alter column num set default 0;
+alter table polls add column discussion_id integer default 0;
+
+create table poll_status (id serial not null, name text);
+insert into poll_status (id,name) values (0, 'In queue'); -- just posted and in queue
+insert into poll_status (id,name) values (1, 'Posted');   -- published to discussion
+
+-- fix default cert_level
+alter table people alter column cert_level set default 0;
+update people set cert_level=0 where cert_level is NULL;
+
+create table discussions (id serial not null,type_id integer,activity_state integer);
+update posts set thread=id where parent=0; -- was this necessary?
+
+insert into discussions select id,0,1 from posts where parent=0;
+
+-- ======================================================================
+-- New council stuff
+--======================================================================
+
+create table councils (id serial not null, name text, discussion_id integer default 0);
+alter table  council_members add column join_date date;
+
+-- DONE ON TANG UP TO HERE
+
+--======================================================================
+-- New locations table
+--======================================================================
+
+create table locations
+         (id serial not null, parent_id integer default 0, 
+          council_id integer,nick text, fullname text, 
+          level_id integer, blurb text, pict_id integer);
+insert into locations(council_id,nick,fullname,level_id,blurb)
+    values(0,'','World',0,'Our beloved Planet Earth');
+insert into locations(council_id,nick,fullname,level_id,blurb)
+    values(1,'us','United States',1,'The Land of the Free');
+insert into locations(parent_id,council_id,nick,fullname,level_id,blurb)
+    values(1,2,'az','Arizona',2,'It''s a dry heat');
+
+drop table location;
+drop table towns;
+drop table states;
+drop table neighborhoods ;
+drop table countries;

ADDED   stml2/example/db/dump_db
Index: stml2/example/db/dump_db
==================================================================
--- /dev/null
+++ stml2/example/db/dump_db
@@ -0,0 +1,1 @@
+pg_dump -d kiatoa | grep -v 'INSERT INTO session_vars' | grep -v 'INSERT INTO sessions' > Kiatoa.sql

ADDED   stml2/example/docs/Setup-notes.txt
Index: stml2/example/docs/Setup-notes.txt
==================================================================
--- /dev/null
+++ stml2/example/docs/Setup-notes.txt
@@ -0,0 +1,15 @@
+1) add:
+
+host    all         all         192.168.1.1/32        password
+
+to the bottom of /etc/postgresql/8.2/main/pg_hba.conf
+
+2)
+
+ln -s /home/matt/kiatoa/kiatoa-scm/kiatoa /var/www
+
+3) copy/update the stml.conf file
+
+sudo cp stml.conf.template /usr/lib/cgi-bin/.stml.conf
+sudo vi /usr/lib/cgi-bin/.stml.conf
+

ADDED   stml2/example/docs/comments.txt
Index: stml2/example/docs/comments.txt
==================================================================
--- /dev/null
+++ stml2/example/docs/comments.txt
@@ -0,0 +1,20 @@
+
+If we had any at all of the alternative voting ideas like instant runoff, Condorcet, any of them, I think it might make the whole process better
+
+My thought was to get people familiar with approval voting, then get people to pledge only to vote for a candidate if that candidate supported approval voting. I put the beginings of a site together here: http://approvalvote.org but stopped working on it because I decided not to push the idea for this election. Morally, in my opinion, letting the neocons in for another term is unacceptable, I suspect (but don't know) that McCain is a participant of the neocon movement. Since these elections can hinge on a few hundreds of votes I thought it wasn't worth even the infintesimal risk of any activity that would get people thinking about the alternatives to the top two pulling votes away from Obama. I did think of pushing the idea in venues dominated by interest in Ron Paul but there was some beer in the fridge and, well, you can guess the rest of that story.
+
+Although the current implementation needs major rework I do think the idea has potential.
+
+   1. Get people to experience plurality vs approval voting. IMHO once you've tried it going back to plurality is actually quite uncomfortable.
+   2. Get people to pledge to vote only for candidates that support approval voting.
+   3. Get candidates to address approval voting.
+
+Now why approval and not Condorcet, range, IRV or any one of the dozens of other voting techniques?
+
+   1. Approval is 100% doable using existing election machines
+   2. Approval is highly resistant to any meaningful strategic voting.
+   3. Approval is easy for the end users. Go try doing some condorcet or IRV ranked voting. It is really tedious.
+   4. IRV is *worse* than Plurality in its vunerablity to strategic voting.
+   5. Condorcet is too hard to grok for most folks. I knew once how it worked but couldn't explain it to someone right now for the life of me.
+
+In short the marginal improvement of the more complex voting solutions over approval doesn't buy much.

ADDED   stml2/example/example/layout.css
Index: stml2/example/example/layout.css
==================================================================
--- /dev/null
+++ stml2/example/example/layout.css
@@ -0,0 +1,244 @@
+
+/*-General-----------------------------------------------*/
+
+html, body {
+	margin:0px;
+	padding:0px;
+}
+
+form {
+	display:inline;
+	margin:0px;
+	padding:0px;
+}
+
+a img {
+	border:none;
+	margin:0px;
+	padding:0px;
+}
+
+h1, h2, h3, h4, h5, h6, p, div {
+	margin:0px;
+	padding:0px;
+}
+
+.right {
+	float:right;
+}
+
+.left{
+	float:left;
+}
+
+/*-Main Layout-------------------------------------------*/
+
+#overall {
+	margin:5px 12px 0px 12px;
+	padding:0px;
+}
+
+/*-Header-------------*/
+
+.header {
+	position:relative;
+	height:90px;
+}
+
+/*-Footer-------------*/
+
+.footer {
+	padding:40px 0px 0px 0px;
+	position:relative;
+	clear:both;
+}
+
+/*-Content Area-------*/
+
+.content {
+	width:100%;
+}
+
+/*-Left Column--------*/
+
+.leftcolumn	{
+  float:left;
+  width:145px;
+  margin:5px;
+}
+
+.leftcolumn .node {
+	margin:0px 0px 15px 0px;
+}
+
+.leftcolumn .node h1 {
+	padding:0px 0px 0px 3px;
+}
+
+.leftcolumn .node ul {
+	margin:0px;
+	padding:0px;
+}
+
+.leftcolumn .node li {
+	display:block;
+	padding:0px 0px 0px 3px;
+	margin:0px;
+}
+
+.leftcolumn .node li.more{
+	padding:0px 0px 0px 6px;
+}
+
+/*-Center Column------*/
+
+.centercolumn {
+        margin: 5px;
+	margin-left:152px;
+        margin-right:200px;
+	font-family:"\"}\"";
+	font-family:inherit;
+}
+
+.centercolumn .node h1 {
+	padding: 0px 0px 0px 13px;
+}
+
+.centercolumn .node h4 {
+	margin: 15px 0px 10px 0px;
+}
+
+.centercolumn .node p {
+	margin: 0px 0px 10px 0px; */
+	padding: 0px 0px 0px 0px;
+}  /* this seemed not to work */
+
+.posts_0  {
+	margin: 0px 0px 0px 0px;
+}
+
+.posts_1  {
+	margin: 0px 0px 0px 20px;
+}
+
+.posts_2  {
+	margin: 0px 0px 0px 40px;
+}
+
+.posts_3  {
+	margin: 0px 0px 0px 60px;
+}
+
+.posts_4  {
+	margin: 0px 0px 0px 80px;
+}
+
+.posts_5  {
+	margin: 0px 0px 0px 100px;
+}
+
+.posts_6  {
+	margin: 0px 0px 0px 120px;
+}
+
+.posts_7  {
+	margin: 0px 0px 0px 140px;
+}
+
+.posts_8  {
+	margin: 0px 0px 0px 160px;
+}
+
+.posts_9  {
+	margin: 0px 0px 0px 160px;
+}
+
+.posts_10  {
+	margin: 0px 0px 0px 180px;
+}
+
+/*-Right Column-------*/
+
+.rightcolumn {
+	float:right;
+        width:190px;
+	margin:5px 5px 0px 0px;
+}
+
+* html .rightcolumn {
+	margin:3px 3px 3px 3px;
+}
+
+body>div .rightcolumn {
+	margin:0px 0px 0px 0px;
+}
+
+.rightcolumn .node {
+	margin:0px 0px 5px 0px;
+	padding:0px;
+}
+
+.rightcolumn .node h2 {
+	margin:3px 3px 3px 2px;
+}
+
+.rightcolumn .node ul {
+  list-style-position:inside;
+  margin:0px;
+  padding:1px;
+}
+
+.rightcolumn .node ul.none {
+	list-style-position:inside;
+}
+
+.rightcolumn .node ul.dot {
+	list-style-position:inside;
+}
+
+.rightcolumn .node ul.books {
+	list-style-position:outside;
+	margin:0px 0px 0px 35px;
+}
+
+.rightcolumn .node li {
+	padding:0px 0px 0px 3px;
+	margin:0px;
+}
+
+/*-Remaining layout--------------------------------------*/
+
+#title {
+	top: 0px;
+	left: 0px;
+	position: absolute;
+}
+
+#search {
+	float:left;
+	margin:0px 0px 0px 30px;
+}
+
+#randomquote {
+	float:right;
+	margin:0px 30px 0px 0px;
+}
+
+#copyright {
+	text-align:center;
+	padding:15px 0px 0px 0px;
+	margin:0px 0px 0px 0px;
+	clear:both;
+}
+
+#bottomNav {
+	text-align:center;
+	margin:0px 0px 20px 0px;
+	padding:0px;
+}
+
+#oldStuffNav {
+	font-weight:bold;
+	text-align:right;
+}
+

ADDED   stml2/example/example/markup.css
Index: stml2/example/example/markup.css
==================================================================
--- /dev/null
+++ stml2/example/example/markup.css
@@ -0,0 +1,299 @@
+/*-General-----------------------------------------------*/
+
+body {
+  background-color:#ffffff;
+  color:#0f0f0f;
+  font-family:serif;
+  font-weight:normal;
+  text-decoration:none; 
+/*  font-size:x-small; */
+  voice-family:"\"}\"";
+  voice-family:inherit;
+  font-size:small;
+}
+
+html>body {
+  font-size:small;
+}
+
+.strong {
+  font-weight:bold;
+}
+
+#red { 
+  color: #ff0000
+}
+
+/*-Main Markup-------------------------------------------*/
+
+#overall {
+  background-color: #ffffff;
+  color:#000000;
+}
+
+/*-Left Column--------*/
+
+.leftcolumn .node a {
+  color:#006666;
+  background-color:transparent;
+}
+
+.leftcolumn .node p {
+  font-size:1.2em;
+  font-weight:normal;
+}
+
+.leftcolumn .node h1 {
+  font-weight:normal;
+  font-size:1.2em;
+  color:#ffffff;
+  background-color:#000000; /* #005991;  #7f9bff #006666; */
+}
+
+.leftcolumn .node h1 a {
+  color:#ffffff;
+  background-color:transparent;
+}
+
+.leftcolumn .node h2 {
+  font-weight:bold;
+  font-size:.95em;
+}
+
+.leftcolumn .node ul {
+  list-style-type:none;
+}
+
+.leftcolumn .node li.more {
+  font-weight:bold;
+  font-size:.75em;
+}
+
+.leftcolumn .node li.selected {
+  font-weight:bold;
+  font-size:1.18em;
+  color:#000000;
+  background-color:#cccccc;
+}
+
+.leftcolumn .node li.selected a {
+  color:#000000;
+  background-color:transparent;
+}
+
+/*-Center Column for classifieds-*/
+
+.centercolumn .classifieds h1 { 
+  font-family:Arial, Helvetica, serif;
+  font-weight:bold;
+  font-size:1.38em;
+  color:#000000; /* ffffff; */
+  background: #5390b7; /* a6bcac; #0c1e0f; 043b0d; 1a6126; */
+}
+
+/*-Center Column------*/
+.centercolumn .node {
+  font-family:serif;
+}
+
+.centercolumn .node a {
+  color:#006666;
+  background-color:transparent;
+}
+
+.centercolumn .node h1 {
+  font-family:Arial, Helvetica, serif;
+  font-weight:bold;
+  font-size:1.38em;
+  color:#ffffff;
+  background:#000000; /* #005991; */
+} /* #006666 /* url('../images/slc.gif') no-repeat; */
+     
+.centercolumn .node h1 a {
+  color:#ffffff;
+  background-color:transparent;
+}
+
+.centercolumn .node h2 {
+  font-weight:bold;
+  font-size:1.18em;
+}
+
+.centercolumn .node h3 {
+  font-weight:bold;
+  font-size:.95em;
+}
+
+.centercolumn .node h4 {
+  font-weight:normal;
+  font-size:1.2em;
+}
+
+.centercolumn .node h4 a {
+  font-weight:bold;
+}
+
+.centercolumn .node p {
+  font-weight:normal;
+}
+
+.centercolumn .posts_0 h1 { 
+  color:#ffffff;
+  background-color:#606060;
+  font-size:1.18em;
+}
+
+.centercolumn .posts_1 h1 { 
+  color:#ffffff;
+  background-color:#606060;
+  font-size:1.18em;
+}
+
+.centercolumn .posts_2 h1 { 
+  color:#ffffff;
+  background-color:#606060;
+  font-size:1.18em;
+}
+
+.centercolumn .posts_3 h1 { 
+  color:#ffffff;
+  background-color:#606060;
+  font-size:1.18em;
+}
+
+.centercolumn .posts_4 h1 { 
+  color:#ffffff;
+  background-color:#606060;
+  font-size:1.18em;
+}
+
+.centercolumn .posts_5 h1 { 
+  color:#ffffff;
+  background-color:#606060;
+  font-size:1.18em;
+}
+
+.centercolumn .posts_6 h1 { 
+  color:#ffffff;
+  background-color:#606060;
+  font-size:1.18em;
+}
+
+.centercolumn .posts_7 h1 { 
+  color:#ffffff;
+  background-color:#606060;
+  font-size:1.18em;
+}
+
+.centercolumn .posts_8 h1 { 
+  color:#ffffff;
+  background-color:#606060;
+  font-size:1.18em;
+}
+
+.centercolumn .posts_9 h1 { 
+  color:#ffffff;
+  background-color:#606060;
+  font-size:1.18em;
+}
+
+.centercolumn .posts_10 h1 { 
+  color:#ffffff;
+  background-color:#606060;
+  font-size:1.18em;
+}
+
+/*-Right Column-------*/
+
+.rightcolumn .node {
+  color:#000000;
+  background-color:#cccccc;
+  font-family:serif;
+}
+
+.rightcolumn .node a {
+  color:#000000; /* #005991;  #006666; */
+  background-color:transparent;
+}
+
+.rightcolumn .node h1 {
+  font-family:Arial, Helvetica, serif;
+  font-weight:bold;
+  font-size:0.95em; /* 1.38em; */
+  color:#ffffff;
+  background-color: #000000; /* #005991;  #006666; */
+}
+
+.rightcolumn .node h1 a {
+  color:#ffffff;
+  background-color:transparent;
+}
+
+.rightcolumn .node h2 {
+  font-weight:bold;
+  font-size:.95em;
+}
+
+.rightcolumn .node ul.none {
+  list-style-type:none;
+}
+
+.rightcolumn .node ul.dot {
+  list-style-type:none;
+  /* list-style-image:url('../images/listdot.gif'); */
+}
+
+.rightcolumn .node ul.books {
+  list-style-type:disc;
+}
+
+/*-OSDN Navagation bar-----------------------------------*/
+
+#OSDNNavbar {
+  background-color:#999999;
+  color:#000000; /* #005991; /* #006666; */
+}
+
+#OSDNNavbar div#links {
+  background-color:#999999;
+  color:#000000; /* #005991; /* #006666; */
+}
+
+#OSDNNavbar a {
+  background-color: transparent;
+  color: #000000; /* #005991; /* #006666; */
+}
+
+/*-Remaining layout--------------------------------------*/
+
+#randomquote {
+  font-size:1.2em;
+  font-style:italic;
+}
+
+#copyright {
+  font-size:.75em;
+  font-family:Arial, Helvetica, serif;
+  background-color:transparent;
+  color:#000000; /* #005991; /* #006666; */
+}
+
+#copyright a {
+  background-color:transparent;
+  color:#000000; /* #005991; /* #006666; */
+}
+
+#bottomNav {
+  background-color:transparent;
+  color:#000000; /* #005991; /* #006666; */
+}
+
+#bottomNav a {
+  background-color:transparent;
+  color:#ffffff;
+}
+
+#oldStuffNav {
+  font-weight:bold;
+}
+

ADDED   stml2/example/models/candidate.scm
Index: stml2/example/models/candidate.scm
==================================================================
--- /dev/null
+++ stml2/example/models/candidate.scm
@@ -0,0 +1,67 @@
+;; Copyright 2007-2008, Matthew Welland. matt@kiatoa.com All rights reserved.
+;; 
+;; models/candidates.scm
+;;
+
+(define (candidate:get-top n)
+  (dbi:get-rows 
+   (s:db) 
+   "SELECT DISTINCT id,name,url,party,desc,supports_av,date_added,score,pscore FROM candidates AS c ORDER BY score DESC LIMIT ?;" n))
+
+;; HERE !!!! getting vote counts... DONT'USE- SEE VOTED INSTEAD
+(define (candidate:get-votes candidates vote_type)
+  (let ((ids (map (lambda (c)(candidate:get-id c)) candidates)))
+    (dbi:get-rows (s:db)
+		  (conc
+		   "SELECT id,sum(votes*(1+score)) WHERE vote_date>"
+		   (- (current-time) (* 24 60 60 7)) ;; seven days
+		   " AND id IN "
+		   (apply conc (intersperse ids ","))))))
+		   
+(define (candidate:get-by-name name)
+  (dbi:get-one-row (s:db) "SELECT id,name,url,party,desc,supports_av,date_added,score,pscore FROM candidates WHERE name=?;" name))
+
+;; update an existing candidate or create if new
+(define (candidate:update dat)
+  (let* ((name   (candidate:get-name dat))
+	 (olddat (candidate:get-by-name name)))
+    (if olddat
+	(begin
+	  (dbi:exec (s:db) 
+		    "UPDATE candidates SET url=?,party=?,desc=?,supports_av=? WHERE name=?;"
+		    (candidate:get-url   dat)
+		    (candidate:get-party dat)
+		    (candidate:get-desc  dat)
+		    (candidate:get-supports-av dat)
+		    name)
+	  (candidate:get-by-name name))
+	(begin
+	  (dbi:exec (s:db)
+		    "INSERT INTO candidates (name,url,party,desc,supports_av) VALUES(?,?,?,?,?);"
+		    name
+		    (candidate:get-url   dat)
+		    (candidate:get-party dat)
+		    (candidate:get-desc  dat)
+		    (candidate:get-supports-av dat))
+	  (candidate:get-by-name name)))))
+
+
+(define (candidate:get-id           dat)(vector-ref dat 0)) 
+(define (candidate:get-name         dat)(vector-ref dat 1)) 
+(define (candidate:get-url          dat)(vector-ref dat 2))
+(define (candidate:get-party        dat)(vector-ref dat 3))
+(define (candidate:get-desc         dat)(vector-ref dat 4))
+(define (candidate:get-supports-av  dat)(vector-ref dat 5))
+(define (candidate:get-date-added   dat)(vector-ref dat 6))
+(define (candidate:get-score        dat)(vector-ref dat 7))
+(define (candidate:get-pscore       dat)(vector-ref dat 8))
+
+(define (candidate:set-id!          dat val)(vector-set! dat 0 val)) 
+(define (candidate:set-name!        dat val)(vector-set! dat 1 val)) 
+(define (candidate:set-url!         dat val)(vector-set! dat 2 val))
+(define (candidate:set-party!       dat val)(vector-set! dat 3 val))
+(define (candidate:set-desc!        dat val)(vector-set! dat 4 val))
+(define (candidate:set-supports-av! dat val)(vector-set! dat 5 val))
+(define (candidate:set-date-added!  dat val)(vector-set! dat 6 val))
+(define (candidate:set-score!       dat val)(vector-set! dat 7 val))
+

ADDED   stml2/example/models/maint.scm
Index: stml2/example/models/maint.scm
==================================================================
--- /dev/null
+++ stml2/example/models/maint.scm
@@ -0,0 +1,57 @@
+;; Copyright 2007-2008, Matthew Welland. matt@kiatoa.com All rights reserved.
+;; 
+;; maint/control.scm
+;;
+
+;; evolve your schema here!
+;; Add entries and then go to http:/your-url/maint
+;;
+;; first make maint:db available as a global
+;;
+(define maint:db (slot-ref s:session 'conn))
+
+;; you can store lambda's or SQL queries to be exectuted
+;; be extremely careful - especially with the lambda's!!!
+(define maint:schema-updates
+  (list (list 1 (lambda ()(keystore:set! maint:db "MAINTPW" "Abc123")))
+	(list 2 "CREATE TABLE people (id INTEGER PRIMARY KEY,name TEXT DEFAULT '',nick TEXT DEFAULT '',email TEXT,password TEXT,status INTEGER DEFAULT 0,score INTEGER DEFAULT 0,location_id INTEGER DEFAULT 0);")
+	(list 3 "CREATE TABLE candidates (id INTEGER PRIMARY KEY,name TEXT DEFAULT '',url TEXT DEFAULT '',party TEXT DEFAULT '',desc TEXT DEFAULT '',supports_av INTEGER,date_added DATETIME,score INTEGER DEFAULT 0);")
+	(list 4 "CREATE TABLE votes (id INTEGER PRIMARY KEY,candidate_id INTEGER,vote_date INTEGER,votes INTEGER,score INTEGER,vote_type INTEGER);")
+	(list 5 "CREATE TABLE voted (id INTEGER PRIMARY KEY,user_id INTEGER,vote_date INTEGER,score INTEGER);")
+	;; location_type can be: city, town, state, region, county etc
+	(list 6 "CREATE TABLE locations (id INTEGER PRIMARY KEY,parent_id INTEGER,codename TEXT,name TEXT,location_type TEXT,desc TEXT,url TEXT);")
+	(list 7 "INSERT INTO locations VALUES(0,0,'ea','earth','planet','Home Planet of Humans','');")
+	(list 8 "ALTER TABLE candidates ADD column pscore INTEGER DEFAULT 0;")
+	))
+
+(define (maint:am-i-maint?)
+  ;; Enter a maint password - return #t if good
+  #t)
+
+(define (maint:update-tables)
+  (let* ((db       (slot-ref s:session 'conn))
+	 (curr-ver (s:any->number (keystore:get db "SCHEMA-VERSION"))))
+    (if (not curr-ver)
+	(begin
+	  (keystore:set! (slot-ref s:session 'conn) "SCHEMA-VERSION" 0)
+	  (set! curr-ver 0)))
+    (if (null? maint:schema-updates)
+	(keystore:set! (slot-ref s:session 'conn) "SCHEMA-VERSION" 0)
+	(let loop ((hed (car  maint:schema-updates))
+		   (tal (cdr maint:schema-updates))
+		   (highest-ver 0))
+	  (if (< (length hed) 2)
+	      (s:log "Malformed maint:schema-updates table in maint/control.scm")
+	      (let ((ver (car hed))
+		    (act (cadr hed)))
+		(if (> ver curr-ver) ;; need to apply this one
+		    (begin
+		      (if (string? act)
+			  (dbi:exec db act)
+			  (act))
+		      ;; yes, do this for each one, just in case of a crash
+		      (keystore:set! db "SCHEMA-VERSION" ver)))
+		(if (null? tal)
+		    highest-ver
+		    (loop (car tal)(cdr tal) ver))))))))
+

ADDED   stml2/example/models/person.scm
Index: stml2/example/models/person.scm
==================================================================
--- /dev/null
+++ stml2/example/models/person.scm
@@ -0,0 +1,68 @@
+;; Copyright 2007-2008, Matthew Welland. matt@kiatoa.com All rights reserved.
+;; 
+;; models/person.scm
+;;
+(require "md5")
+
+(define (person:get-dat email)
+  (dbi:get-one-row (s:db) "SELECT id,name,email,status,password,score FROM people WHERE email=?;" email))
+
+;; this effectively auto logs in using "" as the password
+(define (person:create-or-get email)
+  (let ((dat (person:get-dat email)))
+    (if dat
+	(person:authenticate email "")
+	(person:set-password email ""))))
+
+(define (person:password-match? password cryptedpw)
+  (string=? (md5:digest password) cryptedpw))
+
+(define (person:authenticate email password)
+  (let ((pdat (person:get-dat email)))
+    (if pdat
+	;; (if (s:password-match? password (vector-ref pdat 4))
+	(if (person:password-match? password (vector-ref pdat 4))
+	    pdat ;; password matched, return basic record id,name,email,status
+	    #f)
+	#f)))
+
+;; sets password, creates user if doesn't exist
+(define (person:set-password email password)
+  (let ((pdat (person:get-dat email))
+	;; (cpwd (s:crypt-passwd password #f)))
+        (cpwd (md5:digest password)))
+    (if pdat
+	(dbi:exec (s:db)
+		  "UPDATE people SET password=? WHERE email=?;" 
+		  cpwd
+		  email)
+	(dbi:exec (s:db)
+		  "INSERT INTO people (name,email,password) VALUES(?,?,?);"
+		  ""
+		  email
+		  cpwd))
+    (if pdat 
+	pdat
+	(person:get-dat email))))
+
+(define (person:learn_enabled? email)
+  (eq? (dbi:get-one (s:db) "SELECT status FROM people WHERE email=?;" email)
+       1))
+
+(define(person:files_enabled? email)
+  #f)
+
+;; id,name,email,status,password,score
+(define (person:get-id       dat)(vector-ref dat 0))
+(define (person:get-name     dat)(vector-ref dat 1))
+(define (person:get-email    dat)(vector-ref dat 2))
+(define (person:get-status   dat)(vector-ref dat 3))
+(define (person:get-password dat)(vector-ref dat 4))
+(define (person:get-score    dat)(vector-ref dat 5))
+
+(define (person:set-id!       dat val)(vector-set! dat 0 val))
+(define (person:set-name!     dat val)(vector-set! dat 1 val))
+(define (person:set-email!    dat val)(vector-set! dat 2 val))
+(define (person:set-status!   dat val)(vector-set! dat 3 val))
+(define (person:set-password! dat val)(vector-set! dat 4 val))
+(define (person:set-score!    dat val)(vector-set! dat 5 val))

ADDED   stml2/example/models/voting.scm
Index: stml2/example/models/voting.scm
==================================================================
--- /dev/null
+++ stml2/example/models/voting.scm
@@ -0,0 +1,61 @@
+;; Copyright 2007-2008, Matthew Welland. matt@kiatoa.com All rights reserved.
+;; 
+;; models/voting.scm
+;;
+;; store the votes!
+
+;; look up the entry to which to add 
+(define (voting:get-entry-id candidate-id score type)
+  (dbi:get-one (s:db) "SELECT id FROM votes WHERE candidate_id=? AND score=? AND vote_type=? AND vote_date>?;"
+	       candidate-id
+	       score
+	       type
+	       (- (current-seconds) 86400))) ;; i.e. since 24 hrs ago
+  
+(define (voting:apply-vote dat candidate-id vote-type)
+  (let* ((score (person:get-score dat))
+	 (vote-entry-id (voting:get-entry-id candidate-id score vote-type)))
+    (if vote-entry-id
+	(dbi:exec (s:db) "UPDATE votes SET votes=votes+1 WHERE id=?;" vote-entry-id)
+	(dbi:exec (s:db) "INSERT INTO votes (candidate_id,vote_date,votes,score,vote_type) VALUES(?,?,?,?,?);" 
+		  candidate-id
+		  (current-seconds)
+		  1
+		  score
+		  vote-type))))
+
+(define (voting:rollup-votes)
+  (let ((adat (dbi:get-rows (s:db) 
+			    "SELECT candidate_id AS id,SUM(votes*(score+1)) AS score FROM votes WHERE vote_date>? AND vote_type=1 GROUP BY candidate_id;"
+			    (- (current-seconds) (* 24 60 60 7))))
+	(pdat (dbi:get-rows (s:db) 
+			    "SELECT candidate_id AS id,SUM(votes*(score+1)) AS score FROM votes WHERE vote_date>? AND vote_type=0 GROUP BY candidate_id;"
+			    (- (current-seconds) (* 24 60 60 7)))))
+    (for-each
+     (lambda (row)
+       (dbi:exec (s:db) "UPDATE candidates SET score=? WHERE id=?;" (vector-ref row 1)(vector-ref row 0)))
+     adat)
+    (for-each
+     (lambda (row)
+       (dbi:exec (s:db) "UPDATE candidates SET pscore=? WHERE id=?;" (vector-ref row 1)(vector-ref row 0)))
+     pdat)))
+
+;; vote_type: 0=plurality, 1=approval
+(define (voting:handle-votes email approval plurality)
+  (let* ((pdat (let ((e (s:session-var-get "email")))
+		 (if e 
+		     (person:get-dat e)
+		     (person:create-or-get (if (or (not (string? email)) 
+						   (string-match (regexp "^\\s*$") email))
+					       "noname" 
+					       email)))))) ;; is this really the logic I wanted?
+    ;; (s:log "Got here eh!" " pdat: " pdat)
+    (if (not pdat)
+	(s:set! "errmsg" "Failed to auto log in/register, email or nick already in use. Consider reseting your password")
+	(begin
+	  (s:session-var-set! "email" (person:get-email pdat))
+	  (voting:apply-vote pdat plurality 0)
+	  (map (lambda (candidate-id)
+		 (voting:apply-vote pdat candidate-id 1))
+	       approval)
+	  (voting:rollup-votes)))))

ADDED   stml2/example/pages/action/view.scm
Index: stml2/example/pages/action/view.scm
==================================================================
--- /dev/null
+++ stml2/example/pages/action/view.scm
@@ -0,0 +1,51 @@
+;; Copyright 2007-2008, Matthew Welland. Kiatoa.com All rights reserved.
+;; 
+(s:div 'class "node" 
+       (s:h1 "Approval voting works")
+       "
    Approval voting is very resistant to strategic voting and it is 
+        extremely easy to implement using existing ballot technology.
+       
    Every four years voters must
+       make a painful strategic choice, either vote for the candidate
+       they really want and risk getting saddled
+       with a candidate they don't want, OR
+       vote for the most palatable frontrunner, and send a false
+       message of disinterest in their true choice."
+       (s:h1 "Thinking is required for a democracy to work")
+       "
    Consider trying the "fool test" on an unsuspecting friend or aquaintence.
+        . Pick a popular smear or other known distortion aimed at a candidate you suspect your
+        "person under test", or PUT,
+        doesn't like. Research the item and find out the truth about it as
+        best you can. Start with 
+        factcheck.org but don't stop there. Use google or other search 
+        engines to build up a picture of what is true.
+
+        
    Once you are armed with information you can apply the test. Ask your
+        friend or collegue for the truth behind the smear. Be neutral. Accept
+        their answer without judgement if it is incorrect. Say "oh", or 
+        "thanks" and let it be at that. Again, DO NOT CORRECT THEM!
+
+        
    If your PUT fails the test don't harp on them or correct them. 
+        Although everyone is responsible for researching the facts many people will
+        lock onto their existing ideas if challenged. Instead say something like,
+        "you may want to research that" and accept that you are dealing with
+        someone who just might be a fool, unwilling or unable to look at their
+        favorite candidate with a critical eye.
+        
    Finally, be prepared to be tested yourself,
+        aggressively research the smears your favored candidates put out. If they are true
+        be prepared to prove it, if they are false, be prepared to put them in 
+        context or simply admit they are false. No candidate will be perfect."
+	(s:h1 "A strategy for change")
+	"
    Get a yes/no answer from your favored candidate about approval voting.
+         If your candidate refuses to support approval voting first hear them out. If their 
+         reasons are good then publish them so we can all learn from it. If their
+         reasons are weak then look for an alternative candidate to support.
+
+         
    Improve your score here on approvalvote.org and then vote again in our front 
+         page poll. Your score will adjust the power of your vote such that the poll 
+         will reflect the choices of those who are willing to think. 
+       
+         We will advocate that everyone votes for an approval vote supporting independant 
+         candidate if that candidate is at least 10% ahead of the next candidate of 
+         the same leaning (i.e. liberal or conservative). Otherwise you should vote 
+         for the frontrunner candidate of your choosen leaning due to the dangers of 
+         plurality voting.")

ADDED   stml2/example/pages/footer/view.scm
Index: stml2/example/pages/footer/view.scm
==================================================================
--- /dev/null
+++ stml2/example/pages/footer/view.scm
@@ -0,0 +1,5 @@
+;; Copyright 2007-2008, Matthew Welland. Kiatoa.com All rights reserved.
+;; 
+;; footer
+(list
+ (s:div 'class "node" "This is the footer"))

ADDED   stml2/example/pages/header/control.scm
Index: stml2/example/pages/header/control.scm
==================================================================
--- /dev/null
+++ stml2/example/pages/header/control.scm
@@ -0,0 +1,9 @@
+;; Copyright 2007-2008, Matthew Welland. Kiatoa.com All rights reserved.
+;; 
+;; header/control.scm
+
+;; (load (s:model-path "blah"))
+(define header:menu-items '(("home" "Home")("learn" "Learn")("action" "Take Action")("discussion" "Discussion")
+			    ("preferences" "Preferences")))
+(define header:title (let ((t (s:get-param 'section)))
+		       (if t t "Home")))

ADDED   stml2/example/pages/header/view.scm
Index: stml2/example/pages/header/view.scm
==================================================================
--- /dev/null
+++ stml2/example/pages/header/view.scm
@@ -0,0 +1,30 @@
+;; Copyright 2007-2008, Matthew Welland. Kiatoa.com All rights reserved.
+;; 
+;; header/view.scm
+;;
+(list
+ ;; (s:div 'id "titlebar"
+	(s:table
+	 (s:tr
+	  (s:td (s:img 'src "/www/images/approvalvote.png" 
+		       'alt "ApprovalVote.com" 
+		       'title "Welcome to ApprovalVote.com"))
+	  (s:td 'valign "top" 'align "right"
+		(s:table 'border "0" 'cellspacing "0"
+			 (s:tr 
+			  (s:td 'valign "center" ;; 'width "250" ;; 'rowspan "2"
+				(s:a (s:small " *      NOW IS A GREAT TIME TO PUSH FOR APPROVAL VOTING!     * "))
+				(s:br)))
+			 (s:tr 
+			  (s:td 'columnspan="3" 
+				(s:center "*********")))))) ;;  header:title))))))
+	 ;; this is the horizontal menus
+	 (s:tr 'columnspan "4"
+	       (s:table
+		(s:tr
+		  (map (lambda (m-item)
+			 (s:td (s:small  "[" 
+					 (s:a 'href (s:link-to (car m-item))(cadr m-item))
+					 "]")))
+		       header:menu-items)
+		  )))));; )

ADDED   stml2/example/pages/home/view.scm
Index: stml2/example/pages/home/view.scm
==================================================================
--- /dev/null
+++ stml2/example/pages/home/view.scm
@@ -0,0 +1,12 @@
+;; Copyright 2007-2008, Matthew Welland. Kiatoa.com All rights reserved.
+;; 
+(s:div 'class "node" 
+       (s:h1 "Please Help Save Our Democracy.")
+      "
    We need approval voting to re-energize our democracy.
+       Our system is in danger of failing us since it leaves us powerless
+       to force change. Arguably the biggest problem lies in our use of
+       plurality voting to choose leaders.
+      ")
+(s:div 'class "node"
+       (s:h1 "Practice some approval voting now!")
+       (s:call "uspresident"))

ADDED   stml2/example/pages/index/control.scm
Index: stml2/example/pages/index/control.scm
==================================================================
--- /dev/null
+++ stml2/example/pages/index/control.scm
@@ -0,0 +1,6 @@
+;; Copyright 2007-2008, Matthew Welland. Kiatoa.com All rights reserved.
+;; 
+;; this gets read for ALL pages. Don't weigh it down excessively!
+;;
+;; index/control.scm
+

ADDED   stml2/example/pages/index/view.scm
Index: stml2/example/pages/index/view.scm
==================================================================
--- /dev/null
+++ stml2/example/pages/index/view.scm
@@ -0,0 +1,21 @@
+;; Copyright 2007-2008, Matthew Welland. Kiatoa.com All rights reserved.
+;; 
+;; index
+
+(list
+ (s:html
+  (s:head
+   (s:title "Approval Voting Now!")
+   (s:link  'rel "stylesheet" 'type "text/css" 'href "/approvalvote/markup.css")
+   (s:link  'rel "stylesheet" 'type "text/css" 'href "/approvalvote/layout.css"))
+  (s:body
+   (s:div 'class "header"       (s:call "header"))
+   (s:div 'class "rightcolumn"  (s:call "rightcol"))
+   (s:div 'class "leftcolumn"   (s:call "leftnav"))
+   (s:div 'class "centercolumn"
+          (let ((page    (slot-ref s:session 'page)))
+            (if page
+                (s:call page)
+                (list (s:h2 "Home")
+		      (s:call "sys-state")))))
+   (s:div 'class "footer" (s:call "footer")))))

ADDED   stml2/example/pages/learn/view.scm
Index: stml2/example/pages/learn/view.scm
==================================================================
--- /dev/null
+++ stml2/example/pages/learn/view.scm
@@ -0,0 +1,7 @@
+;; Copyright 2007-2008, Matthew Welland. Kiatoa.com All rights reserved.
+;; 
+(s:div 'class "node" 
+       (s:h1 "Resources")
+        "
    Two excellent sites with more information on approval voting:
+         
    approvalvoting.org
+         
    approvalvoting.com")

ADDED   stml2/example/pages/leftnav/control.scm
Index: stml2/example/pages/leftnav/control.scm
==================================================================
--- /dev/null
+++ stml2/example/pages/leftnav/control.scm
@@ -0,0 +1,11 @@
+;; Copyright 2007-2008, Matthew Welland. Kiatoa.com All rights reserved.
+;; 
+;; leftnav/control.scm 
+
+;; nothing needed here yet!
+
+(define (leftnav-action action)
+  (case action
+    ('logout
+     (s:logout))))
+

ADDED   stml2/example/pages/leftnav/view.scm
Index: stml2/example/pages/leftnav/view.scm
==================================================================
--- /dev/null
+++ stml2/example/pages/leftnav/view.scm
@@ -0,0 +1,38 @@
+;; Copyright 2007-2008, Matthew Welland. Kiatoa.com All rights reserved.
+;; 
+;; leftnav/view.scm
+
+(list
+    (s:div 
+     'class "node"
+     (s:h1 "Navigation")
+     (let ((section (slot-ref s:session 'page)))
+       (cond
+	((or (not section) ;; this is home
+	     (string=? section "home"))
+	 "Home menu")
+	((string=? section "discussions")
+	 (list
+	  (s:a "Filter"         'href (s:link-to "discussions" 'filter "on"))))
+	((string=? section "learn")
+	 (list
+	  (s:a "Learn"  'href (s:link-to "learn"  'action "learn.teach"))(s:br)
+	  (s:a "Test"   'href (s:link-to "learn"  'action "learn.test"))(s:br)
+	  ))
+	((string=? section "preferences")
+	 (list 
+	  (s:a "Password"       'href (s:link-to "preferences" 'action "password"))(s:br)
+	  (s:a "Messages"       'href (s:link-to "preferences" 'action "messages"))(s:br)
+	  (s:a "Preferences"    'href (s:link-to "preferences" 'action "preferences"))(s:br)))
+	(else '( "nada" ))))
+     (s:br))
+    (s:div
+     'class "node"
+     (s:h1 "About you")
+     (let ((email (s:session-var-get "email")))
+       (if email
+           (list email (s:br))
+           "Not logged in")))
+    (s:div
+     'class "node"
+     (s:call "pledge")))

ADDED   stml2/example/pages/login/control.scm
Index: stml2/example/pages/login/control.scm
==================================================================
--- /dev/null
+++ stml2/example/pages/login/control.scm
@@ -0,0 +1,25 @@
+;; Copyright 2007-2008, Matthew Welland. Kiatoa.com All rights reserved.
+;; 
+(load (s:model-path "person"))
+
+(define (login-action action)
+  (case (string->symbol action)
+    ('login
+     ;; the actual login code
+     (s:log "Got here, doing login")
+     (let ((email  (s:get-input 'email-address))
+           (passwd (s:get-input 'password)))
+	   ;; (person (make-person))) ;; DO WE NEED A PERSON "OBJECT"?
+       (s:set! "email-address" email) ;; preserve user as email-address
+       (if (and email passwd)
+	   (let ((good-login (person:authenticate email passwd)))
+	     (if good-login
+		 (begin
+		   (s:set! "msg" "Login successful!")
+		   (s:session-var-set! "email" email))
+		 (s:set! "msg" "Bad password or email. Please try again")))
+	   (s:set! "msg" "Missing password or email"))))
+    ('logout
+     (s:delete-session))
+    ('nada
+     (s:log "Got here, action=" action))))

ADDED   stml2/example/pages/login/view.scm
Index: stml2/example/pages/login/view.scm
==================================================================
--- /dev/null
+++ stml2/example/pages/login/view.scm
@@ -0,0 +1,24 @@
+;; Copyright 2007-2008, Matthew Welland. Kiatoa.com All rights reserved.
+;; 
+;; Login view
+
+(s:div 'class "node"
+       ;; (s:p (s:get-err s:strong)) ;; error message
+       (if (s:session-var-get "email") 
+           (s:a "Log out" 'href (s:link-to (s:current-page) 'action "login.logout"))
+           (list 
+            (s:center (s:p (s:strong "Log in here!")))
+	    (let ((msg (s:get "msg")))
+	      (if msg
+		  (begin
+		    (s:del! "msg")
+		    (s:err-font msg))
+		  (s:null "")))
+            (s:form 'action "login.login" 'method "post"
+                    (s:strong "Id: (*)")(s:br)
+                    (s:input-preserve 'type "text" 'name "email-address" 'size "14" 'maxlength "30")(s:br)
+                    (s:strong "Password:")(s:br)
+                    (s:input 'type "password" 'name "password" 'size "14" 'maxlength "30")(s:br)
+                    (s:input 'type "submit"   'name "form-name"    'value "login")(s:br)
+                    (s:a "Create account" 'href (s:link-to "new_account"))
+                    ))))

ADDED   stml2/example/pages/maint/control.scm
Index: stml2/example/pages/maint/control.scm
==================================================================
--- /dev/null
+++ stml2/example/pages/maint/control.scm
@@ -0,0 +1,13 @@
+;; Copyright 2007-2008, Matthew Welland. matt@kiatoa.com All rights reserved.
+;; 
+;; maint/control.scm
+;;
+(s:load-model "maint")
+
+;; remember that the system will call the function -action with the action as a parameter
+(define (maint-action action)
+  (let ((asym (string->symbol action)))
+    (s:log "Doing action! " action)
+    (case asym
+      ('update_tables
+       (maint:update-tables)))))

ADDED   stml2/example/pages/maint/view.scm
Index: stml2/example/pages/maint/view.scm
==================================================================
--- /dev/null
+++ stml2/example/pages/maint/view.scm
@@ -0,0 +1,12 @@
+;; Copyright 2007-2008, Matthew Welland. Kiatoa.com All rights reserved.
+;; 
+;; maint/view.scm
+;;
+(if (maint:am-i-maint?)
+    (list
+     (s:h1 "Hello Maint!")
+     (s:p (s:a "Update Tables" 'href (s:link-to (s:current-page) 
+					'action "maint.update_tables"))))
+    '())
+
+	

ADDED   stml2/example/pages/new_account/control.scm
Index: stml2/example/pages/new_account/control.scm
==================================================================
--- /dev/null
+++ stml2/example/pages/new_account/control.scm
@@ -0,0 +1,53 @@
+;; Copyright 2007-2008, Matthew Welland. matt@iatoa.com All rights reserved.
+;; 
+;; new_account/control.scm
+
+(load (s:model-path "person"))
+
+(define (new_account:validate-inputs password password-again email-address email-address-again)
+  (cond
+   ((or (not password)(not password-again)
+        (not email-address)(not email-address-again))
+    (s:set-err "Form is incomplete. Please fill in all fields and try again")
+    #f)
+   ((< (string-length password) 2)
+    (s:set-err "Password is too short. Please try again")
+    #f)
+   ((not (string=? password password-again))
+    (s:set-err "Passwords do not match. Please try again")
+    #f)
+   ((> (string-length password) 9)
+    (s:set-err "Password is too long. Please try again")
+    #f)
+   ((not (string=? email-address email-address-again))
+    (s:set-err "Email addresses provided do not match. Please try again")
+    #f)
+   ((and (not (string-match (regexp "^\\s*$") email-address))
+         (not (string-match (regexp "^[^@]+@[^@]+\\.[^@]+$") email-address)))
+    (s:set-err "Not a valid email address, please try again")
+    #f)
+   (else #t)))
+
+(define (new_account-action action)
+  (case (string->symbol action)
+    ('create
+     (s:log "Got here, doing create new account")
+     (let ((password            (s:get-input 'password))
+           (password-again      (s:get-input 'password-again))
+           (email-address       (s:string-downcase (s:get-input 'email-address)))
+           (email-address-again (s:string-downcase (s:get-input 'email-address-again))))
+       ;; save preserved inputs
+       (s:set! "email-address" email-address)
+       (s:log "Saved inputs. Now check inputs")
+       (if (new_account:validate-inputs password password-again email-address 
+                                        email-address-again)
+           ;; Great!! Now have good inputs
+           (if (person:get-dat email-address)
+	       (s:set-err "There is already an account for that email address!")
+	       (let ((pdat (person:set-password email-address password)))
+		 (if pdat
+		     (s:set-err "SUCCESS!! You can now log in with " email-address " and your password")
+		     (s:set-err "ERROR!! Unable to automatically log you on with the same credentials used to create your account. This shouldn't happen. Please send email to matt@kiatoa.com about this"))))
+           ;; bad inputs
+           #f)))
+    ('else (s:log "Placeholder for future actions. Shouldn't get here"))))

ADDED   stml2/example/pages/new_account/view.scm
Index: stml2/example/pages/new_account/view.scm
==================================================================
--- /dev/null
+++ stml2/example/pages/new_account/view.scm
@@ -0,0 +1,27 @@
+;; Copyright 2007-2008, Matthew Welland. Kiatoa.com All rights reserved.
+;; 
+;; new_account/view.scm
+;;
+(list 
+ (s:div 'class "node"
+        ;; (s:p (s:get-err s:strong)) ;; error message
+        (s:p "")(s:p (s:get-err s:err-font))
+        (if (not (s:session-var-get "email")) ;; setting email defines "logged in"
+            (s:form 'action "new_account.create" 'method "post"
+                    (s:table 'border "0" 'spacing "0"
+                             
+                             (s:tr (s:td (s:strong "Email address:")) ;; (s:br)
+                                   (s:td (s:input-preserve 'type "text" 'name "email-address" 'size "16" 'maxlength "30"))) ;; (s:br)
+                             
+                             (s:tr (s:td (s:strong "Email address again:")) ;; (s:br)
+                                   (s:td (s:input-preserve 'type "text" 'name "email-address-again" 'size "16" 'maxlength "30"))) ;; (s:br)
+                    
+                             (s:tr (s:td (s:strong "Password:")) ;; (s:br)
+                                   (s:td (s:input 'type "password" 'name "password" 'size "16" 'maxlength "16"))) ;; (s:br)
+                             
+                             (s:tr (s:td (s:strong "Password again:")) ;; (s:br)
+                                   (s:td (s:input 'type "password" 'name "password-again" 'size "16" 'maxlength "16")))); (s:br)
+                             
+                    (s:input 'type "submit"   'name "form-name"    'value "submit"))
+            (s:h1 "Welcome " (s:session-var-get "email") ":" (s:session-var-get "location") "!"))))
+ 

ADDED   stml2/example/pages/pledge/view.scm
Index: stml2/example/pages/pledge/view.scm
==================================================================
--- /dev/null
+++ stml2/example/pages/pledge/view.scm
@@ -0,0 +1,16 @@
+;; Copyright 2007-2008, Matthew Welland. matt@iatoa.com All rights reserved.
+;; 
+(s:if-sessionvar 
+ "email"
+ (list
+  (s:h1 "Pledge now!")
+  (s:fieldset 
+   "Pledge"
+   (s:form 'action "pledge.pledge"
+	   'method "post"
+	   (s:i " - I will vote" (s:b "ONLY") " for a candidate who supports approval voting!")
+	   (s:table
+	    (s:tr (s:td "Yes")  (s:td (s:input 'type "radio"    'name "pledge_answer" 'value "yes")))
+	    (s:tr (s:td "No")   (s:td (s:input 'type "radio"    'name "pledge_answer" 'value "no")))
+	    (s:tr (s:td "Maybe")(s:td (s:input 'type "radio"    'name "pledge_answer" 'value "maybe"))))
+	   (s:input 'type "button" 'name "pledge_answer" 'value "Submit")))))

ADDED   stml2/example/pages/preferences/view.scm
Index: stml2/example/pages/preferences/view.scm
==================================================================
--- /dev/null
+++ stml2/example/pages/preferences/view.scm
@@ -0,0 +1,12 @@
+;; Copyright 2007-2008, Matthew Welland. matt@iatoa.com All rights reserved.
+;; 
+;; preferences/view.scm
+;;
+(s:div
+ 'class "node"
+ (s:h1 "Register your email address")
+ (s:p "Adds 9 pts to your score the first time you do it and enables very occasional email updates. If you change your email address
+       you need to re-register to keep your 9 pts.")
+ (s:form 'action "preferences.register_email"
+	 'method "post"
+	  (s:input 'type "submit" 'name "register_email" 'value "Register Email"))) 

ADDED   stml2/example/pages/rightcol/view.scm
Index: stml2/example/pages/rightcol/view.scm
==================================================================
--- /dev/null
+++ stml2/example/pages/rightcol/view.scm
@@ -0,0 +1,9 @@
+;; Copyright 2007-2008, Matthew Welland. Kiatoa.com All rights reserved.
+;; 
+
+;; rightcol
+(list
+  (s:div 'class "node" 
+	 (s:call "login")))
+
+;; "This is the right-most column"))

ADDED   stml2/example/pages/sys-state/view.scm
Index: stml2/example/pages/sys-state/view.scm
==================================================================
--- /dev/null
+++ stml2/example/pages/sys-state/view.scm
@@ -0,0 +1,16 @@
+;; Copyright 2007-2008, Matthew Welland. Kiatoa.com All rights reserved.
+;; 
+
+;; sys-state
+
+(list (let ((p (open-input-pipe "env")))
+	(let loop ((l (read-line p))
+		   (res '()))
+	  (if (not (eof-object? l))
+	      (loop (read-line p)(cons (list l "
    ") res))
+	      res)))
+      ;; "USER=" (user-information (current-user-id))
+
+      (s:h2 "Form data")
+      (session:pp-formdat s:session)
+      "argv=" (argv))

ADDED   stml2/example/pages/uspresident/control.scm
Index: stml2/example/pages/uspresident/control.scm
==================================================================
--- /dev/null
+++ stml2/example/pages/uspresident/control.scm
@@ -0,0 +1,72 @@
+;; Copyright 2007-2008, Matthew Welland. Kiatoa.com All rights reserved.
+;; 
+;; this gets read for ALL pages. Don't weigh it down excessively!
+;;
+;; uspresident/control.scm
+
+(s:load-model "candidate")
+(s:load-model "voting")
+(s:load-model "person")
+
+(define candidates (candidate:get-top 10))
+(define candidates:vote-sum-approval  (apply + (map candidate:get-score candidates)))
+(define candidates:vote-sum-plurality (apply + (map candidate:get-pscore candidates)))
+(define candidates:top-plurality-id   (let ((id       #f)
+					    (topscore 0))
+					(for-each (lambda (cand)
+						    (if (> (candidate:get-pscore cand) topscore)
+							(begin 
+							  (set! topscore (candidate:get-pscore cand))
+							  (set! id       (candidate:get-id cand)))))
+						  candidates)
+					id))
+(define candidates:top-approval-id   (let ((id       #f)
+					   (topscore 0))
+				       (for-each (lambda (cand)
+						   (if (> (candidate:get-score cand) topscore)
+						       (begin 
+							 (set! topscore (candidate:get-score cand))
+							 (set! id       (candidate:get-id cand)))))
+						 candidates)
+				       id))
+							   
+
+(define (uspresident-action action)
+  (let ((acsym (string->symbol action)))
+    (cond
+     ('vote
+      (let ((button (s:get-input 'vote)))
+	(cond
+	 ((equal? button "Vote")
+	  (let* ((approval    (s:get-input 'approval))
+		 (plurality   (s:get-input 'plurality))
+		 (newdat      (make-vector 9 ""))
+		 (email       (s:session-var-get "email"))
+		 (newcandname (s:get-input 'poll_name))
+		 (nick-email  (if email email (s:get-input 'users_email))))
+	    (if (not (list? approval))
+		(set! approval (list approval)))
+	    (if (string-match (regexp "^[a-zA-Z]+") newcandname)
+		(let* ((dat (candidate:get-by-name newcandname)))
+		  (if dat ;; i.e. this is a new candidate
+		      (set! newdat dat)
+		      (begin
+			(candidate:set-name! newdat newcandname)
+			(candidate:set-supports-av! newdat (s:get-input 'poll_supports_av))
+			(candidate:set-party! newdat (s:get-input 'poll_party))
+			(candidate:set-url! newdat (s:get-input 'poll_url))
+			(set! newdat (candidate:update newdat))))
+		  (s:log "cid: " (candidate:get-id newdat))
+		  (set! approval  (cons (candidate:get-id newdat) approval))
+		  (set! plurality (candidate:get-id newdat))))
+	    (set! approval (filter (lambda (x)(or (number? x)(string? x))) approval)) ;; clean the approval list
+	    (s:log "using email: " nick-email)
+	    (s:log "approval: " approval)
+	    (s:log "plurality: " plurality)
+	    (if (and approval plurality (not (null? approval)))
+		(begin
+		  (voting:handle-votes nick-email
+				       approval
+				       plurality)
+		  (s:session-var-set! "voted" "yes"))
+		(s:set! "errmsg" "Please select one plurality vote and one or more approval votes"))))))))))

ADDED   stml2/example/pages/uspresident/view.scm
Index: stml2/example/pages/uspresident/view.scm
==================================================================
--- /dev/null
+++ stml2/example/pages/uspresident/view.scm
@@ -0,0 +1,85 @@
+;; Copyright 2007-2008, Matthew Welland. Kiatoa.com All rights reserved.
+;; 
+
+;; Note: the (list is actually no longer needed. 
+
+(list
+ (s:if-sessionvar 
+  "email"
+  (s:if-sessionvar 
+   "voted"
+   "We are glad you tried approval voting. Try again to see how the system works. Don't worry about the poll numbers. This poll is for you to play with."))
+ (s:fieldset
+  "Poll"
+  (s:center
+   (s:if-param "errmsg"
+	       (let ((err (s:get "errmsg")))
+		 (s:del! "errmsg")
+		 (s:err-font err)))
+   (s:form  'action "uspresident.vote"
+	    'method "post"
+	    (s:table 'border "1" 'cellspacing "0"
+		     (s:tr 
+		      (s:td "Candidate")(s:td "Party")(s:td "Supports approval?")
+		      (s:if-sessionvar 
+		       "voted"
+		       (list (s:td "Plurality")
+			     (s:td "Approval")
+			     (s:td "Plurality" (conc "(" candidates:vote-sum-plurality "votes" ")"))
+			     (s:td "Approval"  (conc "(" candidates:vote-sum-plurality "votes" ")")))
+		       (list (s:td "Plurality (vote for one only)")(s:td "Approval (vote for all which you approve of)"))))
+		     ;; map the poll items for each row
+		     (map (lambda (candidate)
+			    (let ((poll-item-id          (number->string (candidate:get-id candidate)))
+				  (poll-item-url         (s:tidy-url (candidate:get-url candidate)))
+				  (poll-item-name        (candidate:get-name candidate))
+				  (poll-item-description (candidate:get-desc candidate))
+				  (poll-item-percent-a   (quotient (* 100 (candidate:get-score candidate)) candidates:vote-sum-plurality))
+				  (poll-item-percent-p   (quotient (* 100 (candidate:get-pscore candidate)) candidates:vote-sum-plurality)))
+			      (list
+			       (s:tr
+				(s:td
+				 (if poll-item-url
+				     (s:a 'href poll-item-url 'target "_blank" poll-item-name)
+				     poll-item-name))
+				;; (if (poll:poll 'have-description?)
+				;;     (s:td 'bgcolor "#f0f0f0" poll-item-description) ;; description
+				;;     '())
+				(s:td (candidate:get-party       candidate))
+				(s:td (candidate:get-supports-av candidate))
+				;; (if (not (s:session-var-get "voted")) ;; here are the check buttons for plurality and approval voting
+				;;    (list 
+				(s:td (s:center
+				       (s:input 'type "radio"    'name "plurality" 'value poll-item-id)))
+				(s:td (s:center
+				       (s:input 'type "checkbox" 'name "approval"  'value poll-item-id)))
+				(s:if-sessionvar "voted"
+						 (list
+						  (s:td (conc poll-item-percent-p "%") 'bgcolor (if (eq? (candidate:get-id candidate)  candidates:top-plurality-id)
+												    "cyan"
+												    "lightgrey")
+							(conc "(" (candidate:get-pscore candidate) ")") 'align "center")
+						  (s:td (conc poll-item-percent-a "%")  'bgcolor (if (eq? (candidate:get-id candidate)  candidates:top-approval-id)
+												    "cyan"
+												    "lightgrey")
+							(conc "(" (candidate:get-score candidate) ")")  'align "center"))))))) ;; % votes
+			  candidates)
+		     (s:tr 
+		      (s:td "Write in (name):
    "
+			    (s:input-preserve 'type "text" 'name "poll_name"  'size "15" 'maxlength "40"))
+		      (s:td "Party:
    " (s:input-preserve 'type "text" 'name "poll_party" 'size "10" 'maxlength "40"))
+		      (s:td "Supports approval:
    " (s:input-preserve 'type "text" 'name "poll_supports_av"  'size "10" 'maxlength "40"))
+		      (s:td "Url:
    "   (s:input-preserve 'type "text" 'name "poll_url"   'size "40" 'maxlength "120") 'colspan 4))
+		     (s:tr
+		      (s:td 'colspan 7
+			    (s:center (s:input 'type "submit" 'name "vote" 'value "Vote") 
+				      (s:if-sessionvar "email"
+						       '()
+						       (list
+							"Email or nickname:" 
+							(s:input-preserve 'type "text" 'name "users_email" 'size 20 'maxlength 40)
+							"(required), Country code:"
+							(s:input-preserve 'type "text" 'name "users_country_code" 'size 2 'maxlength 2)
+							"(optional)"
+							))
+				       ))))))))

ADDED   stml2/example/tests/test.scm
Index: stml2/example/tests/test.scm
==================================================================
--- /dev/null
+++ stml2/example/tests/test.scm
@@ -0,0 +1,85 @@
+#!/usr/local/bin/csi -q 
+
+;; This currently requires that the stml code is available in a parallel directory.
+
+(use test)
+(if (file-exists? "test.db")
+    (begin
+      (print "Removing old test.db")
+      (system "rm -f test.db")))
+
+(load "../stml/misc-stml.scm")
+(load "../stml/formdat.scm")
+(load "../stml/stml.scm")
+(load "../stml/session.scm")
+(load "../stml/sqltbl.scm")
+(load "../stml/html-filter.scm") ;; required for s:split-string 
+(load "../stml/dbi.scm")
+(load "../stml/keystore.scm")
+(load "../stml/sugar.scm")
+
+;; create a session to work with")
+(setenv "REQUEST_URI" "/stmlrun?action=maint.nada")
+(setenv "SCRIPT_NAME" "/cgi-bin/stmlrun")
+(setenv "PATH_INFO" "/maint")
+(setenv "QUERY_STRING" "action=maint.nada")
+(setenv "SERVER_NAME" "localhost")
+(setenv "REQUEST_METHOD" "GET")
+;; (define session-name "pfNOeqUHkJ26BpU6y49IN") ;; ensure this session already exists
+;; (setenv "HTTP_COOKIE" (string-append "session_key=" session-name)) ;; to09ipFJ9_2KXT96b2f9Q")
+
+(load "../stml/setup.scm")
+;; (test (string-append "Session set to existing session " session-name)
+;;       session-name (slot-ref s:session 'session-key))
+
+(s:validate-inputs)
+
+;; test session variables
+
+;; lazy stuff
+(define *conn* (slot-ref s:session 'conn))
+
+;; setup tables
+(load "models/maint.scm")
+(test "Create tables" #t (> (maint:update-tables)
+			    0))
+
+;; test person
+(let ((fh (open-input-pipe "ls models/*.scm")))
+  (let loop ((l (read-line fh)))
+    (if (not (eof-object? l))
+        (begin
+          (print "loading " l)
+          (load l)
+          (loop (read-line fh)))))
+  (close-input-port fh))
+
+(let ((fh (open-input-pipe "find pages -name control.scm"))) ;; ls pages/*/control.scm")))
+  (let loop ((l (read-line fh)))
+    (if (not (eof-object? l))
+        (begin
+          (print "loading " l)
+          (load l)
+          (loop (read-line fh)))))
+  (close-input-port fh))
+
+(let ((fh (open-input-pipe "ls pages/*/view.scm")))
+  (let loop ((l (read-line fh)))
+    (if (not (eof-object? l))
+        (begin
+          (print "loading " l)
+          (load l)
+          (loop (read-line fh)))))
+  (close-input-port fh))
+
+;;======================================================================
+;; Maint
+;;======================================================================
+;; 
+(load "models/maint.scm")
+
+(test "Update tables"   #t                (> (maint:update-tables))) ;;  *conn* 2 "us") 0))
+(test "Add user"        "matt@kiatoa.com" (vector-ref (person:set-password "matt@kiatoa.com" "Password") 2))
+(test "Authenticate"    "matt@kiatoa.com" (vector-ref (person:authenticate "matt@kiatoa.com" "Password") 2))
+(test "Validate inputs" #t                (new_account:validate-inputs "Password" "Password" "matt@kiatoa.com" "matt@kiatoa.com"))
+

ADDED   stml2/example/www/layout.css
Index: stml2/example/www/layout.css
==================================================================
--- /dev/null
+++ stml2/example/www/layout.css
@@ -0,0 +1,245 @@
+
+/*-General-----------------------------------------------*/
+
+html, body {
+	margin:0px;
+	padding:0px;
+}
+
+form {
+	display:inline;
+	margin:0px;
+	padding:0px;
+}
+
+a img {
+	border:none;
+	margin:0px;
+	padding:0px;
+}
+
+h1, h2, h3, h4, h5, h6, p, div {
+	margin:0px;
+	padding:0px;
+}
+
+.right {
+	float:right;
+}
+
+.left{
+	float:left;
+}
+
+/*-Main Layout-------------------------------------------*/
+
+#overall {
+	/* margin:5px 12px 0px 12px; */
+	padding:0px;
+}
+
+/*-Header-------------*/
+
+.header {
+        /* float:top; */
+	position:relative; 
+	height:55px;
+}
+
+/*-Footer-------------*/
+
+.footer {
+	padding:40px 0px 0px 0px;
+	position:relative;
+	clear:both;
+}
+
+/*-Content Area-------*/
+
+.content {
+	width:100%;
+}
+
+/*-Left Column--------*/
+
+.leftcolumn	{
+  float:left;
+  width:145px;
+  margin:5px;
+}
+
+.leftcolumn .node {
+	margin:0px 0px 15px 0px;
+}
+
+.leftcolumn .node h1 {
+	padding:0px 0px 0px 3px;
+}
+
+.leftcolumn .node ul {
+	margin:0px;
+	padding:0px;
+}
+
+.leftcolumn .node li {
+	display:block;
+	padding:0px 0px 0px 3px;
+	margin:0px;
+}
+
+.leftcolumn .node li.more{
+	padding:0px 0px 0px 6px;
+}
+
+/*-Center Column------*/
+
+.centercolumn {
+        margin: 5px;
+	margin-left:152px;
+        margin-right:140px;
+	font-family:"\"}\"";
+	font-family:inherit;
+}
+
+.centercolumn .node h1 {
+	padding: 0px 0px 0px 13px;
+}
+
+.centercolumn .node h4 {
+	margin: 15px 0px 10px 0px;
+}
+
+.centercolumn .node p {
+	margin: 0px 0px 10px 0px; */
+	padding: 0px 0px 0px 0px;
+}  /* this seemed not to work */
+
+.posts_0  {
+	margin: 0px 0px 0px 0px;
+}
+
+.posts_1  {
+	margin: 0px 0px 0px 20px;
+}
+
+.posts_2  {
+	margin: 0px 0px 0px 40px;
+}
+
+.posts_3  {
+	margin: 0px 0px 0px 60px;
+}
+
+.posts_4  {
+	margin: 0px 0px 0px 80px;
+}
+
+.posts_5  {
+	margin: 0px 0px 0px 100px;
+}
+
+.posts_6  {
+	margin: 0px 0px 0px 120px;
+}
+
+.posts_7  {
+	margin: 0px 0px 0px 140px;
+}
+
+.posts_8  {
+	margin: 0px 0px 0px 160px;
+}
+
+.posts_9  {
+	margin: 0px 0px 0px 160px;
+}
+
+.posts_10  {
+	margin: 0px 0px 0px 180px;
+}
+
+/*-Right Column-------*/
+
+.rightcolumn {
+	float:right;
+        width:130px;
+	margin:5px 5px 0px 0px;
+}
+
+* html .rightcolumn {
+	margin:3px 3px 3px 3px;
+}
+
+body>div .rightcolumn {
+	margin:0px 0px 0px 0px;
+}
+
+.rightcolumn .node {
+	margin:0px 0px 5px 0px;
+	padding:0px;
+}
+
+.rightcolumn .node h2 {
+	margin:3px 3px 3px 2px;
+}
+
+.rightcolumn .node ul {
+  list-style-position:inside;
+  margin:0px;
+  padding:1px;
+}
+
+.rightcolumn .node ul.none {
+	list-style-position:inside;
+}
+
+.rightcolumn .node ul.dot {
+	list-style-position:inside;
+}
+
+.rightcolumn .node ul.books {
+	list-style-position:outside;
+	margin:0px 0px 0px 35px;
+}
+
+.rightcolumn .node li {
+	padding:0px 0px 0px 3px;
+	margin:0px;
+}
+
+/*-Remaining layout--------------------------------------*/
+
+#title {
+	top: 0px;
+	left: 0px;
+	position: absolute;
+}
+
+#search {
+	float:left;
+	margin:0px 0px 0px 30px;
+}
+
+#randomquote {
+	float:right;
+	margin:0px 30px 0px 0px;
+}
+
+#copyright {
+	text-align:center;
+	padding:15px 0px 0px 0px;
+	margin:0px 0px 0px 0px;
+	clear:both;
+}
+
+#bottomNav {
+	text-align:center;
+	margin:0px 0px 20px 0px;
+	padding:0px;
+}
+
+#oldStuffNav {
+	font-weight:bold;
+	text-align:right;
+}
+

ADDED   stml2/example/www/markup.css
Index: stml2/example/www/markup.css
==================================================================
--- /dev/null
+++ stml2/example/www/markup.css
@@ -0,0 +1,299 @@
+/*-General-----------------------------------------------*/
+
+body {
+  background-color:#ffffff;
+  color:#0f0f0f;
+/*  font-family:serif; */
+  font-weight:normal;
+  text-decoration:none; 
+  font-size:x-small; 
+  voice-family:"\"}\"";
+  voice-family:inherit;
+  font-size:small;
+}
+
+html>body {
+  font-size:small;
+}
+
+.strong {
+  font-weight:bold;
+}
+
+#red { 
+  color: #ff0000
+}
+
+/*-Main Markup-------------------------------------------*/
+
+#overall {
+  background-color: #ffffff;
+  color:#000000;
+}
+
+/*-Left Column--------*/
+
+.leftcolumn .node a {
+  color:#006666;
+  background-color:transparent;
+}
+
+.leftcolumn .node p {
+  font-size:1.2em;
+  font-weight:normal;
+}
+
+.leftcolumn .node h1 {
+  font-weight:normal;
+  font-size:1.2em;
+  color:#ffffff;
+  background-color:#000000; /* #005991;  #7f9bff #006666; */
+}
+
+.leftcolumn .node h1 a {
+  color:#ffffff;
+  background-color:transparent;
+}
+
+.leftcolumn .node h2 {
+  font-weight:bold;
+  font-size:.95em;
+}
+
+.leftcolumn .node ul {
+  list-style-type:none;
+}
+
+.leftcolumn .node li.more {
+  font-weight:bold;
+  font-size:.75em;
+}
+
+.leftcolumn .node li.selected {
+  font-weight:bold;
+  font-size:1.18em;
+  color:#000000;
+  background-color:#cccccc;
+}
+
+.leftcolumn .node li.selected a {
+  color:#000000;
+  background-color:transparent;
+}
+
+/*-Center Column for classifieds-*/
+
+.centercolumn .classifieds h1 { 
+  font-family:Arial, Helvetica, serif;
+  font-weight:bold;
+  font-size:1.38em;
+  color:#000000; /* ffffff; */
+  background: #5390b7; /* a6bcac; #0c1e0f; 043b0d; 1a6126; */
+}
+
+/*-Center Column------*/
+.centercolumn .node {
+/*  font-family:serif; */
+}
+
+.centercolumn .node a {
+  color:#006666;
+  background-color:transparent;
+}
+
+.centercolumn .node h1 {
+  font-family:Arial, Helvetica, serif;
+  font-weight:bold;
+  font-size:1.38em;
+  color:#ffffff;
+  background:#000000; /* #005991; */
+} /* #006666 /* url('../images/slc.gif') no-repeat; */
+     
+.centercolumn .node h1 a {
+  color:#ffffff;
+  background-color:transparent;
+}
+
+.centercolumn .node h2 {
+  font-weight:bold;
+  font-size:1.18em;
+}
+
+.centercolumn .node h3 {
+  font-weight:bold;
+  font-size:.95em;
+}
+
+.centercolumn .node h4 {
+  font-weight:normal;
+  font-size:1.2em;
+}
+
+.centercolumn .node h4 a {
+  font-weight:bold;
+}
+
+.centercolumn .node p {
+  font-weight:normal;
+}
+
+.centercolumn .posts_0 h1 { 
+  color:#ffffff;
+  background-color:#606060;
+  font-size:1.18em;
+}
+
+.centercolumn .posts_1 h1 { 
+  color:#ffffff;
+  background-color:#606060;
+  font-size:1.18em;
+}
+
+.centercolumn .posts_2 h1 { 
+  color:#ffffff;
+  background-color:#606060;
+  font-size:1.18em;
+}
+
+.centercolumn .posts_3 h1 { 
+  color:#ffffff;
+  background-color:#606060;
+  font-size:1.18em;
+}
+
+.centercolumn .posts_4 h1 { 
+  color:#ffffff;
+  background-color:#606060;
+  font-size:1.18em;
+}
+
+.centercolumn .posts_5 h1 { 
+  color:#ffffff;
+  background-color:#606060;
+  font-size:1.18em;
+}
+
+.centercolumn .posts_6 h1 { 
+  color:#ffffff;
+  background-color:#606060;
+  font-size:1.18em;
+}
+
+.centercolumn .posts_7 h1 { 
+  color:#ffffff;
+  background-color:#606060;
+  font-size:1.18em;
+}
+
+.centercolumn .posts_8 h1 { 
+  color:#ffffff;
+  background-color:#606060;
+  font-size:1.18em;
+}
+
+.centercolumn .posts_9 h1 { 
+  color:#ffffff;
+  background-color:#606060;
+  font-size:1.18em;
+}
+
+.centercolumn .posts_10 h1 { 
+  color:#ffffff;
+  background-color:#606060;
+  font-size:1.18em;
+}
+
+/*-Right Column-------*/
+
+.rightcolumn .node {
+  color:#000000;
+  background-color:#cccccc;
+  font-family:serif;
+}
+
+.rightcolumn .node a {
+  color:#000000; /* #005991;  #006666; */
+  background-color:transparent;
+}
+
+.rightcolumn .node h1 {
+  font-family:Arial, Helvetica, serif;
+  font-weight:bold;
+  font-size:0.95em; /* 1.38em; */
+  color:#ffffff;
+  background-color: #000000; /* #005991;  #006666; */
+}
+
+.rightcolumn .node h1 a {
+  color:#ffffff;
+  background-color:transparent;
+}
+
+.rightcolumn .node h2 {
+  font-weight:bold;
+  font-size:.95em;
+}
+
+.rightcolumn .node ul.none {
+  list-style-type:none;
+}
+
+.rightcolumn .node ul.dot {
+  list-style-type:none;
+  /* list-style-image:url('../images/listdot.gif'); */
+}
+
+.rightcolumn .node ul.books {
+  list-style-type:disc;
+}
+
+/*-OSDN Navagation bar-----------------------------------*/
+
+#OSDNNavbar {
+  background-color:#999999;
+  color:#000000; /* #005991; /* #006666; */
+}
+
+#OSDNNavbar div#links {
+  background-color:#999999;
+  color:#000000; /* #005991; /* #006666; */
+}
+
+#OSDNNavbar a {
+  background-color: transparent;
+  color: #000000; /* #005991; /* #006666; */
+}
+
+/*-Remaining layout--------------------------------------*/
+
+#randomquote {
+  font-size:1.2em;
+  font-style:italic;
+}
+
+#copyright {
+  font-size:.75em;
+  font-family:Arial, Helvetica, serif;
+  background-color:transparent;
+  color:#000000; /* #005991; /* #006666; */
+}
+
+#copyright a {
+  background-color:transparent;
+  color:#000000; /* #005991; /* #006666; */
+}
+
+#bottomNav {
+  background-color:transparent;
+  color:#000000; /* #005991; /* #006666; */
+}
+
+#bottomNav a {
+  background-color:transparent;
+  color:#ffffff;
+}
+
+#oldStuffNav {
+  font-weight:bold;
+}
+

ADDED   stml2/formdat.scm
Index: stml2/formdat.scm
==================================================================
--- /dev/null
+++ stml2/formdat.scm
@@ -0,0 +1,21 @@
+;; Copyright 2007-2011, Matthew Welland.
+;; 
+;;  This program is made available under the GNU GPL version 2.0 or
+;;  greater. See the accompanying file COPYING for details.
+;; 
+;;  This program is distributed WITHOUT ANY WARRANTY; without even the
+;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+;;  PURPOSE.
+
+;; (declare (unit formdat))
+
+(module formdat
+    *
+
+(import chicken scheme data-structures extras srfi-13 ports )
+(use html-filter)
+
+(use regex)
+(require-extension srfi-69)
+
+)

ADDED   stml2/html-filter.scm
Index: stml2/html-filter.scm
==================================================================
--- /dev/null
+++ stml2/html-filter.scm
@@ -0,0 +1,21 @@
+;; Copyright 2007-2011, Matthew Welland.
+;; 
+;;  This program is made available under the GNU GPL version 2.0 or
+;;  greater. See the accompanying file COPYING for details.
+;; 
+;;  This program is distributed WITHOUT ANY WARRANTY; without even the
+;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+;;  PURPOSE.
+
+;; (declare (unit html-filter))
+
+(module html-filter
+    *
+
+(import chicken scheme data-structures extras srfi-13 ports )
+(use misc-stml)
+
+(require-extension regex)
+
+;; 
+)

ADDED   stml2/install.cfg.template
Index: stml2/install.cfg.template
==================================================================
--- /dev/null
+++ stml2/install.cfg.template
@@ -0,0 +1,6 @@
+
+TARGDIR=/usr/lib/cgi-bin
+LOGDIR=/tmp/stmlrun
+SQLITE3=/usr/bin/sqlite3
+# this was needed on the nokia n800 :-)
+# SQLITE3=/tmp/sqlite3

ADDED   stml2/keystore.scm
Index: stml2/keystore.scm
==================================================================
--- /dev/null
+++ stml2/keystore.scm
@@ -0,0 +1,22 @@
+;; Copyright 2007-2011, Matthew Welland.
+;; 
+;;  This program is made available under the GNU GPL version 2.0 or
+;;  greater. See the accompanying file COPYING for details.
+;; 
+;;  This program is distributed WITHOUT ANY WARRANTY; without even the
+;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+;;  PURPOSE.
+
+;;======================================================================
+;; The meta data key store, just a general dumping ground for values
+;; only used occasionally
+;;======================================================================
+
+;; (declare (unit keystore))
+
+(module keystore
+    *
+
+(import chicken scheme data-structures extras srfi-13 ports )
+
+)

ADDED   stml2/misc-stml.scm
Index: stml2/misc-stml.scm
==================================================================
--- /dev/null
+++ stml2/misc-stml.scm
@@ -0,0 +1,24 @@
+;; Copyright 2007-2011, Matthew Welland.
+;; 
+;;  This program is made available under the GNU GPL version 2.0 or
+;;  greater. See the accompanying file COPYING for details.
+;; 
+;;  This program is distributed WITHOUT ANY WARRANTY; without even the
+;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+;;  PURPOSE.
+
+;;======================================================================
+;; dumbobj helpers
+;;======================================================================
+
+;; (declare (unit misc-stml))
+
+(module misc-stml
+  *
+
+(import chicken scheme data-structures extras srfi-13 ports posix)
+  
+(use regex (prefix dbi dbi:))
+(use (prefix crypt c:))
+(use (prefix dbi dbi:))
+)

ADDED   stml2/modules/twiki/Makefile
Index: stml2/modules/twiki/Makefile
==================================================================
--- /dev/null
+++ stml2/modules/twiki/Makefile
@@ -0,0 +1,10 @@
+
+twiki.l.scm : twiki.l
+	csi -batch -eval '(use silex)(if (lex "twiki.l" "twiki.l.scm")(exit 0)(exit 1))'
+
+test-silex : twiki.l.scm test-silex.scm
+	csc test-silex.scm
+
+twikicount : twiki.l.scm twikicount.scm
+	csc twikicount.scm
+

ADDED   stml2/modules/twiki/misc-notes.txt
Index: stml2/modules/twiki/misc-notes.txt
==================================================================
--- /dev/null
+++ stml2/modules/twiki/misc-notes.txt
@@ -0,0 +1,46 @@
+#|
+telnet localhost 80
+GET cgi-bin/kiatoa/twiki?image=4&wiki_key=bG9jYXRpb25zIHdvcmxk HTTP/1.1
+Accept: */*
+Accept-Language: en-us
+Connection: Keep-Alive
+Host: localhost
+Referer: http://localhost/links.asp
+User-Agent: Mozilla/4.0 (compatible; MSIE 5.5; Windows NT 5.0)
+Accept-Encoding: gzip, deflate
+
+GET /kiatoa/images/kiatoa.png HTTP/1.1
+Accept: */*
+Accept-Language: en-us
+Connection: Keep-Alive
+Host: localhost
+Referer: http://localhost/links.asp
+
+GET index.html HTTP/1.1
+Accept: */*
+Accept-Language: en-us
+Connection: Keep-Alive
+Host: localhost
+Referer: http://localhost/links.asp
+
+GET /cgi-bin/kiatoa/twiki?image=2&wiki_key=bG9jYXRpb25zIHdvcmxk HTTP/1.1
+Accept: */*
+Accept-Language: en-us
+Connection: Keep-Alive
+Host: localhost
+Referer: http://192.168.2.1/cgi-bin/kiatoa/location/?twiki_maint=2
+User-Agent: Mozilla/4.0
+Accept-Encoding: gzip, deflate
+
+HTTP/1.1 200 OK
+Date: Tue, 01 Sep 2009 02:18:16 GMT
+Server: Apache/2.2.11 (Ubuntu) PHP/5.2.6-3ubuntu4.2 with Suhosin-Patch
+Last-Modified: Sun, 19 Jul 2009 02:47:52 GMT
+ETag: "a38005-12c2-46f060c330600"
+Accept-Ranges: bytes
+Content-Length: 4802
+Keep-Alive: timeout=15, max=100
+Connection: Keep-Alive
+Content-Type: image/png
+
+|#

ADDED   stml2/modules/twiki/tlayout.css
Index: stml2/modules/twiki/tlayout.css
==================================================================
--- /dev/null
+++ stml2/modules/twiki/tlayout.css
@@ -0,0 +1,172 @@
+/*{{{*/
+* html .tiddler {height:1%;}
+
+body {font-size:.75em; font-family:arial,helvetica; margin:0; padding:0;}
+
+h1,h2,h3,h4,h5,h6 {font-weight:bold; text-decoration:none;}
+h1,h2,h3 {padding-bottom:1px; margin-top:1.2em;margin-bottom:0.3em;}
+h4,h5,h6 {margin-top:1em;}
+h1 {font-size:1.35em;}
+h2 {font-size:1.25em;}
+h3 {font-size:1.1em;}
+h4 {font-size:1em;}
+h5 {font-size:.9em;}
+
+hr {height:1px;}
+
+a {text-decoration:none;}
+
+dt {font-weight:bold;}
+
+ol {list-style-type:decimal;}
+ol ol {list-style-type:lower-alpha;}
+ol ol ol {list-style-type:lower-roman;}
+ol ol ol ol {list-style-type:decimal;}
+ol ol ol ol ol {list-style-type:lower-alpha;}
+ol ol ol ol ol ol {list-style-type:lower-roman;}
+ol ol ol ol ol ol ol {list-style-type:decimal;}
+
+.txtOptionInput {width:11em;}
+
+#contentWrapper .chkOptionInput {border:0;}
+
+.externalLink {text-decoration:underline;}
+
+.indent {margin-left:3em;}
+.outdent {margin-left:3em; text-indent:-3em;}
+code.escaped {white-space:nowrap;}
+
+.tiddlyLinkExisting {font-weight:bold;}
+.tiddlyLinkNonExisting {font-style:italic;}
+
+/* the 'a' is required for IE, otherwise it renders the whole tiddler in bold */
+a.tiddlyLinkNonExisting.shadow {font-weight:bold;}
+
+#mainMenu .tiddlyLinkExisting,
+	#mainMenu .tiddlyLinkNonExisting,
+	#sidebarTabs .tiddlyLinkNonExisting {font-weight:normal; font-style:normal;}
+#sidebarTabs .tiddlyLinkExisting {font-weight:bold; font-style:normal;}
+
+.header {position:relative;}
+.header a:hover {background:transparent;}
+.headerShadow {position:relative; padding:4.5em 0em 1em 1em; left:-1px; top:-1px;}
+.headerForeground {position:absolute; padding:4.5em 0em 1em 1em; left:0px; top:0px;}
+
+.siteTitle {font-size:3em;}
+.siteSubtitle {font-size:1.2em;}
+
+#mainMenu {position:absolute; left:0; width:10em; text-align:right; line-height:1.6em; padding:1.5em 0.5em 0.5em 0.5em; font-size:1.1em;}
+
+#sidebar {position:absolute; right:3px; width:16em; font-size:.9em;}
+#sidebarOptions {padding-top:0.3em;}
+#sidebarOptions a {margin:0em 0.2em; padding:0.2em 0.3em; display:block;}
+#sidebarOptions input {margin:0.4em 0.5em;}
+#sidebarOptions .sliderPanel {margin-left:1em; padding:0.5em; font-size:.85em;}
+#sidebarOptions .sliderPanel a {font-weight:bold; display:inline; padding:0;}
+#sidebarOptions .sliderPanel input {margin:0 0 .3em 0;}
+#sidebarTabs .tabContents {width:15em; overflow:hidden;}
+
+.wizard {padding:0.1em 1em 0em 2em;}
+.wizard h1 {font-size:2em; font-weight:bold; background:none; padding:0em 0em 0em 0em; margin:0.4em 0em 0.2em 0em;}
+.wizard h2 {font-size:1.2em; font-weight:bold; background:none; padding:0em 0em 0em 0em; margin:0.4em 0em 0.2em 0em;}
+.wizardStep {padding:1em 1em 1em 1em;}
+.wizard .button {margin:0.5em 0em 0em 0em; font-size:1.2em;}
+.wizardFooter {padding:0.8em 0.4em 0.8em 0em;}
+.wizardFooter .status {padding:0em 0.4em 0em 0.4em; margin-left:1em;}
+.wizard .button {padding:0.1em 0.2em 0.1em 0.2em;}
+
+#messageArea {position:fixed; top:2em; right:0em; margin:0.5em; padding:0.5em; z-index:2000; _position:absolute;}
+.messageToolbar {display:block; text-align:right; padding:0.2em 0.2em 0.2em 0.2em;}
+#messageArea a {text-decoration:underline;}
+
+.tiddlerPopupButton {padding:0.2em 0.2em 0.2em 0.2em;}
+.popupTiddler {position: absolute; z-index:300; padding:1em 1em 1em 1em; margin:0;}
+
+.popup {position:absolute; z-index:300; font-size:.9em; padding:0; list-style:none; margin:0;}
+.popup .popupMessage {padding:0.4em;}
+.popup hr {display:block; height:1px; width:auto; padding:0; margin:0.2em 0em;}
+.popup li.disabled {padding:0.4em;}
+.popup li a {display:block; padding:0.4em; font-weight:normal; cursor:pointer;}
+.listBreak {font-size:1px; line-height:1px;}
+.listBreak div {margin:2px 0;}
+
+.tabset {padding:1em 0em 0em 0.5em;}
+.tab {margin:0em 0em 0em 0.25em; padding:2px;}
+.tabContents {padding:0.5em;}
+.tabContents ul, .tabContents ol {margin:0; padding:0;}
+.txtMainTab .tabContents li {list-style:none;}
+.tabContents li.listLink { margin-left:.75em;}
+
+#contentWrapper {display:block;}
+#splashScreen {display:none;}
+
+#displayArea {margin:1em 17em 0em 14em;}
+
+.toolbar {text-align:right; font-size:.9em;}
+
+.tiddler {padding:1em 1em 0em 1em;}
+
+.missing .viewer,.missing .title {font-style:italic;}
+
+.title {font-size:1.6em; font-weight:bold;}
+
+.missing .subtitle {display:none;}
+.subtitle {font-size:1.1em;}
+
+.tiddler .button {padding:0.2em 0.4em;}
+
+.tagging {margin:0.5em 0.5em 0.5em 0; float:left; display:none;}
+.isTag .tagging {display:block;}
+.tagged {margin:0.5em; float:right;}
+.tagging, .tagged {font-size:0.9em; padding:0.25em;}
+.tagging ul, .tagged ul {list-style:none; margin:0.25em; padding:0;}
+.tagClear {clear:both;}
+
+.footer {font-size:.9em;}
+.footer li {display:inline;}
+
+.annotation {padding:0.5em; margin:0.5em;}
+
+* html .viewer pre {width:99%; padding:0 0 1em 0;}
+.viewer {line-height:1.4em; padding-top:0.5em;}
+.viewer .button {margin:0em 0.25em; padding:0em 0.25em;}
+.viewer blockquote {line-height:1.5em; padding-left:0.8em;margin-left:2.5em;}
+.viewer ul, .viewer ol {margin-left:0.5em; padding-left:1.5em;}
+
+.viewer table, table.twtable {border-collapse:collapse; margin:0.8em 1.0em;}
+.viewer th, .viewer td, .viewer tr,.viewer caption,.twtable th, .twtable td, .twtable tr,.twtable caption {padding:3px;}
+table.listView {font-size:0.85em; margin:0.8em 1.0em;}
+table.listView th, table.listView td, table.listView tr {padding:0px 3px 0px 3px;}
+
+.viewer pre {padding:0.5em; margin-left:0.5em; font-size:1.2em; line-height:1.4em; overflow:auto;}
+.viewer code {font-size:1.2em; line-height:1.4em;}
+
+.editor {font-size:1.1em;}
+.editor input, .editor textarea {display:block; width:100%; font:inherit;}
+.editorFooter {padding:0.25em 0em; font-size:.9em;}
+.editorFooter .button {padding-top:0px; padding-bottom:0px;}
+
+.fieldsetFix {border:0; padding:0; margin:1px 0px 1px 0px;}
+
+.sparkline {line-height:1em;}
+.sparktick {outline:0;}
+
+.zoomer {font-size:1.1em; position:absolute; overflow:hidden;}
+.zoomer div {padding:1em;}
+
+* html #backstage {width:99%;}
+* html #backstageArea {width:99%;}
+#backstageArea {display:none; position:relative; overflow: hidden; z-index:150; padding:0.3em 0.5em 0.3em 0.5em;}
+#backstageToolbar {position:relative;}
+#backstageArea a {font-weight:bold; margin-left:0.5em; padding:0.3em 0.5em 0.3em 0.5em;}
+#backstageButton {display:none; position:absolute; z-index:175; top:0em; right:0em;}
+#backstageButton a {padding:0.1em 0.4em 0.1em 0.4em; margin:0.1em 0.1em 0.1em 0.1em;}
+#backstage {position:relative; width:100%; z-index:50;}
+#backstagePanel {display:none; z-index:100; position:absolute; width:90%; margin:0em 3em 0em 3em; padding:1em 1em 1em 1em;}
+.backstagePanelFooter {padding-top:0.2em; float:right;}
+.backstagePanelFooter a {padding:0.2em 0.4em 0.2em 0.4em;}
+#backstageCloak {display:none; z-index:20; position:absolute; width:100%; height:100px;}
+
+.whenBackstage {display:none;}
+.backstageVisible .whenBackstage {display:block;}
+/*}}}*/

ADDED   stml2/modules/twiki/twiki-mod.scm
Index: stml2/modules/twiki/twiki-mod.scm
==================================================================
--- /dev/null
+++ stml2/modules/twiki/twiki-mod.scm
@@ -0,0 +1,984 @@
+;; Copyright 2007-2010, Matthew Welland.
+;;
+;;  This program is made available under the GNU GPL version 2.0 or
+;;  greater. See the accompanying file COPYING for details.
+;;
+;;  This program is distributed WITHOUT ANY WARRANTY; without even the
+;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+;;  PURPOSE.
+
+;; twiki module
+(require-extension sqlite3 regex posix md5 message-digest base64)
+(import (prefix base64 base64:))
+
+;; TODO
+;;
+;; * Inline tiddlers [inline[TiddlerName]]
+;; * Pics            [pic X Y[picname.jpg]]
+;; * Move twiki parsing/expanding to mattsutils as loadable module
+
+;; Routines intended to be overridden by end users
+;;  (twiki:access keys wiki-name user-id)
+;; search the code for "override" for more.
+
+;; twiki css
+;; =========
+;; Block                tag
+;; -----                ---
+;; twiki                twiki
+;; twiki body div       twiki-node
+;; twiki main menu      twiki-main-menu
+
+;; This is the currently supported mechanism. Postgres will be added later -mrw- 7/26/2009
+;;
+(define (twiki:open-db key . create-not-ok)
+  ;; (s:log "Got to twiki:open-db with key: " key)
+  (let* ((create-ok (if (null? create-not-ok) #t (car create-not-ok)))
+	 (fdat      (twiki:key->fname key))
+	 (basepath  (sdat-get-twikidir s:session))
+	 (fpath     (car fdat))
+	 (fname     (cadr fdat))
+	 (fulldir   (conc basepath "/" fpath))
+	 (fullname  (let ((fn (conc fulldir "/" fname)))
+		      (if (sdat-get-debugmode s:session)(s:log "\ntwikipath: " fn))
+		      fn))
+	 (fexists   (file-exists? fullname))
+	 (db        (if fexists (dbi:open 'sqlite3 (list (cons 'dbname fullname))) #f)))
+    (if (and (not db)
+	     (not create-ok))
+	(exit 100)
+	(begin
+	  (if (not fexists)
+	      (begin
+		;; (print "fullname: " fullname)
+		(if (sdat-get-debugmode s:session)
+		    (s:log "\ncreating fulldir: " fulldir))
+		(twiki:register-wiki key fullname)
+		(system (conc "mkdir -p " fulldir)) ;; create the path
+		(if (file-exists? fpath)
+		    (s:log "OK: dir " fpath " has been made")
+		    (s:log "ERROR: Failed to make the path for the twiki"))
+		(set! db (dbi:open 'sqlite3 (list (cons 'dbname fullname))))
+		(for-each 
+		 (lambda (sqry)
+		   ;; (print sqry)
+		   (dbi:exec db sqry))
+		 ;; types: 0 text, 1 jpg, 2 png, 3 svg, 4 spreadsheet, 5 audio, 6 video :: better specs to come...
+		 (list
+		  "CREATE TABLE pics      (id INTEGER PRIMARY KEY,name TEXT,wiki_id INTEGER,dat_id INTEGER,thumb_dat_id INTEGER,created_on INTEGER,owner_id INTEGER);"
+		  "CREATE TABLE dats      (id INTEGER PRIMARY KEY,md5sum TEXT,dat BLOB,type INTEGER);"
+		  ;; on every modification a new tiddlers entry is created. When displaying the tiddlers do:
+		  ;;    select where created_on < somedate order by created_on desc limit 1
+		  "CREATE TABLE tiddlers (id INTEGER PRIMARY KEY,wiki_id INTEGER,name TEXT,rev INTEGER,dat_id INTEGER,created_on INTEGER,owner_id INTEGER);"
+		  ;; rev and tag only utilized when user sets a tag. All results from a select as above for tiddlers are set to the tag
+		  "CREATE TABLE revs     (id INTEGER PRIMARY KEY,tag TEXT);"
+		  ;; wikis is here for when postgresql support is added or if a sub wiki is created. 
+		  "CREATE TABLE wikis    (id INTEGER PRIMARY KEY,name TEXT,created_on INTEGER);"
+		  ;; access control, negative numbered groups are private groups, postive numbered groups are system groups
+		  ;; permissions are on a per-wiki granularity
+		  ;; access; 0=none,1=read,2=read/write
+		  "CREATE TABLE perms    (id INTEGER PRIMARY KEY,wiki_id INTEGER,group_id INTEGER,access INTEGER);"
+		  "CREATE TABLE groups   (id INTEGER PRIMARY KEY,name TEXT);"
+		  "CREATE TABLE members  (id INTEGER PRIMARY KEY,person_id INTEGER,group_id INTEGER);"
+		  ;; setup and configuration data
+		  "CREATE TABLE meta     (id INTEGER PRIMARY KEY,key TEXT,val TEXT);"
+		  ;; need to create an entry for *this* twiki
+		  (conc "INSERT INTO wikis (id,name,created_on) VALUES (1,'main'," (current-seconds) ");")))
+		;;     (conc "INSERT INTO tiddlers (wiki_id,name,created_on) VALUES(1,'MainMenu'," (current-seconds) ");")))))
+		(twiki:save-tiddler db "MainMenu" "[[FirstTiddler]]" "" 1 1)))
+	  ;; (sqlite3:set-busy-timeout!(dbi:db-conn db) 1000000)
+	  db))))
+
+;;======================================================================
+;; twikis (db naming, sqlite vs postgresql, keys etc.
+;;======================================================================
+
+;; A wiki is specified by a list of keys, here we convert that list to a single string
+(define (twiki:keys->key keys)
+  (if (not (null? keys))
+      (string-intersperse (map conc keys) " ")
+      " "))
+
+(define (twiki:key->fname key)
+  (let* (;; (md5keypath (md5:digest key)) ;; (twiki:keys->key keys)))
+	 (keypath    (twiki:web64enc key))
+	 (delta      (quotient (string-length keypath) 3)) ;; 
+	 (p1         (substring keypath 0           delta)) ;;  0  8))
+	 (p2         (substring keypath delta       (* delta 2)));;  8 16))
+	 (p3         (substring keypath (* delta 2) (* delta 3)))) ;; 16 24))
+    (list (string-intersperse (list "dbs" p1 p2 p3) "/") keypath)))
+
+;; look up the wid based on the keys, this is used for sub wikis only. I.e. a wiki instantiated inside another wiki 
+;; giving a separate namespace to all the tiddlers
+(define (twiki:name->wid db name) 
+  (let ((wid (dbi:get-one db "SELECT id FROM wikis WHERE name=?;" name)))
+    (if wid wid
+	(begin
+	  (dbi:exec db "INSERT INTO wikis (name,created_on) VALUES(?,?);" name (current-seconds))
+	  (twiki:name->wid db name)))))
+
+;;======================================================================
+;; twiki record
+;;======================================================================
+
+;; make-vector-record twiki wiki wid name key dbh
+(define (make-twiki:wiki)(make-vector 5))
+(define-inline (twiki:wiki-get-wid    vec)    (vector-ref  vec 0))
+(define-inline (twiki:wiki-get-name   vec)    (vector-ref  vec 1))
+(define-inline (twiki:wiki-get-key    vec)    (vector-ref  vec 2))
+(define-inline (twiki:wiki-get-dbh    vec)    (vector-ref  vec 3))
+(define-inline (twiki:wiki-get-perms  vec)    (vector-ref  vec 4))
+
+(define-inline (twiki:wiki-set-wid!   vec val)(vector-set! vec 0 val))
+(define-inline (twiki:wiki-set-name!  vec val)(vector-set! vec 1 val))
+(define-inline (twiki:wiki-set-key!   vec val)(vector-set! vec 2 val))
+(define-inline (twiki:wiki-set-dbh!   vec val)(vector-set! vec 3 val))
+(define-inline (twiki:wiki-set-perms! vec val)(vector-set! vec 4 val))
+
+;;======================================================================
+;; twiki misc
+;;======================================================================
+
+;; returns help html
+(define (twiki:help section)
+  (let ((main (twiki:div 
+	       'node "twiki-help"
+	       (list 
+		(twiki:h3 "Help stuff")
+		(twiki:pre "
+Link to page:      [[Page Title]]
+Heading3:          !!! The heading
+Underline:         __underlined__
+Table:             | cell1 | cell2 |
+List:              # item1
+                   ## item2
+Bullet:            * item1
+                   ** item2
+Preformatted:      {{{stuff here}}}
+Insert a picture:  [pic[PicName]]
+Or with size:      [pic100x100[PicName]]
+Upload the picture using the \"Pic\" link first")))))
+	;;(case section
+    main))
+
+;;======================================================================
+;; twiki access control
+;;======================================================================
+
+;; idea here is for the end user to redefine this routine,
+;; and call twiki:interal-access if desired
+;; 
+;; if override is #t then give access no matter what
+(define (twiki:access keys wiki-name user-id)
+  '(r w))
+
+;; Add support for storing groups, users and access internally
+;; 
+(define (twiki:internal-access keys wiki-name user-id)
+  #f)
+
+;;======================================================================
+;; twiki registry
+;;======================================================================
+
+;; these can be overridden by end user (just create a new routine by the same name)
+
+(define (twiki:open-registry)
+  (let* ((basepath  (sdat-get-twikidir s:session))
+	 (regfile   (conc basepath "/registry.db"))
+	 (regexists (file-exists? regfile))
+	 (db        #f))
+    (if (sdat-get-debugmode s:session)
+	(s:log "regfile: " regfile " regexists: " regexists " db: " db))
+    (set! db (dbi:open 'sqlite3 (list (cons 'dbname regfile))))
+    (if regexists
+	db
+	(begin
+	  (for-each (lambda (stmt)(dbi:exec db stmt))
+		    (list "CREATE TABLE wikis (key TEXT PRIMARY KEY,path TEXT,creation_date INTEGER,creator_id INTEGER);"))
+	  db))))
+
+(define (twiki:register-wiki key path)
+  (let ((db (twiki:open-registry)))
+    (dbi:exec db 
+	      "INSERT OR REPLACE INTO wikis (key,path,creation_date,creator_id) VALUES(?,?,?,?);"
+	      key path (current-seconds) (twiki:get-id))
+    (dbi:close db)))
+
+;;======================================================================
+;; tiddlers
+;;======================================================================
+
+(define twiki:tiddler-selector "SELECT t.id,t.name,t.rev,t.dat_id,t.created_on,t.owner_id FROM tiddlers AS t INNER JOIN dats AS d ON t.dat_id=d.id")
+(define (twiki:tiddler-make)(make-vector 8 #f))
+(define-inline (twiki:tiddler-get-id           vec)    (vector-ref  vec 0))
+(define-inline (twiki:tiddler-get-name         vec)    (vector-ref  vec 1))
+(define-inline (twiki:tiddler-get-rev          vec)    (vector-ref  vec 2))
+(define-inline (twiki:tiddler-get-dat-id       vec)    (vector-ref  vec 3))
+(define-inline (twiki:tiddler-get-created_on   vec)    (vector-ref  vec 4))
+(define-inline (twiki:tiddler-get-owner_id     vec)    (vector-ref  vec 5))
+;; (define-inline (twiki:tiddler-get-dat-type     vec)    (vector-ref  vec 6))
+
+(define-inline (twiki:tiddler-set-id!          vec val)(vector-set! vec 0 val) vec)
+(define-inline (twiki:tiddler-set-name!        vec val)(vector-set! vec 1 val) vec)
+(define-inline (twiki:tiddler-set-rev!         vec val)(vector-set! vec 2 val) vec)
+(define-inline (twiki:tiddler-set-dat-id!      vec val)(vector-set! vec 3 val) vec)
+(define-inline (twiki:tiddler-set-created_on!  vec val)(vector-set! vec 4 val) vec)
+;; (define-inline (twiki:tiddler-set-owner_id!    vec val)(vector-set! vec 5 val))
+
+;;======================================================================
+;; Routines for displaying, editing, browsing etc. tiddlers
+;;======================================================================	
+
+;; should change this to take a tiddler structure?
+;; This is the display of a single tiddler
+(define (twiki:view dat  tkey wid tiddler wiki) ;; close, close others, edit, more
+  (let ((is-not-main  (not (equal? "MainMenu" (twiki:tiddler-get-name tiddler))))
+	(edit-allowed (member 'w (twiki:wiki-get-perms wiki))))
+    (s:div 'class "tiddler"
+	   (s:div 'class "tiddler-menu"
+		  (if (equal? "MainMenu" (twiki:tiddler-get-name tiddler))
+		      (if edit-allowed
+			  (list (s:a "edit" 'href
+				     (s:link-to (twiki:get-link-back-to-current)
+						'edit_tiddler (twiki:tiddler-get-id tiddler))))
+			  '())
+		      (s:div 'class "tiddler-menu-internal"
+		       (s:a "close" 'href (s:link-to (twiki:get-link-back-to-current) 'close_tiddler (twiki:tiddler-get-id tiddler))) "."
+		       (s:a "close others" 'href (s:link-to (twiki:get-link-back-to-current) 'close_other_tiddlers (twiki:tiddler-get-id tiddler))) "."
+		       (if edit-allowed
+			   (s:a "edit"  'href (s:link-to (twiki:get-link-back-to-current) 'edit_tiddler (twiki:tiddler-get-id tiddler)))
+			   '()))))
+	    (s:p (twiki:dat->html dat wiki)))))
+
+(define (twiki:view-tiddler db  tkey wid tiddler wiki)
+  (let* ((dat-id (twiki:tiddler-get-dat-id tiddler))
+	 (dat    (twiki:get-dat db dat-id))
+	 (tnum   (twiki:tiddler-get-id tiddler)))
+    ;; (s:log "twid: " dat-id " dat: " dat)
+    (twiki:view dat  tkey wid tiddler wiki)))
+
+;; call with param => action-name-key e.g. save-bWFpbg__-aGVsbG8gbnVyc2U_ (save main "hello nurse")
+;; this one is called when an edit form is submitted (i.e. POST)
+(define (twiki:action params)
+  (if (and (list? params)
+	   (> (length params) 0))
+      (let* ((cmdln (string-split (car params) "-"))
+	     (cmd   (string->symbol (car cmdln)))
+	     (tkey  (twiki:web64dec (caddr cmdln)))
+	     (wid   (string->number (cadr cmdln)))
+	     (tdb   (twiki:open-db tkey)))
+	(s:log "cmdln: " cmdln " cmd: " cmd " tkey: " tkey " wid: " wid)
+	(case cmd
+	  ((save)
+	   (twiki:save-curr-tiddler tdb wid))
+	  ((savepic)
+	   (s:log "twiki:action got to savepic")
+	   (twiki:save-pic-from-form tdb wid))
+	  ((cancel) ;; deprecated. Use a link for this (i.e in the twiki:twiki proc
+	   (s:del! (conc "CURRENT_TWIDLER_UNDER_EDIT:" wid))
+	   )))))
+
+;; generate a form for editing a twiddler tnum
+(define (twiki:edit-tiddler db tkey wid tnum)
+  (s:log "twiki:edit-tiddler: tkey=" tkey " wid: " wid)
+  (let* ((enc-key  (twiki:web64enc tkey))
+	 (tiddats  (twiki:get-tiddlers-by-num db wid (list tnum))))
+    (if (null? tiddats)
+	(let* ((tid    0)
+	       (dat-id 0))
+	  (s:set! "twiki_title" "")
+	  (s:set! "twiki_body"  ""))
+	(let* ((tid    (car tiddats))
+	       (dat-id (twiki:tiddler-get-dat-id tid)))
+	  ;; (s:log "tid: " tid " dat-id: " dat-id)
+	  (s:set! "twiki_title" (twiki:tiddler-get-name tid))
+	  (s:set! "twiki_body"  (twiki:get-dat db dat-id))))
+    (s:form 'action (s:link-to (twiki:get-link-back-to-current)
+			       'action (conc "twiki.save-" (number->string wid) "-" enc-key))
+	    'method "post" ;; 'twikiname tkey ;; done, cancel, delete
+	    (s:input 'type "submit"   'name "form-name" 'value "save" 'twikiname tkey)
+	    ;; (s:a "done" 'href (s:link-to (twiki:get-link-back-to-current) 'save_tmenu tnum))
+	    (s:a "cancel" 'href (s:link-to (twiki:get-link-back-to-current) 'cancel_tedit tnum)) "."
+	    (s:a "delete" 'href (s:link-to (twiki:get-link-back-to-current) 'delete_tiddler tnum))(s:br)
+	    (s:input-preserve 'type "text" 'name "twiki_title" 'size "58" 'maxlength "150")
+	    (s:textarea-preserve 'type "textarea" 'name "twiki_body" 'rows "10" 'cols "65")
+	    (s:p "Tags" (s:input-preserve 'type "text" 'name "twiki_tags" 'size "55" 'maxlength "150")))))
+
+;; save a tiddler to the db for the twiki twik, getting data from the INPUT
+(define (twiki:save-curr-tiddler tdb wid)
+  (formdat:printall (sdat-get-formdat s:session) s:log)
+  (let* ((heading (s:get-input 'twiki_title))
+	 (body    (s:get-input 'twiki_body))
+	 (tags    (s:get-input 'twiki_tags))
+	 (uid     (twiki:get-id)))
+    ;; (s:log "twiki:save-curr-tiddler heading: " heading " body: " body " tags: " tags)
+    (s:set! 'twiki_title heading)
+    (if body
+	(begin
+	  (set! body (string-chomp body))
+	  (s:set! 'twiki_body  body)))
+    (s:set! 'twiki_tags  tags)
+    (s:del! (conc "CURRENT_TWIDLER_UNDER_EDIT:" wid))
+    (let ((res (twiki:save-tiddler tdb heading body tags wid uid)))
+      ;; Now, replace this twiddler number in the view list with 
+      ;; the new number from the db
+      (twiki:normalize-current-twiddlers tdb wid)
+      (s:del! 'twiki_title)
+      (s:del! 'twiki_body)
+      (s:del! 'twiki_tags)
+      res)
+    ))
+
+(define (twiki:normalize-current-twiddlers tdb wid)
+  (let* ((cvar      (conc "CURRENT_TWIDLERS:" wid))
+	 (curr-slst (s:get cvar))
+	 (curr-lst  (map string->number (string-split curr-slst ",")))
+	 (tdlrs     (twiki:get-tiddlers-by-num tdb wid curr-lst))
+	 (names     (remove (lambda (t)(string=? "MainMenu" t))
+			    (map twiki:tiddler-get-name tdlrs)))
+	 (newnums   (map twiki:tiddler-get-id 
+			 (map (lambda (tn)
+				(twiki:get-tiddler-by-name tdb wid tn))
+			      names))))
+    (s:set! cvar (string-intersperse (map number->string newnums)
+				     ","))))
+    
+;; generic save tiddler
+(define (twiki:save-tiddler tdb heading body tags wid uid)
+    (if (misc:non-zero-string heading)
+	(let* ((prev-tid (twiki:get-tiddler-by-name tdb wid heading))
+	       (prev-dat-id (if prev-tid 
+				(twiki:tiddler-get-dat-id prev-tid)
+				-1))
+	       (dat-id (twiki:save-dat tdb body 0))) ;; 0=text
+	  ;; (s:log "twiki:save-tiddler dat-id: " dat-id " body: " body)
+	  (if (equal? prev-dat-id dat-id) ;; no need to insert a new record if the dat didn't change
+	      #t
+	      (dbi:exec tdb 
+			"INSERT INTO tiddlers (wiki_id,name,dat_id,created_on,owner_id) VALUES(?,?,?,?,?);"
+			wid heading dat-id (current-seconds) uid))
+	  #t) ;; success
+	#f))  ;; non-success
+
+;; text=0, jpg=1, png=2
+(define (twiki:save-dat db dat type)
+  (let* ((md5sum (message-digest-string (md5-primitive) dat)) ;; (md5-digest dat))
+	 (datid  (twiki:dat-exists? db md5sum type))
+	 (datblob (if (string? dat)
+		      (string->blob dat)
+		      dat)))
+    (if datid
+	datid
+	(begin
+	  (case type
+	    ((0)   (dbi:exec db "INSERT INTO dats (md5sum,dat,type) VALUES(?,?,?);" md5sum datblob 0))
+	    ((1)   (dbi:exec db "INSERT INTO dats (md5sum,dat,type) VALUES(?,?,?);" md5sum datblob 1))
+	    (else  (dbi:exec db "INSERT INTO dats (md5sum,dat,type) VALUES(?,?,?);" md5sum datblob type)))
+	  (twiki:dat-exists? db md5sum type)))))
+       
+(define (twiki:dat-exists? db md5sum type)
+  (dbi:get-one db "SELECT id FROM dats WHERE md5sum=? AND type=?;" md5sum type))
+
+(define (twiki:get-dat db id)
+  (if (and id (number? id))
+      (if (< id 0)
+	  ""
+	  (let ((res (dbi:get-one-row db "SELECT dat,type FROM dats WHERE id=?;" id)))
+	    (if res
+		(case (vector-ref res 1)
+		  ((0)(blob->string (vector-ref res 0)))
+		  (else (vector-ref res 0)))
+		#f)))
+      #f))
+
+(define (twiki:maint_area tdb wid tkey wiki)
+  (let ((maint (s:get-param 'twiki_maint))
+	(write-perm (member 'w (twiki:wiki-get-perms wiki))))
+    (s:div 'class "twiki-menu-internal"
+     (if write-perm
+	 (list (s:a "Orphans"  'href (s:link-to (twiki:get-link-back-to-current) 'twiki_maint 1))(s:br)
+	       (s:a "Pics"     'href (s:link-to (twiki:get-link-back-to-current) 'twiki_maint 2))(s:br)
+	       (s:a "Help"     'href (s:link-to (twiki:get-link-back-to-current) 'twiki_maint 4))(s:br))
+	 '())
+     (s:a "Search"   'href (s:link-to (twiki:get-link-back-to-current) 'twiki_maint 3))(s:br)
+     (case maint
+       ((1)
+	(twiki:list-orphans tdb))
+       (else
+	 '())))))
+
+;;======================================================================
+;; Orphans
+;;======================================================================
+(define (twiki:make-tiddler-list tdlrs . tnums)
+  (conc (string-intersperse 
+	 (map conc (delete-duplicates
+		    (append (map twiki:tiddler-get-id tdlrs) tnums)))
+	 ",")))
+
+(define (twiki:get-orphans tdb)
+  '())
+
+(define (twiki:list-orphans tdb)
+  '())
+
+;;======================================================================
+;; Pictures
+;;======================================================================
+(define (twiki:pic_mgmt tdb wid tkey)
+  (s:div 
+   (s:a "Add pic" 'href (s:link-to (twiki:get-link-back-to-current) 'twiki_maint 2 'twiki_maint_add_pics 1))(s:br)
+   (if (s:get-param "twiki_maint_add_pics")
+       (s:form 'enctype "multipart/form-data" ;; 'name "does-a-form-have-a-name"
+	       (s:input 'type "file" 'name "input-picture" 'value "Upload pic")
+	       (s:input 'type "submit" 'name "submit-picture" 'value "Submit")
+	       'method "post" 
+	       'action (s:link-to (twiki:get-link-back-to-current) 'action (conc "twiki.savepic-" (number->string wid) "-" (twiki:web64enc tkey)))
+	       (s:input 'type "text" 'name "picture-name" 'value ""))
+       '())
+   (let ((pics (dbi:get-rows tdb "SELECT id,name,dat_id,thumb_dat_id FROM pics WHERE wiki_id=?;" wid)))
+     (map (lambda (pic)
+	    (s:div 'class "tiddlerthumb"
+		   (s:img 'title (vector-ref pic 1) 'alt (vector-ref pic 1)
+		 	  ;; 'src (s:link-to "twiki" 'wiki_key (twiki:web64enc tkey) 'image  (vector-ref pic 0)))
+		 	  'src (s:link-to "twiki" 'wiki_key (conc (number->string wid) "-" (twiki:web64enc tkey))
+					  'thumb  (vector-ref pic 0)))
+		   ;;       (conc "twiki/" wid "/thumbs/" (vector-ref pic 0))))
+		   (vector-ref pic 0) (vector-ref pic 1)))
+	  pics))))
+
+(define  (twiki:save-pic-from-form tdb wid)
+  (let* ((pic-dat  (s:get-input 'input-picture))
+	 (alt-name (s:get-input 'picture-name)))
+    (if pic-dat
+	(begin
+	  (s:log "twiki:save-pic-from-form with pic-dat=" pic-dat " and alt-name=" alt-name)
+	  (twiki:save-pic tdb pic-dat wid alt-name))
+	#f)))
+
+;; get pic id for a pic name, returns the latest
+(define (twiki:get-pic-id tdb pic-name wid)
+  (dbi:get-one tdb "SELECT pics.id FROM pics WHERE pics.name=? AND pics.wiki_id=? ORDER BY pics.id DESC LIMIT 1;" pic-name wid))
+
+(define (twiki:save-pic tdb pic-dat wid alt)
+  (let ((pic-name (car pic-dat))
+	(pic-type (cadr pic-dat))
+	(pic-data (caddr pic-dat))
+	;; I'm not too happy with this solution but I can't seem to chomp the \n\d from the end of the string
+	(alt-name (if alt (string-substitute (regexp "[^\\w ]") "" alt #t) #f)))
+    (if (and alt-name
+	     (string-match (regexp "\\w+") alt-name))
+	(set! pic-name alt-name))
+    (s:log "alt: " alt " alt-name: " alt-name)
+    (if pic-data
+	(let ((dat-id (twiki:save-dat tdb pic-data (twiki:mime->twiki-type pic-type)))
+	      (creation-time (current-seconds)))
+	  ;; (twiki:delete-pic-by-name tdb pic-name)
+	  (dbi:exec tdb 
+		    "INSERT INTO pics (name,wiki_id,dat_id,created_on,owner_id) VALUES(?,?,?,?,?);"
+		    pic-name wid dat-id creation-time (twiki:get-id))
+	  (let ((pic-id (twiki:get-pic-id tdb pic-name wid)))
+	    (twiki:make-thumbnail tdb pic-id wid))
+	  #t)
+	#f)))
+
+(define (twiki:get-pic-dat tdb wid pic-id)
+  (dbi:get-one tdb "SELECT dat FROM pics INNER JOIN dats ON pics.dat_id=dats.id WHERE pics.id=? AND wiki_id=?;" pic-id wid))
+
+(define (twiki:get-thumb-dat tdb wid pic-id)
+  (dbi:get-one tdb "SELECT dat FROM pics INNER JOIN dats ON pics.thumb_dat_id=dats.id WHERE pics.id=? AND wiki_id=?;" pic-id wid))
+
+;; this one sets up the Content type, puts the data into page-dat and is done
+(define (twiki:return-image-dat tdb wid pic-id)
+  (let ((dat  (twiki:get-pic-dat tdb wid pic-id)))
+    (s:log "twiki:return-image-dat dat is: " dat " of size: " (if (blob? dat)(blob-size dat) "[not a blob]"))
+    (sdat-set-page-type!    s:session 'image)
+    (sdat-set-content-type! s:session "image/jpeg")
+    (sdat-set-alt-page-dat! s:session dat)))
+    ;; (session:alt-out s:session)))
+
+;; this one sets up the Content type, puts the data into page-dat and is done
+(define (twiki:return-thumb-dat tdb wid pic-id)
+  (let ((dat  (twiki:get-thumb-dat tdb wid pic-id)))
+    (s:log "twiki:return-image-dat dat is: " dat " of size: " (if (blob? dat)(blob-size dat) "[not a blob]"))
+    (sdat-set-page-type!    s:session 'image)
+    (sdat-set-content-type! s:session "image/jpeg")
+    (sdat-set-alt-page-dat! s:session dat)))
+    ;; (session:alt-out s:session)))
+  
+(define (twiki:make-thumbnail tdb pic-id wid)
+  (let ((indat  (twiki:get-pic-dat tdb wid pic-id)))
+    ;;   (outdat (open-output-string)))
+    (let-values (((inp oup pid)(process "convert" (list "-size" "500x180" "-" "-thumbnail" "250x90" "-unsharp" "0x.5" "-"))))
+		(write-string (blob->string indat) #f oup)
+		(close-input-port oup)
+		;; (write-string #f inp (blob->string indat))
+		(let ((l (read-string #f inp)))
+		  (close-output-port inp)
+		  ;; (write-string l #f outdat)
+		  (let* ((newdat (string->blob l)) ;; (get-output-string outdat)))
+			 (dat-id (twiki:save-dat tdb newdat 2))) ;; bug?
+		    (dbi:exec tdb "UPDATE pics SET thumb_dat_id=? WHERE id=?;" dat-id pic-id)
+		    dat-id)))))
+
+;; not tested
+(define (twiki:picdat->thumbdat picdat)
+  (let-values (((inp oup pid)(process "convert" ;; (list "-size" "500x180" "-" "-thumbnail" "250x90" "-unsharp" "0x.5" "-"))))
+				      (list "-size" "500x180" "-" "-thumbnail" "200x70" "-unsharp" "0x.5" "-"))))
+	      (write-string (blob->string picdat) #f oup)
+	      (close-input-port oup)
+	      ;; (write-string #f inp (blob->string indat))
+	      (let ((l (read-string #f inp)))
+		(close-output-port inp)
+		(write-string l #f oup)
+		(string->blob l))))
+
+(define (twiki:mime->twiki-type mime-type)
+  (case (string->symbol mime-type)
+    ((image/jpeg) 1)
+    ((image/png)  2)
+    (else 0)))
+
+;;======================================================================
+;; Wiki stuff
+;;======================================================================
+
+;; curr-tiddlers is a list of the names of the current tiddlers displayed
+;; tiddler-under-edit is the tiddler being edited (or #f for none).
+(define (twiki:wiki name keys)
+  (let ((perms   (twiki:access name keys (twiki:get-id))))
+    ;; (s:log "twiki:wiki name: \"" name "\" keys: " keys)
+    (if (or (not name)
+	    (string=? name "")) ;; name must be "" or #f to get here and return an image
+	;; handle returning pictures, note keys and name are ignored for these. They are called out in
+	;; the twiki/view.scm (twiki:twiki "blah" '(nada foo)) call.
+	(let ((image   (s:get-param "image"))
+	      (thumb   (s:get-param "thumb")))
+	  (s:log "image: " image " thumb: " thumb " wiki_key: " (s:get-param 'wiki_key))
+	  (if (and (member 'r perms) image)
+	      (let* ((varlst (string-split (s:get-param 'wiki_key) "-"))
+		     (tkey (twiki:web64dec (cadr varlst)))
+		     (wid  (string->number (car  varlst)))
+		     (tdbn (twiki:open-db tkey #f)))
+		(s:log "tkey: " tkey " image number: " image)
+		(twiki:return-image-dat tdbn wid (string->number image)))) ;; do not return from twiki:return-image
+	  (if (and (member 'r perms) thumb)
+	      (let* ((varlst (string-split (s:get-param 'wiki_key) "-"))
+		     (tkey   (twiki:web64dec (cadr varlst)))
+		     (wid    (string->number (car  varlst)))
+		     (tdbn   (twiki:open-db tkey #f)))
+		(s:log "tkey: " tkey " thumb number: " image)
+		(twiki:return-thumb-dat tdbn wid (string->number thumb))))) ;; do not return from twiki:return-image
+	(if (not (member 'r perms)) ;; read access
+	    '() ;; return a blank slate
+	    (twiki:display-wiki name keys perms)))))
+
+(define (twiki:display-wiki name keys perms)
+  (let* ((wikidat  (make-twiki:wiki))
+	 (tkey     (twiki:keys->key keys))
+	 (tdb      (twiki:open-db tkey))
+	 (wid      (twiki:name->wid tdb name))
+	 (cvar     (conc "CURRENT_TWIDLERS:" wid)) ;; page var to store current twiddlers being viewed
+	 (cvar-ed  (conc "CURRENT_TWIDLER_UNDER_EDIT:" wid))
+	 (tnumedit (if (s:get cvar-ed) 
+		       (string->number (s:get cvar-ed))
+		       #f)) ;; #f => nothing to edit, -1 create a new tiddler
+	 (tnumview #f)
+	 (lmenu    (twiki:get-tiddlers tdb wid (list "MainMenu")))
+	 ;; store tiddlers for this page/twiki in cvar (i.e. CURRENT_TWIDLERS:
+	 (tdlnums  (if (s:get cvar)
+		       (map string->number (string-split (s:get cvar) ","))
+		       '())) ;; list of tiddler numbers
+	 (tdlrs    '())
+	 (tedited  (if (member 'w perms) #f #t)) ;; force no edits if not a writer
+	 (edit-tmenu-id (if (and (member 'w perms)
+				 (s:get-param "edit_tmenu"))
+			    (string->number (s:get-param "edit_tmenu"))
+			    #f))
+	 (edit-tiddler (if  (and (member 'w perms)
+				 (s:get-param "edit_tiddler")) ;; this handles the "edit" link in the tiddler control bar
+			    (let ((t (twiki:get-tiddlers-by-num tdb wid (list (string->number (s:get-param "edit_tiddler"))))))
+			      (s:log "t: " t)
+			      (if t
+				  (car t ) ;; should be a list of one
+				  (twiki:tiddler-set-name!
+				   (twiki:tiddler-set-id! (twiki:tiddler-make) -1) "NewTiddler")))
+			    #f))
+	 (view-tiddler (if (s:get-param "view_tiddler")
+			   (let* ((tname (twiki:web64dec (s:get-param "view_tiddler")))
+				  (t     (twiki:get-tiddler-by-name tdb wid tname)))
+			     (s:log "t: " t)
+			     (if t
+				 t 
+				 (begin
+				   (twiki:save-tiddler tdb tname (conc "!" tname) "" wid (twiki:get-id))
+				   (twiki:get-tiddler-by-name tdb wid tname))))
+			   #f))
+	 ) ;; image is the dat_id, keep it simple silly.
+
+    (twiki:wiki-set-wid!  wikidat wid)
+    (twiki:wiki-set-key!  wikidat tkey)
+    (twiki:wiki-set-name! wikidat name)
+    (twiki:wiki-set-dbh!  wikidat tdb)
+    (twiki:wiki-set-perms! wikidat perms)
+
+    ;; (s:log "edit-tmenu-id: " edit-tmenu-id " edit-tiddler: " edit-tiddler)
+
+    ;; Handle other URI commands here
+    (if (s:get-param "cancel_tedit") ;; doesn't matter which tiddler - just use this to cancel any edit
+	(begin
+	  (s:del! (conc "CURRENT_TWIDLER_UNDER_EDIT:" wid))
+	  (set! edit-tiddler #f)
+	  (set! tnumedit #f)
+	  (set! view-tiddler #f)
+	  (twiki:normalize-current-twiddlers tdb wid)
+	  (if (s:get cvar)
+	      (set! tdlnums (map string->number (string-split (s:get cvar) ","))))))
+    (if (s:get-param "delete_tiddler") '())
+    ;; (twiki:delete_tiddler tdb wid (string->number (s:get-param "delete_tiddler"))))
+
+    (s:set! "TWIKI_KEY" tkey) ;; this mechanism will fail for hierarchial twikis
+    ;; override the twiddler to edit when editing MainMenu
+    (if edit-tiddler
+	(begin
+	  (set! tnumedit (twiki:tiddler-get-id edit-tiddler))
+	  (s:set! 'twiki_title (twiki:tiddler-get-name edit-tiddler))
+	  (s:set! 'twiki_body  (twiki:get-dat tdb (twiki:tiddler-get-dat-id edit-tiddler)))))
+    (if view-tiddler
+	(begin
+	  (set! tnumview (twiki:tiddler-get-id view-tiddler))))
+    
+    ;; NOW WHAT FOR VIEW - fix the links, add to tdlst
+
+
+    (if edit-tmenu-id   (set! tnumedit edit-tmenu-id))
+    (if tnumedit (set! tdlnums (cons tnumedit tdlnums)))
+    (if tnumview (set! tdlnums (cons tnumview tdlnums)))
+    (set! tdlrs (twiki:get-tiddlers-by-num tdb wid tdlnums))
+
+    ;; remove tdlrs from the list if close_tiddler called
+    (if (s:get-param "close_tiddler")
+	(set! tdlrs (let ((tnum (string->number (s:get-param "close_tiddler"))))
+		      (remove (lambda (t)
+				(equal? (twiki:tiddler-get-id t) tnum))
+			      tdlrs))))
+
+    ;; remove all others if close_other_tiddlers called
+    (if (s:get-param "close_other_tiddlers")
+	(set! tdlrs (let ((tnum (string->number (s:get-param "close_other_tiddlers"))))
+		      (remove (lambda (t)
+				(not (equal? (twiki:tiddler-get-id t) tnum)))
+			      tdlrs))))
+    
+    (s:set! cvar (twiki:make-tiddler-list tdlrs))
+    (if tnumedit 
+	(s:set! cvar-ed tnumedit)
+	(s:del! cvar-ed))
+
+    ;; must have a MainMenu tiddler by now
+    (if (null? lmenu)
+	(begin
+	  (twiki:save-tiddler tdb "MainMenu" "" "" wid (twiki:get-id))
+	  (set! lmenu (twiki:get-tiddlers tdb wid (list "MainMenu")))))
+    
+    ;; get the tiddlers from the db now
+    (set! result
+	  (s:div 'class "twiki"
+	   ;; float to the right the control menu
+	   (s:div 'class "twiki-main-menu" (twiki:maint_area tdb wid tkey wikidat))
+	   (twiki:view-tiddler tdb  tkey wid (car lmenu) wikidat)
+	   ;; this is probably not needed as there is no reason to create tiddlers this way
+	   ;; (if (eq? tnumedit -1)(twiki:edit-tiddler tdb tkey wid tnumedit) '())
+	   ;; insert the picture editor window if enabled
+	   (if (equal? (s:get-param "twiki_maint") "2")(twiki:pic_mgmt tdb wid tkey) '())
+	   (if (equal? (s:get-param "twiki_maint") "4")(twiki:help 1) '())
+	   (if (not (null? tdlrs))
+	       (map (lambda (tdlr)
+		      (let ((tnum  (twiki:tiddler-get-id tdlr)))
+			(s:log "tnum: " tnum " tnumedit: " tnumedit)
+			(if (and tnumedit (not tedited) (equal? tnumedit tnum))
+			    (begin
+			      (set! tedited #t) ;; only allow editing one tiddler at a time
+			      (twiki:edit-tiddler tdb tkey wid tnum))
+			    (twiki:view-tiddler tdb  tkey wid tdlr wikidat))))
+		    tdlrs)
+	       '())))
+    (dbi:close tdb)
+    result))
+
+;; should do a single more efficient query but this is good enough
+(define (twiki:get-tiddlers db wid tnames)
+  (apply twiki:get-tiddlers-by-name db wid tnames))
+;;   (let* ((tdlrs '())
+;; 	 ;; (conn   (sdat-get-conn s:session))
+;; 	 (namelst (conc "('" (string-intersperse (map conc tnames) "','") "')"))
+;; 	 (qry     (conc twiki:tiddler-selector " WHERE t.wiki_id=? AND t.id IN " namelst ";")))
+;;     ;; (print qry)
+;;     (dbi:for-each-row
+;;      (lambda (row)
+;;        (set! tdlrs (cons row tdlrs)))
+;;      db qry wid)
+;;     (reverse tdlrs))) ;; !Twiki\
+
+;; tlst is a list of tiddler nums
+(define (twiki:get-tiddlers-by-num db wid tlst)
+  ;; (s:log "Got to twiki:get-tiddlers with keys: " tlst " and wid: " wid)
+  ;; select where created_on < somedate order by created_on desc limit 1
+  (let* ((tdlrs '())
+	 (tlststr (string-intersperse (map number->string tlst) ","))
+	 (already-got (make-hash-table))
+	 (qry    (conc twiki:tiddler-selector " WHERE t.wiki_id=? AND t.id IN (" tlststr ") ORDER BY created_on DESC;")))
+    (dbi:for-each-row
+     (lambda (row)
+       (let ((tname (twiki:tiddler-get-name row)))
+	 (if (not (hash-table-ref/default already-got tname #f))
+	     (begin
+	       (set! tdlrs (cons row tdlrs))
+	       (hash-table-set! already-got tname #t)))))
+     db qry wid)
+    (if (null? tdlrs) tdlrs (reverse tdlrs)))) ;; !Twiki\nTitle, pictures, etc.\n{{{\nCode\n}}}\n[[links]]\n|table|of|stuff|\n|more|stuff|here|\n"))
+
+;; wid = wiki id
+;; returns a list of twiki:tiddlers
+(define (twiki:get-tiddlers-by-name tdb wid . names)
+  (let ((tdlrs '()))
+    (for-each (lambda (name)
+		(let ((tdlr (twiki:get-tiddler-by-name tdb wid name)))
+		  (if tdlr (set! tdlrs (cons tdlr tdlrs)))))
+	      names)
+    (reverse tdlrs)))
+;; with the right query it should be possible to do this much faster approach for twiki:get-tiddlers-by-name
+;;   (let ((tdlrs '())
+;; 	(namelst (conc "('" (string-intersperse names "','") "')")))
+;;     (dbi:for-each-row
+;;      (lambda (row)
+;;        (set! tdlrs (cons row tdlrs)))
+;;      tdb
+;;      (conc twiki:tiddler-selector " WHERE t.wiki_id=? AND t.name IN " namelst) wid)
+;;     (reverse tdlrs)))
+
+;; get the tiddler with the given name and the max date
+(define (twiki:get-tiddler-by-name tdb wid name)
+  (dbi:get-one-row tdb (conc twiki:tiddler-selector " WHERE t.wiki_id=? AND t.name=? ORDER BY created_on DESC LIMIT 1;") wid name))
+
+(define (twiki:tiddler-name->id db tname)
+  (dbi:get-one db "SELECT id FROM tiddlers WHERE name=?;" tname))
+
+;;======================================================================
+;; twiki text formating, parsing and display
+;;======================================================================
+
+;; twiki formating routines (override these to change your look and feel
+(define twiki:twiki-tag  s:b)
+(define twiki:h3         s:h3)
+(define twiki:h2         s:h2)
+(define twiki:h1         s:h1)
+;; (define twiki:make-tlink s:i)
+(define twiki:ul         s:ul)
+(define twiki:ol         s:ol)
+(define twiki:li         s:li)
+(define twiki:pre        s:pre)
+(define twiki:p          s:p)
+(define twiki:u          s:u)
+(define twiki:td         s:td)
+(define twiki:tr         s:tr)
+(define twiki:table      s:table)
+(define twiki:div        s:div)
+
+(define (twiki:web64enc str)
+  (string-substitute "=" "_" (base64:base64-encode str) #t))
+
+(define (twiki:web64dec str)
+  (base64:base64-decode (string-substitute "_" "=" str #t)))
+    
+(define (twiki:make-tlink text tiddlername)
+  (s:a text 'href (s:link-to (twiki:get-link-back-to-current) 'view_tiddler (twiki:web64enc tiddlername))))
+
+(define (twiki:pic pic-name size wiki)
+  (let* ((tdb    (twiki:wiki-get-dbh wiki))
+	 (tkey   (twiki:wiki-get-key wiki))
+	 (xy     (string-split size "x"))
+	 (pic-id (twiki:get-pic-id tdb pic-name (twiki:wiki-get-wid wiki)))
+	 (img-lnk  (s:link-to "twiki" 'wiki_key (conc (number->string (twiki:wiki-get-wid wiki)) "-" (twiki:web64enc tkey))
+			      'image  pic-id)))
+    (if (and (> (length xy) 1)
+	     (car xy)
+	     (cadr xy)) ;; yep, have two numbers
+	(s:img 'title pic-name 'alt pic-name 'width (car xy) 'height (cadr xy) 'src img-lnk)
+	(s:img 'title pic-name 'alt pic-name 'src img-lnk))))
+
+;; override these also
+(define (twiki:get-id)
+  (s:session-var-get "id"))
+
+;; override this to set links inside wiki's
+(define (twiki:get-link-back-to-current)
+  (s:current-page))
+
+
+;; regexes are listed in the order in which they should be checked
+
+(define twiki:h3-patt (regexp "^!!!(.*)$"))
+(define twiki:h2-patt (regexp "^!!(.*)$"))
+(define twiki:h1-patt (regexp "^!(.*)$"))
+
+(define twiki:tlink-patt     (regexp "^(.*)\\[\\[([^\\[\\]]*)\\]\\](.*)$"))
+(define twiki:pic-patt       (regexp "^(.*)\\[pic([0-9%]*x*[0-9%]*)\\[([^\\[\\]]+)\\]\\](.*)$"))
+(define twiki:underline-patt (regexp "^(.*)__(.*)__(.*)$"))
+(define twiki:table-patt     (regexp "^\\|(.*)\\|$"))
+
+;; these are for multi-line formating
+(define twiki:list-patt    (regexp "^(\\*+|\\#+)(.*)$"))
+(define twiki:bullet-patt  (regexp "^(\\*+)(.*)$"))
+(define twiki:number-patt  (regexp "^(\\#+)(.*)$"))
+(define twiki:prefor-patt  (regexp "^\\{\\{\\{$"))
+(define twiki:prefor-end-patt (regexp "^\\}\\}\\}$"))
+
+;; regex
+(define t:match  #f)
+(define (t-match r s)
+  (let ((res (string-match r s)))
+    (set! t:match res)
+    res))
+
+;; should switch to recursively processing by block?
+;; (process-block dat)
+;;   ...
+;;   (process-block remdat)
+(define (twiki:dat->html dat wiki)
+  (let* ((inp        (open-input-string dat))
+	 (nest-depth 0) ;; depth of nested lists
+	 ;; token (i.e. line) handling stuff
+	 (next-line  #f)
+	 (peek-line  (lambda ()
+		       next-line))
+	 (get-line   (lambda ()
+		       (let ((res next-line))
+			 (set! next-line (read-line inp))
+			 ;; (print "get-line: prev=" res " next=" next-line "\n")
+			 res)))
+	 (l          (get-line))) ;; discard the #f in next-line
+    (twiki:read-block peek-line get-line nest-depth #f wiki)))
+
+;; blk-type is #f for not in a block (i.e. at top level), 'pre for preformated, 'ul or 'ol
+;; call with first line as legit data
+;; i.e. for preform - skip the {{{ line then call read-block
+;;      for # or * call with first line
+(define (twiki:read-block peek-line get-line nest-depth blk-type wiki)
+  (let loop ((res '())
+	     (l   (peek-line))) ;; should this be a peek-line? yes!!
+    ;; (print "twiki:read-block loop nest-depth="nest-depth " blk-type=" blk-type " l=" l "\n  res=" res)
+    (if (eof-object? l)
+	;; we are done! return the list
+	res
+	;; process it!
+	(cond
+	 ;; handle preformated text
+	 ((eq? blk-type 'pre)
+	  (if (t-match  twiki:prefor-end-patt l)
+	      (begin
+		(get-line) ;; discard the }}}
+		res)       ;; end of preformatted
+	      (begin
+		;; (get-line) ;; discard the {{{
+		(loop (append res (list (get-line)))
+		      (peek-line)))))
+	 ;; handle tables
+	 ((eq? blk-type 'table)
+	  (if (t-match twiki:table-patt l)
+	      (let ((cels  (string-split (cadr t:match) "|")))
+		(get-line)
+		(loop (append res (twiki:tr (map twiki:td 
+						 (map (lambda (x)(twiki:line->html x #f wiki)) cels))))
+		      (get-line)))
+	      res))
+	 ;; handle lists
+	 ((or (t-match twiki:bullet-patt l) ;; have *
+	      (t-match twiki:number-patt l))
+	  (let* ((directive (cadr t:match))
+		 (levelnum (string-length directive))
+		 (text     (twiki:line->html (caddr t:match) #t wiki))
+		 (btype    (if (string=? "#" (substring directive 0 1))
+			       'ol
+			       'ul))
+		 (func     (if (eq? btype 'ul)
+			       twiki:ul
+			       twiki:ol)))
+	    ;; (print "handling " btype ": levelnum=" levelnum " text=" text " nest-depth=" nest-depth " blk-type=" blk-type)
+	    (cond
+	     ((not blk-type) ;; i.e first member of the list!
+	      (loop (append res (func (twiki:read-block peek-line get-line levelnum btype wiki)))
+		    (get-line)))
+	     ((> levelnum nest-depth)
+	      (loop (append res (func (twiki:read-block peek-line get-line (+ nest-depth 1) btype wiki)))
+		    (peek-line)))
+	     ((< levelnum nest-depth)
+	      (append res (twiki:li text))) ;; return the bulleted item, don't get the next line??
+	     (else
+	      (get-line)
+	      (loop (append res (twiki:li text))
+		    (peek-line))))))
+	 ((t-match twiki:prefor-patt l)
+	  (get-line) ;; discard the {{{
+	  (loop (append res (twiki:pre (twiki:read-block peek-line get-line nest-depth 'pre wiki)))
+		(peek-line)))
+	 ((t-match twiki:table-patt l)
+	  (get-line)
+	  (loop (append res (twiki:table 'border 1 'cellspacing 0 (twiki:read-block peek-line get-line 0 'table wiki)))
+		(peek-line)))
+	 (else
+	  (get-line)
+	  (loop (append res (twiki:line->html l #t wiki))
+		(peek-line)))))))
+
+(define (twiki:line->html dat firstcall wiki)
+  (if firstcall 
+      ;; process the patterns that test for beginning of line only on the first call
+      (cond
+       ((t-match twiki:h3-patt dat)
+	(twiki:h3 (twiki:line->html (cadr t:match) #f wiki)))
+       ((t-match twiki:h2-patt dat)
+	(twiki:h2 (twiki:line->html (cadr t:match) #f wiki)))
+       ((t-match twiki:h1-patt dat)
+	(twiki:h1 (twiki:line->html (cadr t:match) #f wiki)))
+       ;; why was the (s:br) here? trying without
+       (else (twiki:line->html dat #f wiki)))
+       ;; (else  (append (twiki:line->html dat #f wiki)(list (s:br)))));; (s:p 'class "tiddlerpar"
+      ;; not firstcall so process other patterns
+      (cond
+       ((t-match twiki:tlink-patt dat)
+	(let ((pre  (cadr   t:match))
+	      (lnk  (caddr  t:match))
+	      (post (cadddr t:match)))
+	  (list (twiki:line->html pre #f wiki)
+		(twiki:make-tlink (twiki:line->html lnk #f wiki) lnk) ;; special handling
+		(twiki:line->html post #f wiki))))
+       ((t-match twiki:pic-patt dat)
+	(let ((pre  (cadr    t:match))
+	      (size (caddr   t:match)) 
+	      (pic  (cadddr  t:match))
+	      (post (list-ref t:match 4)))
+	  (list (twiki:line->html pre #f wiki)
+		(twiki:pic pic size wiki)
+		(twiki:line->html post #t wiki))))
+       ((t-match twiki:underline-patt dat)
+	(let ((pre  (cadr   t:match))
+	      (lnk  (caddr  t:match))
+	      (post (cadddr t:match)))
+	  (list (twiki:line->html pre #f wiki)
+		(twiki:u (twiki:line->html lnk #f wiki))
+		(twiki:line->html post #f wiki))))
+       ((t-match twiki:table-patt dat)
+	(let ((cels  (string-split (cadr t:match) "|")))
+	  (twiki:tr (map twiki:td (twiki:line->html cels #f wiki)))))
+       (else (list dat)))))
+
+
+#|
+(twiki:dat->html "a\n{{{\nb\nc\nd\n}}}\n!e\n[[f]]\n[[g]]\n*h" wiki)
+(s:output (current-output-port) (twiki:dat->html "!Testing [[my first link]]\n* Test\n* Foo\nblah" wiki))   
+(s:output (current-output-port) (twiki:dat->html "[[a]]\n{{{\nb\n  c\n   d\n}}}\n*x\n[[f]]\n[[g]]\n*h" wiki))
+(s:output (current-output-port)
+|#
+

ADDED   stml2/modules/twiki/twiki-test.scm
Index: stml2/modules/twiki/twiki-test.scm
==================================================================
--- /dev/null
+++ stml2/modules/twiki/twiki-test.scm
@@ -0,0 +1,5 @@
+(include "../../stml.scm")
+;; (include "../../session.scm")
+(include "../../misc-stml.scm")
+(include "twiki-mod.scm")
+

ADDED   stml2/modules/twiki/twiki.l
Index: stml2/modules/twiki/twiki.l
==================================================================
--- /dev/null
+++ stml2/modules/twiki/twiki.l
@@ -0,0 +1,33 @@
+;; twiki
+
+period           \.
+comma            ,
+semicolon        \;
+opensq           \[
+closesq          \]
+opensquig        \{
+closesquig       \}
+
+digit            [0-9]
+letter           [a-zA-Z]
+okchars          [_%\/\.:\*\+\-\(\)\\#']
+escape           \\ 
+whitespace       [ \9]
+linefeed         \n
+bang             !
+plaintext        ({letter}|{digit}|{okchars}|{whitespace}|{linefeed})+
+
+%%
+
+{opensq}                        (list 'opensq     yytext)
+{closesq}                       (list 'closesq    yytext)
+
+{opensquig}                     (list 'opensquig  yytext)
+{closesquig}                    (list 'closesquig yytext)
+
+{bang}                          (list 'bang       yytext)
+{plaintext}                     (list 'plaintext  yytext)
+
+<>                         (list 'end-of-input #f ) ;; yyline)
+
+<>                       (lex-error (conc yyline " : illegal character ") (yygetc))

ADDED   stml2/modules/twiki/twiki.l.scm
Index: stml2/modules/twiki/twiki.l.scm
==================================================================
--- /dev/null
+++ stml2/modules/twiki/twiki.l.scm
@@ -0,0 +1,1194 @@
+; *** This file starts with a copy of the file multilex.scm ***
+; Copyright (C) 1997 Danny Dube', Universite' de Montre'al.
+; All rights reserved.
+; SILex 1.0.
+
+;
+; Gestion des Input Systems
+; Fonctions a utiliser par l'usager:
+;   lexer-make-IS, lexer-get-func-getc, lexer-get-func-ungetc,
+;   lexer-get-func-line, lexer-get-func-column et lexer-get-func-offset
+;
+
+; Taille initiale par defaut du buffer d'entree
+(define lexer-init-buffer-len 1024)
+
+; Numero du caractere newline
+(define lexer-integer-newline (char->integer #\newline))
+
+; Constructeur d'IS brut
+(define lexer-raw-IS-maker
+  (lambda (buffer read-ptr input-f counters)
+    (let ((input-f          input-f)                ; Entree reelle
+	  (buffer           buffer)                 ; Buffer
+	  (buflen           (string-length buffer))
+	  (read-ptr         read-ptr)
+	  (start-ptr        1)                      ; Marque de debut de lexeme
+	  (start-line       1)
+	  (start-column     1)
+	  (start-offset     0)
+	  (end-ptr          1)                      ; Marque de fin de lexeme
+	  (point-ptr        1)                      ; Le point
+	  (user-ptr         1)                      ; Marque de l'usager
+	  (user-line        1)
+	  (user-column      1)
+	  (user-offset      0)
+	  (user-up-to-date? #t))                    ; Concerne la colonne seul.
+      (letrec
+	  ((start-go-to-end-none         ; Fonctions de depl. des marques
+	    (lambda ()
+	      (set! start-ptr end-ptr)))
+	   (start-go-to-end-line
+	    (lambda ()
+	      (let loop ((ptr start-ptr) (line start-line))
+		(if (= ptr end-ptr)
+		    (begin
+		      (set! start-ptr ptr)
+		      (set! start-line line))
+		    (if (char=? (string-ref buffer ptr) #\newline)
+			(loop (+ ptr 1) (+ line 1))
+			(loop (+ ptr 1) line))))))
+	   (start-go-to-end-all
+	    (lambda ()
+	      (set! start-offset (+ start-offset (- end-ptr start-ptr)))
+	      (let loop ((ptr start-ptr)
+			 (line start-line)
+			 (column start-column))
+		(if (= ptr end-ptr)
+		    (begin
+		      (set! start-ptr ptr)
+		      (set! start-line line)
+		      (set! start-column column))
+		    (if (char=? (string-ref buffer ptr) #\newline)
+			(loop (+ ptr 1) (+ line 1) 1)
+			(loop (+ ptr 1) line (+ column 1)))))))
+	   (start-go-to-user-none
+	    (lambda ()
+	      (set! start-ptr user-ptr)))
+	   (start-go-to-user-line
+	    (lambda ()
+	      (set! start-ptr user-ptr)
+	      (set! start-line user-line)))
+	   (start-go-to-user-all
+	    (lambda ()
+	      (set! start-line user-line)
+	      (set! start-offset user-offset)
+	      (if user-up-to-date?
+		  (begin
+		    (set! start-ptr user-ptr)
+		    (set! start-column user-column))
+		  (let loop ((ptr start-ptr) (column start-column))
+		    (if (= ptr user-ptr)
+			(begin
+			  (set! start-ptr ptr)
+			  (set! start-column column))
+			(if (char=? (string-ref buffer ptr) #\newline)
+			    (loop (+ ptr 1) 1)
+			    (loop (+ ptr 1) (+ column 1))))))))
+	   (end-go-to-point
+	    (lambda ()
+	      (set! end-ptr point-ptr)))
+	   (point-go-to-start
+	    (lambda ()
+	      (set! point-ptr start-ptr)))
+	   (user-go-to-start-none
+	    (lambda ()
+	      (set! user-ptr start-ptr)))
+	   (user-go-to-start-line
+	    (lambda ()
+	      (set! user-ptr start-ptr)
+	      (set! user-line start-line)))
+	   (user-go-to-start-all
+	    (lambda ()
+	      (set! user-ptr start-ptr)
+	      (set! user-line start-line)
+	      (set! user-column start-column)
+	      (set! user-offset start-offset)
+	      (set! user-up-to-date? #t)))
+	   (init-lexeme-none             ; Debute un nouveau lexeme
+	    (lambda ()
+	      (if (< start-ptr user-ptr)
+		  (start-go-to-user-none))
+	      (point-go-to-start)))
+	   (init-lexeme-line
+	    (lambda ()
+	      (if (< start-ptr user-ptr)
+		  (start-go-to-user-line))
+	      (point-go-to-start)))
+	   (init-lexeme-all
+	    (lambda ()
+	      (if (< start-ptr user-ptr)
+		  (start-go-to-user-all))
+	      (point-go-to-start)))
+	   (get-start-line               ; Obtention des stats du debut du lxm
+	    (lambda ()
+	      start-line))
+	   (get-start-column
+	    (lambda ()
+	      start-column))
+	   (get-start-offset
+	    (lambda ()
+	      start-offset))
+	   (peek-left-context            ; Obtention de caracteres (#f si EOF)
+	    (lambda ()
+	      (char->integer (string-ref buffer (- start-ptr 1)))))
+	   (peek-char
+	    (lambda ()
+	      (if (< point-ptr read-ptr)
+		  (char->integer (string-ref buffer point-ptr))
+		  (let ((c (input-f)))
+		    (if (char? c)
+			(begin
+			  (if (= read-ptr buflen)
+			      (reorganize-buffer))
+			  (string-set! buffer point-ptr c)
+			  (set! read-ptr (+ point-ptr 1))
+			  (char->integer c))
+			(begin
+			  (set! input-f (lambda () 'eof))
+			  #f))))))
+	   (read-char
+	    (lambda ()
+	      (if (< point-ptr read-ptr)
+		  (let ((c (string-ref buffer point-ptr)))
+		    (set! point-ptr (+ point-ptr 1))
+		    (char->integer c))
+		  (let ((c (input-f)))
+		    (if (char? c)
+			(begin
+			  (if (= read-ptr buflen)
+			      (reorganize-buffer))
+			  (string-set! buffer point-ptr c)
+			  (set! read-ptr (+ point-ptr 1))
+			  (set! point-ptr read-ptr)
+			  (char->integer c))
+			(begin
+			  (set! input-f (lambda () 'eof))
+			  #f))))))
+	   (get-start-end-text           ; Obtention du lexeme
+	    (lambda ()
+	      (substring buffer start-ptr end-ptr)))
+	   (get-user-line-line           ; Fonctions pour l'usager
+	    (lambda ()
+	      (if (< user-ptr start-ptr)
+		  (user-go-to-start-line))
+	      user-line))
+	   (get-user-line-all
+	    (lambda ()
+	      (if (< user-ptr start-ptr)
+		  (user-go-to-start-all))
+	      user-line))
+	   (get-user-column-all
+	    (lambda ()
+	      (cond ((< user-ptr start-ptr)
+		     (user-go-to-start-all)
+		     user-column)
+		    (user-up-to-date?
+		     user-column)
+		    (else
+		     (let loop ((ptr start-ptr) (column start-column))
+		       (if (= ptr user-ptr)
+			   (begin
+			     (set! user-column column)
+			     (set! user-up-to-date? #t)
+			     column)
+			   (if (char=? (string-ref buffer ptr) #\newline)
+			       (loop (+ ptr 1) 1)
+			       (loop (+ ptr 1) (+ column 1)))))))))
+	   (get-user-offset-all
+	    (lambda ()
+	      (if (< user-ptr start-ptr)
+		  (user-go-to-start-all))
+	      user-offset))
+	   (user-getc-none
+	    (lambda ()
+	      (if (< user-ptr start-ptr)
+		  (user-go-to-start-none))
+	      (if (< user-ptr read-ptr)
+		  (let ((c (string-ref buffer user-ptr)))
+		    (set! user-ptr (+ user-ptr 1))
+		    c)
+		  (let ((c (input-f)))
+		    (if (char? c)
+			(begin
+			  (if (= read-ptr buflen)
+			      (reorganize-buffer))
+			  (string-set! buffer user-ptr c)
+			  (set! read-ptr (+ read-ptr 1))
+			  (set! user-ptr read-ptr)
+			  c)
+			(begin
+			  (set! input-f (lambda () 'eof))
+			  'eof))))))
+	   (user-getc-line
+	    (lambda ()
+	      (if (< user-ptr start-ptr)
+		  (user-go-to-start-line))
+	      (if (< user-ptr read-ptr)
+		  (let ((c (string-ref buffer user-ptr)))
+		    (set! user-ptr (+ user-ptr 1))
+		    (if (char=? c #\newline)
+			(set! user-line (+ user-line 1)))
+		    c)
+		  (let ((c (input-f)))
+		    (if (char? c)
+			(begin
+			  (if (= read-ptr buflen)
+			      (reorganize-buffer))
+			  (string-set! buffer user-ptr c)
+			  (set! read-ptr (+ read-ptr 1))
+			  (set! user-ptr read-ptr)
+			  (if (char=? c #\newline)
+			      (set! user-line (+ user-line 1)))
+			  c)
+			(begin
+			  (set! input-f (lambda () 'eof))
+			  'eof))))))
+	   (user-getc-all
+	    (lambda ()
+	      (if (< user-ptr start-ptr)
+		  (user-go-to-start-all))
+	      (if (< user-ptr read-ptr)
+		  (let ((c (string-ref buffer user-ptr)))
+		    (set! user-ptr (+ user-ptr 1))
+		    (if (char=? c #\newline)
+			(begin
+			  (set! user-line (+ user-line 1))
+			  (set! user-column 1))
+			(set! user-column (+ user-column 1)))
+		    (set! user-offset (+ user-offset 1))
+		    c)
+		  (let ((c (input-f)))
+		    (if (char? c)
+			(begin
+			  (if (= read-ptr buflen)
+			      (reorganize-buffer))
+			  (string-set! buffer user-ptr c)
+			  (set! read-ptr (+ read-ptr 1))
+			  (set! user-ptr read-ptr)
+			  (if (char=? c #\newline)
+			      (begin
+				(set! user-line (+ user-line 1))
+				(set! user-column 1))
+			      (set! user-column (+ user-column 1)))
+			  (set! user-offset (+ user-offset 1))
+			  c)
+			(begin
+			  (set! input-f (lambda () 'eof))
+			  'eof))))))
+	   (user-ungetc-none
+	    (lambda ()
+	      (if (> user-ptr start-ptr)
+		  (set! user-ptr (- user-ptr 1)))))
+	   (user-ungetc-line
+	    (lambda ()
+	      (if (> user-ptr start-ptr)
+		  (begin
+		    (set! user-ptr (- user-ptr 1))
+		    (let ((c (string-ref buffer user-ptr)))
+		      (if (char=? c #\newline)
+			  (set! user-line (- user-line 1))))))))
+	   (user-ungetc-all
+	    (lambda ()
+	      (if (> user-ptr start-ptr)
+		  (begin
+		    (set! user-ptr (- user-ptr 1))
+		    (let ((c (string-ref buffer user-ptr)))
+		      (if (char=? c #\newline)
+			  (begin
+			    (set! user-line (- user-line 1))
+			    (set! user-up-to-date? #f))
+			  (set! user-column (- user-column 1)))
+		      (set! user-offset (- user-offset 1)))))))
+	   (reorganize-buffer            ; Decaler ou agrandir le buffer
+	    (lambda ()
+	      (if (< (* 2 start-ptr) buflen)
+		  (let* ((newlen (* 2 buflen))
+			 (newbuf (make-string newlen))
+			 (delta (- start-ptr 1)))
+		    (let loop ((from (- start-ptr 1)))
+		      (if (< from buflen)
+			  (begin
+			    (string-set! newbuf
+					 (- from delta)
+					 (string-ref buffer from))
+			    (loop (+ from 1)))))
+		    (set! buffer    newbuf)
+		    (set! buflen    newlen)
+		    (set! read-ptr  (- read-ptr delta))
+		    (set! start-ptr (- start-ptr delta))
+		    (set! end-ptr   (- end-ptr delta))
+		    (set! point-ptr (- point-ptr delta))
+		    (set! user-ptr  (- user-ptr delta)))
+		  (let ((delta (- start-ptr 1)))
+		    (let loop ((from (- start-ptr 1)))
+		      (if (< from buflen)
+			  (begin
+			    (string-set! buffer
+					 (- from delta)
+					 (string-ref buffer from))
+			    (loop (+ from 1)))))
+		    (set! read-ptr  (- read-ptr delta))
+		    (set! start-ptr (- start-ptr delta))
+		    (set! end-ptr   (- end-ptr delta))
+		    (set! point-ptr (- point-ptr delta))
+		    (set! user-ptr  (- user-ptr delta)))))))
+	(list (cons 'start-go-to-end
+		    (cond ((eq? counters 'none) start-go-to-end-none)
+			  ((eq? counters 'line) start-go-to-end-line)
+			  ((eq? counters 'all ) start-go-to-end-all)))
+	      (cons 'end-go-to-point
+		    end-go-to-point)
+	      (cons 'init-lexeme
+		    (cond ((eq? counters 'none) init-lexeme-none)
+			  ((eq? counters 'line) init-lexeme-line)
+			  ((eq? counters 'all ) init-lexeme-all)))
+	      (cons 'get-start-line
+		    get-start-line)
+	      (cons 'get-start-column
+		    get-start-column)
+	      (cons 'get-start-offset
+		    get-start-offset)
+	      (cons 'peek-left-context
+		    peek-left-context)
+	      (cons 'peek-char
+		    peek-char)
+	      (cons 'read-char
+		    read-char)
+	      (cons 'get-start-end-text
+		    get-start-end-text)
+	      (cons 'get-user-line
+		    (cond ((eq? counters 'none) #f)
+			  ((eq? counters 'line) get-user-line-line)
+			  ((eq? counters 'all ) get-user-line-all)))
+	      (cons 'get-user-column
+		    (cond ((eq? counters 'none) #f)
+			  ((eq? counters 'line) #f)
+			  ((eq? counters 'all ) get-user-column-all)))
+	      (cons 'get-user-offset
+		    (cond ((eq? counters 'none) #f)
+			  ((eq? counters 'line) #f)
+			  ((eq? counters 'all ) get-user-offset-all)))
+	      (cons 'user-getc
+		    (cond ((eq? counters 'none) user-getc-none)
+			  ((eq? counters 'line) user-getc-line)
+			  ((eq? counters 'all ) user-getc-all)))
+	      (cons 'user-ungetc
+		    (cond ((eq? counters 'none) user-ungetc-none)
+			  ((eq? counters 'line) user-ungetc-line)
+			  ((eq? counters 'all ) user-ungetc-all))))))))
+
+; Construit un Input System
+; Le premier parametre doit etre parmi "port", "procedure" ou "string"
+; Prend un parametre facultatif qui doit etre parmi
+; "none", "line" ou "all"
+(define lexer-make-IS
+  (lambda (input-type input . largs)
+    (let ((counters-type (cond ((null? largs)
+				'line)
+			       ((memq (car largs) '(none line all))
+				(car largs))
+			       (else
+				'line))))
+      (cond ((and (eq? input-type 'port) (input-port? input))
+	     (let* ((buffer   (make-string lexer-init-buffer-len #\newline))
+		    (read-ptr 1)
+		    (input-f  (lambda () (read-char input))))
+	       (lexer-raw-IS-maker buffer read-ptr input-f counters-type)))
+	    ((and (eq? input-type 'procedure) (procedure? input))
+	     (let* ((buffer   (make-string lexer-init-buffer-len #\newline))
+		    (read-ptr 1)
+		    (input-f  input))
+	       (lexer-raw-IS-maker buffer read-ptr input-f counters-type)))
+	    ((and (eq? input-type 'string) (string? input))
+	     (let* ((buffer   (string-append (string #\newline) input))
+		    (read-ptr (string-length buffer))
+		    (input-f  (lambda () 'eof)))
+	       (lexer-raw-IS-maker buffer read-ptr input-f counters-type)))
+	    (else
+	     (let* ((buffer   (string #\newline))
+		    (read-ptr 1)
+		    (input-f  (lambda () 'eof)))
+	       (lexer-raw-IS-maker buffer read-ptr input-f counters-type)))))))
+
+; Les fonctions:
+;   lexer-get-func-getc, lexer-get-func-ungetc,
+;   lexer-get-func-line, lexer-get-func-column et lexer-get-func-offset
+(define lexer-get-func-getc
+  (lambda (IS) (cdr (assq 'user-getc IS))))
+(define lexer-get-func-ungetc
+  (lambda (IS) (cdr (assq 'user-ungetc IS))))
+(define lexer-get-func-line
+  (lambda (IS) (cdr (assq 'get-user-line IS))))
+(define lexer-get-func-column
+  (lambda (IS) (cdr (assq 'get-user-column IS))))
+(define lexer-get-func-offset
+  (lambda (IS) (cdr (assq 'get-user-offset IS))))
+
+;
+; Gestion des lexers
+;
+
+; Fabrication de lexer a partir d'arbres de decision
+(define lexer-make-tree-lexer
+  (lambda (tables IS)
+    (letrec
+	(; Contenu de la table
+	 (counters-type        (vector-ref tables 0))
+	 (<>-pre-action   (vector-ref tables 1))
+	 (<>-pre-action (vector-ref tables 2))
+	 (rules-pre-actions    (vector-ref tables 3))
+	 (table-nl-start       (vector-ref tables 5))
+	 (table-no-nl-start    (vector-ref tables 6))
+	 (trees-v              (vector-ref tables 7))
+	 (acc-v                (vector-ref tables 8))
+
+	 ; Contenu du IS
+	 (IS-start-go-to-end    (cdr (assq 'start-go-to-end IS)))
+	 (IS-end-go-to-point    (cdr (assq 'end-go-to-point IS)))
+	 (IS-init-lexeme        (cdr (assq 'init-lexeme IS)))
+	 (IS-get-start-line     (cdr (assq 'get-start-line IS)))
+	 (IS-get-start-column   (cdr (assq 'get-start-column IS)))
+	 (IS-get-start-offset   (cdr (assq 'get-start-offset IS)))
+	 (IS-peek-left-context  (cdr (assq 'peek-left-context IS)))
+	 (IS-peek-char          (cdr (assq 'peek-char IS)))
+	 (IS-read-char          (cdr (assq 'read-char IS)))
+	 (IS-get-start-end-text (cdr (assq 'get-start-end-text IS)))
+	 (IS-get-user-line      (cdr (assq 'get-user-line IS)))
+	 (IS-get-user-column    (cdr (assq 'get-user-column IS)))
+	 (IS-get-user-offset    (cdr (assq 'get-user-offset IS)))
+	 (IS-user-getc          (cdr (assq 'user-getc IS)))
+	 (IS-user-ungetc        (cdr (assq 'user-ungetc IS)))
+
+	 ; Resultats
+	 (<>-action   #f)
+	 (<>-action #f)
+	 (rules-actions    #f)
+	 (states           #f)
+	 (final-lexer      #f)
+
+	 ; Gestion des hooks
+	 (hook-list '())
+	 (add-hook
+	  (lambda (thunk)
+	    (set! hook-list (cons thunk hook-list))))
+	 (apply-hooks
+	  (lambda ()
+	    (let loop ((l hook-list))
+	      (if (pair? l)
+		  (begin
+		    ((car l))
+		    (loop (cdr l)))))))
+
+	 ; Preparation des actions
+	 (set-action-statics
+	  (lambda (pre-action)
+	    (pre-action final-lexer IS-user-getc IS-user-ungetc)))
+	 (prepare-special-action-none
+	  (lambda (pre-action)
+	    (let ((action #f))
+	      (let ((result
+		     (lambda ()
+		       (action "")))
+		    (hook
+		     (lambda ()
+		       (set! action (set-action-statics pre-action)))))
+		(add-hook hook)
+		result))))
+	 (prepare-special-action-line
+	  (lambda (pre-action)
+	    (let ((action #f))
+	      (let ((result
+		     (lambda (yyline)
+		       (action "" yyline)))
+		    (hook
+		     (lambda ()
+		       (set! action (set-action-statics pre-action)))))
+		(add-hook hook)
+		result))))
+	 (prepare-special-action-all
+	  (lambda (pre-action)
+	    (let ((action #f))
+	      (let ((result
+		     (lambda (yyline yycolumn yyoffset)
+		       (action "" yyline yycolumn yyoffset)))
+		    (hook
+		     (lambda ()
+		       (set! action (set-action-statics pre-action)))))
+		(add-hook hook)
+		result))))
+	 (prepare-special-action
+	  (lambda (pre-action)
+	    (cond ((eq? counters-type 'none)
+		   (prepare-special-action-none pre-action))
+		  ((eq? counters-type 'line)
+		   (prepare-special-action-line pre-action))
+		  ((eq? counters-type 'all)
+		   (prepare-special-action-all  pre-action)))))
+	 (prepare-action-yytext-none
+	  (lambda (pre-action)
+	    (let ((get-start-end-text IS-get-start-end-text)
+		  (start-go-to-end    IS-start-go-to-end)
+		  (action             #f))
+	      (let ((result
+		     (lambda ()
+		       (let ((yytext (get-start-end-text)))
+			 (start-go-to-end)
+			 (action yytext))))
+		    (hook
+		     (lambda ()
+		       (set! action (set-action-statics pre-action)))))
+		(add-hook hook)
+		result))))
+	 (prepare-action-yytext-line
+	  (lambda (pre-action)
+	    (let ((get-start-end-text IS-get-start-end-text)
+		  (start-go-to-end    IS-start-go-to-end)
+		  (action             #f))
+	      (let ((result
+		     (lambda (yyline)
+		       (let ((yytext (get-start-end-text)))
+			 (start-go-to-end)
+			 (action yytext yyline))))
+		    (hook
+		     (lambda ()
+		       (set! action (set-action-statics pre-action)))))
+		(add-hook hook)
+		result))))
+	 (prepare-action-yytext-all
+	  (lambda (pre-action)
+	    (let ((get-start-end-text IS-get-start-end-text)
+		  (start-go-to-end    IS-start-go-to-end)
+		  (action             #f))
+	      (let ((result
+		     (lambda (yyline yycolumn yyoffset)
+		       (let ((yytext (get-start-end-text)))
+			 (start-go-to-end)
+			 (action yytext yyline yycolumn yyoffset))))
+		    (hook
+		     (lambda ()
+		       (set! action (set-action-statics pre-action)))))
+		(add-hook hook)
+		result))))
+	 (prepare-action-yytext
+	  (lambda (pre-action)
+	    (cond ((eq? counters-type 'none)
+		   (prepare-action-yytext-none pre-action))
+		  ((eq? counters-type 'line)
+		   (prepare-action-yytext-line pre-action))
+		  ((eq? counters-type 'all)
+		   (prepare-action-yytext-all  pre-action)))))
+	 (prepare-action-no-yytext-none
+	  (lambda (pre-action)
+	    (let ((start-go-to-end    IS-start-go-to-end)
+		  (action             #f))
+	      (let ((result
+		     (lambda ()
+		       (start-go-to-end)
+		       (action)))
+		    (hook
+		     (lambda ()
+		       (set! action (set-action-statics pre-action)))))
+		(add-hook hook)
+		result))))
+	 (prepare-action-no-yytext-line
+	  (lambda (pre-action)
+	    (let ((start-go-to-end    IS-start-go-to-end)
+		  (action             #f))
+	      (let ((result
+		     (lambda (yyline)
+		       (start-go-to-end)
+		       (action yyline)))
+		    (hook
+		     (lambda ()
+		       (set! action (set-action-statics pre-action)))))
+		(add-hook hook)
+		result))))
+	 (prepare-action-no-yytext-all
+	  (lambda (pre-action)
+	    (let ((start-go-to-end    IS-start-go-to-end)
+		  (action             #f))
+	      (let ((result
+		     (lambda (yyline yycolumn yyoffset)
+		       (start-go-to-end)
+		       (action yyline yycolumn yyoffset)))
+		    (hook
+		     (lambda ()
+		       (set! action (set-action-statics pre-action)))))
+		(add-hook hook)
+		result))))
+	 (prepare-action-no-yytext
+	  (lambda (pre-action)
+	    (cond ((eq? counters-type 'none)
+		   (prepare-action-no-yytext-none pre-action))
+		  ((eq? counters-type 'line)
+		   (prepare-action-no-yytext-line pre-action))
+		  ((eq? counters-type 'all)
+		   (prepare-action-no-yytext-all  pre-action)))))
+
+	 ; Fabrique les fonctions de dispatch
+	 (prepare-dispatch-err
+	  (lambda (leaf)
+	    (lambda (c)
+	      #f)))
+	 (prepare-dispatch-number
+	  (lambda (leaf)
+	    (let ((state-function #f))
+	      (let ((result
+		     (lambda (c)
+		       state-function))
+		    (hook
+		     (lambda ()
+		       (set! state-function (vector-ref states leaf)))))
+		(add-hook hook)
+		result))))
+	 (prepare-dispatch-leaf
+	  (lambda (leaf)
+	    (if (eq? leaf 'err)
+		(prepare-dispatch-err leaf)
+		(prepare-dispatch-number leaf))))
+	 (prepare-dispatch-<
+	  (lambda (tree)
+	    (let ((left-tree  (list-ref tree 1))
+		  (right-tree (list-ref tree 2)))
+	      (let ((bound      (list-ref tree 0))
+		    (left-func  (prepare-dispatch-tree left-tree))
+		    (right-func (prepare-dispatch-tree right-tree)))
+		(lambda (c)
+		  (if (< c bound)
+		      (left-func c)
+		      (right-func c)))))))
+	 (prepare-dispatch-=
+	  (lambda (tree)
+	    (let ((left-tree  (list-ref tree 2))
+		  (right-tree (list-ref tree 3)))
+	      (let ((bound      (list-ref tree 1))
+		    (left-func  (prepare-dispatch-tree left-tree))
+		    (right-func (prepare-dispatch-tree right-tree)))
+		(lambda (c)
+		  (if (= c bound)
+		      (left-func c)
+		      (right-func c)))))))
+	 (prepare-dispatch-tree
+	  (lambda (tree)
+	    (cond ((not (pair? tree))
+		   (prepare-dispatch-leaf tree))
+		  ((eq? (car tree) '=)
+		   (prepare-dispatch-= tree))
+		  (else
+		   (prepare-dispatch-< tree)))))
+	 (prepare-dispatch
+	  (lambda (tree)
+	    (let ((dicho-func (prepare-dispatch-tree tree)))
+	      (lambda (c)
+		(and c (dicho-func c))))))
+
+	 ; Fabrique les fonctions de transition (read & go) et (abort)
+	 (prepare-read-n-go
+	  (lambda (tree)
+	    (let ((dispatch-func (prepare-dispatch tree))
+		  (read-char     IS-read-char))
+	      (lambda ()
+		(dispatch-func (read-char))))))
+	 (prepare-abort
+	  (lambda (tree)
+	    (lambda ()
+	      #f)))
+	 (prepare-transition
+	  (lambda (tree)
+	    (if (eq? tree 'err)
+		(prepare-abort     tree)
+		(prepare-read-n-go tree))))
+
+	 ; Fabrique les fonctions d'etats ([set-end] & trans)
+	 (prepare-state-no-acc
+	   (lambda (s r1 r2)
+	     (let ((trans-func (prepare-transition (vector-ref trees-v s))))
+	       (lambda (action)
+		 (let ((next-state (trans-func)))
+		   (if next-state
+		       (next-state action)
+		       action))))))
+	 (prepare-state-yes-no
+	  (lambda (s r1 r2)
+	    (let ((peek-char       IS-peek-char)
+		  (end-go-to-point IS-end-go-to-point)
+		  (new-action1     #f)
+		  (trans-func (prepare-transition (vector-ref trees-v s))))
+	      (let ((result
+		     (lambda (action)
+		       (let* ((c (peek-char))
+			      (new-action
+			       (if (or (not c) (= c lexer-integer-newline))
+				   (begin
+				     (end-go-to-point)
+				     new-action1)
+				   action))
+			      (next-state (trans-func)))
+			 (if next-state
+			     (next-state new-action)
+			     new-action))))
+		    (hook
+		     (lambda ()
+		       (set! new-action1 (vector-ref rules-actions r1)))))
+		(add-hook hook)
+		result))))
+	 (prepare-state-diff-acc
+	  (lambda (s r1 r2)
+	    (let ((end-go-to-point IS-end-go-to-point)
+		  (peek-char       IS-peek-char)
+		  (new-action1     #f)
+		  (new-action2     #f)
+		  (trans-func (prepare-transition (vector-ref trees-v s))))
+	      (let ((result
+		     (lambda (action)
+		       (end-go-to-point)
+		       (let* ((c (peek-char))
+			      (new-action
+			       (if (or (not c) (= c lexer-integer-newline))
+				   new-action1
+				   new-action2))
+			      (next-state (trans-func)))
+			 (if next-state
+			     (next-state new-action)
+			     new-action))))
+		    (hook
+		     (lambda ()
+		       (set! new-action1 (vector-ref rules-actions r1))
+		       (set! new-action2 (vector-ref rules-actions r2)))))
+		(add-hook hook)
+		result))))
+	 (prepare-state-same-acc
+	  (lambda (s r1 r2)
+	    (let ((end-go-to-point IS-end-go-to-point)
+		  (trans-func (prepare-transition (vector-ref trees-v s)))
+		  (new-action #f))
+	      (let ((result
+		     (lambda (action)
+		       (end-go-to-point)
+		       (let ((next-state (trans-func)))
+			 (if next-state
+			     (next-state new-action)
+			     new-action))))
+		    (hook
+		     (lambda ()
+		       (set! new-action (vector-ref rules-actions r1)))))
+		(add-hook hook)
+		result))))
+	 (prepare-state
+	  (lambda (s)
+	    (let* ((acc (vector-ref acc-v s))
+		   (r1 (car acc))
+		   (r2 (cdr acc)))
+	      (cond ((not r1)  (prepare-state-no-acc   s r1 r2))
+		    ((not r2)  (prepare-state-yes-no   s r1 r2))
+		    ((< r1 r2) (prepare-state-diff-acc s r1 r2))
+		    (else      (prepare-state-same-acc s r1 r2))))))
+
+	 ; Fabrique la fonction de lancement du lexage a l'etat de depart
+	 (prepare-start-same
+	  (lambda (s1 s2)
+	    (let ((peek-char    IS-peek-char)
+		  (eof-action   #f)
+		  (start-state  #f)
+		  (error-action #f))
+	      (let ((result
+		     (lambda ()
+		       (if (not (peek-char))
+			   eof-action
+			   (start-state error-action))))
+		    (hook
+		     (lambda ()
+		       (set! eof-action   <>-action)
+		       (set! start-state  (vector-ref states s1))
+		       (set! error-action <>-action))))
+		(add-hook hook)
+		result))))
+	 (prepare-start-diff
+	  (lambda (s1 s2)
+	    (let ((peek-char         IS-peek-char)
+		  (eof-action        #f)
+		  (peek-left-context IS-peek-left-context)
+		  (start-state1      #f)
+		  (start-state2      #f)
+		  (error-action      #f))
+	      (let ((result
+		     (lambda ()
+		       (cond ((not (peek-char))
+			      eof-action)
+			     ((= (peek-left-context) lexer-integer-newline)
+			      (start-state1 error-action))
+			     (else
+			      (start-state2 error-action)))))
+		    (hook
+		     (lambda ()
+		       (set! eof-action <>-action)
+		       (set! start-state1 (vector-ref states s1))
+		       (set! start-state2 (vector-ref states s2))
+		       (set! error-action <>-action))))
+		(add-hook hook)
+		result))))
+	 (prepare-start
+	  (lambda ()
+	    (let ((s1 table-nl-start)
+		  (s2 table-no-nl-start))
+	      (if (= s1 s2)
+		  (prepare-start-same s1 s2)
+		  (prepare-start-diff s1 s2)))))
+
+	 ; Fabrique la fonction principale
+	 (prepare-lexer-none
+	  (lambda ()
+	    (let ((init-lexeme IS-init-lexeme)
+		  (start-func  (prepare-start)))
+	      (lambda ()
+		(init-lexeme)
+		((start-func))))))
+	 (prepare-lexer-line
+	  (lambda ()
+	    (let ((init-lexeme    IS-init-lexeme)
+		  (get-start-line IS-get-start-line)
+		  (start-func     (prepare-start)))
+	      (lambda ()
+		(init-lexeme)
+		(let ((yyline (get-start-line)))
+		  ((start-func) yyline))))))
+	 (prepare-lexer-all
+	  (lambda ()
+	    (let ((init-lexeme      IS-init-lexeme)
+		  (get-start-line   IS-get-start-line)
+		  (get-start-column IS-get-start-column)
+		  (get-start-offset IS-get-start-offset)
+		  (start-func       (prepare-start)))
+	      (lambda ()
+		(init-lexeme)
+		(let ((yyline   (get-start-line))
+		      (yycolumn (get-start-column))
+		      (yyoffset (get-start-offset)))
+		  ((start-func) yyline yycolumn yyoffset))))))
+	 (prepare-lexer
+	  (lambda ()
+	    (cond ((eq? counters-type 'none) (prepare-lexer-none))
+		  ((eq? counters-type 'line) (prepare-lexer-line))
+		  ((eq? counters-type 'all)  (prepare-lexer-all))))))
+
+      ; Calculer la valeur de <>-action et de <>-action
+      (set! <>-action   (prepare-special-action <>-pre-action))
+      (set! <>-action (prepare-special-action <>-pre-action))
+
+      ; Calculer la valeur de rules-actions
+      (let* ((len (quotient (vector-length rules-pre-actions) 2))
+	     (v (make-vector len)))
+	(let loop ((r (- len 1)))
+	  (if (< r 0)
+	      (set! rules-actions v)
+	      (let* ((yytext? (vector-ref rules-pre-actions (* 2 r)))
+		     (pre-action (vector-ref rules-pre-actions (+ (* 2 r) 1)))
+		     (action (if yytext?
+				 (prepare-action-yytext    pre-action)
+				 (prepare-action-no-yytext pre-action))))
+		(vector-set! v r action)
+		(loop (- r 1))))))
+
+      ; Calculer la valeur de states
+      (let* ((len (vector-length trees-v))
+	     (v (make-vector len)))
+	(let loop ((s (- len 1)))
+	  (if (< s 0)
+	      (set! states v)
+	      (begin
+		(vector-set! v s (prepare-state s))
+		(loop (- s 1))))))
+
+      ; Calculer la valeur de final-lexer
+      (set! final-lexer (prepare-lexer))
+
+      ; Executer les hooks
+      (apply-hooks)
+
+      ; Resultat
+      final-lexer)))
+
+; Fabrication de lexer a partir de listes de caracteres taggees
+(define lexer-make-char-lexer
+  (let* ((char->class
+	  (lambda (c)
+	    (let ((n (char->integer c)))
+	      (list (cons n n)))))
+	 (merge-sort
+	  (lambda (l combine zero-elt)
+	    (if (null? l)
+		zero-elt
+		(let loop1 ((l l))
+		  (if (null? (cdr l))
+		      (car l)
+		      (loop1
+		       (let loop2 ((l l))
+			 (cond ((null? l)
+				l)
+			       ((null? (cdr l))
+				l)
+			       (else
+				(cons (combine (car l) (cadr l))
+				      (loop2 (cddr l))))))))))))
+	 (finite-class-union
+	  (lambda (c1 c2)
+	    (let loop ((c1 c1) (c2 c2) (u '()))
+	      (if (null? c1)
+		  (if (null? c2)
+		      (reverse u)
+		      (loop c1 (cdr c2) (cons (car c2) u)))
+		  (if (null? c2)
+		      (loop (cdr c1) c2 (cons (car c1) u))
+		      (let* ((r1 (car c1))
+			     (r2 (car c2))
+			     (r1start (car r1))
+			     (r1end (cdr r1))
+			     (r2start (car r2))
+			     (r2end (cdr r2)))
+			(if (<= r1start r2start)
+			    (cond ((< (+ r1end 1) r2start)
+				   (loop (cdr c1) c2 (cons r1 u)))
+				  ((<= r1end r2end)
+				   (loop (cdr c1)
+					 (cons (cons r1start r2end) (cdr c2))
+					 u))
+				  (else
+				   (loop c1 (cdr c2) u)))
+			    (cond ((> r1start (+ r2end 1))
+				   (loop c1 (cdr c2) (cons r2 u)))
+				  ((>= r1end r2end)
+				   (loop (cons (cons r2start r1end) (cdr c1))
+					 (cdr c2)
+					 u))
+				  (else
+				   (loop (cdr c1) c2 u))))))))))
+	 (char-list->class
+	  (lambda (cl)
+	    (let ((classes (map char->class cl)))
+	      (merge-sort classes finite-class-union '()))))
+	 (class-<
+	  (lambda (b1 b2)
+	    (cond ((eq? b1 'inf+) #f)
+		  ((eq? b2 'inf-) #f)
+		  ((eq? b1 'inf-) #t)
+		  ((eq? b2 'inf+) #t)
+		  (else (< b1 b2)))))
+	 (finite-class-compl
+	  (lambda (c)
+	    (let loop ((c c) (start 'inf-))
+	      (if (null? c)
+		  (list (cons start 'inf+))
+		  (let* ((r (car c))
+			 (rstart (car r))
+			 (rend (cdr r)))
+		    (if (class-< start rstart)
+			(cons (cons start (- rstart 1))
+			      (loop c rstart))
+			(loop (cdr c) (+ rend 1))))))))
+	 (tagged-chars->class
+	  (lambda (tcl)
+	    (let* ((inverse? (car tcl))
+		   (cl (cdr tcl))
+		   (class-tmp (char-list->class cl)))
+	      (if inverse? (finite-class-compl class-tmp) class-tmp))))
+	 (charc->arc
+	  (lambda (charc)
+	    (let* ((tcl (car charc))
+		   (dest (cdr charc))
+		   (class (tagged-chars->class tcl)))
+	      (cons class dest))))
+	 (arc->sharcs
+	  (lambda (arc)
+	    (let* ((range-l (car arc))
+		   (dest (cdr arc))
+		   (op (lambda (range) (cons range dest))))
+	      (map op range-l))))
+	 (class-<=
+	  (lambda (b1 b2)
+	    (cond ((eq? b1 'inf-) #t)
+		  ((eq? b2 'inf+) #t)
+		  ((eq? b1 'inf+) #f)
+		  ((eq? b2 'inf-) #f)
+		  (else (<= b1 b2)))))
+	 (sharc-<=
+	  (lambda (sharc1 sharc2)
+	    (class-<= (caar sharc1) (caar sharc2))))
+	 (merge-sharcs
+	  (lambda (l1 l2)
+	    (let loop ((l1 l1) (l2 l2))
+	      (cond ((null? l1)
+		     l2)
+		    ((null? l2)
+		     l1)
+		    (else
+		     (let ((sharc1 (car l1))
+			   (sharc2 (car l2)))
+		       (if (sharc-<= sharc1 sharc2)
+			   (cons sharc1 (loop (cdr l1) l2))
+			   (cons sharc2 (loop l1 (cdr l2))))))))))
+	 (class-= eqv?)
+	 (fill-error
+	  (lambda (sharcs)
+	    (let loop ((sharcs sharcs) (start 'inf-))
+	      (cond ((class-= start 'inf+)
+		     '())
+		    ((null? sharcs)
+		     (cons (cons (cons start 'inf+) 'err)
+			   (loop sharcs 'inf+)))
+		    (else
+		     (let* ((sharc (car sharcs))
+			    (h (caar sharc))
+			    (t (cdar sharc)))
+		       (if (class-< start h)
+			   (cons (cons (cons start (- h 1)) 'err)
+				 (loop sharcs h))
+			   (cons sharc (loop (cdr sharcs)
+					     (if (class-= t 'inf+)
+						 'inf+
+						 (+ t 1)))))))))))
+	 (charcs->tree
+	  (lambda (charcs)
+	    (let* ((op (lambda (charc) (arc->sharcs (charc->arc charc))))
+		   (sharcs-l (map op charcs))
+		   (sorted-sharcs (merge-sort sharcs-l merge-sharcs '()))
+		   (full-sharcs (fill-error sorted-sharcs))
+		   (op (lambda (sharc) (cons (caar sharc) (cdr sharc))))
+		   (table (list->vector (map op full-sharcs))))
+	      (let loop ((left 0) (right (- (vector-length table) 1)))
+		(if (= left right)
+		    (cdr (vector-ref table left))
+		    (let ((mid (quotient (+ left right 1) 2)))
+		      (if (and (= (+ left 2) right)
+			       (= (+ (car (vector-ref table mid)) 1)
+				  (car (vector-ref table right)))
+			       (eqv? (cdr (vector-ref table left))
+				     (cdr (vector-ref table right))))
+			  (list '=
+				(car (vector-ref table mid))
+				(cdr (vector-ref table mid))
+				(cdr (vector-ref table left)))
+			  (list (car (vector-ref table mid))
+				(loop left (- mid 1))
+				(loop mid right))))))))))
+    (lambda (tables IS)
+      (let ((counters         (vector-ref tables 0))
+	    (<>-action   (vector-ref tables 1))
+	    (<>-action (vector-ref tables 2))
+	    (rules-actions    (vector-ref tables 3))
+	    (nl-start         (vector-ref tables 5))
+	    (no-nl-start      (vector-ref tables 6))
+	    (charcs-v         (vector-ref tables 7))
+	    (acc-v            (vector-ref tables 8)))
+	(let* ((len (vector-length charcs-v))
+	       (v (make-vector len)))
+	  (let loop ((i (- len 1)))
+	    (if (>= i 0)
+		(begin
+		  (vector-set! v i (charcs->tree (vector-ref charcs-v i)))
+		  (loop (- i 1)))
+		(lexer-make-tree-lexer
+		 (vector counters
+			 <>-action
+			 <>-action
+			 rules-actions
+			 'decision-trees
+			 nl-start
+			 no-nl-start
+			 v
+			 acc-v)
+		 IS))))))))
+
+; Fabrication d'un lexer a partir de code pre-genere
+(define lexer-make-code-lexer
+  (lambda (tables IS)
+    (let ((<>-pre-action   (vector-ref tables 1))
+	  (<>-pre-action (vector-ref tables 2))
+	  (rules-pre-action     (vector-ref tables 3))
+	  (code                 (vector-ref tables 5)))
+      (code <>-pre-action <>-pre-action rules-pre-action IS))))
+
+(define lexer-make-lexer
+  (lambda (tables IS)
+    (let ((automaton-type (vector-ref tables 4)))
+      (cond ((eq? automaton-type 'decision-trees)
+	     (lexer-make-tree-lexer tables IS))
+	    ((eq? automaton-type 'tagged-chars-lists)
+	     (lexer-make-char-lexer tables IS))
+	    ((eq? automaton-type 'code)
+	     (lexer-make-code-lexer tables IS))))))
+
+;
+; Table generated from the file twiki.l by SILex 1.0
+;
+
+(define lexer-default-table
+  (vector
+   'line
+   (lambda (yycontinue yygetc yyungetc)
+     (lambda (yytext yyline)
+                                (list 'end-of-input #f ) ;; yyline)
+       ))
+   (lambda (yycontinue yygetc yyungetc)
+     (lambda (yytext yyline)
+                                (lex-error (conc yyline " : illegal character ") (yygetc))
+       ))
+   (vector
+    #t
+    (lambda (yycontinue yygetc yyungetc)
+      (lambda (yytext yyline)
+                                (list 'opensq     yytext)
+        ))
+    #t
+    (lambda (yycontinue yygetc yyungetc)
+      (lambda (yytext yyline)
+                                (list 'closesq    yytext)
+        ))
+    #t
+    (lambda (yycontinue yygetc yyungetc)
+      (lambda (yytext yyline)
+                                (list 'opensquig  yytext)
+        ))
+    #t
+    (lambda (yycontinue yygetc yyungetc)
+      (lambda (yytext yyline)
+                                (list 'closesquig yytext)
+        ))
+    #t
+    (lambda (yycontinue yygetc yyungetc)
+      (lambda (yytext yyline)
+                                (list 'bang       yytext)
+        ))
+    #t
+    (lambda (yycontinue yygetc yyungetc)
+      (lambda (yytext yyline)
+                                (list 'plaintext  yytext)
+        )))
+   'decision-trees
+   0
+   0
+   '#((59 (35 (32 (9 err (11 1 err)) (33 1 (34 2 err))) (38 (= 36 err 1)
+    (44 (39 err 1) (45 err 1)))) (95 (92 (65 err (91 1 6)) (93 1 (94 5
+    err))) (123 (= 96 err 1) (125 (124 4 err) (126 3 err))))) (44 (35 (11
+    (9 err 1) (= 32 1 err)) (37 (36 1 err) (= 38 err 1))) (92 (59 (45 err
+    1) (65 err (91 1 err))) (96 (93 1 (95 err 1)) (97 err (123 1 err)))))
+    err err err err err)
+   '#((#f . #f) (5 . 5) (4 . 4) (3 . 3) (2 . 2) (1 . 1) (0 . 0))))
+
+;
+; User functions
+;
+
+(define lexer #f)
+
+(define lexer-get-line   #f)
+(define lexer-getc       #f)
+(define lexer-ungetc     #f)
+
+(define lexer-init
+  (lambda (input-type input)
+    (let ((IS (lexer-make-IS input-type input 'line)))
+      (set! lexer (lexer-make-lexer lexer-default-table IS))
+      (set! lexer-get-line   (lexer-get-func-line IS))
+      (set! lexer-getc       (lexer-get-func-getc IS))
+      (set! lexer-ungetc     (lexer-get-func-ungetc IS)))))

ADDED   stml2/modules/twiki/twiki.scm
Index: stml2/modules/twiki/twiki.scm
==================================================================
--- /dev/null
+++ stml2/modules/twiki/twiki.scm
@@ -0,0 +1,68 @@
+;; twiki module
+(require-extension silex sqlite3 regex posix)
+
+(include "twiki.l.scm")
+
+(define (twiki:open-db keys)
+  (let* ((fname   (twiki:keys->fname keys))
+	 (fexists (file-exists? fname))
+	 (db (dbi:open 'sqlite3 '((dbname . fname)))))
+    (if (not fexists)
+	(for-each 
+	 (lambda (sqry)
+	   (dbi:exec db sqry))
+	 '("CREATE TABLE dats     (id INTEGER PRIMARY KEY,md5sum TEXT,dat BLOB,type INTEGER);"
+	   "CREATE TABLE tiddlers (id INTEGER PRIMARY KEY,wiki_id INTEGER,name TEXT,rev INTEGER,dat_id INTEGER,created_on INTEGER,changed_on INTEGER,owner_id INTEGER);"
+	   "CREATE TABLE revs     (id INTEGER PRIMARY KEY,tag TEXT);"
+	   "CREATE TABLE wikis    (id INTEGER PRIMARY KEY,key_name TEXT,title TEXT,created_on INTEGER);")))
+    (sqlite3:set-busy-timeout!(dbi:db-conn db) 1000000)
+    db))
+	
+(define (twiki:view)
+  (s:div 'class "node"
+  (s:h1 "Twiki")
+  "Title, pictures, etc."
+   (let ()
+     "blah")))
+
+
+(define (twiki:wiki . keys)
+  (let ((key (conc keys)))
+    (twiki:view)))
+
+(define (twiki:extract-tiddlers dat)
+  (let* ((inp (open-input-string dat))
+	 (prev-state #f)
+	 (stack      (list 'start))
+	 (links      '())
+	 (currlnk    #f))
+    (lexer-init 'port inp)
+    (let loop ((token          (lexer)))
+      (let ((token-type (car token))
+	    (token-val  (cadr token))
+	    (state      (car  stack)))
+	(if (not (eq? prev-state state))
+	    (begin
+	      (print "state: " state)
+	      (set! prev-state state)))
+	(case token-type
+	  ('end-of-input       (print "Done")(close-input-port inp))
+	  ('twikilink-start
+	   (set! stack (cons 'twikilink-start stack))
+	   (loop (lexer)))
+	  ('twikilink-end
+	   (set! links (cons currlnk links))
+	   (set! stack (cdr stack))
+	   (loop (lexer)))
+	  ('twikitext
+	   (if (eq? state 'twikilink-start)
+	       (set! currlnk (cadr token))
+	       (print "Got " token))
+	   (loop (lexer)))
+	  ('anydat
+	   (loop (lexer)))
+	  (else
+	   (print "ERROR: unknown token " token " on line " (lexer-get-line))
+	   (loop (lexer))))))
+    links))
+     

ADDED   stml2/modules/twiki/twikiparser.scm
Index: stml2/modules/twiki/twikiparser.scm
==================================================================
--- /dev/null
+++ stml2/modules/twiki/twikiparser.scm
@@ -0,0 +1,457 @@
+
+(require-extension sqlite3 regex posix eformat silex stack regex)
+
+(define help "
+Usage: nldb [options]
+
+
+General
+  -h                      : this help
+
+Netlist data queries
+
+  -findpath start,end     : find path from start to end. % is a wildcard
+
+Managing netlist data
+
+  -load /path/to/netlist  : load a model into the db
+  -d dbname               : name of the .db file
+  -dump fname             : dump the netlist in to verilog file
+
+")
+
+(include "/nfs/an/home/mrwellan/stuff/tools/lnkmkr/args.scm")
+(include "verilog.l.scm")
+
+;; process args
+(define remargs (get-args (argv)
+			  (list "-load"
+				"-d"          "-dump" 
+				"-findpath")
+			  
+			  (list "-h"
+				)
+			  arg-hash
+			  0)) ;;
+
+(define dbpaths (list "testing.db"))
+
+(define dbpath #f)
+
+(if (get-arg "-d")
+    (set! dbpath (get-arg "-d"))
+    (for-each
+     (lambda (path)
+       (if (file-exists? path)
+	   (set! dbpath path)))
+     dbpaths))
+
+(if (and (not dbpath) (get-arg "-d"))
+    (begin
+      (print "Can't find db. " (get-arg "-d") " Try again or contact Matt!")
+      (exit 1)))
+
+(define dbexists (file-exists? dbpath))
+
+(define realuser (getenv "USER"))
+(define user realuser)
+
+(define db (sqlite3:open dbpath))
+(sqlite3:set-busy-timeout! db 1000000)
+
+(define (mk-tables)
+  (for-each
+   (lambda (sqlstmt)
+     (sqlite3:exec db sqlstmt))
+   (list "CREATE TABLE modules(id INTEGER PRIMARY KEY,name_id INTEGER);"
+	 "CREATE TABLE nets   (id INTEGER PRIMARY KEY,name_id INTEGER,module_id INTEGER);"
+	 "CREATE TABLE insts  (id INTEGER PRIMARY KEY,name_id INTEGER,module_id INTEGER,parent_id INTEGER);"
+	 "CREATE TABLE pins   (id INTEGER PRIMARY KEY,name_id INTEGER,module_id INTEGER,net_id INTEGER,type_id INTEGER);"
+	 "CREATE TABLE conns  (id INTEGER PRIMARY KEY,net_id  INTEGER,inst_id INTEGER,pin_id INTEGER);"
+	 "CREATE TABLE names  (id INTEGER PRIMARY KEY,name TEXT);"
+	 "CREATE TABLE types(id INTEGER PRIMARY KEY,type TEXT);"
+	 "INSERT INTO types VALUES(1, 'undef');"
+	 "INSERT INTO types VALUES(2, 'input');"
+	 "INSERT INTO types VALUES(3, 'output');"
+	 "INSERT INTO types VALUES(4, 'inout');"
+	 "INSERT INTO types VALUES(5, 'pwr');"
+	 "PRAGMA synchronous=OFF;")))
+
+(if (not dbexists)(mk-tables))
+
+;;======================================================================
+;; NETLIST READING
+;;======================================================================
+
+;; Use a stack to tracking state
+;;
+(define nldb:*stack* (make-stack))
+
+(define (nldb:read-files fnames) ;; read in a list of files
+  (for-each 
+   (lambda (fname)
+     (if (file-exists? fname)
+	 (nldb:read-file fname)))
+   fnames))
+
+;;======================================================================
+;; PRECOMPILED REGEXS
+;;======================================================================
+
+(define nldb:escaped-name     (regexp "^\\s*\\\\([^\\s]+)\\s*"))
+(define nldb:trailing-garbage (regexp "^\\s*([^\\s,;]+)[,;\\s]*$"))
+(define nldb:module-pin       (regexp "^\\s*([^\\s]+)\\s*([,\\s\\)]*)"))
+(define nldb:pins-end         (regexp "\\)\\s*;"))
+(define nldb:input-output     (regexp "\\s*(input|output)\\s+([^\\s]+)[\\s;,]"))
+
+;;                                           modname instname( .\pinname[35] (\netname ),
+(define nldb:instance         (regexp "^\\s*([^\\s]+)\\s+([^\\s]+)\\s*\\(\\s*\\.([^\\s]+)\\s*\\(\\s*([^\\s]+)\\s*\\)\\s*,"))
+(define nldb:inst-conn        (regexp "^\\s*\\.([^\\s]+)\\s*\\(\\s*([^\\s])+\\s+\\)\\s*([\\),;]+)"))
+
+;;                                                 module_name         netname (opt)
+(define nldb:module-regex (regexp "^\\s*module\\s+([^\\s]+)\\s*\\(\\s*([^\\s,]+\\s*,|)$"))
+
+;;======================================================================
+;; MISC
+;;======================================================================
+
+;; apply regex and set nldb:match-val
+(define nldb:match-val #f)
+(define (nldb:regex-match r l)
+  (let ((m (string-match r l)))
+    (set! nldb:match-val m) m))
+
+;; stmt can only return *one* value!!
+(define (nldb:sqlite3:get-one stmt . params)
+  (let ((sqlstmt (sqlite3:prepare db stmt))
+	(result  #f))
+    (apply sqlite3:for-each-row
+	   (lambda (x)
+	     (set! result x)) sqlstmt params)
+    (sqlite3:finalize! sqlstmt)
+    result))
+
+;;======================================================================
+;; CACHE
+;;======================================================================
+
+(define *cache*             (make-hash-table))
+(define *module-name-cache* (make-hash-table))
+
+(define (cache-get-module-hash module)
+  (sub-hash-create-get *cache* module))
+
+(define (sub-hash-create-get subhash key)
+  (let ((shash (hash-table-get/default subhash key)))
+    (if shash shash
+	(let ((newh (make-hash-table)))
+	  (hash-table-set! subhash key newh)
+	  newh))))
+
+;; (cache-set! "abc_adder" 'pin "addrin" 0)
+(define (cache-set! module objtype objname value)
+  (let* ((mhash (cache-get-module-hash module))
+	 (thash (sub-hash-create-get mhash objtype)))
+    (hash-table-set! thash objname value)))
+
+(define (cache-ref module objtype objname)
+  (let ((mhash (hash-table-ref/default *cache* module)))
+    (if mhash
+	(let ((ohash (hash-table-ref/default mhash objtype)))
+	  (if ohash
+	      (hash-table-ref/default ohash objname)
+	      #f))
+	#f)))
+    
+;;======================================================================
+;; NAMES
+;;======================================================================
+
+(define nldb:names-hash (make-hash-table))
+
+;; always sucessful. inserts name if not found
+(define (nldb:get-name-id name)
+  (let ((cached-id (hash-table-ref/default nldb:names-hash name #f)))
+    (if cached-id cached-id
+	(let ((id (nldb:sqlite3:get-one "SELECT id FROM names WHERE name=?;" name)))
+	  (if id
+	      (begin
+		(hash-table-set! nldb:names-hash name id )
+		id)
+	      (begin
+		(sqlite3:exec db "INSERT INTO names (name) VALUES (?);" name)
+		(nldb:get-name-id name)))))))
+
+(define (nldb:clean-name name)
+  (if (nldb:regex-match nldb:escaped-name name) ;; process escaped identifiers
+      (list-ref nldb:match-val 1)
+      (if (nldb:regex-match nldb:trailing-garbage name)
+	  (list-ref nldb:match-val 1)
+	  name)))
+
+;;======================================================================
+;; MODULES
+;;======================================================================
+
+;; add a module and return its id.
+(define (nldb:get-module-id name-id)
+  (let ((id  (nldb:sqlite3:get-one 
+	      "SELECT id FROM modules WHERE name_id=?;" name-id)))
+    (if id id
+	(begin
+	  (nldb:insert-module name-id)
+	  (nldb:get-module-id name-id))))) ;; now retrieve and return the id
+
+;; not safe to use outside of get-module-id - could add duplicates
+(define (nldb:insert-module name-id)
+  (sqlite3:exec db "INSERT INTO modules (name_id) VALUES (?);" name-id))
+
+;; module namespace is unique so this is ok, should check for redefining though.
+(define (nldb:get-module-by-name name)
+  (let ((module-id (hash-table-ref *module-name-cache* name)))
+    (if module-id module-id
+	(let ((mid (nldb:get-module-id (nldb:get-name-id name))))
+	  (hash-table-set! *module-name-cache* name mid)))))
+
+;;======================================================================
+;; PINS
+;;======================================================================
+
+(define (nldb:get-pin-id module-id name-id)
+  (nldb:sqlite3:get-one 
+   (string-append "SELECT id FROM pins WHERE module_id=? AND name_id=?;") 
+   module-id name-id))
+
+(define (nldb:add-pin module-id name-id type-id)
+  (let ((pin-id (nldb:get-pin-id module-id name-id)))
+    (if pin-id pin-id
+	(begin	
+	  (nldb:insert-pin module-id name-id type-id)
+	  (nldb:get-pin-id module-id name-id)))))
+
+(define (nldb:insert-pin module-id name-id type-id)
+  (sqlite3:exec db "INSERT INTO pins (module_id,name_id,type_id) VALUES (?,?,?);"
+		module-id name-id (if type-id type-id 0)))
+
+(define (nldb:set-pin-direction pin-id direction)
+  (sqlite3:exec db "UPDATE pins SET type_id=(SELECT id FROM types WHERE type=?) WHERE id=?;" direction pin-id))
+
+(define (nldb:set-pin-net pin-id net-id)
+  (sqlite3:exec db "UPDATE pins SET net_id=? WHERE id=?;" net-id pin-id))
+
+;;====================================================================
+;; CONNS
+;;======================================================================
+
+(define (nldb:get-conn-id inst-id pin-id)
+  ;; (if (not (and inst-id pin-id))(print "ERROR: nldb:get-conn-id called with bad params: inst-id " inst-id " pin-id " pin-id)
+  (nldb:sqlite3:get-one  "SELECT id FROM conns WHERE inst_id=? AND pin_id=?;" inst-id pin-id))
+
+(define (nldb:add-conn inst-id pin-id net-id)
+  ;;  (if (not (and inst-id pin-id net-id))(print "ERROR: nldb:add-conn called with bad params: inst-id " inst-id " pin-id " pin-id " net-id " net-id)
+  (let ((conn-id (nldb:get-conn-id inst-id pin-id)))
+    (if conn-id conn-id
+	(begin	
+	  (nldb:insert-conn inst-id pin-id net-id)
+	  (nldb:get-conn-id inst-id pin-id)))))
+
+(define (nldb:insert-conn inst-id pin-id net-id)
+  ;;  (if (not (and inst-id pin-id net-id))(print "ERROR: nldb:insert-conn called with bad params: inst-id " inst-id " pin-id " pin-id " net-id " net-id)
+  (sqlite3:exec db "INSERT INTO conns (inst_id,pin_id,net_id) VALUES (?,?,?);"
+		inst-id pin-id net-id ))
+
+;;======================================================================
+;; NET
+;;======================================================================
+
+(define (nldb:get-net-id module-id name-id)
+  (nldb:sqlite3:get-one "SELECT id FROM nets WHERE name_id=?;" name-id))
+
+(define (nldb:add-net module-id name-id)
+  (let ((net-id (nldb:get-net-id module-id name-id)))
+    (if net-id net-id
+	(begin
+	  (nldb:insert-net module-id name-id)
+	  (nldb:get-net-id module-id name-id)))))
+
+(define (nldb:insert-net module-id name-id)
+  (sqlite3:exec db "INSERT INTO nets (module_id,name_id) VALUES(?,?);" module-id name-id))
+
+;;======================================================================
+;; INSTANCES
+;;======================================================================
+
+(define (nldb:get-inst-id parent-id name-id)
+  (nldb:sqlite3:get-one "SELECT id FROM insts WHERE parent_id=? AND name_id=?;" parent-id name-id))
+
+;; sub-mod-id = type of instance, parent-id = where instantiated
+(define (nldb:add-inst module-id parent-id name-id)
+  (let ((inst-id (nldb:get-inst-id parent-id name-id))) ;; parent and name are enough to identify it
+    (if inst-id inst-id
+	(begin
+	  (nldb:insert-inst module-id parent-id name-id)
+	  (nldb:get-inst-id parent-id name-id)))))
+
+(define (nldb:insert-inst module-id parent-id name-id)
+  (sqlite3:exec db "INSERT INTO insts (module_id,parent_id,name_id) VALUES(?,?,?);" module-id parent-id name-id))
+
+;;======================================================================
+;; RECORD FOR STATE
+;;======================================================================
+
+(define *statevec* (make-vector 5))
+
+(define-inline (curr-pin-id)           (vector-ref  *statevec* 0))
+(define-inline (curr-inst-id)          (vector-ref  *statevec* 1))
+(define-inline (curr-module-id)        (vector-ref  *statevec* 2))
+(define-inline (curr-inst-module-id)   (vector-ref  *statevec* 3))
+
+(define-inline (set-curr-pin-id!         id)(vector-set! *statevec* 0 id))
+(define-inline (set-curr-inst-id!        id)(vector-set! *statevec* 1 id))
+(define-inline (set-curr-module-id!      id)(vector-set! *statevec* 2 id))
+(define-inline (set-curr-inst-module-id! id)(vector-set! *statevec* 3 id))
+
+;;======================================================================
+;; FILE I/O
+;;======================================================================
+
+;; Initialization and support routines for nldb:read-file
+(stack-push! nldb:*stack* 'start)
+(define nldb:esc-regex  (regexp "^\\\\([^\\s]*)\\s*$") )
+(define (nldb:clean-identifier token)
+  (let* ((t   (car token))
+	 (v   (cadr token))
+	 (ctm (string-match nldb:esc-regex v)))
+    (list 'identifier (list-ref ctm 1))))
+
+
+(define (nldb:read-file fname)
+  (let* ((inp (open-input-file fname))
+	 (prev-state #f))
+    (lexer-init 'port inp)
+    (let loop ((token          (lexer)))
+      (let ((token-type (car token))
+	    (token-val  (cadr token))
+	    (state      (stack-peek herc:*stack*)))
+	(if (not (eq? prev-state state))
+	    (begin
+	      (print "state: " state)
+	      (set! prev-state state)))
+	(case token-type
+	  ('end-of-input       (print "Done")(close-input-port inp))
+	  ('whitespace         (loop (lexer)))  ;; skip whitespace
+	  ('comment-begin      
+	   (stack-push! herc:*stack* 'comment )
+	   (loop (lexer)))
+	  ('comment-end        (stack-pop! herc:*stack*)(loop (lexer)))
+	  ('begin              (stack-push! herc:*stack* 'begin)(loop (lexer)))
+	  ('end                (stack-pop! herc:*stack*)(loop (lexer)))
+	  ('cell
+	   (case state
+	     ('begin
+	       (stack-push! herc:*stack* 'cell-name)
+	       (loop (lexer)))
+	     (else
+	      (loop (lexer)))))
+	  ('plainidentifier
+	   (case state
+	     ('cell-name
+
+	  ('statementend       (stack-pop! nldb:*stack*)(loop (lexer)))
+	  ('endparen           (stack-pop! nldb:*stack*)(loop (lexer)))
+	  ('endmodule          (stack-pop! nldb:*stack*)(loop (lexer)))
+
+	  ('startparen 
+	   (case state
+	     ('module-pins     (loop (lexer)))
+	     ('inst-def        (loop (lexer)))
+	     ('inst-conn-def   (loop (lexer)))
+	     ('pin-net         (loop (lexer)))
+	     (else             (print "ERROR: Didn't expect an open paren here! Line " (lexer-get-line)))))
+
+	  ('comma
+	   (case state
+	     ('module-pins     (loop (lexer)))
+	     ('input-pin       (loop (lexer)))
+	     ('output-pin      (loop (lexer)))
+	     ('wire            (loop (lexer)))
+	     ('inst-conn-def   (loop (lexer))) ;; (stack-pop! nldb:*stack*) (loop (lexer)))
+	     (else             (print "ERROR: Didn't expect a comma here! Line " (lexer-get-line)))))
+
+	  ('module 
+	   (case state
+	     ('start 
+	      (stack-push! nldb:*stack* 'module)      ;; we will be in a module
+	      (stack-push! nldb:*stack* 'module-def)) ;; starting in the def
+	     (else
+	      (print "ERROR: Didn't expect module declaration here! Line " (lexer-get-line))))
+	   (loop (lexer)))
+
+	  ('input 
+	   (case state
+	     ('module      (stack-push! nldb:*stack* 'input-pin))
+	     (else         (print "ERROR: Didn't expect \"input\" statement here! Linenum " (lexer-get-line))))
+	   (loop (lexer)))
+
+	  ('output
+	   (case state
+	     ('module      (stack-push! nldb:*stack* 'output-pin))
+	     (else         (print "ERROR: Didn't expect \"output\" statement here! Linenum " (lexer-get-line))))
+	   (loop (lexer)))
+	  
+	  ('inout
+	   (case state
+	     ('module      (stack-push! nldb:*stack* 'inout-pin))
+	     (else         (print "ERROR: Didn't expect \"inout\" statement here! Linenum " (lexer-get-line))))
+	   (loop (lexer)))
+
+	  ('pin 
+	   (case state
+	     ('inst-conn-def
+	      (let* ((pin-name    (substring token-val 1 (string-length token-val)))
+		     (pin-name-id (nldb:get-name-id pin-name))
+		     (pin-id      (nldb:add-pin (curr-module-id) pin-name-id #f)))
+		(stack-push! nldb:*stack* 'pin-net)
+		(set-curr-pin-id! pin-id)
+		(loop (lexer))))
+	     (else  (print "ERROR: Didn't expect pin here " token-val " Linenum: " (lexer-get-line)))))
+
+	  ('identifier
+	   (case state
+	     ('module  ;; this must be an instance, an identifier at the top level
+	      (let* ((inst-mod-id (nldb:get-module-by-name token-val)))
+		(set-curr-inst-module-id! inst-mod-id)
+		(stack-push! nldb:*stack* 'inst-def))
+	      (loop (lexer)))
+	     ('inst-def                  ;;     inst-module type  parent-id    inst-name-id
+	      (let* ((inst-id (nldb:add-inst (curr-inst-module-id)(curr-module-id)(nldb:get-name-id token-val))))
+		(set-curr-inst-id! inst-id))
+	      (stack-push! nldb:*stack* 'inst-conn-def)
+	      (loop (lexer)))
+	     ('module-def
+	      (let* ((m-id (nldb:get-module-by-name token-val)))
+		(set-curr-module-id! m-id))
+	      (stack-push! nldb:*stack* 'module-pins))
+	     ('module-pins
+	      (nldb:add-pin (curr-module-id) (nldb:get-name-id token-val) #f))
+	     ('input-pin
+	      (let ((pin-id (nldb:get-pin-id (curr-module-id) (nldb:get-name-id token-val))))
+		(nldb:set-pin-direction pin-id "input")))
+	     ('output-pin
+	      (let ((pin-id (nldb:get-pin-id (curr-module-id) (nldb:get-name-id token-val))))
+		(nldb:set-pin-direction pin-id "output")))
+	     ('inout-pin
+	      (let ((pin-id (nldb:get-pin-id (curr-module-id) (nldb:get-name-id token-val))))
+		(nldb:set-pin-direction pin-id "inout")))
+	     ('pin-net
+	      (let* ((net-name-id (nldb:get-name-id token-val))
+		     (net-id      (nldb:add-net (curr-inst-module-id) net-name-id)))
+		(nldb:add-conn (curr-inst-id) (curr-pin-id) net-id)))
+	     (else
+	      (print "ERROR: Didn't expect an identifier here! Token " token-val " Line " (lexer-get-line))))
+	   (loop (lexer)))
+
+	  (else
+	   (print "ERROR: unknown token " token " on line " (lexer-get-line))
+	   (loop (lexer))))))))
+     

ADDED   stml2/requirements.scm.template
Index: stml2/requirements.scm.template
==================================================================
--- /dev/null
+++ stml2/requirements.scm.template
@@ -0,0 +1,16 @@
+;; choose your db interface as appropriate
+(require-extension sqlite3)
+(import (prefix sqlite3 sqlite3:))
+
+;; (require-extension postgresql)
+;; (import (prefix postgresql pg:))
+
+;; (require-extension cgi-util)
+;; (require-extension cookie)
+(use posix)
+;; (require-extension proplist)
+(use regex)
+(use srfi-1) 
+;; (require-extension tinyclos)
+(use srfi-69)
+(use data-structures)

ADDED   stml2/rollup-pages.scm
Index: stml2/rollup-pages.scm
==================================================================
--- /dev/null
+++ stml2/rollup-pages.scm
@@ -0,0 +1,49 @@
+(use regex posix srfi-69 srfi-1)
+
+(define extract-rx (regexp "pages\\/(.*)_(view|ctrl).scm"))
+
+(define (print-page-wrapper lookup page)
+  (print "(define (pages:" page " session db shared)")
+  (if (hash-table-ref/default lookup (conc page "_ctrl") #f)
+      (print "(include \"pages/" page "_ctrl.scm\")"))
+  (if (hash-table-ref/default lookup (conc page "_view") #f)
+      (print "(include \"pages/" page "_view.scm\")"))
+  (print ")\n"))
+
+(let* ((views  (glob "pages/*_view.scm"))
+       (ctrls  (glob "pages/*_ctrl.scm"))
+       (all    (append views ctrls))
+       (lookup (make-hash-table))
+       (pages  (delete-duplicates
+		(map (lambda (x)
+		       (let* ((res  (string-match extract-rx x))
+			      (page (cadr res))
+			      (type (caddr res)))
+			 (hash-table-set! lookup (conc page "_" type) #t)
+			 (cadr res)))
+		     all))))
+  (if (null? all)(begin (print "No page files matching pages/*_(view|ctrl).scm")(exit)))
+  (print "Pages: " pages)
+  ;; first the individual rollup wrappers (used by the dynamic load)
+  (for-each 
+   (lambda (page)
+     (let ((pagefile  (conc "pages/" page ".scm")))
+       (print "page " page " ")
+       (if (not (file-exists? pagefile))
+	   (begin
+	     (with-output-to-file pagefile
+	       (lambda ()
+		 (print-page-wrapper lookup page)))
+	     (print " created"))
+	   (print " already created"))))
+   pages)
+  ;; then the monolithic rollup wrapper (used in compiling the single-executable)
+  (with-output-to-file "all_pages.scm"
+    (lambda ()
+      (for-each
+       (lambda (page)
+	 (print-page-wrapper lookup page))
+       pages))))
+
+
+  

ADDED   stml2/session.scm
Index: stml2/session.scm
==================================================================
--- /dev/null
+++ stml2/session.scm
@@ -0,0 +1,20 @@
+;; Copyright 2007-2011, Matthew Welland.
+;; 
+;;  This program is made available under the GNU GPL version 2.0 or
+;;  greater. See the accompanying file COPYING for details.
+;; 
+;;  This program is distributed WITHOUT ANY WARRANTY; without even the
+;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+;;  PURPOSE.
+
+;; (declare (unit session))
+(module session
+    *
+  
+(import chicken scheme data-structures extras srfi-13 ports posix files srfi-1)
+
+(use (prefix dbi dbi:) srfi-69)
+(require-extension regex)
+(use cookie stmlcommon) ;; (declare (uses cookie))
+
+)

ADDED   stml2/sessions.sql
Index: stml2/sessions.sql
==================================================================
--- /dev/null
+++ stml2/sessions.sql
@@ -0,0 +1,5 @@
+CREATE TABLE session_vars (id integer primary key,  session_id integer, page text, key text, value text);
+
+CREATE TABLE sessions ( id integer primary key, session_key text); 
+	
+

ADDED   stml2/setup.scm
Index: stml2/setup.scm
==================================================================
--- /dev/null
+++ stml2/setup.scm
@@ -0,0 +1,21 @@
+;; Copyright 2007-2011, Matthew Welland.
+;; 
+;;  This program is made available under the GNU GPL version 2.0 or
+;;  greater. See the accompanying file COPYING for details.
+;; 
+;;  This program is distributed WITHOUT ANY WARRANTY; without even the
+;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+;;  PURPOSE.
+
+(module setup
+    *
+(import chicken scheme data-structures extras srfi-13 ports posix)
+
+(uses session misc-stml)
+;; (declare (unit setup))se
+;; (declare (uses session))
+(require-extension srfi-69)
+(require-extension regex)
+
+
+)

ADDED   stml2/spiffyserver.scm
Index: stml2/spiffyserver.scm
==================================================================
--- /dev/null
+++ stml2/spiffyserver.scm
@@ -0,0 +1,13 @@
+;; This doesn't work yet
+;;
+(use spiffy cgi-handler)
+
+(spiffy-debug-mode #t)
+
+(spiffy-file-ext-handlers 
+ `(("drcdb" . ,(cgi-handler* "/path/to/drcdb"))))
+
+(spiffy-root-path "/path/to/web")
+
+(start-server location: (get-host-name)
+                init: noop)

ADDED   stml2/sqlite3.scm
Index: stml2/sqlite3.scm
==================================================================
--- /dev/null
+++ stml2/sqlite3.scm
@@ -0,0 +1,54 @@
+;; Copyright 2007-2011, Matthew Welland.
+;; 
+;;  This program is made available under the GNU GPL version 2.0 or
+;;  greater. See the accompanying file COPYING for details.
+;; 
+;;  This program is distributed WITHOUT ANY WARRANTY; without even the
+;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+;;  PURPOSE.
+;;
+
+;; I used this to get a simple interactive sqlite editor on the nokia n800
+;; since I couldn't get sqlite3 to install (for reasons I can't remember).
+
+(use sqlite3)
+
+(define args (argv))
+(define num-args (length args))
+
+(define dbname #f)
+(define cmd    #f)
+
+(if (> num-args 1)
+  (set! dbname (cadr args))
+  (exit 0))
+
+(if (> num-args 2)
+  (set! cmd (caddr args)))
+
+(define db (sqlite3:open dbname))
+
+(define (interactive db)
+  (let ((prompt " > "))
+    (display prompt)
+  (let loop ((cmd (read-line)))
+    (cond 
+      ((> (string-length cmd) 0)
+       (process-cmd db cmd)
+       (display prompt)
+       (loop (read-line)))
+      (else
+	(loop (read-line)))))))
+ 
+(define (process-cmd db cmd)
+  (sqlite3:for-each-row
+    (lambda (a . b)
+      (print a " " (string-intersperse b " ")))
+    db cmd))
+
+(if cmd
+  (process-cmd db cmd)
+  (interactive db))
+
+(sqlite3:finalize! db)    
+

ADDED   stml2/stml.config.template
Index: stml2/stml.config.template
==================================================================
--- /dev/null
+++ stml2/stml.config.template
@@ -0,0 +1,8 @@
+'(sroot   "/path/to/{pages,models}/dir"
+  logfile "/tmp/stmlrun/logs.log"
+  dbtype  sqlite3
+  dbinit   ((dbname   . "test-stml.db")
+            (user     . "nobody")
+            (password . "Dapassword")
+            (host     . "localhost"))
+  domain  "192.168.1.150")

ADDED   stml2/stml2.meta
Index: stml2/stml2.meta
==================================================================
--- /dev/null
+++ stml2/stml2.meta
@@ -0,0 +1,20 @@
+(
+; Your egg's license:
+(license "LGPL")
+
+; Pick one from the list of categories (see below) for your egg and enter it
+; here.
+(category misc)
+
+; A list of eggs mpeg3 depends on.  If none, you can omit this declaration
+; altogether. If you are making an egg for chicken 3 and you need to use
+; procedures from the `files' unit, be sure to include the `files' egg in the
+; `needs' section (chicken versions < 3.4.0 don't provide the `files' unit).
+; `depends' is an alias to `needs'.
+(needs srfi-69)
+
+; A list of eggs required for TESTING ONLY.  See the `Tests' section.
+(test-depends test)
+
+(author "Matt Welland")
+(synopsis "Primitive argument processor."))

ADDED   stml2/stml2.scm
Index: stml2/stml2.scm
==================================================================
--- /dev/null
+++ stml2/stml2.scm
@@ -0,0 +1,2688 @@
+;; Copyright 2007-2011, Matthew Welland.
+;; 
+;;  This program is made available under the GNU GPL version 2.0 or
+;;  greater. See the accompanying file COPYING for details.
+;; 
+;;  This program is distributed WITHOUT ANY WARRANTY; without even the
+;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+;;  PURPOSE.
+
+;; stml is a list of html strings
+
+;; (declare (unit stml))
+
+(module stml2
+    *
+
+(import chicken scheme data-structures extras srfi-13 ports posix srfi-69 files srfi-1) 
+
+(import cookie)
+(use (prefix dbi dbi:) (prefix crypt c:) typed-records)
+
+;; (declare (uses misc-stml))
+(use regex)
+
+;; The (usually global) sdat contains everything about the session
+;;
+(defstruct sdat
+  ;; database
+  (dbtype 'pg)
+  (dbinit #f)
+  (conn   #f)
+  ;; page info
+  (page "index")
+  (page-type 'html)
+  (toppage "index")
+  (curr-page    "index")
+  (content-type "Content-type: text/html; charset=iso-8859-1\n\n")
+  ;; forms and variables
+  (formdat      #f)
+  (params '())
+  (path-params '())
+  (session-key #f)
+  (pagedat     '())
+  (alt-page-dat #f)
+  (session-cookie #f)
+  (pagevars        (make-hash-table))
+  (pagevars-before (make-hash-table))
+  (sessionvars     (make-hash-table))
+  (sessionvars-before (make-hash-table))
+  (globalvars      (make-hash-table))
+  (globalvars-before (make-hash-table))
+  ;; ports and log file
+  (curr-err       #f)
+  (log-port       (current-error-port))
+  (logfile        "/tmp/stml.log")
+  (seen-pages     '())
+  (page-dir-style  'flat)
+  (debug-mode      #f)
+  (session-id      #f)
+  (request-method  #f)
+  (domain          "localhost")
+  (twikidir        #f)
+  (script          #f)
+  (force-ssl       #f)
+  (shared-hash     (make-hash-table))
+  ;; paths
+  (sroot         "./")
+  (models        #f)
+  (views         #f)
+)
+
+(define (sdat-set-if session configdat var settor)
+  (let ((val (s:find-param var configdat)))
+    (if val (settor session val))))
+
+(define (session:initialize session #!optional (configf #f))
+  ;; (let* ((rawconfigdat (session:read-config session configf))
+  ;;	 (configdat (if rawconfigdat (eval rawconfigdat) '())))
+    ;; (sdat-set-if session configdat 'sroot     sdat-root-set!)
+    ;; (sdat-set-if session configdat 'logfile   sdat-logfile-set!)
+    ;; (sdat-set-if session configdat 'dbtype    sdat-dbtype-set!)
+    ;; (sdat-set-if session configdat 'dbinit    sdat-dbinit-set!)
+    ;; (sdat-set-if session configdat 'domain    sdat-domain-set!)
+    ;; (sdat-set-if session configdat 'twikidir  sdat-twikidir-set!)
+    ;; (sdat-set-if session configdat 'page-dir-style sdat-page-set!)
+    ;; (sdat-set-if session configdat 'sroot sdat-root-set!)
+    ;; (sdat-set-if session configdat 'sroot sdat-root-set!)
+    ;; (sdat-set-if session configdat 'sroot sdat-root-set!)
+    ;; following are set always from config
+    ;; (sdat-page-dir-style-set! session (s:find-param 'page-dir-style configdat))
+  (let* ((rawconfigdat (session:read-config session configf))
+	 (configdat (if rawconfigdat (eval rawconfigdat) '()))
+	 (sroot     (s:find-param 'sroot    configdat))
+	 (models    (s:find-param 'models   configdat))
+	 (views     (s:find-param 'views    configdat))
+	 (logfile   (s:find-param 'logfile  configdat))
+	 (dbtype    (s:find-param 'dbtype   configdat))
+	 (dbinit    (s:find-param 'dbinit   configdat))
+	 (domain    (s:find-param 'domain   configdat))
+	 (twikidir  (s:find-param 'twikidir configdat))
+	 (page-dir  (s:find-param 'page-dir-style configdat))
+	 (debugmode (or (s:find-param 'debug-mode configdat)(s:find-param 'debugmode configdat)))
+         (script    (s:find-param 'script    configdat))
+	 (force-ssl (s:find-param 'force-ssl configdat)))
+    (if sroot    (sdat-sroot-set!      session sroot))
+    (if models   (sdat-models-set!     session models))
+    (if views    (sdat-views-set!      session views))
+    (if logfile  (sdat-logfile-set!    session logfile))
+    (if dbtype   (sdat-dbtype-set!     session dbtype))
+    (if dbinit   (sdat-dbinit-set!     session dbinit))
+    (if domain   (sdat-domain-set!     session domain))
+    (if twikidir (sdat-twikidir-set!   session twikidir))
+    (if debugmode (sdat-debug-mode-set! session debugmode))
+    (if script    (sdat-script-set!    session script))
+    (if force-ssl (sdat-force-ssl-set! session force-ssl))
+    (sdat-page-dir-style-set! session page-dir)
+    ;; (print "configdat: ")(pp configdat)
+    (if debugmode
+	(session:log session "sroot: " sroot " logfile: " logfile " dbtype: " dbtype 
+		     " dbinit: " dbinit " domain: " domain " page-dir-style: " page-dir))
+    ))
+
+;; extract various tokens from the parameter list
+;;   'key val => put in the params list
+;;   strings  => maintain order and add to the datalist <<== IMPORTANT
+(define (s:extract inlst)
+  (if (null? inlst) inlst
+      (let loop ((data '())
+                 (params '())
+                 (head (car inlst))
+                 (tail (cdr inlst)))
+        ;; (print "head=" head " tail=" tail)
+        (cond 
+         ((null? tail)
+          (if (symbol? head) ;; the last item is a param - borked
+              (s:log "ERROR: param with no value"))
+          (list (append data (list (s:any->string head))) params))
+         ((or (string? head)(list? head)(number? head))
+          (loop (append data (list  (s:any->string head))) params (car tail)   (cdr tail)))
+         ((symbol? head)
+          (let ((new-params (cons (list head (car tail)) params))
+                (new-tail  (cdr tail)))
+            (if (null? new-tail) ;; we are done, no more params etc.
+                (list data new-params)
+                (loop data new-params (car new-tail)(cdr new-tail)))))
+         (else
+          (s:log "WARNING: Malformed input, you have broken stml, remember that all stml calls should return a result (null list or empty string is ok):\n  head=" head 
+	          "\n  tail=" tail 
+                  "\n  inlst=" inlst 
+                  "\n  params=" params)
+	  (if (null? tail)
+	      (list data params)
+	      (loop data params (car tail)(cdr tail))))))))
+
+;; most tags can be handled by this routine
+(define (s:common-tag tagname args)
+  (let* ((inputs (s:extract args))
+         (data   (car inputs))
+         (params (s:process-params (cadr inputs))))
+    (list (conc "<" tagname params ">")
+          data
+          (conc ""))))
+
+;; Suggestion: order these alphabetically
+(define (s:a      . args) (s:common-tag "A"      args))
+(define (s:b      . args) (s:common-tag "B"      args))
+(define (s:u      . args) (s:common-tag "U"      args))
+(define (s:big    . args) (s:common-tag "BIG"    args))
+(define (s:body   . args) (s:common-tag "BODY"   args))
+(define (s:button . args) (s:common-tag "BUTTON" args))
+(define (s:center . args) (s:common-tag "CENTER" args))
+(define (s:code   . args) (s:common-tag "CODE"   args))
+(define (s:div    . args) (s:common-tag "DIV"    args))
+(define (s:h1     . args) (s:common-tag "H1"     args))
+(define (s:h2     . args) (s:common-tag "H2"     args))
+(define (s:h3     . args) (s:common-tag "H3"     args))
+(define (s:h4     . args) (s:common-tag "H4"     args))
+(define (s:h5     . args) (s:common-tag "H5"     args))
+(define (s:head   . args) (s:common-tag "HEAD"   args))
+(define (s:html   . args) (s:common-tag "HTML"   args))
+(define (s:i      . args) (s:common-tag "I"      args))
+(define (s:img    . args) (s:common-tag "IMG"    args))
+(define (s:input  . args) (s:common-tag "INPUT"  args))
+(define (s:output . args) (s:common-tag "OUTPUT" args))
+(define (s:link   . args) (s:common-tag "LINK"   args))
+(define (s:p      . args) (s:common-tag "P"      args))
+(define (s:strong . args) (s:common-tag "STRONG" args))
+(define (s:table  . args) (s:common-tag "TABLE"  args))
+(define (s:tbody  . args) (s:common-tag "TBODY"  args))
+(define (s:thead  . args) (s:common-tag "THEAD"  args))
+(define (s:th     . args) (s:common-tag "TH"     args))
+(define (s:td     . args) (s:common-tag "TD"     args))
+(define (s:title  . args) (s:common-tag "TITLE"  args))
+(define (s:tr     . args) (s:common-tag "TR"     args))
+(define (s:small  . args) (s:common-tag "SMALL"  args))
+(define (s:quote  . args) (s:common-tag "QUOTE"  args))
+(define (s:hr     . args) (s:common-tag "HR"     args))
+(define (s:li     . args) (s:common-tag "LI"     args))
+(define (s:ul     . args) (s:common-tag "UL"     args))
+(define (s:ol     . args) (s:common-tag "OL"     args))
+(define (s:dl     . args) (s:common-tag "DL"     args))
+(define (s:dt     . args) (s:common-tag "DT"     args))
+(define (s:dd     . args) (s:common-tag "DD"     args))
+(define (s:pre    . args) (s:common-tag "PRE"    args))
+(define (s:span   . args) (s:common-tag "SPAN"   args))
+(define (s:label  . args) (s:common-tag "LABEL"  args))
+(define (s:script . args) (s:common-tag "SCRIPT" args))
+
+(define (s:dblquote  . args)
+  (let* ((inputs (s:extract args))
+         (data   (caar inputs))
+         (params (s:process-params (cadr inputs))))
+    (conc """ data """)))
+
+(define (s:br     . args) "
    ") ;;  THIS MAY NOT WORK!!!! BR CAN (MISTAKENLY) GET PARAM TEXT
+;; (define (s:br     . args) (s:common-tag "BR"     args))
+(define (s:font   . args) (s:common-tag "FONT"   args))
+(define (s:err-font . args)
+  (s:b (s:font 'color "red" args)))
+
+(define (s:comment . args)
+  (let* ((inputs (s:extract args))
+         (data   (car inputs))
+         (params (s:process-params (cadr inputs))))
+    (list "")))
+
+(define (s:null   . args) ;; nop
+  (let* ((inputs (s:extract args))
+         (data   (car inputs))
+         (params (s:process-params (cadr inputs))))
+    (list data)))
+
+;; puts a nice box around a chunk of stuff
+(define (s:fieldset legend . args)
+  (list "
    " legend "" args "
    "))
+
+;; given a string return the string if it is non-white space or   otherwise
+(define (s:nbsp str)
+  (if (string-match "^\\s*$" str)
+      " "
+      str))
+
+;; USE 'page_override to override a linkto page from a button
+(define (s:form   . args)
+  ;; create a link for calling back into the current page and calling a specified 
+  ;; function
+  (let* ((action     (let ((v (s:find-param 'action args)))
+                       (if v v "default")))
+	 (id         (let ((i (s:find-param 'id args)))
+		       (if i i #f)))
+         (page       (let ((p (sdat-page s:session)))
+                       (if p p "home")))
+	 ;; (link       (session:link-to s:session page (if id
+         ;;                                                 (list 'action action 'id id)
+         ;;                                                 (list 'action action)))))
+	 (link       (if (string=? (substring action 0 5) "http:") ;; if first part of string is http:
+	        	 action
+	        	 (session:link-to s:session 
+	        			  page 
+	        			  (if id
+	        			      (list 'action action 'id id)
+	        			      (list 'action action))))))
+    ;; (script     (slot-ref s:session 'script))
+    ;; (action-str (string-append script "/" page "?action=" action)))
+    (s:common-tag "FORM" (append (s:remove-param-matching (s:remove-param-matching args 'action) 'id)
+                                 (list 'action link)))))
+
+;; look up the variable name (via the 'name tag) then inject the value from the session var
+;; replacing the 'value value if it is already there, adding it if it is not.
+(define (s:preserve tag args)
+  (let* ((var-name (s:find-param 'name args)) ;; name='varname'
+	 (value    (let ((v (s:get var-name)))
+		     (if v v #f)))
+	 (newargs  (append (s:remove-param-matching args 'value) (if value (list 'value value) '()))))
+    (s:common-tag tag newargs)))
+
+(define (s:input-preserve  . args)
+  (s:preserve "INPUT" args))
+
+;; text areas are done a little differently. The value is stored between the tags 
+(define (s:textarea-preserve . args)
+  (let* ((var-name (s:find-param 'name args))
+	 (value    (let ((v (s:get var-name)))
+		     (if v v #f))))
+    (s:common-tag "TEXTAREA" (if value (cons value args) args))))
+
+(define (s:option dat)
+  (let ((len      (length dat)))
+    (cond
+     ((eq? len 1)
+      (let ((item (car dat)))
+	(s:option (list item item item))))
+     ((eq? len 2)
+      (s:option (append dat (list (car dat)))))
+     (else
+      (let ((label    (car dat))
+	    (value    (cadr dat))
+	    (dispval  (caddr dat))
+	    (selected (if (> len 3)(cadddr dat) #f)))
+	(list (conc "")))))))
+
+;; call only with (label (label value dispval [#t]) ...)
+;; NB// sadly this block is redundantly almost identical to the s:select
+;; fix that later ...
+(define (s:optgroup dat)
+  (let ((label (car dat))
+	(rem   (cdr dat)))
+    (if (null? rem)
+	(s:common-tag "OPTGROUP" `('label ,label))
+	(let loop ((hed (car rem))
+		   (tal (cdr rem))
+		   (res (list (conc ""))
+		(loop (car tal)(cdr tal) new)))))))
+    
+;; items is a hierarchial alist
+;; ( (label1 value1 dispval1 #t) ;; <== this one is selected
+;;   (label2 (label3 value2 dispval2)
+;;           (label4 value3 dispval3)))
+;;     
+;;  required arg is 'name
+(define (s:select items . args)
+  (if (null? items)
+      (s:common-tag "SELECT" args)
+      (let loop ((hed (car items))
+		 (tal (cdr items))
+		 (res '()))
+	;; (print "hed: " hed " tal: " tal " res: " res)
+	(let ((new (append res (list (if (and (> (length hed) 1)
+					      (list? (cadr hed)))
+					 (s:optgroup hed)
+					 (s:option hed))))))
+	  (if (null? tal)
+	      (s:common-tag "SELECT" (cons new args))
+	      (loop (car tal)(cdr tal) new))))))
+
+(define (s:color  . args)
+  "#00ff00")
+
+(define (s:print indent inlst)
+  (map (lambda (x)
+         (cond 
+          ((or (string? x)(symbol? x))
+           (print (conc (make-string (* indent 2) #\ ) (s:any->string x))))
+          ((list? x)
+           (s:print (+ indent 1) x))
+          (else
+           ;; (print "ERROR: Bad input 01") ;; why do anything with junk?
+           )))
+       inlst))
+
+;; Moved to misc-stml
+;;
+#;(define (s:cgi-out inlst)
+  (s:output (current-output-port) inlst))
+
+#;(define (s:output port inlst)
+  (map (lambda (x)
+	 (cond 
+	  ((string? x) (print x)) ;; (print x))
+	  ((symbol? x) (print x)) ;; (print x))
+	  ((list? x)   (s:output port x))
+	  (else ""
+	   ;; (print "ERROR: Bad input 02") ;; why do anything? don't output junk.
+	   )))
+       inlst))
+;  (if (> (length inlst) 2)
+;      (print)))
+
+#;(define (s:output-new port inlst)
+  (with-output-to-port port
+      (lambda ()
+	(map (lambda (x)
+	       (cond 
+		((string? x) (print x))
+		((symbol? x) (print x))
+		((list? x)   (s:output port x))
+		(else
+		 ;; (print "ERROR: Bad input 03")
+     )))
+	     inlst))))
+
+;;======================================================================
+;; Not sure where these should go
+;;======================================================================
+
+;; (include "requirements.scm"), dbi has autoload, should not need this any more.
+
+;;======================================================================
+;; setup - convience calls to functions wrapped with a global s:session
+;;======================================================================
+
+;; macros in sugar don't work, have to load in all files or use compiled mode?
+;;
+;; (include "sugar.scm")
+
+;; use this for getting data from page to page when scope and evals
+;; get in the way
+;; save data for use in the page generation here. Does NOT persist across page reads.
+
+(define *page-data* (make-hash-table))
+
+(define (s:lset! var val)
+  (hash-table-set! *page-data* var val))
+(define (s:lget var . default)
+  (hash-table-ref/default *page-data* var (if (null? default)
+					      #f
+					      (car default))))
+
+;; to obscure and indirect database ids use one time keys
+;;
+;;  (s:get-key 'n 1)     => "n99e1882" n=number 99e is the week number since 1970, remainder is random
+;;  (s:key->val "n1882") => 1
+;;
+;;  first letter is a type: n=number, s=string, b=boolean
+(define (s:get-key key-type val)
+  (let ((mkrandstr (lambda (innum)(number->string (random innum) 16)))
+	(week      (number->string (quotient (current-seconds) (* 7 24 60 60)) 16)))
+    (let loop ((siz 1000)
+	       (key (conc key-type week (mkrandstr 100)))
+	       (num 0))
+      (if (s:session-var-get key) ;; have a collision
+	  (loop (cond                 ;; in the unlikey event we have trouble getting a new var, keep increasing the size of the number
+		 ((< num 50)  100)
+		 ((< num 100) 1000)
+		 ((< num 200) 10000)
+		 ((< num 300) 100000)
+		 ((< num 400) 1000000) ;; can't imagine needing to get here. remember that this is for a single user
+		 (else 100000000))
+		(conc key-type (mkrandstr siz))
+		(+ num 1))
+	  (begin
+	    (s:session-var-set! key val)
+	    key)))))
+
+;; given a key Xnnnn, look up the stored value and convert it appropriately, then
+;; destroy the stored session var
+;;
+(define (s:key->val key)
+  (let ((val (s:session-var-get key))
+	(typ (string->symbol (substring key 0 1))))
+    (if val
+	(begin
+	  (s:session-var-del! key)
+	  ;; we take this opportunity to clean up old keyed session vars
+	  ;; if more than 100 vars, remove all that are over 1-2 weeks old
+					;(s:cleanup-session-vars)
+	  (case typ
+	    ((n)(string->number val))
+	    ((s) val)
+	    (else val)))
+	val)))
+  
+;; clean up session vars
+;;
+(define (s:cleanup-session-vars)
+  (let* ((session-vars (hash-table-keys (s:session-get-sessionvars)))
+	 (week-num     (quotient (current-seconds) (* 7 24 60 60)))
+	 (week         (number->string week-num  16)))
+    (if (> (length session-vars) 100)
+	(for-each
+	 (lambda (var)
+	   (if (> (string-length var) 5) ;; can't have keyed values with keys less than 5 characters long
+	       (let ((var-week (string->number (substring var 1 4) 16)))
+		 (if (and var-week
+			  (>= (- week-num var-week) 2))
+		     (s:session-var-del! var)))))
+	 session-vars))))
+
+;; inputs
+;;
+;; param: (dtype [tag1 tag2 ...])
+;; dtype:
+;;    'raw     : do no conversion
+;;    'number  : convert to number, return #f if fails
+;;    'escaped : use html-escape to protect the input
+;;
+(define (s:get-input key . params)
+  (session:get-input s:session key params))
+
+(define (s:get-input-keys)
+  (session:get-input-keys s:session))
+
+;; get-input else, get-param else #f
+;;
+(define (s:get-inp key . params)
+  (or (apply s:get-input key params)
+      (apply s:get-param key params)))
+
+(define (s:load-model model)
+  (session:load-model s:session model))
+
+(define (s:model-path)
+  (session:model-path s:session))
+
+;; share data between pages calls. NOTE: This is not persistent
+;; between cgi calls. Use sessionvars for that.
+;;
+(define (s:shared-hash)
+  (sdat-shared-hash s:session))
+
+(define (s:shared-set! key val)
+  (hash-table-set! (sdat-shared-hash s:session) key val))
+
+;; What to return when no value for key?
+;;
+(define (s:shared-get key)
+  (hash-table-ref/default (sdat-shared-hash s:session) key #f))
+
+;; http://foo.bar.com/pagename/p1/p2 => '("p1" "p2")
+;;  #### DEPRECATED ####
+(define (s:get-page-params)
+  (sdat-path-params s:session))
+
+(define (s:get-path-params)
+  (sdat-path-params s:session))
+	
+
+(define (s:db)
+  (sdat-conn s:session))
+
+;;======================================================================
+;; cgi and session stuff
+;;======================================================================
+
+;;(declare (uses cookie))
+;;(declare (uses html-filter))
+;;(declare (uses misc-stml))
+;;(declare (uses formdat))
+;;(declare (uses stml))
+;;(declare (uses session))
+;;(declare (uses setup)) ;; s:session gets created here
+;;(declare (uses sqltbl))
+;;(declare (uses keystore))
+
+;; given a list of symbols give the count of the matching symbol
+;; l => '(a b c)  (dumobj:indx a 'b) => 1
+(define (s:get-fieldnum lst field-name)
+  (let loop ((head (car lst))
+             (tail (cdr lst))
+             (fnum 0))
+    (if (eq? head field-name) fnum
+        (if (null? tail) #f
+            (loop (car tail)(cdr tail)(+ fnum 1))))))
+
+(define (s:fields->string lst)
+  (string-join (map symbol->string lst) ","))
+
+(define (s:vector-get-field vec field field-list)
+  (vector-ref vec (s:get-fieldnum field-list field)))
+
+;;======================================================================
+;;
+;;======================================================================
+
+;; moved to misc-stml
+;;
+#;(define (err:log . msg)
+  (with-output-to-port (current-error-port) ;; (slot-ref self 'logpt)
+    (lambda () 
+      (apply print msg))))
+
+(define (s:tidy-url url)
+  (if url
+      (let ((r1 (regexp "^http:\\/\\/"))
+            (r2 (regexp "^[ \\t]*$"))) ;; blank
+        (if (string-match r1 url) url
+            (if (string-match r2 url) #f ;; convert a blank to #f
+                (conc "http://" url))))
+      url))
+
+(define (s:lazy->num num)
+  (if (number? num) num
+      (if (string->number num) (string->number num)
+	    (if num 1 0)))) ;; wierd eh! yep, #f=>0 #t=>1 
+
+;;======================================================================
+;; D B
+;;======================================================================
+
+;; convert values to appropriate strings
+;;
+#;(define (s:sqlparam-val->string val)
+  (cond
+   ((list?   val)(string-join (map symbol->string val) ",")) ;; (a b c) => a,b,c
+   ((string? val)(conc "'" (dbi:escape-string val) "'"))
+   ((number? val)(number->string val))
+   ((symbol? val)(dbi:escape-string (symbol->string val)))
+   ((boolean? val)
+    (if val "TRUE" "FALSE"))  ;; should this be "TRUE" or 1?
+                              ;; should this be "FALSE" or 0 or NULL?
+   (else
+    (err:log "sqlparam: unknown type for value: " val)
+    "")))
+
+;; (sqlparam "INSERT INTO foo(name,age) VALUES(?,?);" "bob" 20)
+;; NB// 1. values only!! 
+;;      2. terminating semicolon required (used as part of logic)
+;;
+;; a=? 1 (number) => a=1
+;; a=? 1 (string) => a='1'
+;; a=? #f         => a=FALSE 
+;; a=? a (symbol) => a=a 
+;;
+#;(define (s:sqlparam query . args)
+  (let* ((query-parts (string-split query "?"))
+         (num-parts    (length query-parts))
+         (num-args    (length args)))
+    (if (not (= (+ num-args 1) num-parts))
+        (err:log "ERROR, sqlparam: wrong number of arguments or missing semicolon, " num-args " for query " query)
+        (if (= num-args 0) query
+            (let loop ((section (car query-parts))
+                       (tail    (cdr query-parts))
+                       (result  "")
+                       (arg     (car args))
+                       (argtail (cdr args)))
+              (let* ((valstr    (s:sqlparam-val->string arg))
+                     (newresult (conc result section valstr)))
+                (if (null? argtail) ;; we are done
+                    (conc newresult (car tail))
+                    (loop
+                     (car tail)
+                     (cdr tail)
+                     newresult
+                     (car argtail)
+                     (cdr argtail)))))))))
+
+;;======================================================================
+;; M I S C   S T R I N G   S T U F F
+;;======================================================================
+
+(define (s:string-downcase str)
+  (if (string? str)
+      (string-translate str "ABCDEFGHIJKLMNOPQRSTUVWXYZ" "abcdefghijklmnopqrstuvwxyz")
+      str)) 
+
+;; (define session:valid-chars "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789")
+#;(define session:valid-chars "abcdefghijklmnopqrstuvwxyz0123456789") ;; cookies are case insensitive.
+#;(define session:num-valid-chars (string-length session:valid-chars))
+
+#;(define (session:get-nth-char nth)
+  (substring session:valid-chars nth  (+ nth 1)))
+
+#;(define (session:get-rand-char)
+  (session:get-nth-char (random session:num-valid-chars)))
+
+#;(define (session:make-rand-string len)
+  (let loop ((res "")
+             (n   1))
+    (if (> n len) res
+        (loop (string-append res (session:get-rand-char))
+              (+ n 1)))))
+
+;; maybe replace above make-rand-string with this someday?
+;;
+#;(define (session:generic-make-rand-string len seed-string)
+  (let ((num-chars (string-length seed-string)))
+    (let loop ((res "")
+	       (n   1))
+      (let ((char-num (random num-chars)))
+	(if (> n len) res
+	    (loop (string-append res (substring seed-string char-num (+ char-num 1)))
+		  (+ n 1)))))))
+
+;; Rely on crypt egg's default settings being secure enough, accept
+;; backwards-compatible OpenSSL crypt passwords too.
+;;
+(define (s:crypt-passwd pw s)
+  (c:crypt pw (or s (c:crypt-gensalt))))
+
+(define (s:password-match? password crypted)
+  (let* ((salt (substring crypted 0 2))
+         (pcrypted (s:crypt-passwd password salt)))
+    ;; (s:log "INFO: pcrypted=" pcrypted " crypted=" crypted)
+    (and (string? password)
+         (string? pcrypted)
+         (string=? pcrypted crypted))))
+
+;; (read-line (open-input-pipe "echo foo | mkpasswd -S ab -s"))
+
+;; BUG: The regex implements a rule, but what rule? AH! usaztempe, get rid of this? No, this also looks for &key=value ...
+(define (s:validate-uri)
+  (let ((uri (get-environment-variable "REQUEST_URI"))
+	(qrs (get-environment-variable "QUERY_STRING")))
+    (if (not uri)
+	(set! uri qrs))
+    (if uri
+	(string-match 
+	 (regexp "^(/[a-z\\-\\._:0-9]*)*(|\\?([A-Za-z0-9_\\-\\+]+=[A-Za-z0-9_\\-\\.\\+]*&{0,1})*)$") uri)
+	(begin
+	  "REQUEST URI NOT AVAILABLE!"
+	  (let ((p (open-input-pipe "env")))
+	    (let loop ((l (read-line p))
+		       (res '()))
+	      (if (eof-object? l)
+		  res
+		  (loop (read-line p)(cons (list l "
    ") res)))))
+	  #t))))
+
+;; moved to misc-stml
+;;
+;; anything except a list is converted to a string!!!
+#;(define (s:any->string val)
+  (cond
+   ((string? val) val)
+   ((number? val) (number->string val))
+   ((symbol? val) (symbol->string val))
+   ((eq? val #f) "")
+   ((eq? val #t) "TRUE")
+   ((list? val) val)
+   (else 
+    (let ((ostr (open-output-string)))
+      (with-output-to-port ostr
+	(lambda ()
+	  (display val)))
+      (get-output-string ostr)))))
+
+#;(define (s:any->number val)
+  (cond
+   ((number? val)  val)
+   ((string? val)  (string->number val))
+   ((symbol? val)  (string->number (symbol->string val)))
+   (else     #f)))
+
+;; NB// this is *illegal* pgint
+(define (s:illegal-pgint val)
+  (cond
+   ((> val 2147483647) 1)
+   ((< val -2147483648) -1)
+   (else #f)))
+
+(define (s:any->pgint val)
+  (let ((n (s:any->number val)))
+    (if n
+	(if (s:illegal-pgint n)
+	    #f
+	    n)
+	n)))
+
+;; string is a string and non-zero length
+(define (misc:non-zero-string str)
+  (if (and (string? str)
+           (> (string-length str) 0))
+      str
+      #f))
+
+;;======================================================================
+;; html-filter
+;;======================================================================
+(define (s:split-string strng delim)
+  (if (eq? (string-length strng) 0) (list strng)
+      (let loop ((head (make-string 1 (car (string->list strng))))
+		 (tail (cdr (string->list strng)))
+		 (dest '())
+		 (temp ""))
+	(cond ((equal? head delim)
+	       (set! dest (append dest (list temp)))
+	       (set! temp ""))
+	      ((null? head) 
+	       (set! dest (append dest (list temp))))
+	      (else (set! temp (string-append temp head)))) ;; end if
+	(cond ((null? tail)
+	       (set! dest (append dest (list temp))) dest)
+	      (else (loop (make-string 1 (car tail)) (cdr tail) dest temp))))))
+
+;; allowed-tags is a list of tags as symbols:
+;;   '(a b center p a)
+;; parsing is simplistic and the response conservative
+;; if a < is found without the tag and closing > then
+;; the < or > is replaced with < or > without 
+;; even trying hard to figure out if there is a legit tag 
+;; buried in the text somewhere.
+;; a list of strings is returned.
+;;
+;; NOTES
+;; 1. case is important in the allowed-tags list!
+;; 2. only "solid" tags are supported i.e.  will not work?
+;;
+
+;; (s:cgi-out (eval (s:output (s:html-filter "hellogoodbye eh" '(a b i))))
+
+;; strategy
+;; 1. convert \n to 
+;; 2. Split on "<"
+;; 3. Split on ">"
+;; 4. Fix
+(define (s:html-filter input-text allowed-tags)
+  (let* ((toks   (s:str->toks input-text))
+	 (tmp    (s:toks->stml '(s:null) #f toks allowed-tags))
+	 (res    (car tmp))
+	 (nxttag (cadr tmp))
+	 (rem    (caddr tmp)))
+    res))
+
+(define (s:html-filter->string input-text allowed-tags)
+  (let ((ostr (open-output-string)))
+    ;;; (s:output-new ostr (s:html-filter input-text allowed-tags))
+    (s:output-new ostr (car (eval (s:html-filter input-text allowed-tags))))
+    (string-chomp (get-output-string ostr)))) ;; don't need the linefeed, could stop adding it ...
+	
+;;     (if (null? rem)
+;; 	res '())
+;; 	(s:toks->stml (if (list? res) res '()) #f rem allowed-tags))))
+
+(define (s:str->toks str)
+  (apply append (map (lambda (tok)
+		       (intersperse (s:split-string tok ">") ">")) 
+		     (intersperse (s:split-string str "<") "<"))))
+
+(define (s:tag->stml tag)
+  (string->symbol (string-append "s:" (symbol->string tag))))
+
+
+(define (s:toks->stml res tag rem allowed)
+  ;; (print "tag: " tag " rem: " rem)
+  (if (null? rem)
+      (list (append res (if tag
+			    (list (s:tag->stml tag))
+				'())) #f '() allowed) ;; the case of a lone tag 
+      ;; handle a starting tag
+      (let* ((tmp       (s:upto-tag rem allowed))
+	     (txt       (car tmp))      ;; this txt goes with tag!!!
+	     (nexttag   (cadr tmp))     ;; this is the NEXT DAMN tag!
+	     (begin-tag (caddr tmp))
+	     (newrem    (cadddr tmp)))
+	;; (print "txt:        " txt "\nnexttag:    " nexttag "\nbegin-tag:  " begin-tag "\nnewrem:     " newrem "\nres:        " res "\n")
+	(if begin-tag ;; nest the following stuff
+	    (let* ((childdat (s:toks->stml '() nexttag newrem allowed))
+		   (child    (car childdat))
+		   (newtag   (cadr childdat))
+		   (newrem2  (caddr childdat))
+		   (allowed  (cadddr childdat))) ;; ya, it shouldn't have changed
+	      (if tag 
+		  (s:toks->stml (append res (list (append (list (s:tag->stml tag)) child (list txt))))
+				newtag newrem2 allowed)
+		  (s:toks->stml (append res (list txt) child)
+				newtag newrem2 allowed)))
+	    ;; it must have been an end tag
+	    (list (append res (list 
+			       (if tag
+				   (list (s:tag->stml tag) txt)
+				   txt)))
+		  #f
+		  newrem
+		  allowed)))))
+
+
+;; "<" "b" ">"  => ""
+;; "<"
+;; (define (s:rebuild-tags input-list)
+
+;; ("blah blah" "<" "b" ">" "more stuff" "<" "i" ">" ) 
+;;     => ("blah blah" b #t ( "more stuff" "<" "i" ">" ))
+;; ("blah blah" "<" "/b" ">" "more stuff" "<" "i" ">" ) 
+;;     => ("blah blah" b #f ( "more stuff" "<" "i" ">" ))
+(define (s:upto-tag inlst allowed-tags)
+  (if (null? inlst) inlst
+      (let loop ((tok  (car inlst))
+		 (tail (cdr inlst))
+		 (prel "")) ;; create a string or a list of string parts?
+	(if (string=? tok "<") ;; might have a tag
+	    (if (> (length tail) 1) ;; to be a tag, need tag and closing ">"
+		(let ((tag (car tail))
+		      (end (cadr tail))
+		      (rem (cddr tail))) 
+		  (if (string=? end ">") ;; yep, it is probably a tag
+		      (let* ((trim-tag (if  (string=? "/" (substring tag 0 1))
+					    (substring tag 1 (string-length tag)) #f))
+			     (tag-sym  (string->symbol (if trim-tag trim-tag tag))))
+			(if (member tag-sym allowed-tags)
+			    ;; have a valid tag, rebuild it and return the result
+			    (list prel tag-sym (if trim-tag #f #t) rem)
+			    ;; not a valid tag, convert "<" and ">" and add all to prel
+			    (let ((newprel (string-append prel "<" tag ">")))
+			      (if (null? rem)(list newprel #f #f '()) ;; return newprel - add #f #f ???
+				  (loop (car rem)(cdr rem) newprel)))))
+		      ;; so, it wasn't a tag
+		      (let ((newprel (string-append prel "<" tag)))
+			(if (null? tail)
+			    (list newprel #f #f '())
+			    (loop (car rem)(cdr rem) newprel)))))
+		;; too short to be a tag
+		(list (apply string-append prel "<" tail) #f #f '()))
+	    (if (null? tail) 
+		;; we're done
+		(list (string-append prel tok) #f #f '())
+		(loop (car tail)(cdr tail)(string-append prel tok)))))))
+
+
+(define (s:divy-up-cgi-str instr)
+  (map (lambda (x) (string-split x "=")) (string-split instr "&")))
+
+(define (s:decode-str instr)
+  (let* ((abc (string-substitute "\\+" " " instr #t))
+	 (toks (s:split-string abc "%")))
+    (if (< (length toks) 2) abc
+	(let loop ((head (cadr toks))
+		   (tail (cddr toks))
+		   (result (car toks)))
+	  (if (string=? head "")
+	      (if (null? tail)
+		  result
+		  (loop (car tail)(cdr tail) result))
+	      (let* ((key (substring head 0 2))
+		     (rem (substring head 2 (string-length head)))
+		     (num (string->number key 16))
+		     (ch  (if (and (number? num)
+                                   (exact? num))
+			      (integer->char num)
+			      #f)) ;; this is an error. I will probably regret this some day
+		     (chstr  (if ch (make-string 1 ch) ""))
+		     (newres (if ch
+				 (string-append result chstr rem)
+				 (string-append result head))))
+		;; (print "head: " head " num: " num " ch: |" ch "| chstr: " chstr)
+		(if (null? tail)
+		    newres
+		    (loop (car tail)(cdr tail) newres))))))))
+
+;; probably a bug:
+;;
+;; (s:process-cgi-input "=bar")
+;; => ((bar ""))
+;;
+(define (s:process-cgi-input instr)
+  (map (lambda (xy)
+         (list (string->symbol (s:decode-str (car xy)))
+               (if (eq? (length xy) 1) 
+                   ""
+                   (s:decode-str (cadr xy)))))
+         (s:divy-up-cgi-str instr)))
+
+;; for testing -- deletme
+;; (define blah "post_title=%2B%2B%2B%2B%2B%2B%2B%2B%2B%2B%2Bhello-------------+++++++++++%26%26%26%26%26%26%26%26%26%40%40%40%40%40%40%40%40%40&post_body=%2B%2B%2B%2B%2B%2B%2B%2B%2B%2B%2Bhello-------------+++++++++++%26%26%26%26%26%26%26%26%26%40%40%40%40%40%40%40%40%40%0D%0A%0D%0A%2B%2B%2B%2B%2B%2B%2B%2B%2B%2B%2Bhello-------------+++++++++++%26%26%26%26%26%26%26%26%26%40%40%40%40%40%40%40%40%40%0D%0A%0D%0A%0D%0A%2B%2B%2B%2B%2B%2B%2B%2B%2B%2B%2Bhello-------------+++++++++++%26%26%26%26%26%26%26%26%26%40%40%40%40%40%40%40%40%40&new_post=Submit")
+;; (define blah2 "post_title=5%25&post_body=and+10%25&new_post=Submit")
+
+;;======================================================================
+;; formdat
+;;======================================================================
+
+(define formdat:*debug* #f)
+
+;; Old data format was something like this. BUT! 
+;; Forms do not have names so the hierarcy is
+;; unnecessary (I think)
+;;
+;; hashtable
+;;   |-formname -->  'form-name=formname
+;;   |                        'form-data=hashtable
+;;   |                                       | name => value
+;;
+;; New data format is only the  portion from above
+
+;; (define-class  ()
+;;    (form-data
+;;    ))
+(define (make-formdat:formdat)(vector (make-hash-table)))
+(define (formdat:formdat-get-data   vec)    (vector-ref  vec 0))
+(define (formdat:formdat-set-data!  vec val)(vector-set! vec 0 val))
+
+(define (formdat:initialize self)
+  (formdat:formdat-set-data! self (make-hash-table)))
+
+(define (formdat:get self key)
+  (hash-table-ref/default 
+   (formdat:formdat-get-data self)
+   (cond 
+    ((symbol? key) key)
+    ((string? key) (string->symbol key))
+    (else key))
+   #f))
+
+;; change to convert data to list and append val if already exists
+;; or is a list
+(define (formdat:set! self key val)
+  (let ((prev-val (formdat:get self key))
+        (ht       (formdat:formdat-get-data self)))
+    (if prev-val
+        (if (list? prev-val)
+            (hash-table-set! ht key (cons val prev-val))
+            (hash-table-set! ht key (list val prev-val)))
+        (hash-table-set! ht key val))
+    self))
+
+(define (formdat:keys self)
+  (hash-table-keys (formdat:formdat-get-data self)))
+
+(define (formdat:printall self printproc)
+  (printproc "formdat:printall " (formdat:keys self))
+  (for-each (lambda (k)
+	      (printproc k " => " (formdat:get self k)))
+	    (formdat:keys self)))
+
+(define (formdat:all->strings self)
+  (let ((res '()))
+    (for-each (lambda (k)
+                 (set! res (cons (conc k "=>" (formdat:get self k)) res)))
+              (formdat:keys self))
+        res))
+
+;; call with *one* of the lists in the list of lists created by CGI:url-unquote
+(define (formdat:load self formlist)
+  (let ((ht             (formdat:formdat-get-data self)))
+    (if (null? formlist) self ;; no values provided, return self for no good reason
+        (let loop ((head (car formlist))
+                   (tail (cdr formlist)))
+          (let ((key (car head))
+                (val (cdr head)))
+            ;; (err:log "key=" key " val=" val)
+	    (if (> (length val) 1)
+		(formdat:set! self key val)
+		(formdat:set! self key (car val)))
+            (if (null? tail) self   ;; we are done
+                (loop (car tail)(cdr tail))))))))
+
+;; get the header from datstr
+(define (formdat:read-header datstr) ;; datstr is an input string port
+  (let loop ((hs (read-line datstr))
+	     (header '()))
+    (if (or (eof-object? hs)
+	    (string=? hs ""))
+	header
+	(loop (read-line datstr)(append header (list hs))))))
+
+;; get the data up to the next key. if there is no key then return #f
+;; return (dat remdat)
+(define (formdat:read-dat dat key)
+  (let ((index (substring-index key dat))) ;; (string-search-positions key dat)))
+    (if (or (not index)
+	    (null? index)) ;; the key was not found
+	#f
+	(let* ((datstr (open-input-string dat))
+	       ;; (result (read-string (caar index) datstr))
+	       (result (read-string index datstr))
+	       (remdat (read-string #f datstr)))
+	  (close-input-port datstr)
+	  (list result remdat)))))
+
+ ;; inp is port to read data from, maxsize is max data allowed to read (total)
+(define (formdat:dat->list inp maxsize #!key (debug-port #f))
+  ;; read 1Meg chunks from the input port. If a block is not complete
+  ;; tack on the next 1Meg chunk as needed. Set up so the header is always
+  ;; at the beginning of the chunk
+  ;;-----------------------------29932024411502323332136214973
+  ;;Content-Disposition: form-data; name="input-picture"; filename="breadfruit.jpg"
+  ;;Content-Type: image/jpeg
+  (let loop ((dat (read-string 1000000 inp))
+	     (res '())
+	     (siz 0))
+    (if debug-port (format debug-port "dat: ~A\n" dat))
+    (if debug-port (format debug-port "eof: ~A\n" (eof-object? (read inp))))
+    
+    (if (> siz maxsize)
+	(begin
+	  (print "DATA TOO BIG")
+	  res)
+	(let* ((datstr (open-input-string dat))
+	       (header (formdat:read-header datstr))
+	       (key    (if (not (null? header))(car header) #f))
+	       (remdat (read-string #f datstr))          ;; used in next line, discard if got data, else revert to
+	       (alldat (if key (formdat:read-dat remdat key) #f))    ;; try to extract the data
+	       (thsdat (if alldat (car alldat)  #f))     ;; the data
+	       (newdat (if alldat (cadr alldat) #f))     ;; left over data, must process ...
+	       (thsres (list header thsdat))             ;; speculatively construct results
+	       (newres (append res (list thsres))))      ;; speculatively construct results
+	  (close-input-port datstr)
+	  (cond
+	   ;; either no header or single input
+	   ((and (not alldat)
+		 (or (null? header)
+		     (not (string-match formdat:delim-patt-rex (car header)))))
+	    ;; (print "Got here")
+	    (cons (list header "") res)) ;; note use header as dat and use "" as header????
+	   ;; didn't find end key in this block
+	   ((not alldat)
+	    (let ((mordat (read-string 1000000 inp)))
+	      (if (string=? mordat "") ;; there is no more data, discard results and use remdat as data, this input is broken
+		  (cons (list header remdat) res)
+		  (loop (string-append dat mordat) res (+ siz 2000000))))) ;; add the extra 1000000
+	   (alldat ;; got data, don't attempt to check if there is more, just loop and rely on (not alldat) to get more data
+	    (loop newdat newres (+ siz 1000000))))))))
+
+(define formdat:bin-data-disp-rex (regexp "^Content-Disposition:\\s+form-data;"))
+(define formdat:bin-data-name-rex (regexp "\\Wname=\"([^\"]+)\""))
+(define formdat:bin-file-name-rex (regexp "\\Wfilename=\"([^\"]+)\""))
+(define formdat:bin-file-type-rex (regexp "Content-Type:\\s+([^\\s]+)"))
+(define formdat:delim-patt-rex    (regexp "^\\-+[0-9]+\\-*$"))
+
+;; returns a hash with entries for all forms - could well use a proplist?
+(define (formdat:load-all)
+  (let ((request-method (get-environment-variable "REQUEST_METHOD")))
+    (if (and request-method
+	     (string=? request-method "POST"))
+	(formdat:load-all-port (current-input-port))
+	(make-formdat:formdat))))
+
+;; (s:process-cgi-input (caaar dat))
+(define (formdat:load-all-port inp)
+  (let* ((formdat        (make-formdat:formdat))
+	 (debugp         #f))
+			 ;; (open-output-file (conc "/tmp/delme-" (current-user-id) ".log"))))
+    ;; (write-string (read-string #f inp) #f debugp)  ;; destroys all data!
+    (formdat:initialize formdat)
+    (let ((alldats (formdat:dat->list inp 10e6 debug-port: debugp)))
+      
+      (if debugp (format debugp "formdat : alldats: ~A\n" alldats))
+
+      (let ((firstitem   (car alldats))
+	    (multipass #f)) 
+	(if (and (not (null? firstitem))
+		 (not (null? (car firstitem))))
+	    (if (string-match formdat:delim-patt-rex (caar firstitem))
+		(set! multipass #t)))
+	(if multipass
+	    ;; handle multi-part form
+	    (for-each (lambda (datlst)
+			(let* ((header (formdat:extract-header-info (car datlst)))
+			       (name   (if (assoc 'name header)
+					   (string->symbol (cadr (assoc 'name header)))
+					   "")) ;; grumble
+			       (fnamel  (assoc 'filename header))
+			       (content (assoc 'content header))
+			       (dat    (cadr datlst)))
+			  ;; (print "header: " header " name: " name " fnamel: " fnamel " content: " content) ;;  " dat: " (dat)
+			  (formdat:set! formdat 
+					name
+					(if fnamel 
+					    (list (cadr fnamel)
+						  (if content
+						      (cadr content)
+						      "unknown")
+						  (string->blob dat))
+					    dat))))
+		      alldats)
+	    ;; handle single part form
+	    ;; 	(if (and (string? name)
+	    ;; 		     (string=? name "")) ;; this is the short form input I guess
+	    ;; 		(let* ((datstr (caar datlst))
+	    ;; 		       (munged (s:process-cgi-input datstr)))
+	    ;; 		  (print "datstr: " datstr " munged: " munged)
+	    (if (and (not (null? alldats))
+		     (not (null? (car alldats)))
+		     (not (null? (caar alldats))))
+		(formdat:load formdat  (s:process-cgi-input (caaar alldats))))) ;; munged))
+	;;		    (format debugp "formdat : name: ~A content: ~A\n" name content)
+	(if debugp (close-output-port debugp))
+	;; (sdat-formdat-set! s:session formdat)
+	formdat))))
+		
+#|
+(define inp (open-input-file "tests/example.post.in"))
+(define dat (read-string #f inp))
+(define datstr (open-input-string dat))
+
+;; or
+
+(define inp (open-input-file "tests/example.post.binary.in"))
+(define dat (read-string #f inp))
+(define datstr (open-input-string dat))
+
+(formdat:read-header datstr)
+
+(define dat (formdat:dat->list inp 10e6))
+(close-input-port inp)
+|#
+  
+(define (formdat:extract-header-info header)
+  (if (null? header)
+      '()
+      (let loop ((hed (car header))
+		 (tal (cdr header))
+		 (res '()))
+	(if (string-match formdat:bin-data-disp-rex hed) ;; 
+	    (let* ((data-namem (string-match formdat:bin-data-name-rex hed))
+		   (file-namem (string-match formdat:bin-file-name-rex hed))
+		   (data-name  (if data-namem (cadr data-namem) #f))
+		   (this       (if file-namem
+				   (list (list 'name data-name)(list 'filename (cadr file-namem)))
+				   (list (list 'name data-name)))))
+	      (if (null? tal)
+		  (append res this)
+		  (loop (car tal)(cdr tal)(append res this))))
+	    (let ((content (string-match formdat:bin-file-type-rex hed))) ;; this is the stanza for the content type
+	      (if content
+		  (let ((newres (cons (list 'content (cadr content)) res)))
+		    (if (null? tal)
+			newres
+			(loop (car tal)(cdr tal) newres)))
+		  (if (null? tal)
+		      res
+		      (loop (car tal)(cdr tal) res)
+		      )))))))
+
+;;	      (let loop ((l       (read-line)) ;; (if (eq? mode 'norm)(read-line)(read-char)))
+;;			 (endline #f)
+;;			 (num     0))
+;;		;; (format debugp "~A\n" l)
+;;              (if (or (not (eof-object? l))
+;;		      (not (and (eq? mode 'bin)
+;;				(string=? l "")))) ;; if in bin mode empty string is end of file
+;;		  (case mode
+;;		    ((start)
+;;		     (set! mode 'norm)
+;;		     (if (string-match delim-patt-rex l)
+;;			 (begin
+;;			   (set! delim-string l)
+;;			   (set! delim-len    (string-length l))
+;;			   (loop (read-line) #f 0))
+;;			 (loop l #f 0)))
+;;		    ((norm)
+;;		     ;; I don't like how this gets checked on every single input. Must be a better way. FIXME
+;;		     (if (and (string-match bin-data-disp-rex l)
+;;			      (string-match bin-data-name-rex l)
+;;			      (string-match bin-file-name-rex l))
+;;			 (begin
+;;			   (set! data-name (cadr (string-match bin-data-name-rex l)))
+;;			   (set! file-name (cadr (string-match bin-file-name-rex l)))
+;;			   (set! mode 'content)
+;;			   (loop (read-line) #f num)))
+;;		     (let* ((dat  (s:process-cgi-input l))) ;; (CGI:url-unquote l))
+;;		       (format debugp "PROCESS-CGI-INPUT: ~A\n" (intersperse dat ","))
+;;		       (formdat:load formdat dat)
+;;		       (loop (read-line) #f num)))
+;;		    ((content)
+;;		     (if (string-match bin-file-type-rex l)
+;;			 (begin 
+;;			   (set! mode 'bin)
+;;			   (set! data-type (cadr (string-match bin-file-type-rex l)))
+;;			   (loop (read-string 1) #f num))))
+;;		    ((bin)
+;;		     ;; delim-string: \n"---------------12345"
+;;		     ;;                  012345678901234567890
+;;		     ;; endline:        "---------------12"
+;;		     ;; l = "3"
+;;		     ;; delim-len = 20
+;;		     ;; (substring  "---------------12345" 17 18) => "3"
+;;		     ;;
+;;		     (cond
+;;		       ;; haven't found the start of an endline, is the next char a newline?
+;;		      ((and (not endline)
+;;			    (string=? l "\n")) ;; required first character 
+;;		       (let ((newendline (open-output-string)))
+;;			 ;; (write-line l newendline) ;; discard the newline. add it back if don't have a lock on delim-string
+;;			 (loop (read-string 1) newendline (+ num 1))))
+;;		      ((not endline)
+;;		       (write-string l #f bin-dat)
+;;		       (loop (read-string 1) #f (+ num 1)))
+;;		      ;; string so far matches delim-string
+;;		      (endline
+;;		       (let* ((endstr (get-output-string endline))
+;;			      (endlen (string-length endstr)))
+;;			 (if (> endlen 0)
+;;			     (format debugp " delim: ~A\nendstr: ~A\n" delim-string endstr))
+;;			 (if (and (> delim-len endlen)
+;;				  (string=? l (substring delim-string endlen (+ endlen 1))))
+;;			     ;; yes, this character matches the next in the delim-string
+;;			     (if (eq? delim-len endlen) ;; have a match! Ignore that a newline is required. Lazy bugger.
+;;				 (let* ((fn      (string->symbol data-name)))
+;;				   (formdat:set! formdat fn (list file-name data-type (string->blob (get-output-string bin-dat))))
+;;				   (set! mode 'norm)
+;;				   (loop (read-line) #f 0))
+;;				 (begin
+;;				   (write-string l #f endline)
+;;				   (loop (read-string 1) endline (+ num 1))))
+;;			     ;; no, this character does NOT match the next in line in delim-string
+;;			     (begin
+;;			       (write-string "\n" #f bin-dat) ;; don't forget that newline we dropped
+;;			       (write-string endstr #f bin-dat)
+;;			       (write-string l #f bin-dat)
+;;			       (loop (read-string 1) #f (+ num 1))))))))
+;;		    )))))
+
+;;    (formdat:printall formdat (lambda (x)(write-line x debugp)))
+
+#|
+(define inp (open-input-file "/tmp/stmlrun/delme-33.log.keep-for-ref"))
+(define dat (read-string #f inp))
+(close-input-port inp)
+|#
+
+;;======================================================================
+;; use a table in your db called metadat to store key value pairs
+;;======================================================================
+
+
+(define (keystore:get db key)
+  (dbi:get-one db "SELECT value FROM metadata WHERE key=?;" key))
+
+(define (keystore:set! db key value)
+  (let ((curr-val (keystore:get db key)))
+    (if curr-val
+	(dbi:exec db "UPDATE metadata SET value=? WHERE key=?;" value key)
+	(dbi:exec db "INSERT INTO metadata (key,value) VALUES (?,?);" key value))))
+
+(define (keystore:del! db key)
+  (dbi:exec db "DELETE FROM metadata WHERE key=?;" key))
+
+;;======================================================================
+;; stuff from misc-stml.scm
+;;======================================================================
+
+;; moved to stmlcommon
+;; (bunch of stuff)
+
+;; moved from stmlcommon
+;;
+;; anything except a list is converted to a string!!!
+(define (s:any->string val)
+  (cond
+   ((string? val) val)
+   ((number? val) (number->string val))
+   ((symbol? val) (symbol->string val))
+   ((eq? val #f) "")
+   ((eq? val #t) "TRUE")
+   ((list? val) val)
+   (else 
+    (let ((ostr (open-output-string)))
+      (with-output-to-port ostr
+	(lambda ()
+	  (display val)))
+      (get-output-string ostr)))))
+
+(define (s:any->number val)
+  (cond
+   ((number? val)  val)
+   ((string? val)  (string->number val))
+   ((symbol? val)  (string->number (symbol->string val)))
+   (else     #f)))
+
+;; Moved from stmlcommon
+;;
+(define (s:cgi-out inlst)
+  (s:output-new (current-output-port) inlst))
+
+#;(define (s:output port inlst)
+  (map (lambda (x)
+	 (cond 
+	  ((string? x) (print x)) ;; (print x))
+	  ((symbol? x) (print x)) ;; (print x))
+	  ((list? x)   (s:output port x))
+	  (else ""
+	   ;; (print "ERROR: Bad input 02") ;; why do anything? don't output junk.
+	   )))
+       inlst))
+;  (if (> (length inlst) 2)
+;      (print)))
+
+(define (s:output-new port inlst)
+  (with-output-to-port port
+      (lambda ()
+	(map (lambda (x)
+	       (cond 
+		((string? x) (print x))
+		((symbol? x) (print x))
+		((list? x)   (s:output-new port x))
+		(else
+		 ;; (print "ERROR: Bad input 03")
+     )))
+	     inlst))))
+           
+(define (err:log . msg)
+  (with-output-to-port (current-error-port) ;; (slot-ref self 'logpt)
+    (lambda () 
+      (apply print msg))))
+
+;;======================================================================
+;; D B
+;;======================================================================
+
+;; convert values to appropriate strings
+;;
+(define (s:sqlparam-val->string val)
+  (cond
+   ((list?   val)(string-join (map symbol->string val) ",")) ;; (a b c) => a,b,c
+   ((string? val)(conc "'" (dbi:escape-string val) "'"))
+   ((number? val)(number->string val))
+   ((symbol? val)(dbi:escape-string (symbol->string val)))
+   ((boolean? val)
+    (if val "TRUE" "FALSE"))  ;; should this be "TRUE" or 1?
+                              ;; should this be "FALSE" or 0 or NULL?
+   (else
+    (err:log "sqlparam: unknown type for value: " val)
+    "")))
+
+;; (sqlparam "INSERT INTO foo(name,age) VALUES(?,?);" "bob" 20)
+;; NB// 1. values only!! 
+;;      2. terminating semicolon required (used as part of logic)
+;;
+;; a=? 1 (number) => a=1
+;; a=? 1 (string) => a='1'
+;; a=? #f         => a=FALSE 
+;; a=? a (symbol) => a=a 
+;;
+(define (s:sqlparam query . args)
+  (let* ((query-parts (string-split query "?"))
+         (num-parts    (length query-parts))
+         (num-args    (length args)))
+    (if (not (= (+ num-args 1) num-parts))
+        (err:log "ERROR, sqlparam: wrong number of arguments or missing semicolon, " num-args " for query " query)
+        (if (= num-args 0) query
+            (let loop ((section (car query-parts))
+                       (tail    (cdr query-parts))
+                       (result  "")
+                       (arg     (car args))
+                       (argtail (cdr args)))
+              (let* ((valstr    (s:sqlparam-val->string arg))
+                     (newresult (conc result section valstr)))
+                (if (null? argtail) ;; we are done
+                    (conc newresult (car tail))
+                    (loop
+                     (car tail)
+                     (cdr tail)
+                     newresult
+                     (car argtail)
+                     (cdr argtail)))))))))
+
+;; (define session:valid-chars "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789")
+(define session:valid-chars "abcdefghijklmnopqrstuvwxyz0123456789") ;; cookies are case insensitive.
+(define session:num-valid-chars (string-length session:valid-chars))
+
+(define (session:get-nth-char nth)
+  (substring session:valid-chars nth  (+ nth 1)))
+
+(define (session:get-rand-char)
+  (session:get-nth-char (random session:num-valid-chars)))
+
+(define (session:make-rand-string len)
+  (let loop ((res "")
+             (n   1))
+    (if (> n len) res
+        (loop (string-append res (session:get-rand-char))
+              (+ n 1)))))
+
+;; maybe replace above make-rand-string with this someday?
+;;
+(define (session:generic-make-rand-string len seed-string)
+  (let ((num-chars (string-length seed-string)))
+    (let loop ((res "")
+	       (n   1))
+      (let ((char-num (random num-chars)))
+	(if (> n len) res
+	    (loop (string-append res (substring seed-string char-num (+ char-num 1)))
+		  (+ n 1)))))))
+
+
+;;======================================================================
+;; P A R A M S
+;;======================================================================
+
+;; input: 'a ('a "val a" 'b "val b") => "val a"
+(define (s:find-param key param-lst)
+  (let loop ((head (car param-lst))
+	     (tail (cdr param-lst)))
+    (if (eq? head key)
+	(car tail)
+	(if (< (length tail) 2) #f
+	    (loop (cadr tail)(cddr tail))))))
+
+(define (s:param->string param)
+  (conc (symbol->string (car param)) "=" "\"" (cadr param) "\""))
+
+;; remove 'foo "bar" from ('foo "bar" 'bar "foo")
+(define (s:remove-param-matching params key)
+  (if (= (length params) 0)'() ;;  proper params list >= 2 items
+      (let loop ((head     (car params))
+                 (tail     (cdr params))
+                 (result   '()))
+        (if (symbol? head) ;; symbols have params
+            (let ((val     (car tail))
+                  (newtail (cdr tail)))
+              (if (eq? head key)  ;; get rid of this one
+                  (if (null? newtail) result
+                      (loop (car newtail)(cdr newtail) result))
+                  (let ((newresult (append result (list head val))))
+                    (if (null? newtail) newresult
+                        (loop (car newtail)(cdr newtail) newresult)))))
+            (let ((newresult (append result (list head))))
+              (if (null? tail) newresult
+                  (loop (car tail)(cdr tail) newresult)))))))
+
+(define (session:get-param-from params key)
+  (let ((r1 (regexp (conc "^" (s:any->string key) "=(.*)$"))))
+    (if (null? params) #f
+        (let loop ((head (car params))
+                   (tail (cdr params)))
+          (let ((match (string-match r1 head)))
+            (if match
+                (list-ref match 1)
+                (if (null? tail) #f
+                    (loop (car tail)(cdr tail)))))))))
+
+(define (s:process-params params)
+  (if (null? params) ""
+      (let loop ((res "")
+                 (head (car params))
+                 (tail (cdr params)))
+        (if (null? tail)
+            (conc res " " (s:param->string head))
+            (loop
+             (conc res " " (s:param->string head))
+             (car tail)
+             (cdr tail))))))
+
+;; remove key=var from (key=var key1=var1 key2=var2 ...)
+(define (k=v-params:remove-matching params key)
+  (if (= (length params) 0) params
+      (let ((r1 (regexp (conc "^" key "="))))
+        (let loop ((head (car params))
+                   (tail (cdr params))
+                   (result '()))
+          (if (string-match r1 head)
+              (if (null? tail) result
+                  (loop (car tail)(cdr tail) result))
+              (let ((newlst (cons head result)))
+                (if (null? tail) newlst
+                    (loop (car tail)(cdr tail) newlst))))))))
+
+;;======================================================================
+;; stuff pulled from session
+;;======================================================================
+
+
+;; sessions table
+;; id session_id session_key
+;; create table sessions (id serial not null,session-key text);
+
+;; session_vars table
+;; id session_id page_id key value
+;; create table session_vars (id serial not null,session_id integer,page text,key text,value text);
+
+;; TODO
+;;  Concept of order num incremented with each page access
+;;     if a branch is taken then a new session would need to be created
+;;
+
+;; make-vector-record session session dbtype dbinit conn params path-params session-key session-id domain toppage page curr-page content-type page-type sroot twikidir pagedat alt-page-dat pagevars pagevars-before sessionvars sessionvars-before globalvars globalvars-before logpt formdat request-method session-cookie curr-err log-port logfile seen-pages page-dir-style debugmode
+;; (define (make-sdat)(make-vector 36))
+;; (define (sdat-dbtype               vec)    (vector-ref  vec 0))
+;; (define (sdat-dbinit               vec)    (vector-ref  vec 1))
+;; (define (sdat-conn                 vec)    (vector-ref  vec 2))
+;; (define (sdat-pgconn               vec)    (vector-ref (vector-ref vec 2) 1))
+;; (define (sdat-params               vec)    (vector-ref  vec 3))
+;; (define (sdat-path-params          vec)    (vector-ref  vec 4))
+;; (define (sdat-session-key          vec)    (vector-ref  vec 5))
+;; (define (sdat-session-id           vec)    (vector-ref  vec 6))
+;; (define (sdat-domain               vec)    (vector-ref  vec 7))
+;; (define (sdat-toppage              vec)    (vector-ref  vec 8))
+;; (define (sdat-page                 vec)    (vector-ref  vec 9))
+;; (define (sdat-curr-page            vec)    (vector-ref  vec 10))
+;; (define (sdat-content-type         vec)    (vector-ref  vec 11))
+;; (define (sdat-page-type            vec)    (vector-ref  vec 12))
+;; (define (sdat-sroot                vec)    (vector-ref  vec 13))
+;; (define (sdat-twikidir             vec)    (vector-ref  vec 14))
+;; (define (sdat-pagedat              vec)    (vector-ref  vec 15))
+;; (define (sdat-alt-page-dat         vec)    (vector-ref  vec 16))
+;; (define (sdat-pagevars             vec)    (vector-ref  vec 17))
+;; (define (sdat-pagevars-before      vec)    (vector-ref  vec 18))
+;; (define (sdat-sessionvars          vec)    (vector-ref  vec 19))
+;; (define (sdat-sessionvars-before   vec)    (vector-ref  vec 20))
+;; (define (sdat-globalvars           vec)    (vector-ref  vec 21))
+;; (define (sdat-globalvars-before    vec)    (vector-ref  vec 22))
+;; (define (sdat-logpt                vec)    (vector-ref  vec 23))
+;; (define (sdat-formdat              vec)    (vector-ref  vec 24))
+;; (define (sdat-request-method       vec)    (vector-ref  vec 25))
+;; (define (sdat-session-cookie       vec)    (vector-ref  vec 26))
+;; (define (sdat-curr-err             vec)    (vector-ref  vec 27))
+;; (define (sdat-log-port             vec)    (vector-ref  vec 28))
+;; (define (sdat-logfile              vec)    (vector-ref  vec 29))
+;; (define (sdat-seen-pages           vec)    (vector-ref  vec 30))
+;; (define (sdat-page-dir-style       vec)    (vector-ref  vec 31))
+;; (define (sdat-debugmode            vec)    (vector-ref  vec 32))
+;; (define (sdat-shared-hash          vec)    (vector-ref  vec 33))
+;; (define (sdat-script               vec)    (vector-ref  vec 34))
+;; (define (sdat-force-ssl            vec)    (vector-ref  vec 35))
+;; 
+;; (define (session:get-shared vec varname)
+;;   (hash-table-ref/default (vector-ref vec 33) varname #f))
+;; 
+;; (define (sdat-dbtype-set!              vec val)(vector-set! vec 0 val))
+;; (define (sdat-dbinit-set!              vec val)(vector-set! vec 1 val))
+;; (define (sdat-conn-set!                vec val)(vector-set! vec 2 val))
+;; (define (sdat-params-set!              vec val)(vector-set! vec 3 val))
+;; (define (sdat-path-set-params!         vec val)(vector-set! vec 4 val))
+;; (define (sdat-session-set-key!         vec val)(vector-set! vec 5 val))
+;; (define (sdat-session-set-id!          vec val)(vector-set! vec 6 val))
+;; (define (sdat-domain-set!              vec val)(vector-set! vec 7 val))
+;; (define (sdat-toppage-set!             vec val)(vector-set! vec 8 val))
+;; (define (sdat-page-set!                vec val)(vector-set! vec 9 val))
+;; (define (sdat-curr-set-page!           vec val)(vector-set! vec 10 val))
+;; (define (sdat-content-set-type!        vec val)(vector-set! vec 11 val))
+;; (define (sdat-page-set-type!           vec val)(vector-set! vec 12 val))
+;; (define (sdat-sroot-set!               vec val)(vector-set! vec 13 val))
+;; (define (sdat-twikidir-set!            vec val)(vector-set! vec 14 val))
+;; (define (sdat-pagedat-set!             vec val)(vector-set! vec 15 val))
+;; (define (sdat-alt-set-page-dat!        vec val)(vector-set! vec 16 val))
+;; (define (sdat-pagevars-set!            vec val)(vector-set! vec 17 val))
+;; (define (sdat-pagevars-set-before!     vec val)(vector-set! vec 18 val))
+;; (define (sdat-sessionvars-set!         vec val)(vector-set! vec 19 val))
+;; (define (sdat-sessionvars-set-before!  vec val)(vector-set! vec 20 val))
+;; (define (sdat-globalvars-set!          vec val)(vector-set! vec 21 val))
+;; (define (sdat-globalvars-set-before!   vec val)(vector-set! vec 22 val))
+;; (define (sdat-logpt-set!               vec val)(vector-set! vec 23 val))
+;; (define (sdat-formdat-set!             vec val)(vector-set! vec 24 val))
+;; (define (sdat-request-set-method!      vec val)(vector-set! vec 25 val))
+;; (define (sdat-session-set-cookie!      vec val)(vector-set! vec 26 val))
+;; (define (sdat-curr-set-err!            vec val)(vector-set! vec 27 val))
+;; (define (sdat-log-set-port!            vec val)(vector-set! vec 28 val))
+;; (define (sdat-logfile-set!             vec val)(vector-set! vec 29 val))
+;; (define (sdat-seen-set-pages!          vec val)(vector-set! vec 30 val))
+;; (define (sdat-page-set-dir-style!      vec val)(vector-set! vec 31 val))
+;; (define (sdat-debugmode-set!           vec val)(vector-set! vec 32 val))
+;; (define (sdat-shared-set-hash!         vec val)(vector-set! vec 33 val))
+;; (define (sdat-script-set!              vec val)(vector-set! vec 34 val))
+;; (define (sdat-force-set-ssl!           vec val)(vector-set! vec 35 val))
+;; 
+;; (define (session:set-shared! vec varname val)
+;;   (hash-table-set! (vector-ref vec 33) varname val))
+
+;; The global session
+(define s:session (make-sdat))
+
+;; SPLIT INTO STRAIGHT FORWARD INIT AND COMPLEX INIT
+#;(define (session:initialize self #!optional (configf #f))
+  (sdat-dbtype-set! self      'pg)
+  (sdat-page-set! self        "home")        ;; these are defaults
+  (sdat-curr-set-page! self   "home")
+  (sdat-content-set-type! self "Content-type: text/html; charset=iso-8859-1\n\n")
+  (sdat-page-set-type! self   'html)
+  (sdat-toppage-set! self     "index")
+  (sdat-params-set! self      '())           ;;
+  (sdat-path-set-params! self '())
+  (sdat-session-set-key! self #f)
+  (sdat-pagedat-set! self     '())
+  (sdat-alt-set-page-dat! self #f)
+  (sdat-sroot-set! self       "./")
+  (sdat-session-set-cookie! self #f)
+  (sdat-curr-set-err! self #f)
+  (sdat-log-set-port! self (current-error-port))
+  (sdat-seen-set-pages! self '())
+  (sdat-page-set-dir-style! self #t) ;; #t : pages/_(view|cntl).scm
+                                      ;; #f : pages//(view|control).scm 
+  (sdat-debugmode-set!          self #f)
+  			     
+  (sdat-pagevars-set!           self (make-hash-table))
+  (sdat-sessionvars-set!        self (make-hash-table))
+  (sdat-globalvars-set!         self (make-hash-table))
+  (sdat-pagevars-set-before!    self (make-hash-table))
+  (sdat-sessionvars-set-before! self (make-hash-table))
+  (sdat-globalvars-set-before!  self (make-hash-table))
+  (sdat-domain-set!             self "locahost")   ;; end of defaults
+  (sdat-script-set!             self #f)
+  (sdat-force-set-ssl!          self #f)
+  (let* ((rawconfigdat (session:read-config self configf))
+	 (configdat (if rawconfigdat (eval rawconfigdat) '()))
+	 (sroot     (s:find-param 'sroot    configdat))
+	 (logfile   (s:find-param 'logfile  configdat))
+	 (dbtype    (s:find-param 'dbtype   configdat))
+	 (dbinit    (s:find-param 'dbinit   configdat))
+	 (domain    (s:find-param 'domain   configdat))
+	 (twikidir  (s:find-param 'twikidir configdat))
+	 (page-dir  (s:find-param 'page-dir-style configdat))
+	 (debugmode (s:find-param 'debugmode configdat))
+         (script    (s:find-param 'script    configdat))
+	 (force-ssl (s:find-param 'force-ssl configdat)))
+    (if sroot    (sdat-sroot-set!    self sroot))
+    (if logfile  (sdat-logfile-set!  self logfile))
+    (if dbtype   (sdat-dbtype-set!   self dbtype))
+    (if dbinit   (sdat-dbinit-set!   self dbinit))
+    (if domain   (sdat-domain-set!   self domain))
+    (if twikidir (sdat-twikidir-set! self twikidir))
+    (if debugmode (sdat-debugmode-set! self debugmode))
+    (if script    (sdat-script-set!    self script))
+    (if force-ssl (sdat-force-set-ssl! self force-ssl))
+    (sdat-page-set-dir-style! self page-dir)
+    ;; (print "configdat: ")(pp configdat)
+    (if debugmode
+	(session:log self "sroot: " sroot " logfile: " logfile " dbtype: " dbtype 
+		     " dbinit: " dbinit " domain: " domain " page-dir-style: " page-dir))
+    )
+  (sdat-shared-set-hash! self (make-hash-table))
+  )
+
+;; Used for the strangely inconsistent handling of the config file. A better way is needed.
+;;
+;;   (let ((dbtype (sdat-dbtype self)))
+;;     (print "dbtype: " dbtype)
+;;     (sdat-dbtype-set! self (eval dbtype))))
+
+(define (session:setup self #!optional (configf #f))
+  (session:initialize self configf)
+  (let ((dbtype    (sdat-dbtype self))
+	(debugmode (sdat-debug-mode self))
+	(dbinit    (eval (sdat-dbinit self)))
+	(dbexists  #f))
+    (let ((dbfname (alist-ref 'dbname dbinit)))
+      (if debugmode (session:log self "session:setup dbfname=" dbfname ", dbtype=" dbtype ", dbinit=" dbinit))
+      (if (eq? dbtype 'sqlite3)
+	  ;; The 'auto method will distribute dbs across the disk using hash
+	  ;; of user host and user. TODO
+	  ;; (if (eq? dbfname 'auto) ;; This is the auto assignment of a db based on hash of IP
+	  (let ((dbpath (pathname-directory dbfname)))  ;; do a couple sanity checks here to make setting up easier
+	    (if debugmode (session:log self "INFO: setting up for sqlite3 db access to " dbfname))
+	    (if (not (file-write-access? dbpath))
+		(session:log self "WARNING: Cannot write to " dbpath)
+		(if debugmode (session:log self "INFO: " dbpath " is writeable")))
+	    (if (file-exists? dbfname)
+		(begin
+		  ;; (session:log self "setting dbexists to #t")
+		  (set! dbexists #t))))
+	  (if debugmode (session:log self "INFO: setting up for pg db access to account info " dbinit)))
+      (if debugmode (session:log self "dbtype: " dbtype " dbfname: " dbfname " dbexists: " dbexists)))
+    (sdat-conn-set! self (dbi:open dbtype dbinit))
+    (set! *db* (sdat-conn self))
+    (if (and (not dbexists)(eq? dbtype 'sqlite3))
+ 	(begin
+	  (print "WARNING: Setting up session db with sqlite3")
+	  (session:setup-db self)))
+    (session:process-url-path self)
+    (session:setup-session-key self)
+    ;; capture stdin if this is a POST
+    (sdat-request-method-set! self (get-environment-variable "REQUEST_METHOD"))
+    (sdat-formdat-set! self (formdat:load-all))))
+
+;; setup the db with session tables, works for sqlite only right now
+(define (session:setup-db self)
+  (let ((conn (sdat-conn self)))
+    (for-each 
+     (lambda (stmt)
+       (dbi:exec conn stmt))
+     (list "CREATE TABLE session_vars (id INTEGER PRIMARY KEY,session_id INTEGER,page TEXT,key TEXT,value TEXT);"
+	   "CREATE TABLE sessions (id INTEGER PRIMARY KEY,session_key TEXT,last_used TIMESTAMP);"
+           "CREATE TABLE metadata (id INTEGER PRIMARY KEY,key TEXT,value TEXT);"))))
+;;  ;; if we have a session_key look up the session-id and store it
+;;  (sdat-session-set-id! self (session:get-id self)))
+
+;; only set session-cookie when a new session is created
+(define (session:setup-session-key self)  
+  (let* ((sk  (session:extract-session-key self))
+         (sid (if sk (session:get-id self sk) #f)))
+    (if (not sid) ;; need a new key
+        (let* ((new-key (session:get-new-key self))
+               (new-sid (session:get-id self new-key)))
+          (sdat-session-key-set! self new-key)
+          (sdat-session-id-set! self new-sid)
+          (sdat-session-cookie-set! self (session:make-cookie self)))
+        (sdat-session-id-set! self sid))))
+
+(define (session:make-cookie self)
+  ;; (list (conc "session_key=" (sdat-session-key self) "; Path=/; Domain=." (sdat-domain self) "; Max-Age=" (* 86400 14) "; Version=1"))) 
+  ;; According to 
+  ;;    http://www.codemarvels.com/2010/11/apache-rewriterule-set-a-cookie-on-localhost/
+
+  ;;  Here are the 2 (often left out) requirements to set a cookie using
+  ;;  httpd-F�s rewrite rule (mod_rewrite), while working on localhost:-A
+  ;;
+  ;;  Use the IP 127.0.0.1 instead of localhost/machine-name as the
+  ;;  domain; e.g. [CO=someCookie:someValue:127.0.0.1:2:/], which says
+  ;;  create a cookie -Y�someCookie� with value �someValue� for the
+  ;;  domain �127.0.0.1$B!m(B having a life time of 2 mins, for any path in
+  ;;  the domain (path=/). (Obviously you will have to run the
+  ;;  application with this value in the URL)
+  ;;
+  ;;  To make a session cookie, limit the flag statement to just three
+  ;;  attributes: name, value and domain. e.g
+  ;;  [CO=someCookie:someValue:127.0.0.1] %G–%@ Any further
+  ;;  settings, apache writes an� expires� attribute for the set-cookie
+  ;;  header, which makes the cookie a persistent one (not really
+  ;;  persistent, as the expires value set is the current server time
+  ;;  %G–%@ so you don-F-F�t even get to see your cookie!)-A
+  (list (string-substitute 
+	 ";" "; " 
+	 (car (construct-cookie-string 
+	       ;; warning! messing up this itty bitty bit of code will cost much time!
+	       `(("session_key" ,(sdat-session-key self)
+		  expires: ,(+ (current-seconds) (* 14 86400)) 
+		  ;; max-age: (* 14 86400)
+		  path: "/" ;; 
+		  domain: ,(string-append "." (sdat-domain self))
+		  version: 1)) 0)))))
+
+;; look up a given session key and return the id if found, #f if not found
+(define (session:get-id self session-key)
+  ;; (let ((session-key (sdat-session-key self)))
+  (if session-key
+      (let ((query (string-append "SELECT id FROM sessions WHERE session_key='" session-key "'"))
+            (conn (sdat-conn self))
+            (result #f))
+	(dbi:for-each-row 
+	 (lambda (tuple)
+	   (set! result (vector-ref tuple 0)))
+	 conn query)
+	(if result (dbi:exec conn (conc "UPDATE sessions SET last_used=" (dbi:now conn) " WHERE session_key=?;") session-key))
+        result)
+      #f))
+
+;; 
+(define (session:process-url-path self)
+  (let ((path-info    (get-environment-variable "PATH_INFO"))
+	(query-string (get-environment-variable "QUERY_STRING")))
+    ;; (session:log self "path-info=" path-info " query-string=" query-string)
+    (if path-info
+	(let* ((parts    (string-split path-info "/"))
+	       (numparts (length parts)))
+	  (if (> numparts 0)
+	      (sdat-page-set! self (car parts)))
+	  ;; (session:log self "url-path=" url-path " parts=" parts)
+	  (if (> numparts 1)
+	      (sdat-path-params-set! self (cdr parts)))
+          (if query-string
+              (sdat-params-set! self (string-split query-string "&")))))))
+
+;; BUGGY!
+(define (session:get-new-key self)
+  (let ((conn   (sdat-conn self))
+        (tmpkey (session:make-rand-string 20))
+        (status #f))
+    (dbi:for-each-row (lambda (tuple)
+			(set! status #t))
+		      conn (string-append "INSERT INTO sessions (session_key) VALUES ('" tmpkey "')"))
+    tmpkey))
+
+;; returns session key IFF it is in the HTTP_COOKIE 
+(define (session:extract-session-key self)
+  (let ((http-cookie (get-environment-variable "HTTP_COOKIE")))
+    ;; (err:log "http-cookie: " http-cookie)
+    (if http-cookie
+        (session:extract-key-from-param self (string-split-fields  ";\\s+" http-cookie infix:) "session_key")
+        #f)))
+
+(define (session:get-session-id self session-key)
+  (let ((query "SELECT id FROM sessions WHERE session_key=?;")
+        (result #f))
+    ;;     (pg:query-for-each (lambda (tuple)
+    ;;                          (set! result (vector-ref tuple 0))) ;; (vector-ref tuple 0)))
+    ;;                        (s:sqlparam query session-key)
+    ;;                        (sdat-conn self))
+    ;;                        conn)
+    (dbi:for-each-row (lambda (tuple)
+			(set! result (vector-ref tuple 0))) ;; (vector-ref tuple 0)))
+		      (sdat-conn self)
+		      (s:sqlparam query session-key))
+    result))
+
+;; delete all records for a session
+;; 
+;; NEEDS TO BE TRANSACTIONIZED!
+;;
+(define (session:delete-session self session-key)
+  (let ((session-id (session:get-session-id self session-key))
+        (qry1        ;; (conc "BEGIN;"
+			  "DELETE FROM session_vars WHERE session_id=?;")
+	(qry2             "DELETE FROM sessions WHERE id=?;")
+		     ;;  "COMMIT;"))
+        (conn              (sdat-conn self)))
+    (if session-id
+        (begin
+          (dbi:exec conn qry1 session-id) ;; session-id)
+	  (dbi:exec conn qry2 session-id)
+	  ;; (session:initialize self)
+	  (session:setup self)))
+    (not (session:get-session-id self session-key))))
+
+;; (define (session:delete-session self session-key)
+;;   (let ((session-id (session:get-session-id self session-key))
+;;         (queries    (list "BEGIN;"
+;; 			  "DELETE FROM session_vars WHERE session_id=?;"
+;;                           "DELETE FROM sessions WHERE id=?;"
+;; 			  "COMMIT;"))
+;;         (conn              (sdat-conn self)))
+;;     (if session-id
+;;         (begin
+;;           (for-each
+;;            (lambda (query)
+;;              (dbi:exec conn query session-id))
+;; 	   queries)
+;; 	  (initialize self '())
+;; 	  (session:setup self)))
+;;     (not (session:get-session-id self session-key))))
+
+(define (session:extract-key self key)
+  (let ((params (sdat-params self)))
+    (session:extract-key-from-param self params key)))
+
+(define (session:extract-key-from-param self params key)
+  (let ((r1     (regexp (string-append "^" key "=([^=]+)$"))))
+    (err:log "INFO: Looking for " key " in " params)
+    (if (< (length params) 1) #f
+	(let loop ((head   (car params))
+		   (tail   (cdr params)))
+	  (let ((match (string-match r1 head)))
+	    (cond
+	     (match
+	      (let ((session-key (list-ref match 1)))
+		(err:log "INFO: Found session key=" session-key)
+		(sdat-session-key-set! self (list-ref match 1))
+		session-key))
+	     ((null? tail)
+	      #f)
+	     (else
+	      (loop (car tail)
+		    (cdr tail)))))))))
+
+(define (session:set-page! self page_name)
+  (sdat-page-set! self page_name))
+
+(define (session:close self)
+  (dbi:close (sdat-conn self)))
+;; (close-output-port (sdat-logpt self))
+
+(define (session:err-msg self msg)
+  (hash-table-set! (sdat-sessionvars self) "ERROR_MSG"
+		   (string-intersperse (map s:any->string msg) " ")))
+
+(define (session:prev-err self)
+  (let ((prev-err (hash-table-ref/default (sdat-sessionvars-before self) "ERROR_MSG" #f))
+	(curr-err (hash-table-ref/default (sdat-sessionvars self) "ERROR_MSG" #f)))
+    (if prev-err prev-err
+	(if curr-err curr-err #f))))
+
+;; session vars
+;; 1. keys are always a string NOT a symbol
+;; 2. values are always a string conversion is the responsibility of the 
+;;    consuming function (at least for now, I'd like to change this)
+
+;; set a session var for the current page
+;;
+(define (session:curr-page-set! self key value)
+  (hash-table-set! (sdat-pagevars self) (s:any->string key) (s:any->string value)))
+
+;; del a var for the current page
+;;
+(define (session:page-var-del! self key)
+  (hash-table-delete! (sdat-pagevars self) (s:any->string key)))
+
+;; get the appropriate hash given a page "*sessionvars*, *globalvars* or page
+;;
+(define (session:get-page-hash self page)
+  (if (string=? page "*sessionvars*")
+      (sdat-sessionvars self)
+      (if (string=? page "*globalvars*")
+	  (sdat-globalvars self)
+	  (sdat-pagevars self))))
+
+;; set a session var for a given page
+;;
+(define (session:set! self page key value)
+  (let ((ht (session:get-page-hash self page)))
+    (hash-table-set! ht (s:any->string key) (s:any->string value))))
+
+;; get session vars for the current page
+;;
+(define (session:page-get self key)
+  (hash-table-ref/default (sdat-pagevars self) key #f))
+
+;; get session vars for a specified page
+;;
+(define (session:get self page key params)
+  (let* ((ht  (session:get-page-hash self page))
+	 (res (hash-table-ref/default ht (s:any->string key) #f)))
+    (session:apply-type-preference res params)))
+
+;; delete a session var for a specified page
+;;
+(define (session:del! self page key)
+  (let ((ht (session:get-page-hash self page)))
+    (hash-table-delete! ht (s:any->string key))))
+
+;; get ALL keys for this page and store in the session pagevars hash
+;;
+(define (session:get-vars self)
+  (let ((session-id  (sdat-session-id self)))
+    (if (not session-id)
+	(err:log "ERROR: No session id in session object! session:get-vars")
+	(let* ((result             #f)
+	       (conn               (sdat-conn self))
+	       (pagevars-before    (sdat-pagevars-before self))
+	       (sessionvars-before (sdat-sessionvars-before self))
+	       (globalvars-before  (sdat-globalvars-before self))
+	       (pagevars           (sdat-pagevars self))
+	       (sessionvars        (sdat-sessionvars self))
+	       (globalvars         (sdat-globalvars self))
+	       (page-name          (sdat-page self))
+	       (session-key        (sdat-session-key self))
+	       (query              (string-append
+				    "SELECT key,value FROM session_vars INNER JOIN sessions ON session_vars.session_id=sessions.id "
+				    "WHERE session_key=? AND page=?;")))
+	  ;; first the page specific vars
+	  (dbi:for-each-row (lambda (tuple)
+			      (let ((k (vector-ref tuple 0))
+				    (v (vector-ref tuple 1)))
+				(hash-table-set! pagevars-before k v)
+				(hash-table-set! pagevars        k v)))
+			    conn
+			    (s:sqlparam query session-key page-name))
+	  ;; then the session specific vars
+	  (dbi:for-each-row (lambda (tuple)
+			      (let ((k (vector-ref tuple 0))
+				    (v (vector-ref tuple 1)))
+				(hash-table-set! sessionvars-before k v)
+				(hash-table-set! sessionvars        k v)))
+			    conn
+			    (s:sqlparam query session-key "*sessionvars*"))
+	  ;; and finally the global vars
+	  (dbi:for-each-row (lambda (tuple)
+			      (let ((k (vector-ref tuple 0))
+				    (v (vector-ref tuple 1)))
+				(hash-table-set! globalvars-before k v)
+				(hash-table-set! globalvars        k v)))
+			    conn
+			    (s:sqlparam query session-key "*globalvars"))
+	  ))))
+
+(define (session:save-vars self)
+  (let ((session-id  (sdat-session-id self)))
+    (if (not session-id)
+	(err:log "ERROR: No session id in session object! session:get-vars")
+	(let* ((status      #f)
+	       (conn        (sdat-conn self))
+	       (page-name   (sdat-page self))
+	       (del-query   "DELETE FROM session_vars WHERE session_id=? AND page=? AND key=?;")
+	       (ins-query   "INSERT INTO session_vars (session_id,page,key,value) VALUES(?,?,?,?);")
+	       (upd-query   "UPDATE session_vars set value=? WHERE key=? AND session_id=? AND page=?;")
+	       (changed-count 0))
+	  ;; save the delta only
+	  (for-each
+	   (lambda (page) ;; page is: "*globalvars*" "*sessionvars*" or otherstring
+	     (let* ((before-after-ht (cond
+				      ((string=? page "*sessionvars*")
+				       (vector (sdat-sessionvars self)
+					       (sdat-sessionvars-before self)))
+				       ((string=? page "*globalvars*")
+					(vector (sdat-globalvars self)
+						(sdat-globalvars-before self)))
+				       (else 
+					(vector (sdat-pagevars self)
+						(sdat-pagevars-before self)))))
+		    (master-ht   (vector-ref before-after-ht 0))
+		    (before-ht   (vector-ref before-after-ht 1))
+		    (master-keys (hash-table-keys master-ht))
+		    (before-keys (hash-table-keys before-ht))
+		    (all-keys (delete-duplicates (append master-keys before-keys))))
+	       (for-each 
+		(lambda (key)
+		  (let ((master-value (hash-table-ref/default master-ht key #f))
+			(before-value (hash-table-ref/default before-ht key #f)))
+		    (cond
+		     ;; before and after exist and value unchanged - do nothing
+		     ((and master-value before-value (equal? master-value before-value)))
+		     ;; before and after exist but are changed
+		     ((and master-value before-value)
+		      (dbi:for-each-row (lambda (tuple)
+					  (set! changed-count (+ changed-count 1)))
+					conn
+					(s:sqlparam upd-query master-value key session-id page)))
+		     ;; master-value no longer exists (i.e. #f) - remove item
+		     ((not master-value)
+		      (dbi:for-each-row (lambda (tuple)
+					  (set! changed-count (+ changed-count 1)))
+					conn
+					(s:sqlparam del-query session-id page key)))
+		     ;; before-value doesn't exist - insert a new value
+		     ((not before-value)
+		      (dbi:for-each-row (lambda (tuple)
+					  (set! changed-count (+ changed-count 1)))
+					conn
+					(s:sqlparam ins-query session-id page key master-value)))
+		     (else (err:log "Shouldn't get here")))))
+		all-keys))) ;; process all keys
+	   (list "*sessionvars*" "*globalvars*" page-name))))))
+
+;; (pg:sql-null-object? element)
+(define (session:read-config self #!optional (fname #f))
+  (let* ((cgi-path (pathname-directory (car (argv))))
+         (name     (or fname (string-append (if cgi-path (conc cgi-path "/") "") "." (pathname-file (car (argv))) ".config"))))
+    (if (not (file-exists? name))
+	(print name " not found at " (current-directory))
+	(let* ((fp (open-input-file name))
+	       (initargs (read fp)))
+	  (close-input-port fp)
+	  initargs))))
+
+;; call the controller if it exists
+;; 
+;; WARNING - this code needs a defense agains recursive calling!!!!!
+;;
+;;   I suggest a limit of 100 calls. Plenty for allowing multiple instances
+;;   of a page inside another page. 
+;;
+;; parts = 'both | 'control | 'view
+;;
+
+(define (files-read->string . files)
+  (string-intersperse 
+   (apply append (map file-read->string files)) "\n"))
+
+(define (file-read->string f) 
+  (let ((p (open-input-file f)))
+    (let loop ((hed (read-line p))
+	       (res '()))
+      (if (eof-object? hed)
+	  res
+	  (loop (read-line p)(append res (list hed)))))))
+
+(define (process-port p)
+  (let ((e (interaction-environment)))
+    (map 
+     (lambda (x)
+       (cond
+	((list? x) x)
+	((string? x) x)
+	(else '())))
+     (port-map (lambda (s)
+		 (eval s e))
+	       (lambda ()(read p))))))
+
+(define (session:process-file f)
+  (let* ((p    (open-input-file f))
+	 (dat  (process-port p)))
+    (close-input-port p)
+    dat))
+
+;; May 2011, putting all pages into one directory for the following reasons:
+;;   1. want filename to reflect page name (emacs limitation)
+;;   2. that's it! no other reason. could make it configurable ...
+;; page-dir-style is:
+;;  'stored   => stored in executable
+;;  'flat     => pages flat directory
+;;  'dir      => directory tree pages//{view,control}.scm
+;; parts:
+;;  'both     => load control and view (anything other than view or control and the default)
+;;  'view     => load view only
+;;  'control  => load control only
+(define (session:call-parts self page #!key (parts 'both))
+  (sdat-curr-page-set! self page)
+  (let* ((dir-style    (sdat-page-dir-style self));; (equal? (sdat-page-dir-style self) "onedir")) ;; flag #t for onedir, #f for old style
+	 (dir          (string-append (sdat-sroot self) 
+				      (if dir-style 
+					  (conc "/pages/")
+					  (conc "/pages/" page)))))
+    (case dir-style
+      ;; NB// Stored always loads both control and view
+      ((stored)
+       ((eval (string->symbol (conc "pages:" page))) 
+	self                         ;; the session
+	(sdat-conn self)         ;; the db connection
+	(sdat-shared-hash self)  ;; a shared hash table for passing data to/from page calls
+	))
+      ((flat)   
+       (let* ((so-file  (conc dir page ".so"))
+	      (scm-file (conc dir page ".scm"))
+	      (src-file (or (file-exists? so-file)
+			    (file-exists? scm-file))))
+	 (if src-file
+	     (begin
+	       (load src-file)
+	       ((eval (string->symbol (conc "pages:" page))) 
+		self                         ;; the session
+		(sdat-conn self)         ;; the db connection
+		(sdat-shared-hash self)  ;; a shared hash table for passing data to/from page calls
+		))
+	     (list "
    Page not found " page " 
    "))))
+       ;; first the control
+       ;; (let ((control-file (conc "pages/" page "_ctrl.scm"))
+       ;;       (view-file    (conc "pages/" page "_view.scm")))
+       ;;   (if (and (file-exists? control-file)
+       ;;  	  (not (eq? parts 'view)))
+       ;;       (begin
+       ;;         (session:set-called! self page)
+       ;;         (load control-file)))
+       ;;   (if (file-exists? view-file)
+       ;;       (if (not (eq? parts 'control))
+       ;;  	 (session:process-file view-file))
+       ;;       (list "
    Page not found " page " 
    ")))
+      ((dir) "ERROR:  dir style not yet re-implemented")
+      (else
+       (list "ERROR: page-dir-style must be stored, dir or flat, got " dir-style)))))
+
+(define (session:call self page parts)
+  (session:call-parts self page 'both))
+
+(define (session:load-model self model)
+  (let* ((mpath     (session:model-path self))
+	 (model.scm (string-append mpath "/" model ".scm"))
+	 (model.so  (string-append mpath "/" model ".so")))
+    (if (file-exists? model.so)
+	(load model.so)
+	(if (file-exists? model.scm)
+	    (load model.scm)
+	    (s:log "ERROR: model " model.scm " not found")))))
+
+(define (session:model-path self)
+  (or (sdat-models self)
+      (string-append (sdat-sroot self) "/models/")))
+
+(define (session:pp-formdat self)
+  (let ((dat (formdat:all->strings (sdat-formdat self))))
+    (string-intersperse dat "
     ")))
+
+(define (session:param->string params)
+  ;; (err:log "params=" params)
+  (if (< (length params) 1)
+      ""
+      (let loop ((key (car params))
+		 (val (cadr params))
+		 (tail (cddr params))
+		 (result '()))
+	(let ((newresult (cons (string-append (s:any->string key) "=" (s:any->string val))
+			       result)))
+	  (if (< (length tail) 1) ;; true if done
+	      (string-intersperse newresult "&")
+	      (loop (car tail)(cadr tail)(cddr tail) newresult))))))
+
+(define (session:link-to self page params)
+  (let* ((https-host   (get-environment-variable "HTTPS_HOST"))
+         (force-ssl    (sdat-force-ssl self))
+	 (server       (or https-host ;; Assuming HTTPS_HOST is only set if available
+			   (get-environment-variable "HTTP_HOST")
+			   (get-environment-variable "SERVER_NAME")
+			   (sdat-domain self)))
+         (force-script  (sdat-script self))
+	 (script        (or force-script
+			    (let ((script-name (string-split (get-environment-variable "SCRIPT_NAME") "/")))
+			      (if (> (length script-name) 1)
+				  (string-append (car script-name) "/" (cadr script-name))
+				  (get-environment-variable "SCRIPT_NAME"))))) ;; build script name from first two elements. This is a hangover from before I used ? in the URL.)
+         (session-key   (sdat-session-key self))
+	 (paramstr      (session:param->string params)))
+    (session:log self "server=" server " script=" script " page=" page)
+    (string-append (if (or https-host force-ssl)
+		      "https://"
+		      "http://")
+		   server "/" script "/" page "?" paramstr))) ;; "/sn=" session-key)))
+
+(define (session:cgi-out self)
+  (let* ((content  (list (sdat-content-type self))) ;; '("Content-type: text/html; charset=iso-8859-1\n\n"))
+	 (header   (let ((cookie (sdat-session-cookie self)))
+		     (if cookie
+			 (cons (string-append "Set-Cookie: " (car cookie))
+			       content)
+			 content)))
+	 (pagedat  (sdat-pagedat self)))
+    (s:cgi-out 
+     (cons header pagedat))))
+
+(define (session:log self . msg)
+  (with-output-to-port (sdat-log-port self) ;; (sdat-logpt self)
+    (lambda () 
+      (apply print msg))))
+
+;; escape, convert or return raw when given user input data that potentially
+;; could be malicious
+;;
+(define (session:apply-type-preference res params)
+  (let* ((dtype    (if (null? params)
+		       'escaped
+		       (car params)))
+	 (tags    (if (null? params)
+		      '()
+		      (cdr params))))
+    (case dtype
+      ((raw)     res)
+      ((number)  (if (string? res)(string->number res) #f))
+      ((escaped) (if (string? res)
+		     (s:html-filter->string res tags)
+		     res))
+      ((escaped-nl) (if (string? res) ;; escape \n and \r
+			(string-intersperse
+			 (string-split
+			  (string-intersperse
+			   (string-split (s:html-filter->string res tags) "\n")
+			   "\\n")
+			  "\r")
+			 "\\r")
+			res)) ;; should return #f if not a string and can't escape it?
+      (else      (if (string? res)
+		     (s:html-filter->string res '())
+		     res)))))
+
+#;(define (session:get-param-from params key)
+  (let ((r1 (regexp (conc "^" (s:any->string key) "=(.*)$"))))
+    (if (null? params) #f
+        (let loop ((head (car params))
+                   (tail (cdr params)))
+          (let ((match (string-match r1 head)))
+            (if match
+                (list-ref match 1)
+                (if (null? tail) #f
+                    (loop (car tail)(cdr tail)))))))))
+
+;; params are stored as list of key=val
+;;
+(define (session:get-param self key type-params)
+  ;; (session:log s:session "params=" (slot-ref s:session 'params))
+  (let* ((params (sdat-params self))
+	 (res    (session:get-param-from params key)))
+    (session:apply-type-preference res type-params)))
+
+;; This one will get the first value found regardless of form
+;; param: (dtype [tag1 tag2 ...])
+;; dtype:
+;;    'raw     : do no conversion
+;;    'number  : convert to number, return #f if fails
+;;    'escaped : use html-escape to protect the input -- this is the default
+;;
+(define (session:get-input self key params)
+  (let* ((dtype    (if (null? params)
+		       'escaped
+		       (car params)))
+	 (tags    (if (null? params)
+		      '()
+		      (cdr params)))
+	 (formdat (sdat-formdat self))
+	 (res     (if (not formdat) #f
+		      (if (or (string? key)(number? key)(symbol? key))
+			  (if (and (vector? formdat)
+				   (eq? (vector-length formdat) 1)
+				   (hash-table? (vector-ref formdat 0)))
+			      (formdat:get formdat key)
+			      (begin
+				(session:log self "ERROR: formdat: " formdat " is not of class ")
+				#f))
+			  (begin
+			    (session:log self "ERROR: bad key " key)
+			    #f)))))
+    (case dtype
+      ((raw)     res)
+      ((number)  (if (string? res)(string->number res) #f))
+      ((escaped) (if (string? res)
+		     (s:html-filter->string res tags)
+		     res))
+      (else      (if (string? res)
+		     (s:html-filter->string res '())
+		     res)))))
+
+;; This one will get the first value found regardless of form
+(define (session:get-input-keys self)
+  (let* ((formdat (sdat-formdat self)))
+    (if (not formdat) #f
+	(if (and (vector? formdat)
+		 (eq? (vector-length formdat) 1)
+		 (hash-table? (vector-ref formdat 0)))
+	    (formdat:keys formdat)
+	    (begin
+	      (session:log self "ERROR: formdat: " formdat " is not of class ")
+	      #f)))))
+
+(define (session:run-actions self)
+  (let* ((action    (session:get-param self 'action '(raw)))
+	 (page      (sdat-page self)))
+    ;; (print "action=" action " page=" page)
+    (if action
+	(let ((action-lst  (string-split action ".")))
+	  ;; (print "action-lst=" action-lst)
+	  (if (not (= (length action-lst) 2)) 
+	      (err:log "Action should be of form: module.action")
+	      (let* ((targ-page   (car action-lst))
+		     (proc-name   (string-append targ-page "-action"))
+		     (targ-action (cadr action-lst)))
+		;; (err:log "targ-page=" targ-page " proc-name=" proc-name " targ-action=" targ-action)
+
+		;; call here only if never called before
+		(if (session:never-called-page? self targ-page)
+		    (session:call-parts self targ-page 'control))
+		;;                    proc                         action    
+
+		(if #t ;; set to #t to see better error messages during debuggin :-)
+		    ((eval (string->symbol proc-name)) targ-action) ;; unsafe execution
+		    (condition-case ((eval (string->symbol proc-name)) targ-action)
+				    ((exn file) (s:log "file error"))
+				    ((exn i/o)  (s:log "i/o error"))
+				    ((exn )     (s:log "Action not implemented: " proc-name " action: " targ-action))
+				    (var ()     (s:log "Unknown Error"))))))))))
+
+(define (session:never-called-page? self page)
+  (session:log self "Checking for page: " page)
+  (not (member page (sdat-seen-pages self))))
+
+(define (session:set-called! self page)
+  (sdat-seen-pages-set! self (cons page (sdat-seen-pages self))))
+
+;;======================================================================
+;; Alternative data type delivery
+;;======================================================================
+
+(define (session:alt-out self)
+  (let ((dat (sdat-alt-page-dat self)))
+    ;; (s:log "dat is: " dat)
+    ;; (print "HTTP/1.1 200 OK")
+    (print "Date: " (time->string (seconds->utc-time (current-seconds))))
+    (print "Content-Type: " (sdat-content-type self))
+    (print "Accept-Ranges: bytes")
+    (print "Content-Length: " (if (blob? dat)
+				  (blob-size dat)
+				  0))
+    (print "Keep-Alive: timeout=15, max=100")
+    (print "Connection: Keep-Alive")
+    (print "")
+    (write-string (blob->string dat) #f (current-output-port))))
+
+;;======================================================================
+;; Orphaned functions
+;;======================================================================
+
+;; was in setup
+;;
+(define (s:log . msg)
+  (apply session:log s:session msg))
+
+
+;; Usage: (s:get-err s:big)
+(define (s:get-err wrapperfunc)
+  (let ((errmsg (sdat-curr-err s:session)))
+    (if errmsg ((if wrapperfunc
+                    wrapperfunc
+                    s:strong) errmsg) '())))
+(define (stml:cgi-session session #!optional (configf #f))
+  ;; (session:initialize session)
+  (session:setup session configf)
+  (session:get-vars session)
+
+  (sdat-log-port-set! session ;; (current-error-port))
+		      (open-output-file (sdat-logfile session) #:append))
+  (s:validate-inputs)
+  (change-directory (sdat-sroot session))
+  (session:run-actions session)
+  (sdat-pagedat-set! session
+		     (append (sdat-pagedat session)
+			     (s:call (sdat-toppage session))))
+  (if (eq? (sdat-page-type session) 'html) ;; default is html. 
+      (session:cgi-out session)
+      (session:alt-out session))
+  (session:save-vars session)
+  (session:close session))
+
+
+(define (s:validate-inputs)
+  (if (not (s:validate-uri))
+      (begin (s:error-page "Bad URI" (let ((ref (get-environment-variable "HTTP_REFERER")))
+				       (if ref
+					   (list "referred from" ref)
+					   "")))
+	     (exit))))
+
+(define (s:error-page . err)
+  (s:cgi-out (cons "Content-type: text/html; charset=iso-8859-1\n\n"
+		   (s:html (s:head 
+			    (s:title err)
+			    (s:body
+			     (s:h1 "ERROR")
+			     (s:p err)))))))           
+
+
+(define (stml:main proc #!optional (configf #f))
+  (handle-exceptions
+   exn   
+   (if (sdat-debug-mode s:session)
+       (begin
+	 (print "Content-type: text/html")
+	 (print "")
+	 (print "  EXCEPTION  ")
+	 (print "   QUERY_STRING is:  " (get-environment-variable "QUERY_STRING") "  
    ")
+	 (print "
    ")
+	 ;; (print "   EXCEPTION: " ((condition-property-accessor 'exn 'message) exn))
+	 (print-error-message exn)
+	 (print-call-chain)
+	 (print "
    ")
+	 (print "")
+	 (for-each (lambda (var)
+		     (print ""))
+		   (get-environment-variables))
+	 (print "
    " (car var) "" (cdr var) "
    ")
+	 (print ""))
+       (begin
+	 (with-output-to-file (conc "/tmp/stml-crash-" (current-process-id) ".log")
+	   (lambda ()
+	     (print "EXCEPTION")
+	     (print "   QUERY_STRING is: " (get-environment-variable "QUERY_STRING") )
+	     (print "")
+	     ;; (print "   EXCEPTION: " ((condition-property-accessor 'exn 'message) exn))
+	     (print-error-message exn)
+	     (print-call-chain)
+	     (print "")
+	     (for-each (lambda (var)
+			 (print (car var) "\t" (cdr var)))
+		       (get-environment-variables))))
+	 ;; return something useful to the user
+	 (print "Content-type: text/html")
+	 (print "")
+	 (print "  EXCEPTION  ")
+	 (print "
    CRASH!
    ")
+	 (print "   Please notify support at " (sdat-domain s:session) " that the error log is stml-crash-" (current-process-id) ".log     
    ")
+	 ;; (print "
    ")
+	 ;; ;; (print "   EXCEPTION: " ((condition-property-accessor 'exn 'message) exn))
+	 ;; ;; (print-error-message exn)
+	 ;; ;; (print-call-chain)
+	 ;; (print "
    ")
+	 ;; (print "")
+	 ;; (for-each (lambda (var)
+	 ;; 	     (print ""))
+	 ;; 	   (get-environment-variables))
+	 ;; (print "
    " (car var) "" (cdr var) "
    ")
+	 (print "")))
+   (if proc (proc s:session) (stml:cgi-session s:session configf))
+ ;; (raise-error)
+ ;; (exit)
+   ))
+
+;; find out if we are in debugmode
+(define (s:debug-mode?)
+  (sdat-debug-mode s:session))
+
+(define (s:never-called-page? page)
+  (session:never-called-page? s:session page))
+
+(define (s:set-err . args)
+  (sdat-curr-err-set! s:session args))
+
+(define (s:current-page)
+  (sdat-page s:session))
+
+(define (s:delete-session)
+  (session:delete-session s:session (sdat-session-key s:session)))
+
+(define (s:call page . partsl)
+  (if (null? partsl)
+      (session:call s:session page #f)
+      (session:call s:session page (car partsl))))
+
+(define (s:link-to page . params)
+  (session:link-to s:session page params))
+
+(define (s:get-param key . type-params)
+  (session:get-param s:session key type-params))
+
+;; these are page local
+(define (s:get key) 
+  (session:page-get s:session key))
+
+(define (s:set! key val)
+  (session:curr-page-set! s:session key val))
+
+(define (s:del! key)
+  (session:page-var-del! s:session key))
+
+#;(define (s:get-n-del! key)
+  (let ((val (session:page-get s:session key)))
+    (session:del! s:session val key)
+    val))
+
+;; these are session wide
+(define (s:session-var-get key . params) 
+  (session:get s:session "*sessionvars*" key params))
+
+(define (s:session-var-set! key val)
+  (session:set! s:session "*sessionvars*" key val))
+
+(define (s:session-var-get-n-del! key)
+  (let ((val (session:page-get s:session key)))
+     (session:del! s:session "*sessionvars*" key)
+     val))
+
+(define (s:session-var-del! key)
+  (session:del! s:session "*sessionvars*" key))
+
+(define s:session-var-delete! s:session-var-del!)
+
+;; utility to get all vars as hash table
+(define (s:session-get-sessionvars)
+  (sdat-sessionvars s:session))
+
+;;======================================================================
+;; Sugar
+;;======================================================================
+;;
+;; (require 'syntax-case)
+;; 
+;; (define-syntax s:if-param
+;;   (syntax-rules ()
+;;     [(_ s x)   (if (s:get s) x (s:comment "s:if not"))]
+;;     [(_ s x y) (if (s:get s) x y)]))
+;; ;; 
+;; (define-syntax s:if-test
+;;   (syntax-rules ()
+;;     [(_ s x) (if   (string=? "yep" s)   x (list "s:if not"))]
+;;     [(_ s x y) (if (string=? "yep" s) x y)]))
+
+;; Some of these routines use:
+;;
+;;     http://www.cs.toronto.edu/~gfb/scheme/simple-macros.html
+;;
+;; Syntax for defining macros in a simple style similar to function definiton,
+;;  when there is a single pattern for the argument list and there are no keywords.
+;;
+;; (define-simple-syntax (name arg ...) body ...)
+;;
+
+(define-syntax define-simple-syntax
+  (syntax-rules ()
+    ((_ (name arg ...) body ...)
+     (define-syntax name (syntax-rules () ((name arg ...) (begin body ...)))))))
+
+;;======================================================================
+;; syntatic sugar items
+;;======================================================================
+
+;; We often seem to want to include stuff if a conditional is met
+;; otherwise not include it. This routine makes that slightly cleaner
+;; since using a pure if results in # objects. (admittedly they 
+;; should be ignored but this is slightly cleaner I think). 
+;;
+;; NOTE: This has to be a macro or the true clause will be evaluated 
+;; whether "a" is true or false
+
+;; If a is true return b, else return '()
+(define-simple-syntax (s:if a b)
+  (if a b '()))
+
+
+;; Using the Simple-Syntax System
+;; 
+;; The syntax for defining macros in this system is similar to that for defining functions. In fact if the macro has a fixed number of arguments the syntax is identical. For example:
+;; 
+;;   ; Define a simple macro to add a value to a variable.
+;;   ;
+;;   (define-simple-syntax (+= variable value)
+;;     (set! variable (+ variable value)))
+;; 
+;;   ; Use it.
+;;   ;
+;;   (define v 2)
+;;   (+= v 7)
+;;   v ; => 9
+;; 
+;; For a fixed number of arguments followed by an unknown number of arguments we use ... after a single argument to represent the unknown number (possibly zero) of arguments. For example, let's revise our definition of += to allow zero or more values to be added:
+;; 
+;;   ; Define a simple macro to add a zero or more values to a variable
+;;   ;
+;;   (define-simple-syntax (+= variable value ...)
+;;     (set! variable (+ variable value ...)))
+;; 
+;;   ; Use it
+;;   ;
+;;   (define v 2)
+;;   (+= v 7)
+;;   v ; => 9
+;;   (+= v 3 4)
+;;   v ; => 16
+;;   (+= v)
+;;   v ; => 16
+;; 
+
+(define-simple-syntax (s:if-param varname first ...)
+  (if (s:get varname)
+      (begin
+	first
+	...)
+      '()))
+
+(define-simple-syntax (s:if-sessionvar varname first ...)
+  (if (s:session-var-get varname)
+      (begin
+	first
+	...)
+      '()))
+
+;; (define-macro (s:if-param varname ...)
+;;   (match dat
+;; 	 (()    '())
+;; 	 ((a)    `(if (s:get ,varname) ,a '()))
+;; 	 ((a b)  `(if (s:get ,varname) ,a ,b))))
+;; 
+;; (define-macro (s:if-sessionvar varname . dat)
+;;   (match dat
+;; 	 (()    '())
+;; 	 ((a)    `(if (s:session-var-get ,varname) ,a '()))
+;; 	 ((a b)  `(if (s:session-var-get ,varname) ,a ,b))))
+;; 
+
+)

ADDED   stml2/stml2.setup
Index: stml2/stml2.setup
==================================================================
--- /dev/null
+++ stml2/stml2.setup
@@ -0,0 +1,32 @@
+;; Copyright 2007-2010, Matthew Welland.
+;;
+;;  This program is made available under the GNU GPL version 2.0 or
+;;  greater. See the accompanying file COPYING for details.
+;;
+;;  This program is distributed WITHOUT ANY WARRANTY; without even the
+;;  implied warranty of MERCHANTABILITY or FITNlmESS FOR A PARTICULAR
+;;  PURPOSE.
+
+;;;; margs.setup
+
+;; compile the code into a dynamically loadable shared object
+;; (will generate margs.so)
+;; (compile -s margs.scm)
+
+;; Install as extension library
+
+;; handle cookies
+(standard-extension 'cookie       "0.5")
+;; (standard-extension 'stmlcommon   "0.5")
+(standard-extension 'stml2        "0.5")
+
+;; (standard-extension 'session      "0.5")
+;; (standard-extension 'misc-stml    "0.5") ;; moved to stmlcommon.scm
+;; (standard-extension 'html-filter  "0.5") ;; moved to stmlcommon.scm
+;; (standard-extension 'formdat      "0.5") ;; moved into stmlcommon.scm
+;; (standard-extension 'setup        "0.5") ;; moved into stmlcommon.scm
+;; (standard-extension 'keystore     "0.5") ;; moved into stmlcommon.scm
+;; (standard-extension 'sqltbl       "0.5") ;; eliminated
+
+;; (install-extension 'stml "stml.so")
+

ADDED   stml2/stmlcommon.scm
Index: stml2/stmlcommon.scm
==================================================================
--- /dev/null
+++ stml2/stmlcommon.scm
@@ -0,0 +1,20 @@
+;; Copyright 2007-2011, Matthew Welland.
+;; 
+;;  This program is made available under the GNU GPL version 2.0 or
+;;  greater. See the accompanying file COPYING for details.
+;; 
+;;  This program is distributed WITHOUT ANY WARRANTY; without even the
+;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+;;  PURPOSE.
+
+;; (require-extension syntax-case)
+;; (declare (run-time-macros))
+
+(module stmlcommon
+    *
+
+(import  chicken scheme data-structures extras srfi-13 ports posix)
+
+(use (prefix dbi dbi:) regex (prefix crypt c:) srfi-69)
+
+)

ADDED   stml2/stmlmodule.scm
Index: stml2/stmlmodule.scm
==================================================================
--- /dev/null
+++ stml2/stmlmodule.scm
@@ -0,0 +1,14 @@
+;; Copyright 2007-2011, Matthew Welland.
+;; 
+;;  This program is made available under the GNU GPL version 2.0 or
+;;  greater. See the accompanying file COPYING for details.
+;; 
+;;  This program is distributed WITHOUT ANY WARRANTY; without even the
+;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+;;  PURPOSE.
+
+;; (require-extension syntax-case)
+;; (declare (run-time-macros))
+
+(include "stmlcommon.scm")
+

ADDED   stml2/stmlrun.scm
Index: stml2/stmlrun.scm
==================================================================
--- /dev/null
+++ stml2/stmlrun.scm
@@ -0,0 +1,19 @@
+#!/usr/local/bin/csi -q
+
+;; Copyright 2007-2011, Matthew Welland.
+;; 
+;;  This program is made available under the GNU GPL version 2.0 or
+;;  greater. See the accompanying file COPYING for details.
+;; 
+;;  This program is distributed WITHOUT ANY WARRANTY; without even the
+;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+;;  PURPOSE.
+
+;; (require-extension syntax-case)
+;; (declare (run-time-macros))
+
+;; (include "stmlcommon.scm")
+(require-library stml)
+
+
+(stml:main #f)

ADDED   stml2/sugar.scm
Index: stml2/sugar.scm
==================================================================
--- /dev/null
+++ stml2/sugar.scm
@@ -0,0 +1,113 @@
+;; Copyright 2007-2011, Matthew Welland.
+;; 
+;;  This program is made available under the GNU GPL version 2.0 or
+;;  greater. See the accompanying file COPYING for details.
+;; 
+;;  This program is distributed WITHOUT ANY WARRANTY; without even the
+;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+;;  PURPOSE.
+;;
+
+;;======================================================================
+;; Sugar
+;;======================================================================
+;;
+;; (require 'syntax-case)
+;; 
+;; (define-syntax s:if-param
+;;   (syntax-rules ()
+;;     [(_ s x)   (if (s:get s) x (s:comment "s:if not"))]
+;;     [(_ s x y) (if (s:get s) x y)]))
+;; ;; 
+;; (define-syntax s:if-test
+;;   (syntax-rules ()
+;;     [(_ s x) (if   (string=? "yep" s)   x (list "s:if not"))]
+;;     [(_ s x y) (if (string=? "yep" s) x y)]))
+
+;; Some of these routines use:
+;;
+;;     http://www.cs.toronto.edu/~gfb/scheme/simple-macros.html
+;;
+;; Syntax for defining macros in a simple style similar to function definiton,
+;;  when there is a single pattern for the argument list and there are no keywords.
+;;
+;; (define-simple-syntax (name arg ...) body ...)
+;;
+
+(define-syntax define-simple-syntax
+  (syntax-rules ()
+    ((_ (name arg ...) body ...)
+     (define-syntax name (syntax-rules () ((name arg ...) (begin body ...)))))))
+
+;;======================================================================
+;; syntatic sugar items
+;;======================================================================
+
+;; We often seem to want to include stuff if a conditional is met
+;; otherwise not include it. This routine makes that slightly cleaner
+;; since using a pure if results in # objects. (admittedly they 
+;; should be ignored but this is slightly cleaner I think). 
+;;
+;; NOTE: This has to be a macro or the true clause will be evaluated 
+;; whether "a" is true or false
+
+;; If a is true return b, else return '()
+(define-simple-syntax (s:if a b)
+  (if a b '()))
+
+
+;; Using the Simple-Syntax System
+;; 
+;; The syntax for defining macros in this system is similar to that for defining functions. In fact if the macro has a fixed number of arguments the syntax is identical. For example:
+;; 
+;;   ; Define a simple macro to add a value to a variable.
+;;   ;
+;;   (define-simple-syntax (+= variable value)
+;;     (set! variable (+ variable value)))
+;; 
+;;   ; Use it.
+;;   ;
+;;   (define v 2)
+;;   (+= v 7)
+;;   v ; => 9
+;; 
+;; For a fixed number of arguments followed by an unknown number of arguments we use ... after a single argument to represent the unknown number (possibly zero) of arguments. For example, let's revise our definition of += to allow zero or more values to be added:
+;; 
+;;   ; Define a simple macro to add a zero or more values to a variable
+;;   ;
+;;   (define-simple-syntax (+= variable value ...)
+;;     (set! variable (+ variable value ...)))
+;; 
+;;   ; Use it
+;;   ;
+;;   (define v 2)
+;;   (+= v 7)
+;;   v ; => 9
+;;   (+= v 3 4)
+;;   v ; => 16
+;;   (+= v)
+;;   v ; => 16
+;; 
+
+(define-simple-syntax (s:if-param varname first ...)
+  (if (s:get varname)
+      first
+      ...))
+
+(define-simple-syntax (s:if-sessionvar varname first ...)
+  (if (s:session-var-get varname)
+      first
+      ...))
+
+;; (define-macro (s:if-param varname ...)
+;;   (match dat
+;; 	 (()    '())
+;; 	 ((a)    `(if (s:get ,varname) ,a '()))
+;; 	 ((a b)  `(if (s:get ,varname) ,a ,b))))
+;; 
+;; (define-macro (s:if-sessionvar varname . dat)
+;;   (match dat
+;; 	 (()    '())
+;; 	 ((a)    `(if (s:session-var-get ,varname) ,a '()))
+;; 	 ((a b)  `(if (s:session-var-get ,varname) ,a ,b))))
+;; 

ADDED   stml2/test.scm
Index: stml2/test.scm
==================================================================
--- /dev/null
+++ stml2/test.scm
@@ -0,0 +1,22 @@
+(use test md5)
+
+(require-extension sqlite3)
+(import (prefix sqlite3 sqlite3:))
+
+(require-library dbi)
+
+;; (declare (uses stml))
+
+(include "requirements.scm")
+(include "cookie.scm")
+(include "misc-stml.scm")
+(include "formdat.scm")
+(include "stml.scm")
+(include "session.scm")
+(include "sqltbl.scm")
+(include "html-filter.scm")
+(include "keystore.scm")
+
+(define p (open-input-file "test.stml"))
+(print (process-port p))
+(close-input-port p)

ADDED   stml2/test.stml
Index: stml2/test.stml
==================================================================
--- /dev/null
+++ stml2/test.stml
@@ -0,0 +1,10 @@
+;; Copyright 2007-2008, Matthew Welland. Kiatoa.com All rights reserved.
+;; 
+;; index
+
+(list
+ (s:html
+  (s:head
+   (s:title "Kiatoa")
+   (s:link  'rel "stylesheet" 'type "text/css" 'href "/kiatoa/markup.css")
+   (s:link  'rel "stylesheet" 'type "text/css" 'href "/kiatoa/layout.css"))))

ADDED   stml2/tests/example.post.binary.in
Index: stml2/tests/example.post.binary.in
==================================================================
--- /dev/null
+++ stml2/tests/example.post.binary.in
cannot compute difference between binary files

ADDED   stml2/tests/example.post.in
Index: stml2/tests/example.post.in
==================================================================
--- /dev/null
+++ stml2/tests/example.post.in
@@ -0,0 +1,1 @@
+email-address=matt%3A1&password=Blah&form-name=login

ADDED   stml2/tests/models/test.scm
Index: stml2/tests/models/test.scm
==================================================================
--- /dev/null
+++ stml2/tests/models/test.scm
@@ -0,0 +1,11 @@
+;; Copyright 2007-2008, Matthew Welland.
+;; 
+;;  This program is made available under the GNU GPL version 2.0 or
+;;  greater. See the accompanying file COPYING for details.
+;; 
+;;  This program is distributed WITHOUT ANY WARRANTY; without even the
+;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+;;  PURPOSE.
+;;
+
+;; models/test.scm

ADDED   stml2/tests/pages/test/control.scm
Index: stml2/tests/pages/test/control.scm
==================================================================
--- /dev/null
+++ stml2/tests/pages/test/control.scm
@@ -0,0 +1,11 @@
+;; Copyright 2007-2008, Matthew Welland.
+;; 
+;;  This program is made available under the GNU GPL version 2.0 or
+;;  greater. See the accompanying file COPYING for details.
+;; 
+;;  This program is distributed WITHOUT ANY WARRANTY; without even the
+;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+;;  PURPOSE.
+;;
+
+;; pages/test/control.scm

ADDED   stml2/tests/pages/test/view.scm
Index: stml2/tests/pages/test/view.scm
==================================================================
--- /dev/null
+++ stml2/tests/pages/test/view.scm
@@ -0,0 +1,11 @@
+;; Copyright 2007-2008, Matthew Welland.
+;; 
+;;  This program is made available under the GNU GPL version 2.0 or
+;;  greater. See the accompanying file COPYING for details.
+;; 
+;;  This program is distributed WITHOUT ANY WARRANTY; without even the
+;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+;;  PURPOSE.
+;;
+
+;; pages/test/view.scm

ADDED   stml2/tests/test.scm
Index: stml2/tests/test.scm
==================================================================
--- /dev/null
+++ stml2/tests/test.scm
@@ -0,0 +1,225 @@
+#!/usr/local/bin/csi -q 
+
+;; Copyright 2007-2008, Matthew Welland.
+;; 
+;;  This program is made available under the GNU GPL version 2.0 or
+;;  greater. See the accompanying file COPYING for details.
+;; 
+;;  This program is distributed WITHOUT ANY WARRANTY; without even the
+;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+;;  PURPOSE.
+
+(use test md5)
+
+(require-extension sqlite3)
+(import (prefix sqlite3 sqlite3:))
+
+;; (require-library dbi)
+(use (prefix dbi dbi:))
+
+(load "./requirements.scm")
+(load "./cookie.scm")
+(load "./misc-stml.scm")
+(load "./formdat.scm")
+(load "./stml.scm")
+(load "./session.scm")
+(load "./sqltbl.scm")
+(load "./html-filter.scm")
+(load "./keystore.scm")
+
+;; Test the primitive dbi interface
+
+(system "rm -f tests/test.db")
+(define db (dbi:open 'sqlite3 '((dbname . "tests/test.db"))))
+(dbi:exec db "CREATE TABLE foo(id INTEGER PRIMARY KEY,name TEXT);")
+(dbi:exec db "INSERT INTO foo(name) VALUES(?);" "Matt")
+(dbi:for-each-row 
+ (lambda (tuple)
+   (print (vector-ref tuple 0) " " (vector-ref tuple 1)))
+ db "SELECT * FROM foo;")
+(test "dbi:get-one" "Matt" (dbi:get-one db "SELECT name FROM foo WHERE name='Matt';"))
+
+;; keystore
+(dbi:exec db "CREATE TABLE metadata (id INTEGER PRIMARY KEY,key TEXT,value TEXT);")
+
+(keystore:set! db "SCHEMA-VERSION" 1.2)
+(test "Keystore get" "1.2"  (keystore:get  db "SCHEMA-VERSION"))
+(keystore:del! db "SCHEMA-VERSION") 
+(test "Keystore get deleted" #f (keystore:get db "SCHEMA-VERSION"))
+
+(system "rm -f tests/test.db")
+
+;; create a session to work with")
+(setenv "REQUEST_URI" "/stmlrun?action=test.test")
+(setenv "SCRIPT_NAME" "/cgi-bin/stmlrun")
+(setenv "PATH_INFO" "/test")
+(setenv "QUERY_STRING" "action=test.test")
+(setenv "SERVER_NAME" "localhost")
+(setenv "REQUEST_METHOD" "GET")
+
+(load "./setup.scm")
+
+(s:validate-inputs)
+
+;; test session variables
+
+(session:get-vars s:session)
+(define nada "andnndhhshaas")
+(s:session-var-set! "nick" nada)
+(test "Session var set/get" nada  (s:session-var-get "nick"))
+(print "got here")
+(session:save-vars s:session)
+(session:get-vars  s:session)
+(test "Session var set/get after save/get" nada (s:session-var-get "nick"))
+(session:del! s:session "*sessionvars*" "nick")
+(test "Session var del"                    #f   (s:session-var-get "nick"))
+(session:save-vars s:session)
+(session:get-vars s:session)
+(s:session-var-set! "nick" nada)
+(session:save-vars s:session)
+
+;; (test "Session var del"                    #f   (s:session-var-get "nick"))
+
+;; test person
+
+(load "./tests/models/test.scm")
+
+(print "Session key is " (sdat-get-session-key s:session))
+
+(test "Delete session" #t (s:delete-session))
+
+(let ((fh (open-input-pipe "ls ./tests/pages/*/control.scm")))
+  (let loop ((l (read-line fh)))
+    (if (not (eof-object? l))
+        (begin
+          ;; (print "loading " l)
+          (load l)
+          (loop (read-line fh)))))
+  (close-input-port fh))
+
+;; Should have poll:poll defined now.
+(test "Make a random string" 2 (string-length (session:make-rand-string 2)))
+(test "Create an encrypted password using DES (backwards compat)" "abQ9KY.KfrYrc" (s:crypt-passwd "foo" "ab"))
+(test "Create an encrypted password using Blowfish" "$2a$12$GyoKHX/UOxMLGtwdSTr7EOF9KQzlyyyRqFTKx1YvLA3sMukbV4WBC" (s:crypt-passwd "foo" "$2a$12$GyoKHX/UOxMLGtwdSTr7EO"))
+
+(test "s:any->string on a hash-table" "#" (s:any->string (make-hash-table)))
+
+(define select-list
+  '((a b c)(d (e f g)(h i j #t))))
+(define result '(""))
+
+(test "Select list" result (s:select select-list 'name "efg"))
+
+;; Test modules
+
+(test "misc:non-zero-string \"\"" #f (misc:non-zero-string ""))
+(test "misc:non-zero-string #f" #f (misc:non-zero-string #f))
+(test "misc:non-zero-string 'blah" #f (misc:non-zero-string 'blah))
+
+;; forms
+(define form #f)
+(test "make " #t (let ((f (make-formdat:formdat)))
+			    (set! form f)
+			    #t))
+(test "formdat: set!/get" "Yep!" (begin
+				   (formdat:set! form "blah" "Yep!")
+				   (formdat:get  form "blah")))
+
+(test "s:string->pgint"   123 (s:any->pgint "123"))
+(test "s:illegal-pgint (legal)"        #f (s:illegal-pgint 1011))
+(test "s:illegal-pgint (illegal big)"   1 (s:illegal-pgint  9999999999))
+(test "s:illegalpgint (illegal small)" -1 (s:illegal-pgint -9999999999))
+
+;; The twiki module
+
+;; clean up
+(system "rm -rf twikis/*")
+(load "modules/twiki/twiki-mod.scm")
+(define keys (list "blah" 1 'nada))
+(test "twiki:keys->key"  "blah 1 nada" (twiki:keys->key keys))
+(define key (twiki:keys->key keys))
+
+(define *tdb* #f)
+(test "twiki:open-db"   #t (let ((db (twiki:open-db key)))
+			     (set! *tdb* db)
+			     (if *tdb* #t #f)))
+(define wiki (make-twiki:wiki))
+(twiki:wiki-set-wid! wiki 1)
+(twiki:wiki-set-name! wiki "main")
+(twiki:wiki-set-perms! wiki '(r w))
+
+(test "twiki:dat->html" '("Hello" "
    ") (twiki:dat->html "Hello" wiki))
+(test "twiki:keys->fname" '("twikis/Ymxha/CAxIG/5hZGE" "YmxhaCAxIG5hZGE_") ;; ("twikis/d99a2de9/6808493b/23770f70" "d99a2de96808493b23770f70c76dffe4")
+      (twiki:key->fname key))
+
+(test "twiki:name->wid"     1     (twiki:name->wid *tdb* "main"))
+(test "twiki:get-tiddlers-by-num" '() (twiki:get-tiddlers-by-num  *tdb* 0 (list 1 2 3)))
+(test "twiki:get-tiddlers-by-name" '() (twiki:get-tiddlers-by-name *tdb* 0 "MainMenu"))
+(test "twiki:get-tiddlers"  '()  (twiki:get-tiddlers *tdb* 0 (list "MainMenu")))
+(test "twiki:get-tiddlers"  '()  (twiki:get-tiddlers *tdb* 0 (list "MainMenu" "AnotherOne")))
+(test "twiki:wiki" ""     (car (twiki:wiki "main" (list "blah" 1 'nada))))
+(test "twiki:view"  "
    " (car (twiki:view "" "" 0 (twiki:tiddler-make) wiki)))
+
+(test "s:td"              '("
    ") (s:td '()))
+;; (test "twiki:get-tiddlers-by-name" '() (twiki:get-tiddlers-by-name 1 "fred"))
+(test "twiki:tiddler-name->id" 1 (twiki:tiddler-name->id *tdb* "MainMenu"))
+(test "s:set! a var to #f"     ""
+      (begin (s:set! "BLAH" #f)
+	     (s:get "BLAH"))) ;; don't know if this one makes sense. Setting to #f should really delete the value
+(test "twiki:save-dat"           2        (twiki:save-dat *tdb* "dat" 0))
+(test "twiki:get-dat"            "dat"    (twiki:get-dat *tdb* 2))
+(test "twiki:get-dat"            #f       (twiki:get-dat *tdb* 5))
+;; (test "twiki:get-dat"      #f    (twiki:get-dat *tdb* #f))
+(test "twiki:save-tiddler"       #t       (twiki:save-tiddler *tdb* "heading" "body" "tags" key 0))
+;; (test "twiki:save-curr-tiddler"  #f       (twiki:save-curr-tiddler *tdb* 1))
+(test "twiki:edit-twiddler"      #t       (list? (twiki:edit-tiddler *tdb* key 0 0)))
+(test "twiki:maint_area"         "
    "  (car (twiki:maint_area *tdb* 1 key wiki)))
+(test "twiki:pic_mgmt"           "
    "  (car (twiki:pic_mgmt *tdb* 1 key)))
+
+;; get a blob jpg to process
+(define inp2 (open-input-file "tests/kiatoa.png"))
+(define dat  (string->blob (read-string #f inp2)))
+(close-input-port inp2)
+
+
+(test "twiki:save-pic"           #t       (twiki:save-pic *tdb* (list "mypic.jpg" "image/jpeg" dat) 0)) ;; (string->blob "testing eh!")))) 
+;; (test "twiki:save-pic-from-form" #f       (twiki:save-pic-from-form *tdb* 1))
+
+;; more tests on dats
+
+(define dat #f)
+(let ((inp (open-input-file "tests/kiatoa.png")))
+  (set! dat (read-string #f inp))
+  (close-input-port inp))
+(use md5)
+(define dat-md5 (md5:digest dat))
+(test "twiki:save-dat (binary)" 4        (twiki:save-dat *tdb* dat 1))
+(test "twiki:get-dat (binary)"  dat-md5  (let ((d (twiki:get-dat *tdb* 4)))
+					   (md5:digest d)))
+;; forms
+;; (define inp (open-input-file "tests/example.post.in"))
+;; (define dat (read-string #f inp))
+;; (define datstr (open-input-string dat))
+
+;; binary inputs
+(define inp (open-input-file "tests/example.post.binary.in"))
+(define dat #f)
+
+(test "formdat:load-all-port multipart" #t (let ((idat (formdat:load-all-port inp)))
+				   (set! dat idat)
+				   #t))
+(test "formdat:keys" '(picture-name input-picture "" submit-picture) (formdat:keys dat))
+
+(define inp (open-input-file "tests/example.post.in"))
+(test "formdat:load-all-port single part" #t (let ((idat (formdat:load-all-port inp)))
+				   (set! dat idat)
+				   #t))
+(test "formdat:keys" '(email-address form-name password) (formdat:keys dat))
+
+(close-input-port inp)

ADDED   stml2/testscript.sh
Index: stml2/testscript.sh
==================================================================
--- /dev/null
+++ stml2/testscript.sh
@@ -0,0 +1,7 @@
+export REQUEST_URI='/stmlrun?action=login.login'
+export SCRIPT_NAME=/cgi-bin/stmlrun
+export PATH_INFO=/classifieds
+export QUERY_STRING='action=login.login'
+export SERVER_NAME=localhost
+export REQUEST_METHOD=GET
+export HTTP_COOKIE='session_key=to09ipFJ9_2KXT96b2f9Q'

ADDED   subrun.scm
Index: subrun.scm
==================================================================
--- /dev/null
+++ subrun.scm
@@ -0,0 +1,265 @@
+
+;; Copyright 2006-2016, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
+;;  strftime('%m/%d/%Y %H:%M:%S','now','localtime')
+
+(use (prefix sqlite3 sqlite3:) srfi-1 posix regex regex-case srfi-69 (srfi 18) 
+     posix-extras directory-utils pathname-expand typed-records format
+     call-with-environment-variables)
+(declare (unit subrun))
+;;(declare (uses runs))
+(declare (uses db))
+(declare (uses common))
+;;(declare (uses items))
+;;(declare (uses runconfig))
+;;(declare (uses tests))
+;;(declare (uses server))
+(declare (uses mt))
+;;(declare (uses archive))
+;; (declare (uses filedb))
+
+;(include "common_records.scm")
+;;(include "key_records.scm")
+(include "db_records.scm") ;; provides db:test-get-id
+;;(include "run_records.scm")
+;;(include "test_records.scm")
+
+(define (subrun:subrun-test-initialized? test-run-dir)
+  (if (and (common:file-exists? (conc test-run-dir "/subrun-area") )
+           (common:file-exists? (conc test-run-dir "/testconfig.subrun") ))
+      #t
+      #f))
+
+(define (subrun:launch-dashboard test-run-dir)
+  (if (subrun:subrun-test-initialized? test-run-dir)
+      (let* ((subarea (subrun:get-runarea test-run-dir)))
+        (if (and subarea (common:file-exists? subarea))
+            (system (conc "cd " subarea ";env -i PATH=$PATH DISPLAY=$DISPLAY HOME=$HOME USER=$USER dashboard &"))))))
+
+(define (subrun:subrun-removed? test-run-dir)
+  (if (subrun:subrun-test-initialized? test-run-dir)
+      (let ((flagfile (conc test-run-dir "/subrun.removed")))
+        (if (common:file-exists? flagfile)
+            #t
+            #f))
+      #t))
+
+(define (subrun:set-subrun-removed test-run-dir)
+  (let ((flagfile (conc test-run-dir "/subrun.removed")))
+    (if (and (subrun:subrun-test-initialized? test-run-dir) (not (common:file-exists? flagfile)))
+        (with-output-to-file flagfile
+          (lambda () (print (current-seconds)))))))
+
+(define (subrun:unset-subrun-removed test-run-dir)
+  (let ((flagfile (conc test-run-dir "/subrun.removed")))
+    (if (and (subrun:subrun-test-initialized? test-run-dir) (common:file-exists? flagfile))
+        (delete-file flagfile))))
+
+
+(define (subrun:testconfig-defines-subrun? testconfig)
+  (configf:lookup testconfig "subrun" "runwait")) ;; we use runwait as the flag that a subrun is requested
+
+(define (subrun:initialize-toprun-test  testconfig test-run-dir)
+  (let ((ra (configf:lookup testconfig "subrun" "run-area"))
+        (logpro (configf:lookup testconfig "subrun" "logpro"))
+        (symlink-target (conc test-run-dir "/subrun-area"))
+        )
+    (if (not ra)      ;; when runarea is not set we default to *toppath*. However 
+	(let ((fallback-run-area (or *toppath* (conc test-run-dir "/subrun"))))
+	  ;; we need to force the setting in the testconfig so it will
+          ;; be preserved in the testconfig.subrun file
+	  (configf:set-section-var testconfig "subrun" "run-area" fallback-run-area)
+	  (set! ra fallback-run-area)))
+    (configf:set-section-var testconfig "logpro" "subrun" logpro) ;; append the logpro rules to the logpro section as stepname subrun
+    (if (common:file-exists? symlink-target)
+        (delete-file symlink-target))
+    (create-symbolic-link ra symlink-target)
+    (configf:write-alist testconfig "testconfig.subrun")))
+
+(define (subrun:set-state-status test-run-dir state status new-state-status)
+  (if (and (not (subrun:subrun-removed? test-run-dir)) (subrun:subrun-test-initialized? test-run-dir))
+      (let* ((action-switches-str
+              (conc "-set-state-status "new-state-status
+                    (if state (conc " -state "state) "")
+                    (if status (conc " -status "status) "")))
+             (log-prefix
+              (subrun:sanitize-path
+               (conc "set-state-status="new-state-status
+                     (if state (conc ":state="state) "")
+                     (if status (conc "+status="status) ""))))
+             (submt-result 
+              (subrun:exec-sub-megatest test-run-dir action-switches-str log-prefix)))
+        submt-result)))
+
+(define (subrun:remove-subrun test-run-dir keep-records )
+  (if (and (not (subrun:subrun-removed? test-run-dir)) (subrun:subrun-test-initialized? test-run-dir))
+      (let* ((action-switches-str
+              (conc "-remove-runs"
+                    (if keep-records "-keep-records " "")
+                    ))
+             (remove-result
+              (subrun:exec-sub-megatest test-run-dir action-switches-str "remove")))
+        (if remove-result
+            (begin
+              (subrun:set-subrun-removed test-run-dir)
+              #t)
+            #f))
+      #t))
+
+(define (subrun:kill-subrun test-run-dir )
+  (if (and (not (subrun:subrun-removed? test-run-dir)) (subrun:subrun-test-initialized? test-run-dir))
+      (let* ((action-switches-str
+              (conc "-kill-runs" ))
+             (kill-result
+              (subrun:exec-sub-megatest test-run-dir action-switches-str "kill")))
+        kill-result)
+      #t))
+
+(define (subrun:launch-cmd test-run-dir #!optional (sub-cmd "-run")) ;; BUG: "-run" should be changed to "-rerun-clean" but current doesn't work
+  (if (subrun:subrun-removed? test-run-dir)
+      (subrun:unset-subrun-removed test-run-dir))      
+
+  (let* ((log-prefix "run")
+         (switches (subrun:selector+log-switches test-run-dir log-prefix))
+         (run-wait #t)
+         (cmd      (conc "megatest " sub-cmd " " switches" "
+                         (if run-wait "-run-wait " ""))))
+    cmd))
+
+
+(define (subrun:sanitize-path inpath)
+  (let* ((insane-pattern (irregex "[^[a-zA-Z0-9_\\-]")))
+    (regex#string-substitute insane-pattern "_" inpath #t)))
+
+(define (subrun:get-runarea test-run-dir)
+  (if (subrun:subrun-test-initialized? test-run-dir)
+      (let* ((info-alist (subrun:selector+log-alist
+                          test-run-dir
+                          "foo"))
+             (run-area   (if (list? info-alist)
+                             (alist-ref "-start-dir" info-alist equal? #f)
+                             #f)))
+        run-area)
+      #f))
+
+(define (subrun:selector+log-alist test-run-dir log-prefix)
+  (let* ((switch-def-alist (common:get-param-mapping flavor: 'config))
+         (subrunfile   (conc test-run-dir "/testconfig.subrun" ))
+         (subrundata   (with-input-from-file subrunfile read))
+         (subrunconfig (configf:alist->config subrundata))
+         (run-area     (configf:lookup subrunconfig "subrun" "run-area"))
+         (defvals      `(("start-dir" . ,(or run-area  ;; default values if not specified in subrun section of tconf
+                                             (get-environment-variable "MT_RUN_AREA_HOME")
+                                             "/no/rundir/found")) 
+                         ("run-name"  . ,(or (get-environment-variable "MT_RUNNAME") "NO-RUNNAME"))
+                         ("target"    . ,(or (get-environment-variable "MT_TARGET")  "NO-TARGET"))))
+         (switch-alist-pre  (filter-map (lambda (item)
+                                          (let* ((config-key (car item))
+                                                 (switch     (cdr item))
+                                                 (defval     (alist-ref config-key defvals equal? #f))
+                                                 (val        (or (configf:lookup subrunconfig "subrun" config-key)
+                                                                 defval)))
+                                            (if val
+                                                (cons switch val)
+                                                #f)))
+                                        switch-def-alist))
+
+         ;; testpatt may be modified if all three of mode-patt, tag-expr, and testpatt are null
+         (mode-patt     (alist-ref "-modepatt" switch-alist-pre equal? #f))
+         (tag-expr      (alist-ref "-tagexpr" switch-alist-pre equal? #f))
+         (testpatt      (alist-ref "-testpatt" switch-alist-pre equal?
+                                   (if (not (or mode-patt tag-expr)) "%" #f))) ;; testpatt is % if not
+                                                                               ;; otherwise specified
+
+         ;; define compact-stem for logfile
+         (target        (alist-ref "-target" switch-alist-pre equal? #f)) ;; want data-structures alist-ref, not alist-lib alist-ref
+         (runname       (alist-ref "-runname" switch-alist-pre equal? #f))
+
+
+         (compact-stem  (subrun:sanitize-path
+                         (conc
+                          target
+                          "-"
+                          runname
+                          "-" (or testpatt mode-patt tag-expr "NO-TESTPATT"))))
+         (logfile       (conc
+                         test-run-dir "/"
+                         (if log-prefix
+                             (conc (subrun:sanitize-path log-prefix) "-")
+                             "")
+                         compact-stem
+                         ".log"))
+         ;; swap out testpatt with modified test-patt and add -log
+         (switch-alist  (cons
+                         (cons "-log" logfile)
+                         (map (lambda (item)
+                                (if (equal? (car item) "-testpatt")
+                                    (cons "-testpatt" testpatt)
+                                    item))
+                                switch-alist-pre))))
+    switch-alist))
+    ;; note - get precmd from subrun section
+    ;;   apply to submegatest commands
+
+(define (subrun:get-log-path test-run-dir log-prefix)
+  (let* ((alist (subrun:selector+log-alist test-run-dir log-prefix))
+         (res   (alist-ref "-log" alist equal? #f)))
+    res))
+
+(define (subrun:selector+log-switches test-run-dir log-prefix)
+  (let* ((switch-alist (subrun:selector+log-alist test-run-dir log-prefix))
+         (res
+          (string-intersperse
+           (apply
+            append
+            (map
+             (lambda (x)
+               (list (car x) (cdr x)))
+             switch-alist))
+           " ")))
+    res))
+
+(define (subrun:exec-sub-megatest test-run-dir action-switches-str log-prefix)
+  (let* ((selector-switches  (subrun:selector+log-switches test-run-dir log-prefix))
+         (cmd (conc "megatest " selector-switches " " action-switches-str ))
+         (pid #f)
+         (proc (lambda ()
+                 (debug:print-info 0 *default-log-port* "Running sub megatest command: "cmd)
+                 ;;(set! pid (process-run "/usr/bin/xterm" (list ))))))
+                 (set! pid (process-run "/bin/bash" (list "-c" cmd))))))
+    (call-with-environment-variables 
+     (list (cons "PATH" (conc (get-environment-variable "PATH") ":.")))
+     (lambda  ()
+       (common:without-vars proc "^MT_.*")))
+    (let processloop ((i 0))
+      (let-values (((pid-val exit-status exit-code)(process-wait pid #t)))
+        (if (eq? pid-val 0)
+            (begin
+              (thread-sleep! 2)
+              (processloop (+ i 1)))
+            (begin
+              (debug:print-info 0 *default-log-port* "sub megatest " action-switches-str " completed with exit code " exit-code)
+              (if (eq? 0 exit-code)
+                  (begin
+                    #t)
+                  (begin
+                    #f))))))))
+
+
+
+;; (subrun:exec-sub-megatest "/nfs/pdx/disks/icf_env_disk001/bjbarcla/gwa/issues/mtdev/165/megatest/ext-tests/tests/subrun-usecases/toparea/links/SYSTEM_val/RELEASE_val/go/toptest" "-foo" "foo")

Index: supplemental.megatest.config
==================================================================
--- supplemental.megatest.config
+++ supplemental.megatest.config
@@ -1,3 +1,19 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
 [tests-paths]
 nada #{getenv MT_RUN_AREA_HOME}/moretests
 

Index: synchash.scm
==================================================================
--- synchash.scm
+++ synchash.scm
@@ -1,14 +1,23 @@
 ;;======================================================================
 ;; Copyright 2006-2012, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
 ;;======================================================================
 
 ;;======================================================================
 ;; A hash of hashes that can be kept in sync by sending minial deltas
 ;;======================================================================

Index: task_records.scm
==================================================================
--- task_records.scm
+++ task_records.scm
@@ -1,14 +1,22 @@
 ;;======================================================================
 ;; Copyright 2006-2012, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
 ;;======================================================================
 
 ;; make-vector-record tasks task id action owner state target name test item params creation_time execution_time 
 (define (make-tasks:task)(make-vector 11))
 (define-inline (tasks:task-get-id               vec)    (vector-ref  vec 0))

Index: tasks.scm
==================================================================
--- tasks.scm
+++ tasks.scm
@@ -1,13 +1,22 @@
 ;; Copyright 2006-2012, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
 
 ;;  strftime('%m/%d/%Y %H:%M:%S','now','localtime')
 
 (use sqlite3 srfi-1 posix regex regex-case srfi-69 dot-locking format)
 (import (prefix sqlite3 sqlite3:))
@@ -36,24 +45,24 @@
 	(handle-exceptions
 	 exn
 	 (begin
 	   (print-call-chain (current-error-port))
 	   (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn))
-	   (debug:print 0 *default-log-port* " exn=" (condition->list exn))
+	   (debug:print 5 *default-log-port* " exn=" (condition->list exn))
 	   (debug:print 0 *default-log-port* "tasks:wait-on-journal failed. Continuing on, you can ignore this call-chain")
 	   #t) ;; if stuff goes wrong just allow it to move on
-	 (let loop ((journal-exists (file-exists? fullpath))
+	 (let loop ((journal-exists (common:file-exists? fullpath))
 		    (count          n)) ;; wait ten times ...
 	   (if journal-exists
 	       (begin
 		 (if (and waiting-msg
 			  (eq? (modulo n 30) 0))
 		     (debug:print 0 *default-log-port* waiting-msg))
 		 (if (> count 0)
 		     (begin
 		       (thread-sleep! 1)
-		       (loop (file-exists? fullpath)
+		       (loop (common:file-exists? fullpath)
 			     (- count 1)))
 		     (begin
 		       (debug:print 0 *default-log-port* "ERROR: removing the journal file " fullpath ", this is not good. Look for disk full, write access and other issues.")
 		       (if remove (system (conc "rm -rf " fullpath)))
 		       #f)))
@@ -64,11 +73,11 @@
 		    (configf:lookup *configdat* "setup" "dbdir")
 		    (conc (common:get-linktree) "/.db"))))
     (handle-exceptions
      exn
      (begin
-       (debug:print-error 0 *default-log-port* "Couldn't create path to " dbdir)
+       (debug:print-error 0 *default-log-port* "Couldn't create path to " dbdir ", exn=" exn)
        (exit 1))
      (if (not (directory? dbdir))(create-directory dbdir #t)))
     dbdir))
 
 ;; If file exists AND
@@ -87,28 +96,28 @@
        exn
        (if (> numretries 0)
 	   (begin
 	     (print-call-chain (current-error-port))
 	     (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn))
-	     (debug:print 0 *default-log-port* " exn=" (condition->list exn))
+	     (debug:print 5 *default-log-port* " exn=" (condition->list exn))
 	     (thread-sleep! 1)
 	     (tasks:open-db numretries (- numretries 1)))
 	   (begin
 	     (print-call-chain (current-error-port))
 	     (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn))
-	     (debug:print 0 *default-log-port* " exn=" (condition->list exn))))
+	     (debug:print 5 *default-log-port* " exn=" (condition->list exn))))
        (let* ((dbpath        (db:dbfile-path )) ;; (tasks:get-task-db-path))
 	      (dbfile       (conc dbpath "/monitor.db"))
 	      (avail        (tasks:wait-on-journal dbpath 10)) ;; wait up to about 10 seconds for the journal to go away
-	      (exists       (file-exists? dbpath))
+	      (exists       (common:file-exists? dbpath))
 	      (write-access (file-write-access? dbpath))
 	      (mdb          (cond ;; what the hek is *toppath* doing here?
 			     ((and (string? *toppath*)(file-write-access? *toppath*))
 			      (sqlite3:open-database dbfile))
 			     ((file-read-access? dbpath)    (sqlite3:open-database dbfile))
 			     (else (sqlite3:open-database ":memory:")))) ;; (never-give-up-open-db dbpath))
-	      (handler      (make-busy-timeout 36000)))
+	      (handler      (sqlite3:make-busy-timeout 36000)))
 	 (if (and exists
 		  (not write-access))
 	     (set! *db-write-access* write-access)) ;; only unset so other db's also can use this control
 	 (sqlite3:set-busy-handler! mdb handler)
 	 (db:set-sync mdb) ;; (sqlite3:execute mdb (conc "PRAGMA synchronous = 0;"))
@@ -183,15 +192,27 @@
 ;; no elegance here ...
 ;;
 (define (tasks:kill-server hostname pid #!key (kill-switch ""))
   (debug:print-info 0 *default-log-port* "Attempting to kill server process " pid " on host " hostname)
   (setenv "TARGETHOST" hostname)
-  (setenv "TARGETHOST_LOGF" "server-kills.log")
-  (system (conc "nbfake kill "kill-switch" "pid))
+  (let* ((logdir (if (directory-exists? "logs")
+                    "logs/"
+                    ""))
+         (logfile (if logdir (conc "logs/server-"pid"-"hostname".log") #f))
+         (gzfile  (if logfile (conc logfile ".gz"))))
+    (setenv "TARGETHOST_LOGF" (conc logdir "server-kills.log"))
+
+    (system (conc "nbfake kill "kill-switch" "pid))
 
-  (unsetenv "TARGETHOST_LOGF")
-  (unsetenv "TARGETHOST"))
+    (when logfile
+      (thread-sleep! 0.5)
+      (if (common:file-exists? gzfile) (delete-file gzfile))
+      (system (conc "gzip " logfile))
+      
+      (unsetenv "TARGETHOST_LOGF")
+      (unsetenv "TARGETHOST"))))
+    
  
 ;;======================================================================
 ;; M O N I T O R S
 ;;======================================================================
 
@@ -258,11 +279,11 @@
      "SELECT count(id) FROM monitors WHERE last_update < (strftime('%s','now') - 300) AND username=?;"
      (car (user-information (current-user-id))))
     res))
 
 ;; 
-(define (tasks:start-monitor db mdb)
+#;(define (tasks:start-monitor db mdb)
   (if (> (tasks:get-num-alive-monitors mdb) 2) ;; have two running, no need for more
       (debug:print-info 1 *default-log-port* "Not starting monitor, already have more than two running")
       (let* ((megatestdb     (conc *toppath* "/megatest.db"))
 	     (monitordbf     (conc (db:dbfile-path #f) "/monitor.db"))
 	     (last-db-update 0)) ;; (file-modification-time megatestdb)))
@@ -422,23 +443,23 @@
   (db:with-db
    dbstruct #f #t
    (lambda (db)
      (sqlite3:execute db (conc "DELETE FROM tasks_queue WHERE id IN (" task-ids ");")))))
 
-(define (tasks:process-queue dbstruct)
-  (let* ((task   (tasks:snag-a-task dbstruct))
-	 (action (if task (tasks:task-get-action task) #f)))
-    (if action (print "tasks:process-queue task: " task))
-    (if action
-	(case (string->symbol action)
-	  ((run)       (tasks:start-run     dbstruct task))
-	  ((remove)    (tasks:remove-runs   dbstruct task))
-	  ((lock)      (tasks:lock-runs     dbstruct task))
-	  ;; ((monitor)   (tasks:start-monitor db task))
-	  ((rollup)    (tasks:rollup-runs   dbstruct task))
-	  ((updatemeta)(tasks:update-meta   dbstruct task))
-	  ((kill)      (tasks:kill-monitors dbstruct task))))))
+;; (define (tasks:process-queue dbstruct)
+;;   (let* ((task   (tasks:snag-a-task dbstruct))
+;; 	 (action (if task (tasks:task-get-action task) #f)))
+;;     (if action (print "tasks:process-queue task: " task))
+;;     (if action
+;; 	(case (string->symbol action)
+;; 	  ((run)       (tasks:start-run     dbstruct task))
+;; 	  ((remove)    (tasks:remove-runs   dbstruct task))
+;; 	  ((lock)      (tasks:lock-runs     dbstruct task))
+;; 	  ;; ((monitor)   (tasks:start-monitor db task))
+;; 	  #;((rollup)    (tasks:rollup-runs   dbstruct task))
+;; 	  ((updatemeta)(tasks:update-meta   dbstruct task))
+;; 	  #;((kill)      (tasks:kill-monitors dbstruct task))))))
 
 (define (tasks:tasks->text tasks)
   (let ((fmtstr "~10a~10a~10a~12a~20a~12a~12a~10a"))
     (conc (format #f fmtstr "id" "action" "owner" "state" "target" "runname" "testpatts" "params") "\n"
 	  (string-intersperse 
@@ -448,11 +469,11 @@
 			  (tasks:task-get-action task)
 			  (tasks:task-get-owner  task)
 			  (tasks:task-get-state  task)
 			  (tasks:task-get-target task)
 			  (tasks:task-get-name   task)
-			  (tasks:task-get-test   task)
+			  (tasks:task-get-testpatt task)
 			  ;; (tasks:task-get-item   task)
 			  (tasks:task-get-params task)))
 		tasks) "\n"))))
    
 (define (tasks:set-state dbstruct task-id state)
@@ -606,122 +627,471 @@
 	  (case modifier
 	    ((none)(loop (conc (current-user-name) "_" area-name) 'user))
 	    ((user)(loop (conc (substring (common:get-area-path-signature) 0 4)
 			       area-name) 'areasig))
 	    (else #f)))))) ;; give up
+
+(define (task:print-runtime run-times saperator)
+(for-each
+    (lambda (run-time-info)
+     (let* ((run-name  (vector-ref run-time-info 0))
+            (run-time  (vector-ref run-time-info 1))
+            (target  (vector-ref run-time-info 2)))
+        (print target saperator run-name saperator run-time )))
+   run-times))
+
+(define (task:print-runtime-as-json run-times)
+ (let loop ((run-time-info (car run-times))
+            (rema (cdr run-times)) 
+            (str ""))
+     (let* ((run-name  (vector-ref run-time-info 0))
+            (run-time  (vector-ref run-time-info 1))
+            (target  (vector-ref run-time-info 2)))
+        ;(print (not (equal? str "")))
+        (if (not (equal? str "")) 
+            (set! str (conc str ",")))
+        (if (null? rema)
+		(print "[" str "{target:" target ",run-name:" run-name ", run-time:" run-time "}]")
+            (loop (car rema) (cdr rema) (conc str "{target:" target ", run-name:" run-name ", run-time:" run-time "}"))))))
+
+(define (task:get-run-times)
+   (let* ( 
+           (run-patt (if (args:get-arg "-run-patt")
+                        (args:get-arg "-run-patt")
+                        "%"))
+           (target-patt (if (args:get-arg "-target-patt")
+                        (args:get-arg "-target-patt")
+                        "%"))
+ 
+           (run-times  (rmt:get-run-times  run-patt target-patt )))
+   (if (eq? (length run-times) 0)
+     (begin
+       (print "Data not found!!")
+       (exit)))
+   (if (equal? (args:get-arg "-dumpmode") "json")
+       (task:print-runtime-as-json run-times)
+         (if (equal? (args:get-arg "-dumpmode") "csv")
+	     (task:print-runtime run-times ",")
+	     (task:print-runtime run-times "  ")))))
+
+
+(define (task:print-testtime test-times saperator)
+(for-each
+    (lambda (test-time-info)
+     (let* ((test-name  (vector-ref test-time-info 0))
+            (test-time  (vector-ref test-time-info 2))
+            (test-item  (if (eq? (string-length (vector-ref test-time-info 1)) 0)
+                               "N/A"
+				(vector-ref test-time-info 1))))
+        (print  test-name saperator test-item saperator test-time )))
+   test-times))
+
+(define (task:print-testtime-as-json test-times)
+ (let loop ((test-time-info (car test-times))
+            (rema (cdr test-times)) 
+            (str ""))
+     (let* ((test-name  (vector-ref test-time-info 0))
+            (test-time  (vector-ref test-time-info 2))
+            (item  (vector-ref test-time-info 1)))
+        ;(print (not (equal? str "")))
+        (if (not (equal? str "")) 
+            (set! str (conc str ",")))
+        (if (null? rema)
+		(print "[" str "{test-name:" test-name ", item-path:" item ", test-time:" test-time "}]")
+            (loop (car rema) (cdr rema) (conc str "{test-name:" test-name ", item-path:" item ", test-time:" test-time "}"))))))
+
+
+ (define (task:get-test-times)
+   (let* ((runname (if (args:get-arg "-runname")
+                        (args:get-arg "-runname")
+                        #f))
+           (target (if (args:get-arg "-target")
+                        (args:get-arg "-target")
+                        #f))
+ 
+           (test-times  (rmt:get-test-times  runname target )))
+   (if (not runname)
+      (begin
+      (print "Error: Missing argument -runname")
+      (exit))) 
+    (if (string-contains runname "%")
+      (begin
+      (print "Error: Invalid runname, '%' not allowed  (" runname ") ")
+      (exit)))
+    (if (not target)
+      (begin
+      (print "Error: Missing argument -target")
+      (exit)))
+     (if  (string-contains target "%")
+      (begin
+      (print "Error: Invalid target, '%' not allowed  (" target ") ")
+      (exit)))
+ 
+   (if (eq? (length test-times) 0)
+     (begin
+       (print "Data not found!!")
+       (exit)))
+   (if (equal? (args:get-arg "-dumpmode") "json")
+       (task:print-testtime-as-json test-times)
+         (if (equal? (args:get-arg "-dumpmode") "csv")
+	     (task:print-testtime test-times ",")
+	     (task:print-testtime test-times "  ")))))
+
+
 
 ;; gets mtpg-run-id and syncs the record if different
 ;;
-(define (tasks:run-id->mtpg-run-id dbh cached-info run-id)
+(define (tasks:run-id->mtpg-run-id dbh cached-info run-id area-info smallest-last-update-time)
   (let* ((runs-ht (hash-table-ref cached-info 'runs))
-	 (runinf  (hash-table-ref/default runs-ht run-id #f)))
+	 (runinf  (hash-table-ref/default runs-ht run-id #f))
+         (area-id (vector-ref area-info 0)))
     (if runinf
 	runinf ;; already cached
 	(let* ((run-dat    (rmt:get-run-info run-id))               ;; NOTE: get-run-info returns a vector < row header >
 	       (run-name   (rmt:get-run-name-from-id run-id))
 	       (row        (db:get-rows run-dat))                   ;; yes, this returns a single row
 	       (header     (db:get-header run-dat))
-	       (state      (db:get-value-by-header row header "state "))
+	       (state      (db:get-value-by-header row header "state"))
 	       (status     (db:get-value-by-header row header "status"))
 	       (owner      (db:get-value-by-header row header "owner"))
 	       (event-time (db:get-value-by-header row header "event_time"))
 	       (comment    (db:get-value-by-header row header "comment"))
 	       (fail-count (db:get-value-by-header row header "fail_count"))
 	       (pass-count (db:get-value-by-header row header "pass_count"))
-	       (contour    (if (args:get-arg "-prepend-contour") (db:get-value-by-header row header "contour")))
+	       (db-contour (db:get-value-by-header row header "contour"))
+	       (contour    (if (args:get-arg "-prepend-contour") 
+			       (if (and db-contour (not (equal? db-contour ""))  (string? db-contour )) 
+				   (begin 
+				     (debug:print-info 1 *default-log-port*  "db-contour") 
+				     db-contour)
+				   (args:get-arg "-contour"))))
+	       (run-tag (if (args:get-arg "-run-tag")
+                            (args:get-arg "-run-tag")
+			    ""))
+	       (last-update (db:get-value-by-header row header "last_update"))
 	       (keytarg    (if (or (args:get-arg "-prepend-contour") (args:get-arg "-prefix-target"))
-	       			(conc "MT_CONTOUR/MT_AREA/" (string-intersperse (rmt:get-keys) "/")) (string-intersperse (rmt:get-keys) "/"))) ;; e.g. version/iteration/platform
+			       (conc "MT_CONTOUR/MT_AREA/" (string-intersperse (rmt:get-keys) "/")) (string-intersperse (rmt:get-keys) "/"))) ;; e.g. version/iteration/platform
 	       (target     (if (or (args:get-arg "-prepend-contour") (args:get-arg "-prefix-target")) 
-	       			(conc (or (args:get-arg "-prefix-target") (conc contour "/" (common:get-area-name) "/")) (rmt:get-target run-id)) (rmt:get-target run-id)))                 ;; e.g. v1.63/a3e1/ubuntu
+			       (conc (or (args:get-arg "-prefix-target") (conc contour "/" (common:get-area-name) "/")) (rmt:get-target run-id)) (rmt:get-target run-id)))                 ;; e.g. v1.63/a3e1/ubuntu
 	       (spec-id    (pgdb:get-ttype dbh keytarg))
-	       (new-run-id (pgdb:get-run-id dbh spec-id target run-name))
-
-
-
-	       ;; (area-id    (db:get-value-by-header row header "area_id)"))
-	       )
+	       (publish-time (if (args:get-arg "-cp-eventtime-to-publishtime")
+				 event-time
+				 (current-seconds))) 
+	       (new-run-id (pgdb:get-run-id dbh spec-id target run-name area-id)))
 	  (if new-run-id
 	      (begin ;; let ((run-record (pgdb:get-run-info dbh new-run-id))
 		(hash-table-set! runs-ht run-id new-run-id)
 		;; ensure key fields are up to date
+		;; if last_update == pgdb_last_update do not update smallest-last-update-time  
+		(let* ((pgdb-last-update (pgdb:get-run-last-update dbh new-run-id))
+		       (smallest-time (hash-table-ref/default smallest-last-update-time "smallest-time" #f)))
+		  (if (and  (> last-update pgdb-last-update) (or (not smallest-time) (< last-update smallest-time)))
+		      (hash-table-set! smallest-last-update-time "smallest-time" last-update)))
 		(pgdb:refresh-run-info
 		 dbh
 		 new-run-id
-		 state status owner event-time comment fail-count pass-count)
-		new-run-id)
-	      (if (handle-exceptions
+		 state status owner event-time comment fail-count pass-count area-id last-update publish-time)
+		(debug:print-info 0 *default-log-port* "Working on run-id " run-id " pgdb-id "  new-run-id )
+		(if (not (equal? run-tag ""))
+		    (task:add-run-tag dbh new-run-id run-tag))
+		new-run-id) 
+	      
+	      (if (equal? state "deleted")
+		  (begin 
+		    (debug:print-info 1 *default-log-port*  "Warning: Run with id " run-id " was created after previous sync and deleted before the sync") #f)
+		  (if (handle-exceptions
+		       exn
+		       (begin (print-call-chain)
+			      (print ((condition-property-accessor 'exn 'message) exn))     
+			      #f)
+		       
+		       (pgdb:insert-run
+			dbh
+			spec-id target run-name state status owner event-time comment fail-count pass-count  area-id last-update publish-time))
+		      (let* ((smallest-time (hash-table-ref/default smallest-last-update-time "smallest-time" #f)))
+			(if (or (not smallest-time) (< last-update smallest-time))
+			    (hash-table-set! smallest-last-update-time "smallest-time" last-update))
+			(tasks:run-id->mtpg-run-id dbh cached-info run-id area-info smallest-last-update-time))
+		      #f)))))))
+
+(define (task:add-run-tag dbh run-id tag) 
+  (let* ((tag-info (pgdb:get-tag-info-by-name dbh tag)))
+   (if (not tag-info)
+     (begin   
+     (if (handle-exceptions
+	   exn
+	   (begin 
+               (debug:print-info 1 *default-log-port*  ((condition-property-accessor 'exn 'message) exn))     
+	   #f)
+	   (pgdb:insert-tag  dbh   tag))
+                       (set! tag-info (pgdb:get-tag-info-by-name dbh tag))
+		  #f)))
+     ;;add to area_tags
+     (handle-exceptions
+	   exn
+	   (begin 
+               (debug:print-info 1 *default-log-port*  ((condition-property-accessor 'exn 'message) exn))     
+	   #f)
+           (if (not (pgdb:is-run-taged-with-a-tag dbh (vector-ref tag-info 0)  run-id))  
+	   (pgdb:insert-run-tag  dbh   (vector-ref tag-info 0)  run-id)))))
+
+
+(define (tasks:sync-test-steps dbh cached-info test-step-ids smallest-last-update-time)
+ ; (print "Sync Steps " test-step-ids )
+  (let ((test-ht (hash-table-ref cached-info 'tests))
+        (step-ht (hash-table-ref cached-info 'steps)))
+    (for-each
+     (lambda (test-step-id)
+        (let* ((test-step-info  (rmt:get-steps-info-by-id test-step-id))
+               (step-id (tdb:step-get-id test-step-info))
+               (test-id  (tdb:step-get-test_id    test-step-info))   
+	       (stepname (tdb:step-get-stepname  test-step-info))
+	       (state (tdb:step-get-state test-step-info))	
+	       (status (tdb:step-get-status test-step-info))	
+	       (event_time (tdb:step-get-event_time  test-step-info))	
+	       (comment  (tdb:step-get-comment test-step-info))	
+	       (logfile (tdb:step-get-logfile test-step-info))	
+         (last-update (tdb:step-get-last_update test-step-info))
+	       (pgdb-test-id  (hash-table-ref/default test-ht test-id #f))
+				 (smallest-time (hash-table-ref/default smallest-last-update-time "smallest-time" #f))
+         (pgdb-step-id (if pgdb-test-id 
+                         (pgdb:get-test-step-id dbh pgdb-test-id stepname state)
+                          #f)))
+    (if step-id
+      (begin  
+        (if pgdb-test-id
+           (begin 
+                (if  pgdb-step-id
+                   (begin
+                    (debug:print-info 1 *default-log-port*  "Updating existing test-step with test-id: " test-id " and step-id " step-id " pgdb test id: " pgdb-test-id " pgdb step id " pgdb-step-id )
+										(let* ((pgdb-last-update (pgdb:get-test-step-last-update dbh pgdb-step-id)))
+         (if (and  (> last-update pgdb-last-update) (or (not smallest-time) (< last-update smallest-time)))
+        (hash-table-set! smallest-last-update-time "smallest-time" last-update))) 
+                    (pgdb:update-test-step dbh pgdb-step-id pgdb-test-id stepname state status event_time comment logfile last-update))
+                    (begin
+ 		      (debug:print-info 1 *default-log-port*  "Inserting test-step with test-id: " test-id " and step-id " step-id  " pgdb test id: " pgdb-test-id)
+                     (if (or (not smallest-time) (< last-update smallest-time))
+        				      (hash-table-set! smallest-last-update-time "smallest-time" last-update))
+                      (pgdb:insert-test-step dbh pgdb-test-id stepname state status event_time comment logfile last-update )
+                      (set! pgdb-step-id  (pgdb:get-test-step-id dbh pgdb-test-id stepname state))))
+                (hash-table-set! step-ht step-id pgdb-step-id ))
+           (debug:print-info 1 *default-log-port*  "Error: Test not cashed")))
+      (debug:print-info 1 *default-log-port*  "Error: Could not get test step info for step id " test-step-id ))))	;; this is a wierd senario need to debug      	
+   test-step-ids)))
+
+(define (tasks:sync-test-gen-data dbh cached-info test-data-ids smallest-last-update-time)
+  (let ((test-ht (hash-table-ref cached-info 'tests))
+        (data-ht (hash-table-ref cached-info 'data)))
+    (for-each
+     (lambda (test-data-id)
+        (let* ((test-data-info  (rmt:get-data-info-by-id test-data-id))
+               (data-id (db:test-data-get-id  test-data-info))
+               (test-id  (db:test-data-get-test_id   test-data-info))   
+	       (category  (db:test-data-get-category  test-data-info))
+	       (variable  (db:test-data-get-variable test-data-info))	
+	       (value (db:test-data-get-value  test-data-info))	
+               (expected (db:test-data-get-expected  test-data-info))
+               (tol (db:test-data-get-tol  test-data-info))
+               (units (db:test-data-get-units  test-data-info))     
+	       (comment  (db:test-data-get-comment test-data-info))	
+               (status (db:test-data-get-status test-data-info))	
+	       (type (db:test-data-get-type test-data-info))
+				 (last-update (db:test-data-get-last_update test-data-info))
+				 (smallest-time (hash-table-ref/default smallest-last-update-time "smallest-time" #f))
+   	
+	       (pgdb-test-id  (hash-table-ref/default test-ht test-id #f))
+               (pgdb-data-id (if pgdb-test-id 
+                                 (pgdb:get-test-data-id dbh pgdb-test-id category variable)
+                                  #f)))
+    (if data-id
+      (begin
+        (if pgdb-test-id
+           (begin 
+                (if  pgdb-data-id
+                   (begin
+                    (debug:print-info 1 *default-log-port*  "Updating existing test-data with test-id: " test-id " and  data-id " data-id " pgdb test id: " pgdb-test-id " pgdb data id " pgdb-data-id)
+                    (let* ((pgdb-last-update (pgdb:get-test-data-last-update dbh pgdb-data-id)))
+         (if (and  (>  last-update pgdb-last-update) (or (not smallest-time) (< last-update smallest-time)))
+        (hash-table-set! smallest-last-update-time "smallest-time" last-update))) 
+                    (pgdb:update-test-data dbh pgdb-data-id pgdb-test-id  category variable value expected tol units comment status type last-update))
+                    (begin
+ 		      (debug:print-info 1 *default-log-port*  "Inserting test-data with test-id: " test-id " and data-id " data-id " pgdb test id: " pgdb-test-id)
+                       (if (handle-exceptions
 		      exn
-		      (begin (print-call-chain) #f)
-		    (pgdb:insert-run
-		     dbh
-		     spec-id target run-name state status owner event-time comment fail-count pass-count)) ;; area-id))
-		  (tasks:run-id->mtpg-run-id dbh cached-info run-id)
-		  #f))))))
-
-(define (tasks:sync-tests-data dbh cached-info test-ids)
+		      (begin (print-call-chain)
+                              (print ((condition-property-accessor 'exn 'message) exn))     
+			#f)
+                     
+                    (pgdb:insert-test-data dbh pgdb-test-id category variable value expected tol units comment status type last-update))
+		       ;(tasks:run-id->mtpg-run-id dbh cached-info run-id area-info)
+                      (begin
+                      ;(pgdb:insert-test-data dbh pgdb-test-id category variable value expected tol units comment status type )
+											(if (or (not smallest-time) (< last-update smallest-time))
+        								(hash-table-set! smallest-last-update-time "smallest-time" last-update))
+                      (set! pgdb-data-id  (pgdb:get-test-data-id dbh pgdb-test-id  category variable)))
+		   #f)))
+                (hash-table-set! data-ht data-id pgdb-data-id ))
+             (begin
+                 (debug:print-info 1 *default-log-port*  "Error: Test not in pgdb"))))
+
+      (debug:print-info 1 *default-log-port*  "Error: Could not get test data info for data id " test-data-id ))))	;; this is a wierd senario need to debug      	
+   test-data-ids)))
+
+
+
+(define (tasks:sync-tests-data dbh cached-info test-ids area-info smallest-last-update-time)
   (let ((test-ht (hash-table-ref cached-info 'tests)))
     (for-each
      (lambda (test-id)
+      ; (print test-id)
        (let* ((test-info    (rmt:get-test-info-by-id #f test-id))
 	      (run-id       (db:test-get-run_id    test-info)) ;; look these up in db_records.scm
 	      (test-id      (db:test-get-id        test-info))
 	      (test-name    (db:test-get-testname  test-info))
 	      (item-path    (db:test-get-item-path test-info))
 	      (state        (db:test-get-state     test-info))
 	      (status       (db:test-get-status    test-info))
 	      (host         (db:test-get-host      test-info))
+        (pid          (db:test-get-process_id test-info)) 
 	      (cpuload      (db:test-get-cpuload   test-info))
 	      (diskfree     (db:test-get-diskfree  test-info))
 	      (uname        (db:test-get-uname     test-info))
 	      (run-dir      (db:test-get-rundir    test-info))
 	      (log-file     (db:test-get-final_logf test-info))
 	      (run-duration (db:test-get-run_duration test-info))
 	      (comment      (db:test-get-comment   test-info))
 	      (event-time   (db:test-get-event_time test-info))
 	      (archived     (db:test-get-archived  test-info))
-	      (pgdb-run-id  (tasks:run-id->mtpg-run-id dbh cached-info run-id))
-	      (pgdb-test-id (pgdb:get-test-id dbh pgdb-run-id test-name item-path)))
+        (last-update  (db:test-get-last_update  test-info))
+	      (pgdb-run-id  (tasks:run-id->mtpg-run-id dbh cached-info run-id area-info smallest-last-update-time))
+        (smallest-time (hash-table-ref/default smallest-last-update-time "smallest-time" #f))       
+	      (pgdb-test-id (if pgdb-run-id 
+				(begin
+                                  ;(print pgdb-run-id)    
+                                 (pgdb:get-test-id dbh pgdb-run-id test-name item-path))
+                                 #f)))
 	 ;; "id"           "run_id"        "testname"  "state"      "status"      "event_time"
 	 ;; "host"         "cpuload"       "diskfree"  "uname"      "rundir"      "item_path"
 	 ;; "run_duration" "final_logf"    "comment"   "shortdir"   "attemptnum"  "archived"
-	 (if pgdb-test-id ;; have a record
+         (if pgdb-run-id
+           (begin
+	   (if pgdb-test-id ;; have a record
 	     (begin ;; let ((key-name (conc run-id "/" test-name "/" item-path)))
-	       (hash-table-set! test-ht test-id pgdb-test-id)
-	       (print "Updating existing test with run-id: " run-id " and test-id: " test-id)
-	       (pgdb:update-test dbh pgdb-test-id pgdb-run-id test-name item-path state status host cpuload diskfree uname run-dir log-file run-duration comment event-time archived))
-	     (pgdb:insert-test dbh pgdb-run-id test-name item-path state status host cpuload diskfree uname run-dir log-file run-duration comment event-time archived))
-	 ))
+	       (debug:print-info 0 *default-log-port*  "Updating existing test with run-id: " run-id " and test-id: " test-id " pgdb run id: " pgdb-run-id "  pgdb-test-id "  pgdb-test-id)
+         (let* ((pgdb-last-update (pgdb:get-test-last-update dbh pgdb-test-id)))
+         (if (and  (>  last-update pgdb-last-update) (or (not smallest-time) (< last-update smallest-time))) ;;if last-update is same as pgdb-last-update then it is safe to assume the records are identical and we can use a larger last update time.
+        (hash-table-set! smallest-last-update-time "smallest-time" last-update))) 
+	       (pgdb:update-test dbh pgdb-test-id pgdb-run-id test-name item-path state status host cpuload diskfree uname run-dir log-file run-duration comment event-time archived last-update pid))
+	     (begin 
+           (debug:print-info 0 *default-log-port*  "Inserting test with run-id: " run-id " and test-id: " test-id  " pgdb run id: " pgdb-run-id)
+           (pgdb:insert-test dbh pgdb-run-id test-name item-path state status host cpuload diskfree uname run-dir log-file run-duration comment event-time archived last-update pid)
+            (if (or (not smallest-time) (< last-update smallest-time))
+        				(hash-table-set! smallest-last-update-time "smallest-time" last-update))
+           (set! pgdb-test-id (pgdb:get-test-id dbh pgdb-run-id test-name item-path))))
+           (hash-table-set! test-ht test-id pgdb-test-id))
+           (debug:print-info 1 *default-log-port*  "WARNING: Skipping run with run-id:" run-id ". This run was created after privious sync and removed before this sync."))))
      test-ids)))
+
+(define (task:add-area-tag dbh area-info tag) 
+  (let* ((tag-info (pgdb:get-tag-info-by-name dbh tag)))
+   (if (not tag-info)
+     (begin   
+     (if (handle-exceptions
+	   exn
+	   (begin 
+               (debug:print-info 1 *default-log-port*  ((condition-property-accessor 'exn 'message) exn))     
+	   #f)
+	   (pgdb:insert-tag  dbh   tag))
+                       (set! tag-info (pgdb:get-tag-info-by-name dbh tag))
+		  #f)))
+     ;;add to area_tags
+     (handle-exceptions
+	   exn
+	   (begin 
+               (debug:print-info 1 *default-log-port*  ((condition-property-accessor 'exn 'message) exn))     
+	   #f)
+           (if (not (pgdb:is-area-taged-with-a-tag dbh (vector-ref tag-info 0)  (vector-ref area-info 0)))  
+	   (pgdb:insert-area-tag  dbh   (vector-ref tag-info 0)  (vector-ref area-info 0))))))
+
+(define (tasks:sync-run-data dbh cached-info run-ids area-info smallest-last-update-time) 
+  (for-each
+     (lambda (run-id)
+      (debug:print-info 1 *default-log-port*   "Check if run with " run-id " needs to be synced" )
+       (tasks:run-id->mtpg-run-id dbh cached-info run-id area-info smallest-last-update-time))
+     run-ids))
+
 
 ;; get runs changed since last sync
 ;; (define (tasks:sync-test-data dbh cached-info area-info)
 ;;   (let* ((
 
 (define (tasks:sync-to-postgres configdat dest)
+  (print "In sync")
   (let* ((dbh         (pgdb:open configdat dbname: dest))
 	 (area-info   (pgdb:get-area-by-path dbh *toppath*))
 	 (cached-info (make-hash-table))
-	 (start       (current-seconds)))
+	 (start       (current-seconds))
+   (test-patt   (if (args:get-arg "-testpatt")
+											(args:get-arg "-testpatt")
+                      "%"))
+   (target         (if (args:get-arg "-target")
+														 (args:get-arg "-target")
+													#f))
+    (run-name         (if (args:get-arg "-runname")
+														 (args:get-arg "-runname")
+													#f)))
+     (if (and target  (not run-name))
+       (begin
+					(print "Error: Provide runname")
+          (exit 1)))
+     (if (and (not target)  run-name)
+       (begin
+					(print "Error: Provide target")
+          (exit 1)))
+    ;(print "123")
+    ;(exit 1) 
     (for-each (lambda (dtype)
 		(hash-table-set! cached-info dtype (make-hash-table)))
-	      '(runs targets tests))
+	      '(runs targets tests steps data))
     (hash-table-set! cached-info 'start start) ;; when done we'll set sync times to this
     (if area-info
 	(let* ((last-sync-time (vector-ref area-info 3))
-	       (changed        (rmt:get-changed-record-ids last-sync-time))
+	       (smallest-last-update-time  (make-hash-table))
+         (changed      (if (and target run-name)
+                            (rmt:get-run-record-ids target run-name (rmt:get-keys) test-patt)
+                            (rmt:get-changed-record-ids last-sync-time)))
 	       (run-ids        (alist-ref 'runs       changed))
 	       (test-ids       (alist-ref 'tests      changed))
 	       (test-step-ids  (alist-ref 'test_steps changed))
 	       (test-data-ids  (alist-ref 'test_data  changed))
-	       (run-stat-ids   (alist-ref 'run_stats  changed)))
-	  (print "area-info: " area-info)
-	  (if (not (null? test-ids))
+	       (run-stat-ids   (alist-ref 'run_stats  changed))
+         (area-tag    (if (args:get-arg "-area-tag") 
+                                 (args:get-arg "-area-tag")
+                                 (if (args:get-arg "-area") 
+                                   (args:get-arg "-area") 
+                                   ""))))
+           (if (and (equal? area-tag "") (not (pgdb:is-area-taged dbh (vector-ref area-info 0))))
+            (set! area-tag *default-area-tag*)) 
+           (if (not (equal? area-tag "")) 
+             (task:add-area-tag dbh area-info area-tag)) 
+	  (if (or (not (null? test-ids)) (not (null? run-ids)))
 	      (begin
-		(print "Syncing " (length test-ids) " changed tests")
-		(tasks:sync-tests-data dbh cached-info test-ids)))
-	  (pgdb:write-sync-time dbh area-info start))
+                (debug:print-info 0 *default-log-port*  "syncing runs")   
+	              (tasks:sync-run-data dbh cached-info run-ids area-info smallest-last-update-time) 
+                (debug:print-info 0 *default-log-port*  "syncing tests")
+		            (tasks:sync-tests-data dbh cached-info test-ids area-info smallest-last-update-time)
+                (debug:print-info 0 *default-log-port*  "syncing test steps")
+                (tasks:sync-test-steps dbh cached-info test-step-ids smallest-last-update-time)
+								(debug:print-info 0 *default-log-port*  "syncing test data")
+                (tasks:sync-test-gen-data dbh cached-info test-data-ids smallest-last-update-time)
+                (print "----------done---------------")))
+     (let*  ((smallest-time (hash-table-ref/default smallest-last-update-time "smallest-time" #f)))
+     (debug:print-info 0 "smallest-time :" smallest-time  " last-sync-time " last-sync-time)
+    (if (not (and target run-name)) 
+	  (if (or (and smallest-time (> smallest-time last-sync-time)) (and smallest-time (eq? last-sync-time 0)))
+				(pgdb:write-sync-time dbh area-info smallest-time))))) ;;this needs to be changed
 	(if (tasks:set-area dbh configdat)
 	    (tasks:sync-to-postgres configdat dest)
 	    (begin
 	      (debug:print 0 *default-log-port* "ERROR: unable to create an area record")
 	      #f)))))
 

ADDED   tcmt.scm
Index: tcmt.scm
==================================================================
--- /dev/null
+++ tcmt.scm
@@ -0,0 +1,384 @@
+;; Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
+;;======================================================================
+;;
+;; Wrapper to enable running Megatest flows under teamcity
+;;
+;;  1. Run the megatest process and pass it all the needed parameters
+;;  2. Every five seconds check for state/status changes and print the info
+;;
+
+(use srfi-1 posix srfi-69 srfi-18 regex defstruct)
+
+(use trace)
+;; (trace-call-sites #t)
+
+(declare (uses margs))
+(declare (uses rmt))
+(declare (uses common))
+;; (declare (uses megatest-version))
+
+(include "megatest-version.scm")
+(include "megatest-fossil-hash.scm")
+(include "db_records.scm")
+
+(define origargs (cdr (argv)))
+(define remargs (args:get-args
+		 (argv)
+		 `( "-target"
+		    "-reqtarg"
+		    "-runname"
+		    "-delay"   ;; how long to wait for unexpected changes to 
+		    )
+		 `("-tc-repl"
+		   )
+		 args:arg-hash
+		 0))
+
+(defstruct testdat
+  (tc-type #f)
+  (state   #f)
+  (status  #f)
+  (overall #f)
+  (flowid  #f)
+  tctname
+  tname
+  (event-time #f)
+  details
+  comment
+  duration
+  (start-printed #f)
+  (end-printed   #f))
+
+;;======================================================================
+;; GLOBALS
+;;======================================================================
+
+;; Gotta have a global? Stash it in the *global* hash table.
+;;
+(define *global* (make-hash-table))
+
+(define (tcmt:print tdat flush-mode)
+  (let* ((comment  (if (testdat-comment tdat)
+		       (conc " message='" (testdat-comment tdat) "'")
+		       ""))
+	 (details  (if (testdat-details tdat)
+		       (conc " details='" (testdat-details tdat) "'")
+		       ""))
+	 (flowid   (conc " flowId='" (testdat-flowid   tdat) "'"))
+	 (duration (conc " duration='" (* 1e3 (testdat-duration tdat)) "'"))
+	 (tcname   (conc " name='" (testdat-tctname  tdat) "'"))
+	 (state    (string->symbol (testdat-state tdat)))
+	 (status   (string->symbol (testdat-status tdat)))
+	 (startp   (testdat-start-printed tdat))
+	 (endp     (testdat-end-printed   tdat))
+	 (etime    (testdat-event-time    tdat))
+	 (overall  (case state
+		     ((RUNNING)   state)
+		     ((COMPLETED) state)
+		     (else 'UNK)))
+	 (tstmp    (conc " timestamp='" (time->string (seconds->local-time etime) "%FT%T.000") "'")))
+    (case overall
+      ((RUNNING)
+       (if (not startp)
+	   (begin
+	     (print "##teamcity[testStarted "  tcname flowid tstmp "]")
+	     (testdat-start-printed-set! tdat #t))))
+      ((COMPLETED)
+       (if (not startp) ;; start stanza never printed
+	   (begin
+	     (print "##teamcity[testStarted " tcname flowid tstmp "]")
+	     (testdat-start-printed-set! tdat #t)))
+       (if (not endp)
+	   (begin
+	     (if (not (member status '(PASS WARN SKIP WAIVED)))
+		 (print "##teamcity[testFailed  " tcname flowid comment details "]"))
+             (print "##teamcity[testFinished" tcname flowid comment details duration "]")
+	     (testdat-end-printed-set! tdat #t))))
+      (else
+       (if flush-mode
+	   (begin
+	     (if (not startp)
+		 (begin
+		   (print "##teamcity[testStarted " tcname flowid tstmp "]")
+		   (testdat-start-printed-set! tdat #t)))
+	     (if (not endp)
+		 (begin
+		   (print "##teamcity[testFailed  " tcname flowid comment details "]")
+                   (print "##teamcity[testFinished" tcname flowid comment details duration "]")
+		   (testdat-end-printed-set! tdat #t)))))))
+    ;; (print "ERROR: tc-type \"" (testdat-tc-type tdat) "\" not recognised for " tcname)))
+    (flush-output)))
+
+;; ;; returns values: flag newlst
+;; (define (remove-duplicate-completed  tdats)
+;;   (let* ((flag       #f)
+;;          (state      (testdat-state      tdat))
+;;          (status     (testdat-status     tdat))
+;;          (event-time (testdat-event-time tdat))
+;;          (tname      (testdat-tname      tdat)))
+;;     (let loop ((hed (car tdats))
+;;                (tal (cdr tdats))
+;;                (new '()))
+;;       (if (and (equal? state "COMPLETED")
+;;                (equal? tname (testdat-tname hed))
+;;                (equal? state (testdat-state hed))) ;; we have a duplicate COMPLETED call
+;;           (begin
+;;             (set! flag #t) ;; A changed completed
+            
+;; process the queue of tests gathered so far. List includes one entry for every test so far seen
+;; the last record for a test is preserved. Items are only removed from the list if over 15 seconds
+;; have passed since it happened. This allows for compression of COMPLETED/FAIL followed by some other
+;; state/status
+;;
+(define (process-queue data age flush-mode)
+  ;; here we process tqueue and gather those over 15 seconds (configurable?) old
+  (let* ((print-time (- (current-seconds) age)) ;; print stuff over 15 seconds old
+         (tqueue-raw (hash-table-ref/default data 'tqueue '()))
+         (tqueue     (reverse (delete-duplicates tqueue-raw     ;; REMOVE duplicates by testname and state
+                                                 (lambda (a b)
+                                                   (and (equal? (testdat-tname a)(testdat-tname b))        ;; need oldest to newest
+                                                        (equal? (testdat-state a) (testdat-state b)))))))) ;; "COMPLETED")
+    ;; (equal? (testdat-state b) "COMPLETED")))))))
+    (if (not (null? tqueue))
+        (hash-table-set!
+         data
+         'tqueue
+         (let loop ((hed (car tqueue)) ;; by this point all duplicates by state COMPLETED are removed
+                    (tal (cdr tqueue))
+                    (rem '()))
+           (if (> print-time (testdat-event-time hed)) ;; event happened over 15 seconds ago
+               (begin
+                 (tcmt:print hed flush-mode)
+                 (if (null? tal)
+                     rem ;; return rem to be processed in the future
+                     (loop (car tal)(cdr tal) rem)))
+               (if (null? tal)
+                   (cons hed rem) ;; return rem + hed for future processing
+                   (loop (car tal)(cdr tal)(cons hed rem)))))))))
+
+;; ##teamcity[testStarted name='suite.testName']
+;; ##teamcity[testStdOut name='suite.testName' out='text']
+;; ##teamcity[testStdErr name='suite.testName' out='error text']
+;; ##teamcity[testFailed name='suite.testName' message='failure message' details='message and stack trace']
+;; ##teamcity[testFinished name='suite.testName' duration='50']
+;; 
+;; flush; #f, normal call. #t, last call, print out something for NOT_STARTED, etc.
+;;
+
+;;;;;;;   (begin
+;;;;;;;     (case (string->symbol newstat)
+;;;;;;;       ((UNK)       ) ;; do nothing
+;;;;;;;       ((RUNNING)   (print "##teamcity[testStarted name='" tctname "' flowId='" flowid "']"))
+;;;;;;;       ((PASS SKIP WARN WAIVED) (print "##teamcity[testFinished name='" tctname "' duration='" (* 1e3 duration) "'" cmtstr details " flowId='" flowid "']"))
+;;;;;;;       (else
+;;;;;;; 	(print "##teamcity[testFailed name='" tctname "' " cmtstr details " flowId='" flowid "']")))
+;;;;;;;     (flush-output)
+
+;; (trace rmt:get-tests-for-run)
+
+(define (update-queue-since data run-ids last-update tsname target runname flowid flush #!key (delay-flag #t)) ;; 
+  (let ((now           (current-seconds))
+	(still-running #f))
+;; (handle-exceptions
+;; 	exn
+;; 	(begin (print-call-chain) (print "Error message: " ((condition-property-accessor 'exn 'message) exn)))
+      (for-each
+       (lambda (run-id)
+	 (let* ((tests (rmt:get-tests-for-run run-id "%" '() '() #f #f #f #f #f #f last-update #f)))
+	   ;; (print "DEBUG: got tests=" tests)
+	   (for-each
+	    (lambda (test-rec)
+	      (let* ((tqueue   (hash-table-ref/default data 'tqueue '())) ;; NOTE: the key is a symbol! This allows keeping disparate info in the one hash, lazy but a quick solution for right now.
+		     (is-top   (db:test-get-is-toplevel  test-rec))
+		     (tname    (db:test-get-fullname     test-rec))
+		     (testname (db:test-get-testname     test-rec))
+		     (itempath (db:test-get-item-path    test-rec))
+		     (tctname  (if (string=? itempath "") testname (conc testname "." (string-translate itempath "/" "."))))
+		     (state    (db:test-get-state        test-rec))
+		     (status   (db:test-get-status       test-rec))
+		     (etime    (db:test-get-event_time   test-rec))
+		     (duration (or (any->number (db:test-get-run_duration test-rec)) 0))
+		     (comment  (db:test-get-comment      test-rec))
+		     (logfile  (db:test-get-final_logf   test-rec))
+                     (hostn    (db:test-get-host         test-rec))
+                     (pid      (db:test-get-process_id   test-rec))
+		     (test-cont (> (+ etime duration 40) (current-seconds))) ;; test has not been over for more than 20 seconds
+		     (adj-state (if delay-flag
+				    (if test-cont
+					(begin
+					  (set! still-running #t)
+					  "RUNNING")
+					state)
+				    state))
+		     (newstat  (cond
+                                ;; ((or (not delay-flag)
+				;;      (< (+ etime duration)
+				;; 	(- (current-seconds) 10)))
+				;; 	(print "Skipping as delay hasn't hit") "RUNNING") 
+				((equal? adj-state "RUNNING")
+				 (set! still-running #t)
+				 "RUNNING")
+				((equal? adj-state "COMPLETED")
+				 status)
+				(flush   (conc state "/" status))
+				(else "UNK")))
+		     (cmtstr   (if (and (not flush) comment)
+				   comment
+				   (if flush
+				       (conc "Test ended in state/status="
+					     state "/" status
+					     (if  (string-match "^\\s*$" comment)
+						  ", no Megatest comment found."
+						  (conc ", Megatest comment=\"" comment "\""))) ;; special case, we are handling stragglers
+				       #f)))
+		     (details  (if (string-match ".*html$" logfile)
+				   (conc *toppath* "/lt/" target "/" runname "/" testname
+					 (if (equal? itempath "") "/" (conc "/" itempath "/"))
+					 logfile)
+				   #f))
+		     (prev-tdat (hash-table-ref/default data tname #f)) 
+		     (tdat      (if is-top
+				    #f
+				    (let ((new (or prev-tdat (make-testdat)))) ;; recycle the record so we keep track of already printed items
+				      (testdat-flowid-set!     new (or (testdat-flowid new)
+                                                                       (if (eq? pid 0)
+                                                                           tctname
+                                                                           (conc hostn "-" pid))))
+				      (testdat-tctname-set!    new tctname)
+				      (testdat-tname-set!      new tname)
+				      (testdat-state-set!      new adj-state)
+				      (testdat-status-set!     new status)
+				      (testdat-comment-set!    new cmtstr)
+				      (testdat-details-set!    new details)
+				      (testdat-duration-set!   new duration)
+				      (testdat-event-time-set! new etime) ;; (current-seconds))
+				      (testdat-overall-set!    new newstat)
+				      (hash-table-set! data tname new)
+				      new))))
+		(if (not is-top)
+		    (hash-table-set! data 'tqueue (cons tdat tqueue))) 
+                (hash-table-set! data tname tdat)
+                ))
+            tests)))
+       run-ids)
+      (list now still-running)))
+
+(define (monitor pid)
+  (let* ((run-ids '())
+	 (testdats (make-hash-table))  ;; each entry is a list of testdat structs
+	 (keys    #f)
+	 (last-update 0)
+	 (target  (or (args:get-arg "-target")
+		      (args:get-arg "-reqtarg")))
+	 (runname (args:get-arg "-runname"))
+	 (tsname  #f)
+	 (flowid  (conc target "/" runname))
+	 (tdelay  (string->number (or (args:get-arg "-delay") "15"))))
+    (if (and target runname)
+	(begin
+	  (launch:setup)
+	  (set! keys (rmt:get-keys))))
+    (set! tsname  (common:get-testsuite-name))
+    (print "TCMT: for testsuite=" tsname " found runname=" runname ", target=" target ", keys=" keys " and successfully ran launch:setup. Using " flowid " as the flowId.")
+    (let loop ()
+      ;;;;;; (handle-exceptions
+      ;;;;;;  exn
+      ;;;;;;  ;; (print "Process done.")
+      ;;;;;;  (begin (print-call-chain) (print "Error message: " ((condition-property-accessor 'exn 'message) exn)))
+       (let-values (((pidres exittype exitstatus)
+		     (process-wait pid #t)))
+	 (if (and keys
+		  (or (not run-ids)
+		      (null? run-ids)))
+	     (let* ((runs (rmt:get-runs-by-patt keys
+						runname 
+						target
+						#f ;; offset
+						#f ;; limit
+						#f ;; fields
+						0  ;; last-update
+						))
+		    (header (db:get-header runs))
+		    (rows   (db:get-rows   runs))
+		    (run-ids-in (map (lambda (row)
+				       (db:get-value-by-header row header "id"))
+				     rows)))
+	       (set! run-ids run-ids-in)))
+	 ;; (print "TCMT: pidres=" pidres " exittype=" exittype " exitstatus=" exitstatus " run-ids=" run-ids)
+	 (if (eq? pidres 0)
+	     (begin
+	       (if keys
+                   (begin
+                     (set! last-update (- (car (update-queue-since testdats run-ids last-update tsname target runname flowid #f delay-flag: #t)) 5))
+                     (process-queue testdats tdelay #f)))
+               (thread-sleep! 3)
+	       (loop)))))
+    ;; the megatest runner is done - now wait for all processes to be COMPLETED or NO Processes to be RUNNING > 1 minute
+    (let loop ()
+      (let* ((new-last-update-info (update-queue-since testdats run-ids last-update tsname target runname flowid #f delay-flag: #t))
+	     (still-running        (cadr new-last-update-info))
+	     (new-last-update      (- (car new-last-update-info) 5)))
+	(process-queue testdats tdelay #f)
+	(if still-running
+	    (begin
+	      (print "TCMT: Tests still running, keep watching...")
+	      (thread-sleep! 3)
+	      (loop)))))
+    
+    ;; (print "TCMT: pidres=" pidres " exittype=" exittype " exitstatus=" exitstatus " run-ids=" run-ids)
+    (print "TCMT: processing any tests that did not formally complete.")
+    (update-queue-since testdats run-ids 0 tsname target runname flowid #t #f delay-flag: #f) ;; call in flush mode
+    (process-queue testdats 0 #t)
+    (print "TCMT: All done.")
+    ))
+
+;;;;; )
+
+;; (trace print-changes-since)
+
+;; (if (not (eq? pidres 0))	  ;; (not exitstatus))
+;; 	  (begin
+;; 	    (thread-sleep! 3)
+;; 	    (loop))
+;; 	  (print "Process: megatest " (string-intersperse origargs " ") " is done.")))))
+
+(if (file-exists? ".tcmtrc")
+    (load ".tcmtrc"))
+
+(define (main)
+  (let* ((mt-done #f)
+	 (pid     #f)
+	 (th1     (make-thread (lambda ()
+				 (print "Running megatest " (string-intersperse origargs " "))
+				 (set! pid (process-run "megatest" origargs)))
+			       "Megatest job"))
+	 (th2     (make-thread (lambda ()
+				 (monitor pid))
+			       "Monitor job")))
+    (thread-start! th1)
+    (thread-sleep! 1) ;; give the process time to get going
+    (thread-start! th2)
+    (thread-join! th2)))
+
+(if (args:get-arg "-tc-repl")
+    (repl)
+    (main))
+
+;; (process-wait)
+

Index: tdb.scm
==================================================================
--- tdb.scm
+++ tdb.scm
@@ -1,14 +1,23 @@
 ;;======================================================================
 ;; Copyright 2006-2013, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
 ;;======================================================================
 
 ;;======================================================================
 ;; Database access
 ;;======================================================================
@@ -50,11 +59,11 @@
   (debug:print-info 11 *default-log-port* "open-test-db " work-area)
   (if (and work-area 
 	   (directory? work-area)
 	   (file-read-access? work-area))
       (let* ((dbpath              (conc work-area "/testdat.db"))
-	     (dbexists            (file-exists? dbpath))
+	     (dbexists            (common:file-exists? dbpath))
 	     (work-area-writeable (file-write-access? work-area))
 	     (db                  (handle-exceptions  ;; open the db if area writeable or db pre-existing. open in-mem otherwise. if exception, open in-mem
 				   exn
 				   (begin
 				     (print-call-chain (current-error-port))
@@ -66,13 +75,13 @@
 					   dbexists)
 				       (sqlite3:open-database dbpath)
 				       (sqlite3:open-database ":memory:"))))
 	     (tdb-writeable       (and (file-write-access? work-area)
 				       (file-write-access? dbpath)))
-	     (handler   (make-busy-timeout (if (args:get-arg "-override-timeout")
-					       (string->number (args:get-arg "-override-timeout"))
-					       136000))))
+	     (handler   (sqlite3:make-busy-timeout (if (args:get-arg "-override-timeout")
+						       (string->number (args:get-arg "-override-timeout"))
+						       136000))))
 	
 	(if (and tdb-writeable
 		 *db-write-access*)
 	    (sqlite3:set-busy-handler! db handler))
 	(if (not dbexists)

ADDED   telemetry-daemon
Index: telemetry-daemon
==================================================================
--- /dev/null
+++ telemetry-daemon
@@ -0,0 +1,265 @@
+#!/usr/bin/env python
+# -*- Mode: Python; -*- 
+## Tiny Syslog Server in Python.
+##
+## This is a tiny syslog server that is able to receive UDP based syslog
+## entries on a specified port and save them to a file.
+## That's it... it does nothing else...
+
+ 
+import os
+import sys, os, time, atexit
+from signal import SIGTERM
+import logging
+import logging.handlers
+import SocketServer
+import datetime
+from subprocess import call
+import argparse
+import os
+import socket
+
+## code to determine this host's IP on non-loopback interface
+if os.name != "nt":
+    import fcntl
+    import struct
+
+    def get_interface_ip(ifname):
+        s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+        return socket.inet_ntoa(fcntl.ioctl(s.fileno(), 0x8915, struct.pack('256s',
+                                ifname[:15]))[20:24])
+
+def get_lan_ip():
+    ip = socket.gethostbyname(socket.gethostname())
+    if ip.startswith("127.") and os.name != "nt":
+        interfaces = [
+            "eth0",
+            "eth1",
+            "eth2",
+            "wlan0",
+            "wlan1",
+            "wifi0",
+            "ath0",
+            "ath1",
+            "ppp0",
+            ]
+        for ifname in interfaces:
+            try:
+                ip = get_interface_ip(ifname)
+                break
+            except IOError:
+                pass
+    return ip
+
+class Daemon(object):
+        """
+        A generic daemon class.
+       
+        Usage: subclass the Daemon class and override the run() method
+        """
+        def __init__(self, pidfile, stdin='/dev/null', stdout='/dev/null', stderr='/dev/null'):
+                self.stdin = stdin
+                self.stdout = stdout
+                self.stderr = stderr
+                self.pidfile = pidfile
+       
+        def daemonize(self):
+                """
+                do the UNIX double-fork magic, see Stevens' "Advanced
+                Programming in the UNIX Environment" for details (ISBN 0201563177)
+                http://www.erlenstar.demon.co.uk/unix/faq_2.html#SEC16
+                """
+                try:
+                        pid = os.fork()
+                        if pid > 0:
+                                # exit first parent
+                                sys.exit(0)
+                except OSError, e:
+                        sys.stderr.write("fork #1 failed: %d (%s)\n" % (e.errno, e.strerror))
+                        sys.exit(1)
+       
+                # decouple from parent environment
+                os.chdir("/")
+                os.setsid()
+                os.umask(0)
+       
+                # do second fork
+                try:
+                        pid = os.fork()
+                        if pid > 0:
+                                # exit from second parent
+                                sys.exit(0)
+                except OSError, e:
+                        sys.stderr.write("fork #2 failed: %d (%s)\n" % (e.errno, e.strerror))
+                        sys.exit(1)
+       
+                # redirect standard file descriptors
+                sys.stdout.flush()
+                sys.stderr.flush()
+                si = file(self.stdin, 'r')
+                so = file(self.stdout, 'a+')
+                se = file(self.stderr, 'a+', 0)
+                os.dup2(si.fileno(), sys.stdin.fileno())
+                os.dup2(so.fileno(), sys.stdout.fileno())
+                os.dup2(se.fileno(), sys.stderr.fileno())
+       
+                # write pidfile
+                atexit.register(self.delpid)
+                pid = str(os.getpid())
+                file(self.pidfile,'w+').write("%s\n" % pid)
+       
+        def delpid(self):
+                os.remove(self.pidfile)
+ 
+        def start(self):
+                """
+                Start the daemon
+                """
+                # Check for a pidfile to see if the daemon already runs
+                try:
+                        pf = file(self.pidfile,'r')
+                        pid = int(pf.read().strip())
+                        pf.close()
+                except IOError:
+                        pid = None
+       
+                if pid:
+                        message = "pidfile %s already exist. Daemon already running?\n"
+                        sys.stderr.write(message % self.pidfile)
+                        sys.exit(1)
+               
+                # Start the daemon
+                self.daemonize()
+                self.run()
+ 
+        def stop(self):
+                """
+                Stop the daemon
+                """
+                # Get the pid from the pidfile
+                try:
+                        pf = file(self.pidfile,'r')
+                        pid = int(pf.read().strip())
+                        pf.close()
+                except IOError:
+                        pid = None
+       
+                if not pid:
+                        message = "pidfile %s does not exist. Daemon not running?\n"
+                        sys.stderr.write(message % self.pidfile)
+                        return # not an error in a restart
+ 
+                # Try killing the daemon process       
+                try:
+                        while 1:
+                                os.kill(pid, SIGTERM)
+                                time.sleep(0.1)
+                except OSError, err:
+                        err = str(err)
+                        if err.find("No such process") > 0:
+                                if os.path.exists(self.pidfile):
+                                        os.remove(self.pidfile)
+                        else:
+                                print str(err)
+                                sys.exit(1)
+ 
+        def restart(self):
+                """
+                Restart the daemon
+                """
+                self.stop()
+                self.start()
+ 
+        def run(self):
+                """
+                You should override this method when you subclass Daemon. It will be called after the process has been
+                daemonized by start() or restart().
+                """
+
+# setup logging module so that the log can be moved aside and will reopen for append
+def log_setup(logfile):
+    log_handler = logging.handlers.WatchedFileHandler(logfile)
+    formatter = logging.Formatter(
+        '%(message)s','')
+    log_handler.setFormatter(formatter)
+    logger = logging.getLogger()
+    logger.addHandler(log_handler)
+    logger.setLevel(logging.INFO)
+
+
+class SyslogUDPHandler(SocketServer.BaseRequestHandler):
+	def handle(self):
+		data = bytes.decode(self.request[0].strip())
+		socket = self.request[1]
+		print( "%s : " % self.client_address[0], str(data))
+		timestamp = datetime.datetime.now().isoformat()
+		logline = timestamp + ":"+self.client_address[0] + ":" + str(data)
+		logging.info(str(logline))
+
+
+
+class TelemetryLogDaemon(Daemon):
+  def __init__(self, pidfile, logfile, server_ip, server_port):
+    self.logfile = logfile
+    self.server_ip = server_ip
+    self.server_port = server_port
+    super(TelemetryLogDaemon, self).__init__(pidfile)
+    
+  def run(self):
+    log_setup(self.logfile)
+    server = SocketServer.UDPServer((self.server_ip,int(self.server_port)), SyslogUDPHandler)
+    server.serve_forever(poll_interval=0.5)
+
+
+def main():
+  default_log_file = os.environ['PWD'] + "/telemetry.log"
+
+  parser = argparse.ArgumentParser(description = 'telemetry-daemon')
+  actions="start,restart,stop,nodaemon".split(",")
+  
+  parser.add_argument("-a", "--action", required=True, choices=actions, help="manage daemon: start stop or restart")
+  parser.add_argument("-p", "--server-port", default="5929", help="specify alternate udp port number, default is 5929")
+  parser.add_argument("-i", "--server-ip", default=get_lan_ip(), help="specify IP if heuristics to get local host lan ip fails")
+  parser.add_argument("-l", "--log-file", default=default_log_file, help="specify log file to write")
+  parser.add_argument("-z", "--pid-file", default=default_log_file + ".pidfile", help="specify pidfile")
+  opts = parser.parse_args()
+
+  tld = TelemetryLogDaemon(opts.pid_file, opts.log_file, opts.server_ip, opts.server_port)
+
+  if opts.action == "start":
+    print "Info: Starting server"
+    print """Example addition to megatest.config to enable telemetry:
+
+[telemetry]
+host %s
+port %s
+want-events ALL
+
+    """ % (opts.server_ip, opts.server_port)
+    tld.start()
+    
+  elif opts.action == "stop":
+    tld.stop()
+  elif opts.action == "restart":
+
+    print "Info: Restarting server"
+    print """Example addition to megatest.config to enable telemetry:
+
+[telemetry]
+host %s
+port %s
+want-events ALL
+
+    """ % (opts.server_ip, opts.server_port)
+    tld.restart()
+  elif opts.action == "nodaemon":
+    log_setup(opts.log_file)
+    server = SocketServer.UDPServer((opts.server_ip,int(opts.server_port)), SyslogUDPHandler)
+    server.serve_forever(poll_interval=0.5)
+  
+if __name__ == '__main__':
+  main()
+
+
+
+

Index: test_records.scm
==================================================================
--- test_records.scm
+++ test_records.scm
@@ -1,5 +1,22 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 ;; make-vector-record tests testqueue testname testconfig waitons priority items
 (define (make-tests:testqueue)(make-vector 7 #f))
 (define-inline (tests:testqueue-get-testname     vec)    (vector-ref  vec 0))
 (define-inline (tests:testqueue-get-testconfig   vec)    (vector-ref  vec 1))
 (define-inline (tests:testqueue-get-waitons      vec)    (vector-ref  vec 2))

DELETED testhttp/example-client.scm
Index: testhttp/example-client.scm
==================================================================
--- testhttp/example-client.scm
+++ /dev/null
@@ -1,6 +0,0 @@
-(use regex http-client)
-
-(print (with-input-from-request "http://localhost:8083/?foo=1" #f 
-    (lambda ()
-      (let ((match (string-search (regexp "(.*)<.body>") (caddr (string-split (read-string) "\n")))))
-	(cadr match)))))

DELETED testhttp/example-server.scm
Index: testhttp/example-server.scm
==================================================================
--- testhttp/example-server.scm
+++ /dev/null
@@ -1,26 +0,0 @@
-(use spiffy awful)
-
-(tcp-buffer-size 2048)
-(enable-sxml #t)
-
-(define (hello-world)
-  (define-page (main-page-path)
-    (lambda ()
-      (with-request-variables (foo)
-        foo))))
-
-(define (start-server #!key (portnum 8080))
-  (handle-exceptions
-   exn
-   (begin
-     (print-error-message exn)
-     (if (< portnum 9000)
-	 (begin 
-	   (print "WARNING: failed to start on portnum: " portnum ", trying next port")
-	   (sleep 1)
-	   (start-server portnum: (+ portnum 1)))
-	 (print "ERROR: Tried and tried but could not start the server")))
-   (print "INFO: Trying to start server on portnum: " portnum)
-   (awful-start hello-world port: portnum)))
-
-(start-server)

DELETED testhttp/mockupclient.scm
Index: testhttp/mockupclient.scm
==================================================================
--- testhttp/mockupclient.scm
+++ /dev/null
@@ -1,35 +0,0 @@
-(use posix)
-
-(define cname "Bob")
-(define runtime 10)
-(let ((args (argv)))
-  (if (< (length args) 3)
-      (begin
-	(print "Usage: mockupclient clientname runtime")
-	(exit))
-      (begin
-	(set! cname (cadr args))
-	(set! runtime (string->number (caddr args))))))
-      
-;; (define start-delay (/ (random 100) 9))
-;; (define runtime     (+ 1 (/ (random 200) 2)))
-
-(print "Starting client " cname " with runtime " runtime)
-
-(include "mockupclientlib.scm")
-
-(set! endtime (+ (current-seconds) runtime))
-
-(let loop ()
-  (let ((x (random 15))
-	(varname (list-ref (list "hello" "goodbye" "saluton" "kiaorana")(random 4))))
-    (case x
-      ;; ((1)(dbaccess cname 'sync "nodat"    #f))
-      ((2 3 4 5)(dbaccess cname 'set varname (random 999)))
-      ((6 7 8 9 10)(print cname ": Get \"" varname "\" " (dbaccess cname 'get varname #f)))
-      (else
-       (thread-sleep! 0.011)))
-    (if (< (current-seconds) endtime)
-	(loop))))
-
-(print "Client " cname " all done!!")

DELETED testhttp/mockupclientlib.scm
Index: testhttp/mockupclientlib.scm
==================================================================
--- testhttp/mockupclientlib.scm
+++ /dev/null
@@ -1,33 +0,0 @@
-(define sub  (make-socket 'sub))
-(define push (make-socket 'push))
-(socket-option-set! sub 'subscribe cname)
-(connect-socket sub "tcp://localhost:5563")
-(connect-socket push "tcp://localhost:5564")
-
-(define (dbaccess cname cmd var val #!key (numtries 1))
-  (let* ((msg (conc cname ":" cmd ":" (if val (conc var " " val) var)))
-	 (res #f)
-	 (do-access (lambda ()
-		      (print "Sending msg: " msg)
-		      (send-message push msg)
-		      (print "Message " msg " sent")
-		      (print "Client " cname " waiting for response to " msg)
-		      (print "Client " cname " received address " (receive-message* sub))
-		      (set! res (receive-message* sub)))))
-    (let ((th1 (make-thread do-access "do access"))
-	  (th2 (make-thread (lambda ()
-			      (thread-sleep! 5)
-			      (if (not res)
-				  (if (> numtries 0)
-				      (begin
-					(print "WARNING: access timed out for " cname ", trying again. Trys remaining=" numtries)
-					(dbaccess cname cmd var val numtries: (- numtries 1)))
-				      (begin
-					(print "ERROR: dbaccess timed out. Exiting")
-					(exit)))))
-			    "timeout thread")))
-      (thread-start! th1)
-      (thread-start! th2)
-      (thread-join! th1)
-      res)))
-

DELETED testhttp/mockupserver.scm
Index: testhttp/mockupserver.scm
==================================================================
--- testhttp/mockupserver.scm
+++ /dev/null
@@ -1,140 +0,0 @@
-;; pub/sub with envelope address
-;; Note that if you don't insert a sleep, the server will crash with SIGPIPE as soon
-;; as a client disconnects.  Also a remaining client may receive tons of
-;; messages afterward.
-
-(use srfi-18 sqlite3 spiffy)
-
-(define cname "server")
-(define total-db-accesses 0)
-(define start-time (current-seconds))
-
-;; setup the server here
-(tcp-buffer-size 2048)
-(server-port 5563)
-
-(define (open-db)
-  (let* ((dbpath    "mockup.db")
-	 (dbexists  (file-exists? dbpath))
-	 (db        (open-database dbpath)) ;; (never-give-up-open-db dbpath))
-	 (handler   (make-busy-timeout 10)))
-    (set-busy-handler! db handler)
-    (if (not dbexists)
-	(for-each
-	 (lambda (stmt)
-	   (execute db stmt))
-	 (list
-	  "PRAGMA SYNCHRONOUS=0;"
-	  "CREATE TABLE clients (id INTEGER PRIMARY KEY,name TEXT,num_accesses INTEGER DEFAULT 0);"
-	  "CREATE TABLE vars    (var TEXT,val TEXT,CONSTRAINT vars_constraint UNIQUE (var));")))
-    db))
-
-(define cid-cache (make-hash-table))
-
-(define (get-client-id db cname)
-  (let ((cid (hash-table-ref/default cid-cache cname #f)))
-    (if cid 
-	cid
-	(begin
-	  (execute db "INSERT OR REPLACE INTO clients (name) VALUES(?);" cname)
-	  (for-each-row 
-	   (lambda (id)
-	     (set! cid id))
-	   db
-	   "SELECT id FROM clients WHERE name=?;" cname)
-	  (hash-table-set! cid-cache cname cid)
-	  (set! total-db-accesses (+ total-db-accesses 2))
-	  cid))))
-
-(define (count-client db cname)
-  (let ((cid (get-client-id db cname)))
-    (execute db "UPDATE clients SET num_accesses=num_accesses+1 WHERE id=?;" cid)
-    (set! total-db-accesses (+ total-db-accesses 1))
-    ))
-
-(define db (open-db))
-;; (define queuelst '())
-;; (define mx1 (make-mutex))
-
-(define max-queue-len 0)
-
-(define (process-queue queuelst)
-  (let ((queuelen (length queuelst)))
-    (if (> queuelen max-queue-len)
-	(set! max-queue-len queuelen))
-    (for-each
-     (lambda (item)
-       (let ((cname (vector-ref item 1))
-	     (clcmd (vector-ref item 2))
-	     (cdata (vector-ref item 3)))
-	 (send-message pub cname send-more: #t)
-	 (send-message pub (case clcmd
-			     ((sync)
-			      (conc queuelen))
-			     ((set)
-			      (set! total-db-accesses (+ total-db-accesses 1))
-			      (apply execute db "INSERT OR REPLACE INTO vars (var,val) VALUES (?,?);" (string-split cdata))
-			      "ok")
-			     ((get)
-			      (set! total-db-accesses (+ total-db-accesses 1))
-			      (let ((res "noval"))
-				(for-each-row
-				 (lambda (val)
-				   (set! res val))
-				 db 
-				 "SELECT val FROM vars WHERE var=?;" cdata)
-				res))
-			     (else (conc "unk cmd: " clcmd))))))
-     queuelst)))
-
-(define th1 (make-thread 
-	     (lambda ()
-	       (let ((last-run 0)) ;; current-seconds when run last
-		 (let loop ((queuelst '()))
-		   (let* ((indat (receive-message* pull))
-			  (parts (string-split indat ":"))
-			  (cname (car parts))                   ;; client name
-			  (clcmd (string->symbol (cadr parts))) ;; client cmd
-			  (cdata (caddr parts))                 ;; client data
-			  (svect (vector (current-seconds) cname clcmd cdata))) ;; record for the queue
-		     (count-client db cname)
-		     (case clcmd
-		       ((sync) ;; just process the queue
-			(print "Got sync from " cname)
-			(process-queue (cons svect queuelst))
-			(loop '()))
-		       ((get)
-			(process-queue (cons svect queuelst))
-			(loop '()))
-		       (else
-			(loop (cons svect queuelst))))))))
-	     "server thread"))
-
-(include "mockupclientlib.scm")
-
-;; ;; send a sync to the pull port
-;; (define th2 (make-thread
-;; 	     (lambda ()
-;; 	       (let ((last-action-time (current-seconds)))
-;; 		 (let loop ()
-;; 		   (thread-sleep! 5)
-;; 		   (let ((queuelen (string->number (dbaccess "server" 'sync "nada" #f)))
-;; 			 (last-action-delta #f))
-;; 		     (if (> queuelen 1)(set! last-action-time (current-seconds)))
-;; 		     (set! last-action-delta (- (current-seconds) last-action-time))
-;; 		     (print "Server: Got queuelen=" queuelen ", last-action-delta=" last-action-delta)
-;; 		     (if (< last-action-delta 60)
-;; 			 (loop)
-;; 			 (print "Server exiting, 25 seconds since last access"))))))
-;; 	     "sync thread"))
-
-(handle-not-found 
- 
-
-(thread-start! th1)
-(thread-start! th2)
-(thread-join! th2)
-
-(let* ((run-time       (- (current-seconds) start-time))
-       (queries/second (/  total-db-accesses run-time)))
-  (print "Server exited! Total db accesses=" total-db-accesses " in " run-time " seconds for " queries/second " queries/second with max queue length of: " max-queue-len))

DELETED testhttp/testclient.scm
Index: testhttp/testclient.scm
==================================================================
--- testhttp/testclient.scm
+++ /dev/null
@@ -1,8 +0,0 @@
-(use http-client)
-
-(with-input-from-request "http://localhost:12345/hey"
-                                           ;; #f
-                                           ;; msg 
-                                           (list (cons 'dat "Testing eh"))
-                                           read-string)
-

DELETED testhttp/testserver.scm
Index: testhttp/testserver.scm
==================================================================
--- testhttp/testserver.scm
+++ /dev/null
@@ -1,16 +0,0 @@
-(use spiffy uri-common intarweb spiffy-request-vars)
-
-(root-path "/var/www")
-
-(vhost-map `(((* any) . ,(lambda (continue)
-                           (let (($ (request-vars source: 'both)))
-			     (print ($ 'dat))
-			     (if (equal? (uri-path (request-uri (current-request))) 
-					 '(/ "hey"))
-				 (send-response body: "hey there!\n"
-						headers: '((content-type text/plain)))
-				 (continue)))))))
-
-(start-server port: 12345)
-
-

DELETED testnanomsg/basic-req-rep.scm
Index: testnanomsg/basic-req-rep.scm
==================================================================
--- testnanomsg/basic-req-rep.scm
+++ /dev/null
@@ -1,3 +0,0 @@
-(use nanomsg srfi-18 sqlite3 numbers)
-
-(define resp (nn-socket 'rep))

DELETED testnanomsg/mockupclient.scm
Index: testnanomsg/mockupclient.scm
==================================================================
--- testnanomsg/mockupclient.scm
+++ /dev/null
@@ -1,42 +0,0 @@
-(use zmq posix numbers)
-
-(define cname "Bob")
-(define runtime 10)
-(let ((args (argv)))
-  (if (< (length args) 3)
-      (begin
-	(print "Usage: mockupclient clientname runtime")
-	(exit))
-      (begin
-	(set! cname (cadr args))
-	(set! runtime (string->number (caddr args))))))
-      
-;; (define start-delay (/ (random 100) 9))
-;; (define runtime     (+ 1 (/ (random 200) 2)))
-
-(print "Starting client " cname " with runtime " runtime)
-
-(include "mockupclientlib.scm")
-
-(set! endtime (+ (current-seconds) runtime))
-
-;; first ping the server to ensure we have a connection
-(if (server-ping cname 5)
-    (print "SUCCESS: Client " cname " connected to server")
-    (begin
-      (print "ERROR: Client " cname " failed ping of server, exiting")
-      (exit)))
-
-(let loop ()
-  (let ((x (random 15))
-	(varname (list-ref (list "hello" "goodbye" "saluton" "kiaorana")(random 4))))
-    (case x
-      ;; ((1)(dbaccess cname 'sync "nodat"    #f))
-      ((2 3 4 5)(dbaccess cname 'set varname (random 999)))
-      ((6 7 8 9 10)(print cname ": Get \"" varname "\" " (dbaccess cname 'get varname #f)))
-      (else
-       (thread-sleep! 0.011)))
-    (if (< (current-seconds) endtime)
-	(loop))))
-
-(print "Client " cname " all done!!")

DELETED testnanomsg/mockupclientlib.scm
Index: testnanomsg/mockupclientlib.scm
==================================================================
--- testnanomsg/mockupclientlib.scm
+++ /dev/null
@@ -1,58 +0,0 @@
-(define reqs (nn-socket 'req))
-
-(connect-socket reqs "tcp://localhost:6563")
-
-(thread-sleep! 0.2)
-
-(define (server-ping cname timeout)
-  (let ((msg     (conc cname ":ping:" timeout))
-	(maxtime (+ (current-seconds) timeout)))
-    (print "pinging server from " cname " with timeout " timeout)
-    (let loop ((res   #f))
-      (if (< maxtime (current-seconds))
-	  #f ;; failed to ping
-	  (if (equal? res "Got ping")
-	      #t
-	      (begin
-		(print "Ping received from server " res)
-		(send-message push msg)
-		(thread-sleep! 0.1)
-		(loop (receive-message sub non-blocking: #t))))))))
-  
-(define (dbaccess cname cmd var val #!key (numtries 20))
-  (let* ((msg (conc cname ":" cmd ":" (if val (conc var " " val) var)))
-	 (res #f)
-	 (mtx1 (make-mutex))
-	 (do-access (lambda ()
-		      (let ((tmpres #f))
-			(print "Sending msg: " msg)
-			(send-message push msg)
-			(print "Message " msg " sent")
-			(print "Client " cname " waiting for response to " msg)
-			(print "Client " cname " received address " (receive-message* sub))
-			(set! tmpres (receive-message* sub))
-			(mutex-lock! mtx1)
-			(set! res tmpres)
-			(mutex-unlock! mtx1))))
-	 (th1 (make-thread do-access "do access"))
-	 (th2 (make-thread (lambda ()
-			     (let ((result #f))
-			       (mutex-lock! mtx1)
-			       (set! result res)
-			       (mutex-unlock! mtx1)
-			       (thread-sleep! 5)
-			       (if (not result)
-				   (if (> numtries 0)
-				       (begin
-					 (print "WARNING: access timed out for " cname ", trying again. Trys remaining=" numtries)
-					 (dbaccess cname cmd var val numtries: (- numtries 1)))
-				       (begin
-					 (print "ERROR: dbaccess timed out. Exiting")
-					 (exit)))))
-			     "timeout thread"))))
-    (thread-start! th1)
-    (thread-start! th2)
-    (thread-join! th1)
-    (if res (print "SUCCESS: received " res " with " numtries " remaining possible attempts"))
-    res))
-

DELETED testnanomsg/mockupserver.scm
Index: testnanomsg/mockupserver.scm
==================================================================
--- testnanomsg/mockupserver.scm
+++ /dev/null
@@ -1,146 +0,0 @@
-;; pub/sub with envelope address
-;; Note that if you don't insert a sleep, the server will crash with SIGPIPE as soon
-;; as a client disconnects.  Also a remaining client may receive tons of
-;; messages afterward.
-
-(use nanomsg srfi-18 sqlite3 numbers)
-
-(define resp (nn-socket 'rep))
-(define cname "server")
-(define total-db-accesses 0)
-(define start-time (current-seconds))
-
-(nn-bind resp  "tcp://*:6563")
-
-(thread-sleep! 0.2)
-
-(define (open-db)
-  (let* ((dbpath    "mockup.db")
-	 (dbexists  (file-exists? dbpath))
-	 (db        (open-database dbpath)) ;; (never-give-up-open-db dbpath))
-	 (handler   (make-busy-timeout 10)))
-    (set-busy-handler! db handler)
-    (if (not dbexists)
-	(for-each
-	 (lambda (stmt)
-	   (execute db stmt))
-	 (list
-	  "PRAGMA SYNCHRONOUS=0;"
-	  "CREATE TABLE clients (id INTEGER PRIMARY KEY,name TEXT,num_accesses INTEGER DEFAULT 0);"
-	  "CREATE TABLE vars    (var TEXT,val TEXT,CONSTRAINT vars_constraint UNIQUE (var));")))
-    db))
-
-(define cid-cache (make-hash-table))
-
-(define (get-client-id db cname)
-  (let ((cid (hash-table-ref/default cid-cache cname #f)))
-    (if cid 
-	cid
-	(begin
-	  (execute db "INSERT OR REPLACE INTO clients (name) VALUES(?);" cname)
-	  (for-each-row 
-	   (lambda (id)
-	     (set! cid id))
-	   db
-	   "SELECT id FROM clients WHERE name=?;" cname)
-	  (hash-table-set! cid-cache cname cid)
-	  (set! total-db-accesses (+ total-db-accesses 2))
-	  cid))))
-
-(define (count-client db cname)
-  (let ((cid (get-client-id db cname)))
-    (execute db "UPDATE clients SET num_accesses=num_accesses+1 WHERE id=?;" cid)
-    (set! total-db-accesses (+ total-db-accesses 1))
-    ))
-
-(define db (open-db))
-;; (define queuelst '())
-;; (define mx1 (make-mutex))
-
-(define max-queue-len 0)
-
-(define (process-queue queuelst)
-  (let ((queuelen (length queuelst)))
-    (if (> queuelen max-queue-len)
-	(set! max-queue-len queuelen))
-    (for-each
-     (lambda (item)
-       (let ((cname (vector-ref item 1))
-	     (clcmd (vector-ref item 2))
-	     (cdata (vector-ref item 3)))
-	 (send-message pub cname send-more: #t)
-	 (send-message pub (case clcmd
-			     ((sync)
-			      (conc queuelen))
-			     ((set)
-			      (set! total-db-accesses (+ total-db-accesses 1))
-			      (apply execute db "INSERT OR REPLACE INTO vars (var,val) VALUES (?,?);" (string-split cdata))
-			      "ok")
-			     ((get)
-			      (set! total-db-accesses (+ total-db-accesses 1))
-			      (let ((res "noval"))
-				(for-each-row
-				 (lambda (val)
-				   (set! res val))
-				 db 
-				 "SELECT val FROM vars WHERE var=?;" cdata)
-				res))
-			     (else (conc "unk cmd: " clcmd))))))
-     queuelst)))
-
-;; SERVER THREAD
-(define th1 (make-thread 
-	     (lambda ()
-	       (let ((last-run 0)) ;; current-seconds when run last
-		 (let loop ((queuelst '()))
-		   (let* ((indat (receive-message* pull))
-			  (parts (string-split indat ":"))
-			  (cname (car parts))                   ;; client name
-			  (clcmd (string->symbol (cadr parts))) ;; client cmd
-			  (cdata (caddr parts))                 ;; client data
-			  (svect (vector (current-seconds) cname clcmd cdata))) ;; record for the queue
-		     ;; (print "Server received message: " indat)
-		     (count-client db cname)
-		     (case clcmd
-		       ((ping)
-			(print "Got ping from " cname)
-			(send-message pub cname send-more: #t)
-			(send-message pub "Got ping")
-			(loop queuelst))
-		       ((sync) ;; just process the queue
-			(print "Got sync from " cname)
-			(process-queue (cons svect queuelst))
-			(loop '()))
-		       ((get)
-			(process-queue (cons svect queuelst))
-			(loop '()))
-		       (else
-			(loop (cons svect queuelst))))))))
-	     "server thread"))
-
-(include "mockupclientlib.scm")
-
-;; SYNC THREAD
-;; send a sync to the pull port
-(define th2 (make-thread
-	     (lambda ()
-	       (let ((last-action-time (current-seconds)))
-		 (let loop ()
-		   (thread-sleep! 5)
-		   (let ((queuelen (string->number (dbaccess "server" 'sync "nada" #f)))
-			 (last-action-delta #f))
-		     (if (> queuelen 1)(set! last-action-time (current-seconds)))
-		     (set! last-action-delta (- (current-seconds) last-action-time))
-		     (print "Server: Got queuelen=" queuelen ", last-action-delta=" last-action-delta)
-		     (if (< last-action-delta 60)
-			 (loop)
-			 (print "Server exiting, 25 seconds since last access"))))))
-	     "sync thread"))
-
-(thread-start! th1)
-(thread-start! th2)
-(thread-join! th2)
-
-(let* ((run-time       (- (current-seconds) start-time))
-       (queries/second (/  total-db-accesses run-time)))
-  (print "Server exited! Total db accesses=" total-db-accesses " in " run-time " seconds for " queries/second " queries/second with max queue length of: " max-queue-len))

DELETED testnanomsg/pipeline.scm
Index: testnanomsg/pipeline.scm
==================================================================
--- testnanomsg/pipeline.scm
+++ /dev/null
@@ -1,25 +0,0 @@
-;; watch nanomsg's pipeline load-balancer in action.
-(use nanomsg)
-
-(define push (nn-socket 'push))
-(define pull1 (nn-socket 'pull))
-(define pull2 (nn-socket 'pull))
-
-(nn-bind    push  "inproc://test")
-(nn-connect pull1 "inproc://test")
-(nn-connect pull2 "inproc://test")
-
-(nn-send push "a")
-(nn-send push "b")
-(nn-send push "c")
-(nn-send push "d")
-
-(define ((th sock))
-  (print (current-thread) ": " (nn-recv sock))
-  (print (current-thread) ": " (nn-recv sock))
-  (print (current-thread) " is done"))
-
-(thread-start! (th pull1))
-(thread-start! (th pull2))
-
-(thread-sleep! 1)

DELETED testnanomsg/req-rep-client.scm
Index: testnanomsg/req-rep-client.scm
==================================================================
--- testnanomsg/req-rep-client.scm
+++ /dev/null
@@ -1,31 +0,0 @@
-;; watch nanomsg's pipeline load-balancer in action.
-(use nanomsg posix regex)
-
-(define req   (nn-socket 'req))
-
-(nn-connect req  "tcp://localhost:22022")
-
-;; (with-output-to-string (lambda ()(serialize obj)))
-(define (client-send-receive soc msg)
-  (nn-send soc msg)
-  (nn-recv soc))
-
-(define ((talk-to-server soc))
-  (let loop ((cnt 200000))
-    (let ((name (list-ref '("Matt" "Tom" "Bob" "Jill" "James" "Jane")(random 6))))
-      ;; (print "Sending " name)
-      ;; (print
-      (client-send-receive req name) ;; )
-      (if (> cnt 0)(loop (- cnt 1)))))
-  (print (client-send-receive req "quit"))
-  (nn-close req)
-  (exit))
-
-;; (thread-start! (lambda ()
-;; 		 (thread-sleep! 20)
-;; 		 (print "Give up on waiting for the server")
-;; 		 (nn-close req)
-;; 		 (exit)))
-
-(thread-join! (thread-start! (talk-to-server req)))
-

DELETED testnanomsg/req-rep-server.scm
Index: testnanomsg/req-rep-server.scm
==================================================================
--- testnanomsg/req-rep-server.scm
+++ /dev/null
@@ -1,94 +0,0 @@
-;; watch nanomsg's pipeline load-balancer in action.
-(use nanomsg posix regex)
-
-;; (use trace)
-;; (trace nn-bind nn-socket nn-assert nn-recv nn-send thread-terminate! nn-close )
-
-(define port  22022)
-(define host  "127.0.0.1")
-
-(define rep   (nn-socket 'rep))
-
-(print "connecting, got: " (nn-bind    rep  (conc "tcp://" "*" ":" port)))
-
-(define (server soc)
-  (print "server starting")
-  (let loop ((msg-in (nn-recv soc))
-	     (count  0))
-    (if (eq? 0 (modulo count 1000))
-	(print "server received: " msg-in ", count=" count))
-    (cond
-     ((equal? msg-in "quit")
-      (nn-send soc "Ok, quitting"))
-     ((and (>= (string-length msg-in) 4)
-	   (equal? (substring msg-in 0 4) "ping"))
-      (nn-send soc (conc (current-process-id)))
-      (loop (nn-recv soc)(+ count 1)))
-     ;;((and (>= (string-length msg-in)
-     (else
-      (let ((this-task  (/ (random 10) 200.0))
-	    (start-time (current-milliseconds)))
-	;; (thread-sleep! this-task)
-	(nn-send soc (conc "hello " msg-in " this task took " this-task " seconds to complete"))
-	;; (print "Actual send-receive time: " (- (current-milliseconds) start-time));
-	(loop (nn-recv soc)(+ count 1)))))))
-
-(define (ping-self host port #!key (return-socket #t))
-  ;; send a random number along with pid and check that we get it back
-  (let* ((req     (nn-socket 'req))
-	 (key     "ping")
-	 (success #f)
-	 (keepwaiting #t)
-	 (ping    (make-thread
-		   (lambda ()
-		     (print "ping: sending string \"" key "\", expecting " (current-process-id))
-		     (nn-send req key)
-		     (let ((result  (nn-recv req)))
-		       (if (equal? (conc (current-process-id)) result)
-			   (begin
-			     (print "ping, success: received \"" result "\"")
-			     (set! success #t))
-			   (begin
-			     (print "ping, failed: received key \"" result "\"")
-			     (set! keepwaiting #f)
-			     (set! success #f)))))
-		   "ping"))
-	 (timeout (make-thread (lambda ()
-				 (let loop ((count 0))
-				   (thread-sleep! 1)
-				   (print "still waiting after count seconds...")
-				   (if (and keepwaiting (< count 10))
-				       (loop (+ count 1))))
-				 (if keepwaiting
-				     (begin
-				       (print "timeout waiting for ping")
-				       (thread-terminate! ping))))
-			       "timeout")))
-    (nn-connect req (conc "tcp://" host ":" port))
-    (handle-exceptions
-     exn
-     (begin
-       (print-call-chain)
-       (print 0 " message: " ((condition-property-accessor 'exn 'message) exn))
-       (print "exn=" (condition->list exn))
-       (print "ping failed to connect to " host ":" port))
-     (thread-start! timeout)
-     (thread-start! ping)
-     (thread-join! ping)
-     (if success (thread-terminate! timeout)))
-    (if return-socket
-	(if success req #f)
-	(begin
-	  (nn-close req)
-	  success))))
-
-(let ((server-thread (make-thread (lambda ()(server rep)) "server")))
-  (thread-start! server-thread)
-  ;; (thread-sleep! 1)
-  (if (ping-self host port)
-      (begin
-	(thread-join! server-thread)
-	(nn-close rep))
-      (print "ping failed")))
-
-(exit)

DELETED testnanomsg/req-rep.scm
Index: testnanomsg/req-rep.scm
==================================================================
--- testnanomsg/req-rep.scm
+++ /dev/null
@@ -1,30 +0,0 @@
-;; watch nanomsg's pipeline load-balancer in action.
-(use nanomsg)
-
-(define req   (nn-socket 'req))
-(define rep   (nn-socket 'rep))
-
-(nn-bind    rep  "inproc://test")
-(nn-connect req  "inproc://test")
-
-(define (client-send-receive soc msg)
-  (nn-send soc msg)
-  (nn-recv soc))
-
-(define ((server soc))
-  (let loop ((msg-in (nn-recv soc)))
-    (if (not (equal? msg-in "quit"))
-	(begin
-	  (nn-send soc (conc "hello " msg-in))
-	  (loop (nn-recv soc))))))
-
-(thread-start! (server rep))
-
-(print (client-send-receive req "Matt"))
-(print (client-send-receive req "Tom"))
-
-;; (client-send-receive req "quit")
-
-(nn-close req)
-(nn-close rep)
-(exit)

DELETED testrpc/client.scm
Index: testrpc/client.scm
==================================================================
--- testrpc/client.scm
+++ /dev/null
@@ -1,8 +0,0 @@
-;;;; client.scm
-(use rpc posix)
-
-(define call (rpc:procedure 'foo "localhost"))
-
-(do ((i 10 (sub1 i)))
-    ((zero? i))
-  (print "-> " (call (random 100))))

DELETED testrpc/server.scm
Index: testrpc/server.scm
==================================================================
--- testrpc/server.scm
+++ /dev/null
@@ -1,15 +0,0 @@
-;;;; server.scm
-(use rpc)
-
-(rpc:publish-procedure!
- 'foo
- (lambda (x)
-   (print "foo: " x)
-   #f))
-
-(rpc:publish-procedure!
- 'fini
- (lambda () (print "fini") (thread-start! (lambda () (thread-sleep! 3) (print "terminate") (exit))) #f))
-
-((rpc:make-server (tcp-listen (rpc:default-server-port))) #t)
-

Index: tests.scm
==================================================================
--- tests.scm
+++ tests.scm
@@ -1,24 +1,29 @@
 ;;======================================================================
 ;; Copyright 2006-2013, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
 ;;======================================================================
 
 ;;======================================================================
 ;; Tests
 ;;======================================================================
 
-(use sqlite3 srfi-1 posix regex regex-case srfi-69 dot-locking tcp directory-utils)
-(import (prefix sqlite3 sqlite3:))
-(require-library stml)
-
 (declare (unit tests))
 (declare (uses lock-queue))
 (declare (uses db))
 (declare (uses tdb))
 (declare (uses common))
@@ -25,16 +30,26 @@
 ;; (declare (uses dcommon)) ;; needed for the steps processing
 (declare (uses items))
 (declare (uses runconfig))
 ;; (declare (uses sdb))
 (declare (uses server))
+;;(declare (uses stml2))
+
+(use sqlite3 srfi-1 posix regex regex-case srfi-69 dot-locking tcp directory-utils)
+(import (prefix sqlite3 sqlite3:))
+(require-library stml)
 
 (include "common_records.scm")
 (include "key_records.scm")
 (include "db_records.scm")
 (include "run_records.scm")
 (include "test_records.scm")
+(include "js-path.scm")
+
+(define (init-java-script-lib)
+  (set! *java-script-lib* (conc  (common:get-install-area) "/share/js/jquery-3.1.0.slim.min.js"))
+  )
 
 ;; Call this one to do all the work and get a standardized list of tests
 ;;   gets paths from configs and finds valid tests 
 ;;   returns hash of testname --> fullpath
 ;;
@@ -61,21 +76,28 @@
 (define (tests:get-valid-tests test-registry tests-paths)
   (if (null? tests-paths) 
       test-registry
       (let loop ((hed (car tests-paths))
 		 (tal (cdr tests-paths)))
-	(if (file-exists? hed)
+	(if (common:file-exists? hed)
 	    (for-each (lambda (test-path)
 			(let* ((tname   (last (string-split test-path "/")))
 			       (tconfig (conc test-path "/testconfig")))
 			  (if (and (not (hash-table-ref/default test-registry tname #f))
-				   (file-exists? tconfig))
+				   (common:file-exists? tconfig))
 			      (hash-table-set! test-registry tname test-path))))
 		      (glob (conc hed "/*"))))
 	(if (null? tal)
 	    test-registry
 	    (loop (car tal)(cdr tal))))))
+
+(define (tests:filter-test-names-not-matched test-names test-patts)
+  (delete-duplicates
+   (filter (lambda (testname)
+	     (not (tests:match test-patts testname #f)))
+	   test-names)))
+
 
 (define (tests:filter-test-names test-names test-patts)
   (delete-duplicates
    (filter (lambda (testname)
 	     (tests:match test-patts testname #f))
@@ -146,18 +168,18 @@
 
 
 ;; returns waitons waitors tconfigdat
 ;;
 (define (tests:get-waitons test-name all-tests-registry)
-   (let* ((config  (tests:get-testconfig test-name #f all-tests-registry 'return-procs)))
+   (let* ((config  (tests:get-testconfig test-name #f all-tests-registry 'return-procs))) ;; assuming no problems with immediate evaluation, this could be simplified ('return-procs -> #t)
      (let ((instr (if config 
-		      (config-lookup config "requirements" "waiton")
+		      (configf:lookup config "requirements" "waiton")
 		      (begin ;; No config means this is a non-existant test
 			(debug:print-error 0 *default-log-port* "non-existent required test \"" test-name "\"")
 			(exit 1))))
 	   (instr2 (if config
-		       (config-lookup config "requirements" "waitor")
+		       (configf:lookup config "requirements" "waitor")
 		       "")))
        (debug:print-info 8 *default-log-port* "waitons string is " instr ", waitors string is " instr2)
        (let ((newwaitons
 	      (string-split (cond
 			     ((procedure? instr) ;; here 
@@ -205,42 +227,74 @@
 ;;                                  mode itemwait
 ;;                                  # trim off the cell to determine what to run for genlib
 ;;                                  itemmap /.*
 ;;
 ;;                                  waiting-test is waiting on waiton-test so we need to create a pattern for waiton-test given waiting-test and itemmap
-(define (tests:extend-test-patts test-patt waiting-test waiton-test itemmaps)
-  (let* ((itemmap          (tests:lookup-itemmap itemmaps waiton-test))
-	 (patts            (string-split test-patt ","))
-	 (waiting-test-len (+ (string-length waiting-test) 1))
-	 (patts-waiton     (map (lambda (x)  ;; for each incoming patt that matches the waiting test
-				  (let* ((modpatt (if itemmap (db:convert-test-itempath x itemmap) x)) 
-					 (newpatt (conc waiton-test "/" (substring modpatt waiting-test-len (string-length modpatt)))))
-				    ;; (conc waiting-test "/," waiting-test "/" (substring modpatt waiton-test-len (string-length modpatt)))))
-				    ;; (print "in map, x=" x ", newpatt=" newpatt)
-				    newpatt))
-				(filter (lambda (x)
-					  (eq? (substring-index (conc waiting-test "/") x) 0)) ;; is this patt pertinent to the waiting test
-					patts))))
-    (string-intersperse (delete-duplicates (append patts (if (null? patts-waiton)
-							     (list (conc waiton-test "/%")) ;; really shouldn't add the waiton forcefully like this
-							     patts-waiton)))
-			",")))
-
-
-  
+;; BB> (tests:extend-test-patts "normal-second/2" "normal-second" "normal-first" '())
+;; observed -> "normal-first/2,normal-first/,normal-second/2,normal-second/"
+;; expected -> "normal-first,normal-second/2,normal-second/"
+;; testpatt = normal-second/2
+;; waiting-test = normal-second
+;; waiton-test = normal-first
+;; itemmaps = ()
+
+(define (tests:extend-test-patts test-patt waiting-test waiton-test itemmaps itemized-waiton)
+  (cond
+   (itemized-waiton
+    (let* ((itemmap          (tests:lookup-itemmap itemmaps waiton-test))
+           (patts            (string-split test-patt ","))
+           (waiting-test-len (+ (string-length waiting-test) 1))
+           (patts-waiton     (map (lambda (x)  ;; for each incoming patt that matches the waiting test
+                                    (let* ((modpatt (if itemmap (db:convert-test-itempath x itemmap) x)) 
+                                           (newpatt (conc waiton-test "/" (substring modpatt waiting-test-len (string-length modpatt)))))
+                                      ;; (conc waiting-test "/," waiting-test "/" (substring modpatt waiton-test-len (string-length modpatt)))))
+                                      ;; (print "in map, x=" x ", newpatt=" newpatt)
+                                      newpatt))
+                                  (filter (lambda (x)
+                                            (eq? (substring-index (conc waiting-test "/") x) 0)) ;; is this patt pertinent to the waiting test
+                                          patts)))
+           (extended-test-patt   (append patts (if (null? patts-waiton)
+                                                   (list (conc waiton-test "/%")) ;; really shouldn't add the waiton forcefully like this
+                                                   patts-waiton)))
+           (extended-test-patt-with-toplevels
+            (fold (lambda (testpatt-item accum )
+                    (let ((my-match (string-match "^([^%\\/]+)\\/.+$" testpatt-item)))
+                      (cons testpatt-item
+                            (if my-match
+                                (cons
+                                 (conc (cadr my-match) "/")
+                                 accum)
+                                accum))))
+                  '()
+                  extended-test-patt)))
+      (string-intersperse (delete-duplicates extended-test-patt-with-toplevels) ",")))
+   (else ;; not waiting on items, waiting on entire waiton test.
+    (let* ((patts (string-split test-patt ","))
+           (new-patts (if (member waiton-test patts)
+                          patts
+                          (cons waiton-test patts))))
+      (string-intersperse (delete-duplicates new-patts) ",")))))
+
+(define *glob-like-match-cache* (make-hash-table))
+(define (tests:cache-regexp str-in flag)
+  (let* ((key (conc str-in flag)))
+    (or (hash-table-ref/default *glob-like-match-cache* key #f)
+	(let* ((newrx (regexp str-in flag)))
+	  (hash-table-set! *glob-like-match-cache* key newrx)
+	  newrx))))
+
 ;; tests:glob-like-match 
 (define (tests:glob-like-match patt str) 
-  (let ((like (substring-index "%" patt)))
-    (let* ((notpatt  (equal? (substring-index "~" patt) 0))
-	   (newpatt  (if notpatt (substring patt 1) patt))
-	   (finpatt  (if like
-			(string-substitute (regexp "%") ".*" newpatt #f)
-			(string-substitute (regexp "\\*") ".*" newpatt #f)))
-	   (res      #f))
-      ;; (print "tests:glob-like-match => notpatt: " notpatt ", newpatt: " newpatt ", finpatt: " finpatt)
-      (set! res (string-match (regexp finpatt (if like #t #f)) str))
-      (if notpatt (not res) res))))
+  (let* ((like     (substring-index "%" patt))
+	 (notpatt  (equal? (substring-index "~" patt) 0))
+	 (newpatt  (if notpatt (substring patt 1) patt))
+	 (finpatt  (if like
+		       (string-substitute (regexp "%") ".*" newpatt #f)
+		       (string-substitute (regexp "\\*") ".*" newpatt #f)))
+	 (rx       (tests:cache-regexp finpatt (if like #t #f)))
+	 (res      (string-match rx str)))
+    (if notpatt (not res) res)))
 
 ;; if itempath is #f then look only at the testname part
 ;;
 (define (tests:match patterns testname itempath #!key (required '()))
   (if (string? patterns)
@@ -305,11 +359,11 @@
 	  (db:test-get-rundir prev-testdat)) ;; )
 	 (waivers     (if testconfig (configf:section-vars testconfig "waivers") '()))
 	 (waiver-rx   (regexp "^(\\S+)\\s+(.*)$"))
 	 (diff-rule   "diff %file1% %file2%")
 	 (logpro-rule "diff %file1% %file2% | logpro %waivername%.logpro %waivername%.html"))
-    (if (not (file-exists? test-rundir))
+    (if (not (common:file-exists? test-rundir))
 	(begin
 	  (debug:print-error 0 *default-log-port* "test run directory is gone, cannot propagate waiver")
 	  #f)
 	(begin
 	  (push-directory test-rundir)
@@ -322,11 +376,11 @@
 				     (wparts      (if waiver (string-match waiver-rx waiver) #f))
 				     (waiver-rule (if wparts (cadr wparts)  #f))
 				     (waiver-glob (if wparts (caddr wparts) #f))
 				     (logpro-file (if waiver
 						      (let ((fname (conc hed ".logpro")))
-							(if (file-exists? fname)
+							(if (common:file-exists? fname)
 							    fname 
 							    (begin
 							      (debug:print 0 *default-log-port* "INFO: No logpro file " fname " falling back to diff")
 							      #f)))
 						      #f))
@@ -420,19 +474,19 @@
     ;;       (sqlite3:execute db "UPDATE tests SET first_warn=? WHERE run_id=? AND testname=? AND item_path=?;" val run-id test-name item-path)))
 
     (let ((category (hash-table-ref/default otherdat ":category" ""))
 	  (variable (hash-table-ref/default otherdat ":variable" ""))
 	  (value    (hash-table-ref/default otherdat ":value"    #f))
-	  (expected (hash-table-ref/default otherdat ":expected" #f))
-	  (tol      (hash-table-ref/default otherdat ":tol"      #f))
+	  (expected (hash-table-ref/default otherdat ":expected" "n/a"))
+	  (tol      (hash-table-ref/default otherdat ":tol"      "n/a"))
 	  (units    (hash-table-ref/default otherdat ":units"    ""))
 	  (type     (hash-table-ref/default otherdat ":type"     ""))
 	  (dcomment (hash-table-ref/default otherdat ":comment"  "")))
       (debug:print 4 *default-log-port* 
 		   "category: " category ", variable: " variable ", value: " value
 		   ", expected: " expected ", tol: " tol ", units: " units)
-      (if (and value expected tol) ;; all three required
+      (if (and value) ;; require only value; BB was- all three required
 	  (let ((dat (conc category ","
 			   variable ","
 			   value    ","
 			   expected ","
 			   tol      ","
@@ -439,11 +493,16 @@
 			   units    ","
 			   dcomment ",," ;; extra comma for status
 			   type     )))
 	    ;; This was run remote, don't think that makes sense. Perhaps not, but that is the easiest path for the moment.
 	    (rmt:csv->test-data run-id test-id
-				dat))))
+				dat)
+	    ;; This was added in check-in a5adfa3f9a. Message was: "...added delay in set-values to allow for delayed write on server start"
+	    ;; I'm inserting an arbitrary rmt: call to force/ensure that the server is available to (hopefully) prevent a communication issue.
+	    (rmt:get-var "MEGATEST_VERSION") ;; this does NOTHING but ensure the server is reachable. This is almost certainly NOT needed :)
+            ;; BB - commentiong out arbitrary 10 second wait (thread-sleep! 10) ;; add 10 second delay before quit incase rmt needs time to start a server.
+            )))
       
     ;; need to update the top test record if PASS or FAIL and this is a subtest
     ;;;;;; (if (not (equal? item-path ""))
     ;;;;;;     (rmt:set-state-status-and-roll-up-items run-id test-name item-path state status #f) ;;;;;)
 
@@ -493,11 +552,13 @@
 		  (tests:test-set-toplog! run-id test-name outputfilename))
 		;; didn't get the lock, check to see if current update started later than this 
 		;; update, if so we can exit without doing any work
 		(if (> my-start-time (handle-exceptions
 					 exn
-					 0
+				       (begin
+					 (print "failed to get mod time on " lockf ", exn=" exn)
+					 0)
 				       (file-modification-time lockf)))
 		    ;; we started since current re-gen in flight, delay a little and try again
 		    (begin
 		      (debug:print-info 1 *default-log-port* "Waiting to update " outputfilename ", another test currently updating it")
 		      (thread-sleep! (+ 5 (random 5))) ;; delay between 5 and 10 seconds
@@ -581,13 +642,18 @@
 .HandCursorStyle { cursor: pointer; cursor: hand; }  /* For IE */
 th {background-color: #8c8c8c;}
 td.test {background-color: #d9dbdd;}
 td.PASS {background-color: #347533;}
 td.FAIL {background-color: #cc2812;}
+td.SKIP{background-color: #FFD733;}
+td.WARN {background-color: #EA8724;}
+td.WAIVED {background-color: #838A12;}
+td.ABORT{background-color: #EA24B7;}
+.PASS .link, .SKIP .link, .WARN .link,.WAIVED .link,.ABORT .link, .FAIL .link{color: #FFFFFF;}
 
-  
-  
+
+
 
 
   
 EOF
 )
 
+(define tests:css-jscript-block-dynamic 
+#< 
+EOF
+)
+
+(define  (test:js-block javascript-lib)
+   (conc  "" ))
+
+
+(define tests:css-jscript-block-static (test:js-block *java-script-lib*))
+
+(define (tests:css-jscript-block-cond dynamic) 
+      (if (equal? dynamic  #t)
+       tests:css-jscript-block-dynamic
+       tests:css-jscript-block-static))
+
+       
 (define (tests:run-record->test-path run numkeys)
    (append (take (vector->list run) numkeys)
 	   (list (vector-ref run (+ 1 numkeys)))))
 
 
@@ -709,105 +793,394 @@
                (hash-table-set!  (hash-table-ref/default (hash-table-ref/default resh test-name  #f) test-item #f) run-id (list test-status test-html-path)))) 
         test-data)))
       runs)
    resh))
 
+
+;; tests:genrate dashboard body 
+;;
+
+(define (tests:dashboard-body page pg-size keys numkeys  total-runs linktree area-name get-prev-links get-next-links flag run-patt target-patt)
+  (let* ((start (* page pg-size)) 
+					;(runsdat   (rmt:get-runs "%" pg-size start (map (lambda (x)(list x "%")) keys)))
+         (runsdat   (rmt:get-runs-by-patt  keys run-patt target-patt start pg-size #f 0 sort-order: "desc"))
+					; db:get-runs-by-patt   keys runnamepatt targpatt offset limit fields last-update   
+	 (header    (vector-ref runsdat 0))
+	 (runs      (vector-ref runsdat 1))
+         (ctr 0)
+         (test-runs-hash (tests:get-rest-data runs header numkeys))
+         (test-list (hash-table-keys test-runs-hash))) 
+    
+    (s:html tests:css-jscript-block (tests:css-jscript-block-cond flag)
+	    (s:title "Summary for " area-name)
+	    (s:body 'onload "addEvents();"
+		    (get-prev-links page linktree)
+		    (get-next-links page linktree total-runs)
+		    
+		    (s:h1 "Summary for " area-name)
+		    (s:h3 "Filter" )
+		    (s:input 'type "text"  'name "testname" 'id "testname" 'length "30" 'onkeyup "filtersome()")
+		    ;; top list
+		    
+		    (s:table 'id "LinkedList1" 'border "1" 'cellspacing 0
+			     (map (lambda (key)
+				    (let* ((res (s:tr 'class "something" 
+						      (s:th key )
+						      (map (lambda (run)
+							     (s:th  (vector-ref run ctr)))
+							   runs))))
+				      (set! ctr (+ ctr 1))
+				      res))
+				  keys)
+			     (s:tr
+			      (s:th "Run Name")
+			      (map (lambda (run)
+				     (s:th (db:get-value-by-header run header "runname")))
+				   runs))
+			     
+			     (map (lambda (test-name)
+				    (let* ((item-hash (hash-table-ref/default test-runs-hash test-name  #f))
+					   (item-keys (sort (hash-table-keys item-hash) string<=?))) 
+				      (map (lambda (item-name)  
+  		                             (let* ((res (s:tr  'class item-name
+								(s:td  item-name 'class "test" )
+								(map (lambda (run)
+								       (let* ((run-test (hash-table-ref/default item-hash item-name  #f))
+									      (run-id (db:get-value-by-header run header "id"))
+									      (result (hash-table-ref/default run-test run-id "n/a"))
+					;(relative-path (get-relative-path)) 
+									      (status (if (string? result)
+											  result
+											  (car result)))
+									      (link (if (string? result)
+											result
+											(if (equal? flag #t) 
+											    (s:a (car result) 'href (conc "./test_log?runid=" run-id "&testname="  item-name ))
+											    (s:a (car result) 'href (string-substitute  (conc linktree "/")  "" (cadr result)  "-"))))))
+									 (s:td  link 'class status)))
+								     runs))))
+					       res))
+					   item-keys)))
+				  test-list)))))) 
+
 ;; (tests:create-html-tree "test-index.html")
 ;;
 (define (tests:create-html-tree outf)
-   (let* ((lockfile  (conc outf ".lock"))
+  (let* ((lockfile  (conc outf ".lock"))
 	 (runs-to-process '())
          (linktree  (common:get-linktree))
-          (area-name (common:get-testsuite-name))
-	  (keys      (rmt:get-keys))
-	  (numkeys   (length keys))
+         (area-name (common:get-testsuite-name))
+	 (keys      (rmt:get-keys))
+	 (numkeys   (length keys))
+         (run-patt (or (args:get-arg "-run-patt")
+		       (args:get-arg "-runname")
+		       "%"))
+         (target (or  (args:get-arg "-target-patt") 
+		      (args:get-arg "-target")
+                      "%"))
+         (targlist (string-split target "/"))
+         (numtarg  (length targlist))  
+         (targtweaked (if (> numkeys numtarg)
+			  (append targlist (make-list (- numkeys numtarg) "%"))
+			  targlist))
+         (target-patt (string-join targtweaked "/"))
+					;(total-runs  (rmt:get-num-runs "%")) ;;this needs to be changed to filter by target
+	 (total-runs (rmt:get-runs-cnt-by-patt run-patt target-patt keys )) 
+         (pg-size 10))
+    (if (common:simple-file-lock lockfile)
+        (begin
+					;(print total-runs)    
+	  (let loop ((page 0))
+	    (let* ((oup            (open-output-file (or outf (conc linktree "/page" page ".html"))))
+		   (get-prev-links (lambda (page linktree )   
+				     (let* ((link  (if (not (eq? page 0))
+						       (s:a "<<prev" 'href (conc  "page" (- page 1) ".html"))
+						       (s:a "" 'href (conc   "page"  page ".html")))))
+				       link)))
+		   (get-next-links (lambda (page linktree total-runs)   
+				     (let* ((link  (if (> total-runs (+ 10 (* page pg-size)))
+						       (s:a "next>>" 'href (conc  "page"  (+ page 1) ".html"))
+						       (s:a "" 'href (conc   "page" page  ".html")))))
+				       link))) )
+	      (print "total runs: " total-runs) 
+	      (s:output-new
+	       oup
+	       (tests:dashboard-body page pg-size keys numkeys total-runs linktree area-name get-prev-links get-next-links #f run-patt target-patt)) ;; update this function
+	      (close-output-port oup)
+					; (set! page (+ 1 page))
+	      (if (> total-runs (* (+ 1 page) pg-size))
+		  (loop (+ 1  page)))))
+	  (common:simple-file-release-lock lockfile))
+	(begin
+	  (debug-print 0 *default-log-port* "Failed to get lock on file outf, lockfile: " lockfile) #f))))
+
+
+(define (tests:readlines filename)
+  (call-with-input-file filename
+    (lambda (p)
+      (let loop ((line (read-line p))
+                 (result '()))
+        (if (eof-object? line)
+            (reverse result)
+            (loop (read-line p) (cons line result)))))))
+
+(define (tests:get-test-log run-id test-name item-name)
+  (let* ((test-data    (rmt:get-tests-for-run
+				   (string->number run-id)
+                                    test-name      ;; testnamepatt
+				   '()        ;; states
+				   '()        ;; statuses
+				   #f         ;; offset
+				   #f         ;; num-to-get
+				   #f         ;; hide/not-hide
+				   #f         ;; sort-by
+				   #f         ;; sort-order
+				   #f         ;; 'shortlist                           ;; qrytype
+                                   0         ;; last update
+				   #f))
+         (path "")
+         (found 0))
+    (debug:print-info 0 *default-log-port* "found: " found )
+
+   (let loop ((hed (car test-data))
+		 (tal (cdr test-data)))
+          (debug:print-info 0 *default-log-port* "item: " (vector-ref hed 11) (vector-ref hed 10) "/" (vector-ref hed 13))
+
+	(if (equal? (vector-ref hed 11) item-name)
+            (begin
+              (set! found 1) 
+	      (set! path (conc (vector-ref hed 10) "/" (vector-ref hed 13)))))
+	    (if (and (not (null? tal)) (equal? found 0))
+		(loop (car tal)(cdr tal))))
+   (if (equal? path "")
+     "
    Data not found
    "
+     (string-join (tests:readlines path) "\n"))))
+
+
+(define (tests:dynamic-dboard page)
+;(define (tests:create-html-tree o)
+ (let* (
+;(page "1")
+          (linktree  (common:get-linktree))
+         (area-name (common:get-testsuite-name))
+	       (keys      (rmt:get-keys))
+	       (numkeys   (length keys))
+         (targtweaked (make-list numkeys "%"))
+         (target-patt (string-join targtweaked "/"))
          (total-runs  (rmt:get-num-runs "%"))
-         (pg-size 10)   )
+         (pg-size 10)
+         (pg (if (equal? page #f)
+                 0
+                 (- (string->number page) 1)))
+          (get-prev-links  (lambda (pg linktree)
+                           (debug:print-info 0 *default-log-port* "val: " (- 1 pg))
+                          (let* ((link  (if (not (eq? pg 0))
+                               (s:a  "<<prev " 'href (conc  "dashboard?page="  pg  ))
+                               (s:a "" 'href (conc  "dashboard?page=" pg)))))
+                               link)))
+          (get-next-links   (lambda (pg linktree total-runs)  
+                            (debug:print-info 0 *default-log-port* "val: " pg)
+                             (debug:print-info 0 *default-log-port* "val: " total-runs " size" pg-size)
+ 
+                            (let* ((link  (if (> total-runs (+ 10 (* pg pg-size)))
+                              (s:a  "next>> "  'href (conc  "dashboard?page="  (+ pg 2)  ))
+                             (s:a "" 'href (conc  "dashboard?page=" pg  )))))
+                             link)))
+         (html-body (tests:dashboard-body pg pg-size keys numkeys total-runs linktree area-name get-prev-links get-next-links #t "%" target-patt))) ;; update tis function
+        html-body))
+
+(define (tests:create-html-summary outf)
+ (let* ((lockfile  (conc outf ".lock"))
+        (linktree  (common:get-linktree))
+				(keys      (rmt:get-keys))
+        (area-name (common:get-testsuite-name))
+        (run-patt (or (args:get-arg "-run-patt")
+                        (args:get-arg "-runname")
+                        "%"))
+        (target (or (args:get-arg "-target-patt")
+                        (args:get-arg "-target")
+                        "%"))
+         (targlist (string-split target "/"))
+         (numkeys  (length keys))
+	       (numtarg  (length targlist))  
+         (targtweaked (if (> numkeys numtarg)
+			   								(append targlist (make-list (- numkeys numtarg) "%"))
+			  								targlist))
+        (target-patt (string-join targtweaked "/")))
     (if (common:simple-file-lock lockfile)
         (begin
-         (print total-runs)    
-        (let loop ((page 0))
-	(let* ((oup       (open-output-file (or outf (conc linktree "/page" page ".html"))))
-               (start (* page pg-size)) 
-	       (runsdat   (rmt:get-runs "%" pg-size start (map (lambda (x)(list x "%")) keys)))
-	       (header    (vector-ref runsdat 0))
-	       (runs      (vector-ref runsdat 1))
-               (ctr 0)
-               (test-runs-hash (tests:get-rest-data runs header numkeys))
-               (test-list (hash-table-keys test-runs-hash))
-               (get-prev-links (lambda (page linktree )   
-                            (let* ((link  (if (not (eq? page 0))
-                                            (s:a "<<prev" 'href (conc  linktree "/page" (- page 1) ".html"))
-                                            (s:a "" 'href (conc  linktree "/page"  page ".html")))))
-                               link)))
-                (get-next-links (lambda (page linktree total-runs)   
-                            (let* ((link  (if (> total-runs (+ 1 (* page pg-size)))
-                                            (s:a "next>>" 'href (conc  linktree "/page"  (+ page 1) ".html"))
-                                             (s:a "" 'href (conc  linktree "/page" page  ".html")))))
-                               link))))
-	  (s:output-new
-	   oup
-	   (s:html tests:css-jscript-block
-		   (s:title "Summary for " area-name)
-		   (s:body 'onload "addEvents();"
-                          (get-prev-links page linktree)
-                          (get-next-links page linktree total-runs)
-                           
-			   (s:h1 "Summary for " area-name)
-                           (s:h3 "Filter" )
-                           (s:input 'type "text"  'name "testname" 'id "testname" 'length "30" 'onkeyup "filtersome()")
-  
-			   ;; top list
-			   (s:table 'id "LinkedList1" 'border "1"
-                            (map (lambda (key)
-				 (let* ((res (s:tr 'class "something" 
-				  (s:th key )
-                                   (map (lambda (run)
-                                   (s:th  (vector-ref run ctr)))
-                                  runs))))
-                             (set! ctr (+ ctr 1))
-                               res))
-                               keys)
-                               (s:tr
-				 (s:th "Run Name")
-                                  (map (lambda (run)
-                                   (s:th  (vector-ref run 3)))
-                                  runs))
-                              
-                               (map (lambda (test-name)
-                                 (let* ((item-hash (hash-table-ref/default test-runs-hash test-name  #f))
-                                         (item-keys (sort (hash-table-keys item-hash) string<=?))) 
-                                          (map (lambda (item-name)  
-  		                             (let* ((res (s:tr  'class item-name
-				                         (s:td  item-name 'class "test" )
-                                                           (map (lambda (run)
-                                                               (let* ((run-test (hash-table-ref/default item-hash item-name  #f))
-                                                                      (run-id (db:get-value-by-header run header "id"))
-                                                                      (result (hash-table-ref/default run-test run-id "n/a"))
-                                                                      (status (if (string? result)
-                                                                                 (begin 
-                                                                                  ; (print "string" result)
-                                                                                     result)
-                                                                                 (begin 
-                                                                                   ;  (print "not string" result )
-                                                                                 (car result)))))
-                                                                       (s:td  status 'class status)))
-                                                                runs))))
-                                                        res))
-                                                   item-keys)))
-                               test-list)))))
-          (close-output-port oup)
-         ; (set! page (+ 1 page))
-          (if (> total-runs (* (+ 1 page) pg-size))
-           (loop (+ 1  page)))))
+          (let* (;(runsdat1   (rmt:get-runs run-patt #f #f (map (lambda (x)(list x "%")) keys)))
+                 (runsdat   (rmt:get-runs-by-patt  keys run-patt target-patt #f #f #f 0))
+					       (runs      (vector-ref runsdat 1))
+                 (header      (vector-ref runsdat 0))
+        	       (oup       (open-output-file (or outf (conc linktree "/targets.html"))))
+                 (target-hash (test:create-target-hash runs header (length keys))))
+           (test:create-target-html target-hash oup area-name linktree)
+          (test:create-run-html  runs area-name linktree (length keys) header))
 	  (common:simple-file-release-lock lockfile))
-	            
 	#f)))
 
+(define (test:get-test-hash test-data)
+	(let ((resh (make-hash-table)))
+    	(map (lambda (test)
+        (let* ((test-name (vector-ref test 2))
+               (test-html-path (if (file-exists? (conc (vector-ref test 10) "/test-summary.html"))
+																 (conc (vector-ref test 10) "/test-summary.html" )
+							 									 (conc (vector-ref test 10) "/" (vector-ref test 13))))
+               (test-item  (vector-ref test 11))
+               (test-status (vector-ref test 4)))
+               (if (not (hash-table-ref/default resh test-item  #f))
+                   (hash-table-set! resh test-item   (make-hash-table)))
+               (hash-table-set! (hash-table-ref/default resh test-item  #f) test-name (list test-status test-html-path)))) 
+        test-data)
+resh))
+
+(define (test:get-data->b-keys ordered-data a-keys)
+  (delete-duplicates
+   (sort (apply
+	  append
+	  (map (lambda (sub-key)
+		 (let ((subdat (hash-table-ref ordered-data sub-key)))
+		   (hash-table-keys subdat)))
+	       a-keys))
+	 string>=?)))
+
+
+(define (test:create-run-html runs area-name linktree numkeys header)
+  (map (lambda (run)
+		 (let* ((target (string-join (take (vector->list run) numkeys) "/"))
+						(run-name (db:get-value-by-header run header "runname"))
+            (run-time (seconds->work-week/day-time (db:get-value-by-header run header "event_time")))
+						(oup (if (file-exists? (conc linktree "/" target "/" run-name))
+                        (open-output-file (conc linktree "/" target "/" run-name "/run.html"))
+                         #f))
+            (run-id (db:get-value-by-header run header "id"))
+            (test-data    (rmt:get-tests-for-run
+				  								 run-id
+                           "%"       ;; testnamepatt
+				  								 '()        ;; states
+				   								 '()        ;; statuses
+				  								 	#f         ;; offset
+				  						 			#f         ;; num-to-get
+				   									#f         ;; hide/not-hide
+				  								  #f         ;; sort-by
+				   									#f         ;; sort-order
+				   									#f         ;; 'shortlist                           ;; qrytype
+                            0         ;; last update
+				  									#f))
+            (item-test-hash (test:get-test-hash test-data))
+            (items  (hash-table-keys item-test-hash))
+ 						(test-names (test:get-data->b-keys item-test-hash items)))
+    (if oup
+      (begin 
+     (s:output-new
+	   oup
+	   (s:html tests:css-jscript-block (tests:css-jscript-block-cond #f)
+		   (s:title "Runs View " run-name)
+		   (s:body
+		     (s:h1 "Runs View " )
+         (s:h3 "Target" target)
+				 (s:p 
+					(s:b "Run name" ) run-name)
+         (s:p 
+					(s:b "Run Date" ) run-time)
+         (s:table 'border 1 'cellspacing 0
+           (s:tr
+           (s:th "Items")
+           (map (lambda (test)
+            (s:th test))
+           test-names))  
+           (map (lambda (item) 
+					  (let* ((test-hash (hash-table-ref/default item-test-hash item  #f)))
+								 (if test-hash
+                  (begin
+									(s:tr
+					  			(s:td 'class "test" item)
+            			(map (lambda (test)
+						  		(let* ((test-details (hash-table-ref/default test-hash test  #f))
+												(status (if test-details
+																(car test-details)))
+                        (link (if test-details 
+														(string-substitute  (conc linktree "/" target "/" run-name "/")  "" (cadr test-details) "-"))))
+                   (if test-details
+											(s:td 'class status
+												(s:a 'class "link" 'href link status ))
+                      (s:td "")))) 			
+									test-names))))))
+				  (sort items string<=?))))))
+		(close-output-port oup))
+    (debug:print-info 0 "Skip: Dirctory structure " linktree "/" target "/" run-name " does not exist. Megatest will not create run.html"))))
+runs))
+
+(define (test:create-target-hash runs header numkeys)
+  (let ((resh (make-hash-table)))
+   (for-each
+     (lambda (run)
+        (let* ((run-name (db:get-value-by-header run header "runname"))
+               (target   (string-join (take (vector->list run) numkeys) "/"))
+               (run-list (hash-table-ref/default resh target  #f)))
+               
+               (if (not run-list)
+                   (hash-table-set! resh target   (list run-name))
+                   (hash-table-set! resh target   (cons run-name run-list)))))
+      runs)
+   resh))
+
+(define (test:get-max-run-cnt target-hash targets)
+   (let* ((cnt 0 ))
+   (map (lambda (target)
+        (let* ((runs  (hash-table-ref/default target-hash target  #f))
+               (run-length (if runs
+																(length runs)
+                                 0)))
+  
+              (if (< cnt run-length)
+               (set! cnt  run-length)))) 
+		targets) 
+cnt))
+ 
+(define (test:pad-runs target-hash targets max-row-length)
+ (map (lambda (target)
+        (let loop ((run-list  (hash-table-ref/default target-hash target  #f)))
+               (if (< (length run-list) max-row-length)
+                 (begin  
+               		 (hash-table-set! target-hash target   (cons "" run-list))
+               		 (loop (hash-table-ref/default target-hash target  #f) ))))) 
+		targets)
+   target-hash)
 
+(define (test:create-target-html target-hash oup area-name linktree)
+  (let* ((targets (hash-table-keys target-hash))
+         (max-row-length (test:get-max-run-cnt target-hash targets))
+         (pad-runs-hash (test:pad-runs target-hash targets max-row-length)))
+   (s:output-new
+	   oup
+	   (s:html tests:css-jscript-block (tests:css-jscript-block-cond #f)
 
-
+		   (s:title "Target View " area-name)
+		   (s:body
+		   (s:h1 "Target View " area-name)
+					(s:table 'id "LinkedList1" 'border "1" 'cellspacing 0
+             (s:tr 'class "something" 
+               (s:th "Target")
+								(s:th 'colspan max-row-length "Runs"))                                              
+                (let* ((tbl (map (lambda (target)
+                      (s:tr
+                      (s:td 'class "test" target)
+										  (let* ((runs  (hash-table-ref/default target-hash target  #f))
+														 (rest-row (map (lambda (run)
+																				(if (equal? run "")
+																						(s:td run)
+                                            (if (file-exists?(conc linktree "/" target "/" run ))
+																						(begin 
+																							(s:td 
+																							(s:a 'href (conc  target "/" run "/run.html") run))))))
+																				(reverse runs))))
+                              rest-row)))
+                                   targets)))
+                           tbl)))))
+          (close-output-port oup)))
 
 
 (define (tests:create-html-tree-old outf)
    (let* ((lockfile  (conc outf ".lock"))
 	 (runs-to-process '()))
@@ -839,11 +1212,11 @@
 						      '()
 						      (lambda (x p)
 							(let* ((targ-path (string-intersperse p "/"))
                                                                (full-path (conc linktree "/" targ-path))
                                                                (run-name  (car (reverse p))))
-                                                          (if (and (file-exists? full-path)
+                                                          (if (and (common:file-exists? full-path)
                                                                    (directory?   full-path)
                                                                    (file-write-access? full-path))
                                                               (s:a run-name 'href (conc targ-path "/run-summary.html"))
                                                               (begin
                                                                 (debug:print 0 *default-log-port* "INFO: Can't create " targ-path "/run-summary.html")
@@ -878,11 +1251,11 @@
                                            path-parts))
                                        test-dats))
                     (tests-htree (common:list->htree tests-tree-dat))
                     (html-dir    (conc linktree "/" (string-intersperse run-dir "/")))
                     (html-path   (conc html-dir "/run-summary.html"))
-                    (oup         (if (and (file-exists? html-dir)
+                    (oup         (if (and (common:file-exists? html-dir)
                                           (directory?   html-dir)
                                           (file-write-access? html-dir))
                                      (open-output-file  html-path)
                                      #f)))
                ;; (print "run-dir: " run-dir ", tests-tree-dat: " tests-tree-dat)
@@ -906,21 +1279,21 @@
                                                                           (item-path ;; (if (> (length p) 2) ;; test-name + run-name
                                                                            (string-intersperse p "/"))
                                                                           (full-targ (conc html-dir "/" targ-path))
                                                                           (std-file  (conc full-targ "/test-summary.html"))
                                                                           (alt-file  (conc full-targ "/megatest-rollup-" test-name ".html"))
-                                                                          (html-file (if (file-exists? alt-file)
+                                                                          (html-file (if (common:file-exists? alt-file)
                                                                                          alt-file
                                                                                          std-file))
                                                                           (run-name  (car (reverse p))))
-                                                                     (if (and (not (file-exists? full-targ))
+                                                                     (if (and (not (common:file-exists? full-targ))
                                                                               (directory? full-targ)
                                                                               (file-write-access? full-targ))
                                                                          (tests:summarize-test 
                                                                           run-id 
                                                                           (rmt:get-test-id run-id test-name item-path)))
-                                                                     (if (file-exists? full-targ)
+                                                                     (if (common:file-exists? full-targ)
                                                                          (s:a run-name 'href html-file)
                                                                          (begin
                                                                            (debug:print 0 *default-log-port* "ERROR: can't access " full-targ)
                                                                            (conc "No summary for " run-name)))))
                                                                  ))))))
@@ -1036,10 +1409,29 @@
 			       ;; (stringwork-week/day-time 
 						     (db:test-get-event_time test-dat)))
 			    (s:td "Duration") (s:td (seconds->hr-min-sec (db:test-get-run_duration test-dat)))))
 	     (s:h3 "Log files")
-	     (s:table
+	     (s:table 
 	      'cellspacing "0" 'border "1"
 	      (s:tr (s:td "Final log")(s:td (s:a 'href logf logf))))
 	     (s:table
 	      'cellspacing "0" 'border "1"
 	      (s:tr (s:td "Step Name")(s:td "Start")(s:td "End")(s:td "Status")(s:td "Duration")(s:td "Log File"))
@@ -1114,13 +1506,15 @@
 	       (map (lambda (p)
 		      (if (directory-exists? p)
 			  (let ((glob-query (conc p "/" fnamepatt)))
 			    (handle-exceptions
 				exn
+			      (begin
+				(print "built-in glob on " glob-query ", failed, try using the shell. exn=" exn)
 				(with-input-from-pipe
-				    (conc "echo " glob-query)
-				  read-lines)  ;; we aren't going to try too hard. If glob breaks it is likely because someone tried to do */*/*.log or similar
+				 (conc "echo " glob-query)
+				 read-lines))  ;; we aren't going to try too hard. If glob breaks it is likely because someone tried to do */*/*.log or similar
 			      (glob glob-query)))
 			  '()))
 		    paths-from-db))
 	paths-from-db)))
 
@@ -1129,11 +1523,11 @@
 ;; Gather data from test/task specifications
 ;;======================================================================
 
 ;; (define (tests:get-valid-tests testsdir test-patts) ;;  #!key (test-names '()))
 ;;   (let ((tests (glob (conc testsdir "/tests/*")))) ;; " (string-translate patt "%" "*")))))
-;;     (set! tests (filter (lambda (test)(file-exists? (conc test "/testconfig"))) tests))
+;;     (set! tests (filter (lambda (test)(common:file-exists? (conc test "/testconfig"))) tests))
 ;;     (delete-duplicates
 ;;      (filter (lambda (testname)
 ;; 	       (tests:match test-patts testname #f))
 ;; 	     (map (lambda (testp)
 ;; 		    (last (string-split testp "/")))
@@ -1146,35 +1540,38 @@
 	   (getenv "MT_TEST_NAME")
 	   (getenv "MT_ITEMPATH"))
       (conc (getenv "MT_LINKTREE")  "/"
 	    (getenv "MT_TARGET")    "/"
 	    (getenv "MT_RUNNAME")   "/"
-	    (getenv "MT_TEST_NAME") "/"
-	    (if (or (getenv "MT_ITEMPATH")
-		    (not (string=? "" (getenv "MT_ITEMPATH"))))
-		(conc "/" (getenv "MT_ITEMPATH"))))
+	    (getenv "MT_TEST_NAME")
+	    (if (and (getenv "MT_ITEMPATH")
+                     (not (string=? "" (getenv "MT_ITEMPATH"))))
+		(conc "/" (getenv "MT_ITEMPATH"))
+                ""))
       #f))
 
 ;; if .testconfig exists in test directory read and return it
 ;; else if have cached copy in *testconfigs* return it IFF there is a section "have fulldata"
 ;; else read the testconfig file
 ;;   if have path to test directory save the config as .testconfig and return it
 ;;
-(define (tests:get-testconfig test-name item-path test-registry system-allowed #!key (force-create #f))
+(define (tests:get-testconfig test-name item-path test-registry system-allowed #!key (force-create #f)(allow-write-cache #t)(wait-a-minute #f))
   (let* ((use-cache    (common:use-cache?))
 	 (cache-path   (tests:get-test-path-from-environment))
 	 (cache-file   (and cache-path (conc cache-path "/.testconfig")))
 	 (cache-exists (and cache-file
 			    (not force-create)  ;; if force-create then pretend there is no cache to read
-			    (file-exists? cache-file)))
+			    (common:file-exists? cache-file)))
 	 (cached-dat   (if (and (not force-create)
 				cache-exists
 				use-cache)
 			   (handle-exceptions
-			    exn
-			    #f ;; any issues, just give up with the cached version and re-read
-			    (configf:read-alist cache-file))
+			       exn
+			     (begin
+			       (debug:print 0 *default-log-port* "failed to read " cache-file ", exn=" exn)
+			       #f) ;; any issues, just give up with the cached version and re-read
+			     (configf:read-alist cache-file))
 			   #f))
          (test-full-name (if (and item-path (not (string-null? item-path)))
                              (conc test-name "/" item-path)
                              test-name)))
     (if cached-dat
@@ -1185,13 +1582,37 @@
 	      dat
 	      ;; no cached data available
 	      (let* ((treg         (or test-registry
 				       (tests:get-all)))
 		     (test-path    (or (hash-table-ref/default treg test-name #f)
+                                       (let* ((local-tcdir (conc (getenv "MT_LINKTREE") "/"
+                                                                 (getenv "MT_TARGET") "/"
+                                                                 (getenv "MT_RUNNAME") "/"
+                                                                 test-name "/" item-path))
+                                              (local-tcfg (conc local-tcdir "/testconfig")))
+                                         (if (common:file-exists? local-tcfg)
+                                             local-tcdir
+                                             #f))
 				       (conc *toppath* "/tests/" test-name)))
 		     (test-configf (conc test-path "/testconfig"))
-		     (testexists   (and (file-exists? test-configf)(file-read-access? test-configf)))
+		     (testexists   (let loopa ((tries-left 30))
+                                     (cond
+                                      (
+                                       (and (common:file-exists? test-configf)(file-read-access? test-configf))
+                                       #t)
+                                      (
+                                       (common:file-exists? test-configf)
+                                       (debug:print 0 *default-log-port* "WARNING: Cannot read testconfig file: "test-configf)
+                                       #f)
+                                      (
+                                       (and wait-a-minute (> tries-left 0))
+                                       (thread-sleep! 10)
+                                       (debug:print 0 *default-log-port* "WARNING: testconfig file does not exist: "test-configf" will retry in 10 seconds.  Tries left: "tries-left) ;; BB: this fires
+                                       (loopa (sub1 tries-left)))
+                                      (else
+                                       (debug:print 0 *default-log-port* "WARNING: testconfig file does not exist: "test-configf) ;; BB: this fires
+                                       #f))))
 		     (tcfg         (if testexists
 				       (read-config test-configf #f system-allowed
 						    environ-patt: (if system-allowed
 								      "pre-launch-env-vars"
 								      #f))
@@ -1198,14 +1619,15 @@
 				       #f)))
 		(if (and tcfg cache-file) (hash-table-set! tcfg "have fulldata" #t)) ;; mark this as fully read data
 		(if tcfg (hash-table-set! *testconfigs* test-full-name tcfg))
 		(if (and testexists
 			 cache-file
-			 (file-write-access? cache-path))
+			 (file-write-access? cache-path)
+			 allow-write-cache)
 		    (let ((tpath (conc cache-path "/.testconfig")))
 		      (debug:print-info 1 *default-log-port* "Caching testconfig for " test-name " in " tpath)
-                      (if (not (common:in-running-test?))
+                      (if (and tcfg (not (common:in-running-test?)))
                           (configf:write-alist tcfg tpath))))
 		tcfg))))))
   
 ;; sort tests by priority and waiton
 ;; Move test specific stuff to a test unit FIXME one of these days
@@ -1232,12 +1654,12 @@
 		       (b-record   (hash-table-ref test-records b))
 		       (a-waitons  (or (tests:testqueue-get-waitons a-record) '()))
 		       (b-waitons  (or (tests:testqueue-get-waitons b-record) '()))
 		       (a-config   (tests:testqueue-get-testconfig  a-record))
 		       (b-config   (tests:testqueue-get-testconfig  b-record))
-		       (a-raw-pri  (config-lookup a-config "requirements" "priority"))
-		       (b-raw-pri  (config-lookup b-config "requirements" "priority"))
+		       (a-raw-pri  (configf:lookup a-config "requirements" "priority"))
+		       (b-raw-pri  (configf:lookup b-config "requirements" "priority"))
 		       (a-priority (mungepriority a-raw-pri))
 		       (b-priority (mungepriority b-raw-pri)))
 		  (tests:testqueue-set-priority! a-record a-priority)
 		  (tests:testqueue-set-priority! b-record b-priority)
 		  ;; (debug:print 0 *default-log-port* "a=" a ", b=" b ", a-waitons=" a-waitons ", b-waitons=" b-waitons)
@@ -1279,10 +1701,27 @@
 	;;   (map car (sort data (lambda (a b)
 	;;     		    (> (string->number (caddr a))(string->number (caddr b)))))))
 	;; ))
 	(sort all-tests sort-fn1)))) ;; avoid dealing with deleted tests, look at the hash table
 
+;; look up all waitons that are related to test "testname"
+;;
+(define (tests:get-mt-waitons testname flatten)
+  (let* ((mt-waitons    (configf:get-section *configdat* "waitons"))
+	 (my-waitons    (filter
+			 (lambda (x)
+			   (string-match (conc "^(" testname "|" testname"/.*)$") (car x)))
+			 mt-waitons)))
+    (if flatten
+	(map (lambda (w)
+	       (car (string-split w "/")))
+	     (apply append (map (lambda (x)
+				  (string-split (cadr x)))
+				my-waitons)))
+	my-waitons)))
+
+;; NOT USED
 (define (tests:easy-dot test-records outtype)
   (let-values (((fd temp-path) (file-mkstemp (conc "/tmp/" (current-user-name) ".XXXXXX"))))
     (let ((all-testnames (hash-table-keys test-records))
 	  (temp-port     (open-output-file* fd)))
       ;; (format temp-port "This file is ~A.~%" temp-path)
@@ -1290,15 +1729,17 @@
       (format temp-port "  size=4,8\n")
       ;; (format temp-port "   splines=none\n")
       (for-each
        (lambda (testname)
 	 (let* ((testrec (hash-table-ref test-records testname))
-		(waitons (or (tests:testqueue-get-waitons testrec) '())))
+		(waitons (or (tests:testqueue-get-waitons testrec) '()))
+		(my-mt-waitons (tests:get-mt-waitons testname #t)))
+	   ;; (print "my-mt-waitons=" my-mt-waitons)
 	   (for-each
 	    (lambda (waiton)
 	      (format temp-port (conc "   " waiton " -> " testname " [splines=ortho]\n")))
-	    waitons)))
+	    (append waitons my-mt-waitons))))
        all-testnames)
       (format temp-port "}\n")
       (close-output-port temp-port)
       (with-input-from-pipe
        (conc "env -i PATH=$PATH dot -T" outtype " < " temp-path)
@@ -1323,17 +1764,19 @@
 			      (conc " size=\"" (or sizex 11) "," (or sizey 11) "\";")
 			      " ratio=0.95;"
 			      )))
 	  (let* ((testrec (hash-table-ref test-records hed))
 		 (waitons (or (tests:testqueue-get-waitons testrec) '()))
+		 (my-mt-waitons (tests:get-mt-waitons hed #t))
+		 (all-waitons   (delete-duplicates (append waitons my-mt-waitons)))
 		 (newres  (append res
-				  (if (null? waitons)
+				  (if (null? all-waitons)
 				      (list (conc "   \"" hed "\" [shape=box];"))
 				      (map (lambda (waiton)
 					     (conc "   \"" waiton "\" -> \"" hed "\" [shape=box];"))
-					   waitons)
-				      ))))
+					   all-waitons)))))
+	    ;; (debug:print 0 *default-log-port* "For test "hed" got "all-waitons)
 	    (if (null? tal)
 		(append newres (list "}"))
 		(loop (car tal)(cdr tal) newres)
 		))))))
 
@@ -1351,27 +1794,34 @@
       (close-input-port inp)
       res)))
 
 ;; read data from tmp file or create if not exists
 ;; if exists regen in background
+;; mode: raw (return data as read) or munged (convert to list of lists and remove " from strings)
 ;;
-(define (tests:lazy-dot testrecords  outtype sizex sizey)
+(define (tests:lazy-dot testrecords  outtype sizex sizey mode)
   (let ((dfile (conc "/tmp/." (current-user-name) "-" (server:mk-signature) ".dot"))
 	(fname (conc "/tmp/." (current-user-name) "-" (server:mk-signature) ".dotdat")))
     (tests:write-dot-file testrecords dfile sizex sizey)
-    (if (file-exists? fname)
-	(let ((res (with-input-from-file fname
-		     (lambda ()
-		       (read-lines)))))
-	  (system (conc "env -i PATH=$PATH dot -T " outtype " < " dfile " > " fname "&"))
-	  res)
-	(begin
-	  (system (conc "env -i PATH=$PATH dot -T " outtype " < " dfile " > " fname))
-	  (with-input-from-file fname
-	    (lambda ()
-	      (read-lines)))))))
-	  
+    (let ((data (if (common:file-exists? fname)
+		    (let ((res (with-input-from-file fname
+				 (lambda ()
+				   (read-lines)))))
+		      (system (conc "env -i PATH=$PATH dot -T " outtype " < " dfile " > " fname "&"))
+		      res)
+		    (begin
+		      (system (conc "env -i PATH=$PATH dot -T " outtype " < " dfile " > " fname))
+		      (with-input-from-file fname
+			(lambda ()
+			  (read-lines)))))))
+      (if (eq? mode 'raw)
+	  data
+	  (map (lambda (inl)
+		 (map (lambda (s)
+			(string-substitute "\"" "" s #t))
+		      (string-split inl)))
+	       data)))))
 
 ;; for each test:
 ;;   
 (define (tests:filter-non-runnable run-id testkeynames testrecordshash)
   (let ((runnables '()))
@@ -1427,11 +1877,11 @@
 		 (tal (cdr test-names)))         ;; 'return-procs tells the config reader to prep running system but return a proc
 	(debug:print-info 4 *default-log-port* "hed=" hed " at top of loop")
         ;; don't know item-path at this time, let the testconfig get the top level testconfig
 	(let* ((config  (tests:get-testconfig hed #f all-tests-registry 'return-procs))
 	       (waitons (let ((instr (if config 
-					 (config-lookup config "requirements" "waiton")
+					 (configf:lookup config "requirements" "waiton")
 					 (begin ;; No config means this is a non-existant test
 					   (debug:print-error 0 *default-log-port* "non-existent required test \"" hed "\", grep through your testconfigs to find and remove or create the test. Discarding and continuing.")
 					     ""))))
 			  (debug:print-info 8 *default-log-port* "waitons string is " instr)
 			  (string-split (cond
@@ -1460,11 +1910,11 @@
 		(if (not (hash-table-ref/default test-records hed #f))
 		    (hash-table-set! test-records
 				     hed (vector hed     ;; 0
 						 config  ;; 1
 						 waitons ;; 2
-						 (config-lookup config "requirements" "priority")     ;; priority 3
+						 (configf:lookup config "requirements" "priority")     ;; priority 3
 						 (let ((items      (hash-table-ref/default config "items" #f)) ;; items 4
 						       (itemstable (hash-table-ref/default config "itemstable" #f))) 
 						   ;; if either items or items table is a proc return it so test running
 						   ;; process can know to call items:get-items-from-config
 						   ;; if either is a list and none is a proc go ahead and call get-items
@@ -1522,31 +1972,55 @@
 	 tdb
 	 "SELECT count(id) FROM test_rundat;")
 	res))
   0)
 
-(define (tests:update-central-meta-info run-id test-id cpuload diskfree minutes uname hostname)
-  (rmt:general-call 'update-test-rundat run-id test-id (current-seconds) (or cpuload -1)(or diskfree -1) -1 (or minutes -1))
-  (if (and cpuload diskfree)
-      (rmt:general-call 'update-cpuload-diskfree run-id cpuload diskfree test-id))
-  (if minutes 
-      (rmt:general-call 'update-run-duration run-id minutes test-id))
-  (if (and uname hostname)
-      (rmt:general-call 'update-uname-host run-id uname hostname test-id)))
+;; 
+(define (tests:update-central-meta-info run-id test-id cpuload diskfree minutes uname hostname #!key (update-db #f)(tmpfree #f))
+  (if (get-environment-variable "MT_TEST_RUN_DIR")
+      (let* ((dest-dir (conc (get-environment-variable "MT_TEST_RUN_DIR") "/.mt_data"))
+	     (or-dash  (lambda (instr)
+			 (cond
+			  ((not instr) "") ;; #f -> blank, indicates value unchanged since last measurement taken
+			  ((string? instr)(if (string-search " " instr) (conc "\"" instr "\"") instr))
+			  (else instr))))
+	     (file-new (not (directory-exists? dest-dir))))
+	(if file-new (create-directory dest-dir #t))
+	(let* ((outp (open-output-file (conc dest-dir "/test-run.dat") #:append)))
+	  (with-output-to-port outp
+	    (lambda ()
+	      (if file-new
+		  (print "epoch_time,run_id,test_id,cpuload,diskfree,tmpfree,run_minutes,hostname,uname"))
+	      (print (current-seconds) "," (or-dash run-id)   "," (or-dash test-id)  ","
+		     (or-dash cpuload) "," (or-dash diskfree) "," (or-dash tmpfree)  ","
+		     (or-dash minutes) "," (or-dash hostname) ","
+		     (or-dash uname)))) ;; put uname last as it has spaces in it
+	  (close-output-port outp)))
+      (begin
+	(rmt:general-call 'update-test-rundat run-id test-id (current-seconds) (or cpuload -1)(or diskfree -1) -1 (or minutes -1))))
+  (if update-db
+      (begin
+	(if (and cpuload diskfree)
+	    (rmt:general-call 'update-cpuload-diskfree run-id cpuload diskfree test-id))
+	(if minutes 
+	    (rmt:general-call 'update-run-duration run-id minutes test-id))
+	(if (and uname hostname)
+	    (rmt:general-call 'update-uname-host run-id uname hostname test-id)))))
   
 ;; This one is for running with no db access (i.e. via rmt: internally)
-(define (tests:set-full-meta-info db test-id run-id minutes work-area remtries)
+(define (tests:set-full-meta-info db test-id run-id minutes work-area remtries #!key (update-db #f))
 ;; (define (tests:set-full-meta-info test-id run-id minutes work-area)
 ;;  (let ((remtries 10))
   (let* ((cpuload  (get-cpu-load))
 	 (diskfree (get-df (current-directory)))
+	 (tmpfree  (get-df "/tmp"))
 	 (uname    (get-uname "-srvpio"))
 	 (hostname (get-host-name)))
-    (tests:update-central-meta-info run-id test-id cpuload diskfree minutes uname hostname)))
+    (tests:update-central-meta-info run-id test-id cpuload diskfree minutes uname hostname update-db: update-db tmpfree: tmpfree)))
     
 ;; (define (tests:set-partial-meta-info test-id run-id minutes work-area)
-(define (tests:set-partial-meta-info test-id run-id minutes work-area remtries)
+#;(define (tests:set-partial-meta-info test-id run-id minutes work-area remtries)
   (let* ((cpuload  (get-cpu-load))
 	 (diskfree (get-df (current-directory)))
 	 (remtries 10))
     (handle-exceptions
      exn
@@ -1559,11 +2033,11 @@
 	   (tests:set-full-meta-info db test-id run-id minutes work-area (- remtries 1)))
 	 (let ((err-status ((condition-property-accessor 'sqlite3 'status #f) exn)))
 	   (debug:print-error 0 *default-log-port* "tried for over a minute to update meta info and failed. Giving up")
 	   (debug:print 0 *default-log-port* "EXCEPTION: database probably overloaded or unreadable.")
 	   (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn))
-	   (print "exn=" (condition->list exn))
+	   (debug:print 5 *default-log-port* "exn=" (condition->list exn))
 	   (debug:print 0 *default-log-port* " status:  " ((condition-property-accessor 'sqlite3 'status) exn))
 	   (print-call-chain (current-error-port))))
      (tests:update-testdat-meta-info db test-id work-area cpuload diskfree minutes)
   )))
 	 

Index: tests/Makefile
==================================================================
--- tests/Makefile
+++ tests/Makefile
@@ -1,10 +1,28 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
 #
 # run some tests
 
 BINPATH   = $(shell readlink -m $(PWD)/../bin)
+LSBR      = $(shell lsb_release -sr)
 MEGATEST  = $(BINPATH)/megatest
+MTEST     = $(BINPATH)/.$(LSBR)/mtest
 DASHBOARD = $(BINPATH)/dashboard
 PATH     := $(BINPATH):$(PATH)
 RUNNAME  := $(shell date +w%V.%u.%H.%M)
 IPADDR   := "-"
 RUNID    := 1
@@ -22,20 +40,23 @@
 TARGET     = "ubuntu/nfs/none"
 
 all : build unit test4
 # test1 test2 test3 test4 test5 test6 test7 test8 test9
 
-unit : all-rmt.log
+unit : all-rmt.log all-api.log
 # basicserver.log runs.log misc.log tests.log
+
+# inter dependencies on the unit tests, I wish these could be "suggestions"
+all-rmt.log : all-api.log
 
 rel : 
 	cd release;dashboard -rows 25 &
 
 ## basicserver.log : unittests/basicserver.scm
 ## 	script -c "./rununittest.sh basicserver $(DEBUG)" basicserver.log
 
-%.log : build unittests/%.scm
+%.log : build unittests/%.scm $(MTEST)
 	script -c "./rununittest.sh $* $(DEBUG)" $*.log
 	if logpro unit.logpro $*.html < $*.log > /dev/null;then echo ALLPASS;else echo ALLFAIL;mv $*.log $*.log.FAIL;fi
 
 server :
 	cd fullrun;$(MEGATEST) -server - -debug $(DEBUG) -run-id $(RUNID)
@@ -87,11 +108,11 @@
 	cd fullrun;sleep 5;$(MEGATEST) -preclean -runtests % -target ubuntu/nfs/sleep60 :runname $(RUNNAME)_ac -debug $(DEBUG) $(LOGGING) > ac.log 2> ac.log &
 	cd fullrun;sleep 8;$(MEGATEST) -preclean -runtests % -target ubuntu/nfs/sleep240 :runname $(RUNNAME)_ad -debug $(DEBUG) $(LOGGING) > ad.log 2> ad.log &	
 #	cd fullrun;sleep 0;$(MEGATEST) -preclean -runtests % -target $(TARGET) :runname $(RUNNAME)_af -debug $(DEBUG) $(LOGGING) > af.log 2> af.log &
 
 # MUST ADD THIS BACK IN ASAP!!!!
-	# cd fullrun;sleep 10;$(MEGATEST) -run-wait  -target $(TARGET) :runname % -testpatt % :state RUNNING,LAUNCHED,NOT_STARTED,REMOTEHOSTSTART;echo ALL DONE
+# cd fullrun;sleep 10;$(MEGATEST) -run-wait  -target $(TARGET) :runname % -testpatt % :state RUNNING,LAUNCHED,NOT_STARTED,REMOTEHOSTSTART;echo ALL DONE
 
 test6: fullprep
 	cd fullrun;$(MEGATEST) -preclean -runtests runfirst -testpatt %/1 -reqtarg ubuntu/nfs/none :runname $(RUNNAME)_itempatt -v
 	cd fullrun;$(MEGATEST) -preclean -runtests runfirst -testpatt %blahha% -reqtarg ubuntu/nfs/none :runname $(RUNNAME)_itempatt -debug 10
 	cd fullrun;$(MEGATEST) -rollup :runname newrun -target ubuntu/nfs/none -debug 10
@@ -173,11 +194,11 @@
 	cd mintest;$(MEGATEST) -server - -debug $(DEBUG) > server.log 2> server.log & 
 	sleep 3
 	cd mintest;$(DASHBOARD) -rows 18 &
 
 cleanprep : ../*.scm Makefile */*.config build
-	mkdir -p fullrun/tmp/mt_runs fullrun/tmp/mt_links /tmp/$(USER)/adisk1
+	mkdir -p fullrun/tmp/mt_runs fullrun/tmp/mt_links /tmp/$(USER)/adisk1 fullrun/logs
 	rm -f */logging.db
 	touch cleanprep
 
 fullprep : cleanprep
 	cd fullrun;$(MEGATEST) -remove-runs :runname $(RUNNAME)% -target %/%/% -testpatt %/%

Index: tests/dep-tests/common.testconfig
==================================================================
--- tests/dep-tests/common.testconfig
+++ tests/dep-tests/common.testconfig
@@ -1,5 +1,21 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
 [ezsteps]
 delay    sleep $SPEED;echo "Delayed $SPEED seconds"
 
 # lookup table for waitons
 #

Index: tests/dep-tests/common_itemstable.testconfig
==================================================================
--- tests/dep-tests/common_itemstable.testconfig
+++ tests/dep-tests/common_itemstable.testconfig
@@ -1,4 +1,20 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
 [itemstable]
 VIEW   layout layout layout schematic schematic schematic
 CELL   ntran  ptran  diode  ntran     ptran     diode
 

Index: tests/dep-tests/megatest.config
==================================================================
--- tests/dep-tests/megatest.config
+++ tests/dep-tests/megatest.config
@@ -1,5 +1,21 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
 [fields]
 # this field changes the dep tree 
 DEPS  TEXT
 
 # this field changes the test run time; 0 .. N or random

Index: tests/dep-tests/runconfigs.config
==================================================================
--- tests/dep-tests/runconfigs.config
+++ tests/dep-tests/runconfigs.config
@@ -1,5 +1,21 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
 [default]
 
 # [DEPS/SPEED]
 
 [simple/0]

Index: tests/dep-tests/tests/aggregate/testconfig
==================================================================
--- tests/dep-tests/tests/aggregate/testconfig
+++ tests/dep-tests/tests/aggregate/testconfig
@@ -1,4 +1,21 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 [include #{getenv MT_RUN_AREA_HOME}/common.testconfig]
 
 [requirements]
 waiton #{get #{getenv DEPS} aggregate}

Index: tests/dep-tests/tests/genlib/testconfig
==================================================================
--- tests/dep-tests/tests/genlib/testconfig
+++ tests/dep-tests/tests/genlib/testconfig
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 [include #{getenv MT_RUN_AREA_HOME}/common.testconfig]
 
 [itemstable]
 VIEWTYPE layout schematic
 

Index: tests/dep-tests/tests/results/testconfig
==================================================================
--- tests/dep-tests/tests/results/testconfig
+++ tests/dep-tests/tests/results/testconfig
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 [include #{getenv MT_RUN_AREA_HOME}/common.testconfig]
 
 [requirements]
 waiton #{get #{getenv DEPS} results}
 

Index: tests/dep-tests/tests/setup/testconfig
==================================================================
--- tests/dep-tests/tests/setup/testconfig
+++ tests/dep-tests/tests/setup/testconfig
@@ -1,2 +1,19 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 [include #{getenv MT_RUN_AREA_HOME}/common.testconfig]
 

Index: tests/dep-tests/tests/test1/testconfig
==================================================================
--- tests/dep-tests/tests/test1/testconfig
+++ tests/dep-tests/tests/test1/testconfig
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 [include #{getenv MT_RUN_AREA_HOME}/common.testconfig]
 
 [include #{getenv MT_RUN_AREA_HOME}/common_itemstable.testconfig]
 
 [requirements]

Index: tests/dep-tests/tests/test2/testconfig
==================================================================
--- tests/dep-tests/tests/test2/testconfig
+++ tests/dep-tests/tests/test2/testconfig
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 [include #{getenv MT_RUN_AREA_HOME}/common.testconfig]
 
 [include #{getenv MT_RUN_AREA_HOME}/common_itemstable.testconfig]
 
 [requirements]

Index: tests/dynamic-waiton-example/common.testconfig
==================================================================
--- tests/dynamic-waiton-example/common.testconfig
+++ tests/dynamic-waiton-example/common.testconfig
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 [ezsteps]
 delay    sleep $SPEED;echo "Delayed $SPEED seconds"
 
 [requirements]
 #{getenv WAITON_#{getenv MT_TEST_NAME}}

Index: tests/dynamic-waiton-example/common_itemstable.testconfig
==================================================================
--- tests/dynamic-waiton-example/common_itemstable.testconfig
+++ tests/dynamic-waiton-example/common_itemstable.testconfig
@@ -1,4 +1,21 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 [itemstable]
 VIEW   layout layout layout schematic schematic schematic
 CELL   ntran  ptran  diode  ntran     ptran     diode
 

Index: tests/dynamic-waiton-example/megatest.config
==================================================================
--- tests/dynamic-waiton-example/megatest.config
+++ tests/dynamic-waiton-example/megatest.config
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 [fields]
 # this field changes the dep tree 
 DEPS  TEXT
 
 # this field changes the test run time; 0 .. N or random

Index: tests/dynamic-waiton-example/runconfigs.config
==================================================================
--- tests/dynamic-waiton-example/runconfigs.config
+++ tests/dynamic-waiton-example/runconfigs.config
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 [default]
 WAITON_setup
 WAITON_genlib    waiton setup
 WAITON_test1     waiton genlib
 WAITON_aggregate waiton test1

Index: tests/dynamic-waiton-example/tests/aggregate/testconfig
==================================================================
--- tests/dynamic-waiton-example/tests/aggregate/testconfig
+++ tests/dynamic-waiton-example/tests/aggregate/testconfig
@@ -1,2 +1,19 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 [include #{getenv MT_RUN_AREA_HOME}/common.testconfig]
 

Index: tests/dynamic-waiton-example/tests/genlib/testconfig
==================================================================
--- tests/dynamic-waiton-example/tests/genlib/testconfig
+++ tests/dynamic-waiton-example/tests/genlib/testconfig
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 [include #{getenv MT_RUN_AREA_HOME}/common.testconfig]
 
 [itemstable]
 VIEWTYPE layout schematic
 

Index: tests/dynamic-waiton-example/tests/results/testconfig
==================================================================
--- tests/dynamic-waiton-example/tests/results/testconfig
+++ tests/dynamic-waiton-example/tests/results/testconfig
@@ -1,2 +1,19 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 [include #{getenv MT_RUN_AREA_HOME}/common.testconfig]
 

Index: tests/dynamic-waiton-example/tests/setup/testconfig
==================================================================
--- tests/dynamic-waiton-example/tests/setup/testconfig
+++ tests/dynamic-waiton-example/tests/setup/testconfig
@@ -1,2 +1,19 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 [include #{getenv MT_RUN_AREA_HOME}/common.testconfig]
 

Index: tests/dynamic-waiton-example/tests/test1/testconfig
==================================================================
--- tests/dynamic-waiton-example/tests/test1/testconfig
+++ tests/dynamic-waiton-example/tests/test1/testconfig
@@ -1,3 +1,20 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 [include #{getenv MT_RUN_AREA_HOME}/common.testconfig]
 
 [include #{getenv MT_RUN_AREA_HOME}/common_itemstable.testconfig]

Index: tests/dynamic-waiton-example/tests/test2/testconfig
==================================================================
--- tests/dynamic-waiton-example/tests/test2/testconfig
+++ tests/dynamic-waiton-example/tests/test2/testconfig
@@ -1,3 +1,20 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 [include #{getenv MT_RUN_AREA_HOME}/common.testconfig]
 
 [include #{getenv MT_RUN_AREA_HOME}/common_itemstable.testconfig]

Index: tests/fdktestqa/fdk.config
==================================================================
--- tests/fdktestqa/fdk.config
+++ tests/fdktestqa/fdk.config
@@ -1,36 +1,45 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 [fields]
 SYSTEM TEXT
 RELEASE TEXT
 
 [setup]
 # Adjust max_concurrent_jobs to limit how much you load your machines
 # max_concurrent_jobs 150
-max_concurrent_jobs 1000
+max_concurrent_jobs 3000
 
 # This is your link path, you can move it but it is generally better to keep it stable
 linktree #{shell readlink -f #{getenv MT_RUN_AREA_HOME}/../simplelinks}
 
 [include testqa/configs/megatest.abc.config]
 
-# timeout 0.025
-
 [jobtools]
 maxload 4
-launcher nbfake
+# launcher smartlauncher --cores 1 --memory 1
+launcher nbjob run --target pdx_soft --class 'SLES11&&1C&&1G' --qslot /icf/fdk/soft 
+# launcher bsub -q priority -o $MT_TEST_RUN_DIR/openlava.log 
 
 [server]
 # timeout 0.01
 # homehost xena
 # homehost 143.182.225.38
-
 # force server
-server-query-threshold 0
-
-
-[jobtools]
-# launcher nbq -P ch_vp -C SLES11_EM64T_4G -Q /ciaf/fdk
-launcher nbfake
-maxload 4
-
-# launcher bsub -q priority -o $MT_TEST_RUN_DIR/openlava.log 
+# server-query-threshold 0
+
 

Index: tests/fdktestqa/testqa/Makefile
==================================================================
--- tests/fdktestqa/testqa/Makefile
+++ tests/fdktestqa/testqa/Makefile
@@ -1,24 +1,42 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 BINDIR    = $(PWD)/../../../bin
 PATH     := $(BINDIR):$(PATH)
 MEGATEST  = $(BINDIR)/megatest
 DASHBOARD = $(BINDIR)/dashboard
 NEWDASHBOARD = $(BINDIR)/newdashboard
 RUNNAME   = a
 NUMTESTS  = 20
+SUBTARG = b
 
 all :
 	$(MEGATEST) -remove-runs -target a/b -runname c -testpatt %/%
 	$(MEGATEST) -run -testpatt % -target a/b -runname c
 
 bigbig :
 	for tn in a b c d;do \
-	   ($(MEGATEST) -run -testpatt % -target a/b -runname $tn & ) ; \
+	   (NUMTESTS=1000 $(MEGATEST) -run -testpatt % -target a/$(SUBTARG) -runname $$tn & ) ; \
 	done
 
 waitonpatt :
-	megatest -remove-runs -runname waitonpatt -target a/b -testpatt %
+	megatest -remove-runs -runname waitonpatt -target a/$(SUBTARG) -testpatt %
 	NUMTESTS=15 megatest -run -target a/b -runname waitonpatt -testpatt bigrun3/%8
 
 waitonall :
 	megatest -remove-runs -runname waitonall -target a/b -testpatt %
 	NUMTESTS=20 megatest -run -target a/b -runname waitonall -testpatt alltop

Index: tests/fdktestqa/testqa/README
==================================================================
--- tests/fdktestqa/testqa/README
+++ tests/fdktestqa/testqa/README
@@ -1,1 +1,18 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 set NUMTESTS to set the number of tests that will be run. A small number (say 20) illustrates itemwait well.

Index: tests/fdktestqa/testqa/configs/megatest.abc.config
==================================================================
--- tests/fdktestqa/testqa/configs/megatest.abc.config
+++ tests/fdktestqa/testqa/configs/megatest.abc.config
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # Valid values for state and status for steps, NB// It is not recommended you use this
 [validvalues]
 state start end completed
 
 # Job tools are more advanced ways to control how your jobs are launched

Index: tests/fdktestqa/testqa/configs/megatest.def.config
==================================================================
--- tests/fdktestqa/testqa/configs/megatest.def.config
+++ tests/fdktestqa/testqa/configs/megatest.def.config
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # You can override environment variables for all your tests here
 [env-override]
 EXAMPLE_VAR example value
 
 # As you run more tests you may need to add additional disks, the names are arbitrary but must be unique

Index: tests/fdktestqa/testqa/local.config.example
==================================================================
--- tests/fdktestqa/testqa/local.config.example
+++ tests/fdktestqa/testqa/local.config.example
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 [host-types]
 general #MTLOWESTLOAD xena zeus
 
 [jobtools]
 launcher nbfake

Index: tests/fdktestqa/testqa/megatest.config
==================================================================
--- tests/fdktestqa/testqa/megatest.config
+++ tests/fdktestqa/testqa/megatest.config
@@ -1,12 +1,35 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 [setup]
 testcopycmd cp --remove-destination -rlv TEST_SRC_PATH/. TEST_TARG_PATH/. >> TEST_TARG_PATH/mt_launch.log 2>> TEST_TARG_PATH/mt_launch.log
 # launchwait no
+# launch-delay 0.1
 launch-delay 0
 
+[jobtools]
+maxhomehostload 4
+
 [server]
-runtime 180
+# runtime 180
+# timeout is in hours, this is how long the server will stay alive when not being used.
+# timeout 0.1
 
 # All these are overridden in ../fdk.config
 # [jobtools]
 # launcher nbfake
 # launcher bsub -q priority -o $MT_TEST_RUN_DIR/openlava.log 

Index: tests/fdktestqa/testqa/runconfigs.config
==================================================================
--- tests/fdktestqa/testqa/runconfigs.config
+++ tests/fdktestqa/testqa/runconfigs.config
@@ -1,5 +1,24 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
+[include local.runconfigs]
+
 [default]
 ALLTESTS see this variable
 
 # Your variables here are grouped by targets [SYSTEM/RELEASE]
 [SYSTEM_val/RELEASE_val]

Index: tests/fdktestqa/testqa/runsuite.sh
==================================================================
--- tests/fdktestqa/testqa/runsuite.sh
+++ tests/fdktestqa/testqa/runsuite.sh
@@ -1,7 +1,24 @@
 #!/bin/bash
 
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # (cd ../../..;make && make install) || exit 1
 # export PATH=$PWD/../../../bin:$PATH
 
 for i in a b c d e f;do
   # g h i j k l m n o p q r s t u v w x y z;do

Index: tests/fdktestqa/testqa/tests/alltop/testconfig
==================================================================
--- tests/fdktestqa/testqa/tests/alltop/testconfig
+++ tests/fdktestqa/testqa/tests/alltop/testconfig
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # Add additional steps here. Format is "stepname script"
 [vars]
 step1var step1.sh
 
 [ezsteps]

Index: tests/fdktestqa/testqa/tests/bigrun/step1.sh
==================================================================
--- tests/fdktestqa/testqa/tests/bigrun/step1.sh
+++ tests/fdktestqa/testqa/tests/bigrun/step1.sh
@@ -1,9 +1,26 @@
 #!/bin/bash
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 if [ $NUMBER -lt 10 ];then 
    sleep 20
-   sleep `echo 4 * $NUMBER | bc`
+   sleep `echo 4 \* $NUMBER | bc`
 else
    sleep 130
 fi
 
 if [[ $RANDOM -lt 10000 ]];then

Index: tests/fdktestqa/testqa/tests/bigrun/testconfig
==================================================================
--- tests/fdktestqa/testqa/tests/bigrun/testconfig
+++ tests/fdktestqa/testqa/tests/bigrun/testconfig
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # Add additional steps here. Format is "stepname script"
 [vars]
 step1var step1.sh
 
 [ezsteps]

Index: tests/fdktestqa/testqa/tests/bigrun2/step1.sh
==================================================================
--- tests/fdktestqa/testqa/tests/bigrun2/step1.sh
+++ tests/fdktestqa/testqa/tests/bigrun2/step1.sh
@@ -3,7 +3,24 @@
 # if [ -e $prev_test/testconfig ]; then
 #   exit 0
 # else
 #   exit 1
 # fi
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 
 exit 0

Index: tests/fdktestqa/testqa/tests/bigrun2/testconfig
==================================================================
--- tests/fdktestqa/testqa/tests/bigrun2/testconfig
+++ tests/fdktestqa/testqa/tests/bigrun2/testconfig
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # Add additional steps here. Format is "stepname script"
 [ezsteps]
 step1 step1.sh
 
 # Test requirements are specified here
@@ -9,11 +26,11 @@
 mode itemwait
 itemmap .*/
 
 # Iteration for your tests are controlled by the items section
 [items]
-NUMBER #{scheme (string-intersperse (map (lambda (x)(conc "blah/" x)) \
+NUMBER #{scheme (string-intersperse (map (lambda (x)(conc (if (getenv "USEBLAH") "blah/" "") x)) \
                                          (map number->string (sort (let loop ((a 0)(res '())) \
                                                                         (if (<= a (or (any->number (get-environment-variable "NUMTESTS")) 2500)) \
                                                                             (loop (+ a 1)(cons a res)) res)) <))) " ")}
 
 

Index: tests/fdktestqa/testqa/tests/bigrun3/step1.sh
==================================================================
--- tests/fdktestqa/testqa/tests/bigrun3/step1.sh
+++ tests/fdktestqa/testqa/tests/bigrun3/step1.sh
@@ -3,7 +3,24 @@
 # if [ -e $prev_test/testconfig ]; then
 #   exit 0
 # else
 #   exit 1
 # fi
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 
 exit 0

Index: tests/fdktestqa/testqa/tests/bigrun3/testconfig
==================================================================
--- tests/fdktestqa/testqa/tests/bigrun3/testconfig
+++ tests/fdktestqa/testqa/tests/bigrun3/testconfig
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # Add additional steps here. Format is "stepname script"
 [ezsteps]
 step1 step1.sh
 
 # Test requirements are specified here

Index: tests/fixpath.csh
==================================================================
--- tests/fixpath.csh
+++ tests/fixpath.csh
@@ -1,1 +1,17 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
 setenv PATH `readlink -f ../bin`:$PATH

Index: tests/fixpath.sh
==================================================================
--- tests/fixpath.sh
+++ tests/fixpath.sh
@@ -1,1 +1,18 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 export PATH=$(readlink -f ../bin):$PATH

DELETED tests/fslsync/megatest.config
Index: tests/fslsync/megatest.config
==================================================================
--- tests/fslsync/megatest.config
+++ /dev/null
@@ -1,20 +0,0 @@
-[fields]
-YEAR    TEXT
-WEEKNUM TEXT
-DAY     TEXT
-
-[setup]
-# Adjust max_concurrent_jobs to limit how much you load your machines
-max_concurrent_jobs 50
-
-# This is your link path, you can move it but it is generally better to keep it stable
-linktree #{shell readlink -f #{getenv MT_RUN_AREA_HOME}/fslsynclinks}
-
-# Job tools are more advanced ways to control how your jobs are launched
-[jobtools]
-useshell yes
-launcher nbfind
-
-# As you run more tests you may need to add additional disks, the names are arbitrary but must be unique
-[disks]
-disk0 #{shell readlink -f #{getenv MT_RUN_AREA_HOME}/fslsyncruns}

DELETED tests/fslsync/runconfigs.config
Index: tests/fslsync/runconfigs.config
==================================================================
--- tests/fslsync/runconfigs.config
+++ /dev/null
@@ -1,5 +0,0 @@
-[default]
-WORKAREA /tmp/#{getenv USER}/fslsync
-FSLSAREA /tmp/#{getenv USER}/fsls
-AREANAMES code data
-SITENAMES #{shell cat $MT_RUN_AREA_HOME/sites.dat}

DELETED tests/fslsync/sites.dat.template
Index: tests/fslsync/sites.dat.template
==================================================================
--- tests/fslsync/sites.dat.template
+++ /dev/null
@@ -1,1 +0,0 @@
-site1

DELETED tests/fslsync/tests/setup/mkdirs.logpro
Index: tests/fslsync/tests/setup/mkdirs.logpro
==================================================================
--- tests/fslsync/tests/setup/mkdirs.logpro
+++ /dev/null
@@ -1,8 +0,0 @@
-;; You should have at least one expect:required. This ensures that your process ran
-(expect:required in "LogFileBody" > 0 "done" #/done/)
-
-;; You may need ignores to suppress false error or warning hits from the later expects
-;; NOTE: Order is important here!
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/warn/)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/)) ;; but disallow any other errors

DELETED tests/fslsync/tests/setup/mkdirs.sh
Index: tests/fslsync/tests/setup/mkdirs.sh
==================================================================
--- tests/fslsync/tests/setup/mkdirs.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-# Create needed directories both local and remote
-
-# Remote
-ssh $SITENAME mkdir -vp $WORKAREA/$SITENAME/$AREANAME
-
-# Local
-mkdir -vp $WORKAREA/$SITENAME/$AREANAME
-
-echo done

DELETED tests/fslsync/tests/setup/seedcache.logpro
Index: tests/fslsync/tests/setup/seedcache.logpro
==================================================================
--- tests/fslsync/tests/setup/seedcache.logpro
+++ /dev/null
@@ -1,8 +0,0 @@
-;; You should have at least one expect:required. This ensures that your process ran
-(expect:required in "LogFileBody" > 0 "done" #/done/)
-
-;; You may need ignores to suppress false error or warning hits from the later expects
-;; NOTE: Order is important here!
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/warn/)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/)) ;; but disallow any other errors

DELETED tests/fslsync/tests/setup/seedcache.sh
Index: tests/fslsync/tests/setup/seedcache.sh
==================================================================
--- tests/fslsync/tests/setup/seedcache.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-# Copy any non-existant files to the cache before doing the rsync 
-# in the hopes of saving some time.
-
-echo done

DELETED tests/fslsync/tests/setup/testconfig
Index: tests/fslsync/tests/setup/testconfig
==================================================================
--- tests/fslsync/tests/setup/testconfig
+++ /dev/null
@@ -1,21 +0,0 @@
-# Add additional steps here. Format is "stepname script"
-[ezsteps]
-mkdirs     mkdirs.sh
-seedcache  seedcache.sh
-
-# Test requirements are specified here
-[requirements]
-priority 0
-
-# Iteration for your tests are controlled by the items section
-[items]
-AREANAME #{getenv AREANAMES}
-SITENAME #{getenv SITENAMES}
-
-# test_meta is a section for storing additional data on your test
-[test_meta]
-author matt
-owner  matt
-description Setup needed directories and seed the caches
-tags tagone,tagtwo
-reviewed never

DELETED tests/fslsync/tests/sync/fsync.logpro
Index: tests/fslsync/tests/sync/fsync.logpro
==================================================================
--- tests/fslsync/tests/sync/fsync.logpro
+++ /dev/null
@@ -1,8 +0,0 @@
-;; You should have at least one expect:required. This ensures that your process ran
-(expect:required in "LogFileBody" > 0 "done" #/done/)
-
-;; You may need ignores to suppress false error or warning hits from the later expects
-;; NOTE: Order is important here!
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/warn/)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/)) ;; but disallow any other errors

DELETED tests/fslsync/tests/sync/fsync.sh
Index: tests/fslsync/tests/sync/fsync.sh
==================================================================
--- tests/fslsync/tests/sync/fsync.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-
-# Get the list of fossils from the cache
-
-FILES=$(ls $FSLSAREA/$AREANAME|grep fossil)
-
-# Do the remote sync from CACHE to FOSSILS
-ssh $SITENAME /bin/bash < 0 "done" #/done/)
-
-;; You may need ignores to suppress false error or warning hits from the later expects
-;; NOTE: Order is important here!
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/warn/)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/)) ;; but disallow any other errors

DELETED tests/fslsync/tests/sync/rsync.sh
Index: tests/fslsync/tests/sync/rsync.sh
==================================================================
--- tests/fslsync/tests/sync/rsync.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-# Sync to remote cache
-rsync -avz $FSLSAREA/$AREANAME/ $SITENAME:$WORKAREA/$SITENAME/$AREANAME/ &
-# Sync to local cache
-rsync -avz $SITENAME:$FSLSAREA/$AREANAME/ $WORKAREA/$SITENAME/$AREANAME/ &
-
-# Wait until rsyncs complete
-wait
-
-echo done

DELETED tests/fslsync/tests/sync/testconfig
Index: tests/fslsync/tests/sync/testconfig
==================================================================
--- tests/fslsync/tests/sync/testconfig
+++ /dev/null
@@ -1,22 +0,0 @@
-# Add additional steps here. Format is "stepname script"
-[ezsteps]
-rsync rsync.sh
-fsync fsync.sh
-
-# Test requirements are specified here
-[requirements]
-waiton setup
-priority 0
-
-# Iteration for your tests are controlled by the items section
-[items]
-AREANAME #{getenv AREANAMES}
-SITENAME #{getenv SITENAMES}
-
-# test_meta is a section for storing additional data on your test
-[test_meta]
-author matt
-owner  matt
-description Sync fossils to remote
-tags tagone,tagtwo
-reviewed never

DELETED tests/fullrun/afs.config
Index: tests/fullrun/afs.config
==================================================================
--- tests/fullrun/afs.config
+++ /dev/null
@@ -1,1 +0,0 @@
-TESTSTORUN priority_6 sqlitespeed/ag

DELETED tests/fullrun/common_runconfigs.config
Index: tests/fullrun/common_runconfigs.config
==================================================================
--- tests/fullrun/common_runconfigs.config
+++ /dev/null
@@ -1,17 +0,0 @@
-[default]
-FOOBARBAZZZZ not a useful value
-BIGBOB $FOOBARBAZZZZ/bobby
-FREDDY $sysname/$fsname
-TOMMY  [system pwd]
-
-[/tmp/mrwellan/env/ubuntu/afs]
-BOGOUS Bob
-
-[default/ubuntu/nfs]
-CURRENT     /blah
-ALT_VAR we should not see this one
-
-[ubuntu/nfs/none]
-CURRENT     /tmp/nada
-UNIQUEVAR   this one should be set
-

DELETED tests/fullrun/configs/mt_include_1.config
Index: tests/fullrun/configs/mt_include_1.config
==================================================================
--- tests/fullrun/configs/mt_include_1.config
+++ /dev/null
@@ -1,23 +0,0 @@
-[setup]
-# exectutable /path/to/megatest
-max_concurrent_jobs 250
-
-linktree #{getenv MT_RUN_AREA_HOME}/tmp/mt_links
-
-[jobtools]
-useshell yes
-# ## launcher launches jobs, the job is managed on the target host
-## by megatest, comment out launcher to run local
-# workhosts localhost hermes
-# launcher exec nbfake
-
-launcher nbfake
-# launcher echo
-
-# launcher nbfind
-# launcher nodanggood
-
-## use "xterm -e csi -- " as a launcher to examine the launch environment.
-## exit with (exit)
-## get a shell with (system "bash")
-# launcher xterm -e csi --

DELETED tests/fullrun/configs/mt_include_2.config
Index: tests/fullrun/configs/mt_include_2.config
==================================================================
--- tests/fullrun/configs/mt_include_2.config
+++ /dev/null
@@ -1,2 +0,0 @@
-[disks]
-disk0 #{scheme (create-directory "#{getenv MT_RUN_AREA_HOME}/tmp/mt_runs" #t)}

DELETED tests/fullrun/ez_pass_linked/testconfig
Index: tests/fullrun/ez_pass_linked/testconfig
==================================================================
--- tests/fullrun/ez_pass_linked/testconfig
+++ /dev/null
@@ -1,13 +0,0 @@
-[setup]
-
-[ezsteps]
-lookittmp   ls /tmp
-lookithome  ls /home
-
-[test_meta]
-author matt
-owner  bob
-description This test runs a single ezstep which is expected to pass, no logpro file.
-
-tags first,single
-reviewed 09/10/2011, by Matt

DELETED tests/fullrun/megatest.config
Index: tests/fullrun/megatest.config
==================================================================
--- tests/fullrun/megatest.config
+++ /dev/null
@@ -1,307 +0,0 @@
-[fields]
-sysname TEXT
-fsname TEXT
-datapath TEXT
-
-[graph]
-g1 sqlite3:../../example.db alldat event_time var val stuff
-
-# refareas can be searched to find previous runs
-# the path points to where megatest.db exists
-[refareas]
-area1 /tmp/oldarea/megatest
-
-[include ./configs/mt_include_1.config]
-
-[dashboard]
-# pre-command  xterm -geometry 180x20 -e "
-# post-command |& tee results.log ;echo Press any key to continue;bash -c 'read -n 1 -s'" &
-testsort -event_time
-
-[misc]
-home #{shell readlink -f $MT_RUN_AREA_HOME}
-parent #{shell readlink -f $MT_RUN_AREA_HOME/..}
-testsuite #{shell basename $MT_RUN_AREA_HOME}
-
-[tests-paths]
-1 #{get misc parent}/simplerun/tests
-
-[setup]
-
-# turn off faststart, put monitor.db in MT_RUN_AREA_HOME/db
-# and set the dbdir to /var/tmp/$USER/mt_db to enable keeping
-# the raw db in /var/tmp/$USER
-#
-faststart  no
-monitordir #{getenv MT_RUN_AREA_HOME}/db
-dbdirdefn  /tmp/#{getenv USER}/#{getenv MT_TESTSUITE_NAME}/db
-dbdirmkdir #{scheme (create-directory "#{get setup dbdirdefn}" #t)}
-dbdir      #{get setup dbdirdefn}
-
-# sync more aggressively to megatest-db
-megatest-db yes
-
-# Set launchwait to no to use the more agressive code that does not wait for the launch to complete before proceeding
-# this may save a few milliseconds on launching tests
-# launchwait no
-waivercommentpatt ^WW\d+ [a-z].*
-incomplete-timeout 1
-
-# wait 0.5 seconds between launching every process
-#
-launch-delay 0.5
-
-# wait for runs to completely complete. yes, anything else is no
-run-wait yes
-
-# If set to "default" the old code is used. Otherwise defaults to 200 or uses
-# numeric value given.
-#
-runqueue 20
-
-# Default runtimelim 1d 1h 1m 10s
-#
-runtimelim 20m
-
-# Deadtime - when to consider tests dead (i.e. haven't heard from them in too long)
-# Number in seconds, set to 20 seconds here to trigger a little trouble. Default is
-# 1800
-#
-deadtime 600
-
-# It is possible (but not recommended) to override the rsync command used
-# to populate the test directories. For test development the following 
-# example can be useful
-#
-testcopycmd cp --remove-destination -rsv TEST_SRC_PATH/. TEST_TARG_PATH/. >> TEST_TARG_PATH/mt_launch.log 2>> TEST_TARG_PATH/mt_launch.log
-
-# or for hard links
-
-# testcopycmd cp --remove-destination -rlv TEST_SRC_PATH/. TEST_TARG_PATH/.
-
-# FULL or 2, NORMAL or 1, OFF or 0
-synchronous 0
-# Throttle roughly scales the db access milliseconds to seconds delay
-throttle 0.2
-# Max retries allows megatest to re-check that a tests status has changed
-# as tests can have transient FAIL status occasionally
-maxretries 20
-
-# Setup continued.
-[setup]
-
-# override the logview command
-#
-logviewer (%MTCMD%) 2> /dev/null > /dev/null
-
-# override the html viewer launch command
-#
-# htmlviewercmd firefox -new-window 
-htmlviewercmd arora
-
-# -runtests automatically deletes the records for tests with the listed states on starting up a run allowing them to re-run
-#     (nb// this is in addition to NOT_STARTED which is automatically re-run)
-# format is STATE/STATUS
-allow-auto-rerun /INCOMPLETE /ZERO_ITEMS
-# could add: STUCK STUCK/DEAD UNKNOWN KILLED KILLREQ PREQ_DISCARD
-
-[validvalues]
-state start end 0 1 - 2
-status pass fail n/a 0 1 running - 2
-
-# These are set before all tests, override them 
-# in the testconfig [pre-launch-env-overrides] section
-[env-override]
-
-
-ALL_TOPLEVEL_TESTS          exit_0 exit_1  ez_exit2_fail  ez_fail        ez_pass              ezlog_fail \
-       ezlog_fail_then_pass ezlog_pass     ezlog_warn     lineitem_fail  lineitem_pass        logpro_required_fail \
-       manual_example       neverrun       priority_1     priority_10    priority_10_waiton_1 \
-       priority_3           priority_4     priority_5     priority_6     priority_7           priority_8 \
-       priority_9           runfirst       singletest     singletest2    sqlitespeed          test_mt_vars \
-       ez_fail_quick        test1          test2
-
-# This variable is honored by the loadrunner script. The value is in percent
-MAX_ALLOWED_LOAD 200
-
-# MT_XTERM_CMD overrides the terminal command
-# MT_XTERM_CMD xterm -bg lightgreen -fg black
-
-SPECIAL_ENV_VARS overide them here - should be seen at launch and in the runs
-TESTVAR [system readlink -f .]
-DEADVAR [system ls]
-VARWITHDOLLAR $HOME/.zshrc
-WACKYVAR  #{system ls > /dev/null}
-WACKYVAR2 #{get validvalues state}
-WACKYVAR3 #{getenv USER}
-WACKYVAR4 #{scheme (+ 5 6 7)}
-WACKYVAR5 #{getenv sysname}/#{getenv fsname}/#{getenv datapath}
-WACKYVAR6 #{scheme (args:get-arg "-target")}
-PREDICTABLE the_ans
-MRAH MT_RUN_AREA_HOME=#{getenv MT_RUN_AREA_HOME}
-# The empty var should have a definition with null string
-EMPTY_VAR
-
-WRAPPEDVAR This var should have the work blah thrice: \
-blah \
-blah
-
-MYRUNNAME1 /this/is/#{getenv MT_RUNNAME}/my/runname
-MYRUNNAME2 /this/is/[system echo $MT_RUNNAME]/my/runname
-
-
-# XTERM   [system xterm]
-# RUNDEAD [system exit 56]
-
-[server]
-
-# force use of server always
-# required yes
-
-# Use http instead of direct filesystem access
-transport http
-# transport fs
-# transport nmsg
-
-synchronous 0
-
-# If the server can't be started on this port it will try the next port until
-# it succeeds
-port 9080
-
-# This server will keep running this number of hours after last access. 
-# Three minutes is 0.05 hours
-# timeout 0.025
-timeout 0.01
-
-# faststart; unless no, start server but proceed with writes until server started
-# faststart no
-faststart yes
-
-# Start server when average query takes longer than this
-# server-query-threshold 55500
-server-query-threshold 1000
-
-# daemonize yes
-# hostname #{scheme (get-host-name)}
-
-## disks are:
-## name host:/path/to/area
-## -or-
-## name /path/to/area
-[disks]
-disk0 /foobarbazz
-disk1 not-a-disk
-
-[include ./configs/mt_include_2.config]
-
-[include #{getenv USER}_testing.config]
-
-[jobgroups]
-
-# NOTE: job groups will falsely count the toplevel test as a job. If possible add N
-#       to your jobgroups where N is the number of parallel runs you are likely to see
-#      
-sqlite3 6
-blockz  10
-#       to your jobgroups where N is the number of parallel runs you are likely to see
-#       
-
-#======================================================================
-# Machine flavors
-#
-#   These specify lists of hosts or scripts to use or call for various
-#   flavors of task.
-#
-#======================================================================
-
-[flavors]
-
-plain hosts: xena, phoebe
-strong command: NBFAKE_HOST=zeus nbfake
-arm hosts: cubian
-
-[archive]
-
-# where to get bup executable
-# bup /path/to/bup
-
-# use machines of these flavor
-useflavors plain
-targsize 2G
-
-# minimum space required on an archive disk before allowing archiving to start (MB)
-minspace 10
-
-[archive-disks]
-
-# Archives will be organised under these paths like this:
-#  /
-# Within the archive the data is structured like this:
-#  ///
-disk0 /tmp/#{getenv USER}/adisk1
-disk1 /mfs/tmp/archive
-
-# Uncomment these to emulate a job queue with a long time (look in bin/sleeprunner for the time)
-[jobtools]
-launcher #{scheme (case (string->symbol (conc (getenv "datapath"))) \
-                         ((none) "nbfake") \
-                         ((openlava) "bsub -o $MT_LINKTREE/$MT_TARGET/$MT_RUNNAME.$MT_TESTNAME-$MT_ITEM_PATH.log") \
-                         ((sleeprunner) "sleeprunner") \
-                         (else "nbfake"))}
-
-# launcher bsub -q priority -o $MT_TEST_RUN_DIR/openlava.log 
-
-# launcher #{ shell if which bsub > /dev/null;then echo bsub -q priority -o openlava.log;else echo sleeprunner;fi}
-# launcher nbfake
-
-[configf:settings trim-trailing-spaces yes]
-
-# Override the rollup for specific tests
-[testrollup]
-runfirst ls
-
-[test]
-# VAL1 has trailing spaces
-VAL1 Foo    
-VAL2 ==>#{get test VAL1}Bar<== no spaces between Foo and Bar to pass
-
-ltest #{scheme (case (string->symbol (conc (getenv "datapath"))) \
-                        ((none) "nbfake") \
-                        ((openlava) "bsub -o $MT_LINKTREE/$MT_TARGET/$MT_RUNNAME.$MT_TESTNAME-$MT_ITEM_PATH.log") \
-                        (else "sleeprunner"))}
-
-#================================================================
-# Flexi-launcher
-#================================================================
-#
-# [host-types]
-# general ssh #{getbgesthost general}
-# nbgeneral nbjob run JOBCOMMAND -log $MT_LINKTREE/$MT_TARGET/$MT_RUNNAME.$MT_TESTNAME-$MT_ITEM_PATH.lgo
-# 
-# [hosts]
-# general cubian xena
-# 
-# [launchers]
-# envsetup general
-# xor/%/n 4C16G
-# % nbgeneral
-# 
-# [jobtools]
-# launcher bsub
-# # if defined and not "no" flexi-launcher will bypass launcher unless there is no
-# # match.
-# flexi-launcher yes  
-
-[jobtools]
-flexi-launcher yes
-
-[host-types]
-general nbfake
-alt     #{get jobtools launcher}
-local   nbfake
-remote  #{get jobtools launcher}
-
-[launchers]
-runfirst/sum% remote
-%             general

DELETED tests/fullrun/multi-dboard-load-all.scm
Index: tests/fullrun/multi-dboard-load-all.scm
==================================================================
--- tests/fullrun/multi-dboard-load-all.scm
+++ /dev/null
@@ -1,13 +0,0 @@
-
-(require-library margs)
-(load "../../common.scm")
-(load "../../common_records.scm")
-(load "../../margs.scm")
-(load "../../megatest-version.scm")
-(load "../../portlogger.scm")
-(load "../../tasks.scm")
-(load "../../db.scm")
-(load "../../configf.scm")
-(load "../../keys.scm")
-(load "../../tree.scm")
-(load "../../multi-dboard.scm")

DELETED tests/fullrun/multi-dboard.sh
Index: tests/fullrun/multi-dboard.sh
==================================================================
--- tests/fullrun/multi-dboard.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-
-if [[ ! -e "$HOME/.megatest" ]];then
-   mkdir -p "$HOME/.megatest"
-fi
-# if [[ ! -e "$HOME/.megatest/areas.dat" ]];then
-#    echo "Creating some placeholder files in ~/.megatest"
-#    cat > "$HOME/.megatest/areas.dat" << EOF
-# [default]
-# mfstest /mfs/matt/data/megatest/tests/fullrun
-# mfsbig /mfs/matt/data/megatest/tests/fdktestqa/testqa
-# [local]
-# localtest /home/matt/data/megatest/tests/fullrun
-# EOF
-# fi
-if [[ ! -e "$HOME/.megatest/default.dat" ]];then
-   cat > "$HOME/.megatest/default.dat" << EOF
-[fullrun]
-path /mfs/matt/data/megatest/tests/fullrun
-order 1
-# [bigrun]
-# path /mfs/matt/data/megatest/tests/fdktestqa/testqa
-# order 2
-# [local_fullrun]
-# path /home/matt/data/megatest/tests/fullrun
-# order 3
-EOF
-fi
-
-csi -I ../.. multi-dboard-load-all.scm

DELETED tests/fullrun/nfs.config
Index: tests/fullrun/nfs.config
==================================================================
--- tests/fullrun/nfs.config
+++ /dev/null
@@ -1,1 +0,0 @@
-TESTSTORUN priority_4 test_mt_vars

DELETED tests/fullrun/run-each-proc.sh
Index: tests/fullrun/run-each-proc.sh
==================================================================
--- tests/fullrun/run-each-proc.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-for x in `cat all-db-procs.txt`;do
-  cat > ~/.megatestrc <' '-_g'`
-  megatest -runtests sqlitespeed,test2,ez% -target ubuntu/nfs/none :runname $fname > $fname.log
-done 
-
-

DELETED tests/fullrun/runconfigs.config
Index: tests/fullrun/runconfigs.config
==================================================================
--- tests/fullrun/runconfigs.config
+++ /dev/null
@@ -1,59 +0,0 @@
-[default]
-SOMEVAR This should show up in SOMEVAR3
-VARNOVAL
-VARNOVAL_WITHSPACE
-QUICK %
-
-# target based getting of config file, look at afs.config and nfs.config
-[include #{getenv fsname}.config]
-
-[include #{getenv MT_RUN_AREA_HOME}/common_runconfigs.config]
-
-# #{system echo 'VACKYVAR #{shell pwd}' > $MT_RUN_AREA_HOME/configs/$USER.config}
-[include ./configs/#{getenv USER}.config]
-
-
-WACKYVAR0 #{get ubuntu/nfs/none CURRENT}
-WACKYVAR1 #{scheme (args:get-arg "-target")}
-
-[default/ubuntu/nfs]
-WACKYVAR2 #{runconfigs-get CURRENT}
-
-[ubuntu/nfs/none]
-WACKYVAR2 #{runconfigs-get CURRENT}
-SOMEVAR2  This should show up in SOMEVAR4 if the target is ubuntu/nfs/none
-VARWITHDOLLARSIGNS The$USER/signs/should/be/replaced/with/variable
-
-[default]
-SOMEVAR3 #{rget SOMEVAR}
-SOMEVAR4 #{rget SOMEVAR2}
-SOMEVAR5 #{runconfigs-get SOMEVAR2}
-
-[ubuntu/nfs/all_toplevel]
-TESTPATT all_toplevel
-
-[this/a/test]
-BLAHFOO 123
-
-[ubuntu/nfs/sleep1]
-SLEEPRUNNER 1
-
-[ubuntu/nfs/sleep10]
-SLEEPRUNNER 10
-
-[ubuntu/nfs/sleep60]
-SLEEPRUNNER 60
-
-[ubuntu/nfs/sleep240]
-SLEEPRUNNER 240
-
-[v1.63/tip/dev]
-QUICKPATT %/desert,%/ae
-# OTHER_PATT foo%/desert,%/ae
-
-# [v1.63/%/%]
-# QUICKPATT %/desert,%/ae
-
-[nada/foo/bar]
-junk foo
-

DELETED tests/fullrun/tests/all_toplevel/calcresults.logpro
Index: tests/fullrun/tests/all_toplevel/calcresults.logpro
==================================================================
--- tests/fullrun/tests/all_toplevel/calcresults.logpro
+++ /dev/null
@@ -1,140 +0,0 @@
-;; (c) 2006,2007,2008,2009 Matthew Welland matt@kiatoa.com
-;;  
-;;   License GPL.
-
-(define logbody "LogFileBody")
-
-(define pass-specs '( ;; testname num-expected max-runtime
-		     ("exit_0"		        1  20)
-		     ("ezlog_fail_then_pass"    1  20)
-		     ("ezlog_pass"	        1  20)
-		     ("ez_pass"		        1  20)
-		     ("lineitem_pass"	        1  20)
-		     ("priority_1"	        1  20)
-		     ("priority_10"	        1  20)
-		     ("priority_10_waiton_1"    1  20)
-		     ("priority_3"	        1  20)
-		     ("priority_4"	        1  20)
-		     ;; ("priority_5"	        1  20)
-		     ("priority_6"	        1  20)
-;;		     ("priority_7"	        1  20)
-		     ("priority_8"	        1  20)
-		     ("priority_9"	        1  20)
-		     ("runfirst"	        7  20)
-		     ("singletest"	        1  20)
-		     ("singletest2"	        1  20)
-		     ("special"		        1  20)
-		     ("sqlitespeed"	       10  20)
-		     ("test1"		        1  20)
-		     ("test2"		        6  20)
-		     ("test_mt_vars"	        6  20)
-		     ))
-
-(define fail-specs '( ;; testname num-expected max-runtime
-		     ("exit_1"		        1  20)
-		     ("ez_exit2_fail"           1  20)
-		     ("ez_fail"		        1  20)
-		     ("ez_fail_quick"	        1  20)
-		     ("ezlog_fail"	        1  20)
-		     ("lineitem_fail"	        1  20)
-		     ("logpro_required_fail"    1  20)
-		     ("manual_example"	        1  20)
-		     ("neverrun"	        1  20)))
-		     
-(define warn-specs   '(("ezlog_warn"	        1  20)))
-
-(define nost-specs   '(("wait_no_items1"        1  20)
-		       ("wait_no_items2"        1  20)
-		       ("wait_no_items3"        1  20)
-		       ("wait_no_items4"        1  20)
-		       ;; ("no_items"              1  20)
-		       ))
-
-(define (check-one-test estate estatus testname count runtime)
-   (let* ((rxe      (regexp (conc "^\\s+Test: " testname "(\\(.*|\\s+)\\s+State: " estate "\\s+Status: " estatus "\\s+Runtime:\\s+(\\d+)s")))
-	  (msg1     (conc testname " expecting count of " count))
-	  (msg2     (conc testname " expecting runtime less than " runtime)))
-     (expect:required in logbody = count msg1 rxe)
-     ;;(expect:value    in logbody count < msg2 rxe)
-     ))
-
-;; Special cases
-;;
-(expect:ignore   in logbody >= 0  "db_sync test might not have run"  #/Test: db_sync/)
-(expect:ignore   in logbody >= 0  "all_toplevel may not yet be done" #/Test: all_toplevel/)
-(expect:error    in logbody =  0  "tests left in RUNNING state"      #/State: RUNNING/)
-(expect:required in logbody =  1  "priority_2 is KILLED"             #/Test: priority_2\s+State: KILLED\s+Status: KILLED/)
-(expect:required in logbody =  1  "priority_5 is either PASS or SKIP" #/Test: priority_5\s+State: COMPLETED\s+Status: (SKIP|PASS)/)
-(expect:required in logbody =  1  "priority_7 is either PASS or SKIP" #/Test: priority_7\s+State: COMPLETED\s+Status: (SKIP|PASS)/)
-(expect:required in logbody =  1  "testxz has 1 NOT_STARTED test"    #/Test: testxz\s+State: NOT_STARTED/)
-(expect:required in logbody =  1  "no items"                         #/Test: no_items\s+State: NOT_STARTED\s+Status: ZERO_ITEMS/)
-(expect:warning  in logbody =  1  "dynamic waiton"                   #/Test: dynamic_waiton/)
-(expect:required in logbody = 29  "blocktestxz has 29 tests"         #/Test: blocktestxz/)
-
-;; General cases
-;;
-(for-each 
- (lambda (testdat)
-   (apply check-one-test "COMPLETED" "PASS" testdat))
- pass-specs)
-
-(for-each 
- (lambda (testdat)
-   (apply check-one-test "COMPLETED" "FAIL" testdat))
- fail-specs)
-
-(for-each 
- (lambda (testdat)
-   (apply check-one-test "COMPLETED" "WARN" testdat))
- warn-specs)
-
-(for-each 
- (lambda (testdat)
-   (apply check-one-test "NOT_STARTED" "PREQ_DISCARDED" testdat))
- nost-specs)
-
-;; Catch all.
-;;
-(expect:error    in logbody = 0   "Tests not accounted for"     #/Test: /)
-
-
-;; ;; define your hooks
-;; (hook:first-error   "echo \"Error hook activated: #{escaped errmsg}\"")
-;; (hook:first-warning "echo \"Got warning: #{escaped warnmsg}\"")
-;; (hook:value "echo \"Value hook activated: expected=#{expected}, measured=#{measured}, tolerance=#{tolerance}, message=#{message}\"")
-;; 
-;; ;; first ensure your run at least started
-;; ;;
-;; (trigger "Init"     #/This is a header/)
-;; (trigger "InitEnd"  #/^\s*$/)
-;; (section "Init" "Init" "InitEnd")
-;; 
-;; (trigger "Body"     #/^.*$/) ;; anything starts the body
-;; ;; (trigger "EndBody"  #/This had better never match/)
-;; 
-;; (section "Body"     "Body" "EndBody")
-;; 
-;; (trigger "Blah2"    #/^begin Blah2/)
-;; (trigger "Blah2End" #/^end Blah2/)
-;; (section "Blah2"    "Blah2" "Blah2End")
-;; 
-;; (expect:required in "Init"  = 1 "Header"      #/This is a header/)
-;; (expect:required in "LogFileBody" > 0 "Something required but not found" #/This is required but not found/)
-;; (expect:value    in "LogFileBody" 1.9 0.1 "Output voltage" #/Measured voltage output:\s*([\d\.\+\-e]+)v/)
-;; (expect:value    in "LogFileBody" 0.5 0.1 "Output current" #/Measured output current:\s*([\d\.\+\-e]+)mA/)
-;; (expect:value    in "LogFileBody" 110e9 2e9 "A big number (first)" #/Freq:\s*([\d\.\+\-e]+)\s+Hz/)
-;; (expect:value    in "LogFileBody" 110e9 1e9 "A big number (second), hook not called" #/Freq:\s*([\d\.\+\-e]+)Hz/)
-;; (expect:value    in "LogFileBody" 110e9 1e9 "A big number (never activated)" #/Freq:\s*([\d\.\+\-e]+)zH/)
-;; 
-;; ;; Using match number
-;; (expect:value    in "LogFileBody" 1.9 0.1 "Time Voltage" #/out: (\d+)\s+(\d+)/ match: 2)
-;; 
-;; ;; Comparison instead of tolerance
-;; (expect:value    in "LogFileBody" 1.9 >   "Time voltage" #/out: (\d+)\s+(\d+)/ match: 2)
-;; 
-;; (expect:ignore   in "Blah2" < 99 "FALSE ERROR" #/ERROR/)
-;; (expect:ignore   in "Body"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-;; (expect:warning  in "Body"  = 0 "Any warning" #/WARNING/)
-;; (expect:error    in "Body"  = 0 "ERROR BLAH"  (list #/ERROR/ #/error/)) ;; but disallow any other errors
-;; 
-;; ;(expect in "Init"  < 1 "Junk"        #/This is bogus/)

DELETED tests/fullrun/tests/all_toplevel/testconfig
Index: tests/fullrun/tests/all_toplevel/testconfig
==================================================================
--- tests/fullrun/tests/all_toplevel/testconfig
+++ /dev/null
@@ -1,13 +0,0 @@
-[ezsteps]
-calcresults megatest -list-runs $MT_RUNNAME -target $MT_TARGET
-check_triggers  cat $MT_RUN_AREA_HOME/triggers_$MT_RUNNAME.dat
-
-[logpro]
-check_triggers ;;
-  (expect:error in "LogFileBody" = 0 "No errors" #/error/i)
-
-[requirements]
-waiton  #{getenv ALL_TOPLEVEL_TESTS}
-
-# This is a "toplevel" test, it does not require waitons to be non-FAIL to run
-mode toplevel

DELETED tests/fullrun/tests/blocktestxz/main.sh
Index: tests/fullrun/tests/blocktestxz/main.sh
==================================================================
--- tests/fullrun/tests/blocktestxz/main.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-$MT_MEGATEST -test-status :state $THESTATE :status $THESTATUS -setlog "nada.html"
-
-# By exiting with non-zero we tell Megatest to preseve the state and status
-exit 1

DELETED tests/fullrun/tests/blocktestxz/testconfig
Index: tests/fullrun/tests/blocktestxz/testconfig
==================================================================
--- tests/fullrun/tests/blocktestxz/testconfig
+++ /dev/null
@@ -1,22 +0,0 @@
-[setup]
-runscript main.sh
-
-[items]
-THESTATE UNKNOWN INCOMPLETE KILLED KILLREQ STUCK BOZZLEBLONKED STUCK/DEAD
-THESTATUS PASS FAIL STUCK/DEAD SKIP
-
-[requirements]
-waiton sqlitespeed
-
-[test_meta]
-author matt
-owner  bob
-description This test will fail causing the dependent test "testxz"\
- to never run. This triggers the code that must determine\
- that a test will never be run and thus remove it from\
- the queue of tests to be run.
-
-tags first,single
-reviewed 1/1/1965
-
-jobgroup blockz

DELETED tests/fullrun/tests/db_sync/calcresults.logpro
Index: tests/fullrun/tests/db_sync/calcresults.logpro
==================================================================
--- tests/fullrun/tests/db_sync/calcresults.logpro
+++ /dev/null
@@ -1,44 +0,0 @@
-;; (c) 2006,2007,2008,2009 Matthew Welland matt@kiatoa.com
-;;  
-;;   License GPL.
-
-;; ;; define your hooks
-;; (hook:first-error   "echo \"Error hook activated: #{escaped errmsg}\"")
-;; (hook:first-warning "echo \"Got warning: #{escaped warnmsg}\"")
-;; (hook:value "echo \"Value hook activated: expected=#{expected}, measured=#{measured}, tolerance=#{tolerance}, message=#{message}\"")
-;; 
-;; ;; first ensure your run at least started
-;; ;;
-;; (trigger "Init"     #/This is a header/)
-;; (trigger "InitEnd"  #/^\s*$/)
-;; (section "Init" "Init" "InitEnd")
-;; 
-;; (trigger "Body"     #/^.*$/) ;; anything starts the body
-;; ;; (trigger "EndBody"  #/This had better never match/)
-;; 
-;; (section "Body"     "Body" "EndBody")
-;; 
-;; (trigger "Blah2"    #/^begin Blah2/)
-;; (trigger "Blah2End" #/^end Blah2/)
-;; (section "Blah2"    "Blah2" "Blah2End")
-;; 
-;; (expect:required in "Init"  = 1 "Header"      #/This is a header/)
-;; (expect:required in "LogFileBody" > 0 "Something required but not found" #/This is required but not found/)
-;; (expect:value    in "LogFileBody" 1.9 0.1 "Output voltage" #/Measured voltage output:\s*([\d\.\+\-e]+)v/)
-;; (expect:value    in "LogFileBody" 0.5 0.1 "Output current" #/Measured output current:\s*([\d\.\+\-e]+)mA/)
-;; (expect:value    in "LogFileBody" 110e9 2e9 "A big number (first)" #/Freq:\s*([\d\.\+\-e]+)\s+Hz/)
-;; (expect:value    in "LogFileBody" 110e9 1e9 "A big number (second), hook not called" #/Freq:\s*([\d\.\+\-e]+)Hz/)
-;; (expect:value    in "LogFileBody" 110e9 1e9 "A big number (never activated)" #/Freq:\s*([\d\.\+\-e]+)zH/)
-;; 
-;; ;; Using match number
-;; (expect:value    in "LogFileBody" 1.9 0.1 "Time Voltage" #/out: (\d+)\s+(\d+)/ match: 2)
-;; 
-;; ;; Comparison instead of tolerance
-;; (expect:value    in "LogFileBody" 1.9 >   "Time voltage" #/out: (\d+)\s+(\d+)/ match: 2)
-;; 
-;; (expect:ignore   in "Blah2" < 99 "FALSE ERROR" #/ERROR/)
-;; (expect:ignore   in "Body"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-;; (expect:warning  in "Body"  = 0 "Any warning" #/WARNING/)
-;; (expect:error    in "Body"  = 0 "ERROR BLAH"  (list #/ERROR/ #/error/)) ;; but disallow any other errors
-;; 
-;; ;(expect in "Init"  < 1 "Junk"        #/This is bogus/)

DELETED tests/fullrun/tests/db_sync/dbdelta.scm
Index: tests/fullrun/tests/db_sync/dbdelta.scm
==================================================================
--- tests/fullrun/tests/db_sync/dbdelta.scm
+++ /dev/null
@@ -1,44 +0,0 @@
-
-(use sql-de-lite)
-
-(define megatest.db (conc (get-environment-variable "MT_RUN_AREA_HOME") "/megatest.db"))
-
-(define runsquery "sysname||'/'||fsname||'/'||datapath||'/'||runname||'/'||runs.state||'-'||runs.status") 
-(define bigquery
-  (conc 
-   "SELECT " runsquery "||testname||'/'||item_path||'-'||'-'||tests.state||'-'||tests.status||'-'||runs.id AS outdat FROM runs INNER JOIN tests ON runs.id=tests.run_id WHERE runs.state NOT LIKE 'deleted' AND tests.state NOT LIKE 'deleted' AND testname NOT LIKE 'db_sync' ORDER BY outdat ASC ;"))
-
-(print "Creating file for legacy db")
-(with-output-to-file "legacy-db-dump"
-  (lambda ()
-    (let ((db (open-database megatest.db)))
-      (query (for-each-row
-	      (lambda (res)
-		(print res)))
-	     (sql db bigquery))
-      (close-database db))))
-
-(define main.db (conc (get-environment-variable "MT_DBDIR") "/main.db"))
-
-(print "Creating file for current db")
-(with-output-to-file "current-db-dump"
-  (lambda ()
-    (let* ((mdb      (open-database main.db))
-	   (run-ids  (query fetch-column (sql mdb (conc "select id," runsquery " AS rq from runs ORDER BY rq ASC;"))))
-	   (dbdir    (get-environment-variable "MT_DBDIR")))
-      (for-each
-       (lambda (rid)
-	 (let ((dbfile (conc dbdir "/" rid ".db")))
-	   (if (file-exists? dbfile)
-	       (begin
-		 (exec (sql mdb (conc "ATTACH DATABASE '" dbfile "' AS testsdb;")))
-		 (query (for-each-row
-			 (lambda (res)
-			   (print res)))
-			(sql mdb bigquery))
-		 (exec (sql mdb "DETACH DATABASE testsdb;")))
-	       (print "ERROR: No file " dbfile " found"))))
-       run-ids)
-      (close-database mdb))))
-	 
-      

DELETED tests/fullrun/tests/db_sync/getdbdir.scm
Index: tests/fullrun/tests/db_sync/getdbdir.scm
==================================================================
--- tests/fullrun/tests/db_sync/getdbdir.scm
+++ /dev/null
@@ -1,1 +0,0 @@
-(db:dbfile-path #f)

DELETED tests/fullrun/tests/db_sync/showdiff.logpro
Index: tests/fullrun/tests/db_sync/showdiff.logpro
==================================================================
--- tests/fullrun/tests/db_sync/showdiff.logpro
+++ /dev/null
@@ -1,46 +0,0 @@
-;; (c) 2006,2007,2008,2009 Matthew Welland matt@kiatoa.com
-;;  
-;;   License GPL.
-
-;; ;; define your hooks
-;; (hook:first-error   "echo \"Error hook activated: #{escaped errmsg}\"")
-;; (hook:first-warning "echo \"Got warning: #{escaped warnmsg}\"")
-;; (hook:value "echo \"Value hook activated: expected=#{expected}, measured=#{measured}, tolerance=#{tolerance}, message=#{message}\"")
-;; 
-;; ;; first ensure your run at least started
-;; ;;
-;; (trigger "Init"     #/This is a header/)
-;; (trigger "InitEnd"  #/^\s*$/)
-;; (section "Init" "Init" "InitEnd")
-;; 
-;; (trigger "Body"     #/^.*$/) ;; anything starts the body
-;; ;; (trigger "EndBody"  #/This had better never match/)
-;; 
-;; (section "Body"     "Body" "EndBody")
-;; 
-;; (trigger "Blah2"    #/^begin Blah2/)
-;; (trigger "Blah2End" #/^end Blah2/)
-;; (section "Blah2"    "Blah2" "Blah2End")
-;; 
-;; (expect:required in "Init"  = 1 "Header"      #/This is a header/)
-;; (expect:required in "LogFileBody" > 0 "Something required but not found" #/This is required but not found/)
-;; (expect:value    in "LogFileBody" 1.9 0.1 "Output voltage" #/Measured voltage output:\s*([\d\.\+\-e]+)v/)
-;; (expect:value    in "LogFileBody" 0.5 0.1 "Output current" #/Measured output current:\s*([\d\.\+\-e]+)mA/)
-;; (expect:value    in "LogFileBody" 110e9 2e9 "A big number (first)" #/Freq:\s*([\d\.\+\-e]+)\s+Hz/)
-;; (expect:value    in "LogFileBody" 110e9 1e9 "A big number (second), hook not called" #/Freq:\s*([\d\.\+\-e]+)Hz/)
-;; (expect:value    in "LogFileBody" 110e9 1e9 "A big number (never activated)" #/Freq:\s*([\d\.\+\-e]+)zH/)
-;; 
-;; ;; Using match number
-;; (expect:value    in "LogFileBody" 1.9 0.1 "Time Voltage" #/out: (\d+)\s+(\d+)/ match: 2)
-;; 
-;; ;; Comparison instead of tolerance
-;; (expect:value    in "LogFileBody" 1.9 >   "Time voltage" #/out: (\d+)\s+(\d+)/ match: 2)
-;; 
-;; (expect:ignore   in "Blah2" < 99 "FALSE ERROR" #/ERROR/)
-;; (expect:ignore   in "Body"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-;; (expect:warning  in "Body"  = 0 "Any warning" #/WARNING/)
-;; (expect:error    in "Body"  = 0 "ERROR BLAH"  (list #/ERROR/ #/error/)) ;; but disallow any other errors
-;; 
-;; ;(expect in "Init"  < 1 "Junk"        #/This is bogus/)
-
-(expect:error    in "LogFileBody" = 0 "Any diff is failure" #/.+/)

DELETED tests/fullrun/tests/db_sync/testconfig
Index: tests/fullrun/tests/db_sync/testconfig
==================================================================
--- tests/fullrun/tests/db_sync/testconfig
+++ /dev/null
@@ -1,13 +0,0 @@
-[pre-launch-env-vars]
-
-MT_DBDIR #{scheme (db:dbfile-path #f)}
-
-[ezsteps]
-calcresults csi -b dbdelta.scm
-showdiff    diff  current-db-dump legacy-db-dump
-
-[requirements]
-waiton  #{getenv ALL_TOPLEVEL_TESTS}
-
-# This is a "toplevel" test, it does not require waitons to be non-FAIL to run
-mode toplevel

DELETED tests/fullrun/tests/dynamic_waiton/testconfig
Index: tests/fullrun/tests/dynamic_waiton/testconfig
==================================================================
--- tests/fullrun/tests/dynamic_waiton/testconfig
+++ /dev/null
@@ -1,21 +0,0 @@
-[ezsteps]
-listfiles ls
-
-[requirements]
-waiton #{scheme (string-intersperse \
-                  (tests:filter-test-names \
-                      (hash-table-keys (tests:get-all)) \
-                      (or (args:get-arg "-runtests") \
-                          (args:get-arg "-testpatt") "")) " ")}
-
-[items]
-
-[test_meta]
-author matt
-owner  bob
-description This test runs a single ezstep which is expected to pass \
-but there is an items definition with no items. This should evoke an \
-error.
-
-tags first,single
-reviewed 09/10/2011, by Matt

DELETED tests/fullrun/tests/exit_0/main.sh
Index: tests/fullrun/tests/exit_0/main.sh
==================================================================
--- tests/fullrun/tests/exit_0/main.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-# a bunch of steps in 2 second increments
-for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17;do
-  $MT_MEGATEST -step step$i :state start :status running -setlog results$i.html
-  sleep 2
-  $MT_MEGATEST -step step$i :state end :status 0
-done
-
-exit 0

DELETED tests/fullrun/tests/exit_0/testconfig
Index: tests/fullrun/tests/exit_0/testconfig
==================================================================
--- tests/fullrun/tests/exit_0/testconfig
+++ /dev/null
@@ -1,17 +0,0 @@
-[setup]
-runscript main.sh
-
-[test_meta]
-author matt
-owner  bob
-description This test checks that a multi-lineitem test with mix of pass and non-fail rolls up a PASS
-
-tags first,single
-reviewed 09/10/2011, by Matt
-
-[triggers]
-# NOT_STARTED/ xterm -e bash -s -- 
-NOT_STARTED/   echo "trigger: exit_0, NOT_STARTED/" > $MT_RUN_AREA_HOME/triggers_$MT_RUN_NAME.dat
-RUNNING/       echo "trigger: exit_0, RUNNING/" >> $MT_RUN_AREA_HOME/triggers_$MT_RUN_NAME.dat
-
-

DELETED tests/fullrun/tests/exit_1/main.sh
Index: tests/fullrun/tests/exit_1/main.sh
==================================================================
--- tests/fullrun/tests/exit_1/main.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-# a bunch of steps in 2 second increments
-for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17;do
-  $MT_MEGATEST -step step$i :state start :status running -setlog results$i.html
-  sleep 2
-  $MT_MEGATEST -step step$i :state end :status 0
-done
-
-exit 1

DELETED tests/fullrun/tests/exit_1/testconfig
Index: tests/fullrun/tests/exit_1/testconfig
==================================================================
--- tests/fullrun/tests/exit_1/testconfig
+++ /dev/null
@@ -1,13 +0,0 @@
-[setup]
-runscript main.sh
-
-[requirements]
-priority 9
-
-[test_meta]
-author matt
-owner  bob
-description This test checks that a multi-lineitem test with mix of pass and non-fail rolls up a PASS
-
-tags first,single
-reviewed 09/10/2011, by Matt

DELETED tests/fullrun/tests/ez_exit2_fail/testconfig
Index: tests/fullrun/tests/ez_exit2_fail/testconfig
==================================================================
--- tests/fullrun/tests/ez_exit2_fail/testconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-[setup]
-
-[ezsteps]
-exit2       exit 2
-lookithome  ls /home
-
-[test_meta]
-author matt
-owner  bob
-description This test runs two steps; the first exits with\
- code 2 (a fail because not using logpro) and the second\
- is a pass
-
-tags first,single
-reviewed 09/10/2011, by Matt

DELETED tests/fullrun/tests/ez_fail/testconfig
Index: tests/fullrun/tests/ez_fail/testconfig
==================================================================
--- tests/fullrun/tests/ez_fail/testconfig
+++ /dev/null
@@ -1,19 +0,0 @@
-[setup]
-
-[requirements]
-priority 10
-
-[ezsteps]
-lookittmp   sleep 5s;ls /tmp
-lookithome  sleep 2;ls /home
-# should fail on next step
-lookitnada  sleep 3;ls /nada
-lookitusr   sleep 2;ls /usr
-
-[test_meta]
-author matt
-owner  bob
-description This test runs a single ezstep which is expected to pass, no logpro file.
-
-tags first,single
-reviewed 09/10/2011, by Matt

DELETED tests/fullrun/tests/ez_fail_quick/testconfig
Index: tests/fullrun/tests/ez_fail_quick/testconfig
==================================================================
--- tests/fullrun/tests/ez_fail_quick/testconfig
+++ /dev/null
@@ -1,18 +0,0 @@
-[requirements]
-priority 10
-
-[ezsteps]
-# should fail on next step
-lookitnada  ls /nada
-
-[triggers]
-# run like this: cmd test-id test-rundir trigger
-COMPLETED/FAIL   echo "trigger: ez_fail_quick, COMPLETED/FAIL" >> $MT_RUN_AREA_HOME/triggers_$MT_RUN_NAME.dat
-
-[test_meta]
-author matt
-owner  bob
-description This test runs a single ezstep which fails immediately.
-
-tags first,single
-reviewed 09/10/2011, by Matt

DELETED tests/fullrun/tests/ez_pass/testconfig
Index: tests/fullrun/tests/ez_pass/testconfig
==================================================================
--- tests/fullrun/tests/ez_pass/testconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-[setup]
-
-[ezsteps]
-lookittmp   sleep 1;ls /tmp
-lookithome  sleep 1;ls /home
-isrunname1  sleep 1;echo $MYRUNNAME1 | grep -v '#f' 
-isrunname2  sleep 1;echo $MYRUNNAME2 | grep -v '#f' 
-
-[test_meta]
-author matt
-owner  bob
-description This test runs a single ezstep which is expected to pass, no logpro file.
-
-tags first,single
-reviewed 09/10/2011, by Matt

DELETED tests/fullrun/tests/ez_pass_linked
Index: tests/fullrun/tests/ez_pass_linked
==================================================================
--- tests/fullrun/tests/ez_pass_linked
+++ /dev/null
@@ -1,1 +0,0 @@
-../ez_pass_linked/

DELETED tests/fullrun/tests/ezlog_fail/example.logpro
Index: tests/fullrun/tests/ezlog_fail/example.logpro
==================================================================
--- tests/fullrun/tests/ezlog_fail/example.logpro
+++ /dev/null
@@ -1,44 +0,0 @@
-;; (c) 2006,2007,2008,2009 Matthew Welland matt@kiatoa.com
-;;  
-;;   License GPL.
-
-;; define your hooks
-(hook:first-error   "echo \"Error hook activated: #{escaped errmsg}\"")
-(hook:first-warning "echo \"Got warning: #{escaped warnmsg}\"")
-(hook:value "echo \"Value hook activated: expected=#{expected}, measured=#{measured}, tolerance=#{tolerance}, message=#{message}\"")
-
-;; first ensure your run at least started
-;;
-(trigger "Init"     #/This is a header/)
-(trigger "InitEnd"  #/^\s*$/)
-(section "Init" "Init" "InitEnd")
-
-(trigger "Body"     #/^.*$/) ;; anything starts the body
-;; (trigger "EndBody"  #/This had better never match/)
-
-(section "Body"     "Body" "EndBody")
-
-(trigger "Blah2"    #/^begin Blah2/)
-(trigger "Blah2End" #/^end Blah2/)
-(section "Blah2"    "Blah2" "Blah2End")
-
-(expect:required in "Init"  = 1 "Header"      #/This is a header/)
-(expect:required in "LogFileBody" > 0 "Something required but not found" #/This is required but not found/)
-(expect:value    in "LogFileBody" 1.9 0.1 "Output voltage" #/Measured voltage output:\s*([\d\.\+\-e]+)v/)
-(expect:value    in "LogFileBody" 0.5 0.1 "Output current" #/Measured output current:\s*([\d\.\+\-e]+)mA/)
-(expect:value    in "LogFileBody" 110e9 2e9 "A big number (first)" #/Freq:\s*([\d\.\+\-e]+)\s+Hz/)
-(expect:value    in "LogFileBody" 110e9 1e9 "A big number (second), hook not called" #/Freq:\s*([\d\.\+\-e]+)Hz/)
-(expect:value    in "LogFileBody" 110e9 1e9 "A big number (never activated)" #/Freq:\s*([\d\.\+\-e]+)zH/)
-
-;; Using match number
-(expect:value    in "LogFileBody" 1.9 0.1 "Time Voltage" #/out: (\d+)\s+(\d+)/ match: 2)
-
-;; Comparison instead of tolerance
-(expect:value    in "LogFileBody" 1.9 >   "Time voltage" #/out: (\d+)\s+(\d+)/ match: 2)
-
-(expect:ignore   in "Blah2" < 99 "FALSE ERROR" #/ERROR/)
-(expect:ignore   in "Body"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "Body"  = 0 "Any warning" #/WARNING/)
-(expect:error    in "Body"  = 0 "ERROR BLAH"  (list #/ERROR/ #/error/)) ;; but disallow any other errors
-
-;(expect in "Init"  < 1 "Junk"        #/This is bogus/)

DELETED tests/fullrun/tests/ezlog_fail/lookithome.logpro
Index: tests/fullrun/tests/ezlog_fail/lookithome.logpro
==================================================================
--- tests/fullrun/tests/ezlog_fail/lookithome.logpro
+++ /dev/null
@@ -1,10 +0,0 @@
-;; (c) 2006,2007,2008,2009 Matthew Welland matt@kiatoa.com
-;;  
-;;   License GPL.
-
-
-(expect:required in "LogFileBody" > 0 "Must be some files in the dir" #/.*/)
-
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/WARNING/)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/)) ;; but disallow any other errors

DELETED tests/fullrun/tests/ezlog_fail/lookittmp.logpro
Index: tests/fullrun/tests/ezlog_fail/lookittmp.logpro
==================================================================
--- tests/fullrun/tests/ezlog_fail/lookittmp.logpro
+++ /dev/null
@@ -1,6 +0,0 @@
-;; (c) 2006,2007,2008,2009 Matthew Welland matt@kiatoa.com
-;;  
-;;   License GPL.
-
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/WARNING/)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/.*/)) ;; force an error

DELETED tests/fullrun/tests/ezlog_fail/testconfig
Index: tests/fullrun/tests/ezlog_fail/testconfig
==================================================================
--- tests/fullrun/tests/ezlog_fail/testconfig
+++ /dev/null
@@ -1,28 +0,0 @@
-[setup]
-
-[ezsteps]
-lookittmp   ls /tmp
-lookithome  ls /home
-
-# logpro_file  input_glob
-# matching file(s) will be diff'd with previous run and logpro applied
-# if PASS or WARN result from logpro then WAIVER state is set
-#
-[waivers]
-waiver_1 logpro lookittmp.log
-
-[waiver_rules]
-
-# This builtin rule is the default if there is no .logpro file
-# diff   diff %file1% %file2%
-
-# This builtin rule is applied if a .logpro file exists
-# logpro diff %file1% %file2% | logpro %waivername%.logpro %waivername%.html
-
-[test_meta]
-author matt
-owner  bob
-description This test runs two ezstep, the first of which is expected to fail using a simple logpro file.
-
-tags first,single
-reviewed 09/10/2011, by Matt

DELETED tests/fullrun/tests/ezlog_fail/waiver_1.logpro
Index: tests/fullrun/tests/ezlog_fail/waiver_1.logpro
==================================================================
--- tests/fullrun/tests/ezlog_fail/waiver_1.logpro
+++ /dev/null
@@ -1,1 +0,0 @@
-(expect:warning  in "Body"  = 0 "Any warning" #/WARNING/)

DELETED tests/fullrun/tests/ezlog_fail_then_pass/firststep.logpro
Index: tests/fullrun/tests/ezlog_fail_then_pass/firststep.logpro
==================================================================
--- tests/fullrun/tests/ezlog_fail_then_pass/firststep.logpro
+++ /dev/null
@@ -1,10 +0,0 @@
-;; (c) 2006,2007,2008,2009 Matthew Welland matt@kiatoa.com
-;;  
-;;   License GPL.
-
-
-(expect:required in "LogFileBody" > 0 "Must be some files in the dir" #/.*/)
-
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/WARNING/)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/)) ;; but disallow any other errors

DELETED tests/fullrun/tests/ezlog_fail_then_pass/main.sh
Index: tests/fullrun/tests/ezlog_fail_then_pass/main.sh
==================================================================
--- tests/fullrun/tests/ezlog_fail_then_pass/main.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-megatest -step yepstep :state start :status n/a
-ls /tmp
-megatest -step yepstep :state end :status $?
-
-megatest -load-test-data << EOF
-OPER,du,   1.2,  1.2, <   , GBytes  ,System didn't use too much space
-EOF
-
-# a bunch of steps in 2 second increments
-for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17;do
-  $MT_MEGATEST -step step$i :state start :status running -setlog results$i.html
-  sleep 2
-  $MT_MEGATEST -step step$i :state end :status 0
-done
-
-megatest -test-status :state COMPLETED :status AUTO

DELETED tests/fullrun/tests/ezlog_fail_then_pass/testconfig
Index: tests/fullrun/tests/ezlog_fail_then_pass/testconfig
==================================================================
--- tests/fullrun/tests/ezlog_fail_then_pass/testconfig
+++ /dev/null
@@ -1,13 +0,0 @@
-[setup]
-
-[ezsteps]
-firststep main.sh
-
-[test_meta]
-author matt
-owner  bob
-description This test runs a single ezstep which is logpro clean\
- but fails based on -test-data loaded.
-
-tags first,single
-reviewed 09/10/2011, by Matt

DELETED tests/fullrun/tests/ezlog_pass/example.logpro
Index: tests/fullrun/tests/ezlog_pass/example.logpro
==================================================================
--- tests/fullrun/tests/ezlog_pass/example.logpro
+++ /dev/null
@@ -1,44 +0,0 @@
-;; (c) 2006,2007,2008,2009 Matthew Welland matt@kiatoa.com
-;;  
-;;   License GPL.
-
-;; define your hooks
-(hook:first-error   "echo \"Error hook activated: #{escaped errmsg}\"")
-(hook:first-warning "echo \"Got warning: #{escaped warnmsg}\"")
-(hook:value "echo \"Value hook activated: expected=#{expected}, measured=#{measured}, tolerance=#{tolerance}, message=#{message}\"")
-
-;; first ensure your run at least started
-;;
-(trigger "Init"     #/This is a header/)
-(trigger "InitEnd"  #/^\s*$/)
-(section "Init" "Init" "InitEnd")
-
-(trigger "Body"     #/^.*$/) ;; anything starts the body
-;; (trigger "EndBody"  #/This had better never match/)
-
-(section "Body"     "Body" "EndBody")
-
-(trigger "Blah2"    #/^begin Blah2/)
-(trigger "Blah2End" #/^end Blah2/)
-(section "Blah2"    "Blah2" "Blah2End")
-
-(expect:required in "Init"  = 1 "Header"      #/This is a header/)
-(expect:required in "LogFileBody" > 0 "Something required but not found" #/This is required but not found/)
-(expect:value    in "LogFileBody" 1.9 0.1 "Output voltage" #/Measured voltage output:\s*([\d\.\+\-e]+)v/)
-(expect:value    in "LogFileBody" 0.5 0.1 "Output current" #/Measured output current:\s*([\d\.\+\-e]+)mA/)
-(expect:value    in "LogFileBody" 110e9 2e9 "A big number (first)" #/Freq:\s*([\d\.\+\-e]+)\s+Hz/)
-(expect:value    in "LogFileBody" 110e9 1e9 "A big number (second), hook not called" #/Freq:\s*([\d\.\+\-e]+)Hz/)
-(expect:value    in "LogFileBody" 110e9 1e9 "A big number (never activated)" #/Freq:\s*([\d\.\+\-e]+)zH/)
-
-;; Using match number
-(expect:value    in "LogFileBody" 1.9 0.1 "Time Voltage" #/out: (\d+)\s+(\d+)/ match: 2)
-
-;; Comparison instead of tolerance
-(expect:value    in "LogFileBody" 1.9 >   "Time voltage" #/out: (\d+)\s+(\d+)/ match: 2)
-
-(expect:ignore   in "Blah2" < 99 "FALSE ERROR" #/ERROR/)
-(expect:ignore   in "Body"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "Body"  = 0 "Any warning" #/WARNING/)
-(expect:error    in "Body"  = 0 "ERROR BLAH"  (list #/ERROR/ #/error/)) ;; but disallow any other errors
-
-;(expect in "Init"  < 1 "Junk"        #/This is bogus/)

DELETED tests/fullrun/tests/ezlog_pass/lookittmp.logpro
Index: tests/fullrun/tests/ezlog_pass/lookittmp.logpro
==================================================================
--- tests/fullrun/tests/ezlog_pass/lookittmp.logpro
+++ /dev/null
@@ -1,10 +0,0 @@
-;; (c) 2006,2007,2008,2009 Matthew Welland matt@kiatoa.com
-;;  
-;;   License GPL.
-
-
-(expect:required in "LogFileBody" > 0 "Must be some files in the dir" #/.*/)
-
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/WARNING/)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/)) ;; but disallow any other errors

DELETED tests/fullrun/tests/ezlog_pass/testconfig
Index: tests/fullrun/tests/ezlog_pass/testconfig
==================================================================
--- tests/fullrun/tests/ezlog_pass/testconfig
+++ /dev/null
@@ -1,13 +0,0 @@
-[setup]
-
-[ezsteps]
-lookittmp   ls /tmp
-lookithome  ls /home
-
-[test_meta]
-author matt
-owner  bob
-description This test runs a single ezstep which is expected to pass using a simple logpro file.
-
-tags first,single
-reviewed 09/10/2011, by Matt

DELETED tests/fullrun/tests/ezlog_warn/lookithome.logpro
Index: tests/fullrun/tests/ezlog_warn/lookithome.logpro
==================================================================
--- tests/fullrun/tests/ezlog_warn/lookithome.logpro
+++ /dev/null
@@ -1,11 +0,0 @@
-;; (c) 2006,2007,2008,2009 Matthew Welland matt@kiatoa.com
-;;  
-;;   License GPL.
-
-
-;; Force a warn for this test
-(expect:required in "LogFileBody" > 0 "Must be some files in the dir" #/.*/)
-
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/warn/)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/)) ;; but disallow any other errors

DELETED tests/fullrun/tests/ezlog_warn/lookittmp.logpro
Index: tests/fullrun/tests/ezlog_warn/lookittmp.logpro
==================================================================
--- tests/fullrun/tests/ezlog_warn/lookittmp.logpro
+++ /dev/null
@@ -1,12 +0,0 @@
-;; (c) 2006,2007,2008,2009 Matthew Welland matt@kiatoa.com
-;;  
-;;   License GPL.
-
-
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/.*/)
-;; Can't have a required since it will mask the warns! Could make the warn non-overlapping with the
-;; required I suppose...
-;; (expect:required in "LogFileBody" > 0 "Must be some files in the dir" #/.*/)
-
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/)) ;; but disallow any other errors

DELETED tests/fullrun/tests/ezlog_warn/testconfig
Index: tests/fullrun/tests/ezlog_warn/testconfig
==================================================================
--- tests/fullrun/tests/ezlog_warn/testconfig
+++ /dev/null
@@ -1,13 +0,0 @@
-[setup]
-
-[ezsteps]
-lookittmp   ls /tmp
-lookithome  ls $HOME
-
-[test_meta]
-author matt
-owner  bob
-description This test runs two ezsteps the first of which is expected to fail using a simple logpro file.
-
-tags first,single
-reviewed 09/10/2011, by Matt

DELETED tests/fullrun/tests/lineitem_fail/main.sh
Index: tests/fullrun/tests/lineitem_fail/main.sh
==================================================================
--- tests/fullrun/tests/lineitem_fail/main.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-$MT_MEGATEST -load-test-data << EOF
-foo,bar,   1.2,  1.9, >
-foo,rab, 1.0e9, 10e9, 1e9
-foo,bla,   1.2,  1.9, <
-foo,bal,   1.2,  1.2, <   ,     ,Check for overload
-foo,alb,   1.2,  1.2, <=  , Amps,This is the high power circuit test
-foo,abl,   1.2,  1.3, 0.1
-foo,bra,   1.2, pass, silly stuff
-faz,bar,    10,  8mA,     ,     ,"this is a comment"
-EOF
-
-# a bunch of steps in 2 second increments
-for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17;do
-  $MT_MEGATEST -step step$i :state start :status running -setlog results$i.html
-  sleep 2
-  $MT_MEGATEST -step step$i :state end :status 0
-done
-
-# Needed to force rolling up the results and set the test to COMPLETED
-$MT_MEGATEST -test-status :state COMPLETED :status AUTO
-

DELETED tests/fullrun/tests/lineitem_fail/testconfig
Index: tests/fullrun/tests/lineitem_fail/testconfig
==================================================================
--- tests/fullrun/tests/lineitem_fail/testconfig
+++ /dev/null
@@ -1,10 +0,0 @@
-[setup]
-runscript main.sh
-
-[test_meta]
-author matt
-owner  bob
-description This test checks that a multi-lineitem test with mix of pass and non-fail rolls up a PASS
-
-tags first,single
-reviewed 09/10/2011, by Matt

DELETED tests/fullrun/tests/lineitem_pass/main.sh
Index: tests/fullrun/tests/lineitem_pass/main.sh
==================================================================
--- tests/fullrun/tests/lineitem_pass/main.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-
-# category variable value expected  tol/comp units comment
-$MT_MEGATEST -load-test-data << EOF
-foo,       bar,     1.9,  1.8,      >
-foo,       rab,   1.0e9,  2e9,      1e9
-foo,       bla,     1.2,  1.9,      <
-foo,       bal,    -1.1,    0,      <   ,         , Check for overload
-foo,       alb,     1.2,  1.2,      <=  ,     Amps, This is the high power circuit test
-foo,       abl,     1.2,  1.3,      0.1
-foo,       bra,     1.2, pass,      silly stuff
-faz,       bar,      10,  8mA,          ,         ,"this is a comment"
-EOF
-
-# a bunch of steps in 2 second increments
-for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17;do
-  $MT_MEGATEST -step step$i :state start :status running -setlog results$i.html
-  sleep 2
-  $MT_MEGATEST -step step$i :state end :status 0
-done
-# Needed to force rolling up the results and set the test to COMPLETED
-$MT_MEGATEST -test-status :state COMPLETED :status AUTO

DELETED tests/fullrun/tests/lineitem_pass/testconfig
Index: tests/fullrun/tests/lineitem_pass/testconfig
==================================================================
--- tests/fullrun/tests/lineitem_pass/testconfig
+++ /dev/null
@@ -1,10 +0,0 @@
-[setup]
-runscript main.sh
-
-[test_meta]
-author matt
-owner  bob
-description This test checks that a multi-lineitem test with mix of pass and non-fail rolls up a PASS
-
-tags first,single
-reviewed 09/10/2011, by Matt

DELETED tests/fullrun/tests/logpro_required_fail/testconfig
Index: tests/fullrun/tests/logpro_required_fail/testconfig
==================================================================
--- tests/fullrun/tests/logpro_required_fail/testconfig
+++ /dev/null
@@ -1,23 +0,0 @@
-[setup]
-
-[ezsteps]
-lookittmp   ls /tmp
-
-[test_meta]
-author matt
-owner  bob
-description This test runs two ezstep, the first of which is expected to fail using a simple logpro file.
-
-[logpro]
-lookittmp ;; (c) 2006,2007,2008,2009 Matthew Welland matt@kiatoa.com
-  ;;  
-  ;;   License GPL.
-  ;;
-  (expect:required in "LogFileBody" > 0 "A file name that should never exist!" #/This is a awfully stupid file name that should never be found in the temp dir/)
-  ;;
-  ;; (expect:warning  in "LogFileBody"  = 0 "Any warning" #/WARNING/)
-  ;; (expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/.*/)) ;; force an error
-
-
-tags logpro
-reviewed 09/10/2011, by Matt

DELETED tests/fullrun/tests/manual_example/results/results.csv
Index: tests/fullrun/tests/manual_example/results/results.csv
==================================================================
--- tests/fullrun/tests/manual_example/results/results.csv
+++ /dev/null
@@ -1,1 +0,0 @@
-category, variable, expected,   value,  tol,   units,  comment

DELETED tests/fullrun/tests/manual_example/runsetupxterm.sh
Index: tests/fullrun/tests/manual_example/runsetupxterm.sh
==================================================================
--- tests/fullrun/tests/manual_example/runsetupxterm.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-if [[ $TARGETDISPLAY = "" || $TARGETHOST = "" || $TARGETDIR = "" || $TARGETUSER = "" ]]; then
-    msg="You must set the TARGETDISPLAY, TARGETHOST, TARGETDIR and TARGETUSER variables for manual tests"
-    echo $msg
-    megatest -test-status :state COMPLETED :status FAIL -m $msg
-    exit 1
-else
-    megatest -step setup :state start :status n/a
-    xterm -display $TARGETDISPLAY -e ./setupremote.sh
-    megatest -step setup :state end :status $?
-fi
-

DELETED tests/fullrun/tests/manual_example/setupremote.sh
Index: tests/fullrun/tests/manual_example/setupremote.sh
==================================================================
--- tests/fullrun/tests/manual_example/setupremote.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-
-megatest -step rsyncto :state start :status n/a
-echo "First, lets populate your area with necessary files, you may be prompted for your Unix password several times"
-rsync -avz $MT_TEST_RUN_DIR/  $TARGETUSER@$TARGETHOST:$TARGETDIR
-megatest -step rsyncto :state end :status n/a
-
-megatest -step runtest :state start :status n/a
-remotecmd="cd $TARGETDIR;xterm -display $TARGETDISPLAY"
-echo Launching $remotecmd on $TARGETHOST as $TARGETUSER
-ssh $TARGETUSER@$TARGETHOST $remotecmd
-megatest -step runtest :state end :status $?
-
-megatest -step gatherdata :state start :status n/a
-rsync -avz $TARGETUSER@$TARGETHOST:$TARGETDIR/results/ $MT_TEST_RUN_DIR/results/
-if [[ -e $MT_TEST_RUN_DIR/results/results.csv ]]; then
-    megatest -load-test-data < $MT_TEST_RUN_DIR/results/results.csv
-fi
-
-if [[ -e $MT_TEST_RUN_DIR/results/final_results.log && $MT_TEST_RUN_DIR/final_results.logpro ]]; then
-    logpro $MT_TEST_RUN_DIR/final_results.logpro $MT_TEST_RUN_DIR/final_results.html < $MT_TEST_RUN_DIR/results/final_results.log
-    if [[ $? = 0 ]]; then
-	finalstatus=PASS
-    else
-	finalstatus=FAIL
-    fi
-    megatest -test-status :state COMPLETED :status $finalstatus -setlog final_results.html
-fi

DELETED tests/fullrun/tests/manual_example/testconfig
Index: tests/fullrun/tests/manual_example/testconfig
==================================================================
--- tests/fullrun/tests/manual_example/testconfig
+++ /dev/null
@@ -1,13 +0,0 @@
-[setup]
-
-[ezsteps]
-setup ./runsetupxterm.sh
-# launch launchxterm
-
-[test_meta]
-author matt
-owner  bob
-description This test runs a single ezstep which is expected to pass\
- using a simple logpro file.
-tags first,single
-reviewed 09/10/2011, by Matt

DELETED tests/fullrun/tests/neverrun/testconfig
Index: tests/fullrun/tests/neverrun/testconfig
==================================================================
--- tests/fullrun/tests/neverrun/testconfig
+++ /dev/null
@@ -1,4 +0,0 @@
-[setup]
-runscript idontexist
-
-

DELETED tests/fullrun/tests/no_items/testconfig
Index: tests/fullrun/tests/no_items/testconfig
==================================================================
--- tests/fullrun/tests/no_items/testconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-[ezsteps]
-listfiles ls
-
-[items]
-FOO
-
-[test_meta]
-author matt
-owner  bob
-description This test runs a single ezstep which is expected to pass \
-but there is an items definition with no items. This should evoke an \
-error.
-
-tags first,single
-reviewed 09/10/2011, by Matt

DELETED tests/fullrun/tests/priority_1/main.sh
Index: tests/fullrun/tests/priority_1/main.sh
==================================================================
--- tests/fullrun/tests/priority_1/main.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-# a bunch of steps in 2 second increments
-for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17;do
-  $MT_MEGATEST -step step$i :state start :status running -setlog results$i.html
-  sleep 2
-  $MT_MEGATEST -step step$i :state end :status 0
-done
-
-exit 0

DELETED tests/fullrun/tests/priority_1/testconfig
Index: tests/fullrun/tests/priority_1/testconfig
==================================================================
--- tests/fullrun/tests/priority_1/testconfig
+++ /dev/null
@@ -1,17 +0,0 @@
-[setup]
-runscript main.sh
-
-[requirements]
-priority 1
-
-[test_meta]
-jobgroup sqlite3
-author matt
-owner  bob
-description This test checks that a multi-lineitem test with mix of pass and non-fail rolls up a PASS
-
-tags first,single
-reviewed 09/10/2011, by Matt
-
-[triggers]
-COMPLETED/   echo "trigger: priority_1, COMPLETED/" >> $MT_RUN_AREA_HOME/triggers_$MT_RUN_NAME.dat

DELETED tests/fullrun/tests/priority_10/main.sh
Index: tests/fullrun/tests/priority_10/main.sh
==================================================================
--- tests/fullrun/tests/priority_10/main.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-# a bunch of steps in 2 second increments
-for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17;do
-  $MT_MEGATEST -step step$i :state start :status running -setlog results$i.html
-  sleep 2
-  $MT_MEGATEST -step step$i :state end :status 0
-done
-
-exit 0

DELETED tests/fullrun/tests/priority_10/testconfig
Index: tests/fullrun/tests/priority_10/testconfig
==================================================================
--- tests/fullrun/tests/priority_10/testconfig
+++ /dev/null
@@ -1,13 +0,0 @@
-[setup]
-runscript main.sh
-
-[requirements]
-priority 10
-
-[test_meta]
-author matt
-owner  bob
-description This test checks that a multi-lineitem test with mix of pass and non-fail rolls up a PASS
-
-tags first,single
-reviewed 09/10/2011, by Matt

DELETED tests/fullrun/tests/priority_10_waiton_1/main.sh
Index: tests/fullrun/tests/priority_10_waiton_1/main.sh
==================================================================
--- tests/fullrun/tests/priority_10_waiton_1/main.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-# a bunch of steps in 2 second increments
-for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17;do
-  $MT_MEGATEST -step step$i :state start :status running -setlog results$i.html
-  sleep 2
-  $MT_MEGATEST -step step$i :state end :status 0
-done
-
-exit 0

DELETED tests/fullrun/tests/priority_10_waiton_1/testconfig
Index: tests/fullrun/tests/priority_10_waiton_1/testconfig
==================================================================
--- tests/fullrun/tests/priority_10_waiton_1/testconfig
+++ /dev/null
@@ -1,14 +0,0 @@
-[setup]
-runscript main.sh
-
-[requirements]
-priority 10
-waiton priority_1
-
-[test_meta]
-author matt
-owner  bob
-description This test checks that a multi-lineitem test with mix of pass and non-fail rolls up a PASS
-
-tags first,single
-reviewed 09/10/2011, by Matt

DELETED tests/fullrun/tests/priority_2/main.sh
Index: tests/fullrun/tests/priority_2/main.sh
==================================================================
--- tests/fullrun/tests/priority_2/main.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-# a bunch of steps in 2 second increments
-for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17;do
-  $MT_MEGATEST -step step$i :state start :status running -setlog results$i.html
-  sleep 5
-  $MT_MEGATEST -step step$i :state end :status 0
-done
-
-exit 0

DELETED tests/fullrun/tests/priority_2/testconfig
Index: tests/fullrun/tests/priority_2/testconfig
==================================================================
--- tests/fullrun/tests/priority_2/testconfig
+++ /dev/null
@@ -1,16 +0,0 @@
-[setup]
-runscript main.sh
-
-[requirements]
-priority 2
-# runtimelim 1d 1h 1m 10s
-runtimelim 20s
-
-[test_meta]
-jobgroup sqlite3
-author matt
-owner  bob
-description This test checks that a multi-lineitem test with mix of pass and non-fail rolls up a PASS
-
-tags first,single
-reviewed 09/10/2011, by Matt

DELETED tests/fullrun/tests/priority_3/README
Index: tests/fullrun/tests/priority_3/README
==================================================================
--- tests/fullrun/tests/priority_3/README
+++ /dev/null
@@ -1,3 +0,0 @@
-This test used to look for envfile.txt but that file should NOT have been there.
-
-By changing to lookithome.log it is possible that an error is masked.

DELETED tests/fullrun/tests/priority_3/main.sh
Index: tests/fullrun/tests/priority_3/main.sh
==================================================================
--- tests/fullrun/tests/priority_3/main.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-# a bunch of steps in 2 second increments
-for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17;do
-  $MT_MEGATEST -step step$i :state start :status running -setlog results$i.html
-  sleep 2
-  echo "
    Results$i
    Nothing but faux results here!" > results$i.html
-  $MT_MEGATEST -step step$i :state end :status 0
-done
-
-# get a previous test
-export EZFAILPATH=`$MT_MEGATEST -test-files lookithome.log -target $MT_TARGET :runname $MT_RUNNAME -testpatt ez_fail`
-if [[ -e $EZFAILPATH ]];then
-  echo All good!
-else
-  echo NOT good!
-  exit 1
-fi
-
-exit 0

DELETED tests/fullrun/tests/priority_3/testconfig
Index: tests/fullrun/tests/priority_3/testconfig
==================================================================
--- tests/fullrun/tests/priority_3/testconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-[setup]
-runscript main.sh
-
-[requirements]
-priority 3
-
-
-[test_meta]
-jobgroup sqlite3
-author matt
-owner  bob
-description This test checks that a multi-lineitem test with mix of pass and non-fail rolls up a PASS
-
-tags first,single
-reviewed 09/10/2011, by Matt

DELETED tests/fullrun/tests/priority_4/main.sh
Index: tests/fullrun/tests/priority_4/main.sh
==================================================================
--- tests/fullrun/tests/priority_4/main.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-# a bunch of steps in 2 second increments
-for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17;do
-  $MT_MEGATEST -step step$i :state start :status running -setlog results$i.html
-  sleep 2
-  $MT_MEGATEST -step step$i :state end :status 0
-done
-
-exit 0

DELETED tests/fullrun/tests/priority_4/testconfig
Index: tests/fullrun/tests/priority_4/testconfig
==================================================================
--- tests/fullrun/tests/priority_4/testconfig
+++ /dev/null
@@ -1,14 +0,0 @@
-[setup]
-runscript main.sh
-
-[requirements]
-priority 4
-
-[test_meta]
-jobgroup sqlite3
-author matt
-owner  bob
-description This test checks that a multi-lineitem test with mix of pass and non-fail rolls up a PASS
-
-tags first,single
-reviewed 09/10/2011, by Matt

DELETED tests/fullrun/tests/priority_5/main.sh
Index: tests/fullrun/tests/priority_5/main.sh
==================================================================
--- tests/fullrun/tests/priority_5/main.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-# a bunch of steps in 2 second increments
-for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17;do
-  $MT_MEGATEST -step step$i :state start :status running -setlog results$i.html
-  sleep 2
-  $MT_MEGATEST -step step$i :state end :status 0
-done
-
-exit 0

DELETED tests/fullrun/tests/priority_5/testconfig
Index: tests/fullrun/tests/priority_5/testconfig
==================================================================
--- tests/fullrun/tests/priority_5/testconfig
+++ /dev/null
@@ -1,16 +0,0 @@
-[setup]
-runscript main.sh
-
-[requirements]
-priority 5
-
-[skip]
-prevrunning #t
-
-[test_meta]
-author matt
-owner  bob
-description This test checks that a multi-lineitem test with mix of pass and non-fail rolls up a PASS
-
-tags first,single
-reviewed 09/10/2011, by Matt

DELETED tests/fullrun/tests/priority_6/main.sh
Index: tests/fullrun/tests/priority_6/main.sh
==================================================================
--- tests/fullrun/tests/priority_6/main.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-# a bunch of steps in 2 second increments
-for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17;do
-  $MT_MEGATEST -step step$i :state start :status running -setlog results$i.html
-  sleep 2
-  $MT_MEGATEST -step step$i :state end :status 0
-done
-
-exit 0

DELETED tests/fullrun/tests/priority_6/testconfig
Index: tests/fullrun/tests/priority_6/testconfig
==================================================================
--- tests/fullrun/tests/priority_6/testconfig
+++ /dev/null
@@ -1,13 +0,0 @@
-[setup]
-runscript main.sh
-
-[requirements]
-priority 6
-
-[test_meta]
-author matt
-owner  bob
-description This test checks that a multi-lineitem test with mix of pass and non-fail rolls up a PASS
-
-tags first,single
-reviewed 09/10/2011, by Matt

DELETED tests/fullrun/tests/priority_7/main.sh
Index: tests/fullrun/tests/priority_7/main.sh
==================================================================
--- tests/fullrun/tests/priority_7/main.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-# a bunch of steps in 2 second increments
-for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17;do
-  $MT_MEGATEST -step step$i :state start :status running -setlog results$i.html
-  sleep 2
-  $MT_MEGATEST -step step$i :state end :status 0
-done
-
-exit 0

DELETED tests/fullrun/tests/priority_7/testconfig
Index: tests/fullrun/tests/priority_7/testconfig
==================================================================
--- tests/fullrun/tests/priority_7/testconfig
+++ /dev/null
@@ -1,17 +0,0 @@
-[setup]
-runscript main.sh
-
-[requirements]
-priority 7
-
-[skip]
-# Run only if this much time since last run of this test
-rundelay 10m 5s
-
-[test_meta]
-author matt
-owner  bob
-description This test checks that a multi-lineitem test with mix of pass and non-fail rolls up a PASS
-
-tags first,single
-reviewed 09/10/2011, by Matt

DELETED tests/fullrun/tests/priority_8/main.sh
Index: tests/fullrun/tests/priority_8/main.sh
==================================================================
--- tests/fullrun/tests/priority_8/main.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-# a bunch of steps in 2 second increments
-for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17;do
-  echo "start step before $i: `date`"
-  $MT_MEGATEST -step step$i :state start :status running -setlog results$i.html
-  echo "start step after $i: `date`"
-  sleep 2
-  echo "end step before $i: `date`"
-  $MT_MEGATEST -step step$i :state end :status 0
-  echo "end step after $i: `date`"
-done
-
-exit 0

DELETED tests/fullrun/tests/priority_8/testconfig
Index: tests/fullrun/tests/priority_8/testconfig
==================================================================
--- tests/fullrun/tests/priority_8/testconfig
+++ /dev/null
@@ -1,13 +0,0 @@
-[setup]
-runscript main.sh
-
-[requirements]
-priority 8
-
-[test_meta]
-author matt
-owner  bob
-description This test checks that a multi-lineitem test with mix of pass and non-fail rolls up a PASS
-
-tags first,single
-reviewed 09/10/2011, by Matt

DELETED tests/fullrun/tests/priority_9/main.sh
Index: tests/fullrun/tests/priority_9/main.sh
==================================================================
--- tests/fullrun/tests/priority_9/main.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-# a bunch of steps in 2 second increments
-for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17;do
-  $MT_MEGATEST -step step$i :state start :status running -setlog results$i.html
-  sleep 2
-  $MT_MEGATEST -step step$i :state end :status 0
-done
-
-exit 0

DELETED tests/fullrun/tests/priority_9/testconfig
Index: tests/fullrun/tests/priority_9/testconfig
==================================================================
--- tests/fullrun/tests/priority_9/testconfig
+++ /dev/null
@@ -1,13 +0,0 @@
-[setup]
-runscript main.sh
-
-[requirements]
-priority 9
-
-[test_meta]
-author matt
-owner  bob
-description This test checks that a multi-lineitem test with mix of pass and non-fail rolls up a PASS
-
-tags first,single
-reviewed 09/10/2011, by Matt

DELETED tests/fullrun/tests/runfirst/main.sh
Index: tests/fullrun/tests/runfirst/main.sh
==================================================================
--- tests/fullrun/tests/runfirst/main.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-# (export DISPLAY=:0;xterm) 
-
-# megatest -step wasting_time :state start :status n/a -m "This is a test step comment"
-# sleep 20
-# megatest -step wasting_time :state end :status $?
-
-touch ../I_was_here
-mkdir -p $MT_RUN_AREA_HOME/tmp/$USER/$sysname/$fsname/$datapath/$MT_RUNNAME
-echo 1 2 3 4 5 > $MT_RUN_AREA_HOME/tmp/$USER/$sysname/$fsname/$datapath/$MT_RUNNAME/the_ans
-
-$MT_MEGATEST -runstep wasting_time -logpro wasting_time.logpro "sleep 8;echo all done eh?" -m "This is a test step comment"
-
-$MT_MEGATEST -load-test-data << EOF
-foo,bar,1.2,1.9,>
-foo,rab,1.0e9,10e9,1e9
-foo,bla,1.2,1.9,<
-foo,bal,1.2,1.2,<,,Check for overload
-foo,alb,1.2,1.2,<=,Amps,This is the high power circuit test
-foo,abl,1.2,1.3,0.1
-foo,bra,1.2,pass,silly stuff
-faz,bar,10,8mA,,,"this is a comment"
-EOF
-
-$MT_MEGATEST -load-test-data << EOF
-cat,  var, val, exp, comp, units, comment, status, type
-ameas,iout,1.2,1.9,>,Amps,Comment,,meas
-EOF
-loadstatus=$?
-
-if [[ `basename $PWD` == "mustfail" ]];then
-  $MT_MEGATEST -test-status :state COMPLETED :status FAIL
-else
-  $MT_MEGATEST -test-status :state COMPLETED :status $loadstatus -m "This is a test level comment" :value 10e6 :expected_value 1.1e6 :tol 100e3 :category nada :variable sillyvar :units mFarks :comment "This is the value/expected comment"
-fi
-
-env > envfile.txt
-
-# $MT_MEGATEST -test-status :state COMPLETED :status FAIL

DELETED tests/fullrun/tests/runfirst/testconfig
Index: tests/fullrun/tests/runfirst/testconfig
==================================================================
--- tests/fullrun/tests/runfirst/testconfig
+++ /dev/null
@@ -1,24 +0,0 @@
-[setup]
-runscript main.sh
-
-[pre-launch-env-vars]
-# These are set before the test is launched on the originating
-# host. This can be used to control remote launch tools, e.g. to
-# to choose the target host, select the launch tool etc.
-SPECIAL_ENV_VAR override with everything after the first space.
-
-[items]
-SEASON summer winter fall spring 
-
-[itemstable]
-BLOCK a  b
-TOCK  1  2
-
-[test_meta]
-author matt
-owner  bob
-description This test must\
- be run before the other tests
-
-tags first,single
-reviewed 1/1/1965

DELETED tests/fullrun/tests/runfirst/wasting_time.logpro
Index: tests/fullrun/tests/runfirst/wasting_time.logpro
==================================================================
--- tests/fullrun/tests/runfirst/wasting_time.logpro
+++ /dev/null
@@ -1,15 +0,0 @@
-;; put stuff here
-
-;; NOTE: This is not legit logpro code!!! 
-
-;; Test for 0=PASS, 1=WARN, >2 = FAIL
-
-;; (define season (get-environment-variable "SEASON"))
-;; 
-;; (exit 
-;;  (case (string->symbol season)
-;;    ((summer) 0)
-;;    ((winter) 1)
-;;    ((fall)   2)
-;;    (else     0)))
-

DELETED tests/fullrun/tests/singletest/main.sh
Index: tests/fullrun/tests/singletest/main.sh
==================================================================
--- tests/fullrun/tests/singletest/main.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-# megatest -step wasting_time :state start :status n/a -m "This is a test step comment"
-# sleep 20
-# megatest -step wasting_time :state end :status $?
-
-$MT_MEGATEST -runstep wasting_time -logpro wasting_time.logpro "sleep 5;echo alldone" -m "This is a test step comment"
-
-$MT_MEGATEST -test-status :state COMPLETED :status $? -m "This is a test level comment" -set-toplog the_top_log.html :first_err "This is the first error"

DELETED tests/fullrun/tests/singletest/testconfig
Index: tests/fullrun/tests/singletest/testconfig
==================================================================
--- tests/fullrun/tests/singletest/testconfig
+++ /dev/null
@@ -1,13 +0,0 @@
-[setup]
-runscript main.sh
-
-[requirements]
-diskspace 1M
-memory    1G
-
-[pre-launch-env-vars]
-# These are set before the test is launched on the originating
-# host. This can be used to control remote launch tools, e.g. to
-# to choose the target host, select the launch tool etc.
-SPECIAL_ENV_VAR override with everything after the first space.
-

DELETED tests/fullrun/tests/singletest/wasting_time.logpro
Index: tests/fullrun/tests/singletest/wasting_time.logpro
==================================================================
--- tests/fullrun/tests/singletest/wasting_time.logpro
+++ /dev/null
@@ -1,15 +0,0 @@
-;; put stuff here
-
-;; NOTE: This is not legit logpro code!!! 
-
-;; Test for 0=PASS, 1=WARN, >2 = FAIL
-
-;; (define season (get-environment-variable "SEASON"))
-;; 
-;; (exit 
-;;  (case (string->symbol season)
-;;    ((summer) 0)
-;;    ((winter) 1)
-;;    ((fall)   2)
-;;    (else     0)))
-

DELETED tests/fullrun/tests/singletest2/main.sh
Index: tests/fullrun/tests/singletest2/main.sh
==================================================================
--- tests/fullrun/tests/singletest2/main.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-# megatest -step wasting_time :state start :status n/a -m "This is a test step comment"
-# sleep 20
-# megatest -step wasting_time :state end :status $?
-
-$MT_MEGATEST -runstep wasting_time -logpro wasting_time.logpro "sleep 5;echo all done eh?" -m "This is a test step comment"
-
-$MT_MEGATEST -test-status :state COMPLETED :status $? -m "This is a test level comment" -set-toplog the_top_log.html :first_warn "This is the first warning"

DELETED tests/fullrun/tests/singletest2/testconfig
Index: tests/fullrun/tests/singletest2/testconfig
==================================================================
--- tests/fullrun/tests/singletest2/testconfig
+++ /dev/null
@@ -1,14 +0,0 @@
-[setup]
-runscript main.sh
-
-[requirements]
-diskspace 1M
-memory    1G
-waiton singletest
-
-[pre-launch-env-vars]
-# These are set before the test is launched on the originating
-# host. This can be used to control remote launch tools, e.g. to
-# to choose the target host, select the launch tool etc.
-SPECIAL_ENV_VAR override with everything after the first space.
-

DELETED tests/fullrun/tests/singletest2/wasting_time.logpro
Index: tests/fullrun/tests/singletest2/wasting_time.logpro
==================================================================
--- tests/fullrun/tests/singletest2/wasting_time.logpro
+++ /dev/null
@@ -1,15 +0,0 @@
-;; put stuff here
-
-;; NOTE: This is not legit logpro code!!! 
-
-;; Test for 0=PASS, 1=WARN, >2 = FAIL
-
-;; (define season (get-environment-variable "SEASON"))
-;; 
-;; (exit 
-;;  (case (string->symbol season)
-;;    ((summer) 0)
-;;    ((winter) 1)
-;;    ((fall)   2)
-;;    (else     0)))
-

DELETED tests/fullrun/tests/special/testconfig
Index: tests/fullrun/tests/special/testconfig
==================================================================
--- tests/fullrun/tests/special/testconfig
+++ /dev/null
@@ -1,8 +0,0 @@
-[ezsteps]
-# calcresults megatest -list-runs $MT_RUNNAME -target $MT_TARGET
-
-[requirements]
-waiton #{rget TESTSTORUN}
-
-# This is a "toplevel" test, it does not require waitons to be non-FAIL to run
-mode toplevel

DELETED tests/fullrun/tests/sqlitespeed/runscript.rb
Index: tests/fullrun/tests/sqlitespeed/runscript.rb
==================================================================
--- tests/fullrun/tests/sqlitespeed/runscript.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-#! /usr/bin/env ruby
-
-require "#{ENV['MT_RUN_AREA_HOME']}/../resources/ruby/librunscript.rb"
-
-# run_record(stepname, cmd) - will record in db if exit code of script was zero or not
-run_and_record('create db',"sqlite3 testing.db << EOF\ncreate table if not exists blah(id INTEGER PRIMARY KEY,name TEXT);\n.q\nEOF","")
-
-if (! File.exists?("../../runfirst/I_was_here"))
-    puts "ERROR: This test was started before the prerequisites ran!"
-    system "megatest -test-status :state INCOMPLETE :status FAIL"
-    exit 1
-end
-
-# file_size_checker(stepname, filename, minsize, maxsize) - negative means ignore
-# file_size_checker('create db','testing.db',100,-1)
-
-num_records=rand(5) # 0000
-record_step("add #{num_records}","start","n/a")
-status=false
-(0..num_records).each do |i|
-  randstring="abc";
-  # "a;lskdfja;sdfj;alsdfj;aslfdj;alsfja;lsfdj;alsfja;lsjfd;lasfjl;asdfja;slfj;alsjf;asljf;alsjf;lasdjf;lasjf;lasjf;alsjf;lashflkashflkerhflkdsvnlasldhlfaldf"
-  # status=system "sqlite3 testing.db \"insert into blah (name) values ('#{randstring}');\""
-  system "megatest -step testing :state wrote_junk :status #{num_records}"
-  sleep(5)
-  puts "i=#{i}"
-end
-if status==0
-  status='pass'
-else
-  status='fail'
-end
-
-record_step("add #{num_records}","end",status)
-
-
-
-

DELETED tests/fullrun/tests/sqlitespeed/testconfig
Index: tests/fullrun/tests/sqlitespeed/testconfig
==================================================================
--- tests/fullrun/tests/sqlitespeed/testconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-[setup]
-runscript runscript.rb
-tags non important,dumb junk
-
-[requirements]
-waiton    runfirst
-
-[items]
-MANYITEMS [system (env > envfile.txt;echo aa ab ac ad ae af ag ah ai)]
-# BORKED  
-
-[test_meta]
-jobgroup sqlite3
-tags quick
-

DELETED tests/fullrun/tests/test_mt_vars/altvarnotset.logpro
Index: tests/fullrun/tests/test_mt_vars/altvarnotset.logpro
==================================================================
--- tests/fullrun/tests/test_mt_vars/altvarnotset.logpro
+++ /dev/null
@@ -1,1 +0,0 @@
-(expect:error in "LogFileBody" = 0 "a file that should never exist" #/what a dumb filename this is/)

DELETED tests/fullrun/tests/test_mt_vars/altvarnotset.sh
Index: tests/fullrun/tests/test_mt_vars/altvarnotset.sh
==================================================================
--- tests/fullrun/tests/test_mt_vars/altvarnotset.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-! grep ALT_VAR megatest.sh

DELETED tests/fullrun/tests/test_mt_vars/bogousnotset.logpro
Index: tests/fullrun/tests/test_mt_vars/bogousnotset.logpro
==================================================================
--- tests/fullrun/tests/test_mt_vars/bogousnotset.logpro
+++ /dev/null
@@ -1,1 +0,0 @@
-(expect:error in "LogFileBody" = 0 "a file that should never exist" #/what a dumb filename this is/)

DELETED tests/fullrun/tests/test_mt_vars/bogousnotset.sh
Index: tests/fullrun/tests/test_mt_vars/bogousnotset.sh
==================================================================
--- tests/fullrun/tests/test_mt_vars/bogousnotset.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-! grep BOGOUS megatest.sh

DELETED tests/fullrun/tests/test_mt_vars/currentisblah.logpro
Index: tests/fullrun/tests/test_mt_vars/currentisblah.logpro
==================================================================
--- tests/fullrun/tests/test_mt_vars/currentisblah.logpro
+++ /dev/null
@@ -1,1 +0,0 @@
-(expect:error in "LogFileBody" = 0 "a file that should never exist" #/what a dumb filename this is/)

DELETED tests/fullrun/tests/test_mt_vars/currentisblah.sh
Index: tests/fullrun/tests/test_mt_vars/currentisblah.sh
==================================================================
--- tests/fullrun/tests/test_mt_vars/currentisblah.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-grep -e '^export CURRENT' megatest.sh | grep /tmp/nada

DELETED tests/fullrun/tests/test_mt_vars/empty_var.logpro
Index: tests/fullrun/tests/test_mt_vars/empty_var.logpro
==================================================================
--- tests/fullrun/tests/test_mt_vars/empty_var.logpro
+++ /dev/null
@@ -1,1 +0,0 @@
-(expect:error in "LogFileBody" = 0 "a file that should never exist" #/what a dumb filename this is/)

DELETED tests/fullrun/tests/test_mt_vars/empty_var.sh
Index: tests/fullrun/tests/test_mt_vars/empty_var.sh
==================================================================
--- tests/fullrun/tests/test_mt_vars/empty_var.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-if [ x$EMPTY_VAR != "x" ];then
-  echo BAD EMPTY VAR!
-  exit 1
-fi

DELETED tests/fullrun/tests/test_mt_vars/eval_vars.sh
Index: tests/fullrun/tests/test_mt_vars/eval_vars.sh
==================================================================
--- tests/fullrun/tests/test_mt_vars/eval_vars.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-if env | grep VARWITHDOLLARSIGNS | grep USER;then
-    exit 1 # fails!
-else
-    exit 0 # good!
-fi

DELETED tests/fullrun/tests/test_mt_vars/lookithome.logpro
Index: tests/fullrun/tests/test_mt_vars/lookithome.logpro
==================================================================
--- tests/fullrun/tests/test_mt_vars/lookithome.logpro
+++ /dev/null
@@ -1,1 +0,0 @@
-(expect:error in "LogFileBody" = 0 "a file that should never exist" #/what a dumb filename this is/)

DELETED tests/fullrun/tests/test_mt_vars/lookittmp.logpro
Index: tests/fullrun/tests/test_mt_vars/lookittmp.logpro
==================================================================
--- tests/fullrun/tests/test_mt_vars/lookittmp.logpro
+++ /dev/null
@@ -1,1 +0,0 @@
-(expect:error in "LogFileBody" = 0 "a file that should never exist" #/what a dumb filename this is/)

DELETED tests/fullrun/tests/test_mt_vars/test-path-file.sh
Index: tests/fullrun/tests/test_mt_vars/test-path-file.sh
==================================================================
--- tests/fullrun/tests/test_mt_vars/test-path-file.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-
-
-# get a previous test
-export EZFAILPATH=`$MT_MEGATEST -test-files envfile.txt -target $MT_TARGET :runname $MT_RUNNAME -testpatt runfirst/a%`
-
-echo "Found |$EZFAILPATH|"
-
-if [ -e $EZFAILPATH ];then
-  echo All good!
-else
-  echo NOT good!
-  exit 1
-fi
-
-export EZFAILPATH2=`$MT_MEGATEST -test-paths -target $MT_TARGET :runname $MT_RUNNAME -testpatt runfirst/a%`
-
-echo "Found |$EZFAILPATH2|"
-
-if [ -e $EZFAILPATH2 ];then
-  echo All good!
-else
-  echo NOT good!
-  exit 1
-fi
-
-
-exit 0

DELETED tests/fullrun/tests/test_mt_vars/test-path.logpro
Index: tests/fullrun/tests/test_mt_vars/test-path.logpro
==================================================================
--- tests/fullrun/tests/test_mt_vars/test-path.logpro
+++ /dev/null
@@ -1,1 +0,0 @@
-(expect:error in "LogFileBody" = 0 "a file that should never exist" #/what a dumb filename this is/)

DELETED tests/fullrun/tests/test_mt_vars/testconfig
Index: tests/fullrun/tests/test_mt_vars/testconfig
==================================================================
--- tests/fullrun/tests/test_mt_vars/testconfig
+++ /dev/null
@@ -1,58 +0,0 @@
-[setup]
-
-[ezsteps]
-lookittmp   ls /tmp
-lookithome  ls /home
-# $CURRENT should be /tmp/nada
-currentisblah currentisblah.sh
-
-# $BOGOUS should NOT be set
-bogousnotset bogousnotset.sh
-
-# ALT_VAR should NOT be set
-altvarnotset altvarnotset.sh
-
-# EMPTY_VAR should be an empty string
-empty_var empty_var.sh
-
-# VACKYVAR should be set to a path
-vackyvar vackyvar.sh
-
-# test-path and test-file
-test-path test-path-file.sh
-
-# verify that vars with $ signs get expanded
-varwithdollar eval_vars.sh
-
-emptyvars bash -c 'if [[ $VARNOVAL == "" ]];then echo HAVE_VARNOVAL;else echo "ERROR: VARNOVAL not found";fi'
-emptyvar_withspace bash -c 'if [[ $VARNOVAL_WITHSPACE == "" ]];then echo HAVE_VARNOVAL_WITHSPACE;else echo "ERROR: VARNOVAL_WITHSPACE not found";fi'
-emptyvar_megatest.sh egrep VARNO megatest.sh
-
-[requirements]
-waiton runfirst
-priority 0
-
-[items]
-NUMNUM [system cat $MT_RUN_AREA_HOME/tmp/$USER/$sysname/$fsname/$datapath/$MT_RUNNAME/$PREDICTABLE]
-
-[logpro]
-emptyvars ;;
-  (expect:error in "LogFileBody" = 0 "VARNOVAL not found" #/ERROR: VARNOVAL not found/)
-  (expect:required in "LogFileBody" = 1 "HAVE_VARNOVAL"   #/HAVE_VARNOVAL/)
-
-emptyvar_withspace ;;
-  (expect:error in "LogFileBody" = 0 "VARNOVAL_WITHSPACE not found" #/ERROR: VARNOVAL_WITHSPACE not found/)
-  (expect:required in "LogFileBody" = 1 "HAVE_VARNOVAL_WITHSPACE"   #/HAVE_VARNOVAL_WITHSPACE/)
-
-emptyvar_megatest.sh ;;
-  (expect:error in "LogFileBody" = 0 "No errors expected" #/ERR/i)
-  (expect:required in "LogFileBody" = 1 "VARNOVAL_WITHSPACE"  #/VARNOVAL_WITHSPACE/)
-  (expect:required in "LogFileBody" = 1 "VARNOVAL"            #/VARNOVAL/)
-
-[test_meta]
-author matt
-owner  bob
-description This test runs a single ezstep which is expected to pass, no logpro file.
-
-tags quick,first,single
-reviewed 09/10/2011, by Matt

DELETED tests/fullrun/tests/test_mt_vars/vackyvar.logpro
Index: tests/fullrun/tests/test_mt_vars/vackyvar.logpro
==================================================================
--- tests/fullrun/tests/test_mt_vars/vackyvar.logpro
+++ /dev/null
@@ -1,1 +0,0 @@
-(expect:error in "LogFileBody" = 0 "a file that should never exist" #/what a dumb filename this is/)

DELETED tests/fullrun/tests/test_mt_vars/vackyvar.sh
Index: tests/fullrun/tests/test_mt_vars/vackyvar.sh
==================================================================
--- tests/fullrun/tests/test_mt_vars/vackyvar.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-grep VACKYVAR megatest.sh | grep fullrun

DELETED tests/fullrun/tests/test_mt_vars/varwithdollar.logpro
Index: tests/fullrun/tests/test_mt_vars/varwithdollar.logpro
==================================================================
--- tests/fullrun/tests/test_mt_vars/varwithdollar.logpro
+++ /dev/null
@@ -1,1 +0,0 @@
-(expect:error in "LogFileBody" = 0 "a file that should never exist" #/what a dumb filename this is/)

DELETED tests/fullrun/tests/testxz/testconfig
Index: tests/fullrun/tests/testxz/testconfig
==================================================================
--- tests/fullrun/tests/testxz/testconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-# Add additional steps here. Format is "stepname script"
-[ezsteps]
-listfiles ls
-
-# Test requirements are specified here
-[requirements]
-waiton blocktestxz
-
-# test_meta is a section for storing additional data on your test
-[test_meta]
-author mrwellan
-owner  mrwellan
-description This test should never get run due to blocktestxz failing
-tags tagone,tagtwo
-reviewed never

DELETED tests/fullrun/tests/wait_no_items1/testconfig
Index: tests/fullrun/tests/wait_no_items1/testconfig
==================================================================
--- tests/fullrun/tests/wait_no_items1/testconfig
+++ /dev/null
@@ -1,17 +0,0 @@
-[ezsteps]
-listfiles ls
-
-[requirements]
-waiton no_items
-
-[items]
-
-[test_meta]
-author matt
-owner  bob
-description This test runs a single ezstep which is expected to pass \
-but there is an items definition with no items. This should evoke an \
-error.
-
-tags first,single
-reviewed 09/10/2011, by Matt

DELETED tests/fullrun/tests/wait_no_items2/testconfig
Index: tests/fullrun/tests/wait_no_items2/testconfig
==================================================================
--- tests/fullrun/tests/wait_no_items2/testconfig
+++ /dev/null
@@ -1,17 +0,0 @@
-[ezsteps]
-listfiles ls
-
-[requirements]
-waiton wait_no_items1
-
-[items]
-
-[test_meta]
-author matt
-owner  bob
-description This test runs a single ezstep which is expected to pass \
-but there is an items definition with no items. This should evoke an \
-error.
-
-tags first,single
-reviewed 09/10/2011, by Matt

DELETED tests/fullrun/tests/wait_no_items3/testconfig
Index: tests/fullrun/tests/wait_no_items3/testconfig
==================================================================
--- tests/fullrun/tests/wait_no_items3/testconfig
+++ /dev/null
@@ -1,17 +0,0 @@
-[ezsteps]
-listfiles ls
-
-[requirements]
-waiton wait_no_items2
-
-[items]
-
-[test_meta]
-author matt
-owner  bob
-description This test runs a single ezstep which is expected to pass \
-but there is an items definition with no items. This should evoke an \
-error.
-
-tags first,single
-reviewed 09/10/2011, by Matt

DELETED tests/fullrun/tests/wait_no_items4/testconfig
Index: tests/fullrun/tests/wait_no_items4/testconfig
==================================================================
--- tests/fullrun/tests/wait_no_items4/testconfig
+++ /dev/null
@@ -1,17 +0,0 @@
-[ezsteps]
-listfiles ls
-
-[requirements]
-waiton wait_no_items3
-
-[items]
-
-[test_meta]
-author matt
-owner  bob
-description This test runs a single ezstep which is expected to pass \
-but there is an items definition with no items. This should evoke an \
-error.
-
-tags first,single
-reviewed 09/10/2011, by Matt

DELETED tests/installall/config/megatest.config.dat
Index: tests/installall/config/megatest.config.dat
==================================================================
--- tests/installall/config/megatest.config.dat
+++ /dev/null
@@ -1,1 +0,0 @@
-../megatest.config

DELETED tests/installall/config/runconfigs.config.dat
Index: tests/installall/config/runconfigs.config.dat
==================================================================
--- tests/installall/config/runconfigs.config.dat
+++ /dev/null
@@ -1,1 +0,0 @@
-../runconfigs.config

DELETED tests/installall/config/sheet-names.cfg
Index: tests/installall/config/sheet-names.cfg
==================================================================
--- tests/installall/config/sheet-names.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-megatest.config
-runconfigs.config

DELETED tests/installall/config/sxml/_sheets.sxml
Index: tests/installall/config/sxml/_sheets.sxml
==================================================================
--- tests/installall/config/sxml/_sheets.sxml
+++ /dev/null
@@ -1,51 +0,0 @@
-((@ (http://www.w3.org/2001/XMLSchema-instance:schemaLocation
-      "http://www.gnumeric.org/v9.xsd"))
- (http://www.gnumeric.org/v10.dtd:Version
-   (@ (Minor "17") (Major "10") (Full "1.10.17") (Epoch "1")))
- (http://www.gnumeric.org/v10.dtd:Attributes
-   (http://www.gnumeric.org/v10.dtd:Attribute
-     (http://www.gnumeric.org/v10.dtd:type "4")
-     (http://www.gnumeric.org/v10.dtd:name
-       "WorkbookView::show_horizontal_scrollbar")
-     (http://www.gnumeric.org/v10.dtd:value "TRUE"))
-   (http://www.gnumeric.org/v10.dtd:Attribute
-     (http://www.gnumeric.org/v10.dtd:type "4")
-     (http://www.gnumeric.org/v10.dtd:name
-       "WorkbookView::show_vertical_scrollbar")
-     (http://www.gnumeric.org/v10.dtd:value "TRUE"))
-   (http://www.gnumeric.org/v10.dtd:Attribute
-     (http://www.gnumeric.org/v10.dtd:type "4")
-     (http://www.gnumeric.org/v10.dtd:name "WorkbookView::show_notebook_tabs")
-     (http://www.gnumeric.org/v10.dtd:value "TRUE"))
-   (http://www.gnumeric.org/v10.dtd:Attribute
-     (http://www.gnumeric.org/v10.dtd:type "4")
-     (http://www.gnumeric.org/v10.dtd:name "WorkbookView::do_auto_completion")
-     (http://www.gnumeric.org/v10.dtd:value "TRUE"))
-   (http://www.gnumeric.org/v10.dtd:Attribute
-     (http://www.gnumeric.org/v10.dtd:type "4")
-     (http://www.gnumeric.org/v10.dtd:name "WorkbookView::is_protected")
-     (http://www.gnumeric.org/v10.dtd:value "FALSE")))
- (urn:oasis:names:tc:opendocument:xmlns:office:1.0:document-meta
-   (@ (urn:oasis:names:tc:opendocument:xmlns:office:1.0:version "1.2"))
-   (urn:oasis:names:tc:opendocument:xmlns:office:1.0:meta
-     (http://purl.org/dc/elements/1.1/:date "2013-07-21T23:45:07Z")
-     (urn:oasis:names:tc:opendocument:xmlns:meta:1.0:creation-date
-       "2013-07-21T23:42:35Z")))
- (http://www.gnumeric.org/v10.dtd:Calculation
-   (@ (MaxIterations "100")
-      (ManualRecalc "0")
-      (IterationTolerance "0.001")
-      (FloatRadix "2")
-      (FloatDigits "53")
-      (EnableIteration "1")))
- (http://www.gnumeric.org/v10.dtd:SheetNameIndex
-   (http://www.gnumeric.org/v10.dtd:SheetName
-     (@ (http://www.gnumeric.org/v10.dtd:Rows "65536")
-        (http://www.gnumeric.org/v10.dtd:Cols "256"))
-     "megatest.config")
-   (http://www.gnumeric.org/v10.dtd:SheetName
-     (@ (http://www.gnumeric.org/v10.dtd:Rows "65536")
-        (http://www.gnumeric.org/v10.dtd:Cols "256"))
-     "runconfigs.config"))
- (http://www.gnumeric.org/v10.dtd:Geometry (@ (Width "1440") (Height "647")))
- (http://www.gnumeric.org/v10.dtd:UIData (@ (SelectedTab "0"))))

DELETED tests/installall/config/sxml/_workbook.sxml
Index: tests/installall/config/sxml/_workbook.sxml
==================================================================
--- tests/installall/config/sxml/_workbook.sxml
+++ /dev/null
@@ -1,1 +0,0 @@
-(*TOP* (*PI* xml "version=\"1.0\" encoding=\"UTF-8\""))

DELETED tests/installall/config/sxml/megatest.config.sxml
Index: tests/installall/config/sxml/megatest.config.sxml
==================================================================
--- tests/installall/config/sxml/megatest.config.sxml
+++ /dev/null
@@ -1,108 +0,0 @@
-(http://www.gnumeric.org/v10.dtd:Sheet
-  (@ (Visibility "GNM_SHEET_VISIBILITY_VISIBLE")
-     (OutlineSymbolsRight "1")
-     (OutlineSymbolsBelow "1")
-     (HideZero "0")
-     (HideRowHeader "0")
-     (HideGrid "0")
-     (HideColHeader "0")
-     (GridColor "0:0:0")
-     (DisplayOutlines "1")
-     (DisplayFormulas "0"))
-  (http://www.gnumeric.org/v10.dtd:MaxCol "5")
-  (http://www.gnumeric.org/v10.dtd:MaxRow "7")
-  (http://www.gnumeric.org/v10.dtd:Zoom "1")
-  (http://www.gnumeric.org/v10.dtd:Names
-    (http://www.gnumeric.org/v10.dtd:Name
-      (http://www.gnumeric.org/v10.dtd:name "Print_Area")
-      (http://www.gnumeric.org/v10.dtd:value "#REF!")
-      (http://www.gnumeric.org/v10.dtd:position "A1"))
-    (http://www.gnumeric.org/v10.dtd:Name
-      (http://www.gnumeric.org/v10.dtd:name "Sheet_Title")
-      (http://www.gnumeric.org/v10.dtd:value "\"megatest.config\"")
-      (http://www.gnumeric.org/v10.dtd:position "A1")))
-  (http://www.gnumeric.org/v10.dtd:PrintInformation
-    (http://www.gnumeric.org/v10.dtd:Margins
-      (http://www.gnumeric.org/v10.dtd:top (@ (PrefUnit "mm") (Points "120")))
-      (http://www.gnumeric.org/v10.dtd:bottom
-        (@ (PrefUnit "mm") (Points "120")))
-      (http://www.gnumeric.org/v10.dtd:left (@ (PrefUnit "mm") (Points "72")))
-      (http://www.gnumeric.org/v10.dtd:right (@ (PrefUnit "mm") (Points "72")))
-      (http://www.gnumeric.org/v10.dtd:header
-        (@ (PrefUnit "mm") (Points "72")))
-      (http://www.gnumeric.org/v10.dtd:footer
-        (@ (PrefUnit "mm") (Points "72"))))
-    (http://www.gnumeric.org/v10.dtd:Scale
-      (@ (type "percentage") (percentage "100")))
-    (http://www.gnumeric.org/v10.dtd:vcenter (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:hcenter (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:grid (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:even_if_only_styles (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:monochrome (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:draft (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:titles (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:do_not_print (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:print_range (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:order "d_then_r")
-    (http://www.gnumeric.org/v10.dtd:orientation "portrait")
-    (http://www.gnumeric.org/v10.dtd:Header
-      (@ (Right "") (Middle "&[TAB]") (Left "")))
-    (http://www.gnumeric.org/v10.dtd:Footer
-      (@ (Right "") (Middle "Page &[PAGE]") (Left "")))
-    (http://www.gnumeric.org/v10.dtd:paper "na_letter")
-    (http://www.gnumeric.org/v10.dtd:comments "in_place")
-    (http://www.gnumeric.org/v10.dtd:errors "as_displayed"))
-  (http://www.gnumeric.org/v10.dtd:Styles
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "0") (startCol "0") (endRow "65535") (endCol "255"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "0")
-           (Rotation "0")
-           (PatternColor "0:0:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "General")
-           (Fore "0:0:0")
-           (Back "FFFF:FFFF:FFFF"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "10")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans"))))
-  (http://www.gnumeric.org/v10.dtd:Cols
-    (@ (DefaultSizePts "48"))
-    (http://www.gnumeric.org/v10.dtd:ColInfo
-      (@ (Unit "112.5") (No "0") (HardSize "1")))
-    (http://www.gnumeric.org/v10.dtd:ColInfo (@ (Unit "48") (No "1")))
-    (http://www.gnumeric.org/v10.dtd:ColInfo
-      (@ (Unit "63.75") (No "2") (HardSize "1")))
-    (http://www.gnumeric.org/v10.dtd:ColInfo (@ (Unit "48") (No "3")))
-    (http://www.gnumeric.org/v10.dtd:ColInfo
-      (@ (Unit "86.25") (No "4") (HardSize "1")))
-    (http://www.gnumeric.org/v10.dtd:ColInfo (@ (Unit "48") (No "5"))))
-  (http://www.gnumeric.org/v10.dtd:Rows
-    (@ (DefaultSizePts "12.75"))
-    (http://www.gnumeric.org/v10.dtd:RowInfo
-      (@ (Unit "12.75") (No "0") (Count "8"))))
-  (http://www.gnumeric.org/v10.dtd:Selections
-    (@ (CursorRow "0") (CursorCol "0"))
-    (http://www.gnumeric.org/v10.dtd:Selection
-      (@ (startRow "0") (startCol "0") (endRow "0") (endCol "0"))))
-  (http://www.gnumeric.org/v10.dtd:SheetLayout (@ (TopLeft "A1")))
-  (http://www.gnumeric.org/v10.dtd:Solver
-    (@ (ProgramR "0")
-       (ProblemType "0")
-       (NonNeg "1")
-       (ModelType "0")
-       (MaxTime "60")
-       (MaxIter "1000")
-       (Discr "0")
-       (AutoScale "0"))))

DELETED tests/installall/config/sxml/runconfigs.config.sxml
Index: tests/installall/config/sxml/runconfigs.config.sxml
==================================================================
--- tests/installall/config/sxml/runconfigs.config.sxml
+++ /dev/null
@@ -1,111 +0,0 @@
-(http://www.gnumeric.org/v10.dtd:Sheet
-  (@ (Visibility "GNM_SHEET_VISIBILITY_VISIBLE")
-     (OutlineSymbolsRight "1")
-     (OutlineSymbolsBelow "1")
-     (HideZero "0")
-     (HideRowHeader "0")
-     (HideGrid "0")
-     (HideColHeader "0")
-     (GridColor "0:0:0")
-     (DisplayOutlines "1")
-     (DisplayFormulas "0"))
-  (http://www.gnumeric.org/v10.dtd:MaxCol "3")
-  (http://www.gnumeric.org/v10.dtd:MaxRow "7")
-  (http://www.gnumeric.org/v10.dtd:Zoom "1")
-  (http://www.gnumeric.org/v10.dtd:Names
-    (http://www.gnumeric.org/v10.dtd:Name
-      (http://www.gnumeric.org/v10.dtd:name "Print_Area")
-      (http://www.gnumeric.org/v10.dtd:value "#REF!")
-      (http://www.gnumeric.org/v10.dtd:position "A1"))
-    (http://www.gnumeric.org/v10.dtd:Name
-      (http://www.gnumeric.org/v10.dtd:name "Sheet_Title")
-      (http://www.gnumeric.org/v10.dtd:value "\"runconfigs.config\"")
-      (http://www.gnumeric.org/v10.dtd:position "A1")))
-  (http://www.gnumeric.org/v10.dtd:PrintInformation
-    (http://www.gnumeric.org/v10.dtd:Margins
-      (http://www.gnumeric.org/v10.dtd:top (@ (PrefUnit "mm") (Points "120")))
-      (http://www.gnumeric.org/v10.dtd:bottom
-        (@ (PrefUnit "mm") (Points "120")))
-      (http://www.gnumeric.org/v10.dtd:left (@ (PrefUnit "mm") (Points "72")))
-      (http://www.gnumeric.org/v10.dtd:right (@ (PrefUnit "mm") (Points "72")))
-      (http://www.gnumeric.org/v10.dtd:header
-        (@ (PrefUnit "mm") (Points "72")))
-      (http://www.gnumeric.org/v10.dtd:footer
-        (@ (PrefUnit "mm") (Points "72"))))
-    (http://www.gnumeric.org/v10.dtd:Scale
-      (@ (type "percentage") (percentage "100")))
-    (http://www.gnumeric.org/v10.dtd:vcenter (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:hcenter (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:grid (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:even_if_only_styles (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:monochrome (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:draft (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:titles (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:do_not_print (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:print_range (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:order "d_then_r")
-    (http://www.gnumeric.org/v10.dtd:orientation "portrait")
-    (http://www.gnumeric.org/v10.dtd:Header
-      (@ (Right "") (Middle "&[TAB]") (Left "")))
-    (http://www.gnumeric.org/v10.dtd:Footer
-      (@ (Right "") (Middle "Page &[PAGE]") (Left "")))
-    (http://www.gnumeric.org/v10.dtd:paper "na_letter")
-    (http://www.gnumeric.org/v10.dtd:comments "in_place")
-    (http://www.gnumeric.org/v10.dtd:errors "as_displayed"))
-  (http://www.gnumeric.org/v10.dtd:Styles
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "0") (startCol "0") (endRow "65535") (endCol "255"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "0")
-           (Rotation "0")
-           (PatternColor "0:0:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "General")
-           (Fore "0:0:0")
-           (Back "FFFF:FFFF:FFFF"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "10")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans"))))
-  (http://www.gnumeric.org/v10.dtd:Cols
-    (@ (DefaultSizePts "48"))
-    (http://www.gnumeric.org/v10.dtd:ColInfo
-      (@ (Unit "108.8") (No "0") (HardSize "1")))
-    (http://www.gnumeric.org/v10.dtd:ColInfo
-      (@ (Unit "97.5") (No "1") (HardSize "1")))
-    (http://www.gnumeric.org/v10.dtd:ColInfo
-      (@ (Unit "100.5") (No "2") (HardSize "1") (Count "2"))))
-  (http://www.gnumeric.org/v10.dtd:Rows
-    (@ (DefaultSizePts "12.75"))
-    (http://www.gnumeric.org/v10.dtd:RowInfo
-      (@ (Unit "13.5") (No "0") (Count "2")))
-    (http://www.gnumeric.org/v10.dtd:RowInfo (@ (Unit "12.75") (No "2")))
-    (http://www.gnumeric.org/v10.dtd:RowInfo
-      (@ (Unit "13.5") (No "3") (Count "2")))
-    (http://www.gnumeric.org/v10.dtd:RowInfo (@ (Unit "12.75") (No "5")))
-    (http://www.gnumeric.org/v10.dtd:RowInfo (@ (Unit "13.5") (No "6")))
-    (http://www.gnumeric.org/v10.dtd:RowInfo (@ (Unit "12.75") (No "7"))))
-  (http://www.gnumeric.org/v10.dtd:Selections
-    (@ (CursorRow "7") (CursorCol "3"))
-    (http://www.gnumeric.org/v10.dtd:Selection
-      (@ (startRow "7") (startCol "3") (endRow "7") (endCol "3"))))
-  (http://www.gnumeric.org/v10.dtd:SheetLayout (@ (TopLeft "A1")))
-  (http://www.gnumeric.org/v10.dtd:Solver
-    (@ (ProgramR "0")
-       (ProblemType "0")
-       (NonNeg "1")
-       (ModelType "0")
-       (MaxTime "60")
-       (MaxIter "1000")
-       (Discr "0")
-       (AutoScale "0"))))

DELETED tests/installall/configs/chicken-4.8.0.4.config
Index: tests/installall/configs/chicken-4.8.0.4.config
==================================================================
--- tests/installall/configs/chicken-4.8.0.4.config
+++ /dev/null
@@ -1,1 +0,0 @@
-CHICKEN_URL http://code.call-cc.org/releases/4.8.0/chicken-4.8.0.4.tar.gz

DELETED tests/installall/configs/chicken-4.8.1.config
Index: tests/installall/configs/chicken-4.8.1.config
==================================================================
--- tests/installall/configs/chicken-4.8.1.config
+++ /dev/null
@@ -1,1 +0,0 @@
-CHICKEN_URL http://code.call-cc.org/dev-snapshots/2013/01/04/chicken-4.8.1.tar.gz

DELETED tests/installall/megatest.config
Index: tests/installall/megatest.config
==================================================================
--- tests/installall/megatest.config
+++ /dev/null
@@ -1,24 +0,0 @@
-[fields]
-CHICKEN_VERSION TEXT
-MEGATEST_VERSION TEXT
-IUPMODE TEXT
-BUILD_TAG TEXT
-
-[setup]
-max_concurrent_jobs 6
-linktree #{getenv MT_RUN_AREA_HOME}/links
-testcopycmd cp --remove-destination -rsv TEST_SRC_PATH/. TEST_TARG_PATH/. >> TEST_TARG_PATH/mt_launch.log 2>> TEST_TARG_PATH/mt_launch.log
-
-[jobtools]
-useshell yes
-launcher nbfind
-
-[env-override]
-EXAMPLE_VAR example value
-
-[server]
-port 9080
-
-[disks]
-disk0 #{getenv MT_RUN_AREA_HOME}/runs
-

DELETED tests/installall/runconfigs.config
Index: tests/installall/runconfigs.config
==================================================================
--- tests/installall/runconfigs.config
+++ /dev/null
@@ -1,38 +0,0 @@
-[.............]
-#
-# [CHICKEN_VERSION/MEGATEST_VERSION/IUPMODE/PLATFORM/BUILD_TAG]
-#
-
-[default]
-ALLTESTS see this variable
-PREFIX #{getenv MT_RUN_AREA_HOME}/#{getenv BUILD_TAG}/#{getenv MT_RUNNAME}
-DOWNLOADS #{getenv MT_RUN_AREA_HOME}/downloads
-IUPLIB 26g4
-PLATFORM linux
-LOGPRO_VERSION v1.05
-BUILDSQLITE yes
-SQLITE3_VERSION 3071401
-ZEROMQ_VERSION  2.2.0
-logpro_VERSION v1.08
-stml_VERSION v0.901
-megatest_VERSION v1.5511
-
-[include configs/hicken-#{getenv CHICKEN_VERSION}.config]
-
-# Currently must have at least one variable in a section
-[4.8.0/trunk/bin/std]
-IUP_VERSION na
-
-[4.8.0.4/trunk/src/std]
-CHICKEN_URL http://code.call-cc.org/releases/4.8.0/chicken-4.8.0.4.tar.gz
-IUP_VERSION na
-
-[4.8.1/trunk/src/std]
-IUP_VERSION na
-
-[4.8.0/v1.5508/opt]
-IUP_VERSION na
-PREFIX /opt/chicken/4.8.0
-
-[4.8.0/trunk/centos5.7vm]
-BUILDSQLITE no

DELETED tests/installall/tests/canvas-draw/install.logpro
Index: tests/installall/tests/canvas-draw/install.logpro
==================================================================
--- tests/installall/tests/canvas-draw/install.logpro
+++ /dev/null
@@ -1,8 +0,0 @@
-;; You should have at least one expect:required. This ensures that your process ran
-(expect:required in "LogFileBody" > 0 "Put description here" #/put pattern here/)
-
-;; You may need ignores to suppress false error or warning hits from the later expects
-;; NOTE: Order is important here!
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/warn/)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/i)) ;; but disallow any other errors

DELETED tests/installall/tests/canvas-draw/install.sh
Index: tests/installall/tests/canvas-draw/install.sh
==================================================================
--- tests/installall/tests/canvas-draw/install.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-# Run your step here
-
-source $PREFIX/buildsetup.sh

DELETED tests/installall/tests/canvas-draw/testconfig
Index: tests/installall/tests/canvas-draw/testconfig
==================================================================
--- tests/installall/tests/canvas-draw/testconfig
+++ /dev/null
@@ -1,18 +0,0 @@
-# Add additional steps here. Format is "stepname script"
-[ezsteps]
-install install.sh
-
-# Test requirements are specified here
-[requirements]
-waiton iuplib setup
-
-# Iteration for your tests are controlled by the items section
-[items]
-
-# test_meta is a section for storing additional data on your test
-[test_meta]
-author matt
-owner  matt
-description Install the canvas-draw egg
-tags tagone,tagtwo
-reviewed never

DELETED tests/installall/tests/chicken/compile.logpro
Index: tests/installall/tests/chicken/compile.logpro
==================================================================
--- tests/installall/tests/chicken/compile.logpro
+++ /dev/null
@@ -1,10 +0,0 @@
-;; You should have at least one expect:required. This ensures that your process ran
-(expect:required in "LogFileBody" > 0 "Leaving directory ..." #/Leaving directory/)
-
-;; You may need ignores to suppress false error or warning hits from the later expects
-;; NOTE: Order is important here!
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:ignore   in "LogFileBody"  >= 0 "Ignore HAVE_STRERROR" #/HAVE_STRERROR/)
-
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/warn/)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/i)) ;; but disallow any other errors

DELETED tests/installall/tests/chicken/compile.sh
Index: tests/installall/tests/chicken/compile.sh
==================================================================
--- tests/installall/tests/chicken/compile.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-
-# Run your step here
-
-source $PREFIX/buildsetup.sh
-
-cd chicken-${CHICKEN_VERSION}
-make PLATFORM=${PLATFORM} PREFIX=${PREFIX}

DELETED tests/installall/tests/chicken/download.logpro
Index: tests/installall/tests/chicken/download.logpro
==================================================================
--- tests/installall/tests/chicken/download.logpro
+++ /dev/null
@@ -1,11 +0,0 @@
-;; You should have at least one expect:required. This ensures that your process ran
-(expect:required in "LogFileBody" > 0 "README file must be seen" #/README$/)
-
-;; You may need ignores to suppress false error or warning hits from the later expects
-;; NOTE: Order is important here!
-
-(expect:ignore   in "LogFileBody"  >= 0 "Ignore error flagged by finalizer-error-test" #/\w+-error/)
-
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/warn/)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/i)) ;; but disallow any other errors

DELETED tests/installall/tests/chicken/download.sh
Index: tests/installall/tests/chicken/download.sh
==================================================================
--- tests/installall/tests/chicken/download.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-
-# Run your step here
-
-source $PREFIX/buildsetup.sh
-
-if [ ! -e ${DOWNLOADS}/chicken-${CHICKEN_VERSION}.tar.gz ]; then 
-  if [ "${CHICKEN_URL}" == "" ]; then
-     CHICKEN_URL=http://code.call-cc.org/releases/${CHICKEN_VERSION}/chicken-${CHICKEN_VERSION}.tar.gz
-  fi
-  echo "Downloading $CHICKEN_URL"
-  (cd ${DOWNLOADS};wget ${CHICKEN_URL})
-fi 
-
-ls -l ${DOWNLOADS}/chicken-${CHICKEN_VERSION}.tar.gz
-
-tar xfvz ${DOWNLOADS}/chicken-${CHICKEN_VERSION}.tar.gz
-
-ls -l chicken-${CHICKEN_VERSION}

DELETED tests/installall/tests/chicken/install.logpro
Index: tests/installall/tests/chicken/install.logpro
==================================================================
--- tests/installall/tests/chicken/install.logpro
+++ /dev/null
@@ -1,11 +0,0 @@
-;; You should have at least one expect:required. This ensures that your process ran
-(expect:required in "LogFileBody" > 0 "Leaving directory" #/Leaving directory/)
-
-;; You may need ignores to suppress false error or warning hits from the later expects
-;; NOTE: Order is important here!
-
-(expect:ignore   in "LogFileBody" >= 0 "Ignore error in some filenames" #/\w+-errors/)
-
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/warn/)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/i)) ;; but disallow any other errors

DELETED tests/installall/tests/chicken/install.sh
Index: tests/installall/tests/chicken/install.sh
==================================================================
--- tests/installall/tests/chicken/install.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-# Run your step here
-
-source $PREFIX/buildsetup.sh
-# source $PREFIX
-
-cd chicken-${CHICKEN_VERSION}
-make PLATFORM=${PLATFORM} PREFIX=${PREFIX} install
-
-ls -l ${PREFIX}/bin

DELETED tests/installall/tests/chicken/testconfig
Index: tests/installall/tests/chicken/testconfig
==================================================================
--- tests/installall/tests/chicken/testconfig
+++ /dev/null
@@ -1,22 +0,0 @@
-# Add additional steps here. Format is "stepname script"
-[ezsteps]
-download download.sh
-compile compile.sh
-install install.sh
-
-# Test requirements are specified here
-[requirements]
-waiton setup
-# priority 10
-
-# Iteration for your tests are controlled by the items section
-[items]
-# CHICKEN_VERSION 4.8.0
-
-# test_meta is a section for storing additional data on your test
-[test_meta]
-author matt
-owner  matt
-description Download and install chicken scheme
-tags tagone,tagtwo
-reviewed never

DELETED tests/installall/tests/eggs/install.logpro
Index: tests/installall/tests/eggs/install.logpro
==================================================================
--- tests/installall/tests/eggs/install.logpro
+++ /dev/null
@@ -1,9 +0,0 @@
-;; You should have at least one expect:required. This ensures that your process ran
-(expect:required in "LogFileBody" > 0 "Last thing done is chmod ..." #/chmod /)
-
-;; You may need ignores to suppress false error or warning hits from the later expects
-;; NOTE: Order is important here!
-(expect:ignore   in "LogFileBody" >= 0 "Ignore someword-errors"        #/\w+-error/)
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/warn/)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/i)) ;; but disallow any other errors

DELETED tests/installall/tests/eggs/install.sh
Index: tests/installall/tests/eggs/install.sh
==================================================================
--- tests/installall/tests/eggs/install.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-
-# Run your step here
-
-source $PREFIX/buildsetup.sh
-
-$PREFIX/bin/chicken-install $PROX $EGG_NAME
-

DELETED tests/installall/tests/eggs/testconfig
Index: tests/installall/tests/eggs/testconfig
==================================================================
--- tests/installall/tests/eggs/testconfig
+++ /dev/null
@@ -1,20 +0,0 @@
-# Add additional steps here. Format is "stepname script"
-[ezsteps]
-install install.sh
-
-# Test requirements are specified here
-[requirements]
-waiton chicken setup
-priority 9
-
-# Iteration for your tests are controlled by the items section
-[items]
-EGG_NAME matchable readline apropos base64 regex-literals format regex-case test coops trace csv dot-locking posix-utils posix-extras directory-utils hostinfo tcp-server rpc csv-xml fmt json md5 ssax sxml-serializer sxml-modifications salmonella sql-de-lite postgresql
-
-# test_meta is a section for storing additional data on your test
-[test_meta]
-author matt
-owner  matt
-description Download and install eggs with no significant prerequisites
-tags tagone,tagtwo
-reviewed never

DELETED tests/installall/tests/ffcall/compile.logpro
Index: tests/installall/tests/ffcall/compile.logpro
==================================================================
--- tests/installall/tests/ffcall/compile.logpro
+++ /dev/null
@@ -1,8 +0,0 @@
-;; You should have at least one expect:required. This ensures that your process ran
-(expect:required in "LogFileBody" > 0 "Leaving directory" #/Leaving directory/)
-
-;; You may need ignores to suppress false error or warning hits from the later expects
-;; NOTE: Order is important here!
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/warn/)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/i)) ;; but disallow any other errors

DELETED tests/installall/tests/ffcall/compile.sh
Index: tests/installall/tests/ffcall/compile.sh
==================================================================
--- tests/installall/tests/ffcall/compile.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-
-# Run your step here
-
-source $PREFIX/buildsetup.sh
-
-cd ffcall
-./configure --prefix=${PREFIX} --enable-shared
-make

DELETED tests/installall/tests/ffcall/download.logpro
Index: tests/installall/tests/ffcall/download.logpro
==================================================================
--- tests/installall/tests/ffcall/download.logpro
+++ /dev/null
@@ -1,8 +0,0 @@
-;; You should have at least one expect:required. This ensures that your process ran
-(expect:required in "LogFileBody" > 0 "VERSION" #/ VERSION/)
-
-;; You may need ignores to suppress false error or warning hits from the later expects
-;; NOTE: Order is important here!
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/warn/)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/i)) ;; but disallow any other errors

DELETED tests/installall/tests/ffcall/download.sh
Index: tests/installall/tests/ffcall/download.sh
==================================================================
--- tests/installall/tests/ffcall/download.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-
-# Run your step here
-
-source $PREFIX/buildsetup.sh
-
-if ! [[ -e ${DOWNLOADS}/ffcall.tar.gz ]] ; then
-    (cd ${DOWNLOADS};wget http://www.kiatoa.com/matt/iup/ffcall.tar.gz )
-fi
-
-tar xfvz ${DOWNLOADS}/ffcall.tar.gz
-
-ls -l ffcall

DELETED tests/installall/tests/ffcall/install.logpro
Index: tests/installall/tests/ffcall/install.logpro
==================================================================
--- tests/installall/tests/ffcall/install.logpro
+++ /dev/null
@@ -1,8 +0,0 @@
-;; You should have at least one expect:required. This ensures that your process ran
-(expect:required in "LogFileBody" > 0 "Leaving directory" #/Leaving directory/)
-
-;; You may need ignores to suppress false error or warning hits from the later expects
-;; NOTE: Order is important here!
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/warn/)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/i)) ;; but disallow any other errors

DELETED tests/installall/tests/ffcall/install.sh
Index: tests/installall/tests/ffcall/install.sh
==================================================================
--- tests/installall/tests/ffcall/install.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-
-# Run your step here
-
-source $PREFIX/buildsetup.sh
-
-cd ffcall
-make install

DELETED tests/installall/tests/ffcall/testconfig
Index: tests/installall/tests/ffcall/testconfig
==================================================================
--- tests/installall/tests/ffcall/testconfig
+++ /dev/null
@@ -1,20 +0,0 @@
-# Add additional steps here. Format is "stepname script"
-[ezsteps]
-download download.sh
-compile compile.sh
-install install.sh
-
-# Test requirements are specified here
-[requirements]
-waiton setup
-
-# Iteration for your tests are controlled by the items section
-[items]
-
-# test_meta is a section for storing additional data on your test
-[test_meta]
-author matt
-owner  matt
-description Install the ffcall library
-tags tagone,tagtwo
-reviewed never

DELETED tests/installall/tests/iup/install.logpro
Index: tests/installall/tests/iup/install.logpro
==================================================================
--- tests/installall/tests/iup/install.logpro
+++ /dev/null
@@ -1,9 +0,0 @@
-;; You should have at least one expect:required. This ensures that your process ran
-(expect:required in "LogFileBody" > 0 "chmod is roughly last thing that happens" #/chmod /)
-
-;; You may need ignores to suppress false error or warning hits from the later expects
-;; NOTE: Order is important here!
-(expect:ignore   in "LogFileBody"  >= 0 "Ignore setup-error-handling" #/\w+-error/)
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/warn/)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/i)) ;; but disallow any other errors

DELETED tests/installall/tests/iup/install.sh
Index: tests/installall/tests/iup/install.sh
==================================================================
--- tests/installall/tests/iup/install.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-
-# Run your step here
-source $PREFIX/buildsetup.sh
-# source $PREFIX/setup-chicken4x.sh
-
-export CSCLIBS=`echo $LD_LIBRARY_PATH | sed 's/:/ -L/g'`
-CSC_OPTIONS="-I$PREFIX/include -L$CSCLIBS" $PREFIX/bin/chicken-install $PROX -D no-library-checks -feature disable-iup-web iup
-# CSC_OPTIONS="-I$PREFIX/include -L$CSCLIBS" $CHICKEN_INSTALL $PROX -D no-library-checks -feature disable-iup-web -deploy -prefix $DEPLOYTARG iup
-# iup:1.0.2 
-CSC_OPTIONS="-I$PREFIX/include -L$CSCLIBS" $PREFIX/bin/chicken-install $PROX -D no-library-checks canvas-draw
-# CSC_OPTIONS="-I$PREFIX/include -L$CSCLIBS" $CHICKEN_INSTALL $PROX -D no-library-checks -deploy -prefix $DEPLOYTARG canvas-draw

DELETED tests/installall/tests/iup/testconfig
Index: tests/installall/tests/iup/testconfig
==================================================================
--- tests/installall/tests/iup/testconfig
+++ /dev/null
@@ -1,18 +0,0 @@
-# Add additional steps here. Format is "stepname script"
-[ezsteps]
-install install.sh
-
-# Test requirements are specified here
-[requirements]
-waiton iup#{getenv IUPMODE}lib tougheggs
-
-# Iteration for your tests are controlled by the items section
-[items]
-
-# test_meta is a section for storing additional data on your test
-[test_meta]
-author matt
-owner  matt
-description Install iup egg
-tags tagone,tagtwo
-reviewed never

DELETED tests/installall/tests/iupbinlib/compile.logpro
Index: tests/installall/tests/iupbinlib/compile.logpro
==================================================================
--- tests/installall/tests/iupbinlib/compile.logpro
+++ /dev/null
@@ -1,8 +0,0 @@
-;; You should have at least one expect:required. This ensures that your process ran
-(expect:required in "LogFileBody" > 0 "Put description here" #/put pattern here/)
-
-;; You may need ignores to suppress false error or warning hits from the later expects
-;; NOTE: Order is important here!
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/warn/)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/i)) ;; but disallow any other errors

DELETED tests/installall/tests/iupbinlib/compile.sh
Index: tests/installall/tests/iupbinlib/compile.sh
==================================================================
--- tests/installall/tests/iupbinlib/compile.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-# Run your step here
-
-source $PREFIX/buildsetup.sh

DELETED tests/installall/tests/iupbinlib/download.logpro
Index: tests/installall/tests/iupbinlib/download.logpro
==================================================================
--- tests/installall/tests/iupbinlib/download.logpro
+++ /dev/null
@@ -1,8 +0,0 @@
-;; You should have at least one expect:required. This ensures that your process ran
-(expect:required in "LogFileBody" > 0 "README file should show up" #/README/)
-
-;; You may need ignores to suppress false error or warning hits from the later expects
-;; NOTE: Order is important here!
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/warn/)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/i)) ;; but disallow any other errors

DELETED tests/installall/tests/iupbinlib/download.sh
Index: tests/installall/tests/iupbinlib/download.sh
==================================================================
--- tests/installall/tests/iupbinlib/download.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/env bash
-
-# Run your step here
-source $PREFIX/buildsetup.sh
-# source $PREFIX/setup-chicken4x.sh
-
-if [[ `uname -a | grep x86_64` == "" ]]; then 
-    export ARCHSIZE=''
-else
-    export ARCHSIZE=64_
-fi
-    # export files="cd-5.4.1_Linux${IUPLIB}_lib.tar.gz im-3.6.3_Linux${IUPLIB}_lib.tar.gz iup-3.5_Linux${IUPLIB}_lib.tar.gz"
-if [[ x$USEOLDIUP == "x" ]];then
-   export files="cd-5.5.1_Linux${IUPLIB}_${ARCHSIZE}lib.tar.gz im-3.8_Linux${IUPLIB}_${ARCHSIZE}lib.tar.gz iup-3.6_Linux${IUPLIB}_${ARCHSIZE}lib.tar.gz"
-else
-   echo WARNING: Using old IUP libraries
-   export files="cd-5.4.1_Linux${IUPLIB}_${ARCHSIZE}lib.tar.gz im-3.6.3_Linux${IUPLIB}_${ARCHSIZE}lib.tar.gz iup-3.5_Linux${IUPLIB}_${ARCHSIZE}lib.tar.gz"
-fi
-
-mkdir -p $PREFIX/iuplib
-for a in `echo $files` ; do
-    if ! [[ -e ${DOWNLOADS}/$a ]] ; then
-	(cd ${DOWNLOADS};wget http://www.kiatoa.com/matt/iup/$a)
-    fi
-    echo Untarring $a into $PREFIX/lib
-    (cd $PREFIX/lib;tar xfvz ${DOWNLOADS}/$a;mv include/* ../include)
-done
-

DELETED tests/installall/tests/iupbinlib/install.logpro
Index: tests/installall/tests/iupbinlib/install.logpro
==================================================================
--- tests/installall/tests/iupbinlib/install.logpro
+++ /dev/null
@@ -1,8 +0,0 @@
-;; You should have at least one expect:required. This ensures that your process ran
-(expect:required in "LogFileBody" > 0 "Put description here" #/put pattern here/)
-
-;; You may need ignores to suppress false error or warning hits from the later expects
-;; NOTE: Order is important here!
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/warn/)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/i)) ;; but disallow any other errors

DELETED tests/installall/tests/iupbinlib/install.sh
Index: tests/installall/tests/iupbinlib/install.sh
==================================================================
--- tests/installall/tests/iupbinlib/install.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-# Run your step here
-source $PREFIX/buildsetup.sh

DELETED tests/installall/tests/iupbinlib/testconfig
Index: tests/installall/tests/iupbinlib/testconfig
==================================================================
--- tests/installall/tests/iupbinlib/testconfig
+++ /dev/null
@@ -1,18 +0,0 @@
-# Add additional steps here. Format is "stepname script"
-[ezsteps]
-download download.sh
-
-# Test requirements are specified here
-[requirements]
-waiton ffcall setup
-
-# Iteration for your tests are controlled by the items section
-[items]
-
-# test_meta is a section for storing additional data on your test
-[test_meta]
-author matt
-owner  matt
-description Install the iup library if it is not already installed
-tags tagone,tagtwo
-reviewed never

DELETED tests/installall/tests/iupbinlib/untar.logpro
Index: tests/installall/tests/iupbinlib/untar.logpro
==================================================================
--- tests/installall/tests/iupbinlib/untar.logpro
+++ /dev/null
@@ -1,8 +0,0 @@
-;; You should have at least one expect:required. This ensures that your process ran
-(expect:required in "LogFileBody" > 0 "Put description here" #/put pattern here/)
-
-;; You may need ignores to suppress false error or warning hits from the later expects
-;; NOTE: Order is important here!
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/warn/)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/i)) ;; but disallow any other errors

DELETED tests/installall/tests/iupbinlib/untar.sh
Index: tests/installall/tests/iupbinlib/untar.sh
==================================================================
--- tests/installall/tests/iupbinlib/untar.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-# Run your step here
-source $PREFIX/buildsetup.sh

DELETED tests/installall/tests/iupsrclib/cd.logpro
Index: tests/installall/tests/iupsrclib/cd.logpro
==================================================================
--- tests/installall/tests/iupsrclib/cd.logpro
+++ /dev/null
@@ -1,3 +0,0 @@
-(expect:ignore in "LogFileBody" >= 0 "Ignore these binary operator errors for now" #/error: missing binary operator/)
-
-(load "compile.logpro")

DELETED tests/installall/tests/iupsrclib/compile.logpro
Index: tests/installall/tests/iupsrclib/compile.logpro
==================================================================
--- tests/installall/tests/iupsrclib/compile.logpro
+++ /dev/null
@@ -1,12 +0,0 @@
-;; You should have at least one expect:required. This ensures that your process ran
-(expect:required in "LogFileBody" > 0 "Completed signature" #/(Dynamic Library.*Done|Leaving directory|Nothing to be done)/)
-
-;; You may need ignores to suppress false error or warning hits from the later expects
-;; NOTE: Order is important here!
-(expect:ignore   in "LogFileBody" >= 0 "Ignore files with error in name" #/error.[ch]/)
-(expect:ignore   in "LogFileBody" >= 0 "Ignore files with errors in name" #/errors.[ch]/)
-(expect:ignore   in "LogFileBody" >= 0 "Ignore files with warn in name"  #/warning.[ch]/)
-
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/warn/)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/i)) ;; but disallow any other errors

DELETED tests/installall/tests/iupsrclib/compile.sh
Index: tests/installall/tests/iupsrclib/compile.sh
==================================================================
--- tests/installall/tests/iupsrclib/compile.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-
-# Run your step here
-
-pkg=$1
-
-source $PREFIX/buildsetup.sh
-
-export LUA_SUFFIX=
-export LUA_INC=$MT_TEST_RUN_DIR/lua52/include
-
-if [[ $pkg == "lua52" ]]; then
-    (cd $pkg/src;make $PLATFORM)
-else
-    (cd $pkg/src;make)
-fi
-

DELETED tests/installall/tests/iupsrclib/download.logpro
Index: tests/installall/tests/iupsrclib/download.logpro
==================================================================
--- tests/installall/tests/iupsrclib/download.logpro
+++ /dev/null
@@ -1,13 +0,0 @@
-;; You should have at least one expect:required. This ensures that your process ran
-(expect:required in "LogFileBody" > 0 "README file should show up" #/README/)
-
-;; You may need ignores to suppress false error or warning hits from the later expects
-;; NOTE: Order is important here!
-
-(expect:ignore   in "LogFileBody" >= 0 "Ignore files with error in name" #/error.[ch]/)
-(expect:ignore   in "LogFileBody" >= 0 "Ignore files with errors in name" #/errors.[ch]/)
-(expect:ignore   in "LogFileBody" >= 0 "Ignore files with warn in name"  #/warning.[ch]/)
-
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/warn/)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/i)) ;; but disallow any other errors

DELETED tests/installall/tests/iupsrclib/download.sh
Index: tests/installall/tests/iupsrclib/download.sh
==================================================================
--- tests/installall/tests/iupsrclib/download.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-
-# Run your step here
-source $PREFIX/buildsetup.sh
-
-mkdir -p $PREFIX/iuplib
-for a in cd-5.6.1_Sources.tar.gz  im-3.8.1_Sources.tar.gz  iup-3.8_Sources.tar.gz lua-5.2.1_Sources.tar.gz; do
-    if ! [[ -e ${DOWNLOADS}/$a ]] ; then
-	(cd ${DOWNLOADS};wget http://www.kiatoa.com/matt/iup/$a)
-    fi
-    tar xfvz ${DOWNLOADS}/$a
-done
-
-find . -type d -exec chmod ug+x {} \;

DELETED tests/installall/tests/iupsrclib/im.logpro
Index: tests/installall/tests/iupsrclib/im.logpro
==================================================================
--- tests/installall/tests/iupsrclib/im.logpro
+++ /dev/null
@@ -1,1 +0,0 @@
-(load "compile.logpro")

DELETED tests/installall/tests/iupsrclib/install.logpro
Index: tests/installall/tests/iupsrclib/install.logpro
==================================================================
--- tests/installall/tests/iupsrclib/install.logpro
+++ /dev/null
@@ -1,8 +0,0 @@
-;; You should have at least one expect:required. This ensures that your process ran
-(expect:required in "LogFileBody" > 0 "Put description here" #/put pattern here/)
-
-;; You may need ignores to suppress false error or warning hits from the later expects
-;; NOTE: Order is important here!
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/warn/)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/i)) ;; but disallow any other errors

DELETED tests/installall/tests/iupsrclib/install.sh
Index: tests/installall/tests/iupsrclib/install.sh
==================================================================
--- tests/installall/tests/iupsrclib/install.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env bash
-
-# Run your step here
-source $PREFIX/buildsetup.sh
-
-# The so files
-cp -f im/lib/Linux26g4/*.so $PREFIX/lib
-cp -f cd/lib/Linux26g4/*.so $PREFIX/lib
-cp -f iup/lib/Linux26g4/*.so $PREFIX/lib
-
-# The development files
-mkdir -p $PREFIX/include/im
-cp -fR im/include/*.h $PREFIX/include/im
-cp -f im/lib/Linux26g4/*.a $PREFIX/lib
-
-mkdir -p $PREFIX/include/cd
-cp -f cd/include/*.h $PREFIX/include/cd
-cp -f cd/lib/Linux26g4/*.a $PREFIX/lib
-
-mkdir -p /usr/include/iup
-cp -f iup/include/*.h $PREFIX/include/iup             
-cp -f iup/lib/Linux26g4/*.a $PREFIX/lib     

DELETED tests/installall/tests/iupsrclib/iup.logpro
Index: tests/installall/tests/iupsrclib/iup.logpro
==================================================================
--- tests/installall/tests/iupsrclib/iup.logpro
+++ /dev/null
@@ -1,3 +0,0 @@
-(expect:ignore in "LogFileBody" >= 0 "Ignore these binary operator errors for now" #/error: missing binary operator/ expires: "10/10/2013")
-
-(load "compile.logpro")

DELETED tests/installall/tests/iupsrclib/lua.logpro
Index: tests/installall/tests/iupsrclib/lua.logpro
==================================================================
--- tests/installall/tests/iupsrclib/lua.logpro
+++ /dev/null
@@ -1,1 +0,0 @@
-(load "compile.logpro")

DELETED tests/installall/tests/iupsrclib/testconfig
Index: tests/installall/tests/iupsrclib/testconfig
==================================================================
--- tests/installall/tests/iupsrclib/testconfig
+++ /dev/null
@@ -1,22 +0,0 @@
-# Add additional steps here. Format is "stepname script"
-[ezsteps]
-download download.sh
-lua compile.sh lua52
-im compile.sh im
-cd compile.sh cd
-iup compile.sh iup
-
-# Test requirements are specified here
-[requirements]
-waiton ffcall setup
-
-# Iteration for your tests are controlled by the items section
-[items]
-
-# test_meta is a section for storing additional data on your test
-[test_meta]
-author matt
-owner  matt
-description Install the iup library if it is not already installed
-tags tagone,tagtwo
-reviewed never

DELETED tests/installall/tests/iupsrclib/untar.logpro
Index: tests/installall/tests/iupsrclib/untar.logpro
==================================================================
--- tests/installall/tests/iupsrclib/untar.logpro
+++ /dev/null
@@ -1,8 +0,0 @@
-;; You should have at least one expect:required. This ensures that your process ran
-(expect:required in "LogFileBody" > 0 "Put description here" #/put pattern here/)
-
-;; You may need ignores to suppress false error or warning hits from the later expects
-;; NOTE: Order is important here!
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/warn/)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/i)) ;; but disallow any other errors

DELETED tests/installall/tests/iupsrclib/untar.sh
Index: tests/installall/tests/iupsrclib/untar.sh
==================================================================
--- tests/installall/tests/iupsrclib/untar.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-# Run your step here
-source $PREFIX/buildsetup.sh

DELETED tests/installall/tests/mmisc/clone.logpro
Index: tests/installall/tests/mmisc/clone.logpro
==================================================================
--- tests/installall/tests/mmisc/clone.logpro
+++ /dev/null
@@ -1,8 +0,0 @@
-;; You should have at least one expect:required. This ensures that your process ran
-(expect:required in "LogFileBody" > 0 "Output from fossil" #/^repository:\s+/)
-
-;; You may need ignores to suppress false error or warning hits from the later expects
-;; NOTE: Order is important here!
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/warn/i)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/i)) ;; but disallow any other errors

DELETED tests/installall/tests/mmisc/clone.sh
Index: tests/installall/tests/mmisc/clone.sh
==================================================================
--- tests/installall/tests/mmisc/clone.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-# Run your step here
-source $PREFIX/buildsetup.sh
-
-fossil clone http://www.kiatoa.com/fossils/$FSLPKG $FSLPKG.fossil
-
-mkdir src
-cd src 
-fossil open ../$FSLPKG.fossil --nested
-fossil co ${$FSLPKG}_VERSION}

DELETED tests/installall/tests/mmisc/install.logpro
Index: tests/installall/tests/mmisc/install.logpro
==================================================================
--- tests/installall/tests/mmisc/install.logpro
+++ /dev/null
@@ -1,9 +0,0 @@
-;; You should have at least one expect:required. This ensures that your process ran
-(expect:required in "LogFileBody" > 0 "Always get a chmod at the end of install" #/chmod.*logpro.setup-info/)
-
-;; You may need ignores to suppress false error or warning hits from the later expects
-;; NOTE: Order is important here!
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in setup-error-handling" #/setup-error-handling/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/warn/i)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/i)) ;; but disallow any other errors

DELETED tests/installall/tests/mmisc/install.sh
Index: tests/installall/tests/mmisc/install.sh
==================================================================
--- tests/installall/tests/mmisc/install.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-
-# Run your step here
-source $PREFIX/buildsetup.sh
-cd src
-if [ $FSLPKG == "logpro" ];then
-  chicken-install
-elif [ $FSLPKG == "stml" ];then
-  cp install.cfg.template install.cfg
-  cp requirements.scm.template requirements.scm
-  make 
-  make install
-else
-  make
-  make install PREFIX=$PREFIX
-fi

DELETED tests/installall/tests/mmisc/testconfig
Index: tests/installall/tests/mmisc/testconfig
==================================================================
--- tests/installall/tests/mmisc/testconfig
+++ /dev/null
@@ -1,21 +0,0 @@
-# Add additional steps here. Format is "stepname script"
-[ezsteps]
-clone clone.sh
-install install.sh
-
-# Test requirements are specified here
-[requirements]
-waiton eggs setup
-
-# Iteration for your tests are controlled by the items section
-[items]
-FSLPKG logpro stml megatest
-
-
-# test_meta is a section for storing additional data on your test
-[test_meta]
-author matt
-owner  matt
-description Install the logpro tool
-tags tagone,tagtwo
-reviewed never

DELETED tests/installall/tests/opensrc/clone.logpro
Index: tests/installall/tests/opensrc/clone.logpro
==================================================================
--- tests/installall/tests/opensrc/clone.logpro
+++ /dev/null
@@ -1,8 +0,0 @@
-;; You should have at least one expect:required. This ensures that your process ran
-(expect:required in "LogFileBody" > 0 "Output from fossil" (list #/^repository:\s+/ #/comment:/))
-
-;; You may need ignores to suppress false error or warning hits from the later expects
-;; NOTE: Order is important here!
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/warn/i)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/i)) ;; but disallow any other errors

DELETED tests/installall/tests/opensrc/clone.sh
Index: tests/installall/tests/opensrc/clone.sh
==================================================================
--- tests/installall/tests/opensrc/clone.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env bash
-
-# Run your step here
-source $PREFIX/buildsetup.sh
-
-parentdir=$MT_LINKTREE/$MT_TARGET/$MT_RUNNAME
-
-lockfile $parentdir/clone.lock
-if [ ! -e $parentdir/opensrc.fossil ];then
-  fossil clone http://www.kiatoa.com/fossils/opensrc $parentdir/opensrc.fossil
-fi
-
-if [ ! -e $parentdir/src/dbi ];then
-  mkdir -p $parentdir/src
-  (cd $parentdir/src;fossil open $parentdir/opensrc.fossil --nested)
-else
-  (cd $parentdir/src;fossil sync;fossil co trunk;fossil status)
-fi
-rm -f $parentdir/clone.lock
-
-ln -sf $parentdir/src $MT_TEST_RUN_DIR/src
-

DELETED tests/installall/tests/opensrc/install.logpro
Index: tests/installall/tests/opensrc/install.logpro
==================================================================
--- tests/installall/tests/opensrc/install.logpro
+++ /dev/null
@@ -1,9 +0,0 @@
-;; You should have at least one expect:required. This ensures that your process ran
-(expect:required in "LogFileBody" > 0 "Always get a chmod at the end of install" #/chmod.*.setup-info/)
-
-;; You may need ignores to suppress false error or warning hits from the later expects
-;; NOTE: Order is important here!
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in setup-error-handling" #/setup-error-handling/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/warn/i)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/i)) ;; but disallow any other errors

DELETED tests/installall/tests/opensrc/install.sh
Index: tests/installall/tests/opensrc/install.sh
==================================================================
--- tests/installall/tests/opensrc/install.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-# Run your step here
-source $PREFIX/buildsetup.sh
-cd src/$MODULE_NAME
-chicken-install

DELETED tests/installall/tests/opensrc/testconfig
Index: tests/installall/tests/opensrc/testconfig
==================================================================
--- tests/installall/tests/opensrc/testconfig
+++ /dev/null
@@ -1,20 +0,0 @@
-# Add additional steps here. Format is "stepname script"
-[ezsteps]
-clone clone.sh
-install install.sh
-
-# Test requirements are specified here
-[requirements]
-waiton eggs setup sqlite3
-
-# Iteration for your tests are controlled by the items section
-[items]
-MODULE_NAME dbi margs qtree vcd xfig mutils
-
-# test_meta is a section for storing additional data on your test
-[test_meta]
-author matt
-owner  matt
-description Install the eggs from the opensrc fossil
-tags tagone,tagtwo
-reviewed never

DELETED tests/installall/tests/setup/setup.logpro
Index: tests/installall/tests/setup/setup.logpro
==================================================================
--- tests/installall/tests/setup/setup.logpro
+++ /dev/null
@@ -1,10 +0,0 @@
-;; You should have at least one expect:required. This ensures that your process ran
-(expect:required in "LogFileBody" > 0 "ALL DONE" #/ALL DONE$/)
-
-;; You may need ignores to suppress false error or warning hits from the later expects
-;; NOTE: Order is important here!
-
-
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/warn/)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/i)) ;; but disallow any other errors

DELETED tests/installall/tests/setup/setup.sh
Index: tests/installall/tests/setup/setup.sh
==================================================================
--- tests/installall/tests/setup/setup.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/usr/bin/env bash
-
-# Run your step here
-
-cksetupsh=$PREFIX/setup-chicken4x.sh
-cksetupcsh=$PREFIX/setup-chicken4x.csh
-setupsh=$PREFIX/buildsetup.sh
-
-# make a cache dir
-mkdir -p $DOWNLOADS
-mkdir -p $PREFIX
-
-# File for users to source to run chicken
-echo "# Source me to setup to to run chicken" > $cksetupsh
-echo "export PATH=$PREFIX/bin:\$PATH" > $cksetupsh
-echo "export LD_LIBRARY_PATH=$PREFIX/lib" >> $cksetupsh
-
-# tcsh version
-echo "setenv PATH $PREFIX/bin:\$PATH" > $cksetupcsh
-echo "setenv LD_LIBRARY_PATH $PREFIX/lib" >> $cksetupcsh
-
-# File to source for build process
-echo "export PATH=$PREFIX/bin:\$PATH" > $setupsh
-echo "export LD_LIBRARY_PATH=$PREFIX/lib" >> $setupsh
-
-if [[ $proxy == "" ]]; then 
-  echo 'Please set the environment variable "proxy" to host.com:port (e.g. foo.com:1234) to use a proxy'
-else
-  echo "export http_proxy=http://$proxy" >> $setupsh
-  echo "export PROX=\"-proxy $proxy\""   >> $setupsh
-fi
-
-echo "export PREFIX=$PREFIX" >> $setupsh
-
-echo ALL DONE

DELETED tests/installall/tests/setup/testconfig
Index: tests/installall/tests/setup/testconfig
==================================================================
--- tests/installall/tests/setup/testconfig
+++ /dev/null
@@ -1,18 +0,0 @@
-# Add additional steps here. Format is "stepname script"
-[ezsteps]
-setup setup.sh
-
-# Test requirements are specified here
-[requirements]
-# priority 10
-
-# Iteration for your tests are controlled by the items section
-[items]
-
-# test_meta is a section for storing additional data on your test
-[test_meta]
-author matt
-owner  matt
-description Download and install chicken scheme
-tags tagone,tagtwo
-reviewed never

DELETED tests/installall/tests/sqlite3/compile.logpro
Index: tests/installall/tests/sqlite3/compile.logpro
==================================================================
--- tests/installall/tests/sqlite3/compile.logpro
+++ /dev/null
@@ -1,9 +0,0 @@
-;; You should have at least one expect:required. This ensures that your process ran
-(expect:required in "LogFileBody" > 0 "Leaving directory" #/(Leaving directory|Nothing to be done for|creating sqlite3)/)
-
-;; You may need ignores to suppress false error or warning hits from the later expects
-;; NOTE: Order is important here!
-(expect:ignore   in "LogFileBody"  >= 0 "Ignore strerror_r" #/strerror_r/i)
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/warn/)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/i)) ;; but disallow any other errors

DELETED tests/installall/tests/sqlite3/compile.sh
Index: tests/installall/tests/sqlite3/compile.sh
==================================================================
--- tests/installall/tests/sqlite3/compile.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-
-# Run your step here
-
-source $PREFIX/buildsetup.sh
-
-cd sqlite-autoconf-$SQLITE3_VERSION
-./configure --prefix=$PREFIX
-
-make

DELETED tests/installall/tests/sqlite3/download.logpro
Index: tests/installall/tests/sqlite3/download.logpro
==================================================================
--- tests/installall/tests/sqlite3/download.logpro
+++ /dev/null
@@ -1,8 +0,0 @@
-;; You should have at least one expect:required. This ensures that your process ran
-(expect:required in "LogFileBody" > 0 "sqlite-autoconf" #/sqlite-autoconf/)
-
-;; You may need ignores to suppress false error or warning hits from the later expects
-;; NOTE: Order is important here!
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/warn/)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/i)) ;; but disallow any other errors

DELETED tests/installall/tests/sqlite3/download.sh
Index: tests/installall/tests/sqlite3/download.sh
==================================================================
--- tests/installall/tests/sqlite3/download.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-
-# Run your step here
-
-source $PREFIX/buildsetup.sh
-
-echo Install sqlite3
-if ! [[ -e ${DOWNLOADS}/sqlite-autoconf-${SQLITE3_VERSION}.tar.gz ]]; then
-    (cd ${DOWNLOADS};wget http://www.sqlite.org/sqlite-autoconf-${SQLITE3_VERSION}.tar.gz)
-fi
-
-tar xfz ${DOWNLOADS}/sqlite-autoconf-${SQLITE3_VERSION}.tar.gz 
-
-ls -l sqlite-autoconf-${SQLITE3_VERSION}.tar.gz

DELETED tests/installall/tests/sqlite3/install.logpro
Index: tests/installall/tests/sqlite3/install.logpro
==================================================================
--- tests/installall/tests/sqlite3/install.logpro
+++ /dev/null
@@ -1,8 +0,0 @@
-;; You should have at least one expect:required. This ensures that your process ran
-(expect:required in "LogFileBody" > 0 "Leaving directory" #/Leaving directory/)
-
-;; You may need ignores to suppress false error or warning hits from the later expects
-;; NOTE: Order is important here!
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/warn/)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/i)) ;; but disallow any other errors

DELETED tests/installall/tests/sqlite3/install.sh
Index: tests/installall/tests/sqlite3/install.sh
==================================================================
--- tests/installall/tests/sqlite3/install.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-
-# Run your step here
-
-source $PREFIX/buildsetup.sh
-
-cd sqlite-autoconf-$SQLITE3_VERSION
-make install
-

DELETED tests/installall/tests/sqlite3/installegg.logpro
Index: tests/installall/tests/sqlite3/installegg.logpro
==================================================================
--- tests/installall/tests/sqlite3/installegg.logpro
+++ /dev/null
@@ -1,9 +0,0 @@
-;; You should have at least one expect:required. This ensures that your process ran
-(expect:required in "LogFileBody" > 0 "chmod sqlite3" #/chmod.*sqlite3/)
-
-;; You may need ignores to suppress false error or warning hits from the later expects
-;; NOTE: Order is important here!
-(expect:ignore   in "LogFileBody"  >= 0 "Ignore setup-error-handling" #/setup-error-handling/)
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/warn/)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/i)) ;; but disallow any other errors

DELETED tests/installall/tests/sqlite3/installegg.sh
Index: tests/installall/tests/sqlite3/installegg.sh
==================================================================
--- tests/installall/tests/sqlite3/installegg.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-# Run your step here
-
-source $PREFIX/buildsetup.sh
-
-CSC_OPTIONS="-I$PREFIX/include -L$PREFIX/lib" $PREFIX/bin/chicken-install $PROX sqlite3

DELETED tests/installall/tests/sqlite3/testconfig
Index: tests/installall/tests/sqlite3/testconfig
==================================================================
--- tests/installall/tests/sqlite3/testconfig
+++ /dev/null
@@ -1,24 +0,0 @@
-# Add additional steps here. Format is "stepname script"
-[ezsteps]
-download download.sh
-compile compile.sh
-install install.sh
-installegg installegg.sh
-
-# Test requirements are specified here
-[requirements]
-# We waiton chicken because this one installs the egg. It would behove us to split this
-# into two tests ...
-waiton tougheggs
-priority 2
-
-# Iteration for your tests are controlled by the items section
-[items]
-
-# test_meta is a section for storing additional data on your test
-[test_meta]
-author matt
-owner  matt
-description Install sqlite3 library for systems where it is not installed
-tags tagone,tagtwo
-reviewed never

DELETED tests/installall/tests/tougheggs/install.logpro
Index: tests/installall/tests/tougheggs/install.logpro
==================================================================
--- tests/installall/tests/tougheggs/install.logpro
+++ /dev/null
@@ -1,9 +0,0 @@
-;; You should have at least one expect:required. This ensures that your process ran
-(expect:required in "LogFileBody" > 0 "Last thing done is chmod ..." #/chmod /)
-
-;; You may need ignores to suppress false error or warning hits from the later expects
-;; NOTE: Order is important here!
-(expect:ignore   in "LogFileBody" >= 0 "Ignore someword-errors"        #/\w+-error/)
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/warn/)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/i)) ;; but disallow any other errors

DELETED tests/installall/tests/tougheggs/install.sh
Index: tests/installall/tests/tougheggs/install.sh
==================================================================
--- tests/installall/tests/tougheggs/install.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-
-# Run your step here
-
-source $PREFIX/buildsetup.sh
-
-lockfile $PREFIX/eggs.lock
-$PREFIX/bin/chicken-install $PROX $EGG_NAME
-rm -f $PREFIX/eggs.lock

DELETED tests/installall/tests/tougheggs/testconfig
Index: tests/installall/tests/tougheggs/testconfig
==================================================================
--- tests/installall/tests/tougheggs/testconfig
+++ /dev/null
@@ -1,19 +0,0 @@
-# Add additional steps here. Format is "stepname script"
-[ezsteps]
-install install.sh
-
-# Test requirements are specified here
-[requirements]
-waiton eggs
-
-# Iteration for your tests are controlled by the items section
-[items]
-EGG_NAME intarweb http-client awful uri-common spiffy-request-vars spiffy apropos spiffy-directory-listing
-
-# test_meta is a section for storing additional data on your test
-[test_meta]
-author matt
-owner  matt
-description Download and install eggs with no significant prerequisites
-tags tagone,tagtwo
-reviewed never

DELETED tests/installall/tests/zmq/install.logpro
Index: tests/installall/tests/zmq/install.logpro
==================================================================
--- tests/installall/tests/zmq/install.logpro
+++ /dev/null
@@ -1,8 +0,0 @@
-;; You should have at least one expect:required. This ensures that your process ran
-(expect:required in "LogFileBody" > 0 "Put description here" #/put pattern here/)
-
-;; You may need ignores to suppress false error or warning hits from the later expects
-;; NOTE: Order is important here!
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/warn/)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/i)) ;; but disallow any other errors

DELETED tests/installall/tests/zmq/install.sh
Index: tests/installall/tests/zmq/install.sh
==================================================================
--- tests/installall/tests/zmq/install.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-# Run your step here
-source $PREFIX/buildsetup.sh

DELETED tests/installall/tests/zmq/testconfig
Index: tests/installall/tests/zmq/testconfig
==================================================================
--- tests/installall/tests/zmq/testconfig
+++ /dev/null
@@ -1,18 +0,0 @@
-# Add additional steps here. Format is "stepname script"
-[ezsteps]
-install install.sh
-
-# Test requirements are specified here
-[requirements]
-waiton zmqlib chicken setup
-
-# Iteration for your tests are controlled by the items section
-[items]
-
-# test_meta is a section for storing additional data on your test
-[test_meta]
-author matt
-owner  matt
-description Install the zmq egg
-tags tagone,tagtwo
-reviewed never

DELETED tests/installall/tests/zmqlib/compile.logpro
Index: tests/installall/tests/zmqlib/compile.logpro
==================================================================
--- tests/installall/tests/zmqlib/compile.logpro
+++ /dev/null
@@ -1,8 +0,0 @@
-;; You should have at least one expect:required. This ensures that your process ran
-(expect:required in "LogFileBody" > 0 "Put description here" #/put pattern here/)
-
-;; You may need ignores to suppress false error or warning hits from the later expects
-;; NOTE: Order is important here!
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/warn/)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/i)) ;; but disallow any other errors

DELETED tests/installall/tests/zmqlib/compile.sh
Index: tests/installall/tests/zmqlib/compile.sh
==================================================================
--- tests/installall/tests/zmqlib/compile.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-# Run your step here
-source $PREFIX/buildsetup.sh

DELETED tests/installall/tests/zmqlib/download.logpro
Index: tests/installall/tests/zmqlib/download.logpro
==================================================================
--- tests/installall/tests/zmqlib/download.logpro
+++ /dev/null
@@ -1,8 +0,0 @@
-;; You should have at least one expect:required. This ensures that your process ran
-(expect:required in "LogFileBody" > 0 "Put description here" #/put pattern here/)
-
-;; You may need ignores to suppress false error or warning hits from the later expects
-;; NOTE: Order is important here!
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/warn/)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/i)) ;; but disallow any other errors

DELETED tests/installall/tests/zmqlib/download.sh
Index: tests/installall/tests/zmqlib/download.sh
==================================================================
--- tests/installall/tests/zmqlib/download.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-# Run your step here
-source $PREFIX/buildsetup.sh

DELETED tests/installall/tests/zmqlib/install.logpro
Index: tests/installall/tests/zmqlib/install.logpro
==================================================================
--- tests/installall/tests/zmqlib/install.logpro
+++ /dev/null
@@ -1,8 +0,0 @@
-;; You should have at least one expect:required. This ensures that your process ran
-(expect:required in "LogFileBody" > 0 "Put description here" #/put pattern here/)
-
-;; You may need ignores to suppress false error or warning hits from the later expects
-;; NOTE: Order is important here!
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/warn/)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/i)) ;; but disallow any other errors

DELETED tests/installall/tests/zmqlib/install.sh
Index: tests/installall/tests/zmqlib/install.sh
==================================================================
--- tests/installall/tests/zmqlib/install.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-# Run your step here
-
-source $PREFIX/buildsetup.sh

DELETED tests/installall/tests/zmqlib/testconfig
Index: tests/installall/tests/zmqlib/testconfig
==================================================================
--- tests/installall/tests/zmqlib/testconfig
+++ /dev/null
@@ -1,21 +0,0 @@
-# Add additional steps here. Format is "stepname script"
-[ezsteps]
-download download.sh
-untar untar.sh
-compile compile.sh
-install install.sh
-
-# Test requirements are specified here
-[requirements]
-waiton setup
-
-# Iteration for your tests are controlled by the items section
-[items]
-
-# test_meta is a section for storing additional data on your test
-[test_meta]
-author matt
-owner  matt
-description Install the zmq library if it doesn't already exist
-tags tagone,tagtwo
-reviewed never

DELETED tests/installall/tests/zmqlib/untar.logpro
Index: tests/installall/tests/zmqlib/untar.logpro
==================================================================
--- tests/installall/tests/zmqlib/untar.logpro
+++ /dev/null
@@ -1,8 +0,0 @@
-;; You should have at least one expect:required. This ensures that your process ran
-(expect:required in "LogFileBody" > 0 "Put description here" #/put pattern here/)
-
-;; You may need ignores to suppress false error or warning hits from the later expects
-;; NOTE: Order is important here!
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/warn/)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/i)) ;; but disallow any other errors

DELETED tests/installall/tests/zmqlib/untar.sh
Index: tests/installall/tests/zmqlib/untar.sh
==================================================================
--- tests/installall/tests/zmqlib/untar.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-# Run your step here
-source $PREFIX/buildsetup.sh

Index: tests/manual.sh
==================================================================
--- tests/manual.sh
+++ tests/manual.sh
@@ -1,1 +1,18 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 (cd ..;make install) && `realpath ../bin/megatest` -runtests manual_example :sysname ubuntu :fsname afs :datapath none :runname testing -setvars TARGETDISPLAY=:0,TARGETHOST=localhost,TARGETDIR=/tmp/blah,TARGETUSER=matt 

Index: tests/mintest/megatest.config
==================================================================
--- tests/mintest/megatest.config
+++ tests/mintest/megatest.config
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 [fields]
 X TEXT
 
 [setup]
 max_concurrent_jobs 50

Index: tests/mintest/runconfigs.config
==================================================================
--- tests/mintest/runconfigs.config
+++ tests/mintest/runconfigs.config
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 [default]
 ALLTESTS see this variable
 
 # Your variables here are grouped by targets [SYSTEM/RELEASE]
 [a]

Index: tests/mintest/tests/a/testconfig
==================================================================
--- tests/mintest/tests/a/testconfig
+++ tests/mintest/tests/a/testconfig
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # Add steps here. Format is "stepname script"
 [ezsteps]
 step1 echo SUCCESS
 
 [requirements]

Index: tests/mintest/tests/a1/testconfig
==================================================================
--- tests/mintest/tests/a1/testconfig
+++ tests/mintest/tests/a1/testconfig
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # Add steps here. Format is "stepname script"
 [ezsteps]
 step1 echo SUCCESS
 
 [requirements]

Index: tests/mintest/tests/b/testconfig
==================================================================
--- tests/mintest/tests/b/testconfig
+++ tests/mintest/tests/b/testconfig
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # Add steps here. Format is "stepname script"
 [ezsteps]
 step1 echo SUCCESS
 
 [requirements]

Index: tests/mintest/tests/b1/testconfig
==================================================================
--- tests/mintest/tests/b1/testconfig
+++ tests/mintest/tests/b1/testconfig
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # Add steps here. Format is "stepname script"
 [ezsteps]
 step1 echo SUCCESS
 
 [requirements]

Index: tests/mintest/tests/c/testconfig
==================================================================
--- tests/mintest/tests/c/testconfig
+++ tests/mintest/tests/c/testconfig
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # Add steps here. Format is "stepname script"
 [ezsteps]
 step1 echo SUCCESS
 
 [requirements]

Index: tests/mintest/tests/c1/testconfig
==================================================================
--- tests/mintest/tests/c1/testconfig
+++ tests/mintest/tests/c1/testconfig
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # Add steps here. Format is "stepname script"
 [ezsteps]
 step1 echo SUCCESS
 
 [requirements]

Index: tests/mintest/tests/d/testconfig
==================================================================
--- tests/mintest/tests/d/testconfig
+++ tests/mintest/tests/d/testconfig
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # Add steps here. Format is "stepname script"
 [ezsteps]
 step1 echo SUCCESS
 
 [requirements]

Index: tests/mintest/tests/d1fail/testconfig
==================================================================
--- tests/mintest/tests/d1fail/testconfig
+++ tests/mintest/tests/d1fail/testconfig
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # Add steps here. Format is "stepname script"
 [ezsteps]
 step1 echo SUCCESS
 step2 exit 123
 

Index: tests/mintest/tests/e/testconfig
==================================================================
--- tests/mintest/tests/e/testconfig
+++ tests/mintest/tests/e/testconfig
@@ -1,4 +1,21 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # Add steps here. Format is "stepname script"
 [ezsteps]
 step1 echo SUCCESS
 

Index: tests/mintest/tests/e1/testconfig
==================================================================
--- tests/mintest/tests/e1/testconfig
+++ tests/mintest/tests/e1/testconfig
@@ -1,4 +1,21 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # Add steps here. Format is "stepname script"
 [ezsteps]
 step1 echo SUCCESS
 

Index: tests/mintest/tests/f/testconfig
==================================================================
--- tests/mintest/tests/f/testconfig
+++ tests/mintest/tests/f/testconfig
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # Add steps here. Format is "stepname script"
 [ezsteps]
 step1 echo SUCCESS
 
 [requirements]

Index: tests/mintest/tests/g/testconfig
==================================================================
--- tests/mintest/tests/g/testconfig
+++ tests/mintest/tests/g/testconfig
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # Add steps here. Format is "stepname script"
 [ezsteps]
 step1 echo SUCCESS
 
 [requirements]

Index: tests/mintest/tests/h/testconfig
==================================================================
--- tests/mintest/tests/h/testconfig
+++ tests/mintest/tests/h/testconfig
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # Add steps here. Format is "stepname script"
 [ezsteps]
 step1 echo SUCCESS
 
 [requirements]

Index: tests/mintest/tests/i/testconfig
==================================================================
--- tests/mintest/tests/i/testconfig
+++ tests/mintest/tests/i/testconfig
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # Add steps here. Format is "stepname script"
 [ezsteps]
 step1 echo SUCCESS
 
 [requirements]

Index: tests/mintest/tests/j/testconfig
==================================================================
--- tests/mintest/tests/j/testconfig
+++ tests/mintest/tests/j/testconfig
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # Add steps here. Format is "stepname script"
 [ezsteps]
 step1 echo SUCCESS
 
 [requirements]

Index: tests/mintest/tests/k/testconfig
==================================================================
--- tests/mintest/tests/k/testconfig
+++ tests/mintest/tests/k/testconfig
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # Add steps here. Format is "stepname script"
 [ezsteps]
 step1 echo SUCCESS
 
 [requirements]

Index: tests/mintest/tests/l/testconfig
==================================================================
--- tests/mintest/tests/l/testconfig
+++ tests/mintest/tests/l/testconfig
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # Add steps here. Format is "stepname script"
 [ezsteps]
 step1 echo SUCCESS
 
 [requirements]

Index: tests/ods-test.scm
==================================================================
--- tests/ods-test.scm
+++ tests/ods-test.scm
@@ -1,5 +1,22 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 (load "ods.scm")
 
 (ods:list->ods 
  "testing"
  "testing.ods"

Index: tests/release/Makefile
==================================================================
--- tests/release/Makefile
+++ tests/release/Makefile
@@ -1,6 +1,21 @@
-
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
 
 dashboard : compile
 	dashboard -rows 24 &
 
 compile : runs

Index: tests/release/megatest.config
==================================================================
--- tests/release/megatest.config
+++ tests/release/megatest.config
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 [fields]
 release TEXT
 iteration TEXT
 
 [setup]

Index: tests/release/runconfigs.config
==================================================================
--- tests/release/runconfigs.config
+++ tests/release/runconfigs.config
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 [default]
 MTRUNNER   #{shell readlink -f #{getenv MT_RUN_AREA_HOME}/../../utils/mtrunner}
 MTTESTDIR  #{shell readlink -f #{getenv MT_RUN_AREA_HOME}/..}
 MTPATH     #{shell readlink -f #{getenv MT_RUN_AREA_HOME}/../../bin}
 

Index: tests/release/tests/dependencies/simpleresults.logpro
==================================================================
--- tests/release/tests/dependencies/simpleresults.logpro
+++ tests/release/tests/dependencies/simpleresults.logpro
@@ -1,8 +1,24 @@
 ;; (c) 2006,2007,2008,2009 Matthew Welland matt@kiatoa.com
 ;;  
-;;   License GPL.
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 
 (define logbody "LogFileBody")
 
 (define pass-specs '( ;; testname num-expected max-runtime
 		     ("setup"		        1  20)

Index: tests/release/tests/dependencies/testconfig
==================================================================
--- tests/release/tests/dependencies/testconfig
+++ tests/release/tests/dependencies/testconfig
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # test2 from the tests/Makefile
 
 [var]
 tname itemwait
 

Index: tests/release/tests/fullrun/results.logpro
==================================================================
--- tests/release/tests/fullrun/results.logpro
+++ tests/release/tests/fullrun/results.logpro
@@ -1,8 +1,24 @@
 ;; (c) 2006,2007,2008,2009 Matthew Welland matt@kiatoa.com
 ;;  
-;;   License GPL.
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 
 (define logbody "LogFileBody")
 
 (define pass-specs '( ;; testname num-expected max-runtime
 		     ("exit_0"		        1  20)

Index: tests/release/tests/fullrun/testconfig
==================================================================
--- tests/release/tests/fullrun/testconfig
+++ tests/release/tests/fullrun/testconfig
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 [ezsteps]
 cleantop $MTRUNNER $MTTESTDIR/fullrun $MTPATH megatest -remove-runs -target ubuntu/nfs/none -runname release_toplevel -testpatt %
 runall   $MTRUNNER $MTTESTDIR/fullrun $MTPATH megatest -run -testpatt %            -target ubuntu/nfs/none -runname release_toplevel -runwait
 runtop   $MTRUNNER $MTTESTDIR/fullrun $MTPATH megatest -run -testpatt all_toplevel -target ubuntu/nfs/none -runname release_toplevel -rerun FAIL -preclean -runwait
 results  $MTRUNNER $MTTESTDIR/fullrun $MTPATH megatest -list-runs release_toplevel -target ubuntu/nfs/none -runname release_toplevel 

Index: tests/release/tests/itemwait/testconfig
==================================================================
--- tests/release/tests/itemwait/testconfig
+++ tests/release/tests/itemwait/testconfig
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # test2 from the tests/Makefile
 
 [var]
 tname itemwait
 

Index: tests/release/tests/itemwait/watchrun.sh
==================================================================
--- tests/release/tests/itemwait/watchrun.sh
+++ tests/release/tests/itemwait/watchrun.sh
@@ -1,7 +1,24 @@
 #!/bin/bash
 
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 runname=$1
 
 pass=no
 alldone=no
 while [[ $alldone == no ]];do

Index: tests/release/tests/rollup/firstres.logpro
==================================================================
--- tests/release/tests/rollup/firstres.logpro
+++ tests/release/tests/rollup/firstres.logpro
@@ -1,8 +1,23 @@
 ;; (c) 2006,2007,2008,2009 Matthew Welland matt@kiatoa.com
 ;;  
-;;   License GPL.
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
 
 (define logbody "LogFileBody")
 
 (define pass-specs '( ;; testname num-expected max-runtime
 		     ;; ("exit_0"		        1  20)

Index: tests/release/tests/rollup/results.logpro
==================================================================
--- tests/release/tests/rollup/results.logpro
+++ tests/release/tests/rollup/results.logpro
@@ -1,8 +1,23 @@
 ;; (c) 2006,2007,2008,2009 Matthew Welland matt@kiatoa.com
 ;;  
-;;   License GPL.
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
 
 (define logbody "LogFileBody")
 
 (define pass-specs '( ;; testname num-expected max-runtime
 		     ;; ("exit_0"		        1  20)

Index: tests/release/tests/rollup/testconfig
==================================================================
--- tests/release/tests/rollup/testconfig
+++ tests/release/tests/rollup/testconfig
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # test2 from the tests/Makefile
 
 [var]
 tname rollup
 

Index: tests/release/tests/test2/results.logpro
==================================================================
--- tests/release/tests/test2/results.logpro
+++ tests/release/tests/test2/results.logpro
@@ -1,8 +1,23 @@
 ;; (c) 2006,2007,2008,2009 Matthew Welland matt@kiatoa.com
 ;;  
-;;   License GPL.
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
 
 (define logbody "LogFileBody")
 
 (define pass-specs '( ;; testname num-expected max-runtime
 		     ;; ("exit_0"		        1  20)

Index: tests/release/tests/test2/results_a.logpro
==================================================================
--- tests/release/tests/test2/results_a.logpro
+++ tests/release/tests/test2/results_a.logpro
@@ -1,8 +1,24 @@
 ;; (c) 2006,2007,2008,2009 Matthew Welland matt@kiatoa.com
 ;;  
-;;   License GPL.
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 
 (define logbody "LogFileBody")
 
 (define pass-specs '( ;; testname num-expected max-runtime
 		     ;; ("exit_0"		        1  20)

Index: tests/release/tests/test2/results_b.logpro
==================================================================
--- tests/release/tests/test2/results_b.logpro
+++ tests/release/tests/test2/results_b.logpro
@@ -1,8 +1,23 @@
 ;; (c) 2006,2007,2008,2009 Matthew Welland matt@kiatoa.com
 ;;  
-;;   License GPL.
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
 
 (define logbody "LogFileBody")
 
 (define pass-specs '( ;; testname num-expected max-runtime
 		     ;; ("exit_0"		        1  20)

Index: tests/release/tests/test2/testconfig
==================================================================
--- tests/release/tests/test2/testconfig
+++ tests/release/tests/test2/testconfig
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # test2 from the tests/Makefile
 
 [var]
 tname test2
 mtpath #{shell readlink -f ../../bin}

Index: tests/release/tests/testpatt/cleanres.logpro
==================================================================
--- tests/release/tests/testpatt/cleanres.logpro
+++ tests/release/tests/testpatt/cleanres.logpro
@@ -1,8 +1,23 @@
 ;; (c) 2006,2007,2008,2009 Matthew Welland matt@kiatoa.com
 ;;  
-;;   License GPL.
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
 
 (define logbody "LogFileBody")
 
 (define pass-specs '( ;; testname num-expected max-runtime
 		     ;; ("exit_0"		        1  20)

Index: tests/release/tests/testpatt/results.logpro
==================================================================
--- tests/release/tests/testpatt/results.logpro
+++ tests/release/tests/testpatt/results.logpro
@@ -1,8 +1,24 @@
 ;; (c) 2006,2007,2008,2009 Matthew Welland matt@kiatoa.com
 ;;  
-;;   License GPL.
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 
 (define logbody "LogFileBody")
 
 (define pass-specs '( ;; testname num-expected max-runtime
 		     ;; ("exit_0"		        1  20)

Index: tests/release/tests/testpatt/testconfig
==================================================================
--- tests/release/tests/testpatt/testconfig
+++ tests/release/tests/testpatt/testconfig
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 [ezsteps]
 clean    $MTRUNNER $MTTESTDIR/fullrun $MTPATH megatest -remove-runs -testpatt % -target ubuntu/nfs/none -runname release_testpatt
 cleanres $MTRUNNER $MTTESTDIR/fullrun $MTPATH megatest -list-runs release_testpatt -target ubuntu/nfs/none
 
 runitems $MTRUNNER $MTTESTDIR/fullrun $MTPATH megatest -run -testpatt runfirst/%2 -target ubuntu/nfs/none -runname release_testpatt

Index: tests/release/tests/testpatt_envvar/results.logpro
==================================================================
--- tests/release/tests/testpatt_envvar/results.logpro
+++ tests/release/tests/testpatt_envvar/results.logpro
@@ -1,8 +1,24 @@
 ;; (c) 2006,2007,2008,2009 Matthew Welland matt@kiatoa.com
 ;;  
-;;   License GPL.
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 
 (define logbody "LogFileBody")
 
 (define pass-specs '( ;; testname num-expected max-runtime
 		     ("exit_0"		        1  20)

Index: tests/release/tests/testpatt_envvar/testconfig
==================================================================
--- tests/release/tests/testpatt_envvar/testconfig
+++ tests/release/tests/testpatt_envvar/testconfig
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 [var]
 targ -target ubuntu/nfs/all_toplevel
 tp   -testpatt %
 
 [ezsteps]

Index: tests/release/tests/toprun/results.logpro
==================================================================
--- tests/release/tests/toprun/results.logpro
+++ tests/release/tests/toprun/results.logpro
@@ -1,8 +1,24 @@
 ;; (c) 2006,2007,2008,2009 Matthew Welland matt@kiatoa.com
 ;;  
-;;   License GPL.
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 
 (define logbody "LogFileBody")
 
 (define pass-specs '( ;; testname num-expected max-runtime
 		     ("exit_0"		        1  20)

Index: tests/release/tests/toprun/testconfig
==================================================================
--- tests/release/tests/toprun/testconfig
+++ tests/release/tests/toprun/testconfig
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 [misc]
 rname release_toprun
 rdir  $MTTESTDIR/fullrun
 
 [ezsteps]

Index: tests/resources/ruby/librunscript.rb
==================================================================
--- tests/resources/ruby/librunscript.rb
+++ tests/resources/ruby/librunscript.rb
@@ -1,7 +1,24 @@
 # This is the library of stuff for megatest
 
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 def run_and_record(stepname, cmd, checks)
   system "megatest -step #{stepname} :state start :status n/a"
   system cmd
   exitcode=$?
   if exitcode==0

Index: tests/rununittest.sh
==================================================================
--- tests/rununittest.sh
+++ tests/rununittest.sh
@@ -1,7 +1,24 @@
 #!/bin/bash
 
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # Usage: rununittest.sh testname debuglevel
 #
 banner $1
 
 # put megatest on path from correct location
@@ -11,13 +28,13 @@
 
 # Clean setup
 #
 dbdir=$(echo /tmp/$USER/megatest_localdb/simplerun/.[a-zA-Z]*/)
 echo "dbdir=$dbdir"
-rm -f simplerun/megatest.db simplerun/monitor.db simplerun/db/monitor.db $dbdir
+rm -f simplerun/megatest.db simplerun/monitor.db simplerun/db/monitor.db
 rm -rf simplelinks/ simpleruns/ simplerun/db/ $dbdir
 mkdir -p simplelinks simpleruns
 (cd simplerun;cp ../../*_records.scm .;perl -pi.bak -e 's/define-inline/define/' *_records.scm)
 (cd simplerun;cp ../../altdb.scm .)
 
 # Run the test $1 is the unit test to run
 cd simplerun;echo '(load "../tests.scm")' | ../../bin/megatest -repl -debug $2 $1

Index: tests/simplerun/megatest.config
==================================================================
--- tests/simplerun/megatest.config
+++ tests/simplerun/megatest.config
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 [fields]
 SYSTEM TEXT
 RELEASE TEXT
 
 [setup]

Index: tests/simplerun/runconfigs.config
==================================================================
--- tests/simplerun/runconfigs.config
+++ tests/simplerun/runconfigs.config
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 [default]
 ALLTESTS see this variable
 
 # Your variables here are grouped by targets [SYSTEM/RELEASE]
 [SYSTEM_val/RELEASE_val]

Index: tests/simplerun/test.config
==================================================================
--- tests/simplerun/test.config
+++ tests/simplerun/test.config
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 [section1]
 1 ./blah
 
 [section2]
 

Index: tests/simplerun/tests/test1/step1.logpro
==================================================================
--- tests/simplerun/tests/test1/step1.logpro
+++ tests/simplerun/tests/test1/step1.logpro
@@ -1,5 +1,22 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 ;; You should have at least one expect:required. This ensures that your process ran
 ;; (expect:required in "LogFileBody" > 0 "Put description here" #/put pattern here/)
 
 ;; You may need ignores to suppress false error or warning hits from the later expects
 ;; NOTE: Order is important here!

Index: tests/simplerun/tests/test1/step1.sh
==================================================================
--- tests/simplerun/tests/test1/step1.sh
+++ tests/simplerun/tests/test1/step1.sh
@@ -1,5 +1,22 @@
 #!/usr/bin/env bash
 
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # Run your step here
 echo Got here!
 

Index: tests/simplerun/tests/test1/step2.logpro
==================================================================
--- tests/simplerun/tests/test1/step2.logpro
+++ tests/simplerun/tests/test1/step2.logpro
@@ -1,5 +1,22 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 ;; You should have at least one expect:required. This ensures that your process ran
 ;; (expect:required in "LogFileBody" > 0 "Put description here" #/put pattern here/)
 
 ;; You may need ignores to suppress false error or warning hits from the later expects
 ;; NOTE: Order is important here!

Index: tests/simplerun/tests/test1/step2.sh
==================================================================
--- tests/simplerun/tests/test1/step2.sh
+++ tests/simplerun/tests/test1/step2.sh
@@ -1,6 +1,23 @@
 #!/usr/bin/env bash
 
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # Run your step here
 echo Got here eh!
 
 

Index: tests/simplerun/tests/test1/testconfig
==================================================================
--- tests/simplerun/tests/test1/testconfig
+++ tests/simplerun/tests/test1/testconfig
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # Add additional steps here. Format is "stepname script"
 [ezsteps]
 step1 step1.sh
 step2 step2.sh
 

Index: tests/simplerun/tests/test2/step1.logpro
==================================================================
--- tests/simplerun/tests/test2/step1.logpro
+++ tests/simplerun/tests/test2/step1.logpro
@@ -1,5 +1,22 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 ;; You should have at least one expect:required. This ensures that your process ran
 ;; (expect:required in "LogFileBody" > 0 "Put description here" #/put pattern here/)
 
 ;; You may need ignores to suppress false error or warning hits from the later expects
 ;; NOTE: Order is important here!

Index: tests/simplerun/tests/test2/step1.sh
==================================================================
--- tests/simplerun/tests/test2/step1.sh
+++ tests/simplerun/tests/test2/step1.sh
@@ -1,3 +1,20 @@
 #!/usr/bin/env bash
 
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # Run your step here

Index: tests/simplerun/tests/test2/step2.logpro
==================================================================
--- tests/simplerun/tests/test2/step2.logpro
+++ tests/simplerun/tests/test2/step2.logpro
@@ -1,5 +1,22 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 ;; You should have at least one expect:required. This ensures that your process ran
 ;; (expect:required in "LogFileBody" > 0 "Put description here" #/put pattern here/)
 
 ;; You may need ignores to suppress false error or warning hits from the later expects
 ;; NOTE: Order is important here!

Index: tests/simplerun/tests/test2/step2.sh
==================================================================
--- tests/simplerun/tests/test2/step2.sh
+++ tests/simplerun/tests/test2/step2.sh
@@ -1,3 +1,20 @@
 #!/usr/bin/env bash
 
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # Run your step here

Index: tests/simplerun/tests/test2/testconfig
==================================================================
--- tests/simplerun/tests/test2/testconfig
+++ tests/simplerun/tests/test2/testconfig
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # Add additional steps here. Format is "stepname script"
 [ezsteps]
 step1 step1.sh
 step2 step2.sh
 

Index: tests/speedtest/megatest.config
==================================================================
--- tests/speedtest/megatest.config
+++ tests/speedtest/megatest.config
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 [fields]
 sysname TEXT
 fsname TEXT
 datapath TEXT
 

Index: tests/speedtest/runconfigs.config
==================================================================
--- tests/speedtest/runconfigs.config
+++ tests/speedtest/runconfigs.config
@@ -1,3 +1,20 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 [default]
 SOMEVAR This should show up in SOMEVAR3
 

Index: tests/speedtest/tests/speedtest/main.sh
==================================================================
--- tests/speedtest/tests/speedtest/main.sh
+++ tests/speedtest/tests/speedtest/main.sh
@@ -1,6 +1,22 @@
 #!/bin/bash
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
 
 # a bunch of steps in 2 second increments
 for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17;do
   $MT_MEGATEST -step step$i :state start :status running -setlog results$i.html
   sleep $TEST_DELAY

Index: tests/speedtest/tests/speedtest/testconfig
==================================================================
--- tests/speedtest/tests/speedtest/testconfig
+++ tests/speedtest/tests/speedtest/testconfig
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 [setup]
 runscript main.sh
 
 [requirements]
 priority 1

DELETED tests/stats.txt
Index: tests/stats.txt
==================================================================
--- tests/stats.txt
+++ /dev/null
@@ -1,77 +0,0 @@
-DB Stats:  a1236d6bf92ec5cb8955f490761b21b0d3eea9d3
-========
-Cmd                                     Count   TotTime   Avg       
-get-count-tests-running-for-run-id         1035    237.0                0.23
-get-count-tests-running-in-jobgroup         884    119.0                0.13
-get-count-tests-running                     884    169.0                0.19
-get-prereqs-not-met                         884    732.0                0.83
-get-test-info-by-id                         673    122.0                0.18
-get-keys                                    476      1.0                0.00
-get-test-id                                 356     42.0                0.12
-testmeta-get-record                         203     24.0                0.12
-roll-up-pass-fail-counts                    159     39.0                0.25
-register-test                               140     30.0                0.21
-test-set-rundir-shortdir                    128     98.0                0.77
-test-set-status-state                        94     45.0                0.48
-find-and-mark-incomplete                     32      0.0                0.00
-state-status-msg                             25      4.0                0.16
-delete-tests-in-state                        12      4.0                0.33
-get-tests-for-run-mindata                     8      0.0                0.00
-get-all-run-ids                               5      2.0                0.40
-get-run-info                                  4      0.0                0.00
-register-run                                  4      5.0                1.25
-set-tests-state-status                        4     15.0                3.75
-get-tests-for-run                             4     15.0                3.75
-
-# After converting first three functions above to sqlite3:first-result
-DB Stats
-========
-Cmd                                     Count   TotTime   Avg       
-get-count-tests-running-for-run-id         1138    179.0                0.16
-get-count-tests-running-in-jobgroup         987     91.0                0.09
-get-count-tests-running                     987    171.0                0.17
-get-prereqs-not-met                         987    892.0                0.90
-get-test-info-by-id                         672     95.0                0.14
-get-keys                                    476      0.0                0.00
-get-test-id                                 355     41.0                0.12
-testmeta-get-record                         203     15.0                0.07
-roll-up-pass-fail-counts                    159     30.0                0.19
-register-test                               140     22.0                0.16
-test-set-rundir-shortdir                    128    855.0                6.68
-test-set-status-state                        94     20.0                0.21
-find-and-mark-incomplete                     36      1.0                0.03
-state-status-msg                             24      5.0                0.21
-delete-tests-in-state                        12      2.0                0.17
-get-tests-for-run-mindata                     9      0.0                0.00
-get-all-run-ids                               5      1.0                0.20
-register-run                                  4      1.0                0.25
-get-tests-for-run                             4     11.0                2.75
-get-run-info                                  4      0.0                0.00
-set-tests-state-status                        4     17.0                4.25
-
-DB Stats another run, converted one or two non-relevant functions to sqlite3:first-result
-========
-Cmd                                     Count   TotTime   Avg       
-get-count-tests-running-for-run-id          987    157.0                0.16
-get-count-tests-running-in-jobgroup         836     79.0                0.09
-get-count-tests-running                     836    121.0                0.14
-get-prereqs-not-met                         836    513.0                0.61
-get-test-info-by-id                         673     85.0                0.13
-get-keys                                    476      0.0                0.00
-get-test-id                                 356     32.0                0.09
-testmeta-get-record                         203     19.0                0.09
-roll-up-pass-fail-counts                    159     27.0                0.17
-register-test                               140     23.0                0.16
-test-set-rundir-shortdir                    128     35.0                0.27
-test-set-status-state                        94     20.0                0.21
-find-and-mark-incomplete                     40      0.0                0.00
-state-status-msg                             25      5.0                0.20
-delete-tests-in-state                        12      1.0                0.08
-get-tests-for-run-mindata                    10      0.0                0.00
-get-all-run-ids                               5      0.0                0.00
-set-tests-state-status                        4     15.0                3.75
-register-run                                  4      2.0                0.50
-get-run-info                                  4      1.0                0.25
-get-tests-for-run                             4     12.0                3.00
-
-

Index: tests/supportfiles/ruby/librunscript.rb
==================================================================
--- tests/supportfiles/ruby/librunscript.rb
+++ tests/supportfiles/ruby/librunscript.rb
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # This is the library of stuff for megatest
 
 def run_and_record(stepname, cmd, checks)
   system "megatest -step #{stepname} :state start :status n/a"
   system cmd

Index: tests/test7.logpro
==================================================================
--- tests/test7.logpro
+++ tests/test7.logpro
@@ -1,5 +1,22 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 ;; You should have at least one expect:required. This ensures that your process ran
 (expect:required in "LogFileBody" > 0 "All tests launched" #/INFO:.*All tests launched/)
 
 ;; You may need ignores to suppress false error or warning hits from the later expects
 ;; NOTE: Order is important here!

Index: tests/tests.scm
==================================================================
--- tests/tests.scm
+++ tests/tests.scm
@@ -1,14 +1,22 @@
 ;; Copyright 2006-2012, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
-
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
 ;;  strftime('%m/%d/%Y %H:%M:%S','now','localtime')
 
 (require-extension test)
 (require-extension regex)
 (require-extension srfi-18)
@@ -17,10 +25,26 @@
 (import srfi-18)
 ;; (require-extension zmq)
 ;; (import zmq)
 
 (define test-work-dir (current-directory))
+
+;; given list of lists
+;;  ( ( msg expected param1 param2 ...)
+;;    ( ... ) )
+;; apply test to all
+;;
+(define (test-batch proc pname inlst #!key (post-proc #f))
+  (for-each
+   (lambda (spec)
+     (let ((msg    (conc pname " " (car spec)))
+           (result (cadr spec))
+           (params (cddr spec)))
+       (if post-proc
+           (test msg result (post-proc (apply proc params)))
+           (test msg result (apply proc params)))))
+   inlst))
 
 ;; read in all the _record files
 (let ((files (glob "*_records.scm")))
   (for-each
    (lambda (file)

Index: tests/unit.logpro
==================================================================
--- tests/unit.logpro
+++ tests/unit.logpro
@@ -1,5 +1,22 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 ;; Ignore initial errors
 (trigger "ScriptStart" #/^Script started/)
 (trigger "TestStart"   #/^megatest> \(/)
 (section "startup"     "ScriptStart" "TestStart")
 

ADDED   tests/unittests/all-api.scm
Index: tests/unittests/all-api.scm
==================================================================
--- /dev/null
+++ tests/unittests/all-api.scm
@@ -0,0 +1,180 @@
+
+;;======================================================================
+;;  A L L - A P I 
+;;======================================================================
+
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
+
+;; Run like this:
+;;
+;; Update the following line. make unit from parent directory.
+;;  ./rununittest.sh all-api 1
+
+;; Definitions:
+;;   NTN - no test needed
+;;   DEP - function is deprecated, no point in testing
+;;   NED - function nested under others, no test needed.
+;;   DEF - deferred
+
+
+;; Issues:
+;; 1. Most of the API calls accept a string or symbol for the function name, but at least one requires a symbol.
+;;    Should we decide one way or the other, symbol or string, (seems symbol is best) and enforce that in the API? Current code:
+;;            (cmd               (if (symbol? cmd-in)
+;;				   cmd-in
+;;				   (string->symbol cmd-in)))
+;;    Just accept symbol
+;;    In the refactor, change execute-requests to only accept a symbol.
+
+;; 2. Some functions return  in element 1 of the vector. What to do about this? Fix them to return a measurable value? 
+;;    Or is there a way to make test accept ? - No.
+;;    This is why I had to use vector-ref and look at one value or the other.
+;;    Look at why functions are returning unspecified.
+;;    The last function they call returns nothing.
+
+;; 3. Some API functions call non-existent db functions. 
+;;    Delete these API functions after checking that they are not called?
+;;    Comment them out and give a date to delete. (in the refactor branch?)
+
+;; 4. get-tests-times:  no such query supported in api.scm, but it is in the list of read-only queries. Remove it? Or implement it if it's in db.scm?
+
+
+(define my-dbstruct (db:setup #t))
+(define toppath (current-directory))
+(define keypatts '(("SYSTEM" "ubuntu")("RELEASE" "v1.234")) )
+(define keys (db:get-keys my-dbstruct))
+
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'start-server (list *toppath* ))) 0))
+(test #f '() (vector-ref (api:execute-requests my-dbstruct (vector 'get-key-val-pairs (list 0 ))) 1))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'set-var (list "LAST_UPDATE"  1234567))) 0))
+(test #f 1234567 (vector-ref (api:execute-requests my-dbstruct (vector 'get-var (list "LAST_UPDATE" ))) 1))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'del-var (list "LAST_UPDATE" ))) 0))
+(test #f '("SYSTEM" "RELEASE") (vector-ref (api:execute-requests my-dbstruct (vector 'get-keys (list ))) 1))
+(test #f '() (vector-ref (api:execute-requests my-dbstruct (vector 'get-key-vals (list 1 ))) 1))
+(test #f 0 (vector-ref (api:execute-requests my-dbstruct (vector 'test-toplevel-num-items (list 1 "foo"))) 1))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'get-test-info-by-id (list 1 1))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'get-steps-info-by-id (list 1))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'get-data-info-by-id (list 1))) 0))
+(test #f  '(#t "successful login") (vector-ref (api:execute-requests my-dbstruct (vector 'login (list toppath megatest-version "Fred"))) 1))
+(test #f '(-1 . 0) (vector-ref (api:execute-requests my-dbstruct (vector 'get-latest-host-load (list "localhost"))) 1))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'get-changed-record-ids (list 0))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'get-run-record-ids (list "%" 1 keys "%/%"))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'get-not-completed-cnt (list 1))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'get-tests-tags (list ))) 0))
+(test #f '("SYSTEM" "RELEASE") (vector-ref (api:execute-requests my-dbstruct (vector 'get-keys-write (list ))) 1))
+(test #f  (vector '("SYSTEM" "RELEASE") '())(vector-ref (api:execute-requests my-dbstruct (vector 'get-targets (list 1 ))) 1))
+(test #f "" (vector-ref (api:execute-requests my-dbstruct (vector 'get-target (list 1 ))) 1))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'general-call (list 'register-test 1 1 "foo" ""))) 0))
+(test #f 1 (vector-ref (api:execute-requests my-dbstruct (vector 'get-test-id (list 1 "foo" ""))) 1))
+(test #f "/tmp/badname" (vector-ref (api:execute-requests my-dbstruct (vector 'test-get-rundir-from-test-id (list 1 1))) 1))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'set-tests-state-status (list 1 '("foo") "COMPLETED" "PASS" "NOT_STARTED" "PASS"))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'test-set-state-status-by-id (list 1 1 "COMPLETED" "PASS" "Just testing!"))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'get-tests-for-run (list 1 "%" '() '() #f #f #f #f #f #f 0 #f))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'get-tests-for-run-mindata (list 1  "%" '("COMPLETED") '("PASS") #f ))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'delete-test-records (list 1 2 ))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'test-set-state-status (list 1 1 "COMPLETED" "FAIL" "Another message" ))) 0))
+(test #f '() (vector-ref (api:execute-requests my-dbstruct (vector 'get-matching-previous-test-run-records (list 1 "foo" ""))) 1))
+(test #f '("/tmp/badname" "logs/final.log") (vector-ref (api:execute-requests my-dbstruct (vector 'test-get-logfile-info (list 1 "foo"))) 1))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'test-get-records-for-index-file (list 1 "foo"))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'get-testinfo-state-status (list 1 1))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'general-call (list 'test-set-log 1 "/tmp/another/logfile/eh" 1))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'test-set-archive-block-id (list 1 1 123))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'test-set-top-process-pid (list 1 1 123))) 0))
+(test #f 123 (vector-ref (api:execute-requests my-dbstruct (vector 'test-get-top-process-pid (list 1 1))) 1))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'get-run-ids-matching-target (list keys "%/%" #f "%" "%" "%" "%"))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'test-get-paths-matching-keynames-target-new (list 1 keys "%/%" #f "%" "%" "%" "%"))) 0))
+(test #f '() (vector-ref (api:execute-requests my-dbstruct (vector 'get-prereqs-not-met (list 1 '() "foo" "" '(normal) '()))) 1))
+(test #f 0 (vector-ref (api:execute-requests my-dbstruct (vector 'get-count-tests-running-for-run-id (list 1))) 1))
+(test #f 0 (vector-ref (api:execute-requests my-dbstruct (vector 'get-count-tests-running (list 1))) 1))
+(test #f 0 (vector-ref (api:execute-requests my-dbstruct (vector 'get-count-tests-running-for-testname (list 1 "foo"))) 1))
+(test #f 0 (vector-ref (api:execute-requests my-dbstruct (vector 'get-count-tests-running-in-jobgroup (list 1 "nada"))) 1))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'set-state-status-and-roll-up-items (list 1 "foo" "" "COMPLETED" "FAIL" "Just yet another message"))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'set-state-status-and-roll-up-run (list 1 "COMPLETED" "FAIL"))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'top-test-set-per-pf-counts (list 1 "foo"))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'get-raw-run-stats (list 1))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'get-run-info (list 1))) 0))
+(test #f 0 (vector-ref (api:execute-requests my-dbstruct (vector 'get-num-runs (list "%"))) 1))
+(test #f 0 (vector-ref (api:execute-requests my-dbstruct (vector 'get-runs-cnt-by-patt (list "%" "%/%" keys))) 1))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'register-run (list '(("SYSTEM" "ubuntu")("RELEASE" "v1.234")) "bar" "NEW" "JUSTFINE" "bobafett" "quick" ))) 0))
+(test #f #(#t "bar") (api:execute-requests my-dbstruct (vector 'get-run-name-from-id '(1))))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'delete-run (list 2))) 0)) ;; delete a non-existant run
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'update-run-stats (list 1 '()))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'get-main-run-stats (list 1 ))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'delete-old-deleted-test-records '())) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'get-runs (list "%" 10 0 keypatts))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'simple-get-runs (list "%" 10 0 keypatts))) 0))
+(test #f #(#t (1))(api:execute-requests my-dbstruct (vector 'get-all-run-ids '())))
+(test #f #(#t ()) (api:execute-requests my-dbstruct (vector 'get-prev-run-ids '(1))))
+(test #f #(#t "JUSTFINE") (api:execute-requests my-dbstruct (vector 'get-run-status '(1))))
+(test #f #(#t "NEW") (api:execute-requests my-dbstruct (vector 'get-run-state '(1))))
+(test #f #(#t (("Totals" "UNKNOWN" 1) ("bar" "UNKNOWN" 1))) (api:execute-requests my-dbstruct (vector 'get-run-stats '())))
+(test #f #(#t ()) (api:execute-requests my-dbstruct (vector 'get-run-times '(1 1 ))))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'lock/unlock-run '(1 #t #f "mikey"))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'set-run-status '(1 "NOTFINE" "A message"))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'set-run-state-status '(1 "NOTFINE" "AMESS"))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'update-run-event_time '(1))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'get-runs-by-patt (list keys "%" "%/%" #f #f #f #f "ASC"))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'get-steps-data (list 1 1))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'get-steps-for-test (list 1 1))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'delete-steps-for-test! (list 1 1))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'teststep-set-status! (list 1 1 "step1" "COMPLETED" "PASS" "force pass" "/tmp/logfile"))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'test-data-rollup (list 1 1 "COMPLETED"))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'csv->test-data (list 1 1 "some,data"))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'read-test-data (list 1 1 "%"))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'read-test-data* (list 1 1 "%" "%"))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'tasks-add (list "run" "Fred" "%" "foo" "%/%" #f))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'tasks-set-state-given-param-key (list "mykey" "COMPLETED"))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'tasks-get-last (list "%" "foo"))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'find-task-queue-records (list "%" "myrun" "%/%" "RUNNING" "run"))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'testmeta-add-record (list "foo"))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'testmeta-update-field (list "foo" "description" "junk"))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'testmeta-get-record (list "foo"))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'have-incompletes? (list 1 12000))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'mark-incomplete (list 1 12000))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'no-sync-set (list "field1" "value1"))) 0))
+(test #f "value1" (vector-ref (api:execute-requests my-dbstruct (vector 'no-sync-get/default (list "field1" #f))) 1))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'no-sync-del! (list "field1"))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'no-sync-get-lock (list "mykey"))) 0))
+(test #f 1 (vector-ref (api:execute-requests my-dbstruct (vector 'archive-register-disk (list "mydisk" "/usr/mydisk" 10000000))) 1))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'archive-register-block-name (list 1 "/usr/mydisk/myblock"))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'test-get-archive-block-info (list 1 ))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'ping (list ))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'kill-server (list ))) 0))
+
+;; api.scm calls db:get-previous-test-run-record, which does not exist.
+;;(test #f '() (vector-ref (api:execute-requests my-dbstruct (vector "get-previous-test-run-record" (list 1 ))) 1))
+
+;; no such query supported in api.scm, but it is is the list of read-only queries.
+;;(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'get-tests-times (list ))) 0))
+
+;; api.scm calls db:get-tests-for-runs-mindata, which does not exist.
+;;(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'get-tests-for-runs-mindata (list 1  "%" '("COMPLETED") '("PASS") #f ))) 0))
+
+;;This api function calls db:archive-allocate-testsuite/area-to-block, which does not exist.
+;;(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'archive-allocate-testsuite/area-to-block (list 1 "/usr/mydisk/myblock"))) 0))
+
+;;debug this: ERROR: parameter last-update for db:sync-tables must be a pair or a number, received: (0 . last_update)
+;;(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'sync-inmem->db (list 1))) 0))
+
+;;debug this. Error: bad argument count - received 0 but expected 5: #.
+
 
 ;; Run like this:
 ;;
 ;;  ./rununittest.sh all-rmt 1
 
@@ -14,14 +32,47 @@
 ;;   DEF - deferred
 
 (print "start dir: " (current-directory))
        
 (define toppath (current-directory))
-(test #f #t (string?(server:start-and-wait *toppath*)))
+
+(test #f #f (server:check-if-running toppath))           ;; these are used by server:start-and-wait
+(test #f #t (list? (server:get-list toppath)))
+(test #f '() (server:get-best '()))
+(test #f #t (common:simple-file-lock-and-wait "test.lock" expire-time: 15))
+(test #f "test.lock" (common:simple-file-release-lock "test.lock"))
+(test #f #t (server:get-best-guess-address (get-host-name)))
+(test #f #t (string? (common:get-homehost)))
+
+;; clean out any old running servers
+;;
+(let ((servers (server:get-list toppath)))
+  (print "Known servers: "  servers)
+  (if (not (null? servers))
+      (begin
+	(for-each
+	 (lambda (server)
+	   (let ((pid (list-ref server 4)))
+	     (thread-start!
+	      (make-thread
+	       (lambda ()
+		 (print "Attempting to kill server: " server)
+		 (print "Attempting to kill pid " pid)
+		 (system (conc "kill " pid))
+		 (thread-sleep! 2)
+		 (system (conc "kill -9 " pid)))
+	       (conc pid)))))
+	 servers)
+	(thread-sleep! 2))))
+;; let's start up a server the mechanical way
+(system "nbfake megatest -server -")
+(thread-sleep! 2)
+;; (test #f #t (string? (server:start-and-wait *toppath*)))
 
 (test "setup for run" #t (begin (launch:setup)
  				(string? (getenv "MT_RUN_AREA_HOME"))))
+(test #f #t (client:setup-http toppath))
 (test #f #t (vector? (client:setup toppath)))
 
 (test #f #t (vector? (rmt:get-connection-info toppath))) ;; TODO: push areapath down.
 (test #f #t (string? (server:check-if-running ".")))
 ;; DEF (test #f #f (rmt:send-receive-no-auto-client-setup *runremote* 'get-keys #f '()))
@@ -28,13 +79,24 @@
 ;; DEF (rmt:kill-server run-id)
 ;; DEF (rmt:start-server run-id)
 (test #f '(#t "successful login")(rmt:login #f))
 ;; DEF (rmt:login-no-auto-client-setup connection-info)
 (test #f #t (pair? (rmt:get-latest-host-load (get-host-name))))
+
+;; get-latest-host-load does a lookup in the db, it won't return a useful value unless
+;; a test ran recently on host
+(test-batch rmt:get-latest-host-load
+            "rmt:get-latest-host-load"
+            (list (list "localhost"  #t (get-host-name))
+                  (list "not-a-host" #t "not-a-host"  ))
+            post-proc: pair?)
+                                           
 (test #f #t (list? (rmt:get-changed-record-ids 0)))
+
 (test #f #f (begin (runs:update-all-test_meta #f) #f))
-(test #f '("test1" "test2")(sort (alist-ref "tagtwo" (hash-table->alist (rmt:get-tests-tags)) equal?) string<=))
+
+(test #f '("test1" "test2")(sort (alist-ref "tagtwo" (rmt:get-tests-tags) equal?) string<=))
 (test #f '() (rmt:get-key-val-pairs 0))
 (test #f '("SYSTEM" "RELEASE") (rmt:get-keys))
 (test #f '("SYSTEM" "RELEASE") (rmt:get-keys-write)) ;; dummy query to force server start
 (test #f '() (rmt:get-key-vals 1))
 (test #f (vector '("SYSTEM" "RELEASE") '()) (rmt:get-targets))
@@ -41,11 +103,11 @@
 (test #f "" (rmt:get-target 1))
 (test #f #t (rmt:register-test 1 "foo" ""))
 (test #f 1  (rmt:get-test-id 1 "foo" ""))
 (test #f "foo" (vector-ref (rmt:get-test-info-by-id 1 1) 2))
 (test #f "/tmp/badname" (rmt:test-get-rundir-from-test-id 1 1))
-(test #f '(1) (db:set-tests-state-status *db* 1 '("foo")  "COMPLETED" "PASS" "NOT_STARTED" "PASS"))
+;; (test #f '(1) (db:set-tests-state-status *db* 1 '("foo")  "COMPLETED" "PASS" "NOT_STARTED" "PASS")) ;; trust that this was tested in all-api
 (test #f '(1) (rmt:set-tests-state-status 1 '("foo") "COMPLETED" "PASS" "NOT_STARTED" "PASS"))
 (test #f #t (mt:test-set-state-status-by-id 1 1 "COMPLETED" "PASS" "Just testing!"))
 (test #f #t (list? (rmt:get-tests-for-run 1 "%" '() '() #f #f #f #f #f #f 0 #f)))
 (test #f #t (list? (rmt:get-tests-for-runs-mindata '(1) "%" '() '() #f)))
 (test #f #f (begin (rmt:delete-test-records 1 2) #f))
@@ -82,11 +144,42 @@
 (test #f '()(rmt:get-prev-run-ids 1))
 (test #f #t (begin (rmt:lock/unlock-run 1 #t #f "mikey") #t))
 (test #f "JUSTFINE" (rmt:get-run-status 1))
 (test #f #t (begin (rmt:set-run-status 1 "NOTFINE" msg: "A message") #t))
 (test #f #t (begin (rmt:update-run-event_time 1) #t))
+
 ;; (rmt:get-runs-by-patt  keys runnamepatt targpatt offset limit fields last-runs-update) ;; fields of #f uses default
+;;
+(let ((keys (rmt:get-keys))
+      (rnp  "%")    ;; run name patt
+      (tpt  "%/%")) ;; target patt
+  (test-batch rmt:get-runs-by-patt
+              "rmt:get-runs-by-patt"
+              (list (list "t=0" #t keys rnp tpt #f #f #f 0)
+                    (list "t=current" #f keys rnp tpt #f #f #f (+ 100 (current-seconds))) ;; should be no records from the future
+                    )
+              post-proc: (lambda (res)
+                           ;; (print "rmt:get-runs-by-patt returned: " res)
+                           (and (vector? res)
+                                (let ((rows (vector-ref res 1)))
+                                  (> (length rows) 0))))))
+
+
+(test #f '(("Totals" "UNKNOWN" 1) ("bar" "UNKNOWN" 1)) (begin (rmt:get-run-stats)))
+(test #f #t (begin (rmt:set-run-state-status 1 "COMPLETE" "PASS") #t))
+(test #f '"COMPLETE" (rmt:get-run-state 1))
+(test #f '"PASS" (rmt:get-run-status 1))
+(test #f #t (begin (rmt:set-var "foo" "bar")#t))
+(test #f "bar" (rmt:get-var "foo"))
+(test #f #t (begin (rmt:print-db-stats) #t))
+(test #f #t (begin (rmt:del-var "foo") #t))
+(test #f #f (rmt:get-var "foo"))
+(test #f (vector #f #f #f #f #f #f #f #f #f #f #f #f) (rmt:get-data-info-by-id 1))
+(test #f '() (rmt:get-key-vals 1))
+(test #f "ubuntu/v1.234" (rmt:get-target 1))
+(print (rmt:get-run-info 1))
+(test #f '((runs) (tests) (test_steps) (test_data)) (rmt:get-run-record-ids "ubuntu/v1.234" 1 '("fail_count") "bar"))
 ;; (rmt:find-and-mark-incomplete run-id ovr-deadtime)
 ;; (rmt:get-main-run-stats run-id)
 ;; (rmt:get-var varname)
 ;; (rmt:set-var varname value)
 ;; (rmt:find-and-mark-incomplete-all-runs #!key (ovr-deadtime #f))

Index: tests/unittests/basicserver.scm
==================================================================
--- tests/unittests/basicserver.scm
+++ tests/unittests/basicserver.scm
@@ -1,8 +1,24 @@
 ;;======================================================================
 ;; S E R V E R
 ;;======================================================================
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
 
 ;; Run like this:
 ;;
 ;;  ./rununittest.sh server 1;(cd simplerun;megatest -stop-server 0)
 

Index: tests/unittests/configfiles.scm
==================================================================
--- tests/unittests/configfiles.scm
+++ tests/unittests/configfiles.scm
@@ -1,8 +1,24 @@
 ;;======================================================================
 ;; C O N F I G   F I L E S 
 ;;======================================================================
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
 
 (define conffile #f)
 (test "Read a config" #t (hash-table? (read-config "test.config" #f #f)))
 (test "Read a config that doesn't exist" #t (hash-table? (read-config "nada.config" #f #f)))
 

Index: tests/unittests/cron.scm
==================================================================
--- tests/unittests/cron.scm
+++ tests/unittests/cron.scm
@@ -1,5 +1,21 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
 
 (use test)
 
 ;;                       S  M  H  MD MTH  YR WD 
 (define ref-time (vector 58 39 21 18 1   117 6  48 #f 25200))

Index: tests/unittests/dbrdbstruct.scm
==================================================================
--- tests/unittests/dbrdbstruct.scm
+++ tests/unittests/dbrdbstruct.scm
@@ -1,8 +1,25 @@
 ;;======================================================================
 ;; S E R V E R
 ;;======================================================================
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 
 ;; Run like this:
 ;;
 ;;  (cd ..;make && make install) && ./rununittest.sh server 1;(cd simplerun;megatest -stop-server 0)
 

Index: tests/unittests/inmemdb.scm
==================================================================
--- tests/unittests/inmemdb.scm
+++ tests/unittests/inmemdb.scm
@@ -1,8 +1,24 @@
 ;;======================================================================
 ;; S E R V E R
 ;;======================================================================
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
 
 ;; Run like this:
 ;;
 ;;  (cd ..;make && make install) && ./rununittest.sh server 1;(cd simplerun;megatest -stop-server 0)
 

Index: tests/unittests/misc.scm
==================================================================
--- tests/unittests/misc.scm
+++ tests/unittests/misc.scm
@@ -1,5 +1,22 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 (use sqlite3)
 
 ;;======================================================================
 ;; P R O C E S S E S
 ;;======================================================================

Index: tests/unittests/runs.scm
==================================================================
--- tests/unittests/runs.scm
+++ tests/unittests/runs.scm
@@ -1,5 +1,22 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 (define keys (rmt:get-keys))
 
 (test #f #t (and (server:kind-run *toppath*) #t))
 
 (test "get all legal tests" (list "test1" "test2") (sort (hash-table-keys (tests:get-all)) string<=?))

Index: tests/unittests/server.scm
==================================================================
--- tests/unittests/server.scm
+++ tests/unittests/server.scm
@@ -1,8 +1,25 @@
 ;;======================================================================
 ;; S E R V E R
 ;;======================================================================
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 
 ;; Run like this:
 ;;
 ;;  (cd ..;make && make install) && ./rununittest.sh server 1;(cd simplerun;megatest -stop-server 0)
 

Index: tests/unittests/tests.scm
==================================================================
--- tests/unittests/tests.scm
+++ tests/unittests/tests.scm
@@ -1,6 +1,23 @@
 ;; ;;======================================================================
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 ;; ;; itemwait, itemmatch
 ;; 
 ;; (db:compare-itempaths ref-item-path item-path itemmap)
 ;; 
 ;; ;; prereqs-not-met
@@ -12,69 +29,72 @@
 ;; 	 (non-completed   (runs:calc-not-completed prereqs-not-met))
 ;; 	 (runnables       (runs:calc-runnable prereqs-not-met)))
 ;; 
 ;; 
 ;; 
-
 (define user    (current-user-name))
 (define runname "mytestrun")
 (define keys    (rmt:get-keys))
 (define runinfo #f)
 (define keyvals '(("SYSTEM" "abc")("RELEASE" "def")))
 (define header  (list "SYSTEM" "RELEASE" "id" "runname" "state" "status" "owner" "event_time"))
+(define contour #f)
 (define run-id  1)
-
+(define new-comment #f)
 ;; Create a run
-(test #f 1 (rmt:register-run keyvals runname "new" "n/a" user))
+(test #f 1  (rmt:register-run keyvals runname "new" "n/a" user contour))
 (test #f #t (rmt:general-call 'register-test run-id run-id "test-one"   ""))
 (test #f #t (rmt:general-call 'register-test run-id run-id "test-two"   ""))
 (test #f #t (rmt:general-call 'register-test run-id run-id "test-three" ""))
 (test #f #t (rmt:general-call 'register-test run-id run-id "test-four"  ""))
 
-(rmt:test-set-state-status-by-id run-id (rmt:get-test-id run-id "test-one"   "") "COMPLETED" "FAIL" "")
-(rmt:test-set-state-status-by-id run-id (rmt:get-test-id run-id "test-two"   "") "COMPLETED" "PASS" "")
-(rmt:test-set-state-status-by-id run-id (rmt:get-test-id run-id "test-three" "") "RUNNING"   "n/a"  "")
-(rmt:test-set-state-status-by-id run-id (rmt:get-test-id run-id "test-four"  "") "COMPLETED" "WARN" "")
+
+;; (define (rmt:test-set-state-status-by-id run-id test-id newstate newstatus newcomment)
+(rmt:test-set-state-status-by-id run-id (rmt:get-test-id run-id "test-one"   "") "COMPLETED" "FAIL" new-comment)
+(rmt:test-set-state-status-by-id run-id (rmt:get-test-id run-id "test-two"   "") "COMPLETED" "PASS" new-comment)
+(rmt:test-set-state-status-by-id run-id (rmt:get-test-id run-id "test-three" "") "RUNNING"   "n/a"  new-comment)
+(rmt:test-set-state-status-by-id run-id (rmt:get-test-id run-id "test-four"  "") "COMPLETED" "WARN" new-comment)
 
-(print "MODE=not in")
-(test #f '()
+(test "MODE=not in"
+      '()
       (filter
        (lambda (y)
 	 (equal? y "FAIL")) ;; any FAIL in the output list?
        (map 
 	(lambda (x)(vector-ref x 4))
 	(rmt:get-tests-for-run run-id "%/%" '() '("FAIL") #f #f #t 'event_time "DESC" 'shortlist 0 'dashboard))))
 
-(print "MODE=in")
-(test #f '("FAIL")
+(test "MODE=in"
+      '("FAIL")
       (map 
        (lambda (x)(vector-ref x 4))
        (rmt:get-tests-for-run run-id "%/%" '() '("FAIL") #f #f #f 'event_time "DESC" 'shortlist 0 'dashboard)))
 (set! *verbosity* 1)
 
-(print "MODE=in, state in RUNNING")
 ;; (set! *verbosity* 8)
-(test #f '("RUNNING")
+(test "MODE=in, state in RUNNING" '("RUNNING")
       (map 
        (lambda (x)(vector-ref x 3))
        (rmt:get-tests-for-run run-id "%/%" '("RUNNING") '() #f #f #f 'event_time "DESC" 'shortlist 0 'dashboard)))
 (set! *verbosity* 1)
 
-(print "MODE=in, state in RUNNING and status IN WARN")
 ;; (set! *verbosity* 8)
-(test #f '(("RUNNING" . "n/a") ("COMPLETED" . "WARN"))
-      (map 
-       (lambda (x)
-	 (cons (vector-ref x 3)(vector-ref x 4)))
-       (rmt:get-tests-for-run run-id "%/%" '("RUNNING") '("WARN") #f #f #f 'event_time "DESC" 'shortlist 0 'dashboard)))
+;;(define (rmt:get-tests-for-run run-id testpatt states statuses offset limit not-in sort-by sort-order qryvals last-update mode)
+(test
+ "MODE=in, state in RUNNING and status IN WARN"
+ '(("COMPLETED" . "WARN") ("RUNNING" . "n/a") )
+ (map 
+  (lambda (x)
+    (cons (vector-ref x 3)(vector-ref x 4)))
+  (rmt:get-tests-for-run run-id "%/%" '("RUNNING") '("WARN") #f #f #f 'event_time "DESC" 'shortlist 0 'dashboard)))
 (set! *verbosity* 1)
 
-(print "MODE=not in, state in RUNNING and status IN WARN")
 (set! *verbosity* 8)
-(test #f '(("DELETED" . "n/a") ("COMPLETED" . "PASS") ("COMPLETED" . "FAIL"))
+(test "MODE=not in, state in RUNNING and status IN WARN"
+      '(("COMPLETED" . "PASS") ("COMPLETED" . "FAIL"))
       (map 
        (lambda (x)
 	 (cons (vector-ref x 3)(vector-ref x 4)))
        (rmt:get-tests-for-run run-id "%/%" '("RUNNING") '("WARN") #f #f #t 'event_time "DESC" 'shortlist 0 'dashboard)))
 (set! *verbosity* 1)
 
 (exit)

Index: tests/vectors-vs-records.scm
==================================================================
--- tests/vectors-vs-records.scm
+++ tests/vectors-vs-records.scm
@@ -1,5 +1,22 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
 (use srfi-9)
 
 (define numtodo (string->number (caddr (argv))))
 
 ;; using vectors

Index: tests/watch-monitor.sh
==================================================================
--- tests/watch-monitor.sh
+++ tests/watch-monitor.sh
@@ -1,7 +1,24 @@
 #!/bin/bash
 
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 if [ -e fullrun/db/monitor.db ];then
 sqlite3 fullrun/db/monitor.db << EOF
 .header on
 .mode column
 select * from servers order by start_time desc;

DELETED testzmq/hwclient.scm
Index: testzmq/hwclient.scm
==================================================================
--- testzmq/hwclient.scm
+++ /dev/null
@@ -1,16 +0,0 @@
-(use zmq posix srfi-18)
-
-(define s (make-socket 'req))
-(connect-socket s "tcp://*:5563")
-
-(define myname (cadr (argv)))
-
-(print "Start client...")
-
-(do ((i 0 (+ i 1)))
-    ((>= i 1000))
-  (print "sending message #" i)
-  (send-message s (conc "Hello from " myname))
-  (print "sent \"Hello\", looking for a reply")
-  (printf "Received reply ~a [~a]\n"
-          i (receive-message s)))

DELETED testzmq/hwserver.scm
Index: testzmq/hwserver.scm
==================================================================
--- testzmq/hwserver.scm
+++ /dev/null
@@ -1,28 +0,0 @@
-(use zmq srfi-18 posix)
-
-(define th1 (make-thread 
-	     (lambda ()
-	       (let ((s (make-socket 'rep)))
-		 (bind-socket s "tcp://*:5563")
-		 (print "Start server...")
-		 (let loop ()
-		   (let* ((msg  (receive-message s))
-			  (name (caddr (string-split msg " ")))
-			  (resp (conc "World " name)))
-		     (print "Received request: [" msg "]")
-		     (thread-sleep! 0.0001)
-		     (print "Sending response \"" resp "\"")
-		     (send-message s resp)
-		     (loop)))))))
-(define th2 (make-thread
-	     (lambda ()
-	       (let loop ((count 0))
-		 (print "count is " count)
-		 (thread-sleep! 0.1)
-		 (if (< count 10000)
-		     (loop (+ count 1)))))))
-
-(thread-start! th1)
-(thread-start! th2)
-
-(thread-join! th1)

DELETED testzmq/hwtest.sh
Index: testzmq/hwtest.sh
==================================================================
--- testzmq/hwtest.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-echo Compiling hwclient and hwserver
-csc hwclient.scm
-csc hwserver.scm
-
-./hwserver > hwserver.log &
-
-sleep 1
-for x in a b c d e f g h i j k l m n o p q r s t u v w x y z;do
-./hwclient $x &
-done
-
-# killall -v hwserver hwclient

DELETED testzmq/mockupclient.scm
Index: testzmq/mockupclient.scm
==================================================================
--- testzmq/mockupclient.scm
+++ /dev/null
@@ -1,42 +0,0 @@
-(use zmq posix numbers)
-
-(define cname "Bob")
-(define runtime 10)
-(let ((args (argv)))
-  (if (< (length args) 3)
-      (begin
-	(print "Usage: mockupclient clientname runtime")
-	(exit))
-      (begin
-	(set! cname (cadr args))
-	(set! runtime (string->number (caddr args))))))
-      
-;; (define start-delay (/ (random 100) 9))
-;; (define runtime     (+ 1 (/ (random 200) 2)))
-
-(print "Starting client " cname " with runtime " runtime)
-
-(include "mockupclientlib.scm")
-
-(set! endtime (+ (current-seconds) runtime))
-
-;; first ping the server to ensure we have a connection
-(if (server-ping cname 5)
-    (print "SUCCESS: Client " cname " connected to server")
-    (begin
-      (print "ERROR: Client " cname " failed ping of server, exiting")
-      (exit)))
-
-(let loop ()
-  (let ((x (random 15))
-	(varname (list-ref (list "hello" "goodbye" "saluton" "kiaorana")(random 4))))
-    (case x
-      ;; ((1)(dbaccess cname 'sync "nodat"    #f))
-      ((2 3 4 5)(dbaccess cname 'set varname (random 999)))
-      ((6 7 8 9 10)(print cname ": Get \"" varname "\" " (dbaccess cname 'get varname #f)))
-      (else
-       (thread-sleep! 0.011)))
-    (if (< (current-seconds) endtime)
-	(loop))))
-
-(print "Client " cname " all done!!")

DELETED testzmq/mockupclientlib.scm
Index: testzmq/mockupclientlib.scm
==================================================================
--- testzmq/mockupclientlib.scm
+++ /dev/null
@@ -1,63 +0,0 @@
-(define sub  (make-socket 'sub))
-(define push (make-socket 'push))
-(socket-option-set! sub 'subscribe cname)
-(socket-option-set! sub 'hwm 1000)
-(socket-option-set! push 'hwm 1000)
-
-(connect-socket sub "tcp://localhost:6563")
-(connect-socket push "tcp://localhost:6564")
-
-(thread-sleep! 0.2)
-
-(define (server-ping cname timeout)
-  (let ((msg     (conc cname ":ping:" timeout))
-	(maxtime (+ (current-seconds) timeout)))
-    (print "pinging server from " cname " with timeout " timeout)
-    (let loop ((res   #f))
-      (if (< maxtime (current-seconds))
-	  #f ;; failed to ping
-	  (if (equal? res "Got ping")
-	      #t
-	      (begin
-		(print "Ping received from server " res)
-		(send-message push msg)
-		(thread-sleep! 0.1)
-		(loop (receive-message sub non-blocking: #t))))))))
-  
-(define (dbaccess cname cmd var val #!key (numtries 20))
-  (let* ((msg (conc cname ":" cmd ":" (if val (conc var " " val) var)))
-	 (res #f)
-	 (mtx1 (make-mutex))
-	 (do-access (lambda ()
-		      (let ((tmpres #f))
-			(print "Sending msg: " msg)
-			(send-message push msg)
-			(print "Message " msg " sent")
-			(print "Client " cname " waiting for response to " msg)
-			(print "Client " cname " received address " (receive-message* sub))
-			(set! tmpres (receive-message* sub))
-			(mutex-lock! mtx1)
-			(set! res tmpres)
-			(mutex-unlock! mtx1))))
-	 (th1 (make-thread do-access "do access"))
-	 (th2 (make-thread (lambda ()
-			     (let ((result #f))
-			       (mutex-lock! mtx1)
-			       (set! result res)
-			       (mutex-unlock! mtx1)
-			       (thread-sleep! 5)
-			       (if (not result)
-				   (if (> numtries 0)
-				       (begin
-					 (print "WARNING: access timed out for " cname ", trying again. Trys remaining=" numtries)
-					 (dbaccess cname cmd var val numtries: (- numtries 1)))
-				       (begin
-					 (print "ERROR: dbaccess timed out. Exiting")
-					 (exit)))))
-			     "timeout thread"))))
-    (thread-start! th1)
-    (thread-start! th2)
-    (thread-join! th1)
-    (if res (print "SUCCESS: received " res " with " numtries " remaining possible attempts"))
-    res))
-

DELETED testzmq/mockupserver.scm
Index: testzmq/mockupserver.scm
==================================================================
--- testzmq/mockupserver.scm
+++ /dev/null
@@ -1,151 +0,0 @@
-;; pub/sub with envelope address
-;; Note that if you don't insert a sleep, the server will crash with SIGPIPE as soon
-;; as a client disconnects.  Also a remaining client may receive tons of
-;; messages afterward.
-
-(use zmq srfi-18 sqlite3 numbers)
-
-(define pub (make-socket 'pub))
-(define pull (make-socket 'pull))
-(define cname "server")
-(define total-db-accesses 0)
-(define start-time (current-seconds))
-
-(socket-option-set! pub 'hwm 1000)
-(socket-option-set! pull 'hwm 1000)
-
-(bind-socket pub "tcp://*:6563")
-(bind-socket pull "tcp://*:6564")
-
-(thread-sleep! 0.2)
-
-(define (open-db)
-  (let* ((dbpath    "mockup.db")
-	 (dbexists  (file-exists? dbpath))
-	 (db        (open-database dbpath)) ;; (never-give-up-open-db dbpath))
-	 (handler   (make-busy-timeout 10)))
-    (set-busy-handler! db handler)
-    (if (not dbexists)
-	(for-each
-	 (lambda (stmt)
-	   (execute db stmt))
-	 (list
-	  "PRAGMA SYNCHRONOUS=0;"
-	  "CREATE TABLE clients (id INTEGER PRIMARY KEY,name TEXT,num_accesses INTEGER DEFAULT 0);"
-	  "CREATE TABLE vars    (var TEXT,val TEXT,CONSTRAINT vars_constraint UNIQUE (var));")))
-    db))
-
-(define cid-cache (make-hash-table))
-
-(define (get-client-id db cname)
-  (let ((cid (hash-table-ref/default cid-cache cname #f)))
-    (if cid 
-	cid
-	(begin
-	  (execute db "INSERT OR REPLACE INTO clients (name) VALUES(?);" cname)
-	  (for-each-row 
-	   (lambda (id)
-	     (set! cid id))
-	   db
-	   "SELECT id FROM clients WHERE name=?;" cname)
-	  (hash-table-set! cid-cache cname cid)
-	  (set! total-db-accesses (+ total-db-accesses 2))
-	  cid))))
-
-(define (count-client db cname)
-  (let ((cid (get-client-id db cname)))
-    (execute db "UPDATE clients SET num_accesses=num_accesses+1 WHERE id=?;" cid)
-    (set! total-db-accesses (+ total-db-accesses 1))
-    ))
-
-(define db (open-db))
-;; (define queuelst '())
-;; (define mx1 (make-mutex))
-
-(define max-queue-len 0)
-
-(define (process-queue queuelst)
-  (let ((queuelen (length queuelst)))
-    (if (> queuelen max-queue-len)
-	(set! max-queue-len queuelen))
-    (for-each
-     (lambda (item)
-       (let ((cname (vector-ref item 1))
-	     (clcmd (vector-ref item 2))
-	     (cdata (vector-ref item 3)))
-	 (send-message pub cname send-more: #t)
-	 (send-message pub (case clcmd
-			     ((sync)
-			      (conc queuelen))
-			     ((set)
-			      (set! total-db-accesses (+ total-db-accesses 1))
-			      (apply execute db "INSERT OR REPLACE INTO vars (var,val) VALUES (?,?);" (string-split cdata))
-			      "ok")
-			     ((get)
-			      (set! total-db-accesses (+ total-db-accesses 1))
-			      (let ((res "noval"))
-				(for-each-row
-				 (lambda (val)
-				   (set! res val))
-				 db 
-				 "SELECT val FROM vars WHERE var=?;" cdata)
-				res))
-			     (else (conc "unk cmd: " clcmd))))))
-     queuelst)))
-
-;; SERVER THREAD
-(define th1 (make-thread 
-	     (lambda ()
-	       (let ((last-run 0)) ;; current-seconds when run last
-		 (let loop ((queuelst '()))
-		   (let* ((indat (receive-message* pull))
-			  (parts (string-split indat ":"))
-			  (cname (car parts))                   ;; client name
-			  (clcmd (string->symbol (cadr parts))) ;; client cmd
-			  (cdata (caddr parts))                 ;; client data
-			  (svect (vector (current-seconds) cname clcmd cdata))) ;; record for the queue
-		     ;; (print "Server received message: " indat)
-		     (count-client db cname)
-		     (case clcmd
-		       ((ping)
-			(print "Got ping from " cname)
-			(send-message pub cname send-more: #t)
-			(send-message pub "Got ping")
-			(loop queuelst))
-		       ((sync) ;; just process the queue
-			(print "Got sync from " cname)
-			(process-queue (cons svect queuelst))
-			(loop '()))
-		       ((get)
-			(process-queue (cons svect queuelst))
-			(loop '()))
-		       (else
-			(loop (cons svect queuelst))))))))
-	     "server thread"))
-
-(include "mockupclientlib.scm")
-
-;; SYNC THREAD
-;; send a sync to the pull port
-(define th2 (make-thread
-	     (lambda ()
-	       (let ((last-action-time (current-seconds)))
-		 (let loop ()
-		   (thread-sleep! 5)
-		   (let ((queuelen (string->number (dbaccess "server" 'sync "nada" #f)))
-			 (last-action-delta #f))
-		     (if (> queuelen 1)(set! last-action-time (current-seconds)))
-		     (set! last-action-delta (- (current-seconds) last-action-time))
-		     (print "Server: Got queuelen=" queuelen ", last-action-delta=" last-action-delta)
-		     (if (< last-action-delta 60)
-			 (loop)
-			 (print "Server exiting, 25 seconds since last access"))))))
-	     "sync thread"))
-
-(thread-start! th1)
-(thread-start! th2)
-(thread-join! th2)
-
-(let* ((run-time       (- (current-seconds) start-time))
-       (queries/second (/  total-db-accesses run-time)))
-  (print "Server exited! Total db accesses=" total-db-accesses " in " run-time " seconds for " queries/second " queries/second with max queue length of: " max-queue-len))

DELETED testzmq/random.scm
Index: testzmq/random.scm
==================================================================
--- testzmq/random.scm
+++ /dev/null
@@ -1,8 +0,0 @@
-(use posix numbers)
-(randomize (inexact->exact (current-seconds)))
-
-(define low (string->number (cadr (argv))))
-(define hi  (string->number (caddr (argv))))
-
-(print (+ low (random (- hi low))))
-

DELETED testzmq/testmockup.sh
Index: testzmq/testmockup.sh
==================================================================
--- testzmq/testmockup.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-
-rm -f mockup.db
-
-echo Compiling mockupserver.scm and mockupclient.scm
-
-# Clean up first
-killall mockupserver mockupclient -v
-
-csc random.scm
-csc mockupserver.scm
-csc mockupclient.scm
-
-echo Starting server
-./mockupserver &
-
-sleep 1
-
-rm -f mockupclients.log
-
-echo Starting clients
-for i in a b c d e f g h i j k l m n o p q s t u v w x y z; 
-  do
-  for k in a b;
-    do
-    for j in 0 1 2 3 4 5 6 7 8 9;
-      do
-      waittime=`./random 0 60`
-      runtime=`./random 5 120`
-      echo "Starting client $i$k$j with waittime $waittime and runtime $runtime" 
-      (sleep $waittime;./mockupclient $i$k$j $runtime) &
-      # >> mockupclients.log &
-    done
-  done
-done
-
-wait
-echo testmockup.sh script done
-# echo "Waiting for 5 seconds then killing all mockupserver and mockupclient processes"
-# sleep 30
-# killall -v mockupserver mockupclient

ADDED   trackback.scm
Index: trackback.scm
==================================================================
--- /dev/null
+++ trackback.scm
@@ -0,0 +1,53 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
+(include "codescanlib.scm")
+
+;; show call paths for named procedure
+(define (traceback-proc in-procname)
+  (letrec* ((all-scm-files (glob "*.scm"))
+            (xref (get-xref all-scm-files))
+            (have (alist-ref (string->symbol in-procname) xref eq? #f))
+            (lookup (lambda (path procname depth)
+                      (let* ((upcone-temp (filter (lambda (x)
+                                                    (eq? procname (car x)))
+                                                  xref))
+                             (upcone-temp2 (cond
+                                            ((null? upcone-temp) '())
+                                            (else (cdar upcone-temp))))
+                             (upcone (filter
+                                      (lambda (x) (not (eq? x procname)))
+                                      upcone-temp2))
+                             (uppath (cons procname path))
+                             (updepth (add1 depth)))
+                        (if (null? upcone)
+                            (print  uppath)
+                            (for-each (lambda (x)
+                                        (if (not (member procname path))
+                                            (lookup uppath x updepth) ))
+                                      upcone))))))
+           (if have
+               (lookup '() (string->symbol in-procname) 0)
+               (print "no such func - "in-procname))))
+
+
+(if (eq? 1 (length (command-line-arguments)))
+    (traceback-proc (car (command-line-arguments)))
+    (print "Usage: trackback "))
+
+(exit 0)
+    

Index: tree.scm
==================================================================
--- tree.scm
+++ tree.scm
@@ -1,14 +1,23 @@
 ;;======================================================================
 ;; Copyright 2006-2013, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
 ;;======================================================================
 
 (use format)
 (require-library iup)
 (import (prefix iup iup:))
@@ -18,17 +27,18 @@
 (import (prefix sqlite3 sqlite3:))
 
 (declare (unit tree))
 (declare (uses margs))
 (declare (uses launch))
-(declare (uses megatest-version))
+;; (declare (uses megatest-version))
 (declare (uses gutils))
 (declare (uses db))
 (declare (uses server))
-(declare (uses synchash))
+;; (declare (uses synchash))
 (declare (uses dcommon))
 
+(include "megatest-version.scm")
 (include "common_records.scm")
 (include "db_records.scm")
 (include "key_records.scm")
 
 ;;======================================================================
@@ -69,11 +79,14 @@
 (define (tree:add-node obj top nodelst #!key (userdata #f))
   (let ((curr-top (iup:attribute obj "TITLE0")))
     (if (or (not (string? curr-top))
 	    (string-null? curr-top)
 	    (string-match "^\\s*$" curr-top))
-	(iup:attribute-set! obj "ADDBRANCH0" top))
+          (iup:attribute-set! obj "ADDBRANCH0" top))
+
+
+    
     (cond
      ((not (equal? top (iup:attribute obj "TITLE0")))
       (print "ERROR: top name " top " doesn't match " (iup:attribute obj "TITLE0")))
      ((null? nodelst))
      (else

DELETED txtdb/metadat.scm
Index: txtdb/metadat.scm
==================================================================
--- txtdb/metadat.scm
+++ /dev/null
@@ -1,553 +0,0 @@
-(define minimal-sxml
-  '(*TOP* (*PI* xml "version=\"1.0\" encoding=\"UTF-8\"")
-       (http://www.gnumeric.org/v10.dtd:Workbook
-         (@ (http://www.w3.org/2001/XMLSchema-instance:schemaLocation
-              "http://www.gnumeric.org/v9.xsd"))
-         (http://www.gnumeric.org/v10.dtd:Version
-           (@ (Minor "17") (Major "10") (Full "1.10.17") (Epoch "1")))
-         (http://www.gnumeric.org/v10.dtd:Attributes
-           (http://www.gnumeric.org/v10.dtd:Attribute
-             (http://www.gnumeric.org/v10.dtd:type "4")
-             (http://www.gnumeric.org/v10.dtd:name
-               "WorkbookView::show_horizontal_scrollbar")
-             (http://www.gnumeric.org/v10.dtd:value "TRUE"))
-           (http://www.gnumeric.org/v10.dtd:Attribute
-             (http://www.gnumeric.org/v10.dtd:type "4")
-             (http://www.gnumeric.org/v10.dtd:name
-               "WorkbookView::show_vertical_scrollbar")
-             (http://www.gnumeric.org/v10.dtd:value "TRUE"))
-           (http://www.gnumeric.org/v10.dtd:Attribute
-             (http://www.gnumeric.org/v10.dtd:type "4")
-             (http://www.gnumeric.org/v10.dtd:name
-               "WorkbookView::show_notebook_tabs")
-             (http://www.gnumeric.org/v10.dtd:value "TRUE"))
-           (http://www.gnumeric.org/v10.dtd:Attribute
-             (http://www.gnumeric.org/v10.dtd:type "4")
-             (http://www.gnumeric.org/v10.dtd:name
-               "WorkbookView::do_auto_completion")
-             (http://www.gnumeric.org/v10.dtd:value "TRUE"))
-           (http://www.gnumeric.org/v10.dtd:Attribute
-             (http://www.gnumeric.org/v10.dtd:type "4")
-             (http://www.gnumeric.org/v10.dtd:name
-               "WorkbookView::is_protected")
-             (http://www.gnumeric.org/v10.dtd:value "FALSE")))
-         (urn:oasis:names:tc:opendocument:xmlns:office:1.0:document-meta
-           (@ (urn:oasis:names:tc:opendocument:xmlns:office:1.0:version "1.2"))
-           (urn:oasis:names:tc:opendocument:xmlns:office:1.0:meta
-             (http://purl.org/dc/elements/1.1/:date "2013-07-26T05:41:51Z")
-             (urn:oasis:names:tc:opendocument:xmlns:meta:1.0:creation-date
-               "2013-07-26T05:41:10Z")))
-         (http://www.gnumeric.org/v10.dtd:Calculation
-           (@ (MaxIterations "100")
-              (ManualRecalc "0")
-              (IterationTolerance "0.001")
-              (FloatRadix "2")
-              (FloatDigits "53")
-              (EnableIteration "1")))
-         (http://www.gnumeric.org/v10.dtd:SheetNameIndex
-           (http://www.gnumeric.org/v10.dtd:SheetName
-             (@ (http://www.gnumeric.org/v10.dtd:Rows "65536")
-                (http://www.gnumeric.org/v10.dtd:Cols "256"))
-             "Sheet1"))
-         (http://www.gnumeric.org/v10.dtd:Geometry
-           (@ (Width "1440") (Height "647")))
-         (http://www.gnumeric.org/v10.dtd:Sheets
-           (http://www.gnumeric.org/v10.dtd:Sheet
-             (@ (Visibility "GNM_SHEET_VISIBILITY_VISIBLE")
-                (OutlineSymbolsRight "1")
-                (OutlineSymbolsBelow "1")
-                (HideZero "0")
-                (HideRowHeader "0")
-                (HideGrid "0")
-                (HideColHeader "0")
-                (GridColor "0:0:0")
-                (DisplayOutlines "1")
-                (DisplayFormulas "0"))
-             (http://www.gnumeric.org/v10.dtd:Name "Sheet1")
-             (http://www.gnumeric.org/v10.dtd:MaxCol "-1")
-             (http://www.gnumeric.org/v10.dtd:MaxRow "-1")
-             (http://www.gnumeric.org/v10.dtd:Zoom "1")
-             (http://www.gnumeric.org/v10.dtd:Names
-               (http://www.gnumeric.org/v10.dtd:Name
-                 (http://www.gnumeric.org/v10.dtd:name "Print_Area")
-                 (http://www.gnumeric.org/v10.dtd:value "#REF!")
-                 (http://www.gnumeric.org/v10.dtd:position "A1"))
-               (http://www.gnumeric.org/v10.dtd:Name
-                 (http://www.gnumeric.org/v10.dtd:name "Sheet_Title")
-                 (http://www.gnumeric.org/v10.dtd:value "\"Sheet1\"")
-                 (http://www.gnumeric.org/v10.dtd:position "A1")))
-             (http://www.gnumeric.org/v10.dtd:PrintInformation
-               (http://www.gnumeric.org/v10.dtd:Margins
-                 (http://www.gnumeric.org/v10.dtd:top
-                   (@ (PrefUnit "mm") (Points "120")))
-                 (http://www.gnumeric.org/v10.dtd:bottom
-                   (@ (PrefUnit "mm") (Points "120")))
-                 (http://www.gnumeric.org/v10.dtd:left
-                   (@ (PrefUnit "mm") (Points "72")))
-                 (http://www.gnumeric.org/v10.dtd:right
-                   (@ (PrefUnit "mm") (Points "72")))
-                 (http://www.gnumeric.org/v10.dtd:header
-                   (@ (PrefUnit "mm") (Points "72")))
-                 (http://www.gnumeric.org/v10.dtd:footer
-                   (@ (PrefUnit "mm") (Points "72"))))
-               (http://www.gnumeric.org/v10.dtd:Scale
-                 (@ (type "percentage") (percentage "100")))
-               (http://www.gnumeric.org/v10.dtd:vcenter (@ (value "0")))
-               (http://www.gnumeric.org/v10.dtd:hcenter (@ (value "0")))
-               (http://www.gnumeric.org/v10.dtd:grid (@ (value "0")))
-               (http://www.gnumeric.org/v10.dtd:even_if_only_styles
-                 (@ (value "0")))
-               (http://www.gnumeric.org/v10.dtd:monochrome (@ (value "0")))
-               (http://www.gnumeric.org/v10.dtd:draft (@ (value "0")))
-               (http://www.gnumeric.org/v10.dtd:titles (@ (value "0")))
-               (http://www.gnumeric.org/v10.dtd:do_not_print (@ (value "0")))
-               (http://www.gnumeric.org/v10.dtd:print_range (@ (value "0")))
-               (http://www.gnumeric.org/v10.dtd:order "d_then_r")
-               (http://www.gnumeric.org/v10.dtd:orientation "portrait")
-               (http://www.gnumeric.org/v10.dtd:Header
-                 (@ (Right "") (Middle "&[TAB]") (Left "")))
-               (http://www.gnumeric.org/v10.dtd:Footer
-                 (@ (Right "") (Middle "Page &[PAGE]") (Left "")))
-               (http://www.gnumeric.org/v10.dtd:paper "na_letter")
-               (http://www.gnumeric.org/v10.dtd:comments "in_place")
-               (http://www.gnumeric.org/v10.dtd:errors "as_displayed"))
-             (http://www.gnumeric.org/v10.dtd:Styles
-               (http://www.gnumeric.org/v10.dtd:StyleRegion
-                 (@ (startRow "0")
-                    (startCol "0")
-                    (endRow "65535")
-                    (endCol "255"))
-                 (http://www.gnumeric.org/v10.dtd:Style
-                   (@ (WrapText "0")
-                      (VAlign "2")
-                      (ShrinkToFit "0")
-                      (Shade "0")
-                      (Rotation "0")
-                      (PatternColor "0:0:0")
-                      (Locked "1")
-                      (Indent "0")
-                      (Hidden "0")
-                      (HAlign "1")
-                      (Format "General")
-                      (Fore "0:0:0")
-                      (Back "FFFF:FFFF:FFFF"))
-                   (http://www.gnumeric.org/v10.dtd:Font
-                     (@ (Unit "10")
-                        (Underline "0")
-                        (StrikeThrough "0")
-                        (Script "0")
-                        (Italic "0")
-                        (Bold "0"))
-                     "Sans"))))
-             (http://www.gnumeric.org/v10.dtd:Cols (@ (DefaultSizePts "48")))
-             (http://www.gnumeric.org/v10.dtd:Rows
-               (@ (DefaultSizePts "12.75")))
-             (http://www.gnumeric.org/v10.dtd:Selections
-               (@ (CursorRow "0") (CursorCol "0"))
-               (http://www.gnumeric.org/v10.dtd:Selection
-                 (@ (startRow "0") (startCol "0") (endRow "0") (endCol "0"))))
-             (http://www.gnumeric.org/v10.dtd:Cells)
-             (http://www.gnumeric.org/v10.dtd:SheetLayout (@ (TopLeft "A1")))
-             (http://www.gnumeric.org/v10.dtd:Solver
-               (@ (ProgramR "0")
-                  (ProblemType "0")
-                  (NonNeg "1")
-                  (ModelType "0")
-                  (MaxTime "60")
-                  (MaxIter "1000")
-                  (Discr "0")
-                  (AutoScale "0")))))
-         (http://www.gnumeric.org/v10.dtd:UIData (@ (SelectedTab "0"))))))
-
-(define sheet-meta
-  '(http://www.gnumeric.org/v10.dtd:Sheet
-  (@ (Visibility "GNM_SHEET_VISIBILITY_VISIBLE")
-     (OutlineSymbolsRight "1")
-     (OutlineSymbolsBelow "1")
-     (HideZero "0")
-     (HideRowHeader "0")
-     (HideGrid "0")
-     (HideColHeader "0")
-     (GridColor "0:0:0")
-     (DisplayOutlines "1")
-     (DisplayFormulas "0"))
-  (http://www.gnumeric.org/v10.dtd:MaxCol "8")
-  (http://www.gnumeric.org/v10.dtd:MaxRow "18")
-  (http://www.gnumeric.org/v10.dtd:Zoom "1")
-  (http://www.gnumeric.org/v10.dtd:Names
-    (http://www.gnumeric.org/v10.dtd:Name
-      (http://www.gnumeric.org/v10.dtd:name "Print_Area")
-      (http://www.gnumeric.org/v10.dtd:value "#REF!")
-      (http://www.gnumeric.org/v10.dtd:position "A1"))
-    (http://www.gnumeric.org/v10.dtd:Name
-      (http://www.gnumeric.org/v10.dtd:name "Sheet_Title")
-      (http://www.gnumeric.org/v10.dtd:value "\"First_Sheet\"")
-      (http://www.gnumeric.org/v10.dtd:position "A1")))
-  (http://www.gnumeric.org/v10.dtd:PrintInformation
-    (http://www.gnumeric.org/v10.dtd:Margins
-      (http://www.gnumeric.org/v10.dtd:top
-        (@ (PrefUnit "mm") (Points "93.26")))
-      (http://www.gnumeric.org/v10.dtd:bottom
-        (@ (PrefUnit "mm") (Points "93.26")))
-      (http://www.gnumeric.org/v10.dtd:left (@ (PrefUnit "mm") (Points "72")))
-      (http://www.gnumeric.org/v10.dtd:right (@ (PrefUnit "mm") (Points "72")))
-      (http://www.gnumeric.org/v10.dtd:header
-        (@ (PrefUnit "mm") (Points "72")))
-      (http://www.gnumeric.org/v10.dtd:footer
-        (@ (PrefUnit "mm") (Points "72"))))
-    (http://www.gnumeric.org/v10.dtd:Scale
-      (@ (type "percentage") (percentage "100")))
-    (http://www.gnumeric.org/v10.dtd:vcenter (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:hcenter (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:grid (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:even_if_only_styles (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:monochrome (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:draft (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:titles (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:do_not_print (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:print_range (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:order "d_then_r")
-    (http://www.gnumeric.org/v10.dtd:orientation "portrait")
-    (http://www.gnumeric.org/v10.dtd:Header
-      (@ (Right "") (Middle "&[tab]") (Left "")))
-    (http://www.gnumeric.org/v10.dtd:Footer
-      (@ (Right "") (Middle "&[page]") (Left "")))
-    (http://www.gnumeric.org/v10.dtd:paper "na_letter")
-    (http://www.gnumeric.org/v10.dtd:comments "in_place")
-    (http://www.gnumeric.org/v10.dtd:errors "as_displayed"))
-  (http://www.gnumeric.org/v10.dtd:Styles
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "0") (startCol "0") (endRow "0") (endCol "1"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "0")
-           (Rotation "0")
-           (PatternColor "0:0:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "General")
-           (Fore "0:0:0")
-           (Back "FFFF:FFFF:FFFF"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "10")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans")))
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "1") (startCol "0") (endRow "17") (endCol "1"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "0")
-           (Rotation "0")
-           (PatternColor "0:0:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "hh\":\"mm\":\"ss AM/PM")
-           (Fore "0:0:0")
-           (Back "FFFF:FFFF:FFFF"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "10")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans")))
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "18") (startCol "0") (endRow "31") (endCol "2"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "0")
-           (Rotation "0")
-           (PatternColor "0:0:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "General")
-           (Fore "0:0:0")
-           (Back "FFFF:FFFF:FFFF"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "10")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans")))
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "32") (startCol "0") (endRow "255") (endCol "7"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "0")
-           (Rotation "0")
-           (PatternColor "0:0:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "General")
-           (Fore "0:0:0")
-           (Back "FFFF:FFFF:FFFF"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "10")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans")))
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "256") (startCol "0") (endRow "65535") (endCol "63"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "0")
-           (Rotation "0")
-           (PatternColor "0:0:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "General")
-           (Fore "0:0:0")
-           (Back "FFFF:FFFF:FFFF"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "10")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans")))
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "0") (startCol "2") (endRow "1") (endCol "2"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "0")
-           (Rotation "0")
-           (PatternColor "0:0:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "General")
-           (Fore "0:0:0")
-           (Back "FFFF:FFFF:FFFF"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "10")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans")))
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "2") (startCol "2") (endRow "17") (endCol "2"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "0")
-           (Rotation "0")
-           (PatternColor "0:0:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "0")
-           (Fore "0:0:0")
-           (Back "FFFF:FFFF:FFFF"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "10")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans")))
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "0") (startCol "3") (endRow "31") (endCol "7"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "0")
-           (Rotation "0")
-           (PatternColor "0:0:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "General")
-           (Fore "0:0:0")
-           (Back "FFFF:FFFF:FFFF"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "10")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans")))
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "0") (startCol "8") (endRow "255") (endCol "63"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "0")
-           (Rotation "0")
-           (PatternColor "0:0:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "General")
-           (Fore "0:0:0")
-           (Back "FFFF:FFFF:FFFF"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "10")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans")))
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "0") (startCol "64") (endRow "65535") (endCol "255"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "0")
-           (Rotation "0")
-           (PatternColor "0:0:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "General")
-           (Fore "0:0:0")
-           (Back "FFFF:FFFF:FFFF"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "10")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans"))))
-  (http://www.gnumeric.org/v10.dtd:Cols
-    (@ (DefaultSizePts "48"))
-    (http://www.gnumeric.org/v10.dtd:ColInfo (@ (Unit "48") (No "0")))
-    (http://www.gnumeric.org/v10.dtd:ColInfo
-      (@ (Unit "99") (No "1") (HardSize "1")))
-    (http://www.gnumeric.org/v10.dtd:ColInfo
-      (@ (Unit "64.01") (No "2") (Count "7"))))
-  (http://www.gnumeric.org/v10.dtd:Rows
-    (@ (DefaultSizePts "12.1"))
-    (http://www.gnumeric.org/v10.dtd:RowInfo (@ (Unit "12.64") (No "0")))
-    (http://www.gnumeric.org/v10.dtd:RowInfo
-      (@ (Unit "13.5") (No "1") (Count "17")))
-    (http://www.gnumeric.org/v10.dtd:RowInfo (@ (Unit "12.1") (No "18"))))
-  (http://www.gnumeric.org/v10.dtd:Selections
-    (@ (CursorRow "3") (CursorCol "1"))
-    (http://www.gnumeric.org/v10.dtd:Selection
-      (@ (startRow "3") (startCol "1") (endRow "3") (endCol "1"))))
-  (http://www.gnumeric.org/v10.dtd:SheetLayout
-    (@ (TopLeft "A2"))
-    (http://www.gnumeric.org/v10.dtd:FreezePanes
-      (@ (UnfrozenTopLeft "A2") (FrozenTopLeft "A1"))))
-  (http://www.gnumeric.org/v10.dtd:Solver
-    (@ (ProgramR "0")
-       (ProblemType "0")
-       (NonNeg "1")
-       (ModelType "0")
-       (MaxTime "60")
-       (MaxIter "1000")
-       (Discr "0")
-       (AutoScale "0")))))
-
-(define sheets-meta
-  '((@ (http://www.w3.org/2001/XMLSchema-instance:schemaLocation
-      "http://www.gnumeric.org/v9.xsd"))
- (http://www.gnumeric.org/v10.dtd:Version
-   (@ (Minor "17") (Major "10") (Full "1.10.17") (Epoch "1")))
- (http://www.gnumeric.org/v10.dtd:Attributes
-   (http://www.gnumeric.org/v10.dtd:Attribute
-     (http://www.gnumeric.org/v10.dtd:type "4")
-     (http://www.gnumeric.org/v10.dtd:name
-       "WorkbookView::show_horizontal_scrollbar")
-     (http://www.gnumeric.org/v10.dtd:value "TRUE"))
-   (http://www.gnumeric.org/v10.dtd:Attribute
-     (http://www.gnumeric.org/v10.dtd:type "4")
-     (http://www.gnumeric.org/v10.dtd:name
-       "WorkbookView::show_vertical_scrollbar")
-     (http://www.gnumeric.org/v10.dtd:value "TRUE"))
-   (http://www.gnumeric.org/v10.dtd:Attribute
-     (http://www.gnumeric.org/v10.dtd:type "4")
-     (http://www.gnumeric.org/v10.dtd:name "WorkbookView::show_notebook_tabs")
-     (http://www.gnumeric.org/v10.dtd:value "TRUE"))
-   (http://www.gnumeric.org/v10.dtd:Attribute
-     (http://www.gnumeric.org/v10.dtd:type "4")
-     (http://www.gnumeric.org/v10.dtd:name "WorkbookView::do_auto_completion")
-     (http://www.gnumeric.org/v10.dtd:value "TRUE"))
-   (http://www.gnumeric.org/v10.dtd:Attribute
-     (http://www.gnumeric.org/v10.dtd:type "4")
-     (http://www.gnumeric.org/v10.dtd:name "WorkbookView::is_protected")
-     (http://www.gnumeric.org/v10.dtd:value "FALSE")))
- (urn:oasis:names:tc:opendocument:xmlns:office:1.0:document-meta
-   (@ (urn:oasis:names:tc:opendocument:xmlns:office:1.0:version "1.2"))
-   (urn:oasis:names:tc:opendocument:xmlns:office:1.0:meta
-     (http://purl.org/dc/elements/1.1/:date "2013-07-26T04:47:02Z")
-     (urn:oasis:names:tc:opendocument:xmlns:meta:1.0:creation-date
-       "2013-07-26T04:46:14Z")))
- (http://www.gnumeric.org/v10.dtd:Calculation
-   (@ (MaxIterations "100")
-      (ManualRecalc "0")
-      (IterationTolerance "0.001")
-      (FloatRadix "2")
-      (FloatDigits "53")
-      (EnableIteration "1")))
- (http://www.gnumeric.org/v10.dtd:SheetNameIndex
-   (http://www.gnumeric.org/v10.dtd:SheetName
-     (@ (http://www.gnumeric.org/v10.dtd:Rows "65536")
-        (http://www.gnumeric.org/v10.dtd:Cols "256"))
-     "First_Sheet")
-   (http://www.gnumeric.org/v10.dtd:SheetName
-     (@ (http://www.gnumeric.org/v10.dtd:Rows "65536")
-        (http://www.gnumeric.org/v10.dtd:Cols "256"))
-     "Second-sheet")
-   (http://www.gnumeric.org/v10.dtd:SheetName
-     (@ (http://www.gnumeric.org/v10.dtd:Rows "65536")
-        (http://www.gnumeric.org/v10.dtd:Cols "256"))
-     "RunsToDo")
-   (http://www.gnumeric.org/v10.dtd:SheetName
-     (@ (http://www.gnumeric.org/v10.dtd:Rows "65536")
-        (http://www.gnumeric.org/v10.dtd:Cols "256"))
-     "RunsToLock"))
- (http://www.gnumeric.org/v10.dtd:Geometry (@ (Width "1440") (Height "647")))
- (http://www.gnumeric.org/v10.dtd:UIData (@ (SelectedTab "1")))))
-
-(define workbook-meta
-  '(*TOP* (*PI* xml "version=\"1.0\" encoding=\"UTF-8\"")))
-

DELETED txtdb/nada3/First_Sheet.dat
Index: txtdb/nada3/First_Sheet.dat
==================================================================
--- txtdb/nada3/First_Sheet.dat
+++ /dev/null
@@ -1,153 +0,0 @@
-[Time]
-BLANKVAL 
-A 0.324305555555556
-B 0.33125
-C 0.334722222222222
-D 0.336805555555556
-E 0.338888888888889
-F 0.340972222222222
-G 0.343055555555556
-H 0.345833333333333
-I 0.347916666666667
-J 0.351388888888889
-K 0.366666666666667
-L 0.379166666666667
-M 0.395833333333333
-N 0.422222222222222
-O 0.452083333333333
-P 0.491666666666667
-Q 0.570833333333333
-
-[DeltaTime]
-A 0
-B =days(B3,$B$2)*24*60
-C 
-D 
-E 
-F 
-G 
-H 
-I 
-J 
-K 
-L 
-M 
-N 
-O 
-P 
-Q 
-
-[Ambient]
-A 35.4
-B 35.4
-C 35
-D 35
-E 35
-F 35
-G 35
-H 36
-I 36
-J 37
-K 37
-L 38
-M 39
-N 40
-O 41
-P 41
-Q 41.5
-
-[Firebox]
-A 34.3
-B 72
-C 100
-D 130
-E 145
-F 150
-G 150
-H 158
-I 156
-J 152
-K 134
-L 117
-M 100
-N 91
-O 79
-P 68
-Q 51
-
-[2nd_row]
-A 34.3
-B 60
-C 90
-D 116
-E 121
-F 125
-G 128
-H 129
-I 128
-J 126
-K 117
-L 108
-M 100
-N 90
-O 78
-P 63
-Q 51
-
-[3rd_row]
-A 34.1
-B 42
-C 57
-D 69
-E 73
-F 78
-G 82
-H 86
-I 87
-J 89
-K 94
-L 96
-M 93
-N 88
-O 77
-P 64
-Q 51
-
-[4th_row]
-A 34
-B 39
-C 46
-D 52
-E 54
-F 56
-G 60
-H 62
-I 65
-J 67
-K 77
-L 82
-M 82
-N 81
-O 72
-P 62
-Q 51
-
-[Exit]
-A 34
-B 68
-C 68
-D 68
-E 68
-F 68
-G 69
-H 70
-I 72
-J 75
-K 107
-L 106
-M 106
-N 100
-O 79
-P 68
-Q 51
-

DELETED txtdb/nada3/RunsToDo.dat
Index: txtdb/nada3/RunsToDo.dat
==================================================================
--- txtdb/nada3/RunsToDo.dat
+++ /dev/null
@@ -1,15 +0,0 @@
-[a/b/c]
-123 a
-456 b
-789 c
-
-[d/e/f]
-123 e
-456 f
-789 g
-
-[g/h/i]
-123 h
-456 i
-789 j
-

DELETED txtdb/nada3/RunsToLock.dat
Index: txtdb/nada3/RunsToLock.dat
==================================================================
--- txtdb/nada3/RunsToLock.dat
+++ /dev/null
@@ -1,12 +0,0 @@
-[def]
-def def
-ghi jkl
-qrst 
-uvwx 
-yz12 
-
-[mno]
-abc 
-def xyz
-jkl 
-mnop 

DELETED txtdb/nada3/Second-sheet.dat
Index: txtdb/nada3/Second-sheet.dat
==================================================================
--- txtdb/nada3/Second-sheet.dat
+++ /dev/null
@@ -1,34 +0,0 @@
-[2]
-V2 X
-V6 Y
-V8 Z
-V12 E
-V15 B
-V17 +
-
-[A1]
-V8 Z
-V17 =
-
-# Just a test really
-#
-V1 X
-V3 X
-V5 Y
-V7 Y
-V10 Z
-V11 E
-V13 E
-V14 B
-V16 B
-[3]
-V2 John,
-V6 Tom
-V8 Fred
-V17 ~
-
-# a deeply held belief is a danger to sanity
-#
-V4 X
-row-11 Z
-row-18 B

DELETED txtdb/nada3/Sheet3.dat
Index: txtdb/nada3/Sheet3.dat
==================================================================
--- txtdb/nada3/Sheet3.dat
+++ /dev/null
@@ -1,8 +0,0 @@
-[zeroth title]
-row1name
-row2name
-
-[col1title]
-row1name row1value
-row2nameNoValue
-row3name row3value

DELETED txtdb/nada3/sheet-names.cfg
Index: txtdb/nada3/sheet-names.cfg
==================================================================
--- txtdb/nada3/sheet-names.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-First_Sheet
-Second-sheet
-RunsToDo
-RunsToLock

DELETED txtdb/nada3/sxml/First_Sheet.sxml
Index: txtdb/nada3/sxml/First_Sheet.sxml
==================================================================
--- txtdb/nada3/sxml/First_Sheet.sxml
+++ /dev/null
@@ -1,460 +0,0 @@
-(http://www.gnumeric.org/v10.dtd:Sheet
-  (@ (Visibility "GNM_SHEET_VISIBILITY_VISIBLE")
-     (OutlineSymbolsRight "1")
-     (OutlineSymbolsBelow "1")
-     (HideZero "0")
-     (HideRowHeader "0")
-     (HideGrid "0")
-     (HideColHeader "0")
-     (DisplayOutlines "1")
-     (DisplayFormulas "0"))
-  (http://www.gnumeric.org/v10.dtd:MaxCol "8")
-  (http://www.gnumeric.org/v10.dtd:MaxRow "19")
-  (http://www.gnumeric.org/v10.dtd:Zoom "1")
-  (http://www.gnumeric.org/v10.dtd:Names
-    (http://www.gnumeric.org/v10.dtd:Name
-      (http://www.gnumeric.org/v10.dtd:name "Sheet_Title")
-      (http://www.gnumeric.org/v10.dtd:value "\"First_Sheet\"")
-      (http://www.gnumeric.org/v10.dtd:position "A1"))
-    (http://www.gnumeric.org/v10.dtd:Name
-      (http://www.gnumeric.org/v10.dtd:name "Print_Area")
-      (http://www.gnumeric.org/v10.dtd:value "#REF!")
-      (http://www.gnumeric.org/v10.dtd:position "A1")))
-  (http://www.gnumeric.org/v10.dtd:PrintInformation
-    (http://www.gnumeric.org/v10.dtd:Margins
-      (http://www.gnumeric.org/v10.dtd:top
-        (@ (PrefUnit "mm") (Points "93.26")))
-      (http://www.gnumeric.org/v10.dtd:bottom
-        (@ (PrefUnit "mm") (Points "93.26")))
-      (http://www.gnumeric.org/v10.dtd:left (@ (PrefUnit "Pt") (Points "72")))
-      (http://www.gnumeric.org/v10.dtd:right (@ (PrefUnit "Pt") (Points "72")))
-      (http://www.gnumeric.org/v10.dtd:header
-        (@ (PrefUnit "Pt") (Points "72")))
-      (http://www.gnumeric.org/v10.dtd:footer
-        (@ (PrefUnit "Pt") (Points "72"))))
-    (http://www.gnumeric.org/v10.dtd:Scale
-      (@ (type "percentage") (percentage "100")))
-    (http://www.gnumeric.org/v10.dtd:vcenter (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:hcenter (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:grid (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:even_if_only_styles (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:monochrome (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:draft (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:titles (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:order "d_then_r")
-    (http://www.gnumeric.org/v10.dtd:orientation "portrait")
-    (http://www.gnumeric.org/v10.dtd:Header
-      (@ (Right "") (Middle "&[tab]") (Left "")))
-    (http://www.gnumeric.org/v10.dtd:Footer
-      (@ (Right "") (Middle "&[page]") (Left "")))
-    (http://www.gnumeric.org/v10.dtd:paper "na_letter"))
-  (http://www.gnumeric.org/v10.dtd:Styles
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "4096") (startCol "0") (endRow "65535") (endCol "63"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "0")
-           (Rotation "0")
-           (PatternColor "0:0:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "General")
-           (Fore "0:0:0")
-           (Back "FFFF:FFFF:FFFF"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "10")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans")
-        (http://www.gnumeric.org/v10.dtd:StyleBorder
-          (http://www.gnumeric.org/v10.dtd:Top (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Bottom (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Left (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Right (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Diagonal (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Rev-Diagonal (@ (Style "0"))))))
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "0") (startCol "4") (endRow "255") (endCol "15"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "0")
-           (Rotation "0")
-           (PatternColor "0:0:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "General")
-           (Fore "0:0:0")
-           (Back "FFFF:FFFF:FFFF"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "10")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans")
-        (http://www.gnumeric.org/v10.dtd:StyleBorder
-          (http://www.gnumeric.org/v10.dtd:Top (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Bottom (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Left (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Right (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Diagonal (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Rev-Diagonal (@ (Style "0"))))))
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "32") (startCol "0") (endRow "255") (endCol "3"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "0")
-           (Rotation "0")
-           (PatternColor "0:0:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "General")
-           (Fore "0:0:0")
-           (Back "FFFF:FFFF:FFFF"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "10")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans")
-        (http://www.gnumeric.org/v10.dtd:StyleBorder
-          (http://www.gnumeric.org/v10.dtd:Top (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Bottom (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Left (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Right (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Diagonal (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Rev-Diagonal (@ (Style "0"))))))
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "2") (startCol "2") (endRow "17") (endCol "2"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "0")
-           (Rotation "0")
-           (PatternColor "0:0:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "0")
-           (Fore "0:0:0")
-           (Back "FFFF:FFFF:FFFF"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "10")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans")
-        (http://www.gnumeric.org/v10.dtd:StyleBorder
-          (http://www.gnumeric.org/v10.dtd:Top (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Bottom (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Left (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Right (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Diagonal (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Rev-Diagonal (@ (Style "0"))))))
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "0") (startCol "3") (endRow "31") (endCol "3"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "0")
-           (Rotation "0")
-           (PatternColor "0:0:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "General")
-           (Fore "0:0:0")
-           (Back "FFFF:FFFF:FFFF"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "10")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans")
-        (http://www.gnumeric.org/v10.dtd:StyleBorder
-          (http://www.gnumeric.org/v10.dtd:Top (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Bottom (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Left (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Right (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Diagonal (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Rev-Diagonal (@ (Style "0"))))))
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "1") (startCol "0") (endRow "17") (endCol "1"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "0")
-           (Rotation "0")
-           (PatternColor "0:0:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "hh\":\"mm\":\"ss AM/PM")
-           (Fore "0:0:0")
-           (Back "FFFF:FFFF:FFFF"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "10")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans")
-        (http://www.gnumeric.org/v10.dtd:StyleBorder
-          (http://www.gnumeric.org/v10.dtd:Top (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Bottom (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Left (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Right (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Diagonal (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Rev-Diagonal (@ (Style "0"))))))
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "18") (startCol "0") (endRow "31") (endCol "2"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "0")
-           (Rotation "0")
-           (PatternColor "0:0:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "General")
-           (Fore "0:0:0")
-           (Back "FFFF:FFFF:FFFF"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "10")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans")
-        (http://www.gnumeric.org/v10.dtd:StyleBorder
-          (http://www.gnumeric.org/v10.dtd:Top (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Bottom (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Left (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Right (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Diagonal (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Rev-Diagonal (@ (Style "0"))))))
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "0") (startCol "16") (endRow "4095") (endCol "63"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "0")
-           (Rotation "0")
-           (PatternColor "0:0:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "General")
-           (Fore "0:0:0")
-           (Back "FFFF:FFFF:FFFF"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "10")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans")
-        (http://www.gnumeric.org/v10.dtd:StyleBorder
-          (http://www.gnumeric.org/v10.dtd:Top (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Bottom (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Left (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Right (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Diagonal (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Rev-Diagonal (@ (Style "0"))))))
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "0") (startCol "2") (endRow "1") (endCol "2"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "0")
-           (Rotation "0")
-           (PatternColor "0:0:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "General")
-           (Fore "0:0:0")
-           (Back "FFFF:FFFF:FFFF"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "10")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans")
-        (http://www.gnumeric.org/v10.dtd:StyleBorder
-          (http://www.gnumeric.org/v10.dtd:Top (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Bottom (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Left (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Right (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Diagonal (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Rev-Diagonal (@ (Style "0"))))))
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "0") (startCol "64") (endRow "65535") (endCol "255"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "0")
-           (Rotation "0")
-           (PatternColor "0:0:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "General")
-           (Fore "0:0:0")
-           (Back "FFFF:FFFF:FFFF"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "10")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans")
-        (http://www.gnumeric.org/v10.dtd:StyleBorder
-          (http://www.gnumeric.org/v10.dtd:Top (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Bottom (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Left (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Right (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Diagonal (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Rev-Diagonal (@ (Style "0"))))))
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "256") (startCol "0") (endRow "4095") (endCol "15"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "0")
-           (Rotation "0")
-           (PatternColor "0:0:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "General")
-           (Fore "0:0:0")
-           (Back "FFFF:FFFF:FFFF"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "10")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans")
-        (http://www.gnumeric.org/v10.dtd:StyleBorder
-          (http://www.gnumeric.org/v10.dtd:Top (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Bottom (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Left (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Right (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Diagonal (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Rev-Diagonal (@ (Style "0"))))))
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "0") (startCol "0") (endRow "0") (endCol "1"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "0")
-           (Rotation "0")
-           (PatternColor "0:0:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "General")
-           (Fore "0:0:0")
-           (Back "FFFF:FFFF:FFFF"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "10")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans")
-        (http://www.gnumeric.org/v10.dtd:StyleBorder
-          (http://www.gnumeric.org/v10.dtd:Top (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Bottom (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Left (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Right (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Diagonal (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Rev-Diagonal (@ (Style "0")))))))
-  (http://www.gnumeric.org/v10.dtd:Cols
-    (@ (DefaultSizePts "48"))
-    (http://www.gnumeric.org/v10.dtd:ColInfo
-      (@ (Unit "48") (No "0") (MarginB "2") (MarginA "2")))
-    (http://www.gnumeric.org/v10.dtd:ColInfo
-      (@ (Unit "99") (No "1") (MarginB "2") (MarginA "2") (HardSize "1")))
-    (http://www.gnumeric.org/v10.dtd:ColInfo
-      (@ (Unit "64.01") (No "2") (MarginB "2") (MarginA "2") (Count "7"))))
-  (http://www.gnumeric.org/v10.dtd:Rows
-    (@ (DefaultSizePts "12.1"))
-    (http://www.gnumeric.org/v10.dtd:RowInfo
-      (@ (Unit "12.64") (No "0") (MarginB "0") (MarginA "0")))
-    (http://www.gnumeric.org/v10.dtd:RowInfo
-      (@ (Unit "13.5") (No "1") (MarginB "0") (MarginA "0") (Count "17")))
-    (http://www.gnumeric.org/v10.dtd:RowInfo
-      (@ (Unit "12.1") (No "18") (MarginB "0") (MarginA "0") (Count "2"))))
-  (http://www.gnumeric.org/v10.dtd:Selections
-    (@ (CursorRow "3") (CursorCol "1"))
-    (http://www.gnumeric.org/v10.dtd:Selection
-      (@ (startRow "3") (startCol "1") (endRow "3") (endCol "1"))))
-  (http://www.gnumeric.org/v10.dtd:SheetLayout
-    (@ (TopLeft "A2"))
-    (http://www.gnumeric.org/v10.dtd:FreezePanes
-      (@ (UnfrozenTopLeft "A2") (FrozenTopLeft "A1"))))
-  (http://www.gnumeric.org/v10.dtd:Solver
-    (@ (ShowIter "0")
-       (SensitivityR "0")
-       (ProgramR "0")
-       (ProblemType "0")
-       (PerformR "0")
-       (NonNeg "1")
-       (MaxTime "60")
-       (MaxIter "1000")
-       (LimitsR "0")
-       (Discr "0")
-       (AutoScale "0")
-       (AnswerR "0"))))

DELETED txtdb/nada3/sxml/RunsToDo.sxml
Index: txtdb/nada3/sxml/RunsToDo.sxml
==================================================================
--- txtdb/nada3/sxml/RunsToDo.sxml
+++ /dev/null
@@ -1,109 +0,0 @@
-(http://www.gnumeric.org/v10.dtd:Sheet
-  (@ (Visibility "GNM_SHEET_VISIBILITY_VISIBLE")
-     (OutlineSymbolsRight "1")
-     (OutlineSymbolsBelow "1")
-     (HideZero "0")
-     (HideRowHeader "0")
-     (HideGrid "0")
-     (HideColHeader "0")
-     (DisplayOutlines "1")
-     (DisplayFormulas "0"))
-  (http://www.gnumeric.org/v10.dtd:MaxCol "3")
-  (http://www.gnumeric.org/v10.dtd:MaxRow "4")
-  (http://www.gnumeric.org/v10.dtd:Zoom "1")
-  (http://www.gnumeric.org/v10.dtd:Names
-    (http://www.gnumeric.org/v10.dtd:Name
-      (http://www.gnumeric.org/v10.dtd:name "Sheet_Title")
-      (http://www.gnumeric.org/v10.dtd:value "\"RunsToDo\"")
-      (http://www.gnumeric.org/v10.dtd:position "A1"))
-    (http://www.gnumeric.org/v10.dtd:Name
-      (http://www.gnumeric.org/v10.dtd:name "Print_Area")
-      (http://www.gnumeric.org/v10.dtd:value "#REF!")
-      (http://www.gnumeric.org/v10.dtd:position "A1")))
-  (http://www.gnumeric.org/v10.dtd:PrintInformation
-    (http://www.gnumeric.org/v10.dtd:Margins
-      (http://www.gnumeric.org/v10.dtd:top (@ (PrefUnit "mm") (Points "120")))
-      (http://www.gnumeric.org/v10.dtd:bottom
-        (@ (PrefUnit "mm") (Points "120")))
-      (http://www.gnumeric.org/v10.dtd:left (@ (PrefUnit "Pt") (Points "72")))
-      (http://www.gnumeric.org/v10.dtd:right (@ (PrefUnit "Pt") (Points "72")))
-      (http://www.gnumeric.org/v10.dtd:header
-        (@ (PrefUnit "Pt") (Points "72")))
-      (http://www.gnumeric.org/v10.dtd:footer
-        (@ (PrefUnit "Pt") (Points "72"))))
-    (http://www.gnumeric.org/v10.dtd:Scale
-      (@ (type "percentage") (percentage "100")))
-    (http://www.gnumeric.org/v10.dtd:vcenter (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:hcenter (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:grid (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:even_if_only_styles (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:monochrome (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:draft (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:titles (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:order "d_then_r")
-    (http://www.gnumeric.org/v10.dtd:orientation "portrait")
-    (http://www.gnumeric.org/v10.dtd:Header
-      (@ (Right "") (Middle "&[TAB]") (Left "")))
-    (http://www.gnumeric.org/v10.dtd:Footer
-      (@ (Right "") (Middle "Page &[PAGE]") (Left "")))
-    (http://www.gnumeric.org/v10.dtd:paper "na_letter"))
-  (http://www.gnumeric.org/v10.dtd:Styles
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "0") (startCol "0") (endRow "65535") (endCol "255"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "0")
-           (Rotation "0")
-           (PatternColor "0:0:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "General")
-           (Fore "0:0:0")
-           (Back "FFFF:FFFF:FFFF"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "10")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans")
-        (http://www.gnumeric.org/v10.dtd:StyleBorder
-          (http://www.gnumeric.org/v10.dtd:Top (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Bottom (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Left (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Right (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Diagonal (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Rev-Diagonal (@ (Style "0")))))))
-  (http://www.gnumeric.org/v10.dtd:Cols
-    (@ (DefaultSizePts "48"))
-    (http://www.gnumeric.org/v10.dtd:ColInfo
-      (@ (Unit "48") (No "0") (MarginB "2") (MarginA "2") (Count "4"))))
-  (http://www.gnumeric.org/v10.dtd:Rows
-    (@ (DefaultSizePts "12.75"))
-    (http://www.gnumeric.org/v10.dtd:RowInfo
-      (@ (Unit "13.5") (No "0") (MarginB "0") (MarginA "0") (Count "4")))
-    (http://www.gnumeric.org/v10.dtd:RowInfo
-      (@ (Unit "12.75") (No "4") (MarginB "0") (MarginA "0"))))
-  (http://www.gnumeric.org/v10.dtd:Selections
-    (@ (CursorRow "3") (CursorCol "2"))
-    (http://www.gnumeric.org/v10.dtd:Selection
-      (@ (startRow "3") (startCol "2") (endRow "3") (endCol "2"))))
-  (http://www.gnumeric.org/v10.dtd:SheetLayout (@ (TopLeft "A1")))
-  (http://www.gnumeric.org/v10.dtd:Solver
-    (@ (ShowIter "0")
-       (SensitivityR "0")
-       (ProgramR "0")
-       (ProblemType "0")
-       (PerformR "0")
-       (NonNeg "1")
-       (MaxTime "60")
-       (MaxIter "1000")
-       (LimitsR "0")
-       (Discr "0")
-       (AutoScale "0")
-       (AnswerR "0"))))

DELETED txtdb/nada3/sxml/RunsToLock.sxml
Index: txtdb/nada3/sxml/RunsToLock.sxml
==================================================================
--- txtdb/nada3/sxml/RunsToLock.sxml
+++ /dev/null
@@ -1,92 +0,0 @@
-(http://www.gnumeric.org/v10.dtd:Sheet
-  (@ (Visibility "GNM_SHEET_VISIBILITY_VISIBLE")
-     (OutlineSymbolsRight "1")
-     (OutlineSymbolsBelow "1")
-     (HideZero "0")
-     (HideRowHeader "0")
-     (HideGrid "0")
-     (HideColHeader "0")
-     (DisplayOutlines "1")
-     (DisplayFormulas "0"))
-  (http://www.gnumeric.org/v10.dtd:MaxCol "1")
-  (http://www.gnumeric.org/v10.dtd:MaxRow "1")
-  (http://www.gnumeric.org/v10.dtd:Zoom "1")
-  (http://www.gnumeric.org/v10.dtd:PrintInformation
-    (http://www.gnumeric.org/v10.dtd:Margins
-      (http://www.gnumeric.org/v10.dtd:top (@ (PrefUnit "cm") (Points "120")))
-      (http://www.gnumeric.org/v10.dtd:bottom
-        (@ (PrefUnit "cm") (Points "120"))))
-    (http://www.gnumeric.org/v10.dtd:Scale
-      (@ (type "percentage") (percentage "100")))
-    (http://www.gnumeric.org/v10.dtd:vcenter (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:hcenter (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:grid (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:even_if_only_styles (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:monochrome (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:draft (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:titles (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:order "d_then_r")
-    (http://www.gnumeric.org/v10.dtd:orientation "portrait")
-    (http://www.gnumeric.org/v10.dtd:Header
-      (@ (Right "") (Middle "&[TAB]") (Left "")))
-    (http://www.gnumeric.org/v10.dtd:Footer
-      (@ (Right "") (Middle "Page &[PAGE]") (Left ""))))
-  (http://www.gnumeric.org/v10.dtd:Styles
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "0") (startCol "0") (endRow "65535") (endCol "255"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "0")
-           (Rotation "0")
-           (PatternColor "0:0:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "General")
-           (Fore "0:0:0")
-           (Back "FFFF:FFFF:FFFF"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "10")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans")
-        (http://www.gnumeric.org/v10.dtd:StyleBorder
-          (http://www.gnumeric.org/v10.dtd:Top (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Bottom (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Left (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Right (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Diagonal (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Rev-Diagonal (@ (Style "0")))))))
-  (http://www.gnumeric.org/v10.dtd:Cols
-    (@ (DefaultSizePts "48"))
-    (http://www.gnumeric.org/v10.dtd:ColInfo
-      (@ (Unit "48") (No "0") (MarginB "2") (MarginA "2") (Count "2"))))
-  (http://www.gnumeric.org/v10.dtd:Rows
-    (@ (DefaultSizePts "12.75"))
-    (http://www.gnumeric.org/v10.dtd:RowInfo
-      (@ (Unit "12.75") (No "0") (MarginB "0") (MarginA "0") (Count "2"))))
-  (http://www.gnumeric.org/v10.dtd:Selections
-    (@ (CursorRow "0") (CursorCol "0"))
-    (http://www.gnumeric.org/v10.dtd:Selection
-      (@ (startRow "0") (startCol "0") (endRow "0") (endCol "0"))))
-  (http://www.gnumeric.org/v10.dtd:SheetLayout (@ (TopLeft "A1")))
-  (http://www.gnumeric.org/v10.dtd:Solver
-    (@ (ShowIter "0")
-       (SensitivityR "0")
-       (ProgramR "0")
-       (ProblemType "1")
-       (PerformR "0")
-       (NonNeg "1")
-       (MaxTime "0")
-       (MaxIter "0")
-       (LimitsR "0")
-       (Inputs "")
-       (Discr "0")
-       (AutoScale "0")
-       (AnswerR "0"))))

DELETED txtdb/nada3/sxml/Second-sheet.sxml
Index: txtdb/nada3/sxml/Second-sheet.sxml
==================================================================
--- txtdb/nada3/sxml/Second-sheet.sxml
+++ /dev/null
@@ -1,428 +0,0 @@
-(http://www.gnumeric.org/v10.dtd:Sheet
-  (@ (Visibility "GNM_SHEET_VISIBILITY_VISIBLE")
-     (OutlineSymbolsRight "1")
-     (OutlineSymbolsBelow "1")
-     (HideZero "0")
-     (HideRowHeader "0")
-     (HideGrid "0")
-     (HideColHeader "0")
-     (DisplayOutlines "1")
-     (DisplayFormulas "0"))
-  (http://www.gnumeric.org/v10.dtd:MaxCol "3")
-  (http://www.gnumeric.org/v10.dtd:MaxRow "21")
-  (http://www.gnumeric.org/v10.dtd:Zoom "1")
-  (http://www.gnumeric.org/v10.dtd:Names
-    (http://www.gnumeric.org/v10.dtd:Name
-      (http://www.gnumeric.org/v10.dtd:name "Sheet_Title")
-      (http://www.gnumeric.org/v10.dtd:value "\"Second-sheet\"")
-      (http://www.gnumeric.org/v10.dtd:position "A1"))
-    (http://www.gnumeric.org/v10.dtd:Name
-      (http://www.gnumeric.org/v10.dtd:name "Print_Area")
-      (http://www.gnumeric.org/v10.dtd:value "#REF!")
-      (http://www.gnumeric.org/v10.dtd:position "A1")))
-  (http://www.gnumeric.org/v10.dtd:PrintInformation
-    (http://www.gnumeric.org/v10.dtd:Margins
-      (http://www.gnumeric.org/v10.dtd:top
-        (@ (PrefUnit "mm") (Points "93.26")))
-      (http://www.gnumeric.org/v10.dtd:bottom
-        (@ (PrefUnit "mm") (Points "93.26")))
-      (http://www.gnumeric.org/v10.dtd:left (@ (PrefUnit "Pt") (Points "72")))
-      (http://www.gnumeric.org/v10.dtd:right (@ (PrefUnit "Pt") (Points "72")))
-      (http://www.gnumeric.org/v10.dtd:header
-        (@ (PrefUnit "Pt") (Points "72")))
-      (http://www.gnumeric.org/v10.dtd:footer
-        (@ (PrefUnit "Pt") (Points "72"))))
-    (http://www.gnumeric.org/v10.dtd:Scale
-      (@ (type "percentage") (percentage "100")))
-    (http://www.gnumeric.org/v10.dtd:vcenter (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:hcenter (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:grid (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:even_if_only_styles (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:monochrome (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:draft (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:titles (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:order "d_then_r")
-    (http://www.gnumeric.org/v10.dtd:orientation "portrait")
-    (http://www.gnumeric.org/v10.dtd:Header
-      (@ (Right "") (Middle "&[tab]") (Left "")))
-    (http://www.gnumeric.org/v10.dtd:Footer
-      (@ (Right "") (Middle "&[page]") (Left "")))
-    (http://www.gnumeric.org/v10.dtd:paper "na_letter"))
-  (http://www.gnumeric.org/v10.dtd:Styles
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "4096") (startCol "0") (endRow "65535") (endCol "63"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "0")
-           (Rotation "0")
-           (PatternColor "0:0:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "General")
-           (Fore "0:0:0")
-           (Back "FFFF:FFFF:FFFF"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "10")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans")
-        (http://www.gnumeric.org/v10.dtd:StyleBorder
-          (http://www.gnumeric.org/v10.dtd:Top (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Bottom (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Left (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Right (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Diagonal (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Rev-Diagonal (@ (Style "0"))))))
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "0") (startCol "4") (endRow "255") (endCol "15"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "0")
-           (Rotation "0")
-           (PatternColor "0:0:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "General")
-           (Fore "0:0:0")
-           (Back "FFFF:FFFF:FFFF"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "10")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans")
-        (http://www.gnumeric.org/v10.dtd:StyleBorder
-          (http://www.gnumeric.org/v10.dtd:Top (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Bottom (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Left (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Right (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Diagonal (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Rev-Diagonal (@ (Style "0"))))))
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "32") (startCol "0") (endRow "255") (endCol "3"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "0")
-           (Rotation "0")
-           (PatternColor "0:0:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "General")
-           (Fore "0:0:0")
-           (Back "FFFF:FFFF:FFFF"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "10")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans")
-        (http://www.gnumeric.org/v10.dtd:StyleBorder
-          (http://www.gnumeric.org/v10.dtd:Top (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Bottom (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Left (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Right (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Diagonal (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Rev-Diagonal (@ (Style "0"))))))
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "17") (startCol "3") (endRow "31") (endCol "3"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "0")
-           (Rotation "0")
-           (PatternColor "0:0:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "General")
-           (Fore "0:0:0")
-           (Back "FFFF:FFFF:FFFF"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "10")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans")
-        (http://www.gnumeric.org/v10.dtd:StyleBorder
-          (http://www.gnumeric.org/v10.dtd:Top (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Bottom (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Left (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Right (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Diagonal (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Rev-Diagonal (@ (Style "0"))))))
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "0") (startCol "0") (endRow "31") (endCol "2"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "0")
-           (Rotation "0")
-           (PatternColor "0:0:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "General")
-           (Fore "0:0:0")
-           (Back "FFFF:FFFF:FFFF"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "10")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans")
-        (http://www.gnumeric.org/v10.dtd:StyleBorder
-          (http://www.gnumeric.org/v10.dtd:Top (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Bottom (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Left (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Right (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Diagonal (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Rev-Diagonal (@ (Style "0"))))))
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "16") (startCol "3") (endRow "16") (endCol "3"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "1")
-           (Rotation "0")
-           (PatternColor "FFFF:FFFF:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "General")
-           (Fore "0:0:0")
-           (Back "FFFF:CCCC:0"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "10")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans")
-        (http://www.gnumeric.org/v10.dtd:StyleBorder
-          (http://www.gnumeric.org/v10.dtd:Top (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Bottom (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Left (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Right (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Diagonal (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Rev-Diagonal (@ (Style "0"))))))
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "0") (startCol "16") (endRow "4095") (endCol "63"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "0")
-           (Rotation "0")
-           (PatternColor "0:0:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "General")
-           (Fore "0:0:0")
-           (Back "FFFF:FFFF:FFFF"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "10")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans")
-        (http://www.gnumeric.org/v10.dtd:StyleBorder
-          (http://www.gnumeric.org/v10.dtd:Top (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Bottom (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Left (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Right (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Diagonal (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Rev-Diagonal (@ (Style "0"))))))
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "0") (startCol "64") (endRow "65535") (endCol "255"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "0")
-           (Rotation "0")
-           (PatternColor "0:0:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "General")
-           (Fore "0:0:0")
-           (Back "FFFF:FFFF:FFFF"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "10")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans")
-        (http://www.gnumeric.org/v10.dtd:StyleBorder
-          (http://www.gnumeric.org/v10.dtd:Top (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Bottom (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Left (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Right (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Diagonal (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Rev-Diagonal (@ (Style "0"))))))
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "1") (startCol "3") (endRow "15") (endCol "3"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "0")
-           (Rotation "0")
-           (PatternColor "0:0:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "General")
-           (Fore "0:0:0")
-           (Back "FFFF:FFFF:FFFF"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "10")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans")
-        (http://www.gnumeric.org/v10.dtd:StyleBorder
-          (http://www.gnumeric.org/v10.dtd:Top (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Bottom (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Left (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Right (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Diagonal (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Rev-Diagonal (@ (Style "0"))))))
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "0") (startCol "3") (endRow "0") (endCol "3"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "0")
-           (Rotation "0")
-           (PatternColor "0:0:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "General")
-           (Fore "0:0:0")
-           (Back "FFFF:FFFF:FFFF"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "28")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans")
-        (http://www.gnumeric.org/v10.dtd:StyleBorder
-          (http://www.gnumeric.org/v10.dtd:Top (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Bottom (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Left (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Right (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Diagonal (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Rev-Diagonal (@ (Style "0"))))))
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "256") (startCol "0") (endRow "4095") (endCol "15"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "0")
-           (Rotation "0")
-           (PatternColor "0:0:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "General")
-           (Fore "0:0:0")
-           (Back "FFFF:FFFF:FFFF"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "10")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans")
-        (http://www.gnumeric.org/v10.dtd:StyleBorder
-          (http://www.gnumeric.org/v10.dtd:Top (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Bottom (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Left (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Right (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Diagonal (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Rev-Diagonal (@ (Style "0")))))))
-  (http://www.gnumeric.org/v10.dtd:Cols
-    (@ (DefaultSizePts "48"))
-    (http://www.gnumeric.org/v10.dtd:ColInfo
-      (@ (Unit "64.01") (No "0") (MarginB "2") (MarginA "2")))
-    (http://www.gnumeric.org/v10.dtd:ColInfo
-      (@ (Unit "48") (No "1") (MarginB "2") (MarginA "2")))
-    (http://www.gnumeric.org/v10.dtd:ColInfo
-      (@ (Unit "99") (No "2") (MarginB "2") (MarginA "2") (HardSize "1")))
-    (http://www.gnumeric.org/v10.dtd:ColInfo
-      (@ (Unit "227.2") (No "3") (MarginB "2") (MarginA "2") (HardSize "1"))))
-  (http://www.gnumeric.org/v10.dtd:Rows
-    (@ (DefaultSizePts "12.1"))
-    (http://www.gnumeric.org/v10.dtd:RowInfo
-      (@ (Unit "60") (No "0") (MarginB "0") (MarginA "0") (HardSize "1")))
-    (http://www.gnumeric.org/v10.dtd:RowInfo
-      (@ (Unit "13.5") (No "1") (MarginB "0") (MarginA "0") (Count "17")))
-    (http://www.gnumeric.org/v10.dtd:RowInfo
-      (@ (Unit "12.1") (No "18") (MarginB "0") (MarginA "0") (Count "4"))))
-  (http://www.gnumeric.org/v10.dtd:Selections
-    (@ (CursorRow "0") (CursorCol "3"))
-    (http://www.gnumeric.org/v10.dtd:Selection
-      (@ (startRow "0") (startCol "3") (endRow "0") (endCol "3"))))
-  (http://www.gnumeric.org/v10.dtd:SheetLayout (@ (TopLeft "A1")))
-  (http://www.gnumeric.org/v10.dtd:Solver
-    (@ (ShowIter "0")
-       (SensitivityR "0")
-       (ProgramR "0")
-       (ProblemType "0")
-       (PerformR "0")
-       (NonNeg "1")
-       (MaxTime "60")
-       (MaxIter "1000")
-       (LimitsR "0")
-       (Discr "0")
-       (AutoScale "0")
-       (AnswerR "0"))))

DELETED txtdb/nada3/sxml/Sheet3.sxml
Index: txtdb/nada3/sxml/Sheet3.sxml
==================================================================
--- txtdb/nada3/sxml/Sheet3.sxml
+++ /dev/null
@@ -1,100 +0,0 @@
-(http://www.gnumeric.org/v10.dtd:Sheet
-  (@ (Visibility "GNM_SHEET_VISIBILITY_VISIBLE")
-     (OutlineSymbolsRight "1")
-     (OutlineSymbolsBelow "1")
-     (HideZero "0")
-     (HideRowHeader "0")
-     (HideGrid "0")
-     (HideColHeader "0")
-     (GridColor "0:0:0")
-     (DisplayOutlines "1")
-     (DisplayFormulas "0"))
-  (http://www.gnumeric.org/v10.dtd:MaxCol "0")
-  (http://www.gnumeric.org/v10.dtd:MaxRow "0")
-  (http://www.gnumeric.org/v10.dtd:Zoom "1")
-  (http://www.gnumeric.org/v10.dtd:Names
-    (http://www.gnumeric.org/v10.dtd:Name
-      (http://www.gnumeric.org/v10.dtd:name "Print_Area")
-      (http://www.gnumeric.org/v10.dtd:value "#REF!")
-      (http://www.gnumeric.org/v10.dtd:position "A1"))
-    (http://www.gnumeric.org/v10.dtd:Name
-      (http://www.gnumeric.org/v10.dtd:name "Sheet_Title")
-      (http://www.gnumeric.org/v10.dtd:value "\"Sheet3\"")
-      (http://www.gnumeric.org/v10.dtd:position "A1")))
-  (http://www.gnumeric.org/v10.dtd:PrintInformation
-    (http://www.gnumeric.org/v10.dtd:Margins
-      (http://www.gnumeric.org/v10.dtd:top
-        (@ (PrefUnit "mm") (Points "93.26")))
-      (http://www.gnumeric.org/v10.dtd:bottom
-        (@ (PrefUnit "mm") (Points "93.26")))
-      (http://www.gnumeric.org/v10.dtd:left (@ (PrefUnit "mm") (Points "72")))
-      (http://www.gnumeric.org/v10.dtd:right (@ (PrefUnit "mm") (Points "72")))
-      (http://www.gnumeric.org/v10.dtd:header
-        (@ (PrefUnit "mm") (Points "72")))
-      (http://www.gnumeric.org/v10.dtd:footer
-        (@ (PrefUnit "mm") (Points "72"))))
-    (http://www.gnumeric.org/v10.dtd:Scale
-      (@ (type "percentage") (percentage "100")))
-    (http://www.gnumeric.org/v10.dtd:vcenter (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:hcenter (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:grid (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:even_if_only_styles (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:monochrome (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:draft (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:titles (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:do_not_print (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:print_range (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:order "d_then_r")
-    (http://www.gnumeric.org/v10.dtd:orientation "portrait")
-    (http://www.gnumeric.org/v10.dtd:Header
-      (@ (Right "") (Middle "&[tab]") (Left "")))
-    (http://www.gnumeric.org/v10.dtd:Footer
-      (@ (Right "") (Middle "&[page]") (Left "")))
-    (http://www.gnumeric.org/v10.dtd:paper "na_letter")
-    (http://www.gnumeric.org/v10.dtd:comments "in_place")
-    (http://www.gnumeric.org/v10.dtd:errors "as_displayed"))
-  (http://www.gnumeric.org/v10.dtd:Styles
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "0") (startCol "0") (endRow "65535") (endCol "255"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "0")
-           (Rotation "0")
-           (PatternColor "0:0:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "General")
-           (Fore "0:0:0")
-           (Back "FFFF:FFFF:FFFF"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "10")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans"))))
-  (http://www.gnumeric.org/v10.dtd:Cols
-    (@ (DefaultSizePts "48"))
-    (http://www.gnumeric.org/v10.dtd:ColInfo (@ (Unit "64.01") (No "0"))))
-  (http://www.gnumeric.org/v10.dtd:Rows
-    (@ (DefaultSizePts "12.1"))
-    (http://www.gnumeric.org/v10.dtd:RowInfo (@ (Unit "12.82") (No "0"))))
-  (http://www.gnumeric.org/v10.dtd:Selections
-    (@ (CursorRow "0") (CursorCol "0"))
-    (http://www.gnumeric.org/v10.dtd:Selection
-      (@ (startRow "0") (startCol "0") (endRow "0") (endCol "0"))))
-  (http://www.gnumeric.org/v10.dtd:SheetLayout (@ (TopLeft "A1")))
-  (http://www.gnumeric.org/v10.dtd:Solver
-    (@ (ProgramR "0")
-       (ProblemType "0")
-       (NonNeg "1")
-       (ModelType "0")
-       (MaxTime "60")
-       (MaxIter "1000")
-       (Discr "0")
-       (AutoScale "0"))))

DELETED txtdb/nada3/sxml/_sheets.sxml
Index: txtdb/nada3/sxml/_sheets.sxml
==================================================================
--- txtdb/nada3/sxml/_sheets.sxml
+++ /dev/null
@@ -1,46 +0,0 @@
-((@ (http://www.w3.org/2001/XMLSchema-instance:schemaLocation
-      "http://www.gnumeric.org/v8.xsd"))
- (http://www.gnumeric.org/v10.dtd:Version
-   (@ (Minor "3") (Major "6") (Full "1.6.3") (Epoch "1")))
- (http://www.gnumeric.org/v10.dtd:Attributes
-   (http://www.gnumeric.org/v10.dtd:Attribute
-     (http://www.gnumeric.org/v10.dtd:type "4")
-     (http://www.gnumeric.org/v10.dtd:name
-       "WorkbookView::show_horizontal_scrollbar")
-     (http://www.gnumeric.org/v10.dtd:value "TRUE"))
-   (http://www.gnumeric.org/v10.dtd:Attribute
-     (http://www.gnumeric.org/v10.dtd:type "4")
-     (http://www.gnumeric.org/v10.dtd:name
-       "WorkbookView::show_vertical_scrollbar")
-     (http://www.gnumeric.org/v10.dtd:value "TRUE"))
-   (http://www.gnumeric.org/v10.dtd:Attribute
-     (http://www.gnumeric.org/v10.dtd:type "4")
-     (http://www.gnumeric.org/v10.dtd:name "WorkbookView::show_notebook_tabs")
-     (http://www.gnumeric.org/v10.dtd:value "TRUE"))
-   (http://www.gnumeric.org/v10.dtd:Attribute
-     (http://www.gnumeric.org/v10.dtd:type "4")
-     (http://www.gnumeric.org/v10.dtd:name "WorkbookView::do_auto_completion")
-     (http://www.gnumeric.org/v10.dtd:value "TRUE"))
-   (http://www.gnumeric.org/v10.dtd:Attribute
-     (http://www.gnumeric.org/v10.dtd:type "4")
-     (http://www.gnumeric.org/v10.dtd:name "WorkbookView::is_protected")
-     (http://www.gnumeric.org/v10.dtd:value "FALSE")))
- (http://www.gnumeric.org/v10.dtd:Summary
-   (http://www.gnumeric.org/v10.dtd:Item
-     (http://www.gnumeric.org/v10.dtd:name "application")
-     (http://www.gnumeric.org/v10.dtd:val-string "gnumeric"))
-   (http://www.gnumeric.org/v10.dtd:Item
-     (http://www.gnumeric.org/v10.dtd:name "author")
-     (http://www.gnumeric.org/v10.dtd:val-string "matthew.r.welland")))
- (http://www.gnumeric.org/v10.dtd:SheetNameIndex
-   (http://www.gnumeric.org/v10.dtd:SheetName "First_Sheet")
-   (http://www.gnumeric.org/v10.dtd:SheetName "Second-sheet")
-   (http://www.gnumeric.org/v10.dtd:SheetName "RunsToDo")
-   (http://www.gnumeric.org/v10.dtd:SheetName "RunsToLock"))
- (http://www.gnumeric.org/v10.dtd:Geometry (@ (Width "1440") (Height "647")))
- (http://www.gnumeric.org/v10.dtd:UIData (@ (SelectedTab "3")))
- (http://www.gnumeric.org/v10.dtd:Calculation
-   (@ (MaxIterations "100")
-      (ManualRecalc "0")
-      (IterationTolerance "0.001")
-      (EnableIteration "1"))))

DELETED txtdb/nada3/sxml/_workbook.sxml
Index: txtdb/nada3/sxml/_workbook.sxml
==================================================================
--- txtdb/nada3/sxml/_workbook.sxml
+++ /dev/null
@@ -1,1 +0,0 @@
-(*TOP* (*PI* xml "version=\"1.0\" encoding=\"UTF-8\""))

DELETED txtdb/testdata.sxml
Index: txtdb/testdata.sxml
==================================================================
--- txtdb/testdata.sxml
+++ /dev/null
@@ -1,1273 +0,0 @@
-(*TOP* (*PI* xml "version=\"1.0\" encoding=\"UTF-8\"")
-       (http://www.gnumeric.org/v10.dtd:Workbook
-         (@ (http://www.w3.org/2001/XMLSchema-instance:schemaLocation
-              "http://www.gnumeric.org/v9.xsd"))
-         (http://www.gnumeric.org/v10.dtd:Version
-           (@ (Minor "17") (Major "10") (Full "1.10.17") (Epoch "1")))
-         (http://www.gnumeric.org/v10.dtd:Attributes
-           (http://www.gnumeric.org/v10.dtd:Attribute
-             (http://www.gnumeric.org/v10.dtd:type "4")
-             (http://www.gnumeric.org/v10.dtd:name
-               "WorkbookView::show_horizontal_scrollbar")
-             (http://www.gnumeric.org/v10.dtd:value "TRUE"))
-           (http://www.gnumeric.org/v10.dtd:Attribute
-             (http://www.gnumeric.org/v10.dtd:type "4")
-             (http://www.gnumeric.org/v10.dtd:name
-               "WorkbookView::show_vertical_scrollbar")
-             (http://www.gnumeric.org/v10.dtd:value "TRUE"))
-           (http://www.gnumeric.org/v10.dtd:Attribute
-             (http://www.gnumeric.org/v10.dtd:type "4")
-             (http://www.gnumeric.org/v10.dtd:name
-               "WorkbookView::show_notebook_tabs")
-             (http://www.gnumeric.org/v10.dtd:value "TRUE"))
-           (http://www.gnumeric.org/v10.dtd:Attribute
-             (http://www.gnumeric.org/v10.dtd:type "4")
-             (http://www.gnumeric.org/v10.dtd:name
-               "WorkbookView::do_auto_completion")
-             (http://www.gnumeric.org/v10.dtd:value "TRUE"))
-           (http://www.gnumeric.org/v10.dtd:Attribute
-             (http://www.gnumeric.org/v10.dtd:type "4")
-             (http://www.gnumeric.org/v10.dtd:name
-               "WorkbookView::is_protected")
-             (http://www.gnumeric.org/v10.dtd:value "FALSE")))
-         (urn:oasis:names:tc:opendocument:xmlns:office:1.0:document-meta
-           (@ (urn:oasis:names:tc:opendocument:xmlns:office:1.0:version "1.2"))
-           (urn:oasis:names:tc:opendocument:xmlns:office:1.0:meta
-             (http://purl.org/dc/elements/1.1/:date "2013-07-14T22:32:27Z")
-             (urn:oasis:names:tc:opendocument:xmlns:meta:1.0:creation-date
-               "2013-07-13T04:38:00Z")))
-         (http://www.gnumeric.org/v10.dtd:Calculation
-           (@ (MaxIterations "100")
-              (ManualRecalc "0")
-              (IterationTolerance "0.001")
-              (FloatRadix "2")
-              (FloatDigits "53")
-              (EnableIteration "1")))
-         (http://www.gnumeric.org/v10.dtd:SheetNameIndex
-           (http://www.gnumeric.org/v10.dtd:SheetName
-             (@ (http://www.gnumeric.org/v10.dtd:Rows "65536")
-                (http://www.gnumeric.org/v10.dtd:Cols "256"))
-             "First_Sheet")
-           (http://www.gnumeric.org/v10.dtd:SheetName
-             (@ (http://www.gnumeric.org/v10.dtd:Rows "65536")
-                (http://www.gnumeric.org/v10.dtd:Cols "256"))
-             "Second-sheet")
-           (http://www.gnumeric.org/v10.dtd:SheetName
-             (@ (http://www.gnumeric.org/v10.dtd:Rows "65536")
-                (http://www.gnumeric.org/v10.dtd:Cols "256"))
-             "Sheet3"))
-         (http://www.gnumeric.org/v10.dtd:Geometry
-           (@ (Width "1440") (Height "647")))
-         (http://www.gnumeric.org/v10.dtd:Sheets
-           (http://www.gnumeric.org/v10.dtd:Sheet
-             (@ (Visibility "GNM_SHEET_VISIBILITY_VISIBLE")
-                (OutlineSymbolsRight "1")
-                (OutlineSymbolsBelow "1")
-                (HideZero "0")
-                (HideRowHeader "0")
-                (HideGrid "0")
-                (HideColHeader "0")
-                (GridColor "0:0:0")
-                (DisplayOutlines "1")
-                (DisplayFormulas "0"))
-             (http://www.gnumeric.org/v10.dtd:Name "First_Sheet")
-             (http://www.gnumeric.org/v10.dtd:MaxCol "8")
-             (http://www.gnumeric.org/v10.dtd:MaxRow "17")
-             (http://www.gnumeric.org/v10.dtd:Zoom "1")
-             (http://www.gnumeric.org/v10.dtd:Names
-               (http://www.gnumeric.org/v10.dtd:Name
-                 (http://www.gnumeric.org/v10.dtd:name "Print_Area")
-                 (http://www.gnumeric.org/v10.dtd:value "#REF!")
-                 (http://www.gnumeric.org/v10.dtd:position "A1"))
-               (http://www.gnumeric.org/v10.dtd:Name
-                 (http://www.gnumeric.org/v10.dtd:name "Sheet_Title")
-                 (http://www.gnumeric.org/v10.dtd:value "\"First_Sheet\"")
-                 (http://www.gnumeric.org/v10.dtd:position "A1")))
-             (http://www.gnumeric.org/v10.dtd:PrintInformation
-               (http://www.gnumeric.org/v10.dtd:Margins
-                 (http://www.gnumeric.org/v10.dtd:top
-                   (@ (PrefUnit "mm") (Points "93.26")))
-                 (http://www.gnumeric.org/v10.dtd:bottom
-                   (@ (PrefUnit "mm") (Points "93.26")))
-                 (http://www.gnumeric.org/v10.dtd:left
-                   (@ (PrefUnit "mm") (Points "72")))
-                 (http://www.gnumeric.org/v10.dtd:right
-                   (@ (PrefUnit "mm") (Points "72")))
-                 (http://www.gnumeric.org/v10.dtd:header
-                   (@ (PrefUnit "mm") (Points "72")))
-                 (http://www.gnumeric.org/v10.dtd:footer
-                   (@ (PrefUnit "mm") (Points "72"))))
-               (http://www.gnumeric.org/v10.dtd:Scale
-                 (@ (type "percentage") (percentage "100")))
-               (http://www.gnumeric.org/v10.dtd:vcenter (@ (value "0")))
-               (http://www.gnumeric.org/v10.dtd:hcenter (@ (value "0")))
-               (http://www.gnumeric.org/v10.dtd:grid (@ (value "0")))
-               (http://www.gnumeric.org/v10.dtd:even_if_only_styles
-                 (@ (value "0")))
-               (http://www.gnumeric.org/v10.dtd:monochrome (@ (value "0")))
-               (http://www.gnumeric.org/v10.dtd:draft (@ (value "0")))
-               (http://www.gnumeric.org/v10.dtd:titles (@ (value "0")))
-               (http://www.gnumeric.org/v10.dtd:do_not_print (@ (value "0")))
-               (http://www.gnumeric.org/v10.dtd:print_range (@ (value "0")))
-               (http://www.gnumeric.org/v10.dtd:order "d_then_r")
-               (http://www.gnumeric.org/v10.dtd:orientation "portrait")
-               (http://www.gnumeric.org/v10.dtd:Header
-                 (@ (Right "") (Middle "&[tab]") (Left "")))
-               (http://www.gnumeric.org/v10.dtd:Footer
-                 (@ (Right "") (Middle "&[page]") (Left "")))
-               (http://www.gnumeric.org/v10.dtd:paper "na_letter")
-               (http://www.gnumeric.org/v10.dtd:comments "in_place")
-               (http://www.gnumeric.org/v10.dtd:errors "as_displayed"))
-             (http://www.gnumeric.org/v10.dtd:Styles
-               (http://www.gnumeric.org/v10.dtd:StyleRegion
-                 (@ (startRow "0") (startCol "0") (endRow "0") (endCol "1"))
-                 (http://www.gnumeric.org/v10.dtd:Style
-                   (@ (WrapText "0")
-                      (VAlign "2")
-                      (ShrinkToFit "0")
-                      (Shade "0")
-                      (Rotation "0")
-                      (PatternColor "0:0:0")
-                      (Locked "1")
-                      (Indent "0")
-                      (Hidden "0")
-                      (HAlign "1")
-                      (Format "General")
-                      (Fore "0:0:0")
-                      (Back "FFFF:FFFF:FFFF"))
-                   (http://www.gnumeric.org/v10.dtd:Font
-                     (@ (Unit "10")
-                        (Underline "0")
-                        (StrikeThrough "0")
-                        (Script "0")
-                        (Italic "0")
-                        (Bold "0"))
-                     "Sans")))
-               (http://www.gnumeric.org/v10.dtd:StyleRegion
-                 (@ (startRow "1") (startCol "0") (endRow "17") (endCol "1"))
-                 (http://www.gnumeric.org/v10.dtd:Style
-                   (@ (WrapText "0")
-                      (VAlign "2")
-                      (ShrinkToFit "0")
-                      (Shade "0")
-                      (Rotation "0")
-                      (PatternColor "0:0:0")
-                      (Locked "1")
-                      (Indent "0")
-                      (Hidden "0")
-                      (HAlign "1")
-                      (Format "hh\":\"mm\":\"ss AM/PM")
-                      (Fore "0:0:0")
-                      (Back "FFFF:FFFF:FFFF"))
-                   (http://www.gnumeric.org/v10.dtd:Font
-                     (@ (Unit "10")
-                        (Underline "0")
-                        (StrikeThrough "0")
-                        (Script "0")
-                        (Italic "0")
-                        (Bold "0"))
-                     "Sans")))
-               (http://www.gnumeric.org/v10.dtd:StyleRegion
-                 (@ (startRow "18") (startCol "0") (endRow "31") (endCol "2"))
-                 (http://www.gnumeric.org/v10.dtd:Style
-                   (@ (WrapText "0")
-                      (VAlign "2")
-                      (ShrinkToFit "0")
-                      (Shade "0")
-                      (Rotation "0")
-                      (PatternColor "0:0:0")
-                      (Locked "1")
-                      (Indent "0")
-                      (Hidden "0")
-                      (HAlign "1")
-                      (Format "General")
-                      (Fore "0:0:0")
-                      (Back "FFFF:FFFF:FFFF"))
-                   (http://www.gnumeric.org/v10.dtd:Font
-                     (@ (Unit "10")
-                        (Underline "0")
-                        (StrikeThrough "0")
-                        (Script "0")
-                        (Italic "0")
-                        (Bold "0"))
-                     "Sans")))
-               (http://www.gnumeric.org/v10.dtd:StyleRegion
-                 (@ (startRow "32") (startCol "0") (endRow "255") (endCol "7"))
-                 (http://www.gnumeric.org/v10.dtd:Style
-                   (@ (WrapText "0")
-                      (VAlign "2")
-                      (ShrinkToFit "0")
-                      (Shade "0")
-                      (Rotation "0")
-                      (PatternColor "0:0:0")
-                      (Locked "1")
-                      (Indent "0")
-                      (Hidden "0")
-                      (HAlign "1")
-                      (Format "General")
-                      (Fore "0:0:0")
-                      (Back "FFFF:FFFF:FFFF"))
-                   (http://www.gnumeric.org/v10.dtd:Font
-                     (@ (Unit "10")
-                        (Underline "0")
-                        (StrikeThrough "0")
-                        (Script "0")
-                        (Italic "0")
-                        (Bold "0"))
-                     "Sans")))
-               (http://www.gnumeric.org/v10.dtd:StyleRegion
-                 (@ (startRow "256")
-                    (startCol "0")
-                    (endRow "65535")
-                    (endCol "63"))
-                 (http://www.gnumeric.org/v10.dtd:Style
-                   (@ (WrapText "0")
-                      (VAlign "2")
-                      (ShrinkToFit "0")
-                      (Shade "0")
-                      (Rotation "0")
-                      (PatternColor "0:0:0")
-                      (Locked "1")
-                      (Indent "0")
-                      (Hidden "0")
-                      (HAlign "1")
-                      (Format "General")
-                      (Fore "0:0:0")
-                      (Back "FFFF:FFFF:FFFF"))
-                   (http://www.gnumeric.org/v10.dtd:Font
-                     (@ (Unit "10")
-                        (Underline "0")
-                        (StrikeThrough "0")
-                        (Script "0")
-                        (Italic "0")
-                        (Bold "0"))
-                     "Sans")))
-               (http://www.gnumeric.org/v10.dtd:StyleRegion
-                 (@ (startRow "0") (startCol "2") (endRow "1") (endCol "2"))
-                 (http://www.gnumeric.org/v10.dtd:Style
-                   (@ (WrapText "0")
-                      (VAlign "2")
-                      (ShrinkToFit "0")
-                      (Shade "0")
-                      (Rotation "0")
-                      (PatternColor "0:0:0")
-                      (Locked "1")
-                      (Indent "0")
-                      (Hidden "0")
-                      (HAlign "1")
-                      (Format "General")
-                      (Fore "0:0:0")
-                      (Back "FFFF:FFFF:FFFF"))
-                   (http://www.gnumeric.org/v10.dtd:Font
-                     (@ (Unit "10")
-                        (Underline "0")
-                        (StrikeThrough "0")
-                        (Script "0")
-                        (Italic "0")
-                        (Bold "0"))
-                     "Sans")))
-               (http://www.gnumeric.org/v10.dtd:StyleRegion
-                 (@ (startRow "2") (startCol "2") (endRow "17") (endCol "2"))
-                 (http://www.gnumeric.org/v10.dtd:Style
-                   (@ (WrapText "0")
-                      (VAlign "2")
-                      (ShrinkToFit "0")
-                      (Shade "0")
-                      (Rotation "0")
-                      (PatternColor "0:0:0")
-                      (Locked "1")
-                      (Indent "0")
-                      (Hidden "0")
-                      (HAlign "1")
-                      (Format "0")
-                      (Fore "0:0:0")
-                      (Back "FFFF:FFFF:FFFF"))
-                   (http://www.gnumeric.org/v10.dtd:Font
-                     (@ (Unit "10")
-                        (Underline "0")
-                        (StrikeThrough "0")
-                        (Script "0")
-                        (Italic "0")
-                        (Bold "0"))
-                     "Sans")))
-               (http://www.gnumeric.org/v10.dtd:StyleRegion
-                 (@ (startRow "0") (startCol "3") (endRow "31") (endCol "7"))
-                 (http://www.gnumeric.org/v10.dtd:Style
-                   (@ (WrapText "0")
-                      (VAlign "2")
-                      (ShrinkToFit "0")
-                      (Shade "0")
-                      (Rotation "0")
-                      (PatternColor "0:0:0")
-                      (Locked "1")
-                      (Indent "0")
-                      (Hidden "0")
-                      (HAlign "1")
-                      (Format "General")
-                      (Fore "0:0:0")
-                      (Back "FFFF:FFFF:FFFF"))
-                   (http://www.gnumeric.org/v10.dtd:Font
-                     (@ (Unit "10")
-                        (Underline "0")
-                        (StrikeThrough "0")
-                        (Script "0")
-                        (Italic "0")
-                        (Bold "0"))
-                     "Sans")))
-               (http://www.gnumeric.org/v10.dtd:StyleRegion
-                 (@ (startRow "0") (startCol "8") (endRow "255") (endCol "63"))
-                 (http://www.gnumeric.org/v10.dtd:Style
-                   (@ (WrapText "0")
-                      (VAlign "2")
-                      (ShrinkToFit "0")
-                      (Shade "0")
-                      (Rotation "0")
-                      (PatternColor "0:0:0")
-                      (Locked "1")
-                      (Indent "0")
-                      (Hidden "0")
-                      (HAlign "1")
-                      (Format "General")
-                      (Fore "0:0:0")
-                      (Back "FFFF:FFFF:FFFF"))
-                   (http://www.gnumeric.org/v10.dtd:Font
-                     (@ (Unit "10")
-                        (Underline "0")
-                        (StrikeThrough "0")
-                        (Script "0")
-                        (Italic "0")
-                        (Bold "0"))
-                     "Sans")))
-               (http://www.gnumeric.org/v10.dtd:StyleRegion
-                 (@ (startRow "0")
-                    (startCol "64")
-                    (endRow "65535")
-                    (endCol "255"))
-                 (http://www.gnumeric.org/v10.dtd:Style
-                   (@ (WrapText "0")
-                      (VAlign "2")
-                      (ShrinkToFit "0")
-                      (Shade "0")
-                      (Rotation "0")
-                      (PatternColor "0:0:0")
-                      (Locked "1")
-                      (Indent "0")
-                      (Hidden "0")
-                      (HAlign "1")
-                      (Format "General")
-                      (Fore "0:0:0")
-                      (Back "FFFF:FFFF:FFFF"))
-                   (http://www.gnumeric.org/v10.dtd:Font
-                     (@ (Unit "10")
-                        (Underline "0")
-                        (StrikeThrough "0")
-                        (Script "0")
-                        (Italic "0")
-                        (Bold "0"))
-                     "Sans"))))
-             (http://www.gnumeric.org/v10.dtd:Cols
-               (@ (DefaultSizePts "48"))
-               (http://www.gnumeric.org/v10.dtd:ColInfo
-                 (@ (Unit "48") (No "0")))
-               (http://www.gnumeric.org/v10.dtd:ColInfo
-                 (@ (Unit "99") (No "1") (HardSize "1")))
-               (http://www.gnumeric.org/v10.dtd:ColInfo
-                 (@ (Unit "64.01") (No "2") (Count "7"))))
-             (http://www.gnumeric.org/v10.dtd:Rows
-               (@ (DefaultSizePts "12.1"))
-               (http://www.gnumeric.org/v10.dtd:RowInfo
-                 (@ (Unit "12.64") (No "0")))
-               (http://www.gnumeric.org/v10.dtd:RowInfo
-                 (@ (Unit "13.5") (No "1") (Count "17"))))
-             (http://www.gnumeric.org/v10.dtd:Selections
-               (@ (CursorRow "29") (CursorCol "1"))
-               (http://www.gnumeric.org/v10.dtd:Selection
-                 (@ (startRow "29")
-                    (startCol "1")
-                    (endRow "29")
-                    (endCol "1"))))
-             (http://www.gnumeric.org/v10.dtd:Cells
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "0") (Col "1"))
-                 "Time")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "0") (Col "2"))
-                 "DeltaTime")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "0") (Col "3"))
-                 "Ambient")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "0") (Col "4"))
-                 "Firebox")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "0") (Col "5"))
-                 "2nd row")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "0") (Col "6"))
-                 "3rd row")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "0") (Col "7"))
-                 "4th row")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "0") (Col "8"))
-                 "Exit ")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "1") (Col "0"))
-                 "A")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "1") (Col "1"))
-                 "0.32430555555555557")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "1") (Col "2"))
-                 "0")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "1") (Col "3"))
-                 "35.399999999999999")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "1") (Col "4"))
-                 "34.299999999999997")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "1") (Col "5"))
-                 "34.299999999999997")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "1") (Col "6"))
-                 "34.100000000000001")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "1") (Col "7"))
-                 "34")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "1") (Col "8"))
-                 "34")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "2") (Col "0"))
-                 "B")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "2") (Col "1"))
-                 "0.33124999999999999")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (Row "2") (ExprID "1") (Col "2"))
-                 "=days(B3,$B$2)*24*60")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "2") (Col "3"))
-                 "35.399999999999999")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "2") (Col "4"))
-                 "72")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "2") (Col "5"))
-                 "60")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "2") (Col "6"))
-                 "42")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "2") (Col "7"))
-                 "39")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "2") (Col "8"))
-                 "68")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "3") (Col "0"))
-                 "C")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "3") (Col "1"))
-                 "0.3347222222222222")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (Row "3") (ExprID "1") (Col "2")))
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "3") (Col "3"))
-                 "35")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "3") (Col "4"))
-                 "100")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "3") (Col "5"))
-                 "90")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "3") (Col "6"))
-                 "57")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "3") (Col "7"))
-                 "46")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "3") (Col "8"))
-                 "68")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "4") (Col "0"))
-                 "D")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "4") (Col "1"))
-                 "0.33680555555555558")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (Row "4") (ExprID "1") (Col "2")))
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "4") (Col "3"))
-                 "35")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "4") (Col "4"))
-                 "130")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "4") (Col "5"))
-                 "116")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "4") (Col "6"))
-                 "69")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "4") (Col "7"))
-                 "52")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "4") (Col "8"))
-                 "68")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "5") (Col "0"))
-                 "E")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "5") (Col "1"))
-                 "0.33888888888888891")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (Row "5") (ExprID "1") (Col "2")))
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "5") (Col "3"))
-                 "35")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "5") (Col "4"))
-                 "145")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "5") (Col "5"))
-                 "121")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "5") (Col "6"))
-                 "73")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "5") (Col "7"))
-                 "54")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "5") (Col "8"))
-                 "68")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "6") (Col "0"))
-                 "F")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "6") (Col "1"))
-                 "0.34097222222222223")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (Row "6") (ExprID "1") (Col "2")))
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "6") (Col "3"))
-                 "35")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "6") (Col "4"))
-                 "150")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "6") (Col "5"))
-                 "125")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "6") (Col "6"))
-                 "78")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "6") (Col "7"))
-                 "56")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "6") (Col "8"))
-                 "68")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "7") (Col "0"))
-                 "G")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "7") (Col "1"))
-                 "0.34305555555555556")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (Row "7") (ExprID "1") (Col "2")))
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "7") (Col "3"))
-                 "35")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "7") (Col "4"))
-                 "150")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "7") (Col "5"))
-                 "128")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "7") (Col "6"))
-                 "82")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "7") (Col "7"))
-                 "60")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "7") (Col "8"))
-                 "69")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "8") (Col "0"))
-                 "H")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "8") (Col "1"))
-                 "0.34583333333333333")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (Row "8") (ExprID "1") (Col "2")))
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "8") (Col "3"))
-                 "36")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "8") (Col "4"))
-                 "158")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "8") (Col "5"))
-                 "129")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "8") (Col "6"))
-                 "86")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "8") (Col "7"))
-                 "62")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "8") (Col "8"))
-                 "70")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "9") (Col "0"))
-                 "I")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "9") (Col "1"))
-                 "0.34791666666666665")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (Row "9") (ExprID "1") (Col "2")))
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "9") (Col "3"))
-                 "36")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "9") (Col "4"))
-                 "156")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "9") (Col "5"))
-                 "128")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "9") (Col "6"))
-                 "87")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "9") (Col "7"))
-                 "65")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "9") (Col "8"))
-                 "72")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "10") (Col "0"))
-                 "J")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "10") (Col "1"))
-                 "0.35138888888888886")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (Row "10") (ExprID "1") (Col "2")))
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "10") (Col "3"))
-                 "37")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "10") (Col "4"))
-                 "152")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "10") (Col "5"))
-                 "126")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "10") (Col "6"))
-                 "89")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "10") (Col "7"))
-                 "67")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "10") (Col "8"))
-                 "75")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "11") (Col "0"))
-                 "K")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "11") (Col "1"))
-                 "0.36666666666666664")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (Row "11") (ExprID "1") (Col "2")))
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "11") (Col "3"))
-                 "37")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "11") (Col "4"))
-                 "134")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "11") (Col "5"))
-                 "117")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "11") (Col "6"))
-                 "94")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "11") (Col "7"))
-                 "77")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "11") (Col "8"))
-                 "107")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "12") (Col "0"))
-                 "L")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "12") (Col "1"))
-                 "0.37916666666666665")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (Row "12") (ExprID "1") (Col "2")))
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "12") (Col "3"))
-                 "38")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "12") (Col "4"))
-                 "117")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "12") (Col "5"))
-                 "108")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "12") (Col "6"))
-                 "96")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "12") (Col "7"))
-                 "82")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "12") (Col "8"))
-                 "106")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "13") (Col "0"))
-                 "M")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "13") (Col "1"))
-                 "0.39583333333333331")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (Row "13") (ExprID "1") (Col "2")))
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "13") (Col "3"))
-                 "39")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "13") (Col "4"))
-                 "100")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "13") (Col "5"))
-                 "100")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "13") (Col "6"))
-                 "93")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "13") (Col "7"))
-                 "82")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "13") (Col "8"))
-                 "106")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "14") (Col "0"))
-                 "N")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "14") (Col "1"))
-                 "0.42222222222222222")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (Row "14") (ExprID "1") (Col "2")))
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "14") (Col "3"))
-                 "40")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "14") (Col "4"))
-                 "91")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "14") (Col "5"))
-                 "90")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "14") (Col "6"))
-                 "88")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "14") (Col "7"))
-                 "81")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "14") (Col "8"))
-                 "100")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "15") (Col "0"))
-                 "O")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "15") (Col "1"))
-                 "0.45208333333333334")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (Row "15") (ExprID "1") (Col "2")))
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "15") (Col "3"))
-                 "41")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "15") (Col "4"))
-                 "79")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "15") (Col "5"))
-                 "78")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "15") (Col "6"))
-                 "77")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "15") (Col "7"))
-                 "72")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "15") (Col "8"))
-                 "79")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "16") (Col "0"))
-                 "P")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "16") (Col "1"))
-                 "0.49166666666666664")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (Row "16") (ExprID "1") (Col "2")))
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "16") (Col "3"))
-                 "41")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "16") (Col "4"))
-                 "68")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "16") (Col "5"))
-                 "63")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "16") (Col "6"))
-                 "64")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "16") (Col "7"))
-                 "62")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "16") (Col "8"))
-                 "68")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "17") (Col "0"))
-                 "Q")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "17") (Col "1"))
-                 "0.5708333333333333")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (Row "17") (ExprID "1") (Col "2")))
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "17") (Col "3"))
-                 "41.5")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "17") (Col "4"))
-                 "51")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "17") (Col "5"))
-                 "51")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "17") (Col "6"))
-                 "51")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "17") (Col "7"))
-                 "51")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "17") (Col "8"))
-                 "51"))
-             (http://www.gnumeric.org/v10.dtd:SheetLayout (@ (TopLeft "A1")))
-             (http://www.gnumeric.org/v10.dtd:Solver
-               (@ (ProgramR "0")
-                  (ProblemType "0")
-                  (NonNeg "1")
-                  (ModelType "0")
-                  (MaxTime "60")
-                  (MaxIter "1000")
-                  (Discr "0")
-                  (AutoScale "0"))))
-           (http://www.gnumeric.org/v10.dtd:Sheet
-             (@ (Visibility "GNM_SHEET_VISIBILITY_VISIBLE")
-                (OutlineSymbolsRight "1")
-                (OutlineSymbolsBelow "1")
-                (HideZero "0")
-                (HideRowHeader "0")
-                (HideGrid "0")
-                (HideColHeader "0")
-                (GridColor "0:0:0")
-                (DisplayOutlines "1")
-                (DisplayFormulas "0"))
-             (http://www.gnumeric.org/v10.dtd:Name "Second-sheet")
-             (http://www.gnumeric.org/v10.dtd:MaxCol "4")
-             (http://www.gnumeric.org/v10.dtd:MaxRow "20")
-             (http://www.gnumeric.org/v10.dtd:Zoom "1")
-             (http://www.gnumeric.org/v10.dtd:Names
-               (http://www.gnumeric.org/v10.dtd:Name
-                 (http://www.gnumeric.org/v10.dtd:name "Print_Area")
-                 (http://www.gnumeric.org/v10.dtd:value "#REF!")
-                 (http://www.gnumeric.org/v10.dtd:position "A1"))
-               (http://www.gnumeric.org/v10.dtd:Name
-                 (http://www.gnumeric.org/v10.dtd:name "Sheet_Title")
-                 (http://www.gnumeric.org/v10.dtd:value "\"Second-sheet\"")
-                 (http://www.gnumeric.org/v10.dtd:position "A1")))
-             (http://www.gnumeric.org/v10.dtd:PrintInformation
-               (http://www.gnumeric.org/v10.dtd:Margins
-                 (http://www.gnumeric.org/v10.dtd:top
-                   (@ (PrefUnit "mm") (Points "93.26")))
-                 (http://www.gnumeric.org/v10.dtd:bottom
-                   (@ (PrefUnit "mm") (Points "93.26")))
-                 (http://www.gnumeric.org/v10.dtd:left
-                   (@ (PrefUnit "mm") (Points "72")))
-                 (http://www.gnumeric.org/v10.dtd:right
-                   (@ (PrefUnit "mm") (Points "72")))
-                 (http://www.gnumeric.org/v10.dtd:header
-                   (@ (PrefUnit "mm") (Points "72")))
-                 (http://www.gnumeric.org/v10.dtd:footer
-                   (@ (PrefUnit "mm") (Points "72"))))
-               (http://www.gnumeric.org/v10.dtd:Scale
-                 (@ (type "percentage") (percentage "100")))
-               (http://www.gnumeric.org/v10.dtd:vcenter (@ (value "0")))
-               (http://www.gnumeric.org/v10.dtd:hcenter (@ (value "0")))
-               (http://www.gnumeric.org/v10.dtd:grid (@ (value "0")))
-               (http://www.gnumeric.org/v10.dtd:even_if_only_styles
-                 (@ (value "0")))
-               (http://www.gnumeric.org/v10.dtd:monochrome (@ (value "0")))
-               (http://www.gnumeric.org/v10.dtd:draft (@ (value "0")))
-               (http://www.gnumeric.org/v10.dtd:titles (@ (value "0")))
-               (http://www.gnumeric.org/v10.dtd:do_not_print (@ (value "0")))
-               (http://www.gnumeric.org/v10.dtd:print_range (@ (value "0")))
-               (http://www.gnumeric.org/v10.dtd:order "d_then_r")
-               (http://www.gnumeric.org/v10.dtd:orientation "portrait")
-               (http://www.gnumeric.org/v10.dtd:Header
-                 (@ (Right "") (Middle "&[tab]") (Left "")))
-               (http://www.gnumeric.org/v10.dtd:Footer
-                 (@ (Right "") (Middle "&[page]") (Left "")))
-               (http://www.gnumeric.org/v10.dtd:paper "na_letter")
-               (http://www.gnumeric.org/v10.dtd:comments "in_place")
-               (http://www.gnumeric.org/v10.dtd:errors "as_displayed"))
-             (http://www.gnumeric.org/v10.dtd:Styles
-               (http://www.gnumeric.org/v10.dtd:StyleRegion
-                 (@ (startRow "0")
-                    (startCol "0")
-                    (endRow "65279")
-                    (endCol "255"))
-                 (http://www.gnumeric.org/v10.dtd:Style
-                   (@ (WrapText "0")
-                      (VAlign "2")
-                      (ShrinkToFit "0")
-                      (Shade "0")
-                      (Rotation "0")
-                      (PatternColor "0:0:0")
-                      (Locked "1")
-                      (Indent "0")
-                      (Hidden "0")
-                      (HAlign "1")
-                      (Format "General")
-                      (Fore "0:0:0")
-                      (Back "FFFF:FFFF:FFFF"))
-                   (http://www.gnumeric.org/v10.dtd:Font
-                     (@ (Unit "10")
-                        (Underline "0")
-                        (StrikeThrough "0")
-                        (Script "0")
-                        (Italic "0")
-                        (Bold "0"))
-                     "Sans")))
-               (http://www.gnumeric.org/v10.dtd:StyleRegion
-                 (@ (startRow "65280")
-                    (startCol "0")
-                    (endRow "65534")
-                    (endCol "255"))
-                 (http://www.gnumeric.org/v10.dtd:Style
-                   (@ (WrapText "0")
-                      (VAlign "2")
-                      (ShrinkToFit "0")
-                      (Shade "0")
-                      (Rotation "0")
-                      (PatternColor "0:0:0")
-                      (Locked "1")
-                      (Indent "0")
-                      (Hidden "0")
-                      (HAlign "1")
-                      (Format "General")
-                      (Fore "0:0:0")
-                      (Back "FFFF:FFFF:FFFF"))
-                   (http://www.gnumeric.org/v10.dtd:Font
-                     (@ (Unit "10")
-                        (Underline "0")
-                        (StrikeThrough "0")
-                        (Script "0")
-                        (Italic "0")
-                        (Bold "0"))
-                     "Sans")))
-               (http://www.gnumeric.org/v10.dtd:StyleRegion
-                 (@ (startRow "65535")
-                    (startCol "0")
-                    (endRow "65535")
-                    (endCol "255"))
-                 (http://www.gnumeric.org/v10.dtd:Style
-                   (@ (WrapText "0")
-                      (VAlign "2")
-                      (ShrinkToFit "0")
-                      (Shade "0")
-                      (Rotation "0")
-                      (PatternColor "0:0:0")
-                      (Locked "1")
-                      (Indent "0")
-                      (Hidden "0")
-                      (HAlign "1")
-                      (Format "General")
-                      (Fore "0:0:0")
-                      (Back "FFFF:FFFF:FFFF"))
-                   (http://www.gnumeric.org/v10.dtd:Font
-                     (@ (Unit "10")
-                        (Underline "0")
-                        (StrikeThrough "0")
-                        (Script "0")
-                        (Italic "0")
-                        (Bold "0"))
-                     "Sans"))))
-             (http://www.gnumeric.org/v10.dtd:Cols
-               (@ (DefaultSizePts "48"))
-               (http://www.gnumeric.org/v10.dtd:ColInfo
-                 (@ (Unit "64.01") (No "0")))
-               (http://www.gnumeric.org/v10.dtd:ColInfo
-                 (@ (Unit "48") (No "1") (Count "4"))))
-             (http://www.gnumeric.org/v10.dtd:Rows
-               (@ (DefaultSizePts "12.1"))
-               (http://www.gnumeric.org/v10.dtd:RowInfo
-                 (@ (Unit "13.5") (No "0") (Count "20"))))
-             (http://www.gnumeric.org/v10.dtd:Selections
-               (@ (CursorRow "4") (CursorCol "4"))
-               (http://www.gnumeric.org/v10.dtd:Selection
-                 (@ (startRow "4") (startCol "4") (endRow "4") (endCol "4"))))
-             (http://www.gnumeric.org/v10.dtd:Cells
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "0") (Col "1"))
-                 "A1")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "0") (Col "2"))
-                 "2")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "0") (Col "3"))
-                 "A1")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "0") (Col "4"))
-                 "3")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "1") (Col "0"))
-                 "V1")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "1") (Col "1"))
-                 "X")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "2") (Col "0"))
-                 "V2")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "2") (Col "2"))
-                 "X")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "3") (Col "0"))
-                 "V3")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "3") (Col "3"))
-                 "X")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "4") (Col "0"))
-                 "V4")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "4") (Col "4"))
-                 "X")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "5") (Col "0"))
-                 "V5")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "5") (Col "3"))
-                 "Y")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "6") (Col "0"))
-                 "V6")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "6") (Col "2"))
-                 "Y")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "7") (Col "0"))
-                 "V7")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "7") (Col "1"))
-                 "Y")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "8") (Col "0"))
-                 "V8")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "8") (Col "1"))
-                 "Z")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "9") (Col "0"))
-                 "V8")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "9") (Col "2"))
-                 "Z")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "10") (Col "0"))
-                 "V10")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "10") (Col "3"))
-                 "Z")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "11") (Col "4"))
-                 "Z")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "12") (Col "0"))
-                 "V11")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "12") (Col "3"))
-                 "E")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "13") (Col "0"))
-                 "V12")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "13") (Col "2"))
-                 "E")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "14") (Col "0"))
-                 "V13")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "14") (Col "1"))
-                 "E")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "15") (Col "0"))
-                 "V14")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "15") (Col "1"))
-                 "B")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "16") (Col "0"))
-                 "V15")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "16") (Col "2"))
-                 "B")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "17") (Col "0"))
-                 "V16")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "17") (Col "3"))
-                 "B")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "18") (Col "4"))
-                 "B")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "19") (Col "0"))
-                 "V17")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "19") (Col "1"))
-                 "-")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "19") (Col "2"))
-                 "+")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "19") (Col "3"))
-                 "=")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "19") (Col "4"))
-                 "~"))
-             (http://www.gnumeric.org/v10.dtd:SheetLayout (@ (TopLeft "A1")))
-             (http://www.gnumeric.org/v10.dtd:Solver
-               (@ (ProgramR "0")
-                  (ProblemType "0")
-                  (NonNeg "1")
-                  (ModelType "0")
-                  (MaxTime "60")
-                  (MaxIter "1000")
-                  (Discr "0")
-                  (AutoScale "0"))))
-           (http://www.gnumeric.org/v10.dtd:Sheet
-             (@ (Visibility "GNM_SHEET_VISIBILITY_VISIBLE")
-                (OutlineSymbolsRight "1")
-                (OutlineSymbolsBelow "1")
-                (HideZero "0")
-                (HideRowHeader "0")
-                (HideGrid "0")
-                (HideColHeader "0")
-                (GridColor "0:0:0")
-                (DisplayOutlines "1")
-                (DisplayFormulas "0"))
-             (http://www.gnumeric.org/v10.dtd:Name "Sheet3")
-             (http://www.gnumeric.org/v10.dtd:MaxCol "0")
-             (http://www.gnumeric.org/v10.dtd:MaxRow "0")
-             (http://www.gnumeric.org/v10.dtd:Zoom "1")
-             (http://www.gnumeric.org/v10.dtd:Names
-               (http://www.gnumeric.org/v10.dtd:Name
-                 (http://www.gnumeric.org/v10.dtd:name "Print_Area")
-                 (http://www.gnumeric.org/v10.dtd:value "#REF!")
-                 (http://www.gnumeric.org/v10.dtd:position "A1"))
-               (http://www.gnumeric.org/v10.dtd:Name
-                 (http://www.gnumeric.org/v10.dtd:name "Sheet_Title")
-                 (http://www.gnumeric.org/v10.dtd:value "\"Sheet3\"")
-                 (http://www.gnumeric.org/v10.dtd:position "A1")))
-             (http://www.gnumeric.org/v10.dtd:PrintInformation
-               (http://www.gnumeric.org/v10.dtd:Margins
-                 (http://www.gnumeric.org/v10.dtd:top
-                   (@ (PrefUnit "mm") (Points "93.26")))
-                 (http://www.gnumeric.org/v10.dtd:bottom
-                   (@ (PrefUnit "mm") (Points "93.26")))
-                 (http://www.gnumeric.org/v10.dtd:left
-                   (@ (PrefUnit "mm") (Points "72")))
-                 (http://www.gnumeric.org/v10.dtd:right
-                   (@ (PrefUnit "mm") (Points "72")))
-                 (http://www.gnumeric.org/v10.dtd:header
-                   (@ (PrefUnit "mm") (Points "72")))
-                 (http://www.gnumeric.org/v10.dtd:footer
-                   (@ (PrefUnit "mm") (Points "72"))))
-               (http://www.gnumeric.org/v10.dtd:Scale
-                 (@ (type "percentage") (percentage "100")))
-               (http://www.gnumeric.org/v10.dtd:vcenter (@ (value "0")))
-               (http://www.gnumeric.org/v10.dtd:hcenter (@ (value "0")))
-               (http://www.gnumeric.org/v10.dtd:grid (@ (value "0")))
-               (http://www.gnumeric.org/v10.dtd:even_if_only_styles
-                 (@ (value "0")))
-               (http://www.gnumeric.org/v10.dtd:monochrome (@ (value "0")))
-               (http://www.gnumeric.org/v10.dtd:draft (@ (value "0")))
-               (http://www.gnumeric.org/v10.dtd:titles (@ (value "0")))
-               (http://www.gnumeric.org/v10.dtd:do_not_print (@ (value "0")))
-               (http://www.gnumeric.org/v10.dtd:print_range (@ (value "0")))
-               (http://www.gnumeric.org/v10.dtd:order "d_then_r")
-               (http://www.gnumeric.org/v10.dtd:orientation "portrait")
-               (http://www.gnumeric.org/v10.dtd:Header
-                 (@ (Right "") (Middle "&[tab]") (Left "")))
-               (http://www.gnumeric.org/v10.dtd:Footer
-                 (@ (Right "") (Middle "&[page]") (Left "")))
-               (http://www.gnumeric.org/v10.dtd:paper "na_letter")
-               (http://www.gnumeric.org/v10.dtd:comments "in_place")
-               (http://www.gnumeric.org/v10.dtd:errors "as_displayed"))
-             (http://www.gnumeric.org/v10.dtd:Styles
-               (http://www.gnumeric.org/v10.dtd:StyleRegion
-                 (@ (startRow "0")
-                    (startCol "0")
-                    (endRow "65535")
-                    (endCol "255"))
-                 (http://www.gnumeric.org/v10.dtd:Style
-                   (@ (WrapText "0")
-                      (VAlign "2")
-                      (ShrinkToFit "0")
-                      (Shade "0")
-                      (Rotation "0")
-                      (PatternColor "0:0:0")
-                      (Locked "1")
-                      (Indent "0")
-                      (Hidden "0")
-                      (HAlign "1")
-                      (Format "General")
-                      (Fore "0:0:0")
-                      (Back "FFFF:FFFF:FFFF"))
-                   (http://www.gnumeric.org/v10.dtd:Font
-                     (@ (Unit "10")
-                        (Underline "0")
-                        (StrikeThrough "0")
-                        (Script "0")
-                        (Italic "0")
-                        (Bold "0"))
-                     "Sans"))))
-             (http://www.gnumeric.org/v10.dtd:Cols
-               (@ (DefaultSizePts "48"))
-               (http://www.gnumeric.org/v10.dtd:ColInfo
-                 (@ (Unit "64.01") (No "0"))))
-             (http://www.gnumeric.org/v10.dtd:Rows
-               (@ (DefaultSizePts "12.1"))
-               (http://www.gnumeric.org/v10.dtd:RowInfo
-                 (@ (Unit "12.82") (No "0"))))
-             (http://www.gnumeric.org/v10.dtd:Selections
-               (@ (CursorRow "0") (CursorCol "0"))
-               (http://www.gnumeric.org/v10.dtd:Selection
-                 (@ (startRow "0") (startCol "0") (endRow "0") (endCol "0"))))
-             (http://www.gnumeric.org/v10.dtd:Cells)
-             (http://www.gnumeric.org/v10.dtd:SheetLayout (@ (TopLeft "A1")))
-             (http://www.gnumeric.org/v10.dtd:Solver
-               (@ (ProgramR "0")
-                  (ProblemType "0")
-                  (NonNeg "1")
-                  (ModelType "0")
-                  (MaxTime "60")
-                  (MaxIter "1000")
-                  (Discr "0")
-                  (AutoScale "0")))))
-         (http://www.gnumeric.org/v10.dtd:UIData (@ (SelectedTab "0")))))

ADDED   ulex.scm
Index: ulex.scm
==================================================================
--- /dev/null
+++ ulex.scm
@@ -0,0 +1,24 @@
+;;======================================================================
+;; Copyright 2019, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
+;;======================================================================
+
+(declare (unit ulex))
+(declare (uses pkts))
+
+(include "ulex/ulex.scm")

ADDED   ulex/ulex.scm
Index: ulex/ulex.scm
==================================================================
--- /dev/null
+++ ulex/ulex.scm
@@ -0,0 +1,2252 @@
+;; ulex: Distributed sqlite3 db
+;;;
+;; Copyright (C) 2018 Matt Welland
+;; Redistribution and use in source and binary forms, with or without
+;; modification, is permitted.
+;;
+;; THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+;; OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+;; WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+;; ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE
+;; LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+;; CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+;; OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+;; BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+;; LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+;; (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+;; USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+;; DAMAGE.
+
+;;======================================================================
+;; ABOUT:
+;;   See README in the distribution at https://www.kiatoa.com/fossils/ulex
+;; NOTES:
+;;   Why sql-de-lite and not say, dbi?  - performance mostly, then simplicity.
+;;
+;;======================================================================
+
+(use mailbox)
+
+(module ulex
+ *
+
+(import scheme posix chicken data-structures ports extras files mailbox)
+(import srfi-18 pkts matchable regex
+	typed-records srfi-69 srfi-1
+	srfi-4 regex-case
+	(prefix sqlite3 sqlite3:)
+	foreign
+	tcp6
+	;; ulex-netutil
+	hostinfo
+	)
+
+;; make it a global? Well, it is local to area module
+
+(define *captain-pktspec*
+  `((captain (host     . h)
+	     (port     . p)
+	     (pid      . i)
+	     (ipaddr   . a)
+	     )
+    #;(data   (hostname . h)  ;; sender hostname
+	    (port     . p)  ;; sender port
+	    (ipaddr   . a)  ;; sender ip
+	    (hostkey  . k)  ;; sending host key - store info at server under this key
+	    (servkey  . s)  ;; server key - this needs to match at server end or reject the msg
+	    (format   . f)  ;; sb=serialized-base64, t=text, sx=sexpr, j=json
+	    (data     . d)  ;; base64 encoded slln data
+	    )))
+
+;; struct for keeping track of our world
+
+(defstruct udat
+  ;; captain info
+  (captain-address #f)
+  (captain-host    #f)
+  (captain-port    #f)
+  (captain-pid     #f)
+  (captain-lease   0)    ;; time (unix epoc) seconds when the lease is up
+  (ulex-dir        (conc (get-environment-variable "HOME") "/.ulex"))
+  (cpkts-dir       (conc (get-environment-variable "HOME") "/.ulex/pkts"))
+  (cpkt-spec       *captain-pktspec*)
+  ;; this processes info
+  (my-cpkt-key     #f)   ;; put Z card here when I create a pkt for myself as captain
+  (my-address      #f)
+  (my-hostname     #f)
+  (my-port         #f)
+  (my-pid          (current-process-id))
+  (my-dbs          '())
+  ;; server and handler thread
+  (serv-listener   #f)                 ;; this processes server info
+  (handler-thread  #f)
+  (mboxes          (make-hash-table))  ;; key => mbox
+  ;; other servers
+  (peers           (make-hash-table))  ;; host-port => peer record
+  (dbowners        (make-hash-table))  ;; dbfile => host-port
+  (handlers        (make-hash-table))  ;; dbfile => proc
+  ;; (outgoing-conns  (make-hash-table))  ;; host:port -> conn
+  (work-queue      (make-queue))       ;; most stuff goes here
+  ;; (fast-queue      (make-queue))       ;; super quick stuff goes here (e.g. ping)
+  (busy            #f)                 ;; is either of the queues busy, use to switch between queuing tasks or doing immediately
+  ;; app info
+  (appname         #f)
+  (dbtypes         (make-hash-table))  ;; this should be an alist but hash is easier. dbtype => [ initproc syncproc ]
+  ;; cookies
+  (cnum            0) ;; cookie num
+  )
+
+;;======================================================================
+;; NEW APPROACH
+;;======================================================================
+
+;;  start-server-find-port  ;; gotta have a server port ready from the very begining
+
+;; udata    - all the connection info, captain, server, ulex db etc. MUST BE PASSED IN
+;; dbpath   - full path and filename of the db to talk to or a symbol naming the db?
+;; callname - the remote call to execute
+;; params   - parameters to pass to the remote call
+;;
+(define (remote-call udata dbpath dbtype callname . params)
+  (start-server-find-port udata) ;; ensure we have a local server
+  (find-or-setup-captain udata)
+  ;; look at connect, process-request, send, send-receive
+  (let-values (((cookie-key host-port)(get-db-owner udata dbpath dbtype)))
+    (send-receive udata host-port callname cookie-key params)))
+
+;;======================================================================
+;; KEY FUNCTIONS - THESE ARE TOO BE EXPOSED AND USED
+;;======================================================================
+
+;; connection setup and management functions
+
+;; This is the basic setup command. Must always be
+;; called before connecting to a db using connect.
+;;
+;; find or become the captain
+;; setup and return a ulex object
+;;
+(define (find-or-setup-captain udata)
+  ;; see if we already have a captain and if the lease is ok
+  (if (and (udat-captain-address udata)
+	   (udat-captain-port    udata)
+	   (< (current-seconds) (udat-captain-lease udata)))
+      udata
+      (let* ((cpkts (get-all-captain-pkts udata)) ;; read captain pkts
+	     (captn (get-winning-pkt cpkts)))
+	(if captn
+	    (let* ((port   (alist-ref 'port   captn))
+		   (host   (alist-ref 'host   captn))
+		   (ipaddr (alist-ref 'ipaddr captn))
+		   (pid    (alist-ref 'pid    captn))
+		   (Z      (alist-ref 'Z      captn)))
+	      (udat-captain-address-set! udata ipaddr)
+	      (udat-captain-host-set!    udata host)
+	      (udat-captain-port-set!    udata port)
+	      (udat-captain-pid-set!     udata pid)
+	      (udat-captain-lease-set!   udata (+ (current-seconds) 10))
+	      (let-values (((success pingtime)(ping udata (conc ipaddr ":" port))))
+		(if success
+		    udata
+		    (begin
+		      (print "Found unreachable captain at " ipaddr ":" port ", removing pkt")
+		      (remove-captain-pkt udata captn)
+		      (find-or-setup-captain udata))))
+	      (begin
+		(setup-as-captain udata)  ;; this saves the thread to captain-thread and starts the thread
+		(find-or-setup-captain udata)))))))
+
+;; connect to a specific dbfile
+;;   - if already connected - return the dbowner host-port
+;;   - ask the captain who to talk to for this db
+;;   - put the entry in the dbowners hash as dbfile => host-port
+;;
+(define (connect udata dbfname dbtype)
+  (or (hash-table-ref/default (udat-dbowners udata) dbfname #f)
+      (let-values (((success dbowner-host-port)(get-db-owner udata dbfname dbtype)))
+	(if success
+	    (begin
+	      ;; just clobber the record, this is the new data no matter what
+	      (hash-table-set! (udat-dbowners udata) dbfname dbowner-host-port)
+	      dbowner-host-port)
+	    #f))))
+
+;; returns: success pingtime
+;;
+;; NOTE: causes the callee to store the info on this host along with the dbs this host currently owns
+;;
+(define (ping udata host-port)
+  (let* ((start  (current-milliseconds))
+	 (cookie (make-cookie udata))
+	 (dbs    (udat-my-dbs udata))
+	 (msg    (string-intersperse dbs " "))
+	 (res (send udata host-port 'ping cookie msg retval: #t))
+	 (delta (- (current-milliseconds) start)))
+    (values (equal? res cookie) delta)))
+
+;; returns: success pingtime
+;;
+;; NOTE: causes all references to this worker to be wiped out in the
+;; callee (ususally the captain)
+;;
+(define (goodbye-ping udata host-port)
+  (let* ((start  (current-milliseconds))
+	 (cookie (make-cookie udata))
+	 (dbs    (udat-my-dbs udata))
+	 (res (send udata host-port 'goodbye cookie "nomsg" retval: #t))
+	 (delta (- (current-milliseconds) start)))
+    (values (equal? res cookie) delta)))
+
+(define (goodbye-captain udata)
+  (let* ((host-port (udat-captain-host-port udata)))
+    (if host-port
+	(goodbye-ping udata host-port)
+	(values #f -1))))
+
+(define (get-db-owner udata dbname dbtype)
+  (let* ((host-port (udat-captain-host-port udata)))
+    (if host-port
+	(let* ((cookie (make-cookie udata))
+	       (msg    #f) ;; (conc dbname " " dbtype))
+	       (params `(,dbname ,dbtype))
+	       (res    (send udata host-port 'db-owner cookie msg
+			     params: params retval: #t)))
+	  (match (string-split res)
+	    ((retcookie owner-host-port)
+	     (values (equal? retcookie cookie) owner-host-port))))
+	(values #f -1))))
+
+;; called in ulex-handler to dispatch work, called on the workers side
+;;     calls (proc params data)
+;;     returns result with cookie
+;;
+;; pdat is the info of the caller, used to send the result data
+;; prockey is key into udat-handlers hash dereferencing a proc
+;; procparam is a first param handed to proc - often to do further derefrencing
+;; NOTE: params is intended to be a list of strings, encoding on data
+;;       is up to the user but data must be a single line
+;;
+(define (process-request udata pdat dbname cookie prockey procparam data)
+  (let* ((dbrec (ulex-open-db udata dbname))     ;; this will be a dbconn record, looks for in udata first
+	 (proc  (hash-table-ref udata prockey)))
+    (let* ((result (proc dbrec procparam data)))
+      result)))
+
+;; remote-request - send to remote to process in process-request
+;; uconn comes from a call to connect and can be used instead of calling connect again
+;; uconn is the host-port to call
+;; we send dbname to the worker so they know which file to open
+;; data must be a string with no newlines, it will be handed to the proc
+;; at the remote site unchanged. It is up to the user to encode/decode it's contents
+;;
+;;   rtype: immediate, read-only, normal, low-priority
+;; 
+(define (remote-request udata uconn rtype dbname prockey procparam data)
+  (let* ((cookie    (make-cookie udata)))
+    (send-receive udata uconn rtype cookie data `(,prockey procparam))))
+
+(define (ulex-open-db udata dbname)
+  #f)
+
+
+;;======================================================================
+;; Ulex db
+;;
+;;   - track who is captain, lease expire time
+;;   - track who owns what db, lease
+;;
+;;======================================================================
+
+;;
+;;
+(define (ulex-dbfname)
+  (let ((dbdir (conc (get-environment-variable "HOME") "/.ulex")))
+    (if (not (file-exists? dbdir))
+	(create-directory dbdir #t))
+    (conc dbdir "/network.db")))
+	 
+;; always goes in ~/.ulex/network.db
+;; role is captain, adjutant, node
+;;
+(define (ulexdb-setup)
+  (let* ((dbfname (ulex-dbfname))
+	 (have-db (file-exists? dbfname))
+	 (db      (sqlite3:open-database dbfname)))
+    (sqlite3:set-busy-handler! db (sqlite3:make-busy-timeout 136000))
+    (sqlite3:execute db "PRAGMA synchronous = 0;")
+    (if (not have-db)
+	(sqlite3:with-transaction
+	 db
+	 (lambda ()
+	   (for-each
+	    (lambda (stmt)
+	      (if stmt (sqlite3:execute db stmt)))
+	    `("CREATE TABLE IF NOT EXISTS nodes
+                 (id INTEGER PRIMARY KEY,
+                  role  TEXT NOT NULL,
+                  host  TEXT NOT NULL,
+                  port TEXT NOT NULL,
+                  ipadr TEXT NOT NULL,
+                  pid   INTEGER NOT NULL,
+                  zcard TEXT NOT NULL,
+                  regtime INTEGER DEFAULT (strftime('%s','now')),
+                  lease_thru INTEGER DEFAULT (strftime('%s','now')),
+                  last_update INTEGER DEFAULT (strftime('%s','now')));"
+	      "CREATE TRIGGER  IF NOT EXISTS update_nodes_trigger AFTER UPDATE ON nodes
+                             FOR EACH ROW
+                               BEGIN 
+                                 UPDATE nodes SET last_update=(strftime('%s','now'))
+                                   WHERE id=old.id;
+                               END;"
+	      "CREATE TABLE IF NOT EXISTS dbs
+                 (id INTEGER PRIMARY KEY,
+                  dbname TEXT NOT NULL,
+                  dbfile TEXT NOT NULL,
+                  dbtype TEXT NOT NULL,
+                  host_port TEXT NOT NULL,
+                  regtime INTEGER DEFAULT (strftime('%s','now')),
+                  lease_thru INTEGER DEFAULT (strftime('%s','now')),
+                  last_update INTEGER DEFAULT (strftime('%s','now')));"
+	      "CREATE TRIGGER  IF NOT EXISTS update_dbs_trigger AFTER UPDATE ON dbs
+                             FOR EACH ROW
+                               BEGIN 
+                                 UPDATE dbs SET last_update=(strftime('%s','now'))
+                                   WHERE id=old.id;
+                               END;")))))
+    db))
+
+(define (get-host-port-lease db dbfname)
+  (sqlite3:fold-row
+   (lambda (rem host-port lease-thru)
+     (list host-port lease-thru))
+   #f db "SELECT host_port,lease_thru FROM dbs WHERE dbfile = ?" dbfname))
+  
+(define (register-captain db host ipadr port pid zcard #!key (lease 20))
+  (let* ((dbfname (ulex-dbfname))
+	 (host-port  (conc host ":" port)))
+    (sqlite3:with-transaction
+     db
+     (lambda ()
+       (match (get-host-port-lease db dbfname)
+	 ((host-port lease-thru)
+	  (if (> (current-seconds) lease-thru)
+	      (begin
+		(sqlite3:execute db "UPDATE dbs SET host_port=?,lease_thru=? WHERE dbname=?"
+				 (conc host ":" port)
+				 (+ (current-seconds) lease)
+				 dbfname)
+		#t)
+	      #f))
+	 (#f  (sqlite3:execute db "INSERT INTO dbs (dbname,dbfile,dbtype,host_port,lease_thru) VALUES (?,?,?,?,?)"
+			       "captain" dbfname "captain" host-port (+ (current-seconds) lease)))
+	 (else (print "ERROR: Unrecognised result from fold-row")
+	       (exit 1)))))))
+							    
+;;======================================================================
+;; network utilities
+;;======================================================================
+
+(define (rate-ip ipaddr)
+  (regex-case ipaddr
+    ( "^127\\..*" _ 0 )
+    ( "^(10\\.0|192\\.168)\\..*" _ 1 )
+    ( else 2 ) ))
+
+;; Change this to bias for addresses with a reasonable broadcast value?
+;;
+(define (ip-pref-less? a b)
+  (> (rate-ip a) (rate-ip b)))
+  
+
+(define (get-my-best-address)
+  (let ((all-my-addresses (get-all-ips))
+        ;;(all-my-addresses-old (vector->list (hostinfo-addresses (hostname->hostinfo (get-host-name)))))
+        )
+    (cond
+     ((null? all-my-addresses)
+      (get-host-name))                                          ;; no interfaces?
+     ((eq? (length all-my-addresses) 1)
+      (car all-my-addresses))                      ;; only one to choose from, just go with it
+     
+     (else
+      (car (sort all-my-addresses ip-pref-less?)))
+     ;; (else 
+     ;;  (ip->string (car (filter (lambda (x)                      ;; take any but 127.
+     ;;    			 (not (eq? (u8vector-ref x 0) 127)))
+     ;;    		       all-my-addresses))))
+
+     )))
+
+(define (get-all-ips-sorted)
+  (sort (get-all-ips) ip-pref-less?))
+
+(define (get-all-ips)
+  (map ip->string (vector->list 
+		   (hostinfo-addresses
+		    (host-information (current-hostname))))))
+
+(define (udat-my-host-port udata)
+  (if (and (udat-my-address udata)(udat-my-port udata))
+      (conc (udat-my-address udata) ":" (udat-my-port udata))
+      #f))
+
+(define (udat-captain-host-port udata)
+  (if (and (udat-captain-address udata)(udat-captain-port udata))
+      (conc (udat-captain-address udata) ":" (udat-captain-port udata))
+      #f))
+
+(define (udat-get-peer udata host-port)
+  (hash-table-ref/default (udat-peers udata) host-port #f))
+
+;; struct for keeping track of others we are talking to
+
+(defstruct peer
+  (addr-port       #f)
+  (hostname        #f)
+  (pid             #f)
+  ;; (inp             #f)
+  ;; (oup             #f)
+  (dbs            '()) ;; list of databases this peer is currently handling
+  )
+
+(defstruct work
+  (peer-dat   #f)
+  (handlerkey #f)
+  (qrykey     #f)
+  (data       #f)
+  (start      (current-milliseconds)))
+
+#;(defstruct dbowner
+  (pdat        #f)
+  (last-update (current-seconds)))
+
+;;======================================================================
+;; Captain functions
+;;======================================================================
+
+;; NB// This needs to be started in a thread
+;;
+;; setup to be a captain
+;;   - local server MUST be started already
+;;   - create pkt
+;;   - start server port handler
+;;
+(define (setup-as-captain udata)
+  (if (create-captain-pkt udata)
+      (let* ((my-addr (udat-my-address udata))
+	     (my-port (udat-my-port    udata))
+	     (th (make-thread (lambda ()
+				(ulex-handler-loop udata)) "Captain handler")))
+	(udat-handler-thread-set! udata th)
+	(udat-captain-address-set! udata my-addr)
+	(udat-captain-port-set!    udata my-port)
+	(thread-start! th))
+      (begin
+	(print "ERROR: failed to create captain pkt")
+	#f)))
+
+;; given a pkts dir read 
+;;
+(define (get-all-captain-pkts udata)
+  (let* ((pktsdir       (let ((d (udat-cpkts-dir udata)))
+			  (if (file-exists? d)
+			      d
+			      (begin
+				(create-directory d #t)
+				d))))
+	 (all-pkt-files (glob (conc pktsdir "/*.pkt")))
+	 (pkt-spec      (udat-cpkt-spec udata)))
+    (map (lambda (pkt-file)
+	   (read-pkt->alist pkt-file pktspec: pkt-spec))
+	 all-pkt-files)))
+
+;; sort by D then Z, return one, choose the oldest then
+;; differentiate if needed using the Z key
+;;l
+(define (get-winning-pkt pkts)
+  (if (null? pkts)
+      #f
+      (car (sort pkts (lambda (a b)
+			(let ((ad (string->number (alist-ref 'D a)))
+			      (bd (string->number (alist-ref 'D b))))
+			  (if (eq? a b)
+			      (let ((az (alist-ref 'Z a))
+				    (bz (alist-ref 'Z b)))
+				(string>=? az bz))
+			      (> ad bd))))))))
+
+;; put the host, ip, port and pid into a pkt in
+;; the captain pkts dir
+;;  - assumes user has already fired up a server
+;;    which will be in the udata struct
+;;
+(define (create-captain-pkt udata)
+  (if (not (udat-serv-listener udata))
+      (begin
+	(print "ERROR: create-captain-pkt called with out a listener")
+	#f)
+      (let* ((pktdat `((port   . ,(udat-my-port udata))
+		       (host   . ,(udat-my-hostname udata))
+		       (ipaddr . ,(udat-my-address udata))
+		       (pid    . ,(udat-my-pid     udata))))
+	     (pktdir  (udat-cpkts-dir udata))
+	     (pktspec (udat-cpkt-spec udata))
+	     )
+	(udat-my-cpkt-key-set!
+	 udata
+	 (write-alist->pkt
+	  pktdir
+	  pktdat
+	  pktspec: pktspec
+	  ptype:   'captain))
+	(udat-my-cpkt-key udata))))
+
+;; remove pkt associated with captn (the Z key .pkt)
+;;
+(define (remove-captain-pkt udata captn)
+  (let ((Z       (alist-ref 'Z captn))
+	(cpktdir (udat-cpkts-dir udata)))
+    (delete-file* (conc cpktdir "/" Z ".pkt"))))
+
+;; call all known peers and tell them to delete their info on the captain
+;; thus forcing them to re-read pkts and connect to a new captain
+;; call this when the captain needs to exit and if an older captain is
+;; detected. Due to delays in sending file meta data in NFS multiple
+;; captains can be initiated in a "Storm of Captains", book soon to be
+;; on Amazon
+;;
+(define (drop-captain udata)
+  (let* ((peers (hash-table-keys (udat-peers udata)))
+	 (cookie (make-cookie udata)))
+    (for-each
+     (lambda (host-port)
+       (send udata host-port 'dropcaptain cookie "nomsg" retval: #t))
+     peers)))
+
+;;======================================================================
+;; server primitives
+;;======================================================================
+
+(define (make-cookie udata)
+  (let ((newcnum (+ (udat-cnum udata) 1)))
+    (udat-cnum-set! udata newcnum)
+    (conc (udat-my-address udata) ":"
+	  (udat-my-port    udata) "-"
+	  (udat-my-pid     udata) "-"
+	  newcnum)))
+
+;; create a tcp listener and return a populated udat struct with
+;; my port, address, hostname, pid etc.
+;; return #f if fail to find a port to allocate.
+;;
+;;  if udata-in is #f create the record
+;;  if there is already a serv-listener return the udata
+;;
+(define (start-server-find-port udata-in #!optional (port 4242))
+  (let ((udata (or udata-in (make-udat))))
+    (if (udat-serv-listener udata) ;; TODO - add check that the listener is alive and ready?
+	udata
+	(handle-exceptions
+	    exn
+	  (if (< port 65535)
+	      (start-server-find-port udata (+ port 1))
+	      #f)
+	  (connect-server udata port)))))
+
+(define (connect-server udata port)
+  ;; (tcp-listener-socket LISTENER)(socket-name so)
+  ;; sockaddr-address, sockaddr-port, sockaddr->string
+  (let* ((tlsn (tcp-listen port 1000 #f)) ;; (tcp-listen TCPPORT [BACKLOG [HOST]])
+	 (addr (get-my-best-address))) ;; (hostinfo-addresses (host-information (current-hostname)))
+    (udat-my-address-set!    udata addr)
+    (udat-my-port-set!       udata port)
+    (udat-my-hostname-set!   udata (get-host-name))
+    (udat-serv-listener-set! udata tlsn)
+    udata))
+
+(define (get-peer-dat udata host-port #!optional (hostname #f)(pid #f))
+  (let* ((pdat (or (udat-get-peer udata host-port)
+		   (handle-exceptions ;; ERROR - MAKE THIS EXCEPTION HANDLER MORE SPECIFIC
+		    exn
+		    #f
+		    (let ((npdat (make-peer addr-port: host-port)))
+		      (if hostname (peer-hostname-set! npdat hostname))
+		      (if pid (peer-pid-set! npdat pid))
+		      npdat)))))
+    pdat))
+
+;; send structured data to recipient
+;;
+;;  NOTE: qrykey is what was called the "cookie" previously
+;;
+;;     retval tells send to expect and wait for return data (one line) and return it or time out
+;;       this is for ping where we don't want to necessarily have set up our own server yet.
+;;
+(define (send udata host-port handler qrykey data
+	      #!key (hostname #f)(pid #f)(params '())(retval #f))
+  (let* ((my-host-port (udat-my-host-port udata))
+	 (isme         (equal? host-port my-host-port)) ;; am I calling
+							;; myself?
+	 (dat          (list
+			handler              ;; " "
+			my-host-port         ;; " "
+			(udat-my-pid  udata) ;; " "
+			qrykey
+			params ;;(if (null? params) "" (conc " "
+			       ;;(string-intersperse params " ")))
+			)))
+    ;; (print "send isme is " (if isme "true!" "false!") ",
+    ;; my-host-port: " my-host-port ", host-port: " host-port)
+    (if isme
+	(ulex-handler udata dat data)
+	(handle-exceptions ;; ERROR - MAKE THIS EXCEPTION HANDLER MORE
+			   ;; SPECIFIC
+	    exn
+	    #f 
+	  (let-values (((inp oup)(tcp-connect host-port)))
+	    ;;
+	    ;; CONTROL LINE:
+	    ;;    handlerkey host:port pid qrykey params ...
+	    ;;
+	    (let ((res
+		   (if (and inp oup)
+		       (let* ()
+			 (if my-host-port
+			     (begin
+			       (write dat  oup)
+			       (write data oup) ;; send as sexpr
+			       ;; (print "Sent dat: " dat " data: " data)
+			       (if retval
+				   (read inp)
+				   #t))
+			     (begin
+			       (print "ERROR: send called but no receiver has been setup. Please call setup first!")
+			       #f))
+			 ;; NOTE: DO NOT BE TEMPTED TO LOOK AT ANY DATA ON INP HERE!
+			 ;;       (there is a listener for handling that)
+			 )
+		       #f))) ;; #f means failed to connect and send
+	      (close-input-port inp)
+	      (close-output-port oup)
+	      res))))))
+
+;; send a request to the given host-port and register a mailbox in udata
+;; wait for the mailbox data and return it
+;;
+(define (send-receive udata host-port handler qrykey data #!key (hostname #f)(pid #f)(params '())(timeout 20))
+  (let ((mbox      (make-mailbox))
+	(mbox-time (current-milliseconds))
+	(mboxes    (udat-mboxes udata)))
+    (hash-table-set! mboxes qrykey mbox)
+    (if (send udata host-port handler qrykey data hostname: hostname pid: pid params: params)
+	(let* ((mbox-timeout-secs    timeout)
+	       (mbox-timeout-result 'MBOX_TIMEOUT)
+	       (res                  (mailbox-receive! mbox mbox-timeout-secs mbox-timeout-result))
+	       (mbox-receive-time    (current-milliseconds)))
+	  (hash-table-delete! mboxes qrykey)
+	  (if (eq? res 'MBOX_TIMEOUT)
+	      #f
+	      res))
+	#f))) ;; #f means failed to communicate
+
+;; 
+(define (ulex-handler udata controldat data)
+  (print "controldat: " controldat " data: " data)
+  (match controldat ;;  (string-split controldat)
+    ((handlerkey host-port pid qrykey params ...)
+     ;; (print "handlerkey: " handlerkey " host-port: " host-port " pid: " pid " qrykey: " qrykey " params: " params)
+     (case handlerkey ;; (string->symbol handlerkey)
+       ((ack)(print "Got ack!"))
+       ((ping) ;; special case - return result immediately on the same connection
+	(let* ((proc  (hash-table-ref/default (udat-handlers udata) 'ping #f))
+	       (val   (if proc (proc) "gotping"))
+	       (peer  (make-peer addr-port: host-port pid: pid))
+	       (dbshash (udat-dbowners udata)))
+	  (peer-dbs-set! peer params) ;; params for ping is list of dbs owned by pinger
+	  (for-each (lambda (dbfile)
+		      (hash-table-set! dbshash dbfile host-port)) ;; WRONG?
+		    params) ;; register each db in the dbshash
+	  (if (not (hash-table-exists? (udat-peers udata) host-port))
+	      (hash-table-set! (udat-peers udata) host-port peer)) ;; save the details of this caller in peers
+	  qrykey)) ;; End of ping
+       ((goodbye)
+	;; remove all traces of the caller in db ownership etc.
+	(let* ((peer  (hash-table-ref/default (udat-peers udata) host-port #f))
+	       (dbs   (if peer (peer-dbs peer) '()))
+	       (dbshash (udat-dbowners udata)))
+	  (for-each (lambda (dbfile)(hash-table-delete! dbshash dbfile)) dbs)
+	  (hash-table-delete! (udat-peers udata) host-port)
+	  qrykey))
+       ((dropcaptain)
+	;; remove all traces of the captain
+	(udat-captain-address-set! udata #f)
+	(udat-captain-host-set!    udata #f)
+	(udat-captain-port-set!    udata #f)
+	(udat-captain-pid-set!     udata #f)
+	qrykey)
+       ((rucaptain) ;; remote is asking if I'm the captain
+	(if (udat-my-cpkt-key udata) "yes" "no"))
+       ((db-owner) ;; given a db name who do I send my queries to
+	;; look up the file in handlers, if have an entry ping them to be sure
+	;; they are still alive and then return that host:port.
+	;; if no handler found or if the ping fails pick from peers the oldest that
+	;; is managing the fewest dbs
+	(match params
+	  ((dbfile dbtype)
+	   (let* ((owner-host-port (hash-table-ref/default (udat-dbowners udata) dbfile #f)))
+	     (if owner-host-port
+		 (conc qrykey " " owner-host-port)
+		 (let* ((pdat (or (hash-table-ref/default (udat-peers udata) host-port #f) ;; no owner - caller gets to own it!
+				  (make-peer addr-port: host-port pid: pid dbs: `(,dbfile)))))
+		   (hash-table-set! (udat-peers udata) host-port pdat)
+		   (hash-table-set! (udat-dbowners udata) dbfile host-port)
+		   (conc qrykey " " host-port)))))
+	  (else (conc qrykey " BADDATA"))))
+       ;; for work items:
+       ;;    handler is one of; immediate, read-only, read-write, high-priority
+       ((immediate read-only normal low-priority) ;; do this work immediately
+	;; host-port (caller), pid (caller), qrykey (cookie), params <= all from first line
+	;; data => a single line encoded however you want, or should I build json into it?
+	(print "handlerkey=" handlerkey)
+	(let* ((pdat (get-peer-dat udata host-port)))
+	  (match params ;; dbfile prockey procparam
+	    ((dbfile prockey procparam)
+	     (case handlerkey
+	       ((immediate read-only)
+		(process-request udata pdat dbfile qrykey prockey procparam data))
+	       ((normal low-priority) ;; split off later and add logic to support low priority
+		(add-to-work-queue udata pdat dbfile qrykey prockey procparam data))
+	       (else
+		#f)))
+	    (else
+	     (print "INFO: params=" params " handlerkey=" handlerkey " controldat=" controldat)
+	     #f))))
+       (else
+	;; (add-to-work-queue udata (get-peer-dat udata host-port) handlerkey qrykey data)
+	#f)))
+    (else
+     (print "BAD DATA? controldat=" controldat " data=" data)
+     #f)));; handles the incoming messages and dispatches to queues
+
+;;
+(define (ulex-handler-loop udata)
+  (let* ((serv-listener (udat-serv-listener udata)))
+    ;; data comes as two lines
+    ;;   handlerkey resp-addr:resp-port hostname pid qrykey [dbpath/dbfile.db]
+    ;;   data
+    (let loop ((state 'start))
+      (let-values (((inp oup)(tcp-accept serv-listener)))
+	(let* ((controldat (read inp))
+	       (data       (read inp))
+	       (resp       (ulex-handler udata controldat data)))
+	  (if resp (write resp oup))
+	  (close-input-port inp)
+	  (close-output-port oup))
+	(loop state)))))
+
+;; add a proc to the handler list, these are done symetrically (i.e. in all instances)
+;; so that the proc can be dereferenced remotely
+;;
+(define (register-handler udata key proc)
+  (hash-table-set! (udat-handlers udata) key proc))
+
+
+;;======================================================================
+;; work queues
+;;======================================================================
+
+(define (add-to-work-queue udata peer-dat handlerkey qrykey data)
+  (let ((wdat (make-work peer-dat: peer-dat handlerkey: handlerkey qrykey: qrykey data: data)))
+    (if (udat-busy udata)
+	(queue-add! (udat-work-queue udata) wdat)
+	(process-work udata wdat)) ;; passing in wdat tells process-work to first process the passed in wdat
+    ))
+
+(define (do-work udata wdat)
+  #f)
+
+(define (process-work udata #!optional wdat)
+  (if wdat (do-work udata wdat)) ;; process wdat
+  (let ((wqueue (udat-work-queue udata)))
+    (if (not (queue-empty? wqueue))
+	(let loop ((wd (queue-remove! wqueue)))
+	  (do-work udata wd)
+	  (if (not (queue-empty? wqueue))
+	      (loop (queue-remove! wqueue)))))))
+
+;;======================================================================
+;; Generic db handling
+;;   setup a inmem db instance
+;;   open connection to on-disk db
+;;   sync on-disk db to inmem
+;;   get lock in on-disk db for dbowner of this db
+;;   put sync-proc, init-proc, on-disk handle, inmem handle in dbconn stuct
+;;   return the stuct
+;;======================================================================
+
+(defstruct dbconn
+  (fname  #f)
+  (inmem  #f)
+  (conn   #f)
+  (sync   #f) ;; sync proc
+  (init   #f) ;; init proc
+  (lastsync (current-seconds))
+  )
+
+(defstruct dbinfo
+  (initproc #f)
+  (syncproc #f))
+
+;; open inmem and disk database
+;;   init with initproc
+;;   return db struct
+;;
+;;   appname; megatest, ulex or something else.
+;;
+(define (setup-db-connection udata fname-in appname dbtype)
+  (let* ((is-ulex (eq? appname 'ulex))
+	 (dbinf   (if is-ulex ;; ulex is a built-in special case
+		      (make-dbinfo initproc: ulexdb-init syncproc: ulexdb-sync)
+		      (hash-table-ref/default (udat-dbtypes udata) dbtype #f)))
+	 (initproc (dbinfo-initproc dbinf))
+	 (syncproc (dbinfo-syncproc dbinf))
+	 (fname   (if is-ulex
+		      (conc (udat-ulex-dir udata) "/ulex.db")
+		      fname-in))
+	 (inmem-db (open-and-initdb udata #f 'inmem (dbinfo-initproc dbinf)))
+	 (disk-db  (open-and-initdb udata fname 'disk (dbinfo-initproc dbinf))))
+    (make-dbconn inmem: inmem-db conn: disk-db sync: syncproc init: initproc)))
+
+;; dest='inmem or 'disk
+;;
+(define (open-and-initdb udata filename dest init-proc)
+  (let* ((inmem    (eq? dest 'inmem))
+	 (dbfile   (if inmem
+		       ":INMEM:"
+		       filename))
+	 (dbexists (if inmem #t (file-exists? dbfile)))
+	 (db       (sqlite3:open-database dbfile)))
+    (sqlite3:set-busy-handler! db (sqlite3:make-busy-timeout 136000))
+    (if (not dbexists)
+	(init-proc db))
+    db))
+
+
+;;======================================================================
+;; Previous Ulex db stuff
+;;======================================================================
+
+(define (ulexdb-init db inmem)
+  (sqlite3:with-transaction
+   db
+   (lambda ()
+     (for-each
+      (lambda (stmt)
+	(if stmt (sqlite3:execute db stmt)))
+      `("CREATE TABLE IF NOT EXISTS processes 
+                 (id INTEGER PRIMARY KEY,
+                  host  TEXT NOT NULL,
+                  ipadr TEXT NOT NULL,
+                  port  INTEGER NOT NULL,
+                  pid   INTEGER NOT NULL,
+                  regtime INTEGER DEFAULT (strftime('%s','now')),
+                  last_update INTEGER DEFAULT (strftime('%s','now')));"
+	(if inmem
+	    "CREATE TRIGGER  IF NOT EXISTS update_proces_trigger AFTER UPDATE ON processes
+                             FOR EACH ROW
+                               BEGIN 
+                                 UPDATE processes SET last_update=(strftime('%s','now'))
+                                   WHERE id=old.id;
+                               END;"
+	    #f))))))
+
+;; open databases, do initial sync
+(define (ulexdb-sync dbconndat udata)
+  #f)
+
+
+) ;; END OF ULEX
+
+
+;;; ;;======================================================================
+;;; ;; D E B U G   H E L P E R S
+;;; ;;======================================================================
+;;;     
+;;; (define (dbg> . args)
+;;;   (with-output-to-port (current-error-port)
+;;;     (lambda ()
+;;;       (apply print "dbg> " args))))
+;;; 
+;;; (define (debug-pp . args)
+;;;   (if (get-environment-variable "ULEX_DEBUG")
+;;;       (with-output-to-port (current-error-port)
+;;; 	(lambda ()
+;;; 	  (apply pp args)))))
+;;; 
+;;; (define *default-debug-port* (current-error-port))
+;;; 
+;;; (define (sdbg> fn stage-name stage-start stage-end start-time . message)
+;;;   (if (get-environment-variable "ULEX_DEBUG")
+;;;       (with-output-to-port *default-debug-port* 
+;;; 	(lambda ()
+;;; 	  (apply print "ulex:" fn " " stage-name " took " (- (if stage-end stage-end (current-milliseconds)) stage-start) " ms. "
+;;; 		 (if start-time
+;;; 		     (conc "total time " (- (current-milliseconds) start-time)
+;;; 			   " ms.")
+;;; 		     "")
+;;; 		 message
+;;; 		 )))))
+
+;;======================================================================
+;; M A C R O S
+;;======================================================================
+;; iup callbacks are not dumping the stack, this is a work-around
+;;
+
+;; Some of these routines use:
+;;
+;;     http://www.cs.toronto.edu/~gfb/scheme/simple-macros.html
+;;
+;; Syntax for defining macros in a simple style similar to function definiton,
+;;  when there is a single pattern for the argument list and there are no keywords.
+;;
+;; (define-simple-syntax (name arg ...) body ...)
+;;
+;; 
+;; (define-syntax define-simple-syntax
+;;   (syntax-rules ()
+;;     ((_ (name arg ...) body ...)
+;;      (define-syntax name (syntax-rules () ((name arg ...) (begin body ...)))))))
+;; 
+;; (define-simple-syntax (catch-and-dump proc procname)
+;;   (handle-exceptions
+;;    exn
+;;    (begin
+;;      (print-call-chain (current-error-port))
+;;      (with-output-to-port (current-error-port)
+;;        (lambda ()
+;;          (print ((condition-property-accessor 'exn 'message) exn))
+;;          (print "Callback error in " procname)
+;;          (print "Full condition info:\n" (condition->list exn)))))
+;;    (proc)))
+;; 
+;; 
+;;======================================================================
+;;  R E C O R D S
+;;======================================================================
+
+;;; ;; information about me as a server
+;;; ;;
+;;; (defstruct area
+;;;   ;; about this area
+;;;   (useportlogger #f)
+;;;   (lowport       32768)
+;;;   (server-type   'auto)  ;; auto=create up to five servers/pkts, main=create pkts, passive=no pkt (unless there are no pkts at all)
+;;;   (conn          #f)
+;;;   (port          #f)
+;;;   (myaddr        (get-my-best-address))
+;;;   pktid          ;; get pkt from hosts table if needed
+;;;   pktfile
+;;;   pktsdir
+;;;   dbdir
+;;;   (dbhandles     (make-hash-table)) ;; fname => list-of-dbh, NOTE: Should really never need more than one?
+;;;   (mutex         (make-mutex))
+;;;   (rtable        (make-hash-table)) ;; registration table of available actions
+;;;   (dbs           (make-hash-table)) ;; filename => random number, used for choosing what dbs I serve
+;;;   ;; about other servers
+;;;   (hosts         (make-hash-table)) ;; key => hostdat
+;;;   (hoststats     (make-hash-table)) ;; key => alist of fname => ( qcount . qtime )
+;;;   (reqs          (make-hash-table)) ;; uri => queue
+;;;   ;; work queues
+;;;   (wqueues       (make-hash-table)) ;; fname => qdat
+;;;   (stats         (make-hash-table)) ;; fname => totalqueries
+;;;   (last-srvup    (current-seconds)) ;; last time we updated the known servers
+;;;   (cookie2mbox   (make-hash-table)) ;; map cookie for outstanding request to mailbox of awaiting call
+;;;   (ready #f)
+;;;   (health        (make-hash-table)) ;; ipaddr:port => num failed pings since last good ping
+;;;   )
+;;; 
+;;; ;; host stats
+;;; ;;
+;;; (defstruct hostdat
+;;;   (pkt      #f)
+;;;   (dbload   (make-hash-table))  ;; "dbfile.db" => queries/min
+;;;   (hostload #f)                 ;; normalized load ( 5min load / numcpus )
+;;;   )
+;;; 
+;;; ;; dbdat
+;;; ;;
+;;; (defstruct dbdat
+;;;   (dbh    #f)
+;;;   (fname  #f)
+;;;   (write-access #f)
+;;;   (sths   (make-hash-table))  ;; hash mapping query strings to handles
+;;;   )
+;;; 
+;;; ;; qdat
+;;; ;;
+;;; (defstruct qdat
+;;;   (writeq  (make-queue))
+;;;   (readq   (make-queue))
+;;;   (rwq     (make-queue))
+;;;   (logq    (make-queue)) ;; do we need a queue for logging? yes, if we use sqlite3 db for logging
+;;;   (osshort (make-queue))
+;;;   (oslong  (make-queue))
+;;;   (misc    (make-queue)) ;; used for things like ping-full
+;;;   )
+;;; 
+;;; ;; calldat
+;;; ;;
+;;; (defstruct calldat
+;;;   (ctype 'dbwrite)
+;;;   (obj   #f)              ;; this would normally be an SQL statement e.g. SELECT, INSERT etc.
+;;;   (rtime (current-milliseconds)))
+;;; 
+;;; ;; make it a global? Well, it is local to area module
+;;; 
+;;; (define *pktspec*
+;;;   `((server (hostname . h)
+;;; 	    (port     . p)
+;;; 	    (pid      . i)
+;;; 	    (ipaddr   . a)
+;;; 	    )
+;;;     (data   (hostname . h)  ;; sender hostname
+;;; 	    (port     . p)  ;; sender port
+;;; 	    (ipaddr   . a)  ;; sender ip
+;;; 	    (hostkey  . k)  ;; sending host key - store info at server under this key
+;;; 	    (servkey  . s)  ;; server key - this needs to match at server end or reject the msg
+;;; 	    (format   . f)  ;; sb=serialized-base64, t=text, sx=sexpr, j=json
+;;; 	    (data     . d)  ;; base64 encoded slln data
+;;; 	    )))
+;;; 
+;;; ;; work item
+;;; ;;
+;;; (defstruct witem
+;;;   (rhost #f)   ;; return host
+;;;   (ripaddr #f) ;; return ipaddr
+;;;   (rport #f)   ;; return port
+;;;   (servkey #f) ;; the packet representing the client of this workitem, used by final send-message
+;;;   (rdat  #f)   ;; the request - usually an sql query, type is rdat
+;;;   (action #f)  ;; the action: immediate, dbwrite, dbread,oslong, osshort
+;;;   (cookie #f)  ;; cookie id for response
+;;;   (data   #f)  ;; the data payload, i.e. parameters
+;;;   (result #f)  ;; the result from processing the data
+;;;   (caller #f)) ;; the calling peer according to rpc itself
+;;; 
+;;; (define (trim-pktid pktid)
+;;;   (if (string? pktid)
+;;;       (substring pktid 0 4)
+;;;       "nopkt"))
+;;; 
+;;; (define (any->number num)
+;;;   (cond
+;;;    ((number? num) num)
+;;;    ((string? num) (string->number num))
+;;;    (else num)))
+;;; 
+;;; (use trace)
+;;; (trace-call-sites #t)
+;;; 
+;;; ;;======================================================================
+;;; ;; D A T A B A S E   H A N D L I N G 
+;;; ;;======================================================================
+;;; 
+;;; ;; look in dbhandles for a db, return it, else return #f
+;;; ;;
+;;; (define (get-dbh acfg fname)
+;;;   (let ((dbh-lst (hash-table-ref/default (area-dbhandles acfg) fname '())))
+;;;     (if (null? dbh-lst)
+;;; 	(begin
+;;; 	  ;; (print "opening db for " fname)
+;;; 	  (open-db acfg fname)) ;; Note that the handles get put back in the queue in the save-dbh calls
+;;; 	(let ((rem-lst (cdr dbh-lst)))
+;;; 	  ;; (print "re-using saved connection for " fname)
+;;; 	  (hash-table-set! (area-dbhandles acfg) fname rem-lst)
+;;; 	  (car dbh-lst)))))
+;;; 
+;;; (define (save-dbh acfg fname dbdat)
+;;;     ;; (print "saving dbh for " fname)
+;;;     (hash-table-set! (area-dbhandles acfg) fname (cons dbdat (hash-table-ref/default (area-dbhandles acfg) fname '()))))
+;;; 
+;;; ;; open the database, if never before opened init it. put the handle in the
+;;; ;; open db's hash table
+;;; ;; returns: the dbdat
+;;; ;;
+;;; (define (open-db acfg fname)
+;;;   (let* ((fullname     (conc (area-dbdir acfg) "/" fname))
+;;; 	 (exists       (file-exists? fullname))
+;;; 	 (write-access (if exists
+;;; 			   (file-write-access? fullname)
+;;; 			   (file-write-access? (area-dbdir acfg))))
+;;; 	 (db           (sqlite3:open-database fullname))
+;;; 	 (handler      (sqlite3:make-busy-timeout 136000))
+;;; 	 )
+;;;     (sqlite3:set-busy-handler! db handler)
+;;;     (sqlite3:execute db "PRAGMA synchronous = 0;")
+;;;     (if (not exists) ;; need to init the db
+;;; 	(if write-access
+;;; 	    (let ((isql (get-rsql acfg 'dbinitsql))) ;; get the init sql statements
+;;; 	      ;; (sqlite3:with-transaction
+;;; 	      ;;  db
+;;; 	      ;;  (lambda ()
+;;; 		 (if isql
+;;; 		     (for-each
+;;; 		      (lambda (sql)
+;;; 			(sqlite3:execute db sql))
+;;; 		      isql)))
+;;; 	    (print "ERROR: no write access to " (area-dbdir acfg))))
+;;;     (make-dbdat dbh: db fname: fname write-access: write-access)))
+;;; 
+;;; ;; This is a low-level command to retrieve or to prepare, save and return a prepared statment
+;;; ;; you must extract the db handle
+;;; ;;
+;;; (define (get-sth db cache stmt)
+;;;   (if (hash-table-exists? cache stmt)
+;;;       (begin
+;;; 	;; (print "Reusing cached stmt for " stmt)
+;;; 	(hash-table-ref/default cache stmt #f))
+;;;       (let ((sth (sqlite3:prepare db stmt)))
+;;; 	(hash-table-set! cache stmt sth)
+;;; 	;; (print "prepared stmt for " stmt)
+;;; 	sth)))
+;;; 
+;;; ;; a little more expensive but does all the tedious deferencing - only use if you don't already
+;;; ;; have dbdat and db sitting around
+;;; ;;
+;;; (define (full-get-sth acfg fname stmt)
+;;;   (let* ((dbdat  (get-dbh acfg fname))
+;;; 	 (db     (dbdat-dbh dbdat))
+;;; 	 (sths   (dbdat-sths dbdat)))
+;;;     (get-sth db sths stmt)))
+;;; 
+;;; ;; write to a db
+;;; ;; acfg: area data
+;;; ;; rdat: request data
+;;; ;; hdat: (host . port)
+;;; ;;
+;;; ;; (define (dbwrite acfg rdat hdat data-in)
+;;; ;;   (let* ((dbname (car data-in))
+;;; ;; 	 (dbdat  (get-dbh acfg dbname))
+;;; ;; 	 (db     (dbdat-dbh dbdat))
+;;; ;; 	 (sths   (dbdat-sths dbdat))
+;;; ;; 	 (stmt   (calldat-obj rdat))
+;;; ;; 	 (sth    (get-sth db sths stmt))
+;;; ;; 	 (data   (cdr data-in)))
+;;; ;;     (print "dbname: " dbname " acfg: " acfg " rdat: " (calldat->alist rdat) " hdat: " hdat " data: " data)
+;;; ;;     (print "dbdat: " (dbdat->alist dbdat))
+;;; ;;     (apply sqlite3:execute sth data)
+;;; ;;     (save-dbh acfg dbname dbdat)
+;;; ;;     #t
+;;; ;;     ))
+;;; 
+;;; (define (finalize-all-db-handles acfg)
+;;;   (let* ((dbhandles (area-dbhandles acfg))  ;; dbhandles is hash of fname ==> dbdat
+;;; 	 (num       0))
+;;;     (for-each
+;;;      (lambda (area-name)
+;;;        (print "Closing handles for " area-name)
+;;;        (let ((dbdats (hash-table-ref/default dbhandles area-name '())))
+;;; 	 (for-each
+;;; 	  (lambda (dbdat)
+;;; 	    ;; first close all statement handles
+;;; 	    (for-each
+;;; 	     (lambda (sth)
+;;; 	       (sqlite3:finalize! sth)
+;;; 	       (set! num (+ num 1)))
+;;; 	     (hash-table-values (dbdat-sths dbdat)))
+;;; 	    ;; now close the dbh
+;;; 	    (set! num (+ num 1))
+;;; 	    (sqlite3:finalize! (dbdat-dbh dbdat)))
+;;; 	  dbdats)))
+;;;      (hash-table-keys dbhandles))
+;;;     (print "FINALIZED " num " dbhandles")))
+;;; 
+;;; ;;======================================================================
+;;; ;; W O R K   Q U E U E   H A N D L I N G 
+;;; ;;======================================================================
+;;; 
+;;; (define (register-db-as-mine acfg dbname)
+;;;   (let ((ht (area-dbs acfg)))
+;;;     (if (not (hash-table-ref/default ht dbname #f))
+;;; 	(hash-table-set! ht dbname (random 10000)))))
+;;; 	
+;;; (define (work-queue-add acfg fname witem)
+;;;   (let* ((work-queue-start (current-milliseconds))
+;;; 	 (action           (witem-action witem)) ;; NB the action is the index into the rdat actions
+;;; 	 (qdat             (or (hash-table-ref/default (area-wqueues acfg) fname #f)
+;;; 			       (let ((newqdat (make-qdat)))
+;;; 				 (hash-table-set! (area-wqueues acfg) fname newqdat)
+;;; 				 newqdat)))
+;;; 	 (rdat             (hash-table-ref/default (area-rtable acfg) action #f)))
+;;;     (if rdat
+;;; 	(queue-add!
+;;; 	 (case (calldat-ctype rdat)
+;;; 	   ((dbwrite)   (register-db-as-mine acfg fname)(qdat-writeq qdat))
+;;; 	   ((dbread)    (register-db-as-mine acfg fname)(qdat-readq  qdat))
+;;; 	   ((dbrw)      (register-db-as-mine acfg fname)(qdat-rwq    qdat))
+;;; 	   ((oslong)    (qdat-oslong qdat))
+;;; 	   ((osshort)   (qdat-osshort qdat))
+;;; 	   ((full-ping) (qdat-misc  qdat))
+;;; 	   (else
+;;; 	    (print "ERROR: no queue for " action ". Adding to dbwrite queue.")
+;;; 	    (qdat-writeq qdat)))
+;;; 	 witem)
+;;; 	(case action
+;;; 	  ((full-ping)(qdat-misc qdat))
+;;; 	  (else
+;;; 	   (print "ERROR: No action " action " was registered"))))
+;;;     (sdbg> "work-queue-add" "queue-add" work-queue-start #f #f)
+;;;     #t)) ;; for now, simply return #t to indicate request got to the queue
+;;; 
+;;; (define (doqueue acfg q fname dbdat dbh)
+;;;   ;; (print "doqueue: " fname)
+;;;   (let* ((start-time (current-milliseconds))
+;;; 	 (qlen       (queue-length q)))
+;;;     (if (> qlen 1)
+;;; 	(print "Processing queue of length " qlen))
+;;;     (let loop ((count      0)
+;;; 	       (responses '()))
+;;;       (let ((delta (- (current-milliseconds) start-time)))
+;;; 	(if (or (queue-empty? q)
+;;; 		(> delta 400)) ;; stop working on this queue after 400ms have passed
+;;; 	    (list count delta responses) ;; return count, delta and responses list
+;;; 	    (let* ((witem  (queue-remove! q))
+;;; 		   (action (witem-action witem))
+;;; 		   (rdat   (witem-rdat   witem))
+;;; 		   (stmt   (calldat-obj rdat))
+;;; 		   (sth    (full-get-sth acfg fname stmt))
+;;; 		   (ctype  (calldat-ctype rdat))
+;;; 		   (data   (witem-data   witem))
+;;; 		   (cookie (witem-cookie witem)))
+;;; 	      ;; do the processing and save the result in witem-result
+;;; 	      (witem-result-set!
+;;; 	       witem
+;;; 	       (case ctype ;; action
+;;; 		 ((noblockwrite) ;; blind write, no ack of success returned
+;;; 		  (apply sqlite3:execute sth data)
+;;; 		  (sqlite3:last-insert-rowid dbh))
+;;; 		 ((dbwrite)      ;; blocking write   
+;;; 		  (apply sqlite3:execute sth data)
+;;; 		  #t)
+;;; 		 ((dbread) ;; TODO: consider breaking this up and shipping in pieces for large query
+;;; 		  (apply sqlite3:map-row (lambda x x) sth data))
+;;; 		 ((full-ping)  'full-ping)
+;;; 		 (else (print "Not ready for action " action) #f)))
+;;; 	      (loop (add1 count)
+;;; 		    (if cookie
+;;; 			(cons witem responses)
+;;; 			responses))))))))
+;;; 
+;;; ;; do up to 400ms of processing on each queue
+;;; ;; - the work-queue-processor will allow the max 1200ms of work to complete but it will flag as overloaded
+;;; ;; 
+;;; (define (process-db-queries acfg fname)
+;;;   (if (hash-table-exists? (area-wqueues acfg) fname)
+;;;       (let* ((process-db-queries-start-time (current-milliseconds))
+;;; 	     (qdat             (hash-table-ref/default (area-wqueues acfg) fname #f))
+;;; 	     (queue-sym->queue (lambda (queue-sym)
+;;; 				 (case queue-sym  ;; lookup the queue from qdat given a name (symbol)
+;;; 				   ((wqueue)  (qdat-writeq qdat))
+;;; 				   ((rqueue)  (qdat-readq  qdat))
+;;; 				   ((rwqueue) (qdat-rwq    qdat))
+;;; 				   ((misc)    (qdat-misc   qdat))
+;;; 				   (else #f))))
+;;; 	     (dbdat   (get-dbh acfg fname))
+;;; 	     (dbh     (if (dbdat? dbdat)(dbdat-dbh dbdat) #f))
+;;; 	     (nowtime (current-seconds)))
+;;; 	;; handle the queues that require a transaction
+;;; 	;;
+;;; 	(map ;; 
+;;; 	 (lambda (queue-sym)
+;;; 	   ;; (print "processing queue " queue-sym)
+;;; 	   (let* ((queue (queue-sym->queue queue-sym)))
+;;; 	     (if (not (queue-empty? queue))
+;;; 		 (let ((responses
+;;; 			(sqlite3:with-transaction ;; todo - catch exceptions...
+;;; 			 dbh
+;;; 			 (lambda ()
+;;; 			   (let* ((res (doqueue acfg queue fname dbdat dbh))) ;; this does the work!
+;;; 			     ;; (print "res=" res)
+;;; 			     (match res
+;;; 			      ((count delta responses)
+;;; 			       (update-stats acfg fname queue-sym delta count)
+;;; 			       (sdbg> "process-db-queries" "sqlite3-transaction" process-db-queries-start-time #f #f)
+;;; 			       responses) ;; return responses
+;;; 			      (else
+;;; 			       (print "ERROR: bad return data from doqueue " res)))
+;;; 			     )))))
+;;; 		   ;; having completed the transaction, send the responses.
+;;; 		   ;; (print "INFO: sending " (length responses) " responses.")
+;;; 		   (let loop ((responses-left responses))
+;;; 		     (cond
+;;; 		      ((null? responses-left)  #t)
+;;; 		      (else
+;;; 		       (let* ((witem    (car responses-left))
+;;; 			      (response (cdr responses-left)))  
+;;; 			 (call-deliver-response acfg (witem-ripaddr witem)(witem-rport witem)
+;;; 						(witem-cookie witem)(witem-result witem)))
+;;; 		       (loop (cdr responses-left))))))
+;;; 		 )))
+;;; 	 '(wqueue rwqueue rqueue))
+;;; 	
+;;; 	;; handle misc queue
+;;; 	;;
+;;; 	;; (print "processing misc queue")
+;;; 	(let ((queue (queue-sym->queue 'misc)))
+;;; 	  (doqueue acfg queue fname dbdat dbh))
+;;; 	;; ....
+;;; 	(save-dbh acfg fname dbdat)
+;;; 	#t ;; just to let the tests know we got here
+;;; 	)
+;;;       #f ;; nothing processed
+;;;       ))
+;;; 
+;;; ;; run all queues in parallel per db but sequentially per queue for that db.
+;;; ;;  - process the queues every 500 or so ms
+;;; ;;  - allow for long running queries to continue but all other activities for that
+;;; ;;    db will be blocked.
+;;; ;;
+;;; (define (work-queue-processor acfg)
+;;;   (let* ((threads (make-hash-table))) ;; fname => thread
+;;;     (let loop ((fnames      (hash-table-keys (area-wqueues acfg)))
+;;; 	       (target-time (+ (current-milliseconds) 50)))
+;;;       ;;(if (not (null? fnames))(print "Processing for these databases: " fnames))
+;;;       (for-each
+;;;        (lambda (fname)
+;;; 	 ;; (print "processing for " fname)
+;;; 	 ;;(process-db-queries acfg fname))
+;;; 	 (let ((th (hash-table-ref/default threads fname #f)))
+;;; 	   (if (and th (not (member (thread-state th) '(dead terminated))))
+;;; 	       (begin
+;;; 		 (print "WARNING: worker thread for " fname " is taking a long time.")
+;;; 		 (print "Thread is in state " (thread-state th)))
+;;; 	       (let ((th1 (make-thread (lambda ()
+;;; 					 ;; (catch-and-dump
+;;; 					 ;;  (lambda ()
+;;; 					    ;; (print "Process queries for " fname)
+;;; 					    (let ((start-time (current-milliseconds)))
+;;; 					      (process-db-queries acfg fname)
+;;; 					      ;; (thread-sleep! 0.01) ;; need the thread to take at least some time
+;;; 					      (hash-table-delete! threads fname)) ;; no mutexes?
+;;; 					    fname)
+;;; 					  "th1"))) ;; ))
+;;; 		 (hash-table-set! threads fname th1)
+;;; 		 (thread-start! th1)))))
+;;;        fnames)
+;;;       ;; (thread-sleep! 0.1) ;; give the threads some time to process requests
+;;;       ;; burn time until 400ms is up
+;;;       (let ((now-time (current-milliseconds)))
+;;; 	(if (< now-time target-time)
+;;; 	    (let ((delta (- target-time now-time)))
+;;; 	      (thread-sleep! (/ delta 1000)))))
+;;;       (loop (hash-table-keys (area-wqueues acfg))
+;;; 	    (+ (current-milliseconds) 50)))))
+;;; 
+;;; ;;======================================================================
+;;; ;; S T A T S   G A T H E R I N G
+;;; ;;======================================================================
+;;; 
+;;; (defstruct stat
+;;;   (qcount-avg  0)                  ;; coarse running average
+;;;   (qtime-avg   0)                  ;; coarse running average
+;;;   (qcount      0)                  ;; total
+;;;   (qtime       0)                  ;; total
+;;;   (last-qcount 0)                  ;; last 
+;;;   (last-qtime  0)                  ;; last
+;;;   (dbs        '())                 ;; list of db files handled by this node
+;;;   (when        0))                 ;; when the last query happened - seconds
+;;; 
+;;; 
+;;; (define (update-stats acfg fname bucket duration numqueries)
+;;;   (let* ((key   fname) ;; for now do not use bucket. Was: (conc fname "-" bucket)) ;; lazy but good enough
+;;; 	 (stats (or (hash-table-ref/default (area-stats acfg) key #f)
+;;; 		    (let ((newstats (make-stat)))
+;;; 		      (hash-table-set! (area-stats acfg) key newstats)
+;;; 		      newstats))))
+;;;     ;; when the last query happended (used to remove the fname from the active list)
+;;;     (stat-when-set! stats (current-seconds))
+;;;     ;; last values
+;;;     (stat-last-qcount-set! stats numqueries)
+;;;     (stat-last-qtime-set!  stats duration)
+;;;     ;; total over process lifetime
+;;;     (stat-qcount-set! stats (+ (stat-qcount stats) numqueries))
+;;;     (stat-qtime-set!  stats (+ (stat-qtime  stats) duration))
+;;;     ;; coarse average
+;;;     (stat-qcount-avg-set! stats (/ (+ (stat-qcount-avg stats) numqueries) 2))
+;;;     (stat-qtime-avg-set!  stats (/ (+ (stat-qtime-avg  stats) duration)   2))
+;;; 
+;;;     ;; here is where we add the stats for a given dbfile
+;;;     (if (not (member fname (stat-dbs stats)))
+;;; 	(stat-dbs-set! stats (cons fname (stat-dbs stats))))
+;;; 
+;;;     ))
+;;; 
+;;; ;;======================================================================
+;;; ;; S E R V E R   S T U F F 
+;;; ;;======================================================================
+;;; 
+;;; ;; this does NOT return!
+;;; ;;
+;;; (define (find-free-port-and-open acfg)
+;;;   (let ((port (or (area-port acfg) 3200)))
+;;;     (handle-exceptions
+;;; 	exn
+;;; 	(begin
+;;; 	  (print "INFO: cannot bind to port " (rpc:default-server-port) ", trying next port")
+;;; 	  (area-port-set! acfg (+ port 1))
+;;; 	  (find-free-port-and-open acfg))
+;;;       (rpc:default-server-port port)
+;;;       (area-port-set! acfg port)
+;;;       (tcp-read-timeout 120000)
+;;;       ;; ((rpc:make-server (tcp-listen port)) #t)
+;;;       (tcp-listen (rpc:default-server-port)
+;;;       ))))
+;;; 
+;;; ;; register this node by putting a packet into the pkts dir.
+;;; ;; look for other servers
+;;; ;; contact other servers and compile list of servers
+;;; ;; there are two types of server
+;;; ;;     main servers - dashboards, runners and dedicated servers - need pkt
+;;; ;;     passive servers - test executers, step calls, list-runs - no pkt
+;;; ;;
+;;; (define (register-node acfg hostip port-num)
+;;;   ;;(mutex-lock! (area-mutex acfg))
+;;;   (let* ((server-type  (area-server-type acfg)) ;; auto, main, passive (no pkt created)
+;;; 	 (best-ip      (or hostip (get-my-best-address)))
+;;; 	 (mtdir        (area-dbdir acfg))
+;;; 	 (pktdir       (area-pktsdir acfg))) ;; conc mtdir "/.server-pkts")))
+;;;     (print "Registering node " best-ip ":" port-num)
+;;;     (if (not mtdir) ;; require a home for this node to put or find databases
+;;; 	#f
+;;; 	(begin
+;;; 	  (if  (not (directory? pktdir))(create-directory pktdir))
+;;; 	  ;; server is started, now create pkt if needed
+;;; 	  (print "Starting server in " server-type " mode with port " port-num)
+;;; 	  (if (member server-type '(auto main)) ;; TODO: if auto, count number of servers registers, if > 3 then don't put out a pkt
+;;; 	      (begin
+;;; 		(area-pktid-set! acfg
+;;; 				 (write-alist->pkt
+;;; 				  pktdir 
+;;; 				  `((hostname . ,(get-host-name))
+;;; 				    (ipaddr   . ,best-ip)
+;;; 				    (port     . ,port-num)
+;;; 				    (pid      . ,(current-process-id)))
+;;; 				  pktspec: *pktspec*
+;;; 				  ptype:   'server))
+;;; 		(area-pktfile-set! acfg (conc pktdir "/" (area-pktid acfg) ".pkt"))))
+;;; 	  (area-port-set!    acfg port-num)
+;;; 	  #;(mutex-unlock! (area-mutex acfg))))))
+;;; 
+;;; (define *cookie-seqnum* 0)
+;;; (define (make-cookie key)
+;;;   (set! *cookie-seqnum* (add1 *cookie-seqnum*))
+;;;   ;;(print "MAKE COOKIE CALLED -- on "servkey"-"*cookie-seqnum*)
+;;;   (conc key "-" *cookie-seqnum*)
+;;;   )
+;;; 
+;;; ;; dispatch locally if possible
+;;; ;;
+;;; (define (call-deliver-response acfg ipaddr port cookie data)
+;;;   (if (and (equal? (area-myaddr acfg) ipaddr)
+;;; 	   (equal? (area-port     acfg) port))
+;;;       (deliver-response acfg cookie data)
+;;;       ((rpc:procedure 'response ipaddr port) cookie data)))
+;;; 
+;;; (define (deliver-response acfg cookie data)
+;;;   (let ((deliver-response-start (current-milliseconds)))
+;;;     (thread-start! (make-thread
+;;; 		    (lambda ()
+;;; 		      (let loop ((tries-left 5))
+;;; 			;;(print "TOP OF DELIVER_RESPONSE LOOP; triesleft="tries-left)
+;;; 			;;(pp (hash-table->alist (area-cookie2mbox acfg)))
+;;; 			(let* ((mbox (hash-table-ref/default (area-cookie2mbox acfg) cookie #f)))
+;;; 			  (cond
+;;; 			   ((eq? 0 tries-left)
+;;; 			    (print "ulex:deliver-response: I give up. Mailbox never appeared. cookie="cookie)
+;;; 			    )
+;;; 			   (mbox
+;;; 			    ;;(print "got mbox="mbox"  got data="data"  send.")
+;;; 			    (mailbox-send! mbox data))
+;;; 			   (else
+;;; 			    ;;(print "no mbox yet.  look for "cookie)
+;;; 			    (thread-sleep! (/ (- 6 tries-left) 10))
+;;; 			    (loop (sub1 tries-left))))))
+;;; 		      ;; (debug-pp (list (conc "ulex:deliver-response took " (- (current-milliseconds) deliver-response-start) " ms, cookie=" cookie " data=") data))
+;;; 		      (sdbg> "deliver-response" "mailbox-send" deliver-response-start #f #f cookie)
+;;; 		      )
+;;; 		    (conc "deliver-response thread for cookie="cookie))))
+;;;   #t)
+;;; 
+;;; ;; action:
+;;; ;;   immediate - quick actions, no need to put in queues
+;;; ;;   dbwrite   - put in dbwrite queue
+;;; ;;   dbread    - put in dbread queue
+;;; ;;   oslong    - os actions, e.g. du, that could take a long time
+;;; ;;   osshort   - os actions that should be quick, e.g. df
+;;; ;;
+;;; (define (request acfg from-ipaddr from-port servkey action cookie fname params) ;; std-peer-handler
+;;;   ;; NOTE: Use rpc:current-peer for getting return address
+;;;   (let* ((std-peer-handler-start (current-milliseconds))
+;;; 	 ;; (raw-data               (alist-ref 'data     dat))
+;;; 	 (rdat                   (hash-table-ref/default
+;;; 				  (area-rtable acfg) action #f)) ;; this looks up the sql query or other details indexed by the action
+;;; 	 (witem                  (make-witem ripaddr: from-ipaddr ;; rhost:   from-host   
+;;; 					     rport:   from-port   action:  action
+;;; 					     rdat:    rdat        cookie:  cookie
+;;; 					     servkey: servkey     data:    params ;; TODO - rename data to params
+;;; 					     caller:  (rpc:current-peer))))
+;;;     (if (not (equal? servkey (area-pktid acfg)))
+;;; 	`(#f . ,(conc "I don't know you servkey=" servkey ", pktid=" (area-pktid acfg))) ;; immediately return this
+;;; 	(let* ((ctype (if rdat 
+;;; 			  (calldat-ctype rdat) ;; is this necessary? these should be identical
+;;; 			  action)))
+;;; 	  (sdbg> "std-peer-handler" "immediate" std-peer-handler-start #f #f)
+;;; 	  (case ctype
+;;; 	    ;; (dbwrite acfg rdat (cons from-ipaddr from-port) data)))
+;;; 	    ((full-ping)  `(#t  "ack to full ping"        ,(work-queue-add acfg fname witem) ,cookie))
+;;; 	    ((response)   `(#t  "ack from requestor"      ,(deliver-response acfg fname params)))
+;;; 	    ((dbwrite)    `(#t  "db write submitted"      ,(work-queue-add acfg fname witem) ,cookie))
+;;; 	    ((dbread)     `(#t  "db read submitted"       ,(work-queue-add acfg fname witem) ,cookie  ))
+;;; 	    ((dbrw)       `(#t  "db read/write submitted" ,cookie))
+;;; 	    ((osshort)    `(#t  "os short submitted"      ,cookie))
+;;; 	    ((oslong)     `(#t  "os long submitted"       ,cookie))
+;;; 	    (else         `(#f  "unrecognised action"     ,ctype)))))))
+;;; 
+;;; ;; Call this to start the actual server
+;;; ;;
+;;; ;; start_server
+;;; ;;
+;;; ;;   mode: '
+;;; ;;   handler: proc which takes pktrecieved as argument
+;;; ;;
+;;; 
+;;; (define (start-server acfg)
+;;;   (let* ((conn (find-free-port-and-open acfg))
+;;; 	 (port (area-port acfg)))
+;;;     (rpc:publish-procedure!
+;;;      'delist-db
+;;;      (lambda (fname)
+;;;        (hash-table-delete! (area-dbs acfg) fname)))
+;;;     (rpc:publish-procedure!
+;;;      'calling-addr
+;;;      (lambda ()
+;;;        (rpc:current-peer)))
+;;;     (rpc:publish-procedure!
+;;;      'ping
+;;;      (lambda ()(real-ping acfg)))
+;;;     (rpc:publish-procedure!
+;;;      'request
+;;;      (lambda (from-addr from-port servkey action cookie dbname params)
+;;;        (request acfg from-addr from-port servkey action cookie dbname params)))
+;;;     (rpc:publish-procedure!
+;;;      'response
+;;;      (lambda (cookie res-dat)
+;;;        (deliver-response acfg cookie res-dat)))
+;;;     (area-ready-set! acfg #t)
+;;;     (area-conn-set! acfg conn)
+;;;     ((rpc:make-server conn) #f)));; ((tcp-listen (rpc:default-server-port)) #t)
+;;; 
+;;; 
+;;; (define (launch acfg) ;;  #!optional (proc std-peer-handler))
+;;;   (print "starting launch")
+;;;   (update-known-servers acfg) ;; gotta do this on every start (thus why limit number of publicised servers)
+;;;   #;(let ((original-handler (current-exception-handler))) ;; is th
+;;;     (lambda (exception)
+;;;       (server-exit-procedure)
+;;;       (original-handler exception)))
+;;;   (on-exit (lambda ()
+;;; 	     (shutdown acfg))) ;; (finalize-all-db-handles acfg)))
+;;;   ;; set up the rpc handler
+;;;   (let* ((th1  (make-thread
+;;; 		(lambda ()(start-server acfg))
+;;; 		"server thread"))
+;;; 	 (th2   (make-thread
+;;; 		 (lambda ()
+;;; 		   (print "th2 starting")
+;;; 		   (let loop ()
+;;; 		     (work-queue-processor acfg)
+;;; 		     (print "work-queue-processor crashed!")
+;;; 		     (loop)))
+;;; 		 "work queue thread")))
+;;;     (thread-start! th1)
+;;;     (thread-start! th2)
+;;;     (let loop ()
+;;;       (thread-sleep! 0.025)
+;;;       (if (area-ready acfg)
+;;; 	  #t
+;;; 	  (loop)))
+;;;     ;; attempt to fix my address
+;;;     (let* ((all-addr (get-all-ips-sorted)))	     ;; could use (tcp-addresses conn)?
+;;;       (let loop ((rem-addrs all-addr))
+;;; 	(if (null? rem-addrs)
+;;; 	    (begin
+;;; 	      (print "ERROR: Failed to figure out the ip address of myself as a server. Giving up.")
+;;; 	      (exit 1)) ;; BUG Changeme to raising an exception
+;;; 		
+;;; 	    (let* ((addr      (car rem-addrs))
+;;; 		   (good-addr (handle-exceptions
+;;; 				  exn
+;;; 				  #f
+;;; 				((rpc:procedure 'calling-addr addr (area-port acfg))))))
+;;; 	      (if good-addr
+;;; 		  (begin
+;;; 		    (print "Got good-addr of " good-addr)
+;;; 		    (area-myaddr-set! acfg good-addr))
+;;; 		  (loop (cdr rem-addrs)))))))
+;;;     (register-node acfg (area-myaddr acfg)(area-port acfg))
+;;;     (print "INFO: Server started on " (area-myaddr acfg) ":" (area-port acfg))
+;;;     ;; (update-known-servers acfg) ;; gotta do this on every start (thus why limit number of publicised servers)
+;;;     ))
+;;; 
+;;; (define (clear-server-pkt acfg)
+;;;   (let ((pktf (area-pktfile acfg)))
+;;;     (if pktf (delete-file* pktf))))
+;;; 
+;;; (define (shutdown acfg)
+;;;   (let (;;(conn (area-conn    acfg))
+;;; 	(pktf (area-pktfile acfg))
+;;; 	(port (area-port    acfg)))
+;;;     (if pktf (delete-file* pktf))
+;;;     (send-all "imshuttingdown")
+;;;     ;; (rpc:close-all-connections!) ;; don't know if this is actually needed
+;;;     (finalize-all-db-handles acfg)))
+;;; 
+;;; (define (send-all msg)
+;;;   #f)
+;;; 
+;;; ;; given a area record look up all the packets
+;;; ;;
+;;; (define (get-all-server-pkts acfg)
+;;;   (let ((all-pkt-files (glob (conc (area-pktsdir acfg) "/*.pkt"))))
+;;;     (map (lambda (pkt-file)
+;;; 	   (read-pkt->alist pkt-file pktspec: *pktspec*))
+;;; 	 all-pkt-files)))
+;;; 
+;;; #;((Z . "9a0212302295a19610d5796fce0370fa130758e9")
+;;;   (port . "34827")
+;;;   (pid . "28748")
+;;;   (hostname . "zeus")
+;;;   (T . "server")
+;;;   (D . "1549427032.0"))
+;;; 
+;;; #;(define (get-my-best-address)
+;;;   (let ((all-my-addresses (get-all-ips))) ;; (vector->list (hostinfo-addresses (hostname->hostinfo (get-host-name))))))
+;;;     (cond
+;;;      ((null? all-my-addresses)
+;;;       (get-host-name))                                          ;; no interfaces?
+;;;      ((eq? (length all-my-addresses) 1)
+;;;       (ip->string (car all-my-addresses)))                      ;; only one to choose from, just go with it
+;;;      (else 
+;;;       (ip->string (car (filter (lambda (x)                      ;; take any but 127.
+;;; 				 (not (eq? (u8vector-ref x 0) 127)))
+;;; 			       all-my-addresses)))))))
+;;; 
+;;; ;; whoami? I am my pkt
+;;; ;;
+;;; (define (whoami? acfg)
+;;;   (hash-table-ref/default (area-hosts acfg)(area-pktid acfg) #f))
+;;; 
+;;; ;;======================================================================
+;;; ;; "Client side" operations
+;;; ;;======================================================================
+;;; 
+;;; (define (safe-call call-key host port . params)
+;;;   (handle-exceptions
+;;;    exn
+;;;    (begin
+;;;      (print "Call " call-key " to " host ":" port " failed")
+;;;      #f)
+;;;    (apply (rpc:procedure call-key host port) params)))
+;;; 
+;;; ;; ;; convert to/from string / sexpr
+;;; ;; 
+;;; ;; (define (string->sexpr str)
+;;; ;;   (if (string? str)
+;;; ;;       (with-input-from-string str read)
+;;; ;;       str))
+;;; ;; 
+;;; ;; (define (sexpr->string s)
+;;; ;;   (with-output-to-string (lambda ()(write s))))
+;;; 
+;;; ;; is the server alive?
+;;; ;;
+;;; (define (ping acfg host port)
+;;;   (let* ((myaddr     (area-myaddr acfg))
+;;; 	 (myport     (area-port   acfg))
+;;; 	 (start-time (current-milliseconds))
+;;; 	 (res        (if (and (equal? myaddr host)
+;;; 			      (equal? myport port))
+;;; 			 (real-ping acfg)
+;;; 			 ((rpc:procedure 'ping host port)))))
+;;;     (cons (- (current-milliseconds) start-time)
+;;; 	  res)))
+;;; 
+;;; ;; returns ( ipaddr port alist-fname=>randnum )
+;;; (define (real-ping acfg)
+;;;   `(,(area-myaddr acfg) ,(area-port acfg) ,(get-host-stats acfg)))
+;;; 
+;;; ;; is the server alive AND the queues processing?
+;;; ;;
+;;; #;(define (full-ping acfg servpkt)
+;;;   (let* ((start-time (current-milliseconds))
+;;; 	 (res        (send-message acfg servpkt '(full-ping) 'full-ping)))
+;;;     (cons (- (current-milliseconds) start-time)
+;;; 	  res))) ;; (equal? res "got ping"))))
+;;; 
+;;; 
+;;; ;; look up all pkts and get the server id (the hash), port, host/ip
+;;; ;; store this info in acfg
+;;; ;; return the number of responsive servers found
+;;; ;;
+;;; ;; DO NOT VERIFY THAT THE SERVER IS ALIVE HERE. This is called at times where the current server is not yet alive and cannot ping itself
+;;; ;;
+;;; (define (update-known-servers acfg)
+;;;   ;; readll all pkts
+;;;   ;; foreach pkt; if it isn't me ping the server; if alive, add to hosts hash, else rm the pkt
+;;;   (let* ((start-time (current-milliseconds))
+;;; 	 (all-pkts  (delete-duplicates
+;;; 		     (append (get-all-server-pkts acfg)
+;;; 			     (hash-table-values (area-hosts acfg)))))
+;;; 	 (hostshash (area-hosts acfg))
+;;; 	 (my-id     (area-pktid acfg))
+;;; 	 (pktsdir   (area-pktsdir acfg)) ;; needed to remove pkts from non-responsive servers
+;;; 	 (numsrvs   0)
+;;; 	 (delpkt    (lambda (pktsdir sid)
+;;; 		      (print "clearing out server " sid)
+;;; 		      (delete-file* (conc pktsdir "/" sid ".pkt"))
+;;; 		      (hash-table-delete! hostshash sid))))
+;;;     (area-last-srvup-set! acfg (current-seconds))
+;;;     (for-each
+;;;      (lambda (servpkt)
+;;;        (if (list? servpkt)
+;;; 	   ;; (pp servpkt)
+;;; 	   (let* ((shost (alist-ref 'ipaddr servpkt))
+;;; 		  (sport (any->number (alist-ref 'port servpkt)))
+;;; 		  (res   (handle-exceptions
+;;; 			  exn
+;;; 			  (begin
+;;; 			    ;; (print "INFO: bad server on " shost ":" sport)
+;;; 			    #f)
+;;; 			  (ping acfg shost sport)))
+;;; 		  (sid   (alist-ref 'Z servpkt)) ;; Z code is our name for the server
+;;; 		  (url   (conc shost ":" sport))
+;;; 		  )
+;;; 	     #;(if (or (not res)
+;;; 		     (null? res))
+;;; 		 (begin
+;;; 		   (print "STRANGE: ping of " url " gave " res)))
+;;; 	     
+;;; 	     ;; (print "Got " res " from " shost ":" sport)
+;;; 	     (match res
+;;; 		    ((qduration . payload)
+;;; 		     ;; (print "Server pkt:" (alist-ref 'ipaddr servpkt) ":" (alist-ref 'port servpkt)
+;;; 		     ;;        (if payload
+;;; 		     ;;            "Success" "Fail"))
+;;; 		     (match payload
+;;; 			    ((host port stats)
+;;; 			     ;; (print "From " host ":" port " got stats: " stats)
+;;; 			     (if (and host port stats)
+;;; 				 (let ((url (conc host ":" port)))
+;;; 				   (hash-table-set! hostshash sid servpkt)
+;;; 				   ;; store based on host:port
+;;; 				   (hash-table-set! (area-hoststats acfg) sid stats))
+;;; 				 (print "missing data from the server, not sure what that means!"))
+;;; 			     (set! numsrvs (+ numsrvs 1)))
+;;; 			    (#f
+;;; 			     (print "Removing pkt " sid " due to #f from server or failed ping")
+;;; 			     (delpkt pktsdir sid))
+;;; 			    (else
+;;; 			     (print "Got ")(pp res)(print " from server ")(pp servpkt) " but response did not match (#f/#t . msg)")))
+;;; 		    (else
+;;; 		     ;; here we delete the pkt - can't reach the server, remove it
+;;; 		     ;; however this logic is inadequate. we should mark the server as checked
+;;; 		     ;; and not good, if it happens a second time - then remove the pkt
+;;; 		     ;; or something similar. I.e. don't be too quick to assume the server is wedged or dead
+;;; 		     ;; could be it is simply too busy to reply
+;;; 		     (let ((bad-pings (hash-table-ref/default (area-health acfg) url 0)))
+;;; 		       (if (> bad-pings 1) ;; two bad pings - remove pkt
+;;; 			   (begin
+;;; 			     (print "INFO: " bad-pings " bad responses from " url ", deleting pkt " sid)
+;;; 			     (delpkt pktsdir sid))
+;;; 			   (begin
+;;; 			     (print "INFO: " bad-pings " bad responses from " shost ":" sport " not deleting pkt yet")
+;;; 			     (hash-table-set! (area-health acfg)
+;;; 					      url
+;;; 					      (+ (hash-table-ref/default (area-health acfg) url 0) 1))
+;;; 			     ))
+;;; 		       ))))
+;;; 	   ;; servpkt is not actually a pkt?
+;;; 	   (begin
+;;; 	     (print "Bad pkt " servpkt))))
+;;;      all-pkts)
+;;;     (sdbg> "update-known-servers" "end" start-time #f #f " found " numsrvs
+;;; 	   " servers, pkts: " (map (lambda (p)
+;;; 				     (alist-ref 'Z p))
+;;; 				   all-pkts))
+;;;     numsrvs))
+;;; 
+;;; (defstruct srvstat
+;;;   (numfiles 0)   ;; number of db files handled by this server - subtract 1 for the db being currently looked at
+;;;   (randnum  #f)  ;; tie breaker number assigned to by the server itself - applies only to the db under consideration
+;;;   (pkt      #f)) ;; the server pkt
+;;; 
+;;; ;;(define (srv->srvstat srvpkt)
+;;;   
+;;; ;; Get the server best for given dbname and key
+;;; ;;
+;;; ;;   NOTE: key is not currently used. The key points to the kind of query, this may be useful for directing read-only queries.
+;;; ;;
+;;; (define (get-best-server acfg dbname key)
+;;;   (let* (;; (servers (hash-table-values (area-hosts acfg)))
+;;; 	 (servers     (area-hosts acfg))
+;;; 	 (skeys       (sort (hash-table-keys servers) string>=?)) ;; a stable listing
+;;; 	 (start-time  (current-milliseconds))
+;;; 	 (srvstats    (make-hash-table))  ;; srvid => srvstat
+;;; 	 (url         (conc (area-myaddr acfg) ":" (area-port acfg))))
+;;;     ;; (print "scores for " dbname ": " (map (lambda (k)(cons k (calc-server-score acfg dbname k))) skeys))
+;;;     (if (null? skeys)
+;;; 	(if (> (update-known-servers acfg) 0)
+;;; 	    (get-best-server acfg dbname key) ;; some risk of infinite loop here, TODO add try counter
+;;; 	    (begin
+;;; 	      (print "ERROR: no server found!") ;; since this process is also a server this should never happen
+;;; 	      #f))
+;;; 	(begin
+;;; 	  ;; (print "in get-best-server with skeys=" skeys)
+;;; 	  (if (> (- (current-seconds) (area-last-srvup acfg)) 10)
+;;; 	      (begin
+;;; 		(update-known-servers acfg)
+;;; 		(sdbg> "get-best-server" "update-known-servers" start-time #f #f)))
+;;; 
+;;; 	  ;; for each server look at the list of dbfiles, total number of dbs being handled
+;;; 	  ;; and the rand number, save the best host
+;;; 	  ;; also do a delist-db for each server dbfile not used
+;;; 	  (let* ((best-server       #f)
+;;; 		 (servers-to-delist (make-hash-table)))
+;;; 	    (for-each
+;;; 	     (lambda (srvid)
+;;; 	       (let* ((server    (hash-table-ref/default servers srvid #f))
+;;; 		      (stats     (hash-table-ref/default (area-hoststats acfg) srvid '(()))))
+;;; 		 ;; (print "stats: " stats)
+;;;  		 (if server
+;;; 		     (let* ((dbweights (car stats))
+;;; 			    (srvload   (length (filter (lambda (x)(not (equal? dbname (car x)))) dbweights)))
+;;; 			    (dbrec     (alist-ref dbname dbweights equal?))  ;; get the pair with fname . randscore
+;;; 			    (randnum   (if dbrec
+;;; 					   dbrec ;; (cdr dbrec)
+;;; 					   0)))
+;;; 		       (hash-table-set! srvstats srvid (make-srvstat numfiles: srvload randnum: randnum pkt: server))))))
+;;; 	     skeys)
+;;; 	    
+;;; 	    (let* ((sorted    (sort (hash-table-values srvstats) 
+;;; 				    (lambda (a b)
+;;; 				      (let ((numfiles-a (srvstat-numfiles a))
+;;; 					    (numfiles-b (srvstat-numfiles b))
+;;; 					    (randnum-a  (srvstat-randnum a))
+;;; 					    (randnum-b  (srvstat-randnum b)))
+;;; 					(if (< numfiles-a numfiles-b) ;; Note, I don't think adding an offset works here. Goal was only move file handling to a different server if it has 2 less
+;;; 					    #t
+;;; 					    (if (and (equal? numfiles-a numfiles-b)
+;;; 						     (< randnum-a randnum-b))
+;;; 						#t
+;;; 						#f))))))
+;;; 		   (best      (if (null? sorted)
+;;; 				  (begin
+;;; 				    (print "ERROR: should never be null due to self as server.")
+;;; 				    #f)
+;;; 				  (srvstat-pkt (car sorted)))))
+;;; 	      #;(print "SERVER(" url "): " dbname ": " (map (lambda (srv)
+;;; 							    (let ((p (srvstat-pkt srv)))
+;;; 							      (conc (alist-ref 'ipaddr p) ":" (alist-ref 'port p)
+;;; 								    "(" (srvstat-numfiles srv)","(srvstat-randnum srv)")")))
+;;; 							    sorted))
+;;; 	      best))))))
+;;;     
+;;;     ;; send out an "I'm about to exit notice to all known servers"
+;;;     ;;
+;;; (define (death-imminent acfg)
+;;;   '())
+;;; 
+;;; ;;======================================================================
+;;; ;; U L E X  -  T H E   I N T E R E S T I N G   S T U F F ! !
+;;; ;;======================================================================
+;;; 
+;;; ;; register a handler
+;;; ;;   NOTES:
+;;; ;;     dbinitsql   is reserved for a list of sql statements for initializing the db
+;;; ;;     dbinitfn    is reserved for a db init function, if exists called after dbinitsql
+;;; ;;     
+;;; (define (register acfg key obj #!optional (ctype 'dbwrite))
+;;;   (let ((ht (area-rtable acfg)))
+;;;     (if (hash-table-exists? ht key)
+;;; 	(print "WARNING: redefinition of entry " key))
+;;;     (hash-table-set! ht key (make-calldat obj: obj ctype: ctype))))
+;;; 
+;;; ;; usage: register-batch acfg '((key1 . sql1) (key2 . sql2) ... )
+;;; ;; NB// obj is often an sql query
+;;; ;;
+;;; (define (register-batch acfg ctype data)
+;;;   (let ((ht (area-rtable acfg)))
+;;;     (map (lambda (dat)
+;;; 	   (hash-table-set! ht (car dat)(make-calldat obj: (cdr dat) ctype: ctype)))
+;;; 	 data)))
+;;; 
+;;; (define (initialize-area-calls-from-specfile area specfile)
+;;;   (let* ((callspec (with-input-from-file specfile read )))
+;;;     (for-each (lambda (group)
+;;;                 (register-batch
+;;;                  area
+;;;                  (car group)
+;;;                  (cdr group)))
+;;;               callspec)))
+;;; 
+;;; ;; get-rentry
+;;; ;;
+;;; (define (get-rentry acfg key)
+;;;   (hash-table-ref/default (area-rtable acfg) key #f))
+;;; 
+;;; (define (get-rsql acfg key)
+;;;   (let ((cdat (get-rentry acfg key)))
+;;;     (if cdat
+;;; 	(calldat-obj cdat)
+;;; 	#f)))
+;;; 
+;;; 
+;;; 
+;;; ;; blocking call:
+;;; ;;    client                         server
+;;; ;;    ------                         ------
+;;; ;;    call()
+;;; ;;    send-message()
+;;; ;;    nmsg-send()
+;;; ;;                                   nmsg-receive()
+;;; ;;                                   nmsg-respond(ack,cookie)
+;;; ;;    ack, cookie
+;;; ;;    mbox-thread-wait(cookie)
+;;; ;;                                   nmsg-send(client,cookie,result)
+;;; ;;        nmsg-respond(ack)
+;;; ;;        return result
+;;; ;;
+;;; ;; reserved action:
+;;; ;;    'immediate
+;;; ;;    'dbinitsql
+;;; ;;
+;;; (define (call acfg dbname action params #!optional (count 0))
+;;;   (let* ((call-start-time     (current-milliseconds))
+;;; 	 (srv                 (get-best-server acfg dbname action))
+;;; 	 (post-get-start-time (current-milliseconds))
+;;; 	 (rdat                (hash-table-ref/default (area-rtable acfg) action #f))
+;;; 	 (myid                (trim-pktid (area-pktid acfg)))
+;;; 	 (srvid               (trim-pktid (alist-ref 'Z srv)))
+;;; 	 (cookie              (make-cookie myid)))
+;;;     (sdbg> "call" "get-best-server" call-start-time #f call-start-time " from: " myid " to server: " srvid " for " dbname " action: " action " params: " params " rdat: " rdat)
+;;;     (print "INFO: call to " (alist-ref 'ipaddr srv) ":" (alist-ref 'port srv) " from " (area-myaddr acfg) ":" (area-port acfg) " for " dbname)
+;;;     (if (and srv rdat) ;; need both to dispatch a request
+;;; 	(let* ((ripaddr  (alist-ref 'ipaddr srv))
+;;; 	       (rsrvid   (alist-ref 'Z srv))
+;;; 	       (rport    (any->number (alist-ref 'port   srv)))
+;;; 	       (res-full (if (and (equal? ripaddr (area-myaddr acfg))
+;;; 				  (equal? rport   (area-port acfg)))
+;;; 			     (request acfg ripaddr rport (area-pktid acfg) action cookie dbname params)
+;;; 			     (safe-call 'request ripaddr rport
+;;; 					(area-myaddr acfg)
+;;; 					(area-port   acfg)
+;;; 					#;(area-pktid acfg)
+;;; 					rsrvid
+;;; 					action cookie dbname params))))
+;;; 	  ;; (print "res-full: " res-full)
+;;; 	  (match res-full
+;;; 	    ((response-ok response-msg rem ...)
+;;; 	     (let* ((send-message-time (current-milliseconds))
+;;; 		    ;; (match res-full
+;;; 		    ;;  ((response-ok response-msg)
+;;; 		    ;; (response-ok  (car res-full))
+;;; 		    ;; (response-msg (cadr res-full)
+;;; 		    )
+;;; 	       ;; (res (take res-full 3))) ;; ctype == action, TODO: converge on one term <<=== what was this? BUG 
+;;; 	       ;; (print "ulex:call: send-message took " (- send-message-time post-get-start-time) " ms params=" params)
+;;; 	       (sdbg> "call" "send-message" post-get-start-time #f call-start-time)
+;;; 	       (cond
+;;; 		((not response-ok) #f)
+;;; 		((member response-msg '("db read submitted" "db write submitted"))
+;;; 		 (let* ((cookie-id   (cadddr res-full))
+;;; 			(mbox        (make-mailbox))
+;;; 			(mbox-time   (current-milliseconds)))
+;;; 		   (hash-table-set! (area-cookie2mbox acfg) cookie-id mbox)
+;;; 		   (let* ((mbox-timeout-secs    20)
+;;; 			  (mbox-timeout-result 'MBOX_TIMEOUT)
+;;; 			  (res                  (mailbox-receive! mbox mbox-timeout-secs mbox-timeout-result))
+;;; 			  (mbox-receive-time    (current-milliseconds)))
+;;; 		     (hash-table-delete! (area-cookie2mbox acfg) cookie-id)
+;;; 		     (sdbg> "call" "mailbox-receive" mbox-time #f call-start-time " from: " myid " to server: " srvid " for " dbname)
+;;; 		     ;; (print "ulex:call mailbox-receive took " (- mbox-receive-time mbox-time) "ms params=" params)
+;;; 		     res)))
+;;; 		(else
+;;; 		 (print "Unhandled response \""response-msg"\"")
+;;; 		 #f))
+;;; 	       ;; depending on what action (i.e. ctype) is we will block here waiting for
+;;; 	       ;; all the data (mechanism to be determined)
+;;; 	       ;;
+;;; 	       ;; if res is a "working on it" then wait
+;;; 	       ;;    wait for result
+;;; 	       ;; mailbox thread wait on 
+;;; 	       
+;;; 	       ;; if res is a "can't help you" then try a different server
+;;; 	       ;; if res is a "ack" (e.g. for one-shot requests) then return res
+;;; 	       ))
+;;; 	    (else
+;;; 	     (if (< count 10)
+;;; 		 (let* ((url (conc (alist-ref 'ipaddr srv) ":" (alist-ref 'port srv))))
+;;; 		   (thread-sleep! 1)
+;;; 		   (print "ERROR: Bad result from " url ", dbname: " dbname ", action: " action ", params: " params ". Trying again in 1 second.")
+;;; 		   (call acfg dbname action params (+ count 1)))
+;;; 		 (begin
+;;; 		   (error (conc "ERROR: " count " tries, still have improper response res-full=" res-full)))))))
+;;; 	(begin
+;;; 	  (if (not rdat)
+;;; 	      (print "ERROR: action " action " not registered.")
+;;; 	      (if (< count 10)
+;;; 		 (begin
+;;; 		   (thread-sleep! 1)
+;;; 		   (area-hosts-set! acfg (make-hash-table)) ;; clear out all known hosts
+;;; 		   (print "ERROR: no server found, srv=" srv ", trying again in 1 seconds")
+;;; 		   (call acfg dbname action params (+ count 1)))
+;;; 		 (begin
+;;; 		   (error (conc "ERROR: no server found after 10 tries, srv=" srv ", giving up."))
+;;; 		   #;(error "No server available"))))))))
+;;; 
+;;; 
+;;; ;;======================================================================
+;;; ;; U T I L I T I E S 
+;;; ;;======================================================================
+;;; 
+;;; ;; get a signature for identifing this process
+;;; ;;
+;;; (define (get-process-signature)
+;;;   (cons (get-host-name)(current-process-id)))
+;;; 
+;;; ;;======================================================================
+;;; ;; S Y S T E M   S T U F F
+;;; ;;======================================================================
+;;; 
+;;; ;; get normalized cpu load by reading from /proc/loadavg and
+;;; ;; /proc/cpuinfo return all three values and the number of real cpus
+;;; ;; and the number of threads returns alist '((adj-cpu-load
+;;; ;; . normalized-proc-load) ... etc.  keys: adj-proc-load,
+;;; ;; adj-core-load, 1m-load, 5m-load, 15m-load
+;;; ;;
+;;; (define (get-normalized-cpu-load)
+;;;   (let ((res (get-normalized-cpu-load-raw))
+;;; 	(default `((adj-proc-load . 2) ;; there is no right answer
+;;; 		   (adj-core-load . 2)
+;;; 		   (1m-load       . 2)
+;;; 		   (5m-load       . 0) ;; causes a large delta - thus causing default of throttling if stuff goes wrong
+;;; 		   (15m-load      . 0)
+;;; 		   (proc          . 1)
+;;; 		   (core          . 1)
+;;; 		   (phys          . 1)
+;;; 		   (error         . #t))))
+;;;     (cond
+;;;      ((and (list? res)
+;;; 	   (> (length res) 2))
+;;;       res)
+;;;      ((eq? res #f)   default) ;; add messages?
+;;;      ((eq? res #f) default)   ;; this would be the #eof
+;;;      (else default))))
+;;; 
+;;; (define (get-normalized-cpu-load-raw)
+;;;   (let* ((actual-host           (get-host-name))) ;; #f is localhost
+;;;     (let ((data  (append 
+;;; 		  (with-input-from-file "/proc/loadavg" read-lines)
+;;; 		  (with-input-from-file "/proc/cpuinfo" read-lines)
+;;; 		  (list "end")))
+;;; 	  (load-rx  (regexp "^([\\d\\.]+)\\s+([\\d\\.]+)\\s+([\\d\\.]+)\\s+.*$"))
+;;; 	  (proc-rx  (regexp "^processor\\s+:\\s+(\\d+)\\s*$"))
+;;; 	  (core-rx  (regexp "^core id\\s+:\\s+(\\d+)\\s*$"))
+;;; 	  (phys-rx  (regexp "^physical id\\s+:\\s+(\\d+)\\s*$"))
+;;; 	  (max-num  (lambda (p n)(max (string->number p) n))))
+;;;       ;; (print "data=" data)
+;;;       (if (null? data) ;; something went wrong
+;;; 	  #f
+;;; 	  (let loop ((hed      (car data))
+;;; 		     (tal      (cdr data))
+;;; 		     (loads    #f)
+;;; 		     (proc-num 0)  ;; processor includes threads
+;;; 		     (phys-num 0)  ;; physical chip on motherboard
+;;; 		     (core-num 0)) ;; core
+;;; 	    ;; (print hed ", " loads ", " proc-num ", " phys-num ", " core-num)
+;;; 	    (if (null? tal) ;; have all our data, calculate normalized load and return result
+;;; 		(let* ((act-proc (+ proc-num 1))
+;;; 		       (act-phys (+ phys-num 1))
+;;; 		       (act-core (+ core-num 1))
+;;; 		       (adj-proc-load (/ (car loads) act-proc))
+;;; 		       (adj-core-load (/ (car loads) act-core))
+;;; 		       (result
+;;; 			(append (list (cons 'adj-proc-load adj-proc-load)
+;;; 				      (cons 'adj-core-load adj-core-load))
+;;; 				(list (cons '1m-load (car loads))
+;;; 				      (cons '5m-load (cadr loads))
+;;; 				      (cons '15m-load (caddr loads)))
+;;; 				(list (cons 'proc act-proc)
+;;; 				      (cons 'core act-core)
+;;; 				      (cons 'phys act-phys)))))
+;;; 		  result)
+;;; 		(regex-case
+;;; 		    hed
+;;; 		  (load-rx  ( x l1 l5 l15 ) (loop (car tal)(cdr tal)(map string->number (list l1 l5 l15)) proc-num phys-num core-num))
+;;; 		  (proc-rx  ( x p         ) (loop (car tal)(cdr tal) loads           (max-num p proc-num) phys-num core-num))
+;;; 		  (phys-rx  ( x p         ) (loop (car tal)(cdr tal) loads           proc-num (max-num p phys-num) core-num))
+;;; 		  (core-rx  ( x c         ) (loop (car tal)(cdr tal) loads           proc-num phys-num (max-num c core-num)))
+;;; 		  (else 
+;;; 		   (begin
+;;; 		     ;; (print "NO MATCH: " hed)
+;;; 		     (loop (car tal)(cdr tal) loads proc-num phys-num core-num))))))))))
+;;; 
+;;; (define (get-host-stats acfg)
+;;;   (let ((stats-hash (area-stats acfg)))
+;;;     ;; use this opportunity to remove references to dbfiles which have not been accessed in a while
+;;;     (for-each
+;;;      (lambda (dbname)
+;;;        (let* ((stats       (hash-table-ref stats-hash dbname))
+;;; 	      (last-access (stat-when stats)))
+;;; 	 (if (and (> last-access 0)                             ;; if zero then there has been no access
+;;; 		  (> (- (current-seconds) last-access) 10))     ;; not used in ten seconds
+;;; 	     (begin
+;;; 	       (print "Removing " dbname " from stats list")
+;;; 	       (hash-table-delete! stats-hash dbname) ;; remove from stats hash
+;;; 	       (stat-dbs-set! stats (hash-table-keys stats))))))
+;;;      (hash-table-keys stats-hash))
+;;;     
+;;;     `(,(hash-table->alist (area-dbs acfg)) ;; dbname => randnum
+;;;       ,(map (lambda (dbname)  ;; dbname is the db name
+;;; 	      (cons dbname (stat-when (hash-table-ref stats-hash dbname))))
+;;; 	    (hash-table-keys stats-hash))
+;;;       (cpuload . ,(get-normalized-cpu-load)))))
+;;;     #;(stats   . ,(map (lambda (k) ;; create an alist from the stats data
+;;; 		       (cons k (stat->alist (hash-table-ref (area-stats acfg) k))))
+;;; 		     (hash-table-keys (area-stats acfg))))
+;;; 
+;;; #;(trace
+;;;  ;; assv
+;;;  ;; cdr
+;;;  ;; caar
+;;;  ;; ;; cdr
+;;;  ;; call
+;;;  ;; finalize-all-db-handles
+;;;  ;; get-all-server-pkts
+;;;  ;; get-normalized-cpu-load
+;;;  ;; get-normalized-cpu-load-raw
+;;;  ;; launch
+;;;  ;; nmsg-send
+;;;  ;; process-db-queries
+;;;  ;; receive-message
+;;;  ;; std-peer-handler
+;;;  ;; update-known-servers
+;;;  ;; work-queue-processor
+;;;  )
+;;; 
+;;; ;;======================================================================
+;;; ;; netutil
+;;; ;;   move this back to ulex-netutil.scm someday?
+;;; ;;======================================================================
+;;; 
+;;; ;; #include 
+;;; ;; #include 
+;;; ;; #include 
+;;; ;; #include 
+;;; 
+;;; (foreign-declare "#include \"sys/types.h\"")
+;;; (foreign-declare "#include \"sys/socket.h\"")
+;;; (foreign-declare "#include \"ifaddrs.h\"")
+;;; (foreign-declare "#include \"arpa/inet.h\"")
+;;; 
+;;; ;; get IP addresses from ALL interfaces
+;;; (define get-all-ips
+;;;   (foreign-safe-lambda* scheme-object ()
+;;;     "
+;;; 
+;;; // from https://stackoverflow.com/questions/17909401/linux-c-get-default-interfaces-ip-address :
+;;; 
+;;; 
+;;;     C_word lst = C_SCHEME_END_OF_LIST, len, str, *a;
+;;; //    struct ifaddrs *ifa, *i;
+;;; //    struct sockaddr *sa;
+;;; 
+;;;     struct ifaddrs * ifAddrStruct = NULL;
+;;;     struct ifaddrs * ifa = NULL;
+;;;     void * tmpAddrPtr = NULL;
+;;; 
+;;;     if ( getifaddrs(&ifAddrStruct) != 0)
+;;;       C_return(C_SCHEME_FALSE);
+;;; 
+;;; //    for (i = ifa; i != NULL; i = i->ifa_next) {
+;;;     for (ifa = ifAddrStruct; ifa != NULL; ifa = ifa->ifa_next) {
+;;;         if (ifa->ifa_addr->sa_family==AF_INET) { // Check it is
+;;;             // a valid IPv4 address
+;;;             tmpAddrPtr = &((struct sockaddr_in *)ifa->ifa_addr)->sin_addr;
+;;;             char addressBuffer[INET_ADDRSTRLEN];
+;;;             inet_ntop(AF_INET, tmpAddrPtr, addressBuffer, INET_ADDRSTRLEN);
+;;; //            printf(\"%s IP Address %s\\n\", ifa->ifa_name, addressBuffer);
+;;;             len = strlen(addressBuffer);
+;;;             a = C_alloc(C_SIZEOF_PAIR + C_SIZEOF_STRING(len));
+;;;             str = C_string(&a, len, addressBuffer);
+;;;             lst = C_a_pair(&a, str, lst);
+;;;         } 
+;;; 
+;;; //        else if (ifa->ifa_addr->sa_family==AF_INET6) { // Check it is
+;;; //            // a valid IPv6 address
+;;; //            tmpAddrPtr = &((struct sockaddr_in6 *)ifa->ifa_addr)->sin6_addr;
+;;; //            char addressBuffer[INET6_ADDRSTRLEN];
+;;; //            inet_ntop(AF_INET6, tmpAddrPtr, addressBuffer, INET6_ADDRSTRLEN);
+;;; ////            printf(\"%s IP Address %s\\n\", ifa->ifa_name, addressBuffer);
+;;; //            len = strlen(addressBuffer);
+;;; //            a = C_alloc(C_SIZEOF_PAIR + C_SIZEOF_STRING(len));
+;;; //            str = C_string(&a, len, addressBuffer);
+;;; //            lst = C_a_pair(&a, str, lst);
+;;; //       }
+;;; 
+;;; //       else {
+;;; //         printf(\" not an IPv4 address\\n\");
+;;; //       }
+;;; 
+;;;     }
+;;; 
+;;;     freeifaddrs(ifa);
+;;;     C_return(lst);
+;;; 
+;;; "))
+;;; 
+;;; ;; Change this to bias for addresses with a reasonable broadcast value?
+;;; ;;
+;;; (define (ip-pref-less? a b)
+;;;   (let* ((rate (lambda (ipstr)
+;;;                  (regex-case ipstr
+;;;                              ( "^127\\." _ 0 )
+;;;                              ( "^(10\\.0|192\\.168\\.)\\..*" _ 1 )
+;;;                              ( else 2 ) ))))
+;;;     (< (rate a) (rate b))))
+;;;   
+;;; 
+;;; (define (get-my-best-address)
+;;;   (let ((all-my-addresses (get-all-ips))
+;;;         ;;(all-my-addresses-old (vector->list (hostinfo-addresses (hostname->hostinfo (get-host-name)))))
+;;;         )
+;;;     (cond
+;;;      ((null? all-my-addresses)
+;;;       (get-host-name))                                          ;; no interfaces?
+;;;      ((eq? (length all-my-addresses) 1)
+;;;       (car all-my-addresses))                      ;; only one to choose from, just go with it
+;;;      
+;;;      (else
+;;;       (car (sort all-my-addresses ip-pref-less?)))
+;;;      ;; (else 
+;;;      ;;  (ip->string (car (filter (lambda (x)                      ;; take any but 127.
+;;;      ;;    			 (not (eq? (u8vector-ref x 0) 127)))
+;;;      ;;    		       all-my-addresses))))
+;;; 
+;;;      )))
+;;; 
+;;; (define (get-all-ips-sorted)
+;;;   (sort (get-all-ips) ip-pref-less?))
+;;; 
+;;; 
+

Index: utils/Makefile.git.installall
==================================================================
--- utils/Makefile.git.installall
+++ utils/Makefile.git.installall
@@ -1,14 +1,22 @@
 
 # Copyright 2013-2015 Matthew Welland.
+#
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
 # 
-#  This program is made available under the GNU GPL version 2.0 or
-#  greater. See the accompanying file COPYING for details.
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
 # 
-#  This program is distributed WITHOUT ANY WARRANTY; without even the
-#  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#  PURPOSE.
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
 
 help :
 	@echo You may need to do the following setup first:
 	@echo
 	@echo sudo apt-get install libreadline-dev
@@ -47,11 +55,11 @@
 PROXY=
 
 # http://code.call-cc.org/dev-snapshots/2015/06/07/chicken-4.10.0rc1.tar.gz
 # http://code.call-cc.org/releases/4.10.0/chicken-4.10.0.tar.gz
 # Select version of chicken, sqlite3 etc
-CHICKEN_VERSION=4.10.1
+CHICKEN_VERSION=4.12.0rc2
 SQLITE3_VERSION=3090200
 # http://www.sqlite.org/2014/sqlite-autoconf-3080500.tar.gz
 # http://www.sqlite.org/2015/sqlite-autoconf-3081101.tar.gz
 # Override IUPBRANCH to use other than trunk
 IUPBRANCH=trunk
@@ -174,10 +182,13 @@
 	cd chicken-core; pwd
 	cd chicken-core; fossil open ../chicken-scheme.fossil
 	cd chicken-core; fossil up 337f5be
 #	wget http://code.call-cc.org/dev-snapshots/2015/08/29/chicken-4.10.1.tar.gz
 
+chicken-4.12.0rc2.tar.gz :
+	wget https://code.call-cc.org/dev-snapshots/2017/02/06/chicken-4.12.0rc2.tar.gz	
+
 # git clone git://code.call-cc.org/chicken-core
 # git clone http://code.call-cc.org/git/chicken-core.git
 
 $(PRODCHICKEN)/bin/chicken :
 	wget http://code.call-cc.org/dev-snapshots/2015/08/29/chicken-4.10.1.tar.gz

Index: utils/Makefile.installall
==================================================================
--- utils/Makefile.installall
+++ utils/Makefile.installall
@@ -1,14 +1,22 @@
 
 # Copyright 2013-2015 Matthew Welland.
 # 
-#  This program is made available under the GNU GPL version 2.0 or
-#  greater. See the accompanying file COPYING for details.
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
 # 
-#  This program is distributed WITHOUT ANY WARRANTY; without even the
-#  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#  PURPOSE.
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
 
 help :
 	@echo You may need to do the following setup first:
 	@echo
 	@echo sudo apt-get install libreadline-dev
@@ -45,11 +53,11 @@
 
 # http://code.call-cc.org/dev-snapshots/2015/06/07/chicken-4.10.0rc1.tar.gz
 # http://code.call-cc.org/releases/4.10.0/chicken-4.10.0.tar.gz
 # Select version of chicken, sqlite3 etc
 # CHICKEN_VERSION=4.10.0
-CHICKEN_VERSION=4.11.0rc2
+CHICKEN_VERSION=4.11.0
 SQLITE3_VERSION=3090200
 # http://www.sqlite.org/2014/sqlite-autoconf-3080500.tar.gz
 # http://www.sqlite.org/2015/sqlite-autoconf-3081101.tar.gz
 # Override IUPBRANCH to use other than trunk
 IUPBRANCH=trunk
@@ -56,11 +64,11 @@
 IUPCONFIG=ubuntu-15.04.inc
 # iup-3.15
 
 # Eggs to install (straightforward ones)
 EGGS=matchable readline apropos base64 regex-literals format regex-case test coops trace csv \
-     dot-locking posix-utils posix-extras directory-utils hostinfo tcp-server rpc csv-xml fmt \
+     dot-locking posix-utils posix-extras hostinfo tcp-server rpc csv-xml fmt \
      json md5 awful http-client spiffy uri-common intarweb spiffy-request-vars pathname-expand \
      spiffy-directory-listing ssax sxml-serializer sxml-modifications sql-de-lite \
      srfi-19 refdb ini-file sparse-vectors z3 call-with-environment-variables hahn linenoise \
      crypt parley
 
@@ -97,11 +105,11 @@
 else
 ARCHSIZE=64_
 endif
 
 CSCLIBS=$(shell echo $(LD_LIBRARY_PATH) | sed 's/:/ -L/g')
-CSC_OPTIONS="-I$(PREFIX)/include -L$(CSCLIBS) -C \"-fPIC\""
+CSC_OPTIONS="-I$(PREFIX)/include -L$(CSCLIBS) -C -fPIC"
 # CSC_OPTIONS=-I $(PREFIX)/include -L $(CSCLIBS)
 
 nogui : base mutils
 
 #all : nogui libiup $(PREFIX)/lib/sqlite3.so
@@ -137,11 +145,12 @@
 	mkdir -p eggflags
 	touch $(EGGFLAGS)
 
 # some setup stuff
 #
-$(PREFIX)/setup-chicken4x.sh : $(EGGFLAGS)
+#$(PREFIX)/setup-chicken4x.sh : $(EGGFLAGS)
+$(PREFIX)/setup-chicken4x.sh : 
 	mkdir -p $(PREFIX)
 	(echo 'export PATH=$(PREFIX)/bin:$$PATH' > $(PREFIX)/setup-chicken4x.sh)
 	(echo "export LD_LIBRARY_PATH=$(LD_LIBRARY_PATH)" >> $(PREFIX)/setup-chicken4x.sh)
 
 $(PREFIX)/setup-chicken4x.csh : $(EGGFLAGS)
@@ -149,35 +158,26 @@
 	(echo "setenv PATH $(PREFIX):'$$'PATH" > $(PREFIX)/setup-chicken4x.csh)
 	(echo "setenv LD_LIBRARY_PATH $(LD_LIBRARY_PATH)" >> $(PREFIX)/setup-chicken4x.csh)
 
 # NOTE: the touch chicken-core/chicken.scm compensates for the time stamp from the tar file
 chicken-core/chicken.scm : chicken-$(CHICKEN_VERSION).tar.gz
-	tar xf chicken-$(CHICKEN_VERSION).tar.gz
+	tar xzf chicken-$(CHICKEN_VERSION).tar.gz
 	ln -sf chicken-$(CHICKEN_VERSION) chicken-core
 	if [[ -e chicken-core/chicken.scm ]];then touch chicken-core/chicken.scm;fi
 
-chicken-4.9.0rc1.tar.gz : 
-	wget http://code.call-cc.org/dev-snapshots/2014/04/17/chicken-4.9.0rc1.tar.gz
-
-chicken-4.9.0.1.tar.gz :
-	wget http://code.call-cc.org/releases/4.9.0/chicken-4.9.0.1.tar.gz
-
-chicken-4.10.0rc1.tar.gz :
-	wget http://code.call-cc.org/dev-snapshots/2015/06/07/chicken-4.10.0rc1.tar.gz
-
-chicken-4.10.0.tar.gz :
-	wget http://code.call-cc.org/releases/4.10.0/chicken-4.10.0.tar.gz
-
-chicken-4.11.0rc2.tar.gz : 
-	wget http://code.call-cc.org/dev-snapshots/2016/04/28/chicken-4.11.0rc2.tar.gz
+chicken-4.11.0.tar.gz :
+	wget http://code.call-cc.org/releases/4.11.0/chicken-4.11.0.tar.gz
 
 # git clone git://code.call-cc.org/chicken-core
 # git clone http://code.call-cc.org/git/chicken-core.git
 
 $(CHICKEN_INSTALL) : chicken-core/chicken.scm $(PREFIX)/setup-chicken4x.sh $(PREFIX)/setup-chicken4x.csh
-	cd chicken-core;make PLATFORM=linux PREFIX=$(PREFIX)
-	cd chicken-core;make PLATFORM=linux PREFIX=$(PREFIX) install
+	pwd; env; which make
+	cd chicken-core; make PLATFORM=linux PREFIX=$(PREFIX)
+	cd chicken-core; make PLATFORM=linux PREFIX=$(PREFIX) install
+	#cd chicken-core;env -i PATH=${PATH} LD_LIBRARY_PATH=${LD_LIBRARY_PATH} make PLATFORM=linux PREFIX=$(PREFIX)
+	#cd chicken-core;env -i PATH=${PATH} LD_LIBRARY_PATH=${LD_LIBRARY_PATH} make PLATFORM=linux PREFIX=$(PREFIX) install
 
 #======================================================================
 # S Q L I T E 3
 #======================================================================
 # https://www.sqlite.org/2015/sqlite-autoconf-3090200.tar.gz
@@ -235,11 +235,12 @@
 
 $(PREFIX)/lib/chicken/8/margs.so : opensrc/margs/margs.scm
 	cd opensrc/margs;chicken-install
 
 opensrc/histstore/hs : opensrc/histstore/histstore.scm chkn eggs $(CHICKEN_EGG_DIR)/sqlite3.so 
-	cd opensrc/histstore;$(PREFIX)/bin/csc histstore.scm -o hs
+	env | grep CSC
+	cd opensrc/histstore; $(PREFIX)/bin/csc histstore.scm -o hs
 
 $(PREFIX)/bin/hs : opensrc/histstore/hs 
 	cp -f opensrc/histstore/hs $(PREFIX)/bin/hs
 
 # stml
@@ -254,11 +255,11 @@
 stml/requirements.scm : stml/requirements.scm.template
 	cp stml/install.cfg.template      stml/install.cfg
 	cp stml/requirements.scm.template stml/requirements.scm
 
 $(PREFIX)/lib/chicken/8/stml.so : stml/requirements.scm
-	cd stml;make
+	cd stml; make
 
 #======================================================================
 # F F C A L L (Used by IUP)
 #======================================================================
 
@@ -280,34 +281,47 @@
 
 iuplib.fossil :
 	fossil clone http://www.kiatoa.com/fossils/iuplib iuplib.fossil
 
 cd-5.9_Linux26g4_64_lib.tar.gz :
-	wget -c http://sourceforge.net/projects/canvasdraw/files/5.9/Linux%20Libraries/cd-5.9_Linux26g4_64_lib.tar.gz/download
+	wget --no-check-certificate -c http://sourceforge.net/projects/canvasdraw/files/5.9/Linux%20Libraries/cd-5.9_Linux26g4_64_lib.tar.gz/download
 	mv download cd-5.9_Linux26g4_64_lib.tar.gz
 
+cd-5.10_Linux26g4_64_lib.tar.gz :
+	cp /p/fdk/gwa/jmoon18/cd-5.10_Linux26g4_64_lib.tar.gz cd-5.10_Linux26g4_64_lib.tar.gz
+
 iup-3.17_Linux26g4_64_lib.tar.gz :
-	wget -c http://sourceforge.net/projects/iup/files/3.17/Linux%20Libraries/iup-3.17_Linux26g4_64_lib.tar.gz/download
-	mv download iup-3.17_Linux26g4_64_lib.tar.gz
+	cp /p/fdk/gwa/jmoon18/iup-3.17_Linux26g4_64_lib.tar.gz  iup-3.17_Linux26g4_64_lib.tar.gz
+#	wget --no-check-certificate -c http://sourceforge.net/projects/iup/files/3.17/Linux%20Libraries/iup-3.17_Linux26g4_64_lib.tar.gz/download
+#	mv download iup-3.17_Linux26g4_64_lib.tar.gz
+
+iup-3.19.1_Linux26g4_64_lib.tar.gz :
+	cp /p/fdk/gwa/jmoon18/iup-3.19.1_Linux26g4_64_lib.tar.gz iup-3.19.1_Linux26g4_64_lib.tar.gz
 
 im-3.10_Linux26g4_64_lib.tar.gz :
-	wget -c http://sourceforge.net/projects/imtoolkit/files/3.10/Linux%20Libraries/im-3.10_Linux26g4_64_lib.tar.gz/download
+	wget --no-check-certificate -c http://sourceforge.net/projects/imtoolkit/files/3.10/Linux%20Libraries/im-3.10_Linux26g4_64_lib.tar.gz/download
 	mv download im-3.10_Linux26g4_64_lib.tar.gz
 
+im-3.11_Linux26g4_64_lib.tar.gz :
+	cp /p/fdk/gwa/jmoon18/im-3.11_Linux26g4_64_lib.tar.gz im-3.11_Linux26g4_64_lib.tar.gz
+
 lua-5.3.2_Linux26g4_64_lib.tar.gz :
-	wget -c http://sourceforge.net/projects/luabinaries/files/5.3.2/Linux%20Libraries/lua-5.3.2_Linux26g4_64_lib.tar.gz/download
+	wget --no-check-certificate -c http://sourceforge.net/projects/luabinaries/files/5.3.2/Linux%20Libraries/lua-5.3.2_Linux26g4_64_lib.tar.gz/download
 	mv download lua-5.3.2_Linux26g4_64_lib.tar.gz
 
+lua-5.3.3_Linux26g4_64_lib.tar.gz :
+	cp /p/fdk/gwa/jmoon18/lua-5.3.3_Linux26g4_64_lib.tar.gz lua-5.3.3_Linux26g4_64_lib.tar.gz
+
 iup/installall.sh : $(PREFIX)/lib/libiup.so \
-                       cd-5.9_Linux26g4_64_lib.tar.gz \
+                       cd-5.10_Linux26g4_64_lib.tar.gz \
                        iup-3.17_Linux26g4_64_lib.tar.gz \
-                       im-3.10_Linux26g4_64_lib.tar.gz \
-		       lua-5.3.2_Linux26g4_64_lib.tar.gz	# iuplib.fossil
+                       im-3.11_Linux26g4_64_lib.tar.gz \
+		       lua-5.3.3_Linux26g4_64_lib.tar.gz	# iuplib.fossil
 	mkdir -p iup
 	pwd
-	tar -xzvf cd-5.9_Linux26g4_64_lib.tar.gz -C iup/
-	tar -xzvf im-3.10_Linux26g4_64_lib.tar.gz -C iup/
+	tar -xzvf cd-5.10_Linux26g4_64_lib.tar.gz -C iup/
+	tar -xzvf im-3.11_Linux26g4_64_lib.tar.gz -C iup/
 	tar -xzvf iup-3.17_Linux26g4_64_lib.tar.gz -C iup/
 	mkdir -p $(PREFIX)/include/ $(PREFIX)/lib/
 	cp iup/include/* $(PREFIX)/include/
 	cp iup/*.so $(PREFIX)/lib/
 	cp iup/*.a $(PREFIX)/lib/
@@ -331,6 +345,6 @@
 $(CHICKEN_EGG_DIR)/canvas-draw.so :  $(PREFIX)/lib/libiup.so  $(PREFIX)/lib/libavcall.a 
 	CSC_OPTIONS=$(CSC_OPTIONS) $(CHICKEN_INSTALL) $(PROX) -D no-library-checks canvas-draw
 
 
 clean :
-	rm -rf chicken-4.8.0 eggflags ffcall sqlite-autoconf-$(SQLITE3_VERSION)
+	rm -rf chicken-4.11.0 eggflags ffcall sqlite-autoconf-$(SQLITE3_VERSION)

Index: utils/Makefile.latest.installall
==================================================================
--- utils/Makefile.latest.installall
+++ utils/Makefile.latest.installall
@@ -1,14 +1,23 @@
 
 # Copyright 2013-2015 Matthew Welland.
 # 
-#  This program is made available under the GNU GPL version 2.0 or
-#  greater. See the accompanying file COPYING for details.
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
 # 
-#  This program is distributed WITHOUT ANY WARRANTY; without even the
-#  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#  PURPOSE.
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 
 help :
 	@echo You may need to do the following setup first:
 	@echo
 	@echo sudo apt-get install libreadline-dev

ADDED   utils/checkPreReqs
Index: utils/checkPreReqs
==================================================================
--- /dev/null
+++ utils/checkPreReqs
@@ -0,0 +1,48 @@
+#!/bin/bash
+
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
+SYSTEM_TYPE=$(lsb_release -irs |tr ' ' '_' |tr '\n' '-')$(uname -i)
+file=`/bin/mktemp`
+case $SYSTEM_TYPE in
+Ubuntu-17.04-x86_64-std)
+	apt list --installed | cut -d/ -f 1 > $file
+        ;;
+Ubuntu-16.04-x86_64)
+	apt list --installed | cut -d/ -f 1 > $file
+        ;;
+Ubuntu-16.04-i686)
+	apt list --installed | cut -d/ -f 1 > $file
+        ;;
+SUSE_LINUX_11-x86_64)
+	rpm -qa > $file 
+  ;;
+CentOS_5.11-x86_64-std)
+	rpm -qa > $file 
+  ;;
+esac
+
+
+
+for package in libmysqlclient-dev libsqlite3-dev sqlite3 postgresql libreadline-dev libwebkitgtk-dev libpangox-1.0-0 zlib1g-dev libfreetype6 cmake libssl-dev uuid-dev libmotif3 mysql-client; do
+  grep --silent $package $file
+  if [ "$?" != "0" ]; then
+    echo "sudo apt install $package"
+  fi 
+done
+rm $file

Index: utils/cleanup-links-dir.sh
==================================================================
--- utils/cleanup-links-dir.sh
+++ utils/cleanup-links-dir.sh
@@ -1,7 +1,24 @@
 #!/usr/bin/env bash
 
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 export LINKSDIR=$1
 export RUNSDIR=$2
 
 if [ "x$LINKSDIR" == "x" ];then
    echo Usage: cleanup-links-dir /links/dir/path /runs/dir/path

ADDED   utils/cleanup-pkts.sh
Index: utils/cleanup-pkts.sh
==================================================================
--- /dev/null
+++ utils/cleanup-pkts.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
+pushd $1
+
+for x in *.pkt;do
+    if grep 'T configf' $x > /dev/null;then
+        rm $x
+    else
+        echo skip $x
+    fi
+done
+

Index: utils/deploy.sh
==================================================================
--- utils/deploy.sh
+++ utils/deploy.sh
@@ -1,7 +1,24 @@
 #!/bin/bash
 
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 set -x
 
 if [[ $DEPLOYTARG == "" ]] ; then
     echo Installing into deploytarg
     export DEPLOYTARG=$PWD/deploytarg

ADDED   utils/editwiki
Index: utils/editwiki
==================================================================
--- /dev/null
+++ utils/editwiki
@@ -0,0 +1,73 @@
+#!/bin/bash
+
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
+wikiname=$1
+FOSSILBIN=fossil
+
+if [ x"$wikiname" == "x" ];then
+  echo "Usage: viwiki wikipagename"
+  exit
+fi
+
+$FOSSILBIN sync
+
+# wikitmpfile=`mktemp /tmp/${USER}_wikiedit.XXXXXXX`
+wikitmpfile=${wikiname}.in
+
+if ! $FOSSILBIN wiki export "$wikiname" 2> /dev/null  1> $wikitmpfile ;then
+    cat /dev/null > $wikitmpfile
+    wikipagestate='new'
+else
+    wikipagestate='existing'
+fi
+
+# make a backup copy of the extracted file to diff detect if changed
+cp $wikitmpfile ${wikitmpfile}.orig
+
+if [[ x"$EDITOR" == "x" ]];then #  || [[ x"$VISUAL" == "x" ]];then
+    EDITOR="gvim -f"
+fi
+
+echo $EDITOR | grep -q -e gvim
+isGvim=$?
+
+echo $EDITOR | grep -q -e 'gvim.*-f'
+hasF=$?
+
+if [[ $isGvim == 0 && $hasF != 0 ]]; then
+	EDITOR="$EDITOR -f"
+fi
+
+$EDITOR $wikitmpfile
+
+if ! diff -q $wikitmpfile ${wikitmpfile}.orig;then
+    echo "Saving changes to $wikitmpfile to wiki"
+    if [ $wikipagestate == 'new' ];then
+        $FOSSILBIN wiki create "$wikiname" $wikitmpfile
+    else
+        $FOSSILBIN wiki commit "$wikiname" $wikitmpfile
+    fi
+else
+    echo "Not saving, no changes to $wikitmpfile."
+fi
+
+$FOSSILBIN sync
+
+# NOTE// We *keep* the wikitmpfile but remove the orig copy
+rm -f ${wikitmpfile}.orig

Index: utils/example-launch-dispatcher.scm
==================================================================
--- utils/example-launch-dispatcher.scm
+++ utils/example-launch-dispatcher.scm
@@ -1,5 +1,22 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
 
 (let ((target (assoc 
 	       ;; Put the variable name here, note: only *one* '
 	       ;; 'TARGET_OS
 	       'MANYITEMS

Index: utils/find-unused-globals.sh
==================================================================
--- utils/find-unused-globals.sh
+++ utils/find-unused-globals.sh
@@ -1,7 +1,24 @@
 #!/bin/bash
 
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 echo "Finding unused globals:"
 
 for var in $(egrep '^\s*\(define\s+\*' *.scm|awk '{print $2}'|sort -u);do
     if ! $(egrep -v '^\s*\(define' *scm| grep "$var" > /dev/null);then
 	echo "$var not used";

Index: utils/fslrept.scm
==================================================================
--- utils/fslrept.scm
+++ utils/fslrept.scm
@@ -1,5 +1,22 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
 
 (use json fmt posix)
 
 ;; abstract out the alist-ref a bit and re-order the params
 ;;

ADDED   utils/gen-build-info.sh
Index: utils/gen-build-info.sh
==================================================================
--- /dev/null
+++ utils/gen-build-info.sh
@@ -0,0 +1,16 @@
+echo "Data gathered on $(date)"
+echo
+echo "Megatest code node: $(fossil status | grep checkout: | awk '{print $2}')"
+echo
+echo "Host: $HOSTNAME"
+echo
+echo "Which csi: $(which csi)"
+echo
+echo "Version info from csc -version:"
+csc -version
+echo
+echo "Eggs info from chicken-status:"
+chicken-status
+echo
+echo "Host info from lsb_release -a:"
+lsb_release -a

Index: utils/homehost_check.sh
==================================================================
--- utils/homehost_check.sh
+++ utils/homehost_check.sh
@@ -1,7 +1,24 @@
 #! /bin/bash
 
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 #exits 1 when current host is not homehost.
 
 if [[ ! -e .homehost ]]; then
     exit 0
 fi

Index: utils/installall.logpro
==================================================================
--- utils/installall.logpro
+++ utils/installall.logpro
@@ -1,8 +1,23 @@
 ;; (c) 2006,2007,2008,2009 Matthew Welland matt@kiatoa.com
 ;;  
-;;   License GPL.
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
 
 ;; first ensure your run at least started
 ;;
 
 (trigger "Body"     #/^.*$/) ;; anything starts the body

Index: utils/installall.sh
==================================================================
--- utils/installall.sh
+++ utils/installall.sh
@@ -5,27 +5,43 @@
 # to chicken install target area.  /opt/chicken is a typical value
 # set -x
 
 # Copyright 2007-2014, Matthew Welland.
 # 
-#  This program is made available under the GNU GPL version 2.0 or
-#  greater. See the accompanying file COPYING for details.
-# 
-#  This program is distributed WITHOUT ANY WARRANTY; without even the
-#  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#  PURPOSE.
-
-if [[ $OPTION=="" ]]; then
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
+# echo OPTION=$OPTION
+
+# BKM for ubuntu 17.04:
+#  sudo dpkg -i libpng12-0_1.2.54-1ubuntu1_amd64.deb
+#  sudo dpkg -i libpng12-0_1.2.54-1ubuntu1_amd64.deb
+
+
+if [[ $OPTION == "" ]]; then
     export OPTION=std
 fi
 
 echo You may need to do the following first:
-echo sudo apt-get install libreadline-dev
-echo sudo apt-get install libwebkitgtk-dev 
-echo sudo apt-get install libpangox-1.0-0 zlib1g-dev libfreetype6-dev cmake
-echo sudo apt-get install libssl-dev  uuid-dev
-echo sudo apt-get install libmotif3 -OR- set KTYPE=26g4
+echo sudo apt install libreadline-dev
+echo sudo apt install libwebkitgtk-dev 
+echo sudo apt install libpangox-1.0-0 zlib1g-dev libfreetype6-dev cmake
+echo sudo apt install libssl-dev  uuid-dev
+echo sudo apt install libmotif3 -OR- set KTYPE=26g4
+echo sudo apt install cmake curl ruby wget
 echo
 echo Set OPTION to std, currently OPTION=$OPTION
 echo
 echo Additionally, if you want mysql-client, you will need to make sure
 echo mysql_config is in your path
@@ -35,48 +51,79 @@
 echo You are using proxy="$proxy"
 echo 
 echo "Set additional_libpath to help find gtk or other libraries, don't forget a leading :"
 
 SYSTEM_TYPE=$(lsb_release -irs |tr ' ' '_' |tr '\n' '-')$(uname -i)-$OPTION
-CHICKEN_VERSION=4.11.0
-CHICKEN_BASEVER=4.11.0
+
+CHICKEN_VERSION=4.10.0
+CHICKEN_BASEVER=4.10.0
 
 # Set up variables
 #
 case $SYSTEM_TYPE in
+Ubuntu-17.10-x86_64-std)
+	KTYPE=32
+	CDVER=5.11.1
+	IUPVER=3.22
+	IMVER=3.12
+#	CHICKEN_VERSION=4.12.0
+#	CHICKEN_BASEVER=4.12.0
+        ;;
+Ubuntu-17.04-x86_64-std)
+	KTYPE=32
+	CDVER=5.11.1
+	IUPVER=3.22
+	IMVER=3.12
+#	CHICKEN_VERSION=4.12.0
+#	CHICKEN_BASEVER=4.12.0
+	;;
 Ubuntu-16.04-x86_64-std)
 	KTYPE=32
-	CDVER=5.10
-	IUPVER=3.17
-	IMVER=3.11
-	CHICKEN_VERSION=4.12.0
-	CHICKEN_BASEVER=4.12.0
+	CDVER=5.11.1
+	IUPVER=3.22
+	IMVER=3.12
+#	CHICKEN_VERSION=4.12.0
+#	CHICKEN_BASEVER=4.12.0
+	;;
+Ubuntu-16.04-x86_64-new)
+	KTYPE=32
+	CDVER=5.11.1
+	IUPVER=3.22
+	IMVER=3.12
+	CHICKEN_VERSION=4.13.0
+	CHICKEN_BASEVER=4.13.0
 	;;
 Ubuntu-16.04-i686-std)
 	KTYPE=32
-	CDVER=5.10
-	IUPVER=3.17
-	IMVER=3.11
+	CDVER=5.11.1
+	IUPVER=3.22
+	IMVER=3.12
+#        CHICKEN_VERSION=4.12.0
+#        CHICKEN_BASEVER=4.12.0
 	;;
 SUSE_LINUX_11-x86_64-std)
   KTYPE=26g4 
-	CDVER=5.10
-	IUPVER=3.17
-	IMVER=3.11
+	CDVER=5.11.1
+	IUPVER=3.22
+	IMVER=3.12
   ;;
 CentOS_5.11-x86_64-std)
   KTYPE=24g3 
   CDVER=5.4.1
   IUPVER=3.5
   IMVER=3.6.3
   ;; 
 esac
 
+echo SYSTEM_TYPE=$SYSTEM_TYPE
 echo KTYPE=$KTYPE			  
 echo CDVER=$CDVER
 echo IUPVER=$IUPVER
 echo IMVER=$IMVER	
+echo CHICKEN_VERSION=$CHICKEN_VERSION
+echo CHICKEN_BASEVER=$CHICKEN_BASEVER
+
 # NOTES:
 #
 # Centos with security setup may need to do commands such as following as root:
 #
 # NB// fix the paths first
@@ -101,10 +148,11 @@
 if [[ $proxy == "" ]]; then 
   echo 'Please set the environment variable "proxy" to host.com:port (e.g. foo.com:1234) to use a proxy'
   echo PROX=""
 else
   export http_proxy=http://$proxy
+  export https_proxy=http://$proxy
   export PROX="-proxy $proxy"
 fi
 
 if [[ $KTYPE == "" ]]; then
   echo 'Using KTYPE=26'
@@ -153,22 +201,25 @@
     make PLATFORM=linux PREFIX=$PREFIX
     make PLATFORM=linux PREFIX=$PREFIX install
     cd $BUILDHOME
 fi
 cd $BUILDHOME
-#wget --no-check-certificate https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz 
-#mv 1.0.0 1.0.0.tar.gz
-# if ! [[ -e $PREFIX/lib64/libnanomsg.so.1.0.0 ]]; then
-#         wget --no-check-certificate https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz 
-#         mv 1.0.0 1.0.0.tar.gz
-# 	tar xf 1.0.0.tar.gz 
-# 	cd nanomsg-1.0.0
-# 	./configure --prefix=$PREFIX
-# 	make
-# 	make install
-# fi
-# cd $BUILDHOME
+#if [[ ! -e 1.0.0.tar.gz ]];then
+#  wget --no-check-certificate https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz 
+#  mv 1.0.0 1.0.0.tar.gz
+#fi
+if ! [[ -e $PREFIX/lib/libnanomsg.so ]]; then
+        wget --no-check-certificate https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz 
+        mv 1.0.0 1.0.0.tar.gz
+	tar xf 1.0.0.tar.gz 
+	cd nanomsg-1.0.0
+	./configure --prefix=$PREFIX
+	make
+	make install
+	CSC_OPTIONS="-I$PREFIX/include -L$PREFIX/lib" $CHICKEN_INSTALL $PROX nanomsg
+fi
+cd $BUILDHOME
 
 export SQLITE3_VERSION=3090200
 if ! [[ -e $PREFIX/bin/sqlite3 ]]; then
 	echo Install sqlite3
 	sqlite3_tgz=sqlite-autoconf-$SQLITE3_VERSION.tar.gz
@@ -182,15 +233,28 @@
 		tar xfz tgz/sqlite-autoconf-$SQLITE3_VERSION.tar.gz 
 		(cd sqlite-autoconf-$SQLITE3_VERSION;./configure --prefix=$PREFIX;make;make install)
 	    fi
 	fi
 fi
-
+if ! [[ -e $PREFIX/bin/pg_config ]]; then
+	echo Install Postgresql
+	pgsql_tgz=postgresql-9.6.4.tar.gz
+	if ! [[ -e tgz/$pgsql_tgz ]]; then
+	  wget -c https://ftp.postgresql.org/pub/source/v9.6.4/$pgsql_tgz
+	  mv $pgsql_tgz tgz
+	fi
+	if ! [[ -e $PREFIX/bin/pg_config ]]; then
+	  if [[ -e tgz/$pgsql_tgz ]]; then
+	    tar xfz tgz/$pgsql_tgz
+	    (cd postgresql-9.6.4; ./configure --prefix=$PREFIX --with-openssl; make; make install)
+	  fi
+	fi
+fi
 
 
 cd $BUILDHOME
-for egg in "sqlite3" sql-de-lite # nanomsg
+for egg in "sqlite3" sql-de-lite nanomsg
 do
 	echo "Installing $egg"
 	CSC_OPTIONS="-I$PREFIX/include -L$PREFIX/lib -L$PREFIX/lib64"  $CHICKEN_INSTALL $PROX -keep-installed $egg
 	#CSC_OPTIONS="-I$PREFIX/include -L$PREFIX/lib -L$PREFIX/lib64"  $CHICKEN_INSTALL $PROX $egg
 	if [ $? -ne 0 ]; then
@@ -202,22 +266,24 @@
 # Some eggs are quoted since they are reserved to Bash
 # for f in matchable readline apropos base64 regex-literals format "regex-case" "test" coops trace csv dot-locking posix-utils posix-extras directory-utils hostinfo tcp rpc csv-xml fmt json md5; do
 # $CHICKEN_INSTALL $PROX -keep-installed matchable readline apropos base64 regex-literals format "regex-case" "test" coops trace csv dot-locking posix-utils posix-extras directory-utils hostinfo tcp rpc csv-xml fmt json md5 awful http-client spiffy uri-common intarweb http-client spiffy-request-vars md5 message-digest http-client spiffy-directory-listing
 for egg in matchable readline apropos base64 regex-literals format "regex-case" "test" \
 	coops trace csv dot-locking posix-utils posix-extras directory-utils hostinfo \
-	tcp rpc csv-xml fmt json md5 awful http-client spiffy uri-common intarweb http-client \
+	tcp rpc csv-xml fmt json md5 awful http-client:0.7.1 spiffy uri-common intarweb http-client \
 	spiffy-request-vars s md5 message-digest spiffy-directory-listing ssax sxml-serializer \
-	sxml-modifications logpro z3 call-with-environment-variables \
-	pathname-expand typed-records simple-exceptions numbers crypt parley srfi-42 \
+	sxml-modifications            z3 call-with-environment-variables \
+	pathname-expand typed-records \
+        logpro \
+        simple-exceptions numbers crypt parley srfi-42 \
 	alist-lib ansi-escape-sequences args basic-sequences bindings chicken-doc chicken-doc-cmd \
 	cock condition-utils debug define-record-and-printer easyffi easyffi-base \
 	expand-full ezxdisp filepath foof-loop ini-file irc lalr lazy-seq \
 	locale locale-builtin locale-categories locale-components locale-current locale-posix \
 	locale-timezone loops low-level-macros procedural-macros refdb rfc3339 scsh-process \
 	sexp-diff sha1 shell slice srfi-101 srfi-19 srfi-19-core srfi-19-date srfi-19-io \
 	srfi-19-period srfi-19-support srfi-19-time srfi-19-timezone srfi-29 srfi-37 srfi-78 syslog \
-	udp uuid uuid-lib zlib
+	udp uuid uuid-lib zlib postgresql
 
 do
 	echo "Installing $egg"
 	$CHICKEN_INSTALL $PROX -keep-installed $egg
 	#$CHICKEN_INSTALL $PROX $egg
@@ -225,38 +291,23 @@
 		echo "$egg failed to install"
 		exit 1
 	fi
 done
 
-if [[ -e `which mysql_config` ]]; then
-  $CHICKEN_INSTALL $PROX -keep-installed mysql-client
+if [[ ! -e $PREFIX/lib/chicken/7/mysql-client.so ]];then
+    if [[ -e `which mysql_config` ]]; then
+	$CHICKEN_INSTALL $PROX mysql-client
+    fi
 fi
 
 cd $BUILDHOME
 cd `$PREFIX/bin/csi -p '(chicken-home)'`
 curl http://3e8.org/pub/chicken-doc/chicken-doc-repo.tgz | tar zx
 cd $BUILDHOME
 
-
-
 # $CHICKEN_INSTALL $PROX sqlite3
 cd $BUILDHOME
-# # IUP versions
-# if [[ x$USEOLDIUP == "x" ]];then
-#   CDVER=5.10
-#   IUPVER=3.17
-#   IMVER=3.11
-# else
-#   CDVER=5.10
-#   IUPVER=3.17
-#   IMVER=3.11
-# fi
-# if [[ x$KTYPE == "x24g3" ]];then
-#   CDVER=5.4.1
-#   IUPVER=3.5
-#   IMVER=3.6.3
-# fi
 
 if [[ `uname -a | grep x86_64` == "" ]]; then 
     export ARCHSIZE=''
 else
     export ARCHSIZE=64_
@@ -270,21 +321,25 @@
 fi
 echo $files
 
 mkdir -p $PREFIX/iuplib
 mkdir -p iup/
-for a in `echo $files` ; do
+for a in $files ; do
+    targfile=$(echo $a | cut -d'/' -f2)
     if ! [[ -e tgz/$a ]] ; then
         echo wget -c -O tgz/$a http://www.kiatoa.com/matt/chicken-build/$a
 	wget -c http://www.kiatoa.com/matt/chicken-build/$a
-        mv `echo $a | cut -d'/' -f2` tgz/
+	mv $targfile tgz/
+    fi
+    if ! [[ -e tgz/$targfile ]] ; then
+	echo "ERROR: Failed to get http://www.kiatoa.com/matt/chicken-build/$a, please report this to matt@kiatoa.com"
+	exit 1
     fi
-    echo Untarring tgz/$a into $BUILDHOME/lib
-    tar -xzf tgz/`echo $a | cut -d'/' -f2` -C iup/
-    #(cd $PREFIX/lib;tar xfvz $BUILDHOME/tgz/$a;mv include/* ../include)
-    # (cd $DEPLOYTARG;tar xfvz $BUILDHOME/$a)
+    echo Untarring tgz/$targfile into $BUILDHOME/lib
+    tar -xzf tgz/$targfile -C iup/
 done
+
 cp iup/include/* $PREFIX/include/
 cp iup/*.so $PREFIX/lib/
 cp iup/*.a $PREFIX/lib/
 cp iup/ftgl/lib/*/* $PREFIX/lib/
 cd $BUILDHOME
@@ -319,14 +374,16 @@
 	$PREFIX/bin/chicken-install
 	cd ../dbi 
 	$PREFIX/bin/chicken-install
 	cd ../margs
 	$PREFIX/bin/chicken-install
+	cd ../pkts
+	$PREFIX/bin/chicken-install
 fi
 cd $BUILDHOME
 
-if ! [[ -e $PREFIX/bin/stmlrun ]] ; then
+if [[ ! -e $PREFIX/bin/stmlrun ]] ; then
 	#fossil clone http://www.kiatoa.com/fossils/stml stml.fossil
 	wget -c -O stml.tar.gz 'http://www.kiatoa.com/fossils/stml/tarball?name=stml&uuid=trunk'
 	tar -xzf stml.tar.gz
 	cd stml
 	#fossil open ../stml.fossil
@@ -346,22 +403,26 @@
 if [[ $IUPVER == "3.5" ]]; then
   IUPEGGVER='iup:1.2.1'
 fi
 
 #CSC_OPTIONS="-I$PREFIX/include -L$CSCLIBS" $CHICKEN_INSTALL $PROX -D no-library-checks -feature disable-iup-web iup
-CSC_OPTIONS="-I$PREFIX/include -L$PREFIX/lib" $CHICKEN_INSTALL $PROX -D no-library-checks -feature disable-iup-web $IUPEGGVER
+CSC_OPTIONS="-I$PREFIX/include -L$PREFIX/lib" $CHICKEN_INSTALL $PROX -D no-library-checks -feature disable-iup-web -feature disable-iup-pplot $IUPEGGVER
 
 # CSC_OPTIONS="-I$PREFIX/include -L$CSCLIBS" $CHICKEN_INSTALL $PROX -D no-library-checks -feature disable-iup-web -deploy -prefix $DEPLOYTARG iup
 # iup:1.0.2 
 CSC_OPTIONS="-I$PREFIX/include -L$PREFIX/lib" $CHICKEN_INSTALL $PROX -D no-library-checks canvas-draw
 # CSC_OPTIONS="-I$PREFIX/include -L$CSCLIBS" $CHICKEN_INSTALL $PROX -D no-library-checks -deploy -prefix $DEPLOYTARG canvas-draw
 
 cd $BUILDHOME  
 
 # install ducttape
-cd ../ducttape
-$CHICKEN_INSTALL
+if [[ -e ../ducttape ]];then
+  cd ../ducttape
+  $CHICKEN_INSTALL
+else
+  echo "ducttape egg not found at ../ducttape. You will need to cd into the ducttape directory in the megatest distribution and run \"chicken-install\""
+fi
 
 cd $BUILDHOME
 echo You may need to add $LD_LIBRARY_PATH to your LD_LIBRARY_PATH variable, a setup-chicken4x.sh 
 echo file can be found in the current directory which should work for setting up to run chicken4x
 

Index: utils/installck.sh
==================================================================
--- utils/installck.sh
+++ utils/installck.sh
@@ -1,7 +1,24 @@
 #!/bin/bash
 
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 myhome=$(dirname $0)
 
 if [[ $proxy == "" ]]; then 
   echo 'Please set the environment variable "proxy" to host.com:port (e.g. foo.com:1234) to use a proxy'
   echo PROX=""

Index: utils/loadrunner
==================================================================
--- utils/loadrunner
+++ utils/loadrunner
@@ -1,7 +1,24 @@
 #!/bin/bash 
 
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 LOADRUNNER=$0
 
 # load=`uptime|awk '{print $10}'|cut -d, -f1`
 load=$(uptime|perl -pe 's/.*: (\d+.\d+),.*/$1/')
 load2=$(uptime|perl -pe 's/.*: (\d+.\d+), (\d+.\d+),.*/$2/')

Index: utils/loadrunner.scm.notfinished
==================================================================
--- utils/loadrunner.scm.notfinished
+++ utils/loadrunner.scm.notfinished
@@ -1,14 +1,22 @@
 
 ;; Copyright 2006-2013, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
 
 (use ssax)
 (use sxml-serializer)
 (use sxml-modifications)
 (use regex)

Index: utils/lock-stats.sh
==================================================================
--- utils/lock-stats.sh
+++ utils/lock-stats.sh
@@ -1,7 +1,24 @@
 #!/bin/bash
 
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 while IFS=': ' read x x x x p x x i x; do
     if ! [[ ${i}x == "x" ]];then
 	if ! $(echo $i|grep EOF >/dev/null);then
 	    fname=$(find -L "/proc/$p/fd" -maxdepth 1 -inum "$i" -exec readlink {} \; -quit)
 	    if $(echo $fname | grep megatest.db > /dev/null) || \

ADDED   utils/memproblem.scm
Index: utils/memproblem.scm
==================================================================
--- /dev/null
+++ utils/memproblem.scm
@@ -0,0 +1,65 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
+;; Run like this: ((adjust the "30" number to a value that fills memory on the machine you are using)
+;; script -c "free -g ; utils/memproblem 30 -:hm128G" memclean.log
+
+;; Fill the cache with something like this:
+;; find /path/to/lots/of/files/ -type f -exec cat {} > /dev/null \;
+
+
+(use posix numbers srfi-4)
+
+(define num-iter (or (if (> (length (argv)) 2)
+                        (string->number (cadr (argv)))
+                        #f)
+                    43)) ;; Gigs memory to try to allocate
+;; (print "Allocating up to " memsize "G memory. Note that due to the usage of the heap this will actually use up to " (* 2 memsize) "G")
+
+(define (get-free)
+  (let ((indat (with-input-from-pipe
+                "free"
+                read-lines)))
+    (map string->number
+         (cdr 
+          (string-split
+           (cadr indat))))))
+
+(define-inline (cached dat)(list-ref dat 5))
+(define-inline (used   dat)(list-ref dat 1))
+(define-inline (free   dat)(list-ref dat 2))
+
+(define-inline (k->G val)(/ val 1e6))
+(define-inline (G->k val)(* val 1e6))
+
+(define start-time (current-milliseconds))
+
+(let loop ((n      0)
+           (dat    (get-free))
+           (stuff  '()))
+  (let ((bigvec (make-u32vector 200000000))
+        (startt (current-milliseconds)))
+    (print "Value at 100: " (u32vector-ref bigvec 100) " ms to access: " (- (current-milliseconds) startt))
+    (u32vector-set! bigvec (random 190000000) 111)
+    (print n " Elapsed time: " (/ (- (current-milliseconds) start-time) 1000) " s "
+           "Cached: " (k->G (cached dat)) " G "
+           "Used:   " (k->G (used   dat)) " G ")
+    (if (< n num-iter)
+        (loop (+ n 1)(get-free) (cons bigvec stuff)))))
+
+(exit)
+

Index: utils/mk_wrapper
==================================================================
--- utils/mk_wrapper
+++ utils/mk_wrapper
@@ -1,32 +1,58 @@
 #!/bin/bash
 
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 prefix=$1
 cmd=$2
 target=$3
+cfgfile="$prefix/bin/.$(lsb_release -sr)/cfg.sh"
+
+# we wish to create a var in cfg.sh for finding sqlite3 executable
+chicken_bin_dir=$(dirname $(which csi))
+if [[ -e $chicken_bin_dir/sqlite3 ]];then
+    sqlite3_exe=$chicken_bin_dir/sqlite3
+else
+    sqlite3_exe=$(which sqlite3)
+fi
 
 if [ "$LD_LIBRARY_PATH" != "" ];then
-  cfgfile="$prefix/bin/.$(lsb_release -sr)/cfg.sh"
   echo "INFO: Using LD_LIBRARY_PATH=$LD_LIBRARY_PATH" >&2
 ( cat << __EOF
+if [ -z \$MT_ORIG_ENV ]; then
+    export MT_ORIG_ENV=\$( $prefix/bin/serialize-env )
+fi
+
 if [ "\$LD_LIBRARY_PATH" != "" ];then
   export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:\$LD_LIBRARY_PATH
 else
   export LD_LIBRARY_PATH=$LD_LIBRARY_PATH
 fi
+
+export MT_SQLITE3_EXE=$sqlite3_exe
 __EOF
 ) > $cfgfile
   echo 
 else
   echo "INFO: LD_LIBRARY_PATH not set" >&2
 fi
 
-# echo "#!/bin/bash" > $target
-# if [ "$LD_LIBRARY_PATH" != "" ];then
-#   echo "source $prefix/bin/.\$(lsb_release -sr)/cfg.sh" >> $target
-# fi
-# echo "exec $prefix/bin/.\$(lsb_release -sr)/$cmd \"\$@\"" >> $target
 echo "#!/bin/bash" > $target
 
 if [[ $cmd =~ dboard ]]; then
     cat >> $target <<'EOF'
 
@@ -57,8 +83,19 @@
 fi
 EOF
 
 fi
 
+cat >> $target << EOF 
+if [[ \$(ulimit -a | grep 'open files' | awk '{print \$4}') -gt 10000 ]];then ulimit -n 10000;fi
+EOF
+
+# echo "#!/bin/bash" > $target
+# echo "exec $prefix/bin/.\$(lsb_release -sr)/$cmd \"\$@\"" >> $target
+
 echo "lsbr=\$(lsb_release -sr)" >> $target
-echo "if [[ -e \$lsbr ]];then source \$lsbr;fi" >> $target
+if [ "$LD_LIBRARY_PATH" != "" ];then
+  echo "source $prefix/bin/.\$lsbr/cfg.sh" >> $target
+fi
+
+# echo "if [[ -e \$lsbr ]];then source \$lsbr;fi" >> $target
 echo "exec $prefix/bin/.\$lsbr/$cmd \"\$@\"" >> $target

ADDED   utils/mk_wrapper_tool
Index: utils/mk_wrapper_tool
==================================================================
--- /dev/null
+++ utils/mk_wrapper_tool
@@ -0,0 +1,101 @@
+#!/bin/bash
+
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
+prefix=$1
+cmd=$2
+target=$3
+cfgfile="$prefix/bin/.$(lsb_release -sr)/cfg.sh"
+
+# we wish to create a var in cfg.sh for finding sqlite3 executable
+chicken_bin_dir=$(dirname $(which csi))
+if [[ -e $chicken_bin_dir/sqlite3 ]];then
+    sqlite3_exe=$chicken_bin_dir/sqlite3
+else
+    sqlite3_exe=$(which sqlite3)
+fi
+
+if [ "$LD_LIBRARY_PATH" != "" ];then
+  echo "INFO: Using LD_LIBRARY_PATH=$LD_LIBRARY_PATH" >&2
+( cat << __EOF
+if [ -z \$MT_ORIG_ENV ]; then
+    export MT_ORIG_ENV=\$( $prefix/bin/serialize-env )
+fi
+
+if [ "\$LD_LIBRARY_PATH" != "" ];then
+  export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:\$LD_LIBRARY_PATH
+else
+  export LD_LIBRARY_PATH=$LD_LIBRARY_PATH
+fi
+
+export MT_SQLITE3_EXE=$sqlite3_exe
+__EOF
+) > $cfgfile
+  echo 
+else
+  echo "INFO: LD_LIBRARY_PATH not set" >&2
+fi
+
+echo "#!/bin/bash" > $target
+
+if [[ $cmd =~ dboard ]]; then
+    cat >> $target <<'EOF'
+
+# # disable if not running on homehost
+# if [[ -e .homehost ]]; then
+#   homehostname=$( host `cat .homehost` | awk '{print $NF}' | sed 's/\.$//' )
+#   hostname=$( hostname -f )
+# 
+#   if [[ ! ($homehostname == $hostname) ]]; then
+#     echo "ERROR: this host ($hostname) is not the homehost ($homehostname) for this megatest run area.  Cannot start dashboard."
+#     echo "       Please log into homehost before launching dashboard."
+#     exit 1
+#   fi
+# fi
+
+# check that $DISPLAY is set
+if [[ -z $DISPLAY ]]; then
+   echo 'ERROR: $DISPLAY environment variable is not set; megatest dashboard requires X display address to be set in $DISPLAY.'
+   exit 1
+fi
+
+# check that $DISPLAY is proper
+if [[ -x $(which xdpyinfo  2>/dev/null) ]]; then
+  if ! xdpyinfo -display "$DISPLAY" &>/dev/null; then
+    echo 'ERROR: megatest dashboard cannot open display "'$DISPLAY'".  Please check $DISPLAY environment variable.'
+    exit 1
+  fi
+fi
+EOF
+
+fi
+
+cat >> $target << EOF 
+if [[ \$(ulimit -a | grep 'open files' | awk '{print \$4}') -gt 10000 ]];then ulimit -n 10000;fi
+EOF
+
+# echo "#!/bin/bash" > $target
+# echo "exec $prefix/bin/.\$(lsb_release -sr)/bin/$cmd \"\$@\"" >> $target
+
+echo "lsbr=\$(lsb_release -sr)" >> $target
+if [ "$LD_LIBRARY_PATH" != "" ];then
+  echo "source $prefix/bin/.\$lsbr/cfg.sh" >> $target
+fi
+
+# echo "if [[ -e \$lsbr ]];then source \$lsbr;fi" >> $target
+echo "exec $chicken_bin_dir/$cmd \"\$@\"" >> $target

Index: utils/mt_ezstep
==================================================================
--- utils/mt_ezstep
+++ utils/mt_ezstep
@@ -1,18 +1,26 @@
 #!/bin/bash
 
-usage="mt_ezstep stepname prevstepname command [args ...]"
-
-if [[ "$MT_CMDINFO" == "" ]];then
-  if [[ -e megatest.sh ]];then
-    source megatest.sh
-  else
-    echo "ERROR: $0 should be run within a megatest test environment"
-    echo "Usage: $usage"
-    exit
-  fi
-fi
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
+usage="mt_ezstep stepname command [args ...]"
+
 
 # Purpose: This is for the [ezsteps] secton in your testconfig file.
 #   DO NOT USE IN YOUR SCRIPTS!
 #
 # Call like this:
@@ -24,16 +32,15 @@
 fi
 
 # Since the user may not have . on the path and since we are likely to want to 
 # run test scripts in the current directory add the current dir to the path
 export PATH=$PATH:$PWD
-
+testrundir=$1; shift
 stepname=$1;shift
-prevstepname=$1;shift
+
 
 command=$*
-
 allstatus=99
 runstatus=99
 logpropstatus=99
 
 # prev_env=".ezsteps/${prevstepname}.sh"
@@ -41,39 +48,36 @@
 # if [[ -e "${prev_env}" ]];then
 #     source $prev_env
 # fi
 
 # source the environment from the previous step if it exists
+cd $testrundir
+#if [[ "$MT_CMDINFO" == "" ]];then
+  if [[ -e megatest.sh ]];then
+    source megatest.sh
+  else
+    echo "ERROR: $0 should be run within a megatest test environment"
+    echo "Usage: $usage"
+    exit
+  fi
+#fi
+
+
 
 # if a logpro file exists then use it otherwise just run the command, nb// was using 2>&1
 if [[ -e ${stepname}.logpro ]];then
-   # could do:
-   $command 2>&1| tee ${stepname}.log | logpro ${stepname}.logpro ${stepname}.html &> /dev/null
-   logprostatus=$?
-   # $command 2>&1| logpro ${stepname}.logpro ${stepname}.html &> ${stepname}.log 
-   # allstatus=(${PIPESTATUS[0]} ${PIPESTATUS[1]}) 
-   allstatus=(${PIPESTATUS[0]} ${PIPESTATUS[1]})
-   runstatus=${allstatus[0]}
-   # logprostatus=${allstatus[1]}
-else
-   $command &> ${stepname}.log
-   runstatus=$?
-   logprostatus=$runstatus
-fi
-
-# If the test exits with non-zero, we will record FAIL even if logpro
-# says it is a PASS
-
-if [[ $runstatus -ne 0 ]]; then
-    exitstatus=$runstatus
-elif [[ $logprostatus -eq 0 ]]; then
-    exitstatus=$logprostatus
-elif [[ $logprostatus -eq 2 ]]; then
-    exitstatus=2
-elif [[ $logprostatus -eq 1 ]]; then
-    exitstatus=1
-else 
-    exitstatus=0
-fi
-
-# $MT_MEGATEST -env2file .ezsteps/${stepname}
+   eval $command 2>&1 ${stepname}.log
+   runstatus=$?
+   logpro ${stepname}.logpro ${stepname}.html &> /dev/null < ${stepname}.log
+   logprostatus=$?
+
+   if [[ $runstatus == 0 ]]; then
+       exitstatus=$logprostatus
+   else
+       exitstatus=$runstatus
+   fi
+else
+   eval $command &> ${stepname}.log
+   exitstatus=$?
+fi
+
 exit $exitstatus

Index: utils/mt_laststep
==================================================================
--- utils/mt_laststep
+++ utils/mt_laststep
@@ -1,7 +1,24 @@
 #!/bin/bash
 
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 if [ $MT_CMDINFO == "" ];then
   echo "ERROR: $0 should be run within a megatest test environment"
   exit
 fi
 

Index: utils/mt_runstep
==================================================================
--- utils/mt_runstep
+++ utils/mt_runstep
@@ -1,7 +1,24 @@
 #!/bin/bash
 
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # Purpose: run a step, record start and end with exit codes
 #
 # Call like this:
 # mt_runstep stepname command ....
 # 

Index: utils/mt_xterm
==================================================================
--- utils/mt_xterm
+++ utils/mt_xterm
@@ -1,7 +1,24 @@
 #!/bin/bash
 
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 MT_TMPDISPLAY=$DISPLAY
 if [ -e megatest.sh ];then
   source megatest.sh
 fi
 export DISPLAY=$MT_TMPDISPLAY

Index: utils/mtgetfile
==================================================================
--- utils/mtgetfile
+++ utils/mtgetfile
@@ -1,7 +1,24 @@
 #!/bin/bash
 
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 fullparams="$@"
 
 function findfile () {
 megatest $fullparams -repl <.
+
+# Rollup counts of calls to Megatest from a logging dat file
+#
+# Usage: mtrept.sh file [host]
+
+if [[ "$2"x != "x" ]];then
+  host_name_grep="grep $2 | "
+else
+  host_name_grep=""
+fi
+if [[ "$1"x == "x" ]];then
+  datfile=/p/fdk/gwa/$USER/.logger/all.dat
+else
+  datfile=$1
+fi
+datcopy=/tmp/$USER/all.$PID.dat
+
+if [[ -e $datfile ]];then
+   cp $datfile $datcopy
+   list_runs=$(grep list-runs $datcopy |$host_name_grep wc -l)
+   show_config=$(grep show-config $datcopy |$host_name_grep wc -l)
+   list_targets=$(grep list-targets $datcopy |$host_name_grep wc -l)
+   mt_run=$(grep ' -run ' $datcopy |$host_name_grep wc -l)
+   execute=$(grep ' -execute' $datcopy|$host_name_grep wc -l)
+   server=$(grep ' -server' $datcopy|$host_name_grep wc -l)
+   sync_to=$(grep ' -sync-to' $datcopy|$host_name_grep wc -l)
+   step=$(grep ' -step' $datcopy|$host_name_grep wc -l)
+   state_status=$(grep ' -set-state-status' $datcopy|$host_name_grep wc -l)
+   test_status=$(grep ' -test-status' $datcopy|$host_name_grep wc -l)
+   other=$(egrep -v ' -(list-runs|show-config|list-targets|run|execute|server|sync-to|step|set-state-status|test-status)' $datcopy |$host_name_grep wc -l)
+   start_time=$(head -1 $datcopy|awk '{print $1}')
+   end_time=$(tail -1 $datcopy | awk '{print $1}')
+   minutes=$(echo "($end_time-$start_time)/60.0" | bc)
+   hours=$(echo "($minutes/60)"|bc)
+   total_calls=$(cat $datcopy |$host_name_grep wc -l)
+   
+   if [[ $hours -gt 2 ]];then
+      echo "Over $hours hour period we have;"
+   else
+      echo "Over $minutes minutes we have;"
+   fi
+   echo "    list-runs:    $list_runs"
+   echo "    show-config:  $show_config"
+   echo "    list-targets: $list_targets"
+   echo "    execute:      $execute"
+   echo "    run:          $mt_run"
+   echo "    server:       $server"
+   echo "    step:         $step"
+   echo "    test-status:  $test_status"
+   echo "    sync-to:      $sync_to"
+   echo "    state-status: $state_status"
+   echo "    other:        $other"
+   echo "    total:        $total_calls"
+else
+   echo "Could not find input file $datfile"
+fi
+

Index: utils/mtrunner
==================================================================
--- utils/mtrunner
+++ utils/mtrunner
@@ -1,7 +1,24 @@
 #! /bin/bash
 
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # Run megatest from within megatest
 # Usage: mtrunner testsuite_dir megatest_bin_dir command args ....
 
 for var in $(env | egrep "^MT_"|cut -d= -f1);do
   unset ${var}
@@ -9,6 +26,6 @@
 cd $1
 shift
 export PATH="$1:$PATH"
 shift 
 
-"$@"
+exec "$@"

Index: utils/mtrunscript
==================================================================
--- utils/mtrunscript
+++ utils/mtrunscript
@@ -1,17 +1,23 @@
 #!/usr/bin/env bash
 
 # Copyright 2012, Matthew Welland.
-#
-#  This program is made available under the GNU GPL version 2.0 or
-#  greater. See the accompanying file COPYING for details.
-#
-#  This program is distributed WITHOUT ANY WARRANTY; without even the
-#  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#  PURPOSE.
-#
-# VERSION: 
+
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
 
 # set -e
 # set -u
 # set -x
 

Index: utils/mtutils.csh
==================================================================
--- utils/mtutils.csh
+++ utils/mtutils.csh
@@ -1,8 +1,25 @@
 # Better to use the mt_* snippet scripts in utils 
 #   To use the snippets set PREFIX then install with "make installall"
 
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 alias mt_runstep 'set argv=(\!*); \
  set stepname = $1;shift; \
  megatest -runstep $stepname -logpro ${stepname}.logpro "$*" || exit $?'
 
 alias mt_laststep 'set argv=(\!*);set stepname = $1;shift; \

Index: utils/nbfake
==================================================================
--- utils/nbfake
+++ utils/nbfake
@@ -1,6 +1,24 @@
 #!/bin/bash
+
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 ###############################################################################
 #
 # nbfake - capture command output in a logfile
 #
 # nbfake behavior can be changed by setting the following env vars:

Index: utils/nbfind
==================================================================
--- utils/nbfind
+++ utils/nbfind
@@ -1,7 +1,24 @@
 #!/bin/bash 
 
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # load=`uptime|awk '{print $10}'|cut -d, -f1`
 load=`uptime|perl -pe 's/.*: (\d+.\d+),.*/$1/'`
 if which cpucheck > /dev/null;then
     numcpu=`cpucheck|tail -1|awk '{print $6}'`
 else

Index: utils/plot-code.scm
==================================================================
--- utils/plot-code.scm
+++ utils/plot-code.scm
@@ -1,6 +1,24 @@
 #!/mfs/pkgs/chicken/4.8.0.5/bin/csi -nbq
+
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
 
 ;; Coming soon (right?) Usage: plot-code file1.scm,file2.scm "fun1,fun2,x*" *.scm > plot.dot
 ;; Usage: plot-code file1.scm,file2.scm *.scm > plot.dot
 ;;        dot -Tpdf plot.dot > plot.pdf
 ;; first param is comma separated list of files to include in the map, use - to do all

Index: utils/remrun
==================================================================
--- utils/remrun
+++ utils/remrun
@@ -6,10 +6,27 @@
 #
 # remrun behavior can be changed by setting the following env var:
 #   NBFAKE_LOG        Logfile for nbfake output
 #
 ###############################################################################
+#
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
 
 if [[ -z "$@" ]]; then
   cat <<__EOF
 
 remrun usage:
@@ -23,6 +40,12 @@
   exit
 fi
 
 export NBFAKE_HOST=$1
 shift
-exec nbfake $*
+cmd=""
+for var in $(env | egrep "^(PARENT_|MT_)"|cut -d= -f1);do
+  new_var="`echo ${!var}`"
+  cmd="$cmd export $var=$new_var;" 
+done
+cmd="$cmd $*"
+exec nbfake $cmd

Index: utils/revtagfsl.scm
==================================================================
--- utils/revtagfsl.scm
+++ utils/revtagfsl.scm
@@ -1,14 +1,23 @@
 
 ;; Copyright 2006-2013, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
 
 (use json regex posix)
 (use srfi-69)
 
 ;; Add tags with node nums: trunk(12) 

ADDED   utils/run2mock.scm
Index: utils/run2mock.scm
==================================================================
--- /dev/null
+++ utils/run2mock.scm
@@ -0,0 +1,186 @@
+#!/p/foundry/env/pkgs/chicken/4.10.1_v1.63/bin/csi -s
+; -*- Mode: Scheme; -*-
+
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
+
+(use ducttape-lib)
+(use posix-extras pathname-expand regex matchable)
+(use ini-file)
+;; plugs a hole in posix-extras in latter chicken versions
+(define ##sys#expand-home-path pathname-expand)
+(define (realpath x) (resolve-pathname  (pathname-expand (or x "/dev/null")) ))
+
+;; resolve fullpath to this script
+(define (get-this-script-fullpath #!key (argv (argv)))
+  (let* ((this-script
+          (cond
+           ((and (> (length argv) 2)
+                 (string-match "^(.*/csi|csi)$" (car argv))
+                 (string-match "^-(s|ss|sx|script)$" (cadr argv)))
+            (caddr argv))
+           (else (car argv))))
+         (fullpath (realpath this-script)))
+    fullpath))
+
+(define *this-script-fullpath* (get-this-script-fullpath))
+(define *this-script-dir* (pathname-directory *this-script-fullpath*))
+(define *this-script-name* (pathname-strip-directory *this-script-fullpath*))
+
+(define (false-on-exception thunk)
+  (handle-exceptions exn #f (thunk) ))
+
+(define (safe-file-exists? path-string)
+  (false-on-exception (lambda () (file-exists? path-string))))
+
+
+(define (crude-config-transformer infile outfile keep-sections-list append-text #!key (filter-patt #f))
+  (let* ((inlines (with-input-from-file infile read-lines))
+         (keep-lines (let loop ((lines-left inlines) (lines-out '()) (current-section #f) (section-lines-accumulator '()))
+                       (let* ((this-line (if (not (null? lines-left))
+                                             (car lines-left)
+                                             ""))
+                              (section-match (string-match "^\\s*\\[([^\\]]+)\\].*" this-line)))
+                         (cond
+                          ((null? lines-left)
+                           (if (member current-section keep-sections-list)
+                               (append lines-out (reverse section-lines-accumulator))
+                               lines-out))
+                          (section-match
+                           (let* ((next-lines-left      (cdr lines-left))
+                                  (next-lines-out       (if (member current-section keep-sections-list)
+                                                            (append lines-out (reverse section-lines-accumulator))
+                                                            lines-out))
+                                  (next-current-section (cadr section-match))
+                                  (next-section-lines-accumulator (list this-line)))
+                             (loop next-lines-left next-lines-out next-current-section next-section-lines-accumulator)))
+                          (else
+                           (let* ((next-lines-left       (cdr lines-left))
+                                  (next-lines-out        lines-out)
+                                  (next-current-section  current-section)
+                                  (next-section-lines-accumulator
+                                   (cond
+                                    ((and filter-patt (string-match (conc "^.*"filter-patt".*$") this-line))
+                                     section-lines-accumulator)
+                                    (else (cons this-line section-lines-accumulator)))))
+                             (loop next-lines-left next-lines-out next-current-section next-section-lines-accumulator))))))))
+    (with-output-to-file outfile (lambda ()
+                                   (print (string-join keep-lines "\n"))
+                                   (print)
+                                   (print append-text)
+                                   (print)))))
+                                        
+                           
+(define (testconfig-transformer infile outfile)
+  (crude-config-transformer
+   infile
+   outfile
+   '("meta" "items" "requirements" "test_meta")
+   
+   (conc "
+
+[ezsteps]
+alwayspass /bin/true
+
+")))
+
+
+
+
+
+(let* ((mtexe         "/p/foundry/env/pkgs/megatest/1.64/31/bin/megatest")
+       (faux-mtra     "/p/fdk/gwa/bjbarcla/issues/mtdev/ch/cap/faux")
+       (src-mtra      "/nfs/pdx/disks/icf_fdk_asic_gwa002/asicfdkqa/fossil/megatestqa/afdkqa")
+       (target        "p1275/5/ADF_r0.7_s/9p27t_tp0")
+       (run           "ww38.4")
+       (src-mtdb      (conc src-mtra "/megatest.db"))
+       (extra-src-testdirs   '("/p/fdk/gwa/asicfdkqa/fossil/ext/afdkqa_ext/trunk/tests"))
+       (mtconf        (with-input-from-pipe (conc "cd "src-mtra" && "mtexe" -show-config -target "target) read))
+       (runconf       (with-input-from-pipe (conc "cd "src-mtra" && "mtexe" -show-runconfig -dumpmode sexp -target "target) read))
+       (testdir-alist (alist-ref "tests-paths" mtconf equal?))
+       (testdirs      (filter safe-file-exists?
+                              (append extra-src-testdirs
+                                      (list (conc src-mtra "/tests"))
+                                      (if (and testdir-alist (not (null? testdir-alist)))
+                                          (map cadr testdir-alist)
+                                          '()))))
+       (tconfigfiles
+        (apply append (map (lambda (src-testdir)
+                             (with-input-from-pipe (conc "ls -1 "src-testdir"/*/testconfig") read-lines))
+                           testdirs)))
+       (tconf-alist   (filter identity
+                              (map (lambda (tcfile)
+                                     (let* ((m (string-match "^.*/([^/]+)/testconfig$" tcfile)))
+                                       (if (not (null? m))
+                                           (cons (cadr m) tcfile)
+                                           #f)))
+                                   tconfigfiles))))
+
+;  (pp mtconf)
+;  (pp (list 'FOO testdir-alist)) (exit 1)
+  ;; make megatest area
+  (when (not (file-exists? src-mtdb))
+    (ierr "Source does not exist.  Aborting.  [src-mtdb]")
+    (exit 1))
+  
+  (when (file-exists? faux-mtra)
+    (system (conc "cd "faux-mtra" && rm -rf $(/p/foundry/env/bin/mttmpdir)"))
+    (system (conc "rm -rf "faux-mtra)))
+  
+  (system (conc "mkdir -p "faux-mtra))
+  (system (conc "mkdir -p "faux-mtra"/links"))
+  (system (conc "mkdir -p "faux-mtra"/disk0"))
+
+  (system (conc "cd "src-mtra" && "mtexe" -show-config -target "target" -dumpmode ini > "faux-mtra"/megatest.config.in"))
+  (crude-config-transformer
+   (conc faux-mtra"/megatest.config.in")
+   (conc faux-mtra"/megatest.config")
+   '("fields" "server" "env-override" "dashboard" "validvalues")
+    (conc "[setup]
+linktree "faux-mtra"/links
+max_concurrent_jobs 1000
+launch-delay 5
+use-wal 1
+
+" ;; emacs has trouble if a string has [ at the beginning of line, so breaking it up.
+"[disks]
+disk0 "faux-mtra"/disk0")
+    filter-patt: "MT_LINKTREE"
+    )
+
+  
+  (system (conc "cd "src-mtra" && "mtexe" -show-runconfig -target "target" -dumpmode ini > "faux-mtra"/runconfigs.config"))
+
+
+  (system (conc "mkdir -p "faux-mtra"/tests"))
+
+  (for-each (lambda (tpair)
+              (pp tpair)
+              (let* ((testname (car tpair))
+                     (src-tconfigfile (cdr tpair))
+                     (destdir (conc faux-mtra"/tests/"testname)))
+                (do-or-die (conc "mkdir -p "destdir))
+                (do-or-die (conc "cp "src-tconfigfile" "destdir"/testconfig.in"))
+                (testconfig-transformer
+                 (conc destdir"/testconfig.in")
+                 (conc destdir"/testconfig"))
+                (print "processed test "testname)))
+            tconf-alist)
+  
+  
+  )

Index: utils/runner
==================================================================
--- utils/runner
+++ utils/runner
@@ -1,7 +1,24 @@
 #!/usr/bin/perl -w
 
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 $starthr=`date +%k`;
 $hrsper = 1;
 $nexthr=$starthr + $hrsper;
 
 $ltr='a';

ADDED   utils/softlock/Makefile
Index: utils/softlock/Makefile
==================================================================
--- /dev/null
+++ utils/softlock/Makefile
@@ -0,0 +1,11 @@
+#Need a chicken 5.1.0 with system-information egg installed in your path 
+
+.DEFAULT : all
+
+all : softlock
+
+softlock : softlock.scm
+	csc -static -L -static -L -lm -L -dl -L -lpthread -L -lcrypto -L -lz softlock.scm 
+
+clean: 
+	rm softlock *.o

ADDED   utils/softlock/softlock.scm
Index: utils/softlock/softlock.scm
==================================================================
--- /dev/null
+++ utils/softlock/softlock.scm
@@ -0,0 +1,135 @@
+;;======================================================================
+;; Copyright 2019, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
+;;======================================================================
+
+(import (chicken string) 
+        (chicken pathname) 
+        system-information 
+        (chicken file posix) 
+        (chicken process-context posix) 
+        (chicken process-context) 
+        (chicken process) 
+        (chicken file posix) 
+        (chicken file) 
+        (chicken time) 
+        srfi-18
+)
+
+
+(if (< (length (command-line-arguments)) 2) ;; require at least lockfile command
+    (begin
+      (print "Usage: 
+softlock lockfile command args ...
+
+Softlock does weak, transient locking. This is useful to slow down a
+deluge of events that can overwhelm hardware or software systems.
+
+Locks are only good for one second, just enough time to spread events
+out.
+
+On NFS the Unix file locking mechanism works well but lock handling on
+the filers can be overwhelmed by many locks occuring quickly. Jobs
+that must use NFS file locks can use softlock to minimize the rate
+that the file locks are created, preventing the NFS filer from being
+swamped.
+
+Environment variables:
+
+  SOFTLOCK_DEBUG_MODE - if defined enable some messages
+
+WARNING: the file .softlock will be overwritten and removed by softlock!
+
+Part of the Megatest project http://www.kiatoa.com/fossils/megatest")
+      (exit 1)))
+
+(define (read-lock-file fname)
+  (handle-exceptions
+   exn
+   (begin
+     (if (get-environment-variable "SOFTLOCK_DEBUG_MODE")
+	 (print "Exception on reading lock file. exn=" exn))
+     #f)
+   (with-input-from-file fname
+     read-line)))
+
+(define (lock-file-old fname)
+  (and (file-exists? fname)
+       (> (- (current-seconds)(file-modification-time fname)) 1))) ;; hard coded to one second
+
+(define (check-locked-by-me fname mykey)
+  (if (file-exists? fname)
+      (let ((lock-data (read-lock-file fname)))
+	(if (and lock-data
+		 (equal? mykey lock-data))
+	    #t
+	    (not (lock-file-old fname)))) ;; if the lockfile is old we are NOT locked.
+      #f))
+		
+(define (check-locked-by-someone-else fname mykey)
+  (if (file-exists? fname)
+      (let ((lock-data (read-lock-file fname)))
+	(and lock-data
+	     (not (equal? mykey lock-data))
+	     (not (lock-file-old fname)))) ;; if the lockfile is old we are NOT locked.
+      #f))
+
+(define (take-lock fname mykey)
+  (with-output-to-file fname
+    (lambda ()
+      (print mykey))))
+
+(define (run-the-command command params)
+  (process-wait (process-run command params)))
+
+(let* ((lockfile (car (command-line-arguments)))
+       (fulllock (conc lockfile ".softlock")) ;; prevent accidentally removing important files
+       (lockfdir (pathname-directory lockfile))
+       (command  (cadr (command-line-arguments)))
+       (params   (cddr (command-line-arguments)))
+       (mykey    (conc (get-host-name) "-" (current-process-id))))
+  
+  ;; sanity checks
+  (cond
+   ((not lockfdir)
+    (print "ERROR: lock file parameter must include path component, e.g. ./mylock")
+    (exit 1))
+   ((not (file-writable? lockfdir))
+    (print "ERROR: Can not access directory for lock " lockfdir)
+    (exit 1))
+   ;; add more sanity checks here
+   )
+
+  (let loop ((remtries 10))
+    (if (> remtries 0)
+	(if (check-locked-by-someone-else fulllock mykey)
+	    (begin
+	      (print "... lock " fulllock " exists, waiting...")
+	      (thread-sleep! 1.9)
+	      (loop (- remtries 1)))
+	    (begin
+	      (take-lock fulllock mykey)
+	      (if (check-locked-by-me fulllock mykey)
+		  (run-the-command command params)
+		  (begin ;; didn't get the lock
+		    (thread-sleep! (+ 1.9 (/ 1 (+ 1 (random 20))))) ;; add some noise to prevent nyquist problems
+		    (loop (- remtries 1))))))
+	(begin
+	  (print "ERROR: not able to get the lock. Gonna take it and proceed...")
+	  (take-lock fulllock mykey)
+	  (run-the-command command params)))))

DELETED utils/trace/trace.import.scm
Index: utils/trace/trace.import.scm
==================================================================
--- utils/trace/trace.import.scm
+++ /dev/null
@@ -1,32 +0,0 @@
-;;;; trace.import.scm - GENERATED BY CHICKEN 4.9.0.1 -*- Scheme -*-
-
-(eval '(import
-         scheme
-         chicken
-         csi
-         advice
-         extras
-         ports
-         data-structures
-         (except srfi-1 break)
-         miscmacros))
-(##sys#register-compiled-module
-  'trace
-  (list)
-  '((breakpoint . trace#breakpoint)
-    (trace . trace#trace)
-    (untrace . trace#untrace)
-    (break . trace#break)
-    (unbreak . trace#unbreak)
-    (trace-output-port . trace#trace-output-port)
-    (continue . trace#continue)
-    (c . trace#c)
-    (traced? . trace#traced?)
-    (trace-module . trace#trace-module)
-    (untrace-module . trace#untrace-module)
-    (trace-verbose . trace#trace-verbose)
-    (trace/untrace . trace#trace/untrace))
-  (list)
-  (list))
-
-;; END OF FILE

DELETED utils/trace/trace.meta
Index: utils/trace/trace.meta
==================================================================
--- utils/trace/trace.meta
+++ /dev/null
@@ -1,10 +0,0 @@
-;;;; trace.meta -*- Scheme -*-
-
-
-((category tools)
- (synopsis "tracing and breakpoints")
- (author "felix winkelmann")
- (license "public domain")
- (needs advice				; don't we all?
-	miscmacros)
- (files "tests/run.scm" "trace.meta" "trace.release-info" "trace.scm" "trace.setup") )

DELETED utils/trace/trace.scm
Index: utils/trace/trace.scm
==================================================================
--- utils/trace/trace.scm
+++ /dev/null
@@ -1,259 +0,0 @@
-;;;; trace.scm
-
-
-(module trace (breakpoint 
-	       trace untrace
-	       break unbreak
-	       trace-output-port
-	       continue c 
-	       traced?
-	       trace-module untrace-module
-	       trace-verbose
-	       trace/untrace)
-	       
-(import scheme chicken csi)
-
-(use advice extras ports data-structures)
-(require-library srfi-1)
-(import (except srfi-1 break) miscmacros)
-
-
-(define *last-breakpoint* #f)
-(define *traced-procedures* '())
-(define *broken-procedures* '())
-(define *trace-indent-level* 0)
-
-(define trace-output-port (make-parameter (current-output-port)))
-(define trace-verbose (make-parameter #t))
-
-(define (break-entry name args)
-  ;; Does _not_ unwind!
-  (##sys#call-with-current-continuation
-   (lambda (c)
-     (let ((exn (##sys#make-structure
-		 'condition
-		 '(exn breakpoint)
-		 (list '(exn . message) "*** breakpoint ***"
-		       '(exn . arguments) (list (cons name args))
-		       '(exn . location) name
-		       '(exn . continuation) c) ) ) )
-       (set! *last-breakpoint* exn)
-       (signal exn) ) ) ) )
-
-(define (break-resume exn)
-  (let ((a (member '(exn . continuation) (##sys#slot exn 2))))
-    (if a
-	((cadr a) (void))
-	(error "condition has no continuation" exn) ) ) )
-
-(define (breakpoint #!optional (name 'breakpoint))
-  (break-entry name '()) )
-
-(define (trace-indent)
-  (let ((port (trace-output-port)))
-    (do ((i (fxmin 3 *trace-indent-level*) (fx- i 1)))
-	((fx<= i 0))
-      (write-char #\space port) )
-    (fprintf port "[~a] " *trace-indent-level*) ) )
-
-(define (traced-procedure-entry name args)
-  (let ((port (trace-output-port)))
-    (trace-indent)
-    (set! *trace-indent-level* (fx+ 1 *trace-indent-level*))
-    (write (cons name args) port)
-    (write ", Called from: " port)
-    (write (conc (car (reverse (get-call-chain)))))
-    (write-char #\newline port)
-    (flush-output port) ) )
-
-(define (traced-procedure-exit name results)
-  (let ((port (trace-output-port)))
-    (set! *trace-indent-level* (fx- *trace-indent-level* 1))
-    (trace-indent)
-    (fprintf port "~a -> " name)
-    (if results
-	(for-each
-	 (lambda (x)
-	   (write x port)
-	   (write-char #\space port) )
-	 results)
-	(display "(escaping)" port))
-    (write-char #\newline port)
-    (flush-output port) ) )
-
-(define (procedure-name proc)
-  (cond ((procedure-information proc) =>
-	 (lambda (info)
-	   (if (pair? info) (car info) info) ) )
-	(else ')) )
-
-(define (do-trace procs)
-  (for-each
-   (lambda (s)
-     (ensure procedure? s)
-     (cond ((traced? s)
-	    (warning "procedure already traced" s) )
-	   (else
-	    (let ((name (procedure-name s)))
-	      (when (trace-verbose)
-		(fprintf (current-error-port) "; tracing ~a~%" name))
-	      (set! *traced-procedures* (cons (cons s name) *traced-procedures*))
-	      (advise 
-	       'around s
-	       (lambda (next args)
-		 (let ((results #f))
-		   (dynamic-wind
-		       (cut traced-procedure-entry name args)
-		       (lambda () 
-			 (call-with-values (cut apply next args)
-			   (lambda rs
-			     (set! results rs)
-			     (apply values rs))))
-		       (cut traced-procedure-exit name results))))
-	       '*trace*)))))
-   procs) )
-
-(define (do-untrace-all)
-  (define (unadvise* p)
-    (ignore-errors (unadvise p '*trace*)))
-  (for-each
-   (lambda (proc)
-     (let ((proc (car proc)))
-       (when (trace-verbose)
-	 (fprintf (current-error-port) "; untracing ~a~%" (procedure-name proc))
-	 (unadvise* proc))))
-   *traced-procedures*)
-  (set! *traced-procedures* '()))
-
-(define (do-untrace procs)
-  (for-each
-   (lambda (s)
-     (ensure procedure? s)
-     (let ((p (assq s *traced-procedures*)) 
-	   (name (procedure-name s)))
-       (cond ((not p) (warning "procedure not traced" name))
-	     (else
-	      (when (trace-verbose)
-		(fprintf (current-error-port) "; untracing ~a~%" name))
-	      (ignore-errors (unadvise s '*trace*))
-	      (set! *traced-procedures* 
-		(delete 
-		 p *traced-procedures* 
-		 eq?))))))
-   procs) )
-
-(define (do-break procs)
-  (for-each
-   (lambda (s)
-     (let ((name (procedure-name s)))
-       (ensure procedure? s)
-       (cond ((assq s *broken-procedures*)
-	      (warning "procedure already has break-point" name))
-	     (else
-	      (when (trace-verbose)
-		(fprintf (current-error-port) "; setting break-point in ~a~%" name))
-	      (set! *broken-procedures* (cons (cons s name) *broken-procedures*))
-	      (advise 
-	       'before s
-	       (lambda (args)
-		 (break-entry name args) )
-	       '*break*) ) )))
-   procs) )
-
-(define (do-unbreak procs)
-  (for-each
-   (lambda (s)
-     (ensure procedure? s)
-     (let ((p (assq s *broken-procedures*)) 
-	   (name (procedure-name s)))
-       (cond ((not p) (warning "procedure has no breakpoint" name))
-	     (else
-	      (when (trace-verbose)
-		(fprintf (current-error-port) "; removing break-point in ~a~%" name))
-	      (ignore-errors (unadvise s '*break*))
-	      (set! *broken-procedures* (delete p *broken-procedures* eq?) ) ) ) ) )
-   procs) )
-
-(define (do-unbreak-all)
-  (for-each
-   (lambda (bp)
-     (ignore-errors (unadvise (car bp) '*break*)))
-   *broken-procedures*)
-  (set! *broken-procedures* '())
-  (void))
-
-(define (trace . procs)
-  (cond ((null? procs)
-	 (when (pair? *traced-procedures*)
-	   (printf "Traced:~%~%")
-	   (for-each (lambda (p) (printf "  ~a~%" (cdr p))) *traced-procedures*)) )
-	(else
-	 (do-trace procs) ) ) )
-
-(define (untrace . procs)
-  (cond ((null? procs) (do-untrace-all))
-	(else (do-untrace procs)))
-  (void))
-
-(define (break . procs)
-  (cond ((null? procs)
-	 (when (pair? *broken-procedures*)
-	   (printf "Breakpoints:~%~%")
-	   (for-each (lambda (p) (printf "  ~a~%" (cdr p))) *broken-procedures*)) )
-	(else
-	 (do-break procs) ) ) )
-
-(define (unbreak . procs)
-  (cond ((null? procs) (do-unbreak-all))
-	(else (do-unbreak procs))))
-
-(define (continue #!optional (bp *last-breakpoint*))
-  (cond (*last-breakpoint*
-	 (let ((exn *last-breakpoint*))
-	   (set! *last-breakpoint* #f)
-	   (break-resume exn) ) )
-	(else (display "no breakpoint pending\n") ) ) )
-
-(define c continue)
-
-(define (traced? proc)
-  (assq proc *traced-procedures*))
-
-(define (trace/untrace . procs)
-  (for-each
-   (lambda (proc)
-     ((if (traced? proc) do-untrace do-trace) (list proc)))
-   procs))
-
-(define (walk-module mname proc)
-  (let* ((m (##sys#find-module mname))
-	 (exps (nth-value 1 (##sys#module-exports m))))
-    (for-each
-     (lambda (exp)
-       (let* ((realname (cdr exp))
-	      (prim (get realname '##core#primitive)))
-	 (if prim
-	     (warning "export is a core-library primitive - not traced" (car exp))
-	     (when (##sys#symbol-has-toplevel-binding? realname)
-	       (let ((val (##sys#slot realname 0)))
-		 (when (procedure? val)
-		   (proc val)))))))
-     exps)))
-
-(define (trace-module . mnames)
-  (for-each
-   (lambda (mname)
-     (walk-module mname trace))
-   mnames))
-
-(define (untrace-module . mnames)
-  (for-each
-   (lambda (mname)
-     (walk-module 
-      mname 
-      (lambda (proc)
-	(when (traced? proc)
-	  (do-untrace (list proc))))))
-   mnames))
-
-)

DELETED utils/trace/trace.setup
Index: utils/trace/trace.setup
==================================================================
--- utils/trace/trace.setup
+++ /dev/null
@@ -1,9 +0,0 @@
-;;;; trace.setup -*- Scheme -*-
-
-
-(compile -s trace.scm -O3 -d1 -j trace)
-(compile -s trace.import.scm -O3 -d0)
-
-(install-extension
- 'trace
- '("trace.so" "trace.import.so"))

Index: utils/triage.rb
==================================================================
--- utils/triage.rb
+++ utils/triage.rb
@@ -1,7 +1,24 @@
 #!/usr/bin/env ruby
 
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 #dir = "."
 #if ARGV.length == 1
 #  dir = ARGV[0]
 #end
 #puts dir

Index: utils/unlock_db.sh
==================================================================
--- utils/unlock_db.sh
+++ utils/unlock_db.sh
@@ -1,7 +1,24 @@
 #!/bin/bash
 
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 ## Enh :
 # 1. if /tmp/repo exists, delte it or name it something else
 # 2. compare the repo is successfully created
 
 ## Usage :

Index: utils/viewscreen
==================================================================
--- utils/viewscreen
+++ utils/viewscreen
@@ -1,7 +1,24 @@
 #!/bin/bash
 
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 if ! type screen &> /dev/null;then
   xterm -geometry 180x20 -e "$*;echo Press any key to continue;bash -c 'read -n 1 -s'" &
   exit
 fi
 

ADDED   utils/watch-close-wait.sh
Index: utils/watch-close-wait.sh
==================================================================
--- /dev/null
+++ utils/watch-close-wait.sh
@@ -0,0 +1,25 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
+psline=$(ps -F -u $USER | grep "mtest" |grep " -run " | egrep " -(target|reqtarg) "| head -1)
+id=$(echo $psline|awk '{print $2}')
+echo "Watching process for command line: $psline"
+echo "  with PID=$id"
+while true;do
+  echo "CLOSE_WAIT: $(lsof -n | grep CLOSE_WAIT | grep $id | wc -l) ALL OPEN: $(lsof -n |grep $id|wc -l) ALL CLOSE_WAIT: $(netstat -ap 2> /dev/null| grep -i close_wait| wc -l)"
+  sleep 1
+done

ADDED   utils/whodunit.scm
Index: utils/whodunit.scm
==================================================================
--- /dev/null
+++ utils/whodunit.scm
@@ -0,0 +1,65 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
+(use posix srfi-69)
+
+(define *numsamples* (or (and (> (length (argv)) 1)
+                              (string->number (cadr (argv))))
+                         3))
+
+(define (topdata)
+  (with-input-from-pipe
+   (conc "top -b -n " *numsamples* " -d 0.1")
+   read-lines))
+
+(define (cleanup-data topdat)list
+  (let loop ((hed (car topdat))
+              (tal (cdr topdat))
+              (res '()))
+    (let* ((line-list (string-split hed))
+           (nums      (map (lambda (indat)(or (string->number indat) indat)) line-list))
+           (not-data  (or (null? nums)
+                          (not (number? (car nums)))))
+           (new-res   (if not-data res (cons nums res))))
+      (if (null? tal)
+          new-res
+          (loop (car tal)(cdr tal) new-res)))))
+
+(print "Getting " *numsamples* " samples of cpu usage data.")
+(define data (cleanup-data (topdata)))
+(define pidhash  (make-hash-table))
+(define userhash (make-hash-table))
+
+;; sum up and normalize the 
+(for-each
+ (lambda (indat)
+   (let ((pid (car indat))
+         (usr (cadr indat))
+         (cpu (list-ref indat 8)))
+     (hash-table-set! userhash usr (+ cpu (hash-table-ref/default userhash usr 0)))))
+ data)
+
+(for-each
+ (lambda (usr)
+   (print usr
+          (if (< (string-length usr) 8) "\t\t" "\t")
+          (inexact->exact (round (/ (hash-table-ref userhash usr) *numsamples*)))))
+ (sort (hash-table-keys userhash)
+       (lambda (a b)
+         (> (hash-table-ref userhash a)
+            (hash-table-ref userhash b)))))
+

DELETED utils/wip/mtest-dbstop.scm
Index: utils/wip/mtest-dbstop.scm
==================================================================
--- utils/wip/mtest-dbstop.scm
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/p/foundry/env/pkgs/chicken/4.10.0_ext/bin/csi -s
-
-(use chicken)
-(use data-structures)
-
-
-(include "/nfs/site/home/bjbarcla/bin2/mtest-repair-lib.scm")
-(glib-color-mode 1)
-
-(set! *this-cmd* "/nfs/site/home/bjbarcla/bin2/mtest-dbstop.scm")
-(kill-in-db)
-  

DELETED utils/wip/mtest-diag.scm
Index: utils/wip/mtest-diag.scm
==================================================================
--- utils/wip/mtest-diag.scm
+++ /dev/null
@@ -1,165 +0,0 @@
-#!/p/foundry/env/pkgs/chicken/4.10.0_ext/bin/csi -s
-
-(use chicken)
-(use data-structures)
-
-
-(include "/nfs/site/home/bjbarcla/bin2/mtest-repair-lib.scm")
-(glib-color-mode 1)
-
-;;; check mtver in xterm
-(let ((mt-ver (do-or-die "megatest -version")))
-  (when (member mt-ver '("1.6309-738c" "1.6029"))
-      (iwarn "This xterm has an older version of megatest.")
-      (ierr "Please load latest megatest version to proceed.")
-      (print "eg.: source ../scripts/newrel-setup.csh 1.63/11b")
-      (exit 3)))
-
-
-;;;; kill netbatch jobs from this megatest
-;; TODO!
-
-
-(define *diag* #t)
-;;(define *user* (get-environment-variable "USER"))
-(define *user* (do-or-die "ls -ld . | awk '{print $3}'"))
-(print "user="*user*)
-;;;; delete .homehost .homehost.config
-;;;; if not on homehost, ssh homehost, cd here, killall mtest dboard
-(if (not *diag*)
-    (when (file-exists? ".homehost.config")
-      (delete-db ".homehost.config")))
-    
-(when (file-exists? ".homehost")
-  (let* ((homehost (with-input-from-file ".homehost" (lambda () (read)))))
-    (let* ((homehostname (do-or-die "host `cat .homehost` | sed 's/.$//' | awk '{print $NF}' | awk -F. '{print $1}'"))
-           (thishostname (get-environment-variable "HOST")))
-      (when (not (equal? homehostname thishostname))
-        (let* ((this-exe-compiled (car (argv)))
-               (this-exe "/nfs/site/home/bjbarcla/bin2/mtest-diag.scm")
-               (cmd (conc "ssh "homehostname" 'cd "(get-environment-variable "PWD")" && "this-exe"'")))
-          (iwarn "Running on the homehost -- "homehostname)
-          ;;(iwarn "eg: % ssh "homehostname" 'cd "(get-environment-variable "PWD")" && "(car (argv))"'")
-          (print "cmd="cmd)
-          ;;(inote "sleeping for 5 seconds.  hit ctrl-c now to run on homehost or wait to proceed.")
-          (system cmd)
-          (exit 0))))))
-
-
-
-
-;;;; kill megatests and dashboards in this area
-(define (kill-mtest-dboard)
-  (if *diag*
-      #f
-      (let* ((this-toppath (pid->cwd (current-process-id)))
-             (tmppath      (toppath->tmppath this-toppath))
-             (config       (let ((res (conc this-toppath "/megatest.config")))
-                             (when (not (file-exists? res))
-                               (ierr "This is not a megatest run area; "res" does not exist.  Aborting.")
-                               (exit 2))
-                             res))
-             (mtest-procs (get-my-mtest-procs))
-             (dashboard-procs (get-my-dashboard-procs))
-             (all-pids (map proc-PID (append mtest-procs dashboard-procs)))
-             (our-pids (filter (lambda (pid)
-                                 (equal? (pid->cwd pid) this-toppath))
-                               all-pids)))
-
-        (if (null? our-pids)
-            (inote "No mtest or dboard processes on this host in in this runarea.")
-            (begin
-              (iwarn "Killing all megatest and dashboard processes on this host.")
-              (gracefully-kill-pids our-pids)))
-        )))
-
-(kill-mtest-dboard)
-
-
-;;;; delete /tmp/.$USER-portlogger.db
-(let ((plfile (conc "/tmp/."*user* "-portlogger.db")))
-
-  (if (safe-file-exists? plfile)
-    (if *diag*
-        (print "plfile exists - "plfile)
-        (begin
-          (inote "removing portlogger file")
-          (system (conc "rm "plfile))))))
-
-
-;;;; move logs dir aside
-(when (not *diag*)
-  (system (conc "mv logs logs-aside-`date +%s`"))
-  (system "mkdir logs"))
-  
-
-;;;; fixes for dependency diagram
-(when (not *diag*)
-  (inote "Removing dep graph tmp files if they exist")
-  (system (conc "rm /tmp/."*user*"-*.dot"))
-
-  ;;#ln -s /p/fdk/gwa/$USER/fossil/ext/_ext ext
-  (let* ((toppath (pid->cwd (current-process-id)))
-         (flow (car (string-split
-                     (car (reverse (string-split toppath "/")))
-                     ".")))
-         (extdir (conc "/p/fdk/gwa/"*user*
-                       "/fossil/ext/"flow"_ext")))
-    (when (and (safe-file-exists? extdir)
-               (not (safe-file-exists? "ext")))
-      (inote "Linking in ext dir")
-      (system (conc "ln -s "extdir" ext")))))
-  
-
-;;;; check for 0 byte megatest{,_ref}.db in tmp.  delete them
-;;;; check for wal-mode megatest{,_ref}.db in tmp.  delete them
-(define (repair-dbs)
-  (let* ((this-toppath (pid->cwd (current-process-id)))
-         (tmppath      (toppath->tmppath this-toppath))
-         (golden-mtest-file (conc this-toppath "/megatest.db"))
-         (golden-mtest-file-ok (check-db "megatest.db"))
-         (tmp-mtest-file    (conc tmppath "/megatest.db"))
-         (tmp-mtestref-file    (conc tmppath "/megatest_ref.db"))
-         (tmp-mtest-file-ok (check-db tmp-mtest-file))
-         (tmp-mtestref-file-ok (check-db tmp-mtestref-file))
-         )
-;;;; check for megatest{,_ref}.db in tmp that die on .schema.  delete them
-    (when (safe-file-exists? tmppath)
-        (if tmp-mtest-file-ok
-            (inote "tmp megatest db file ok")
-            (if *diag*
-                (print "diag: tmp megatest db broken - "tmp-mtest-file)
-                (delete-db tmp-mtest-file)))
-        (if tmp-mtestref-file-ok
-            (inote "tmp megatestref db file ok")
-            (if *diag*
-                (print "diag: tmpref megatest db broken - "tmp-mtestref-file)
-                (delete-db tmp-mtestref-file))))
-
-;;;; check for megatest.db
-    (if golden-mtest-file-ok
-        (inote "golden megatest db file ok")
-        (if (not (file-exists? golden-mtest-file))
-            (inote "megatest.db not present.  Continuing.")
-            (begin
-          ;;;; if golden megatest db is broken, stop now!
-              (ierr "Golden megatest.db is broken.  Please delete it or replace it from a backup version in .snapshot.  If critical, contact env team to assist.")
-              (sendmail "bjbarcla" "!!Bad golden megatest.db" this-toppath)
-              (inote "Backups in .snapshot:")
-              (system "ls -l .snapshot/*/megatest.db")
-              (ierr "Not proceeding with any more checks.")
-              (exit 3))))
-
-
-
-    ))
-
-(repair-dbs)
-    
-
-
-
-
-
-
-

DELETED utils/wip/mtest-nbstop.scm
Index: utils/wip/mtest-nbstop.scm
==================================================================
--- utils/wip/mtest-nbstop.scm
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/p/foundry/env/pkgs/chicken/4.10.0_ext/bin/csi -s
-
-(use chicken)
-(use data-structures)
-
-
-(include "/nfs/site/home/bjbarcla/bin2/mtest-repair-lib.scm")
-(glib-color-mode 1)
-
-(set! *this-cmd* "/nfs/site/home/bjbarcla/bin2/mtest-nbstop.scm")
-
-(inote "Killing local mtest/dboard in this run area.")
-(kill-mtest-dboard)
-
-;;;; move logs dir aside
-(inote "move logs")
-(system (conc "mv logs logs-aside-`date +%s`"))
-(system "mkdir logs")
-
-
-
-(inote "Killing netbatch mtest jobs launched from this run area.")
-(let ((jobcount (kill-mtest-jobs-in-netbatch)))
-  (when (> jobcount 0)
-    (inote "Marking in-flight tests killed in db")
-    (when (db-islocked? "megatest.db")
-      (iwarn "Unlocking megatest.db")
-      (db-unlock "megaetest.db"))
-    (kill-in-db)))
-
-(inote "Final reaping of mtest/dboard")
-(kill-mtest-dboard)
-
-

DELETED utils/wip/mtest-reaper.scm
Index: utils/wip/mtest-reaper.scm
==================================================================
--- utils/wip/mtest-reaper.scm
+++ /dev/null
@@ -1,142 +0,0 @@
-#!/p/foundry/env/pkgs/chicken/4.10.0_ext/bin/csi -s
-
-(use general-lib)
-(use typed-records)
-(use regex-literals)
-(use regex)
-(use sql-de-lite)
-
-(defstruct proc
-    (USER "")
-  (PID -1)
-  (%CPU -1.0)
-  (%MEM -1.0)
-  (VSZ -1)
-  (RSS -1)
-  (TTY "")
-  (STAT "")
-  (START "")
-  (TIME "")
-  (COMMAND ""))
-
-(define (linux-get-process-info-records)
-  (let* ((raw (do-or-die "/bin/ps auwx"))
-         (all-lines (string-split raw "\n"))
-         (lines (cdr all-lines)) ;; skip title lines
-         (re #/^(\S+)\s+(\d+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(.*)$/))
-    (filter
-     proc?
-     (map
-      (lambda (line)
-        (let ((match (string-match re line)))
-          (if match
-              (make-proc
-               USER:    (list-ref match 1)
-               PID:     (string->number (list-ref match 2))
-               %CPU:    (string->number (list-ref match 3))
-               %MEM:    (string->number (list-ref match 4))
-               VSZ:     (string->number (list-ref match 5))
-               RSS:     (string->number (list-ref match 6))
-               TTY:     (string->number (list-ref match 7))
-               STAT:    (list-ref match 8)
-               START:   (list-ref match 9)
-               TIME:    (list-ref match 10)
-               COMMAND: (list-ref match 11))
-              #f)))
-      lines))))
-        
-(define (get-my-mtest-server-procs)
-  (let* ((procs (linux-get-process-info-records))
-        (my-mtest-procs
-         (filter
-          (lambda (a-proc)
-            (and
-             (equal? (get-environment-variable "USER") (proc-USER a-proc))
-             (string-match #/^.*\/mtest\s+.*-server.*/ (proc-COMMAND a-proc))))
-          procs)))
-    my-mtest-procs))
-
-
-(define (pid->environ-hash pid)
-  (let* ((envfile (conc "/proc/"pid"/environ"))
-         (ht (make-hash-table))
-         (rawdata (with-input-from-file envfile read-string))
-         (lines (string-split rawdata  (make-string 1 #\nul ))))
-    (for-each
-     (lambda (line)
-       (let ((match (string-match #/(^[^=]+)=(.*)/ line)))
-         (if match
-             (hash-table-set! ht (list-ref match 1) (list-ref match 2)))))
-     lines)
-    ht))
-
-(define (pid->cwd pid)
-  (read-symbolic-link (conc "/proc/"pid"/cwd")))
-
-(define (pid->mtest-monitor-db-file pid)
-  (let* ((env   (pid->environ-hash pid))
-         (ltdir (hash-table-ref/default env "MT_LINKTREE" #f))
-         (radir (hash-table-ref/default env "MT_RUN_AREA_HOME" #f))
-         (cwd   (pid->cwd pid)))
-    (let ((res
-           (cond
-            (ltdir (conc ltdir "/.db/monitor.db"))
-            (radir (conc
-                    (do-or-die
-                     (conc "megatest -start-dir "radir" -show-config -section setup -var linktree"))
-                    "/.db/monitor.db"))
-            (cwd  (conc
-                   (do-or-die
-                    (conc "megatest -start-dir "cwd" -show-config -section setup -var linktree"))
-                   "/.db/monitor.db"))
-            
-            (else #f))))
-      res)))
-      
-
-
-
-
-(define (get-mdb-status mdb-file pid)
-    ;; select state from servers where pid='4465';
-  
-  (cond
-   ((not (string? mdb-file)) (conc "mdb-file could not be determined for pid " pid ">>"mdb-file ))
-   ((not (file-exists? mdb-file)) (conc "mdb-file does not exist for pid "pid" : "mdb-file))
-   (else
-    (let ((dbh (open-database mdb-file)))
-      
-      (set-busy-handler! dbh 10000)
-      (let* ((sql-str "select state from servers where pid=?;")
-             (stm (sql dbh sql-str))
-             (alists (query fetch-alists stm (->string pid))))
-        (if (null? alists)
-            "server pid not in monitor.db"
-            (cdr (car (car alists)))))))))
-
-    
-(define (mtest-server-pid->status pid)
-  (let* ((mdb-file (pid->mtest-monitor-db-file pid)))
-    (if mdb-file
-        (get-mdb-status mdb-file pid)
-        "no monitor.db file could be found"
-        )))
-
-
-(define (kill pid)
-  (print "KILL "pid)
-  (do-or-die (conc "kill -9 "pid)))
-
-(define (reap-defunct-mtest-server-pid pid)
-  (let ((status (mtest-server-pid->status pid)))
-    (print pid"->"(mtest-server-pid->status pid))
-    (if (member status (list "running" "dbprep" "available" "collision"))
-        (print "pid="pid" in status "status" -- not killing")
-        (kill pid))))
-        
-(let* ((procs (get-my-mtest-server-procs))
-       (pids (map proc-PID procs))
-       )
-  
-  (for-each reap-defunct-mtest-server-pid pids))
-

DELETED utils/wip/mtest-repair-lib.scm
Index: utils/wip/mtest-repair-lib.scm
==================================================================
--- utils/wip/mtest-repair-lib.scm
+++ /dev/null
@@ -1,508 +0,0 @@
-(use general-lib)
-(use typed-records)
-(use regex-literals)
-(use regex)
-(use sql-de-lite)
-(use posix)
-(use files)
-(use s11n)
-(use ports)
-(use z3)
-(use base64)
-(use matchable)
-
-
-
-
-(define (cli-arg arg #!key (default #f) (is-list #f))
-  (let* ((temp    (skim-cmdline-opts-withargs-by-regex arg)))
-      (if (> (length temp) 0)
-          (if is-list
-              temp
-              (car temp))
-          default)))
-
-(define (cli-switch arg)
-  (let ((temp (skim-cmdline-opts-noarg-by-regex arg)))
-    (if (> (length temp) 0)
-        (car temp)
-        #f)))
-
-
-         
-(defstruct nbjob
-    pool
-    jobid
-    owner
-    mtver
-    user
-    status
-    cmdline
-    execute)
-
-(define (cmdline->execute cmdline)
-  (let* ((match (string-match ".*-execute\\s+(\\S+)" cmdline)))
-    (if match
-        (with-input-from-string (z3:decode-buffer (base64-decode (cadr match))) read)
-        #f)))
-
-
-(define (nbjob-execute-ref nbjob key #!key (default #f))
-  (let ((execute (nbjob-execute nbjob)))
-    (if (list? execute)
-        (let* ((match (alist-ref key execute)))
-          (if match
-              (if (list? match) (car match) match)
-              default))
-        default)))
-
-(define (nbjob-process pool nbstatus-line)
-  (let ((toks (string-split nbstatus-line ",")))
-    (if (eq? 4 (length toks))
-        (if (equal? (list-ref toks 1) "Jobid")
-            #f
-            (begin
-              (let ((res
-                     (make-nbjob
-                      pool:    pool
-                      status:  (list-ref toks 0)
-                      jobid:   (list-ref toks 1)
-                      user:    (list-ref toks 2)
-                      cmdline: (list-ref toks 3)
-                      execute: (cmdline->execute (list-ref toks 3))
-                      )))
-                res)))
-        #f)))
-
-(define (get-mtest-nb-jobs user nbpools #!key (cmdline-filter "megatest"))
-  (let* ((res
-          (apply append
-                 (map (lambda (pool)
-                        (let* (;;(user-filter ".*")
-                               (user-filter user)
-                               (cmd
-                                (conc "nbstatus jobs --tar "pool" --fields status,jobid,user,cmdline --format csv "
-                                      "'USER=~\""user-filter
-                                      "\"&&cmdline=~\""cmdline-filter"\"'"))
-                               (res (do-or-die cmd)))
-                          (filter nbjob?
-                                  (map (lambda (line)
-                                         (nbjob-process pool line))
-                                       (string-split res "\n")))))
-                      nbpools))))
-    res))
-
-;;(define foo (get-mtest-nb-jobs "bjbarcla" '("pdx_normal" "pdx_critical")))
-
-(define (cmdline->execute cmdline)
-  (let* ((match (string-match ".*-execute\\s+(\\S+)" cmdline)))
-    (if match
-        (with-input-from-string (z3:decode-buffer (base64-decode (cadr match))) read)
-        #f)))
-
-;;;; kill jobs in netbatch for this area
-(define (kill-mtest-jobs-in-netbatch)
-  (let ((pwd (get-environment-variable "PWD"))
-        (jobs (get-mtest-nb-jobs (get-environment-variable "USER") '("pdx_normal" "pdx_critical") )))
-
-    (for-each
-     (lambda (job)
-       (let* ((jobid  (nbjob-jobid job))
-              (pool   (nbjob-pool job))
-              (status (nbjob-status job))
-              (cmd (conc "nbjob --target "pool" remove "jobid)))
-         ;;(print status)
-         (print  cmd)
-         (system cmd)))
-                                        ;(pp (nbjob->alist job))
-     (filter
-      (lambda (job)
-        (equal? (nbjob-execute-ref job 'toppath) pwd))
-      jobs))
-    (length jobs)
-
-    ))
-
-
-;;;; kill megatest jobs in running in netbatch
-(define (kill-in-db #!key (megatest_exe "megatest"))
-  (let* ((all-targ-patt (do-or-die "sqlite3 megatest.db \"select id from keys\" | tr \"\\n1234567890\" \"/%%%%%%%%%%\" | sed 's/\\/$//'"))
-         )
-    (for-each (lambda (state)
-                (let* ((cmd (conc megatest_exe " -state "state" -set-state-status KILLED,n/a -testpatt % -target "all-targ-patt" -runname %")))
-                  (print cmd)
-                  (system cmd)))
-              '("REMOTEHOSTSTART" "LAUNCHED" "RUNNING" "KEEP_TRYING" "PREQ_FAIL"))))
-
-
-
-;;;; kill megatests and dashboards in this area running on this host
-(define (kill-mtest-dboard)
-  
-  (let* ((this-toppath (pid->cwd (current-process-id)))
-         (tmppath      (toppath->tmppath this-toppath))
-         (config       (let ((res (conc this-toppath "/megatest.config")))
-                         (when (not (file-exists? res))
-                           (ierr "This is not a megatest run area; "res" does not exist.  Aborting.")
-                           (exit 2))
-                         res))
-         (mtest-procs (get-my-mtest-procs))
-         (dashboard-procs (get-my-dashboard-procs))
-         (all-pids (map proc-PID (append mtest-procs dashboard-procs)))
-         (our-pids (filter (lambda (pid)
-                             ;;(print (pid-COMMAND pid))
-                             (and
-                              (equal? (pid->cwd pid) this-toppath)
-                              
-                              ))
-                           all-pids)))
-
-    (if (null? our-pids)
-        (inote "No mtest or dboard processes on this host in in this runarea.")
-        (begin
-          (iwarn "Killing all megatest and dashboard processes on this host.")
-          (gracefully-kill-pids our-pids)))
-    ))
-
-
-
-(define (db-mt-version dbpath)
-  (let* ((cmd (conc "sqlite3 "dbpath" 'select val from metadat where var=\"MEGATEST_VERSION\"'"))
-         (res (do-or-die cmd)))
-    res))
-   
-;; TODO
-(define (db-islocked? dbpath)
-  (let-values (((ec so se) (isys (conc "sqlite3 "dbpath" vacuum"))))
-    (let* ((message se)
-           (is-locked (string-match "^.*database is locked.*$" message)))
-      (inote "dbfile - "dbpath "; message - "message)
-      is-locked)))
-
-(define (db-unlock dbpath)
-  (system (conc "/nfs/site/bjbarcla/bin/unlock_db.sh " dbpath))
-
-  ;; (let* ((temp-dbpath (conc "/tmp/"(get-environment-variable "USER")"-"(current-process-id)".db")))
-  ;;   (inote "Unlocking "dbpath)
-  ;;   (do-or-die (conc "cp "dbpath" "temp-dbpath))
-  ;;   (do-or-die (conc "rm -f "dbpath))
-  ;;   (let* ((cmd (conc "sqlite3 "temp-dbpath" .dump | sqlite3 "dbpath)))
-  ;;     (inote "Running: "cmd)
-  ;;     (system cmd))
-  ;;   ;;(do-or-die "sqlite3 "temp-dbpath" .dump | sqlite3 "dbpath)
-  ;;   (if (db-islocked? dbpath)
-  ;;       (begin
-  ;;         (ierr "Could not unlock "dbpath)
-  ;;         (exit 5))
-  ;;       (inote "Unlocked "dbpath))
-  ;;   #t)
-
-  )
-
-
-(define *user* (do-or-die "ls -ld . | awk '{print $3}'"))
-
-(define (false-on-exception thunk)
-  (handle-exceptions exn #f (thunk) ))
-
-(define (safe-file-exists? path-string)
-  (false-on-exception (lambda () (file-exists? path-string))))
-
-(defstruct proc
-    (USER "")
-  (PID -1)
-  (%CPU -1.0)
-  (%MEM -1.0)
-  (VSZ -1)
-  (RSS -1)
-  (TTY "")
-  (STAT "")
-  (START "")
-  (TIME "")
-  (COMMAND ""))
-
-(define (toppath->tmppath toppath)
-  (let* ((user *user*)
-         (area (car (string-split
-                     (car (reverse (string-split toppath "/")))
-                     ".")))
-         (dotified-path (string-substitute "/" "." toppath "all")))
-    (conc "/tmp/" user "/megatest_localdb/" area "/" dotified-path)))
-
-
-(define (delete-db dbfile)
-  (let* ((db-files (glob (conc dbfile "*"))))
-    (for-each
-     (lambda (file)
-       (inote "delete file " file)
-       (if (delete-file* file)
-           (inote "Removed file - " file)
-           (iwarn "Could Not Remove file - " file))
-       )
-     db-files)))
-
-(define (check-db dbfile)
-  (let* ((has-wal (safe-file-exists? (conc dbfile "-wal")))
-         (has-shm (safe-file-exists? (conc dbfile "-shm")))
-         (has-journal (safe-file-exists? (conc dbfile "-journal")))
-         (has-db (safe-file-exists? dbfile))
-         (ok-flag #t))
-    (when has-journal
-      (iwarn "Journal exists - "(conc dbfile "-journal"))
-      )
-    (when has-wal
-      (set! ok-flag #f)
-      (iwarn "Wal-mode db exists: "(conc dbfile "-wal")))
-    (if (not has-db)
-        (begin
-          (inote "db does not exists " dbfile)
-          (set! ok-flag #f))
-        (let* ((db-size (file-size dbfile)))
-          (inote "db size = " db-size " -- " dbfile)
-          (when (member db-size (list 0 1024))
-            (iwarn "db has bad size - "db-size" -- "dbfile)
-            (set! ok-flag #f))))
-    ok-flag))
-               
-
-(define (linux-get-process-info-records)
-  (let* ((raw (do-or-die "/bin/ps auwx"))
-         (all-lines (string-split raw "\n"))
-         (lines (cdr all-lines)) ;; skip title lines
-         (re (regexp "^(\\S+)\\s+(\\d+)\\s+(\\S+)\\s+(\\S+)\\s+(\\S+)\\s+(\\S+)\\s+(\\S+)\\s+(\\S+)\\s+(\\S+)\\s+(\\S+)\\s+(.*)$")))
-    (filter
-     proc?
-     (map
-      (lambda (line)
-        (let ((match (string-match re line)))
-          (if match
-              (make-proc
-               USER:    (list-ref match 1)
-               PID:     (string->number (list-ref match 2))
-               %CPU:    (string->number (list-ref match 3))
-               %MEM:    (string->number (list-ref match 4))
-               VSZ:     (string->number (list-ref match 5))
-               RSS:     (string->number (list-ref match 6))
-               TTY:     (string->number (list-ref match 7))
-               STAT:    (list-ref match 8)
-               START:   (list-ref match 9)
-               TIME:    (list-ref match 10)
-               COMMAND: (list-ref match 11))
-              #f)))
-      lines))))
-        
-(define (get-my-mtest-server-procs)
-  (let* ((procs (linux-get-process-info-records))
-        (my-mtest-procs
-         (filter
-          (lambda (a-proc)
-            (and
-             (equal? *user* (proc-USER a-proc))
-             (string-match "^.*/mtest\\s+.*-server.*" (proc-COMMAND a-proc))))
-          procs)))
-    my-mtest-procs))
-
-(define (get-my-mtest-procs)
-  (let* ((procs (linux-get-process-info-records))
-        (my-mtest-procs
-         (filter
-          (lambda (a-proc)
-            (and
-             (equal? *user* (proc-USER a-proc))
-             (string-match "^.*/m(ega)?test .*" (proc-COMMAND a-proc))
-             (not (string-match "^.*/mtest-repair.*" (proc-COMMAND a-proc)))))
-          procs)))
-    my-mtest-procs))
-
-(define (get-my-dashboard-procs)
-  (let* ((procs (linux-get-process-info-records))
-        (my-dboard-procs
-         (filter
-          (lambda (a-proc)
-            (and
-             (equal? *user* (proc-USER a-proc))
-             (string-match "^.*/dboard.*" (proc-COMMAND a-proc))))
-          procs)))
-    my-dboard-procs))
-
-
-(define (pid->environ-hash pid)
-  (let* ((envfile (conc "/proc/"pid"/environ"))
-         (ht (make-hash-table))
-         (rawdata (with-input-from-file envfile read-string))
-         (lines (string-split rawdata  (make-string 1 #\nul ))))
-    (for-each
-     (lambda (line)
-       (let ((match (string-match "(^[^=]+)=(.*)" line)))
-         (if match
-             (hash-table-set! ht (list-ref match 1) (list-ref match 2)))))
-     lines)
-    ht))
-
-(define (pid->cwd pid)
-  (read-symbolic-link (conc "/proc/"pid"/cwd")))
-
-(define (pid->mtest-monitor-db-file pid #!key (megatest_exe "megatest"))
-  (let* ((env   (pid->environ-hash pid))
-         (ltdir (hash-table-ref/default env "MT_LINKTREE" #f))
-         (radir (hash-table-ref/default env "MT_RUN_AREA_HOME" #f))
-         (cwd   (pid->cwd pid)))
-    (let ((res
-           (cond
-            (ltdir (conc ltdir "/.db/monitor.db"))
-            (radir (conc
-                    (do-or-die
-                     (conc megatest_exe " -start-dir "radir" -show-config -section setup -var linktree"))
-                    "/.db/monitor.db"))
-            (cwd  (conc
-                   (do-or-die
-                    (conc megatest_exe " -start-dir "cwd" -show-config -section setup -var linktree"))
-                   "/.db/monitor.db"))
-            
-            (else #f))))
-      res)))
-      
-
-
-
-
-(define (get-mdb-status mdb-file pid)
-    ;; select state from servers where pid='4465';
-  
-  (cond
-   ((not (string? mdb-file)) (conc "mdb-file could not be determined for pid " pid ">>"mdb-file ))
-   ((not (safe-file-exists? mdb-file)) (conc "mdb-file does not exist for pid "pid" : "mdb-file))
-   (else
-    (let ((dbh (open-database mdb-file)))
-      
-      (set-busy-handler! dbh 10000)
-      (let* ((sql-str "select state from servers where pid=?;")
-             (stm (sql dbh sql-str))
-             (alists (query fetch-alists stm (->string pid))))
-        (if (null? alists)
-            "server pid not in monitor.db"
-            (cdr (car (car alists)))))))))
-
-    
-(define (mtest-server-pid->status pid)
-  (let* ((mdb-file (pid->mtest-monitor-db-file pid)))
-    (if mdb-file
-        (get-mdb-status mdb-file pid)
-        "no monitor.db file could be found"
-        )))
-
-
-(define (gracefully-kill-pids pids)
-  (for-each (lambda (pid)
-              (print "kill "pid)
-              (system (conc "kill "pid)))
-            pids)
-  (sleep 5)
-  (let* ((procs-left (linux-get-process-info-records))
-         (pids-left (map proc-PID procs-left)))
-    (for-each (lambda (pid)
-                (when (member pid pids-left)
-                  (print "kill -9"pid)
-                  (system (conc "kill -9 "pid))))
-              pids)))
-  
-            
-              
-(define (kill pid)
-  (print "KILL "pid)
-  (do-or-die (conc "kill -9 "pid)))
-
-(define (reap-defunct-mtest-server-pid pid)
-  (let ((status (mtest-server-pid->status pid)))
-    (print pid"->"(mtest-server-pid->status pid))
-    (if (member status (list "running" "dbprep" "available" "collision"))
-        (print "pid="pid" in status "status" -- not killing")
-        (kill pid))))
-        
-;; (let* ((procs (get-my-mtest-server-procs))
-;;        (pids (map proc-PID procs))
-;;        )
-  
-;;   (for-each reap-defunct-mtest-server-pid pids))
-
-
-
-(define (mtdbver->mtrelver mtdbver)
-  (let* ((table-alist '(
-                        ("1.5402" . "1.54/02")
-                        ("1.5406" . "1.54/05")
-                        ("1.5408" . "1.54/07")
-                        ("1.5409" . "1.54/09")
-                        ("1.5412" . "1.54/12")
-                        ("1.5413" . "1.54/13")
-                        ("1.5414" . "1.54/14")
-                        ("1.5415" . "1.54/15")
-                        ("1.5416" . "1.54/16")
-                        ("1.5417" . "1.54/17")
-                        ("1.5418" . "1.54/18")
-                        ("1.5419" . "1.54/19")
-                        ("1.5421" . "1.54/21")
-                        ("1.5411" . "1.54/support-for-skip")
-                        ("1.5522" . "1.55/22")
-                        ("1.5523" . "1.55/23")
-                        ("1.5524" . "1.55/24")
-                        ("1.5525" . "1.55/25")
-                        ("1.6001" . "1.60/01")
-                        ("1.6002" . "1.60/02")
-                        ("1.6003" . "1.60/03")
-                        ("1.6004" . "1.60/04")
-                        ("1.6005" . "1.60/05")
-                        ("1.6006" . "1.60/06")
-                        ("1.6007" . "1.60/07")
-                        ("1.6008" . "1.60/08")
-                        ("1.6009" . "1.60/09")
-                        ("1.6009" . "1.60/11")
-                        ("1.6012" . "1.60/12")
-                        ("1.6013" . "1.60/13")
-                        ("1.6014" . "1.60/14")
-                        ("1.6015" . "1.60/15")
-                        ("1.6016" . "1.60/16")
-                        ("1.6017" . "1.60/17")
-                        ("1.6018" . "1.60/18")
-                        ("1.6019" . "1.60/19")
-                        ("1.6021" . "1.60/21")
-                        ("1.6022" . "1.60/22")
-                        ("1.6023" . "1.60/23")
-                        ("1.6024" . "1.60/24")
-                        ("1.6025" . "1.60/25")
-                        ("1.6026" . "1.60/26")
-                        ("1.6027" . "1.60/27")
-                        ("1.6028" . "1.60/28")
-                        ;;("1.6029" . "1.60/29")
-                        ("1.6029" . "1.60/29a")
-                        ("1.6031" . "1.60/31")
-                        ("1.6101" . "1.61/01")
-                        ("1.6101" . "1.61/01a")
-                        ("1.6102-c2ba" . "1.61/02")
-                        ("1.6103-3e88" . "1.61/03")
-                        ("1.6104-ee53" . "1.61/04")
-                        ("1.6105-232b" . "1.61/05")
-                        ("1.6201-e652" . "1.62/01")
-                        ("1.6204-c74d" . "1.62/04")
-                        ("1.6205-aff0" . "1.62/05")
-                        ("1.6207-6f59" . "1.62/07")
-                        ("1.6301-fbf0" . "1.63/01")
-                        ("1.6302-da4a" . "1.63/02")
-                        ("1.6303-aa5f" . "1.63/03")
-                        ("1.6304-fa49" . "1.63/04")
-                        ("1.6305-a03b" . "1.63/05")
-                        ("1.6306-7a12" . "1.63/06")
-                        ("1.6307-fb5d" . "1.63/07")
-                        ("1.6308-35e0" . "1.63/08")
-                        ("1.6309-738c" . "1.63/09")
-                        ("1.6309-880c" . "1.63/09a")
-                        ("1.6309-b566" . "1.63/09b")
-                        ("1.6311-fb43" . "1.63/11")
-                        ("1.6311-fb43" . "1.63/11b")
-                        ("1.6311-8a6c" . "1.63/11b")
-                        ("1.6402-03c5" . "1.64/02")
-                        )
-                      )
-         (res (alist-ref mtdbver table-alist equal?)))
-    res))
-

DELETED utils/wip/mtest-repair.scm
Index: utils/wip/mtest-repair.scm
==================================================================
--- utils/wip/mtest-repair.scm
+++ /dev/null
@@ -1,139 +0,0 @@
-#!/p/foundry/env/pkgs/chicken/4.10.0_ext/bin/csi -s
-
-(use chicken)
-(use data-structures)
-
-
-(include "/nfs/site/home/bjbarcla/bin2/mtest-repair-lib.scm")
-(glib-color-mode 1)
-
-;;(define this-cmd (car (argv)))
-(define this-cmd "/nfs/site/home/bjbarcla/bin2/mtest-repair.scm")
-
-;;; check mtver in xterm
-
-;; note - 11b is 1.6311-fb43
-(let ((mt-ver (do-or-die "megatest -version")))
-  (when (member mt-ver '("1.6309-738c" "1.6029" "1.6309-b566"))
-      (iwarn "This xterm has an older version of megatest.")
-      (ierr "Please load latest megatest version to proceed.")
-      (print "eg.: source ../scripts/newrel-setup.csh 1.63/11b")
-      (exit 3)))
-
-
-;;;; kill netbatch jobs from this megatest
-;;(kill-mtest-dboard)
-;;(system "/nfs/site/home/bjbarcla/bin2/mtest-nbstop.scm")
-
-
-;;;; delete .homehost .homehost.config
-;;;; if not on homehost, ssh homehost, cd here, killall mtest dboard
-(when (file-exists? ".homehost.config")
-  (delete-db ".homehost.config"))
-
-(when (file-exists? ".homehost")
-  (let* ((homehost (with-input-from-file ".homehost" (lambda () (read)))))
-    (let* ((homehostname (do-or-die "host `cat .homehost` | sed 's/.$//' | awk '{print $NF}' | awk -F. '{print $1}'"))
-           (thishostname (get-environment-variable "HOST")))
-      (when (not (equal? homehostname thishostname))
-          (iwarn "Please also run this on the homehost -- "homehostname)
-
-          (iwarn "eg: % ssh "homehostname" 'cd "(get-environment-variable "PWD")" && "this-cmd"'")
-          (print "")
-          (inote "sleeping for 5 seconds.  hit ctrl-c now to run on homehost or wait to proceed.")
-          (sleep 5)))))
-
-
-
-
-
-(kill-mtest-dboard)
-
-
-;;;; delete /tmp/.$USER-portlogger.db
-(let ((plfile (conc "/tmp/."(get-environment-variable "USER") "-portlogger.db")))
-  (when (safe-file-exists? plfile)
-    (inote "removing portlogger file")
-    (system (conc "rm "plfile))))
-
-
-;;;; move logs dir aside
-(system (conc "mv logs logs-aside-`date +%s`"))
-(system "mkdir logs")
-
-;;;; fixes for dependency diagram
-(inote "Removing dep graph tmp files if they exist")
-(system (conc "rm /tmp/."(get-environment-variable "USER")"-*.dot"))
-
-;;#ln -s /p/fdk/gwa/$USER/fossil/ext/_ext ext
-(let* ((toppath (pid->cwd (current-process-id)))
-       (flow (car (string-split
-                   (car (reverse (string-split toppath "/")))
-                   ".")))
-       (extdir (conc "/p/fdk/gwa/"(get-environment-variable "USER")
-                     "/fossil/ext/"flow"_ext")))
-  (when (and (safe-file-exists? extdir)
-           (not (safe-file-exists? "ext")))
-    (inote "Linking in ext dir")
-    (system (conc "ln -s "extdir" ext"))))
-
-
-;;;; check for 0 byte megatest{,_ref}.db in tmp.  delete them
-;;;; check for wal-mode megatest{,_ref}.db in tmp.  delete them
-(define (repair-dbs)
-  (let* ((this-toppath (pid->cwd (current-process-id)))
-         (tmppath      (toppath->tmppath this-toppath))
-         (golden-mtest-file (conc this-toppath "/megatest.db"))
-         (golden-mtest-file-ok (check-db "megatest.db"))
-         (tmp-mtest-file    (conc tmppath "/megatest.db"))
-         (tmp-mtestref-file    (conc tmppath "/megatest_ref.db"))
-         (tmp-mtest-file-ok (check-db tmp-mtest-file))
-         (tmp-mtestref-file-ok (check-db tmp-mtestref-file))
-         (alldbs (list tmp-mtest-file tmp-mtestref-file golden-mtest-file))
-         )
-;;;; check for megatest{,_ref}.db in tmp that die on .schema.  delete them
-    (when (safe-file-exists? tmppath)
-        (if tmp-mtest-file-ok
-            (inote "tmp megatest db file ok")
-            (delete-db tmp-mtest-file))
-        (if tmp-mtestref-file-ok
-            (inote "tmp megatestref db file ok")
-            (delete-db tmp-mtestref-file)))
-
-    ;;;;; check for locked dbs
-    (for-each (lambda (dbfile)
-                (let* ((locked (db-islocked? dbfile)))
-                  (if (db-islocked? dbfile)
-                      (begin
-                        (iwarn "db locked - "dbfile)
-                        (db-unlock dbfile))
-                      (inote "db not locked - "dbfile))))
-              alldbs)
-    
-;;;; check for megatest.db
-    (if golden-mtest-file-ok
-        (inote "golden megatest db file ok")
-        (if (not (file-exists? golden-mtest-file))
-            (inote "megatest.db not present.  Continuing.")
-            (begin
-          ;;;; if golden megatest db is broken, stop now!
-              (ierr "Golden megatest.db is broken.  Please delete it or replace it from a backup version in .snapshot.  If critical, contact env team to assist.")
-              (sendmail "bjbarcla" "!!Bad golden megatest.db" this-toppath)
-              (inote "Backups in .snapshot:")
-              (system "ls -l .snapshot/*/megatest.db")
-              (ierr "Not proceeding with any more checks.")
-              (exit 3))))
-    ))
-
-;; TODO: check for and fix locked megatest.db and locked monitor.db (ritika working on)
-
-
-(repair-dbs)
-    
-
-
-
-
-
-
-

Index: vg-test.scm
==================================================================
--- vg-test.scm
+++ vg-test.scm
@@ -1,5 +1,22 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
 (use canvas-draw iup foof-loop)
 (import canvas-draw-iup)
 
 (load "vg.scm")
 

Index: vg.scm
==================================================================
--- vg.scm
+++ vg.scm
@@ -1,14 +1,22 @@
 ;;
 ;; Copyright 2016  Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
 
 ;;  strftime('%m/%d/%Y %H:%M:%S','now','localtime')
 
 (use typed-records srfi-1)
 
@@ -555,11 +563,11 @@
 	;;     (begin
 	;; 	(canvas-foreground-set! cnv fill-color)
 	;; 	(canvas-box! cnv llx ulx lly uly))) ;; docs are all over the place on this one.;; w h)
 	  (if line-color
 	      (canvas-foreground-set! cnv line-color)
-	      (if fill-color
+	      #;(if fill-color
 		  (canvas-foreground-set! cnv prev-foreground-color)))
 	  (canvas-line! cnv llx ulx lly uly)
 	  (canvas-foreground-set! cnv prev-foreground-color)
 	  (if text 
 	      (let* ((prev-font    (canvas-font cnv))

Index: vg_records.scm
==================================================================
--- vg_records.scm
+++ vg_records.scm
@@ -1,7 +1,25 @@
 ;; Created by records.sh. DO NOT EDIT THIS FILE. Edit records.sh instead
 ;; Generated using make-vector-record -safe vg lib comps
+
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
 
 (use simple-exceptions)
 (define vg:lib-exn (make-exception "wrong record type, expected vg:lib." 'assert))
 (define (pmake-vg:lib . params)(let ((v (if (null? params)(make-vector 2)(apply vector 'vg:lib params)))) v))
 (define (make-vg:lib #!key 

Index: widgets.scm
==================================================================
--- widgets.scm
+++ widgets.scm
@@ -1,5 +1,22 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 (require-library srfi-4 iup)
 (import srfi-4 iup iup-pplot iup-glcanvas) ;; iup-web
 
 (define (popup dlg . args)
   (apply show dlg #:modal? 'yes args)

ADDED   wrappers/cfg.sh
Index: wrappers/cfg.sh
==================================================================
--- /dev/null
+++ wrappers/cfg.sh
@@ -0,0 +1,27 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
+if [ -z $MT_ORIG_ENV ]; then
+    export MT_ORIG_ENV=$( PREFIX/bin/serialize-env )
+fi
+
+if [ "$LD_LIBRARY_PATH" != "" ];then
+  export LD_LIBRARY_PATH=PREFIX:PREFIX/lib:PREFIX/lib64:$LD_LIBRARY_PATH
+else
+  export LD_LIBRARY_PATH=PREFIX:PREFIX/lib:PREFIX/lib64
+fi
+

ADDED   wrappers/dashboard
Index: wrappers/dashboard
==================================================================
--- /dev/null
+++ wrappers/dashboard
@@ -0,0 +1,49 @@
+#!/bin/bash
+
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
+# # disable if not running on homehost
+# if [[ -e .homehost ]]; then
+#   homehostname=$( host `cat .homehost` | awk '{print $NF}' | sed 's/\.$//' )
+#   hostname=$( hostname -f )
+#
+#   if [[ ! ($homehostname == $hostname) ]]; then
+#     echo "ERROR: this host ($hostname) is not the homehost ($homehostname) for this megatest run area.  Cannot start dashboard."
+#     echo "       Please log into homehost before launching dashboard."
+#     exit 1
+#   fi
+# fi
+
+# check that $DISPLAY is set
+if [[ -z $DISPLAY ]]; then
+   echo 'ERROR: $DISPLAY environment variable is not set; megatest dashboard requires X display address to be set in $DISPLAY.'
+   exit 1
+fi
+
+# check that $DISPLAY is proper
+if [[ -x $(which xdpyinfo  2>/dev/null) ]]; then
+  if ! xdpyinfo -display "$DISPLAY" &>/dev/null; then
+    echo 'ERROR: megatest dashboard cannot open display "'$DISPLAY'".  Please check $DISPLAY environment variable.'
+    exit 1
+  fi
+fi
+if [[ $(ulimit -a | grep 'open files' | awk '{print $4}') -gt 10000 ]];then ulimit -n 10000;fi
+lsbr=$(lsb_release -sr)
+source PREFIX/ARCHSTR/cfg.sh
+exec PREFIX/dboard "$@"
+

ADDED   wrappers/megatest
Index: wrappers/megatest
==================================================================
--- /dev/null
+++ wrappers/megatest
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
+if [[ $(ulimit -a | grep 'open files' | awk '{print $4}') -gt 20000 ]];then ulimit -n 20000;fi
+lsbr=$(lsb_release -sr)
+source PREFIX/ARCHSTR/cfg.sh
+exec PREFIX/mtest "$@"
+


    " (()) "