[Gd-chatter] r11061 - in trunk/libraries/network: koala/sources/examples/buddha web-framework

[hannes at gwydiondylan.org]

Author: hannes
Date: Tue Dec 12 02:03:42 2006
New Revision: 11061

Modified:
   trunk/libraries/network/koala/sources/examples/buddha/buddha.dylan
   trunk/libraries/network/web-framework/class-editor.dylan
   trunk/libraries/network/web-framework/storage.dylan
Log:
Job: minor
fixed more stuff

Modified: trunk/libraries/network/koala/sources/examples/buddha/buddha.dylan
==============================================================================
--- trunk/libraries/network/koala/sources/examples/buddha/buddha.dylan	(original)
+++ trunk/libraries/network/koala/sources/examples/buddha/buddha.dylan	Tue Dec 12 02:03:42 2006
@@ -138,9 +138,9 @@
           li { a("Changes", href => "/changes") }
         }
       },
-      do(if(*user*.access-level = #"root" | *user*.access-level = #"noc")
-           collect(with-xml()
       div (id => "buddha-edit") {
+      do(if (*user*.access-level = #"root" | *user*.access-level = #"noc")
+           with-xml()
         ul {
           li("Add:"),
           li { a("vlan", href => concatenate("/add?object-type=",
@@ -164,18 +164,17 @@
                                                "&parent-object=",
                                                get-reference(storage(<subnet>)))) }
         }
-        end);
-      elseif (*user*.access-level = #"helpdesk")
-           collect(with-xml()
-      div (id => "buddha-edit") {
+           end;
+         elseif (*user*.access-level = #"helpdesk")
+           with-xml()
         ul {
           li { a("host", href => concatenate("/add?object-type=",
                                              get-reference(<host>),
                                              "&parent-object=",
                                              get-reference(storage(<host>)))) }
         }
-      }
-        end)),
+           end;
+         end if),
         ul { li{ text("Logged in as "),
                  strong(*user*.username) } }
       }
@@ -283,7 +282,7 @@
                               response :: <response>,
                               #key errors = #())
   let al = *user*.access-level;
-  if (sl = #"root" | al = #"noc" | al = #"helpdesk")
+  if (al = #"root" | al = #"noc" | al = #"helpdesk")
     let real-type = get-object(get-query-value("object-type"));
     let parent-object = get-object(get-query-value("parent-object"));
     let out = output-stream(response);

Modified: trunk/libraries/network/web-framework/class-editor.dylan
==============================================================================
--- trunk/libraries/network/web-framework/class-editor.dylan	(original)
+++ trunk/libraries/network/web-framework/class-editor.dylan	Tue Dec 12 02:03:42 2006
@@ -289,6 +289,8 @@
   end;
 end;
 
+define constant *debug* = #t;
+
 define method respond-to-post
     (page == #"edit",
      request :: <request>,
@@ -299,7 +301,10 @@
   let object = get-object(object-string);
   let handler <web-form-warning>
     = method(e :: <web-form-warning>, next-handler :: <function>)
-          errors := add!(errors, e)
+          errors := add!(errors, e);
+          if (*debug*)
+            break();
+          end;
       end;
   block(return)
     //add, save, remove... we may not need this here...
@@ -314,13 +319,20 @@
       otherwise => signal(make(<web-error>,
                                error: concatenate("Unknown action: ",
                                                   as(<string>, action))));
-      end select;
+    end select;
+    dump-data(); //yes, this is a bit ugly :(
   exception (e :: <web-error>)
     errors := add!(errors, e);
+    if (*debug*)
+      break()
+    end;
     return();
   exception (e :: <error>)
     errors := add!(errors, make(<web-error>,
                                 error: format-to-string("%=", e)));
+    if (*debug*)
+      break()
+    end;
     return();
   end; 
   let referer = get-query-value("refer-to");

Modified: trunk/libraries/network/web-framework/storage.dylan
==============================================================================
--- trunk/libraries/network/web-framework/storage.dylan	(original)
+++ trunk/libraries/network/web-framework/storage.dylan	Tue Dec 12 02:03:42 2006
@@ -65,11 +65,11 @@
 define method save (object) => ()
   with-lock($database-lock)
     add-object(storage(object.object-class), object);
-    if (*rev* = 100 | *version* = 0)
-      really-dump-all-data();
-    else
-      dump-single-object(object);
-    end;
+    //if (*rev* = 100 | *version* = 0)
+    //  really-dump-all-data();
+    //else
+    //  dump-single-object(object);
+    //end;
   end;
 end;