--- forms.js~	2007-02-16 14:58:32.000000000 +0200
+++ forms.js	2007-02-22 15:43:11.000000000 +0200
@@ -32,6 +32,7 @@
 kukit.fo.dictprefix = ''
 kukit.fo.dictseparator = '.'
 kukit.fo.dictpostfix = ':record'
+kukit.fo.listpostfix = ':list'
 
 kukit.fo.FormQueryElem = function(name, value) {
     this.name = name;
@@ -47,18 +48,23 @@
 };
 
 kukit.fo.FormQuery.prototype.appendElem = function(name, value) {
+    var retarr = new Array();
     if (typeof(value) == 'object') {
         // Special marshalling of dicts
         for (var key in value) {
+            // Assume dictionary
             var qkey = kukit.fo.dictprefix + name + kukit.fo.dictseparator + key + kukit.fo.dictpostfix;
             var elem = new kukit.fo.FormQueryElem(qkey, value[key]);
             this.l.push(elem);
+            retarr.push(value[key]);          
         }
     } else {
         // normal strings
         var elem = new kukit.fo.FormQueryElem(name, value);
         this.l.push(elem);
+        retarr.push(value);
     }
+    return retarr;
 };
 
 kukit.fo.FormQuery.prototype.encode = function() {
@@ -107,7 +113,7 @@
     });
 };
 
-kukit.fo.getValueOfFormElement = function(element) {
+kukit.fo._getValueOfFormElement = function(element) {
     // Returns the value of the form element / or null
     // First: update the field in case an editor is lurking
     // in the background
@@ -141,12 +147,153 @@
     return value;
 };
 
+kukit.fo.getValueOfFormElement = function(form, element) {
+    if (!element)
+        return;
+
+    if (element.name == undefined)
+        return;
+        
+    // Rudimentary de-marshaller
+    if ((element.name) && (element.name.substr(element.name.length-5, element.name.length-1) == ':list'))
+    {
+        var value = new Array();
+        var elements = form.elements;
+        for (var y=0; y<elements.length; y++) 
+        {
+            if (elements[y].name == element.name)
+                value.push(kukit.fo._getValueOfFormElement(elements[y]));
+        }
+        return value;
+    }
+    else if ((element.name) && (element.name.substr(element.name.length-7, element.name.length-1) == ':record'))
+    {
+        var element_subname = kukit.fo.getMarshallRoot(element.name, 'record');
+        var value = {};
+        var elements = form.elements;
+        for (var y=0; y<elements.length; y++) 
+        {
+            // element.name is foo.bar:record. elements[y].name is foo.zak:record.
+            // In such a case the predicate must evaluate true.
+            if (element_subname == kukit.fo.getMarshallRoot(elements[y].name, 'record'))            
+                value[elements[y].name] = kukit.fo._getValueOfFormElement(elements[y]);            
+        }
+        return value;
+    }
+    else if ((element.name) && (element.name.substr(element.name.length-8, element.name.length-1) == ':records'))
+    {
+        var element_subname = kukit.fo.getMarshallRoot(element.name, 'records');
+        var value = {};
+        var elements = form.elements;
+        for (var y=0; y<elements.length; y++) 
+        {
+            if (element_subname == kukit.fo.getMarshallRoot(elements[y].name, 'records'))            
+            {
+                if (!value[elements[y].name])
+                    value[elements[y].name] = new Array();
+                value[elements[y].name].push(kukit.fo._getValueOfFormElement(elements[y]));
+            }
+        }
+        return value;
+    }
+
+    else
+    {
+        return kukit.fo._getValueOfFormElement(element);
+    }    
+};
+
+kukit.fo.getMarshallType = function(name, parsename) 
+{
+    // If parsename is false then simple check whether name ends in
+    // :list, :record or :records
+    // If parsename is true then the check is more complex for 
+    // :record and :records, ie. foo.bar:record must match if name is foo:record
+    // XXX :int and composite marshalling is not yet supported
+    if (parsename)
+    {
+        re = /(.*)\.(.*):(records|record)/;
+    }
+    else
+    {
+        re = /:(records|record)/;
+    }
+    var matchArr = re.exec(name);
+    if (matchArr == null)
+    {
+        re = /(.*):list/;
+        matchArr = re.exec(name);
+        if (matchArr != null)
+            return 'list'
+        else
+            return false;
+    }    
+    // matchArr[1,3] is either record or records
+    if (parsename)
+        return matchArr[3]
+    else
+        return matchArr[1];
+}
+
+kukit.fo.getMarshallRoot = function(name, marshalltype) 
+{
+    if (marshalltype == 'record')
+        re = /(.*)\.(.*):record/
+    else if (marshalltype == 'records')
+        re = /(.*)\.(.*):records/
+    else if (marshalltype == 'list')
+        re = /(.*):list/;
+
+    var matchArr = re.exec(name);
+    if (matchArr != null)
+        return matchArr[1];
+    return false;
+}
+
+kukit.fo.getMarshallSubname = function(name, marshalltype) 
+{
+    if (marshalltype == 'record')
+        re = /(.*)\.(.*):record/
+    else if (marshalltype == 'records')
+        re = /(.*)\.(.*):records/;
+
+    var matchArr = re.exec(name);
+    if (matchArr != null)
+        return matchArr[2];
+    return false;
+}
+
 kukit.fo.getFormVar = function(form, name) {
     // Extract the value of a formvar, from a given form
     var value = null;
-    var element = form[name];
+    
+    var element = null;  
+    var marshaltype = kukit.fo.getMarshallType(name, false);
+    if (marshaltype)
+    {        
+        // If marshalled find any element matching the marshall
+        var name_root = name.replace(':' + marshaltype, '');
+        var elements = form.elements;
+        for (var y=0; y<elements.length; y++) 
+        {
+            // xxx: The multiple calls to getMarshall* can surely be optimized
+            if (kukit.fo.getMarshallType(elements[y].name, true) == marshaltype)         
+            {
+                if (kukit.fo.getMarshallRoot(elements[y].name) == name_root)
+                {
+                    element = elements[y];
+                    break;
+                }
+            }
+        }
+    }
+    else        
+        var element = form[name];
+
+    //alert('for name ' + name + ' we got element ' + element + ' which is if type ' + typeof(element)); 
+    //alert('marshaltype = ' + marshaltype);
     if (element) {
-        var value = kukit.fo.getValueOfFormElement(element);
+        value = kukit.fo.getValueOfFormElement(form, element);
         if (value == null) {
             kukit.logWarning('Form element not harvested: '+element.tagName);
         } else {
@@ -155,6 +302,7 @@
     } else {
         kukit.logWarning('Form element '+ name + '" not found in form.');
     }
+    //alert('getformvar returns ' + value);
     return value;
 };
 
@@ -164,7 +312,7 @@
     var elements = form.elements;
     for (var y=0; y<elements.length; y++) {
         var element = elements[y];
-        var value = kukit.fo.getValueOfFormElement(element);
+        var value = kukit.fo.getValueOfFormElement(form, element);
         if (value == null) {
             kukit.logWarning('Form element not harvested: '+element.tagName);
         } else {