Author: hannes
Date: Mon Sep 5 19:16:46 2005
New Revision: 9958
Removed:
trunk/libraries/koala/sources/examples/buddha/html-utils.dylan
Modified:
trunk/libraries/koala/sources/examples/buddha/buddha.dylan
trunk/libraries/koala/sources/examples/buddha/buddha.lid
trunk/libraries/koala/sources/examples/buddha/cidr.dylan
trunk/libraries/koala/sources/examples/buddha/host.dylan
trunk/libraries/koala/sources/examples/buddha/network.dylan
trunk/libraries/koala/sources/examples/buddha/subnet.dylan
trunk/libraries/koala/sources/examples/buddha/vlan.dylan
trunk/libraries/koala/sources/examples/buddha/zone.dylan
Log:
Bug: 7257
*removed html-utils
*removed print-html generic function
*fixed xml-generation, now buddha works again :)
Modified: trunk/libraries/koala/sources/examples/buddha/buddha.dylan
==============================================================================
--- trunk/libraries/koala/sources/examples/buddha/buddha.dylan (original)
+++ trunk/libraries/koala/sources/examples/buddha/buddha.dylan Mon Sep 5
19:16:46 2005
@@ -184,7 +184,7 @@
do(let res = make(<list>);
for (net in *config*.config-nets,
i from 0)
- res := concatenate(res, gen-xml(net));
+ res := concatenate(gen-xml(net), res);
res := add!(res, with-xml()
form(action => "/net", \method => "post")
{
@@ -228,16 +228,18 @@
input(type => "text", name => "cidr"),
\select(name => "vlan")
{
- do(do(
+ do(let res = make(<list>);
+ do(
method(x)
let num = integer-to-string(x.vlan-number);
- with-xml()
- option(name => num,
- value => concatenate(num,
- " ",
- x.vlan-name))
- end;
- end, get-sorted-list(*config*.config-vlans)))
+ res := add!(res, with-xml()
+ option(concatenate(num,
+ " ",
+ x.vlan-name),
+ value => num)
+ end);
+ end, get-sorted-list(*config*.config-vlans));
+ reverse(res))
},
text("DHCP?"),
input(type => "checkbox",
@@ -266,13 +268,13 @@
input(type => "submit",
name => "add-subnet-button",
value => concatenate
- ("Add subnet to",
+ ("Add subnet to ",
as(<string>, net.network-cidr)))
}
}
end);
end;
- res;),
+ reverse(res)),
form(action => "/net", \method => "post")
{
div(class => "edit")
@@ -313,11 +315,11 @@
{
do(let res = make(<list>);
do(method(x)
- res := concatenate(res, gen-xml(x));
+ res := concatenate(gen-xml(x), res);
res := add!(res,
with-xml()
form(action => "/vlan", \method => "post")
- {
+ {
div(class => "edit")
{
input(type => "hidden",
@@ -333,7 +335,7 @@
}
end);
end, get-sorted-list(*config*.config-vlans));
- res),
+ reverse(res)),
form(action => "/vlan", \method => "post")
{
div(class => "edit")
@@ -376,7 +378,7 @@
res := add!(res, gen-xml(x));
end, net.network-hosts);
end;
- res)
+ reverse(res))
},
form(action => "/host", \method => "post")
{
@@ -683,9 +685,11 @@
end;
begin
- let dood = make(<dood>,
- locator:
concatenate("/home/hannes/dylan/libraries/koala/www/buddha/",
base64-encode("foo")),
- direction: #"input");
+ let dood
+ = make(<dood>,
+ locator:
concatenate("/home/hannes/dylan/libraries/koala/www/buddha/",
+ base64-encode("foo")),
+ direction: #"input");
*config* := dood-root(dood);
dood-close(dood);
Modified: trunk/libraries/koala/sources/examples/buddha/buddha.lid
==============================================================================
--- trunk/libraries/koala/sources/examples/buddha/buddha.lid (original)
+++ trunk/libraries/koala/sources/examples/buddha/buddha.lid Mon Sep 5
19:16:46 2005
@@ -2,7 +2,6 @@
executable: buddha
files: library
util
- html-utils
xml
config
network
Modified: trunk/libraries/koala/sources/examples/buddha/cidr.dylan
==============================================================================
--- trunk/libraries/koala/sources/examples/buddha/cidr.dylan (original)
+++ trunk/libraries/koala/sources/examples/buddha/cidr.dylan Mon Sep 5
19:16:46 2005
@@ -47,11 +47,6 @@
format(stream, "%s", as(<string>, cidr));
end;
-define method print-html (cidr :: <cidr>, stream :: <stream>)
- => ()
- format(stream, "<td>%s</td>", as(<string>, cidr));
-end;
-
define method as (class == <string>, cidr :: <cidr>)
=> (res :: <string>)
concatenate(as(<string>, network-address(cidr)), "/",
Modified: trunk/libraries/koala/sources/examples/buddha/host.dylan
==============================================================================
--- trunk/libraries/koala/sources/examples/buddha/host.dylan (original)
+++ trunk/libraries/koala/sources/examples/buddha/host.dylan Mon Sep 5
19:16:46 2005
@@ -37,15 +37,6 @@
a.host-ipv4-address < b.host-ipv4-address
end;
-define method print-html (host :: <host>, stream :: <stream>)
- gen-row(stream,
- list(host.host-name,
- as(<string>, host.host-ipv4-address),
- as(<string>, host.host-net.network-cidr),
- mac-to-string(host.host-mac),
- host.host-zone.zone-name));
-end;
-
define method gen-xml (host :: <host>)
with-xml()
tr
Modified: trunk/libraries/koala/sources/examples/buddha/network.dylan
==============================================================================
--- trunk/libraries/koala/sources/examples/buddha/network.dylan (original)
+++ trunk/libraries/koala/sources/examples/buddha/network.dylan Mon Sep 5
19:16:46 2005
@@ -89,16 +89,6 @@
end for;
end;
-define method print-html (network :: <network>, stream :: <stream>)
- => ()
- format(stream, "Network CIDR %=<br/>", network.network-cidr);
- with-table (stream, #("CIDR", "VLAN"))
- do(method(x)
- print-html(x, stream);
- end, network.network-subnets);
- end;
-end;
-
define method gen-xml (network :: <network>)
=> (res :: <list>)
let res = make(<list>);
@@ -110,9 +100,11 @@
table
{
tr { th("CIDR"), th("VLAN") },
- do(do(method(x)
- gen-xml(x);
- end, network.network-subnets))
+ do(let res = make(<list>);
+ do(method(x)
+ res := add!(res, gen-xml(x));
+ end, network.network-subnets);
+ reverse(res))
}
end);
res;
Modified: trunk/libraries/koala/sources/examples/buddha/subnet.dylan
==============================================================================
--- trunk/libraries/koala/sources/examples/buddha/subnet.dylan (original)
+++ trunk/libraries/koala/sources/examples/buddha/subnet.dylan Mon Sep 5
19:16:46 2005
@@ -61,14 +61,6 @@
end;
end;
-define method print-html (subnet :: <subnet>, stream :: <stream>)
- => ()
- //gen-row(stream, #(subnet.network-cidr, subnet.subnet-vlan.vlan-number))
- format(stream, "<tr>");
- print-html(subnet.network-cidr, stream);
- format(stream, "<td>%d</td></tr>", subnet.subnet-vlan.vlan-number);
-end;
-
define method gen-xml (subnet :: <subnet>)
with-xml()
tr { td(as(<string>, subnet.network-cidr)),
Modified: trunk/libraries/koala/sources/examples/buddha/vlan.dylan
==============================================================================
--- trunk/libraries/koala/sources/examples/buddha/vlan.dylan (original)
+++ trunk/libraries/koala/sources/examples/buddha/vlan.dylan Mon Sep 5
19:16:46 2005
@@ -14,18 +14,6 @@
vlan.vlan-number, vlan.vlan-name, vlan.vlan-description);
end;
-define method print-html (vlan :: <vlan>, stream :: <stream>)
- => ()
- format(stream, "VLAN %d %s %s<br/>\n",
- vlan.vlan-number,
- vlan.vlan-name,
- vlan.vlan-description);
- with-table (stream, #("CIDR", "VLAN"))
- do(method(x) print-html(x, stream); end,
- vlan.vlan-subnets);
- end;
-end;
-
define method gen-xml (vlan :: <vlan>)
let res = make(<list>);
res := add!(res, with-xml()
@@ -38,8 +26,12 @@
table
{
tr { th("CIDR"), th("VLAN") },
- do(do(method(x) gen-xml(x); end,
- vlan.vlan-subnets))
+ do(let res = make(<list>);
+ do(method(x)
+ res := add!(res, gen-xml(x));
+ end,
+ vlan.vlan-subnets);
+ reverse(res))
}
end);
res;
Modified: trunk/libraries/koala/sources/examples/buddha/zone.dylan
==============================================================================
--- trunk/libraries/koala/sources/examples/buddha/zone.dylan (original)
+++ trunk/libraries/koala/sources/examples/buddha/zone.dylan Mon Sep 5
19:16:46 2005
@@ -23,11 +23,6 @@
format(stream, "%s", zone.zone-name);
end method;
-define method print-html (zone :: <zone>, stream :: <stream>)
- => ()
- gen-row(stream, list(zone.zone-name));
-end;
-
define method gen-xml (zone :: <zone>)
with-xml()
tr { td(zone.zone-name) }
--
Gd-chatter mailing list
Gd-chatter@xxxxxxxxxxxxxxxx
https://gauss.gwydiondylan.org/mailman/listinfo/gd-chatter
|
